writerfilter/source/dmapper/DomainMapper.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit fc8b757dad5d98f4ba1cd40d03505873128670cd
Author: Justin Luth <jl...@mail.com>
AuthorDate: Wed Jul 13 10:19:23 2022 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Wed Jul 13 21:09:30 2022 +0200
tdf#139759 writerfilter: import comment highlight
Although it is a highlight, LO doesn't have such a silly
duplicate thing in the editeng code. So just map this as
normal char background instead of char highlight.
As of LO 7.x, we default to exporting as char background anyway,
so highlight is on the way out in LO.
P.S. Highlight is one of 17-ish colors. It is the background
button in the Char panel in MS Word. Background is on Word's
Para panel (even though it is a character property),
and so it can fairly easily be removed in MS Word.
I didn't add a unit test because it doesn't round-trip,
and an import-only test is basically useless.
I'm having a surprisingly hard time finding why it doesn't export.
Change-Id: Iad279b503b9f307994f1d9b96e7d984d6d8b44fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137036
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index d940d09ffd34..969578a4e73c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1714,17 +1714,19 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
break;
}
+ PropertyIds ePropertyId = m_pImpl->IsInComments() ?
PROP_CHAR_BACK_COLOR : PROP_CHAR_HIGHLIGHT;
+
// OOXML import uses an ID
if( IsOOXMLImport() )
{
sal_Int32 nColor = 0;
if( getColorFromId(nIntValue, nColor) )
- rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::Any( nColor ));
+ rContext->Insert(ePropertyId, uno::Any(nColor));
}
// RTF import uses the actual color value
else if( IsRTFImport() )
{
- rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::Any( nIntValue ));
+ rContext->Insert(ePropertyId, uno::Any(nIntValue));
}
}
break;
