CWS-TOOLING: integrate CWS calc49

2009-04-27 15:35:08 +0200 oc  r271282 : #i101371 Adapt autotests because of changed standard filter dialog
2009-04-27 15:33:38 +0200 oc  r271281 : #i101371 Adapt autotests because of changed standard filter dialog
2009-04-27 14:07:49 +0200 oc  r271268 : #i101371 Autotest for NewStyle button in conditional formatting dialog
2009-04-27 14:05:43 +0200 oc  r271267 : #i101371 Autotest for NewStyle button in conditional formatting dialog
2009-04-27 14:03:00 +0200 oc  r271266 : #i101371 Autotest for NewStyle button in conditional formatting dialog
2009-04-02 14:04:47 +0200 nn  r270403 : CWS-TOOLING: rebase CWS calc49 to trunk@270033 (milestone: DEV300:m45)
2009-03-25 14:18:26 +0100 nn  r270025 : #i83643# adjust conditional formats when cell style is renamed (patch from gaojingmei)
2009-03-23 15:05:13 +0100 nn  r269875 : gcc warnings
2009-03-23 14:20:06 +0100 nn  r269871 : #i17995# order of OK/Cancel/Help/More is different between standard and advanced filter dialog
2009-03-20 19:15:21 +0100 nn  r269825 : gcc warnings
2009-03-20 18:10:25 +0100 nn  r269823 : #i70320# ScTabView::SetTabNo: don't deselect if called with bNew = TRUE
2009-03-18 17:28:04 +0100 nn  r269695 : #i97974# CopyToTable: update draw page size (patch from gaozm)
2009-03-18 14:30:50 +0100 nn  r269665 : #i45291# handle date/time input from validity dialog (patch from gaojingmei)
2009-03-18 11:43:17 +0100 nn  r269648 : #i27253# add 'New Style' buttons to conditional formatting dialog
2009-03-17 19:04:02 +0100 nn  r269624 : #i13829# include formats when sorting with toolbar buttons
2009-03-17 16:41:26 +0100 nn  r269617 : #i17995# allow more criteria in standard filter dialog
2009-03-12 10:23:21 +0100 nn  r269365 : #i7500# allow paste on merged cells (patch from mloiseleur/maoyg)
2009-03-12 09:57:17 +0100 nn  r269360 : #i8302# insert/delete in merged cells (patch from maoyg)
2009-03-11 19:07:44 +0100 nn  r269349 : #i27666# select current cell content in validity drop-down (patch from gaojingmei)
2009-03-11 19:03:40 +0100 nn  r269348 : #i7921# right variable
2009-03-04 17:45:03 +0100 nn  r268853 : #i7921# 'Deselect All Sheets' slot
2009-03-04 17:43:58 +0100 nn  r268852 : #i70320# #i7921# 'Deselect All Sheets' in context menu and TabBar empty area
2009-03-03 17:50:40 +0100 nn  r268774 : #i70320# deselect sheets when switching sheets and all sheets are selected
2009-03-03 14:50:44 +0100 nn  r268728 : #i99714# unused methods (patch from cmc)
2009-02-23 19:47:06 +0100 nn  r268369 : #i5550# lcl_DecompValueString: prefer end above beginning if not followed by space
2009-02-20 19:42:05 +0100 nn  r268337 : #i93091# ScDBFunc::GetDBData: allow filtered rows in selection

5 files changed, 50 insertions, 15 deletions

diff --git a/sc/source/ui/inc/condfrmt.hrc b/sc/source/ui/inc/condfrmt.hrc
index dcc1870a3e35..943e41219e7b 100644
--- a/sc/source/ui/inc/condfrmt.hrc
+++ b/sc/source/ui/inc/condfrmt.hrc
@@ -70,3 +70,7 @@
 #define BTN_CANCEL          32
 #define BTN_HELP            33
 
