diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-04-23 05:23:50 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-24 23:39:56 +0200 |
commit | f2431c944376433219eb7eb704e9b21589f201f5 (patch) | |
tree | da6cf07070e1116a4ed1a0259b8a2f096987eebc | |
parent | 96475ada3fcf026ae7833824a056b642c1bd1864 (diff) |
add undo action for conditional formatting, cp#1000050, fdo#77381
Change-Id: I11db1e5824077135c4352ae43cc0e8d139244268
-rw-r--r-- | sc/inc/globstr.hrc | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 40 | ||||
-rw-r--r-- | sc/source/ui/inc/undoblk.hxx | 22 | ||||
-rw-r--r-- | sc/source/ui/src/globstr.src | 5 | ||||
-rw-r--r-- | sc/source/ui/undo/undoblk.cxx | 52 |
5 files changed, 120 insertions, 3 deletions
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 845694497a0f..0b2a6606b2d7 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -692,7 +692,9 @@ #define STR_PRINT_PREVIEW_NODATA 529 #define STR_PRINT_PREVIEW_EMPTY_RANGE 530 -#define SC_GLOBSTR_STR_COUNT 531 /**< the count of permanently resident strings */ +#define STR_UNDO_CONDFORMAT 531 + +#define SC_GLOBSTR_STR_COUNT 532 /**< the count of permanently resident strings */ #endif diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 5950a9ddd111..9a9daa3f42d7 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -5302,6 +5302,31 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor if(pDoc->IsTabProtected(nTab)) return; + bool bUndo = pDoc->IsUndoEnabled(); + ScDocument* pUndoDoc = NULL; + ScRange aCombinedRange = rRanges.Combine(); + ScRange aCompleteRange; + if(bUndo) + { + pUndoDoc = new ScDocument(SCDOCMODE_UNDO); + pUndoDoc->InitUndo( pDoc, nTab, nTab ); + + if(pFormat) + { + aCompleteRange = aCombinedRange; + } + if(nOldFormat) + { + ScConditionalFormat* pOldFormat = pDoc->GetCondFormList(nTab)->GetFormat(nOldFormat); + if(pOldFormat) + aCompleteRange.ExtendTo(pOldFormat->GetRange().Combine()); + } + + pDoc->CopyToDocument( aCompleteRange.aStart.Col(),aCompleteRange.aStart.Row(),nTab, + aCompleteRange.aEnd.Col(),aCompleteRange.aEnd.Row(),nTab, + IDF_ALL, false, pUndoDoc ); + } + boost::scoped_ptr<ScRange> pRepaintRange; if(nOldFormat) { @@ -5318,9 +5343,9 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor if(pFormat) { if(pRepaintRange) - pRepaintRange->ExtendTo(rRanges.Combine()); + pRepaintRange->ExtendTo(aCombinedRange); else - pRepaintRange.reset(new ScRange(rRanges.Combine())); + pRepaintRange.reset(new ScRange(aCombinedRange)); sal_uLong nIndex = pDoc->AddCondFormat(pFormat, nTab); @@ -5328,6 +5353,17 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor pDoc->SetStreamValid(nTab, false); } + if(bUndo) + { + ScDocument* pRedoDoc = new ScDocument(SCDOCMODE_UNDO); + pRedoDoc->InitUndo( pDoc, nTab, nTab ); + pDoc->CopyToDocument( aCompleteRange.aStart.Col(),aCompleteRange.aStart.Row(),nTab, + aCompleteRange.aEnd.Col(),aCompleteRange.aEnd.Row(),nTab, + IDF_ALL, false, pRedoDoc ); + rDocShell.GetUndoManager()->AddUndoAction( + new ScUndoConditionalFormat(&rDocShell, pUndoDoc, pRedoDoc, aCompleteRange)); + } + if(pRepaintRange) rDocShell.PostPaint(*pRepaintRange, PAINT_GRID); diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index d619e5b03c7c..40af6cc415b4 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -636,6 +636,28 @@ private: void DoChange( ScDocument* pSrcDoc ) const; }; +class ScUndoConditionalFormat : public ScSimpleUndo +{ +public: + TYPEINFO_OVERRIDE(); + ScUndoConditionalFormat( ScDocShell* pNewDocShell, + ScDocument* pUndoDoc, ScDocument* pRedoDoc, const ScRange& rRange); + virtual ~ScUndoConditionalFormat(); + + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + + virtual OUString GetComment() const SAL_OVERRIDE; + +private: + void DoChange(ScDocument* pDoc); + boost::scoped_ptr<ScDocument> mpUndoDoc; + boost::scoped_ptr<ScDocument> mpRedoDoc; + ScRange maRange; +}; + class ScUndoUseScenario: public ScSimpleUndo { diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index b55ae11d1db6..3d167fdef221 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -2071,6 +2071,11 @@ Resource RID_GLOBSTR { Text [ en-US ] = "Print Range Empty"; }; + + String STR_UNDO_CONDFORMAT + { + Text [ en-US ] = "Conditional Format"; + }; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 8496fc236b2f..4472e94ba5dd 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -61,6 +61,7 @@ TYPEINIT1(ScUndoCut, ScBlockUndo); TYPEINIT1(ScUndoPaste, SfxUndoAction); TYPEINIT1(ScUndoDragDrop, SfxUndoAction); TYPEINIT1(ScUndoListNames, SfxUndoAction); +TYPEINIT1(ScUndoConditionalFormat, SfxUndoAction); TYPEINIT1(ScUndoUseScenario, SfxUndoAction); TYPEINIT1(ScUndoSelectionStyle, SfxUndoAction); TYPEINIT1(ScUndoEnterMatrix, ScBlockUndo); @@ -1430,6 +1431,57 @@ bool ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const return rTarget.ISA(ScTabViewTarget); } +ScUndoConditionalFormat::ScUndoConditionalFormat(ScDocShell* pNewDocShell, + ScDocument* pUndoDoc, ScDocument* pRedoDoc, const ScRange& rRange): + ScSimpleUndo( pNewDocShell ), + mpUndoDoc(pUndoDoc), + mpRedoDoc(pRedoDoc), + maRange(rRange) +{ +} + +ScUndoConditionalFormat::~ScUndoConditionalFormat() +{ +} + +OUString ScUndoConditionalFormat::GetComment() const +{ + return ScGlobal::GetRscString( STR_UNDO_CONDFORMAT ); +} + +void ScUndoConditionalFormat::Undo() +{ + DoChange(mpUndoDoc.get()); +} + +void ScUndoConditionalFormat::Redo() +{ + DoChange(mpRedoDoc.get()); +} + +void ScUndoConditionalFormat::DoChange(ScDocument* pSrcDoc) +{ + ScDocument* pDoc = pDocShell->GetDocument(); + + pDoc->DeleteAreaTab( maRange, IDF_ALL ); + pSrcDoc->CopyToDocument( maRange, IDF_ALL, false, pDoc ); + pDocShell->PostPaint( maRange, PAINT_GRID ); + pDocShell->PostDataChanged(); + ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); + if (pViewShell) + pViewShell->CellContentChanged(); +} + +void ScUndoConditionalFormat::Repeat(SfxRepeatTarget& ) +{ +} + +bool ScUndoConditionalFormat::CanRepeat(SfxRepeatTarget& ) const +{ + return false; +} + + ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell, const ScMarkData& rMark, /*C*/ const ScArea& rDestArea, |