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

[Michael Stahl]

 sw/source/filter/ww8/ww8par2.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 37c35bc263b46edb5881cc9eb824d3eb432c0441
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 13 14:04:50 2016 +0100

    sw: -Werror=unused-but-set-variable
    
    Change-Id: Iec8f2715a526d69332e771b99058fa1b321dbc57

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index cc25522..ed846b0 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 ];
         }
     }
 }