fdo#63023 incorrect RTF background color in header

Change-Id: I33f5c8a856206860ac9cdb23dd6b5222cb785bf7

4 files changed, 42 insertions, 6 deletions

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 86547b8848ad..94b5d7e58e04 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -200,6 +200,12 @@ protected:
     // Get paragraph (counted from 1), optionally check it contains the given text.
-    uno::Reference<text::XTextContent> getParagraphOrTable(int number) const
+    uno::Reference<text::XTextContent> getParagraphOrTable(int number, uno::Reference<text::XText> xText = uno::Reference<text::XText>()) const
     {
-        uno::Reference<text::XTextDocument> textDocument(mxComponent, uno::UNO_QUERY);
-        uno::Reference<container::XEnumerationAccess> paraEnumAccess(textDocument->getText(), uno::UNO_QUERY);
+        uno::Reference<container::XEnumerationAccess> paraEnumAccess;
+        if (xText.is())
+            paraEnumAccess.set(xText, uno::UNO_QUERY);
+        else
+        {
+            uno::Reference<text::XTextDocument> textDocument(mxComponent, uno::UNO_QUERY);
+            paraEnumAccess.set(textDocument->getText(), uno::UNO_QUERY);
+        }
         uno::Reference<container::XEnumeration> paraEnum = paraEnumAccess->createEnumeration();
@@ -223,2 +229,8 @@ protected:
 
+    uno::Reference<text::XTextRange> getParagraphOfText(int number, uno::Reference<text::XText> xText) const
+    {
+        uno::Reference<text::XTextRange> const xParagraph(getParagraphOrTable(number, xText), uno::UNO_QUERY_THROW);
+        return xParagraph;
+    }
+
     /// Get run (counted from 1) of a paragraph, optionally check it contains the given text.
diff --git a/sw/qa/extras/rtfimport/data/fdo63023.rtf b/sw/qa/extras/rtfimport/data/fdo63023.rtf
new file mode 100644
index 000000000000..c246dc634b10
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo63023.rtf
@@ -0,0 +1,10 @@
+{\rtf1
+{\colortbl;\red0\green0\blue0;\red0\green0\blue128;\red92\green133\blue38;\red153\green153\blue255;\red220\green35\blue0;\red255\green255\blue153;\red128\green128\blue128;}
+{\header
+{\cf4\chcbpat6
+Yellow 2 Background with Violet Text}
+\pard\par
+}
+body text
+\pard\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 0b3d758c5fa5..950c95b31337 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -153,2 +153,3 @@ public:
     void testFdo61193();
+    void testFdo63023();
 
@@ -276,2 +277,3 @@ void Test::run()
         {"hello.rtf", &Test::testFdo61193},
+        {"fdo63023.rtf", &Test::testFdo63023},
     };
@@ -1235,2 +1237,9 @@ void Test::testFdo51916()
 
+void Test::testFdo63023()
+{
+    uno::Reference<text::XText> xHeaderText = getProperty< uno::Reference<text::XText> >(getStyles("PageStyles")->getByName(DEFAULT_STYLE), "HeaderText");
+    // Back color was black (0) in the header, due to missing color table in the substream.
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFFFF99), getProperty<sal_Int32>(getRun(getParagraphOfText(1, xHeaderText), 1), "CharBackColor"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f1268f546d50..8d88a27052b3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -580,5 +580,10 @@ sal_uInt32 RTFDocumentImpl::getColorTable(sal_uInt32 nIndex)
 {
-    if (nIndex < m_aColorTable.size())
-        return m_aColorTable[nIndex];
-    return 0;
+    if (!m_pSuperstream)
+    {
+        if (nIndex < m_aColorTable.size())
+            return m_aColorTable[nIndex];
+        return 0;
+    }
+    else
+        return m_pSuperstream->getColorTable(nIndex);
 }