[Libreoffice-commits] core.git: lotuswordpro/source
David Tardon
dtardon at redhat.com
Tue Apr 14 00:58:44 PDT 2015
lotuswordpro/source/filter/lwptablelayout.cxx | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 25c25f855169c98c30f3f7868fd1ad430e159ddc
Author: David Tardon <dtardon at redhat.com>
Date: Tue Apr 14 09:54:12 2015 +0200
tdf#90028 avoid crash if style is not found
Change-Id: I4ffc8cdcb67ecb4c4afa641c9219dd465fe13d29
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 90897ad..99d8b18 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1201,13 +1201,17 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_
}
XFParaStyle * pStyle = pXFStyleManager->FindParaStyle(pXFPara->GetStyleName());
- if (pStyle->GetNumberRight() || bColorMod)
+ if ((pStyle && pStyle->GetNumberRight()) || bColorMod)
{
XFParaStyle* pOverStyle = new XFParaStyle;
- *pOverStyle = *pStyle;
- if (pStyle->GetNumberRight())
- pOverStyle->SetAlignType(enumXFAlignEnd);
+ if (pStyle)
+ {
+ *pOverStyle = *pStyle;
+
+ if (pStyle->GetNumberRight())
+ pOverStyle->SetAlignType(enumXFAlignEnd);
+ }
if (bColorMod)
{
More information about the Libreoffice-commits
mailing list