diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-03 10:13:00 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-04 03:17:26 +0000 |
| commit | 697d445ed0c7b60e463243db89af32e2145b475b (patch) | |
| tree | 5a74d57cdc97f82bc78a686dee345a229a082a72 /sw/source/ui/table/tautofmt.cxx | |
| parent | 91a7580e03d5b47c6e2513afce85ddee45e730b6 (diff) | |
vcl: take into account the font width is the average font width
I'm changing the Font class function names:
- SetSize -> SetFontSize
- GetSize -> GetFontSize
- SetHeight -> SetFontHeight
- GetHeight -> GetFontHeight
- SetWidth -> SetAverageFontWidth
- GetWidth -> GetAverageFontWidth
That's because it really makes no sense to say that there is a
single constant font width because obviously proportional fonts
don't have one - the best we can do is an average font width,
which is what folks like Microsoft sort of do already. On a fixed
font, the average is still accurate, for obvious reasons :-)
I'm also not a fan of GetSize/SetSize as I find it a might too
generic.
Change-Id: Ib80a604ba62d6883fd6cbc7994da763976be5c70
Reviewed-on: https://gerrit.libreoffice.org/22069
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'sw/source/ui/table/tautofmt.cxx')
| -rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 3ecbd16825ce..fdd2c8000b63 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -584,20 +584,20 @@ void AutoFormatPreview::MakeFonts( sal_uInt8 nIndex, vcl::Font& rFont, vcl::Font const SwBoxAutoFormat& rBoxFormat = aCurData.GetBoxFormat( nIndex ); rFont = rCJKFont = rCTLFont = GetFont(); - Size aFontSize( rFont.GetSize().Width(), 10 * GetDPIScaleFactor() ); + Size aFontSize( rFont.GetFontSize().Width(), 10 * GetDPIScaleFactor() ); lcl_SetFontProperties( rFont, rBoxFormat.GetFont(), rBoxFormat.GetWeight(), rBoxFormat.GetPosture() ); lcl_SetFontProperties( rCJKFont, rBoxFormat.GetCJKFont(), rBoxFormat.GetCJKWeight(), rBoxFormat.GetCJKPosture() ); lcl_SetFontProperties( rCTLFont, rBoxFormat.GetCTLFont(), rBoxFormat.GetCTLWeight(), rBoxFormat.GetCTLPosture() ); - SETONALLFONTS( SetUnderline, (FontLineStyle)rBoxFormat.GetUnderline().GetValue() ); - SETONALLFONTS( SetOverline, (FontLineStyle)rBoxFormat.GetOverline().GetValue() ); - SETONALLFONTS( SetStrikeout, (FontStrikeout)rBoxFormat.GetCrossedOut().GetValue() ); - SETONALLFONTS( SetOutline, rBoxFormat.GetContour().GetValue() ); - SETONALLFONTS( SetShadow, rBoxFormat.GetShadowed().GetValue() ); - SETONALLFONTS( SetColor, rBoxFormat.GetColor().GetValue() ); - SETONALLFONTS( SetSize, aFontSize ); - SETONALLFONTS( SetTransparent, true ); + SETONALLFONTS( SetUnderline, (FontLineStyle)rBoxFormat.GetUnderline().GetValue() ); + SETONALLFONTS( SetOverline, (FontLineStyle)rBoxFormat.GetOverline().GetValue() ); + SETONALLFONTS( SetStrikeout, (FontStrikeout)rBoxFormat.GetCrossedOut().GetValue() ); + SETONALLFONTS( SetOutline, rBoxFormat.GetContour().GetValue() ); + SETONALLFONTS( SetShadow, rBoxFormat.GetShadowed().GetValue() ); + SETONALLFONTS( SetColor, rBoxFormat.GetColor().GetValue() ); + SETONALLFONTS( SetFontSize, aFontSize ); + SETONALLFONTS( SetTransparent, true ); } sal_uInt8 AutoFormatPreview::GetFormatIndex( size_t nCol, size_t nRow ) const |