diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-07-24 11:25:16 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-07-24 12:11:12 +0200 |
commit | d978bc31bf821d9698b2fdb5c277b239704d9776 (patch) | |
tree | 6cd1a4e53174bd599bf9c767b657c171c5b1c1a4 /sw/source | |
parent | 41bf9d4cc32436ab3e43e8905236dd61ba511815 (diff) |
MSWordExportBase: handle SfxGrabBagItem
Change-Id: Iace2abaa0e933d7f4abf2feb146698bbf299be38
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/filter/ww8/attributeoutputbase.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 13 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 3 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.hxx | 3 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 8 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8attributeoutput.hxx | 3 |
7 files changed, 38 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index 25ee2a0db8f9..cadce5a67f7a 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -102,6 +102,7 @@ class SvxFmtKeepItem; class SwTextGridItem; class SwFmtLineNumber; class SvxFrameDirectionItem; +class SfxGrabBagItem; class SwFmtRuby; class SwTxtNode; class SwTOXMark; @@ -560,6 +561,9 @@ protected: /// Sfx item RES_FRAMEDIR virtual void FormatFrameDirection( const SvxFrameDirectionItem& ) = 0; + /// Sfx item RES_PARATR_GRABBAG + virtual void ParaGrabBag( const SfxGrabBagItem& ) = 0; + /// Write the expanded field virtual void WriteExpand( const SwField* pFld ) = 0; diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index f4a56087b468..cf95aa2646c2 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -73,6 +73,7 @@ #include <svx/svdobj.hxx> #include <svx/xfillit0.hxx> #include <svx/xflgrit.hxx> +#include <svl/grabbagitem.hxx> #include <sfx2/sfxbasemodel.hxx> #include <anchoredobject.hxx> @@ -5221,6 +5222,18 @@ void DocxAttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDi } } +void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem) +{ + const std::map<OUString, com::sun::star::uno::Any>& rMap = rItem.GetGrabBag(); + for (std::map<OUString, com::sun::star::uno::Any>::const_iterator i = rMap.begin(); i != rMap.end(); ++i) + { + if (i->first == "MirrorIndents") + m_pSerializer->singleElementNS(XML_w, XML_mirrorIndents, FSEND); + else + SAL_INFO("sw.ww8", "DocxAttributeOutput::ParaGrabBag: unhandled grab bag property " << i->first); + } +} + DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML ) : m_rExport( rExport ), m_pSerializer( pSerializer ), diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 316ea6aa6318..2a163a89a485 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -564,6 +564,9 @@ protected: /// Sfx item RES_FRAMEDIR virtual void FormatFrameDirection( const SvxFrameDirectionItem& ); + /// Sfx item RES_PARATR_GRABBAG + virtual void ParaGrabBag( const SfxGrabBagItem& ); + /// Write the expanded field virtual void WriteExpand( const SwField* pFld ); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 4e16660ca7ab..70f19c87ac39 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -3116,6 +3116,10 @@ void RtfAttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir } } +void RtfAttributeOutput::ParaGrabBag(const SfxGrabBagItem& /*rItem*/) +{ +} + void RtfAttributeOutput::WriteExpand( const SwField* pFld ) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index ec5002fbc752..ea115bfa1f02 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -402,6 +402,9 @@ protected: /// Sfx item RES_FRAMEDIR virtual void FormatFrameDirection( const SvxFrameDirectionItem& ); + /// Sfx item RES_PARATR_GRABBAG + virtual void ParaGrabBag( const SfxGrabBagItem& ); + /// Write the expanded field virtual void WriteExpand( const SwField* pFld ); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 62335b3afd08..f8c6eee74ae6 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -30,6 +30,7 @@ #include <svl/zformat.hxx> #include <svl/itemiter.hxx> #include <svl/whiter.hxx> +#include <svl/grabbagitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/tstpitem.hxx> #include <editeng/adjustitem.hxx> @@ -4708,6 +4709,10 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir } } +void WW8AttributeOutput::ParaGrabBag(const SfxGrabBagItem& /*rItem*/) +{ +} + // "Separate paragraphs" void WW8AttributeOutput::ParaSplit( const SvxFmtSplitItem& rSplit ) { @@ -5243,6 +5248,9 @@ void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt ) case RES_FRAMEDIR: FormatFrameDirection( static_cast< const SvxFrameDirectionItem& >( rHt ) ); break; + case RES_PARATR_GRABBAG: + ParaGrabBag(static_cast<const SfxGrabBagItem&>(rHt)); + break; default: SAL_INFO("sw.ww8", "Unhandled SfxPoolItem with id " << rHt.Which() ); diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index d471101277d2..97419ba51a03 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -383,6 +383,9 @@ protected: /// Sfx item RES_FRAMEDIR virtual void FormatFrameDirection( const SvxFrameDirectionItem& ); + /// Sfx item RES_PARATR_GRABBAG + virtual void ParaGrabBag( const SfxGrabBagItem& ); + /// Write the expanded field virtual void WriteExpand( const SwField* pFld ); |