[Libreoffice-commits] core.git: editeng/source

Caolán McNamara caolanm at redhat.com
Thu Aug 22 07:30:06 PDT 2013


 editeng/source/outliner/outliner.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 166510ed48bf49b75a031ce973f41d08fb4e4518
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 22 15:29:10 2013 +0100

    Resolves: rhbz#996162 apparent NULL bullet font
    
    Change-Id: I2f50ef1dabe2f152f2e18025edc88734158dbea2

diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index cb27c69..49465fb 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -897,9 +897,15 @@ Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
     }
 
     Font aBulletFont;
+    const Font *pSourceFont = 0;
     if ( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL )
     {
-        aBulletFont = *pFmt->GetBulletFont();
+        pSourceFont = pFmt->GetBulletFont();
+    }
+
+    if (pSourceFont)
+    {
+        aBulletFont = *pSourceFont;
     }
     else
     {


More information about the Libreoffice-commits mailing list