diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-04-18 17:07:22 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-06 17:48:45 +0200 |
| commit | 6bf2ac6b88d4fd4f1cfe420d7a9c78dc0ab2b90b (patch) | |
| tree | c0984093a5912d93f3297ceb9d3df4d302931ab0 /writerfilter | |
| parent | e238fdf9c495c0f1d5917cbc26c95ade42732835 (diff) | |
fdo#63023 incorrect RTF background color in header
(cherry picked from commits 3d4fef85d05269e613316a7af6245f05d207d76e and
08dc5de900b2e5cca9d9443fc5d4ea7756842af9)
Change-Id: I33f5c8a856206860ac9cdb23dd6b5222cb785bf7
Reviewed-on: https://gerrit.libreoffice.org/3461
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 954c08f7e67f..0a2348d89311 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -572,9 +572,14 @@ void RTFDocumentImpl::seek(sal_uInt32 nPos) 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); } rtl_TextEncoding RTFDocumentImpl::getEncoding(sal_uInt32 nFontIndex) |