diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
| commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
| tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /cui/source/tabpages/numfmt.cxx | |
| parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) | |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'cui/source/tabpages/numfmt.cxx')
| -rw-r--r-- | cui/source/tabpages/numfmt.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index ebf1a03f6f6d..6937e0c5cd16 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -81,7 +81,7 @@ SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle) , mnPos(-1) , mnChar(0x0) { - Font aFont( GetFont() ); + vcl::Font aFont( GetFont() ); aFont.SetTransparent( true ); aFont.SetColor( Application::GetSettings().GetStyleSettings().GetFieldColor() ); SetFont( aFont ); @@ -149,10 +149,10 @@ void SvxNumberPreview::NotifyChange( const OUString& rPrevStr, void SvxNumberPreview::Paint( const Rectangle& ) { - Font aDrawFont = GetFont(); - Size aSzWnd = GetOutputSizePixel(); - OUString aTmpStr( aPrevStr ); - long nLeadSpace = (aSzWnd.Width() - GetTextWidth( aTmpStr )) /2; + vcl::Font aDrawFont = GetFont(); + Size aSzWnd = GetOutputSizePixel(); + OUString aTmpStr( aPrevStr ); + long nLeadSpace = (aSzWnd.Width() - GetTextWidth( aTmpStr )) /2; aDrawFont.SetColor( aPrevCol ); SetFont( aDrawFont ); @@ -830,7 +830,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt { OUString aEntry; OUString aTmpString; - Font aFont=m_pLbCategory->GetFont(); + vcl::Font aFont=m_pLbCategory->GetFont(); size_t i = 0; short nTmpCatPos; short aPrivCat; @@ -877,7 +877,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt { Color* pPreviewColor = NULL; OUString aPreviewString( GetExpColorString( pPreviewColor, aEntry, aPrivCat ) ); - Font aEntryFont( m_pLbFormat->GetFont() ); + vcl::Font aEntryFont( m_pLbFormat->GetFont() ); m_pLbFormat->InsertFontEntry( aPreviewString, aEntryFont, pPreviewColor ); } else |