diff options
| author | Vinaya Mandke <vinaya.mandke@synerzip.com> | 2014-01-08 18:54:51 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-13 17:48:18 +0100 |
| commit | c4ff46485f0461de6a2804ae859dbbc81b6af105 (patch) | |
| tree | b314c4ec6ea2da7ddf85c5f091a7755e5c9d9a83 /include/filter/msfilter | |
| parent | Renamed 'SwRedline' to 'SwRangeRedline' (diff) | |
| download | core-c4ff46485f0461de6a2804ae859dbbc81b6af105.tar.gz core-c4ff46485f0461de6a2804ae859dbbc81b6af105.zip | |
fdo#65833 Fix to preserve VML Canvas Information
Grab-bagged the "editas" attribute of v:group and added UT for
the same
Please verify this fix on MS Office 2007 as it renders the mc:Fallback VML part
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7335
Change-Id: I4e4456997621089967514009005ee775b71d6d69
Diffstat (limited to 'include/filter/msfilter')
| -rw-r--r-- | include/filter/msfilter/escherex.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index e24996cd9521..d69e49d04674 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1588,6 +1588,7 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable sal_Bool mbEscherDg; sal_Bool mbOleEmf; // OLE is EMF instead of WMF bool mbOOXML; + OUString mEditAs; virtual sal_Bool DoSeek( sal_uInt32 nKey ); @@ -1643,7 +1644,8 @@ public: sal_Bool SeekToPersistOffset( sal_uInt32 nKey ); virtual sal_Bool InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ); // nValue is being inserted into the Stream where it's appropriate (overwrite modus), without that the // current StreamPosition changes - + void SetEditAs( OUString rEditAs ); + rtl::OUString GetEditAs() { return mEditAs; } SvStream& GetStream() const { return *mpOutStrm; } sal_uLong GetStreamPos() const { return mpOutStrm->Tell(); } |