diff options
| author | Malte Timmermann <mt@openoffice.org> | 2000-10-11 09:45:44 +0000 |
|---|---|---|
| committer | Malte Timmermann <mt@openoffice.org> | 2000-10-11 09:45:44 +0000 |
| commit | 913e13aaae9e5596525e35fafd5dd9540edd8e8c (patch) | |
| tree | 5b76a70fb250d4d37029be54536e21fcf8eb7fb8 /svx | |
| parent | 83202a819dfe176093e8162d08e3aa848d0544b3 (diff) | |
#78954# GetBulletColor, not included in GetBulletFont
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/outliner/outliner.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx index 36ff699ef801..b42434dd0321 100644 --- a/svx/source/outliner/outliner.cxx +++ b/svx/source/outliner/outliner.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outliner.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mt $ $Date: 2000-10-10 09:44:55 $ + * last change: $Author: mt $ $Date: 2000-10-11 10:45:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -975,11 +975,11 @@ Font Outliner::ImpCalcBulletFont( USHORT nPara ) const Font aBulletFont( *pFmt->GetBulletFont() ); aBulletFont.SetAlign( ALIGN_BOTTOM ); aBulletFont.SetSize( Size( 0, nScaledLineHeight ) ); - if( pEditEngine->IsFlatMode() || ( pEditEngine->GetControlWord() & EE_CNTRL_NOCOLORS ) ) - { - Color aColor( COL_BLACK ); - aBulletFont.SetColor( aColor ); - } + Color aColor( COL_BLACK ); + if( !pEditEngine->IsFlatMode() && !( pEditEngine->GetControlWord() & EE_CNTRL_NOCOLORS ) ) + aColor = pFmt->GetBulletColor(); + aBulletFont.SetColor( aColor ); + return aBulletFont; } |