diff options
author | Justin Malcolm <malcolm.justin@gmail.com> | 2010-09-29 14:14:15 -0400 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2010-09-29 14:14:15 -0400 |
commit | 31018e35b1984aad1f01a389b1fd3428d52acf6e (patch) | |
tree | 80c65287ee3064cb5208daa0d78f1d97bc37c6ce /sc/source/filter/excel | |
parent | da4c41c60b8224888486111c1bc01c813ff670c5 (diff) |
I think that this eliminates the remaining //UNUSED comments
There were still some of these comments (actually, a lot of them).
The most recent attachment should get rid of the last of them.
(fd#30442)
Diffstat (limited to 'sc/source/filter/excel')
-rw-r--r-- | sc/source/filter/excel/frmbase.cxx | 14 | ||||
-rw-r--r-- | sc/source/filter/excel/tokstack.cxx | 33 | ||||
-rw-r--r-- | sc/source/filter/excel/xehelper.cxx | 16 | ||||
-rw-r--r-- | sc/source/filter/excel/xelink.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/excel/xename.cxx | 5 | ||||
-rw-r--r-- | sc/source/filter/excel/xepivot.cxx | 10 | ||||
-rw-r--r-- | sc/source/filter/excel/xestream.cxx | 28 | ||||
-rw-r--r-- | sc/source/filter/excel/xestring.cxx | 38 | ||||
-rw-r--r-- | sc/source/filter/excel/xestyle.cxx | 43 | ||||
-rw-r--r-- | sc/source/filter/excel/xetable.cxx | 35 | ||||
-rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 5 | ||||
-rw-r--r-- | sc/source/filter/excel/xihelper.cxx | 22 | ||||
-rw-r--r-- | sc/source/filter/excel/xilink.cxx | 36 | ||||
-rw-r--r-- | sc/source/filter/excel/xistream.cxx | 7 | ||||
-rw-r--r-- | sc/source/filter/excel/xlpivot.cxx | 5 | ||||
-rw-r--r-- | sc/source/filter/excel/xlstyle.cxx | 12 |
16 files changed, 0 insertions, 315 deletions
diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index b550bfa92ef4..eb3ddd541725 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -269,20 +269,6 @@ LotusConverterBase::~LotusConverterBase() { } -//UNUSED2008-05 void LotusConverterBase::Reset( INT32 nLen, const ScAddress& rEingPos ) -//UNUSED2008-05 { -//UNUSED2008-05 ConverterBase::Reset(); -//UNUSED2008-05 nBytesLeft = nLen; -//UNUSED2008-05 aEingPos = rEingPos; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void LotusConverterBase::Reset( INT32 nLen ) -//UNUSED2008-05 { -//UNUSED2008-05 ConverterBase::Reset(); -//UNUSED2008-05 nBytesLeft = nLen; -//UNUSED2008-05 aEingPos.Set( 0, 0, 0 ); -//UNUSED2008-05 } - void LotusConverterBase::Reset( const ScAddress& rEingPos ) { ConverterBase::Reset(); diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index b61a844d02a5..b1f7dfe12db6 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -204,23 +204,6 @@ void TokenPool::GrowDouble( void ) pP_Dbl = pP_DblNew; } - -//UNUSED2009-05 void TokenPool::GrowError( void ) -//UNUSED2009-05 { -//UNUSED2009-05 UINT16 nP_ErrNew = nP_Err * 2; -//UNUSED2009-05 -//UNUSED2009-05 USHORT* pP_ErrNew = new USHORT[ nP_ErrNew ]; -//UNUSED2009-05 -//UNUSED2009-05 for( UINT16 nL = 0 ; nL < nP_Err ; nL++ ) -//UNUSED2009-05 pP_ErrNew[ nL ] = pP_Err[ nL ]; -//UNUSED2009-05 -//UNUSED2009-05 nP_Err = nP_ErrNew; -//UNUSED2009-05 -//UNUSED2009-05 delete[] pP_Err; -//UNUSED2009-05 pP_Err = pP_ErrNew; -//UNUSED2009-05 } - - void TokenPool::GrowTripel( void ) { UINT16 nP_RefTrNew = nP_RefTr * 2; @@ -847,7 +830,6 @@ BOOL TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const return FALSE; } - const String* TokenPool::GetExternal( const TokenId& rId ) const { const String* p = NULL; @@ -862,21 +844,6 @@ const String* TokenPool::GetExternal( const TokenId& rId ) const return p; } - -//UNUSED2008-05 const String* TokenPool::GetString( const TokenId& r ) const -//UNUSED2008-05 { -//UNUSED2008-05 const String* p = NULL; -//UNUSED2008-05 UINT16 n = (UINT16) r; -//UNUSED2008-05 if( n && n <= nElementAkt ) -//UNUSED2008-05 { -//UNUSED2008-05 n--; -//UNUSED2008-05 if( pType[ n ] == T_Str ) -//UNUSED2008-05 p = ppP_Str[ pElement[ n ] ]; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 return p; -//UNUSED2008-05 } - ScMatrix* TokenPool::GetMatrix( unsigned int n ) const { if( n < nP_MatrixAkt ) diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index bce037bd05c1..5393e229e5c4 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -255,24 +255,8 @@ bool XclExpAddressConverter::ConvertRange( XclRange& rXclRange, return bValidStart; } -//UNUSED2008-05 XclRange XclExpAddressConverter::CreateValidRange( const ScRange& rScRange, bool bWarn ) -//UNUSED2008-05 { -//UNUSED2008-05 return XclRange( -//UNUSED2008-05 CreateValidAddress( rScRange.aStart, bWarn ), -//UNUSED2008-05 CreateValidAddress( rScRange.aEnd, bWarn ) ); -//UNUSED2008-05 } - // cell range list ------------------------------------------------------------ -//UNUSED2008-05 bool XclExpAddressConverter::CheckRangeList( const ScRangeList& rScRanges, bool bWarn ) -//UNUSED2008-05 { -//UNUSED2008-05 for( ULONG nIdx = 0, nSize = rScRanges.Count(); nIdx < nSize; ++nIdx ) -//UNUSED2008-05 if( const ScRange* pScRange = rScRanges.GetObject( nIdx ) ) -//UNUSED2008-05 if( !CheckRange( *pScRange, bWarn ) ) -//UNUSED2008-05 return false; -//UNUSED2008-05 return true; -//UNUSED2008-05 } - void XclExpAddressConverter::ValidateRangeList( ScRangeList& rScRanges, bool bWarn ) { ULONG nIdx = rScRanges.Count(); diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index fcf738527025..a9112b98c98d 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -798,12 +798,6 @@ SCTAB XclExpTabInfo::GetRealScTab( SCTAB nSortedScTab ) const return (nSortedScTab < mnScCnt) ? maFromSortedVec[ nSortedScTab ] : SCTAB_INVALID; } -//UNUSED2009-05 SCTAB XclExpTabInfo::GetSortedScTab( SCTAB nScTab ) const -//UNUSED2009-05 { -//UNUSED2009-05 DBG_ASSERT( nScTab < mnScCnt, "XclExpTabInfo::GetSortedScTab - sheet out of range" ); -//UNUSED2009-05 return (nScTab < mnScCnt) ? maToSortedVec[ nScTab ] : SCTAB_INVALID; -//UNUSED2009-05 } - bool XclExpTabInfo::GetFlag( SCTAB nScTab, sal_uInt8 nFlags ) const { DBG_ASSERT( nScTab < mnScCnt, "XclExpTabInfo::GetFlag - sheet out of range" ); diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index af275bef7eef..66e79aa4072b 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -721,11 +721,6 @@ sal_uInt16 XclExpNameManager::InsertDBRange( USHORT nScDBRangeIdx ) return mxImpl->InsertDBRange( nScDBRangeIdx ); } -//UNUSED2009-05 sal_uInt16 XclExpNameManager::InsertBuiltInName( sal_Unicode cBuiltIn, XclTokenArrayRef xTokArr, SCTAB nScTab ) -//UNUSED2009-05 { -//UNUSED2009-05 return mxImpl->InsertBuiltInName( cBuiltIn, xTokArr, nScTab ); -//UNUSED2009-05 } - sal_uInt16 XclExpNameManager::InsertBuiltInName( sal_Unicode cBuiltIn, const ScRange& rRange ) { XclTokenArrayRef xTokArr = GetFormulaCompiler().CreateFormula( EXC_FMLATYPE_NAME, rRange ); diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index ddcdb3243167..1f3a263238a2 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -707,11 +707,6 @@ const XclExpPCField* XclExpPivotCache::GetField( sal_uInt16 nFieldIdx ) const return maFieldList.GetRecord( nFieldIdx ).get(); } -//UNUSED2009-05 const XclExpPCField* XclExpPivotCache::GetField( const String& rFieldName ) const -//UNUSED2009-05 { -//UNUSED2009-05 return const_cast< XclExpPivotCache* >( this )->GetFieldAcc( rFieldName ); -//UNUSED2009-05 } - bool XclExpPivotCache::HasAddFields() const { // pivot cache can be shared, if there are no additional cache fields @@ -1025,11 +1020,6 @@ sal_uInt16 XclExpPTField::GetLastDataInfoIndex() const return static_cast< sal_uInt16 >( maDataInfoVec.size() - 1 ); } -//UNUSED2009-05 const XclExpPTItem* XclExpPTField::GetItem( const String& rName ) const -//UNUSED2009-05 { -//UNUSED2009-05 return const_cast< XclExpPTField* >( this )->GetItemAcc( rName ); -//UNUSED2009-05 } - sal_uInt16 XclExpPTField::GetItemIndex( const String& rName, sal_uInt16 nDefaultIdx ) const { for( size_t nPos = 0, nSize = maItemList.GetSize(); nPos < nSize; ++nPos ) diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index f828079c8735..60bde56e827d 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -296,28 +296,6 @@ sal_Size XclExpStream::CopyFromStream( SvStream& rInStrm, sal_Size nBytes ) return nRet; } -//UNUSED2008-05 void XclExpStream::WriteUnicodeBuffer( const sal_uInt16* pBuffer, sal_Size nChars, sal_uInt8 nFlags ) -//UNUSED2008-05 { -//UNUSED2008-05 SetSliceSize( 0 ); -//UNUSED2008-05 if( pBuffer && (nChars > 0) ) -//UNUSED2008-05 { -//UNUSED2008-05 sal_uInt16 nCharLen = (nFlags & EXC_STRF_16BIT) ? 2 : 1; -//UNUSED2008-05 for( sal_Size nIndex = 0; nIndex < nChars; ++nIndex ) -//UNUSED2008-05 { -//UNUSED2008-05 if( mbInRec && (mnCurrSize + nCharLen > mnCurrMaxSize) ) -//UNUSED2008-05 { -//UNUSED2008-05 StartContinue(); -//UNUSED2008-05 // repeat only 16bit flag -//UNUSED2008-05 operator<<( static_cast< sal_uInt8 >( nFlags & EXC_STRF_16BIT ) ); -//UNUSED2008-05 } -//UNUSED2008-05 if( nCharLen == 2 ) -//UNUSED2008-05 operator<<( pBuffer[ nIndex ] ); -//UNUSED2008-05 else -//UNUSED2008-05 operator<<( static_cast< sal_uInt8 >( pBuffer[ nIndex ] ) ); -//UNUSED2008-05 } -//UNUSED2008-05 } -//UNUSED2008-05 } - void XclExpStream::WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nFlags ) { SetSliceSize( 0 ); @@ -339,12 +317,6 @@ void XclExpStream::WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nF } } -//UNUSED2008-05 void XclExpStream::WriteByteStringBuffer( const ByteString& rString, sal_uInt16 nMaxLen ) -//UNUSED2008-05 { -//UNUSED2008-05 SetSliceSize( 0 ); -//UNUSED2008-05 Write( rString.GetBuffer(), ::std::min< sal_Size >( rString.Len(), nMaxLen ) ); -//UNUSED2008-05 } - // ER: #71367# Xcl has an obscure sense of whether starting a new record or not, // and crashes if it encounters the string header at the very end of a record. // Thus we add 1 to give some room, seems like they do it that way but with another count (10?) diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index cd0b083aa208..6279ec4cd0fd 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -125,20 +125,6 @@ XclExpString::XclExpString( const OUString& rString, XclStrFlags nFlags, sal_uIn Assign( rString, nFlags, nMaxLen ); } -//UNUSED2008-05 XclExpString::XclExpString( -//UNUSED2008-05 const String& rString, const XclFormatRunVec& rFormats, -//UNUSED2008-05 XclStrFlags nFlags, sal_uInt16 nMaxLen ) -//UNUSED2008-05 { -//UNUSED2008-05 Assign( rString, rFormats, nFlags, nMaxLen ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 XclExpString::XclExpString( -//UNUSED2008-05 const OUString& rString, const XclFormatRunVec& rFormats, -//UNUSED2008-05 XclStrFlags nFlags, sal_uInt16 nMaxLen ) -//UNUSED2008-05 { -//UNUSED2008-05 Assign( rString, rFormats, nFlags, nMaxLen ); -//UNUSED2008-05 } - // assign --------------------------------------------------------------------- void XclExpString::Assign( const String& rString, XclStrFlags nFlags, sal_uInt16 nMaxLen ) @@ -179,20 +165,6 @@ void XclExpString::AssignByte( Build( aByteStr.GetBuffer(), aByteStr.Len(), nFlags, nMaxLen ); } -//UNUSED2008-05 void XclExpString::AssignByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc, XclStrFlags nFlags, sal_uInt16 nMaxLen ) -//UNUSED2008-05 { -//UNUSED2008-05 if( !cChar ) -//UNUSED2008-05 { -//UNUSED2008-05 sal_Char cByteChar = 0; -//UNUSED2008-05 Build( &cByteChar, 1, nFlags, nMaxLen ); -//UNUSED2008-05 } -//UNUSED2008-05 else -//UNUSED2008-05 { -//UNUSED2008-05 ByteString aByteStr( &cChar, 1, eTextEnc ); // length may be >1 -//UNUSED2008-05 Build( aByteStr.GetBuffer(), aByteStr.Len(), nFlags, nMaxLen ); -//UNUSED2008-05 } -//UNUSED2008-05 } - // append --------------------------------------------------------------------- void XclExpString::Append( const String& rString ) @@ -200,16 +172,6 @@ void XclExpString::Append( const String& rString ) BuildAppend( rString.GetBuffer(), rString.Len() ); } -//UNUSED2008-05 void XclExpString::Append( const ::rtl::OUString& rString ) -//UNUSED2008-05 { -//UNUSED2008-05 BuildAppend( rString.getStr(), rString.getLength() ); -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpString::Append( sal_Unicode cChar ) -//UNUSED2008-05 { -//UNUSED2008-05 BuildAppend( &cChar, 1 ); -//UNUSED2008-05 } - void XclExpString::AppendByte( const String& rString, rtl_TextEncoding eTextEnc ) { if( rString.Len() > 0 ) diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index ccebe9a4280f..923f1ff85cf3 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2113,49 +2113,6 @@ XclExpDefaultXF::XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF ) : { } -//UNUSED2008-05 void XclExpDefaultXF::SetParent( sal_uInt32 nParentXFId ) -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ASSERT( IsCellXF(), "XclExpDefaultXF::SetParent - not allowed in style XFs" ); -//UNUSED2008-05 if( IsCellXF() ) -//UNUSED2008-05 mnParentXFId = nParentXFId; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpDefaultXF::SetUsedFlags( -//UNUSED2008-05 bool bProtUsed, bool bFontUsed, bool bFmtUsed, -//UNUSED2008-05 bool bAlignUsed, bool bBorderUsed, bool bAreaUsed ) -//UNUSED2008-05 { -//UNUSED2008-05 mbProtUsed = bProtUsed; -//UNUSED2008-05 mbFontUsed = bFontUsed; -//UNUSED2008-05 mbFmtUsed = bFmtUsed; -//UNUSED2008-05 mbAlignUsed = bAlignUsed; -//UNUSED2008-05 mbBorderUsed = bBorderUsed; -//UNUSED2008-05 mbAreaUsed = bAreaUsed; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpDefaultXF::SetProtection( const XclExpCellProt& rProtection ) -//UNUSED2008-05 { -//UNUSED2008-05 maProtection = rProtection; -//UNUSED2008-05 mbProtUsed = true; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpDefaultXF::SetAlignment( const XclExpCellAlign& rAlignment ) -//UNUSED2008-05 { -//UNUSED2008-05 maAlignment = rAlignment; -//UNUSED2008-05 mbAlignUsed = true; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpDefaultXF::SetBorder( const XclExpCellBorder& rBorder ) -//UNUSED2008-05 { -//UNUSED2008-05 maBorder = rBorder; -//UNUSED2008-05 mbBorderUsed = true; -//UNUSED2008-05 } -//UNUSED2008-05 -//UNUSED2008-05 void XclExpDefaultXF::SetArea( const XclExpCellArea& rArea ) -//UNUSED2008-05 { -//UNUSED2008-05 maArea = rArea; -//UNUSED2008-05 mbAreaUsed = true; -//UNUSED2008-05 } - void XclExpDefaultXF::SetFont( sal_uInt16 nXclFont ) { mnXclFont = nXclFont; diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 452e7bee0fc0..0bfb2d7904b3 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -648,41 +648,6 @@ void XclExpBooleanCell::WriteContents( XclExpStream& rStrm ) rStrm << sal_uInt16( mbValue ? 1 : 0 ) << EXC_BOOLERR_BOOL; } -// ---------------------------------------------------------------------------- - -//UNUSED2009-05 IMPL_FIXEDMEMPOOL_NEWDEL( XclExpErrorCell, 256, 256 ) -//UNUSED2009-05 -//UNUSED2009-05 XclExpErrorCell::XclExpErrorCell( -//UNUSED2009-05 const XclExpRoot rRoot, const XclAddress& rXclPos, -//UNUSED2009-05 const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, sal_uInt8 nErrCode ) : -//UNUSED2009-05 // #i41210# always use latin script for error cells -//UNUSED2009-05 XclExpSingleCellBase( rRoot, EXC_ID3_BOOLERR, 2, rXclPos, pPattern, ApiScriptType::LATIN, nForcedXFId ), -//UNUSED2009-05 mnErrCode( nErrCode ) -//UNUSED2009-05 { -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 void XclExpErrorCell::SaveXml( XclExpXmlStream& rStrm ) -//UNUSED2009-05 { -//UNUSED2009-05 sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); -//UNUSED2009-05 rWorksheet->startElement( XML_c, -//UNUSED2009-05 XML_r, XclXmlUtils::ToOString( GetXclPos() ).getStr(), -//UNUSED2009-05 XML_s, lcl_GetStyleId( rStrm, *this ).getStr(), -//UNUSED2009-05 XML_t, "e", -//UNUSED2009-05 // OOXTODO: XML_cm, XML_vm, XML_ph -//UNUSED2009-05 FSEND ); -//UNUSED2009-05 rWorksheet->startElement( XML_v, FSEND ); -//UNUSED2009-05 rWorksheet->write( (sal_Int32) mnErrCode ); -//UNUSED2009-05 rWorksheet->endElement( XML_v ); -//UNUSED2009-05 rWorksheet->endElement( XML_c ); -//UNUSED2009-05 } -//UNUSED2009-05 -//UNUSED2009-05 void XclExpErrorCell::WriteContents( XclExpStream& rStrm ) -//UNUSED2009-05 { -//UNUSED2009-05 rStrm << mnErrCode << EXC_BOOLERR_ERROR; -//UNUSED2009-05 } - -// ---------------------------------------------------------------------------- - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpLabelCell, 256, 256 ) XclExpLabelCell::XclExpLabelCell( diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 8d09cae60941..557f59654f92 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -2975,11 +2975,6 @@ void XclImpPictureObj::ReadPictFmla( XclImpStream& rStrm, sal_uInt16 nLinkSize ) // DFF stream conversion ====================================================== -//UNUSED2009-05 void XclImpSolverContainer::ReadSolverContainer( SvStream& rDffStrm ) -//UNUSED2009-05 { -//UNUSED2009-05 rDffStrm >> *this; -//UNUSED2009-05 } - void XclImpSolverContainer::InsertSdrObjectInfo( SdrObject& rSdrObj, sal_uInt32 nDffShapeId, sal_uInt32 nDffFlags ) { if( nDffShapeId > 0 ) diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index ad04a1f3930c..d8b353179cd6 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -134,24 +134,8 @@ bool XclImpAddressConverter::ConvertRange( ScRange& rScRange, return bValidStart; } -//UNUSED2009-05 ScRange XclImpAddressConverter::CreateValidRange( -//UNUSED2009-05 const XclRange& rXclRange, SCTAB nScTab1, SCTAB nScTab2, bool bWarn ) -//UNUSED2009-05 { -//UNUSED2009-05 return ScRange( -//UNUSED2009-05 CreateValidAddress( rXclRange.maFirst, nScTab1, bWarn ), -//UNUSED2009-05 CreateValidAddress( rXclRange.maLast, nScTab2, bWarn ) ); -//UNUSED2009-05 } - // cell range list ------------------------------------------------------------ -//UNUSED2009-05 bool XclImpAddressConverter::CheckRangeList( const XclRangeList& rXclRanges, bool bWarn ) -//UNUSED2009-05 { -//UNUSED2009-05 for( XclRangeList::const_iterator aIt = rXclRanges.begin(), aEnd = rXclRanges.end(); aIt != aEnd; ++aIt ) -//UNUSED2009-05 if( !CheckRange( *aIt, bWarn ) ) -//UNUSED2009-05 return false; -//UNUSED2009-05 return true; -//UNUSED2009-05 } - void XclImpAddressConverter::ConvertRangeList( ScRangeList& rScRanges, const XclRangeList& rXclRanges, SCTAB nScTab, bool bWarn ) { @@ -251,12 +235,6 @@ EditTextObject* XclImpStringHelper::CreateTextObject( return lclCreateTextObject( rRoot, rString, EXC_FONTITEM_EDITENG, 0 ); } -//UNUSED2009-05 EditTextObject* XclImpStringHelper::CreateNoteObject( -//UNUSED2009-05 const XclImpRoot& rRoot, const XclImpString& rString ) -//UNUSED2009-05 { -//UNUSED2009-05 return lclCreateTextObject( rRoot, rString, EXC_FONTITEM_NOTE, 0 ); -//UNUSED2009-05 } - ScBaseCell* XclImpStringHelper::CreateCell( const XclImpRoot& rRoot, const XclImpString& rString, sal_uInt16 nXFIndex ) { diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index dc2234570ea6..1e1eac022570 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -206,21 +206,9 @@ private: const XclImpXti* GetXti( sal_uInt16 nXtiIndex ) const; /** Returns the specified SUPBOOK (external document). */ const XclImpSupbook* GetSupbook( sal_uInt16 nXtiIndex ) const; -//UNUSED2009-05 /** Returns the SUPBOOK (external workbook) specified by its URL. */ -//UNUSED2009-05 const XclImpSupbook* GetSupbook( const String& rUrl ) const; void LoadCachedValues(); -//UNUSED2009-05 /** Finds the largest range of sheet indexes in a SUPBOOK after a start sheet index. -//UNUSED2009-05 @param rnSBTabFirst (out-param) The first sheet index of the range in SUPBOOK is returned here. -//UNUSED2009-05 @param rnSBTabLast (out-param) The last sheet index of the range in SUPBOOK is returned here (inclusive). -//UNUSED2009-05 @param nSupbook The list index of the SUPBOOK. -//UNUSED2009-05 @param nSBTabStart The first allowed sheet index. Sheet ranges with an earlier start index are ignored. -//UNUSED2009-05 @return true = the return values are valid; false = nothing found. */ -//UNUSED2009-05 bool FindNextTabRange( -//UNUSED2009-05 sal_uInt16& rnSBTabFirst, sal_uInt16& rnSBTabLast, -//UNUSED2009-05 sal_uInt16 nSupbook, sal_uInt16 nSBTabStart ) const; - private: typedef ::std::vector< XclImpXti > XclImpXtiVector; typedef ScfDelList< XclImpSupbook > XclImpSupbookList; @@ -693,14 +681,6 @@ const XclImpSupbook* XclImpLinkManagerImpl::GetSupbook( sal_uInt16 nXtiIndex ) c return pXti ? maSupbookList.GetObject( pXti->mnSupbook ) : 0; } -//UNUSED2009-05 const XclImpSupbook* XclImpLinkManagerImpl::GetSupbook( const String& rUrl ) const -//UNUSED2009-05 { -//UNUSED2009-05 for( const XclImpSupbook* pSupbook = maSupbookList.First(); pSupbook; pSupbook = maSupbookList.Next() ) -//UNUSED2009-05 if( pSupbook->GetXclUrl() == rUrl ) -//UNUSED2009-05 return pSupbook; -//UNUSED2009-05 return 0; -//UNUSED2009-05 } - void XclImpLinkManagerImpl::LoadCachedValues() { // Read all CRN records which can be accessed via XclImpSupbook, and store @@ -714,22 +694,6 @@ void XclImpLinkManagerImpl::LoadCachedValues() } } -//UNUSED2009-05 bool XclImpLinkManagerImpl::FindNextTabRange( -//UNUSED2009-05 sal_uInt16& rnSBTabFirst, sal_uInt16& rnSBTabLast, -//UNUSED2009-05 sal_uInt16 nSupbook, sal_uInt16 nSBTabStart ) const -//UNUSED2009-05 { -//UNUSED2009-05 rnSBTabFirst = rnSBTabLast = EXC_NOTAB; -//UNUSED2009-05 for( const XclImpXti* pXti = maXtiList.First(); pXti; pXti = maXtiList.Next() ) -//UNUSED2009-05 { -//UNUSED2009-05 if( (nSupbook == pXti->mnSupbook) && (nSBTabStart <= pXti->mnSBTabLast) && (pXti->mnSBTabFirst < rnSBTabFirst) ) -//UNUSED2009-05 { -//UNUSED2009-05 rnSBTabFirst = ::std::max( nSBTabStart, pXti->mnSBTabFirst ); -//UNUSED2009-05 rnSBTabLast = pXti->mnSBTabLast; -//UNUSED2009-05 } -//UNUSED2009-05 } -//UNUSED2009-05 return rnSBTabFirst != EXC_NOTAB; -//UNUSED2009-05 } - // ============================================================================ XclImpLinkManager::XclImpLinkManager( const XclImpRoot& rRoot ) : diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 98db9dcb4471..a7e2af0c52f4 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -474,13 +474,6 @@ void XclImpStream::PopPosition() } } -//UNUSED2008-05 void XclImpStream::RejectPosition() -//UNUSED2008-05 { -//UNUSED2008-05 DBG_ASSERT( !maPosStack.empty(), "XclImpStream::RejectPosition - stack empty" ); -//UNUSED2008-05 if( !maPosStack.empty() ) -//UNUSED2008-05 maPosStack.pop_back(); -//UNUSED2008-05 } - void XclImpStream::StoreGlobalPosition() { StorePosition( maGlobPos ); diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index ed7aadd0a410..ca16b2f525e8 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -293,11 +293,6 @@ bool XclPCField::IsStandardField() const return meFieldType == EXC_PCFIELD_STANDARD; } -//UNUSED2008-05 bool XclPCField::IsCalculatedField() const -//UNUSED2008-05 { -//UNUSED2008-05 return meFieldType == EXC_PCFIELD_CALCED; -//UNUSED2008-05 } - bool XclPCField::IsStdGroupField() const { return meFieldType == EXC_PCFIELD_STDGROUP; diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 4a48584da7fa..93c651b55e88 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -468,12 +468,6 @@ void XclFontData::SetApiFamily( sal_Int16 nApiFamily ) } } -//UNUSED2009-05 void XclFontData::SetApiFontEncoding( sal_Int16 nApiFontEnc ) -//UNUSED2009-05 { -//UNUSED2009-05 // API constants are equal to rtl_TextEncoding constants -//UNUSED2009-05 SetFontEncoding( static_cast< rtl_TextEncoding >( nApiFontEnc ) ); -//UNUSED2009-05 } - void XclFontData::SetApiPosture( Awt::FontSlant eApiPosture ) { mbItalic = @@ -1492,12 +1486,6 @@ void XclNumFmtBuffer::InitializeImport() maFmtMap.clear(); } -//UNUSED2008-05 const XclNumFmt* XclNumFmtBuffer::GetFormat( sal_uInt16 nXclNumFmt ) const -//UNUSED2008-05 { -//UNUSED2008-05 XclNumFmtMap::const_iterator aIt = maFmtMap.find( nXclNumFmt ); -//UNUSED2008-05 return (aIt != maFmtMap.end()) ? &aIt->second : 0; -//UNUSED2008-05 } - void XclNumFmtBuffer::InsertFormat( sal_uInt16 nXclNumFmt, const String& rFormat ) { XclNumFmt& rNumFmt = maFmtMap[ nXclNumFmt ]; |