strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

impress195: Minor adaptions due to last merge.

Browse source
This commit is contained in:
Andre Fischer<andre.f.fischer 2011-02-09 11:35:49 +01:00
parent 6109948127
commit d3b03514dd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;

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

@ -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;