rpms/openoffice.org/devel openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch, NONE, 1.1 workspace.cmcfixes15.patch, NONE, 1.1 openoffice.org.spec, 1.403, 1.404 sources, 1.102, 1.103 workspace.javapatch.patch, 1.1, 1.2 openoffice.org-1.9.117.ooo52048.inhalt.sw.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Aug 22 14:18:35 UTC 2005


Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13459

Modified Files:
	openoffice.org.spec sources workspace.javapatch.patch 
Added Files:
	openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch 
	workspace.cmcfixes15.patch 
Removed Files:
	openoffice.org-1.9.117.ooo52048.inhalt.sw.patch 
Log Message:
test build of cmcfixes15 in rpm env

openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch:
 extensions/prj/build.lst                            |    2 +-
 extensions/source/plugin/base/nfuncs.cxx            |    2 +-
 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |    7 +++++++
 extensions/source/plugin/unx/npnapi.cxx             |    8 ++++----
 extensions/source/plugin/util/makefile.pmk          |    6 +++++-
 prj/build.lst                                       |    0 
 source/plugin/base/nfuncs.cxx                       |    0 
 source/plugin/inc/plugin/unx/plugcon.hxx            |    0 
 source/plugin/unx/npnapi.cxx                        |    0 
 source/plugin/util/makefile.pmk                     |    0 
 10 files changed, 18 insertions(+), 7 deletions(-)

--- NEW FILE openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch ---
Index: prj/build.lst
===================================================================
RCS file: /cvs/util/extensions/prj/build.lst,v
retrieving revision 1.29
diff -u -p -u -r1.29 build.lst
--- openoffice.org.orig/extensions/prj/build.lst	20 Jun 2005 15:02:49 -0000	1.29
+++ openoffice.org/extensions/prj/build.lst	22 Aug 2005 13:14:48 -0000
@@ -1,4 +1,4 @@
-ex	extensions	:	rdbmaker svx SANE:sane twain offuh np_sdk stoc uui NULL
+ex	extensions	:	rdbmaker svx SANE:sane twain offuh MOZ:np_sdk stoc uui NULL
 ex	extensions					usr1	-	all	ex_mkout NULL
 ex	extensions\inc					get		-	all	ex_inc NULL
 ex	extensions\inc\ucbhelper			get		-	all	ex_incucbh NULL
Index: source/plugin/base/nfuncs.cxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/base/nfuncs.cxx,v
retrieving revision 1.10
diff -u -p -u -r1.10 nfuncs.cxx
--- openoffice.org.orig/extensions/source/plugin/base/nfuncs.cxx	17 Mar 2004 10:13:54 -0000	1.10
+++ openoffice.org/extensions/source/plugin/base/nfuncs.cxx	22 Aug 2005 13:15:41 -0000
@@ -257,7 +257,7 @@ extern "C" {
 		return NULL;
 	}
 
