summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-01-13 14:04:50 +0100
committerMichael Stahl <mstahl@redhat.com>2016-01-13 14:05:05 +0100
commit37c35bc263b46edb5881cc9eb824d3eb432c0441 (patch)
treeeb918a2d3fcd02c15e4d33dfda05b16b1cbbb5aa
parente17855d3bf12de307693aa34ace8f4fd20c707e6 (diff)
sw: -Werror=unused-but-set-variable
Change-Id: Iec8f2715a526d69332e771b99058fa1b321dbc57
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx5
1 files changed, 0 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index cc255220dcc8..ed846b052d13 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3257,9 +3257,6 @@ void WW8TabDesc::UpdateTableMergeGroup( WW8_TCell& rCell,
SwTableBox* pActBox,
sal_uInt16 nCol )
{
- // set default for return
- SwTableBox* pResult = nullptr;
-
// check if the box has to be merged
// If cell is the first one to be merged, a new merge group has to be provided.
// E.g., it could be that a cell is the first one to be merged, but no
@@ -3286,8 +3283,6 @@ void WW8TabDesc::UpdateTableMergeGroup( WW8_TCell& rCell,
{
// add current box to merge group
pTheMergeGroup->push_back(pActBox);
- // return target box
- pResult = (*pTheMergeGroup)[ 0 ];
}
}
}