+#define BTN_COND1_NEW       34
+#define BTN_COND2_NEW       35
+#define BTN_COND3_NEW       36
+
diff --git a/sc/source/ui/inc/condfrmt.hxx b/sc/source/ui/inc/condfrmt.hxx
index 4e74bc6cb5db..db36fef2066a 100644
--- a/sc/source/ui/inc/condfrmt.hxx
+++ b/sc/source/ui/inc/condfrmt.hxx
@@ -71,6 +71,7 @@ private:
     formula::RefButton          aRbCond12;
     FixedText           aFtCond1Template;
     ListBox             aLbCond1Template;
+    PushButton          aBtnNew1;
     FixedLine           aFlSep1;
 
     CheckBox            aCbxCond2;
@@ -83,6 +84,7 @@ private:
     formula::RefButton          aRbCond22;
     FixedText           aFtCond2Template;
     ListBox             aLbCond2Template;
+    PushButton          aBtnNew2;
     FixedLine           aFlSep2;
 
     CheckBox            aCbxCond3;
@@ -95,6 +97,7 @@ private:
     formula::RefButton          aRbCond32;
     FixedText           aFtCond3Template;
     ListBox             aLbCond3Template;
+    PushButton          aBtnNew3;
 
     OKButton            aBtnOk;
     CancelButton        aBtnCancel;
@@ -146,6 +149,7 @@ private:
     DECL_LINK( GetFocusHdl, Control* );
     DECL_LINK( LoseFocusHdl, Control* );
     DECL_LINK( BtnHdl, PushButton* );
+    DECL_LINK( NewBtnHdl, PushButton* );
 #endif // _CONDFRMT_CXX
 };
 
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 6bc29b67e441..7e9ed68706ef 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -59,7 +59,6 @@ class TypedScStrCollection;
 // Gemeinsame Resource-Objekte:
 
 #define _COMMON_FILTER_RSCOBJS \
-    FixedLine       aFlOptions; \
     CheckBox        aBtnCase; \
     CheckBox        aBtnRegExp; \
     CheckBox        aBtnHeader; \
@@ -71,17 +70,12 @@ class TypedScStrCollection;
     CheckBox        aBtnDestPers; \
     FixedText       aFtDbAreaLabel; \
     FixedInfo       aFtDbArea; \
-    OKButton        aBtnOk; \
-    CancelButton    aBtnCancel; \
-    HelpButton      aBtnHelp; \
-    MoreButton      aBtnMore; \
     const String    aStrUndefined; \
     const String    aStrNoName; \
     const String    aStrNone;
 
 
 #define _INIT_COMMON_FILTER_RSCOBJS \
-    aFlOptions      ( this, ScResId( FL_OPTIONS ) ), \
     aBtnCase        ( this, ScResId( BTN_CASE ) ), \
     aBtnRegExp      ( this, ScResId( BTN_REGEXP ) ), \
     aBtnHeader      ( this, ScResId( BTN_HEADER ) ), \
@@ -93,10 +87,6 @@ class TypedScStrCollection;
     aBtnDestPers    ( this, ScResId( BTN_DEST_PERS ) ), \
     aFtDbAreaLabel  ( this, ScResId( FT_DBAREA_LABEL ) ), \
     aFtDbArea       ( this, ScResId( FT_DBAREA ) ), \
-    aBtnOk          ( this, ScResId( BTN_OK ) ), \
-    aBtnCancel      ( this, ScResId( BTN_CANCEL ) ), \
-    aBtnHelp        ( this, ScResId( BTN_HELP ) ), \
-    aBtnMore        ( this, ScResId( BTN_MORE ) ), \
     aStrUndefined   ( ScResId( SCSTR_UNDEFINED ) ), \
     aStrNoName      ( ScGlobal::GetRscString(STR_DB_NONAME) ), \
     aStrNone        ( ScResId( SCSTR_NONE ) ),
@@ -116,28 +106,46 @@ public:
     virtual void    SetActive();
 
     virtual BOOL    Close();
+    void            SliderMoved();
+    USHORT          GetSliderPos();
+    void            RefreshEditRow( USHORT nOffset );
 
 private:
     FixedLine       aFlCriteria;
     //----------------------------
+    ListBox         aLbConnect1;
     ListBox         aLbField1;
     ListBox         aLbCond1;
     ComboBox        aEdVal1;
     //----------------------------
