drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |    2 -
 filter/source/msfilter/escherex.cxx                        |    4 +-
 include/vcl/graph.hxx                                      |    6 ++--
 oox/source/export/drawingml.cxx                            |    2 -
 sfx2/source/appl/fileobj.cxx                               |    4 +-
 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 ++--
 sw/source/core/graphic/ndgrf.cxx                           |    2 -
 sw/source/filter/ww8/rtfattributeoutput.cxx                |    4 +-
 vcl/source/filter/GraphicNativeMetadata.cxx                |    2 -
 vcl/source/filter/GraphicNativeTransform.cxx               |    4 +-
 vcl/source/filter/graphicfilter.cxx                        |    6 ++--
 vcl/source/gdi/graph.cxx                                   |    6 ++--
 vcl/source/gdi/impgraph.cxx                                |    2 -
 vcl/source/gdi/pdfextoutdevdata.cxx                        |   18 ++++++-------
 vcl/source/gdi/pdfwriter_impl2.cxx                         |    2 -
 vcl/source/graphic/UnoGraphicDescriptor.cxx                |    4 +-
 23 files changed, 48 insertions(+), 48 deletions(-)

New commits:
commit 11163faafe718e65b25f0dfea8700d1a18d4dee6
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date:   Mon Apr 2 18:38:39 2018 +0900

    graphic: rename Set{Get,Is}Link to Set{Get,Is}GfxLink
    
    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 <c...@libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index c36606c0986c..7485a15c9494 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -772,7 +772,7 @@ namespace drawinglayer
                         // svtools/source/graphic/grfmgr.cxx
                         const Graphic& rGraphic = 
rGraphicPrimitive.getGraphicObject().GetGraphic();
 
