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

1 files changed, 4 insertions, 0 deletions

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
 };