strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bNoLines is always false

Browse source
This commit is contained in:
Caolán McNamara 2011-11-10 08:51:23 +00:00
parent b3a9e9c728
commit 8c69b4db58
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
svx/inc/svx/fntctrl.hxx
View file

@ -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);

24
svx/source/dialog/fntctrl.cxx
View file

@ -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;