[Libreoffice-commits] core.git: vcl/source

Tomaž Vajngerl (via logerrit) logerrit at kemper.freedesktop.org
Wed Mar 4 11:57:11 UTC 2020


 vcl/source/filter/graphicfilter.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit c941c6c4f02522dfc7210bb5ceadd221dbc07260
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Tue Mar 3 12:50:00 2020 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Wed Mar 4 12:56:31 2020 +0100

    graphic: remove CreateNativeLink property for graphic import
    
    Doesn't seem to be used and we always want to creat a native link
    anyway.
    
    Change-Id: I2e50093491b771bb251816525cf492cf030bc496
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89930
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 1c87416115e9..97fdc15d8200 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1422,7 +1422,6 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath,
 
     Size                aPreviewSizeHint( 0, 0 );
     bool                bAllowPartialStreamRead = false;
-    bool                bCreateNativeLink = true;
 
     std::unique_ptr<sal_uInt8[]> pGraphicContent;
     sal_Int32  nGraphicContentSize = 0;
@@ -1449,10 +1448,6 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath,
             {
                 rPropVal.Value >>= bAllowPartialStreamRead;
             }
-            else if ( rPropVal.Name == "CreateNativeLink" )
-            {
-                rPropVal.Value >>= bCreateNativeLink;
-            }
         }
     }
 
@@ -1786,7 +1781,7 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath,
         }
     }
 
-    if( nStatus == ERRCODE_NONE && bCreateNativeLink && ( eLinkType != GfxLinkType::NONE ) && !rGraphic.GetReaderContext() && !bLinkSet )
+    if( nStatus == ERRCODE_NONE && ( eLinkType != GfxLinkType::NONE ) && !rGraphic.GetReaderContext() && !bLinkSet )
     {
         if (!pGraphicContent)
         {


More information about the Libreoffice-commits mailing list