[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svx/source

[Zolnai Tamás]

 svx/source/svdraw/svdograf.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ced7bcbf53c302a5fd0203216a1b4fda18059f6f
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Dec 8 03:11:18 2014 +0100

    Copying linked graphic between components is broken
    
    IsLinkedGraphic() is better to use here.
    
    Reproducer steps:
    -Insert an image to Impress as a link.
    -Copy this image (CTRL+C & CTRL+V) to Writer.
    Result: Image is not displayed.
    
    Change-Id: Iaf9b686b5c87caf5a0cc15425f8c5988f857bfe6
    (cherry picked from commit 3650b66c366177877d30f6aae83a33bf683d3457)
    Reviewed-on: https://gerrit.libreoffice.org/13609
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 712a5e1..1a27c4c 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -840,7 +840,7 @@ SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj )
     aFilterName = rObj.aFilterName;
     bMirrored = rObj.bMirrored;
 
-    if( rObj.pGraphicLink != NULL)
+    if( rObj.IsLinkedGraphic() )
     {
         SetGraphicLink( aFileName, rObj.aReferer, aFilterName );
     }