[Libreoffice-commits] core.git: writerfilter/source

[Mike Kaganski]

 writerfilter/source/dmapper/DomainMapper.cxx       |    1 -
 writerfilter/source/dmapper/PageBordersHandler.cxx |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6d20aeeda8a346ac10782d44214a89878fd00c40
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Tue Mar 13 09:20:57 2018 +0100

    If handler sets contexts properties, it should do it properly
    
    Change-Id: I0b58ab924214e1cbbc89af94c037e29d14d45856
    Reviewed-on: https://gerrit.libreoffice.org/51195
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 5af309e1cbcf..60f65a481084 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2093,7 +2093,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
 
             // Set the borders to the context and apply them to the styles
             pHandler->SetBorders( pSectionContext );
-            pSectionContext->SetBorderParams( pHandler->GetDisplayOffset( ) );
         }
     }
     break;
diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx b/writerfilter/source/dmapper/PageBordersHandler.cxx
index f9fe9685692b..fc1867be3c80 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.cxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.cxx
@@ -137,6 +137,7 @@ void PageBordersHandler::SetBorders( SectionPropertyMap* pSectContext )
     {
         pSectContext->SetBorder( rBorder.m_ePos, rBorder.m_nDistance, rBorder.m_rLine, rBorder.m_bShadow );
     }
+    pSectContext->SetBorderParams(GetDisplayOffset());
 }
 
 } }