diff options
| author | thb <thb@openoffice.org> | 2010-01-07 13:07:30 +0100 |
|---|---|---|
| committer | thb <thb@openoffice.org> | 2010-01-07 13:07:30 +0100 |
| commit | 3f77adb947ea286d12d27cc969ffb7233e8effa5 (patch) | |
| tree | 4b16f5503719b0c70cc9f19a8641f4af2d050d4e /cppcanvas | |
| parent | 51df7ffd3ff8107524ab2b238196a3ff91e7ad77 (diff) | |
| parent | 0c5348ff2c5cede4607555fdab45642db10b07ba (diff) | |
eraser01: merge with DEV300 m68
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 4 | ||||
| -rw-r--r-- | cppcanvas/util/makefile.mk | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 6269cfb11ef4..c6f9a295b332 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -83,6 +83,7 @@ #include <vcl/metric.hxx> #include <vcl/graphictools.hxx> #include <tools/poly.hxx> +#include <i18npool/mslangid.hxx> #include <implrenderer.hxx> #include <tools.hxx> @@ -956,6 +957,9 @@ namespace cppcanvas rParms.mrParms.maFontLetterForm.getValue() : (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9; + LanguageType aLang = rFont.GetLanguage(); + aFontRequest.Locale = MsLangId::convertLanguageToLocale(aLang, false); + // setup state-local text transformation, // if the font be rotated const short nFontAngle( rFont.GetOrientation() ); diff --git a/cppcanvas/util/makefile.mk b/cppcanvas/util/makefile.mk index a5ac026e262c..4d0ff2a8dc55 100644 --- a/cppcanvas/util/makefile.mk +++ b/cppcanvas/util/makefile.mk @@ -50,7 +50,7 @@ LIB1FILES=\ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1IMPLIB= i$(TARGET) -SHL1STDLIBS= $(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) +SHL1STDLIBS= $(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(I18NISOLANGLIB) .IF "$(debug)$(dbgutil)"!="" SHL1STDLIBS += $(CPPUHELPERLIB) |