diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-28 19:03:55 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-28 19:03:55 +0000 |
commit | 25d44e2d80584ecf435d91232049e371c960be2a (patch) | |
tree | 73cf5b499c01298716a0190f5ba6b92bca4a8d52 /sc/inc | |
parent | #i104742# shrink selected soure data to the data area when making datapilot t... (diff) | |
parent | Create DEV300_m57 milestone tag from trunk@275796 (diff) | |
download | core-25d44e2d80584ecf435d91232049e371c960be2a.tar.gz core-25d44e2d80584ecf435d91232049e371c960be2a.zip |
koheidatapilot03: merge with DEV300_m57
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/address.hxx | 2 | ||||
-rw-r--r-- | sc/inc/attarray.hxx | 3 | ||||
-rw-r--r-- | sc/inc/attrib.hxx | 4 | ||||
-rw-r--r-- | sc/inc/cell.hxx | 7 | ||||
-rw-r--r-- | sc/inc/chartarr.hxx | 1 | ||||
-rw-r--r-- | sc/inc/chartpos.hxx | 5 | ||||
-rw-r--r-- | sc/inc/chgtrack.hxx | 62 | ||||
-rw-r--r-- | sc/inc/collect.hxx | 6 | ||||
-rw-r--r-- | sc/inc/column.hxx | 10 | ||||
-rw-r--r-- | sc/inc/conditio.hxx | 4 | ||||
-rw-r--r-- | sc/inc/dapiuno.hxx | 3 | ||||
-rw-r--r-- | sc/inc/dbcolect.hxx | 2 | ||||
-rw-r--r-- | sc/inc/document.hxx | 25 | ||||
-rw-r--r-- | sc/inc/docuno.hxx | 1 | ||||
-rw-r--r-- | sc/inc/dpcachetable.hxx | 6 | ||||
-rw-r--r-- | sc/inc/dpobject.hxx | 6 | ||||
-rw-r--r-- | sc/inc/dpsave.hxx | 1 | ||||
-rw-r--r-- | sc/inc/dptabsrc.hxx | 4 | ||||
-rw-r--r-- | sc/inc/global.hxx | 9 | ||||
-rw-r--r-- | sc/inc/markarr.hxx | 2 | ||||
-rw-r--r-- | sc/inc/olinetab.hxx | 2 | ||||
-rw-r--r-- | sc/inc/pivot.hxx | 232 | ||||
-rw-r--r-- | sc/inc/rangenam.hxx | 6 | ||||
-rw-r--r-- | sc/inc/rechead.hxx | 27 | ||||
-rw-r--r-- | sc/inc/scmatrix.hxx | 10 | ||||
-rw-r--r-- | sc/inc/stlpool.hxx | 2 | ||||
-rw-r--r-- | sc/inc/subtotal.hxx | 29 | ||||
-rw-r--r-- | sc/inc/table.hxx | 8 | ||||
-rw-r--r-- | sc/inc/validat.hxx | 2 |
29 files changed, 34 insertions, 447 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index f1859be15fcf..728f011c3cbc 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -276,7 +276,7 @@ public: {} /* Use the formula::FormulaGrammar::AddressConvention associated with rAddr::Tab() */ Details( const ScDocument* pDoc, const ScAddress & rAddr ); - void SetPos( const ScDocument* pDoc, const ScAddress & rAddr ); +//UNUSED2009-05 void SetPos( const ScDocument* pDoc, const ScAddress & rAddr ); }; SC_DLLPUBLIC static const Details detailsOOOa1; diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index 1f6c02c2d74f..5cbe1bafd290 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -110,8 +110,9 @@ public: void SetTab(SCTAB nNewTab) { nTab = nNewTab; } void SetCol(SCCOL nNewCol) { nCol = nNewCol; } - +#ifdef DBG_UTIL void TestData() const; +#endif void Reset( const ScPatternAttr* pPattern, BOOL bAlloc = TRUE ); BOOL Concat(SCSIZE nPos); diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index e7e28083dec2..47ba240f5204 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -248,8 +248,8 @@ public: const IntlWrapper* pIntl = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - BOOL GetTableList( List& aList ) const; - void SetTableList( const List& aList ); +//UNUSED2009-05 BOOL GetTableList( List& aList ) const; +//UNUSED2009-05 void SetTableList( const List& aList ); public: USHORT nCount; diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx index 10de035abf7c..1e9a8618800e 100644 --- a/sc/inc/cell.hxx +++ b/sc/inc/cell.hxx @@ -59,9 +59,6 @@ class ScCodeArray; class ScProgress; class ScPostIt; -class ScMultipleReadHeader; -class ScMultipleWriteHeader; - // ============================================================================ /** Default cell clone flags: do not start listening, do not adjust 3D refs to @@ -196,10 +193,6 @@ public: ~ScNoteCell(); #endif - ScNoteCell( SvStream& rStream, USHORT nVer ); - - void Save( SvStream& rStream ) const; - private: ScNoteCell( const ScNoteCell& ); }; diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index e2650c5652c1..b04c70eb01b3 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -40,7 +40,6 @@ class ScAddress; class Table; class ScDocument; -class ScMultipleReadHeader; // ScMemChart is a stripped-down SchMemChart from old chart, diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index b3b6e8763eb1..cd0bd47f2a32 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -100,8 +100,8 @@ public: return ppRowHeader[ nChartRow ]; return NULL; } - ScRangeListRef GetColRanges( SCCOL nChartCol ) const; - ScRangeListRef GetRowRanges( SCROW nChartRow ) const; +//UNUSED2009-05 ScRangeListRef GetColRanges( SCCOL nChartCol ) const; +//UNUSED2009-05 ScRangeListRef GetRowRanges( SCROW nChartRow ) const; }; @@ -114,7 +114,6 @@ enum ScChartGlue { }; class ScDocument; -class ScMultipleReadHeader; class ScChartPositioner // nur noch Parameter-Struct { diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 54a6570c0f1d..6707473f5610 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -89,8 +89,6 @@ enum ScChangeActionClipMode }; class SvStream; -class ScMultipleReadHeader; -class ScMultipleWriteHeader; // --- ScChangeActionLinkEntry --------------------------------------------- @@ -278,28 +276,8 @@ protected: const ScBigRange&, const ULONG nAction); - ScChangeAction( SvStream&, - ScMultipleReadHeader&, ScChangeTrack* ); virtual ~ScChangeAction(); - static void StoreCell( ScBaseCell*, SvStream&, - ScMultipleWriteHeader& ); - static ScBaseCell* LoadCell( SvStream&, ScMultipleReadHeader&, - ScDocument*, USHORT nVer ); - - static BOOL StoreLinkChain( ScChangeActionLinkEntry*, - SvStream& ); - static BOOL LoadLinkChain( ScChangeAction*, - ScChangeActionLinkEntry**, - SvStream&, ScChangeTrack*, - BOOL bLinkDeleted ); - - static BOOL StoreCellList( ScChangeActionCellListEntry*, - SvStream& ); - static BOOL LoadCellList( ScChangeAction* pOfAction, - ScChangeActionCellListEntry*&, SvStream&, - ScChangeTrack* ); - String GetRefString( const ScBigRange&, ScDocument*, BOOL bFlag3D = FALSE ) const; @@ -367,10 +345,6 @@ protected: // used in Reject() instead of IsRejectable() BOOL IsInternalRejectable() const; - virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const; - virtual BOOL StoreLinks( SvStream& ) const; - virtual BOOL LoadLinks( SvStream&, ScChangeTrack* ); - // Derived classes that hold a pointer to the // ChangeTrack must return that. Otherwise NULL. virtual const ScChangeTrack* GetChangeTrack() const = 0; @@ -491,8 +465,6 @@ class ScChangeActionIns : public ScChangeAction friend class ScChangeTrack; ScChangeActionIns( const ScRange& rRange ); - ScChangeActionIns( SvStream&, - ScMultipleReadHeader&, ScChangeTrack* ); virtual ~ScChangeActionIns(); virtual void AddContent( ScChangeActionContent* ) {} @@ -500,8 +472,6 @@ class ScChangeActionIns : public ScChangeAction virtual BOOL Reject( ScDocument* ); - virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const; - virtual const ScChangeTrack* GetChangeTrack() const { return 0; } public: @@ -586,9 +556,6 @@ class ScChangeActionDel : public ScChangeAction ScChangeActionDel( const ScRange& rRange, SCsCOL nDx, SCsROW nDy, ScChangeTrack* ); - ScChangeActionDel( SvStream&, - ScMultipleReadHeader&, ScDocument*, - USHORT nVer, ScChangeTrack* ); virtual ~ScChangeActionDel(); ScChangeActionIns* GetCutOffInsert() { return pCutOff; } @@ -607,9 +574,6 @@ class ScChangeActionDel : public ScChangeAction virtual const ScChangeTrack* GetChangeTrack() const { return pTrack; } - virtual BOOL StoreLinks( SvStream& ) const; - virtual BOOL LoadLinks( SvStream&, ScChangeTrack* ); - public: ScChangeActionDel(const ULONG nActionNumber, const ScChangeActionState eState, @@ -687,8 +651,6 @@ class ScChangeActionMove : public ScChangeAction nStartLastCut(0), nEndLastCut(0) {} - ScChangeActionMove( SvStream&, - ScMultipleReadHeader&, ScChangeTrack* ); virtual ~ScChangeActionMove(); virtual void AddContent( ScChangeActionContent* ); @@ -709,10 +671,6 @@ class ScChangeActionMove : 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* ); - protected: using ScChangeAction::GetRefString; @@ -765,10 +723,6 @@ class ScChangeActionContent : public ScChangeAction ScChangeActionContent* pNextInSlot; // in gleichem Slot ScChangeActionContent** ppPrevInSlot; - ScChangeActionContent( SvStream&, - ScMultipleReadHeader&, ScDocument*, - USHORT nVer, ScChangeTrack* ); - void InsertInSlot( ScChangeActionContent** pp ) { if ( !ppPrevInSlot ) @@ -849,10 +803,6 @@ class ScChangeActionContent : public ScChangeAction void PutValueToDoc( ScBaseCell*, const String&, ScDocument*, SCsCOL nDx, SCsROW nDy ) const; - virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const; - virtual BOOL StoreLinks( SvStream& ) const; - virtual BOOL LoadLinks( SvStream&, ScChangeTrack* ); - protected: using ScChangeAction::GetRefString; @@ -983,8 +933,6 @@ class ScChangeActionReject : public ScChangeAction SetRejectAction( nReject ); SetState( SC_CAS_ACCEPTED ); } - ScChangeActionReject( SvStream&, - ScMultipleReadHeader&, ScChangeTrack* ); virtual void AddContent( ScChangeActionContent* ) {} virtual void DeleteCellEntries() {} @@ -993,8 +941,6 @@ class ScChangeActionReject : public ScChangeAction virtual const ScChangeTrack* GetChangeTrack() const { return 0; } - virtual BOOL Store( SvStream&, ScMultipleWriteHeader& ) const; - public: ScChangeActionReject(const ULONG nActionNumber, const ScChangeActionState eState, @@ -1282,11 +1228,6 @@ public: // alter Wert aus pOldCell, Format aus Doc void AppendContent( const ScAddress& rPos, const ScBaseCell* pOldCell ); - // nachdem neuer Wert im Dokument gesetzt wurde, - // alter Wert aus pOldCell, Format aus RefDoc - void AppendContent( const ScAddress& rPos, - const ScBaseCell* pOldCell, - ScDocument* pRefDoc ); // nachdem neue Werte im Dokument gesetzt wurden, // alte Werte aus RefDoc/UndoDoc. // Alle Contents, wo im RefDoc eine Zelle steht. @@ -1313,9 +1254,6 @@ public: // bevor neuer Wert im Dokument gesetzt wird void AppendContent( const ScAddress& rPos, - const String& rNewValue ); - // bevor neuer Wert im Dokument gesetzt wird - void AppendContent( const ScAddress& rPos, const String& rNewValue, ScBaseCell* pOldCell ); diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx index de6539b08311..8f6388a86040 100644 --- a/sc/inc/collect.hxx +++ b/sc/inc/collect.hxx @@ -143,9 +143,6 @@ public: virtual ScDataObject* Clone() const; StrData* operator[]( const USHORT nIndex) const {return (StrData*)At(nIndex);} virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - - void Load( SvStream& ); - void Store( SvStream& ) const; }; //------------------------------------------------------------------------ @@ -178,9 +175,6 @@ public: private: friend class TypedScStrCollection; -#if OLD_PIVOT_IMPLEMENTATION - friend class PivotScStrCollection; -#endif String aStrValue; double nValue; diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index c66ecb960e7d..816a8ade4628 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -58,8 +58,6 @@ class ScBaseCell; class ScDocument; class ScFormulaCell; class ScMarkData; -class ScMultipleReadHeader; -class ScMultipleWriteHeader; class ScPatternAttr; class ScStyleSheet; class SvtBroadcaster; @@ -146,8 +144,8 @@ public: void SwapRow( SCROW nRow1, SCROW nRow2 ); void SwapCell( SCROW nRow, ScColumn& rCol); - BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, - BOOL bLeft, BOOL bRight ) const; +//UNUSED2009-05 BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, +//UNUSED2009-05 BOOL bLeft, BOOL bRight ) const; BOOL HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, @@ -164,7 +162,7 @@ public: SCSIZE GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const; BOOL HasDataAt(SCROW nRow) const; BOOL HasVisibleDataAt(SCROW nRow) const; - SCROW GetFirstDataPos() const; +//UNUSED2009-05 SCROW GetFirstDataPos() const; SCROW GetLastDataPos() const; SCROW GetLastVisDataPos(BOOL bNotes) const; // ohne Broadcaster SCROW GetFirstVisDataPos(BOOL bNotes) const; @@ -258,7 +256,7 @@ public: BOOL HasStringData( SCROW nRow ) const; BOOL HasValueData( SCROW nRow ) const; - USHORT GetErrorData( SCROW nRow) const; +//UNUSED2009-05 USHORT GetErrorData( SCROW nRow) const; BOOL HasStringCells( SCROW nStartRow, SCROW nEndRow ) const; /** Returns the pointer to a cell note object at the passed row. */ diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index edb0f9371788..141cb5706515 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -40,8 +40,6 @@ class ScBaseCell; class ScFormulaCell; class ScTokenArray; -class ScMultipleReadHeader; -class ScMultipleWriteHeader; class ScRangeList; @@ -285,8 +283,6 @@ public: ScConditionalFormat* GetFormat( sal_uInt32 nKey ); -//UNUSED2008-05 void ResetUsed(); - void CompileAll(); void CompileXML(); void UpdateReference( UpdateRefMode eUpdateRefMode, diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index 341300228869..c3d5db0bc72b 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -72,9 +72,6 @@ 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/dbcolect.hxx b/sc/inc/dbcolect.hxx index 2056bcb331f1..3d9d357b512b 100644 --- a/sc/inc/dbcolect.hxx +++ b/sc/inc/dbcolect.hxx @@ -42,8 +42,6 @@ //------------------------------------------------------------------------ class ScDocument; -class ScMultipleReadHeader; -class ScMultipleWriteHeader; //------------------------------------------------------------------------ diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index ea04d92b9f10..070397ff5bb5 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -99,10 +99,6 @@ class ScFormulaCell; class ScMarkData; class ScOutlineTable; class ScPatternAttr; -#if OLD_PIVOT_IMPLEMENTATION -class ScPivot; -class ScPivotCollection; -#endif class ScPrintRangeSaver; class ScRangeData; class ScRangeName; @@ -237,9 +233,6 @@ friend class ScHorizontalAttrIterator; friend class ScDocAttrIterator; friend class ScAttrRectIterator; friend class ScDocShell; -#if OLD_PIVOT_IMPLEMENTATION -friend class ScPivot; -#endif private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager; @@ -261,9 +254,6 @@ private: ScTable* pTab[MAXTABCOUNT]; ScRangeName* pRangeName; ScDBCollection* pDBCollection; -#if OLD_PIVOT_IMPLEMENTATION - ScPivotCollection* pPivotCollection; -#endif ScDPCollection* pDPCollection; ScChartCollection* pChartCollection; std::auto_ptr< ScTemporaryChartLock > apTemporaryChartLock; @@ -497,11 +487,6 @@ public: SC_DLLPUBLIC 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 SC_DLLPUBLIC ScChartCollection* GetChartCollection() const; void StopTemporaryChartLock(); @@ -724,8 +709,8 @@ public: BOOL HasSubTotalCells( const ScRange& rRange ); SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, BOOL bForceTab = FALSE ); - SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, - ULONG nFormatIndex, BOOL bForceTab = FALSE); +//UNUSED2009-05 SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, +//UNUSED2009-05 ULONG nFormatIndex, BOOL bForceTab = FALSE); SC_DLLPUBLIC void PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, BOOL bForceTab = FALSE ); SC_DLLPUBLIC void PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, @@ -1347,8 +1332,8 @@ public: SC_DLLPUBLIC void ClearPrintRanges( SCTAB nTab ); /** Adds a new print ranges. */ SC_DLLPUBLIC void AddPrintRange( SCTAB nTab, const ScRange& rNew ); - /** Removes all old print ranges and sets the passed print ranges. */ - void SetPrintRange( SCTAB nTab, const ScRange& rNew ); +//UNUSED2009-05 /** Removes all old print ranges and sets the passed print ranges. */ +//UNUSED2009-05 void SetPrintRange( SCTAB nTab, const ScRange& rNew ); /** Marks the specified sheet to be printed completely. Deletes old print ranges on the sheet! */ SC_DLLPUBLIC void SetPrintEntireSheet( SCTAB nTab ); SC_DLLPUBLIC void SetRepeatColRange( SCTAB nTab, const ScRange* pNew ); @@ -1685,7 +1670,7 @@ public: SC_DLLPUBLIC SfxItemPool* GetEnginePool() const; SC_DLLPUBLIC ScFieldEditEngine& GetEditEngine(); SC_DLLPUBLIC ScNoteEditEngine& GetNoteEngine(); - SfxItemPool& GetNoteItemPool(); +//UNUSED2009-05 SfxItemPool& GetNoteItemPool(); ScRefreshTimerControl* GetRefreshTimerControl() const { return pRefreshTimerControl; } diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index defe627dd812..c4b6413c7d58 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -127,7 +127,6 @@ public: void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL ); - ScDrawLayer* MakeDrawLayer(); void BeforeXMLLoading(); void AfterXMLLoading(sal_Bool bRet); diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx index 93cd12c4c937..2115eab7cc42 100644 --- a/sc/inc/dpcachetable.hxx +++ b/sc/inc/dpcachetable.hxx @@ -176,11 +176,6 @@ public: const String* getFieldName(sal_Int32 nIndex) const; - /** Get the field index (i.e. column ID in the original data source) based - on the string value that corresponds with the column title. It returns - -1 if no field matching the string value exists. */ - sal_Int32 getFieldIndex(const String& rStr) const; - /** Get the unique entries for a field specified by index. The caller must make sure that the table is filled before calling function, or it will get an empty collection. */ @@ -194,7 +189,6 @@ public: const ::std::hash_set<sal_Int32>& rRepeatIfEmptyDims); void clear(); - void swap(ScDPCacheTable& rOther); bool empty() const; private: diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index a2e8c3f9e7e2..ef7a2c491c50 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -58,8 +58,6 @@ class Rectangle; class SvStream; class ScDPSaveData; class ScDPOutput; -class ScMultipleReadHeader; -class ScMultipleWriteHeader; class ScPivot; class ScPivotCollection; struct ScPivotParam; @@ -298,9 +296,7 @@ public: virtual ScDataObject* Clone() const; ScDPObject* operator[](USHORT nIndex) const {return (ScDPObject*)At(nIndex);} -#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 ); diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index e8a7420ffcbc..86093ac8614b 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -137,7 +137,6 @@ public: void SetName( const String& rNew ); // used if the source dim was renamed (groups) void SetOrientation(USHORT nNew); - void SetSubTotals(BOOL bSet); // to be removed! void SetSubTotals(long nCount, const USHORT* pFuncs); long GetSubTotalsCount() const { return nSubTotalCount; } USHORT GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; } diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 2293135f9c11..94229f5b1d35 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -192,7 +192,7 @@ public: ScDPDimensions* GetDimensionsObject(); - void DumpState( ScDocument* pDoc, const ScAddress& rPos ); +//UNUSED2009-05 void DumpState( ScDocument* pDoc, const ScAddress& rPos ); // XDimensionsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > @@ -441,7 +441,7 @@ public: const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const; - BOOL IsValidPage( const ScDPItemData& rData ); +//UNUSED2009-05 BOOL IsValidPage( const ScDPItemData& rData ); }; class ScDPHierarchies : public cppu::WeakImplHelper2< diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 69b0fc99aa8a..0de72ccf77f3 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -86,13 +86,6 @@ 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 - //------------------------------------------------------------------------ // die 1000 Namen des Calc... @@ -465,7 +458,7 @@ struct ScImportParam ScImportParam& operator= ( const ScImportParam& r ); BOOL operator== ( const ScImportParam& r ) const; - void Clear (); +//UNUSED2009-05 void Clear (); }; struct ScStringHashCode diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx index 83a218887508..84d7a9d88a1a 100644 --- a/sc/inc/markarr.hxx +++ b/sc/inc/markarr.hxx @@ -65,7 +65,7 @@ public: void CopyMarksTo( ScMarkArray& rDestMarkArray ) const; BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; - void DeleteArea(SCROW nStartRow, SCROW nEndRow); +//UNUSED2009-05 void DeleteArea(SCROW nStartRow, SCROW nEndRow); /// Including current row, may return -1 if bUp and not found SCsROW GetNextMarked( SCsROW nRow, BOOL bUp ) const; diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx index 59846d7717a0..4d42accdf729 100644 --- a/sc/inc/olinetab.hxx +++ b/sc/inc/olinetab.hxx @@ -39,8 +39,6 @@ #define SC_OL_MAXDEPTH 7 class SvStream; -class ScMultipleReadHeader; -class ScMultipleWriteHeader; class ScOutlineEntry : public ScDataObject diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index eb70f50e70f2..100463cb5542 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -66,20 +66,9 @@ 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; class ScUserListData; -class ScMultipleReadHeader; -class ScMultipleWriteHeader; class ScProgress; struct ScDPLabelData; @@ -127,7 +116,7 @@ struct ScPivotParam ScPivotParam& operator= ( const ScPivotParam& r ); BOOL operator== ( const ScPivotParam& r ) const; - void Clear (); +//UNUSED2009-05 void Clear (); void ClearPivotArrays(); void SetLabelData (const ::std::vector<ScDPLabelDataRef>& r); void SetPivotArrays ( const PivotField* pPageArr, @@ -142,228 +131,9 @@ struct ScPivotParam // ----------------------------------------------------------------------- -#if OLD_PIVOT_IMPLEMENTATION -struct PivotColRef -{ - SCSIZE nDataIndex; - SCSIZE nRecCount; - USHORT nFuncMask; - SCSIZE nIndex; - - PivotColRef() - { - nDataIndex = nRecCount = nIndex = 0; - nFuncMask = PIVOT_FUNC_NONE; - } -}; -#endif - typedef PivotField PivotFieldArr[PIVOT_MAXFIELD]; typedef PivotField PivotPageFieldArr[PIVOT_MAXPAGEFIELD]; -#if OLD_PIVOT_IMPLEMENTATION -class PivotScStrCollection : public ScStrCollection -{ - ScUserListData* pUserData; -public: - PivotScStrCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : - ScStrCollection ( nLim, nDel, bDup ), - pUserData (NULL) { } - PivotScStrCollection(const PivotScStrCollection& rPivotScStrCollection) : - ScStrCollection ( rPivotScStrCollection ), - pUserData ( rPivotScStrCollection.pUserData) {} - - virtual ScDataObject* Clone() const; - virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - - TypedStrData* operator[]( const USHORT nIndex) const - { return (TypedStrData*)At(nIndex); } - void SetUserData(ScUserListData* pData) - { pUserData = pData; } - const String& GetString(USHORT nIndex) - { return ((TypedStrData*)At(nIndex))->GetString(); } - USHORT GetIndex(TypedStrData* pData) const; -}; - -class ScPivot : public ScDataObject -{ - ScDocument* pDoc; - ScQueryParam aQuery; - BOOL bHasHeader; - - BOOL bIgnoreEmpty; // Flags aus Dialog - BOOL bDetectCat; - BOOL bMakeTotalCol; - BOOL bMakeTotalRow; - - String aName; - String aTag; - SCSIZE nColNameCount; - String* pColNames; // Array - - SCCOL nSrcCol1; - SCROW nSrcRow1; - SCCOL nSrcCol2; - SCROW nSrcRow2; - SCTAB nSrcTab; - - SCCOL nDestCol1; - SCROW nDestRow1; - SCCOL nDestCol2; - SCROW nDestRow2; - SCTAB nDestTab; - - SCCOL nDataStartCol; - SCROW nDataStartRow; - - SCSIZE nColCount; - SCSIZE nRowCount; - SCSIZE nDataCount; - - PivotFieldArr aColArr; - PivotFieldArr aRowArr; - PivotFieldArr aDataArr; - - PivotScStrCollection* pColList[PIVOT_MAXFIELD]; // pro Zeile alle Eintraege - PivotScStrCollection* pRowList[PIVOT_MAXFIELD]; - PivotScStrCollection* pDataList; // Shortcut auf Col/RowList mit Daten - - SubTotal** ppDataArr; - SCSIZE nDataColCount; - SCSIZE nDataRowCount; - SCSIZE nRowIndex; - SCSIZE nColIndex; - SCSIZE nDataIndex; - SCSIZE nRecCount; - - PivotColRef* pColRef; - - BOOL bValidArea; - BOOL bDataAtCol; - -public: - ScPivot(ScDocument* pDocument); - ScPivot(const ScPivot& rPivot); - ~ScPivot(); - - virtual ScDataObject* Clone() const; - - ScPivot* CreateNew() const; - - BOOL Load(SvStream& rStream, ScMultipleReadHeader& rHdr ); - BOOL Store(SvStream& rStream, ScMultipleWriteHeader& rHdr ) const; - - void SetQuery(const ScQueryParam& rQuery); - void GetQuery(ScQueryParam& rQuery) const; - - void SetHeader(BOOL bHeader); - BOOL GetHeader() const; - void SetIgnoreEmpty(BOOL bIgnore); - BOOL GetIgnoreEmpty() const; - void SetDetectCat(BOOL bDetect); - BOOL GetDetectCat() const; - void SetMakeTotalCol(BOOL bSet); - BOOL GetMakeTotalCol() const; - void SetMakeTotalRow(BOOL bSet); - BOOL GetMakeTotalRow() const; - - void SetName(const String& rNew); - const String& GetName() const; - void SetTag(const String& rNew); - const String& GetTag() const; - - void SetSrcArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab); - void GetSrcArea(SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2, SCTAB& rTab) const; - ScRange GetSrcArea() const; - - void SetDestPos(SCCOL nCol, SCROW nRow, SCTAB nTab); - void GetDestArea(SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2, SCTAB& rTab) const; - ScRange GetDestArea() const; - - void SetColFields(const PivotField* pFieldArr, SCSIZE nCount); - void GetColFields(PivotField* pFieldArr, SCSIZE& rCount) const; - SCSIZE GetColFieldCount() const { return nColCount; } - - void SetRowFields(const PivotField* pFieldArr, SCSIZE nCount); - void GetRowFields(PivotField* pFieldArr, SCSIZE& rCount) const; - SCSIZE GetRowFieldCount() const { return nRowCount; } - - void SetDataFields(const PivotField* pFieldArr, SCSIZE nCount); - void GetDataFields(PivotField* pFieldArr, SCSIZE& rCount) const; - - void GetParam( ScPivotParam& rParam, ScQueryParam& rQuery, ScArea& rSrcArea ) const; - void SetParam( const ScPivotParam& rParam, const ScQueryParam& rQuery, - const ScArea& rSrcArea ); - - BOOL CreateData(BOOL bKeepDest = FALSE); - void DrawData(); - void ReleaseData(); - - BOOL IsPivotAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; - BOOL IsFilterAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; - BOOL GetColFieldAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, SCCOL& rField) const; - BOOL GetRowFieldAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, SCCOL& rField) const; - - // Referenz-Anpassung: - - void MoveSrcArea( SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab ); - void MoveDestArea( SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab ); - void ExtendSrcArea( SCCOL nNewEndCol, SCROW nNewEndRow ); - -private: - BOOL CreateFields(); - void CreateFieldData(); - void CalcArea(); - - void SetDataLine(SCCOL nCol, SCROW nRow, SCTAB nTab, SCSIZE nRIndex); - void SetFuncLine(SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nFunc, SCSIZE nIndex, SCSIZE nStartRIndex, SCSIZE nEndRIndex); - void ColToTable(SCSIZE nField, SCROW& nRow, ScProgress& rProgress); - void RowToTable(SCSIZE nField, SCCOL& nCol); - void SetFrame(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nWidth = 20); - void SetFrameHor(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - void SetFrameVer(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - void SetFontBold(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - void SetJustifyLeft(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - void SetJustifyRight(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - void SetStyle(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nId); - void SetButton(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - void SetValue(SCCOL nCol, SCROW nRow, const SubTotal& rTotal, USHORT nFunc); - SCROW GetCategoryRow( SCCOL nCol, SCROW nRow ); -}; - -//------------------------------------------------------------------------ -class ScPivotCollection : public ScCollection -{ - -private: - ScDocument* pDoc; -public: - ScPivotCollection(USHORT nLim = 4, USHORT nDel = 4, ScDocument* pDocument = NULL) : - ScCollection ( nLim, nDel), - pDoc ( pDocument ) {} - ScPivotCollection(const ScPivotCollection& rScPivotCollection) : - ScCollection ( rScPivotCollection ), - pDoc ( rScPivotCollection.pDoc ) {} - - virtual ScDataObject* Clone() const; - ScPivot* operator[]( const USHORT nIndex) const {return (ScPivot*)At(nIndex);} - ScPivot* GetPivotAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; - - BOOL Load( SvStream& rStream ); - BOOL Store( SvStream& rStream ) const; - - void UpdateReference(UpdateRefMode eUpdateRefMode, - SCCOL nCol1, SCROW nRow1, SCTAB nTab1, - SCCOL nCol2, SCROW nRow2, SCTAB nTab2, - SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - - BOOL operator==(const ScPivotCollection& rCmp) const; - - String CreateNewName( USHORT nMin = 1 ) const; -}; -#endif - //------------------------------------------------------------------------ struct ScDPLabelData diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 002adf9b77ce..2c6f706ff403 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -40,8 +40,6 @@ //------------------------------------------------------------------------ class ScDocument; -class ScMultipleReadHeader; -class ScMultipleWriteHeader; namespace rtl { class OUStringBuffer; @@ -146,7 +144,7 @@ public: BOOL IsReference( ScRange& rRef, const ScAddress& rPos ) const; BOOL IsValidReference( ScRange& rRef ) const; - BOOL IsRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; +//UNUSED2009-05 BOOL IsRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; BOOL IsRangeAtBlock( const ScRange& ) const; void UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable); @@ -203,7 +201,7 @@ public: virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; - ScRangeData* GetRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; +//UNUSED2009-05 ScRangeData* GetRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& ) const; SC_DLLPUBLIC BOOL SearchName( const String& rName, USHORT& rPos ) const; diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx index 14be3ddcb325..a9e8a5cacd53 100644 --- a/sc/inc/rechead.hxx +++ b/sc/inc/rechead.hxx @@ -130,33 +130,6 @@ class SvStream; // ----------------------------------------------------------------------- -// "Automatischer" Record-Header mit Groessenangabe - -class ScReadHeader -{ -private: - SvStream& rStream; - ULONG nDataEnd; - -public: - ScReadHeader(SvStream& rNewStream); - ~ScReadHeader(); - - ULONG BytesLeft() const; -}; - -class ScWriteHeader -{ -private: - SvStream& rStream; - ULONG nDataPos; - sal_uInt32 nDataSize; - -public: - ScWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault = 0); - ~ScWriteHeader(); -}; - // Header mit Groessenangaben fuer mehrere Objekte class ScMultipleReadHeader diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index 140d3dfe4c4a..7f3b5443d9d9 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -401,11 +401,11 @@ 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 or equal to the mRes matrix - dimensions. - */ - void MatCopyUpperLeft( ScMatrix& mRes) const; +//UNUSED2009-05 /** Copy upper left of this matrix to mRes matrix. +//UNUSED2009-05 This matrix's dimensions must be greater or equal to the mRes matrix +//UNUSED2009-05 dimensions. +//UNUSED2009-05 */ +//UNUSED2009-05 void MatCopyUpperLeft( ScMatrix& mRes) const; // Convert ScInterpreter::CompareMat values (-1,0,1) to boolean values void CompareEqual(); diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index 86db2815a0d8..1028bb5f7673 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -63,7 +63,7 @@ public: ScStyleSheet* FindCaseIns( const String& rName, SfxStyleFamily eFam ); - void SetForceStdName( const String* pSet ); +//UNUSED2009-05 void SetForceStdName( const String* pSet ); const String* GetForceStdName() const { return pForceStdName; } virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam, diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx index adc604151f35..92e03e140288 100644 --- a/sc/inc/subtotal.hxx +++ b/sc/inc/subtotal.hxx @@ -35,35 +35,6 @@ class SubTotal { -#if OLD_PIVOT_IMPLEMENTATION -private: - long nCount; - long nCount2; - double nSum; - double nSumSqr; - double nMax; - double nMin; - double nProduct; - BOOL bSumOk; - BOOL bSumSqrOk; - BOOL bProductOk; - USHORT nProgress; - -public: - SCSIZE nIndex; // Test - -public: - SubTotal(); - ~SubTotal(); - - void UpdateNoVal(); - void Update( double nVal ); - void Update( const SubTotal& rVal ); - - 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); diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 0c6233e5fb98..1eb15ebc6cb7 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -256,7 +256,7 @@ public: BOOL IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const; void PutCell( const ScAddress&, ScBaseCell* pCell ); - void PutCell( const ScAddress&, ULONG nFormatIndex, ScBaseCell* pCell); +//UNUSED2009-05 void PutCell( const ScAddress&, ULONG nFormatIndex, ScBaseCell* pCell); void PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell ); void PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell); // TRUE = Zahlformat gesetzt @@ -460,7 +460,7 @@ public: const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const; - BOOL HasLines( const ScRange& rRange, Rectangle& rSizes ) const; +//UNUSED2009-05 BOOL HasLines( const ScRange& rRange, Rectangle& rSizes ) const; BOOL HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nMask ) const; BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, @@ -543,8 +543,8 @@ public: void ClearPrintRanges(); /** Adds a new print ranges. */ void AddPrintRange( const ScRange& rNew ); - /** Removes all old print ranges and sets the passed print ranges. */ - void SetPrintRange( const ScRange& rNew ); +//UNUSED2009-05 /** Removes all old print ranges and sets the passed print ranges. */ +//UNUSED2009-05 void SetPrintRange( const ScRange& rNew ); /** Marks the specified sheet to be printed completely. Deletes old print ranges! */ void SetPrintEntireSheet(); diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index cea9c154f04a..e41d81990378 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -200,8 +200,6 @@ public: ScValidationData* GetData( sal_uInt32 nKey ); - void ResetUsed(); - void CompileXML(); void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); |