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.

12 files changed, 164 insertions, 91 deletions

diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 439b0618f9f1..d40ca4de1876 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: globlmn_tmpl.hrc,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.212.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -140,6 +140,12 @@
     HelpID = SID_ATTR_CHAR_UNDERLINE ; \
     Text [ en-US ] = "Underline" ;\
 
+#define ITEM_FORMAT_ATTR_CHAR_OVERLINE \
+    Identifier = SID_ATTR_CHAR_OVERLINE ; \
+        Command = ".uno:Overline" ; \
+    HelpID = SID_ATTR_CHAR_OVERLINE ; \
+    Text [ en-US ] = "Overline" ;\
+
 #define ITEM_FORMAT_ATTR_CHAR_STRIKEOUT \
     Identifier = SID_ATTR_CHAR_STRIKEOUT ; \
     Command = ".uno:Strikeout" ; \
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svdstr.hrc
index 03b4858a861b..cb1b85079f37 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svdstr.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svdstr.hrc,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.212.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -722,59 +722,60 @@
 #define SIP_EE_CHAR_FONTWIDTH               (SIP_Begin + 228)
 #define SIP_EE_CHAR_WEIGHT                  (SIP_Begin + 229)
 #define SIP_EE_CHAR_UNDERLINE               (SIP_Begin + 230)
-#define SIP_EE_CHAR_STRIKEOUT               (SIP_Begin + 231)
-#define SIP_EE_CHAR_ITALIC                  (SIP_Begin + 232)
-#define SIP_EE_CHAR_OUTLINE                 (SIP_Begin + 233)
-#define SIP_EE_CHAR_SHADOW                  (SIP_Begin + 234)
-#define SIP_EE_CHAR_ESCAPEMENT              (SIP_Begin + 235)
-#define SIP_EE_CHAR_PAIRKERNING             (SIP_Begin + 236)
-#define SIP_EE_CHAR_KERNING                 (SIP_Begin + 237)
-#define SIP_EE_CHAR_WLM                     (SIP_Begin + 238)
-#define SIP_EE_FEATURE_TAB                  (SIP_Begin + 239)
-#define SIP_EE_FEATURE_LINEBR               (SIP_Begin + 240)
-#define SIP_EE_FEATURE_NOTCONV              (SIP_Begin + 241)
-#define SIP_EE_FEATURE_FIELD                (SIP_Begin + 242)
-
-#define SIP_SA_GRAFRED                      (SIP_Begin + 243)
-#define SIP_SA_GRAFGREEN                    (SIP_Begin + 244)
-#define SIP_SA_GRAFBLUE                     (SIP_Begin + 245)
-#define SIP_SA_GRAFLUMINANCE                (SIP_Begin + 246)
-#define SIP_SA_GRAFCONTRAST                 (SIP_Begin + 247)
-#define SIP_SA_GRAFGAMMA                    (SIP_Begin + 248)
-#define SIP_SA_GRAFTRANSPARENCE             (SIP_Begin + 249)
-#define SIP_SA_GRAFINVERT                   (SIP_Begin + 250)
-#define SIP_SA_GRAFMODE                     (SIP_Begin + 251)
-#define SIP_SA_GRAFCROP                     (SIP_Begin + 252)
-#define SIP_SA_GRAFRESERVE3                 (SIP_Begin + 253)
-#define SIP_SA_GRAFRESERVE4                 (SIP_Begin + 254)
-#define SIP_SA_GRAFRESERVE5                 (SIP_Begin + 255)
-#define SIP_SA_GRAFRESERVE6                 (SIP_Begin + 256)
-//BFS01#define SIP_SDRATTRSET_GRAF                  (SIP_Begin + 257)
+#define SIP_EE_CHAR_OVERLINE                (SIP_Begin + 231)
+#define SIP_EE_CHAR_STRIKEOUT               (SIP_Begin + 232)
+#define SIP_EE_CHAR_ITALIC                  (SIP_Begin + 233)
+#define SIP_EE_CHAR_OUTLINE                 (SIP_Begin + 234)
+#define SIP_EE_CHAR_SHADOW                  (SIP_Begin + 235)
+#define SIP_EE_CHAR_ESCAPEMENT              (SIP_Begin + 236)
+#define SIP_EE_CHAR_PAIRKERNING             (SIP_Begin + 237)
+#define SIP_EE_CHAR_KERNING                 (SIP_Begin + 238)
+#define SIP_EE_CHAR_WLM                     (SIP_Begin + 239)
+#define SIP_EE_FEATURE_TAB                  (SIP_Begin + 240)
+#define SIP_EE_FEATURE_LINEBR               (SIP_Begin + 241)
+#define SIP_EE_FEATURE_NOTCONV              (SIP_Begin + 242)
+#define SIP_EE_FEATURE_FIELD                (SIP_Begin + 243)
+
+#define SIP_SA_GRAFRED                      (SIP_Begin + 244)
+#define SIP_SA_GRAFGREEN                    (SIP_Begin + 245)
+#define SIP_SA_GRAFBLUE                     (SIP_Begin + 246)
+#define SIP_SA_GRAFLUMINANCE                (SIP_Begin + 247)
+#define SIP_SA_GRAFCONTRAST                 (SIP_Begin + 248)
+#define SIP_SA_GRAFGAMMA                    (SIP_Begin + 249)
+#define SIP_SA_GRAFTRANSPARENCE             (SIP_Begin + 250)
+#define SIP_SA_GRAFINVERT                   (SIP_Begin + 251)
+#define SIP_SA_GRAFMODE                     (SIP_Begin + 252)
+#define SIP_SA_GRAFCROP                     (SIP_Begin + 253)
+#define SIP_SA_GRAFRESERVE3                 (SIP_Begin + 254)
+#define SIP_SA_GRAFRESERVE4                 (SIP_Begin + 255)
+#define SIP_SA_GRAFRESERVE5                 (SIP_Begin + 256)
+#define SIP_SA_GRAFRESERVE6                 (SIP_Begin + 257)
+//BFS01#define SIP_SDRATTRSET_GRAF                  (SIP_Begin + 258)
 
 #define SIP_SA_MARKERS                      (SIP_Begin + 258)
