[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_svtools binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Mar 1 02:45:14 PST 2012
binfilter/bf_sc/source/core/inc/ddelink.hxx | 3 -
binfilter/bf_sc/source/core/tool/sc_rechead.cxx | 31 ----------
binfilter/bf_svtools/source/memtools/tl_unqidx.cxx | 62 ---------------------
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 23 -------
binfilter/bf_svtools/source/misc/tl_tustring.cxx | 23 +++++++
binfilter/inc/bf_sc/cell.hxx | 3 -
binfilter/inc/bf_sc/chgtrack.hxx | 9 ---
binfilter/inc/bf_sc/column.hxx | 2
binfilter/inc/bf_sc/conditio.hxx | 5 -
binfilter/inc/bf_sc/dbcolect.hxx | 4 -
binfilter/inc/bf_sc/dpobject.hxx | 1
binfilter/inc/bf_sc/olinetab.hxx | 3 -
binfilter/inc/bf_sc/pivot.hxx | 2
binfilter/inc/bf_sc/rangenam.hxx | 4 -
binfilter/inc/bf_sc/rechead.hxx | 14 ----
binfilter/inc/bf_sc/validat.hxx | 2
binfilter/inc/bf_tools/string.hxx | 1
17 files changed, 23 insertions(+), 169 deletions(-)
New commits:
commit 3419df8d8ad9c2e514a19dfb681d8aaaaa5ee009
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Mar 1 09:32:12 2012 +0000
drop ScMultipleWriteHeader
diff --git a/binfilter/bf_sc/source/core/inc/ddelink.hxx b/binfilter/bf_sc/source/core/inc/ddelink.hxx
index 4c09e17..5db1af8 100644
--- a/binfilter/bf_sc/source/core/inc/ddelink.hxx
+++ b/binfilter/bf_sc/source/core/inc/ddelink.hxx
@@ -36,7 +36,6 @@ namespace binfilter {
class ScDocument;
class ScMatrix;
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
class ScDdeLink : public ::binfilter::SvBaseLink, public SfxBroadcaster
{
@@ -63,8 +62,6 @@ public:
ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& rHdr );
virtual ~ScDdeLink();
- void Store( SvStream&, ScMultipleWriteHeader& ) const {}
-
// von SvBaseLink ueberladen:
virtual void DataChanged( const String& rMimeType,
const ::com::sun::star::uno::Any & rValue );
diff --git a/binfilter/bf_sc/source/core/tool/sc_rechead.cxx b/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
index 695d22a..ce966ee 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
@@ -181,37 +181,6 @@ namespace binfilter {
/*N*/ return 0;
/*N*/ }
-// -----------------------------------------------------------------------
-
-/*N*/ ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault) :
-/*N*/ rStream( rNewStream ),
-/*N*/ aMemStream( 4096, 4096 )
-/*N*/ {
-/*N*/ nDataSize = nDefault;
-/*N*/ rStream << nDataSize;
-/*N*/
-/*N*/ nDataPos = rStream.Tell();
-/*N*/ nEntryStart = nDataPos;
-/*N*/ }
-
-/*N*/ ScMultipleWriteHeader::~ScMultipleWriteHeader()
-/*N*/ {
-/*N*/ ULONG nDataEnd = rStream.Tell();
-/*N*/
-/*N*/ rStream << (USHORT) SCID_SIZES;
-/*N*/ rStream << static_cast<sal_uInt32>(aMemStream.Tell());
-/*N*/ rStream.Write( aMemStream.GetData(), aMemStream.Tell() );
-/*N*/
-/*N*/ if ( nDataEnd - nDataPos != nDataSize ) // Default getroffen?
-/*N*/ {
-/*N*/ nDataSize = nDataEnd - nDataPos;
-/*N*/ ULONG nPos = rStream.Tell();
-/*N*/ rStream.Seek(nDataPos-sizeof(sal_uInt32));
-/*N*/ rStream << nDataSize; // Groesse am Anfang eintragen
-/*N*/ rStream.Seek(nPos);
-/*N*/ }
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx b/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
index 3356ccd..66ebdf8 100644
--- a/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
@@ -98,31 +98,6 @@ sal_uIntPtr UniqueIndex::Insert( void* p )
/*************************************************************************
|*
-|* UniqueIndex::Insert()
-|*
-*************************************************************************/
-
-sal_uIntPtr UniqueIndex::Insert( sal_uIntPtr nIndex, void* p )
-{
- // NULL-Pointer ist nicht erlaubt
- if ( !p )
- return UNIQUEINDEX_ENTRY_NOTFOUND;
-
- sal_uIntPtr nContIndex = nIndex - nStartIndex;
- // Ist Array voll, dann expandieren
- if ( nContIndex >= Container::GetSize() )
- SetSize( nContIndex + nReSize );
-
- // Object im Array speichern
- Container::Replace( p, nContIndex );
-
- // Anzahl der Eintraege erhoehen und Index zurueckgeben
- nCount++;
- return nIndex;
-}
-
-/*************************************************************************
-|*
|* UniqueIndex::Remove()
|*
*************************************************************************/
@@ -146,22 +121,6 @@ void* UniqueIndex::Remove( sal_uIntPtr nIndex )
/*************************************************************************
|*
-|* UniqueIndex::Get()
-|*
-*************************************************************************/
-
-void* UniqueIndex::Get( sal_uIntPtr nIndex ) const
-{
- // Ist Index zulaessig
- if ( (nIndex >= nStartIndex) &&
- (nIndex < (Container::GetSize()+nStartIndex)) )
- return Container::ImpGetObject( nIndex-nStartIndex );
- else
- return NULL;
-}
-
-/*************************************************************************
-|*
|* UniqueIndex::GetCurIndex()
|*
*************************************************************************/
@@ -236,27 +195,6 @@ void* UniqueIndex::Seek( sal_uIntPtr nIndex )
/*************************************************************************
|*
-|* UniqueIndex::Seek()
-|*
-*************************************************************************/
-
-void* UniqueIndex::Seek( void* p )
-{
- // Wird ein NULL-Pointer uebergeben, dann wurde Pointer nicht gefunden
- if ( !p )
- return NULL;
-
- sal_uIntPtr nIndex = GetIndex( p );
-
- // Ist Index vorhanden, dann als aktuellen Eintrag setzen
- if ( nIndex != UNIQUEINDEX_ENTRY_NOTFOUND )
- return Container::Seek( nIndex-nStartIndex );
- else
- return NULL;
-}
-
-/*************************************************************************
-|*
|* UniqueIndex::First()
|*
*************************************************************************/
diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index 64eef56..83ca2c0 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -1014,29 +1014,6 @@ xub_StrLen STRING::Search( const STRCODE* pCharStr, xub_StrLen nIndex ) const
// -----------------------------------------------------------------------
-xub_StrLen STRING::SearchBackward( STRCODE c, xub_StrLen nIndex ) const
-{
- DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
- if ( nIndex > mpData->mnLen )
- nIndex = (xub_StrLen)mpData->mnLen;
-
- const STRCODE* pStr = mpData->maStr;
- pStr += nIndex;
-
- while ( nIndex )
- {
- nIndex--;
- pStr--;
- if ( *pStr == c )
- return nIndex;
- }
-
- return STRING_NOTFOUND;
-}
-
-// -----------------------------------------------------------------------
-
xub_StrLen STRING::SearchAndReplace( const STRING& rStr, const STRING& rRepStr,
xub_StrLen nIndex )
{
diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
index 803b36e..6c6f0c3 100644
--- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
@@ -673,6 +673,29 @@ STRING& STRING::Assign( const STRCODE* pCharStr, xub_StrLen nLen )
return *this;
}
+// -----------------------------------------------------------------------
+
+xub_StrLen STRING::SearchBackward( STRCODE c, xub_StrLen nIndex ) const
+{
+ DBG_CHKTHIS( STRING, DBGCHECKSTRING );
+
+ if ( nIndex > mpData->mnLen )
+ nIndex = (xub_StrLen)mpData->mnLen;
+
+ const STRCODE* pStr = mpData->maStr;
+ pStr += nIndex;
+
+ while ( nIndex )
+ {
+ nIndex--;
+ pStr--;
+ if ( *pStr == c )
+ return nIndex;
+ }
+
+ return STRING_NOTFOUND;
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sc/cell.hxx b/binfilter/inc/bf_sc/cell.hxx
index 819dd04..6b48e7e 100644
--- a/binfilter/inc/bf_sc/cell.hxx
+++ b/binfilter/inc/bf_sc/cell.hxx
@@ -64,7 +64,6 @@ class ScTokenArray;
class ScProgress;
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
class ScBaseCell
{
@@ -285,8 +284,6 @@ public:
void GetEnglishFormula( String& rFormula, BOOL bCompileXML = FALSE ) const;
void GetEnglishFormula( ::rtl::OUStringBuffer& rBuffer, BOOL bCompileXML = FALSE ) const;
- void Save( SvStream&, ScMultipleWriteHeader& ) const {}
-
void SetDirty();
inline void SetDirtyVar() { bDirty = TRUE; }
inline void ResetTableOpDirtyVar() { bTableOpDirty = FALSE; }
diff --git a/binfilter/inc/bf_sc/chgtrack.hxx b/binfilter/inc/bf_sc/chgtrack.hxx
index 195c4ef..6c860b7 100644
--- a/binfilter/inc/bf_sc/chgtrack.hxx
+++ b/binfilter/inc/bf_sc/chgtrack.hxx
@@ -89,7 +89,6 @@ enum ScChangeActionClipMode
};
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
// --- ScChangeActionLinkEntry ---------------------------------------------
@@ -361,7 +360,6 @@ protected:
/*N*/ // used in Reject() instead of IsRejectable()
/*N*/ BOOL IsInternalRejectable() const;
/*N*/
-/*N*/ virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const {return FALSE;}
/*N*/ virtual BOOL StoreLinks( SvStream& ) const;
/*N*/ virtual BOOL LoadLinks( SvStream&, ScChangeTrack* );
/*N*/
@@ -467,8 +465,6 @@ class ScChangeActionIns : public ScChangeAction
/*N*/
/*N*/ virtual BOOL Reject( ScDocument* );
/*N*/
-/*N*/ virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const {return FALSE;}
-/*N*/
public:
ScChangeActionIns(const ULONG nActionNumber,
const ScChangeActionState eState,
@@ -570,7 +566,6 @@ class ScChangeActionDel : public ScChangeAction
/*N*/
/*N*/ virtual BOOL Reject( ScDocument* );
/*N*/
-/*N*/ virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const {return FALSE;}
/*N*/ virtual BOOL StoreLinks( SvStream& ) const;
/*N*/ virtual BOOL LoadLinks( SvStream&, ScChangeTrack* );
/*N*/
@@ -669,7 +664,6 @@ class ScChangeActionMove : public ScChangeAction
/*N*/
/*N*/ virtual BOOL Reject( ScDocument* );
/*N*/
-/*N*/ virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const {return FALSE;}
/*N*/ virtual BOOL StoreLinks( SvStream& ) const;
/*N*/ virtual BOOL LoadLinks( SvStream&, ScChangeTrack* );
/*N*/
@@ -783,7 +777,6 @@ class ScChangeActionContent : public ScChangeAction
/*N*/ void PutValueToDoc( ScBaseCell*, const String&,
/*N*/ ScDocument*, short nDx, short nDy ) const;
/*N*/
-/*N*/ virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const {return FALSE;}
/*N*/ virtual BOOL StoreLinks( SvStream& ) const;
/*N*/ virtual BOOL LoadLinks( SvStream&, ScChangeTrack* );
/*N*/
@@ -904,8 +897,6 @@ class ScChangeActionReject : public ScChangeAction
/*N*/
/*N*/ virtual BOOL Reject( ScDocument* /*p*/ ) { return FALSE; }
/*N*/
-/*N*/ virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const {return FALSE;}
-/*N*/
public:
ScChangeActionReject(const ULONG nActionNumber,
const ScChangeActionState eState,
diff --git a/binfilter/inc/bf_sc/column.hxx b/binfilter/inc/bf_sc/column.hxx
index ca9208e..9aec3ad 100644
--- a/binfilter/inc/bf_sc/column.hxx
+++ b/binfilter/inc/bf_sc/column.hxx
@@ -57,7 +57,6 @@ class ScDocument;
class ScFormulaCell;
class ScMarkData;
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
class ScPatternAttr;
class ScStyleSheet;
class ScBroadcasterList;
@@ -287,7 +286,6 @@ public:
void LoadNotes( SvStream& rStream );
BOOL Load( SvStream& rStream, ScMultipleReadHeader& rHdr );
- BOOL Save( SvStream&, ScMultipleWriteHeader& ) const {return false; }
BOOL TestTabRefAbs(USHORT nTable);
diff --git a/binfilter/inc/bf_sc/conditio.hxx b/binfilter/inc/bf_sc/conditio.hxx
index 1ad0c29..f9535c1 100644
--- a/binfilter/inc/bf_sc/conditio.hxx
+++ b/binfilter/inc/bf_sc/conditio.hxx
@@ -40,7 +40,6 @@ class ScBaseCell;
class ScFormulaCell;
class ScTokenArray;
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
class ScRangeList;
@@ -166,8 +165,6 @@ public:
void SetParent( ScConditionalFormat* pNew ) { pParent = pNew; }
- void Store(SvStream&, ScMultipleWriteHeader&) const {}
-
int operator== ( const ScCondFormatEntry& r ) const;
const String& GetStyle() const { return aStyleName; }
@@ -199,8 +196,6 @@ public:
// echte Kopie der Formeln (fuer Ref-Undo / zwischen Dokumenten)
ScConditionalFormat* Clone(ScDocument* pNewDoc = NULL) const;
- void Store(SvStream&, ScMultipleWriteHeader&) const {}
-
void AddEntry( const ScCondFormatEntry& rNew );
BOOL IsEmpty() const { return (nEntryCount == 0); }
diff --git a/binfilter/inc/bf_sc/dbcolect.hxx b/binfilter/inc/bf_sc/dbcolect.hxx
index 9f2f077..fa8ba03 100644
--- a/binfilter/inc/bf_sc/dbcolect.hxx
+++ b/binfilter/inc/bf_sc/dbcolect.hxx
@@ -41,7 +41,6 @@
namespace binfilter {
class ScDocument;
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
//------------------------------------------------------------------------
@@ -134,9 +133,6 @@ public:
ScDBData& operator= (const ScDBData& rData);
-
- BOOL Store( SvStream&, ScMultipleWriteHeader& ) const {return FALSE;}
-
const String& GetName() const { return aName; }
void GetName(String& rName) const { rName = aName; }
void SetName(const String& rName) { aName = rName; }
diff --git a/binfilter/inc/bf_sc/dpobject.hxx b/binfilter/inc/bf_sc/dpobject.hxx
index c07014f..de3c618 100644
--- a/binfilter/inc/bf_sc/dpobject.hxx
+++ b/binfilter/inc/bf_sc/dpobject.hxx
@@ -48,7 +48,6 @@ class ScDPSaveData;
class ScDPOutput;
struct ScDPPositionData;
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
class ScPivot;
class ScPivotCollection;
struct ScPivotParam;
diff --git a/binfilter/inc/bf_sc/olinetab.hxx b/binfilter/inc/bf_sc/olinetab.hxx
index 274cc16..c3050fc 100644
--- a/binfilter/inc/bf_sc/olinetab.hxx
+++ b/binfilter/inc/bf_sc/olinetab.hxx
@@ -40,8 +40,6 @@ namespace binfilter {
#define SC_OL_MAXDEPTH 7
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
-
class ScOutlineEntry : public DataObject
{
@@ -56,7 +54,6 @@ public:
ScOutlineEntry( const ScOutlineEntry& rEntry );
ScOutlineEntry( SvStream& rStream, ScMultipleReadHeader& rHdr );
- void Store( SvStream&, ScMultipleWriteHeader& ) {}
virtual DataObject* Clone() const;
USHORT GetStart() const { return nStart; }
/*N*/ USHORT GetSize() const { return nSize; }
diff --git a/binfilter/inc/bf_sc/pivot.hxx b/binfilter/inc/bf_sc/pivot.hxx
index e3e0ae6..3160daf 100644
--- a/binfilter/inc/bf_sc/pivot.hxx
+++ b/binfilter/inc/bf_sc/pivot.hxx
@@ -70,7 +70,6 @@ class SubTotal;
class ScDocument;
class ScUserListData;
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
class ScProgress;
struct PivotColRef
@@ -176,7 +175,6 @@ public:
BOOL Load(SvStream& rStream, ScMultipleReadHeader& rHdr );
- BOOL Store(SvStream&, ScMultipleWriteHeader&) const {return FALSE;}
void SetQuery(const ScQueryParam& rQuery);
void GetQuery(ScQueryParam& rQuery) const;
diff --git a/binfilter/inc/bf_sc/rangenam.hxx b/binfilter/inc/bf_sc/rangenam.hxx
index 3fa1a32..2f5403e 100644
--- a/binfilter/inc/bf_sc/rangenam.hxx
+++ b/binfilter/inc/bf_sc/rangenam.hxx
@@ -42,7 +42,6 @@ namespace binfilter {
class ScDocument;
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
@@ -102,9 +101,6 @@ public:
virtual DataObject* Clone() const;
- BOOL Store( SvStream&, ScMultipleWriteHeader& ) const {return FALSE;}
-
-
void GetName( String& rName ) const { rName = aName; }
const String& GetName( void ) const { return aName; }
ScAddress GetPos() const { return aPos; }
diff --git a/binfilter/inc/bf_sc/rechead.hxx b/binfilter/inc/bf_sc/rechead.hxx
index a417c0b..93c51f2 100644
--- a/binfilter/inc/bf_sc/rechead.hxx
+++ b/binfilter/inc/bf_sc/rechead.hxx
@@ -179,20 +179,6 @@ public:
ULONG BytesLeft() const;
};
-class ScMultipleWriteHeader
-{
-private:
- SvStream& rStream;
- SvMemoryStream aMemStream;
- ULONG nDataPos;
- sal_uInt32 nDataSize;
- ULONG nEntryStart;
-
-public:
- ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault = 0);
- ~ScMultipleWriteHeader();
-};
-
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sc/validat.hxx b/binfilter/inc/bf_sc/validat.hxx
index c0f45c2..0f39b30 100644
--- a/binfilter/inc/bf_sc/validat.hxx
+++ b/binfilter/inc/bf_sc/validat.hxx
@@ -88,8 +88,6 @@ public:
ScDocument* pDocument );
~ScValidationData();
- void Store(SvStream&, ScMultipleWriteHeader&) const {}
-
ScValidationData* Clone() const // echte Kopie
{ return new ScValidationData( GetDocument(), *this ); }
ScValidationData* Clone(ScDocument* pNew) const
diff --git a/binfilter/inc/bf_tools/string.hxx b/binfilter/inc/bf_tools/string.hxx
index a43f04f..3a22903 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -221,7 +221,6 @@ public:
xub_StrLen Search( sal_Char c, xub_StrLen nIndex = 0 ) const;
xub_StrLen Search( const ByteString& rStr, xub_StrLen nIndex = 0 ) const;
xub_StrLen Search( const sal_Char* pCharStr, xub_StrLen nIndex = 0 ) const;
- xub_StrLen SearchBackward( sal_Char c, xub_StrLen nIndex = STRING_LEN ) const;
xub_StrLen SearchAndReplace( const ByteString& rStr, const ByteString& rRepStr,
xub_StrLen nIndex = 0 );
More information about the Libreoffice-commits
mailing list