diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-06-09 19:55:17 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-07-15 11:01:29 +0200 |
| commit | 83535a28c57ffb59f795dd35332d6b3426071e32 (patch) | |
| tree | a35406c5ed8c7971681385cbb081aad325e1cf54 /sd/source | |
| parent | 79f5cb620984c4d04d53a497e698472b2192d2bb (diff) | |
emfplus: create a wmf/emf/emf+ primitive based importer
First steps to organize an importer that can read/interpret
wmf/emf/emf+ and deliver a primitive representation for
the content by parsing it. Use the same mechanisms as
already applied for Svg, so to reuse abilities to keep
original binary data to allow save again and embedding in
files and have an implemented replacement bitmap based
representation. For this, unify the used helper classes
to handle more than just Svg. For 1st try, add test code
and static bool switches
Change-Id: I6e0a82943541d811a8f8d65a84115569fcd8cee7
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews7.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index c144cf9ea251..51bcc0a2388c 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -711,9 +711,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj* >(mpDrawView->GetMarkedObjectByIndex(0)); - if(pSdrGrafObj && pSdrGrafObj->isEmbeddedSvg()) + if(pSdrGrafObj && pSdrGrafObj->isEmbeddedVectorGraphicData()) { - aGraphic = Graphic(pSdrGrafObj->GetGraphic().getSvgData()->getReplacement()); + aGraphic = Graphic(pSdrGrafObj->GetGraphic().getVectorGraphicData()->getReplacement()); bDone = true; } } @@ -2362,9 +2362,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { nCount += pGraf->GetGraphic().GetGDIMetaFile().GetActionSize(); } - else if(pGraf->isEmbeddedSvg()) + else if(pGraf->isEmbeddedVectorGraphicData()) { - nCount += pGraf->getMetafileFromEmbeddedSvg().GetActionSize(); + nCount += pGraf->getMetafileFromEmbeddedVectorGraphicData().GetActionSize(); } } diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index d829639e0bae..3feab2fe0b0e 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1387,7 +1387,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { case GraphicType::Bitmap : bFoundBitmap = true; - if(pSdrGrafObj->isEmbeddedSvg()) + if(pSdrGrafObj->isEmbeddedVectorGraphicData()) { bFoundMetafile = true; } diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 0e6be246b0f8..d634fa8d4d80 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -1015,7 +1015,7 @@ bool View::IsVectorizeAllowed() const if(pObj) { - if(GraphicType::Bitmap == pObj->GetGraphicType() && !pObj->isEmbeddedSvg()) + if(GraphicType::Bitmap == pObj->GetGraphicType() && !pObj->isEmbeddedVectorGraphicData()) { bRet = true; } |