You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1017 B
35 lines
1017 B
From 166510ed48bf49b75a031ce973f41d08fb4e4518 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
Date: Thu, 22 Aug 2013 15:29:10 +0100
|
|
Subject: [PATCH] Resolves: rhbz#996162 apparent NULL bullet font
|
|
|
|
Change-Id: I2f50ef1dabe2f152f2e18025edc88734158dbea2
|
|
---
|
|
editeng/source/outliner/outliner.cxx | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
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
|
|
{
|
|
--
|
|
1.8.3.1
|
|
|