[Libreoffice-commits] core.git: lotuswordpro/source
Caolán McNamara
caolanm at redhat.com
Sun Dec 13 09:41:13 PST 2015
lotuswordpro/source/filter/lwptablelayout.cxx | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 00bccc565d1bcd4bd620bb9b33b9f1d07fb5f13e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Dec 13 17:40:36 2015 +0000
font might be null
Change-Id: Id0d9bb1d1abe6f6c9440bf979407d13db49696c4
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 9783531..85ff885 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1222,14 +1222,17 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_
if (bColorMod)
{
- rtl::Reference<XFFont> pFont = pOverStyle->GetFont();
- XFColor aColor = pFont->GetColor();
- if ( aColor == aNullColor )
+ rtl::Reference<XFFont> xFont = pOverStyle->GetFont();
+ if (xFont.is())
{
- rtl::Reference<XFFont> pNewFont = new XFFont;
- aColor = pNumStyle->GetColor();
- pNewFont->SetColor(aColor);
- pOverStyle->SetFont(pNewFont);
+ XFColor aColor = xFont->GetColor();
+ if ( aColor == aNullColor )
+ {
+ rtl::Reference<XFFont> pNewFont = new XFFont;
+ aColor = pNumStyle->GetColor();
+ pNewFont->SetColor(aColor);
+ pOverStyle->SetFont(pNewFont);
+ }
}
}
More information about the Libreoffice-commits
mailing list