From 11163faafe718e65b25f0dfea8700d1a18d4dee6 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Mon, 2 Apr 2018 18:38:39 +0900
Subject: graphic: rename Set{Get,Is}Link to Set{Get,Is}GfxLink
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The main reason is to differentiate when we have the GfxLink from
other (url, file) links which use the same terminology.

Change-Id: I805c61e7fb231062340562c51c25a189b2cfc7f7
Reviewed-on: https://gerrit.libreoffice.org/52245
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
---
 svx/source/core/graphichelper.cxx           | 2 +-
 svx/source/dialog/compressgraphicdialog.cxx | 2 +-
 svx/source/gallery2/galtheme.cxx            | 2 +-
 svx/source/svdraw/svdograf.cxx              | 4 ++--
 svx/source/unodraw/unoshap4.cxx             | 4 ++--
 svx/source/unodraw/unoshape.cxx             | 4 ++--
 svx/source/xml/xmlgrhlp.cxx                 | 4 ++--
 svx/source/xoutdev/_xoutbmp.cxx             | 6 +++---
 8 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'svx')

diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index db2f885d087c..28c96fa232a7 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -92,7 +92,7 @@ void GraphicHelper::GetPreferredExtension( OUString& rExtension, const Graphic&
         return;
     }
 
-    switch( rGraphic.GetLink().GetType() )
+    switch( rGraphic.GetGfxLink().GetType() )
     {
         case GfxLinkType::NativeGif:
             aExtension = "gif";
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 67145347ea02..92edf6e78d48 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -145,7 +145,7 @@ void CompressGraphicsDialog::Initialize()
 
 void CompressGraphicsDialog::Update()
 {
-    GfxLinkType aLinkType = m_aGraphic.GetLink().GetType();
+    GfxLinkType aLinkType = m_aGraphic.GetGfxLink().GetType();
     OUString aGraphicTypeString;
     switch(aLinkType)
     {
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 9c8b27bef7d5..835b0c0039e6 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -845,7 +845,7 @@ bool GalleryTheme::InsertGraphic(const Graphic& rGraphic, sal_uInt32 nInsertPos)
     if( rGraphic.GetType() != GraphicType::NONE )
     {
         ConvertDataFormat nExportFormat = ConvertDataFormat::Unknown;
-        const GfxLink     aGfxLink( rGraphic.GetLink() );
+        const GfxLink     aGfxLink( rGraphic.GetGfxLink() );
 
         if( aGfxLink.GetDataSize() )
         {
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 0acc622e08e0..21412a222451 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1299,10 +1299,10 @@ Reference< XInputStream > SdrGrafObj::getInputStream()
 {
     Reference< XInputStream > xStream;
 
-    if (mpGraphicObject && GetGraphic().IsLink())
+    if (mpGraphicObject && GetGraphic().IsGfxLink())
     {
         Graphic aGraphic( GetGraphic() );
-        GfxLink aLink( aGraphic.GetLink() );
+        GfxLink aLink( aGraphic.GetGfxLink() );
         sal_uInt32 nSize = aLink.GetDataSize();
         const void* pSourceData = static_cast<const void*>(aLink.GetData());
         if( nSize && pSourceData )
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index c9e40652e372..e69ed77add50 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -227,9 +227,9 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro
             if( pGraphic )
             {
                 bool bIsWMF = false;
-                if ( pGraphic->IsLink() )
+                if ( pGraphic->IsGfxLink() )
                 {
-                    GfxLink aLnk = pGraphic->GetLink();
+                    GfxLink aLnk = pGraphic->GetGfxLink();
                     if ( aLnk.GetType() == GfxLinkType::NativeWmf )
                     {
                         bIsWMF = true;
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index c726444e814d..b8bdbe02fee0 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2821,9 +2821,9 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
             if( pGraphic )
             {
                 bool bIsWMF = false;
-                if ( pGraphic->IsLink() )
+                if ( pGraphic->IsGfxLink() )
                 {
-                    GfxLink aLnk = pGraphic->GetLink();
+                    GfxLink aLnk = pGraphic->GetGfxLink();
                     if ( aLnk.GetType() == GfxLinkType::NativeWmf )
                     {
                         bIsWMF = true;
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index bac4ea26914d..e420cc103274 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -116,7 +116,7 @@ GraphicInputStream::GraphicInputStream(GraphicObject const & raGraphicObject, co
         if (pStream)
         {
             Graphic aGraphic(aGraphicObject.GetGraphic());
-            const GfxLink aGfxLink(aGraphic.GetLink());
+            const GfxLink aGfxLink(aGraphic.GetGfxLink());
             bool bRet = false;
 
             if (aGfxLink.GetDataSize() && aGfxLink.GetData())
@@ -640,7 +640,7 @@ OUString SvXMLGraphicHelper::implSaveGraphic(css::uno::Reference<css::graphic::X
 
     if (aGraphicObject.GetType() != GraphicType::NONE)
     {
-        const GfxLink aGfxLink(aGraphic.GetLink());
+        const GfxLink aGfxLink(aGraphic.GetGfxLink());
         OUString aExtension;
         bool bUseGfxLink = true;
 
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index edc9e0a228f2..d2fd8dfcbe4f 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -206,10 +206,10 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileName,
             if( ( nFlags & XOutFlags::UseNativeIfPossible ) &&
                 !( nFlags & XOutFlags::MirrorHorz ) &&
                 !( nFlags & XOutFlags::MirrorVert ) &&
-                ( rGraphic.GetType() != GraphicType::GdiMetafile ) && rGraphic.IsLink() )
+                ( rGraphic.GetType() != GraphicType::GdiMetafile ) && rGraphic.IsGfxLink() )
             {
                 // try to write native link
-                const GfxLink aGfxLink( rGraphic.GetLink() );
+                const GfxLink aGfxLink( rGraphic.GetGfxLink() );
 
                 switch( aGfxLink.GetType() )
                 {
@@ -361,7 +361,7 @@ bool XOutBitmap::GraphicToBase64(const Graphic& rGraphic, OUString& rOUString)
 {
     SvMemoryStream aOStm;
     OUString aMimeType;
-    GfxLink aLink = rGraphic.GetLink();
+    GfxLink aLink = rGraphic.GetGfxLink();
     ConvertDataFormat aCvtType;
     switch(  aLink.GetType() )
     {
-- 
cgit