-                        if(rGraphic.IsLink())
+                        if(rGraphic.IsGfxLink())
                         {
                             const GraphicAttr& rAttr = 
rGraphicPrimitive.getGraphicAttr();
 
diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 3b3fc0562bf5..c0da5ae84b81 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4161,9 +4161,9 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& 
rPicOutStrm, GraphicObjec
 
         const sal_uInt8*    pGraphicAry = nullptr;
 
-        if ( p_EscherBlibEntry->mbIsNativeGraphicPossible && aGraphic.IsLink() 
)
+        if ( p_EscherBlibEntry->mbIsNativeGraphicPossible && 
aGraphic.IsGfxLink() )
         {
-            aGraphicLink = aGraphic.GetLink();
+            aGraphicLink = aGraphic.GetGfxLink();
 
             p_EscherBlibEntry->mnSize = aGraphicLink.GetDataSize();
             pGraphicAry = aGraphicLink.GetData();
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index be62d12bc1e7..c088e6484661 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -213,9 +213,9 @@ private:
     friend class GraphicObject;
 
 public:
-    void            SetLink( const GfxLink& );
-    GfxLink         GetLink() const;
-    bool            IsLink() const;
+    void            SetGfxLink(const GfxLink& rGfxLink);
+    GfxLink         GetGfxLink() const;
+    bool            IsGfxLink() const;
 
     bool            ExportNative( SvStream& rOStream ) const;
 
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 987b45be5002..e18c0ce93fd2 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -820,7 +820,7 @@ const char* DrawingML::GetRelationCompPrefix()
 
 OUString DrawingML::WriteImage( const Graphic& rGraphic , bool bRelPathToMedia 
)
 {
-    GfxLink aLink = rGraphic.GetLink ();
+    GfxLink aLink = rGraphic.GetGfxLink ();
     OUString sMediaType;
     const char* pExtension = "";
     OUString sRelId;
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 5918ba7a6c09..f19e7f9acc72 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -299,9 +299,9 @@ bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, 
SvStream* pStream )
     ErrCode nRes;
 
     // To avoid that a native link is created
-    if( !rGrf.IsLink() &&
+    if( !rGrf.IsGfxLink() &&
         !rGrf.GetContext() && !bNativFormat )
-        rGrf.SetLink( GfxLink() );
+        rGrf.SetGfxLink( GfxLink() );
 
     if( !pStream )
         nRes = xMed.is() ? ERRCODE_GRFILTER_OPENERROR
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() )
     {
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 97660f6cbbde..d9adeb0bc922 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -591,7 +591,7 @@ void SwGrfNode::ReleaseLink()
     if( refLink.is() )
     {
         const Graphic aLocalGraphic(maGrfObj.GetGraphic());
-        const bool bHasOriginalData(aLocalGraphic.IsLink());
+        const bool bHasOriginalData(aLocalGraphic.IsGfxLink());
 
         {
             bInSwapIn = true;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index ff0257873bc4..56c0d2f9d293 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3923,9 +3923,9 @@ void RtfAttributeOutput::FlyFrameGraphic(const 
SwFlyFrameFormat* pFlyFrameFormat
 
     GfxLink aGraphicLink;
     const sal_Char* pBLIPType = nullptr;
-    if (rGraphic.IsLink())
+    if (rGraphic.IsGfxLink())
     {
-        aGraphicLink = rGraphic.GetLink();
+        aGraphicLink = rGraphic.GetGfxLink();
         nSize = aGraphicLink.GetDataSize();
         pGraphicAry = aGraphicLink.GetData();
         switch (aGraphicLink.GetType())
diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx 
b/vcl/source/filter/GraphicNativeMetadata.cxx
index 26ba4a72892e..3132eef43ada 100644
--- a/vcl/source/filter/GraphicNativeMetadata.cxx
+++ b/vcl/source/filter/GraphicNativeMetadata.cxx
@@ -34,7 +34,7 @@ GraphicNativeMetadata::~GraphicNativeMetadata()
 
 bool GraphicNativeMetadata::read(Graphic const & rGraphic)
 {
-    GfxLink aLink = rGraphic.GetLink();
+    GfxLink aLink = rGraphic.GetGfxLink();
     if ( aLink.GetType() != GfxLinkType::NativeJpg )
         return false;
 
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx 
b/vcl/source/filter/GraphicNativeTransform.cxx
index b9fdefa3f7ff..50a472903005 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -48,7 +48,7 @@ void GraphicNativeTransform::rotate(sal_uInt16 aInputRotation)
         return;
     }
 
-    GfxLink aLink = mrGraphic.GetLink();
+    GfxLink aLink = mrGraphic.GetGfxLink();
     if ( aLink.GetType() == GfxLinkType::NativeJpg )
     {
         rotateJPEG(aRotation);
@@ -127,7 +127,7 @@ bool GraphicNativeTransform::rotateJPEG(sal_uInt16 
aRotation)
     }
     else
     {
-        GfxLink aLink = mrGraphic.GetLink();
+        GfxLink aLink = mrGraphic.GetGfxLink();
 
         SvMemoryStream aSourceStream;
         aSourceStream.WriteBytes(aLink.GetData(), aLink.GetDataSize());
diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 273e500a0806..79c6e484fdc4 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1431,7 +1431,7 @@ void GraphicFilter::ImportGraphics(std::vector< 
std::shared_ptr<Graphic> >& rGra
             }
 
             if (rContext.m_nStatus == ERRCODE_NONE)
-                
rContext.m_pGraphic->SetLink(GfxLink(std::move(pGraphicContent), 
nGraphicContentSize, rContext.m_eLinkType));
+                
rContext.m_pGraphic->SetGfxLink(GfxLink(std::move(pGraphicContent), 
nGraphicContentSize, rContext.m_eLinkType));
         }
 
         if (rContext.m_nStatus != ERRCODE_NONE)
@@ -1451,7 +1451,7 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, 
const OUString& rPath,
     sal_uLong                      nStreamBegin;
     ErrCode                        nStatus;
     GfxLinkType                    eLinkType = GfxLinkType::NONE;
-    const bool                     bLinkSet = rGraphic.IsLink();
+    const bool                     bLinkSet = rGraphic.IsGfxLink();
     std::unique_ptr<FilterConfigItem> pFilterConfigItem;
 
     Size                aPreviewSizeHint( 0, 0 );
@@ -1850,7 +1850,7 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, 
const OUString& rPath,
         }
         if( nStatus == ERRCODE_NONE )
         {
-            rGraphic.SetLink( GfxLink( std::move(pGraphicContent), 
nGraphicContentSize, eLinkType ) );
+            rGraphic.SetGfxLink( GfxLink( std::move(pGraphicContent), 
nGraphicContentSize, eLinkType ) );
         }
     }
 
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index a424b4ebdb0e..b262f262601e 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -507,18 +507,18 @@ bool Graphic::IsDummyContext()
     return mxImpGraphic->ImplIsDummyContext();
 }
 
-void Graphic::SetLink( const GfxLink& rGfxLink )
+void Graphic::SetGfxLink( const GfxLink& rGfxLink )
 {
     ImplTestRefCount();
     mxImpGraphic->ImplSetLink( rGfxLink );
 }
 
-GfxLink Graphic::GetLink() const
+GfxLink Graphic::GetGfxLink() const
 {
     return mxImpGraphic->ImplGetLink();
 }
 
-bool Graphic::IsLink() const
+bool Graphic::IsGfxLink() const
 {
     return mxImpGraphic->ImplIsLink();
 }
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 0a2acd9538fd..bd51fe571d07 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1538,7 +1538,7 @@ void ReadImpGraphic( SvStream& rIStm, ImpGraphic& 
rImpGraphic )
 
         // set dummy link to avoid creation of additional link after filtering;
         // we set a default link to avoid unnecessary swapping of native data
-        aGraphic.SetLink( GfxLink() );
+        aGraphic.SetGfxLink( GfxLink() );
 
         if( !rIStm.GetError() && aLink.LoadNative( aGraphic ) )
         {
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx 
b/vcl/source/gdi/pdfextoutdevdata.cxx
index a21c0d98aee9..013cca964441 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -398,9 +398,9 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, 
sal_uInt32& rCurGDIMtfAc
                     if ( aBeg->eAct == PDFExtOutDevDataSync::EndGroupGfxLink )
                     {
                         Graphic& rGraphic = mGraphics.front();
-                        if ( rGraphic.IsLink() && mParaRects.size() >= 2 )
+                        if ( rGraphic.IsGfxLink() && mParaRects.size() >= 2 )
                         {
-                            GfxLinkType eType = rGraphic.GetLink().GetType();
+                            GfxLinkType eType = 
rGraphic.GetGfxLink().GetType();
                             if ( eType == GfxLinkType::NativeJpg )
                             {
                                 mbGroupIgnoreGDIMtfActions = 
rOutDevData.HasAdequateCompression(rGraphic);
@@ -436,7 +436,7 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, 
sal_uInt32& rCurGDIMtfAc
                 {
                     bool bClippingNeeded = ( aOutputRect != aVisibleOutputRect 
) && !aVisibleOutputRect.IsEmpty();
 
-                    GfxLink   aGfxLink( aGraphic.GetLink() );
+                    GfxLink   aGfxLink( aGraphic.GetGfxLink() );
                     if ( aGfxLink.GetType() == GfxLinkType::NativeJpg )
                     {
                         if ( bClippingNeeded )
@@ -801,12 +801,12 @@ void PDFExtOutDevData::EndGroup( const Graphic&     
rGraphic,
 // Avoids expensive de-compression and re-compression of large images.
 bool PDFExtOutDevData::HasAdequateCompression( const Graphic &rGraphic ) const
 {
-    assert(rGraphic.IsLink() &&
-           (rGraphic.GetLink().GetType() == GfxLinkType::NativeJpg ||
-            rGraphic.GetLink().GetType() == GfxLinkType::NativePng ||
-            rGraphic.GetLink().GetType() == GfxLinkType::NativePdf));
+    assert(rGraphic.IsGfxLink() &&
+           (rGraphic.GetGfxLink().GetType() == GfxLinkType::NativeJpg ||
+            rGraphic.GetGfxLink().GetType() == GfxLinkType::NativePng ||
+            rGraphic.GetGfxLink().GetType() == GfxLinkType::NativePdf));
 
-    if (rGraphic.GetLink().GetDataSize() == 0)
+    if (rGraphic.GetGfxLink().GetDataSize() == 0)
         return false;
 
     Size aSize = rGraphic.GetSizePixel();
@@ -821,7 +821,7 @@ bool PDFExtOutDevData::HasAdequateCompression( const 
Graphic &rGraphic ) const
 
     // FIXME: ideally we'd also pre-empt the DPI related scaling too.
     sal_Int32 nCurrentRatio = (100 * aSize.Width() * aSize.Height() * 4) /
-                               rGraphic.GetLink().GetDataSize();
+                               rGraphic.GetGfxLink().GetDataSize();
 
     static const struct {
         sal_Int32 mnQuality;
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx 
b/vcl/source/gdi/pdfwriter_impl2.cxx
index 5256442be109..9028bc75fa77 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -102,7 +102,7 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& 
i_rPoint, const Size& i_rSiz
     bool bIsJpeg = false, bIsPng = false;
     if( i_Graphic.GetType() != GraphicType::NONE && i_Graphic.GetBitmapEx() == 
aBitmapEx )
     {
-        GfxLinkType eType = i_Graphic.GetLink().GetType();
+        GfxLinkType eType = i_Graphic.GetGfxLink().GetType();
         bIsJpeg = (eType == GfxLinkType::NativeJpg);
         bIsPng = (eType == GfxLinkType::NativePng);
     }
diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx 
b/vcl/source/graphic/UnoGraphicDescriptor.cxx
index d8281f13732d..49e1c01769cd 100644
--- a/vcl/source/graphic/UnoGraphicDescriptor.cxx
+++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx
@@ -279,11 +279,11 @@ void GraphicDescriptor::_getPropertyValues( const 
comphelper::PropertyMapEntry**
 
                 if( mpGraphic )
                 {
-                    if( mpGraphic->IsLink() )
+                    if( mpGraphic->IsGfxLink() )
                     {
                         const char* pMimeType;
 
-                        switch( mpGraphic->GetLink().GetType() )
+                        switch( mpGraphic->GetGfxLink().GetType() )
                         {
                             case GfxLinkType::NativeGif: pMimeType = 
MIMETYPE_GIF; break;
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to