Kaydet (Commit) 86bc68a4 authored tarafından Noel Grandin's avatar Noel Grandin

-Werror=unused-but-set-variable

Change-Id: I18a3a72dce0d4bd42c11bd0836858125c13e02f4
üst 61161254
...@@ -1677,7 +1677,7 @@ void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc, ...@@ -1677,7 +1677,7 @@ void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
return; return;
const sal_Unicode* p = rStr.getStr(); 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 (void)pDoc; // make compiler shutup we may need this later
...@@ -1693,13 +1693,11 @@ void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc, ...@@ -1693,13 +1693,11 @@ void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
{ {
if( nullptr != (p = lcl_a1_get_row( p+1, &aEnd, &ignored ))) if( nullptr != (p = lcl_a1_get_row( p+1, &aEnd, &ignored )))
{ {
nRes = SCA_VALID_COL;
} }
} }
else else
{ {
aEnd = aStart; aEnd = aStart;
nRes = SCA_VALID_COL;
} }
} }
break; break;
...@@ -1713,13 +1711,11 @@ void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc, ...@@ -1713,13 +1711,11 @@ void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
if( (p[1] == 'R' || p[1] == 'r') && if( (p[1] == 'R' || p[1] == 'r') &&
nullptr != (p = lcl_r1c1_get_row( p+1, rDetails, &aEnd, &ignored ))) nullptr != (p = lcl_r1c1_get_row( p+1, rDetails, &aEnd, &ignored )))
{ {
nRes = SCA_VALID_COL;
} }
} }
else else
{ {
aEnd = aStart; aEnd = aStart;
nRes = SCA_VALID_COL;
} }
} }
break; break;
......
...@@ -1428,26 +1428,21 @@ void ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& ...@@ -1428,26 +1428,21 @@ void ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStream&
bError |= !rStrm.IsValid(); bError |= !rStrm.IsValid();
} }
ConvErr eRet;
if( bError ) if( bError )
{ {
aPool << ocBad; aPool << ocBad;
aPool >> aStack; aPool >> aStack;
rpArray = aPool[ aStack.Get() ]; rpArray = aPool[ aStack.Get() ];
eRet = ConvErrNi;
} }
else if( rStrm.GetRecPos() != nEndPos ) else if( rStrm.GetRecPos() != nEndPos )
{ {
aPool << ocBad; aPool << ocBad;
aPool >> aStack; aPool >> aStack;
rpArray = aPool[ aStack.Get() ]; rpArray = aPool[ aStack.Get() ];
eRet = ConvErrCount;
} }
else else
{ {
rpArray = aPool[ aStack.Get() ]; rpArray = aPool[ aStack.Get() ];
eRet = ConvOK;
} }
rStrm.Seek(nEndPos); rStrm.Seek(nEndPos);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment