From dfee7d93b4e863d673c45921f79bb876b5738ea6 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Thu, 8 Mar 2018 09:01:17 +0900 Subject: sw: get rid of FN_UNO_GRAPHIC_U_R_L and "GraphicURL" property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6148016658e5bb46fd4f8765a233a434174791fd Reviewed-on: https://gerrit.libreoffice.org/50922 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- sw/source/filter/ww8/docxattributeoutput.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sw/source/filter/ww8/docxattributeoutput.cxx') 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(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 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); -- cgit v1.2.3