diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-22 15:29:10 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-10-11 16:40:40 +0000 |
| commit | 9225bf807d40bf85a83536e2df23a28c457f7777 (patch) | |
| tree | cc25566f0b86699294dc8c287c6fcd717e1d29bb /editeng | |
| parent | c23fa104084fccd8aa3bd930499406380c410d02 (diff) | |
Resolves: rhbz#996162 apparent NULL bullet font
Change-Id: I2f50ef1dabe2f152f2e18025edc88734158dbea2
(cherry picked from commit 166510ed48bf49b75a031ce973f41d08fb4e4518)
Reviewed-on: https://gerrit.libreoffice.org/6153
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 92923d357d83..70da2fc902ff 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -898,9 +898,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 { |