[ooo-build-commit] .: patches/dev300
Miklos Vajna
vmiklos at kemper.freedesktop.org
Wed Sep 8 17:12:48 PDT 2010
patches/dev300/cws-vmiklos01.diff | 203 ++++++++++++++++++---------------
patches/dev300/docx-export-enable.diff | 27 ----
2 files changed, 115 insertions(+), 115 deletions(-)
New commits:
commit eb004f62b0a4507b9cb9a6b66a0721e46d0baefb
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Thu Sep 9 02:08:28 2010 +0200
Update cws-vmiklos01.diff from hg
Also fix docx-export-enable.diff to apply again on top of the new cws
snapshot.
diff --git a/patches/dev300/cws-vmiklos01.diff b/patches/dev300/cws-vmiklos01.diff
index 448c224..e57eee1 100644
--- a/patches/dev300/cws-vmiklos01.diff
+++ b/patches/dev300/cws-vmiklos01.diff
@@ -1,6 +1,6 @@
-diff -r 004715ace8e7 -r b935ac15ff37 filter/source/config/fragments/filters/Rich_Text_Format.xcu
+diff -r 004715ace8e7 -r d6b973424417 filter/source/config/fragments/filters/Rich_Text_Format.xcu
--- filter/source/config/fragments/filters/Rich_Text_Format.xcu Mon Jul 19 17:09:02 2010 +0200
-+++ filter/source/config/fragments/filters/Rich_Text_Format.xcu Sat Sep 04 01:00:40 2010 +0200
++++ filter/source/config/fragments/filters/Rich_Text_Format.xcu Thu Sep 09 01:20:35 2010 +0200
@@ -1,7 +1,7 @@
<node oor:name="Rich Text Format" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN PREFERRED</value></prop>
@@ -11,9 +11,21 @@ diff -r 004715ace8e7 -r b935ac15ff37 filter/source/config/fragments/filters/Rich
<prop oor:name="UserData"><value>RTF</value></prop>
<prop oor:name="UIName">
<value xml:lang="x-default">Rich Text Format</value>
-diff -r 004715ace8e7 -r b935ac15ff37 svtools/inc/rtfkeywd.hxx
+diff -r 004715ace8e7 -r d6b973424417 scp2/source/ooo/file_library_ooo.scp
+--- scp2/source/ooo/file_library_ooo.scp Mon Jul 19 17:09:02 2010 +0200
++++ scp2/source/ooo/file_library_ooo.scp Thu Sep 09 01:20:35 2010 +0200
+@@ -1393,7 +1393,7 @@
+ STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+ STD_LIB_FILE( gid_File_Lib_Swui, swui)
+
+-STD_LIB_FILE( gid_File_Lib_Msword, msword )
++STD_UNO_LIB_FILE( gid_File_Lib_Msword, msword )
+
+ #if ! defined UNX
+ File gid_File_Lib_Sysdtrans
+diff -r 004715ace8e7 -r d6b973424417 svtools/inc/rtfkeywd.hxx
--- svtools/inc/rtfkeywd.hxx Mon Jul 19 17:09:02 2010 +0200
-+++ svtools/inc/rtfkeywd.hxx Sat Sep 04 01:00:40 2010 +0200
++++ svtools/inc/rtfkeywd.hxx Thu Sep 09 01:20:35 2010 +0200
@@ -39,6 +39,7 @@
#define OOO_STRING_SVTOOLS_RTF_ALT "\\alt"
#define OOO_STRING_SVTOOLS_RTF_ANNOTATION "\\annotation"
@@ -58,9 +70,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 svtools/inc/rtfkeywd.hxx
+#define OOO_STRING_SVTOOLS_RTF_NONESTTABLES "\\nonesttables"
+
#endif // _RTFKEYWD_HXX
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/rtf/makefile.mk
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/rtf/makefile.mk
--- sw/source/filter/rtf/makefile.mk Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/rtf/makefile.mk Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/rtf/makefile.mk Thu Sep 09 01:20:35 2010 +0200
@@ -46,18 +46,15 @@
EXCEPTIONSFILES= \
$(SLO)$/rtffly.obj \
@@ -82,9 +94,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/rtf/makefile.mk
# --- Tagets -------------------------------------------------------
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/rtf/rtfnum.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/rtf/rtfnum.cxx
--- sw/source/filter/rtf/rtfnum.cxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/rtf/rtfnum.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/rtf/rtfnum.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -47,7 +47,6 @@
#include <fltini.hxx>
#include <swtypes.hxx>
@@ -106,9 +118,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/rtf/rtfnum.cxx
return bRet;
}
+#endif
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/rtf/swparrtf.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/rtf/swparrtf.cxx
--- sw/source/filter/rtf/swparrtf.cxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/rtf/swparrtf.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/rtf/swparrtf.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -179,6 +179,12 @@
return nRet;
}
@@ -122,9 +134,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/rtf/swparrtf.cxx
SwRTFParser::SwRTFParser(SwDoc* pD,
uno::Reference<document::XDocumentProperties> i_xDocProps,
const SwPaM& rCrsr, SvStream& rIn, const String& rBaseURL,
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/rtf/swparrtf.hxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/rtf/swparrtf.hxx
--- sw/source/filter/rtf/swparrtf.hxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/rtf/swparrtf.hxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/rtf/swparrtf.hxx Thu Sep 09 01:20:35 2010 +0200
@@ -81,6 +81,8 @@
class RtfReader: public Reader
{
@@ -134,9 +146,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/rtf/swparrtf.hxx
};
class SwNodeIdx : public SvxNodeIdx
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/README-rtf.txt
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/README-rtf.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ sw/source/filter/ww8/README-rtf.txt Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/README-rtf.txt Thu Sep 09 01:20:35 2010 +0200
@@ -0,0 +1,227 @@
+
+---------------------------------------------------------------------
@@ -365,9 +377,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/README-rtf.txt
+ * An obvious typo in WW8AttributeOutput::CharTwoLines has been
+ fixed
+
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/docxexport.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/docxexport.cxx
--- sw/source/filter/ww8/docxexport.cxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/ww8/docxexport.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/docxexport.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -116,131 +116,6 @@
return true;
}
@@ -500,9 +512,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/docxexport.cxx
void DocxExport::AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub_StrLen nLen )
{
std::vector< OUString > aStarts;
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/docxexport.hxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/docxexport.hxx
--- sw/source/filter/ww8/docxexport.hxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/ww8/docxexport.hxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/docxexport.hxx Thu Sep 09 01:20:35 2010 +0200
@@ -76,11 +76,6 @@
/// Footer counter.
sal_Int32 m_nFooters;
@@ -540,9 +552,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/docxexport.hxx
/// Setup pStyles and write styles.xml
void InitStyles();
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/docxexportfilter.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/docxexportfilter.cxx
--- sw/source/filter/ww8/docxexportfilter.cxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/ww8/docxexportfilter.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/docxexportfilter.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -26,6 +26,8 @@
************************************************************************/
@@ -620,9 +632,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/docxexportfilter.cxx
}
if ( xFactory.is() )
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/makefile.mk
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/makefile.mk
--- sw/source/filter/ww8/makefile.mk Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/ww8/makefile.mk Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/makefile.mk Thu Sep 09 01:20:35 2010 +0200
@@ -67,7 +67,12 @@
$(SLO)$/WW8TableInfo.obj \
$(SLO)$/WW8FFData.obj \
@@ -651,9 +663,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/makefile.mk
# --- Tagets -------------------------------------------------------
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfattributeoutput.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/rtfattributeoutput.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ sw/source/filter/ww8/rtfattributeoutput.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/rtfattributeoutput.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -0,0 +1,3357 @@
+/*************************************************************************
+ *
@@ -4012,9 +4024,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfattributeoutput.cxx
+}
+
+/* vi:set shiftwidth=4 expandtab: */
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfattributeoutput.hxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/rtfattributeoutput.hxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ sw/source/filter/ww8/rtfattributeoutput.hxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/rtfattributeoutput.hxx Thu Sep 09 01:20:35 2010 +0200
@@ -0,0 +1,574 @@
+/*************************************************************************
+ *
@@ -4590,10 +4602,10 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfattributeoutput.hxx
+#endif // _RTFATTRIBUTEOUTPUT_HXX_
+
+/* vi:set shiftwidth=4 expandtab: */
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexport.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/rtfexport.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ sw/source/filter/ww8/rtfexport.cxx Sat Sep 04 01:00:40 2010 +0200
-@@ -0,0 +1,1240 @@
++++ sw/source/filter/ww8/rtfexport.cxx Thu Sep 09 01:20:35 2010 +0200
+@@ -0,0 +1,1241 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -4972,6 +4984,7 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexport.cxx
+void RtfExport::WriteMainText()
+{
+ OSL_TRACE("%s start", OSL_THIS_FUNC);
++ pCurPam->GetPoint()->nNode = pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex();
+ WriteText();
+ OSL_TRACE("%s end", OSL_THIS_FUNC);
+}
@@ -5834,9 +5847,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexport.cxx
+}
+
+/* vi:set shiftwidth=4 expandtab: */
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexport.hxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/rtfexport.hxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ sw/source/filter/ww8/rtfexport.hxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/rtfexport.hxx Thu Sep 09 01:20:35 2010 +0200
@@ -0,0 +1,212 @@
+/*************************************************************************
+ *
@@ -6050,10 +6063,10 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexport.hxx
+
+#endif // _RTFEXPORT_HXX_
+/* vi:set shiftwidth=4 expandtab: */
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexportfilter.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/rtfexportfilter.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ sw/source/filter/ww8/rtfexportfilter.cxx Sat Sep 04 01:00:40 2010 +0200
-@@ -0,0 +1,227 @@
++++ sw/source/filter/ww8/rtfexportfilter.cxx Thu Sep 09 01:20:35 2010 +0200
+@@ -0,0 +1,228 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -6082,8 +6095,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexportfilter.cxx
+ *
+ ************************************************************************/
+
-+#include "rtfexportfilter.hxx"
-+#include "rtfexport.hxx"
++#include <rtfexportfilter.hxx>
++#include <rtfexport.hxx>
++#include <rtfimportfilter.hxx>
+
+#include <docsh.hxx>
+#include <doc.hxx>
@@ -6219,19 +6233,19 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexportfilter.cxx
+ OSL_ENSURE( sal_False, "### InvalidRegistryException (rtfexport)!" );
+ }
+
-+// try
-+// {
-+// uno::Reference< registry::XRegistryKey > xNewKey1(
-+// static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
-+// OUString::createFromAscii( IMPL_NAME_RTFIMPORT "/UNO/SERVICES/" ) ) );
-+// xNewKey1->createKey( RtfExport_getSupportedServiceNames().getConstArray()[0] );
++ try
++ {
++ uno::Reference< registry::XRegistryKey > xNewKey1(
++ static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
++ OUString::createFromAscii( IMPL_NAME_RTFIMPORT "/UNO/SERVICES/" ) ) );
++ xNewKey1->createKey( RtfExport_getSupportedServiceNames().getConstArray()[0] );
+
-+// bRet = sal_True;
-+// }
-+// catch( registry::InvalidRegistryException& )
-+// {
-+// OSL_ENSURE( sal_False, "### InvalidRegistryException (rtfimport)!" );
-+// }
++ bRet = sal_True;
++ }
++ catch( registry::InvalidRegistryException& )
++ {
++ OSL_ENSURE( sal_False, "### InvalidRegistryException (rtfimport)!" );
++ }
+ }
+
+ return bRet;
@@ -6256,15 +6270,15 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexportfilter.cxx
+ RtfExport_createInstance,
+ RtfExport_getSupportedServiceNames() ) );
+ }
-+// else if ( rtl_str_compare( pImplName, IMPL_NAME_RTFIMPORT ) == 0 ) {
-+// const OUString aServiceName( OUString::createFromAscii( IMPL_NAME_RTFIMPORT ) );
++ else if ( rtl_str_compare( pImplName, IMPL_NAME_RTFIMPORT ) == 0 ) {
++ const OUString aServiceName( OUString::createFromAscii( IMPL_NAME_RTFIMPORT ) );
+
-+// xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
-+// reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
-+// RtfImport_getImplementationName(),
-+// RtfImport_createInstance,
-+// RtfImport_getSupportedServiceNames() ) );
-+// }
++ xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
++ reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
++ RtfImport_getImplementationName(),
++ RtfImport_createInstance,
++ RtfImport_getSupportedServiceNames() ) );
++ }
+
+ if ( xFactory.is() )
+ {
@@ -6281,9 +6295,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexportfilter.cxx
+#endif
+
+/* vi:set shiftwidth=4 expandtab: */
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexportfilter.hxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/rtfexportfilter.hxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ sw/source/filter/ww8/rtfexportfilter.hxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/rtfexportfilter.hxx Thu Sep 09 01:20:35 2010 +0200
@@ -0,0 +1,85 @@
+/*************************************************************************
+ *
@@ -6370,9 +6384,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfexportfilter.hxx
+
+#endif // _RTFEXPORTFILTER_HXX_
+/* vi:set shiftwidth=4 expandtab: */
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfimportfilter.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/rtfimportfilter.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ sw/source/filter/ww8/rtfimportfilter.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/rtfimportfilter.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -0,0 +1,135 @@
+/*************************************************************************
+ *
@@ -6509,9 +6523,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfimportfilter.cxx
+}
+
+/* vi:set shiftwidth=4 expandtab: */
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfimportfilter.hxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/rtfimportfilter.hxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ sw/source/filter/ww8/rtfimportfilter.hxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/rtfimportfilter.hxx Thu Sep 09 01:20:35 2010 +0200
@@ -0,0 +1,75 @@
+/*************************************************************************
+ *
@@ -6588,9 +6602,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfimportfilter.hxx
+
+#endif // _RTFIMPORTFILTER_HXX_
+/* vi:set shiftwidth=4 expandtab: */
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfsdrexport.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/rtfsdrexport.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ sw/source/filter/ww8/rtfsdrexport.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/rtfsdrexport.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -0,0 +1,578 @@
+/*************************************************************************
+ *
@@ -7170,9 +7184,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfsdrexport.cxx
+}
+
+/* vi:set shiftwidth=4 expandtab: */
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfsdrexport.hxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/rtfsdrexport.hxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ sw/source/filter/ww8/rtfsdrexport.hxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/rtfsdrexport.hxx Thu Sep 09 01:20:35 2010 +0200
@@ -0,0 +1,112 @@
+/*************************************************************************
+ *
@@ -7286,9 +7300,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/rtfsdrexport.hxx
+
+#endif // _RTFSdrEXPORT_HXX_
+/* vi:set shiftwidth=4 expandtab: */
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtw8esh.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/wrtw8esh.cxx
--- sw/source/filter/ww8/wrtw8esh.cxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/ww8/wrtw8esh.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/wrtw8esh.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -811,49 +811,7 @@
OutputField(0, ww::eSHAPE, aEmptyStr, WRITEFIELD_CLOSE);
}
@@ -7439,9 +7453,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtw8esh.cxx
USHORT nPara = rEditObj.GetParagraphCount();
BYTE bNul = 0;
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtw8nds.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/wrtw8nds.cxx
--- sw/source/filter/ww8/wrtw8nds.cxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/ww8/wrtw8nds.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/wrtw8nds.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -1646,14 +1646,127 @@
m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() );
}
@@ -7574,9 +7588,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtw8nds.cxx
}
void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtw8num.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/wrtw8num.cxx
--- sw/source/filter/ww8/wrtw8num.cxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/ww8/wrtw8num.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/wrtw8num.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -721,6 +721,9 @@
StarSymbolToMSMultiFont *pConvert = 0;
FontFamily eFamily = FAMILY_DECORATIVE;
@@ -7587,9 +7601,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtw8num.cxx
if (!pConvert)
{
pConvert = CreateStarSymbolToMSMultiFont();
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtw8sty.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/wrtw8sty.cxx
--- sw/source/filter/ww8/wrtw8sty.cxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/ww8/wrtw8sty.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/wrtw8sty.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -79,6 +79,7 @@
#include "ww8par.hxx"
#include "ww8attributeoutput.hxx"
@@ -7654,9 +7668,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtw8sty.cxx
/* */
WW8_WrPlc0::WW8_WrPlc0( ULONG nOffset )
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtww8.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/wrtww8.cxx
--- sw/source/filter/ww8/wrtww8.cxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/ww8/wrtww8.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/wrtww8.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -3371,7 +3371,7 @@
mpTableInfo(new ww8::WW8TableInfo()), nUniqueList(0),
mnHdFtIndex(0), pAktPageDesc(0), pPapPlc(0), pChpPlc(0), pChpIter(0),
@@ -7666,9 +7680,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtww8.cxx
pDoc( pDocument ),
pCurPam( pCurrentPam ),
pOrigPam( pOriginalPam )
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtww8.hxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/wrtww8.hxx
--- sw/source/filter/ww8/wrtww8.hxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/ww8/wrtww8.hxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/wrtww8.hxx Thu Sep 09 01:20:35 2010 +0200
@@ -35,6 +35,7 @@
#define _SVSTDARR_ULONGS
#include <svl/svstdarr.hxx>
@@ -7799,9 +7813,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/wrtww8.hxx
/// Class to collect and output the styles table.
class MSWordStyles
{
-diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/ww8atr.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/ww8atr.cxx
--- sw/source/filter/ww8/ww8atr.cxx Mon Jul 19 17:09:02 2010 +0200
-+++ sw/source/filter/ww8/ww8atr.cxx Sat Sep 04 01:00:40 2010 +0200
++++ sw/source/filter/ww8/ww8atr.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -3340,7 +3340,7 @@
m_rWW8Export.pO->Insert( (BYTE)0x02, m_rWW8Export.pO->Count() );
@@ -7811,9 +7825,22 @@ diff -r 004715ace8e7 -r b935ac15ff37 sw/source/filter/ww8/ww8atr.cxx
/*
As per usual we have problems. We can have seperate left and right brackets
-diff -r 004715ace8e7 -r b935ac15ff37 writerfilter/source/filter/RtfFilter.cxx
+diff -r 004715ace8e7 -r d6b973424417 sw/util/msword.map
+--- sw/util/msword.map Mon Jul 19 17:09:02 2010 +0200
++++ sw/util/msword.map Thu Sep 09 01:20:35 2010 +0200
+@@ -6,6 +6,9 @@
+ ExportDOC;
+ SaveOrDelMSVBAStorage_ww8;
+ GetSaveWarningOfMSVBAStorage_ww8;
++ component_getImplementationEnvironment;
++ component_writeInfo;
++ component_getFactory;
+ local:
+ *;
+ };
+diff -r 004715ace8e7 -r d6b973424417 writerfilter/source/filter/RtfFilter.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ writerfilter/source/filter/RtfFilter.cxx Sat Sep 04 01:00:40 2010 +0200
++++ writerfilter/source/filter/RtfFilter.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -0,0 +1,146 @@
+/*************************************************************************
+ *
@@ -7961,9 +7988,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 writerfilter/source/filter/RtfFilter.cxx
+}
+
+/* vi:set shiftwidth=4 expandtab: */
-diff -r 004715ace8e7 -r b935ac15ff37 writerfilter/source/filter/RtfFilter.hxx
+diff -r 004715ace8e7 -r d6b973424417 writerfilter/source/filter/RtfFilter.hxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ writerfilter/source/filter/RtfFilter.hxx Sat Sep 04 01:00:40 2010 +0200
++++ writerfilter/source/filter/RtfFilter.hxx Thu Sep 09 01:20:35 2010 +0200
@@ -0,0 +1,102 @@
+/*************************************************************************
+ *
@@ -8067,9 +8094,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 writerfilter/source/filter/RtfFilter.hxx
+ throw( ::com::sun::star::uno::Exception );
+#endif
+
-diff -r 004715ace8e7 -r b935ac15ff37 writerfilter/source/filter/WriterFilter.cxx
+diff -r 004715ace8e7 -r d6b973424417 writerfilter/source/filter/WriterFilter.cxx
--- writerfilter/source/filter/WriterFilter.cxx Mon Jul 19 17:09:02 2010 +0200
-+++ writerfilter/source/filter/WriterFilter.cxx Sat Sep 04 01:00:40 2010 +0200
++++ writerfilter/source/filter/WriterFilter.cxx Thu Sep 09 01:20:35 2010 +0200
@@ -30,6 +30,7 @@
#endif
#include <WriterFilter.hxx>
@@ -8086,9 +8113,9 @@ diff -r 004715ace8e7 -r b935ac15ff37 writerfilter/source/filter/WriterFilter.cxx
{ 0, 0, 0, 0, 0, 0 } // terminate with NULL
};
-diff -r 004715ace8e7 -r b935ac15ff37 writerfilter/source/filter/makefile.mk
+diff -r 004715ace8e7 -r d6b973424417 writerfilter/source/filter/makefile.mk
--- writerfilter/source/filter/makefile.mk Mon Jul 19 17:09:02 2010 +0200
-+++ writerfilter/source/filter/makefile.mk Sat Sep 04 01:00:40 2010 +0200
++++ writerfilter/source/filter/makefile.mk Thu Sep 09 01:20:35 2010 +0200
@@ -40,7 +40,8 @@
SLOFILES= $(SLO)$/WriterFilter.obj \
diff --git a/patches/dev300/docx-export-enable.diff b/patches/dev300/docx-export-enable.diff
index 037f0ff..e53d7d4 100644
--- a/patches/dev300/docx-export-enable.diff
+++ b/patches/dev300/docx-export-enable.diff
@@ -154,17 +154,6 @@ index 8bbf8a3..deb8dbb 100644
.IF "$(GUI)"=="WNT"
diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
index acaea04..c7402e8 100644
---- scp2/source/ooo/file_library_ooo.scp
-+++ scp2/source/ooo/file_library_ooo.scp
-@@ -1446,7 +1446,7 @@ STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
- STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
- STD_LIB_FILE( gid_File_Lib_Swui, swui)
-
--STD_LIB_FILE( gid_File_Lib_Msword, msword )
-+STD_UNO_LIB_FILE( gid_File_Lib_Msword, msword )
-
- #if ! defined UNX
- File gid_File_Lib_Sysdtrans
--- sw/source/filter/ww8/WW8TableInfo.hxx 2010-06-24 16:56:52.000000000 +0200
+++ sw/source/filter/ww8/WW8TableInfo.hxx 2010-06-24 16:56:44.000000000 +0200
@@ -30,6 +30,7 @@
@@ -523,22 +512,6 @@ index 2907264..abeec13 100644
$(SVXCORELIB) \
$(EDITENGLIB) \
$(MSFILTERLIB) \
-diff --git sw/util/msword.map sw/util/msword.map
-index 16b9d25..df7ae0b 100755
---- sw/util/msword.map
-+++ sw/util/msword.map
-@@ -6,6 +6,11 @@ UDK_3_0_0 {
- ExportDOC;
- SaveOrDelMSVBAStorage_ww8;
- GetSaveWarningOfMSVBAStorage_ww8;
-+
-+ component_getImplementationEnvironment;
-+ component_writeInfo;
-+ component_getFactory;
-+
- local:
- *;
- };
--
1.7.0.1
More information about the ooo-build-commit
mailing list