-#define SIP_SA_FINE_MARKERS                 (SIP_Begin + 259)
+#define SIP_SA_FINE_MARKERS                 (SIP_Begin + 260)
 
 // #100499#
-#define BMP_SVXOLEOBJ                       (SIP_Begin + 260)
+#define BMP_SVXOLEOBJ                       (SIP_Begin + 261)
 
 // #101928#
-#define SIP_SA_ACCESSIBILITY_MARKERS        (SIP_Begin + 261)
-
-#define STR_TABLE_ATTR                      (SIP_Begin + 262)
-#define STR_TABLE_AUTOFMT                   (SIP_Begin + 263)
-#define STR_TABLE_INSCOL                    (SIP_Begin + 264)
-#define STR_TABLE_INSROW                    (SIP_Begin + 265)
-#define STR_UNDO_COL_DELETE                 (SIP_Begin + 266)
-#define STR_UNDO_ROW_DELETE                 (SIP_Begin + 267)
-#define STR_TABLE_SPLIT                     (SIP_Begin + 268)
-#define STR_TABLE_MERGE                     (SIP_Begin + 269)
-#define STR_TABLE_NUMFORMAT                 (SIP_Begin + 270)
-#define STR_TABLE_DISTRIBUTE_ROWS           (SIP_Begin + 271)
-#define STR_TABLE_DISTRIBUTE_COLUMNS        (SIP_Begin + 272)
-#define STR_TABLE_STYLE                     (SIP_Begin + 273)
-#define STR_TABLE_STYLE_SETTINGS            (SIP_Begin + 274)
-#define SIP_SA_CROP_MARKERS                 (SIP_Begin + 275)
-#define SIP_SA_CROP_FINE_MARKERS            (SIP_Begin + 276)
+#define SIP_SA_ACCESSIBILITY_MARKERS        (SIP_Begin + 262)
+
+#define STR_TABLE_ATTR                      (SIP_Begin + 263)
+#define STR_TABLE_AUTOFMT                   (SIP_Begin + 264)
+#define STR_TABLE_INSCOL                    (SIP_Begin + 265)
+#define STR_TABLE_INSROW                    (SIP_Begin + 266)
+#define STR_UNDO_COL_DELETE                 (SIP_Begin + 267)
+#define STR_UNDO_ROW_DELETE                 (SIP_Begin + 268)
+#define STR_TABLE_SPLIT                     (SIP_Begin + 269)
+#define STR_TABLE_MERGE                     (SIP_Begin + 270)
+#define STR_TABLE_NUMFORMAT                 (SIP_Begin + 271)
+#define STR_TABLE_DISTRIBUTE_ROWS           (SIP_Begin + 272)
+#define STR_TABLE_DISTRIBUTE_COLUMNS        (SIP_Begin + 273)
+#define STR_TABLE_STYLE                     (SIP_Begin + 274)
+#define STR_TABLE_STYLE_SETTINGS            (SIP_Begin + 275)
+#define SIP_SA_CROP_MARKERS                 (SIP_Begin + 276)
+#define SIP_SA_CROP_FINE_MARKERS            (SIP_Begin + 277)
 #define SIP_SA_ACCESSIBILITY_CROP_MARKERS   (SIP_Begin + 278)
 
 #define SIP_End                             (SIP_SA_ACCESSIBILITY_CROP_MARKERS)
