diff options
Diffstat (limited to 'sc/source/filter')
64 files changed, 620 insertions, 1184 deletions
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx index 27b1e8c55746..f7d4b3e50e5c 100644 --- a/sc/source/filter/excel/colrowst.cxx +++ b/sc/source/filter/excel/colrowst.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: colrowst.cxx,v $ - * $Revision: 1.34 $ + * $Revision: 1.34.32.1 $ * * This file is part of OpenOffice.org. * @@ -145,16 +145,6 @@ void XclImpColRowSettings::SetHeight( SCROW nScRow, sal_uInt16 nHeight ) } } -void XclImpColRowSettings::HideRow( SCROW nScRow ) -{ - if( ValidRow( nScRow ) ) - { - ::set_flag( maRowFlags[ nScRow ], static_cast< sal_uInt8 >( EXC_COLROW_USED | EXC_COLROW_HIDDEN ) ); - if( nScRow > mnLastScRow ) - mnLastScRow = nScRow; - } -} - void XclImpColRowSettings::SetRowSettings( SCROW nScRow, sal_uInt16 nHeight, sal_uInt16 nFlags ) { if( ValidRow( nScRow ) ) diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 8722ebdc982d..8fb15fb9c5c7 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: excel.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.26.32.2 $ * * This file is part of OpenOffice.org. * @@ -50,12 +50,6 @@ #include "exp_op.hxx" -FltError ScImportExcel( SfxMedium& r, ScDocument* p ) -{ - return ScImportExcel( r, p, EIF_AUTO ); -} - - FltError ScImportExcel( SfxMedium& rMedium, ScDocument* pDocument, const EXCIMPFORMAT eFormat ) { // check the passed Calc document @@ -164,16 +158,6 @@ FltError ScImportExcel( SfxMedium& rMedium, ScDocument* pDocument, const EXCIMPF } - - -FltError ScExportExcel234( SvStream& /*aStream*/, ScDocument* /*pDoc*/, - ExportFormatExcel /*eFormat*/, CharSet /*eNach*/ ) -{ - FltError eRet = eERR_NI; - return eRet; -} - - FltError ScExportExcel5( SfxMedium& rMedium, ScDocument *pDocument, const BOOL bBiff8, CharSet eNach ) { diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx index 74f0fa9e11fe..be145e52a9a2 100644 --- a/sc/source/filter/excel/exctools.cxx +++ b/sc/source/filter/excel/exctools.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: exctools.cxx,v $ - * $Revision: 1.62 $ + * $Revision: 1.61.32.2 $ * * This file is part of OpenOffice.org. * @@ -285,19 +285,6 @@ void XclImpOutlineBuffer::Reset( void ) } -void XclImpOutlineBuffer::Reset( ScOutlineArray *pOArray ) -{ - for( SCSIZE nC = 0 ; nC < nSize ; nC++ ) - { - pLevel[ nC ] = 0; - pOuted[ nC ] = pHidden[ nC ] = FALSE; - } - pOutlineArray = pOArray; -} - - - - //___________________________________________________________________ diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index d5fb7d5c9f6e..d4899bf29fac 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: frmbase.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.32.3 $ * * This file is part of OpenOffice.org. * @@ -262,19 +262,19 @@ LotusConverterBase::~LotusConverterBase() { } -void LotusConverterBase::Reset( INT32 nLen, const ScAddress& rEingPos ) -{ - ConverterBase::Reset(); - nBytesLeft = nLen; - aEingPos = rEingPos; -} - -void LotusConverterBase::Reset( INT32 nLen ) -{ - ConverterBase::Reset(); - nBytesLeft = nLen; - aEingPos.Set( 0, 0, 0 ); -} +//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 ) { diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index b8b57111e8c3..e243f9bf9504 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: namebuff.cxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.26.32.1 $ * * This file is part of OpenOffice.org. * @@ -88,41 +88,6 @@ void NameBuffer::operator <<( const String &rNewString ) } -void NameBuffer::Reset() -{ - register StringHashEntry* pDel = ( StringHashEntry* ) List::First(); - while( pDel ) - { - delete pDel; - pDel = ( StringHashEntry* ) List::Next(); - } - Clear(); -} - - -BOOL NameBuffer::Find( const sal_Char* pRefName, UINT16& rIndex ) -{ - StringHashEntry aRefEntry( String::CreateFromAscii( pRefName ) ); - - register StringHashEntry* pFind = ( StringHashEntry* ) List::First(); - register UINT16 nCnt = nBase; - while( pFind ) - { - if( *pFind == aRefEntry ) - { - rIndex = nCnt; - return TRUE; - } - pFind = ( StringHashEntry* ) List::Next(); - nCnt++; - } - - return FALSE; -} - - - - #ifdef DBG_UTIL UINT16 nShrCnt; #endif @@ -306,18 +271,6 @@ BOOL ExtSheetBuffer::GetLink( const UINT16 nExcIndex, String& rAppl, String& rDo } -BOOL ExtSheetBuffer::IsExternal( UINT16 nExcIndex ) const -{ - DBG_ASSERT( nExcIndex > 0, "*ExtSheetBuffer::IsExternal(): Index muss >0 sein!" ); - Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 ); - - if( pRet ) - return !pRet->bSWB; - else - return FALSE; -} - - void ExtSheetBuffer::Reset( void ) { Cont *pAkt = ( Cont * ) List::First(); @@ -339,20 +292,6 @@ BOOL ExtName::IsDDE( void ) const } -BOOL ExtName::IsOLE( void ) const -{ - return ( nFlags & 0x0002 ) != 0; -} - - -BOOL ExtName::IsName( void ) const -{ - return ( nFlags & 0x0004 ) != 0; -} - - - - const sal_Char* ExtNameBuff::pJoostTest = "Joost ist immer noch doof!"; diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index b692db246df6..c8a2b41b8b34 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tokstack.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.14.32.3 $ * * This file is part of OpenOffice.org. * @@ -531,26 +531,26 @@ const TokenId TokenPool::Store( const double& rDouble ) } -const TokenId TokenPool::StoreError( USHORT nError ) -{ - if( nElementAkt >= nElement ) - GrowElement(); - - if( nP_ErrAkt >= nP_Err ) - GrowError(); - - pElement[ nElementAkt ] = nP_ErrAkt; // Index in Error-Array - pType[ nElementAkt ] = T_Err; // Typinfo Error eintragen - - pP_Err[ nP_ErrAkt ] = nError; - - pSize[ nElementAkt ] = 1; // eigentlich Banane - - nElementAkt++; - nP_ErrAkt++; - - return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! -} +//UNUSED2008-05 const TokenId TokenPool::StoreError( USHORT nError ) +//UNUSED2008-05 { +//UNUSED2008-05 if( nElementAkt >= nElement ) +//UNUSED2008-05 GrowElement(); +//UNUSED2008-05 +//UNUSED2008-05 if( nP_ErrAkt >= nP_Err ) +//UNUSED2008-05 GrowError(); +//UNUSED2008-05 +//UNUSED2008-05 pElement[ nElementAkt ] = nP_ErrAkt; // Index in Error-Array +//UNUSED2008-05 pType[ nElementAkt ] = T_Err; // Typinfo Error eintragen +//UNUSED2008-05 +//UNUSED2008-05 pP_Err[ nP_ErrAkt ] = nError; +//UNUSED2008-05 +//UNUSED2008-05 pSize[ nElementAkt ] = 1; // eigentlich Banane +//UNUSED2008-05 +//UNUSED2008-05 nElementAkt++; +//UNUSED2008-05 nP_ErrAkt++; +//UNUSED2008-05 +//UNUSED2008-05 return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! +//UNUSED2008-05 } const TokenId TokenPool::Store( const UINT16 nIndex ) @@ -768,19 +768,19 @@ const String* TokenPool::GetExternal( const TokenId& rId ) const } -const String* TokenPool::GetString( const TokenId& r ) const -{ - const String* p = NULL; - UINT16 n = (UINT16) r; - if( n && n <= nElementAkt ) - { - n--; - if( pType[ n ] == T_Str ) - p = ppP_Str[ pElement[ n ] ]; - } - - 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 { diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 931beae3efdf..751bd607663c 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xeformula.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.25.30.2 $ * * This file is part of OpenOffice.org. * @@ -341,7 +341,7 @@ private: void AdjustLastTokenClassForEastereggOp(); void AppendOpTokenId( sal_uInt8 nTokenId, sal_uInt8 nExpClass, sal_uInt8 nSpaces = 0 ); - void AppendFuncTokenId( sal_uInt16 nXclFuncIdx, sal_uInt8 nRetClass, sal_uInt8 nExpRetClass, sal_uInt8 nSpaces = 0 ); +//UNUSED2008-05 void AppendFuncTokenId( sal_uInt16 nXclFuncIdx, sal_uInt8 nRetClass, sal_uInt8 nExpRetClass, sal_uInt8 nSpaces = 0 ); void AppendVarFuncTokenId( sal_uInt16 nXclFuncIdx, sal_uInt8 nRetClass, sal_uInt8 nExpRetClass, sal_uInt8 nParamCount, sal_uInt8 nSpaces = 0 ); // token vector ----------------------------------------------------------- @@ -2015,12 +2015,12 @@ void XclExpFmlaCompImpl::AppendOpTokenId( sal_uInt8 nTokenId, sal_uInt8 nExpClas AdjustLastTokenClass( nExpClass ); } -void XclExpFmlaCompImpl::AppendFuncTokenId( - sal_uInt16 nXclFuncIdx, sal_uInt8 nRetClass, sal_uInt8 nExpRetClass, sal_uInt8 nSpaces ) -{ - AppendOpTokenId( GetTokenId( EXC_TOKID_FUNC, nRetClass ), nExpRetClass, nSpaces ); - Append( nXclFuncIdx ); -} +//UNUSED2008-05 void XclExpFmlaCompImpl::AppendFuncTokenId( +//UNUSED2008-05 sal_uInt16 nXclFuncIdx, sal_uInt8 nRetClass, sal_uInt8 nExpRetClass, sal_uInt8 nSpaces ) +//UNUSED2008-05 { +//UNUSED2008-05 AppendOpTokenId( GetTokenId( EXC_TOKID_FUNC, nRetClass ), nExpRetClass, nSpaces ); +//UNUSED2008-05 Append( nXclFuncIdx ); +//UNUSED2008-05 } void XclExpFmlaCompImpl::AppendVarFuncTokenId( sal_uInt16 nXclFuncIdx, sal_uInt8 nRetClass, sal_uInt8 nExpRetClass, diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 37edde3dbd2d..032e0d576f43 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xehelper.cxx,v $ - * $Revision: 1.31 $ + * $Revision: 1.31.32.2 $ * * This file is part of OpenOffice.org. * @@ -258,23 +258,23 @@ bool XclExpAddressConverter::ConvertRange( XclRange& rXclRange, return bValidStart; } -XclRange XclExpAddressConverter::CreateValidRange( const ScRange& rScRange, bool bWarn ) -{ - return XclRange( - CreateValidAddress( rScRange.aStart, bWarn ), - CreateValidAddress( rScRange.aEnd, bWarn ) ); -} +//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 ------------------------------------------------------------ -bool XclExpAddressConverter::CheckRangeList( const ScRangeList& rScRanges, bool bWarn ) -{ - for( ULONG nIdx = 0, nSize = rScRanges.Count(); nIdx < nSize; ++nIdx ) - if( const ScRange* pScRange = rScRanges.GetObject( nIdx ) ) - if( !CheckRange( *pScRange, bWarn ) ) - return false; - return true; -} +//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 ) { diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index 6bb638614f22..03746882171b 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xerecord.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.32.2 $ * * This file is part of OpenOffice.org. * @@ -43,11 +43,11 @@ void XclExpRecordBase::Save( XclExpStream& /*rStrm*/ ) { } -void XclExpRecordBase::SaveRepeated( XclExpStream& rStrm, size_t nCount ) -{ - for( size_t nIndex = 0; nIndex < nCount; ++nIndex ) - Save( rStrm ); -} +//UNUSED2008-05 void XclExpRecordBase::SaveRepeated( XclExpStream& rStrm, size_t nCount ) +//UNUSED2008-05 { +//UNUSED2008-05 for( size_t nIndex = 0; nIndex < nCount; ++nIndex ) +//UNUSED2008-05 Save( rStrm ); +//UNUSED2008-05 } // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index ea06477bd66b..03554efd68eb 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xestream.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.30.2 $ * * This file is part of OpenOffice.org. * @@ -159,27 +159,27 @@ sal_Size XclExpStream::CopyFromStream( SvStream& rInStrm, sal_Size nBytes ) return nRet; } -void XclExpStream::WriteUnicodeBuffer( const sal_uInt16* pBuffer, sal_Size nChars, sal_uInt8 nFlags ) -{ - SetSliceSize( 0 ); - if( pBuffer && (nChars > 0) ) - { - sal_uInt16 nCharLen = (nFlags & EXC_STRF_16BIT) ? 2 : 1; - for( sal_Size nIndex = 0; nIndex < nChars; ++nIndex ) - { - if( mbInRec && (mnCurrSize + nCharLen > mnCurrMaxSize) ) - { - StartContinue(); - // repeat only 16bit flag - operator<<( static_cast< sal_uInt8 >( nFlags & EXC_STRF_16BIT ) ); - } - if( nCharLen == 2 ) - operator<<( pBuffer[ nIndex ] ); - else - operator<<( static_cast< sal_uInt8 >( pBuffer[ nIndex ] ) ); - } - } -} +//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 ) { @@ -202,11 +202,11 @@ void XclExpStream::WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nF } } -void XclExpStream::WriteByteStringBuffer( const ByteString& rString, sal_uInt16 nMaxLen ) -{ - SetSliceSize( 0 ); - Write( rString.GetBuffer(), ::std::min< sal_Size >( rString.Len(), nMaxLen ) ); -} +//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. diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index f2ef9aa64074..74647717a390 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xestring.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.32.2 $ * * This file is part of OpenOffice.org. * @@ -118,24 +118,24 @@ XclExpString::XclExpString( const String& rString, XclStrFlags nFlags, sal_uInt1 Assign( rString, nFlags, nMaxLen ); } -XclExpString::XclExpString( - const String& rString, const XclFormatRunVec& rFormats, - XclStrFlags nFlags, sal_uInt16 nMaxLen ) -{ - Assign( rString, rFormats, nFlags, nMaxLen ); -} - XclExpString::XclExpString( const OUString& rString, XclStrFlags nFlags, sal_uInt16 nMaxLen ) { Assign( rString, nFlags, nMaxLen ); } -XclExpString::XclExpString( - const OUString& rString, const XclFormatRunVec& rFormats, - XclStrFlags nFlags, sal_uInt16 nMaxLen ) -{ - Assign( rString, rFormats, 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 --------------------------------------------------------------------- @@ -177,19 +177,19 @@ void XclExpString::AssignByte( Build( aByteStr.GetBuffer(), aByteStr.Len(), nFlags, nMaxLen ); } -void XclExpString::AssignByte( sal_Unicode cChar, rtl_TextEncoding eTextEnc, XclStrFlags nFlags, sal_uInt16 nMaxLen ) -{ - if( !cChar ) - { - sal_Char cByteChar = 0; - Build( &cByteChar, 1, nFlags, nMaxLen ); - } - else - { - ByteString aByteStr( &cChar, 1, eTextEnc ); // length may be >1 - 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 --------------------------------------------------------------------- @@ -198,15 +198,15 @@ void XclExpString::Append( const String& rString ) BuildAppend( rString.GetBuffer(), rString.Len() ); } -void XclExpString::Append( const ::rtl::OUString& rString ) -{ - BuildAppend( rString.getStr(), rString.getLength() ); -} - -void XclExpString::Append( sal_Unicode cChar ) -{ - BuildAppend( &cChar, 1 ); -} +//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 ) { diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 55edbf13da47..7d90b3f870cf 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xestyle.cxx,v $ - * $Revision: 1.34 $ + * $Revision: 1.33.32.3 $ * * This file is part of OpenOffice.org. * @@ -1811,30 +1811,48 @@ XclExpDefaultXF::XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF ) : { } -void XclExpDefaultXF::SetParent( sal_uInt32 nParentXFId ) -{ - DBG_ASSERT( IsCellXF(), "XclExpDefaultXF::SetParent - not allowed in style XFs" ); - if( IsCellXF() ) - mnParentXFId = nParentXFId; -} - -void XclExpDefaultXF::SetUsedFlags( - bool bProtUsed, bool bFontUsed, bool bFmtUsed, - bool bAlignUsed, bool bBorderUsed, bool bAreaUsed ) -{ - mbProtUsed = bProtUsed; - mbFontUsed = bFontUsed; - mbFmtUsed = bFmtUsed; - mbAlignUsed = bAlignUsed; - mbBorderUsed = bBorderUsed; - mbAreaUsed = bAreaUsed; -} - -void XclExpDefaultXF::SetProtection( const XclExpCellProt& rProtection ) -{ - maProtection = rProtection; - mbProtUsed = true; -} +//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 ) { @@ -1848,24 +1866,6 @@ void XclExpDefaultXF::SetNumFmt( sal_uInt16 nXclNumFmt ) mbFmtUsed = true; } -void XclExpDefaultXF::SetAlignment( const XclExpCellAlign& rAlignment ) -{ - maAlignment = rAlignment; - mbAlignUsed = true; -} - -void XclExpDefaultXF::SetBorder( const XclExpCellBorder& rBorder ) -{ - maBorder = rBorder; - mbBorderUsed = true; -} - -void XclExpDefaultXF::SetArea( const XclExpCellArea& rArea ) -{ - maArea = rArea; - mbAreaUsed = true; -} - // ---------------------------------------------------------------------------- XclExpStyle::XclExpStyle( sal_uInt32 nXFId, const String& rStyleName ) : diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 438735c04ee5..44d4040a1e53 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xistream.cxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.30.3 $ * * This file is part of OpenOffice.org. * @@ -468,12 +468,12 @@ void XclImpStream::PopPosition() } } -void XclImpStream::RejectPosition() -{ - DBG_ASSERT( !maPosStack.empty(), "XclImpStream::RejectPosition - stack empty" ); - if( !maPosStack.empty() ) - maPosStack.pop_back(); -} +//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() { @@ -770,18 +770,18 @@ sal_Size XclImpStream::CopyToStream( SvStream& rOutStrm, sal_Size nBytes ) return nRet; } -sal_Size XclImpStream::CopyRecordToStream( SvStream& rOutStrm ) -{ - sal_Size nRet = 0; - if( mbValidRec ) - { - PushPosition(); - RestorePosition( maFirstRec ); - nRet = CopyToStream( rOutStrm, GetRecSize() ); - PopPosition(); - } - return nRet; -} +//UNUSED2008-05 sal_Size XclImpStream::CopyRecordToStream( SvStream& rOutStrm ) +//UNUSED2008-05 { +//UNUSED2008-05 sal_Size nRet = 0; +//UNUSED2008-05 if( mbValidRec ) +//UNUSED2008-05 { +//UNUSED2008-05 PushPosition(); +//UNUSED2008-05 RestorePosition( maFirstRec ); +//UNUSED2008-05 nRet = CopyToStream( rOutStrm, GetRecSize() ); +//UNUSED2008-05 PopPosition(); +//UNUSED2008-05 } +//UNUSED2008-05 return nRet; +//UNUSED2008-05 } void XclImpStream::Seek( sal_Size nPos ) { @@ -974,11 +974,6 @@ String XclImpStream::ReadByteString( bool b16BitLen ) return ReadRawByteString( ReadByteStrLen( b16BitLen ) ); } -void XclImpStream::IgnoreByteString( bool b16BitLen ) -{ - Ignore( ReadByteStrLen( b16BitLen ) ); -} - // private -------------------------------------------------------------------- void XclImpStream::StorePosition( XclImpStreamPos& rPos ) diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index e156a7fc7279..54ab98f569bb 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xlpivot.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.32.2 $ * * This file is part of OpenOffice.org. * @@ -214,11 +214,6 @@ XclPCNumGroupInfo::XclPCNumGroupInfo() : SetNumType(); } -bool XclPCNumGroupInfo::IsNumType() const -{ - return GetXclDataType() == EXC_SXNUMGROUP_TYPE_NUM; -} - void XclPCNumGroupInfo::SetNumType() { SetXclDataType( EXC_SXNUMGROUP_TYPE_NUM ); @@ -302,10 +297,10 @@ bool XclPCField::IsStandardField() const return meFieldType == EXC_PCFIELD_STANDARD; } -bool XclPCField::IsCalculatedField() const -{ - return meFieldType == EXC_PCFIELD_CALCED; -} +//UNUSED2008-05 bool XclPCField::IsCalculatedField() const +//UNUSED2008-05 { +//UNUSED2008-05 return meFieldType == EXC_PCFIELD_CALCED; +//UNUSED2008-05 } bool XclPCField::IsStdGroupField() const { diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 9255ba58a941..a3ae0cc5458d 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xlstyle.cxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.27.32.3 $ * * This file is part of OpenOffice.org. * @@ -1469,11 +1469,11 @@ XclNumFmtBuffer::XclNumFmtBuffer( const XclRoot& rRoot ) : InsertBuiltinFormats(); } -const XclNumFmt* XclNumFmtBuffer::GetFormat( sal_uInt16 nXclNumFmt ) const -{ - XclNumFmtMap::const_iterator aIt = maFmtMap.find( nXclNumFmt ); - return (aIt != maFmtMap.end()) ? &aIt->second : 0; -} +//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 ) { diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 06f61ad21252..2ac6fc3f6f8a 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xltools.cxx,v $ - * $Revision: 1.32 $ + * $Revision: 1.31.32.3 $ * * This file is part of OpenOffice.org. * @@ -426,16 +426,16 @@ rtl_TextEncoding XclTools::GetTextEncoding( sal_uInt16 nCodePage ) return pEntry->meTextEnc; } -sal_uInt16 XclTools::GetXclCodePage( rtl_TextEncoding eTextEnc ) -{ - const XclCodePageEntry* pEntry = ::std::find_if( pCodePageTable, pCodePageTableEnd, XclCodePageEntry_TEPred( eTextEnc ) ); - if( pEntry == pCodePageTableEnd ) - { - DBG_ERROR1( "XclTools::GetXclCodePage - unsupported text encoding: %d", eTextEnc ); - return 1252; - } - return pEntry->mnCodePage; -} +//UNUSED2008-05 sal_uInt16 XclTools::GetXclCodePage( rtl_TextEncoding eTextEnc ) +//UNUSED2008-05 { +//UNUSED2008-05 const XclCodePageEntry* pEntry = ::std::find_if( pCodePageTable, pCodePageTableEnd, XclCodePageEntry_TEPred( eTextEnc ) ); +//UNUSED2008-05 if( pEntry == pCodePageTableEnd ) +//UNUSED2008-05 { +//UNUSED2008-05 DBG_ERROR1( "XclTools::GetXclCodePage - unsupported text encoding: %d", eTextEnc ); +//UNUSED2008-05 return 1252; +//UNUSED2008-05 } +//UNUSED2008-05 return pEntry->mnCodePage; +//UNUSED2008-05 } // font names ----------------------------------------------------------------- diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx index b495810d8ac3..f4dcc65b940d 100644 --- a/sc/source/filter/excel/xltracer.cxx +++ b/sc/source/filter/excel/xltracer.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xltracer.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.32.1 $ * * This file is part of OpenOffice.org. * @@ -103,12 +103,6 @@ void XclTracer::AddAttribute( const OUString& rName, const OUString& rValue ) mpTracer->AddAttribute( rName, rValue ); } -void XclTracer::AddAttribute( const OUString& rName, sal_Int32 nValue ) -{ - if( mbEnabled ) - mpTracer->AddAttribute( rName, OUString::valueOf( nValue ) ); -} - void XclTracer::Trace( const OUString& rElementID, const OUString& rMessage ) { if( mbEnabled ) @@ -118,15 +112,6 @@ void XclTracer::Trace( const OUString& rElementID, const OUString& rMessage ) } } -void XclTracer::Trace( const OUString& rElementID, sal_Int32 nMessage ) -{ - if( mbEnabled ) - { - mpTracer->Trace( rElementID, OUString::valueOf( nMessage ) ); - mpTracer->ClearAttributes(); - } -} - void XclTracer::TraceLog( XclTracerId eProblem, sal_Int32 nValue ) { if( mbEnabled ) @@ -219,17 +204,6 @@ void XclTracer::TraceFillPattern( bool bFillPattern) ProcessTraceOnce(eFillPattern); } -void XclTracer::TraceInvisibleGrid( bool bVisibleGrid) -{ - // Excel supports Grid lines on a per sheet basis while - // Calc displays grid lines on a per doc basis based on the - // first visible sheet. If the first visible sheet has the - // grid turned off then potentially we may have a problem. - - if(!bVisibleGrid) - ProcessTraceOnce(eInvisibleGrid); -} - void XclTracer::TraceFormulaExtName( ) { // import cannot access Excel External name ranges in @@ -260,37 +234,11 @@ void XclTracer::TraceChartUnKnownType() ProcessTraceOnce(eChartUnKnownType); } -void XclTracer::TraceChartTrendLines() -{ - ProcessTraceOnce(eChartTrendLines); -} - -void XclTracer::TraceChartErrorBars() -{ - ProcessTraceOnce( eChartErrorBars ); -} - void XclTracer::TraceChartOnlySheet() { ProcessTraceOnce(eChartOnlySheet); } -void XclTracer::TraceChartRange() -{ - // Chart range symmetry is essential to display a chart. If the count - // of category values is not equal to the count of values or the start row/column - // depending on type, is not the same, then the chart range is said to be not - // symmetrical and will not display correctly. - ProcessTraceOnce(eChartRange); -} - -void XclTracer::TraceChartDSName() -{ - // Data series names must be linked to a cell to appear. Hard - // coded strings contained in the ChartSeriestext() do not appear. - ProcessTraceOnce(eChartDSName); -} - void XclTracer::TraceChartDataTable() { // Data table is not supported. @@ -304,37 +252,12 @@ void XclTracer::TraceChartLegendPosition() ProcessTraceOnce(eChartLegendPosition); } -void XclTracer::TraceChartTextFormatting() -{ - // text formatting in titles or data labels not supported. - ProcessTraceOnce(eChartTextFormatting); -} - void XclTracer::TraceChartEmbeddedObj() { // drawing objects e.g. text boxes etc not supported inside charts ProcessTraceOnce(eChartEmbeddedObj); } -void XclTracer::TraceChartAxisAutoCross() -{ - // Axis intervals generated automatically may not be the same. - ProcessTraceOnce(eChartAxisAuto); -} - -void XclTracer::TraceChartAxisManualCross() -{ - // Manual axis crossing point changed - ProcessTraceOnce(eChartAxisManual); -} - -void XclTracer::TraceChartInvalidXY() -{ - // Scatter charts will ony appear if the category(X) data range is - // located in the left most column in relation to the value range. - ProcessTraceOnce(eChartInvalidXY); -} - void XclTracer::TraceUnsupportedObjects() { // Called from Excel 5.0 - limited Graphical object support. diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 05b9ddb773fe..5053734451fc 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fapihelper.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.32.2 $ * * This file is part of OpenOffice.org. * @@ -109,35 +109,35 @@ Reference< XInterface > ScfApiHelper::CreateInstance( const OUString& rServiceNa return CreateInstance( ::comphelper::getProcessServiceFactory(), rServiceName ); } -Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( - Reference< XMultiServiceFactory > xFactory, const OUString& rServiceName, const Sequence< Any >& rArgs ) -{ - Reference< XInterface > xInt; - if( xFactory.is() ) - { - try - { - xInt = xFactory->createInstanceWithArguments( rServiceName, rArgs ); - } - catch( Exception& ) - { - DBG_ERRORFILE( "ScfApiHelper::CreateInstanceWithArgs - cannot create instance" ); - } - } - return xInt; -} - -Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( - SfxObjectShell* pShell, const OUString& rServiceName, const Sequence< Any >& rArgs ) -{ - return CreateInstanceWithArgs( GetServiceFactory( pShell ), rServiceName, rArgs ); -} - -Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( - const OUString& rServiceName, const Sequence< Any >& rArgs ) -{ - return CreateInstanceWithArgs( ::comphelper::getProcessServiceFactory(), rServiceName, rArgs ); -} +//UNUSED2008-05 Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( +//UNUSED2008-05 Reference< XMultiServiceFactory > xFactory, const OUString& rServiceName, const Sequence< Any >& rArgs ) +//UNUSED2008-05 { +//UNUSED2008-05 Reference< XInterface > xInt; +//UNUSED2008-05 if( xFactory.is() ) +//UNUSED2008-05 { +//UNUSED2008-05 try +//UNUSED2008-05 { +//UNUSED2008-05 xInt = xFactory->createInstanceWithArguments( rServiceName, rArgs ); +//UNUSED2008-05 } +//UNUSED2008-05 catch( Exception& ) +//UNUSED2008-05 { +//UNUSED2008-05 DBG_ERRORFILE( "ScfApiHelper::CreateInstanceWithArgs - cannot create instance" ); +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 return xInt; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( +//UNUSED2008-05 SfxObjectShell* pShell, const OUString& rServiceName, const Sequence< Any >& rArgs ) +//UNUSED2008-05 { +//UNUSED2008-05 return CreateInstanceWithArgs( GetServiceFactory( pShell ), rServiceName, rArgs ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( +//UNUSED2008-05 const OUString& rServiceName, const Sequence< Any >& rArgs ) +//UNUSED2008-05 { +//UNUSED2008-05 return CreateInstanceWithArgs( ::comphelper::getProcessServiceFactory(), rServiceName, rArgs ); +//UNUSED2008-05 } String ScfApiHelper::QueryPasswordForMedium( SfxMedium& rMedium ) { diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx index c03cde4adfd9..9471a1d1a2bf 100644 --- a/sc/source/filter/ftools/fprogressbar.cxx +++ b/sc/source/filter/ftools/fprogressbar.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fprogressbar.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.32.2 $ * * This file is part of OpenOffice.org. * @@ -231,11 +231,11 @@ void ScfSimpleProgressBar::Init( sal_Size nSize ) // ============================================================================ -ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, const String& rText ) : - mrStrm( rStrm ) -{ - Init( pDocShell, rText ); -} +//UNUSED2008-05 ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, const String& rText ) : +//UNUSED2008-05 mrStrm( rStrm ) +//UNUSED2008-05 { +//UNUSED2008-05 Init( pDocShell, rText ); +//UNUSED2008-05 } ScfStreamProgressBar::ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, USHORT nResId ) : mrStrm( rStrm ) diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 3882f005e809..38bd3e2dde65 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: htmlpars.cxx,v $ - * $Revision: 1.34 $ + * $Revision: 1.34.32.1 $ * * This file is part of OpenOffice.org. * @@ -2829,20 +2829,6 @@ const ScHTMLTable* ScHTMLQueryParser::GetGlobalTable() const return mpGlobTable.get(); } - -// ---------------------------------------------------------------------------- - -ScHTMLTable* ScHTMLQueryParser::GetTable( ScHTMLTableId nTableId ) const -{ - if( nTableId == SC_HTML_GLOBAL_TABLE ) - return mpGlobTable.get(); - ScHTMLTable* pTable = mpGlobTable->FindNestedTable( nTableId ); - DBG_ASSERT( pTable, "ScHTMLQueryParser::GetTable - table not found" ); - if( !pTable ) - return mpGlobTable.get(); - return pTable; -} - void ScHTMLQueryParser::ProcessToken( const ImportInfo& rInfo ) { switch( rInfo.nToken ) diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx index 5a485de77af5..0e1e70fc3b78 100644 --- a/sc/source/filter/inc/colrowst.hxx +++ b/sc/source/filter/inc/colrowst.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: colrowst.hxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.23.32.2 $ * * This file is part of OpenOffice.org. * @@ -50,7 +50,6 @@ public: void SetDefHeight( sal_uInt16 nDefHeight, sal_uInt16 nFlags ); void SetHeight( SCROW nRow, sal_uInt16 nHeight ); - void HideRow( SCROW nRow ); void SetRowSettings( SCROW nRow, sal_uInt16 nHeight, sal_uInt16 nFlags ); void SetDefaultXF( SCCOL nScCol1, SCCOL nScCol2, sal_uInt16 nXFIndex ); diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index 655e0a17d723..4936e07cc36e 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: exp_op.hxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.13.32.3 $ * * This file is part of OpenOffice.org. * @@ -62,7 +62,7 @@ public: - +#if ENABLE_LOTUS123_EXPORT class ExportWK1 : public ExportTyp { private: @@ -101,7 +101,7 @@ public: FltError Write(); }; - +#endif diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 8771d1653452..9e91cd13b891 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fapihelper.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.32.2 $ * * This file is part of OpenOffice.org. * @@ -89,22 +89,22 @@ public: /** Creates an instance from the passed service name, using the process service factory. */ static XInterfaceRef CreateInstance( const ::rtl::OUString& rServiceName ); - /** Creates an instance from the passed service name, using the passed service factory. */ - static XInterfaceRef CreateInstanceWithArgs( - XServiceFactoryRef xFactory, - const ::rtl::OUString& rServiceName, - const UnoAnySequence& rArgs ); - - /** Creates an instance from the passed service name, using the service factory of the passed object. */ - static XInterfaceRef CreateInstanceWithArgs( - SfxObjectShell* pShell, - const ::rtl::OUString& rServiceName, - const UnoAnySequence& rArgs ); - - /** Creates an instance from the passed service name, using the process service factory. */ - static XInterfaceRef CreateInstanceWithArgs( - const ::rtl::OUString& rServiceName, - const UnoAnySequence& rArgs ); +//UNUSED2008-05 /** Creates an instance from the passed service name, using the passed service factory. */ +//UNUSED2008-05 static XInterfaceRef CreateInstanceWithArgs( +//UNUSED2008-05 XServiceFactoryRef xFactory, +//UNUSED2008-05 const ::rtl::OUString& rServiceName, +//UNUSED2008-05 const UnoAnySequence& rArgs ); +//UNUSED2008-05 +//UNUSED2008-05 /** Creates an instance from the passed service name, using the service factory of the passed object. */ +//UNUSED2008-05 static XInterfaceRef CreateInstanceWithArgs( +//UNUSED2008-05 SfxObjectShell* pShell, +//UNUSED2008-05 const ::rtl::OUString& rServiceName, +//UNUSED2008-05 const UnoAnySequence& rArgs ); +//UNUSED2008-05 +//UNUSED2008-05 /** Creates an instance from the passed service name, using the process service factory. */ +//UNUSED2008-05 static XInterfaceRef CreateInstanceWithArgs( +//UNUSED2008-05 const ::rtl::OUString& rServiceName, +//UNUSED2008-05 const UnoAnySequence& rArgs ); /** Opens a password dialog and returns the entered password. @return The entered password or an empty string on 'Cancel' or any error. */ diff --git a/sc/source/filter/inc/fdumper.hxx b/sc/source/filter/inc/fdumper.hxx index aea8de6ae96c..997e4092e53f 100644 --- a/sc/source/filter/inc/fdumper.hxx +++ b/sc/source/filter/inc/fdumper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fdumper.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.8.28.2 $ * * This file is part of OpenOffice.org. * @@ -31,7 +31,7 @@ #ifndef SC_FDUMPER_HXX #define SC_FDUMPER_HXX -#define SCF_INCL_DUMPER (OSL_DEBUG_LEVEL > 0) +#define SCF_INCL_DUMPER (OSL_DEBUG_LEVEL > 0) && 0 #include <map> #include <math.h> diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx index 7e0e18885871..ebef6bd83810 100644 --- a/sc/source/filter/inc/formel.hxx +++ b/sc/source/filter/inc/formel.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formel.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.11.32.4 $ * * This file is part of OpenOffice.org. * @@ -240,8 +240,8 @@ protected: virtual ~LotusConverterBase(); public: - void Reset( INT32 nLen ); - void Reset( INT32 nLen, const ScAddress& rEingPos ); +//UNUSED2008-05 void Reset( INT32 nLen ); +//UNUSED2008-05 void Reset( INT32 nLen, const ScAddress& rEingPos ); void Reset( const ScAddress& rEingPos ); virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest, diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index 140a7e3147aa..77349615faac 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fprogressbar.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.32.2 $ * * This file is part of OpenOffice.org. * @@ -222,7 +222,7 @@ private: class ScfStreamProgressBar { public: - explicit ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, const String& rText ); +//UNUSED2008-05 explicit ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, const String& rText ); explicit ScfStreamProgressBar( SvStream& rStrm, SfxObjectShell* pDocShell, USHORT nResId = STR_LOAD_DOC ); /** Sets the progress bar to the current stream position. */ diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 0b8ffe4390a8..b75a44c618db 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: htmlpars.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.32.1 $ * * This file is part of OpenOffice.org. * @@ -597,9 +597,6 @@ public: virtual const ScHTMLTable* GetGlobalTable() const; private: - /** Returns the specified table (may be maGlobTable, if no real table can be found). */ - ScHTMLTable* GetTable( ScHTMLTableId nTableId ) const; - /** Handles all possible tags in the HTML document. */ void ProcessToken( const ImportInfo& rInfo ); /** Inserts a text portion into current entry. */ diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 0ee10c9eb09e..060422fe6b52 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: namebuff.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.15.32.2 $ * * This file is part of OpenOffice.org. * @@ -118,8 +118,6 @@ public: inline UINT16 GetLastIndex( void ); inline void SetBase( UINT16 nNewBase = 0 ); void operator <<( const String& rNewString ); - void Reset( void ); - BOOL Find( const sal_Char* pRefName, UINT16& rIndex ); }; //#94039# prevent empty rootdata @@ -307,7 +305,6 @@ public: BOOL GetScTabIndex( UINT16 nExcSheetIndex, UINT16& rIn_LastTab_Out_ScIndex ); BOOL IsLink( const UINT16 nExcSheetIndex ) const; BOOL GetLink( const UINT16 nExcSheetIndex, String &rAppl, String &rDoc ) const; - BOOL IsExternal( UINT16 nExcSheetIndex ) const; void Reset( void ); }; @@ -329,8 +326,6 @@ struct ExtName inline ExtName( const String& r ) : aName( r ), nStorageId( 0 ) {} BOOL IsDDE( void ) const; - BOOL IsOLE( void ) const; - BOOL IsName( void ) const; }; diff --git a/sc/source/filter/inc/otlnbuff.hxx b/sc/source/filter/inc/otlnbuff.hxx index 886c2c713dbf..883705afc6d7 100644 --- a/sc/source/filter/inc/otlnbuff.hxx +++ b/sc/source/filter/inc/otlnbuff.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: otlnbuff.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.5.32.2 $ * * This file is part of OpenOffice.org. * @@ -53,7 +53,6 @@ class XclImpOutlineBuffer void SetLevel( SCSIZE nIndex, BYTE nVal, BOOL bOuted, BOOL bHidden ); void SetOutlineArray( ScOutlineArray* pOArray ); void Reset( void ); - void Reset( ScOutlineArray* pOArray ); void MakeScOutline( void ); void SetLevelRange( SCSIZE nF, SCSIZE nL, BYTE nVal, BOOL bOuted, BOOL bHidden ); diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index 153d819d612a..82a5dd72d9fb 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: qproform.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.32.1 $ * * This file is part of OpenOffice.org. * @@ -81,8 +81,6 @@ class QProToSc : public ConverterBase void DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtString ); void ReadSRD( SingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel ); void IncToken( TokenId &aParam ); - void DecToken( TokenId& aParam ); - void NegToken( TokenId& aParam ); DefTokenId IndexToToken( sal_uInt16 nToken ); FUNC_TYPE IndexToType( sal_uInt8 nToken ); DefTokenId IndexToDLLId( sal_uInt16 nIndex ); diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 7378c4302be5..42e5718ecda4 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tokstack.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.14.32.3 $ * * This file is part of OpenOffice.org. * @@ -167,7 +167,7 @@ class TokenPool inline void operator >>( TokenStack& rStack ); inline const TokenId Store( void ); const TokenId Store( const double& rDouble ); - const TokenId StoreError( USHORT nError ); +//UNUSED2008-05 const TokenId StoreError( USHORT nError ); // nur fuer Range-Names const TokenId Store( const UINT16 nIndex ); @@ -188,7 +188,7 @@ class TokenPool inline const SingleRefData* GetSRD( const TokenId& nId ) const; BOOL IsSingleOp( const TokenId& nId, const DefTokenId eId ) const; const String* GetExternal( const TokenId& nId ) const; - const String* GetString( const TokenId& nId ) const; +//UNUSED2008-05 const String* GetString( const TokenId& nId ) const; ScMatrix* GetMatrix( unsigned int n ) const; }; diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index 2cc2a8c20f9f..24de125426b8 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tool.h,v $ - * $Revision: 1.6 $ + * $Revision: 1.5.32.2 $ * * This file is part of OpenOffice.org. * @@ -42,8 +42,6 @@ void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char *pString void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt ); -sal_Char* ReplaceWith( sal_Char* pString, sal_Char cVon, sal_Char cNach ); - void InitPage( void ); String DosToSystem( sal_Char *pSource ); diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 9afc12be25ad..8740af2c70e5 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xcl97rec.hxx,v $ - * $Revision: 1.49 $ + * $Revision: 1.48.30.3 $ * * This file is part of OpenOffice.org. * @@ -338,15 +338,6 @@ public: }; -// --- class ExcBofC8 ------------------------------------------------ -// Header Record fuer CHARTs - -class ExcBofC8 : public ExcBof8_Base -{ -public: - ExcBofC8(); -}; - // --- class ExcBundlesheet8 ----------------------------------------- class ExcBundlesheet8 : public ExcBundlesheetBase @@ -374,25 +365,6 @@ public: }; -// --- class XclDConRef ---------------------------------------------- - -class XclDConRef : public ExcRecord -{ -private: - ScRange aSourceRange; - XclExpString* pWorkbook; - - virtual void SaveCont( XclExpStream& rStrm ); - -public: - XclDConRef( const ScRange& rSrcR, const String& rWB ); - virtual ~XclDConRef(); - - virtual UINT16 GetNum() const; - virtual sal_Size GetLen() const; -}; - - // ---- class XclCodename -------------------------------------------- class XclCodename : public ExcRecord diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index e58d443af39c..cb9170396ead 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xehelper.hxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.20.32.2 $ * * This file is part of OpenOffice.org. * @@ -142,23 +142,23 @@ public: @return true = Cell range returned in rXclRange is valid (original or cropped). */ bool ConvertRange( XclRange& rXclRange, const ScRange& rScRange, bool bWarn ); - /** Returns a valid cell range by moving it into allowed dimensions. - @descr The start and/or end position of the range may be modified. - @param rScRange The Calc cell range to convert. - @param bWarn true = Sets the internal flag that produces a warning box - after loading/saving the file, if the cell range contains invalid cells. - @return The converted Excel cell range. */ - XclRange CreateValidRange( const ScRange& rScRange, bool bWarn ); +//UNUSED2008-05 /** Returns a valid cell range by moving it into allowed dimensions. +//UNUSED2008-05 @descr The start and/or end position of the range may be modified. +//UNUSED2008-05 @param rScRange The Calc cell range to convert. +//UNUSED2008-05 @param bWarn true = Sets the internal flag that produces a warning box +//UNUSED2008-05 after loading/saving the file, if the cell range contains invalid cells. +//UNUSED2008-05 @return The converted Excel cell range. */ +//UNUSED2008-05 XclRange CreateValidRange( const ScRange& rScRange, bool bWarn ); // cell range list -------------------------------------------------------- - /** Checks if the passed cell range list is valid. - @param rScRanges The Calc cell range list to check. - @param bWarn true = Sets the internal flag that produces a warning box - after loading/saving the file, if the cell range list contains at - least one invalid range. - @return true = Cell range list in rScRanges is completly valid. */ - bool CheckRangeList( const ScRangeList& rScRanges, bool bWarn ); +//UNUSED2008-05 /** Checks if the passed cell range list is valid. +//UNUSED2008-05 @param rScRanges The Calc cell range list to check. +//UNUSED2008-05 @param bWarn true = Sets the internal flag that produces a warning box +//UNUSED2008-05 after loading/saving the file, if the cell range list contains at +//UNUSED2008-05 least one invalid range. +//UNUSED2008-05 @return true = Cell range list in rScRanges is completly valid. */ +//UNUSED2008-05 bool CheckRangeList( const ScRangeList& rScRanges, bool bWarn ); /** Checks and eventually crops the cell ranges to valid dimensions. @descr The start position of the ranges will not be modified. Cell diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 21f161f7f6ee..1a7cf2143736 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xerecord.hxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.32.2 $ * * This file is part of OpenOffice.org. * @@ -51,8 +51,8 @@ public: /** Overwrite this method to do any operation while saving the record. */ virtual void Save( XclExpStream& rStrm ); - /** Calls Save(XclExpStream&) nCount times. */ - void SaveRepeated( XclExpStream& rStrm, size_t nCount ); +//UNUSED2008-05 /** Calls Save(XclExpStream&) nCount times. */ +//UNUSED2008-05 void SaveRepeated( XclExpStream& rStrm, size_t nCount ); }; // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 1094dddc0dc0..8408fef68acf 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xestream.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.30.2 $ * * This file is part of OpenOffice.org. * @@ -120,18 +120,20 @@ public: // *** unicode string export is realized with helper class XclExpString *** // (slice length setting has no effect here -> disabled automatically) - /** Writes Unicode buffer as 8/16 bit, repeats nFlags at start of a CONTINUE record. */ - void WriteUnicodeBuffer( const sal_uInt16* pBuffer, sal_Size nChars, sal_uInt8 nFlags ); +//UNUSED2008-05 /** Writes Unicode buffer as 8/16 bit, repeats nFlags at start of a CONTINUE record. */ +//UNUSED2008-05 void WriteUnicodeBuffer( const sal_uInt16* pBuffer, sal_Size nChars, sal_uInt8 nFlags ); + /** Writes Unicode buffer as 8/16 bit, repeats nFlags at start of a CONTINUE record. */ void WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nFlags ); // *** write 8-bit-strings *** // (slice length setting has no effect here -> disabled automatically) - /** Writes ByteString buffer (without string length field). */ - void WriteByteStringBuffer( - const ByteString& rString, - sal_uInt16 nMaxLen = 0x00FF ); +//UNUSED2008-05 /** Writes ByteString buffer (without string length field). */ +//UNUSED2008-05 void WriteByteStringBuffer( +//UNUSED2008-05 const ByteString& rString, +//UNUSED2008-05 sal_uInt16 nMaxLen = 0x00FF ); + /** Writes string length field and ByteString buffer. */ void WriteByteString( const ByteString& rString, diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 757f6e9506e8..d26d69976171 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xestring.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.32.2 $ * * This file is part of OpenOffice.org. * @@ -74,15 +74,6 @@ public: const String& rString, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); - /** Constructs a formatted BIFF8 Unicode string. - @param rFormats The formatting runs. - @param nFlags Modifiers for string export. - @param nMaxLen The maximum number of characters to store in this string. */ - explicit XclExpString( - const String& rString, - const XclFormatRunVec& rFormats, - XclStrFlags nFlags = EXC_STR_DEFAULT, - sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); /** Constructs an unformatted BIFF8 Unicode string. @param nFlags Modifiers for string export. @param nMaxLen The maximum number of characters to store in this string. */ @@ -90,15 +81,25 @@ public: const ::rtl::OUString& rString, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); - /** Constructs a formatted BIFF8 Unicode string. - @param rFormats The formatting runs. - @param nFlags Modifiers for string export. - @param nMaxLen The maximum number of characters to store in this string. */ - explicit XclExpString( - const ::rtl::OUString& rString, - const XclFormatRunVec& rFormats, - XclStrFlags nFlags = EXC_STR_DEFAULT, - sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); +//UNUSED2008-05 /** Constructs a formatted BIFF8 Unicode string. +//UNUSED2008-05 @param rFormats The formatting runs. +//UNUSED2008-05 @param nFlags Modifiers for string export. +//UNUSED2008-05 @param nMaxLen The maximum number of characters to store in this string. */ +//UNUSED2008-05 explicit XclExpString( +//UNUSED2008-05 const String& rString, +//UNUSED2008-05 const XclFormatRunVec& rFormats, +//UNUSED2008-05 XclStrFlags nFlags = EXC_STR_DEFAULT, +//UNUSED2008-05 sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); +//UNUSED2008-05 +//UNUSED2008-05 /** Constructs a formatted BIFF8 Unicode string. +//UNUSED2008-05 @param rFormats The formatting runs. +//UNUSED2008-05 @param nFlags Modifiers for string export. +//UNUSED2008-05 @param nMaxLen The maximum number of characters to store in this string. */ +//UNUSED2008-05 explicit XclExpString( +//UNUSED2008-05 const ::rtl::OUString& rString, +//UNUSED2008-05 const XclFormatRunVec& rFormats, +//UNUSED2008-05 XclStrFlags nFlags = EXC_STR_DEFAULT, +//UNUSED2008-05 sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); // assign ----------------------------------------------------------------- @@ -150,26 +151,28 @@ public: rtl_TextEncoding eTextEnc, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); - /** Assigns a character, converts this object to a BIFF2-BIFF7 byte string. - @param nFlags Modifiers for string export. - @param nMaxLen The maximum number of characters to store in this string (for appending). */ - void AssignByte( - sal_Unicode cChar, - rtl_TextEncoding eTextEnc, - XclStrFlags nFlags = EXC_STR_DEFAULT, - sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); + +//UNUSED2008-05 /** Assigns a character, converts this object to a BIFF2-BIFF7 byte string. +//UNUSED2008-05 @param nFlags Modifiers for string export. +//UNUSED2008-05 @param nMaxLen The maximum number of characters to store in this string (for appending). */ +//UNUSED2008-05 void AssignByte( +//UNUSED2008-05 sal_Unicode cChar, +//UNUSED2008-05 rtl_TextEncoding eTextEnc, +//UNUSED2008-05 XclStrFlags nFlags = EXC_STR_DEFAULT, +//UNUSED2008-05 sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); // append ----------------------------------------------------------------- /** Appends a string. Uses the string flags used in constructor or last Assign(). @descr This object must be a BIFF8 Unicode string. */ void Append( const String& rString ); - /** Appends a string. Uses the string flags used in constructor or last Assign(). - @descr This object must be a BIFF8 Unicode string. */ - void Append( const ::rtl::OUString& rString ); - /** Appends a character. Uses the string flags used in constructor or last Assign(). - @descr This object must be a BIFF8 Unicode string. */ - void Append( sal_Unicode cChar ); + +//UNUSED2008-05 /** Appends a string. Uses the string flags used in constructor or last Assign(). +//UNUSED2008-05 @descr This object must be a BIFF8 Unicode string. */ +//UNUSED2008-05 void Append( const ::rtl::OUString& rString ); +//UNUSED2008-05 /** Appends a character. Uses the string flags used in constructor or last Assign(). +//UNUSED2008-05 @descr This object must be a BIFF8 Unicode string. */ +//UNUSED2008-05 void Append( sal_Unicode cChar ); /** Appends a string. Uses the string flags used in constructor or last Assign(). @descr This object must be a BIFF2-BIFF7 byte string. */ diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index c0e500992fe4..0c5523a510da 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xestyle.hxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.20.32.2 $ * * This file is part of OpenOffice.org. * @@ -529,26 +529,27 @@ class XclExpDefaultXF : public XclExpXF public: explicit XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF ); - /** Sets the parent XF ID. Only allowed for cell XFs. */ - void SetParent( sal_uInt32 nParentXFId ); +//UNUSED2008-05 /** Sets the parent XF ID. Only allowed for cell XFs. */ +//UNUSED2008-05 void SetParent( sal_uInt32 nParentXFId ); +//UNUSED2008-05 +//UNUSED2008-05 /** Sets all "attribute used" flags explicitely. +//UNUSED2008-05 @descr The following Set***() functions set the appropriate flag too. */ +//UNUSED2008-05 void SetUsedFlags( +//UNUSED2008-05 bool bProtUsed, bool bFontUsed, bool bFmtUsed, +//UNUSED2008-05 bool bAlignUsed, bool bBorderUsed, bool bAreaUsed ); +//UNUSED2008-05 /** Sets the cell protection flags. */ +//UNUSED2008-05 void SetProtection( const XclExpCellProt& rProtection ); +//UNUSED2008-05 /** Sets cell alignment attributes. */ +//UNUSED2008-05 void SetAlignment( const XclExpCellAlign& rAlignment ); +//UNUSED2008-05 /** Sets a cell border style. */ +//UNUSED2008-05 void SetBorder( const XclExpCellBorder& rBorder ); +//UNUSED2008-05 /** Sets a cell area style. */ +//UNUSED2008-05 void SetArea( const XclExpCellArea& rArea ); - /** Sets all "attribute used" flags explicitely. - @descr The following Set***() functions set the appropriate flag too. */ - void SetUsedFlags( - bool bProtUsed, bool bFontUsed, bool bFmtUsed, - bool bAlignUsed, bool bBorderUsed, bool bAreaUsed ); - /** Sets the cell protection flags. */ - void SetProtection( const XclExpCellProt& rProtection ); /** Sets the Excel font index. */ void SetFont( sal_uInt16 nXclFont ); /** Sets the Excel number format index. */ void SetNumFmt( sal_uInt16 nXclNumFmt ); - /** Sets cell alignment attributes. */ - void SetAlignment( const XclExpCellAlign& rAlignment ); - /** Sets a cell border style. */ - void SetBorder( const XclExpCellBorder& rBorder ); - /** Sets a cell area style. */ - void SetArea( const XclExpCellArea& rArea ); }; // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index f35dbe17a518..bad06af69ac2 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xistream.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.30.3 $ * * This file is part of OpenOffice.org. * @@ -310,8 +310,8 @@ public: /** Seeks to last position from user position stack. @descr This position will be removed from the stack. */ void PopPosition(); - /** Removes last position from user position stack, but does not seek to it. */ - void RejectPosition(); +//UNUSED2008-05 /** Removes last position from user position stack, but does not seek to it. */ +//UNUSED2008-05 void RejectPosition(); /** Stores current position. This position keeps valid in all records. */ void StoreGlobalPosition(); @@ -357,9 +357,10 @@ public: /** Copies nBytes bytes to rOutStrm. @return Count of bytes really written. */ sal_Size CopyToStream( SvStream& rOutStrm, sal_Size nBytes ); - /** Copies the entire record to rOutStrm. The current record position keeps unchanged. - @return Count of bytes really written. */ - sal_Size CopyRecordToStream( SvStream& rOutStrm ); + +//UNUSED2008-05 /** Copies the entire record to rOutStrm. The current record position keeps unchanged. +//UNUSED2008-05 @return Count of bytes really written. */ +//UNUSED2008-05 sal_Size CopyRecordToStream( SvStream& rOutStrm ); /** Seeks absolute in record content to the specified position. @descr The value 0 means start of record, independent from physical stream position. */ @@ -430,8 +431,6 @@ public: String ReadRawByteString( sal_uInt16 nChars ); /** Reads 8/16 bit string length, character array and returns the string. */ String ReadByteString( bool b16BitLen ); - /** Ignores 8/16 bit string length, character array. */ - void IgnoreByteString( bool b16BitLen ); // *** SvStream functions *** --------------------------------------------- diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index bd26ac1540a3..9604c7b1d17d 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xlpivot.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.32.2 $ * * This file is part of OpenOffice.org. * @@ -490,7 +490,6 @@ struct XclPCNumGroupInfo explicit XclPCNumGroupInfo(); - bool IsNumType() const; void SetNumType(); sal_Int32 GetScDateType() const; @@ -520,8 +519,9 @@ public: /** Returns true, if this is a standard field build directly from source data. */ bool IsStandardField() const; - /** Returns true, if the items of the field are calculated from a formula. */ - bool IsCalculatedField() const; + +//UNUSED2008-05 /** Returns true, if the items of the field are calculated from a formula. */ +//UNUSED2008-05 bool IsCalculatedField() const; /** Returns true, if this field is a grouping field. */ bool IsStdGroupField() const; diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index 28ab38a1cfe0..ac56f254492c 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xlstyle.hxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.23.32.2 $ * * This file is part of OpenOffice.org. * @@ -465,8 +465,9 @@ protected: /** Returns the current number format map. */ inline const XclNumFmtMap& GetFormatMap() const { return maFmtMap; } - /** Returns the number format with the specified Excel format index. */ - const XclNumFmt* GetFormat( sal_uInt16 nXclNumFmt ) const; + +//UNUSED2008-05 /** Returns the number format with the specified Excel format index. */ +//UNUSED2008-05 const XclNumFmt* GetFormat( sal_uInt16 nXclNumFmt ) const; /** Inserts a new number format for the specified Excel format index. */ void InsertFormat( sal_uInt16 nXclNumFmt, const String& rFormat ); diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index f76190f1464f..459a5c9b3a78 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xltools.hxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.27.32.2 $ * * This file is part of OpenOffice.org. * @@ -166,8 +166,9 @@ public: /** Returns a text encoding from an Excel code page. @return The corresponding text encoding or RTL_TEXTENCODING_DONTKNOW. */ static rtl_TextEncoding GetTextEncoding( sal_uInt16 nCodePage ); - /** Returns an Excel code page from a text encoding. */ - static sal_uInt16 GetXclCodePage( rtl_TextEncoding eTextEnc ); + +//UNUSED2008-05 /** Returns an Excel code page from a text encoding. */ +//UNUSED2008-05 static sal_uInt16 GetXclCodePage( rtl_TextEncoding eTextEnc ); // font names ------------------------------------------------------------- diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index eec0c294bb0e..2d3009260140 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xltracer.hxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.32.1 $ * * This file is part of OpenOffice.org. * @@ -99,15 +99,10 @@ public: /** Adds an attribute to be traced with the next Trace() call. */ void AddAttribute( const ::rtl::OUString& rName, const ::rtl::OUString& rValue ); - /** Adds an attribute to be traced with the next Trace() call. */ - void AddAttribute( const ::rtl::OUString& rName, sal_Int32 nValue ); /** Creates an element including all attributes set up to this call. @descr Removes all attributes after the element is traced. */ void Trace( const ::rtl::OUString& rElementID, const ::rtl::OUString& rMessage ); - /** Creates an element including all attributes set up to this call. - @descr Removes all attributes after the element is traced. */ - void Trace( const ::rtl::OUString& rElementID, sal_Int32 nMessage ); /** Calls Trace() with a known document properties problem. */ void TraceLog( XclTracerId eProblem, sal_Int32 nValue = 0 ); @@ -125,24 +120,15 @@ public: void TraceDates(sal_uInt16 nNumFmt); void TraceBorderLineStyle(bool bBorderLineStyle); void TraceFillPattern(bool bFillPattern); - void TraceInvisibleGrid(bool bVisibleGrid); void TraceFormulaExtName(); void TraceFormulaMissingArg(); void TracePivotDataSource(bool bExternal); void TracePivotChartExists(); void TraceChartUnKnownType(); - void TraceChartTrendLines(); - void TraceChartErrorBars(); void TraceChartOnlySheet(); - void TraceChartRange(); - void TraceChartDSName(); void TraceChartDataTable(); void TraceChartLegendPosition(); - void TraceChartTextFormatting(); void TraceChartEmbeddedObj(); - void TraceChartAxisAutoCross(); - void TraceChartAxisManualCross(); - void TraceChartInvalidXY(); void TraceUnsupportedObjects(); void TraceObjectNotPrintable(); void TraceDVType(bool bType); diff --git a/sc/source/filter/lotus/expop.cxx b/sc/source/filter/lotus/expop.cxx index 6e0a40446258..137659451bb3 100644 --- a/sc/source/filter/lotus/expop.cxx +++ b/sc/source/filter/lotus/expop.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: expop.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.2 $ * * This file is part of OpenOffice.org. * @@ -43,7 +43,7 @@ #include "exp_op.hxx" - +#if ENABLE_LOTUS123_EXPORT const USHORT ExportWK1::WK1MAXCOL = 255; const USHORT ExportWK1::WK1MAXROW = 8191; @@ -411,6 +411,6 @@ FltError ExportWK1::Write() return eERR_OK; } - +#endif diff --git a/sc/source/filter/lotus/export.cxx b/sc/source/filter/lotus/export.cxx index d8dc9d0e3025..9c1e43c44635 100644 --- a/sc/source/filter/lotus/export.cxx +++ b/sc/source/filter/lotus/export.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: export.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.2 $ * * This file is part of OpenOffice.org. * @@ -37,7 +37,7 @@ #include "scerrors.hxx" #include "exp_op.hxx" - +#if ENABLE_LOTUS123_EXPORT FltError ScExportLotus123( SvStream& aStream, ScDocument* pDoc, ExportFormatLotus eFormat, CharSet eDest ) { switch( eFormat ) @@ -56,6 +56,6 @@ FltError ScExportLotus123( SvStream& aStream, ScDocument* pDoc, ExportFormatLotu return eERR_OK; } - +#endif diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index 310cffff059e..aaeee31d6faa 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -143,45 +143,6 @@ void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt ) pDoc->ApplyAttr( nCol, nRow, nTab, aAttr ); } - - - -sal_Char* ReplaceWith( sal_Char* pString, sal_Char cVon, sal_Char cNach ) -{ // Ersetzt alle Vorkommen von cVon durch cNach - // cNach = 0 -> cVon wird aus String herausgeloescht! - // PREC: pString: Nullterminierter String - // POST: cNach = 0: aus String werden alle Vorkommen von cVon - // herausgeloescht (String wird kuerzer) - // cNach !=0: alle Vorkommen von cVon im String werden durch - // cNach ersetzt - DBG_ASSERT( pString != NULL, "ReplaceWith(): pString == NULL" ); - - sal_Char *pAkt, *pCpy; - if( cNach != 0 ) - { // Zeichen erstzen - for( pAkt = pString ; *pAkt != 0 ; pAkt++ ) - { - if( *pAkt == cVon ) - *pAkt = cNach; - } - } - else - { // Zeichen loeschen - for( pAkt = pCpy =pString ; *pAkt != 0 ; pAkt++ ) - if( *pAkt != cVon ) - { - *pCpy = *pAkt; - pCpy++; - } - *pCpy = 0; // Nullterminator anhaengen - } - - return pString; -} - - - - void InitPage( void ) { // Seitenformat initialisieren, d.h. Default-Werte von SC holen //scGetPageFormat( 0, &aPage ); diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 7ed74d357828..dfeac931b50f 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: qproform.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.32.1 $ * * This file is part of OpenOffice.org. * @@ -192,18 +192,6 @@ void QProToSc::IncToken( TokenId &rParam ) rParam = aPool.Store(); } -void QProToSc::DecToken( TokenId &rParam ) -{ - aPool << ocOpen << rParam << mnSubToken; - rParam = aPool.Store(); -} - -void QProToSc::NegToken( TokenId &rParam ) -{ - aPool << ocNegSub << ocOpen << rParam << ocClose; - rParam = aPool.Store(); -} - #define SAFEDEC_OR_RET(nRef, amt, ret) \ do { \ if (nRef < amt)\ diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 65c80de0bdc9..8f072435871d 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: scflt.cxx,v $ - * $Revision: 1.25 $ + * $Revision: 1.25.30.2 $ * * This file is part of OpenOffice.org. * @@ -92,16 +92,6 @@ using namespace com::sun::star; const SCCOL SC10MAXCOL = 255; // #i85906# don't try to load more columns than there are in the file -void lcl_ReadDateTime(SvStream& rStream, Sc10DateTime& rDateTime) -{ - rStream >> rDateTime.Year; - rStream >> rDateTime.Month; - rStream >> rDateTime.Day; - rStream >> rDateTime.Hour; - rStream >> rDateTime.Min; - rStream >> rDateTime.Sec; -} - void lcl_ReadFileHeader(SvStream& rStream, Sc10FileHeader& rFileHeader) { @@ -111,55 +101,6 @@ void lcl_ReadFileHeader(SvStream& rStream, Sc10FileHeader& rFileHeader) } -void lcl_ReadFileInfo(SvStream& rStream, Sc10FileInfo& rFileInfo) -{ - rStream.Read(&rFileInfo.Title, sizeof(rFileInfo.Title)); - rStream.Read(&rFileInfo.Thema, sizeof(rFileInfo.Thema)); - rStream.Read(&rFileInfo.Keys, sizeof(rFileInfo.Keys)); - rStream.Read(&rFileInfo.Note, sizeof(rFileInfo.Note)); - rStream.Read(&rFileInfo.InfoLabel0, sizeof(rFileInfo.InfoLabel0)); - rStream.Read(&rFileInfo.InfoLabel1, sizeof(rFileInfo.InfoLabel1)); - rStream.Read(&rFileInfo.InfoLabel2, sizeof(rFileInfo.InfoLabel2)); - rStream.Read(&rFileInfo.InfoLabel3, sizeof(rFileInfo.InfoLabel3)); - rStream.Read(&rFileInfo.Info0, sizeof(rFileInfo.Info0)); - rStream.Read(&rFileInfo.Info1, sizeof(rFileInfo.Info1)); - rStream.Read(&rFileInfo.Info2, sizeof(rFileInfo.Info2)); - rStream.Read(&rFileInfo.Info3, sizeof(rFileInfo.Info3)); - rStream.Read(&rFileInfo.CreateAuthor, sizeof(rFileInfo.CreateAuthor)); - rStream.Read(&rFileInfo.ChangeAuthor, sizeof(rFileInfo.ChangeAuthor)); - rStream.Read(&rFileInfo.PrintAuthor, sizeof(rFileInfo.PrintAuthor)); - lcl_ReadDateTime(rStream, rFileInfo.CreateDate); - lcl_ReadDateTime(rStream, rFileInfo.ChangeDate); - lcl_ReadDateTime(rStream, rFileInfo.PrintDate); - rStream >> rFileInfo.PageCount; - rStream >> rFileInfo.ChartCount; - rStream >> rFileInfo.PictureCount; - rStream >> rFileInfo.GraphCount; - rStream >> rFileInfo.OleCount; - rStream >> rFileInfo.NoteCount; - rStream >> rFileInfo.TextCellCount; - rStream >> rFileInfo.ValueCellCount; - rStream >> rFileInfo.FormulaCellCount; - rStream >> rFileInfo.CellCount; - rStream.Read(rFileInfo.Reserved, sizeof(rFileInfo.Reserved)); -} - - -void lcl_ReadEditStateInfo(SvStream& rStream, Sc10EditStateInfo& rInfo) -{ - rStream >> rInfo.CarretX; - rStream >> rInfo.CarretY; - rStream >> rInfo.CarretZ; - - rStream >> rInfo.DeltaX; - rStream >> rInfo.DeltaY; - rStream >> rInfo.DeltaZ; - - rStream >> rInfo.DataBaseMode; - rStream.Read(rInfo.Reserved, sizeof(rInfo.Reserved)); -} - - void lcl_ReadTabProtect(SvStream& rStream, Sc10TableProtect& rProtect) { rStream.Read(&rProtect.PassWord, sizeof(rProtect.PassWord)); @@ -1123,7 +1064,6 @@ void Sc10Import::LoadFileInfo() { Sc10FileInfo FileInfo; rStream.Read(&FileInfo, sizeof(FileInfo)); - //lcl_ReadFileInfo(rStream, FileInfo); nError = rStream.GetError(); // Achtung Info Uebertragen @@ -1135,7 +1075,6 @@ void Sc10Import::LoadEditStateInfo() { Sc10EditStateInfo EditStateInfo; rStream.Read(&EditStateInfo, sizeof(EditStateInfo)); - //lcl_ReadEditStateInfo(rStream, EditStateInfo); nError = rStream.GetError(); nShowTab = static_cast<SCTAB>(EditStateInfo.DeltaZ); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 7d8b4cd38fdd..bf58888d47ab 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xcl97rec.cxx,v $ - * $Revision: 1.88 $ + * $Revision: 1.87.30.3 $ * * This file is part of OpenOffice.org. * @@ -916,13 +916,6 @@ ExcBofW8::ExcBofW8() } -// --- class ExcBofC8 ------------------------------------------------ - -ExcBofC8::ExcBofC8() -{ - nDocType = 0x0020; -} - // --- class ExcBundlesheet8 ----------------------------------------- ExcBundlesheet8::ExcBundlesheet8( RootData& rRootData, SCTAB nTab ) : @@ -968,45 +961,6 @@ sal_Size XclObproj::GetLen() const } - -// --- class XclDConRef ---------------------------------------------- - -XclDConRef::XclDConRef( const ScRange& rSrcR, const String& rWB ) : - aSourceRange( rSrcR ) -{ - String sTemp( ( sal_Unicode ) 0x02 ); - - sTemp += rWB; - pWorkbook = new XclExpString( sTemp ); -} - -XclDConRef::~XclDConRef() -{ - delete pWorkbook; -} - -void XclDConRef::SaveCont( XclExpStream& rStrm ) -{ - rStrm << (UINT16) aSourceRange.aStart.Row() - << (UINT16) aSourceRange.aEnd.Row() - << (UINT8) aSourceRange.aStart.Col() - << (UINT8) aSourceRange.aEnd.Col() - << *pWorkbook - << (UINT8) 0x00; -} - -UINT16 XclDConRef::GetNum() const -{ - return 0x0051; -} - -sal_Size XclDConRef::GetLen() const -{ - return 7 + pWorkbook->GetSize(); -} - - - // ---- class XclCodename -------------------------------------------- XclCodename::XclCodename( const String& r ) : aName( r ) diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 7140508ff1c8..8abb1573aaa7 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XMLChangeTrackingExportHelper.cxx,v $ - * $Revision: 1.34 $ + * $Revision: 1.33.30.2 $ * * This file is part of OpenOffice.org. * @@ -791,113 +791,6 @@ void ScChangeTrackingExportHelper::CollectAutoStyles() } } -void ScChangeTrackingExportHelper::WriteChangeViewSettings() -{ - ScChangeViewSettings* pViewSettings = rExport.GetDocument() ? rExport.GetDocument()->GetChangeViewSettings() : NULL; - if (pViewSettings && pChangeTrack) - { - if (!pViewSettings->ShowChanges()) - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_CHANGES, XML_FALSE); - if (pViewSettings->IsShowAccepted()) - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_ACCEPTED_CHANGES, XML_TRUE); - if (pViewSettings->IsShowRejected()) - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_REJECTED_CHANGES, XML_TRUE); - SvXMLElementExport aChangeViewSettingsElem(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_VIEW_SETTINGS, sal_True, sal_True); - { - SvXMLElementExport aChangeViewConditionsElem(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_VIEW_CONDITIONS, sal_True, sal_True); - { - { - if (pViewSettings->HasDate()) - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USE_CONDITION, XML_TRUE); - switch (pViewSettings->GetTheDateMode()) - { - case SCDM_DATE_BEFORE: - { - rtl::OUStringBuffer sDate; - ScXMLConverter::ConvertDateTimeToString(pViewSettings->GetTheFirstDateTime(), sDate); - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_TIME, sDate.makeStringAndClear()); - SvXMLElementExport aDateBeforeElem(rExport, XML_NAMESPACE_TABLE, XML_BEFORE_DATE_TIME, sal_True, sal_True); - } - break; - case SCDM_DATE_SINCE: - { - rtl::OUStringBuffer sDate; - ScXMLConverter::ConvertDateTimeToString(pViewSettings->GetTheFirstDateTime(), sDate); - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_TIME, sDate.makeStringAndClear()); - SvXMLElementExport aDateSinceElem(rExport, XML_NAMESPACE_TABLE, XML_SINCE_DATE_TIME, sal_True, sal_True); - } - break; - case SCDM_DATE_EQUAL: - { - rtl::OUStringBuffer sDate; - ScXMLConverter::ConvertDateTimeToString(pViewSettings->GetTheFirstDateTime(), sDate); - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE, sDate.makeStringAndClear()); - SvXMLElementExport aDateEqualElem(rExport, XML_NAMESPACE_TABLE, XML_EQUAL_DATE, sal_True, sal_True); - } - break; - case SCDM_DATE_NOTEQUAL: - { - rtl::OUStringBuffer sDate; - ScXMLConverter::ConvertDateTimeToString(pViewSettings->GetTheFirstDateTime(), sDate); - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATE, sDate.makeStringAndClear()); - SvXMLElementExport aDateNotEqualElem(rExport, XML_NAMESPACE_TABLE, XML_NOT_EQUAL_DATE, sal_True, sal_True); - } - break; - case SCDM_DATE_BETWEEN: - { - rtl::OUStringBuffer sDate; - ScXMLConverter::ConvertDateTimeToString(pViewSettings->GetTheFirstDateTime(), sDate); - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIRST_DATE_TIME, sDate.makeStringAndClear()); - ScXMLConverter::ConvertDateTimeToString(pViewSettings->GetTheFirstDateTime(), sDate); - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SECOND_DATE_TIME, sDate.makeStringAndClear()); - SvXMLElementExport aDateBetweenElem(rExport, XML_NAMESPACE_TABLE, XML_BETWEEN_DATE_TIMES, sal_True, sal_True); - } - break; - case SCDM_DATE_SAVE: - { - SvXMLElementExport aDateSaveElem(rExport, XML_NAMESPACE_TABLE, XML_SINCE_SAVE, sal_True, sal_True); - } - break; - case SCDM_NO_DATEMODE: - { - DBG_ERROR("wrong date mode"); - } - break; - } - } - rtl::OUString sAuthor (pViewSettings->GetTheAuthorToShow()); - if (sAuthor.getLength() && !pViewSettings->HasAuthor()) - { - if (pViewSettings->HasAuthor()) - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USE_CONDITION, XML_TRUE); - if (sAuthor.getLength()) - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_AUTHOR, sAuthor); - SvXMLElementExport aEqualAuthorElem(rExport, XML_NAMESPACE_TABLE, XML_EQUAL_AUTHOR, sal_True, sal_True); - } - rtl::OUString sComment (pViewSettings->GetTheComment()); - if (sComment.getLength() && !pViewSettings->HasComment()) - { - if (pViewSettings->HasComment()) - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USE_CONDITION, XML_TRUE); - if (sComment.getLength()) - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COMMENT, sComment); - SvXMLElementExport aEqualCommentElem(rExport, XML_NAMESPACE_TABLE, XML_EQUAL_COMMENT, sal_True, sal_True); - } - rtl::OUString sRangeList; - ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), rExport.GetDocument()); - if (sRangeList.getLength() && !pViewSettings->HasRange()) - { - if (pViewSettings->HasRange()) - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USE_CONDITION, XML_TRUE); - if (sRangeList.getLength()) - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS_LIST, sRangeList); - SvXMLElementExport aInRangeElem(rExport, XML_NAMESPACE_TABLE, XML_IN_RANGE, sal_True, sal_True); - } - } - } - } -} - void ScChangeTrackingExportHelper::CollectAndWriteChanges() { if (pChangeTrack) diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx index 20a2f91f0d8b..e7775eb58a4f 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XMLChangeTrackingExportHelper.hxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.17.32.2 $ * * This file is part of OpenOffice.org. * @@ -94,7 +94,6 @@ public: ScChangeTrackingExportHelper(ScXMLExport& rExport); ~ScChangeTrackingExportHelper(); - void WriteChangeViewSettings(); void CollectAutoStyles(); void CollectAndWriteChanges(); }; diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index 6af29e7b583f..302bd51f5038 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XMLChangeTrackingImportHelper.cxx,v $ - * $Revision: 1.30 $ + * $Revision: 1.29.32.2 $ * * This file is part of OpenOffice.org. * @@ -43,20 +43,6 @@ #define SC_CHANGE_ID_PREFIX "ct" -ScMyCellInfo::ScMyCellInfo() - : pCell(NULL), - sFormulaAddress(), - sFormula(), - sInputString(), - fValue(0.0), - nMatrixCols(0), - nMatrixRows(0), - eGrammar( ScGrammar::GRAM_STORAGE_DEFAULT), - nType(NUMBERFORMAT_ALL), - nMatrixFlag(MM_NONE) -{ -} - ScMyCellInfo::ScMyCellInfo(ScBaseCell* pTempCell, const rtl::OUString& rFormulaAddress, const rtl::OUString& rFormula, const ScGrammar::Grammar eTempGrammar, const rtl::OUString& rInputString, const double& rValue, const sal_uInt16 nTempType, const sal_uInt8 nTempMatrixFlag, const sal_Int32 nTempMatrixCols, diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index 30b17d1239c9..2730a3f8e896 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XMLChangeTrackingImportHelper.hxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.18.32.2 $ * * This file is part of OpenOffice.org. * @@ -59,7 +59,6 @@ struct ScMyCellInfo sal_uInt16 nType; sal_uInt8 nMatrixFlag; - ScMyCellInfo(); ScMyCellInfo(ScBaseCell* pCell, const rtl::OUString& sFormulaAddress, const rtl::OUString& sFormula, const ScGrammar::Grammar eGrammar, const rtl::OUString& sInputString, const double& fValue, const sal_uInt16 nType, const sal_uInt8 nMatrixFlag, const sal_Int32 nMatrixCols, @@ -67,6 +66,9 @@ struct ScMyCellInfo ~ScMyCellInfo(); ScBaseCell* CreateCell(ScDocument* pDoc); + +private: + ScMyCellInfo(); // disabled }; struct ScMyDeleted diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index 9673e6938dfc..e0a20ad4353e 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XMLConverter.cxx,v $ - * $Revision: 1.29 $ + * $Revision: 1.29.32.2 $ * * This file is part of OpenOffice.org. * @@ -359,12 +359,12 @@ void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUS SvXMLUnitConverter::convertDateTime(sDate, aAPIDateTime); } -void ScXMLConverter::ConvertStringToDateTime(const rtl::OUString& sDate, DateTime& aDateTime, SvXMLUnitConverter* /* pUnitConverter */) -{ - com::sun::star::util::DateTime aAPIDateTime; - SvXMLUnitConverter::convertDateTime(aAPIDateTime, sDate); - ConvertAPIToCoreDateTime(aAPIDateTime, aDateTime); -} +//UNUSED2008-05 void ScXMLConverter::ConvertStringToDateTime(const rtl::OUString& sDate, DateTime& aDateTime, SvXMLUnitConverter* /* pUnitConverter */) +//UNUSED2008-05 { +//UNUSED2008-05 com::sun::star::util::DateTime aAPIDateTime; +//UNUSED2008-05 SvXMLUnitConverter::convertDateTime(aAPIDateTime, sDate); +//UNUSED2008-05 ConvertAPIToCoreDateTime(aAPIDateTime, aDateTime); +//UNUSED2008-05 } void ScXMLConverter::ConvertCoreToAPIDateTime(const DateTime& aDateTime, util::DateTime& rDateTime) { diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index b56709dbb18c..75254a7b3300 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XMLConverter.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.15.32.3 $ * * This file is part of OpenOffice.org. * @@ -109,8 +109,8 @@ public: const sal_Bool bIsFormula = sal_True); // EXPORT: Core Date Time static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate); -// IMPORT: Core Date Time - static void ConvertStringToDateTime(const rtl::OUString& sDate, DateTime& aDateTime, SvXMLUnitConverter* pUnitConverter); +//UNUSED2008-05 // IMPORT: Core Date Time +//UNUSED2008-05 static void ConvertStringToDateTime(const rtl::OUString& sDate, DateTime& aDateTime, SvXMLUnitConverter* pUnitConverter); static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime); diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 6d4e16d5cb8d..12c31a4d5acc 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XMLStylesImportHelper.cxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.32.1 $ * * This file is part of OpenOffice.org. * @@ -531,19 +531,6 @@ void ScMyStylesImportHelper::AddRange(const ScRange& rRange) } } -void ScMyStylesImportHelper::AddRange(const com::sun::star::table::CellRangeAddress& rRange) -{ - ScRange aScRange( static_cast<SCCOL>(rRange.StartColumn), static_cast<SCROW>(rRange.StartRow), rRange.Sheet, - static_cast<SCCOL>(rRange.EndColumn), static_cast<SCROW>(rRange.EndRow), rRange.Sheet ); - AddRange(aScRange); -} - -void ScMyStylesImportHelper::AddCell(const ScAddress& rAddress) -{ - ScRange aScRange( rAddress, rAddress ); - AddRange(aScRange); -} - void ScMyStylesImportHelper::AddCell(const com::sun::star::table::CellAddress& rAddress) { ScAddress aScAddress( static_cast<SCCOL>(rAddress.Column), static_cast<SCROW>(rAddress.Row), rAddress.Sheet ); diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index 56473e93acab..17f23f9dbfd1 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: XMLStylesImportHelper.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.10.32.2 $ * * This file is part of OpenOffice.org. * @@ -187,8 +187,6 @@ public: void SetAttributes(rtl::OUString* pStyleName, rtl::OUString* pCurrency, const sal_Int16 nCellType); void AddRange(const ScRange& rRange); - void AddRange(const com::sun::star::table::CellRangeAddress& rRange); - void AddCell(const ScAddress& rAddress); void AddCell(const com::sun::star::table::CellAddress& rAddress); void InsertRow(const sal_Int32 nRow, const sal_Int32 nTab, ScDocument* pDoc); // a row is inserted before nRow void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); // a col is inserted before nCol diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index bea3415f81df..af28486efb97 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlexprt.cxx,v $ - * $Revision: 1.213 $ + * $Revision: 1.212.28.3 $ * * This file is part of OpenOffice.org. * @@ -2049,24 +2049,24 @@ void ScXMLExport::CollectInternalShape( uno::Reference< drawing::XShape > xShape } } -sal_Bool ScXMLExport::GetMerge (const uno::Reference <sheet::XSpreadsheet>& xTable, - const sal_Int32 nCol, const sal_Int32 nRow, - table::CellRangeAddress& aCellAddress) -{ - uno::Reference<sheet::XSheetCellRange> xSheetCellRange(xTable->getCellRangeByPosition(nCol, nRow, nCol, nRow), uno::UNO_QUERY); - if (xSheetCellRange.is()) - { - uno::Reference<sheet::XSheetCellCursor> xCursor(xTable->createCursorByRange(xSheetCellRange)); - if(xCursor.is()) - { - uno::Reference<sheet::XCellRangeAddressable> xCellAddress (xCursor, uno::UNO_QUERY); - xCursor->collapseToMergedArea(); - aCellAddress = xCellAddress->getRangeAddress(); - return sal_True; - } - } - return sal_False; -} +//UNUSED2008-05 sal_Bool ScXMLExport::GetMerge (const uno::Reference <sheet::XSpreadsheet>& xTable, +//UNUSED2008-05 const sal_Int32 nCol, const sal_Int32 nRow, +//UNUSED2008-05 table::CellRangeAddress& aCellAddress) +//UNUSED2008-05 { +//UNUSED2008-05 uno::Reference<sheet::XSheetCellRange> xSheetCellRange(xTable->getCellRangeByPosition(nCol, nRow, nCol, nRow), uno::UNO_QUERY); +//UNUSED2008-05 if (xSheetCellRange.is()) +//UNUSED2008-05 { +//UNUSED2008-05 uno::Reference<sheet::XSheetCellCursor> xCursor(xTable->createCursorByRange(xSheetCellRange)); +//UNUSED2008-05 if (xCursor.is()) +//UNUSED2008-05 { +//UNUSED2008-05 uno::Reference<sheet::XCellRangeAddressable> xCellAddress (xCursor, uno::UNO_QUERY); +//UNUSED2008-05 xCursor->collapseToMergedArea(); +//UNUSED2008-05 aCellAddress = xCellAddress->getRangeAddress(); +//UNUSED2008-05 return sal_True; +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 return sal_False; +//UNUSED2008-05 } sal_Bool ScXMLExport::GetMerged (const table::CellRangeAddress* pCellAddress, const uno::Reference <sheet::XSpreadsheet>& xTable) @@ -2113,50 +2113,50 @@ sal_Bool ScXMLExport::GetMerged (const table::CellRangeAddress* pCellAddress, return !bReady; } -sal_Bool ScXMLExport::IsMatrix (const uno::Reference <table::XCellRange>& xCellRange, - const uno::Reference <sheet::XSpreadsheet>& xTable, - const sal_Int32 nCol, const sal_Int32 nRow, - table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const -{ - bIsFirst = sal_False; - uno::Reference <sheet::XArrayFormulaRange> xArrayFormulaRange (xCellRange->getCellRangeByPosition(nCol,nRow,nCol,nRow), uno::UNO_QUERY); - if (xArrayFormulaRange.is()) - { - rtl::OUString sArrayFormula(xArrayFormulaRange->getArrayFormula()); - if (sArrayFormula.getLength()) - { - uno::Reference<sheet::XSheetCellRange> xMatrixSheetCellRange (xArrayFormulaRange, uno::UNO_QUERY); - if (xMatrixSheetCellRange.is()) - { - uno::Reference<sheet::XSheetCellCursor> xMatrixSheetCursor(xTable->createCursorByRange(xMatrixSheetCellRange)); - if (xMatrixSheetCursor.is()) - { - xMatrixSheetCursor->collapseToCurrentArray(); - uno::Reference<sheet::XCellRangeAddressable> xMatrixCellAddress (xMatrixSheetCursor, uno::UNO_QUERY); - if (xMatrixCellAddress.is()) - { - aCellAddress = xMatrixCellAddress->getRangeAddress(); - if ((aCellAddress.StartColumn == nCol && aCellAddress.StartRow == nRow) && - (aCellAddress.EndColumn > nCol || aCellAddress.EndRow > nRow)) - { - bIsFirst = sal_True; - return sal_True; - } - else if (aCellAddress.StartColumn != nCol || aCellAddress.StartRow != nRow || - aCellAddress.EndColumn != nCol || aCellAddress.EndRow != nRow) - return sal_True; - else - { - bIsFirst = sal_True; - return sal_True; - } - } - } - } - } - } - return sal_False; -} +//UNUSED2008-05 sal_Bool ScXMLExport::IsMatrix (const uno::Reference <table::XCellRange>& xCellRange, +//UNUSED2008-05 const uno::Reference <sheet::XSpreadsheet>& xTable, +//UNUSED2008-05 const sal_Int32 nCol, const sal_Int32 nRow, +//UNUSED2008-05 table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const +//UNUSED2008-05 { +//UNUSED2008-05 bIsFirst = sal_False; +//UNUSED2008-05 uno::Reference <sheet::XArrayFormulaRange> xArrayFormulaRange (xCellRange->getCellRangeByPosition(nCol,nRow,nCol,nRow), uno::UNO_QUERY); +//UNUSED2008-05 if (xArrayFormulaRange.is()) +//UNUSED2008-05 { +//UNUSED2008-05 rtl::OUString sArrayFormula(xArrayFormulaRange->getArrayFormula()); +//UNUSED2008-05 if (sArrayFormula.getLength()) +//UNUSED2008-05 { +//UNUSED2008-05 uno::Reference<sheet::XSheetCellRange> xMatrixSheetCellRange (xArrayFormulaRange, uno::UNO_QUERY); +//UNUSED2008-05 if (xMatrixSheetCellRange.is()) +//UNUSED2008-05 { +//UNUSED2008-05 uno::Reference<sheet::XSheetCellCursor> xMatrixSheetCursor(xTable->createCursorByRange(xMatrixSheetCellRange)); +//UNUSED2008-05 if (xMatrixSheetCursor.is()) +//UNUSED2008-05 { +//UNUSED2008-05 xMatrixSheetCursor->collapseToCurrentArray(); +//UNUSED2008-05 uno::Reference<sheet::XCellRangeAddressable> xMatrixCellAddress (xMatrixSheetCursor, uno::UNO_QUERY); +//UNUSED2008-05 if (xMatrixCellAddress.is()) +//UNUSED2008-05 { +//UNUSED2008-05 aCellAddress = xMatrixCellAddress->getRangeAddress(); +//UNUSED2008-05 if ((aCellAddress.StartColumn == nCol && aCellAddress.StartRow == nRow) && +//UNUSED2008-05 (aCellAddress.EndColumn > nCol || aCellAddress.EndRow > nRow)) +//UNUSED2008-05 { +//UNUSED2008-05 bIsFirst = sal_True; +//UNUSED2008-05 return sal_True; +//UNUSED2008-05 } +//UNUSED2008-05 else if (aCellAddress.StartColumn != nCol || aCellAddress.StartRow != nRow || +//UNUSED2008-05 aCellAddress.EndColumn != nCol || aCellAddress.EndRow != nRow) +//UNUSED2008-05 return sal_True; +//UNUSED2008-05 else +//UNUSED2008-05 { +//UNUSED2008-05 bIsFirst = sal_True; +//UNUSED2008-05 return sal_True; +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 return sal_False; +//UNUSED2008-05 } sal_Bool ScXMLExport::IsMatrix (const ScAddress& aCell, table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const @@ -2831,13 +2831,13 @@ sal_Bool ScXMLExport::IsEditCell(const com::sun::star::table::CellAddress& aAddr return sal_False; } -sal_Bool ScXMLExport::IsEditCell(const com::sun::star::uno::Reference <com::sun::star::table::XCell>& xCell) const -{ - uno::Reference<sheet::XCellAddressable> xAddressable (xCell, uno::UNO_QUERY); - if ( xAddressable.is() ) - return IsEditCell(xAddressable->getCellAddress()); - return sal_False; -} +//UNUSED2008-05 sal_Bool ScXMLExport::IsEditCell(const com::sun::star::uno::Reference <com::sun::star::table::XCell>& xCell) const +//UNUSED2008-05 { +//UNUSED2008-05 uno::Reference<sheet::XCellAddressable> xAddressable (xCell, uno::UNO_QUERY); +//UNUSED2008-05 if ( xAddressable.is() ) +//UNUSED2008-05 return IsEditCell(xAddressable->getCellAddress()); +//UNUSED2008-05 return sal_False; +//UNUSED2008-05 } sal_Bool ScXMLExport::IsEditCell(ScMyCell& rCell) const { @@ -2851,43 +2851,43 @@ sal_Bool ScXMLExport::IsEditCell(ScMyCell& rCell) const } } -sal_Bool ScXMLExport::IsAnnotationEqual(const uno::Reference<table::XCell>& /* xCell1 */, - const uno::Reference<table::XCell>& /* xCell2 */) -{ - // no longer compareable, because the position and size and other attributes can also differ - -/* uno::Reference<sheet::XSheetAnnotationAnchor> xSheetAnnotationAnchor1(xCell1, uno::UNO_QUERY); - uno::Reference<sheet::XSheetAnnotationAnchor> xSheetAnnotationAnchor2(xCell2, uno::UNO_QUERY); - if (xSheetAnnotationAnchor1.is() && xSheetAnnotationAnchor2.is()) - { - uno::Reference <sheet::XSheetAnnotation> xSheetAnnotation1(xSheetAnnotationAnchor1->getAnnotation()); - uno::Reference <sheet::XSheetAnnotation> xSheetAnnotation2(xSheetAnnotationAnchor2->getAnnotation()); - uno::Reference<text::XSimpleText> xSimpleText1(xSheetAnnotation1, uno::UNO_QUERY); - uno::Reference<text::XSimpleText> xSimpleText2(xSheetAnnotation2, uno::UNO_QUERY); - if (xSheetAnnotation1.is() && xSimpleText1.is() && - xSheetAnnotation2.is() && xSimpleText2.is()) - { - rtl::OUString sText1(xSimpleText1->getString()); - rtl::OUString sText2(xSimpleText2->getString()); - sal_Int32 nLength1(sText1.getLength()); - sal_Int32 nLength2(sText2.getLength()); - if (nLength1 && nLength2) - if (sText1 == sText2 && - xSheetAnnotation1->getAuthor() == xSheetAnnotation2->getAuthor() && - xSheetAnnotation1->getDate() == xSheetAnnotation2->getDate() && - xSheetAnnotation1->getIsVisible() == xSheetAnnotation2->getIsVisible()) - return sal_True; - else - return sal_False; - else - if (nLength1 || nLength2) - return sal_False; - else - return sal_True; - } - }*/ - return sal_False; -} +//UNUSED2008-05 sal_Bool ScXMLExport::IsAnnotationEqual(const uno::Reference<table::XCell>& /* xCell1 */, +//UNUSED2008-05 const uno::Reference<table::XCell>& /* xCell2 */) +//UNUSED2008-05 { +//UNUSED2008-05 // no longer compareable, because the position and size and other attributes can also differ +//UNUSED2008-05 +//UNUSED2008-05 /* uno::Reference<sheet::XSheetAnnotationAnchor> xSheetAnnotationAnchor1(xCell1, uno::UNO_QUERY); +//UNUSED2008-05 uno::Reference<sheet::XSheetAnnotationAnchor> xSheetAnnotationAnchor2(xCell2, uno::UNO_QUERY); +//UNUSED2008-05 if (xSheetAnnotationAnchor1.is() && xSheetAnnotationAnchor2.is()) +//UNUSED2008-05 { +//UNUSED2008-05 uno::Reference <sheet::XSheetAnnotation> xSheetAnnotation1(xSheetAnnotationAnchor1->getAnnotation()); +//UNUSED2008-05 uno::Reference <sheet::XSheetAnnotation> xSheetAnnotation2(xSheetAnnotationAnchor2->getAnnotation()); +//UNUSED2008-05 uno::Reference<text::XSimpleText> xSimpleText1(xSheetAnnotation1, uno::UNO_QUERY); +//UNUSED2008-05 uno::Reference<text::XSimpleText> xSimpleText2(xSheetAnnotation2, uno::UNO_QUERY); +//UNUSED2008-05 if (xSheetAnnotation1.is() && xSimpleText1.is() && +//UNUSED2008-05 xSheetAnnotation2.is() && xSimpleText2.is()) +//UNUSED2008-05 { +//UNUSED2008-05 rtl::OUString sText1(xSimpleText1->getString()); +//UNUSED2008-05 rtl::OUString sText2(xSimpleText2->getString()); +//UNUSED2008-05 sal_Int32 nLength1(sText1.getLength()); +//UNUSED2008-05 sal_Int32 nLength2(sText2.getLength()); +//UNUSED2008-05 if (nLength1 && nLength2) +//UNUSED2008-05 if (sText1 == sText2 && +//UNUSED2008-05 xSheetAnnotation1->getAuthor() == xSheetAnnotation2->getAuthor() && +//UNUSED2008-05 xSheetAnnotation1->getDate() == xSheetAnnotation2->getDate() && +//UNUSED2008-05 xSheetAnnotation1->getIsVisible() == xSheetAnnotation2->getIsVisible()) +//UNUSED2008-05 return sal_True; +//UNUSED2008-05 else +//UNUSED2008-05 return sal_False; +//UNUSED2008-05 else +//UNUSED2008-05 if (nLength1 || nLength2) +//UNUSED2008-05 return sal_False; +//UNUSED2008-05 else +//UNUSED2008-05 return sal_True; +//UNUSED2008-05 } +//UNUSED2008-05 }*/ +//UNUSED2008-05 return sal_False; +//UNUSED2008-05 } sal_Bool ScXMLExport::IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2) { diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 0b2767dbfa76..4d452c3f1c0e 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlexprt.hxx,v $ - * $Revision: 1.84 $ + * $Revision: 1.83.32.3 $ * * This file is part of OpenOffice.org. * @@ -162,9 +162,10 @@ class ScXMLExport : public SvXMLExport void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); void FillColumnRowGroups(); - sal_Bool GetMerge (const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable, - sal_Int32 nCol, sal_Int32 nRow, - com::sun::star::table::CellRangeAddress& aCellAddress); +//UNUSED2008-05 sal_Bool GetMerge (const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable, +//UNUSED2008-05 sal_Int32 nCol, sal_Int32 nRow, +//UNUSED2008-05 com::sun::star::table::CellRangeAddress& aCellAddress); + sal_Bool GetMerged (const com::sun::star::table::CellRangeAddress* pCellRange, const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable); @@ -182,10 +183,10 @@ class ScXMLExport : public SvXMLExport sal_Bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const; sal_Bool IsEditCell(const com::sun::star::table::CellAddress& aAddress) const; - sal_Bool IsEditCell(const com::sun::star::uno::Reference <com::sun::star::table::XCell>& xCell) const; +//UNUSED2008-05 sal_Bool IsEditCell(const com::sun::star::uno::Reference <com::sun::star::table::XCell>& xCell) const; sal_Bool IsEditCell(ScMyCell& rCell) const; - sal_Bool IsAnnotationEqual(const com::sun::star::uno::Reference<com::sun::star::table::XCell>& xCell1, - const com::sun::star::uno::Reference<com::sun::star::table::XCell>& xCell2); +//UNUSED2008-05 sal_Bool IsAnnotationEqual(const com::sun::star::uno::Reference<com::sun::star::table::XCell>& xCell1, +//UNUSED2008-05 const com::sun::star::uno::Reference<com::sun::star::table::XCell>& xCell2); sal_Bool IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2); void WriteCalculationSettings(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc); @@ -215,10 +216,10 @@ public: static sal_Int16 GetFieldUnit(); inline ScDocument* GetDocument() { return pDoc; } inline const ScDocument* GetDocument() const { return pDoc; } - sal_Bool IsMatrix (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, - const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable, - const sal_Int32 nCol, const sal_Int32 nRow, - com::sun::star::table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const; +//UNUSED2008-05 sal_Bool IsMatrix (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, +//UNUSED2008-05 const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable, +//UNUSED2008-05 const sal_Int32 nCol, const sal_Int32 nRow, +//UNUSED2008-05 com::sun::star::table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const; sal_Bool IsMatrix (const ScAddress& aCell, com::sun::star::table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index ed9da641879b..6649e48e17b3 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlimprt.cxx,v $ - * $Revision: 1.133 $ + * $Revision: 1.132.30.4 $ * * This file is part of OpenOffice.org. * @@ -215,6 +215,7 @@ static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] = XML_TOKEN_MAP_END }; +#if 0 // apparently not used - 2008-08-15 (Friday) static __FAR_DATA SvXMLTokenMapEntry aStylesTokenMap[] = { { XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLES_STYLE }, @@ -234,6 +235,7 @@ static __FAR_DATA SvXMLTokenMapEntry aStyleTokenMap[] = { XML_NAMESPACE_STYLE, XML_PROPERTIES, XML_TOK_STYLE_PROPERTIES }, XML_TOKEN_MAP_END }; +#endif static __FAR_DATA SvXMLTokenMapEntry aBodyTokenMap[] = { @@ -415,6 +417,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTokenMap[] = XML_TOKEN_MAP_END }; +#if 0 // apparently not used - 2008-08-15 (Friday) static __FAR_DATA SvXMLTokenMapEntry aTableRowCellAttrTokenMap[] = { { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_ROW_CELL_ATTR_STYLE_NAME }, @@ -434,6 +437,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableRowCellAttrTokenMap[] = { XML_NAMESPACE_TABLE, XML_CURRENCY, XML_TOK_TABLE_ROW_CELL_ATTR_CURRENCY }, XML_TOKEN_MAP_END }; +#endif static __FAR_DATA SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] = { @@ -959,29 +963,29 @@ const SvXMLTokenMap& ScXMLImport::GetDocElemTokenMap() return *pDocElemTokenMap; } -const SvXMLTokenMap& ScXMLImport::GetStylesElemTokenMap() -{ - if( !pStylesElemTokenMap ) - pStylesElemTokenMap = new SvXMLTokenMap( aStylesTokenMap ); - - return *pStylesElemTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetStylesAttrTokenMap() -{ - if( !pStylesAttrTokenMap ) - pStylesAttrTokenMap = new SvXMLTokenMap( aStylesAttrTokenMap ); - - return *pStylesAttrTokenMap; -} - -const SvXMLTokenMap& ScXMLImport::GetStyleElemTokenMap() -{ - if( !pStyleElemTokenMap ) - pStyleElemTokenMap = new SvXMLTokenMap( aStyleTokenMap ); - - return *pStyleElemTokenMap; -} +//UNUSED2008-05 const SvXMLTokenMap& ScXMLImport::GetStylesElemTokenMap() +//UNUSED2008-05 { +//UNUSED2008-05 if( !pStylesElemTokenMap ) +//UNUSED2008-05 pStylesElemTokenMap = new SvXMLTokenMap( aStylesTokenMap ); +//UNUSED2008-05 +//UNUSED2008-05 return *pStylesElemTokenMap; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 const SvXMLTokenMap& ScXMLImport::GetStylesAttrTokenMap() +//UNUSED2008-05 { +//UNUSED2008-05 if( !pStylesAttrTokenMap ) +//UNUSED2008-05 pStylesAttrTokenMap = new SvXMLTokenMap( aStylesAttrTokenMap ); +//UNUSED2008-05 +//UNUSED2008-05 return *pStylesAttrTokenMap; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 const SvXMLTokenMap& ScXMLImport::GetStyleElemTokenMap() +//UNUSED2008-05 { +//UNUSED2008-05 if ( !pStyleElemTokenMap ) +//UNUSED2008-05 pStyleElemTokenMap = new SvXMLTokenMap( aStyleTokenMap ); +//UNUSED2008-05 +//UNUSED2008-05 return *pStyleElemTokenMap; +//UNUSED2008-05 } const SvXMLTokenMap& ScXMLImport::GetBodyElemTokenMap() { @@ -1116,12 +1120,12 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap() return *pTableRowCellElemTokenMap; } -const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap() -{ - if( !pTableRowCellAttrTokenMap ) - pTableRowCellAttrTokenMap = new SvXMLTokenMap( aTableRowCellAttrTokenMap ); - return *pTableRowCellAttrTokenMap; -} +//UNUSED2008-05 const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap() +//UNUSED2008-05 { +//UNUSED2008-05 if ( !pTableRowCellAttrTokenMap ) +//UNUSED2008-05 pTableRowCellAttrTokenMap = new SvXMLTokenMap( aTableRowCellAttrTokenMap ); +//UNUSED2008-05 return *pTableRowCellAttrTokenMap; +//UNUSED2008-05 } const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap() { diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index a056640228e3..12a737320b4e 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlimprt.hxx,v $ - * $Revision: 1.97 $ + * $Revision: 1.96.32.3 $ * * This file is part of OpenOffice.org. * @@ -826,9 +826,9 @@ public: // SvXMLImportContextRef GetStyles() const { return xStyles; } const SvXMLTokenMap& GetDocElemTokenMap(); - const SvXMLTokenMap& GetStylesElemTokenMap(); - const SvXMLTokenMap& GetStylesAttrTokenMap(); - const SvXMLTokenMap& GetStyleElemTokenMap(); +//UNUSED2008-05 const SvXMLTokenMap& GetStylesElemTokenMap(); +//UNUSED2008-05 const SvXMLTokenMap& GetStylesAttrTokenMap(); +//UNUSED2008-05 const SvXMLTokenMap& GetStyleElemTokenMap(); const SvXMLTokenMap& GetBodyElemTokenMap(); const SvXMLTokenMap& GetContentValidationsElemTokenMap(); const SvXMLTokenMap& GetContentValidationElemTokenMap(); @@ -848,7 +848,7 @@ public: const SvXMLTokenMap& GetTableRowElemTokenMap(); const SvXMLTokenMap& GetTableRowAttrTokenMap(); const SvXMLTokenMap& GetTableRowCellElemTokenMap(); - const SvXMLTokenMap& GetTableRowCellAttrTokenMap(); +//UNUSED2008-05 const SvXMLTokenMap& GetTableRowCellAttrTokenMap(); const SvXMLTokenMap& GetTableAnnotationAttrTokenMap(); const SvXMLTokenMap& GetDetectiveElemTokenMap(); const SvXMLTokenMap& GetDetectiveHighlightedAttrTokenMap(); diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index 517423b35283..647067f9fe85 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlsubti.cxx,v $ - * $Revision: 1.50 $ + * $Revision: 1.50.30.1 $ * * This file is part of OpenOffice.org. * @@ -109,14 +109,6 @@ void ScMyTableData::AddColumn() nRealCols[aTableCellPos.Column + 1] = nRealCols[aTableCellPos.Column] + nColsPerCol[aTableCellPos.Column]; } -sal_Int32 ScMyTableData::FindNextCol(const sal_Int32 nIndex) const -{ - sal_Int32 i = nIndex; - while(nRealCols[i] < 0) - ++i; - return nRealCols[i]; -} - sal_Int32 ScMyTableData::GetRealCols(const sal_Int32 nIndex, const sal_Bool /* bIsNormal */) const { return (nIndex < 0) ? 0 : nRealCols[nIndex]; @@ -425,22 +417,6 @@ void ScMyTables::SetRowStyle(const rtl::OUString& rCellStyleName) rImport.GetStylesImportHelper()->SetRowStyle(rCellStyleName); } -void ScMyTables::CloseRow() -{ - sal_Int32 nToMerge; - sal_Int32 nSpannedCols(aTableVec[nTableCount - 1]->GetSpannedCols()); - sal_Int32 nColCount(aTableVec[nTableCount - 1]->GetColCount()); - sal_Int32 nCol(aTableVec[nTableCount - 1]->GetColumn()); - sal_Int32 nColsPerCol(aTableVec[nTableCount - 1]->GetColsPerCol(nCol)); - if (nSpannedCols > nColCount) - nToMerge = aTableVec[nTableCount - 1]->GetChangedCols(nCol, nCol + nColsPerCol + nSpannedCols - nColCount); - else - nToMerge = aTableVec[nTableCount - 1]->GetChangedCols(nCol, nCol + nColsPerCol); - if ((nToMerge > nCol) && (aTableVec[nTableCount - 1]->GetSubTableSpanned() == 1)) - DoMerge(nColsPerCol + aTableVec[nTableCount - 1]->GetColsPerCol(nToMerge) - 1); -} - - void ScMyTables::InsertColumn() { if ( xCurrentCellRange.is() ) diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index 027f54876ed7..fae1d22922d1 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlsubti.hxx,v $ - * $Revision: 1.32 $ + * $Revision: 1.32.32.1 $ * * This file is part of OpenOffice.org. * @@ -74,7 +74,6 @@ public: void AddRow(); void AddColumn(); void SetFirstColumn() { aTableCellPos.Column = -1; } - sal_Int32 FindNextCol(const sal_Int32 nIndex) const; sal_Int32 GetColsPerCol(const sal_Int32 nIndex) const { return nColsPerCol[nIndex]; } void SetColsPerCol(const sal_Int32 nIndex, sal_Int32 nValue = 1) { nColsPerCol[nIndex] = nValue; } sal_Int32 GetRealCols(const sal_Int32 nIndex, const sal_Bool bIsNormal = sal_True) const; @@ -149,7 +148,6 @@ public: const sal_Bool bProtection, const rtl::OUString& sPassword); void AddRow(); void SetRowStyle(const rtl::OUString& rCellStyleName); - void CloseRow(); void AddColumn(sal_Bool bIsCovered); void NewTable(sal_Int32 nTempSpannedCols); void UpdateRowHeights(); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 854846ba583a..88f2bf2ba0a1 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlwrap.cxx,v $ - * $Revision: 1.70 $ + * $Revision: 1.69.32.3 $ * * This file is part of OpenOffice.org. * @@ -96,34 +96,34 @@ ScXMLImportWrapper::ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, const uno: DBG_ASSERT( pMedium || xStorage.is(), "ScXMLImportWrapper: Medium or Storage must be set" ); } -uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator( - uno::Reference < frame::XModel> & rModel) -{ - DBG_ERROR( "The status indicator from medium must be used!" ); - - uno::Reference<task::XStatusIndicator> xStatusIndicator; - - if (rModel.is()) - { - uno::Reference<frame::XController> xController( rModel->getCurrentController()); - if( xController.is()) - { - uno::Reference<task::XStatusIndicatorFactory> xFactory( xController->getFrame(), uno::UNO_QUERY ); - if( xFactory.is()) - { - try - { - xStatusIndicator.set(xFactory->createStatusIndicator()); - } - catch( lang::DisposedException e ) - { - DBG_ERROR("Exception while trying to get a Status Indicator"); - } - } - } - } - return xStatusIndicator; -} +//UNUSED2008-05 uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator( +//UNUSED2008-05 uno::Reference < frame::XModel> & rModel) +//UNUSED2008-05 { +//UNUSED2008-05 DBG_ERROR( "The status indicator from medium must be used!" ); +//UNUSED2008-05 +//UNUSED2008-05 uno::Reference<task::XStatusIndicator> xStatusIndicator; +//UNUSED2008-05 +//UNUSED2008-05 if (rModel.is()) +//UNUSED2008-05 { +//UNUSED2008-05 uno::Reference<frame::XController> xController( rModel->getCurrentController()); +//UNUSED2008-05 if ( xController.is()) +//UNUSED2008-05 { +//UNUSED2008-05 uno::Reference<task::XStatusIndicatorFactory> xFactory( xController->getFrame(), uno::UNO_QUERY ); +//UNUSED2008-05 if ( xFactory.is()) +//UNUSED2008-05 { +//UNUSED2008-05 try +//UNUSED2008-05 { +//UNUSED2008-05 xStatusIndicator.set(xFactory->createStatusIndicator()); +//UNUSED2008-05 } +//UNUSED2008-05 catch ( lang::DisposedException e ) +//UNUSED2008-05 { +//UNUSED2008-05 DBG_ERROR("Exception while trying to get a Status Indicator"); +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 return xStatusIndicator; +//UNUSED2008-05 } uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator() { |