diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-04-04 16:47:00 +0900 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-05-22 12:17:08 +0200 |
| commit | 637d9cbec7358f171069bfab4ffb70dcd24ada3f (patch) | |
| tree | 3340a13d6419bb99a7d367996bd0421c0a7306ef /vcl | |
| parent | c69360fd17708bcc3d6d2f0638f6e1356f7c2fa6 (diff) | |
replace originURL with GraphicExternalLink class (internally)
For now just introduce the GraphicExternalLink internally in
ImpGraphic, and use it for the origin URL. In a future patch this
will store additional data about the link.
Reviewed-on: https://gerrit.libreoffice.org/52393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit a50897107bca839af5665ee0f9621e9cce54900b)
Change-Id: I7b4edac80d0e71603d37243ff28bcac1b18fdc01
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/impgraph.hxx | 7 | ||||
| -rw-r--r-- | vcl/source/gdi/impgraph.cxx | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index d429a7aef931..748f315469b2 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_VCL_INC_IMPGRAPH_HXX #define INCLUDED_VCL_INC_IMPGRAPH_HXX +#include <vcl/GraphicExternalLink.hxx> + struct ImpSwapInfo { MapMode maPrefMapMode; @@ -51,6 +53,7 @@ private: SvgDataPtr maSvgData; css::uno::Sequence<sal_Int8> maPdfData; OUString msOriginURL; + GraphicExternalLink maGraphicExternalLink; private: @@ -73,12 +76,12 @@ private: OUString getOriginURL() const { - return msOriginURL; + return maGraphicExternalLink.msURL; } void setOriginURL(OUString const & rOriginURL) { - msOriginURL = rOriginURL; + maGraphicExternalLink.msURL = rOriginURL; } void ImplCreateSwapInfo(); diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index b061774f1137..08d72ed96c40 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -120,7 +120,7 @@ ImpGraphic::ImpGraphic(const ImpGraphic& rImpGraphic) , mbDummyContext(rImpGraphic.mbDummyContext) , maSvgData(rImpGraphic.maSvgData) , maPdfData(rImpGraphic.maPdfData) - , msOriginURL(rImpGraphic.msOriginURL) + , maGraphicExternalLink(rImpGraphic.maGraphicExternalLink) { if( rImpGraphic.mpGfxLink ) mpGfxLink = o3tl::make_unique<GfxLink>( *rImpGraphic.mpGfxLink ); @@ -146,7 +146,7 @@ ImpGraphic::ImpGraphic(ImpGraphic&& rImpGraphic) , mbDummyContext(rImpGraphic.mbDummyContext) , maSvgData(std::move(rImpGraphic.maSvgData)) , maPdfData(std::move(rImpGraphic.maPdfData)) - , msOriginURL(rImpGraphic.msOriginURL) + , maGraphicExternalLink(rImpGraphic.maGraphicExternalLink) { rImpGraphic.ImplClear(); rImpGraphic.mbDummyContext = false; @@ -213,7 +213,7 @@ ImpGraphic& ImpGraphic::operator=( const ImpGraphic& rImpGraphic ) maSwapInfo = rImpGraphic.maSwapInfo; mpContext = rImpGraphic.mpContext; mbDummyContext = rImpGraphic.mbDummyContext; - msOriginURL = rImpGraphic.msOriginURL; + maGraphicExternalLink = rImpGraphic.maGraphicExternalLink; mpAnimation.reset(); @@ -257,7 +257,7 @@ ImpGraphic& ImpGraphic::operator=(ImpGraphic&& rImpGraphic) mpGfxLink = std::move(rImpGraphic.mpGfxLink); maSvgData = std::move(rImpGraphic.maSvgData); maPdfData = std::move(rImpGraphic.maPdfData); - msOriginURL = rImpGraphic.msOriginURL; + maGraphicExternalLink = rImpGraphic.maGraphicExternalLink; rImpGraphic.ImplClear(); rImpGraphic.mbDummyContext = false; @@ -384,7 +384,7 @@ void ImpGraphic::ImplClear() ImplClearGraphics(); meType = GraphicType::NONE; mnSizeBytes = 0; - msOriginURL.clear(); + maGraphicExternalLink.msURL.clear(); } void ImpGraphic::ImplSetDefaultType() |