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 | |
| parent | 4a68f12691d4fd77652d824ccb4147e8ce643182 (diff) | |
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')
| -rw-r--r-- | include/filter/msfilter/escherex.hxx | 4 | ||||
| -rw-r--r-- | include/oox/export/vmlexport.hxx | 2 | ||||
| -rw-r--r-- | include/oox/vml/vmlshape.hxx | 2 |
3 files changed, 6 insertions, 2 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(); } diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 876ff7ba9b66..bc7bf294b09e 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -133,7 +133,7 @@ private: void AddLineDimensions( const Rectangle& rRectangle ); /// Add position and size to the OStringBuffer. - void AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle ); + void AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle, sal_Bool rbAbsolutePos = true ); }; } // namespace vml diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index fcfb9671c643..e45c87d1139b 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -84,6 +84,7 @@ struct OOX_DLLPUBLIC ShapeTypeModel sal_Bool mbVisible; ///< Visible or Hidden OUString maWrapStyle; ///< Wrapping mode for text. OUString maArcsize; ///< round rectangles arc size + OUString maEditAs; ///< Edit As type (e.g. "canvas" etc) StrokeModel maStrokeModel; ///< Border line formatting. FillModel maFillModel; ///< Shape fill formatting. @@ -205,6 +206,7 @@ struct ShapeModel OUString maControl1; ///< Bezier control point 1 OUString maControl2; ///< Bezier control point 2 OUString maVmlPath; ///< VML path for this shape + OUString maEditAs; ///< VML EditAs for shape explicit ShapeModel(); ~ShapeModel(); |