diff options
| author | Andre Fischer <andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com> | 2011-02-09 11:35:49 +0100 |
|---|---|---|
| committer | Andre Fischer <andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com> | 2011-02-09 11:35:49 +0100 |
| commit | d3b03514dde317473db0d247f21405b5db6a727e (patch) | |
| tree | c7526375c71327a195714e9e325b66a9ad013d74 /cppcanvas | |
| parent | 61099481271709723469421181f65e6219cbc271 (diff) | |
impress195: Minor adaptions due to last merge.
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/inc/cppcanvas/renderer.hxx | 2 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cppcanvas/inc/cppcanvas/renderer.hxx b/cppcanvas/inc/cppcanvas/renderer.hxx index bad132ed149e..09852ff9e530 100644 --- a/cppcanvas/inc/cppcanvas/renderer.hxx +++ b/cppcanvas/inc/cppcanvas/renderer.hxx @@ -137,7 +137,7 @@ namespace cppcanvas ::boost::optional< sal_Int8 > maFontLetterForm; /// Optionally forces the given font proportion (condensed, monospaced etc.) for all text actions - ::comphelper::OptionalValue< sal_Int8 > maFontProportion; + ::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 dee6ce637813..d0cee1b4b976 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -852,8 +852,8 @@ namespace cppcanvas *rParms.mrParms.maFontLetterForm : (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9; aFontRequest.FontDescription.FontDescription.Proportion = - rParms.mrParms.maFontProportion.isValid() ? - rParms.mrParms.maFontProportion.getValue() : + rParms.mrParms.maFontProportion.is_initialized() ? + *rParms.mrParms.maFontProportion : (rFont.GetPitch() == PITCH_FIXED) ? rendering::PanoseProportion::MONO_SPACED : rendering::PanoseProportion::ANYTHING; |