[Libreoffice-commits] core.git: svtools/source sw/source

[Oliver Specht]

 svtools/source/control/ctrlbox.cxx |    2 ++
 sw/source/core/layout/paintfrm.cxx |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8045b87609409c944e3e89e7e11c00822a214512
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Fri Dec 11 15:36:57 2015 +0100

    tdf#36722: Enable footnote separator line style NONE
    
    adds detection of css::table::BorderLineStyle::NONE
    to the LineListBox and stops painting NONE style lines
    
    Change-Id: Ib24fa25a9e3e3ae685f2000685f01cae42d1653f
    Reviewed-on: https://gerrit.libreoffice.org/20639
    Reviewed-by: Oliver Specht <oliver.specht at cib.de>
    Tested-by: Oliver Specht <oliver.specht at cib.de>

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 450fb4d..69816b7 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -803,6 +803,8 @@ void LineListBox::InsertEntry(
 
 sal_Int32 LineListBox::GetEntryPos( sal_uInt16 nStyle ) const
 {
+    if(nStyle == css::table::BorderLineStyle::NONE && !m_sNone.isEmpty())
+        return 0;
     for ( size_t i = 0, n = pLineList->size(); i < n; ++i ) {
         ImpLineListData* pData = (*pLineList)[ i ];
         if ( pData )
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 83a8638..4fb7c89 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5596,7 +5596,7 @@ void SwFootnoteContFrame::PaintLine( const SwRect& rRect,
                       nX), Size( nLineWidth, nWidth ) )
             : SwRect( Point( nX, Frame().Pos().Y() + rInf.GetTopDist() ),
                             Size( nWidth, rInf.GetLineWidth()));
-    if ( aLineRect.HasArea() )
+    if ( aLineRect.HasArea() && rInf.GetLineStyle() != css::table::BorderLineStyle::NONE)
         PaintBorderLine( rRect, aLineRect , pPage, &rInf.GetLineColor(),
                 rInf.GetLineStyle() );
 }