aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice-2.0-devel
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2003-12-08 13:57:34 +0000
committerMaho Nakata <maho@FreeBSD.org>2003-12-08 13:57:34 +0000
commit68a46b37ab8c3559e09d1eb753c01278a19d4cf9 (patch)
tree8d5a4f6fef466d0c30afd9a8f22ed72e709e1c2e /editors/openoffice-2.0-devel
parent2a7037b6ef8bd7cb0482a7161f09395c3fdd851d (diff)
downloadports-68a46b37ab8c3559e09d1eb753c01278a19d4cf9.tar.gz
ports-68a46b37ab8c3559e09d1eb753c01278a19d4cf9.zip
Notes
Diffstat (limited to 'editors/openoffice-2.0-devel')
-rw-r--r--editors/openoffice-2.0-devel/files/patch-config_office103
-rw-r--r--editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk45
-rw-r--r--editors/openoffice-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map10
-rw-r--r--editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk11
-rw-r--r--editors/openoffice-2.0-devel/files/patch-desktop+scripts+soffice.sh11
-rw-r--r--editors/openoffice-2.0-devel/files/patch-jvmaccess+source+sunversion.cxx25
-rw-r--r--editors/openoffice-2.0-devel/files/patch-python-makefile.mk11
-rw-r--r--editors/openoffice-2.0-devel/files/patch-readlicense_oo+prj+d.lst8
-rw-r--r--editors/openoffice-2.0-devel/files/patch-rtfcjk214
-rw-r--r--editors/openoffice-2.0-devel/files/patch-sal+textenc+tencinfo.c13
-rw-r--r--editors/openoffice-2.0-devel/files/patch-setup2+script+setup.sh13
-rw-r--r--editors/openoffice-2.0-devel/files/patch-solenv+bin+addsym.awk16
-rw-r--r--editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk19
-rw-r--r--editors/openoffice-2.0-devel/files/patch-stlport::STLport-4.5.patch25
-rw-r--r--editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx11
-rw-r--r--editors/openoffice-2.0-devel/files/patch-tools+source+string+tstring.cxx22
-rw-r--r--editors/openoffice-2.0-devel/files/patch-topsection21
-rw-r--r--editors/openoffice-2.0-devel/files/patch-unoil+makefile.pmk13
-rw-r--r--editors/openoffice-2.0-devel/files/patch-vcl+unx+source+app+salmain.cxx11
-rw-r--r--editors/openoffice-2.0-devel/files/patch-word6+95-cjkhandling63
-rw-r--r--editors/openoffice-2.0-devel/files/patch-wrtrtf312
21 files changed, 0 insertions, 977 deletions
diff --git a/editors/openoffice-2.0-devel/files/patch-config_office b/editors/openoffice-2.0-devel/files/patch-config_office
deleted file mode 100644
index 29182dcbd96b..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-config_office
+++ /dev/null
@@ -1,103 +0,0 @@
---- ../config_office/configure.in 5 Aug 2003 16:21:41 -0000 1.55.2.9
-+++ ../config_office/configure.in 9 Aug 2003 05:20:19 -0000
-@@ -77,6 +77,11 @@
-
- Usage: --with-jdk-home=<absolute path to JDK 1.3 home>
- ],,)
-+AC_ARG_WITH(gxx_include_path,
-+[ --with-gxx-include-path if you want to override the autodetected g++ include path.
-+
-+ Usage: --with-gxx-include-path=<absolute path to g++ include dir>
-+],,)
- AC_ARG_ENABLE(java,
- [ --disable-java Build without Java support. Use if there is no supported JDK
- for your platform. The build will have no support for Java
-@@ -191,8 +196,8 @@
- Usage: --with-asm-home=<path to ml.exe directory>
- ],,)
- AC_ARG_WITH(os-version,
--[ --with-os-version For FreeBSD users, use this option option to build
-- OpenOffice.org with the correct OSVERSION.
-+[ --with-os-version For FreeBSD users, use this option option to override
-+ the detected OSVERSION.
-
- Usage: --with-os-version=<OSVERSION>
- ],,)
-@@ -301,6 +306,19 @@
- "FreeBSD")
- test_x=yes
- test_gtk=yes
-+ AC_MSG_CHECKING([the FreeBSD operating system release])
-+ if test -n "$with_os_version"; then
-+ OSVERSION="$with_os_version"
-+ else
-+ OSVERSION=`/sbin/sysctl -n kern.osreldate`
-+ fi
-+ AC_MSG_RESULT([found OSVERSION=$OSVERSION])
-+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
-+ if test "$OSVERSION" -lt "500016"; then
-+ PTHREAD_LIBS="-pthread"
-+ else
-+ PTHREAD_LIBS="-lc_r"
-+ fi
- ;;
- "OSF1")
- test_x=dontknow
-@@ -326,6 +345,7 @@
-
- AC_MSG_RESULT([checked ($_os)])
-
-+AC_SUBST(OSVERSION)
- AC_SUBST(PTHREAD_CFLAGS)
- AC_SUBST(PTHREAD_LIBS)
-
-@@ -812,30 +832,20 @@
- dnl ===================================================================
- dnl Set the gcc/gxx include directories
- dnl ===================================================================
--if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then
--if test "$GXX" = "yes"; then
-- if test -n "$enable_gcc3"; then
-- _gccincname1="g++-v3"
-- else
-- _gccincname1="g++-3"
-- fi
-- _gcc_include_path=".."
-- _gxx_include_path="$_gcc_include_path/$_gccincname1"
--fi
--else
--if test "$GXX" = "yes"; then
-- _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-- if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then
-- _gxx_include_path="/usr/include"
-+# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
-+# often contains an i386 which is expanded as a macro. Solved in stlport.
-+if test "$GXX" = "yes" -a -z "$with_gxx_include_path"; then
-+ with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-+ if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
-+ with_gxx_include_path="/usr/include"
- fi
- dnl This is the original code...
--dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
--fi
-+dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
- fi
--if test -z "$_gxx_include_path"; then
-- _gxx_include_path="NO_GXX_INCLUDE"
-+if test -z "$with_gxx_include_path"; then
-+ with_gxx_include_path="NO_GXX_INCLUDE"
- fi
--GXX_INCLUDE_PATH="$_gxx_include_path"
-+GXX_INCLUDE_PATH="$with_gxx_include_path"
- AC_SUBST(GXX_INCLUDE_PATH)
-
- dnl ===================================================================
-@@ -1677,8 +1687,6 @@
- AC_SUBST(GCC_HOME)
-
- AC_SUBST(WITH_MINGWIN)
--OSVERSION="$with_os_version"
--AC_SUBST(OSVERSION)
-
- AC_OUTPUT([set_soenv])
-
diff --git a/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 2f79f5a07f6e..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Apr 15 19:39:14 2003
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 31 22:34:31 2003
-@@ -64,8 +64,8 @@
- #mozilla specific stuff.
- MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
- MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
--#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib
--#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla
-+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib
-+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla
- #End of mozilla specific stuff.
-
- PRJ=..$/..$/..$/..
-@@ -132,7 +132,7 @@
- -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
-- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap
-+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \
- -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
- -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-@@ -150,7 +150,7 @@
- -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
-- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap
-+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr
- CDEFS+= -DMOZILLA_CLIENT \
- -DOSTYPE=\"Linux2.2.14-5\" -DOJI
- .IF "$(OS)" == "LINUX"
-@@ -166,6 +166,13 @@
- -fno-rtti -Wall -Wconversion -Wpointer-arith \
- -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
- -Wno-long-long
-+CDEFS += -DTRACING
-+.ELIF "$(OS)" == "FREEBSD"
-+CFLAGS += -fPIC
-+CFLAGSCXX += \
-+ -fno-rtti -Wall -Wconversion -Wpointer-arith \
-+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
-+ -Wno-long-long -pthread
- CDEFS += -DTRACING
- .ENDIF
- .ENDIF
diff --git a/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
deleted file mode 100644
index da9fd94b39c0..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../cppuhelper/source/gcc3_linux_intel.map.orig Sat Sep 13 22:15:22 2003
-+++ ../cppuhelper/source/gcc3_linux_intel.map Sat Sep 13 22:16:01 2003
-@@ -299,6 +299,7 @@
- _ZNK4cppu6UnoUrl11getProtocolEv;
- _ZNK4cppu6UnoUrl13getConnectionEv;
- _ZNK4cppu6UnoUrl13getObjectNameEv;
-+_end;
-
- local:
- *;
diff --git a/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
deleted file mode 100644
index 2ed3ac4d5182..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../crashrep/source/unx/makefile.mk.orig Tue Jul 22 19:37:38 2003
-+++ ../crashrep/source/unx/makefile.mk Thu Aug 14 18:44:09 2003
-@@ -123,7 +123,7 @@
- APP2STDLIBS+=-lsocket
- .ENDIF
- .IF "$(OS)" == "FREEBSD"
--APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11
-+APP2STDLIBS=`pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -lintl -lfreetype -lexpat $(DYNAMIC) -lXext -lX11
- .ENDIF
-
- .ENDIF
diff --git a/editors/openoffice-2.0-devel/files/patch-desktop+scripts+soffice.sh b/editors/openoffice-2.0-devel/files/patch-desktop+scripts+soffice.sh
deleted file mode 100644
index ad1235c24e01..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-desktop+scripts+soffice.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../desktop/scripts/soffice.sh.orig Wed Sep 17 05:21:54 2003
-+++ ../desktop/scripts/soffice.sh Wed Sep 17 05:24:59 2003
-@@ -233,6 +233,8 @@
- PATH="$sd_prog":$PATH
- export PATH
-
-+. $sd_prog/freebsd-local.sh
-+
- # execute soffice binary
- exec "$sd_prog/$sd_binary" "$@"
-
diff --git a/editors/openoffice-2.0-devel/files/patch-jvmaccess+source+sunversion.cxx b/editors/openoffice-2.0-devel/files/patch-jvmaccess+source+sunversion.cxx
deleted file mode 100644
index 49b9b53ba97a..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-jvmaccess+source+sunversion.cxx
+++ /dev/null
@@ -1,25 +0,0 @@
---- ../jvmaccess/source/sunversion.cxx.orig Thu May 22 18:41:23 2003
-+++ ../jvmaccess/source/sunversion.cxx Tue Sep 2 21:31:04 2003
-@@ -244,6 +244,22 @@
- m_preRelease = Rel_RC1;
- else if (! strcmp(pCur, "rc2"))
- m_preRelease = Rel_RC2;
-+ else if (! strcmp(pCur, "p8"))
-+ m_preRelease = Rel_BETA;
-+ else if (! strcmp(pCur, "p7"))
-+ m_preRelease = Rel_BETA;
-+ else if (! strcmp(pCur, "p6"))
-+ m_preRelease = Rel_BETA;
-+ else if (! strcmp(pCur, "p5"))
-+ m_preRelease = Rel_BETA;
-+ else if (! strcmp(pCur, "p4"))
-+ m_preRelease = Rel_BETA;
-+ else if (! strcmp(pCur, "p3"))
-+ m_preRelease = Rel_BETA;
-+ else if (! strcmp(pCur, "p2"))
-+ m_preRelease = Rel_BETA;
-+ else if (! strcmp(pCur, "p1"))
-+ m_preRelease = Rel_BETA;
- else
- return false;
- }
diff --git a/editors/openoffice-2.0-devel/files/patch-python-makefile.mk b/editors/openoffice-2.0-devel/files/patch-python-makefile.mk
deleted file mode 100644
index 6308ab485a6f..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-python-makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../python/makefile.mk 31 Jul 2003 12:15:14 -0000 1.5.2.2
-+++ ../python/makefile.mk 8 Aug 2003 15:28:45 -0000
-@@ -187,7 +187,7 @@
- ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
- .ELSE
- .IF "$(OS)" == "FREEBSD"
-- ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR) -lm -lutil ${PTHREAD_LIBS}
-+ $(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR) -lm -lutil ${PTHREAD_LIBS}
- .ELSE
- .IF "$(OS)" == "IRIX"
- ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
diff --git a/editors/openoffice-2.0-devel/files/patch-readlicense_oo+prj+d.lst b/editors/openoffice-2.0-devel/files/patch-readlicense_oo+prj+d.lst
deleted file mode 100644
index 8d91debe9944..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-readlicense_oo+prj+d.lst
+++ /dev/null
@@ -1,8 +0,0 @@
---- ../readlicense_oo/prj/d.lst~ Thu Jul 17 03:00:51 2003
-+++ ../readlicense_oo/prj/d.lst Sun Jul 27 17:23:26 2003
-@@ -206,4 +206,4 @@
- ..\%__SRC%\misc\99\readme99.txt %_DEST%\bin%_EXT%\99\osl\README99
- ..\%__SRC%\misc\99\readme99.html %_DEST%\bin%_EXT%\99\osl\README99.html
-
--..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
-+..\%__SRC%\html\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
diff --git a/editors/openoffice-2.0-devel/files/patch-rtfcjk b/editors/openoffice-2.0-devel/files/patch-rtfcjk
deleted file mode 100644
index 2b44f86757f9..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-rtfcjk
+++ /dev/null
@@ -1,214 +0,0 @@
---- ../svx/source/svrtf/rtfitem.cxx 24 Jun 2003 07:48:56 -0000 1.18
-+++ ../svx/source/svrtf/rtfitem.cxx 25 Jul 2003 22:54:24 -0000
-@@ -285,11 +285,20 @@
- }
- else
- {
-- if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType )
-+// if( LOW_CHARTYPE == eType || HIGH_CHARTYPE == eType ) //Takashi Ono for CJK
-+ if( LOW_CHARTYPE == eType )
- {
- if( *pNormal )
- {
- rItem.SetWhich( *pNormal );
-+ rSet.Put( rItem );
-+ }
-+ }
-+ else if( HIGH_CHARTYPE == eType )
-+ {
-+ if( *pCTL )
-+ {
-+ rItem.SetWhich( *pCTL );
- rSet.Put( rItem );
- }
- }
---- ../svx/source/svrtf/svxrtf.cxx 19 May 2003 12:30:59 -0000 1.15
-+++ ../svx/source/svrtf/svxrtf.cxx 25 Jul 2003 22:54:29 -0000
-@@ -583,8 +583,14 @@
-
- case RTF_FCHARSET:
- if( -1 != nTokenValue )
-- pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset(
-- (BYTE)nTokenValue ) );
-+ {
-+// pFont->SetCharSet( rtl_getTextEncodingFromWindowsCharset(
-+// (BYTE)nTokenValue ) );
-+ CharSet nCharSet =
-+ rtl_getTextEncodingFromWindowsCharset( (BYTE)nTokenValue );
-+ pFont->SetCharSet( nCharSet );
-+ SetEncoding( nCharSet ); //Takashi Ono
-+ }
- break;
-
- case RTF_FPRQ:
---- ../sw/source/filter/rtf/swparrtf.cxx 4 Jun 2003 10:19:09 -0000 1.28
-+++ ../sw/source/filter/rtf/swparrtf.cxx 25 Jul 2003 22:54:37 -0000
-@@ -3231,10 +3231,156 @@
- SetSwgValues( rCollSet );
- }
-
-+//Takashi Ono for CJK
-+String SwRTFParser::XlateFmtColName( const String &rName )
-+{
-+#define RES_NONE RES_POOLCOLL_DOC_END
-+
-+ static const RES_POOL_COLLFMT_TYPE aArr[]={
-+ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2,
-+ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5,
-+ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8,
-+ RES_POOLCOLL_HEADLINE9,
-+
-+ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3,
-+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
-+ RES_POOLCOLL_TOX_CNTNT1,
-+
-+ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4,
-+ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7,
-+ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9,
-+ RES_NONE, RES_POOLCOLL_FOOTNOTE,
-+
-+ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH,
-+ RES_NONE, RES_NONE, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS,
-+ RES_NONE, RES_NONE,
-+
-+ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_NONE, RES_NONE, RES_NONE,
-+ RES_POOLCOLL_LISTS_BEGIN, RES_NONE, RES_NONE,
-+
-+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
-+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
-+
-+ RES_NONE,RES_NONE, RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE,
-+ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE,
-+
-+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL };
-+ static const sal_Char *stiName[] = {
-+ "Normal",
-+ "heading 1",
-+ "heading 2",
-+ "heading 3",
-+ "heading 4",
-+ "heading 5",
-+ "heading 6",
-+ "heading 7",
-+ "heading 8",
-+ "heading 9",
-+ "index 1",
-+ "index 2",
-+ "index 3",
-+ "index 4",
-+ "index 5",
-+ "index 6",
-+ "index 7",
-+ "index 8",
-+ "index 9",
-+ "toc 1",
-+ "toc 2",
-+ "toc 3",
-+ "toc 4",
-+ "toc 5",
-+ "toc 6",
-+ "toc 7",
-+ "toc 8",
-+ "toc 9",
-+ "Normal Indent",
-+ "footnote text",
-+ "annotation text",
-+ "header",
-+ "footer",
-+ "index heading",
-+ "caption",
-+ "table of figures",
-+ "envelope address",
-+ "envelope return",
-+ "footnote reference",
-+ "annotation reference",
-+ "line number",
-+ "page number",
-+ "endnote reference",
-+ "endnote text",
-+ "table of authorities",
-+ "macro",
-+ "toa heading",
-+ "List",
-+ "List Bullet",
-+ "List Number",
-+ "List 2",
-+ "List 3",
-+ "List 4",
-+ "List 5",
-+ "List Bullet 2",
-+ "List Bullet 3",
-+ "List Bullet 4",
-+ "List Bullet 5",
-+ "List Number 2",
-+ "List Number 3",
-+ "List Number 4",
-+ "List Number 5",
-+ "Title",
-+ "Closing",
-+ "Signature",
-+ "Default Paragraph Font",
-+ "Body Text",
-+ "Body Text Indent",
-+ "List Continue",
-+ "List Continue 2",
-+ "List Continue 3",
-+ "List Continue 4",
-+ "List Continue 5",
-+ "Message Header",
-+ "Subtitle",
-+ };
-+
-+
-+ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ),
-+ "Style-UEbersetzungstabelle hat falsche Groesse" );
-+ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ),
-+ "Style-UEbersetzungstabelle hat falsche Groesse" );
-+
-+ RES_POOL_COLLFMT_TYPE nId = RES_NONE;
-+
-+ for (int i = 0; i < sizeof( stiName ) / sizeof( *stiName ); i++)
-+ {
-+ if ( rName == String( stiName[i], RTL_TEXTENCODING_MS_1252 ) )
-+ {
-+ nId = aArr[i];
-+ break;
-+ }
-+ }
-+ USHORT nResId;
-+ if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END )
-+ nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN;
-+ else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END)
-+ nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN;
-+ else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END)
-+ nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN;
-+ else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END)
-+ nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN;
-+ else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END)
-+ nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN;
-+ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END)
-+ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN;
-+ return String( ResId( nResId + nId, pSwResMgr ) );
-+}
-+
- SwTxtFmtColl* SwRTFParser::MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle )
- {
-- int bCollExist;
-- SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo),
-+ int bCollExist;
-+// SwTxtFmtColl* pColl = MakeColl( rStyle.sName, USHORT(nNo), //Takashi Ono for CJK
-+ SwTxtFmtColl* pColl = MakeColl( XlateFmtColName( rStyle.sName ),
-+ USHORT(nNo),
- rStyle.nOutlineNo, bCollExist );
- aTxtCollTbl.Insert( nNo, pColl );
-
---- ../sw/source/filter/rtf/swparrtf.hxx 19 May 2003 12:25:34 -0000 1.10
-+++ ../sw/source/filter/rtf/swparrtf.hxx 25 Jul 2003 22:54:44 -0000
-@@ -364,6 +364,7 @@
- void SetStyleAttr( SfxItemSet& rCollSet,
- const SfxItemSet& rStyleSet,
- const SfxItemSet& rDerivedSet );
-+ String XlateFmtColName( const String &rName ); //Takashi Ono for CJK
- SwTxtFmtColl* MakeStyle( USHORT nNo, const SvxRTFStyleType& rStyle );
- SwCharFmt* MakeCharStyle( USHORT nNo, const SvxRTFStyleType& rStyle );
- void MakeStyleTab();
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+textenc+tencinfo.c b/editors/openoffice-2.0-devel/files/patch-sal+textenc+tencinfo.c
deleted file mode 100644
index 69355f97a5e2..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sal+textenc+tencinfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../sal/textenc/tencinfo.c.orig Fri Apr 11 16:25:01 2003
-+++ ../sal/textenc/tencinfo.c Sat May 31 23:33:43 2003
-@@ -668,6 +668,10 @@
- /* characters. The function search for the first equal string in */
- /* the table. In this table are only the most used mime types. */
- /* Sort order: important */
-+
-+ if (pMimeCharset == NULL)
-+ pMimeCharset = "usascii";
-+
- static ImplStrCharsetDef const aVIPMimeCharsetTab[] =
- {
- { "usascii", RTL_TEXTENCODING_ASCII_US },
diff --git a/editors/openoffice-2.0-devel/files/patch-setup2+script+setup.sh b/editors/openoffice-2.0-devel/files/patch-setup2+script+setup.sh
deleted file mode 100644
index ece1911001a1..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-setup2+script+setup.sh
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../setup2/script/setup.sh.orig Thu Jul 17 02:59:43 2003
-+++ ../setup2/script/setup.sh Thu Sep 4 07:27:59 2003
-@@ -118,6 +118,10 @@
- LD_LIBRARY_PATH=${sd_archive_path}:.
- export LD_LIBRARY_PATH
- ;;
-+ FreeBSD)
-+ LD_LIBRARY_PATH=${sd_archive_path}:.
-+ export LD_LIBRARY_PATH
-+ ;;
- Darwin)
- DYLD_LIBRARY_PATH=${sd_archive_path}:.
- export DYLD_LIBRARY_PATH
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+bin+addsym.awk b/editors/openoffice-2.0-devel/files/patch-solenv+bin+addsym.awk
deleted file mode 100644
index 996e282b350b..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-solenv+bin+addsym.awk
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../solenv/bin/addsym.awk.orig Tue Mar 11 15:11:44 2003
-+++ ../solenv/bin/addsym.awk Tue Mar 11 15:13:19 2003
-@@ -72,11 +72,11 @@
- END {
- if (state == 0) {
- print "# Weak RTTI symbols for C++ exceptions:"
-- print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };"
-+ print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};"
- }
- }
- state == 2 {
-- print " _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-+ print " _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions"
- state = 3
- }
- /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 }
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 15f987ab46fc..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.org Thu Aug 28 07:35:37 2003
-+++ ../solenv/inc/unxfbsdi.mk Fri Aug 29 22:42:08 2003
-@@ -200,12 +200,12 @@
- # libraries for linking applications
- STDLIBCUIST=-lm
- STDLIBGUIST=-lXaw -lXt -lX11 -lm
--STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm -lstlport_gcc
--STDLIBCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
-+STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
-+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-
- # libraries for linking shared libraries
--STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm -lstlport_gcc
--STDSHLCUIMT=$(PTHREAD_LIBS) -lm -lstlport_gcc
-+STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
-+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-
- LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
diff --git a/editors/openoffice-2.0-devel/files/patch-stlport::STLport-4.5.patch b/editors/openoffice-2.0-devel/files/patch-stlport::STLport-4.5.patch
deleted file mode 100644
index 714dfcdf9334..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-stlport::STLport-4.5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
-+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
-@@ -254,11 +254,12 @@
-
- # elif (__GNUC_MINOR__ < 8)
-
----- 244,253 ----
-+--- 244,254 ----
-
- # if (__GNUC__ >= 3)
-
- ! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
-+! #undef i386
- ! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
- ! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
- ! GXX_INCLUDE_PATH/backward
-@@ -274,7 +275,7 @@
- # endif
-
- + #ifdef __FreeBSD__
--+ # include <../wchar.h>
-++ #include _STLP_NATIVE_C_HEADER(wchar.h)
- + #endif
- # include <stl/_cwchar.h>
-
diff --git a/editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx b/editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx
deleted file mode 100644
index 0cfbc156cf11..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-sw+source+filter+ww8+ww8scan.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../sw/source/filter/ww8/ww8scan.cxx.orig Wed Sep 3 04:12:28 2003
-+++ ../sw/source/filter/ww8/ww8scan.cxx Wed Sep 3 04:12:49 2003
-@@ -163,7 +163,7 @@
- {
- ASSERT(mnNoElems && pWwSprmTab, "WW8: empty Array: Don't do that");
- std::sort(mpWwSprmTab, mpWwSprmTab + mnNoElems);
--#if OSL_DEBUG_LEVEL > 1
-+#if OSL_DEBUG_LEVEL > 10 // XXX pass compilation with WITH_DEBUG=2
- bool bBroken=false;
- rtl::OUString sError;
- const C *pIter = mpWwSprmTab;
diff --git a/editors/openoffice-2.0-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-2.0-devel/files/patch-tools+source+string+tstring.cxx
deleted file mode 100644
index 43a78f4c538b..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-tools+source+string+tstring.cxx
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../tools/source/string/tstring.cxx.orig Thu Mar 27 18:04:53 2003
-+++ ../tools/source/string/tstring.cxx Sat May 31 23:04:05 2003
-@@ -103,6 +103,9 @@
- xub_StrLen ImplStringLen( const sal_Char* pStr )
- {
- const sal_Char* pTempStr = pStr;
-+
-+ if (pStr == NULL)
-+ return(0);
- while( *pTempStr )
- ++pTempStr;
- return (xub_StrLen)(pTempStr-pStr);
-@@ -113,6 +116,9 @@
- xub_StrLen ImplStringLen( const sal_Unicode* pStr )
- {
- const sal_Unicode* pTempStr = pStr;
-+
-+ if (pStr == NULL)
-+ return(0);
- while( *pTempStr )
- ++pTempStr;
- return (xub_StrLen)(pTempStr-pStr);
diff --git a/editors/openoffice-2.0-devel/files/patch-topsection b/editors/openoffice-2.0-devel/files/patch-topsection
deleted file mode 100644
index a332718508de..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-topsection
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../sw/source/filter/ww8/ww8par.cxx 9 Jul 2003 11:06:44 -0000 1.114
-+++ ../sw/source/filter/ww8/ww8par.cxx 25 Jul 2003 22:55:23 -0000
-@@ -2015,7 +2015,7 @@
- bool bStartAttr = pPlcxMan->Get(&aRes); // hole Attribut-Pos
- aRes.nAktCp = rTxtPos; // Akt. Cp-Pos
-
-- if (aRes.nFlags & MAN_MASK_NEW_SEP) // neue Section
-+ if ((aRes.nFlags & MAN_MASK_NEW_SEP) || maSectionManager.empty()) // neue Section
- {
- ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
- // PageDesc erzeugen und fuellen
---- ../sw/source/filter/ww8/ww8par.hxx 30 Jun 2003 15:54:37 -0000 1.115
-+++ ../sw/source/filter/ww8/ww8par.hxx 25 Jul 2003 22:55:28 -0000
-@@ -720,6 +720,7 @@
- short GetPageLeft() const;
- short GetPageRight() const;
- short GetPageWidth() const;
-+ bool empty() const { return maSegments.empty(); }
- };
-
- class wwFrameNamer
diff --git a/editors/openoffice-2.0-devel/files/patch-unoil+makefile.pmk b/editors/openoffice-2.0-devel/files/patch-unoil+makefile.pmk
deleted file mode 100644
index 7febdabf7b4b..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-unoil+makefile.pmk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../unoil/makefile.pmk.orig Fri Aug 31 18:04:43 2001
-+++ ../unoil/makefile.pmk Thu Sep 12 12:17:50 2002
-@@ -74,8 +74,8 @@
- JAVAFILESLIST := $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
- .ENDIF # "$(L10N_framework)"==""
-
--GENJAVAFILES := $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
--GENCLASSFILES := $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-+GENJAVAFILES += $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
-+GENCLASSFILES += $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
-
- # --- Targets ------------------------------------------------------
-
diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+app+salmain.cxx
deleted file mode 100644
index 8d0a6f423f5e..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+app+salmain.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1
-+++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000
-@@ -62,7 +62,7 @@
- #define _SV_SALMAIN_CXX
-
- // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
--#ifdef MACOSX
-+#if defined(MACOSX) || defined(FREEBSD)
- // rlimit needs sys/types.h
- #include <sys/types.h>
- #include <sys/time.h>
diff --git a/editors/openoffice-2.0-devel/files/patch-word6+95-cjkhandling b/editors/openoffice-2.0-devel/files/patch-word6+95-cjkhandling
deleted file mode 100644
index 9a86ffb7da9d..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-word6+95-cjkhandling
+++ /dev/null
@@ -1,63 +0,0 @@
---- ../sw/source/filter/ww8/ww8par.cxx 9 Jul 2003 11:06:44 -0000 1.114
-+++ ../sw/source/filter/ww8/ww8par.cxx 25 Jul 2003 22:54:52 -0000
-@@ -1683,11 +1683,20 @@
- if (bVer67)
- {
- sal_Char aTest[2];
-- aTest[0] = (nUCode & 0xFF00) >> 8;
-- aTest[1] = (nUCode & 0x00FF);
-- String aTemp(aTest, 2, eSrcCharSet);
-- ASSERT(aTemp.Len() == 1, "so much for that theory");
-- *pWork = aTemp.GetChar(0);
-+ if (nUCode >= 0x3000)
-+ {
-+ aTest[0] = (nUCode & 0xFF00) >> 8;
-+ aTest[1] = (nUCode & 0x00FF);
-+ String aTemp(aTest, 2, eSrcCharSet);
-+ ASSERT(aTemp.Len() == 1, "so much for that theory");
-+ *pWork = aTemp.GetChar(0);
-+ }
-+ else
-+ {
-+ aTest[0] = (nUCode & 0x00FF);
-+ String aTemp(aTest, 1, eSrcCharSet);
-+ *pWork = aTemp.GetChar(0);
-+ }
- }
- else
- *pWork = nUCode;
-@@ -3188,7 +3197,8 @@
- {
- case 6:
- case 7:
-- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) )
-+ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono
-+ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) )
- {
- //JP 06.05.99: teste auf eigenen 97-Fake!
- if (pStg && 0xa5ec == nMagic)
---- ../sw/source/filter/ww8/ww8par6.cxx 20 Jun 2003 09:38:07 -0000 1.138
-+++ ../sw/source/filter/ww8/ww8par6.cxx 25 Jul 2003 22:55:05 -0000
-@@ -3373,9 +3373,11 @@
- nId = RES_CHRATR_CTL_FONT;
- break;
- case 93:
-+ case 111:
- case 0x4a4f:
- nId = RES_CHRATR_FONT;
- break;
-+ case 112:
- case 0x4a50:
- nId = RES_CHRATR_CJK_FONT;
- break;
-@@ -4984,8 +4986,8 @@
- //percentage to grow hps short
- {110, (FNReadRecord)0}, //"sprmCCondHyhen", chp.ysri
- //ysri short
-- {111, (FNReadRecord)0}, //"??111",
-- {112, (FNReadRecord)0}, //"??112",
-+ {111, &SwWW8ImplReader::Read_FontCode}, //ww7 font
-+ {112, &SwWW8ImplReader::Read_FontCode}, //ww7 CJK font
- {113, &SwWW8ImplReader::Read_FontCode}, //ww7 rtl font
- {114, (FNReadRecord)0}, //"??114",
- {115, &SwWW8ImplReader::Read_TxtColor}, //ww7 rtl colour ?
diff --git a/editors/openoffice-2.0-devel/files/patch-wrtrtf b/editors/openoffice-2.0-devel/files/patch-wrtrtf
deleted file mode 100644
index 7381dc61cd69..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-wrtrtf
+++ /dev/null
@@ -1,312 +0,0 @@
---- ../svtools/source/svrtf/rtfout.cxx.orig 2000-10-16 18:13:46.000000000 +0900
-+++ ../svtools/source/svrtf/rtfout.cxx 2003-09-23 12:41:00.000000000 +0900
-@@ -124,8 +124,9 @@
- default:
- {
- sal_Unicode cCh = c;
-- c = (BYTE)ByteString::ConvertFromUnicode( c, eDestEnc, FALSE );
-- if( !c )
-+ rtl::OString buff( &c, 1, eDestEnc, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_IGNORE|RTL_UNICODETOTEXT_FLAGS_INVALID_IGNORE );
-+// c = (BYTE)ByteString::ConvertFromUnicode( c, eDestEnc, FALSE );
-+ if( !buff.getLength() )
- {
- // then write as unicode - character
- if( 0xFF < cCh )
-@@ -141,8 +142,8 @@
- break;
- }
-
-- if( !bWriteHelpFile )
-- switch( c )
-+ if( !bWriteHelpFile && buff.getLength() == 1 )
-+ switch( BYTE(buff[0]) )
- {
- #ifdef MAC
- case 0xa5: pStr = sRTF_BULLET; break;
-@@ -164,6 +165,9 @@
- // MAC
- }
- if( !pStr )
-+ for (int i = 0; i < buff.getLength(); ++i)
-+ {
-+ c = BYTE(buff[i]);
- switch ( c )
- {
- case '\\':
-@@ -186,6 +190,7 @@
- }
- break;
- }
-+ }
- }
- break;
- }
---- ../sw/source/filter/rtf/wrtrtf.cxx.orig 2003-04-18 00:00:28.000000000 +0900
-+++ ../sw/source/filter/rtf/wrtrtf.cxx 2003-09-23 23:33:08.000000000 +0900
-@@ -184,6 +184,12 @@
- #ifndef _CHARFMT_HXX
- #include <charfmt.hxx>
- #endif
-+#ifndef _POOLFMT_HXX
-+#include <poolfmt.hxx>
-+#endif
-+#ifndef _SWSTYLENAMEMAPPER_HXX
-+#include <SwStyleNameMapper.hxx>
-+#endif
- #ifndef _SECTION_HXX //autogen
- #include <section.hxx>
- #endif
-@@ -215,7 +221,7 @@
- SV_IMPL_VARARR( RTFColorTbl, Color )
-
-
--SwRTFWriter::SwRTFWriter( const String& rFltName )
-+SwRTFWriter::SwRTFWriter( const String& rFltName ) : eCurrentCharSet(DEF_ENCODING)
- {
- // schreibe Win-RTF-HelpFileFmt
- bWriteHelpFmt = 'W' == rFltName.GetChar( 0 );
-@@ -893,14 +899,14 @@
- // as alternative name. Because WinWord can't match each
- // font to a UniCode font. So the CJK texts are shown as
- // empty rectangles ;-(.
-- RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, DEF_ENCODING,
-+ RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, eChrSet,
- rWrt.bWriteHelpFmt );
- OutComment( rWrt, sRTF_FALT) << ' ';
-- RTFOutFuncs::Out_String( rWrt.Strm(), sAltNm, DEF_ENCODING,
-+ RTFOutFuncs::Out_String( rWrt.Strm(), sAltNm, eChrSet,
- rWrt.bWriteHelpFmt ) << '}';
- }
- else
-- RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, DEF_ENCODING,
-+ RTFOutFuncs::Out_String( rWrt.Strm(), sFntNm, eChrSet,
- rWrt.bWriteHelpFmt );
- rWrt.Strm() << ";}";
- }
-@@ -932,6 +938,139 @@
-
-
-
-+//Takashi Ono for CJK
-+const rtl::OUString SwRTFWriter::XlateFmtName( const rtl::OUString &rName, SwGetPoolIdFromName eFlags )
-+{
-+#define RES_NONE RES_POOLCOLL_DOC_END
-+
-+ static const RES_POOL_COLLFMT_TYPE aArr[]={
-+ RES_POOLCOLL_STANDARD, RES_POOLCOLL_HEADLINE1, RES_POOLCOLL_HEADLINE2,
-+ RES_POOLCOLL_HEADLINE3, RES_POOLCOLL_HEADLINE4, RES_POOLCOLL_HEADLINE5,
-+ RES_POOLCOLL_HEADLINE6, RES_POOLCOLL_HEADLINE7, RES_POOLCOLL_HEADLINE8,
-+ RES_POOLCOLL_HEADLINE9,
-+
-+ RES_POOLCOLL_TOX_IDX1, RES_POOLCOLL_TOX_IDX2, RES_POOLCOLL_TOX_IDX3,
-+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
-+ RES_POOLCOLL_TOX_CNTNT1,
-+
-+ RES_POOLCOLL_TOX_CNTNT2, RES_POOLCOLL_TOX_CNTNT3, RES_POOLCOLL_TOX_CNTNT4,
-+ RES_POOLCOLL_TOX_CNTNT5, RES_POOLCOLL_TOX_CNTNT6, RES_POOLCOLL_TOX_CNTNT7,
-+ RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9,
-+ RES_POOLCOLL_TEXT_IDENT, RES_POOLCOLL_FOOTNOTE,
-+
-+ RES_NONE, RES_POOLCOLL_HEADER, RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH,
-+ RES_POOLCOLL_LABEL, RES_POOLCOLL_TOX_ILLUSH, RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS,
-+ RES_NONE, RES_NONE,
-+
-+ RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE, RES_POOLCOLL_TOX_AUTHORITIESH, RES_NONE, RES_NONE,
-+ RES_POOLCOLL_BUL_LEVEL1, RES_POOLCOLL_BUL_LEVEL1, RES_POOLCOLL_NUM_LEVEL1,
-+
-+ RES_POOLCOLL_BUL_LEVEL2, RES_POOLCOLL_BUL_LEVEL3, RES_POOLCOLL_BUL_LEVEL4, RES_POOLCOLL_BUL_LEVEL5,
-+ RES_POOLCOLL_BUL_LEVEL2, RES_POOLCOLL_BUL_LEVEL3, RES_POOLCOLL_BUL_LEVEL4, RES_POOLCOLL_BUL_LEVEL5,
-+ RES_POOLCOLL_NUM_LEVEL2, RES_POOLCOLL_NUM_LEVEL3, RES_POOLCOLL_NUM_LEVEL4, RES_POOLCOLL_NUM_LEVEL5,
-+
-+ RES_POOLCOLL_DOC_TITEL, RES_NONE, RES_POOLCOLL_SIGNATURE, RES_NONE,
-+ RES_POOLCOLL_TEXT, RES_POOLCOLL_TEXT_MOVE, RES_NONE, RES_NONE,
-+
-+ RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_DOC_SUBTITEL };
-+ static const sal_Char *stiName[] = {
-+ "Normal",
-+ "heading 1",
-+ "heading 2",
-+ "heading 3",
-+ "heading 4",
-+ "heading 5",
-+ "heading 6",
-+ "heading 7",
-+ "heading 8",
-+ "heading 9",
-+ "index 1",
-+ "index 2",
-+ "index 3",
-+ "index 4",
-+ "index 5",
-+ "index 6",
-+ "index 7",
-+ "index 8",
-+ "index 9",
-+ "toc 1",
-+ "toc 2",
-+ "toc 3",
-+ "toc 4",
-+ "toc 5",
-+ "toc 6",
-+ "toc 7",
-+ "toc 8",
-+ "toc 9",
-+ "Normal Indent",
-+ "footnote text",
-+ "annotation text",
-+ "header",
-+ "footer",
-+ "index heading",
-+ "caption",
-+ "table of figures",
-+ "envelope address",
-+ "envelope return",
-+ "footnote reference",
-+ "annotation reference",
-+ "line number",
-+ "page number",
-+ "endnote reference",
-+ "endnote text",
-+ "table of authorities",
-+ "macro",
-+ "toa heading",
-+ "List",
-+ "List Bullet",
-+ "List Number",
-+ "List 2",
-+ "List 3",
-+ "List 4",
-+ "List 5",
-+ "List Bullet 2",
-+ "List Bullet 3",
-+ "List Bullet 4",
-+ "List Bullet 5",
-+ "List Number 2",
-+ "List Number 3",
-+ "List Number 4",
-+ "List Number 5",
-+ "Title",
-+ "Closing",
-+ "Signature",
-+ "Default Paragraph Font",
-+ "Body Text",
-+ "Body Text Indent",
-+ "List Continue",
-+ "List Continue 2",
-+ "List Continue 3",
-+ "List Continue 4",
-+ "List Continue 5",
-+ "Message Header",
-+ "Subtitle",
-+ };
-+
-+
-+ ASSERT( ( sizeof( aArr ) / sizeof( RES_POOL_COLLFMT_TYPE ) == 75 ),
-+ "Style-UEbersetzungstabelle hat falsche Groesse" );
-+ ASSERT( ( sizeof( stiName ) / sizeof( *stiName ) == 75 ),
-+ "Style-UEbersetzungstabelle hat falsche Groesse" );
-+
-+ sal_uInt16 idcol = ::SwStyleNameMapper::GetPoolIdFromUIName( rName, eFlags );
-+
-+ for (int i = 0; i < sizeof( aArr ) / sizeof( *aArr ); i++)
-+ {
-+ if ( idcol == aArr[i] )
-+ {
-+ return rtl::OUString::createFromAscii(stiName[i]);
-+ }
-+ }
-+ return ::SwStyleNameMapper::GetProgName( idcol, String() );
-+}
-+
-+
-+
- void SwRTFWriter::OutRTFStyleTab()
- {
- // das 0-Style ist das Default, wird nie ausgegeben !!
-@@ -988,7 +1127,7 @@
- }
-
- Strm() << ' ';
-- RTFOutFuncs::Out_String( Strm(), pColl->GetName(), DEF_ENCODING,
-+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( pColl->GetName(), GET_POOLID_TXTCOLL ), DEF_ENCODING,
- bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
- }
-
-@@ -1015,8 +1154,8 @@
- }
-
- Strm() << ' ';
-- RTFOutFuncs::Out_String( Strm(), pFmt->GetName(), DEF_ENCODING,
-- bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
-+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( pFmt->GetName(), GET_POOLID_CHRFMT ), DEF_ENCODING,
-+ bWriteHelpFmt ) << ";}" << SwRTFWriter::sNewLine;
- }
-
- Strm() << '}';
-@@ -1217,8 +1356,8 @@
- break;
- Strm() << sRTF_PGDSCNXT;
- OutULong( i ) << ' ';
-- RTFOutFuncs::Out_String( Strm(), rPageDesc.GetName(),
-- DEF_ENCODING, bWriteHelpFmt ) << ";}";
-+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( rPageDesc.GetName(), GET_POOLID_PAGEDESC ), DEF_ENCODING,
-+ bWriteHelpFmt ) << ";}";
- }
- Strm() << '}' << SwRTFWriter::sNewLine;
- bOutPageDesc = bOutPageDescTbl = FALSE;
---- ../sw/source/filter/rtf/wrtrtf.hxx.orig 2002-07-31 19:18:50.000000000 +0900
-+++ ../sw/source/filter/rtf/wrtrtf.hxx 2003-09-23 23:37:50.000000000 +0900
-@@ -117,6 +117,7 @@
- USHORT nAktFlyPos; // Index auf das naechste "FlyFrmFmt"
- void OutRTFColorTab();
- void OutRTFFontTab();
-+ const rtl::OUString XlateFmtName( const rtl::OUString &rName, SwGetPoolIdFromName eFlags );
- void OutRTFStyleTab();
- void OutRTFListTab();
-
-@@ -136,6 +137,8 @@
- USHORT nBkmkTabPos; // akt. Position in der Bookmark-Tabelle
- USHORT nCurScript; // actual scripttype
-
-+ rtl_TextEncoding eCurrentCharSet;
-+
- #if defined(MAC) || defined(UNX)
- static const sal_Char sNewLine; // nur \012 oder \015
- #else
---- ../sw/source/filter/rtf/rtfatr.cxx.orig 2003-05-19 21:24:46.000000000 +0900
-+++ ../sw/source/filter/rtf/rtfatr.cxx 2003-09-23 23:45:52.000000000 +0900
-@@ -1319,7 +1319,7 @@
- sURL = aTmp.GetFull();
- }
- */ rWrt.Strm() << '\"';
-- RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING,
-+ RTFOutFuncs::Out_String( rWrt.Strm(), sURL, rRTFWrt.eCurrentCharSet,
- rRTFWrt.bWriteHelpFmt ) << "\" ";
- sURL = aTmp.GetMark();
- }
-@@ -1328,7 +1328,7 @@
- {
- rWrt.Strm() << "\\\\l \"";
- sURL.Erase( 0, 1 );
-- RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING,
-+ RTFOutFuncs::Out_String( rWrt.Strm(), sURL, rRTFWrt.eCurrentCharSet,
- rRTFWrt.bWriteHelpFmt ) << "\" ";
- }
-
-@@ -1609,7 +1609,7 @@
-
- if( nStrPos != nEnde )
- RTFOutFuncs::Out_Char( rWrt.Strm(), rStr.GetChar( nStrPos ),
-- DEF_ENCODING, rRTFWrt.bWriteHelpFmt );
-+ rRTFWrt.eCurrentCharSet, rRTFWrt.bWriteHelpFmt );
- }
-
- // noch eine schliesende Klammer da ??
-@@ -2188,6 +2188,7 @@
- const sal_Char* pCmd = bAssoc ? sRTF_AF : sRTF_F;
- rWrt.Strm() << pCmd;
- rWrt.OutULong(rRTFWrt.GetId(rFont));
-+ rRTFWrt.eCurrentCharSet = rFont.GetCharSet();
- }
- return rWrt;
- }