editeng/source/outliner/outliner.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
New commits: commit 9225bf807d40bf85a83536e2df23a28c457f7777 Author: Caolán McNamara <[email protected]> Date: Thu Aug 22 15:29:10 2013 +0100 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 <[email protected]> Tested-by: Eike Rathke <[email protected]> diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 92923d3..70da2fc 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 {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
