summaryrefslogtreecommitdiff
path: root/toolkit/source/helper/vclunohelper.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/source/helper/vclunohelper.cxx')
-rw-r--r--toolkit/source/helper/vclunohelper.cxx177
1 files changed, 7 insertions, 170 deletions
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 0c2004234bff..2c424dbd7bec 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -20,6 +20,7 @@
#include <tools/stream.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/window.hxx>
+#include <vcl/unohelp.hxx>
#include <sal/macros.h>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/awt/XBitmap.hpp>
@@ -196,170 +197,6 @@ css::uno::Reference< css::awt::XControlContainer> VCLUnoHelper::CreateControlCon
return x;
}
-float VCLUnoHelper::ConvertFontWidth( FontWidth eWidth )
-{
- if( eWidth == WIDTH_DONTKNOW )
- return css::awt::FontWidth::DONTKNOW;
- else if( eWidth == WIDTH_ULTRA_CONDENSED )
- return css::awt::FontWidth::ULTRACONDENSED;
- else if( eWidth == WIDTH_EXTRA_CONDENSED )
- return css::awt::FontWidth::EXTRACONDENSED;
- else if( eWidth == WIDTH_CONDENSED )
- return css::awt::FontWidth::CONDENSED;
- else if( eWidth == WIDTH_SEMI_CONDENSED )
- return css::awt::FontWidth::SEMICONDENSED;
- else if( eWidth == WIDTH_NORMAL )
- return css::awt::FontWidth::NORMAL;
- else if( eWidth == WIDTH_SEMI_EXPANDED )
- return css::awt::FontWidth::SEMIEXPANDED;
- else if( eWidth == WIDTH_EXPANDED )
- return css::awt::FontWidth::EXPANDED;
- else if( eWidth == WIDTH_EXTRA_EXPANDED )
- return css::awt::FontWidth::EXTRAEXPANDED;
- else if( eWidth == WIDTH_ULTRA_EXPANDED )
- return css::awt::FontWidth::ULTRAEXPANDED;
-
- OSL_FAIL( "Unknown FontWidth" );
- return css::awt::FontWidth::DONTKNOW;
-}
-
-FontWidth VCLUnoHelper::ConvertFontWidth( float f )
-{
- if( f <= css::awt::FontWidth::DONTKNOW )
- return WIDTH_DONTKNOW;
- else if( f <= css::awt::FontWidth::ULTRACONDENSED )
- return WIDTH_ULTRA_CONDENSED;
- else if( f <= css::awt::FontWidth::EXTRACONDENSED )
- return WIDTH_EXTRA_CONDENSED;
- else if( f <= css::awt::FontWidth::CONDENSED )
- return WIDTH_CONDENSED;
- else if( f <= css::awt::FontWidth::SEMICONDENSED )
- return WIDTH_SEMI_CONDENSED;
- else if( f <= css::awt::FontWidth::NORMAL )
- return WIDTH_NORMAL;
- else if( f <= css::awt::FontWidth::SEMIEXPANDED )
- return WIDTH_SEMI_EXPANDED;
- else if( f <= css::awt::FontWidth::EXPANDED )
- return WIDTH_EXPANDED;
- else if( f <= css::awt::FontWidth::EXTRAEXPANDED )
- return WIDTH_EXTRA_EXPANDED;
- else if( f <= css::awt::FontWidth::ULTRAEXPANDED )
- return WIDTH_ULTRA_EXPANDED;
-
- OSL_FAIL( "Unknown FontWidth" );
- return WIDTH_DONTKNOW;
-}
-
-float VCLUnoHelper::ConvertFontWeight( FontWeight eWeight )
-{
- if( eWeight == WEIGHT_DONTKNOW )
- return css::awt::FontWeight::DONTKNOW;
- else if( eWeight == WEIGHT_THIN )
- return css::awt::FontWeight::THIN;
- else if( eWeight == WEIGHT_ULTRALIGHT )
- return css::awt::FontWeight::ULTRALIGHT;
- else if( eWeight == WEIGHT_LIGHT )
- return css::awt::FontWeight::LIGHT;
- else if( eWeight == WEIGHT_SEMILIGHT )
- return css::awt::FontWeight::SEMILIGHT;
- else if( ( eWeight == WEIGHT_NORMAL ) || ( eWeight == WEIGHT_MEDIUM ) )
- return css::awt::FontWeight::NORMAL;
- else if( eWeight == WEIGHT_SEMIBOLD )
- return css::awt::FontWeight::SEMIBOLD;
- else if( eWeight == WEIGHT_BOLD )
- return css::awt::FontWeight::BOLD;
- else if( eWeight == WEIGHT_ULTRABOLD )
- return css::awt::FontWeight::ULTRABOLD;
- else if( eWeight == WEIGHT_BLACK )
- return css::awt::FontWeight::BLACK;
-
- OSL_FAIL( "Unknown FontWeight" );
- return css::awt::FontWeight::DONTKNOW;
-}
-
-FontWeight VCLUnoHelper::ConvertFontWeight( float f )
-{
- if( f <= css::awt::FontWeight::DONTKNOW )
- return WEIGHT_DONTKNOW;
- else if( f <= css::awt::FontWeight::THIN )
- return WEIGHT_THIN;
- else if( f <= css::awt::FontWeight::ULTRALIGHT )
- return WEIGHT_ULTRALIGHT;
- else if( f <= css::awt::FontWeight::LIGHT )
- return WEIGHT_LIGHT;
- else if( f <= css::awt::FontWeight::SEMILIGHT )
- return WEIGHT_SEMILIGHT;
- else if( f <= css::awt::FontWeight::NORMAL )
- return WEIGHT_NORMAL;
- else if( f <= css::awt::FontWeight::SEMIBOLD )
- return WEIGHT_SEMIBOLD;
- else if( f <= css::awt::FontWeight::BOLD )
- return WEIGHT_BOLD;
- else if( f <= css::awt::FontWeight::ULTRABOLD )
- return WEIGHT_ULTRABOLD;
- else if( f <= css::awt::FontWeight::BLACK )
- return WEIGHT_BLACK;
-
- OSL_FAIL( "Unknown FontWeight" );
- return WEIGHT_DONTKNOW;
-}
-
-css::awt::FontSlant VCLUnoHelper::ConvertFontSlant(FontItalic eItalic)
-{
- css::awt::FontSlant eRet(css::awt::FontSlant_DONTKNOW);
- switch (eItalic)
- {
- case ITALIC_NONE:
- eRet = css::awt::FontSlant_NONE;
- break;
- case ITALIC_OBLIQUE:
- eRet = css::awt::FontSlant_OBLIQUE;
- break;
- case ITALIC_NORMAL:
- eRet = css::awt::FontSlant_ITALIC;
- break;
- case ITALIC_DONTKNOW:
- eRet = css::awt::FontSlant_DONTKNOW;
- break;
- case FontItalic_FORCE_EQUAL_SIZE:
- eRet = css::awt::FontSlant_MAKE_FIXED_SIZE;
- break;
- }
- return eRet;
-}
-
-FontItalic VCLUnoHelper::ConvertFontSlant(css::awt::FontSlant eSlant)
-{
- FontItalic eRet = ITALIC_DONTKNOW;
- switch (eSlant)
- {
- case css::awt::FontSlant_NONE:
- eRet = ITALIC_NONE;
- break;
- case css::awt::FontSlant_OBLIQUE:
- eRet = ITALIC_OBLIQUE;
- break;
- case css::awt::FontSlant_ITALIC:
- eRet = ITALIC_NORMAL;
- break;
- case css::awt::FontSlant_DONTKNOW:
- eRet = ITALIC_DONTKNOW;
- break;
- case css::awt::FontSlant_REVERSE_OBLIQUE:
- //there is no vcl reverse oblique
- eRet = ITALIC_OBLIQUE;
- break;
- case css::awt::FontSlant_REVERSE_ITALIC:
- //there is no vcl reverse normal
- eRet = ITALIC_NORMAL;
- break;
- case css::awt::FontSlant_MAKE_FIXED_SIZE:
- eRet = FontItalic_FORCE_EQUAL_SIZE;
- break;
- }
- return eRet;
-}
-
css::awt::FontDescriptor VCLUnoHelper::CreateFontDescriptor( const vcl::Font& rFont )
{
css::awt::FontDescriptor aFD;
@@ -370,9 +207,9 @@ css::awt::FontDescriptor VCLUnoHelper::CreateFontDescriptor( const vcl::Font& rF
aFD.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamilyType());
aFD.CharSet = rFont.GetCharSet();
aFD.Pitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch());
- aFD.CharacterWidth = VCLUnoHelper::ConvertFontWidth( rFont.GetWidthType() );
- aFD.Weight= VCLUnoHelper::ConvertFontWeight( rFont.GetWeight() );
- aFD.Slant = VCLUnoHelper::ConvertFontSlant( rFont.GetItalic() );
+ aFD.CharacterWidth = vcl::unohelper::ConvertFontWidth(rFont.GetWidthType());
+ aFD.Weight = vcl::unohelper::ConvertFontWeight(rFont.GetWeight());
+ aFD.Slant = vcl::unohelper::ConvertFontSlant(rFont.GetItalic());
aFD.Underline = sal::static_int_cast< sal_Int16 >(rFont.GetUnderline());
aFD.Strikeout = sal::static_int_cast< sal_Int16 >(rFont.GetStrikeout());
aFD.Orientation = rFont.GetOrientation();
@@ -398,11 +235,11 @@ vcl::Font VCLUnoHelper::CreateFont( const css::awt::FontDescriptor& rDescr, cons
if ( (FontPitch)rDescr.Pitch != PITCH_DONTKNOW )
aFont.SetPitch( (FontPitch)rDescr.Pitch );
if ( rDescr.CharacterWidth )
- aFont.SetWidthType( VCLUnoHelper::ConvertFontWidth( rDescr.CharacterWidth ) );
+ aFont.SetWidthType(vcl::unohelper::ConvertFontWidth(rDescr.CharacterWidth));
if ( rDescr.Weight )
- aFont.SetWeight( VCLUnoHelper::ConvertFontWeight( rDescr.Weight ) );
+ aFont.SetWeight(vcl::unohelper::ConvertFontWeight(rDescr.Weight));
if ( rDescr.Slant != css::awt::FontSlant_DONTKNOW )
- aFont.SetItalic( VCLUnoHelper::ConvertFontSlant( rDescr.Slant ) );
+ aFont.SetItalic(vcl::unohelper::ConvertFontSlant(rDescr.Slant));
if ( (FontLineStyle)rDescr.Underline != LINESTYLE_DONTKNOW )
aFont.SetUnderline( (FontLineStyle)rDescr.Underline );
if ( (FontStrikeout)rDescr.Strikeout != STRIKEOUT_DONTKNOW )