svx/source/table/tablecontroller.cxx | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
New commits:
commit a4b01a34f7e9ba4584eacab364b66709c55ecc44
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun May 28 21:10:28 2017 +0100
coverity#704341 Logically dead code
Change-Id: I1986daab3ec6576ac1b7d65f5944bbf21cd450b3
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index 47ca6dbcd5ad..e244ecfc04a7 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2680,20 +2680,6 @@ bool SvxTableController::ApplyFormatPaintBrush(
SfxItemSet& rFormatSet, bool bNo
aAttr.ClearItem( SDRATTR_TABLE_BORDER_INNER );
}
- const sal_uInt16* pRanges = rFormatSet.GetRanges();
- bool bTextOnly = true;
-
- while( *pRanges )
- {
- if( (*pRanges != EE_PARA_START) && (*pRanges != EE_CHAR_START) )
- {
- bTextOnly = true;
- break;
- }
- pRanges += 2;
- }
-
- const bool bReplaceAll = false;
for( sal_Int32 nRow = aStart.mnRow; nRow <= aEnd.mnRow; nRow++ )
{
for( sal_Int32 nCol = aStart.mnCol; nCol <= aEnd.mnCol; nCol++ )
@@ -2701,11 +2687,8 @@ bool SvxTableController::ApplyFormatPaintBrush(
SfxItemSet& rFormatSet, bool bNo
CellRef xCell( dynamic_cast< Cell* >(
mxTable->getCellByPosition( nCol, nRow ).get() ) );
if( xCell.is() )
{
- if( bUndo )
+ if (bUndo)
xCell->AddUndo();
- if( !bTextOnly )
- xCell->SetMergedItemSetAndBroadcast(aAttr,
bReplaceAll);
-
SdrText* pText = static_cast< SdrText* >( xCell.get() );
SdrObjEditView::ApplyFormatPaintBrushToText( rFormatSet,
*pTableObj, pText, bNoCharacterFormats, bNoParagraphFormats );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
