You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/12/28 12:39:43 UTC

[openoffice] branch AOO419 updated (1427dd4 -> 11859c3)

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a change to branch AOO419
in repository https://gitbox.apache.org/repos/asf/openoffice.git.


    from 1427dd4  Changed icons for OLE objects in Navigation - This fixes issue 128315
     new 827572e  #i126369# Removed some fragments for removed HWP (Hangul Word Processor)
     new 11859c3  #i126369# Removed last (hopefully) fragments for removed HWP (Hangul Word Processor)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../filter/detection/typeDetection/files.csv       |  1 -
 .../fragments/filters/writer_MIZI_Hwp_97.xcu       | 34 ----------------------
 .../config/fragments/types/writer_MIZI_Hwp_97.xcu  | 33 ---------------------
 main/postprocess/rebase/coffbase.txt               |  1 -
 main/scp2/source/supported_extensions.txt          |  1 -
 main/scp2/source/writer/registryitem_writer.scp    |  9 ------
 6 files changed, 79 deletions(-)
 delete mode 100644 main/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu
 delete mode 100644 main/filter/source/config/fragments/types/writer_MIZI_Hwp_97.xcu


[openoffice] 02/02: #i126369# Removed last (hopefully) fragments for removed HWP (Hangul Word Processor)

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO419
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 11859c39640a3039bb2b70e7e862badac53ec1de
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Tue Apr 18 21:51:10 2017 +0000

    #i126369# Removed last (hopefully) fragments for removed HWP (Hangul Word Processor)
    
    git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1791839 13f79535-47bb-0310-9956-ffa450edef68
    (cherry picked from commit 3860c2719b5734f44da9b459f06e4a1b1a0fcaa7)
---
 .../filter/detection/typeDetection/files.csv       |  1 -
 .../fragments/filters/writer_MIZI_Hwp_97.xcu       | 34 ----------------------
 .../config/fragments/types/writer_MIZI_Hwp_97.xcu  | 33 ---------------------
 3 files changed, 68 deletions(-)

diff --git a/main/filter/qa/complex/filter/detection/typeDetection/files.csv b/main/filter/qa/complex/filter/detection/typeDetection/files.csv
index 84b593f..d6b8534 100644
--- a/main/filter/qa/complex/filter/detection/typeDetection/files.csv
+++ b/main/filter/qa/complex/filter/detection/typeDetection/files.csv
@@ -33,7 +33,6 @@ ApiPro3;Writer/AmiPro_3x.sam;writer_Text_encoded:writer_Text;writer_Text_encoded
 Applix;Writer/Applix.aw;writer_Text_encoded:writer_Text;writer_Text_encoded:writer_Text
 Text2;Writer/Counterstrike I.txt;writer_Text_encoded:writer_Text;writer_Text_encoded:writer_Text
 FrameMake_document;Writer/FrameMaker.mif;writer_Text_encoded:writer_Text;writer_Text_encoded:writer_Text
-WordPro_Hangul;Writer/HangulWordPro.hwp;writer_Text_encoded:writer_Text;writer_Text_encoded:writer_Text
 Ichitaro;Writer/Ichitaro.jtd;writer_JustSystem_Ichitaro_10;writer_JustSystem_Ichitaro_10
 MacWord5_document;Writer/MacWord_5.mcw;writer_Text_encoded:writer_Text;writer_Text_encoded:writer_Text
 rtf2;Writer/RTF.rtf;writer_Rich_Text_Format;writer_Rich_Text_Format