@@ -783,5 +784,3 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
-
diff --git a/svx/inc/svx/editeng.hxx b/svx/inc/svx/editeng.hxx
index 6c3955683e5e..d5176034a301 100644
--- a/svx/inc/svx/editeng.hxx
+++ b/svx/inc/svx/editeng.hxx
@@ -440,6 +440,7 @@ public:
         bool bEndOfParagraph,
         bool bEndOfBullet,
         const ::com::sun::star::lang::Locale* pLocale,
+        const Color& rOverlineColor,
         const Color& rTextLineColor);
 
     virtual String  GetUndoComment( USHORT nUndoId ) const;
diff --git a/svx/inc/svx/eeitem.hxx b/svx/inc/svx/eeitem.hxx
index 7ce56a45b088..53202b795170 100644
--- a/svx/inc/svx/eeitem.hxx
+++ b/svx/inc/svx/eeitem.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: eeitem.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.212.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -84,17 +84,18 @@
 #define EE_CHAR_RELIEF              (EE_ITEMS_START+42)
 #define EE_CHAR_RUBI_DUMMY          (EE_ITEMS_START+43)
 #define EE_CHAR_XMLATTRIBS          (EE_ITEMS_START+44)
-#define EE_CHAR_END                 (EE_ITEMS_START+44)
+#define EE_CHAR_OVERLINE            (EE_ITEMS_START+45)
+#define EE_CHAR_END                 (EE_ITEMS_START+45)
 
 
-#define EE_FEATURE_START            (EE_ITEMS_START+45)
-#define EE_FEATURE_TAB              (EE_ITEMS_START+45)
-#define EE_FEATURE_LINEBR           (EE_ITEMS_START+46)
-#define EE_FEATURE_NOTCONV          (EE_ITEMS_START+47)
-#define EE_FEATURE_FIELD            (EE_ITEMS_START+48)
-#define EE_FEATURE_END              (EE_ITEMS_START+48)
+#define EE_FEATURE_START            (EE_ITEMS_START+46)
+#define EE_FEATURE_TAB              (EE_ITEMS_START+46)
+#define EE_FEATURE_LINEBR           (EE_ITEMS_START+47)
+#define EE_FEATURE_NOTCONV          (EE_ITEMS_START+48)
+#define EE_FEATURE_FIELD            (EE_ITEMS_START+49)
+#define EE_FEATURE_END              (EE_ITEMS_START+49)
 
