diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-09-30 05:48:28 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-09-30 05:48:28 +0000 |
| commit | 716636d558e9cc9b910da6d127314d2b20cdf0b6 (patch) | |
| tree | d266019c3c89a0649074f3290439d74010ec618c /sc/inc | |
| parent | abda8e12d8cd23c2cd1bb870b097eddfdee38825 (diff) | |
CWS-TOOLING: integrate CWS koheicoderemoval
Diffstat (limited to 'sc/inc')
66 files changed, 350 insertions, 636 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 3f6901b2bc37..f063ee539365 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: address.hxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.17.30.3 $ * * This file is part of OpenOffice.org. * @@ -330,9 +330,6 @@ public: inline size_t hash() const; - // moved from ScTripel - /// "(1,2,3)" - String GetText() const; /// "A1" or "$A$1" or R1C1 or R[1]C[1] String GetColRowString( bool bAbsolute = FALSE, const Details& rDetails = detailsOOOa1) const; @@ -475,7 +472,6 @@ public: // The document for the maximum defined sheet number bool Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScDocument* =NULL ); void Justify(); - void ExtendOne(); void ExtendTo( const ScRange& rRange ); bool Intersects( const ScRange& ) const; // do two ranges intersect? inline bool operator==( const ScRange& r ) const; diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx index aba8f878915b..219036728869 100644 --- a/sc/inc/appoptio.hxx +++ b/sc/inc/appoptio.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: appoptio.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.32.2 $ * * This file is part of OpenOffice.org. * @@ -88,8 +88,6 @@ public: const ScAppOptions& operator= ( const ScAppOptions& rOpt ); - friend SvStream& operator>> ( SvStream& rStream, ScAppOptions& rOpt ); - friend SvStream& operator<< ( SvStream& rStream, const ScAppOptions& rOpt ); private: FieldUnit eMetric; diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index 4771d8f71b21..1f6c02c2d74f 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: attarray.hxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.32.3 $ * * This file is part of OpenOffice.org. * @@ -166,8 +166,8 @@ public: BOOL IsEmpty() const; - SCROW GetFirstEntryPos() const; - SCROW GetLastEntryPos( BOOL bIncludeBottom ) const; +//UNUSED2008-05 SCROW GetFirstEntryPos() const; +//UNUSED2008-05 SCROW GetLastEntryPos( BOOL bIncludeBottom ) const; BOOL GetFirstVisibleAttr( SCROW& rFirstRow ) const; BOOL GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const; @@ -188,9 +188,7 @@ public: void DeleteHardAttr( SCROW nStartRow, SCROW nEndRow ); - void Save( SvStream& rStream ) const; - void Load( SvStream& rStream ); - void ConvertFontsAfterLoad(); // old binary file format +//UNUSED2008-05 void ConvertFontsAfterLoad(); // old binary file format }; diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index a129a30ff15a..ed8c9719272b 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: attrib.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.32.3 $ * * This file is part of OpenOffice.org. * @@ -74,7 +74,6 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual SvStream& Store( SvStream& rStream, USHORT nVer ) const; SCsCOL GetColMerge() const {return nColMerge; } SCsROW GetRowMerge() const {return nRowMerge; } @@ -136,7 +135,6 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual SvStream& Store( SvStream& rStream, USHORT nVer ) const; virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); @@ -188,9 +186,6 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store( SvStream& rStream, USHORT nVer ) const; const ScRange& GetRange() const { return aRange; } void SetRange( const ScRange& rNew ) { aRange = rNew; } @@ -235,7 +230,7 @@ public: inline ScTableListItem( const USHORT nWhich ); ScTableListItem( const ScTableListItem& rCpy ); - ScTableListItem( const USHORT nWhich, const List& rList ); +//UNUSED2008-05 ScTableListItem( const USHORT nWhich, const List& rList ); ~ScTableListItem(); ScTableListItem& operator=( const ScTableListItem &rCpy ); @@ -248,8 +243,6 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store( SvStream& rStream, USHORT nVer ) const; BOOL GetTableList( List& aList ) const; void SetTableList( const List& aList ); @@ -287,9 +280,6 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual SvStream& Store( SvStream& rStream, USHORT nVer ) const; - - virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); @@ -347,7 +337,6 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual SvStream& Store( SvStream& rStream, USHORT nVer ) const; double GetValue() const { return nValue; } diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index fa52d778bb40..d5feb4840837 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: autoform.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.32.3 $ * * This file is part of OpenOffice.org. * @@ -245,7 +245,6 @@ public: void CopyItem( USHORT nToIndex, USHORT nFromIndex, USHORT nWhich ); const ScNumFormatAbbrev& GetNumFormat( USHORT nIndex ) const; - void SetNumFormat( USHORT nIndex, const ScNumFormatAbbrev& rNumFormat ); BOOL IsEqualData( USHORT nIndex1, USHORT nIndex2 ) const; diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx index 4fec95645953..9d1f1a20a91c 100644 --- a/sc/inc/callform.hxx +++ b/sc/inc/callform.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: callform.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.32.1 $ * * This file is part of OpenOffice.org. * @@ -98,7 +98,6 @@ public: ParamType GetReturnType() const { return eParamType[0]; } ParamType GetAsyncType() const { return eAsyncType; } BOOL Call(void** ppParam); - BOOL Advice(AdvData pfCallback); BOOL Unadvice(double nHandle); // Name und Beschreibung des Parameters nParam. diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx index 59d551ec5496..810288b56600 100644 --- a/sc/inc/cell.hxx +++ b/sc/inc/cell.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cell.hxx,v $ - * $Revision: 1.30 $ + * $Revision: 1.29.32.5 $ * * This file is part of OpenOffice.org. * @@ -99,8 +99,6 @@ public: inline void ForgetBroadcaster(); inline void SwapBroadcaster(ScBaseCell& rOther); // zum Sortieren - void LoadNote( SvStream& rStream, ScDocument* pDoc ); - // String- oder EditCell static ScBaseCell* CreateTextCell( const String& rString, ScDocument* ); @@ -139,13 +137,10 @@ public: ScValueCell(); ScValueCell( const double& rValue ); ScValueCell( const ScValueCell& rScValueCell, ScDocument* pDoc ); - ScValueCell( SvStream& rStream, USHORT nVer ); ScBaseCell* Clone(ScDocument* pDoc) const; void SetValue( const double& rValue ); double GetValue() const; - - void Save( SvStream& rStream ) const; }; @@ -166,15 +161,10 @@ public: ScStringCell(); ScStringCell( const String& rString ); ScStringCell( const ScStringCell& rScStringCell, ScDocument* pDoc ); - ScStringCell( SvStream& rStream, USHORT nVer ); ScBaseCell* Clone(ScDocument* pDoc) const; void SetString( const String& rString ); void GetString( String& rString ) const; - - void Save( SvStream& rStream, FontToSubsFontConverter hConv = 0 ) const; - // convert symbol font after loading binary format - void ConvertFont( FontToSubsFontConverter hConv ); }; @@ -200,11 +190,9 @@ public: ~ScEditCell(); // wegen pData immer! - ScEditCell( ScDocument* ); ScEditCell( const EditTextObject* pObject, ScDocument*, const SfxItemPool* pFromPool /* = NULL */ ); ScEditCell( const ScEditCell& rEditCell, ScDocument* ); - ScEditCell( SvStream& rStream, USHORT nVer, ScDocument* ); // fuer Zeilenumbrueche ScEditCell( const String& rString, ScDocument* ); ScBaseCell* Clone( ScDocument* ) const; @@ -215,8 +203,6 @@ public: void GetString( String& rString ) const; const EditTextObject* GetData() const { return pData; } - - void Save( SvStream& rStream ) const; }; enum ScMatrixMode { @@ -324,7 +310,6 @@ public: BOOL HasOneReference( ScRange& r ) const; BOOL HasRelNameReference() const; - BOOL HasDBArea() const; BOOL HasColRowName() const; void UpdateReference(UpdateRefMode eUpdateRefMode, @@ -449,10 +434,7 @@ public: ScNoteCell(); ScNoteCell( const ScPostIt& rNote ); ScNoteCell( const ScNoteCell& rScNoteCell, ScDocument* pDoc ); - ScNoteCell( SvStream& rStream, USHORT nVer ); ScBaseCell* Clone(ScDocument* pDoc) const; - - void Save( SvStream& rStream ) const; }; diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index 63d602529bf0..0cce265866c2 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: chartarr.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.4 $ * * This file is part of OpenOffice.org. * @@ -90,7 +90,6 @@ public: ScChartArray( ScDocument* pDoc, const ScRangeListRef& rRangeList, const String& rChartName ); ScChartArray( const ScChartArray& rArr ); - ScChartArray( ScDocument* pDoc, SvStream& rStream, ScMultipleReadHeader& rHdr ); virtual ~ScChartArray(); virtual DataObject* Clone() const; @@ -98,8 +97,6 @@ public: const ScRangeListRef& GetRangeList() const { return aPositioner.GetRangeList(); } void SetRangeList( const ScRangeListRef& rNew ) { aPositioner.SetRangeList(rNew); } void SetRangeList( const ScRange& rNew ) { aPositioner.SetRangeList(rNew); } - void AddToRangeList( const ScRange& rRange ) { aPositioner.AddToRangeList(rRange); } - void AddToRangeList( const ScRangeListRef& rAdd ) { aPositioner.AddToRangeList(rAdd); } const ScChartPositionMap* GetPositionMap() { return aPositioner.GetPositionMap(); } void SetHeaders(BOOL bCol, BOOL bRow) { aPositioner.SetHeaders(bCol, bRow); } @@ -109,8 +106,6 @@ public: void SetName(const String& rNew) { aName = rNew; } const String& GetName() const { return aName; } - BOOL IsAtCursor(const ScAddress& rPos) const { return aPositioner.IsAtCursor(rPos); } - BOOL operator==(const ScChartArray& rCmp) const; ScMemChart* CreateMemChart(); @@ -128,8 +123,6 @@ public: { return (ScChartArray*)At(nIndex); } BOOL operator==(const ScChartCollection& rCmp) const; - - BOOL Load( ScDocument* pDoc, SvStream& rStream ); }; diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index 4c71eb6ff04a..b3b6e8763eb1 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: chartpos.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.32.2 $ * * This file is part of OpenOffice.org. * @@ -135,7 +135,6 @@ private: void CreatePositionMap(); public: - ScChartPositioner( ScDocument* pDoc ); ScChartPositioner( ScDocument* pDoc, SCTAB nTab, SCCOL nStartColP, SCROW nStartRowP, SCCOL nEndColP, SCROW nEndRowP ); @@ -144,13 +143,9 @@ public: virtual ~ScChartPositioner(); - String ReadStream( SvStream& rStream, ScMultipleReadHeader& rHdr ); - const ScRangeListRef& GetRangeList() const { return aRangeListRef; } void SetRangeList( const ScRangeListRef& rNew ) { aRangeListRef = rNew; } void SetRangeList( const ScRange& rNew ); - void AddToRangeList( const ScRange& rRange ); - void AddToRangeList( const ScRangeListRef& rAdd ); void SetHeaders(BOOL bCol, BOOL bRow) { bColHeaders=bCol; bRowHeaders=bRow; } BOOL HasColHeaders() const { return bColHeaders; } @@ -160,8 +155,6 @@ public: void SetStartCol(SCCOL nNew) { nStartCol = nNew; } void SetStartRow(SCROW nNew) { nStartRow = nNew; } - BOOL IsAtCursor(const ScAddress& rPos) const; - BOOL operator==(const ScChartPositioner& rCmp) const; void InvalidateGlue() diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 4e775afe8f34..f455954389c8 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: chgtrack.hxx,v $ - * $Revision: 1.31 $ + * $Revision: 1.31.32.4 $ * * This file is part of OpenOffice.org. * @@ -320,10 +320,7 @@ protected: pLnk->SetLink( pL ); return pLnk; } - void RemoveLink( ScChangeAction* p ); void RemoveAllAnyLinks(); - // zeigt ein AnyLink auf p? - BOOL DependsOn( ScChangeAction* p ) const; virtual ScChangeActionLinkEntry* GetDeletedIn() const { return pLinkDeletedIn; } @@ -343,7 +340,6 @@ protected: return new ScChangeActionLinkEntry( &pLinkDeleted, p ); } - BOOL RemoveDeleted( const ScChangeAction* p ); void RemoveAllDeleted(); ScChangeActionLinkEntry* AddDependent( ScChangeAction* p ) @@ -351,7 +347,6 @@ protected: return new ScChangeActionLinkEntry( &pLinkDependent, p ); } - void RemoveDependent( ScChangeAction* p ); void RemoveAllDependent(); void RemoveAllLinks(); @@ -611,7 +606,6 @@ class ScChangeActionDel : public ScChangeAction virtual const ScChangeTrack* GetChangeTrack() const { return pTrack; } - virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const; virtual BOOL StoreLinks( SvStream& ) const; virtual BOOL LoadLinks( SvStream&, ScChangeTrack* ); @@ -1168,12 +1162,6 @@ class ScChangeTrack : public SfxListener // Content on top an Position ScChangeActionContent* SearchContentAt( const ScBigAddress&, ScChangeAction* pButNotThis ) const; - // das gleiche fuer generierte Del-Eintraege, - // wobei der Content nicht in der angegebenen - // Richtung geloescht sein darf - ScChangeActionContent* SearchGeneratedDelContentAt( - const ScBigAddress&, - ScChangeActionType eNotInDelType ) const; void DeleteGeneratedDelContent( ScChangeActionContent* ); ScChangeActionContent* GenerateDelContent( const ScAddress&, diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index 2cb372381b1e..7a3c0e3986bf 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: chgviset.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.2 $ * * This file is part of OpenOffice.org. * @@ -134,10 +134,6 @@ public: BOOL IsShowRejected() const { return bShowRejected; } void SetShowRejected( BOOL bVal ) { bShowRejected = bVal; } - - void Load( SvStream& rStream, USHORT nVer ); - void Store( SvStream& rStream ) const; - ScChangeViewSettings& operator= ( const ScChangeViewSettings& r ); /// Adjust dates according to selected DateMode diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx index 3b53e09a31f9..c5f3d68813ca 100644 --- a/sc/inc/collect.hxx +++ b/sc/inc/collect.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: collect.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.4 $ * * This file is part of OpenOffice.org. * @@ -161,8 +161,8 @@ public: nValue(nVal), nStrType(nType) {} - TypedStrData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, - BOOL bAllStrings ); +//UNUSED2008-05 TypedStrData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, +//UNUSED2008-05 BOOL bAllStrings ); TypedStrData( const TypedStrData& rCpy ) : DataObject(), @@ -178,7 +178,9 @@ public: private: friend class TypedStrCollection; +#if OLD_PIVOT_IMPLEMENTATION friend class PivotStrCollection; +#endif String aStrValue; double nValue; diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 650b0e0ce9c1..f43193c23313 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: column.hxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.21.32.4 $ * * This file is part of OpenOffice.org. * @@ -143,7 +143,6 @@ public: void DeleteAtIndex( SCSIZE nIndex ); void FreeAll(); void Resize( SCSIZE nSize ); - void SetNewRow( SCROW nRow1, SCROW nRow2 ); void SwapRow( SCROW nRow1, SCROW nRow2 ); void SwapCell( SCROW nRow, ScColumn& rCol); @@ -179,12 +178,6 @@ public: USHORT GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; BOOL HasSelectionMatrixFragment(const ScMarkData& rMark) const; - // Daten oder Attribute: - SCROW GetFirstEntryPos() const; - SCROW GetLastEntryPos() const; - - // nur Attribute: - SCROW GetLastAttrPos() const; BOOL GetFirstVisibleAttr( SCROW& rFirstRow ) const; BOOL GetLastVisibleAttr( SCROW& rLastRow ) const; BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; @@ -379,16 +372,8 @@ public: void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedStrCollection& rStrings); BOOL GetDataEntries(SCROW nRow, TypedStrCollection& rStrings, BOOL bLimit); - SCROW NoteCount( SCROW nMaxRow = MAXROW ) const; - - void LoadData( SvStream& rStream ); - void SaveData( SvStream& rStream ) const; - - void LoadNotes( SvStream& rStream ); - void SaveNotes( SvStream& rStream ) const; +//UNUSED2008-05 SCROW NoteCount( SCROW nMaxRow = MAXROW ) const; - BOOL Load( SvStream& rStream, ScMultipleReadHeader& rHdr ); - BOOL Save( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const; void UpdateInsertTabAbs(SCTAB nNewPos); BOOL TestTabRefAbs(SCTAB nTable); BOOL GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData) const; @@ -414,7 +399,7 @@ public: private: ScBaseCell* CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument* pDestDoc, const ScAddress& rDestPos); - void CorrectSymbolCells( CharSet eStreamCharSet ); +//UNUSED2008-05 void CorrectSymbolCells( CharSet eStreamCharSet ); }; diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index b1bd35bc8199..81f5c606c9be 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: compiler.hxx,v $ - * $Revision: 1.40 $ + * $Revision: 1.36.30.4 $ * * This file is part of OpenOffice.org. * @@ -178,13 +178,13 @@ public: void SetSingleReference( const SingleRefData& rRef ); void SetDoubleReference( const ComplRefData& rRef ); void SetDouble( double fVal ); - void SetInt( int nVal ); +//UNUSED2008-05 void SetInt( int nVal ); +//UNUSED2008-05 void SetMatrix( ScMatrix* p ); +//UNUSED2008-05 // These methods are ok to use, reference count not cleared. +//UNUSED2008-05 ComplRefData& GetReference(); +//UNUSED2008-05 void SetReference( ComplRefData& rRef ); void SetName( USHORT n ); - void SetMatrix( ScMatrix* p ); void SetExternal(const sal_Unicode* pStr); - // These methods are ok to use, reference count not cleared. - ComplRefData& GetReference(); - void SetReference( ComplRefData& rRef ); ScRawToken* Clone() const; // real copy! ScToken* CreateToken() const; // create typified token @@ -452,7 +452,6 @@ private: BOOL IsColRowName( const String& ); BOOL IsBoolean( const String& ); void AutoCorrectParsedSymbol(); - void AdjustReference( SingleRefData& r ); void PushTokenArray( ScTokenArray*, BOOL = FALSE ); void PopTokenArray(); void SetRelNameReference(); diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx index 28fb65f8868b..15487e0811e8 100644 --- a/sc/inc/compressedarray.hxx +++ b/sc/inc/compressedarray.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: compressedarray.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.2 $ * * This file is part of OpenOffice.org. * @@ -102,10 +102,6 @@ public: not decremented and the value of the first entry is returned again. */ const D& GetPrevValue( size_t& nIndex, A& nStart ) const; - /** Fill an array with consecutive data between nStart and nEnd. Caller - must assure that all elements fit into the array. */ - void FillDataArray( A nStart, A nEnd, D * pArray ) const; - /** Return the last row where an entry meets the condition: (aValue != rCompare). If no entry meets this condition ::std::numeric_limits<A>::max() is returned. */ diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index ffa34c35da59..a35426090f8f 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: conditio.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.32.4 $ * * This file is part of OpenOffice.org. * @@ -106,11 +106,6 @@ class ScConditionEntry BOOL IsValid( double nArg ) const; BOOL IsValidStr( const String& rArg ) const; -protected: - ScConditionEntry( SvStream& rStream, ScMultipleReadHeader& rHdr, - ScDocument* pDocument ); - void StoreCondition(SvStream& rStream, ScMultipleWriteHeader& rHdr) const; - public: ScConditionEntry( ScConditionMode eOper, const String& rExpr1, const String& rExpr2, @@ -183,14 +178,10 @@ public: const String& rStyle ); ScCondFormatEntry( const ScCondFormatEntry& r ); ScCondFormatEntry( ScDocument* pDocument, const ScCondFormatEntry& r ); - ScCondFormatEntry( SvStream& rStream, ScMultipleReadHeader& rHdr, - ScDocument* pDocument ); virtual ~ScCondFormatEntry(); void SetParent( ScConditionalFormat* pNew ) { pParent = pNew; } - void Store(SvStream& rStream, ScMultipleWriteHeader& rHdr) const; - int operator== ( const ScCondFormatEntry& r ) const; const String& GetStyle() const { return aStyleName; } @@ -215,15 +206,11 @@ class ScConditionalFormat public: ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument); ScConditionalFormat(const ScConditionalFormat& r); - ScConditionalFormat(SvStream& rStream, ScMultipleReadHeader& rHdr, - ScDocument* pDocument); ~ScConditionalFormat(); // echte Kopie der Formeln (fuer Ref-Undo / zwischen Dokumenten) ScConditionalFormat* Clone(ScDocument* pNewDoc = NULL) const; - void Store(SvStream& rStream, ScMultipleWriteHeader& rHdr) const; - void AddEntry( const ScCondFormatEntry& rNew ); BOOL IsEmpty() const { return (nEntryCount == 0); } @@ -280,9 +267,7 @@ public: ScConditionalFormat* GetFormat( sal_uInt32 nKey ); - void Load( SvStream& rStream, ScDocument* pDocument ); - void Store( SvStream& rStream ) const; - void ResetUsed(); +//UNUSED2008-05 void ResetUsed(); void CompileAll(); void CompileXML(); diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index 31cedfc0b111..8fe665ae6130 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dapiuno.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.10.30.2 $ * * This file is part of OpenOffice.org. * @@ -69,7 +69,9 @@ namespace com { namespace sun { namespace star { namespace sheet { }}}} class ScDocShell; +#if OLD_PIVOT_IMPLEMENTATION class ScPivot; +#endif class ScDPSaveDimension; class ScDPSaveGroupDimension; class ScDPSaveNumGroupDimension; diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 313c9f0171ad..405d49e2a6b2 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: datauno.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.32.1 $ * * This file is part of OpenOffice.org. * @@ -502,10 +502,6 @@ public: // nField[] hier innerhalb des Bereichs: void GetQueryParam(ScQueryParam& rQueryParam) const; void SetQueryParam(const ScQueryParam& rQueryParam); - void GetSortParam(ScSortParam& rSortParam) const; - void SetSortParam(const ScSortParam& rSortParam); - void GetImportParam(ScImportParam& rImportParam) const; - void SetImportParam(const ScImportParam& rImportParam); void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const; void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx index b283c44a8799..0b3f965ebc96 100644 --- a/sc/inc/dbcolect.hxx +++ b/sc/inc/dbcolect.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbcolect.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.32.5 $ * * This file is part of OpenOffice.org. * @@ -129,7 +129,6 @@ public: SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, BOOL bByR = TRUE, BOOL bHasH = TRUE); ScDBData(const ScDBData& rData); - ScDBData( SvStream& rStream, ScMultipleReadHeader& rHdr ); ~ScDBData(); virtual DataObject* Clone() const; @@ -138,8 +137,6 @@ public: BOOL operator== (const ScDBData& rData) const; - BOOL Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const; - const String& GetName() const { return aName; } void GetName(String& rName) const { rName = aName; } void SetName(const String& rName) { aName = rName; } @@ -160,7 +157,7 @@ public: BOOL IsStripData() const { return bStripData; } void SetStripData(BOOL bSet) { bStripData = bSet; } - BOOL IsBeyond(SCROW nMaxRow) const; +//UNUSED2008-05 BOOL IsBeyond(SCROW nMaxRow) const; String GetSourceString() const; String GetOperations() const; @@ -182,8 +179,6 @@ public: BOOL IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; BOOL IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; - String GetTargetName(const String& rDocName) const; - BOOL HasImportParam() const { return bDBImport; } BOOL HasQueryParam() const { return bDoQuery[0]; } BOOL HasSortParam() const { return bDoSort[0]; } @@ -228,9 +223,6 @@ public: ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; - BOOL Load( SvStream& rStream ); - BOOL Store( SvStream& rStream ) const; - BOOL SearchName( const String& rName, USHORT& rIndex ) const; void DeleteOnTab( SCTAB nTab ); diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index a99cdf24d893..06beb91790f1 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: detdata.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.2 $ * * This file is part of OpenOffice.org. * @@ -101,9 +101,6 @@ public: void Append( ScDetOpData* pData ); - void Load( SvStream& rStream ); - void Store( SvStream& rStream ) const; - BOOL HasAddError() const { return bHasAddError; } }; diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index ec53cb863d8c..12d47638b9ae 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dociter.hxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.32.2 $ * * This file is part of OpenOffice.org. * @@ -105,10 +105,11 @@ private: BOOL GetThis(double& rValue, USHORT& rErr); public: - ScValueIterator(ScDocument* pDocument, - SCCOL nSCol, SCROW nSRow, SCTAB nSTab, - SCCOL nECol, SCROW nERow, SCTAB nETab, - BOOL bSTotal = FALSE, BOOL bTextAsZero = FALSE); +//UNUSED2008-05 ScValueIterator(ScDocument* pDocument, +//UNUSED2008-05 SCCOL nSCol, SCROW nSRow, SCTAB nSTab, +//UNUSED2008-05 SCCOL nECol, SCROW nERow, SCTAB nETab, +//UNUSED2008-05 BOOL bSTotal = FALSE, BOOL bTextAsZero = FALSE); + ScValueIterator(ScDocument* pDocument, const ScRange& rRange, BOOL bSTotal = FALSE, BOOL bTextAsZero = FALSE ); diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 6a90e4c5e7c3..e161e3e02428 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docoptio.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.4 $ * * This file is part of OpenOffice.org. * @@ -83,8 +83,6 @@ public: void ResetDocOptions(); inline void CopyTo(ScDocOptions& rOpt); - void Load(SvStream& rStream); - void Save(SvStream& rStream, BOOL bConfig = FALSE) const; inline const ScDocOptions& operator=( const ScDocOptions& rOpt ); inline int operator==( const ScDocOptions& rOpt ) const; @@ -178,7 +176,7 @@ class SC_DLLPUBLIC ScTpCalcItem : public SfxPoolItem { public: TYPEINFO(); - ScTpCalcItem( USHORT nWhich ); +//UNUSED2008-05 ScTpCalcItem( USHORT nWhich ); ScTpCalcItem( USHORT nWhich, const ScDocOptions& rOpt ); ScTpCalcItem( const ScTpCalcItem& rItem ); diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index c96c86365d8e..64bfa3ad3ddc 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docpool.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.32.1 $ * * This file is part of OpenOffice.org. * @@ -62,7 +62,6 @@ public: virtual const SfxPoolItem& Put( const SfxPoolItem&, USHORT nWhich = 0 ); virtual void Remove( const SfxPoolItem& ); static void CheckRef( const SfxPoolItem& ); - void MyLoadCompleted(); void StyleDeleted( ScStyleSheet* pStyle ); // Loeschen von Vorlagen im Organizer virtual SfxItemPresentation GetPresentation( diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 8dd4c2a3df36..60f3d8e8033a 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: document.hxx,v $ - * $Revision: 1.115 $ + * $Revision: 1.111.20.7 $ * * This file is part of OpenOffice.org. * @@ -96,8 +96,10 @@ class ScFormulaCell; class ScMarkData; class ScOutlineTable; class ScPatternAttr; +#if OLD_PIVOT_IMPLEMENTATION class ScPivot; class ScPivotCollection; +#endif class ScPrintRangeSaver; class ScRangeData; class ScRangeName; @@ -119,7 +121,6 @@ class ScDPCollection; class ScMatrix; class ScScriptTypeData; class ScPoolHelper; -class ScImpExpLogMsg; struct ScSortParam; class ScRefreshTimerControl; class ScUnoListenerCalls; @@ -229,7 +230,9 @@ friend class ScHorizontalCellIterator; friend class ScHorizontalAttrIterator; friend class ScDocAttrIterator; friend class ScAttrRectIterator; +#if OLD_PIVOT_IMPLEMENTATION friend class ScPivot; +#endif private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager; @@ -250,7 +253,9 @@ private: ScTable* pTab[MAXTABCOUNT]; ScRangeName* pRangeName; ScDBCollection* pDBCollection; +#if OLD_PIVOT_IMPLEMENTATION ScPivotCollection* pPivotCollection; +#endif ScDPCollection* pDPCollection; ScChartCollection* pChartCollection; std::auto_ptr< ScTemporaryChartLock > apTemporaryChartLock; @@ -286,8 +291,6 @@ private: ScExtDocOptions* pExtDocOptions; // fuer Import etc. ScConsolidateParam* pConsolidateDlgData; - List* pLoadedSymbolStringCellList; // binary file format import of symbol font string cells - ScRecursionHelper* pRecursionHelper; // information for recursive and iterative cell formulas ScAutoNameCache* pAutoNameCache; // for automatic name lookup during CompileXML @@ -372,8 +375,6 @@ private: BOOL bChartListenerCollectionNeedsUpdate; // ob RC_FORCED Formelzellen im Dokument sind/waren (einmal an immer an) BOOL bHasForcedFormulas; - // ist beim Laden/Speichern etwas weggelassen worden? - BOOL bLostData; // ob das Doc gerade zerstoert wird (kein Notify-Tracking etc. mehr) BOOL bInDtorClear; // ob bei Spalte/Zeile einfuegen am Rand einer Referenz die Referenz @@ -435,7 +436,6 @@ public: XColorTable* GetColorTable(); SvxLinkManager* GetLinkManager() { return pLinkManager; } - void SetLinkManager( SvxLinkManager* pNew ); const ScDocOptions& GetDocOptions() const; void SetDocOptions( const ScDocOptions& rOpt ); @@ -476,20 +476,19 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; BOOL bStartOnly = FALSE) const; ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; - ScRangeData* GetRangeAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, - BOOL bStartOnly = FALSE) const; +//UNUSED2008-05 ScRangeData* GetRangeAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, +//UNUSED2008-05 BOOL bStartOnly = FALSE) const; ScRangeData* GetRangeAtBlock( const ScRange& rBlock, String* pName=NULL ) const; ScDPCollection* GetDPCollection(); ScDPObject* GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; ScDPObject* GetDPAtBlock( const ScRange& rBlock ) const; - +#if OLD_PIVOT_IMPLEMENTATION ScPivotCollection* GetPivotCollection() const; void SetPivotCollection(ScPivotCollection* pNewPivotCollection); ScPivot* GetPivotAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; - +#endif ScChartCollection* GetChartCollection() const; - void SetChartCollection(ScChartCollection* pNewChartCollection); void StopTemporaryChartLock(); @@ -538,18 +537,8 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; BOOL IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL IsSelectedBlockEditable( SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow, - const ScMarkData& rMark ) const; BOOL IsSelectionEditable( const ScMarkData& rMark, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL IsSelectionOrBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow, - const ScMarkData& rMark ) const; - BOOL IsSelectedOrBlockEditable( SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow, - const ScMarkData& rMark ) const; - BOOL HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ) const; @@ -580,7 +569,6 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; BOOL bInsertNew = TRUE, BOOL bResultsOnly = FALSE ); void TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos); - void ClearDrawPage(SCTAB nTab); void SetVisible( SCTAB nTab, BOOL bVisible ); BOOL IsVisible( SCTAB nTab ) const; void SetLayoutRTL( SCTAB nTab, BOOL bRTL ); @@ -697,7 +685,6 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; BOOL HasControl( SCTAB nTab, const Rectangle& rMMRect ); void InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle& rMMRect ); - void StopAnimations( SCTAB nTab, Window* pWin ); void StartAnimations( SCTAB nTab, Window* pWin ); BOOL HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ); @@ -759,13 +746,12 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; void GetCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ) const; ScBaseCell* GetCell( const ScAddress& rPos ) const; - void RefreshNoteFlags(); +//UNUSED2008-05 void RefreshNoteFlags(); BOOL HasNoteObject( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; BOOL HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ); SC_DLLPUBLIC BOOL HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; BOOL HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - USHORT GetErrorData(SCCOL nCol, SCROW nRow, SCTAB nTab) const; BOOL HasStringCells( const ScRange& rRange ) const; /** Returns true, if there is any data to create a selection list for rPos. */ @@ -801,7 +787,6 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; ScRange* pLastRange = NULL, Rectangle* pLastMM = NULL ) const; - BOOL IsOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; BOOL IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; BOOL IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; @@ -809,8 +794,6 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; SCCOL nCol2, SCROW nRow2, SCTAB nTab2, USHORT nMask ); BOOL HasAttrib( const ScRange& rRange, USHORT nMask ); - BOOL HasLines( const ScRange& rRange, Rectangle& rSizes ) const; - void GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab, const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, @@ -821,7 +804,6 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; void SetDirty(); void SetDirty( const ScRange& ); - void SetDirtyVar(); void SetTableOpDirty( const ScRange& ); // for Interpreter TableOp void CalcAll(); void CalcAfterLoad(); @@ -854,7 +836,6 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; // if CalcFormulaTree() is currently running BOOL IsCalculatingFormulaTree() { return bCalculatingFormulaTree; } - void GetErrCode( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT& rErrCode ); USHORT GetErrCode( const ScAddress& ) const; void GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, @@ -944,7 +925,6 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; void DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark ); void DeleteObjectsInSelection( const ScMarkData& rMark ); - void DeleteObjects( SCTAB nTab ); void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, USHORT nDelFlag); @@ -1099,10 +1079,8 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges ); void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, SCTAB nTab ); void ConditionalChanged( ULONG nKey ); - void SetConditionalUsed( ULONG nKey ); // beim Speichern ULONG AddValidationEntry( const ScValidationData& rNew ); - void SetValidationUsed( ULONG nKey ); // beim Speichern const ScValidationData* GetValidationEntry( ULONG nIndex ) const; @@ -1150,14 +1128,9 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; - // Rueckgabe TRUE bei ApplyFlags: Wert geaendert - BOOL ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - const ScMarkData& rMark, INT16 nFlags ); BOOL ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, INT16 nFlags ); - BOOL RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, - const ScMarkData& rMark, INT16 nFlags ); BOOL RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, INT16 nFlags ); @@ -1262,8 +1235,6 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; const ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArray( SCTAB nTab ) const; ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArrayModifiable( SCTAB nTab ); - /// @return the index of the last column with any set flags (auto-pagebreak is ignored). - SCCOL GetLastFlaggedCol( SCTAB nTab ) const; /// @return the index of the last row with any set flags (auto-pagebreak is ignored). SCROW GetLastFlaggedRow( SCTAB nTab ) const; @@ -1303,7 +1274,6 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; Size GetPageSize( SCTAB nTab ) const; void SetPageSize( SCTAB nTab, const Size& rSize ); void SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); - void UpdatePageBreaks(); void UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL ); void RemoveManualBreaks( SCTAB nTab ); BOOL HasManualBreaks( SCTAB nTab ) const; @@ -1344,12 +1314,6 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); ScRange GetRange( SCTAB nTab, const Rectangle& rMMRect ); - BOOL LoadPool( SvStream& rStream, BOOL bLoadRefCounts ); - BOOL SavePool( SvStream& rStream ) const; - - BOOL Load( SvStream& rStream, ScProgress* pProgress ); - BOOL Save( SvStream& rStream, ScProgress* pProgress ) const; - void UpdStlShtPtrsFrmNms(); void StylesToNames(); @@ -1359,9 +1323,6 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; ULONG GetSrcVersion() const { return nSrcVer; } SCROW GetSrcMaxRow() const { return nSrcMaxRow; } - void SetLostData(); - BOOL HasLostData() const { return bLostData; } - void SetSrcCharSet( CharSet eNew ) { eSrcSet = eNew; } void UpdateFontCharSet(); @@ -1439,7 +1400,6 @@ SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const; BOOL GetHasMacroFunc() const { return bHasMacroFunc; } void SetHasMacroFunc(BOOL bSet) { bHasMacroFunc = bSet; } - BOOL HasMacroCallsAfterLoad(); BOOL CheckMacroWarn(); void SetRangeOverflowType(sal_uInt32 nType) { nRangeOverflowType = nType; } @@ -1495,7 +1455,7 @@ SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const; private: - void SetAutoFilterFlags(); +//UNUSED2008-05 void SetAutoFilterFlags(); void FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ) const; @@ -1683,19 +1643,11 @@ public: ScNoteEditEngine& GetNoteEngine(); SfxItemPool& GetNoteItemPool(); - void AddToImpExpLog( const ScImpExpLogMsg& rMsg ); - void AddToImpExpLog( ScImpExpLogMsg* pMsg ); - ScRefreshTimerControl* GetRefreshTimerControl() const { return pRefreshTimerControl; } ScRefreshTimerControl * const * GetRefreshTimerControlAddress() const { return &pRefreshTimerControl; } - /// if symbol string cells of old binary file format are in list - BOOL SymbolStringCellsPending() const; - /// get list of ScSymbolStringCellEntry, create if necessary - List& GetLoadedSymbolStringCellsList(); - void SetPastingDrawFromOtherDoc( BOOL bVal ) { bPastingDrawFromOtherDoc = bVal; } BOOL PastingDrawFromOtherDoc() const @@ -1715,10 +1667,7 @@ public: { return eStorageGrammar; } private: // CLOOK-Impl-Methoden - void ImplLoadDocOptions( SvStream& rStream ); - void ImplLoadViewOptions( SvStream& rStream ); - void ImplSaveDocOptions( SvStream& rStream ) const; - void ImplSaveViewOptions( SvStream& rStream ) const; + void ImplCreateOptions(); // bei Gelegenheit auf on-demand umstellen? void ImplDeleteOptions(); @@ -1735,8 +1684,6 @@ private: // CLOOK-Impl-Methoden void LoadDdeLinks(SvStream& rStream); void SaveDdeLinks(SvStream& rStream) const; - void LoadAreaLinks(SvStream& rStream); - void SaveAreaLinks(SvStream& rStream) const; void DeleteAreaLinksOnTab( SCTAB nTab ); void UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode, diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 73cb9949c9f5..05a46d53c22f 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docuno.hxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.27.32.2 $ * * This file is part of OpenOffice.org. * @@ -116,10 +116,7 @@ public: ScDocument* GetDocument() const; SfxObjectShell* GetEmbeddedObject() const; - BOOL IsEmbedded() const; - double GetOutputFactor() const; - BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ); void UpdateAllRowHeights(); ScDrawLayer* MakeDrawLayer(); @@ -658,7 +655,7 @@ private: ScDocShell* pDocShell; public: - ScSpreadsheetSettingsObj(ScDocShell* pDocSh); +//UNUSED2008-05 ScSpreadsheetSettingsObj(ScDocShell* pDocSh); virtual ~ScSpreadsheetSettingsObj(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 0e5dcff76052..e04d4a7750ed 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dpobject.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.14.30.5 $ * * This file is part of OpenOffice.org. * @@ -57,8 +57,10 @@ class ScDPSaveData; class ScDPOutput; class ScMultipleReadHeader; class ScMultipleWriteHeader; +#if OLD_PIVOT_IMPLEMENTATION class ScPivot; class ScPivotCollection; +#endif struct ScPivotParam; struct ScImportSourceDesc; struct ScSheetSourceDesc; @@ -182,13 +184,11 @@ public: void ToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); - BOOL StoreOld(SvStream& rStream, ScMultipleWriteHeader& rHdr ) const; - BOOL StoreNew(SvStream& rStream, ScMultipleWriteHeader& rHdr ) const; - BOOL LoadNew(SvStream& rStream, ScMultipleReadHeader& rHdr ); BOOL FillOldParam(ScPivotParam& rParam, BOOL bForFile) const; BOOL FillLabelData(ScPivotParam& rParam); +#if OLD_PIVOT_IMPLEMENTATION void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource); - +#endif BOOL GetHierarchiesNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xHiers ); BOOL GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< rtl::OUString >& rHiers ); @@ -256,13 +256,9 @@ public: virtual DataObject* Clone() const; ScDPObject* operator[](USHORT nIndex) const {return (ScDPObject*)At(nIndex);} - - BOOL StoreOld( SvStream& rStream ) const; - BOOL StoreNew( SvStream& rStream ) const; - BOOL LoadNew( SvStream& rStream ); - +#if OLD_PIVOT_IMPLEMENTATION void ConvertOldTables( ScPivotCollection& rOldColl ); - +#endif void DeleteOnTab( SCTAB nTab ); void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); @@ -271,7 +267,7 @@ public: void WriteRefsTo( ScDPCollection& r ) const; String CreateNewName( USHORT nMin = 1 ) const; - void EnsureNames(); +//UNUSED2008-05 void EnsureNames(); }; diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index d8cbec552c46..a03ca15f5451 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dpsave.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.32.3 $ * * This file is part of OpenOffice.org. * @@ -146,7 +146,6 @@ public: void SetLayoutName(const String* pName); const String& GetLayoutName() const; BOOL HasLayoutName() const; - void ResetLayoutName(); const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const { return pReferenceValue; } void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew); @@ -233,9 +232,6 @@ public: void WriteToSource( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource ); - void Store( SvStream& rStream ) const; - void Load( SvStream& rStream ); - BOOL IsEmpty() const; const ScDPDimensionSaveData* GetExistingDimensionData() const { return pDimensionData; } diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index 9a6883b2583f..9bb4cdc6aa7c 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: drwlayer.hxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.21.32.1 $ * * This file is part of OpenOffice.org. * @@ -154,7 +154,6 @@ public: const ScAddress& rDestPos, const Rectangle& rDestRange ); void SetPageSize( USHORT nPageNo, const Size& rSize ); - ULONG GetDefTextHeight() const; // mirror or move between positive and negative positions for RTL void MirrorRTL( SdrObject* pObj ); diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx index d9a610b3cee8..950c3533e44a 100644 --- a/sc/inc/editsrc.hxx +++ b/sc/inc/editsrc.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: editsrc.hxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.32.1 $ * * This file is part of OpenOffice.org. * @@ -190,9 +190,6 @@ public: virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); virtual void UpdateData(); virtual SfxBroadcaster& GetBroadcaster() const; - - void SetDoUpdateData(sal_Bool bValue); - sal_Bool IsDirty() const; }; #endif diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index 170beff14191..d716e857188d 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fielduno.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.32.2 $ * * This file is part of OpenOffice.org. * @@ -148,8 +148,8 @@ private: String aRepresentation; String aTarget; + ScCellFieldObj(); // disabled public: - ScCellFieldObj(); ScCellFieldObj(ScDocShell* pDocSh, const ScAddress& rPos, const ESelection& rSel); virtual ~ScCellFieldObj(); @@ -345,8 +345,8 @@ private: ESelection aSelection; sal_Int16 nFileFormat; // enum SvxFileFormat, valid if not inserted + ScHeaderFieldObj(); // disabled public: - ScHeaderFieldObj(); ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, USHORT nP, USHORT nT, const ESelection& rSel); virtual ~ScHeaderFieldObj(); diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 3a197bfa2831..3a966f210c38 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filter.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.32.2 $ * * This file is part of OpenOffice.org. * @@ -34,6 +34,8 @@ #include <tools/string.hxx> #include <rtl/textenc.h> +#define ENABLE_LOTUS123_EXPORT 0 + class SfxMedium; class SvStream; @@ -87,8 +89,6 @@ enum ExportFormatExcel { ExpBiff2, ExpBiff3, ExpBiff4, ExpBiff4W, ExpBiff5 }; FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet eSrc = RTL_TEXTENCODING_DONTKNOW ); -FltError ScImportExcel( SfxMedium&, ScDocument* ); - FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ); // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) @@ -109,9 +109,9 @@ FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ); // Diverse Exportfilter // *********************************************************************** +#if ENABLE_LOTUS123_EXPORT FltError ScExportLotus123( SvStream&, ScDocument*, ExportFormatLotus, CharSet eDest ); - -FltError ScExportExcel234( SvStream&, ScDocument*, ExportFormatExcel, CharSet eDest ); +#endif FltError ScExportExcel5( SfxMedium&, ScDocument*, const BOOL bTuerk, CharSet eDest ); diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 792ea013dcfb..ca1320b9e1dc 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmtuno.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.32.1 $ * * This file is part of OpenOffice.org. * @@ -86,8 +86,8 @@ private: ScTableConditionalEntry* GetObjectByIndex_Impl(USHORT nIndex) const; void AddEntry_Impl(const ScCondFormatEntryItem& aEntry); + ScTableConditionalFormat(); // disable public: - ScTableConditionalFormat(); ScTableConditionalFormat(ScDocument* pDoc, ULONG nKey, const ScGrammar::Grammar eGrammar); virtual ~ScTableConditionalFormat(); @@ -159,8 +159,8 @@ private: ScTableConditionalFormat* pParent; ScCondFormatEntryItem aData; + ScTableConditionalEntry(); // disabled public: - ScTableConditionalEntry(); ScTableConditionalEntry(ScTableConditionalFormat* pPar, const ScCondFormatEntryItem& aItem); virtual ~ScTableConditionalEntry(); @@ -229,8 +229,8 @@ private: void ClearData_Impl(); + ScTableValidationObj(); // disabled public: - ScTableValidationObj(); ScTableValidationObj(ScDocument* pDoc, ULONG nKey, const ScGrammar::Grammar eGrammar); virtual ~ScTableValidationObj(); diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index ab33939feed6..fe1d970e1c2e 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: funcdesc.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.30.1 $ * * This file is part of OpenOffice.org. * @@ -149,8 +149,6 @@ public: const ScFuncDesc** ppFDesc = NULL, String*** pppArgs = NULL ); - static const ScFuncDesc* GetDefaultFuncDesc(); - static xub_StrLen GetFunctionStart( const String& rFormula, xub_StrLen nStart, BOOL bBack, String* pFuncName = NULL ); diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 33e8859b23c7..6965b2acc8e7 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: global.hxx,v $ - * $Revision: 1.53 $ + * $Revision: 1.53.32.8 $ * * This file is part of OpenOffice.org. * @@ -84,6 +84,12 @@ extern "C" { #define SC_TRANSLITERATION_CASESENSE 0 #endif +// Remove the old pivot table implementation that the current data pilot +// implementation has effectively replaced. The old pivot code was still +// around to handle loading of the old binary format. Now that the old +// binary filter is handled by binfilter, we can safely remove the old pivot +// handling code. +#define OLD_PIVOT_IMPLEMENTATION 0 //------------------------------------------------------------------------ struct LabelData; @@ -773,9 +779,6 @@ struct ScQueryEntry void Clear(); ScQueryEntry& operator=( const ScQueryEntry& r ); BOOL operator==( const ScQueryEntry& r ) const; - - void Load(SvStream& rStream); - void Store(SvStream& rStream) const; }; struct SC_DLLPUBLIC ScQueryParam @@ -817,9 +820,6 @@ public: void MoveToDest(); void FillInExcelSyntax(String& aCellStr, SCSIZE nIndex); - - void Load(SvStream& rStream); - void Store(SvStream& rStream) const; }; // ----------------------------------------------------------------------- @@ -881,9 +881,6 @@ struct ScConsolidateParam void Clear (); // = ClearDataAreas()+Members void ClearDataAreas (); void SetAreas ( ScArea* const* ppAreas, USHORT nCount ); - - void Load( SvStream& rStream ); - void Store( SvStream& rStream ) const; }; // ----------------------------------------------------------------------- diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx index 21c4fae9d478..92c17caf9641 100644 --- a/sc/inc/hints.hxx +++ b/sc/inc/hints.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: hints.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.2 $ * * This file is part of OpenOffice.org. * @@ -43,9 +43,10 @@ class ScPaintHint : public SfxHint USHORT nParts; BOOL bPrint; // Flag, ob auch Druck/Vorschau betroffen ist + ScPaintHint(); // disabled + public: TYPEINFO(); - ScPaintHint(); ScPaintHint( const ScRange& rRng, USHORT nPaint = PAINT_ALL ); ~ScPaintHint(); @@ -95,7 +96,7 @@ class ScPointerChangedHint : public SfxHint public: TYPEINFO(); - ScPointerChangedHint( USHORT nF ); +//UNUSED2008-05 ScPointerChangedHint( USHORT nF ); ~ScPointerChangedHint(); USHORT GetFlags() const { return nFlags; } diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index 8fa0c6f1bb0b..4d56f70b4d33 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: inputopt.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.1 $ * * This file is part of OpenOffice.org. * @@ -81,8 +81,6 @@ public: BOOL GetReplaceCellsWarn() const { return bReplCellsWarn; } const ScInputOptions& operator= ( const ScInputOptions& rOpt ); - friend SvStream& operator>> ( SvStream& rStream, ScInputOptions& rOpt ); - friend SvStream& operator<< ( SvStream& rStream, const ScInputOptions& rOpt ); }; diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx index 6555e762b073..83a218887508 100644 --- a/sc/inc/markarr.hxx +++ b/sc/inc/markarr.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: markarr.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.1 $ * * This file is part of OpenOffice.org. * @@ -56,7 +56,6 @@ public: ~ScMarkArray(); void Reset( BOOL bMarked = FALSE ); BOOL GetMark( SCROW nRow ) const; - void SetMark( SCROW nRow, BOOL bMarked ); void SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ); BOOL IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const; BOOL HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const; @@ -67,8 +66,6 @@ public: BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; void DeleteArea(SCROW nStartRow, SCROW nEndRow); - void SwapCol(ScMarkArray& rMarkArray); - void MoveTo(SCROW nStartRow, SCROW nEndRow, ScMarkArray& rMarkArray); /// Including current row, may return -1 if bUp and not found SCsROW GetNextMarked( SCsROW nRow, BOOL bUp ) const; diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index c5a5422826c3..8eee5df56ebd 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: miscuno.hxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.32.4 $ * * This file is part of OpenOffice.org. * @@ -126,57 +126,55 @@ public: throw(::com::sun::star::uno::RuntimeException); }; - -class ScEmptyEnumerationAccess : public cppu::WeakImplHelper2< - com::sun::star::container::XEnumerationAccess, - com::sun::star::lang::XServiceInfo > -{ -public: - ScEmptyEnumerationAccess(); - virtual ~ScEmptyEnumerationAccess(); - - // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL - createEnumeration() throw(::com::sun::star::uno::RuntimeException); - - // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); - - // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException); -}; - - -class ScEmptyEnumeration : public cppu::WeakImplHelper2< - com::sun::star::container::XEnumeration, - com::sun::star::lang::XServiceInfo > -{ -public: - ScEmptyEnumeration(); - virtual ~ScEmptyEnumeration(); - - // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL nextElement() - throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException); -}; +//UNUSED2008-05 class ScEmptyEnumerationAccess : public cppu::WeakImplHelper2< +//UNUSED2008-05 com::sun::star::container::XEnumerationAccess, +//UNUSED2008-05 com::sun::star::lang::XServiceInfo > +//UNUSED2008-05 { +//UNUSED2008-05 public: +//UNUSED2008-05 ScEmptyEnumerationAccess(); +//UNUSED2008-05 virtual ~ScEmptyEnumerationAccess(); +//UNUSED2008-05 +//UNUSED2008-05 // XEnumerationAccess +//UNUSED2008-05 virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL +//UNUSED2008-05 createEnumeration() throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 +//UNUSED2008-05 // XElementAccess +//UNUSED2008-05 virtual ::com::sun::star::uno::Type SAL_CALL getElementType() +//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 +//UNUSED2008-05 // XServiceInfo +//UNUSED2008-05 virtual ::rtl::OUString SAL_CALL getImplementationName( ) +//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) +//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) +//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 }; + +//UNUSED2008-05 class ScEmptyEnumeration : public cppu::WeakImplHelper2< +//UNUSED2008-05 com::sun::star::container::XEnumeration, +//UNUSED2008-05 com::sun::star::lang::XServiceInfo > +//UNUSED2008-05 { +//UNUSED2008-05 public: +//UNUSED2008-05 ScEmptyEnumeration(); +//UNUSED2008-05 virtual ~ScEmptyEnumeration(); +//UNUSED2008-05 +//UNUSED2008-05 // XEnumeration +//UNUSED2008-05 virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual ::com::sun::star::uno::Any SAL_CALL nextElement() +//UNUSED2008-05 throw(::com::sun::star::container::NoSuchElementException, +//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, +//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 +//UNUSED2008-05 // XServiceInfo +//UNUSED2008-05 virtual ::rtl::OUString SAL_CALL getImplementationName( ) +//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) +//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) +//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 }; // new (uno 3) variant class ScNameToIndexAccess : public cppu::WeakImplHelper2< @@ -214,63 +212,63 @@ public: throw(::com::sun::star::uno::RuntimeException); }; -class ScPrintSettingsObj : public cppu::WeakImplHelper2< - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo > -{ -public: - ScPrintSettingsObj(); - virtual ~ScPrintSettingsObj(); - - // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > - SAL_CALL getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( - const ::rtl::OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException); -}; +//UNUSED2008-05 class ScPrintSettingsObj : public cppu::WeakImplHelper2< +//UNUSED2008-05 com::sun::star::beans::XPropertySet, +//UNUSED2008-05 com::sun::star::lang::XServiceInfo > +//UNUSED2008-05 { +//UNUSED2008-05 public: +//UNUSED2008-05 ScPrintSettingsObj(); +//UNUSED2008-05 virtual ~ScPrintSettingsObj(); +//UNUSED2008-05 +//UNUSED2008-05 // XPropertySet +//UNUSED2008-05 virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > +//UNUSED2008-05 SAL_CALL getPropertySetInfo() +//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, +//UNUSED2008-05 const ::com::sun::star::uno::Any& aValue ) +//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, +//UNUSED2008-05 ::com::sun::star::beans::PropertyVetoException, +//UNUSED2008-05 ::com::sun::star::lang::IllegalArgumentException, +//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, +//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( +//UNUSED2008-05 const ::rtl::OUString& PropertyName ) +//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, +//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, +//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, +//UNUSED2008-05 const ::com::sun::star::uno::Reference< +//UNUSED2008-05 ::com::sun::star::beans::XPropertyChangeListener >& xListener ) +//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, +//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, +//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, +//UNUSED2008-05 const ::com::sun::star::uno::Reference< +//UNUSED2008-05 ::com::sun::star::beans::XPropertyChangeListener >& aListener ) +//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, +//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, +//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, +//UNUSED2008-05 const ::com::sun::star::uno::Reference< +//UNUSED2008-05 ::com::sun::star::beans::XVetoableChangeListener >& aListener ) +//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, +//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, +//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, +//UNUSED2008-05 const ::com::sun::star::uno::Reference< +//UNUSED2008-05 ::com::sun::star::beans::XVetoableChangeListener >& aListener ) +//UNUSED2008-05 throw(::com::sun::star::beans::UnknownPropertyException, +//UNUSED2008-05 ::com::sun::star::lang::WrappedTargetException, +//UNUSED2008-05 ::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 +//UNUSED2008-05 // XServiceInfo +//UNUSED2008-05 virtual ::rtl::OUString SAL_CALL getImplementationName( ) +//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) +//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) +//UNUSED2008-05 throw(::com::sun::star::uno::RuntimeException); +//UNUSED2008-05 }; class ScUnoHelpFunctions diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx index b6966341c12c..2ef72d67bc10 100644 --- a/sc/inc/olinetab.hxx +++ b/sc/inc/olinetab.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: olinetab.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.3 $ * * This file is part of OpenOffice.org. * @@ -54,9 +54,6 @@ public: ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, BOOL bNewHidden = FALSE ); ScOutlineEntry( const ScOutlineEntry& rEntry ); - ScOutlineEntry( SvStream& rStream, ScMultipleReadHeader& rHdr ); - - void Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ); virtual DataObject* Clone() const; @@ -135,9 +132,6 @@ public: BOOL bShow, const ScBitMaskCompressedArray< SCCOLROW, BYTE>& rHiddenFlags ); - void Load( SvStream& rStream ); - void Store( SvStream& rStream ); - void RemoveAll(); }; @@ -163,9 +157,6 @@ public: BOOL TestInsertRow( SCSIZE nSize ); void InsertRow( SCROW nStartRow, SCSIZE nSize ); BOOL DeleteRow( SCROW nStartRow, SCSIZE nSize ); - - void Load( SvStream& rStream ); - void Store( SvStream& rStream ); }; diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index 80c36efac17c..86506d7ccdb8 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: patattr.hxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.32.1 $ * * This file is part of OpenOffice.org. * @@ -136,18 +136,18 @@ public: with text encoding RTL_TEXTENC_SYMBOL */ BOOL IsSymbolFont() const; - /** Create a FontToSubsFontConverter if needed for - this pattern, else return 0. - - @param nFlags is the bit mask which shall be - used for CreateFontToSubsFontConverter(). - - The converter must be destroyed by the caller - using DestroyFontToSubsFontConverter() which - should be accomplished using the - ScFontToSubsFontConverter_AutoPtr - */ - FontToSubsFontConverter GetSubsFontConverter( ULONG nFlags ) const; +//UNUSED2008-05 /** Create a FontToSubsFontConverter if needed for +//UNUSED2008-05 this pattern, else return 0. +//UNUSED2008-05 +//UNUSED2008-05 @param nFlags is the bit mask which shall be +//UNUSED2008-05 used for CreateFontToSubsFontConverter(). +//UNUSED2008-05 +//UNUSED2008-05 The converter must be destroyed by the caller +//UNUSED2008-05 using DestroyFontToSubsFontConverter() which +//UNUSED2008-05 should be accomplished using the +//UNUSED2008-05 ScFontToSubsFontConverter_AutoPtr +//UNUSED2008-05 */ +//UNUSED2008-05 FontToSubsFontConverter GetSubsFontConverter( ULONG nFlags ) const; ULONG GetNumberFormat( SvNumberFormatter* ) const; ULONG GetNumberFormat( SvNumberFormatter* pFormatter, diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index 536b6f185400..3caf946459d2 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: pivot.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.32.3 $ * * This file is part of OpenOffice.org. * @@ -65,12 +65,14 @@ class SubTotal; #include <com/sun/star/sheet/DataPilotFieldLayoutInfo.hpp> #include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp> +#if OLD_PIVOT_IMPLEMENTATION #define PIVOT_STYLE_INNER 0 #define PIVOT_STYLE_RESULT 1 #define PIVOT_STYLE_CATEGORY 2 #define PIVOT_STYLE_TITLE 3 #define PIVOT_STYLE_FIELDNAME 4 #define PIVOT_STYLE_TOP 5 +#endif class SvStream; class ScDocument; @@ -140,6 +142,7 @@ struct ScPivotParam // ----------------------------------------------------------------------- +#if OLD_PIVOT_IMPLEMENTATION struct PivotColRef { SCSIZE nDataIndex; @@ -153,10 +156,12 @@ struct PivotColRef nFuncMask = PIVOT_FUNC_NONE; } }; +#endif typedef PivotField PivotFieldArr[PIVOT_MAXFIELD]; typedef PivotField PivotPageFieldArr[PIVOT_MAXPAGEFIELD]; +#if OLD_PIVOT_IMPLEMENTATION class PivotStrCollection : public StrCollection { ScUserListData* pUserData; @@ -357,6 +362,7 @@ public: String CreateNewName( USHORT nMin = 1 ) const; }; +#endif //------------------------------------------------------------------------ diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index a43599f1eec1..15ca7ec6a521 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: postit.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.1 $ * * This file is part of OpenOffice.org. * @@ -124,32 +124,6 @@ inline int ScPostIt::operator==( const ScPostIt& rPostIt ) const && maItemSet == rPostIt.maItemSet ); } -inline SvStream& operator>>( SvStream& rStream, ScPostIt& rPostIt ) -{ - // without bShown !!! - - CharSet eSet = rStream.GetStreamCharSet(); - String aText = rPostIt.GetText(); - rStream.ReadByteString( aText, eSet ); - rStream.ReadByteString( rPostIt.maStrDate, eSet ); - rStream.ReadByteString( rPostIt.maStrAuthor, eSet ); - - return rStream; -} - -inline SvStream& operator<<( SvStream& rStream, const ScPostIt& rPostIt ) -{ - // without bShown !!! - - CharSet eSet = rStream.GetStreamCharSet(); - String aText = rPostIt.GetText(); - rStream.WriteByteString( aText, eSet ); - rStream.WriteByteString( rPostIt.maStrDate, eSet ); - rStream.WriteByteString( rPostIt.maStrAuthor, eSet ); - - return rStream; -} - // ============================================================================ #endif diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index d59416450a8f..6c4a88d9df60 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: printopt.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.2 $ * * This file is part of OpenOffice.org. * @@ -66,7 +66,7 @@ class SC_DLLPUBLIC ScTpPrintItem : public SfxPoolItem { public: TYPEINFO(); - ScTpPrintItem( USHORT nWhich ); +//UNUSED2008-05 ScTpPrintItem( USHORT nWhich ); ScTpPrintItem( USHORT nWhich, const ScPrintOptions& rOpt ); ScTpPrintItem( const ScTpPrintItem& rItem ); @@ -94,7 +94,6 @@ public: ScPrintCfg(); void SetOptions( const ScPrintOptions& rNew ); - void OptionsChanged(); // after direct access to ScPrintOptions base class virtual void Commit(); }; diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx index 4206efc821ff..6796b467aa24 100644 --- a/sc/inc/progress.hxx +++ b/sc/inc/progress.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: progress.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.32.1 $ * * This file is part of OpenOffice.org. * @@ -68,8 +68,6 @@ public: BOOL bWait = TRUE ); static ScProgress* GetInterpretProgress() { return pInterpretProgress; } static void DeleteInterpretProgress(); - static void SetAllowInterpret( BOOL bVal ); - static BOOL GetAllowInterpret() { return bAllowInterpretProgress; } static ULONG GetInterpretCount() { return nInterpretProgress; } static ULONG GetGlobalRange() { return nGlobalRange; } static ULONG GetGlobalPercent() { return nGlobalPercent; } diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 19a7c0118d3e..8ce292003f2d 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: rangelst.hxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.32.3 $ * * This file is part of OpenOffice.org. * @@ -50,7 +50,6 @@ public: virtual ~ScRangeList(); ScRangeList& operator=(const ScRangeList& rList); void RemoveAll(); - ScRangeList* Clone() const; void Append( const ScRange& rRange ) { ScRangePtr pR = new ScRange( rRange ); @@ -68,9 +67,6 @@ public: const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); ScRange* Find( const ScAddress& ) const; - ScRange* Find( const ScRange& ) const; - BOOL Load( SvStream&, USHORT nVer ); - BOOL Store( SvStream& ) const; BOOL operator==( const ScRangeList& ) const; BOOL Intersects( const ScRange& ) const; BOOL In( const ScRange& ) const; @@ -102,8 +98,6 @@ public: void DeleteOnTab( SCTAB nTab ); ScRangePair* Find( const ScAddress& ) const; ScRangePair* Find( const ScRange& ) const; - BOOL Load( SvStream&, USHORT nVer ); - BOOL Store( SvStream& ) const; ScRangePair** CreateNameSortedArray( ULONG& nCount, ScDocument* ) const; BOOL operator==( const ScRangePairList& ) const; }; diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index fc555a6772e2..6658bccbe1f1 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: rangenam.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.32.1 $ * * This file is part of OpenOffice.org. * @@ -152,8 +152,6 @@ public: void ReplaceRangeNamesInUse( const ScIndexMap& rMap ); - BOOL IsBeyond( SCROW nMaxRow ) const; - static void MakeValidName( String& rName ); SC_DLLPUBLIC static BOOL IsNameValid( const String& rName, ScDocument* pDoc ); }; diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index 8010f0e9f539..74c1859fd6d3 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: rangeutl.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.32.3 $ * * This file is part of OpenOffice.org. * @@ -118,11 +118,6 @@ public: sal_Bool bAppendStr, sal_Unicode cSeperator = ' '); - static void AppendString( - ::rtl::OUString& rString, - const ::rtl::OUString& rNewStr, - sal_Unicode cSeperator = ' '); - static sal_Int32 IndexOf( const ::rtl::OUString& rString, sal_Unicode cSearchChar, @@ -264,13 +259,9 @@ public: ScArea( const ScArea& r ); - void Clear (); ScArea& operator= ( const ScArea& r ); BOOL operator== ( const ScArea& r ) const; BOOL operator!= ( const ScArea& r ) const { return !( operator==(r) ); } - void GetString ( String& rStr, - BOOL bAbsolute = TRUE, ScDocument* pDoc = NULL, - ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; public: SCTAB nTab; @@ -280,9 +271,6 @@ public: SCROW nRowEnd; }; -SvStream& operator<< ( SvStream& rStream, const ScArea& rArea ); -SvStream& operator>> ( SvStream& rStream, ScArea& rArea ); - //------------------------------------------------------------------------ // diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx index 813901026ce6..14be3ddcb325 100644 --- a/sc/inc/rechead.hxx +++ b/sc/inc/rechead.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: rechead.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.32.2 $ * * This file is part of OpenOffice.org. * diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx index 3c592063d62d..640a24fab327 100644 --- a/sc/inc/refdata.hxx +++ b/sc/inc/refdata.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: refdata.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.2 $ * * This file is part of OpenOffice.org. * @@ -112,9 +112,9 @@ struct SingleRefData // Single reference (one address) into the sheet void SmartRelAbs( const ScAddress& rPos ); void CalcRelFromAbs( const ScAddress& rPos ); void CalcAbsIfRel( const ScAddress& rPos ); - void OldBoolsToNewFlags( const OldSingleRefBools& ); - BYTE CreateStoreByteFromFlags() const; - void CreateFlagsFromLoadByte( BYTE ); +//UNUSED2008-05 void OldBoolsToNewFlags( const OldSingleRefBools& ); +//UNUSED2008-05 BYTE CreateStoreByteFromFlags() const; +//UNUSED2008-05 void CreateFlagsFromLoadByte( BYTE ); BOOL operator==( const SingleRefData& ) const; }; diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 038567662b4d..64b568076d28 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: scdll.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.2 $ * * This file is part of OpenOffice.org. * @@ -70,9 +70,7 @@ public: static void Init(); // called directly after loading the DLL static void Exit(); // called directly befor unloading the DLL - - static void FillStatusBar(StatusBar &rBar); - +//UNUSED2008-05 static void FillStatusBar(StatusBar &rBar); static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ); }; diff --git a/sc/inc/scimpexpmsg.hxx b/sc/inc/scimpexpmsg.hxx index 32b4ba72e0cf..d74a7f0f1ee2 100644 --- a/sc/inc/scimpexpmsg.hxx +++ b/sc/inc/scimpexpmsg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: scimpexpmsg.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.32.2 $ * * This file is part of OpenOffice.org. * @@ -35,74 +35,73 @@ #include <tools/string.hxx> #include <tools/solar.h> -enum ScImpExpMsg -{ - SC_IMPEXPMSG_UNKNOWN -}; - - -class String; - - -class ScImpExpLogMsg -{ -private: - ScImpExpMsg eId; - String* pPos; - String* pHint; -protected: -public: - ScImpExpLogMsg( ScImpExpMsg eId ); - ScImpExpLogMsg( ScImpExpMsg eId, const String& rPosition ); - ScImpExpLogMsg( ScImpExpMsg eId, const String& rPosition, const String& rAdditionalHint ); - ScImpExpLogMsg( const ScImpExpLogMsg& rCpy ); - virtual ~ScImpExpLogMsg(); - - ScImpExpLogMsg& operator =( const ScImpExpLogMsg& rCpy ); - - void Set( ScImpExpMsg eId, const String* pPos = NULL, const String* pHint = NULL ); - - inline ScImpExpMsg GetId( void ) const; - inline const String* GetPos( void ) const; - inline const String* GetHint( void ) const; - - static String GetMsg( ScImpExpMsg eId ); - inline String GetMsg( void ) const; -}; - - - - -inline ScImpExpLogMsg& ScImpExpLogMsg::operator =( const ScImpExpLogMsg& r ) -{ - Set( r.eId, r.pPos, r.pHint ); - return *this; -} - - -inline ScImpExpMsg ScImpExpLogMsg::GetId( void ) const -{ - return eId; -} - - -inline const String* ScImpExpLogMsg::GetPos( void ) const -{ - return pPos; -} - - -inline const String* ScImpExpLogMsg::GetHint( void ) const -{ - return pHint; -} - - -inline String ScImpExpLogMsg::GetMsg( void ) const -{ - return GetMsg( eId ); -} - +//UNUSED2008-05 enum ScImpExpMsg +//UNUSED2008-05 { +//UNUSED2008-05 SC_IMPEXPMSG_UNKNOWN +//UNUSED2008-05 }; +//UNUSED2008-05 +//UNUSED2008-05 +//UNUSED2008-05 class String; +//UNUSED2008-05 +//UNUSED2008-05 +//UNUSED2008-05 class ScImpExpLogMsg +//UNUSED2008-05 { +//UNUSED2008-05 private: +//UNUSED2008-05 ScImpExpMsg eId; +//UNUSED2008-05 String* pPos; +//UNUSED2008-05 String* pHint; +//UNUSED2008-05 protected: +//UNUSED2008-05 public: +//UNUSED2008-05 ScImpExpLogMsg( ScImpExpMsg eId ); +//UNUSED2008-05 ScImpExpLogMsg( ScImpExpMsg eId, const String& rPosition ); +//UNUSED2008-05 ScImpExpLogMsg( ScImpExpMsg eId, const String& rPosition, const String& rAdditionalHint ); +//UNUSED2008-05 ScImpExpLogMsg( const ScImpExpLogMsg& rCpy ); +//UNUSED2008-05 virtual ~ScImpExpLogMsg(); +//UNUSED2008-05 +//UNUSED2008-05 ScImpExpLogMsg& operator =( const ScImpExpLogMsg& rCpy ); +//UNUSED2008-05 +//UNUSED2008-05 void Set( ScImpExpMsg eId, const String* pPos = NULL, const String* pHint = NULL ); +//UNUSED2008-05 +//UNUSED2008-05 inline ScImpExpMsg GetId( void ) const; +//UNUSED2008-05 inline const String* GetPos( void ) const; +//UNUSED2008-05 inline const String* GetHint( void ) const; +//UNUSED2008-05 +//UNUSED2008-05 static String GetMsg( ScImpExpMsg eId ); +//UNUSED2008-05 inline String GetMsg( void ) const; +//UNUSED2008-05 }; +//UNUSED2008-05 +//UNUSED2008-05 +//UNUSED2008-05 +//UNUSED2008-05 +//UNUSED2008-05 inline ScImpExpLogMsg& ScImpExpLogMsg::operator =( const ScImpExpLogMsg& r ) +//UNUSED2008-05 { +//UNUSED2008-05 Set( r.eId, r.pPos, r.pHint ); +//UNUSED2008-05 return *this; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 +//UNUSED2008-05 inline ScImpExpMsg ScImpExpLogMsg::GetId( void ) const +//UNUSED2008-05 { +//UNUSED2008-05 return eId; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 +//UNUSED2008-05 inline const String* ScImpExpLogMsg::GetPos( void ) const +//UNUSED2008-05 { +//UNUSED2008-05 return pPos; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 +//UNUSED2008-05 inline const String* ScImpExpLogMsg::GetHint( void ) const +//UNUSED2008-05 { +//UNUSED2008-05 return pHint; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 +//UNUSED2008-05 inline String ScImpExpLogMsg::GetMsg( void ) const +//UNUSED2008-05 { +//UNUSED2008-05 return GetMsg( eId ); +//UNUSED2008-05 } #endif diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index b0a6c4a24f15..a3f036d59a45 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: scmatrix.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.32.1 $ * * This file is part of OpenOffice.org. * @@ -199,8 +199,6 @@ public: void PutDouble( double fVal, SCSIZE nC, SCSIZE nR); void PutDouble( double fVal, SCSIZE nIndex) { pMat[nIndex].fVal = fVal; } - void PutDoubleAndResetString( double fVal, SCSIZE nC, SCSIZE nR ); - void PutDoubleAndResetString( double fVal, SCSIZE nIndex ); void PutString( const String& rStr, SCSIZE nC, SCSIZE nR); void PutString( const String& rStr, SCSIZE nIndex); void PutEmpty( SCSIZE nC, SCSIZE nR); @@ -217,8 +215,6 @@ public: void FillDouble( double fVal, SCSIZE nC1, SCSIZE nR1, SCSIZE nC2, SCSIZE nR2 ); - /// lower left triangle - void FillDoubleLowerLeft( double fVal, SCSIZE nC2 ); /** May be used before obtaining the double value of an element to avoid passing its NAN around. @@ -295,10 +291,6 @@ public: void MatTrans( ScMatrix& mRes) const; void MatCopy ( ScMatrix& mRes) const; - /** Copy upper left of this matrix to mRes matrix. - This matrix's dimensions must be greater than the mRes matrix - dimensions. */ - void MatCopyUpperLeft( ScMatrix& mRes) const; // Convert ScInterpreter::CompareMat values (-1,0,1) to boolean values void CompareEqual(); diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 0899135170a8..f1522f374ce1 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: scmod.hxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.24.32.1 $ * * This file is part of OpenOffice.org. * @@ -152,7 +152,6 @@ public: virtual void FillStatusBar(StatusBar &rBar); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); void DeleteCfg(); - void CloseDialogs(); // von der Applikation verschoben: @@ -238,7 +237,6 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO void SetRefInputHdl( ScInputHandler* pNew ); ScInputHandler* GetRefInputHdl(); - void SetInputWindow( ScInputWindow* pWin ); void ViewShellGone(ScTabViewShell* pViewSh); void ViewShellChanged(); // Kommunikation mit Funktionsautopilot diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx index 22c8026b3f72..ace44dc5be4d 100644 --- a/sc/inc/servuno.hxx +++ b/sc/inc/servuno.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: servuno.hxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.32.2 $ * * This file is part of OpenOffice.org. * @@ -105,7 +105,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > MakeInstance( sal_uInt16 nType, ScDocShell* pDocShell ); static ::com::sun::star::uno::Sequence<rtl::OUString> GetAllServiceNames(); - static String GetProviderName(sal_uInt16 nObjectType); +//UNUSED2008-05 static String GetProviderName(sal_uInt16 nObjectType); static sal_uInt16 GetProviderType(const String& rServiceName); }; diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index f9f250892324..86db2815a0d8 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: stlpool.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.1 $ * * This file is part of OpenOffice.org. * @@ -56,7 +56,7 @@ public: void CreateStandardStyles(); void CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ); - void UpdateStdNames(); +//UNUSED2008-05 void UpdateStdNames(); void CopyStyleFrom( ScStyleSheetPool* pSrcPool, const String& rName, SfxStyleFamily eFamily ); @@ -69,8 +69,6 @@ public: virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam, USHORT nMask = 0xffff, USHORT nPos = 0xffff ); - void ConvertFontsAfterLoad(); // old binary file format - protected: virtual ~ScStyleSheetPool(); diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index c06a19542a39..959036df02e8 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: styleuno.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.1 $ * * This file is part of OpenOffice.org. * @@ -219,8 +219,8 @@ private: throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + ScStyleObj(); // disabled public: - ScStyleObj(); ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName); virtual ~ScStyleObj(); diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx index 27801d97c7a3..adc604151f35 100644 --- a/sc/inc/subtotal.hxx +++ b/sc/inc/subtotal.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: subtotal.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.1 $ * * This file is part of OpenOffice.org. * @@ -35,6 +35,7 @@ class SubTotal { +#if OLD_PIVOT_IMPLEMENTATION private: long nCount; long nCount2; @@ -62,6 +63,9 @@ public: short Valid( USHORT nFunction ) const; // return 0 => Fehler, -1 => kein Wert, 1 => ok double Result( USHORT nFunction ) const; +#endif +public: + static BOOL SafePlus( double& fVal1, double fVal2); static BOOL SafeMult( double& fVal1, double fVal2); static BOOL SafeDiv( double& fVal1, double fVal2); diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 3f35327cb796..3e8325e1793a 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: table.hxx,v $ - * $Revision: 1.35 $ + * $Revision: 1.35.30.6 $ * * This file is part of OpenOffice.org. * @@ -350,13 +350,13 @@ public: BOOL HasData( SCCOL nCol, SCROW nRow ); BOOL HasStringData( SCCOL nCol, SCROW nRow ); BOOL HasValueData( SCCOL nCol, SCROW nRow ); - USHORT GetErrorData(SCCOL nCol, SCROW nRow) const; +//UNUSED2008-05 USHORT GetErrorData(SCCOL nCol, SCROW nRow) const; BOOL HasStringCells( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const; USHORT GetErrCode( const ScAddress& rPos ) const { return aCol[rPos.Col()].GetErrCode( rPos.Row() ); } - USHORT GetErrCode( SCCOL nCol, SCROW nRow ) const; +//UNUSED2008-05 USHORT GetErrCode( SCCOL nCol, SCROW nRow ) const; void ResetChanged( const ScRange& rRange ); @@ -385,7 +385,7 @@ public: void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); void UpdateInsertTab(SCTAB nTable); - void UpdateInsertTabOnlyCells(SCTAB nTable); +//UNUSED2008-05 void UpdateInsertTabOnlyCells(SCTAB nTable); void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo = NULL ); void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo, ScProgress& ); void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); @@ -551,8 +551,6 @@ public: void SetRowFlags( SCROW nRow, BYTE nNewFlags ); void SetRowFlags( SCROW nStartRow, SCROW nEndRow, BYTE nNewFlags ); - /// @return the index of the last column with any set flags (auto-pagebreak is ignored). - SCCOL GetLastFlaggedCol() const; /// @return the index of the last row with any set flags (auto-pagebreak is ignored). SCROW GetLastFlaggedRow() const; @@ -580,10 +578,6 @@ public: void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); - - BOOL Load( SvStream& rStream, USHORT nVersion, ScProgress* pProgress ); - BOOL Save( SvStream& rStream, long& rSavedDocCells, ScProgress* pProgress ) const; - void Sort(const ScSortParam& rSortParam, BOOL bKeepQuery); BOOL ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam, BOOL* pSpecial = NULL, ScBaseCell* pCell = NULL, diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index 3baa95421961..2d50f575d29f 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: textuno.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.32.1 $ * * This file is part of OpenOffice.org. * @@ -77,8 +77,9 @@ private: EditTextObject* pRightText; SfxBroadcaster aBC; + ScHeaderFooterContentObj(); // disabled + public: - ScHeaderFooterContentObj(); ScHeaderFooterContentObj( const EditTextObject* pLeft, const EditTextObject* pCenter, const EditTextObject* pRight ); @@ -352,7 +353,6 @@ public: ScEditEngineTextObj(); virtual ~ScEditEngineTextObj() throw(); - void SetText( const String& rStr ); void SetText( const EditTextObject& rTextObject ); EditTextObject* CreateTextObject(); }; diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index f8c7d1b32b11..f3476250c83e 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: token.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.15.32.3 $ * * This file is part of OpenOffice.org. * @@ -179,10 +179,10 @@ public: BOOL TextEqual( const ScToken& rToken ) const; BOOL Is3DRef() const; // reference with 3D flag set - // If token in RPN resulted from resolving a name and contains an absolute - // reference. Token must be obtained through ScTokenArray::GetNextReferenceRPN() - // or similar. - BOOL IsRPNReferenceAbsName() const; +//UNUSED2008-05 // If token in RPN resulted from resolving a name and contains an absolute +//UNUSED2008-05 // reference. Token must be obtained through ScTokenArray::GetNextReferenceRPN() +//UNUSED2008-05 // or similar. +//UNUSED2008-05 BOOL IsRPNReferenceAbsName() const; /** If rTok1 and rTok2 both are SingleRef or DoubleRef tokens, extend/merge ranges as needed for ocRange. diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index 40e54792b51f..584f9e33c6df 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tokenarray.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.32.2 $ * * This file is part of OpenOffice.org. * @@ -112,8 +112,9 @@ public: BOOL HasOpCode( OpCode ) const; BOOL HasOpCodeRPN( OpCode ) const; - /// Token of type svIndex - BOOL HasName() const; +//UNUSED2008-05 /// Token of type svIndex +//UNUSED2008-05 BOOL HasName() const; + /// Token of type svIndex or opcode ocColRowName BOOL HasNameOrColRowName() const; /// Exactly and only one range (valid or deleted) diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx index d118ae232517..7554cc13e49b 100644 --- a/sc/inc/userlist.hxx +++ b/sc/inc/userlist.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: userlist.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.3 $ * * This file is part of OpenOffice.org. * @@ -49,11 +49,10 @@ friend class ScUserList; public: ScUserListData(const String& rStr); ScUserListData(const ScUserListData& rData); - ScUserListData( SvStream& rStream ); virtual ~ScUserListData(); virtual DataObject* Clone() const { return new ScUserListData(*this); } - BOOL Store( SvStream& rStream ) const; + const String& GetString() const { return aStr; } void SetString( const String& rStr); USHORT GetSubCount() const; @@ -73,8 +72,6 @@ public: virtual DataObject* Clone() const; ScUserListData* GetData( const String& rSubStr ) const; - BOOL Load( SvStream& rStream ); - BOOL Store( SvStream& rStream ) const; /// If the list in rStr is already inserted BOOL HasEntry( const String& rStr ) const; diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index fa28553d30bb..02cdbb8fbd2c 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: validat.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.32.3 $ * * This file is part of OpenOffice.org. * @@ -98,12 +98,8 @@ public: ScDocument* pDocument, const ScAddress& rPos ); ScValidationData( const ScValidationData& r ); ScValidationData( ScDocument* pDocument, const ScValidationData& r ); - ScValidationData( SvStream& rStream, ScMultipleReadHeader& rHdr, - ScDocument* pDocument ); virtual ~ScValidationData(); - void Store(SvStream& rStream, ScMultipleWriteHeader& rHdr) const; - ScValidationData* Clone() const // echte Kopie { return new ScValidationData( GetDocument(), *this ); } ScValidationData* Clone(ScDocument* pNew) const @@ -201,8 +197,6 @@ public: ScValidationData* GetData( sal_uInt32 nKey ); - void Load( SvStream& rStream, ScDocument* pDocument ); - void Store( SvStream& rStream ) const; void ResetUsed(); void CompileXML(); diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 50f4aeb27b7b..fee3984449b7 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewopti.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.32.3 $ * * This file is part of OpenOffice.org. * @@ -90,9 +90,6 @@ public: const ScGridOptions& operator= ( const ScGridOptions& rCpy ); int operator== ( const ScGridOptions& rOpt ) const; int operator!= ( const ScGridOptions& rOpt ) const { return !(operator==(rOpt)); } - - friend SvStream& operator>> ( SvStream& rStream, ScGridOptions& rOpt ); - friend SvStream& operator<< ( SvStream& rStream, const ScGridOptions& rOpt ); }; //================================================================== @@ -128,10 +125,6 @@ public: int operator== ( const ScViewOptions& rOpt ) const; int operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); } - friend SvStream& operator>> ( SvStream& rStream, ScViewOptions& rOpt ); - - void Save(SvStream& rStream, BOOL bConfig = FALSE) const; - private: BOOL aOptArr [MAX_OPT]; ScVObjMode aModeArr [MAX_TYPE]; @@ -141,12 +134,6 @@ private: BOOL bHideAutoSpell; }; -inline SvStream& operator<<( SvStream& rStream, const ScViewOptions& rOpt ) -{ - rOpt.Save( rStream, FALSE ); - return rStream; -} - //================================================================== // Item fuer Einstellungsdialog - Ansicht //================================================================== @@ -155,7 +142,7 @@ class SC_DLLPUBLIC ScTpViewItem : public SfxPoolItem { public: TYPEINFO(); - ScTpViewItem( USHORT nWhich ); +//UNUSED2008-05 ScTpViewItem( USHORT nWhich ); ScTpViewItem( USHORT nWhich, const ScViewOptions& rOpt ); ScTpViewItem( const ScTpViewItem& rItem ); ~ScTpViewItem(); diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index ea8f83337d44..e489cb718163 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewuno.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.12.32.2 $ * * This file is part of OpenOffice.org. * @@ -211,8 +211,8 @@ private: void StartActivationListening(); void EndActivationListening(); + ScTabViewObj(); // disabled public: - ScTabViewObj(); ScTabViewObj(ScTabViewShell* pViewSh); virtual ~ScTabViewObj(); diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx index c1da477b53ff..7245ee4f45b3 100644 --- a/sc/inc/xmlwrap.hxx +++ b/sc/inc/xmlwrap.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlwrap.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.32.2 $ * * This file is part of OpenOffice.org. * @@ -58,8 +58,8 @@ class ScXMLImportWrapper SfxMedium* pMedium; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xStorage; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator> GetStatusIndicator( - com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel); +//UNUSED2008-05 com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator> GetStatusIndicator( +//UNUSED2008-05 com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel); com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator> GetStatusIndicator(); sal_uInt32 ImportFromComponent(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& xServiceFactory, |