summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-01-20 23:20:57 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-01-28 09:46:08 +0100
commit5ca5a5dd124f68c8a5667d86d6a0dbbd49a5f911 (patch)
treee0d0467abbd3c6d1e38bb691500173d6d3c923b9 /drawinglayer
parent693217465486667d38c3b7cd6d654136fe1efc85 (diff)
Resolves: fdo#49784 CRASH when FILEOPEN particular doc containing .svm
(cherry picked from commit 59bce03256c5c00616cf63ace140cb91fdd46aa7) Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7 Reviewed-by: Radek Doulík <rodo@novell.com> Tested-by: Radek Doulík <rodo@novell.com>
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 d168bef63cb7..76316016ca12 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -524,8 +524,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()