[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - writerfilter/source

[Thomas Beck]

 writerfilter/source/rtftok/rtfdispatchdestination.cxx |   24 +++---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|2 -
 2 files changed, 4 insertions(+), 22 deletions(-)

New commits:
commit ca968bd93f8b80da013c70a18f09e05cc30f1495
Author: Thomas Beck 
Date:   Thu Dec 14 09:41:56 2017 +0100

related tdf#108947 - fix further issues in 5.2 branch

Change-Id: Ibecd30aac458d56dc98ca5c3ef39a4f4b275e2d6

diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx 
b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index 1714434df331..1478ff5ce5ae 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -210,18 +210,10 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 }
 break;
 case RTF_HEADERL:
-if (!m_hasLHeader)
-{
-nId = NS_ooxml::LN_headerl;
-m_hasLHeader = true;
-}
+nId = NS_ooxml::LN_headerl;
 break;
 case RTF_HEADERR:
-if (!m_hasRHeader)
-{
-nId = NS_ooxml::LN_headerr;
-m_hasRHeader = true;
-}
+nId = NS_ooxml::LN_headerr;
 break;
 case RTF_HEADERF:
 if (!m_hasFHeader)
@@ -231,18 +223,10 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 }
 break;
 case RTF_FOOTERL:
-if (!m_hasLFooter)
-{
-nId = NS_ooxml::LN_footerl;
-m_hasLFooter = true;
-}
+nId = NS_ooxml::LN_footerl;
 break;
 case RTF_FOOTERR:
-if (!m_hasRFooter)
-{
-nId = NS_ooxml::LN_footerr;
-m_hasRFooter = true;
-}
+nId = NS_ooxml::LN_footerr;
 break;
 case RTF_FOOTERF:
 if (!m_hasFFooter)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 571c2d83ac54..4d16fbe8c9f3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -640,8 +640,6 @@ void RTFDocumentImpl::sectBreak(bool bFinal)
 {
 m_hasFHeader = false;
 m_hasRHeader = false;
-m_hasLHeader = false;
-m_hasLFooter = false;
 m_hasRFooter = false;
 m_hasFFooter = false;
 Mapper().endSectionGroup();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - writerfilter/source

[Serge Krot]

 writerfilter/source/dmapper/DomainMapper.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0dd909fff3117c8b30c33da48939215b44595c39
Author: Serge Krot 
Date:   Wed Sep 27 21:20:03 2017 +0200

related tdf#87533: handle LN_EG_SectPrContents_bidi correctly

Change-Id: I90d220550d24fb964cf4e528a1f506033f05de95
Reviewed-on: https://gerrit.libreoffice.org/42896
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/44176
Tested-by: Thorsten Behrens 

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 138fca3f7863..46aef6bf81c7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1473,7 +1473,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 break;
 case NS_ooxml::LN_EG_SectPrContents_bidi:
 if (pSectionContext != nullptr)
-pSectionContext->Insert(PROP_WRITING_MODE, uno::makeAny( 
text::WritingMode2::RL_TB));
+{
+const sal_Int16 writingMode = (nIntValue != 0) ? 
sal_Int16(text::WritingMode2::RL_TB) : sal_Int16(text::WritingMode2::LR_TB);
+pSectionContext->Insert(PROP_WRITING_MODE, 
uno::makeAny(writingMode));
+}
 break;
 case NS_ooxml::LN_EG_RPrBase_highlight:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits