[ooo-build-commit] .: 2 commits - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon May 10 05:24:54 PDT 2010
patches/dev300/apply | 4 -
patches/dev300/docx-fixes02.diff | 59 +++++++++------
patches/dev300/ooxml-filters.diff | 143 ++++++++++++++++++++++++++++++++------
3 files changed, 160 insertions(+), 46 deletions(-)
New commits:
commit 8d080b5109a9f8765e5ee3a60d4bcaeba643c94c
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon May 10 14:23:02 2010 +0200
Enhanced ooxml-filters.diff and unapplied it
* patches/dev300/apply:
Moved the ooxml-filters.diff into some experimental section
* patches/dev300/ooxml-filters.diff:
Using FileFormatVersion value to distinguish the OOXML versions
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 73c1102..aca4c02 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2268,8 +2268,6 @@ oox-pptx-import-fix-subtitle-placeholder.diff, n#480243, rodo
oox-pptx-import-fix-text-body-vert.diff, n#479829, rodo
oox-pptx-import-fix-hidden-slides.diff, n#480229, rodo
-ooxml-filters.diff, cbosdo
-
# FIXME: 2009-08-12: Does not apply, upstream code refactored, not
# clear what to do. --tml
# oox-import-zoom-setting-with-tab-color.diff, n#494603, janneke
@@ -3307,6 +3305,8 @@ xlsx-shared-oox-calc-export-sotstorage-init.diff
xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
#xlsx-shared-xlsx-export-perf-rowbuffer.diff
+ooxml-filters.diff, cbosdo
+
[ OOXMLExport ]
# hack to ignore writerfilter when odf-converter is present
odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
diff --git a/patches/dev300/ooxml-filters.diff b/patches/dev300/ooxml-filters.diff
index 142b827..07ec7cd 100644
--- a/patches/dev300/ooxml-filters.diff
+++ b/patches/dev300/ooxml-filters.diff
@@ -1,18 +1,20 @@
-Add OOXML Import / Export filter in the UI
+Adding ISO OOXML filters
From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
---
- filter/source/config/fragments/fcfg_writer.mk | 12 +++++++++---
- .../source/config/fragments/filters/OOXML_Text.xcu | 13 +++++++++++++
- .../fragments/filters/OOXML_Text_Template.xcu | 13 +++++++++++++
- .../fragments/filters/OOXML_Text_Template_ui.xcu | 6 ++++++
- .../config/fragments/filters/OOXML_Text_ui.xcu | 6 ++++++
- .../source/config/fragments/types/writer_OOXML.xcu | 12 ++++++++++++
- .../fragments/types/writer_OOXML_Template.xcu | 12 ++++++++++++
- 7 files changed, 71 insertions(+), 3 deletions(-)
+ filter/source/config/fragments/fcfg_writer.mk | 12 ++++++---
+ .../source/config/fragments/filters/OOXML_Text.xcu | 14 ++++++++++
+ .../fragments/filters/OOXML_Text_Template.xcu | 14 ++++++++++
+ .../fragments/filters/OOXML_Text_Template_ui.xcu | 6 ++++
+ .../config/fragments/filters/OOXML_Text_ui.xcu | 6 ++++
+ .../source/config/fragments/types/writer_OOXML.xcu | 12 +++++++++
+ .../fragments/types/writer_OOXML_Template.xcu | 12 +++++++++
+ oox/inc/oox/core/filterbase.hxx | 7 +++++
+ oox/source/core/filterbase.cxx | 28 ++++++++++++++++++++
+ 9 files changed, 108 insertions(+), 3 deletions(-)
create mode 100644 filter/source/config/fragments/filters/OOXML_Text.xcu
create mode 100644 filter/source/config/fragments/filters/OOXML_Text_Template.xcu
create mode 100644 filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu
@@ -60,39 +62,41 @@ index a10cefb..df4b7cf 100644
# count = 0
diff --git filter/source/config/fragments/filters/OOXML_Text.xcu filter/source/config/fragments/filters/OOXML_Text.xcu
new file mode 100644
-index 0000000..2518e46
+index 0000000..9943af5
--- /dev/null
+++ filter/source/config/fragments/filters/OOXML_Text.xcu
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,14 @@
+ <node oor:name="Office Open XML Text" oor:op="replace">
+ <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>OOXML</value></prop>
++ <prop oor:name="UserData"><value></value></prop>
+ <prop oor:name="UIName">
+ <value xml:lang="x-default">Office Open XML Text</value>
+ </prop>
-+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
++ <!-- ISO/IEC 29500:2008 -->
++ <prop oor:name="FileFormatVersion"><value>1</value></prop>
+ <prop oor:name="Type"><value>writer_OOXML</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+ </node>
diff --git filter/source/config/fragments/filters/OOXML_Text_Template.xcu filter/source/config/fragments/filters/OOXML_Text_Template.xcu
new file mode 100644
-index 0000000..afad41d
+index 0000000..ffc9dfd
--- /dev/null
+++ filter/source/config/fragments/filters/OOXML_Text_Template.xcu
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,14 @@
+ <node oor:name="Office Open XML Text Template" oor:op="replace">
+ <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
-+ <prop oor:name="UserData"><value>OOXML</value></prop>
++ <prop oor:name="UserData"><value></value></prop>
+ <prop oor:name="UIName">
+ <value xml:lang="x-default">Office Open XML Text Template</value>
+ </prop>
-+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
-+ <prop oor:name="Type"><value>writer_OOXML_Template</value></prop>
++ <!-- ISO/IEC 29500:2008 -->
++ <prop oor:name="FileFormatVersion"><value>1</value></prop>
++ <prop oor:name="Type"><value>writer_OOXML_Text_Template</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+ </node>
@@ -122,7 +126,7 @@ index 0000000..483f23d
+ </node>
diff --git filter/source/config/fragments/types/writer_OOXML.xcu filter/source/config/fragments/types/writer_OOXML.xcu
new file mode 100644
-index 0000000..e2342cf
+index 0000000..346b00e
--- /dev/null
+++ filter/source/config/fragments/types/writer_OOXML.xcu
@@ -0,0 +1,12 @@
@@ -132,7 +136,7 @@ index 0000000..e2342cf
+ <prop oor:name="Extensions"><value>docx docm</value></prop>
+ <prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.wordprocessingml.document</value></prop>
+ <prop oor:name="Preferred"><value>true</value></prop>
-+ <prop oor:name="PreferredFilter"><value>Office Open XML Text Document</value></prop>
++ <prop oor:name="PreferredFilter"><value>Office Open XML Text</value></prop>
+ <prop oor:name="UIName">
+ <value>Office Open XML Text Document</value>
+ </prop>
@@ -156,3 +160,102 @@ index 0000000..566e08d
+ </prop>
+ <prop oor:name="ClipboardFormat"><value>MSWordDoc</value></prop>
+ </node>
+diff --git oox/inc/oox/core/filterbase.hxx oox/inc/oox/core/filterbase.hxx
+index d96c1ab..b896a9b 100644
+--- oox/inc/oox/core/filterbase.hxx
++++ oox/inc/oox/core/filterbase.hxx
+@@ -75,6 +75,12 @@ namespace core {
+
+ // ============================================================================
+
++enum OoxmlVersion
++{
++ ECMA_DIALECT,
++ ISOIEC_29500_2008
++};
++
+ struct FilterBaseImpl;
+
+ typedef ::cppu::WeakImplHelper5<
+@@ -282,6 +288,7 @@ protected:
+ implGetInputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const;
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
+ implGetOutputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const;
++ OoxmlVersion getVersion( );
+
+ private:
+ void setMediaDescriptor(
+diff --git oox/source/core/filterbase.cxx oox/source/core/filterbase.cxx
+index 4dc3451..d360bda 100644
+--- oox/source/core/filterbase.cxx
++++ oox/source/core/filterbase.cxx
+@@ -28,6 +28,7 @@
+ #include "oox/core/filterbase.hxx"
+ #include <set>
+ #include <com/sun/star/awt/XDevice.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
+ #include <com/sun/star/frame/XFramesSupplier.hpp>
+ #include <com/sun/star/frame/XModel.hpp>
+ #include <com/sun/star/task/XStatusIndicator.hpp>
+@@ -70,6 +71,7 @@ using ::com::sun::star::task::XStatusIndicator;
+ using ::com::sun::star::drawing::XShape;
+ using ::com::sun::star::task::XInteractionHandler;
+ using ::com::sun::star::graphic::XGraphic;
++using ::com::sun::star::container::XNameAccess;
+ using ::comphelper::MediaDescriptor;
+ using ::comphelper::SequenceAsHashMap;
+ using ::oox::ole::OleObjectHelper;
+@@ -149,6 +151,7 @@ struct FilterBaseImpl
+ DeviceInfo maDeviceInfo;
+ OUString maFileUrl;
+ StorageRef mxStorage;
++ OoxmlVersion meVersion;
+
+ GraphicHelperRef mxGraphicHelper; /// Graphic and graphic object handling.
+ ModelObjHelperRef mxModelObjHelper; /// Tables to create new named drawing objects.
+@@ -178,6 +181,7 @@ struct FilterBaseImpl
+
+ FilterBaseImpl::FilterBaseImpl( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
+ meDirection( FILTERDIRECTION_UNKNOWN ),
++ meVersion( ECMA_DIALECT ),
+ mxGlobalFactory( rxGlobalFactory )
+ {
+ OSL_ENSURE( mxGlobalFactory.is(), "FilterBaseImpl::FilterBaseImpl - missing service factory" );
+@@ -292,6 +296,11 @@ bool FilterBase::isExportFilter() const
+ return mxImpl->meDirection == FILTERDIRECTION_EXPORT;
+ }
+
++OoxmlVersion FilterBase::getVersion( )
++{
++ return mxImpl->meVersion;
++}
++
+ // ----------------------------------------------------------------------------
+
+ Any FilterBase::getArgument( const OUString& rArgName ) const
+@@ -675,6 +684,25 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
+ mxImpl->mxStatusIndicator = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >() );
+ mxImpl->mxInteractionHandler = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_INTERACTIONHANDLER(), Reference< XInteractionHandler >() );
+ mxImpl->mxParentShape = mxImpl->maMediaDesc.getUnpackedValueOrDefault( CREATE_OUSTRING( "ParentShape" ), mxImpl->mxParentShape );
++
++ // Check for ISO OOXML
++ OUString sFilterName = mxImpl->maMediaDesc.getUnpackedValueOrDefault( CREATE_OUSTRING( "FilterName" ), OUString() );
++ try
++ {
++ Reference< XNameAccess > xFilters( getGlobalFactory()->createInstance(
++ CREATE_OUSTRING( "com.sun.star.document.FilterFactory" ) ), UNO_QUERY_THROW );
++ Any aValues = xFilters->getByName( sFilterName );
++ Sequence<PropertyValue > aPropSeq;
++ aValues >>= aPropSeq;
++ SequenceAsHashMap aProps( aPropSeq );
++
++ sal_Int32 nVersion = aProps.getUnpackedValueOrDefault( CREATE_OUSTRING( "FileFormatVersion" ), sal_Int32( 0 ) );
++ mxImpl->meVersion = OoxmlVersion( nVersion );
++ }
++ catch ( Exception& )
++ {
++ // Not ISO OOXML
++ }
+ }
+
+
commit 6264126e4feea97570231868c29d6186988405d2
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Fri May 7 15:09:10 2010 +0200
Exported the <w:lid> for Ruby in docx
* patches/dev300/docx-fixes02.diff:
diff --git a/patches/dev300/docx-fixes02.diff b/patches/dev300/docx-fixes02.diff
index 57c0626..2142632 100644
--- a/patches/dev300/docx-fixes02.diff
+++ b/patches/dev300/docx-fixes02.diff
@@ -8,15 +8,15 @@ From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
sax/source/tools/fastserializer.cxx | 45 +++
sax/source/tools/fastserializer.hxx | 7
sw/source/filter/ww8/attributeoutputbase.hxx | 5
- sw/source/filter/ww8/docxattributeoutput.cxx | 393 +++++++++++++++++++++++---
+ sw/source/filter/ww8/docxattributeoutput.cxx | 404 +++++++++++++++++++++++---
sw/source/filter/ww8/docxattributeoutput.hxx | 8 -
sw/source/filter/ww8/makefile.mk | 1
sw/source/filter/ww8/wrtw8nds.cxx | 88 +-----
sw/source/filter/ww8/wrtw8sty.cxx | 15 +
- sw/source/filter/ww8/wrtww8.hxx | 69 +++++
+ sw/source/filter/ww8/wrtww8.hxx | 69 ++++
sw/source/filter/ww8/ww8atr.cxx | 25 --
sw/source/filter/ww8/ww8attributeoutput.hxx | 5
- 11 files changed, 514 insertions(+), 147 deletions(-)
+ 11 files changed, 525 insertions(+), 147 deletions(-)
diff --git sax/source/tools/fastserializer.cxx sax/source/tools/fastserializer.cxx
@@ -138,10 +138,10 @@ index c005746..1ec45f6 100644
/// End of a style in the styles table.
virtual void EndStyle() = 0;
diff --git sw/source/filter/ww8/docxattributeoutput.cxx sw/source/filter/ww8/docxattributeoutput.cxx
-index ce74da7..42afc15 100644
+index ce74da7..cc4dfca 100644
--- sw/source/filter/ww8/docxattributeoutput.cxx
+++ sw/source/filter/ww8/docxattributeoutput.cxx
-@@ -31,6 +31,12 @@
+@@ -31,6 +31,13 @@
#include "writerwordglue.hxx"
#include "wrtww8.hxx"
#include "ww8par.hxx"
@@ -151,10 +151,11 @@ index ce74da7..42afc15 100644
+#include "tgrditem.hxx"
+#include "fmtruby.hxx"
+#include "charfmt.hxx"
++#include "breakit.hxx"
#include <oox/core/tokens.hxx>
#include <oox/export/drawingml.hxx>
-@@ -213,6 +219,25 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
+@@ -213,6 +220,25 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
FinishTableRowCell( pTextNodeInfoInner );
m_bParagraphOpened = false;
@@ -180,7 +181,7 @@ index ce74da7..42afc15 100644
}
void DocxAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool bForceEmptyParagraph )
-@@ -292,6 +317,14 @@ void DocxAttributeOutput::InitCollectedParagraphProperties()
+@@ -292,6 +318,14 @@ void DocxAttributeOutput::InitCollectedParagraphProperties()
void DocxAttributeOutput::WriteCollectedParagraphProperties()
{
@@ -195,7 +196,7 @@ index ce74da7..42afc15 100644
if ( m_pSpacingAttrList )
{
XFastAttributeListRef xAttrList( m_pSpacingAttrList );
-@@ -755,11 +788,59 @@ void DocxAttributeOutput::RawText( const String& /*rText*/, bool /*bForceUnicode
+@@ -755,11 +789,69 @@ void DocxAttributeOutput::RawText( const String& /*rText*/, bool /*bForceUnicode
#endif
}
@@ -211,6 +212,16 @@ index ce74da7..42afc15 100644
+ // hpsBaseText
+ // hpsRaise
+ // lid
++ lang::Locale aLocale( SwBreakIt::Get()->GetLocale(
++ rNode.GetLang( nPos ) ) );
++ OUString sLang( aLocale.Language );
++ if ( aLocale.Country.getLength( ) > 0 )
++ sLang += OUString::createFromAscii( "-" ) + OUString( aLocale.Country );
++ m_pSerializer->singleElementNS( XML_w, XML_lid,
++ FSNS( XML_w, XML_val ),
++ OUStringToOString( sLang, RTL_TEXTENCODING_UTF8 ).getStr( ), FSEND );
++
++
+ OString sAlign ( "center" );
+ switch ( rRuby.GetAdjustment( ) )
+ {
@@ -256,7 +267,7 @@ index ce74da7..42afc15 100644
}
void DocxAttributeOutput::EndRuby()
-@@ -767,6 +848,9 @@ void DocxAttributeOutput::EndRuby()
+@@ -767,6 +859,9 @@ void DocxAttributeOutput::EndRuby()
#if OSL_DEBUG_LEVEL > 0
fprintf( stderr, "TODO DocxAttributeOutput::EndRuby()\n" );
#endif
@@ -266,7 +277,7 @@ index ce74da7..42afc15 100644
}
bool DocxAttributeOutput::AnalyzeURL( const String& rUrl, const String& rTarget, String* pLinkURL, String* pMark )
-@@ -1810,6 +1894,12 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
+@@ -1810,6 +1905,12 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
WriteOLE2Obj( pSdrObj, rFrame.GetLayoutSize() );
}
break;
@@ -279,7 +290,7 @@ index ce74da7..42afc15 100644
default:
#if OSL_DEBUG_LEVEL > 0
fprintf( stderr, "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Point& rNdTopLeft ) - frame type '%s'\n",
-@@ -1824,7 +1914,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
+@@ -1824,7 +1925,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
}
void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
@@ -288,7 +299,7 @@ index ce74da7..42afc15 100644
{
OString aStyle( "style" );
-@@ -1847,6 +1937,9 @@ void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
+@@ -1847,6 +1948,9 @@ void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
m_pSerializer->singleElementNS( XML_w, XML_next,
FSNS( XML_w, XML_val ), ( aStyle + OString::valueOf( sal_Int32( nNext ) ) ).getStr(),
FSEND );
@@ -298,7 +309,7 @@ index ce74da7..42afc15 100644
}
void DocxAttributeOutput::EndStyle()
-@@ -2364,11 +2457,43 @@ void DocxAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
+@@ -2364,11 +2468,43 @@ void DocxAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
}
}
@@ -347,7 +358,7 @@ index ce74da7..42afc15 100644
}
void DocxAttributeOutput::CharFont( const SvxFontItem& rFont)
-@@ -2400,7 +2525,7 @@ void DocxAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
+@@ -2400,7 +2536,7 @@ void DocxAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
void DocxAttributeOutput::CharKerning( const SvxKerningItem& rKerning )
{
OString aKerning = OString::valueOf( ( sal_Int32 ) rKerning.GetValue() );
@@ -356,7 +367,7 @@ index ce74da7..42afc15 100644
}
void DocxAttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage )
-@@ -2653,11 +2778,12 @@ void DocxAttributeOutput::TextINetFormat( const SwFmtINetFmt& rLink )
+@@ -2653,11 +2789,12 @@ void DocxAttributeOutput::TextINetFormat( const SwFmtINetFmt& rLink )
m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
}
@@ -373,7 +384,7 @@ index ce74da7..42afc15 100644
}
void DocxAttributeOutput::RefField( const SwField& rFld, const String& rRef )
-@@ -3071,9 +3197,22 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
+@@ -3071,9 +3208,22 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
{
if ( m_rExport.bOutFlyFrmAttrs )
{
@@ -399,7 +410,7 @@ index ce74da7..42afc15 100644
}
else if ( m_rExport.bOutPageDescs )
{
-@@ -3103,9 +3242,12 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
+@@ -3103,9 +3253,12 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
{
if ( m_rExport.bOutFlyFrmAttrs )
{
@@ -415,7 +426,7 @@ index ce74da7..42afc15 100644
}
else if ( m_rExport.bOutPageDescs )
{
-@@ -3146,11 +3288,17 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
+@@ -3146,11 +3299,17 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
{
@@ -434,7 +445,7 @@ index ce74da7..42afc15 100644
}
else if (m_rExport.bOutPageDescs )
{
-@@ -3192,32 +3340,150 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
+@@ -3192,32 +3351,150 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
}
}
@@ -600,7 +611,7 @@ index ce74da7..42afc15 100644
}
void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
-@@ -3229,10 +3495,6 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
+@@ -3229,10 +3506,6 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
FSNS( XML_w, XML_fill ), sColor.getStr( ),
FSEND );
}
@@ -611,7 +622,7 @@ index ce74da7..42afc15 100644
}
void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox )
-@@ -3315,11 +3577,52 @@ void DocxAttributeOutput::FormatKeep( const SvxFmtKeepItem& )
+@@ -3315,11 +3588,52 @@ void DocxAttributeOutput::FormatKeep( const SvxFmtKeepItem& )
m_pSerializer->singleElementNS( XML_w, XML_keepNext, FSEND );
}
@@ -668,7 +679,7 @@ index ce74da7..42afc15 100644
}
void DocxAttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering )
-@@ -3377,6 +3680,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
+@@ -3377,6 +3691,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
m_pCharLangAttrList( NULL ),
m_pSpacingAttrList( NULL ),
m_pHyperlinkAttrList( NULL ),
@@ -676,7 +687,7 @@ index ce74da7..42afc15 100644
m_pFootnotesList( new ::docx::FootnotesList() ),
m_pEndnotesList( new ::docx::FootnotesList() ),
m_pSectionInfo( NULL ),
-@@ -3389,7 +3693,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
+@@ -3389,7 +3704,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
m_bTableCellOpen( false ),
m_nTableDepth( 0 ),
m_bParagraphOpened( false ),
@@ -686,7 +697,7 @@ index ce74da7..42afc15 100644
{
}
-@@ -3400,11 +3705,13 @@ DocxAttributeOutput::~DocxAttributeOutput()
+@@ -3400,11 +3716,13 @@ DocxAttributeOutput::~DocxAttributeOutput()
delete m_pCharLangAttrList, m_pCharLangAttrList = NULL;
delete m_pSpacingAttrList, m_pSpacingAttrList = NULL;
delete m_pHyperlinkAttrList, m_pHyperlinkAttrList = NULL;
More information about the ooo-build-commit
mailing list