Hi,
Please find attached patch (made available under LGPLv3+/MPL) containing removal
of unused functions in calc as identified by call-catcher.
Patch has been rebased and compiled without errors.
Please, disregard my previous patch commenting out these calc functions, as
Cedric suggested, this new patch directly removes the functions.
Thanks & regards,
Alfonso
From 18e45467342802383fa944c469141f4042bd0c8b Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Tue, 1 Feb 2011 08:20:47 +0000
Subject: [PATCH] Call-catcher: removed unused functions in calc
Removed unused functions from calc using the call-catcher list available
in Easy Tasks (first batch).
---
sc/inc/compressedarray.hxx | 154 ---------------------------
sc/source/core/data/attarray.cxx | 1 -
sc/source/core/data/compressedarray.cxx | 155 ----------------------------
sc/source/filter/excel/xestream.cxx | 11 +--
sc/source/filter/excel/xestring.cxx | 16 ---
sc/source/filter/excel/xihelper.cxx | 5 -
sc/source/filter/excel/xipivot.cxx | 18 ---
sc/source/filter/excel/xistream.cxx | 19 ----
sc/source/filter/excel/xltracer.cxx | 6 -
sc/source/filter/inc/XclImpChangeTrack.hxx | 6 -
sc/source/filter/inc/xestream.hxx | 2 -
sc/source/filter/inc/xestring.hxx | 20 +---
sc/source/filter/inc/xihelper.hxx | 7 --
sc/source/filter/inc/xipivot.hxx | 4 -
sc/source/filter/inc/xistream.hxx | 4 -
sc/source/filter/inc/xltracer.hxx | 1 -
16 files changed, 4 insertions(+), 425 deletions(-)
diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index efc5cd7..12a5940 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -89,18 +89,11 @@ public:
/** Get value for a row, and it's region end row */
const D& GetValue( A nPos, size_t& nIndex, A& nEnd ) const;
- /** Get value for a row, and it's region start row and end row */
- const D& GetValue( A nPos, size_t& nIndex, A& nStart, A& nEnd ) const;
-
/** Get next value and it's region end row. If nIndex<nCount, nIndex is
incremented first. If the resulting nIndex>=nCount, the value of the
last entry is returned again. */
const D& GetNextValue( size_t& nIndex, A& nEnd ) const;
- /** Get previous value and it's region start row. If nIndex==0, nIndex is
- not decremented and the value of the first entry is returned again. */
- const D& GetPrevValue( size_t& nIndex, A& nStart ) const;
-
/** Insert rows before nStart and copy value for inserted rows from
nStart-1, return that value. */
const D& Insert( A nStart, size_t nCount );
@@ -117,8 +110,6 @@ public:
SC_DLLPUBLIC size_t Search( A nPos ) const;
/** Get number of entries */
size_t GetEntryCount() const;
- /** Get data entry for an index */
- const DataEntry& GetDataEntry( size_t nIndex ) const;
protected:
@@ -171,17 +162,6 @@ const D& ScCompressedArray<A,D>::GetValue( A nPos, size_t& nIndex, A& nEnd )
con
template< typename A, typename D >
-const D& ScCompressedArray<A,D>::GetValue( A nPos, size_t& nIndex, A& nStart,
- A& nEnd ) const
-{
- nIndex = Search( nPos);
- nStart = (nIndex > 0 ? pData[nIndex-1].nEnd + 1 : 0);
- nEnd = pData[nIndex].nEnd;
- return pData[nIndex].aValue;
-}
-
-
-template< typename A, typename D >
const D& ScCompressedArray<A,D>::GetNextValue( size_t& nIndex, A& nEnd ) const
{
if (nIndex < nCount)
@@ -193,30 +173,12 @@ const D& ScCompressedArray<A,D>::GetNextValue( size_t& nIndex, A& nEnd ) const
template< typename A, typename D >
-const D& ScCompressedArray<A,D>::GetPrevValue( size_t& nIndex, A& nStart ) const
-{
- if (nIndex > 0)
- --nIndex;
- nStart = (nIndex > 0 ? pData[nIndex-1].nEnd + 1 : 0);
- return pData[nIndex].aValue;
-}
-
-
-template< typename A, typename D >
size_t ScCompressedArray<A,D>::GetEntryCount() const
{
return nCount;
}
-template< typename A, typename D >
-const typename ScCompressedArray<A,D>::DataEntry&
-ScCompressedArray<A,D>::GetDataEntry( size_t nIndex ) const
-{
- return pData[nIndex];
-}
-
-
// === ScCompressedArrayIterator =============================================
/** Iterator for ScCompressedArray.
@@ -474,21 +436,6 @@ public:
meets this condition, ::std::numeric_limits<A>::max() is returned. */
A GetLastAnyBitAccess( A nStart,
const D& rBitMask ) const;
-
- /** Sum values of a ScSummableCompressedArray for each row where in *this*
- array the condition is met: ((aValue & rBitMask) == rMaskedCompare). */
- template< typename S >
- SC_DLLPUBLIC unsigned long SumCoupledArrayForCondition( A nStart, A nEnd,
- const D& rBitMask, const D& rMaskedCompare,
- const ScSummableCompressedArray<A,S>& rArray ) const;
-
- /** Sum scaled values of a ScSummableCompressedArray for each row where in
- *this* array the condition is met: ((aValue & rBitMask) == rMaskedCompare). */
- template< typename S >
- SC_DLLPUBLIC unsigned long SumScaledCoupledArrayForCondition( A nStart, A nEnd,
- const D& rBitMask, const D& rMaskedCompare,
- const ScSummableCompressedArray<A,S>& rArray,
- double fScale ) const;
};
@@ -510,107 +457,6 @@ void ScBitMaskCompressedArray<A,D>::OrValue( A nPos, const D& rValueToOr )
}
-// === ScCoupledCompressedArrayIterator ======================================
-
-/** Iterate over a ScBitMaskCompressedArray and retrieve values from a coupled
- array for positions where in the bit mask array the condition ((*aIter1 &
- rBitMask) == rMaskedCompare) is met.
- */
-
-template< typename A, typename D, typename S > class ScCoupledCompressedArrayIterator
-{
-public:
- SC_DLLPUBLIC ScCoupledCompressedArrayIterator(
- const ScBitMaskCompressedArray<A,D> & rArray1,
- A nStart, A nEnd,
- const D& rBitMask,
- const D& rMaskedCompare,
- const ScCompressedArray<A,S> & rArray2 );
- void NewLimits( A nStart, A nEnd );
- A GetIterStart() const;
- A GetIterEnd() const;
- bool operator ++();
- A GetPos() const;
- operator bool() const;
- const S& operator *() const;
- SC_DLLPUBLIC bool NextRange();
- A GetRangeStart() const;
- A GetRangeEnd() const;
- void Resync( A nPos );
-
-private:
- ScCompressedArrayIterator<A,D> aIter1;
- ScCompressedArrayIterator<A,S> aIter2;
- const D& rBitMask;
- const D& rMaskedCompare;
-
- void InitLimits();
-};
-
-
-template< typename A, typename D, typename S >
-A ScCoupledCompressedArrayIterator<A,D,S>::GetIterStart() const
-{
- return aIter1.GetIterStart();
-}
-
-
-template< typename A, typename D, typename S >
-A ScCoupledCompressedArrayIterator<A,D,S>::GetIterEnd() const
-{
- return aIter1.GetIterEnd();
-}
-
-
-template< typename A, typename D, typename S >
-ScCoupledCompressedArrayIterator<A,D,S>::operator bool() const
-{
- return aIter1 && aIter2;
-}
-
-
-template< typename A, typename D, typename S >
-const S& ScCoupledCompressedArrayIterator<A,D,S>::operator*() const
-{
- return *aIter2;
-}
-
-
-template< typename A, typename D, typename S >
-bool ScCoupledCompressedArrayIterator<A,D,S>::operator ++()
-{
- if (aIter1.GetPos() < aIter1.GetRangeEnd())
- {
- ++aIter1;
- ++aIter2;
- return operator bool();
- }
- else
- return NextRange();
-}
-
-
-template< typename A, typename D, typename S >
-A ScCoupledCompressedArrayIterator<A,D,S>::GetPos() const
-{
- return aIter2.GetPos();
-}
-
-
-template< typename A, typename D, typename S >
-A ScCoupledCompressedArrayIterator<A,D,S>::GetRangeStart() const
-{
- return ::std::max( aIter1.GetRangeStart(), aIter2.GetRangeStart());
-}
-
-
-template< typename A, typename D, typename S >
-A ScCoupledCompressedArrayIterator<A,D,S>::GetRangeEnd() const
-{
- return ::std::min( aIter1.GetRangeEnd(), aIter2.GetRangeEnd());
-}
-
-
#endif // SC_COMPRESSEDARRAY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index bd52f4b..bb411ab 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1183,7 +1183,6 @@ long lcl_LineSize( const SvxBorderLine& rLine )
return nTotal;
}
-
BOOL ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
BOOL bLeft, BOOL bRight ) const
{
diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx
index 1c4d8bd..2201997 100644
--- a/sc/source/core/data/compressedarray.cxx
+++ b/sc/source/core/data/compressedarray.cxx
@@ -516,75 +516,6 @@ A ScBitMaskCompressedArray<A,D>::GetLastAnyBitAccess( A nStart,
}
-template< typename A, typename D >
-template< typename S >
-unsigned long ScBitMaskCompressedArray<A,D>::SumCoupledArrayForCondition(
- A nStart, A nEnd, const D& rBitMask, const D& rMaskedCompare,
- const ScSummableCompressedArray<A,S>& rArray ) const
-{
- unsigned long nSum = 0;
- A nS = nStart;
- size_t nIndex1 = Search( nStart);
- size_t nIndex2 = rArray.Search( nStart);
- do
- {
- if ((this->pData[nIndex1].aValue & rBitMask) == rMaskedCompare)
- {
- while (nIndex2 < rArray.GetEntryCount() &&
- rArray.GetDataEntry(nIndex2).nEnd < nS)
- ++nIndex2;
- unsigned long nNew = rArray.SumValuesContinuation( nS,
- ::std::min( this->pData[nIndex1].nEnd, nEnd), nIndex2);
- nSum += nNew;
- if (nSum < nNew)
- return ::std::numeric_limits<unsigned long>::max();
- }
- nS = this->pData[nIndex1].nEnd + 1;
- ++nIndex1;
- } while (nIndex1 < this->nCount && nS <= nEnd);
- if (nEnd > this->nMaxAccess &&
- (this->pData[this->GetEntryCount()-1].aValue & rBitMask) == rMaskedCompare)
- nSum += rArray.GetDataEntry(rArray.GetEntryCount()-1).aValue * (nEnd -
- this->nMaxAccess);
- return nSum;
-}
-
-
-template< typename A, typename D >
-template< typename S >
-unsigned long ScBitMaskCompressedArray<A,D>::SumScaledCoupledArrayForCondition(
- A nStart, A nEnd, const D& rBitMask, const D& rMaskedCompare,
- const ScSummableCompressedArray<A,S>& rArray, double fScale ) const
-{
- unsigned long nSum = 0;
- A nS = nStart;
- size_t nIndex1 = Search( nStart);
- size_t nIndex2 = rArray.Search( nStart);
- do
- {
- if ((this->pData[nIndex1].aValue & rBitMask) == rMaskedCompare)
- {
- while (nIndex2 < rArray.GetEntryCount() &&
- rArray.GetDataEntry(nIndex2).nEnd < nS)
- ++nIndex2;
- unsigned long nNew = rArray.SumScaledValuesContinuation( nS,
- ::std::min( this->pData[nIndex1].nEnd, nEnd), nIndex2, fScale);
- nSum += nNew;
- if (nSum < nNew)
- return ::std::numeric_limits<unsigned long>::max();
- }
- nS = this->pData[nIndex1].nEnd + 1;
- ++nIndex1;
- } while (nIndex1 < this->nCount && nS <= nEnd);
- if (nEnd > this->nMaxAccess &&
- (this->pData[this->GetEntryCount()-1].aValue & rBitMask) == rMaskedCompare)
- nSum += (unsigned long)
- (rArray.GetDataEntry(rArray.GetEntryCount()-1).aValue * fScale) *
- (nEnd - this->nMaxAccess);
- return nSum;
-}
-
-
// === ScCompressedArrayIterator =============================================
template< typename A, typename D >
@@ -610,100 +541,14 @@ void ScCompressedArrayIterator<A,D>::Follow(
}
-// === ScCoupledCompressedArrayIterator ======================================
-
-template< typename A, typename D, typename S >
-ScCoupledCompressedArrayIterator<A,D,S>::ScCoupledCompressedArrayIterator(
- const ScBitMaskCompressedArray<A,D> & rArray1, A nStart, A nEnd,
- const D& rBitMaskP, const D& rMaskedCompareP,
- const ScCompressedArray<A,S> & rArray2 )
- : aIter1( rArray1, nStart, nEnd )
- , aIter2( rArray2, nStart, nEnd )
- , rBitMask( rBitMaskP )
- , rMaskedCompare( rMaskedCompareP )
-{
- InitLimits();
-}
-
-
-template< typename A, typename D, typename S >
-void ScCoupledCompressedArrayIterator<A,D,S>::InitLimits()
-{
- bool bFound = true;
- bool bMoved = false;
- while (bFound && ((*aIter1 & rBitMask) != rMaskedCompare))
- {
- bFound = aIter1.NextRange();
- bMoved = true;
- }
- if (bMoved && bFound)
- aIter2.Follow( aIter1);
-}
-
-
-template< typename A, typename D, typename S >
-void ScCoupledCompressedArrayIterator<A,D,S>::NewLimits( A nStart, A nEnd )
-{
- aIter1.NewLimits( nStart, nEnd);
- aIter2.NewLimits( nStart, nEnd);
- InitLimits();
-}
-
-
-template< typename A, typename D, typename S >
-bool ScCoupledCompressedArrayIterator<A,D,S>::NextRange()
-{
- bool bAdv;
- if (aIter1.GetRangeEnd() <= aIter2.GetRangeEnd())
- {
- // Advance bit mask array until condition is met, coupled array
- // follows.
- do
- {
- bAdv = aIter1.NextRange();
- } while (bAdv && ((*aIter1 & rBitMask) != rMaskedCompare));
- if (bAdv)
- aIter2.Follow( aIter1);
- }
- else
- {
- // Make coupled array catch up with bit mask array.
- do
- {
- bAdv = aIter2.NextRange();
- } while (bAdv && aIter2.GetRangeEnd() < aIter1.GetRangeStart());
- if (bAdv)
- aIter1.Follow( aIter2); // synchronize aIter1.nCurrent
- }
- return operator bool();
-}
-
-
-template< typename A, typename D, typename S >
-void ScCoupledCompressedArrayIterator<A,D,S>::Resync( A nPos )
-{
- aIter1.Resync( nPos);
- aIter2.Resync( nPos);
- InitLimits();
-}
-
-
// === Force instantiation of specializations ================================
template class ScCompressedArray< SCROW, USHORT>; // heights, base class
template class ScSummableCompressedArray< SCROW, USHORT>; // heights
template class ScCompressedArray< SCROW, BYTE>; // flags, base class
template class ScBitMaskCompressedArray< SCROW, BYTE>; // flags
-template unsigned long ScBitMaskCompressedArray< SCROW,
- BYTE>::SumCoupledArrayForCondition( SCROW, SCROW, const BYTE&, const BYTE&,
- const ScSummableCompressedArray< SCROW, USHORT>&) const;
-template unsigned long ScBitMaskCompressedArray< SCROW,
- BYTE>::SumScaledCoupledArrayForCondition( SCROW, SCROW, const BYTE&,
- const BYTE&, const ScSummableCompressedArray< SCROW, USHORT>&,
- double) const;
template void ScCompressedArrayIterator< SCROW, USHORT>::Follow(
const ScCompressedArrayIterator< SCROW, BYTE>&);
-template class ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT>;
// === EOF ===================================================================
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 571d7fa..c577adc 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -995,12 +995,13 @@ void XclExpXmlStream::PopStream()
maStreams.pop();
}
+/* seems unused - commenting out for now
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 )
{
@@ -1134,14 +1135,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 b75bb2c..d18c578 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 af76096..f6ef3e2 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 a973b86..d69dca3 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 c2d71e8..830b0e6 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 784c401..6c04540 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 11f253b..0de078e 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 2581295..0c0aff8 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 6117b99..af296e2 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 278d601..084a846 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 e4ad832..54992db 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 3fc31fa..17179c7 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 27151cf..4a8d1fd 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);
--
1.7.1
Context
- [Libreoffice] [PATCH] Call-catcher: removed unused functions in calc · Alfonso Eusebio
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.