-#define EE_ITEMS_END                (EE_ITEMS_START+48)
+#define EE_ITEMS_END                (EE_ITEMS_START+49)
 
 #define EDITITEMCOUNT ( EE_ITEMS_END - EE_ITEMS_START + 1 )
 
diff --git a/svx/inc/svx/eeitemid.hxx b/svx/inc/svx/eeitemid.hxx
index 0ca9822fa37b..088762f7fe10 100644
--- a/svx/inc/svx/eeitemid.hxx
+++ b/svx/inc/svx/eeitemid.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: eeitemid.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.212.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -60,6 +60,9 @@
 #ifdef ITEMID_UNDERLINE
 #undef ITEMID_UNDERLINE
 #endif
+#ifdef ITEMID_OVERLINE
+#undef ITEMID_OVERLINE
+#endif
 #ifdef ITEMID_LANGUAGE
 #undef ITEMID_LANGUAGE
 #endif
@@ -87,6 +90,7 @@
 #define ITEMID_CONTOUR          EE_CHAR_OUTLINE
 #define ITEMID_CROSSEDOUT       EE_CHAR_STRIKEOUT
 #define ITEMID_UNDERLINE        EE_CHAR_UNDERLINE
+#define ITEMID_OVERLINE         EE_CHAR_OVERLINE
 #define ITEMID_FONTHEIGHT       EE_CHAR_FONTHEIGHT
 #define ITEMID_CHARSCALE_W      EE_CHAR_FONTWIDTH
 #define ITEMID_COLOR            EE_CHAR_COLOR
diff --git a/svx/inc/svx/outliner.hxx b/svx/inc/svx/outliner.hxx
index 32351252c4f8..9fc20b815494 100644
--- a/svx/inc/svx/outliner.hxx
+++ b/svx/inc/svx/outliner.hxx
@@ -431,6 +431,7 @@ public:
     const EEngineData::WrongSpellVector*  mpWrongSpellVector;
     const SvxFieldData* mpFieldData;
     const ::com::sun::star::lang::Locale* mpLocale;
+    const Color maOverlineColor;
     const Color maTextLineColor;
 
     // #101498# BiDi level needs to be transported, too.
@@ -456,6 +457,7 @@ public:
         const EEngineData::WrongSpellVector* pWrongSpellVector,
         const SvxFieldData* pFieldData,
         const ::com::sun::star::lang::Locale* pLocale,
+        const Color& rOverlineColor,
         const Color& rTextLineColor,
         BYTE nBiDiLevel,
         bool bEndOfLine,
@@ -472,6 +474,7 @@ public:
         mpWrongSpellVector(pWrongSpellVector),
         mpFieldData(pFieldData),
         mpLocale(pLocale),
+        maOverlineColor(rOverlineColor),
         maTextLineColor(rTextLineColor),
         mnBiDiLevel(nBiDiLevel),
         mbEndOfLine(bEndOfLine),
@@ -904,6 +907,7 @@ public:
         bool bEndOfParagraph,
         bool bEndOfBullet,
         const ::com::sun::star::lang::Locale* pLocale,
+        const Color& rOverlineColor,
         const Color& rTextLineColor);
 
     Size            CalcTextSize();
diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc
index 0df801e90e4d..019211697711 100644
--- a/svx/inc/svx/svxitems.hrc
+++ b/svx/inc/svx/svxitems.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svxitems.hrc,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.212.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -211,7 +211,7 @@
 #define RID_SVXITEMS_ESCAPEMENT_SUB         (RID_SVXITEMS_START + 168)
 #define RID_SVXITEMS_ESCAPEMENT_AUTO        (RID_SVXITEMS_START + 169)
 
-// enum FontUnderline ----------------------------------------------------
+// enum FontUnderline - used for underline -------------------------------
 #define RID_SVXITEMS_UL_BEGIN               (RID_SVXITEMS_START + 170)
 #define RID_SVXITEMS_UL_NONE                (RID_SVXITEMS_START + 170)
 #define RID_SVXITEMS_UL_SINGLE              (RID_SVXITEMS_START + 171)
@@ -233,6 +233,28 @@
 #define RID_SVXITEMS_UL_BOLDDASHDOTDOT      (RID_SVXITEMS_START + 187)
 #define RID_SVXITEMS_UL_BOLDWAVE            (RID_SVXITEMS_START + 188)
 
+// enum FontUnderline - used for overline --------------------------------
+#define RID_SVXITEMS_OL_BEGIN               (RID_SVXITEMS_START + 200)
+#define RID_SVXITEMS_OL_NONE                (RID_SVXITEMS_START + 200)
+#define RID_SVXITEMS_OL_SINGLE              (RID_SVXITEMS_START + 201)
+#define RID_SVXITEMS_OL_DOUBLE              (RID_SVXITEMS_START + 202)
+#define RID_SVXITEMS_OL_DOTTED              (RID_SVXITEMS_START + 203)
+#define RID_SVXITEMS_OL_DONTKNOW            (RID_SVXITEMS_START + 204)
+#define RID_SVXITEMS_OL_DASH                (RID_SVXITEMS_START + 205)
+#define RID_SVXITEMS_OL_LONGDASH            (RID_SVXITEMS_START + 206)
+#define RID_SVXITEMS_OL_DASHDOT             (RID_SVXITEMS_START + 207)
+#define RID_SVXITEMS_OL_DASHDOTDOT          (RID_SVXITEMS_START + 208)
+#define RID_SVXITEMS_OL_SMALLWAVE           (RID_SVXITEMS_START + 209)
+#define RID_SVXITEMS_OL_WAVE                (RID_SVXITEMS_START + 210)
+#define RID_SVXITEMS_OL_DOUBLEWAVE          (RID_SVXITEMS_START + 211)
+#define RID_SVXITEMS_OL_BOLD                (RID_SVXITEMS_START + 212)
+#define RID_SVXITEMS_OL_BOLDDOTTED          (RID_SVXITEMS_START + 213)
+#define RID_SVXITEMS_OL_BOLDDASH            (RID_SVXITEMS_START + 214)
+#define RID_SVXITEMS_OL_BOLDLONGDASH        (RID_SVXITEMS_START + 215)
+#define RID_SVXITEMS_OL_BOLDDASHDOT         (RID_SVXITEMS_START + 216)
+#define RID_SVXITEMS_OL_BOLDDASHDOTDOT      (RID_SVXITEMS_START + 217)
+#define RID_SVXITEMS_OL_BOLDWAVE            (RID_SVXITEMS_START + 218)
+
 // enum SvxAdjust -----------------------------------------------------------
 #define RID_SVXITEMS_ADJUST_BEGIN           (RID_SVXITEMS_START + 230)
 #define RID_SVXITEMS_ADJUST_LEFT            (RID_SVXITEMS_START + 230)
@@ -322,6 +344,7 @@
 #define RID_ATTR_PARA_KEEP                  (RID_ATTR_BEGIN + 66)
 #define RID_ATTR_CHAR_BLINK                 (RID_ATTR_BEGIN + 67)
 #define RID_ATTR_CHAR_CHARSETCOLOR          (RID_ATTR_BEGIN + 68)
+#define RID_ATTR_CHAR_OVERLINE              (RID_ATTR_BEGIN + 69)
 
 #define RID_ATTR_FLASH                      (RID_ATTR_BEGIN + 406)
 #define RID_ATTR_PARA_REGISTER              (RID_ATTR_BEGIN + 413)
diff --git a/svx/inc/svx/udlnitem.hxx b/svx/inc/svx/udlnitem.hxx
index 5e10783b4968..ca27f07b9602 100644
--- a/svx/inc/svx/udlnitem.hxx
+++ b/svx/inc/svx/udlnitem.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: udlnitem.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.212.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,21 +46,18 @@ namespace rtl
     class OUString;
 }
 
