diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-29 17:43:42 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-31 04:31:13 +0000 |
| commit | 3187193a6142b4b1c974ae1e1de572fa74a3c8ee (patch) | |
| tree | 6d9350492186d06a38703821336ba79cb72a8583 /vcl/source/font | |
| parent | 0bc3af3c1f719f9758ac01ff0b526abea7af0490 (diff) | |
tools: rename FontUnderline to FontLineStyle
Change-Id: I4750ad8569a1003b2f8c29052f3e25003ee433ca
Reviewed-on: https://gerrit.libreoffice.org/21892
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/source/font')
| -rw-r--r-- | vcl/source/font/font.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx index 4d41ed4f687e..4cfd900f400d 100644 --- a/vcl/source/font/font.cxx +++ b/vcl/source/font/font.cxx @@ -322,7 +322,7 @@ void Font::SetShadow( bool bShadow ) } } -void Font::SetUnderline( FontUnderline eUnderline ) +void Font::SetUnderline( FontLineStyle eUnderline ) { if( mpImplFont->meUnderline != eUnderline ) { @@ -331,7 +331,7 @@ void Font::SetUnderline( FontUnderline eUnderline ) } } -void Font::SetOverline( FontUnderline eOverline ) +void Font::SetOverline( FontLineStyle eOverline ) { if( mpImplFont->meOverline != eOverline ) { @@ -430,12 +430,12 @@ void Font::Merge( const vcl::Font& rFont ) if ( rFont.GetSize().Height() ) SetSize( rFont.GetSize() ); - if ( rFont.GetUnderline() != UNDERLINE_DONTKNOW ) + if ( rFont.GetUnderline() != LINESTYLE_DONTKNOW ) { SetUnderline( rFont.GetUnderline() ); SetWordLineMode( rFont.IsWordLineMode() ); } - if ( rFont.GetOverline() != UNDERLINE_DONTKNOW ) + if ( rFont.GetOverline() != LINESTYLE_DONTKNOW ) { SetOverline( rFont.GetOverline() ); SetWordLineMode( rFont.IsWordLineMode() ); @@ -483,7 +483,7 @@ SvStream& ReadImplFont( SvStream& rIStm, ImplFont& rImplFont ) rIStm.ReadUInt16( nTmp16 ); rImplFont.SetFamilyType( (FontFamily) nTmp16 ); rIStm.ReadUInt16( nTmp16 ); rImplFont.SetPitch( (FontPitch) nTmp16 ); rIStm.ReadUInt16( nTmp16 ); rImplFont.SetWeight( (FontWeight) nTmp16 ); - rIStm.ReadUInt16( nTmp16 ); rImplFont.meUnderline = (FontUnderline) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImplFont.meUnderline = (FontLineStyle) nTmp16; rIStm.ReadUInt16( nTmp16 ); rImplFont.meStrikeout = (FontStrikeout) nTmp16; rIStm.ReadUInt16( nTmp16 ); rImplFont.SetItalic( (FontItalic) nTmp16 ); rIStm.ReadUInt16( nTmp16 ); rImplFont.maLanguageTag.reset( (LanguageType) nTmp16); @@ -506,7 +506,7 @@ SvStream& ReadImplFont( SvStream& rIStm, ImplFont& rImplFont ) if( aCompat.GetVersion() >= 3 ) { - rIStm.ReadUInt16( nTmp16 ); rImplFont.meOverline = (FontUnderline) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImplFont.meOverline = (FontLineStyle) nTmp16; } // Relief @@ -829,8 +829,8 @@ void Font::SetOrientationFlag( bool bCanRotate ) { mpImplFont->SetOrientationFla bool Font::IsOutline() const { return mpImplFont->mbOutline; } bool Font::IsShadow() const { return mpImplFont->mbShadow; } FontRelief Font::GetRelief() const { return mpImplFont->meRelief; } -FontUnderline Font::GetUnderline() const { return mpImplFont->meUnderline; } -FontUnderline Font::GetOverline() const { return mpImplFont->meOverline; } +FontLineStyle Font::GetUnderline() const { return mpImplFont->meUnderline; } +FontLineStyle Font::GetOverline() const { return mpImplFont->meOverline; } FontStrikeout Font::GetStrikeout() const { return mpImplFont->meStrikeout; } FontEmphasisMark Font::GetEmphasisMark() const { return mpImplFont->meEmphasisMark; } bool Font::IsWordLineMode() const { return mpImplFont->mbWordLine; } @@ -846,8 +846,8 @@ ImplFont::ImplFont() : meWidthType( WIDTH_DONTKNOW ), meItalic( ITALIC_NONE ), meAlign( ALIGN_TOP ), - meUnderline( UNDERLINE_NONE ), - meOverline( UNDERLINE_NONE ), + meUnderline( LINESTYLE_NONE ), + meOverline( LINESTYLE_NONE ), meStrikeout( STRIKEOUT_NONE ), meRelief( RELIEF_NONE ), meEmphasisMark( EMPHASISMARK_NONE ), |