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 /toolkit/source/helper | |
| 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 'toolkit/source/helper')
| -rw-r--r-- | toolkit/source/helper/formpdfexport.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/helper/vclunohelper.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index bb7c97fdf570..0d5603540a1a 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -402,7 +402,7 @@ namespace toolkitform { FontDescriptor aUNOFont; OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_FONT ) >>= aUNOFont ); - _rpDescriptor->TextFont = VCLUnoHelper::CreateFont( aUNOFont, Font() ); + _rpDescriptor->TextFont = VCLUnoHelper::CreateFont( aUNOFont, vcl::Font() ); } // tab order diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 5fb541d34f26..1b598ca1c98f 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -362,7 +362,7 @@ FontItalic VCLUnoHelper::ConvertFontSlant(css::awt::FontSlant eSlant) return eRet; } -::com::sun::star::awt::FontDescriptor VCLUnoHelper::CreateFontDescriptor( const Font& rFont ) +::com::sun::star::awt::FontDescriptor VCLUnoHelper::CreateFontDescriptor( const vcl::Font& rFont ) { ::com::sun::star::awt::FontDescriptor aFD; aFD.Name = rFont.GetName(); @@ -384,9 +384,9 @@ FontItalic VCLUnoHelper::ConvertFontSlant(css::awt::FontSlant eSlant) return aFD; } -Font VCLUnoHelper::CreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr, const Font& rInitFont ) +vcl::Font VCLUnoHelper::CreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr, const vcl::Font& rInitFont ) { - Font aFont( rInitFont ); + vcl::Font aFont( rInitFont ); if ( !rDescr.Name.isEmpty() ) aFont.SetName( rDescr.Name ); if ( !rDescr.StyleName.isEmpty() ) @@ -418,9 +418,9 @@ Font VCLUnoHelper::CreateFont( const ::com::sun::star::awt::FontDescriptor& rDes return aFont; } -Font VCLUnoHelper::CreateFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ) +vcl::Font VCLUnoHelper::CreateFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ) { - Font aFont; + vcl::Font aFont; VCLXFont* pVCLXFont = VCLXFont::GetImplementation( rxFont ); if ( pVCLXFont ) aFont = pVCLXFont->GetFont(); |