CWS-TOOLING: integrate CWS datapilotrange

2009-05-14 15:00:09 +0200 oc  r271892 : #i101920
2009-05-14 14:57:48 +0200 oc  r271890 : #i101920
2009-04-15 01:41:12 +0200 kohei  r270812 : ScDPObject::bInfoValid is no longer used at all.  Removing it.
2009-04-15 01:30:31 +0200 kohei  r270811 : removed redundant call to InvalidateSource().  SetSheetDesc() already calls it, so
no need to call it twice.
2009-04-13 22:01:35 +0200 kohei  r270739 : #i86791# Fixed odd drag-n-drop issues after source range has changed.  It was
because the arrays that keep track of each field's members were not flushed
properly after the source range change.
2009-04-13 21:58:39 +0200 kohei  r270738 : Fixed indentation mis-match.
2009-04-13 17:54:55 +0200 kohei  r270737 : Fixed a build breakage after rebase.
2009-04-13 04:06:55 +0200 kohei  r270728 : CWS-TOOLING: rebase CWS datapilotrange to trunk@270723 (milestone: DEV300:m46)
2009-01-06 06:57:12 +0100 kohei  r265892 : migrated the change from the old cvs repo & modified to get it to build.

1 files changed, 20 insertions, 2 deletions

diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index b0fd8a02c946..b7a71aebc1fe 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -48,6 +48,7 @@
 #include "pivot.hxx"
 #include "anyrefdg.hxx"
 #include "fieldwnd.hxx"
+#include "formula/funcutl.hxx"
 
 /*==========================================================================*\
 
@@ -129,10 +130,18 @@ private:
     FixedInfo               aFtInfo;
 
     FixedLine               aFlAreas;
+
+    // DP source selection
+    FixedText               aFtInArea;
+    ::formula::RefEdit      aEdInPos;
+    ::formula::RefButton    aRbInPos;
+
+    // DP output location
     ListBox                 aLbOutPos;
     FixedText               aFtOutArea;
-    formula::RefEdit               aEdOutPos;
-    formula::RefButton             aRbOutPos;
+    formula::RefEdit        aEdOutPos;
+    formula::RefButton      aRbOutPos;
+
     CheckBox                aBtnIgnEmptyRows;
     CheckBox                aBtnDetectCat;
     CheckBox                aBtnTotalCol;
@@ -155,6 +164,8 @@ private:
     size_t                  nDnDFromIndex;
     BOOL                    bIsDrag;
 
+    ::formula::RefEdit*     pEditActive;
+
     Rectangle               aRectPage;
     Rectangle               aRectRow;
     Rectangle               aRectCol;
@@ -173,6 +184,7 @@ private:
     ScDPFuncDataVec         aDataArr;
 
     ScDPObjectPtr           xDlgDPObject;
+    ScRange                 aOldRange;
     ScPivotParam            thePivotData;
     ScViewData*             pViewData;
     ScDocument*             pDoc;
@@ -184,6 +196,7 @@ private:
     void                    InitWndSelect   ( LabelData** ppLabelArr, long nLabels );
     void                    InitWnd         ( PivotField* pArr, long nCount, ScDPFieldType eType );
     void                    InitFocus       ();
+    void                    InitFields      ();
     void                    CalcWndSizes    ();
     Point                   DlgPos2WndPos   ( const Point& rPt, Window& rWnd );
     ScDPLabelData*          GetLabelData    ( SCsCOL nCol, size_t* pPos = NULL );
@@ -207,14 +220,19 @@ private:
                                               USHORT&       rColCount,
                                               USHORT&       rRowCount,
                                               USHORT&       rDataCount );
+
+    void                    UpdateSrcRange();
+
     // Handler
     DECL_LINK( ClickHdl, PushButton * );
     DECL_LINK( ScrollHdl, ScrollBar * );
     DECL_LINK( SelAreaHdl, ListBox * );
     DECL_LINK( MoreClickHdl, MoreButton * );
     DECL_LINK( EdModifyHdl, Edit * );
+    DECL_LINK( EdInModifyHdl, Edit * );
     DECL_LINK( OkHdl, OKButton * );
     DECL_LINK( CancelHdl, CancelButton * );
+    DECL_LINK( GetFocusHdl, Control* );
 };