summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-22 15:29:10 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-22 15:29:43 +0100
commit166510ed48bf49b75a031ce973f41d08fb4e4518 (patch)
tree52d872095e54a6674b4098e30ebe3c010899abc9
parent123189c882366002ca4c81c7db71ed690f8e907e (diff)
Resolves: rhbz#996162 apparent NULL bullet font
Change-Id: I2f50ef1dabe2f152f2e18025edc88734158dbea2
-rw-r--r--editeng/source/outliner/outliner.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index cb27c692533e..49465fbd69e8 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
{