|
 |
f0633d |
From 7be4941f5f8e4936e058c5530df6fad6448cac8e Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Julien Nabet <serval2412@yahoo.fr>
|
|
|
f0633d |
Date: Sun, 29 Dec 2013 19:06:11 +0100
|
|
|
f0633d |
Subject: [PATCH 089/109] Resolves: fdo#72961 Crash when you open
|
|
|
f0633d |
ODFver.1.0/1.1 created by LibO-3.5/3.6
|
|
|
f0633d |
|
|
|
f0633d |
It seems pAction may be NULL so let's keep on to check it.
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: Ie1a48c96bfa930364053c7c3ad0c940559544e33
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7228
|
|
|
f0633d |
Reviewed-by: Andrzej Hunt <andrzej.hunt@collabora.com>
|
|
|
f0633d |
Tested-by: Andrzej Hunt <andrzej.hunt@collabora.com>
|
|
|
f0633d |
(cherry picked from commit 6cc888babdc3e6414e55f57c0df65135f2ef4804)
|
|
|
f0633d |
---
|
|
|
f0633d |
vcl/source/gdi/gdimtf.cxx | 14 ++++++++------
|
|
|
f0633d |
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
|
|
|
f0633d |
index 1240500..90e691b 100644
|
|
|
f0633d |
--- a/vcl/source/gdi/gdimtf.cxx
|
|
|
f0633d |
+++ b/vcl/source/gdi/gdimtf.cxx
|
|
|
f0633d |
@@ -2765,15 +2765,17 @@ SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
|
|
|
f0633d |
{
|
|
|
f0633d |
pAction = MetaAction::ReadMetaAction( rIStm, &aReadData );
|
|
|
f0633d |
|
|
|
f0633d |
- if (pAction->GetType() == META_COMMENT_ACTION)
|
|
|
f0633d |
- {
|
|
|
f0633d |
- MetaCommentAction* pCommentAct = static_cast<MetaCommentAction*>(pAction);
|
|
|
f0633d |
- if ( pCommentAct->GetComment() == "EMF_PLUS" )
|
|
|
f0633d |
- rGDIMetaFile.UseCanvas( sal_True );
|
|
|
f0633d |
- }
|
|
|
f0633d |
|
|
|
f0633d |
if( pAction )
|
|
|
f0633d |
+ {
|
|
|
f0633d |
+ if (pAction->GetType() == META_COMMENT_ACTION)
|
|
|
f0633d |
+ {
|
|
|
f0633d |
+ MetaCommentAction* pCommentAct = static_cast<MetaCommentAction*>(pAction);
|
|
|
f0633d |
+ if ( pCommentAct->GetComment() == "EMF_PLUS" )
|
|
|
f0633d |
+ rGDIMetaFile.UseCanvas( sal_True );
|
|
|
f0633d |
+ }
|
|
|
f0633d |
rGDIMetaFile.AddAction( pAction );
|
|
|
f0633d |
+ }
|
|
|
f0633d |
}
|
|
|
f0633d |
}
|
|
|
f0633d |
else
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|