summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2011-10-25 13:50:37 +0300
committerTor Lillqvist <tlillqvist@suse.com>2011-10-25 13:55:52 +0300
commit40360820036a5d6a3359d1b5ec748a47a7edd85f (patch)
tree4ccc9ae24f91ef83bd0ec6bc89987e22d63226c7 /oox
parente3ec70c557d90fd504284c23036e6475b9f0b7c7 (diff)
WaE: unreachable code and unreferenced formal parameter
Diffstat (limited to 'oox')
-rw-r--r--oox/source/xls/sheetdatabuffer.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/oox/source/xls/sheetdatabuffer.cxx b/oox/source/xls/sheetdatabuffer.cxx
index 54fd7b3e8425..0839b9dc55d4 100644
--- a/oox/source/xls/sheetdatabuffer.cxx
+++ b/oox/source/xls/sheetdatabuffer.cxx
@@ -239,9 +239,13 @@ void CellBlockBuffer::setColSpans( sal_Int32 nRow, const ValueRangeSet& rColSpan
CellBlock* CellBlockBuffer::getCellBlock( const CellAddress& rCellAddr )
{
+ (void) rCellAddr; // Avoid WaE: unreferenced formal parameter, drop this line
+ // if the below "temporarily disabled" early return is removed
+
// Temporarily disabled. TODO: Fix this.
return NULL;
+#if 0 // Avoid WaE: unreachable code. Don't remove this ifdeffed out block, see above
OSL_ENSURE( rCellAddr.Row >= mnCurrRow, "CellBlockBuffer::getCellBlock - passed row out of order" );
// prepare cell blocks, if row changes
if( rCellAddr.Row != mnCurrRow )
@@ -312,6 +316,7 @@ CellBlock* CellBlockBuffer::getCellBlock( const CellAddress& rCellAddr )
// no valid cell block found
return 0;
+#endif // See start of method
}
void CellBlockBuffer::finalizeImport()