-// class SvxUnderlineItem ------------------------------------------------
-
-/*  [Beschreibung]
+// class SvxTextLineItem ------------------------------------------------
 
-    Dieses Item beschreibt, ob und wie unterstrichen ist.
-*/
+/* Value container for underline and overline font effects */
 
-class SVX_DLLPUBLIC SvxUnderlineItem : public SfxEnumItem
+class SVX_DLLPUBLIC SvxTextLineItem : public SfxEnumItem
 {
     Color mColor;
 public:
     TYPEINFO();
 
-    SvxUnderlineItem( const FontUnderline eSt /*= UNDERLINE_NONE*/,
-                      const USHORT nId  );
+    SvxTextLineItem( const FontUnderline eSt,
+                     const USHORT nId );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -86,24 +83,57 @@ public:
     virtual BOOL            GetBoolValue() const;
     virtual void            SetBoolValue( BOOL bVal );
 
-    virtual int              operator==( const SfxPoolItem& ) const;
+    virtual int             operator==( const SfxPoolItem& ) const;
 
-    inline SvxUnderlineItem& operator=(const SvxUnderlineItem& rUnderline)
+    inline SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine)
         {
-            SetValue( rUnderline.GetValue() );
-            SetColor( rUnderline.GetColor() );
+            SetValue( rTextLine.GetValue() );
+            SetColor( rTextLine.GetColor() );
             return *this;
         }
 
     // enum cast
-    FontUnderline           GetUnderline() const
+    FontUnderline           GetLineStyle() const
                                 { return (FontUnderline)GetValue(); }
-    void                    SetUnderline ( FontUnderline eNew )
+    void                    SetLineStyle( FontUnderline eNew )
                                 { SetValue((USHORT) eNew); }
 
     const Color&            GetColor() const                { return mColor; }
     void                    SetColor( const Color& rCol )   { mColor = rCol; }
 };
 
-#endif // #ifndef _SVX_UDLNITEM_HXX
+// class SvxUnderlineItem ------------------------------------------------
+
+/* Value container for underline font effects */
+
+class SVX_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem
+{
+public:
+    TYPEINFO();
+
+    SvxUnderlineItem( const FontUnderline eSt,
+                      const USHORT nId );
+
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
+    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
+    virtual String          GetValueTextByPos( USHORT nPos ) const;
+};
+
+// class SvxOverlineItem ------------------------------------------------
+
+/* Value container for overline font effects */
+
+class SVX_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem
+{
+public:
+    TYPEINFO();
 
+    SvxOverlineItem( const FontUnderline eSt,
+                     const USHORT nId );
+
+    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
+    virtual SfxPoolItem*    Create(SvStream &, USHORT) const;
+    virtual String          GetValueTextByPos( USHORT nPos ) const;
+};
+
+#endif // #ifndef _SVX_UDLNITEM_HXX
diff --git a/svx/inc/svx/unomid.hxx b/svx/inc/svx/unomid.hxx
index a74d2e64ebb2..f4c44d228b04 100644
--- a/svx/inc/svx/unomid.hxx
+++ b/svx/inc/svx/unomid.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unomid.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.212.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -68,11 +68,11 @@
 #define MID_FONTWIDTH       0
 #define MID_FONTWIDTH_PROP  1
 
-//SvxUnderlineItem
-#define MID_UNDERLINED      0
-#define MID_UNDERLINE       1
-#define MID_UL_COLOR        2
-#define MID_UL_HASCOLOR     3
+//SvxTextLineItem
+#define MID_TEXTLINED       0
+#define MID_TL_STYLE        1
+#define MID_TL_COLOR        2
+#define MID_TL_HASCOLOR     3
 
 //SvxCrossedOutItem
 #define MID_CROSSED_OUT     0
