summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-12-03 20:50:24 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-12-03 23:56:49 +0100
commitc4d57fc6b274c9155660514e478d6adc159aaaf2 (patch)
treeecf4a89aa77781f7fea49e0e7b59c4c64081875c
parent632fae27880f552fb20598805a1e15a6d0c35199 (diff)
Linked graphic is not displayed
Regression from: 17475638138c92162be1c0f34cf1f9cc95c63579 Change-Id: Ie2d484fbe065c24d19938c8c9c68818bd1076f2d (cherry picked from commit 02b17c1bbdd19a978b9de646c0dacdad179c60de)
-rw-r--r--include/svtools/grfmgr.hxx1
-rw-r--r--svx/source/svdraw/svdograf.cxx1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 2bdbc9a1c24d..234ec9a844e0 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 3e334fc32380..712a5e1ccb65 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()