diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-12 21:41:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-13 11:20:23 +0100 |
| commit | 14b81851592a31dad02699870938f676885c7c11 (patch) | |
| tree | ab988f0dc55ba93c5314e6a4542a5a22f301c601 | |
| parent | 6191fa0847ac5b27083efe1a8c6cd84d080a638c (diff) | |
SetDrawBaseLine is never used so bDrawBaseLine is always true
since removal of sc/source/ui/attrdlg/condfrmt.cxx
Change-Id: Iba794cd62fc4872dbb9dc7c3d7591cdd5ab5519e
| -rw-r--r-- | svx/inc/svx/fntctrl.hxx | 1 | ||||
| -rw-r--r-- | svx/source/dialog/fntctrl.cxx | 24 |
2 files changed, 5 insertions, 20 deletions
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index e71816db38b1..f292fa5173ec 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -75,7 +75,6 @@ public: void ResetColor(); void SetBackColor( const Color& rColor ); void UseResourceText( sal_Bool bUse = sal_True ); - void SetDrawBaseLine( sal_Bool bSet = sal_True ); void Paint( const Rectangle& ); sal_Bool IsTwoLines() const; diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index de0e9c7283eb..f7db5c9bc438 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -166,7 +166,6 @@ class FontPrevWin_Impl sal_Bool bSelection : 1, bGetSelection : 1, bUseResText : 1, - bDrawBaseLine : 1, bPreviewBackgroundToCharacter : 1, bTwoLines : 1, bUseFontNameAsText : 1, @@ -183,7 +182,7 @@ public: pColor( NULL ), pBackColor( 0 ), nAscent( 0 ), cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ), bSelection( sal_False ), bGetSelection( sal_False ), bUseResText( sal_False ), - bDrawBaseLine( sal_True ), bPreviewBackgroundToCharacter( sal_False ), bTwoLines( sal_False ), + bPreviewBackgroundToCharacter( sal_False ), bTwoLines( sal_False ), bUseFontNameAsText( sal_False ), bTextInited( sal_False ) { SvtLanguageOptions aLanguageOptions; @@ -632,13 +631,6 @@ void SvxFontPrevWindow::UseResourceText( sal_Bool bUse ) // ----------------------------------------------------------------------- -void SvxFontPrevWindow::SetDrawBaseLine( sal_Bool bSet ) -{ - pImpl->bDrawBaseLine = bSet; -} - -// ----------------------------------------------------------------------- - void SvxFontPrevWindow::Paint( const Rectangle& ) { Printer* pPrinter = pImpl->pPrinter; @@ -785,11 +777,8 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) nResultWidth += nTextWidth; long _nX = (aLogSize.Width() - nResultWidth) / 2; - if ( pImpl->bDrawBaseLine ) - { - DrawLine( Point( 0, nY ), Point( _nX, nY ) ); - DrawLine( Point( _nX + nResultWidth, nY ), Point( aLogSize.Width(), nY ) ); - } + DrawLine( Point( 0, nY ), Point( _nX, nY ) ); + DrawLine( Point( _nX + nResultWidth, nY ), Point( aLogSize.Width(), nY ) ); long nSmallAscent = pImpl->nAscent; long nOffset = (nStdAscent - nSmallAscent ) / 2; @@ -821,11 +810,8 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) 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 ) ); - } + DrawLine( Point( 0, nY ), Point( nX, nY ) ); + DrawLine( Point( nX + aTxtSize.Width(), nY ), Point( aLogSize.Width(), nY ) ); SetLineColor( aLineCol ); Point aTmpPoint( nX, nY ); |