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

CWS-TOOLING: integrate CWS impress195

Browse Source
This commit is contained in:
Ivo Hinkelmann
2011-02-28 17:12:48 +01:00
parent 6ca901341d d3b03514dd
commit 6c4a630826
8 changed files with 259 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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