diff options
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 450fb4de2760..69816b720c43 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 83a8638d00ab..4fb7c8957e87 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() ); } |