Attachment 100793 Details for Bug 79599 – patch for fdo#79599

[patch] patch for fdo#79599

0001-fdo-79599-use-highlightN-instead-of-chcbpatN-in-RTF-.patch (text/plain), 2.08 KB, created by Norbert X on 2014-06-10 09:16:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Norbert X

Created: 2014-06-10 09:16:43 UTC

Size: 2.08 KB

patch

obsolete

>From 2c294d0885231923bdd8b70b10598646f2d47a77 Mon Sep 17 00:00:00 2001
>From: "nrbrtx@gmail.com" <nrbrtx@gmail.com>
>Date: Tue, 10 Jun 2014 12:26:26 +0400
>Subject: [PATCH] fdo#79599: use \highlightN instead of \chcbpatN in RTF import
> and export
>
>Change-Id: I98ef606fb73368a3c275819cb83b936e2162769d
>---
> sw/source/filter/ww8/rtfattributeoutput.cxx  | 2 +-
> writerfilter/source/dmapper/DomainMapper.cxx | 8 +-------
> 2 files changed, 2 insertions(+), 8 deletions(-)
>
>diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
>index 834996e..d144c58 100644
>--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
>+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
>@@ -2234,7 +2234,7 @@ void RtfAttributeOutput::CharBackground(const SvxBrushItem& rBrush)
> {
>     if (!rBrush.GetColor().GetTransparency())
>     {
>-        m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CHCBPAT);
>+        m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HIGHLIGHT);
>         m_aStyles.append((sal_Int32)m_rExport.GetColor(rBrush.GetColor()));
>     }
> }
>diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
>index fb4a5dc..f119b4d 100644
>--- a/writerfilter/source/dmapper/DomainMapper.cxx
>+++ b/writerfilter/source/dmapper/DomainMapper.cxx
>@@ -1334,13 +1334,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
>             pSectionContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::RL_TB));
>         break;
>     case NS_ooxml::LN_EG_RPrBase_highlight:
>-        {
>-            sal_Int32 nColor = 0;
>-            if( (mbIsHighlightSet = getColorFromIndex(nIntValue, nColor)) )
>-                rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::makeAny( nColor ));
>-            else if (mnBackgroundColor)
>-                rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( mnBackgroundColor ));
>-        }
>+        rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( nIntValue ));
>         break;
>     case NS_ooxml::LN_EG_RPrBase_em:
>         rContext->Insert(PROP_CHAR_EMPHASIS, uno::makeAny ( getEmphasisValue (nIntValue)));
>-- 
>1.8.5.5
>

Actions: View | Splinter Review

Attachments on bug 79599: 100365 | 100688 | 100793

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.