diff options
author | Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk> | 2011-02-01 08:20:47 +0000 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-02-01 09:26:56 -0500 |
commit | 449c729fc69f802eb7136de08dc44321af8f3de1 (patch) | |
tree | ad38e74808e46805090122dbc0b9606bbedcb276 /sc/source/filter | |
parent | 8b167759ce07dbe1232677d7245d394aa6f09647 (diff) |
Call-catcher: removed unused functions in calc
Removed unused functions from calc using the call-catcher list available
in Easy Tasks (first batch).
Diffstat (limited to 'sc/source/filter')
-rw-r--r-- | sc/source/filter/excel/xestream.cxx | 15 | ||||
-rw-r--r-- | sc/source/filter/excel/xestring.cxx | 16 | ||||
-rw-r--r-- | sc/source/filter/excel/xihelper.cxx | 5 | ||||
-rw-r--r-- | sc/source/filter/excel/xipivot.cxx | 18 | ||||
-rw-r--r-- | sc/source/filter/excel/xistream.cxx | 19 | ||||
-rw-r--r-- | sc/source/filter/excel/xltracer.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/inc/XclImpChangeTrack.hxx | 6 | ||||
-rw-r--r-- | sc/source/filter/inc/xestream.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xestring.hxx | 20 | ||||
-rw-r--r-- | sc/source/filter/inc/xihelper.hxx | 7 | ||||
-rw-r--r-- | sc/source/filter/inc/xipivot.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/inc/xistream.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/inc/xltracer.hxx | 1 |
13 files changed, 2 insertions, 121 deletions
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 227e9da14401..e2f3f29afb79 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -995,13 +995,6 @@ void XclExpXmlStream::PopStream() maStreams.pop(); } -OUString XclExpXmlStream::GetIdForPath( const OUString& sPath ) -{ - if( maOpenedStreamMap.find( sPath ) == maOpenedStreamMap.end() ) - return OUString(); - return maOpenedStreamMap[ sPath ].first; -} - sax_fastparser::FSHelperPtr XclExpXmlStream::GetStreamForPath( const OUString& sPath ) { if( maOpenedStreamMap.find( sPath ) == maOpenedStreamMap.end() ) @@ -1134,14 +1127,6 @@ bool XclExpXmlStream::exportDocument() throw() return true; } -void XclExpXmlStream::Trace( const char* format, ...) -{ - va_list ap; - va_start( ap, format ); - vfprintf( stderr, format, ap ); - va_end( ap ); -} - ////////////////////////////////////////////////////////////////////////// // UNO stuff so that the filter is registered ////////////////////////////////////////////////////////////////////////// diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 0247d765966a..b6e6dc02115c 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -135,27 +135,11 @@ void XclExpString::Assign( const String& rString, XclStrFlags nFlags, sal_uInt16 Build( rString.GetBuffer(), rString.Len(), nFlags, nMaxLen ); } -void XclExpString::Assign( - const String& rString, const XclFormatRunVec& rFormats, - XclStrFlags nFlags, sal_uInt16 nMaxLen ) -{ - Assign( rString, nFlags, nMaxLen ); - SetFormats( rFormats ); -} - void XclExpString::Assign( const OUString& rString, XclStrFlags nFlags, sal_uInt16 nMaxLen ) { Build( rString.getStr(), rString.getLength(), nFlags, nMaxLen ); } -void XclExpString::Assign( - const OUString& rString, const XclFormatRunVec& rFormats, - XclStrFlags nFlags, sal_uInt16 nMaxLen ) -{ - Assign( rString, nFlags, nMaxLen ); - SetFormats( rFormats ); -} - void XclExpString::Assign( sal_Unicode cChar, XclStrFlags nFlags, sal_uInt16 nMaxLen ) { Build( &cChar, 1, nFlags, nMaxLen ); diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index af7609698dce..f6ef3e205fa3 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -108,11 +108,6 @@ ScAddress XclImpAddressConverter::CreateValidAddress( // cell range ----------------------------------------------------------------- -bool XclImpAddressConverter::CheckRange( const XclRange& rXclRange, bool bWarn ) -{ - return CheckAddress( rXclRange.maFirst, bWarn ) && CheckAddress( rXclRange.maLast, bWarn ); -} - bool XclImpAddressConverter::ConvertRange( ScRange& rScRange, const XclRange& rXclRange, SCTAB nScTab1, SCTAB nScTab2, bool bWarn ) { diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 2ebf6c6eb7a5..bcdf78f588f7 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -216,11 +216,6 @@ const XclImpPCField* XclImpPCField::GetGroupBaseField() const return IsGroupChildField() ? mrPCache.GetField( maFieldInfo.mnGroupBase ) : 0; } -sal_uInt16 XclImpPCField::GetItemCount() const -{ - return static_cast< sal_uInt16 >( maItems.size() ); -} - const XclImpPCItem* XclImpPCField::GetItem( sal_uInt16 nItemIdx ) const { return (nItemIdx < maItems.size()) ? maItems[ nItemIdx ].get() : 0; @@ -961,12 +956,6 @@ const String* XclImpPTField::GetItemName( sal_uInt16 nItemIdx ) const return pItem ? pItem->GetItemName() : 0; } -const String* XclImpPTField::GetVisItemName( sal_uInt16 nItemIdx ) const -{ - const XclImpPTItem* pItem = GetItem( nItemIdx ); - return pItem ? pItem->GetVisItemName() : 0; -} - // records -------------------------------------------------------------------- void XclImpPTField::ReadSxvd( XclImpStream& rStrm ) @@ -1231,13 +1220,6 @@ XclImpPTField* XclImpPivotTable::GetFieldAcc( sal_uInt16 nFieldIdx ) return (nFieldIdx < maFields.size()) ? maFields[ nFieldIdx ].get() : 0; } -const String& XclImpPivotTable::GetFieldName( sal_uInt16 nFieldIdx ) const -{ - if( const XclImpPTField* pField = GetField( nFieldIdx ) ) - return pField->GetFieldName(); - return EMPTY_STRING; -} - const XclImpPTField* XclImpPivotTable::GetDataField( sal_uInt16 nDataFieldIdx ) const { if( nDataFieldIdx < maOrigDataFields.size() ) diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 74428a0d4314..e0af805fa09a 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -667,13 +667,6 @@ XclImpStream& XclImpStream::operator>>( double& rfValue ) return *this; } -sal_Int8 XclImpStream::ReadInt8() -{ - sal_Int8 nValue(0); - operator>>( nValue ); - return nValue; -} - sal_uInt8 XclImpStream::ReaduInt8() { sal_uInt8 nValue(0); @@ -709,13 +702,6 @@ sal_uInt32 XclImpStream::ReaduInt32() return nValue; } -float XclImpStream::ReadFloat() -{ - float fValue(0.0); - operator>>( fValue ); - return fValue; -} - double XclImpStream::ReadDouble() { double fValue(0.0); @@ -952,11 +938,6 @@ void XclImpStream::IgnoreUniString( sal_uInt16 nChars ) IgnoreUniString( nChars, ReaduInt8() ); } -void XclImpStream::IgnoreUniString() -{ - IgnoreUniString( ReaduInt16() ); -} - // ---------------------------------------------------------------------------- String XclImpStream::ReadRawByteString( sal_uInt16 nChars ) diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx index 948fa41efbdf..a5351a1da9bf 100644 --- a/sc/source/filter/excel/xltracer.cxx +++ b/sc/source/filter/excel/xltracer.cxx @@ -243,12 +243,6 @@ void XclTracer::TraceChartLegendPosition() ProcessTraceOnce(eChartLegendPosition); } -void XclTracer::TraceChartEmbeddedObj() -{ - // drawing objects e.g. text boxes etc not supported inside charts - ProcessTraceOnce(eChartEmbeddedObj); -} - void XclTracer::TraceUnsupportedObjects() { // Called from Excel 5.0 - limited Graphical object support. diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index 0bed2ca49c2f..402085eae6e7 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -93,7 +93,6 @@ private: void ReadDateTime( DateTime& rDateTime ); inline void ReadString( String& rString ); - inline void IgnoreString(); sal_Bool CheckRecord( sal_uInt16 nOpCode ); @@ -167,11 +166,6 @@ inline void XclImpChangeTrack::ReadString( String& rString ) rString = pStrm->ReadUniString(); } -inline void XclImpChangeTrack::IgnoreString() -{ - pStrm->IgnoreUniString(); -} - //___________________________________________________________________ // derived class for special 3D ref handling diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 2d7e9c095fbc..8ae34b1f58a7 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -317,7 +317,6 @@ public: void PushStream( sax_fastparser::FSHelperPtr aStream ); void PopStream(); - ::rtl::OUString GetIdForPath( const ::rtl::OUString& rPath ); sax_fastparser::FSHelperPtr GetStreamForPath( const ::rtl::OUString& rPath ); sax_fastparser::FSHelperPtr& WriteAttributes( sal_Int32 nAttribute, ... ); @@ -340,7 +339,6 @@ public: virtual const oox::drawingml::table::TableStyleListPtr getTableStyles(); virtual oox::drawingml::chart::ChartConverter& getChartConverter(); - void Trace( const char* format, ...); private: virtual ::rtl::OUString implGetImplementationName() const; ScDocShell *getDocShell(); diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 6b1c12474dd0..abc6f331aa1b 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -90,15 +90,7 @@ public: const String& rString, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); - /** Assigns a formatted string, converts this object to a 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. */ - void Assign( - const String& rString, - const XclFormatRunVec& rFormats, - XclStrFlags nFlags = EXC_STR_DEFAULT, - sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); + /** Assigns an unformatted string, converts this object to a BIFF8 Unicode string. @param nFlags Modifiers for string export. @param nMaxLen The maximum number of characters to store in this string. */ @@ -106,15 +98,7 @@ public: const ::rtl::OUString& rString, XclStrFlags nFlags = EXC_STR_DEFAULT, sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); - /** Assigns a formatted string, converts this object to a 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. */ - void Assign( - const ::rtl::OUString& rString, - const XclFormatRunVec& rFormats, - XclStrFlags nFlags = EXC_STR_DEFAULT, - sal_uInt16 nMaxLen = EXC_STR_MAXLEN ); + /** Assigns a Unicode character, converts this object to a BIFF8 Unicode string. @param nFlags Modifiers for string export. @param nMaxLen The maximum number of characters to store in this string (for appending). */ diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 278d601f13ac..084a8461a844 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -74,13 +74,6 @@ public: // cell range ------------------------------------------------------------- - /** Checks if the passed cell range is valid (checks start and end position). - @param rXclRange The Excel cell range to check. - @param bWarn true = Sets the internal flag that produces a warning box - after loading/saving the file, if the cell range is not valid. - @return true = Cell range in rXclRange is valid. */ - bool CheckRange( const XclRange& rXclRange, bool bWarn ); - /** Converts the passed Excel cell range to a Calc cell range. @param rScRange (Out) The converted Calc cell range, if valid. @param rXclRange The Excel cell range to convert. diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index 939744feb1b5..86fc881d04e7 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -91,8 +91,6 @@ public: /** Returns the base field if this is a grouping field. */ const XclImpPCField* GetGroupBaseField() const; - /** Returns the number of items of this field. */ - sal_uInt16 GetItemCount() const; /** Returns the item at the specified position or 0 on error. */ const XclImpPCItem* GetItem( sal_uInt16 nItemIdx ) const; /** Returns the item representing a limit value in numeric/date/time grouping fields. @@ -262,8 +260,6 @@ public: const XclImpPTItem* GetItem( sal_uInt16 nItemIdx ) const; /** Returns the internal name of the specified item. */ const String* GetItemName( sal_uInt16 nItemIdx ) const; - /** Returns the displayed name of the specified item. */ - const String* GetVisItemName( sal_uInt16 nItemIdx ) const; /** Returns the flags of the axes this field is part of. */ inline sal_uInt16 GetAxes() const { return maFieldInfo.mnAxes; } diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 86428c199639..9333474fca83 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -336,13 +336,11 @@ public: XclImpStream& operator>>( float& rfValue ); XclImpStream& operator>>( double& rfValue ); - sal_Int8 ReadInt8(); sal_uInt8 ReaduInt8(); sal_Int16 ReadInt16(); sal_uInt16 ReaduInt16(); sal_Int32 ReadInt32(); sal_uInt32 ReaduInt32(); - float ReadFloat(); double ReadDouble(); /** Reads nBytes bytes to the existing(!) buffer pData. @@ -416,8 +414,6 @@ public: void IgnoreUniString( sal_uInt16 nChars, sal_uInt8 nFlags ); /** Ignores 8 bit flags, ext. header, nChar characters, ext. data. */ void IgnoreUniString( sal_uInt16 nChars ); - /** Ignores 16 bit character count, 8 bit flags, ext. header, character array, ext. data. */ - void IgnoreUniString(); // *** read/ignore 8-bit-strings, store in String *** --------------------- diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index 3e4c6e87c9d4..ba177fd3706f 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -125,7 +125,6 @@ public: void TraceChartOnlySheet(); void TraceChartDataTable(); void TraceChartLegendPosition(); - void TraceChartEmbeddedObj(); void TraceUnsupportedObjects(); void TraceObjectNotPrintable(); void TraceDVType(bool bType); |