diff options
author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-06-12 15:27:16 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-07-15 11:01:29 +0200 |
commit | 5868745db74ae930edb0058490076d82aaeafbe9 (patch) | |
tree | 78bea29cb44b770d9e3affef2a303d0d38722d85 /svx/source/svdraw/svdograf.cxx | |
parent | 83535a28c57ffb59f795dd35332d6b3426071e32 (diff) |
emfplus: make VectorFormats Emf/Wmf/Svg work
make complete turn around and internal buffering
for Emf/Wmf/Svg work, including images in ODF and
re-save from UI. The correct FileType has to be
determined. It has shown that *.wmf exist that really
contain *.emf, so this turn around will not alter
the binary data, but may change the mimetype
Change-Id: I4fd92629236c12114f7b7c30234a3d3a9917dfaf
Diffstat (limited to 'svx/source/svdraw/svdograf.cxx')
-rw-r--r-- | svx/source/svdraw/svdograf.cxx | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 0bf050507bd5..82bdf58a2f70 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -748,7 +748,24 @@ OUString SdrGrafObj::TakeObjNameSingul() const if(rVectorGraphicDataPtr.get()) { - sName.append(ImpGetResStr(STR_ObjNameSingulGRAFSVG)); + switch (rVectorGraphicDataPtr->getVectorGraphicDataType()) + { + case VectorGraphicDataType::Wmf: + { + sName.append(ImpGetResStr(STR_ObjNameSingulGRAFWMF)); + break; + } + case VectorGraphicDataType::Emf: + { + sName.append(ImpGetResStr(STR_ObjNameSingulGRAFEMF)); + break; + } + default: // case VectorGraphicDataType::Svg: + { + sName.append(ImpGetResStr(STR_ObjNameSingulGRAFSVG)); + break; + } + } } else { @@ -801,7 +818,24 @@ OUString SdrGrafObj::TakeObjNamePlural() const if(rVectorGraphicDataPtr.get()) { - sName.append(ImpGetResStr(STR_ObjNamePluralGRAFSVG)); + switch (rVectorGraphicDataPtr->getVectorGraphicDataType()) + { + case VectorGraphicDataType::Wmf: + { + sName.append(ImpGetResStr(STR_ObjNamePluralGRAFWMF)); + break; + } + case VectorGraphicDataType::Emf: + { + sName.append(ImpGetResStr(STR_ObjNamePluralGRAFEMF)); + break; + } + default: // case VectorGraphicDataType::Svg: + { + sName.append(ImpGetResStr(STR_ObjNamePluralGRAFSVG)); + break; + } + } } else { |