-	void* SAL_CALL NP_LOADDS  NPN_GetJavaPeer( NPP instance )
+	jref SAL_CALL NP_LOADDS  NPN_GetJavaPeer( NPP instance )
 	{
 		TRACE( "NPN_GetJavaPeer" );
 		return NULL;
Index: source/plugin/inc/plugin/unx/plugcon.hxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
retrieving revision 1.6
diff -u -p -u -r1.6 plugcon.hxx
--- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	17 Mar 2004 10:15:02 -0000	1.6
+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	22 Aug 2005 13:15:42 -0000
@@ -100,9 +100,16 @@
 #include <X11/Xatom.h>
 #define XP_UNIX
 #include <stdio.h>
+#ifdef SYSTEM_MOZILLA
+#define OJI
+#define MOZ_X11
+#include <npupp.h>
+#include <npapi.h>
+#else
 #ifndef _NPAPI_H_
 #include <npsdk/npupp.h>
 #include <npsdk/npapi.h>
+#endif
 #endif
 #undef Window
 #undef Font
Index: source/plugin/unx/npnapi.cxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/unx/npnapi.cxx,v
retrieving revision 1.7
diff -u -p -u -r1.7 npnapi.cxx
--- openoffice.org.orig/extensions/source/plugin/unx/npnapi.cxx	13 Oct 2004 09:03:01 -0000	1.7
+++ openoffice.org/extensions/source/plugin/unx/npnapi.cxx	22 Aug 2005 13:15:45 -0000
@@ -23,7 +23,7 @@ void* CreateNewShell( void**, XLIB_Windo
 // begin Netscape plugin api calls
 extern "C" {
 
-static void* l_NPN_MemAlloc( UINT32 nBytes )
+static void* l_NPN_MemAlloc( uint32 nBytes )
 {
 	void* pMem = new char[nBytes];
     return pMem;
@@ -34,7 +34,7 @@ static void l_NPN_MemFree( void* pMem )
     delete [] (char*)pMem;
 }
     
-static UINT32 l_NPN_MemFlush( UINT32 nSize )
+static uint32 l_NPN_MemFlush( uint32 nSize )
 {
     return 0;
 }
@@ -165,7 +165,7 @@ static NPError l_NPN_NewStream( NPP inst
 	return aRet;
 }
 
-static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* target, UINT32 len, const char* buf, NPBool file, void* notifyData )
+static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* target, uint32 len, const char* buf, NPBool file, void* notifyData )
 {
 	UINT32 nInstance = pConnector->GetNPPID( instance );
     if( nInstance == PluginConnector::UnknownNPPID )
@@ -190,7 +190,7 @@ static NPError l_NPN_PostURLNotify( NPP 
 	return aRet;
 }
 
-static NPError l_NPN_PostURL( NPP instance, const char* url, const char* window, UINT32 len, const char* buf, NPBool file )
+static NPError l_NPN_PostURL( NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file )
 {
 	UINT32 nInstance = pConnector->GetNPPID( instance );
     if( nInstance == PluginConnector::UnknownNPPID )
Index: source/plugin/util/makefile.pmk
===================================================================
RCS file: /cvs/util/extensions/source/plugin/util/makefile.pmk,v
retrieving revision 1.2
diff -u -p -u -r1.2 makefile.pmk
--- openoffice.org.orig/extensions/source/plugin/util/makefile.pmk	25 Mar 2003 16:03:44 -0000	1.2
+++ openoffice.org/extensions/source/plugin/util/makefile.pmk	22 Aug 2005 13:15:46 -0000
@@ -66,4 +66,8 @@ NOUNODOC=true
 .INCLUDE :  settings.mk
 .INCLUDE :  sv.mk
 
-
+.IF "$(SYSTEM_MOZILLA)" == "YES"
+CFLAGS+=-DSYSTEM_MOZILLA
+PKGCONFIG_MODULES=mozilla-plugin
+.INCLUDE : pkg_config.mk
+.ENDIF

workspace.cmcfixes15.patch:
 config/ssrc680.ini             |    0 
 config_office/configure.in     |   23 +++++++++++++++++++++++
 postprocess/prj/build.lst      |    2 +-
 prj/build.lst                  |    0 
 scp2/source/math/file_math.scp |    2 ++
 solenv/config/ssrc680.ini      |    2 +-
 source/math/file_math.scp      |    0 
 7 files changed, 27 insertions(+), 2 deletions(-)

--- NEW FILE workspace.cmcfixes15.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.129
diff -u -p -u -r1.129 configure.in
--- openoffice.org.orig/config_office/configure.in	5 Aug 2005 15:05:56 -0000	1.129
+++ openoffice.org/config_office/configure.in	22 Aug 2005 14:01:33 -0000
@@ -61,6 +61,10 @@ AC_ARG_ENABLE(fontooo,
 [  --disable-fontooo       disable FontOOo
                           (useful for distributions using fontconfig for OOo)
 ],,enable_fontooo="yes")
+AC_ARG_ENABLE(mathmldtd,
+[  --disable-mathmldtd     disable mathmldtd
+                          (useful for distributions that want to avoid packaging it)
+],,enable_mathmldtd="yes")
 AC_ARG_ENABLE(evolution2,
 [  --enable-evolution2     Allows the built-in evolution 2 addressbook connectivity
 			  build to be enabled.
@@ -3830,6 +3834,7 @@ if test -n "$enable_fontooo"; then
   else
     AC_MSG_RESULT([yes])
     WITH_FONTOOO=YES
+    BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT"
   fi
 else
   AC_MSG_RESULT([no])
@@ -3859,6 +3864,23 @@ fi
 AC_SUBST(SYSTEM_MSPACK)
 
 dnl ===================================================================
+dnl Test whether to include MathMLDTD
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include MathMLDTD])
+if test -n "$enable_mathmldtd"; then
+  if test "$enable_mathmldtd" = "no"; then
+    AC_MSG_RESULT([no])
+    SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
+  else
+    AC_MSG_RESULT([yes])
+    BUILD_TYPE="$BUILD_TYPE MATHMLDTD"
+  fi
+else
+  AC_MSG_RESULT([no])
+  SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
+fi
+
+dnl ===================================================================
 dnl Test whether to include fonts
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include Bitstream Vera fonts])
@@ -3872,6 +3894,7 @@ else
   SCPDEFS="$SCPDEFS -DWITHOUT_FONTS"
 fi
 AC_SUBST(WITH_FONTS)
+
 AC_SUBST(SCPDEFS)
 
 AC_MSG_CHECKING([whether and how to use Xinerama])
Index: prj/build.lst
===================================================================
RCS file: /cvs/installation/postprocess/prj/build.lst,v
retrieving revision 1.16
diff -u -p -u -r1.16 build.lst
--- openoffice.org.orig/postprocess/prj/build.lst	20 Jun 2005 07:29:14 -0000	1.16
+++ openoffice.org/postprocess/prj/build.lst	22 Aug 2005 14:04:36 -0000
@@ -1,4 +1,4 @@
-po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MathMLDTD msfontextract odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml unzip ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
+po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml unzip ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
Index: source/math/file_math.scp
===================================================================
RCS file: /cvs/installation/scp2/source/math/file_math.scp,v
retrieving revision 1.18
diff -u -p -u -r1.18 file_math.scp
--- openoffice.org.orig/scp2/source/math/file_math.scp	20 Jul 2005 12:30:45 -0000	1.18
+++ openoffice.org/scp2/source/math/file_math.scp	22 Aug 2005 14:06:20 -0000
@@ -57,6 +57,7 @@
 
 #include "macros.inc"
 
+#ifndef WITHOUT_MATHMLDTD
 File gid_File_Html_W3c_Ipr
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -70,6 +71,7 @@ File gid_File_Dtd_Math
     Dir = gid_Dir_Share_Dtd_Math_1_01;
     Name = "math.dtd";
 End
+#endif
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sm , sm)
 
