summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-01-20 23:20:57 +0100
committerRadek Doulík <rodo@novell.com>2013-01-24 15:27:26 +0000
commit59bce03256c5c00616cf63ace140cb91fdd46aa7 (patch)
treee8e1b6aec64cdfa521590eef5341c0af040b04e5
parent20371d26374b40fe28ac006d9392104b692fce32 (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>
-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 f4337aa5847d..cef65006d0fb 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()