diff options
| author | Ravindra Vidhate <ravindra.vidhate@synerzip.com> | 2014-03-05 11:38:22 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-11 10:57:46 +0100 |
| commit | ff2f55d6f0a515c8c6e4186e124db28cc4056f5b (patch) | |
| tree | cf53a7880d6cc179a489e2818e38a98295945a70 /include | |
| parent | e895da0420253c7d3e1b9bff3abb339bb9dc1218 (diff) | |
fdo#35324: Text and picture water are not imported and not preserved in RT.
Problem : Open docx file which has Text/Picture as water mark.
1. The text is not imported properly also picture water mark is also considered as shape.
2. It writes the watermarks in Document.xml, while it should write in only Header.xml.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8457
Change-Id: Ic988858da25a4cba3ae16e614d920e2e16053a5f
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/export/vmlexport.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 2b414c0d81be..744dbbd1bf05 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -90,7 +90,7 @@ public: sal_Int16 eVOri = -1, sal_Int16 eHRel = -1, sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0, const sal_Bool bOOxmlExport = false ); virtual void AddSdrObjectVMLObject( const SdrObject& rObj); - + static bool IsWaterMarkShape(const OUString& rStr); protected: /// Add an attribute to the generated <v:shape/> element. /// |