diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-06 14:46:21 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-06 14:54:15 +0200 |
commit | 96965fb39d6d376e91030a01c11f16f9428ddf2e (patch) | |
tree | 310ab31e5e210d75c2a51e6a4fbdb384da810eef /sw/source/filter/ww8/docxsdrexport.hxx | |
parent | 3b8ce44eba33b04773efe4806583a746233a25c9 (diff) |
DOCX drawingML export: don't export textboxes of shapes twice
We already had code, so that in case a shape has a textbox, then we
wrote the textbox contents as the shape text, but textboxes were still
exported independently as well.
Build a list of textboxes at the start of the export, and ignore
anything that's on that list during export. In the future, if both RTF
and DOC will support textboxes, then this can be moved to
MSWordExportBase.
Change-Id: I9370b2bbda515ef605281ad398a358b2f24d8f0e
Diffstat (limited to 'sw/source/filter/ww8/docxsdrexport.hxx')
-rw-r--r-- | sw/source/filter/ww8/docxsdrexport.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx b/sw/source/filter/ww8/docxsdrexport.hxx index c05979fd5ba5..5cda344ba7c0 100644 --- a/sw/source/filter/ww8/docxsdrexport.hxx +++ b/sw/source/filter/ww8/docxsdrexport.hxx @@ -97,6 +97,8 @@ public: void writeVMLTextFrame(sw::Frame* pParentFrame); /// Undo the text direction mangling done by the frame btLr handler in writerfilter::dmapper::DomainMapper::lcl_startCharacterGroup() bool checkFrameBtlr(SwNode* pStartNode, sax_fastparser::FastAttributeList* pTextboxAttrList = 0); + /// Is this a standalone TextFrame, or used as a TextBox of a shape? + bool isTextBox(const SwFrmFmt& rFrmFmt); }; #endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXSDREXPORT_HXX |