summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-01-20 23:20:57 +0100
committerPetr Mladek <pmladek@suse.cz>2013-03-04 17:12:45 +0100
commitb113a87ed1bce401856d53029418e7770ca7d6e5 (patch)
tree1efe1b54fc3268222cdf23fbf23dc6861840c47b /drawinglayer
parent7de4f6e82551ff7d64b4327245eb0c99ea5deaf0 (diff)
Resolves: fdo#49784 CRASH when FILEOPEN particular doc containing .svm
Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7 Reviewed-on: https://gerrit.libreoffice.org/1788 Reviewed-by: Radek Doulík <rodo@novell.com> Tested-by: Radek Doulík <rodo@novell.com> Reviewed-on: https://gerrit.libreoffice.org/1851
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index fa5b1ae1a9f0..6da553b4acb8 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -534,8 +534,9 @@ namespace
TargetHolder& Current()
{
+ static TargetHolder aDummy;
OSL_ENSURE(maTargetHolders.size(), "TargetHolders: CURRENT with no property holders (!)");
- return *maTargetHolders.back();
+ return maTargetHolders.empty() ? aDummy : *maTargetHolders.back();
}
~TargetHolders()