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

INTEGRATION: CWS presfixes02 (1.5.2); FILE MERGED

Browse Source 
2005/03/14 16:04:53 thb 1.5.2.1: #i35136# #i36914# #i41113# #i44100# #i40115# #i41839# #i44404# Merge from presfixes01 patches
This commit is contained in:
Rüdiger Timm
2005-03-30 07:30:55 +00:00
parent 56598b22dc
commit 9cb5f84c94
1 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cppcanvas/source/mtfrenderer/outdevstate.hxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: outdevstate.hxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: vg $ $Date: 2005-03-10 13:25:26 $
* last change: $Author: rt $ $Date: 2005-03-30 08:30:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -101,6 +101,9 @@
#ifndef _SV_OUTDEV_HXX
#include <vcl/outdev.hxx>
#endif
#ifndef _SV_OUTDEV_HXX
#include <vcl/outdev.hxx>
#endif
namespace cppcanvas
@@ -122,7 +125,7 @@ namespace cppcanvas
xFont(),
transform(),
fontTransform(),
fontRotation(0.0),
textEmphasisMarkStyle(EMPHASISMARK_NONE),
pushFlags(PUSH_ALL),
@@ -132,6 +135,7 @@ namespace cppcanvas
textReliefStyle(RELIEF_NONE),
textUnderlineStyle(UNDERLINE_NONE),
textStrikeoutStyle(STRIKEOUT_NONE),
textReferencePoint(ALIGN_BASELINE),
isTextOutlineModeSet( false ),
isTextEffectShadowSet( false ),
@@ -143,7 +147,6 @@ namespace cppcanvas
isTextLineColorSet( false )
{
transform.identity();
fontTransform.identity();
}
::basegfx::B2DPolyPolygon clip;
@@ -163,7 +166,7 @@ namespace cppcanvas
*/
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > xFont;
::basegfx::B2DHomMatrix transform;
::basegfx::B2DHomMatrix fontTransform;
double fontRotation;
sal_uInt16 textEmphasisMarkStyle;
sal_uInt16 pushFlags;
@@ -172,6 +175,7 @@ namespace cppcanvas
sal_Int8 textReliefStyle;
sal_Int8 textUnderlineStyle;
sal_Int8 textStrikeoutStyle;
TextAlign textReferencePoint;
bool isTextOutlineModeSet;
bool isTextEffectShadowSet;