diff --git a/svx/inc/svx/unoprnms.hxx b/svx/inc/svx/unoprnms.hxx
index 9b589301b90a..7f28e5677043 100644
--- a/svx/inc/svx/unoprnms.hxx
+++ b/svx/inc/svx/unoprnms.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unoprnms.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.148.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -340,6 +340,7 @@
 #define UNO_NAME_EDIT_CHAR_FONTNAME             "CharFontName"
 #define UNO_NAME_EDIT_CHAR_SHADOWED             "CharShadowed"
 #define UNO_NAME_EDIT_CHAR_UNDERLINE            "CharUnderline"
+#define UNO_NAME_EDIT_CHAR_OVERLINE             "CharOverline"
 
 #define UNO_NAME_BITMAP                         "Bitmap"
 
diff --git a/svx/inc/svx/unotext.hxx b/svx/inc/svx/unotext.hxx
index 7662eea8706f..3d26d1b09836 100644
--- a/svx/inc/svx/unotext.hxx
+++ b/svx/inc/svx/unotext.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unotext.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.84.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -114,9 +114,12 @@
     { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_LOCALE),      EE_CHAR_LANGUAGE,   &::getCppuType((const ::com::sun::star::lang::Locale*)0),0, MID_LANG_LOCALE }, \
     { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_COLOR),       EE_CHAR_COLOR,      &::getCppuType((const sal_Int32*)0),        0, 0 }, \
     { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_ESCAPEMENT),  EE_CHAR_ESCAPEMENT, &::getCppuType((const sal_Int16*)0),        0, MID_ESC }, \
-    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_UNDERLINE),   EE_CHAR_UNDERLINE,  &::getCppuType((const sal_Int16*)0),        0, MID_UNDERLINE }, \
-    { MAP_CHAR_LEN("CharUnderlineColor"),           EE_CHAR_UNDERLINE,  &::getCppuType((const sal_Int32*)0),        0, MID_UL_COLOR }, \
-    { MAP_CHAR_LEN("CharUnderlineHasColor"),        EE_CHAR_UNDERLINE,  &::getBooleanCppuType(),                    0, MID_UL_HASCOLOR } , \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_UNDERLINE),   EE_CHAR_UNDERLINE,  &::getCppuType((const sal_Int16*)0),        0, MID_TL_STYLE }, \
+    { MAP_CHAR_LEN("CharUnderlineColor"),           EE_CHAR_UNDERLINE,  &::getCppuType((const sal_Int32*)0),        0, MID_TL_COLOR }, \
+    { MAP_CHAR_LEN("CharUnderlineHasColor"),        EE_CHAR_UNDERLINE,  &::getBooleanCppuType(),                    0, MID_TL_HASCOLOR } , \
+    { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_OVERLINE),    EE_CHAR_OVERLINE,   &::getCppuType((const sal_Int16*)0),        0, MID_TL_STYLE }, \
+    { MAP_CHAR_LEN("CharOverlineColor"),            EE_CHAR_OVERLINE,   &::getCppuType((const sal_Int32*)0),        0, MID_TL_COLOR }, \
+    { MAP_CHAR_LEN("CharOverlineHasColor"),         EE_CHAR_OVERLINE,   &::getBooleanCppuType(),                    0, MID_TL_HASCOLOR } , \
     { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_CROSSEDOUT),  EE_CHAR_STRIKEOUT,  &::getBooleanCppuType(),                    0, MID_CROSSED_OUT }, \
     { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_STRIKEOUT),   EE_CHAR_STRIKEOUT,  &::getCppuType((const sal_Int16*)0),        0, MID_CROSS_OUT}, \
     { MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_SHADOWED),    EE_CHAR_SHADOW,     &::getBooleanCppuType(),                    0, 0 }, \
diff --git a/svx/inc/svxrtf.hxx b/svx/inc/svxrtf.hxx
index 896494c5a810..f66e37033759 100644
--- a/svx/inc/svxrtf.hxx
+++ b/svx/inc/svxrtf.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svxrtf.hxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.24.208.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -165,6 +165,7 @@ struct RTFPlainAttrMapIds
             nPosture,
             nShadowed,
             nUnderline,
+            nOverline,
             nWeight,
             nWordlineMode,
             nAutoKerning,