Author: pfg
Date: Fri Feb 12 21:09:20 2016
New Revision: 1730107
URL: http://svn.apache.org/viewvc?rev=1730107&view=rev
Log:
i126369 - Finish off hwpfilter
The Hangul Word Processor filter was disabled from OpenOffice in
r1677190 due to security concerns. While some extra buffer controls
could have been made and the filter restored, the truth is a much
bigger effort is required to catch up with this format. Files created
with later editions of Hangul, including Hangul Wordian, Hangul 2002,
Hangul 2005 and Hangul 2007 cannot be opened with the existing filter.
Existing users can apparently download a free viewer and convert their
document to RTF or doc.
Drop completely the code. while here also drop remnants of wpd support
that we dropped since 3.4.1. Having less code is sometimes better.
Removed:
openoffice/trunk/main/hwpfilter/
Modified:
openoffice/trunk/main/LICENSE
openoffice/trunk/main/configure.ac
openoffice/trunk/main/rat-excludes
openoffice/trunk/main/scp2/source/writer/registryitem_writer.scp
openoffice/trunk/main/sysui/desktop/macosx/Info.plist
openoffice/trunk/main/toolkit/src2xml/include.lst
Modified: openoffice/trunk/main/LICENSE
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/LICENSE?rev=1730107&r1=1730106&r2=1730107&view=diff
==============================================================================
--- openoffice/trunk/main/LICENSE (original)
+++ openoffice/trunk/main/LICENSE Fri Feb 12 21:09:20 2016
@@ -754,27 +754,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
____
-For main/hwpfilter/source/ksc5601.h:
-- MIT license
-
-Copyright (c) 1999-2000 Free Software Foundation, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-FREE SOFTWARE FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-____
-
For main/soltools/mkdepend/*:
- MIT license
Modified: openoffice/trunk/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1730107&r1=1730106&r2=1730107&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Fri Feb 12 21:09:20 2016
@@ -435,9 +435,6 @@ AC_ARG_WITH(system-jpeg,
AC_ARG_WITH(system-expat,
[ --with-system-expat Use expat already on system
],,)
-AC_ARG_WITH(system-libwpd,
-[ --with-system-libwpd Use libwpd already on system
-],,)
AC_ARG_WITH(system-libxml,
[ --with-system-libxml Use libxml already on system
],,)
@@ -3781,23 +3778,6 @@ fi
AC_SUBST(SYSTEM_EXPAT)
dnl ===================================================================
-dnl Check for system libwpd
-dnl ===================================================================
-AC_MSG_CHECKING([which libwpd to use])
-if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
- test "$with_system_libwpd" != "no"; then
- AC_MSG_RESULT([external])
- SYSTEM_LIBWPD=YES
- PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
-else
- AC_MSG_RESULT([no])
- SYSTEM_LIBWPD=
-fi
-AC_SUBST(SYSTEM_LIBWPD)
-AC_SUBST(LIBWPD_CFLAGS)
-AC_SUBST(LIBWPD_LIBS)
-
-dnl ===================================================================
dnl Check whether freetype is available
dnl ===================================================================
if test "$test_freetype" = "yes"; then
Modified: openoffice/trunk/main/rat-excludes
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/rat-excludes?rev=1730107&r1=1730106&r2=1730107&view=diff
==============================================================================
--- openoffice/trunk/main/rat-excludes (original)
+++ openoffice/trunk/main/rat-excludes Fri Feb 12 21:09:20 2016
@@ -1386,15 +1386,6 @@ main/connectivity/qa/complex/connectivit
##############################################################################
#
-# FSF, contains MIT equal license
-# A case for https://issues.apache.org/jira/browse/LEGAL-130
-#
-
-main/hwpfilter/source/ksc5601.h
-
-
-##############################################################################
-#
# originally from XConsortium, mkdepend.man contains license info (permission)
# and looks like MIT1.1
# A case for https://issues.apache.org/jira/browse/LEGAL-130
Modified: openoffice/trunk/main/scp2/source/writer/registryitem_writer.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/writer/registryitem_writer.scp?rev=1730107&r1=1730106&r2=1730107&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/writer/registryitem_writer.scp (original)
+++ openoffice/trunk/main/scp2/source/writer/registryitem_writer.scp Fri Feb 12
21:09:20 2016
@@ -1328,24 +1328,6 @@ RegistryItem gid_Regitem_OpenOffice_XML_
Value = " ";
End
-// .WPD
-RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = ".wpd\OpenWithProgIDs";
- ModuleID = gid_Module_Prg_Wrt_Bin;
- Name = "soffice.StarWriterDocument.6";
- Value = " ";
-End
-
-// .HWP
-RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- Subkey = ".hwp\OpenWithProgIDs";
- ModuleID = gid_Module_Prg_Wrt_Bin;
- Name = "soffice.StarWriterDocument.6";
- Value = " ";
-End
-
// .SXG
RegistryItem gid_Regitem_OpenOffice_SXG_OpenWith_Writer
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Modified: openoffice/trunk/main/sysui/desktop/macosx/Info.plist
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/macosx/Info.plist?rev=1730107&r1=1730106&r2=1730107&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/macosx/Info.plist (original)
+++ openoffice/trunk/main/sysui/desktop/macosx/Info.plist Fri Feb 12 21:09:20
2016
@@ -1257,11 +1257,8 @@
<string>pdb</string>
<string>xml</string>
<string>psw</string>
- <string>wpd</string>
<string>jtd</string>
<string>jtt</string>
- <string>hwp</string>
- <string>wps</string>
<string>dif</string>
<string>dbf</string>
<string>xls</string>
Modified: openoffice/trunk/main/toolkit/src2xml/include.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/src2xml/include.lst?rev=1730107&r1=1730106&r2=1730107&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/src2xml/include.lst (original)
+++ openoffice/trunk/main/toolkit/src2xml/include.lst Fri Feb 12 21:09:20 2016
@@ -136,8 +136,6 @@
../../configmgr/inc
../../configmgr/source/inc
../../configmgr/unxlngi6.pro/inc
-../../hwpfilter/inc
-../../hwpfilter/unxlngi6.pro/inc
../../libxmlsec/unxlngi6.pro/inc
../../jvmaccess/inc
../../jvmaccess/unxlngi6.pro/inc
@@ -210,9 +208,6 @@
../../layout/unxlngi6.pro/inc
../../linguistic/inc
../../linguistic/unxlngi6.pro/inc
-../../libwpd/unxlngi6.pro/inc
-../../libwpg/unxlngi6.pro/inc
-../../libwps/unxlngi6.pro/inc
../../lingucomponent/inc
../../lingucomponent/unxlngi6.pro/inc
../../offapi/unxlngi6.pro/inc