-    ListBox         aLbConnect1;
+    ListBox         aLbConnect2;
     ListBox         aLbField2;
     ListBox         aLbCond2;
     ComboBox        aEdVal2;
     //----------------------------
-    ListBox         aLbConnect2;
+    ListBox         aLbConnect3;
     ListBox         aLbField3;
     ListBox         aLbCond3;
     ComboBox        aEdVal3;
     //----------------------------
+    ListBox         aLbConnect4;
+    ListBox         aLbField4;
+    ListBox         aLbCond4;
+    ComboBox        aEdVal4;
+    //----------------------------
     FixedText       aFtConnect;
     FixedText       aFtField;
     FixedText       aFtCond;
     FixedText       aFtVal;
+    FixedLine       aFlSeparator;
+
+    ScrollBar       aScrollBar;
+
+    FixedLine       aFlOptions;
+    MoreButton      aBtnMore;
+    HelpButton      aBtnHelp;
+    OKButton        aBtnOk;
+    CancelButton    aBtnCancel;
 
     _COMMON_FILTER_RSCOBJS
 
@@ -155,9 +163,11 @@ private:
     ScDocument*         pDoc;
     SCTAB               nSrcTab;
 
-    ComboBox*           aValueEdArr[3];
-    ListBox*            aFieldLbArr[3];
-    ListBox*            aCondLbArr[3];
+    ComboBox*           aValueEdArr[4];
+    ListBox*            aFieldLbArr[4];
+    ListBox*            aCondLbArr[4];
+    ListBox*            aConnLbArr[4];
+    BOOL                bRefreshExceptQuery[MAXQUERY];
     USHORT              nFieldCount;
     BOOL                bRefInputMode;
 
@@ -184,6 +194,7 @@ private:
     DECL_LINK( CheckBoxHdl,  CheckBox* );
     DECL_LINK( EndDlgHdl,    Button* );
     DECL_LINK( MoreClickHdl, MoreButton* );
+    DECL_LINK( ScrollHdl, ScrollBar* );
 
     // Hack: RefInput-Kontrolle
     DECL_LINK( TimeOutHdl,   Timer* );
@@ -212,8 +223,15 @@ private:
     formula::RefEdit    aEdFilterArea;
     formula::RefButton  aRbFilterArea;
 
+    FixedLine       aFlOptions;
+
     _COMMON_FILTER_RSCOBJS
 
+    OKButton        aBtnOk;
+    CancelButton    aBtnCancel;
+    HelpButton      aBtnHelp;
+    MoreButton      aBtnMore;
+
     ScFilterOptionsMgr* pOptionsMgr;
 
     const USHORT        nWhichQuery;
@@ -238,6 +256,7 @@ private:
     DECL_LINK( FilterAreaSelHdl, ListBox* );
     DECL_LINK( FilterAreaModHdl, formula::RefEdit* );
     DECL_LINK( EndDlgHdl,        Button* );
+    DECL_LINK( ScrollHdl, ScrollBar* );
 
     // Hack: RefInput-Kontrolle
     DECL_LINK( TimeOutHdl,       Timer* );
diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc
index 0948171a1e00..65e965b6bea3 100644
--- a/sc/source/ui/inc/filter.hrc
+++ b/sc/source/ui/inc/filter.hrc
@@ -68,6 +68,13 @@
 #define ED_VAL2             33
 #define ED_VAL3             34
 #define FL_CRITERIA         35
+#define FL_SEPARATOR        36
+#define LB_OP3              37
+#define LB_FIELD4           38
+#define LB_COND4            39
+#define ED_VAL4             40
+#define LB_SCROLL           41
+#define LB_OP4              42
 
 // Spezialfilter
 
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index d6b7583808d8..d7b5e2a8260b 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -472,6 +472,7 @@ public:
 
     void            SelectAll( BOOL bContinue = FALSE );
     void            SelectAllTables();
+    void            DeselectAllTables();
 
     void            MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
                                 BOOL bCols = FALSE, BOOL bRows = FALSE, BOOL bCellSelection = FALSE );