diff options
| author | Nikhil Walvekar <nikhil.walvekar@synerzip.com> | 2013-11-29 14:03:46 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-13 11:49:35 +0000 |
| commit | 8fe352be80ff69552f622f3c7a6a6f269912ab71 (patch) | |
| tree | d3fd939ca45176ba60782726f9a5caef5a30abac /include | |
| parent | 5ee74052edd7e83318a51ee0297607773b451a98 (diff) | |
fdo#65836 Do not compress WMF / EMF file incase of OOXML export
Change-Id: Ic498e5703ab48719f998be6da3f245843cc0979d
Reviewed-on: https://gerrit.libreoffice.org/6849
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/filter/msfilter/escherex.hxx | 8 | ||||
| -rw-r--r-- | include/oox/export/vmlexport.hxx | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 5cc33c6111d7..e24996cd9521 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1095,7 +1095,8 @@ public: const OString& rGraphicId, const Rectangle& rBoundRect, const com::sun::star::awt::Rectangle* pVisArea = NULL, - const GraphicAttr* pGrafikAttr = NULL + const GraphicAttr* pGrafikAttr = NULL, + const sal_Bool ooxmlExport = false ); sal_Bool HasGraphics() const { return mnBlibEntrys != 0; }; @@ -1259,7 +1260,8 @@ public: const OUString& rSource, const sal_Bool bCreateFillBitmap, const sal_Bool bCreateCroppingAttributes = sal_False, - const sal_Bool bFillBitmapModeAllowed = sal_True + const sal_Bool bFillBitmapModeAllowed = sal_True, + const sal_Bool bOOxmlExport = false ); sal_Bool CreateBlipPropertiesforOLEControl( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape); @@ -1682,7 +1684,7 @@ public: void AddUnoShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ); /// returns the ShapeID - sal_uInt32 AddSdrObject( const SdrObject& rObj ); + sal_uInt32 AddSdrObject( const SdrObject& rObj, bool ooxmlExport = false ); /// If objects are written through AddSdrObject the /// SolverContainer has to be written, and maybe some diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 8121e3bcca46..876ff7ba9b66 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -88,7 +88,7 @@ public: /// Call this when you need to export the object as VML. sal_uInt32 AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1, sal_Int16 eVOri = -1, sal_Int16 eHRel = -1, - sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0 ); + sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0, const sal_Bool bOOxmlExport = false ); protected: /// Add an attribute to the generated <v:shape/> element. |