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.

2 files changed, 24 insertions, 3 deletions

diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index b3b4839fc444..bad28cd2a6a0 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: swfntcch.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.210.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +32,7 @@
 
 #include <tools/mempool.hxx>
 
-#define NUM_DEFAULT_VALUES 35
+#define NUM_DEFAULT_VALUES 36
 
 #include "swcache.hxx"
 #include "swfont.hxx"
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 4c62d90304a5..c36d5d9d4192 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: swfont.hxx,v $
- * $Revision: 1.37 $
+ * $Revision: 1.37.210.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -98,6 +98,7 @@ class SwSubFont : public SvxFont
     inline void SetPitch( const FontPitch ePitch );
     inline void SetAlign( const FontAlign eAlign );
     inline void SetUnderline( const FontUnderline eUnderline );
+    inline void SetOverline( const FontUnderline eOverline );
     inline void SetStrikeout( const FontStrikeout eStrikeout );
     inline void SetItalic( const FontItalic eItalic );
     inline void SetOutline( const BOOL bOutline );
@@ -137,6 +138,7 @@ class SwFont
     SwSubFont   aSub[SW_SCRIPTS]; // Latin-, CJK- and CTL-font
     Color*      pBackColor;     // background color (i.e. at character styles)
     Color       aUnderColor;    // color of the underlining
+    Color       aOverColor;     // color of the overlining
     BYTE        nToxCnt;        // Zaehlt die Schachtelungstiefe der Tox
     BYTE        nRefCnt;        // Zaehlt die Schachtelungstiefe der Refs
     BYTE        nActual;        // actual font (Latin, CJK or CTL)
@@ -202,6 +204,8 @@ public:
     inline void SetAlign( const FontAlign eAlign );
     inline void SetUnderline( const FontUnderline eUnderline );
     inline void SetUnderColor( const Color &rColor ) { aUnderColor = rColor; }
+    inline void SetOverline( const FontUnderline eOverline );
+    inline void SetOverColor( const Color &rColor ) { aOverColor = rColor; }
     inline void SetStrikeout( const FontStrikeout eStrikeout );
     inline void SetOutline( const BOOL bOutline );
            void SetVertical( USHORT nDir, const BOOL nVertLayout = FALSE );
@@ -264,6 +268,8 @@ public:
         { return aSub[nActual].IsSymbol( pSh ); }
     FontUnderline GetUnderline() const { return aSub[nActual].GetUnderline(); }
     const Color& GetUnderColor() const { return aUnderColor; }
+    FontUnderline GetOverline() const { return aSub[nActual].GetOverline(); }
+    const Color& GetOverColor() const { return aOverColor; }
     short GetFixKerning() const { return aSub[nActual].GetFixKerning(); }
     FontStrikeout GetStrikeout() const { return aSub[nActual].GetStrikeout(); }
     const Color& GetColor() const { return aSub[nActual].GetColor(); }
@@ -500,6 +506,21 @@ inline void SwFont::SetUnderline( const FontUnderline eUnderline )
 }
 
 // gekapselte SV-Font-Methode
+inline void SwSubFont::SetOverline( const FontUnderline eOverline )
+{
+    pMagic = 0;
+    Font::SetOverline( eOverline );
+}
+
+inline void SwFont::SetOverline( const FontUnderline eOverline )
+{
+    bFntChg = TRUE;
+    aSub[0].SetOverline( eOverline );
+    aSub[1].SetOverline( eOverline );
+    aSub[2].SetOverline( eOverline );
+}
+
+// gekapselte SV-Font-Methode
 inline void SwSubFont::SetStrikeout( const FontStrikeout eStrikeout )
 {
     pMagic = 0;