summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNikhil Walvekar <nikhil.walvekar@synerzip.com>2013-11-29 14:03:46 +0530
committerAndras Timar <andras.timar@collabora.com>2014-09-17 10:04:06 +0000
commit6f87913d843a97963703721506495bd57af36461 (patch)
treee995c84a370fbc9c1c8075dbe3c4d422b48b9236 /oox
parent23a817342f264bde5b6d4cb6b00b298c7b930430 (diff)
fdo#65836 bnc#621241 Do not compress WMF / EMF file incase of OOXML export
(cherry picked from commit 8fe352be80ff69552f622f3c7a6a6f269912ab71) Change-Id: Ic498e5703ab48719f998be6da3f245843cc0979d Reviewed-on: https://gerrit.libreoffice.org/11426 Reviewed-by: Nikhil Walvekar <nikhil.walvekar@synerzip.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/vmlexport.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index f87e773c112d..2cf460664a95 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -1048,7 +1048,7 @@ void VMLExport::EndShape( sal_Int32 nShapeElement )
}
}
-sal_uInt32 VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel, const Point* pNdTopLeft )
+sal_uInt32 VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel, const Point* pNdTopLeft, const sal_Bool bOOxmlExport )
{
m_pSdrObject = &rObj;
m_eHOri = eHOri;
@@ -1056,7 +1056,7 @@ sal_uInt32 VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri, sal_
m_eHRel = eHRel;
m_eVRel = eVRel;
m_pNdTopLeft = pNdTopLeft;
- return EscherEx::AddSdrObject(rObj);
+ return EscherEx::AddSdrObject(rObj, bOOxmlExport);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */