Char shading: use a marker for character background imported from MSO shading

* So MSO format export filters can recognize that it should be exported
as shading.
* Editing in LO removes this shading marker, so from that point there
will be an LO character background.

Change-Id: I853b952f0395b33d36bb2934a6d910f2182cc1d9

1 files changed, 14 insertions, 4 deletions

diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index a74103765447..f62b2319eecb 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -30,6 +30,7 @@ public:
     void testImageWithSpecialID();
     void testGraphicShape();
     void testCharHighlight();
+    void testCharHighlightBody();
 
     CPPUNIT_TEST_SUITE(Test);
     CPPUNIT_TEST(testSwappedOutImageExport);
@@ -353,7 +354,7 @@ void Test::testGraphicShape()
     }
 }
 
-void Test::testCharHighlight()
+void Test::testCharHighlightBody()
 {
     // MS Word has two kind of character backgrounds called character shading and highlighting
     // MS filters handle these attributes separately, but ODF export merges them into one background attribute
@@ -365,9 +366,6 @@ void Test::testCharHighlight()
         "Office Open XML Text",
     };
 
-    SvtFilterOptions& rOpt = SvtFilterOptions::Get();
-    rOpt.SetCharBackground2Shading();
-
     for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++nFilter )
     {
         if (mxComponent.is())
@@ -453,6 +451,18 @@ void Test::testCharHighlight()
     }
 }
 
+void Test::testCharHighlight()
+{
+    SvtFilterOptions& rOpt = SvtFilterOptions::Get();
+    rOpt.SetCharBackground2Shading();
+
+    testCharHighlightBody();
+
+    rOpt.SetCharBackground2Highlighting();
+
+    testCharHighlightBody();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();