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

[Zolnai Tamás]

 include/svtools/grfmgr.hxx     |    1 +
 svx/source/svdraw/svdograf.cxx |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit c4d57fc6b274c9155660514e478d6adc159aaaf2
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Wed Dec 3 20:50:24 2014 +0100

    Linked graphic is not displayed
    
    Regression from:
    17475638138c92162be1c0f34cf1f9cc95c63579
    
    Change-Id: Ie2d484fbe065c24d19938c8c9c68818bd1076f2d
    (cherry picked from commit 02b17c1bbdd19a978b9de646c0dacdad179c60de)

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 2bdbc9a..234ec9a 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -157,6 +157,7 @@ public:
 class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream
 {
     friend class GraphicManager;
+    friend class SdrGrafObj;
 
 private:
 
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 3e334fc..712a5e1 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -624,6 +624,7 @@ void SdrGrafObj::SetGraphicLink(const OUString& rFileName, const OUString& rRefe
     aFilterName = rFilterName;
     ImpLinkAnmeldung();
     pGraphic->SetUserData();
+    pGraphic->SetSwapState();
 }
 
 void SdrGrafObj::ReleaseGraphicLink()