diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-09-30 16:10:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-09-30 16:10:40 +0100 |
| commit | 4361349144bc061e9045fe66f14a78c7cd20621a (patch) | |
| tree | fbfd13bbe357a62ca30e3d25c8be6a2fd1069caf /cppcanvas | |
| parent | 79279751c2808294b9421c62376f5898ae0aa356 (diff) | |
#i64671# transfer VCL's FontPitch through DrawingLayer to Canvas
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/inc/cppcanvas/renderer.hxx | 3 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cppcanvas/inc/cppcanvas/renderer.hxx b/cppcanvas/inc/cppcanvas/renderer.hxx index 780a27f31503..12d97e075317 100644 --- a/cppcanvas/inc/cppcanvas/renderer.hxx +++ b/cppcanvas/inc/cppcanvas/renderer.hxx @@ -136,6 +136,9 @@ namespace cppcanvas /// Optionally forces the given font letter form (italics etc.) for all text actions ::comphelper::OptionalValue< sal_Int8 > maFontLetterForm; + /// Optionally forces the given font proportion (condensed, monospaced etc.) for all text actions + ::comphelper::OptionalValue< sal_Int8 > maFontProportion; + /// Optionally forces underlining for all text actions ::comphelper::OptionalValue< bool > maFontUnderline; }; diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index af1f20904560..d7be552b48e9 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> @@ -852,6 +853,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); @@ -2997,7 +3004,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 ); |