diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-03-05 20:44:08 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-07 02:38:28 +0100 |
| commit | 27008aa028cde8d270e898c5743a9fe5c7701dab (patch) | |
| tree | d3c8bbd6c1607122dc8009beeba68f7d0b89d256 /xmloff/source/draw | |
| parent | 5a4d6162f643050faf00ccf08d58feed00dcd781 (diff) | |
xmloff: convert XMLTextParagraphExport to get rid of "GraphicURL"
Change-Id: I10cc1115bfe628dc296b67b75e386e1a2e4a6c46
Reviewed-on: https://gerrit.libreoffice.org/50789
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'xmloff/source/draw')
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 10 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpshap.hxx | 5 |
2 files changed, 4 insertions, 11 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 187262720251..5e59db4fafcb 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -3387,7 +3387,7 @@ uno::Reference<graphic::XGraphic> SdXMLFrameShapeContext::getGraphicFromImportCo return xGraphic; } -OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const +OUString SdXMLFrameShapeContext::getGraphicPackageURLFromImportContext(const SvXMLImportContext& rContext) const { OUString aRetval; const SdXMLGraphicObjectShapeContext* pSdXMLGraphicObjectShapeContext = dynamic_cast< const SdXMLGraphicObjectShapeContext* >(&rContext); @@ -3398,15 +3398,9 @@ OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXMLImpor { const uno::Reference< beans::XPropertySet > xPropSet(pSdXMLGraphicObjectShapeContext->getShape(), uno::UNO_QUERY_THROW); - if(xPropSet.is()) + if (xPropSet.is()) { xPropSet->getPropertyValue("GraphicStreamURL") >>= aRetval; - - if(!aRetval.getLength()) - { - // it maybe a link, try GraphicURL - xPropSet->getPropertyValue("GraphicURL") >>= aRetval; - } } } catch( uno::Exception& ) diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index c6376719c637..30f5b149ad9f 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -547,9 +547,8 @@ private: protected: /// helper to get the created xShape instance, needs to be overridden - virtual OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const override; - virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) override; - + void removeGraphicFromImportContext(const SvXMLImportContext& rContext) override; + OUString getGraphicPackageURLFromImportContext(const SvXMLImportContext& rContext) const override; css::uno::Reference<css::graphic::XGraphic> getGraphicFromImportContext(const SvXMLImportContext& rContext) const override; public: |