diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:53:43 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 19:02:03 -0600 |
| commit | 30128b51056f0650d79eb0ac973f17d7b4e5dde3 (patch) | |
| tree | 6c58e489fafee8155086bd3a7473386046ff6ac5 /cppcanvas | |
| parent | a918e60386f3e2d36012c1cb2842e561455ecf3f (diff) | |
use boost rather then extstd
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 b74f0a1ff44a..a01b438670a8 100644 --- a/cppcanvas/inc/cppcanvas/renderer.hxx +++ b/cppcanvas/inc/cppcanvas/renderer.hxx @@ -138,7 +138,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 f9a72f21194e..3627a9820db7 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -868,8 +868,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; |