diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-10 08:51:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-10 09:28:40 +0000 |
| commit | 8c69b4db58ce820e27c96dc0f33890b6946a5f4c (patch) | |
| tree | ae81a2ae39c3d0e0faeb39c1d4bb2dc74cef9225 /svx | |
| parent | b3a9e9c728c8fc2e54e31c2a7bbabab37a303571 (diff) | |
bNoLines is always false
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/fntctrl.hxx | 1 | ||||
| -rw-r--r-- | svx/source/dialog/fntctrl.cxx | 24 |
2 files changed, 7 insertions, 18 deletions
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index f625d6eb686e..e71816db38b1 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -80,7 +80,6 @@ public: sal_Bool IsTwoLines() const; void SetTwoLines(sal_Bool bSet); - void SetNoLines(sal_Bool bSet); void SetBrackets(sal_Unicode cStart, sal_Unicode cEnd); diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 33971f81cf3d..73f60c49c7d8 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -176,7 +176,6 @@ class FontPrevWin_Impl bDrawBaseLine : 1, bPreviewBackgroundToCharacter : 1, bTwoLines : 1, - bNoLines : 1, bUseFontNameAsText : 1, bTextInited : 1; @@ -192,7 +191,6 @@ public: cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ), bSelection( sal_False ), bGetSelection( sal_False ), bUseResText( sal_False ), bDrawBaseLine( sal_True ), bPreviewBackgroundToCharacter( sal_False ), bTwoLines( sal_False ), - bNoLines( sal_False ), bUseFontNameAsText( sal_False ), bTextInited( sal_False ) { SvtLanguageOptions aLanguageOptions; @@ -819,18 +817,15 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) else { - if (!pImpl->bNoLines) - { - Color aLineCol = GetLineColor(); + Color aLineCol = GetLineColor(); - SetLineColor( rFont.GetColor() ); - if ( pImpl->bDrawBaseLine ) - { - DrawLine( Point( 0, nY ), Point( nX, nY ) ); - DrawLine( Point( nX + aTxtSize.Width(), nY ), Point( aLogSize.Width(), nY ) ); - } - SetLineColor( aLineCol ); + SetLineColor( rFont.GetColor() ); + if ( pImpl->bDrawBaseLine ) + { + DrawLine( Point( 0, nY ), Point( nX, nY ) ); + DrawLine( Point( nX + aTxtSize.Width(), nY ), Point( aLogSize.Width(), nY ) ); } + SetLineColor( aLineCol ); Point aTmpPoint( nX, nY ); pImpl->DrawPrev( this, pPrinter, aTmpPoint, rFont ); @@ -848,11 +843,6 @@ void SvxFontPrevWindow::SetTwoLines(sal_Bool bSet) pImpl->bTwoLines = bSet; } -void SvxFontPrevWindow::SetNoLines(sal_Bool bSet) -{ - pImpl->bNoLines = bSet; -} - void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd) { pImpl->cStartBracket = cStart; |