From a99237ba49d1d84dcff274f8baca46b4e7f940aa Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Mon, 5 Jan 2009 17:49:45 +0000
Subject: CWS-TOOLING: integrate CWS overline3 2008-12-11 15:24:46 +0100
fredrikh r265314 : i97099 2008-12-11 15:20:37 +0100 fredrikh r265313 :
i97099 2008-12-11 15:18:00 +0100 fredrikh r265312 : i97099 2008-12-11
15:17:00 +0100 fredrikh r265311 : i97099 2008-12-11 15:13:20 +0100 fredrikh
r265309 : i97144 2008-12-11 15:06:24 +0100 fredrikh r265306 : i97099
2008-11-24 10:41:42 +0100 fme r264213 : #i5991# Overline support 2008-11-24
10:39:53 +0100 fme r264212 : #i5991# Overline support 2008-11-24 10:02:13
+0100 fme r264209 : #5991# Overline support 2008-11-24 10:01:26 +0100 fme
r264208 : #5991# Overline support 2008-11-24 09:59:11 +0100 fme r264207 :
#5991# Overline support 2008-11-24 09:57:11 +0100 fme r264206 : #5991#
Overline support 2008-11-14 10:36:44 +0100 fme r263667 : CWS-TOOLING: rebase
CWS overline3 to trunk@263288 (milestone: DEV300:m35) 2008-11-13 16:12:13
+0100 fme r263649 : #i5991# migrate CWS overline3 to SVN.
---
cppcanvas/source/mtfrenderer/mtftools.hxx | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
(limited to 'cppcanvas/source/mtfrenderer/mtftools.hxx')
diff --git a/cppcanvas/source/mtfrenderer/mtftools.hxx b/cppcanvas/source/mtfrenderer/mtftools.hxx
index b9234bb178d7..d44272342ee9 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.hxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: mtftools.hxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.16.1 $
*
* This file is part of OpenOffice.org.
*
@@ -208,21 +208,30 @@ namespace cppcanvas
struct TextLineInfo
{
TextLineInfo( const double& rLineHeight,
+ const double& rOverlineHeight,
+ const double& rOverlineOffset,
const double& rUnderlineOffset,
const double& rStrikeoutOffset,
+ sal_Int8 nOverlineStyle,
sal_Int8 nUnderlineStyle,
sal_Int8 nStrikeoutStyle ) :
mnLineHeight( rLineHeight ),
+ mnOverlineHeight( rOverlineHeight ),
+ mnOverlineOffset( rOverlineOffset ),
mnUnderlineOffset( rUnderlineOffset ),
mnStrikeoutOffset( rStrikeoutOffset ),
+ mnOverlineStyle( nOverlineStyle ),
mnUnderlineStyle( nUnderlineStyle ),
mnStrikeoutStyle( nStrikeoutStyle )
{
}
double mnLineHeight;
+ double mnOverlineHeight;
+ double mnOverlineOffset;
double mnUnderlineOffset;
double mnStrikeoutOffset;
+ sal_Int8 mnOverlineStyle;
sal_Int8 mnUnderlineStyle;
sal_Int8 mnStrikeoutStyle;
};
@@ -240,16 +249,16 @@ namespace cppcanvas
const ::cppcanvas::internal::OutDevState& rState );
/** Create a poly-polygon representing the given combination
- of strikeout and underline.
+ of overline, strikeout and underline.
@param rStartOffset
Offset in X direction, where the underline starts
@param rLineWidth
- Width of the line of text to underline/strikeout
+ Width of the line of text to overline/strikeout/underline
@param rTextLineInfo
- Common info needed for strikeout/underline generation
+ Common info needed for overline/strikeout/underline generation
*/
::basegfx::B2DPolyPolygon createTextLinesPolyPolygon( const double& rStartOffset,
const double& rLineWidth,
--
cgit v1.2.3