Share undo doc creation code.

Change-Id: I55f27b61637ba0284479c63c2fa48b0bd8938c0f

sc/source/ui/docshell/docfunc.cxx

@@ -628,42 +628,8 @@ bool ScDocFunc::DeleteContents( const ScMarkData& rMark, InsertDeleteFlags nFlag
 
     if ( bRecord )
     {
-        pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-        pUndoDoc->InitUndo( &rDoc, aMarkRange.aStart.Tab(), aMarkRange.aEnd.Tab() );
-
-        //  bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument
-        //  nur mit IDF_HARDATTR zu langsam ist:
-        InsertDeleteFlags nUndoDocFlags = nFlags;
-        if (nFlags & IDF_ATTRIB)
-            nUndoDocFlags |= IDF_ATTRIB;
-        if (nFlags & IDF_EDITATTR)          // Edit-Engine-Attribute
-            nUndoDocFlags |= IDF_STRING;    // -> Zellen werden geaendert
-        if (nFlags & IDF_NOTE)
-            nUndoDocFlags |= IDF_CONTENTS;  // copy all cells with their notes
-        // note captions are handled in drawing undo
-        nUndoDocFlags |= IDF_NOCAPTIONS;
-        rDoc.CopyToDocument( aExtendedRange, nUndoDocFlags, bMulti, pUndoDoc, &aMultiMark );
-
-        pDataSpans.reset(new ScSimpleUndo::DataSpansType);
-
-        ScMarkData::iterator it = aMultiMark.begin(), itEnd = aMultiMark.end();
-        for (; it != itEnd; ++it)
-        {
-            SCTAB nTab = *it;
-
-            SCCOL nCol1 = aMarkRange.aStart.Col(), nCol2 = aMarkRange.aEnd.Col();
-            SCROW nRow1 = aMarkRange.aStart.Row(), nRow2 = aMarkRange.aEnd.Row();
-
-            std::pair<ScSimpleUndo::DataSpansType::iterator,bool> r =
-                pDataSpans->insert(nTab, new sc::ColumnSpanSet(false));
-
-            if (r.second)
-            {
-                ScSimpleUndo::DataSpansType::iterator it2 = r.first;
-                sc::ColumnSpanSet* pSet = it2->second;
-                pSet->scan(rDoc, nTab, nCol1, nRow1, nCol2, nRow2, true);
-            }
-        }
+        pUndoDoc = sc::DocFuncUtil::createDeleteContentsUndoDoc(rDoc, aMultiMark, aMarkRange, nFlags, bMulti);
+        pDataSpans.reset(sc::DocFuncUtil::getNonEmptyCellSpans(rDoc, aMultiMark, aMarkRange));
     }
 
     rDoc.DeleteSelection( nFlags, aMultiMark );

sc/source/ui/docshell/docfuncutil.cxx

@@ -20,6 +20,10 @@
 #include <docfuncutil.hxx>
 #include <document.hxx>
 #include <markdata.hxx>
+#include <undobase.hxx>
+#include <global.hxx>
+
+#include <memory>
 
 namespace sc {
 
@@ -34,6 +38,63 @@ bool DocFuncUtil::hasProtectedTab( const ScDocument& rDoc, const ScMarkData& rMa
     return false;
 }
 
+ScDocument* DocFuncUtil::createDeleteContentsUndoDoc(
+    ScDocument& rDoc, const ScMarkData& rMark, const ScRange& rRange,
+    InsertDeleteFlags nFlags, bool bOnlyMarked )
+{
+    std::unique_ptr<ScDocument> pUndoDoc(new ScDocument(SCDOCMODE_UNDO));
+    SCTAB nTab = rRange.aStart.Tab();
+    pUndoDoc->InitUndo(&rDoc, nTab, nTab);
+    SCTAB nTabCount = rDoc.GetTableCount();
+    ScMarkData::const_iterator itr = rMark.begin(), itrEnd = rMark.end();
+    for (; itr != itrEnd; ++itr)
+        if (*itr != nTab)
+            pUndoDoc->AddUndoTab( *itr, *itr );
+    ScRange aCopyRange = rRange;
+    aCopyRange.aStart.SetTab(0);
+    aCopyRange.aEnd.SetTab(nTabCount-1);
+
+    //  in case of "Format/Standard" copy all attributes, because CopyToDocument
+    //  with IDF_HARDATTR only is too time-consuming:
+    InsertDeleteFlags nUndoDocFlags = nFlags;
+    if (nFlags & IDF_ATTRIB)
+        nUndoDocFlags |= IDF_ATTRIB;
+    if (nFlags & IDF_EDITATTR)          // Edit-Engine-Attribute
+        nUndoDocFlags |= IDF_STRING;    // -> cells will be changed
+    if (nFlags & IDF_NOTE)
+        nUndoDocFlags |= IDF_CONTENTS;  // copy all cells with their notes
+    // do not copy note captions to undo document
+    nUndoDocFlags |= IDF_NOCAPTIONS;
+    rDoc.CopyToDocument(aCopyRange, nUndoDocFlags, bOnlyMarked, pUndoDoc.get(), &rMark);
+
+    return pUndoDoc.release();
+}
+
+ScSimpleUndo::DataSpansType* DocFuncUtil::getNonEmptyCellSpans(
+    const ScDocument& rDoc, const ScMarkData& rMark, const ScRange& rRange )
+{
+    std::unique_ptr<ScSimpleUndo::DataSpansType> pDataSpans(new ScSimpleUndo::DataSpansType);
+    ScMarkData::const_iterator it = rMark.begin(), itEnd = rMark.end();
+    for (; it != itEnd; ++it)
+    {
+        SCTAB nTab = *it;
+
+        SCCOL nCol1 = rRange.aStart.Col(), nCol2 = rRange.aEnd.Col();
+        SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row();
+
+        std::pair<ScSimpleUndo::DataSpansType::iterator,bool> r =
+            pDataSpans->insert(nTab, new sc::ColumnSpanSet(false));
+
+        if (r.second)
+        {
+            sc::ColumnSpanSet* pSet = r.first->second;
+            pSet->scan(rDoc, nTab, nCol1, nRow1, nCol2, nRow2, true);
+        }
+    }
+
+    return pDataSpans.release();
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/inc/docfuncutil.hxx

@@ -5,17 +5,34 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#ifndef INCLUDED_SC_DOCFUNCUTIL_HXX
+#define INCLUDED_SC_DOCFUNCUTIL_HXX
+
+#include <undobase.hxx>
+
 class ScDocument;
 class ScMarkData;
+class ScRange;
+struct InsertDeleteFlags;
 
 namespace sc {
 
 class DocFuncUtil
 {
 public:
+
     static bool hasProtectedTab( const ScDocument& rDoc, const ScMarkData& rMark );
+
+    static ScDocument* createDeleteContentsUndoDoc(
+        ScDocument& rDoc, const ScMarkData& rMark, const ScRange& rRange,
+        InsertDeleteFlags nFlags, bool bOnlyMarked );
+
+    static ScSimpleUndo::DataSpansType* getNonEmptyCellSpans(
+        const ScDocument& rDoc, const ScMarkData& rMark, const ScRange& rRange );
 };
 
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/view/viewfunc.cxx

@@ -1834,50 +1834,8 @@ void ScViewFunc::DeleteContents( InsertDeleteFlags nFlags, bool bRecord )
 
     if ( bRecord )
     {
-        pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-        SCTAB nTab = aMarkRange.aStart.Tab();
-        pUndoDoc->InitUndo( pDoc, nTab, nTab );
-        SCTAB nTabCount = pDoc->GetTableCount();
-        ScMarkData::iterator itr = aFuncMark.begin(), itrEnd = aFuncMark.end();
-        for (; itr != itrEnd; ++itr)
-            if (*itr != nTab)
-                pUndoDoc->AddUndoTab( *itr, *itr );
-        ScRange aCopyRange = aExtendedRange;
-        aCopyRange.aStart.SetTab(0);
-        aCopyRange.aEnd.SetTab(nTabCount-1);
-
-        //  in case of "Format/Standard" copy all attributes, because CopyToDocument
-        //  with IDF_HARDATTR only is too time-consuming:
-        InsertDeleteFlags nUndoDocFlags = nFlags;
-        if (nFlags & IDF_ATTRIB)
-            nUndoDocFlags |= IDF_ATTRIB;
-        if (nFlags & IDF_EDITATTR)          // Edit-Engine-Attribute
-            nUndoDocFlags |= IDF_STRING;    // -> cells will be changed
-        if (nFlags & IDF_NOTE)
-            nUndoDocFlags |= IDF_CONTENTS;  // copy all cells with their notes
-        // do not copy note captions to undo document
-        nUndoDocFlags |= IDF_NOCAPTIONS;
-        pDoc->CopyToDocument( aCopyRange, nUndoDocFlags, bMulti, pUndoDoc, &aFuncMark );
-
-        pDataSpans.reset(new ScSimpleUndo::DataSpansType);
-
-        for (itr = aFuncMark.begin(); itr != itrEnd; ++itr)
-        {
-            nTab = *itr;
-
-            SCCOL nCol1 = aCopyRange.aStart.Col(), nCol2 = aCopyRange.aEnd.Col();
-            SCROW nRow1 = aCopyRange.aStart.Row(), nRow2 = aCopyRange.aEnd.Row();
-
-            std::pair<ScSimpleUndo::DataSpansType::iterator,bool> r =
-                pDataSpans->insert(nTab, new sc::ColumnSpanSet(false));
-
-            if (r.second)
-            {
-                ScSimpleUndo::DataSpansType::iterator it = r.first;
-                sc::ColumnSpanSet* pSet = it->second;
-                pSet->scan(*pDoc, nTab, nCol1, nRow1, nCol2, nRow2, true);
-            }
-        }
+        pUndoDoc = sc::DocFuncUtil::createDeleteContentsUndoDoc(*pDoc, aFuncMark, aExtendedRange, nFlags, bMulti);
+        pDataSpans.reset(sc::DocFuncUtil::getNonEmptyCellSpans(*pDoc, aFuncMark, aExtendedRange));
     }
 
     HideAllCursors();   // for if summary is cancelled