mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use boost rather then extstd

Browse Source
This commit is contained in:
Norbert Thiebaud
2011-03-12 18:53:43 -06:00
parent a918e60386
commit 30128b5105
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cppcanvas/inc/cppcanvas/renderer.hxx
View File

@@ -138,7 +138,7 @@ namespace cppcanvas
::boost::optional< sal_Int8 > maFontLetterForm; ::boost::optional< sal_Int8 > maFontLetterForm;
/// Optionally forces the given font proportion (condensed, monospaced etc.) for all text actions /// 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 /// Optionally forces underlining for all text actions
::boost::optional< bool > maFontUnderline; ::boost::optional< bool > maFontUnderline;

4
cppcanvas/source/mtfrenderer/implrenderer.cxx
View File

@@ -868,8 +868,8 @@ namespace cppcanvas
*rParms.mrParms.maFontLetterForm : *rParms.mrParms.maFontLetterForm :
(rFont.GetItalic() == ITALIC_NONE) ? 0 : 9; (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
aFontRequest.FontDescription.FontDescription.Proportion = aFontRequest.FontDescription.FontDescription.Proportion =
rParms.mrParms.maFontProportion.isValid() ? rParms.mrParms.maFontProportion.is_initialized() ?
rParms.mrParms.maFontProportion.getValue() : *rParms.mrParms.maFontProportion :
(rFont.GetPitch() == PITCH_FIXED) (rFont.GetPitch() == PITCH_FIXED)
? rendering::PanoseProportion::MONO_SPACED ? rendering::PanoseProportion::MONO_SPACED
: rendering::PanoseProportion::ANYTHING; : rendering::PanoseProportion::ANYTHING;