diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-02-28 17:12:48 +0100 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-02-28 17:12:48 +0100 |
| commit | 6c4a630826520dff28c0ba0616c976e6d995e2c5 (patch) | |
| tree | a3ae994f495d4e78e0f8f483c3b0abe61b0f03d4 /cppcanvas | |
| parent | 6ca901341d6971ff1d2d390aa26f95fcdc757dd0 (diff) | |
| parent | d3b03514dde317473db0d247f21405b5db6a727e (diff) | |
CWS-TOOLING: integrate CWS impress195
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 0b8bb43d7e3e..09852ff9e530 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 ::boost::optional< sal_Int8 > maFontLetterForm; + /// Optionally forces the given font proportion (condensed, monospaced etc.) for all text actions + ::boost::optional< sal_Int8 > maFontProportion; + /// Optionally forces underlining for all text actions ::boost::optional< bool > maFontUnderline; }; diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index e8a6468611f7..1e0611ab037a 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> @@ -863,6 +864,12 @@ namespace cppcanvas rParms.mrParms.maFontLetterForm.is_initialized() ? *rParms.mrParms.maFontLetterForm : (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9; + aFontRequest.FontDescription.FontDescription.Proportion = + rParms.mrParms.maFontProportion.is_initialized() ? + *rParms.mrParms.maFontProportion : + (rFont.GetPitch() == PITCH_FIXED) + ? rendering::PanoseProportion::MONO_SPACED + : rendering::PanoseProportion::ANYTHING; LanguageType aLang = rFont.GetLanguage(); aFontRequest.Locale = MsLangId::convertLanguageToLocale(aLang, false); @@ -2980,7 +2987,8 @@ namespace cppcanvas if( rParams.maFontName.is_initialized() || rParams.maFontWeight.is_initialized() || rParams.maFontLetterForm.is_initialized() || - rParams.maFontUnderline.is_initialized() ) + rParams.maFontUnderline.is_initialized() || + rParams.maFontProportion.is_initialized() ) { ::cppcanvas::internal::OutDevState& rState = getState( aStateStack ); |