Index: config/ssrc680.ini
===================================================================
RCS file: /cvs/tools/solenv/config/ssrc680.ini,v
retrieving revision 1.74
diff -u -p -u -r1.74 ssrc680.ini
--- openoffice.org.orig/solenv/config/ssrc680.ini	15 Jul 2005 10:38:20 -0000	1.74
+++ openoffice.org/solenv/config/ssrc680.ini	22 Aug 2005 14:03:35 -0000
@@ -113,7 +113,7 @@ common
 			BIG_SVX TRUE
 			BIG_GOODIES TRUE
 			BMP_WRITES_FLAG TRUE
-            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB BSH MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK
+            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB BSH MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD
 			RES_ENUS TRUE
 			RES_GER TRUE
 			NO_REC_RES TRUE


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- openoffice.org.spec	22 Aug 2005 11:51:58 -0000	1.403
+++ openoffice.org.spec	22 Aug 2005 14:18:33 -0000	1.404
@@ -162,16 +162,17 @@
 Patch43: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
 Patch44: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
 Patch45: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
-Patch46: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
-Patch47: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
-Patch48: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch49: workspace.javapatch.patch
-Patch50: openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
-Patch51: openoffice.org-1.9.122.ooo52974.systembeanshell.patch
-Patch52: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
-Patch53: openoffice.org-1.9.112.ooo53025.exception.package.patch
-Patch54: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch55: openoffice.org-1.9.125.oooXXXXX.install.instset_native.patch
+Patch46: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
+Patch47: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch48: workspace.javapatch.patch
+Patch49: openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
+Patch50: openoffice.org-1.9.122.ooo52974.systembeanshell.patch
+Patch51: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
+Patch52: openoffice.org-1.9.112.ooo53025.exception.package.patch
+Patch53: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch54: openoffice.org-1.9.125.oooXXXXX.install.instset_native.patch
+Patch55: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
+Patch56: workspace.cmcfixes15.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -819,18 +820,19 @@
 %patch43 -p1 -b .oooXXXXX.extensions.evolution.patch
 %patch44 -p1 -b .ooo51912.nullpointer.wizards.patch
 %patch45 -p1 -b .ooo52023.evoadb2.nognuconst.patch
-%patch46 -p1 -b .ooo52048.inhalt.sw.patch
-%patch47 -p1 -b .ooo49720.mozillanspr.extensions.patch
-%patch48 -p1 -b .ooo52428.execshield.bridges.patch
-%patch49 -p1 -b .workspace.javapatch.patch
+%patch46 -p1 -b .ooo49720.mozillanspr.extensions.patch
+%patch47 -p1 -b .ooo52428.execshield.bridges.patch
+%patch48 -p1 -b .workspace.javapatch.patch
 %if ! %{internaljavabits}
-%patch50 -p1 -b .ooo52974.systemhsqldb.patch
-%patch51 -p1 -b .ooo52974.systembeanshell.patch
+%patch49 -p1 -b .ooo52974.systemhsqldb.patch
+%patch50 -p1 -b .ooo52974.systembeanshell.patch
 %endif