diff --git a/main/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu b/main/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu
deleted file mode 100644
index ab0db82..0000000
--- a/main/filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--***********************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- ***********************************************************-->
-
-	<node oor:name="writer_MIZI_Hwp_97" oor:op="replace">
-		<prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop>
-		<prop oor:name="UIComponent"/>
-		<prop oor:name="FilterService"><value>com.sun.comp.hwpimport.HwpImportFilter</value></prop>
-		<prop oor:name="UserData"><value></value></prop>
-		<prop oor:name="UIName">
-			<value xml:lang="x-default">Hangul WP 97</value>
-		</prop>
-		<prop oor:name="FileFormatVersion"><value>0</value></prop>
-		<prop oor:name="Type"><value>writer_MIZI_Hwp_97</value></prop>
-		<prop oor:name="TemplateName"/>
-		<prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
-	</node>
diff --git a/main/filter/source/config/fragments/types/writer_MIZI_Hwp_97.xcu b/main/filter/source/config/fragments/types/writer_MIZI_Hwp_97.xcu
deleted file mode 100644
index c12f57a..0000000
--- a/main/filter/source/config/fragments/types/writer_MIZI_Hwp_97.xcu
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--***********************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- ***********************************************************-->
-
-	<node oor:name="writer_MIZI_Hwp_97" oor:op="replace" >
-		<prop oor:name="DetectService"/>
-		<prop oor:name="URLPattern"/>
-		<prop oor:name="Extensions"><value>hwp</value></prop>
-		<prop oor:name="MediaType"/>
-		<prop oor:name="Preferred"><value>false</value></prop>
-		<prop oor:name="PreferredFilter"><value>writer_MIZI_Hwp_97</value></prop>
-		<prop oor:name="UIName">
-			<value>Hangul WP 97</value>
-		</prop>
-		<prop oor:name="ClipboardFormat"/>
-	</node>


[openoffice] 01/02: #i126369# Removed some fragments for removed HWP (Hangul Word Processor)

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO419
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 827572ed1836e15e2001fe4b19c6fe33d6320576
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Fri Apr 14 10:37:19 2017 +0000

    #i126369# Removed some fragments for removed HWP (Hangul Word Processor)
    
    git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1791341 13f79535-47bb-0310-9956-ffa450edef68
    (cherry picked from commit 4018d6a2749bdf0fa8cd19a91a22abea95f3810e)
---
 main/postprocess/rebase/coffbase.txt            | 1 -
 main/scp2/source/supported_extensions.txt       | 1 -
 main/scp2/source/writer/registryitem_writer.scp | 9 ---------
 3 files changed, 11 deletions(-)

diff --git a/main/postprocess/rebase/coffbase.txt b/main/postprocess/rebase/coffbase.txt
index b198d77..49bfd21 100644
--- a/main/postprocess/rebase/coffbase.txt
+++ b/main/postprocess/rebase/coffbase.txt
@@ -100,7 +100,6 @@ guesslangmi.dll  0x0000000063890000 0x00010000
 hatchwindowfactory.uno.dll 0x0000000063860000 0x00020000
 helplinkermi.dll 0x0000000063820000 0x00030000
 hsqldb2.dll      0x00000000637d0000 0x00040000
-hwp.dll          0x0000000063740000 0x00080000
 hyphenmi.dll     0x0000000063710000 0x00020000
 i18nisolang1msc.dll 0x00000000636f0000 0x00010000
 i18npool.uno.dll 0x00000000635b0000 0x00130000
diff --git a/main/scp2/source/supported_extensions.txt b/main/scp2/source/supported_extensions.txt
index a8d0e1e..1bb31c7 100644
--- a/main/scp2/source/supported_extensions.txt
+++ b/main/scp2/source/supported_extensions.txt
@@ -59,7 +59,6 @@ WPD
 WPS
 JTD
 JTT
-HWP
 OTH
 ODM
 SXG
diff --git a/main/scp2/source/writer/registryitem_writer.scp b/main/scp2/source/writer/registryitem_writer.scp
index 9cc3646..1c42bd8 100644
--- a/main/scp2/source/writer/registryitem_writer.scp
+++ b/main/scp2/source/writer/registryitem_writer.scp
@@ -1419,15 +1419,6 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Hwp
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".hwp";
-    Value = "soffice.StarWriterDocument.6";
-    Styles = ();
-End
-
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";