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

Noel Grandin noel at peralex.com
Fri Jan 15 01:54:04 PST 2016


 sc/source/core/tool/address.cxx     |    6 +-----
 sc/source/filter/excel/excform8.cxx |    5 -----
 2 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 86bc68a4dabfb3c89f2b229ca42ab6a29ba8e696
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Jan 15 11:53:05 2016 +0200

    -Werror=unused-but-set-variable
    
    Change-Id: I18a3a72dce0d4bd42c11bd0836858125c13e02f4

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 2229fb0..99de6b3 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1677,7 +1677,7 @@ void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
         return;
 
     const sal_Unicode* p = rStr.getStr();
-    sal_uInt16 nRes = 0, ignored = 0;
+    sal_uInt16 ignored = 0;
 
     (void)pDoc; // make compiler shutup we may need this later
 
@@ -1693,13 +1693,11 @@ void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
             {
                 if( nullptr != (p = lcl_a1_get_row( p+1, &aEnd, &ignored )))
                 {
-                    nRes = SCA_VALID_COL;
                 }
             }
             else
             {
                 aEnd = aStart;
-                nRes = SCA_VALID_COL;
             }
         }
         break;
@@ -1713,13 +1711,11 @@ void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
                 if( (p[1] == 'R' || p[1] == 'r') &&
                     nullptr != (p = lcl_r1c1_get_row( p+1, rDetails, &aEnd, &ignored )))
                 {
-                    nRes = SCA_VALID_COL;
                 }
             }
             else
             {
                 aEnd = aStart;
-                nRes = SCA_VALID_COL;
             }
         }
         break;
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index ca1cc60..c13876c 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -1428,26 +1428,21 @@ void ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStream&
         bError |= !rStrm.IsValid();
     }
 
-    ConvErr eRet;
-
     if( bError )
     {
         aPool << ocBad;
         aPool >> aStack;
         rpArray = aPool[ aStack.Get() ];
-        eRet = ConvErrNi;
     }
     else if( rStrm.GetRecPos() != nEndPos )
     {
         aPool << ocBad;
         aPool >> aStack;
         rpArray = aPool[ aStack.Get() ];
-        eRet = ConvErrCount;
     }
     else
     {
         rpArray = aPool[ aStack.Get() ];
-        eRet = ConvOK;
     }
 
     rStrm.Seek(nEndPos);


More information about the Libreoffice-commits mailing list