Move all clip params into the new context class. We don't need two buckets.

Change-Id: Ida0542583242ebcdd7f1448931e31656aa542457

4 files changed, 31 insertions, 8 deletions

diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 00049f169771..ca6760fbccf9 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -10,13 +10,39 @@
 #ifndef SC_CLIPCONTEXT_HXX
 #define SC_CLIPCONTEXT_HXX
 
+#include "address.hxx"
+
+class ScDocument;
+
 namespace sc {
 
 class CopyFromClipContext
 {
+    ScDocument* mpRefUndoDoc;
+    ScDocument* mpClipDoc;
+    sal_uInt16  mnInsertFlag;
+    SCTAB       mnTabStart;
+    SCTAB       mnTabEnd;
+    bool        mbAsLink:1;
+    bool        mbSkipAttrForEmptyCells:1;
+
+    CopyFromClipContext(); // disabled
 public:
-    CopyFromClipContext();
+    CopyFromClipContext(
+        ScDocument* pRefUndoDoc, ScDocument* pClipDoc, sal_uInt16 nInsertFlag,
+        bool bAsLink, bool bSkipAttrForEmptyCells);
+
+    void setTabRange(SCTAB nStart, SCTAB nEnd);
+
     ~CopyFromClipContext();
+
+    ScDocument* getUndoDoc();
+    ScDocument* getClipDoc();
+    sal_uInt16 getInsertFlag() const;
+    SCTAB getTabStart() const;
+    SCTAB getTabEnd() const;
+    bool isAsLink() const;
+    bool isSkipAttrForEmptyCells() const;
 };
 
 }
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 9d810e1d59a1..cf171ae319bd 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -236,8 +236,7 @@ public:
     void CopyStaticToDocument(SCROW nRow1, SCROW nRow2, ScColumn& rDestCol);
     void CopyCellToDocument( SCROW nSrcRow, SCROW nDestRow, ScColumn& rDestCol );
     void CopyFromClip(
-        sc::CopyFromClipContext& rCxt, SCROW nRow1, SCROW nRow2, long nDy,
-        sal_uInt16 nInsFlag, bool bAsLink, bool bSkipAttrForEmpty, ScColumn& rColumn );
+        sc::CopyFromClipContext& rCxt, SCROW nRow1, SCROW nRow2, long nDy, ScColumn& rColumn );
 
     void        StartListeningInArea( SCROW nRow1, SCROW nRow2 );
     void        BroadcastInArea( SCROW nRow1, SCROW nRow2 );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7b7ea40fa27f..00cd7abdae0d 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -144,7 +144,6 @@ class ScRowBreakIterator;
 struct ScSetStringParam;
 class ScDocRowHeightUpdater;
 struct ScColWidthParam;
-struct ScCopyBlockFromClipParams;
 class ScSheetEvents;
 class ScProgress;
 class SvtListener;
@@ -1143,11 +1142,10 @@ public:
                                 SCTAB nTab, ScDocument* pClipDoc = NULL);
     void CopyBlockFromClip(
         sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-        const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy, const ScCopyBlockFromClipParams* pCBFCP );
+        const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy );
     void CopyNonFilteredFromClip(
         sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-        const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy, const ScCopyBlockFromClipParams* pCBFCP,
-        SCROW & rClipStartRow );
+        const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy, SCROW & rClipStartRow );
 
     void            StartListeningFromClip( SCCOL nCol1, SCROW nRow1,
                                         SCCOL nCol2, SCROW nRow2,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index ac2b2bff23c6..70fc1cf2ac2f 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -386,7 +386,7 @@ public:
     void CopyCellToDocument( SCCOL nSrcCol, SCROW nSrcRow, SCCOL nDestCol, SCROW nDestRow, ScTable& rDestTab );
     void CopyFromClip(
         sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-        SCsCOL nDx, SCsROW nDy, sal_uInt16 nInsFlag, bool bAsLink, bool bSkipAttrForEmpty, ScTable* pTable );
+        SCsCOL nDx, SCsROW nDy, ScTable* pTable );
 
     void        StartListeningInArea( SCCOL nCol1, SCROW nRow1,
                                         SCCOL nCol2, SCROW nRow2 );