fdo#65403, fdo#65404 DOCX export/import of character highlight

Steps
-Add a new character attribute (RES_CHRATR_HIGHLIGHT)
-Get this character attribute via SwFont class just like
background
-If has highlight, then paint that, otherwise paint background
-Extend UNO API
-Implement DOCX export and import filter
Note: By now character highlight can't be set via UI.
It's a next step to add a highlight option.

Change-Id: I7f81e173744bf256891487f898d06dbf372a2f88

5 files changed, 8 insertions, 1 deletions

diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index b0a77c27e7d8..e2482059b8fb 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -87,6 +87,8 @@ inline const SvxBlinkItem  &SwAttrSet::GetBlink(sal_Bool bInP) const
     {   return (const SvxBlinkItem&)Get( RES_CHRATR_BLINK,bInP); }
 inline const SvxBrushItem &SwAttrSet::GetChrBackground( sal_Bool bInP ) const
     {   return (const SvxBrushItem&)Get( RES_CHRATR_BACKGROUND, bInP ); }
+inline const SvxBrushItem &SwAttrSet::GetChrHighLight( sal_Bool bInP ) const
+    {   return (const SvxBrushItem&)Get( RES_CHRATR_HIGHLIGHT, bInP ); }
 inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( sal_Bool bInP ) const
     {   return (const SvxEmphasisMarkItem&)Get( RES_CHRATR_EMPHASIS_MARK, bInP ); }
 inline const SvxTwoLinesItem    &SwAttrSet::Get2Lines( sal_Bool bInP ) const
@@ -152,6 +154,8 @@ inline const SvxBlinkItem           &SwFmt::GetBlink(sal_Bool bInP) const
     {   return aSet.GetBlink(bInP); }
 inline const SvxBrushItem           &SwFmt::GetChrBackground(sal_Bool bInP) const
     {   return aSet.GetChrBackground(bInP); }
+inline const SvxBrushItem &SwFmt::GetChrHighLight(sal_Bool bInP) const
+    {   return aSet.GetChrHighLight(bInP); }
 inline const SvxEmphasisMarkItem   &SwFmt::GetEmphasisMark( sal_Bool bInP ) const
     {   return aSet.GetEmphasisMark(bInP); }
 inline const SvxTwoLinesItem       &SwFmt::Get2Lines( sal_Bool bInP ) const
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index a058dc6f5ae5..88c54022cac2 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -190,6 +190,7 @@ public:
     inline const SvxNoHyphenItem     &GetNoHyphenHere( sal_Bool = sal_True ) const;
     inline const SvxBlinkItem        &GetBlink( sal_Bool = sal_True ) const;
     inline const SvxBrushItem        &GetChrBackground( sal_Bool = sal_True ) const;
+    inline const SvxBrushItem        &GetChrHighLight( sal_Bool = sal_True ) const;
 
     inline const SvxFontItem         &GetCJKFont( sal_Bool = sal_True ) const;
     inline const SvxFontHeightItem   &GetCJKSize( sal_Bool = sal_True ) const;
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 231551a210fc..97ee553f4035 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -90,7 +90,7 @@ RES_CHRATR_BEGIN = HINT_BEGIN,
     RES_CHRATR_RSID,                        // 39
     RES_CHRATR_BOX,                         // 40
     RES_CHRATR_SHADOW,                      // 41
-    RES_CHRATR_DUMMY1,                      // 42
+    RES_CHRATR_HIGHLIGHT,                   // 42
     RES_CHRATR_DUMMY2,                      // 43
     RES_CHRATR_DUMMY3,                      // 44
 RES_CHRATR_END
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 0b3513506743..8c1c87b15599 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -232,6 +232,7 @@ public:
     inline const SvxNoHyphenItem      &GetNoHyphenHere( sal_Bool = sal_True ) const;
     inline const SvxBlinkItem         &GetBlink( sal_Bool = sal_True ) const;
     inline const SvxBrushItem         &GetChrBackground( sal_Bool = sal_True ) const;
+    inline const SvxBrushItem         &GetChrHighLight( sal_Bool = sal_True ) const;
     inline const SvxFontItem          &GetCJKFont( sal_Bool = sal_True ) const;
     inline const SvxFontHeightItem    &GetCJKSize( sal_Bool = sal_True ) const;
     inline const SvxLanguageItem      &GetCJKLanguage( sal_Bool = sal_True ) const;
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index ebc95c7a6f75..32f635ee69d7 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -840,6 +840,7 @@ enum SwPropNameIds
 
 /* 0774 */  UNO_NAME_DOC_INTEROP_GRAB_BAG,
 /* 0775 */  UNO_NAME_FRAME_INTEROP_GRAB_BAG,
+/* 0776 */  UNO_NAME_CHAR_HIGHLIGHT,
 
             SW_PROPNAME_END