diff options
| author | Eike Rathke <erack@redhat.com> | 2013-09-20 20:15:05 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-09-20 20:17:25 +0200 |
| commit | f51e79aaa8cef49421c875c2a876d8570e8b064f (patch) | |
| tree | a86907a607371104600ec2771b635e43df4931da /vcl/inc | |
| parent | 3d246af83bacacedb7c6a15e082210a67cd5566d (diff) | |
Font and ImplLayoutArgs with LanguageTag
Avoid the gazillion temporary conversions / Impl searches.
Change-Id: I5232589f1e31d1cbb6becc198b12daabf1038f31
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/impfont.hxx | 6 | ||||
| -rw-r--r-- | vcl/inc/sallayout.hxx | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 4270e9d31d6c..e849fa5a07fb 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -22,7 +22,7 @@ #include <tools/gen.hxx> #include <tools/string.hxx> -#include <i18nlangtag/lang.h> +#include <i18nlangtag/languagetag.hxx> #include <tools/color.hxx> #include <vcl/dllapi.h> #include <vcl/vclenum.hxx> @@ -60,8 +60,8 @@ private: Color maColor; // compatibility, now on output device Color maFillColor; // compatibility, now on output device rtl_TextEncoding meCharSet; - LanguageType meLanguage; - LanguageType meCJKLanguage; + LanguageTag maLanguageTag; + LanguageTag maCJKLanguageTag; FontFamily meFamily; FontPitch mePitch; TextAlign meAlign; diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 491db056cee6..3bfab2ce06e4 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -24,6 +24,7 @@ #include <tools/gen.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <i18nlangtag/languagetag.hxx> #ifndef _TOOLS_LANG_HXX typedef unsigned short LanguageType; @@ -83,7 +84,7 @@ class ImplLayoutArgs { public: // string related inputs - LanguageType meLanguage; + LanguageTag maLanguageTag; int mnFlags; int mnLength; int mnMinCharPos; @@ -101,7 +102,7 @@ public: public: ImplLayoutArgs( const sal_Unicode* pStr, int nLength, - int nMinCharPos, int nEndCharPos, int nFlags, LanguageType eLanguage ); + int nMinCharPos, int nEndCharPos, int nFlags, const LanguageTag& rLanguageTag ); void SetLayoutWidth( long nWidth ) { mnLayoutWidth = nWidth; } void SetDXArray( const sal_Int32* pDXArray ) { mpDXArray = pDXArray; } |