summaryrefslogtreecommitdiff
path: root/svtools/source/graphic/grfmgr.cxx
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-11-22 19:51:02 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-11-22 21:53:11 +0100
commiteff1a2afdc5763abda103bea7dbc33c8aa20c724 (patch)
tree1f7c2afc64f7d2d54d74b5e7722304c8950048ce /svtools/source/graphic/grfmgr.cxx
parent85086306939b6bebb8cf549966942f2e5a244388 (diff)
fdo#86573: Impress does not show pictures anymore
Regression from: 286e2f5c6ec829bc0987b1be7016699f7ef03e5e Sometimes SdrGrafObj import the image file just as a preview (with low resolution) and late when the real picture is needed it just throws this preview and tries to load the image again. This preview works only with package URL so in this case we should not forget that URL. Plus two other related potential image loss situation: - SetUserData() is called with empty image URL - Image preview is thrown when we actually have no package URL from we can import the image again. Change-Id: Ib21f400eb6d28133e8598e6b201209e5dd1a976f (cherry picked from commit f0b28806eebb1477066d44de49b5d1d61a8e84cf)
Diffstat (limited to 'svtools/source/graphic/grfmgr.cxx')
-rw-r--r--svtools/source/graphic/grfmgr.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index f7c6ec6b75cd..ec3c59bf0a6b 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -430,7 +430,8 @@ void GraphicObject::SetUserData()
void GraphicObject::SetUserData( const OUString& rUserData )
{
maUserData = rUserData;
- SetSwapState();
+ if( !rUserData.isEmpty() )
+ SetSwapState();
}
void GraphicObject::SetSwapStreamHdl()