summaryrefslogtreecommitdiff
path: root/sc/source/ui/undo/refundo.cxx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-09-30 05:48:28 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-09-30 05:48:28 +0000
commit716636d558e9cc9b910da6d127314d2b20cdf0b6 (patch)
treed266019c3c89a0649074f3290439d74010ec618c /sc/source/ui/undo/refundo.cxx
parentabda8e12d8cd23c2cd1bb870b097eddfdee38825 (diff)
CWS-TOOLING: integrate CWS koheicoderemoval
Diffstat (limited to 'sc/source/ui/undo/refundo.cxx')
-rw-r--r--sc/source/ui/undo/refundo.cxx10
1 files changed, 9 insertions, 1 deletions
diff --git a/sc/source/ui/undo/refundo.cxx b/sc/source/ui/undo/refundo.cxx
index 9e7cfe572489..85bf65179bd8 100644
--- a/sc/source/ui/undo/refundo.cxx
+++ b/sc/source/ui/undo/refundo.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: refundo.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.32.1 $
*
* This file is part of OpenOffice.org.
*
@@ -66,8 +66,10 @@ ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) :
pPrintRanges = pDoc->CreatePrintRangeSaver(); // neu erzeugt
+#if OLD_PIVOT_IMPLEMENTATION
ScPivotCollection* pOldPivot = pDoc->GetPivotCollection();
pPivotCollection = pOldPivot ? new ScPivotCollection(*pOldPivot) : NULL;
+#endif
//! bei Pivot nur Bereiche merken ???
ScDPCollection* pOldDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const
@@ -94,7 +96,9 @@ ScRefUndoData::~ScRefUndoData()
delete pDBCollection;
delete pRangeName;
delete pPrintRanges;
+#if OLD_PIVOT_IMPLEMENTATION
delete pPivotCollection;
+#endif
delete pDPCollection;
delete pCondFormList;
delete pDetOpList;
@@ -126,12 +130,14 @@ void ScRefUndoData::DeleteUnchanged( const ScDocument* pDoc )
delete pNewRanges;
}
+#if OLD_PIVOT_IMPLEMENTATION
if (pPivotCollection)
{
ScPivotCollection* pNewPivot = pDoc->GetPivotCollection();
if ( pNewPivot && *pPivotCollection == *pNewPivot )
DELETEZ(pPivotCollection);
}
+#endif
if (pDPCollection)
{
@@ -189,8 +195,10 @@ void ScRefUndoData::DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst )
if (pPrintRanges)
pDoc->RestorePrintRanges(*pPrintRanges);
+#if OLD_PIVOT_IMPLEMENTATION
if (pPivotCollection)
pDoc->SetPivotCollection( new ScPivotCollection(*pPivotCollection) );
+#endif
if (pDPCollection)
{