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:54:19 +0100
commit02b17c1bbdd19a978b9de646c0dacdad179c60de (patch)
tree402f1f7584ce7fda58ed27f532baf083773a68ce
parenteca1d9ce9b171d8813ee19fc6fda966301f54ea6 (diff)
Linked graphic is not displayed
Regression from: 17475638138c92162be1c0f34cf1f9cc95c63579 Change-Id: Ie2d484fbe065c24d19938c8c9c68818bd1076f2d
-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 8dbb3c4f04ee..a353e0f9fd66 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()