diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-13 12:07:33 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-13 12:16:11 +0200 |
| commit | c7e237045df1e0ed01c47ce85923cd182a101bc7 (patch) | |
| tree | 207f0e5a12ca567d939c4aa3e89661896ce0a944 | |
| parent | 5bf554a89183c983cc492bcdcbc78967f3dbc415 (diff) | |
fdo#58819 VML export: handle objects anchored in the header / footer
Previously such shapes landed in the middle of section properties.
Change-Id: I7993eaa721e2b53d8adb1cbdee40992bbeb11416
| -rw-r--r-- | include/oox/export/vmlexport.hxx | 2 | ||||
| -rw-r--r-- | oox/source/export/vmlexport.cxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 54212a65bccf..4e790c55f96d 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -75,6 +75,8 @@ public: ::sax_fastparser::FSHelperPtr GetFS() { return m_pSerializer; } + void SetFS(::sax_fastparser::FSHelperPtr pSerializer); + /// Export the sdr object as VML. /// /// Call this when you need to export the object as VML. diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index d6623c069f0a..ca5e625cbfa3 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -49,6 +49,11 @@ VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr pSerializer, VMLTextExport* memset( m_pShapeTypeWritten, 0, ESCHER_ShpInst_COUNT * sizeof( bool ) ); } +void VMLExport::SetFS( ::sax_fastparser::FSHelperPtr pSerializer ) +{ + m_pSerializer = pSerializer; +} + VMLExport::~VMLExport() { delete mpOutStrm, mpOutStrm = NULL; diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 40dc957fcb0b..99c646068095 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -599,12 +599,14 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* // switch the serializer to redirect the output to word/styles.xml m_pAttrOutput->SetSerializer( pFS ); + m_pVMLExport->SetFS( pFS ); // do the work WriteHeaderFooterText( rFmt, bHeader ); // switch the serializer back m_pAttrOutput->SetSerializer( m_pDocumentFS ); + m_pVMLExport->SetFS( m_pDocumentFS ); // close the tag sal_Int32 nReference; |