diff options
| author | Andre Fischer <af@openoffice.org> | 2010-07-14 15:54:26 +0200 |
|---|---|---|
| committer | Andre Fischer <af@openoffice.org> | 2010-07-14 15:54:26 +0200 |
| commit | a7b3942c0f04f24455ab85ec0c0a8c2a0014da0f (patch) | |
| tree | 2c95d3537d96d0c56dad2efbaea0cab37f852bc1 /cppcanvas/source | |
| parent | be588658ea127a6a05390435126f1d739a477b58 (diff) | |
impress195: #i64671# Fixed font pitch processing.
Diffstat (limited to 'cppcanvas/source')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 1423cd42ed93..7ac049e43660 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/rendering/TexturingMode.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/geometry/RealPoint2D.hpp> +#include <com/sun/star/rendering/PanoseProportion.hpp> #include <com/sun/star/rendering/ViewState.hpp> #include <com/sun/star/rendering/RenderState.hpp> #include <com/sun/star/rendering/XCanvasFont.hpp> @@ -850,6 +851,12 @@ namespace cppcanvas rParms.mrParms.maFontLetterForm.isValid() ? rParms.mrParms.maFontLetterForm.getValue() : (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9; + aFontRequest.FontDescription.FontDescription.Proportion = + rParms.mrParms.maFontProportion.isValid() ? + rParms.mrParms.maFontProportion.getValue() : + (rFont.GetPitch() == PITCH_FIXED) + ? rendering::PanoseProportion::MONO_SPACED + : rendering::PanoseProportion::ANYTHING; LanguageType aLang = rFont.GetLanguage(); aFontRequest.Locale = MsLangId::convertLanguageToLocale(aLang, false); @@ -2967,7 +2974,8 @@ namespace cppcanvas if( rParams.maFontName.isValid() || rParams.maFontWeight.isValid() || rParams.maFontLetterForm.isValid() || - rParams.maFontUnderline.isValid() ) + rParams.maFontUnderline.isValid() || + rParams.maFontProportion.isValid() ) { ::cppcanvas::internal::OutDevState& rState = getState( aStateStack ); |