diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-04-16 09:14:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-16 10:15:38 +0100 |
| commit | cb7412b8185d6b94ca59b48668ec5e77fa8f7999 (patch) | |
| tree | 9a0e17cbffb5de39ade4d5aa73184a9db852396c /toolkit | |
| parent | ade27059dc2e1c84ab00023c15430ee6645617f7 (diff) | |
merge duplicated CreateFontDescriptor methods
Change-Id: I33f9df7f17158eedc4a4c0dedfd0fc4cddc6180f
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/toolkit/helper/vclunohelper.hxx | 5 | ||||
| -rw-r--r-- | toolkit/source/helper/vclunohelper.cxx | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/toolkit/inc/toolkit/helper/vclunohelper.hxx b/toolkit/inc/toolkit/helper/vclunohelper.hxx index 7c07a87cfe72..cb1da9ffe4d2 100644 --- a/toolkit/inc/toolkit/helper/vclunohelper.hxx +++ b/toolkit/inc/toolkit/helper/vclunohelper.hxx @@ -94,7 +94,10 @@ public: // Polygon static Polygon CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ); - // Font + /** convert Font to ::com::sun::star::awt::FontDescriptor + @param rFont Font to be converted + @return the new FontDescriptor + */ static ::com::sun::star::awt::FontDescriptor CreateFontDescriptor( const Font& rFont ); static Font CreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr, const Font& rInitFont ); static Font CreateFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ); diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 6df61c00a469..3d275c1593b5 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -305,7 +305,7 @@ FontWeight VCLUnoHelper::ConvertFontWeight( float f ) else if( f <= ::com::sun::star::awt::FontWeight::BLACK ) return WEIGHT_BLACK; - OSL_FAIL( "Unknown FontWeigth" ); + OSL_FAIL( "Unknown FontWeight" ); return WEIGHT_DONTKNOW; } |