summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/docxattributeoutput.cxx
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2018-03-08 09:01:17 +0900
committerTomaž Vajngerl <quikee@gmail.com>2018-03-08 12:56:51 +0100
commitdfee7d93b4e863d673c45921f79bb876b5738ea6 (patch)
treed82ed3b540f740ef2aae3cb5f58692bf56a76a1e /sw/source/filter/ww8/docxattributeoutput.cxx
parent8f79f22a8d4b1c2d209c55cd618c24428960088f (diff)
sw: get rid of FN_UNO_GRAPHIC_U_R_L and "GraphicURL" property
Change-Id: I6148016658e5bb46fd4f8765a233a434174791fd Reviewed-on: https://gerrit.libreoffice.org/50922 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sw/source/filter/ww8/docxattributeoutput.cxx')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6c069de73777..3e4c9396f99b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4482,14 +4482,14 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* pSdrObj, const SwFrameFo
uno::Reference< drawing::XShape > xShape( const_cast<SdrObject*>(pSdrObj)->getUnoShape(), uno::UNO_QUERY );
uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY );
- OUString sUrl;
- xPropSet->getPropertyValue("GraphicURL") >>= sUrl;
- const GraphicObject aGrafObj(GraphicObject::CreateGraphicObjectFromURL(sUrl));
+ uno::Reference<graphic::XGraphic> xGraphic;
+ xPropSet->getPropertyValue("Graphic") >>= xGraphic;
+ const Graphic aGraphic(xGraphic);
- Size aOriginalSize(aGrafObj.GetPrefSize());
+ Size aOriginalSize(aGraphic.GetPrefSize());
const MapMode aMap100mm( MapUnit::Map100thMM );
- const MapMode& rMapMode = aGrafObj.GetPrefMapMode();
+ const MapMode& rMapMode = aGraphic.GetPrefMapMode();
if (rMapMode.GetMapUnit() == MapUnit::MapPixel)
{
aOriginalSize = Application::GetDefaultDevice()->PixelToLogic(aOriginalSize, aMap100mm);