-%patch52 -p1 -b .ooo52626.workspacerestore.vcl.patch
-%patch53 -p1 -b .ooo53025.exception.package.patch
-%patch54 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch55 -p1 -R -b .oooXXXXX.install.instset_native.patch
+%patch51 -p1 -b .ooo52626.workspacerestore.vcl.patch
+%patch52 -p1 -b .ooo53025.exception.package.patch
+%patch53 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch54 -p1 -R -b .oooXXXXX.install.instset_native.patch
+%patch55 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
+%patch56 -p1 -b .workspace.cmcfixes15.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -866,7 +868,7 @@
 fi
 cd config_office
 autoconf
-%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --enable-symbols --enable-openldap --enable-libsn --enable-evolution2 --enable-xsltproc --disable-fontooo --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang}
+%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --enable-symbols --enable-openldap --enable-libsn --enable-evolution2 --enable-xsltproc --disable-fontooo --disable-mathmldtd --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas --without-gpc %{extraflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -2966,9 +2968,6 @@
 %{instdir}/program/resource/bf_sm680en-US.res
 %{instdir}/program/resource/sm680en-US.res
 %{instdir}/program/smath
-%dir %{instdir}/share
-%dir %{instdir}/share/dtd
-%{instdir}/share/dtd/math/
 %dir %{instdir}/share/registry
 %dir %{instdir}/share/registry/data
 %dir %{instdir}/share/registry/data/org
@@ -3108,6 +3107,7 @@
 * Mon Aug 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.125-2
 - rh#166432# add README to he_IL dictionary
 - rh#166290# print range not properly available in gnomeprintui
+- flr moves inhalt patch into javafilter workspace
 
 * Wed Aug 17 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.125-1
 - beta2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	22 Aug 2005 08:28:35 -0000	1.102
+++ sources	22 Aug 2005 14:18:33 -0000	1.103
@@ -3,5 +3,5 @@
 11c0541fa373a327d1c134887ce511e7  openoffice.org-simple-crash_report.sh
 c733528059f1ea2b51c78d07738bf121  gcj-sed.sh
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
-b60ac657604ee3ee2b7178e2c0ae119c  SRC680_m125.tar.bz2
 73aac8274b29c79ac2041d0963faa2b8  openoffice.org-myspell-contrib.tar.gz
+2bcfb8457c79ca75b0a22c5cbf4b4445  SRC680_m125.tar.bz2

workspace.javapatch.patch:
 source/filter/ww8/wrtw8nds.cxx    |    0 
 sw/inc/shellio.hxx                |    3 +++
 sw/source/filter/rtf/rtffly.cxx   |   16 ++++++++++++----
 sw/source/filter/ww8/wrtw8nds.cxx |    2 +-
 sw/source/filter/ww8/wrtww8gr.cxx |    4 ++--
 sw/source/filter/ww8/ww8graf.cxx  |    6 +++---
 sw/source/filter/ww8/ww8par.cxx   |   27 +++++++++++++++++++++++++++
 sw/source/filter/ww8/ww8par2.cxx  |    4 ++++
 sw/source/filter/ww8/ww8par6.cxx  |   10 +++++++++-
 sw/source/ui/app/docsh.cxx        |    5 ++++-
 10 files changed, 65 insertions(+), 12 deletions(-)

Index: workspace.javapatch.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.javapatch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.javapatch.patch	21 Aug 2005 11:40:13 -0000	1.1
+++ workspace.javapatch.patch	22 Aug 2005 14:18:33 -0000	1.2
@@ -245,3 +245,19 @@
  
  	return bOk;
  }
+Index: source/filter/ww8/wrtw8nds.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/ww8/wrtw8nds.cxx,v
+retrieving revision 1.77
+diff -u -p -r1.77 wrtw8nds.cxx
+--- openoffice.org.orig/sw/source/filter/ww8/wrtw8nds.cxx	18 Apr 2005 15:18:35 -0000	1.77
++++ openoffice.org/sw/source/filter/ww8/wrtw8nds.cxx	15 Jul 2005 18:08:00 -0000
+@@ -1168,7 +1168,7 @@ void WW8_SwAttrIter::OutSwTOXMark(const 
+         // kein break;
+     case TOX_CONTENT:
+         {
+-            sTxt.InsertAscii( " INHALT \"", 0 );
++            sTxt.InsertAscii( " TC \"", 0 );
+             USHORT nLvl = rAttr.GetLevel();
+             if (nLvl > WW8ListManager::nMaxLevel)
+                 nLvl = WW8ListManager::nMaxLevel;


--- openoffice.org-1.9.117.ooo52048.inhalt.sw.patch DELETED ---




More information about the fedora-cvs-commits mailing list