[ooo-build-commit] .: 2 commits - patches/dev300 patches/ooxml
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 15 23:52:10 PDT 2010
patches/dev300/apply | 14
patches/dev300/cws-vmiklos01.diff | 12
patches/dev300/default-ms-filter-convert.diff | 71 --
patches/dev300/default-openssl-no-idea-alg.diff | 29 -
patches/dev300/docx-export-enable.diff | 517 --------------------
patches/dev300/sw-dde-table-no-header.diff | 11
patches/ooxml/buildfix-oox-depends-on-unotools.diff | 4
7 files changed, 22 insertions(+), 636 deletions(-)
New commits:
commit 3d7eecf0920abe5b66b40a0d81a4932779825c70
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Sep 16 08:34:52 2010 +0200
Don't set header in DDE tables, usually not what the user wants.
n#634517
diff --git a/patches/dev300/apply b/patches/dev300/apply
index f5c9669..d1731fe 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3027,6 +3027,9 @@ svx-hu-name-order.diff, i#105342, timar
# is in. Just don't bother handling such empty "link annotations".
skip-empty-links-in-pdf.diff, bnc#598816, tml
+# don't set header in DDE tables, usually not what the user wants
+sw-dde-table-no-header.diff, n#634517, jholesov
+
[ Toolbars ]
SectionOwner => jholesov
# experimental now
diff --git a/patches/dev300/sw-dde-table-no-header.diff b/patches/dev300/sw-dde-table-no-header.diff
new file mode 100644
index 0000000..1d3c496
--- /dev/null
+++ b/patches/dev300/sw-dde-table-no-header.diff
@@ -0,0 +1,11 @@
+--- sw/source/ui/dochdl/swdtflvr.cxx 2010-09-16 08:28:23.000000000 +0200
++++ sw/source/ui/dochdl/swdtflvr.cxx 2010-09-16 08:28:18.000000000 +0200
+@@ -2222,7 +2222,7 @@ int SwTransferable::_PasteDDE( Transfera
+ }
+
+ rWrtShell.InsertDDETable(
+- SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 1 ), // TODO MULTIHEADER
++ SwInsertTableOptions( tabopts::SPLIT_LAYOUT, 1 ), // TODO MULTIHEADER
+ pDDETyp, nRows, nCols );
+ }
+ else if( 1 < aExpand.GetTokenCount( '\n' ) )
commit 816b10ac7961c517e5a4c7df373cb8c08cc1c0ca
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Sep 16 08:41:55 2010 +0200
More patches migrated.
* patches/dev300/default-ms-filter-convert.diff
* patches/dev300/default-openssl-no-idea-alg.diff
* patches/dev300/docx-export-enable.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c98cbc4..f5c9669 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -937,8 +937,6 @@ disable-checkdeliver.diff, jholesov
default-font-aasize.diff, michael
# set default font size to 10pt
default-font-size.diff, i#35565, michael
-# Dramatically improve MS import / export cf. i8276 et. al.
-default-ms-filter-convert.diff, i#8276, michael
# Optimal Page Wrap should be default for graphics insertion (X#59831)
writer-default-as-optimal-page-wrap.diff, i#38108, jody
#
@@ -949,12 +947,6 @@ vfs-kde-too.diff, michael
# Trade speed for reliability with valgrind
valgrind-alloc.diff, michael
-# disable the IDEA algorithm in the internal openssl; It is pattented.
-# There is no license fee only for non-commercial use.
-# This change actually affects only the Windows builds because the others
-# should use --with-system-openssl
-default-openssl-no-idea-alg.diff, pmladek
-
# load and save also odf documents in flat xml format as opposed to the
# compressed ones (conforming to the odf specifications)
odf-flatxml-import-export.diff
@@ -2465,9 +2457,6 @@ ooop-langpack-policy.diff
mail-document-subject.diff, n#459176
[ OOXMLExport ]
-# Enable the DOCX export (and few related features in oox)
-docx-export-enable.diff, jholesov
-
pptx-filter-as-a-separate-lib.diff
[ OOXMLExport and not OpenGLTransitions ]
diff --git a/patches/dev300/cws-vmiklos01.diff b/patches/dev300/cws-vmiklos01.diff
index e57eee1..62057e3 100644
--- a/patches/dev300/cws-vmiklos01.diff
+++ b/patches/dev300/cws-vmiklos01.diff
@@ -7613,8 +7613,8 @@ diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/wrtw8sty.cxx
using namespace sw::util;
using namespace nsHdFtFlags;
@@ -713,6 +714,17 @@
+ rAttrOutput->EndFont();
}
- #endif
+void wwFont::WriteRtf( const RtfAttributeOutput* rAttrOutput ) const
+{
@@ -7654,8 +7654,8 @@ diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/wrtw8sty.cxx
USHORT wwFontHelper::GetId(const Font& rFont)
@@ -839,6 +867,14 @@
+ ::std::bind2nd( ::std::mem_fun( &wwFont::WriteDocx ), &rAttrOutput ) );
}
- #endif
+void wwFontHelper::WriteFontTable( const RtfAttributeOutput& rAttrOutput )
+{
@@ -7700,9 +7700,9 @@ diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/wrtww8.hxx
class SwEscherEx;
class DateTime;
@@ -296,6 +298,7 @@
- #ifdef DOCX
+ rtl_TextEncoding eChrSet, bool bWrtWW8 );
+ bool Write( SvStream *pTableStram ) const;
void WriteDocx( const DocxAttributeOutput* rAttrOutput ) const;
- #endif
+ void WriteRtf( const RtfAttributeOutput* rAttrOutput ) const;
rtl::OUString GetFamilyName() const { return rtl::OUString( msFamilyNm ); }
friend bool operator < (const wwFont &r1, const wwFont &r2);
@@ -7717,9 +7717,9 @@ diff -r 004715ace8e7 -r d6b973424417 sw/source/filter/ww8/wrtww8.hxx
void InitFontTable(bool bWrtWW8, const SwDoc& rDoc);
USHORT GetId(const Font& rFont);
@@ -321,6 +324,10 @@
- #ifdef DOCX
+ USHORT GetId(const wwFont& rFont);
+ void WriteFontTable( SvStream *pTableStream, WW8Fib& pFib );
void WriteFontTable( const DocxAttributeOutput& rAttrOutput );
- #endif
+ void WriteFontTable( const RtfAttributeOutput& rAttrOutput );
+
+ /// If true, all fonts are loaded before processing the document.
diff --git a/patches/dev300/default-ms-filter-convert.diff b/patches/dev300/default-ms-filter-convert.diff
deleted file mode 100644
index 81587da..0000000
--- a/patches/dev300/default-ms-filter-convert.diff
+++ /dev/null
@@ -1,71 +0,0 @@
----
- .../schema/org/openoffice/Office/Common.xcs | 16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs
-index 016684c..74c65d3 100644
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
-@@ -4232,25 +4232,25 @@
- <info>
- <desc>Specifies if convertible MathType OLE objects are converted into Math objects.</desc>
- </info>
-- <value>false</value>
-+ <value>true</value>
- </prop>
- <prop oor:name="WinWordToWriter" oor:type="xs:boolean">
- <info>
- <desc>Specifies if convertible WinWord OLE objects are converted into Writer objects.</desc>
- </info>
-- <value>false</value>
-+ <value>true</value>
- </prop>
- <prop oor:name="ExcelToCalc" oor:type="xs:boolean">
- <info>
- <desc>Specifies if convertible Excel OLE objects are converted into Calc objects.</desc>
- </info>
-- <value>false</value>
-+ <value>true</value>
- </prop>
- <prop oor:name="PowerPointToImpress" oor:type="xs:boolean">
- <info>
- <desc>Specifies if convertible PowerPoint OLE objects are converted into Impress objects.</desc>
- </info>
-- <value>false</value>
-+ <value>true</value>
- </prop>
- <prop oor:name="ImportWWFieldsAsEnhancedFields" oor:type="xs:boolean">
- <info>
-@@ -4267,25 +4267,25 @@
- <info>
- <desc>Specifies if embedded Math objects are converted into MathType objects.</desc>
- </info>
-- <value>false</value>
-+ <value>true</value>
- </prop>
- <prop oor:name="WriterToWinWord" oor:type="xs:boolean">
- <info>
- <desc>Specifies if embedded Writer objects are converted into WinWord objects.</desc>
- </info>
-- <value>false</value>
-+ <value>true</value>
- </prop>
- <prop oor:name="CalcToExcel" oor:type="xs:boolean">
- <info>
- <desc>Specifies if embedded Calc objects are converted into Excel objects.</desc>
- </info>
-- <value>false</value>
-+ <value>true</value>
- </prop>
- <prop oor:name="ImpressToPowerPoint" oor:type="xs:boolean">
- <info>
- <desc>Specifies if embedded Impress objects are converted into PowerPoint objects.</desc>
- </info>
-- <value>false</value>
-+ <value>true</value>
- </prop>
- <prop oor:name="EnablePowerPointPreview" oor:type="xs:boolean">
- <info>
---
-1.7.0.1
-
diff --git a/patches/dev300/default-openssl-no-idea-alg.diff b/patches/dev300/default-openssl-no-idea-alg.diff
deleted file mode 100644
index 8915807..0000000
--- a/patches/dev300/default-openssl-no-idea-alg.diff
+++ /dev/null
@@ -1,29 +0,0 @@
----
- openssl/makefile.mk | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git openssl/makefile.mk openssl/makefile.mk
-index 0816807..53a5239 100644
---- openssl/makefile.mk
-+++ openssl/makefile.mk
-@@ -53,7 +53,7 @@ TARFILE_MD5=05a0ece1372392a2cf310ebb96333025
-
- CONFIGURE_DIR=.
- CONFIGURE_ACTION=config
--CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared
-+CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared no-idea
-
- BUILD_DIR=.
- BUILD_ACTION=make CC='$(CC)'
-@@ -156,7 +156,7 @@ OUT2BIN += out/libeay32.dll
-
- #CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure
- CONFIGURE_ACTION=$(PERL) configure
-- CONFIGURE_FLAGS=VC-WIN32
-+ CONFIGURE_FLAGS=VC-WIN32 no-idea
- BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak
-
- OUT2LIB = out32dll$/ssleay32.lib
---
-1.7.0.1
-
diff --git a/patches/dev300/docx-export-enable.diff b/patches/dev300/docx-export-enable.diff
deleted file mode 100644
index e53d7d4..0000000
--- a/patches/dev300/docx-export-enable.diff
+++ /dev/null
@@ -1,517 +0,0 @@
----
- .../config/fragments/filters/MS_Word_2007_XML.xcu | 2 +-
- oox/inc/oox/vml/vmldrawing.hxx | 3 +-
- oox/prj/build.lst | 5 ++-
- oox/prj/d.lst | 3 ++
- oox/source/export/drawingml.cxx | 16 ++++++-----
- oox/util/makefile.mk | 11 ++++++-
- scp2/source/ooo/file_library_ooo.scp | 2 +-
- sw/source/filter/ww8/docxexport.cxx | 29 +++++++++++++------
- sw/source/filter/ww8/docxexport.hxx | 5 ++-
- sw/source/filter/ww8/docxexportfilter.cxx | 2 +-
- sw/source/filter/ww8/docxexportfilter.hxx | 4 +-
- sw/source/filter/ww8/makefile.mk | 4 +++
- sw/source/filter/ww8/wrtw8sty.cxx | 4 ---
- sw/source/filter/ww8/wrtww8.hxx | 4 ---
- sw/util/makefile.mk | 2 +
- sw/util/msword.map | 5 +++
- 16 files changed, 65 insertions(+), 36 deletions(-)
-
-diff --git filter/source/config/fragments/filters/MS_Word_2007_XML.xcu filter/source/config/fragments/filters/MS_Word_2007_XML.xcu
-index d8a3740..c8c9f00 100644
---- filter/source/config/fragments/filters/MS_Word_2007_XML.xcu
-+++ filter/source/config/fragments/filters/MS_Word_2007_XML.xcu
-@@ -1,5 +1,5 @@
- <node oor:name="MS Word 2007 XML" oor:op="replace">
-- <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop>
-+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
- <prop oor:name="UserData"><value>OXML</value></prop>
-diff --git oox/inc/oox/vml/vmldrawing.hxx oox/inc/oox/vml/vmldrawing.hxx
-index 87c7bfc..f0e3e23 100644
---- oox/inc/oox/vml/vmldrawing.hxx
-+++ oox/inc/oox/vml/vmldrawing.hxx
-@@ -30,7 +30,8 @@
-
- #include <map>
- #include <memory>
--#include "oox/ole/oleobjecthelper.hxx"
-+
-+#include <oox/ole/oleobjecthelper.hxx>
-
- namespace com { namespace sun { namespace star {
- namespace awt { struct Rectangle; }
-diff --git oox/prj/build.lst oox/prj/build.lst
-index 60c4b02..0a15fd9 100644
---- oox/prj/build.lst
-+++ oox/prj/build.lst
-@@ -1,4 +1,4 @@
--oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx xmlscript tools vcl unotools BOOST:boost OPENSSL:openssl NULL
-+oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx svx xmlscript tools vcl unotools BOOST:boost OPENSSL:openssl NULL
- oox oox usr1 - all oox_mkout NULL
- oox oox\prj get - all oox_prj NULL
- oox oox\source\token nmake - all oox_token NULL
-@@ -15,4 +15,5 @@ oox oox\source\vml nmake - all oox_vml oox_token NULL
- oox oox\source\xls nmake - all oox_xls oox_token NULL
- oox oox\source\dump nmake - all oox_dump oox_token NULL
- oox oox\source\shape nmake - all oox_shape oox_token NULL
--oox oox\util nmake - all oox_util oox_token oox_helper oox_core oox_ole oox_vml oox_drawingml oox_diagram oox_chart oox_table oox_ppt oox_xls oox_dump oox_shape oox_docprop NULL
-+oox oox\source\export nmake - all oox_export oox_token NULL
-+oox oox\util nmake - all oox_util oox_token oox_helper oox_core oox_ole oox_vml oox_drawingml oox_diagram oox_chart oox_table oox_ppt oox_xls oox_dump oox_export oox_shape oox_docprop NULL
-diff --git oox/prj/d.lst oox/prj/d.lst
-index 482a270..97ebba2 100644
---- oox/prj/d.lst
-+++ oox/prj/d.lst
-@@ -4,6 +4,7 @@ mkdir: %_DEST%\inc%_EXT%\oox\core
- mkdir: %_DEST%\inc%_EXT%\oox\drawingml
- mkdir: %_DEST%\inc%_EXT%\oox\drawingml\chart
- mkdir: %_DEST%\inc%_EXT%\oox\drawingml\table
-+mkdir: %_DEST%\inc%_EXT%\oox\export
- mkdir: %_DEST%\inc%_EXT%\oox\ole
- mkdir: %_DEST%\inc%_EXT%\oox\vml
- mkdir: %_DEST%\inc%_EXT%\oox\xls
-@@ -34,8 +35,10 @@ mkdir: %_DEST%\inc%_EXT%\oox\xls
- ..\inc\oox\drawingml\chart\chartconverter.hxx %_DEST%\inc%_EXT%\oox\drawingml\chart\chartconverter.hxx
- ..\inc\oox\drawingml\table\tablestylelist.hxx %_DEST%\inc%_EXT%\oox\drawingml\table\tablestylelist.hxx
- ..\inc\oox\ole\vbaproject.hxx %_DEST%\inc%_EXT%\oox\ole\vbaproject.hxx
-+..\inc\oox\ole\oleobjecthelper.hxx %_DEST%\inc%_EXT%\oox\ole\oleobjecthelper.hxx
- ..\inc\oox\vml\vmldrawing.hxx %_DEST%\inc%_EXT%\oox\vml\vmldrawing.hxx
- ..\inc\oox\vml\vmlshape.hxx %_DEST%\inc%_EXT%\oox\vml\vmlshape.hxx
-+..\inc\oox\export\*.hxx %_DEST%\inc%_EXT%\oox\export\*.hxx
-
- dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
-
-diff --git oox/source/export/drawingml.cxx oox/source/export/drawingml.cxx
-index 399608e..8789b80 100644
---- oox/source/export/drawingml.cxx
-+++ oox/source/export/drawingml.cxx
-@@ -40,6 +40,7 @@
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <com/sun/star/beans/XPropertyState.hpp>
- #include <com/sun/star/container/XEnumerationAccess.hpp>
-+#include <com/sun/star/container/XIndexAccess.hpp>
- #include <com/sun/star/drawing/BitmapMode.hpp>
- #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
- #include <com/sun/star/drawing/LineDash.hpp>
-@@ -47,6 +48,7 @@
- #include <com/sun/star/drawing/LineStyle.hpp>
- #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
- #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-+#include <com/sun/star/drawing/XShape.hpp>
- #include <com/sun/star/i18n/ScriptType.hpp>
- #include <com/sun/star/io/XOutputStream.hpp>
- #include <com/sun/star/style/ParagraphAdjust.hpp>
-@@ -484,13 +486,13 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
- case DOCUMENT_XLSX: pComponent = "xl"; break;
- }
-
-- Reference< XOutputStream > xOutStream = mpFB->openOutputStream( OUStringBuffer()
-- .appendAscii( pComponent )
-- .appendAscii( "/media/image" )
-- .append( (sal_Int32) mnImageCounter )
-- .appendAscii( sExtension )
-- .makeStringAndClear(),
-- sMediaType );
-+ Reference< XOutputStream > xOutStream = mpFB->openFragmentStream( OUStringBuffer()
-+ .appendAscii( pComponent )
-+ .appendAscii( "/media/image" )
-+ .append( (sal_Int32) mnImageCounter )
-+ .appendAscii( sExtension )
-+ .makeStringAndClear(),
-+ sMediaType );
- xOutStream->writeBytes( Sequence< sal_Int8 >( (const sal_Int8*) aData, nDataSize ) );
- xOutStream->closeOutput();
-
-diff --git oox/util/makefile.mk oox/util/makefile.mk
-index 8bbf8a3..deb8dbb 100644
---- oox/util/makefile.mk
-+++ oox/util/makefile.mk
-@@ -53,7 +53,8 @@ LIB1FILES= \
- $(SLB)$/table.lib\
- $(SLB)$/shape.lib\
- $(SLB)$/dump.lib\
-- $(SLB)$/docprop.lib
-+ $(SLB)$/docprop.lib\
-+ $(SLB)$/export.lib
-
- # --- Shared-Library -----------------------------------------------
-
-@@ -69,7 +70,13 @@ SHL1STDLIBS= \
- $(SALLIB) \
- $(BASEGFXLIB) \
- $(SAXLIB) \
-- $(XMLSCRIPTLIB)
-+ $(XMLSCRIPTLIB) \
-+ $(VCLLIB) \
-+ $(GOODIESLIB) \
-+ $(SVTOOLLIB) \
-+ $(SVXCORELIB) \
-+ $(SVXMSFILTERLIB) \
-+ $(TOOLSLIB)
-
- # link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk
- .IF "$(GUI)"=="WNT"
-diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
-index acaea04..c7402e8 100644
---- 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 @@
- #include <hash_map>
- #include <string>
- #include <map>
-+#include <set>
- #include <functional>
- #include <boost/shared_ptr.hpp>
- #include <sal/types.h>
---- sw/source/filter/ww8/docxattributeoutput.cxx
-+++ sw/source/filter/ww8/docxattributeoutput.cxx
-@@ -454,7 +454,7 @@ void DocxAttributeOutput::StartField_Impl( FieldInfos& rInfos, sal_Bool bWriteRu
- if ( rInfos.pField && rInfos.eType == ww::eUNKNOWN )
- {
- // Expand unsupported fields
-- RunText( rInfos.pField->Expand( ) );
-+ RunText( rInfos.pField->GetCntnt() );
- }
- else if ( rInfos.eType != ww::eNONE ) // HYPERLINK fields are just commands
- {
-@@ -559,7 +559,7 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
- m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
-
- // Find another way for hyperlinks
-- RunText( rInfos.pField->Expand( ) );
-+ RunText( rInfos.pField->GetCntnt() );
- m_pSerializer->endElementNS( XML_w, XML_r );
- }
-
-@@ -1146,7 +1146,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point
- TableBackgrounds( pTableTextNodeInfoInner );
-
- // Cell prefered width
-- SwTwips nWidth = GetGridCols( pTableTextNodeInfoInner )[ pTableTextNodeInfoInner->getCell() ];
-+ SwTwips nWidth = GetGridCols( pTableTextNodeInfoInner )->at( pTableTextNodeInfoInner->getCell() );
- m_pSerializer->singleElementNS( XML_w, XML_tcW,
- FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( nWidth ) ).getStr( ),
- FSNS( XML_w, XML_type ), "dxa",
-@@ -1190,7 +1190,7 @@ void DocxAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t
- bool bRelBoxSize = false;
-
- // Create the SwWriteTable instance to use col spans (and maybe other infos)
-- GetTablePageSize( pTableTextNodeInfoInner, nPageSize, bRelBoxSize );
-+ GetTablePageSize( pTableTextNodeInfoInner.get(), nPageSize, bRelBoxSize );
-
- const SwTable* pTable = pTableTextNodeInfoInner->getTable( );
- const SwFrmFmt *pFmt = pTable->GetFrmFmt( );
-@@ -1290,7 +1290,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
- bool bRelBoxSize = false;
-
- // Create the SwWriteTable instance to use col spans (and maybe other infos)
-- GetTablePageSize( pTableTextNodeInfoInner, nPageSize, bRelBoxSize );
-+ GetTablePageSize( pTableTextNodeInfoInner.get(), nPageSize, bRelBoxSize );
-
- // Output the table prefered width
- if ( nPageSize != 0 )
-@@ -1342,8 +1342,8 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
- // Write the table grid infos
- m_pSerializer->startElementNS( XML_w, XML_tblGrid, FSEND );
-
-- std::vector<SwTwips> gridCols = GetGridCols( pTableTextNodeInfoInner );
-- for ( std::vector<SwTwips>::const_iterator it = gridCols.begin(); it != gridCols.end(); ++it )
-+ ww8::GridColsPtr pGridCols = GetGridCols( pTableTextNodeInfoInner );
-+ for ( ww8::GridCols::const_iterator it = pGridCols->begin(); it != pGridCols->end(); ++it )
- m_pSerializer->singleElementNS( XML_w, XML_gridCol,
- FSNS( XML_w, XML_w ), OString::valueOf( sal_Int32( *it ) ).getStr( ),
- FSEND );
---- sw/source/filter/ww8/docxattributeoutput.hxx 2010-06-24 17:02:20.000000000 +0200
-+++ sw/source/filter/ww8/docxattributeoutput.hxx 2010-06-24 17:02:13.000000000 +0200
-@@ -160,6 +160,8 @@ public:
-
- virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
-
-+ virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner );
-+
- virtual void TableRowEnd( sal_uInt32 nDepth = 1 );
-
- /// Start of the styles table.
-diff --git sw/source/filter/ww8/docxexport.cxx sw/source/filter/ww8/docxexport.cxx
-index 8752ff2..07e2b54 100644
---- sw/source/filter/ww8/docxexport.cxx
-+++ sw/source/filter/ww8/docxexport.cxx
-@@ -312,7 +312,7 @@ bool DocxExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt )
- }
-
- void DocxExport::WriteHeadersFooters( BYTE nHeadFootFlags,
-- const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt )
-+ const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, BYTE /*nBreakCode*/ )
- {
- // headers
- if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_EVEN )
-@@ -333,6 +333,10 @@ void DocxExport::WriteHeadersFooters( BYTE nHeadFootFlags,
-
- if ( nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_FIRST )
- WriteHeaderFooter( rFirstPageFmt, false, "first" );
-+
-+#if OSL_DEBUG_LEVEL > 0
-+ fprintf( stderr, "DocxExport::WriteHeadersFooters() - nBreakCode introduced, but ignored\n" );
-+#endif
- }
-
- void DocxExport::OutputField( const SwField* pFld, ww::eField eFldType, const String& rFldCmd, BYTE nMode )
-@@ -345,6 +349,13 @@ void DocxExport::WriteFormData( const ::sw::mark::IFieldmark& /*rFieldmark*/ )
- OSL_TRACE( "TODO DocxExport::WriteFormData()\n" );
- }
-
-+void DocxExport::WriteHyperlinkData( const ::sw::mark::IFieldmark& /*rFieldmark*/ )
-+{
-+#if OSL_DEBUG_LEVEL > 0
-+ fprintf( stderr, "TODO DocxExport::WriteHyperlinkData()\n" );
-+#endif
-+}
-+
- void DocxExport::DoComboBox(const rtl::OUString& rName,
- const rtl::OUString& rHelp,
- const rtl::OUString& rToolTip,
-@@ -528,7 +539,7 @@ void DocxExport::InitStyles()
- S( "styles.xml" ) );
-
- ::sax_fastparser::FSHelperPtr pStylesFS =
-- m_pFilter->openOutputStreamWithSerializer( S( "word/styles.xml" ),
-+ m_pFilter->openFragmentStreamWithSerializer( S( "word/styles.xml" ),
- S( "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml" ) );
-
- // switch the serializer to redirect the output to word/styles.xml
-@@ -551,7 +562,7 @@ void DocxExport::WriteFootnotesEndnotes()
- S( "footnotes.xml" ) );
-
- ::sax_fastparser::FSHelperPtr pFootnotesFS =
-- m_pFilter->openOutputStreamWithSerializer( S( "word/footnotes.xml" ),
-+ m_pFilter->openFragmentStreamWithSerializer( S( "word/footnotes.xml" ),
- S( "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml" ) );
-
- // switch the serializer to redirect the output to word/footnotes.xml
-@@ -572,7 +583,7 @@ void DocxExport::WriteFootnotesEndnotes()
- S( "endnotes.xml" ) );
-
- ::sax_fastparser::FSHelperPtr pEndnotesFS =
-- m_pFilter->openOutputStreamWithSerializer( S( "word/endnotes.xml" ),
-+ m_pFilter->openFragmentStreamWithSerializer( S( "word/endnotes.xml" ),
- S( "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml" ) );
-
- // switch the serializer to redirect the output to word/endnotes.xml
-@@ -595,7 +606,7 @@ void DocxExport::WriteNumbering()
- S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering" ),
- S( "numbering.xml" ) );
-
-- ::sax_fastparser::FSHelperPtr pNumberingFS = m_pFilter->openOutputStreamWithSerializer( S( "word/numbering.xml" ),
-+ ::sax_fastparser::FSHelperPtr pNumberingFS = m_pFilter->openFragmentStreamWithSerializer( S( "word/numbering.xml" ),
- S( "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml" ) );
-
- // switch the serializer to redirect the output to word/nubering.xml
-@@ -628,7 +639,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char*
- S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header" ),
- aName );
-
-- pFS = m_pFilter->openOutputStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(),
-+ pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(),
- S( "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml" ) );
-
- pFS->startElementNS( XML_w, XML_hdr,
-@@ -643,7 +654,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char*
- S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer" ),
- aName );
-
-- pFS = m_pFilter->openOutputStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(),
-+ pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(),
- S( "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml" ) );
-
- pFS->startElementNS( XML_w, XML_ftr,
-@@ -686,7 +697,7 @@ void DocxExport::WriteFonts()
- S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable" ),
- S( "fontTable.xml" ) );
-
-- ::sax_fastparser::FSHelperPtr pFS = m_pFilter->openOutputStreamWithSerializer(
-+ ::sax_fastparser::FSHelperPtr pFS = m_pFilter->openFragmentStreamWithSerializer(
- S( "word/fontTable.xml" ),
- S( "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml" ) );
-
-@@ -774,7 +785,7 @@ DocxExport::DocxExport( DocxExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCur
- S( "word/document.xml" ) );
-
- // the actual document
-- m_pDocumentFS = m_pFilter->openOutputStreamWithSerializer( S( "word/document.xml" ),
-+ m_pDocumentFS = m_pFilter->openFragmentStreamWithSerializer( S( "word/document.xml" ),
- S( "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" ) );
-
- // the DrawingML access
-diff --git sw/source/filter/ww8/docxexport.hxx sw/source/filter/ww8/docxexport.hxx
-index 06d39a6..5873f95 100644
---- sw/source/filter/ww8/docxexport.hxx
-+++ sw/source/filter/ww8/docxexport.hxx
-@@ -113,7 +113,7 @@ public:
-
- /// Output the actual headers and footers.
- virtual void WriteHeadersFooters( BYTE nHeadFootFlags,
-- const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt );
-+ const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, BYTE nBreakCode );
-
- /// Write the field
- virtual void OutputField( const SwField* pFld, ww::eField eFldType,
-@@ -121,6 +121,7 @@ public:
-
- /// Write the data of the form field
- virtual void WriteFormData( const ::sw::mark::IFieldmark& rFieldmark );
-+ virtual void WriteHyperlinkData( const ::sw::mark::IFieldmark& rFieldmark );
-
- virtual void DoComboBox(const rtl::OUString &rName,
- const rtl::OUString &rHelp,
-@@ -154,7 +155,7 @@ protected:
-
- virtual void AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, ULONG nLnNum );
-
-- virtual void SectionBreaksAndFrames( const SwTxtNode& rNode ) {}
-+ virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) {}
-
- /// Get ready for a new section.
- virtual void PrepareNewPageDesc( const SfxItemSet* pSet,
-diff --git sw/source/filter/ww8/docxexportfilter.cxx sw/source/filter/ww8/docxexportfilter.cxx
-index 3d7d44f..7bc2e78 100644
---- sw/source/filter/ww8/docxexportfilter.cxx
-+++ sw/source/filter/ww8/docxexportfilter.cxx
-@@ -47,7 +47,7 @@ DocxExportFilter::DocxExportFilter( cons
-
- bool DocxExportFilter::exportDocument()
- {
-- OSL_TRACE(, "DocxExportFilter::exportDocument()\n" ); // DEBUG remove me
-+ OSL_TRACE( "DocxExportFilter::exportDocument()\n" ); // DEBUG remove me
-
- // get SwDoc*
- uno::Reference< uno::XInterface > xIfc( getModel(), uno::UNO_QUERY );
-@@ -76,7 +76,7 @@ bool DocxExportFilter::exportDocument()
- aExport.ExportDocument( true ); // FIXME support exporting selection only
- }
-
-- commit();
-+ commitStorage();
-
- // delete the pCurPam
- if ( pCurPam )
-diff --git sw/source/filter/ww8/docxexportfilter.hxx sw/source/filter/ww8/docxexportfilter.hxx
-index e1d0b3d..cf5d5e2 100644
---- sw/source/filter/ww8/docxexportfilter.hxx
-+++ sw/source/filter/ww8/docxexportfilter.hxx
-@@ -30,7 +30,7 @@
-
- #include <oox/core/xmlfilterbase.hxx>
- #include <oox/drawingml/chart/chartconverter.hxx>
--#include <oox/vml/drawing.hxx>
-+#include <oox/vml/vmldrawing.hxx>
-
- #include <com/sun/star/beans/PropertyValue.hpp>
-
-@@ -45,7 +45,7 @@ public:
- virtual bool importDocument() { return false; }
- virtual const ::oox::drawingml::Theme* getCurrentTheme() const { return NULL; }
- virtual sal_Int32 getSchemeClr( sal_Int32 ) const { return 0; }
-- virtual const ::oox::vml::DrawingPtr getDrawings() { return ::oox::vml::DrawingPtr(); }
-+ virtual ::oox::vml::Drawing* getVmlDrawing() { return NULL; }
- virtual ::oox::drawingml::chart::ChartConverter& getChartConverter() { static ::oox::drawingml::chart::ChartConverter aConverter; return aConverter; }
- virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() { return ::oox::drawingml::table::TableStyleListPtr(); }
-
-diff --git sw/source/filter/ww8/makefile.mk sw/source/filter/ww8/makefile.mk
-index b25887e..653c36f 100644
---- sw/source/filter/ww8/makefile.mk
-+++ sw/source/filter/ww8/makefile.mk
-@@ -58,6 +58,7 @@ EXCEPTIONSFILES = \
- $(SLO)$/wrtw8num.obj \
- $(SLO)$/wrtw8sty.obj \
- $(SLO)$/wrtww8.obj \
-+ $(SLO)$/docxexportfilter.obj \
- $(SLO)$/ww8atr.obj \
- $(SLO)$/ww8par.obj \
- $(SLO)$/ww8par6.obj \
-@@ -77,6 +78,9 @@ SLOFILES = \
- $(SLO)$/wrtw8sty.obj \
- $(SLO)$/wrtww8.obj \
- $(SLO)$/wrtww8gr.obj \
-+ $(SLO)$/docxattributeoutput.obj \
-+ $(SLO)$/docxexportfilter.obj \
-+ $(SLO)$/docxexport.obj \
- $(SLO)$/ww8atr.obj \
- $(SLO)$/ww8graf.obj \
- $(SLO)$/ww8graf2.obj \
-diff --git sw/source/filter/ww8/wrtw8sty.cxx sw/source/filter/ww8/wrtw8sty.cxx
-index 651c09e..42b829a 100644
---- sw/source/filter/ww8/wrtw8sty.cxx
-+++ sw/source/filter/ww8/wrtw8sty.cxx
-@@ -697,7 +697,6 @@ bool wwFont::Write(SvStream *pTableStrm) const
- return true;
- }
-
--#ifdef DOCX
- void wwFont::WriteDocx( const DocxAttributeOutput* rAttrOutput ) const
- {
- // no font embedding, panose id, subsetting, ... implemented
-@@ -712,7 +711,6 @@ void wwFont::WriteDocx( const DocxAttributeOutput* rAttrOutput ) const
-
- rAttrOutput->EndFont();
- }
--#endif
-
- void wwFont::WriteRtf( const RtfAttributeOutput* rAttrOutput ) const
- {
-@@ -857,7 +855,6 @@ void wwFontHelper::WriteFontTable(SvStream *pTableStream, WW8Fib& rFib)
- }
- }
-
--#ifdef DOCX
- void wwFontHelper::WriteFontTable( const DocxAttributeOutput& rAttrOutput )
- {
- ::std::vector<const wwFont *> aFontList( AsVector() );
-@@ -865,7 +862,6 @@ void wwFontHelper::WriteFontTable( const DocxAttributeOutput& rAttrOutput )
- ::std::for_each( aFontList.begin(), aFontList.end(),
- ::std::bind2nd( ::std::mem_fun( &wwFont::WriteDocx ), &rAttrOutput ) );
- }
--#endif
-
- void wwFontHelper::WriteFontTable( const RtfAttributeOutput& rAttrOutput )
- {
-diff --git sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/wrtww8.hxx
-index 43211a9..d73ebae 100644
---- sw/source/filter/ww8/wrtww8.hxx
-+++ sw/source/filter/ww8/wrtww8.hxx
-@@ -295,9 +295,7 @@ public:
- wwFont( const String &rFamilyName, FontPitch ePitch, FontFamily eFamily,
- rtl_TextEncoding eChrSet, bool bWrtWW8 );
- bool Write( SvStream *pTableStram ) const;
--#ifdef DOCX
- void WriteDocx( const DocxAttributeOutput* rAttrOutput ) const;
--#endif
- void WriteRtf( const RtfAttributeOutput* rAttrOutput ) const;
- rtl::OUString GetFamilyName() const { return rtl::OUString( msFamilyNm ); }
- friend bool operator < (const wwFont &r1, const wwFont &r2);
-@@ -321,9 +319,7 @@ public:
- USHORT GetId(const SvxFontItem& rFont);
- USHORT GetId(const wwFont& rFont);
- void WriteFontTable( SvStream *pTableStream, WW8Fib& pFib );
--#ifdef DOCX
- void WriteFontTable( const DocxAttributeOutput& rAttrOutput );
--#endif
- void WriteFontTable( const RtfAttributeOutput& rAttrOutput );
-
- /// If true, all fonts are loaded before processing the document.
-diff --git sw/util/makefile.mk sw/util/makefile.mk
-index 2907264..abeec13 100644
---- sw/util/makefile.mk
-+++ sw/util/makefile.mk
-@@ -315,6 +315,8 @@ DEF4NAME=$(SHL4TARGET)
-
- SHL4STDLIBS= \
- $(ISWLIB) \
-+ $(OOXLIB) \
-+ $(SAXLIB) \
- $(SVXCORELIB) \
- $(EDITENGLIB) \
- $(MSFILTERLIB) \
---
-1.7.0.1
-
diff --git a/patches/ooxml/buildfix-oox-depends-on-unotools.diff b/patches/ooxml/buildfix-oox-depends-on-unotools.diff
index eb4e8e8..b17be28 100644
--- a/patches/ooxml/buildfix-oox-depends-on-unotools.diff
+++ b/patches/ooxml/buildfix-oox-depends-on-unotools.diff
@@ -7,8 +7,8 @@ index 345c72e..60c4b02 100644
--- oox/prj/build.lst
+++ oox/prj/build.lst
@@ -1,4 +1,4 @@
--oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
-+oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx xmlscript tools vcl unotools BOOST:boost OPENSSL:openssl NULL
+-oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
++oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx svx xmlscript tools vcl unotools BOOST:boost OPENSSL:openssl NULL
oox oox usr1 - all oox_mkout NULL
oox oox\prj get - all oox_prj NULL
oox oox\source\token nmake - all oox_token NULL
More information about the ooo-build-commit
mailing list