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.

3 files changed, 42 insertions, 6 deletions

diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index ed7dbe587f..d20e05cbe9 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: xmltoken.cxx,v $
- * $Revision: 1.130.2.3 $
+ * $Revision: 1.131.6.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -2420,6 +2420,12 @@ namespace xmloff { namespace token {
         TOKEN( "text-underline-type",              XML_TEXT_UNDERLINE_TYPE ),
         TOKEN( "text-underline-width",             XML_TEXT_UNDERLINE_WIDTH ),
 
+        TOKEN( "text-overline-type",               XML_TEXT_OVERLINE_TYPE ),
+        TOKEN( "text-overline-style",              XML_TEXT_OVERLINE_STYLE ),
+        TOKEN( "text-overline-width",              XML_TEXT_OVERLINE_WIDTH ),
+        TOKEN( "text-overline-color",              XML_TEXT_OVERLINE_COLOR ),
+        TOKEN( "text-overline-mode",               XML_TEXT_OVERLINE_MODE ),
+
         TOKEN( "text-line-through-style",          XML_TEXT_LINE_THROUGH_STYLE ),
         TOKEN( "text-line-through-type",           XML_TEXT_LINE_THROUGH_TYPE ),
         TOKEN( "text-line-through-width",          XML_TEXT_LINE_THROUGH_WIDTH ),
@@ -3023,7 +3029,7 @@ namespace xmloff { namespace token {
         TOKEN( "cell-range" ,           XML_CELL_RANGE ),
         TOKEN( "error-lower-range",     XML_ERROR_LOWER_RANGE ),
         TOKEN( "error-upper-range",     XML_ERROR_UPPER_RANGE ),
-        
+
         // --> OD 2008-04-22 #refactorlists#
         TOKEN( "continue-list",         XML_CONTINUE_LIST ),
         TOKEN( "style-override",        XML_STYLE_OVERRIDE ),
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index 286559b00b..81530e129c 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: prhdlfac.cxx,v $
- * $Revision: 1.30 $
+ * $Revision: 1.30.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -326,6 +326,22 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::CreatePropertyHandler( sal_
             pPropHdl = new XMLIsTransparentPropHdl( XML_FONT_COLOR,
                                                      sal_False );
             break;
+        case XML_TYPE_TEXT_OVERLINE_TYPE:
+            pPropHdl = new XMLUnderlineTypePropHdl;
+            break;
+        case XML_TYPE_TEXT_OVERLINE_STYLE:
+            pPropHdl = new XMLUnderlineStylePropHdl;
+            break;
+        case XML_TYPE_TEXT_OVERLINE_WIDTH:
+            pPropHdl = new XMLUnderlineWidthPropHdl;
+            break;
+        case XML_TYPE_TEXT_OVERLINE_COLOR:
+            pPropHdl = new XMLColorTransparentPropHdl( XML_FONT_COLOR );
+            break;
+        case XML_TYPE_TEXT_OVERLINE_HASCOLOR:
+            pPropHdl = new XMLIsTransparentPropHdl( XML_FONT_COLOR,
+                                                     sal_False );
+            break;
         case XML_TYPE_TEXT_WEIGHT:
             pPropHdl = new XMLFontWeightPropHdl;
             break;
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index ca48238758..83fa7436ff 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: txtprmap.cxx,v $
- * $Revision: 1.106 $
+ * $Revision: 1.106.36.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -151,7 +151,8 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
     MT_E( "CharWeight",		FO,		FONT_WEIGHT,		XML_TYPE_TEXT_WEIGHT, 0 ),
     // RES_CHRATR_WORDLINEMODE
     MT_E( "CharWordMode",	STYLE,	TEXT_UNDERLINE_MODE,		XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
-    MT_E( "CharWordMode",	STYLE,	TEXT_LINE_THROUGH_MODE,		XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MT_E( "CharWordMode",   STYLE,  TEXT_OVERLINE_MODE,     XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MT_E( "CharWordMode",   STYLE,  TEXT_LINE_THROUGH_MODE,     XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
     // RES_CHRATR_AUTOKERN
     MT_E( "CharAutoKerning",	STYLE,	LETTER_KERNING,		XML_TYPE_BOOL, 0 ),
     // RES_CHRATR_BLINK
@@ -215,6 +216,12 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
     MT_E( "CharRelief",				STYLE,		FONT_RELIEF,				XML_TYPE_TEXT_FONT_RELIEF, 0 ),
     // RES_CHRATR_HIDDEN
     MT_E( "CharHidden",              TEXT,       DISPLAY,                    XML_TYPE_TEXT_HIDDEN_AS_DISPLAY|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_TEXT_DISPLAY ),
+    // RES_CHRATR_OVERLINE
+    MT_E( "CharOverline",   STYLE,  TEXT_OVERLINE_STYLE,        XML_TYPE_TEXT_OVERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MT_E( "CharOverline",   STYLE,  TEXT_OVERLINE_TYPE,     XML_TYPE_TEXT_OVERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MT_E( "CharOverline",   STYLE,  TEXT_OVERLINE_WIDTH,        XML_TYPE_TEXT_OVERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MT_E( "CharOverlineColor",  STYLE,  TEXT_OVERLINE_COLOR,        XML_TYPE_TEXT_OVERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
+    MT_E( "CharOverlineHasColor",   STYLE,  TEXT_OVERLINE_COLOR,        XML_TYPE_TEXT_OVERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
 
     // RES_TXTATR_INETFMT
     // TODO
@@ -439,7 +446,8 @@ XMLPropertyMapEntry aXMLTextPropMap[] =
     MT_E( "CharWeight",		FO,		FONT_WEIGHT,		XML_TYPE_TEXT_WEIGHT, 0 ),
     // RES_CHRATR_WORDLINEMODE
     MT_E( "CharWordMode",	STYLE,	TEXT_UNDERLINE_MODE,		XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
-    MT_E( "CharWordMode",	STYLE,	TEXT_LINE_THROUGH_MODE,		XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MT_E( "CharWordMode",   STYLE,  TEXT_OVERLINE_MODE,     XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MT_E( "CharWordMode",   STYLE,  TEXT_LINE_THROUGH_MODE,     XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
     // RES_CHRATR_AUTOKERN
     MT_E( "CharAutoKerning",	STYLE,	LETTER_KERNING,		XML_TYPE_BOOL, 0 ),
     // RES_CHRATR_BLINK
@@ -505,6 +513,12 @@ XMLPropertyMapEntry aXMLTextPropMap[] =
     MT_E( "CharRelief",				STYLE,		FONT_RELIEF,				XML_TYPE_TEXT_FONT_RELIEF, 0 ),
     // RES_CHRATR_HIDDEN
     MT_E( "CharHidden",              TEXT,       DISPLAY,                    XML_TYPE_TEXT_HIDDEN_AS_DISPLAY|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_TEXT_DISPLAY ),
+    // RES_CHRATR_OVERLINE
+    MT_E( "CharOverline",   STYLE,  TEXT_OVERLINE_STYLE,        XML_TYPE_TEXT_OVERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MT_E( "CharOverline",   STYLE,  TEXT_OVERLINE_TYPE,     XML_TYPE_TEXT_OVERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MT_E( "CharOverline",   STYLE,  TEXT_OVERLINE_WIDTH,        XML_TYPE_TEXT_OVERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
+    MT_E( "CharOverlineColor",  STYLE,  TEXT_OVERLINE_COLOR,        XML_TYPE_TEXT_OVERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
+    MT_E( "CharOverlineHasColor",   STYLE,  TEXT_OVERLINE_COLOR,        XML_TYPE_TEXT_OVERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
 
     // RES_TXTATR_INETFMT
     MT_E( "HyperLinkURL",			TEXT,		XMLNS,						XML_TYPE_STRING|MID_FLAG_NO_PROPERTY_IMPORT,	CTF_HYPERLINK_URL ),