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 /include | |
| 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 'include')
| -rw-r--r-- | include/svx/svdstr.hrc | 6 | ||||
| -rw-r--r-- | include/vcl/vectorgraphicdata.hxx | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc index 90163609b02f..69bc66a44417 100644 --- a/include/svx/svdstr.hrc +++ b/include/svx/svdstr.hrc @@ -159,8 +159,12 @@ // Svg support #define STR_ObjNameSingulGRAFSVG (STR_ObjNameBegin + 147) #define STR_ObjNamePluralGRAFSVG (STR_ObjNameBegin + 148) +#define STR_ObjNameSingulGRAFWMF (STR_ObjNameBegin + 149) +#define STR_ObjNamePluralGRAFWMF (STR_ObjNameBegin + 150) +#define STR_ObjNameSingulGRAFEMF (STR_ObjNameBegin + 151) +#define STR_ObjNamePluralGRAFEMF (STR_ObjNameBegin + 152) -#define STR_ObjNameEnd (STR_ObjNamePluralGRAFSVG) +#define STR_ObjNameEnd (STR_ObjNamePluralGRAFEMF) #define STR_EditBegin (STR_ObjNameEnd+1) #define STR_EditWithCopy (STR_EditBegin + 0) diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx index f46be43489db..6a259a5567e3 100644 --- a/include/vcl/vectorgraphicdata.hxx +++ b/include/vcl/vectorgraphicdata.hxx @@ -74,11 +74,14 @@ public: VectorGraphicData( const VectorGraphicDataArray& rVectorGraphicDataArray, const OUString& rPath, - VectorGraphicDataType eVectorDataType); // = VectorGraphicDataType::Svg); + VectorGraphicDataType eVectorDataType); VectorGraphicData( const OUString& rPath, VectorGraphicDataType eVectorDataType); + /// compare op + bool operator==(const VectorGraphicData& rCandidate) const; + /// data read const VectorGraphicDataArray& getVectorGraphicDataArray() const { return maVectorGraphicDataArray; } sal_uInt32 getVectorGraphicDataArrayLength() const { return maVectorGraphicDataArray.getLength(); } |