diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-05-23 01:14:47 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-05-24 12:38:11 +0200 |
commit | 655d61042f5b6130643d2dde3cd46e4e4d3bbb2b (patch) | |
tree | 34227fb45a7c2bf064770b4d14cdacd05a68f342 /sc/source/ui/undo | |
parent | 99f61e9b635a7c30f28192c01a534acb1e2a6ca3 (diff) |
make color formats and conditional formats a sheet property
TODO:
- UNO needs some love to accept this change
- we need a new uno interface for conditional formats in 4.0
- copy/paste
- undo/redo
Change-Id: I2c8a233888a95c7298dfb151d1c12b6a6a58520d
Diffstat (limited to 'sc/source/ui/undo')
-rw-r--r-- | sc/source/ui/undo/refundo.cxx | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sc/source/ui/undo/refundo.cxx b/sc/source/ui/undo/refundo.cxx index 1d2d2bc62fc3..2b55c3258c98 100644 --- a/sc/source/ui/undo/refundo.cxx +++ b/sc/source/ui/undo/refundo.cxx @@ -41,7 +41,6 @@ #include "pivot.hxx" #include "chartarr.hxx" #include "stlpool.hxx" -#include "conditio.hxx" #include "detdata.hxx" #include "prnsave.hxx" #include "chartlis.hxx" @@ -67,9 +66,6 @@ ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) : ScDPCollection* pOldDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const pDPCollection = pOldDP ? new ScDPCollection(*pOldDP) : NULL; - ScConditionalFormatList* pOldCond = pDoc->GetCondFormList(); - pCondFormList = pOldCond ? new ScConditionalFormatList(*pOldCond) : NULL; - ScDetOpList* pOldDetOp = pDoc->GetDetOpList(); pDetOpList = pOldDetOp ? new ScDetOpList(*pOldDetOp) : 0; @@ -89,7 +85,6 @@ ScRefUndoData::~ScRefUndoData() delete pRangeName; delete pPrintRanges; delete pDPCollection; - delete pCondFormList; delete pDetOpList; delete pChartListenerCollection; delete pAreaLinks; @@ -126,13 +121,6 @@ void ScRefUndoData::DeleteUnchanged( const ScDocument* pDoc ) DELETEZ(pDPCollection); } - if (pCondFormList) - { - ScConditionalFormatList* pNewCond = pDoc->GetCondFormList(); - if ( pNewCond && *pCondFormList == *pNewCond ) - DELETEZ(pCondFormList); - } - if (pDetOpList) { ScDetOpList* pNewDetOp = pDoc->GetDetOpList(); @@ -182,8 +170,6 @@ void ScRefUndoData::DoUndo( ScDocument* pDoc, sal_Bool bUndoRefFirst ) pDPCollection->WriteRefsTo( *pDocDP ); } - if (pCondFormList) - pDoc->SetCondFormList( new ScConditionalFormatList(*pCondFormList) ); if (pDetOpList) pDoc->SetDetOpList( new ScDetOpList(*pDetOpList) ); |