merge with m50

4 files changed, 137 insertions, 25 deletions

diff --git a/sc/source/ui/src/condfrmt.src b/sc/source/ui/src/condfrmt.src
index 6f20d74b1452..982e2990485c 100644
--- a/sc/source/ui/src/condfrmt.src
+++ b/sc/source/ui/src/condfrmt.src
@@ -128,6 +128,13 @@ ModelessDialog RID_SCDLG_CONDFORMAT
         DropDown = TRUE ;
         Sort = TRUE ;
     };
+    PushButton BTN_COND1_NEW
+    {
+        Pos = MAP_APPFONT ( 124 , 34 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "~New Style..." ;
+    };
     FixedLine FL_SEP1
     {
         Pos = MAP_APPFONT ( 6 , 51 ) ;
@@ -223,6 +230,13 @@ ModelessDialog RID_SCDLG_CONDFORMAT
         DropDown = TRUE ;
         Sort = TRUE ;
     };
+    PushButton BTN_COND2_NEW
+    {
+        Pos = MAP_APPFONT ( 124 , 88 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "Ne~w Style..." ;
+    };
     FixedLine FL_SEP2
     {
         Pos = MAP_APPFONT ( 6 , 105 ) ;
@@ -318,6 +332,13 @@ ModelessDialog RID_SCDLG_CONDFORMAT
         DropDown = TRUE ;
         Sort = TRUE ;
     };
+    PushButton BTN_COND3_NEW
+    {
+        Pos = MAP_APPFONT ( 124 , 142 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        TabStop = TRUE ;
+        Text [ en-US ] = "New ~Style..." ;
+    };
     OKButton BTN_OK
     {
         Pos = MAP_APPFONT ( 260 , 6 ) ;
diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src
index d655496c5666..73108b984ebe 100644
--- a/sc/source/ui/src/filter.src
+++ b/sc/source/ui/src/filter.src
@@ -34,7 +34,7 @@ ModelessDialog RID_SCDLG_FILTER
     HelpId = SID_FILTER ;
     Hide = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 298 , 83 ) ;
+    Size = MAP_APPFONT ( 251 , 121 ) ;
     Text [ en-US ] = "Standard Filter" ;
     Moveable = TRUE ;
     Closeable = FALSE ;
@@ -65,7 +65,7 @@ ModelessDialog RID_SCDLG_FILTER
     ListBox LB_OP1
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 41 ) ;
+        Pos = MAP_APPFONT ( 12 , 25 ) ;
         Size = MAP_APPFONT ( 40 , 46 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -78,6 +78,19 @@ ModelessDialog RID_SCDLG_FILTER
     ListBox LB_OP2
     {
         Border = TRUE ;
+        Pos = MAP_APPFONT ( 12 , 41 ) ;
+        Size = MAP_APPFONT ( 40 , 46 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+        StringList [ en-US ] =
+        {
+            < "AND" ; Default ; > ;
+            < "OR" ; Default ; > ;
+        };
+    };
+    ListBox LB_OP3
+    {
+        Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 57 ) ;
         Size = MAP_APPFONT ( 40 , 46 ) ;
         TabStop = TRUE ;
@@ -88,6 +101,19 @@ ModelessDialog RID_SCDLG_FILTER
             < "OR" ; Default ; > ;
         };
     };
+    ListBox LB_OP4
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 12 , 73 ) ;
+        Size = MAP_APPFONT ( 40 , 46 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+        StringList [ en-US ] =
+        {
+            < "AND" ; Default ; > ;
+            < "OR" ; Default ; > ;
+        };
+    };
     ListBox LB_FIELD1
     {
         Border = TRUE ;
@@ -112,11 +138,19 @@ ModelessDialog RID_SCDLG_FILTER
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
+    ListBox LB_FIELD4
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 58 , 73 ) ;
+        Size = MAP_APPFONT ( 60 , 90 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+    };
     ListBox LB_COND1
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 122 , 25 ) ;
-        Size = MAP_APPFONT ( 47 , 105 ) ;
+        Size = MAP_APPFONT ( 47 , 145 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         stringlist [ en-US ] =
@@ -137,7 +171,7 @@ ModelessDialog RID_SCDLG_FILTER
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 122 , 41 ) ;
-        Size = MAP_APPFONT ( 47 , 105 ) ;
+        Size = MAP_APPFONT ( 47 , 145 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         stringlist [ en-US ] =
@@ -158,7 +192,28 @@ ModelessDialog RID_SCDLG_FILTER
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 122 , 57 ) ;
-        Size = MAP_APPFONT ( 47 , 105 ) ;
+        Size = MAP_APPFONT ( 47 , 145 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+        stringlist [ en-US ] =
+        {
+            < "=" ; Default ; > ;
+            < "<" ; Default ; > ;
+            < ">" ; Default ; > ;
+            < "<=" ; Default ; > ;
+            < ">=" ; Default ; > ;
+            < "<>" ; Default ; > ;
+            < "Largest" ; Default ; > ;
+            < "Smallest" ; Default ; > ;
+            < "Largest %" ; Default ; > ;
+            < "Smallest %" ; Default ; > ;
+        };
+    };
+    ListBox LB_COND4
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 122 , 73 ) ;
+        Size = MAP_APPFONT ( 47 , 145 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         stringlist [ en-US ] =
@@ -196,16 +251,31 @@ ModelessDialog RID_SCDLG_FILTER
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
+    ComboBox ED_VAL4
+    {
+        Pos = MAP_APPFONT ( 173 , 73 ) ;
+        Size = MAP_APPFONT ( 60 , 90 ) ;
+        TabStop = TRUE ;
+        DropDown = TRUE ;
+    };
+    ScrollBar LB_SCROLL
+    {
+        Pos = MAP_APPFONT ( 237, 25 ) ;
+        Size = MAP_APPFONT ( 8 , 60 ) ;
+        TabStop = TRUE ;
+        VScroll = TRUE ;
+    };
+
     FixedLine FL_CRITERIA
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 230 , 8 ) ;
+        Size = MAP_APPFONT ( 275 , 8 ) ;
         Text [ en-US ] = "Filter criteria";
     };
     CheckBox BTN_CASE
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 86 ) ;
+        Pos = MAP_APPFONT ( 12 , 130 ) ;
         Size = MAP_APPFONT ( 128 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Case ~sensitive" ;
@@ -213,7 +283,7 @@ ModelessDialog RID_SCDLG_FILTER
     CheckBox BTN_REGEXP
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 142 , 86 ) ;
+        Pos = MAP_APPFONT ( 142 , 130 ) ;
         Size = MAP_APPFONT ( 94 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Regular ~expression" ;
@@ -221,7 +291,7 @@ ModelessDialog RID_SCDLG_FILTER
     CheckBox BTN_HEADER
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 100 ) ;
+        Pos = MAP_APPFONT ( 12 , 144 ) ;
         Size = MAP_APPFONT ( 128 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Range contains ~column labels" ;
@@ -229,7 +299,7 @@ ModelessDialog RID_SCDLG_FILTER
     CheckBox BTN_UNIQUE
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 142 , 100 ) ;
+        Pos = MAP_APPFONT ( 142 , 144 ) ;
         Size = MAP_APPFONT ( 94 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~No duplication" ;
@@ -237,7 +307,7 @@ ModelessDialog RID_SCDLG_FILTER
     CheckBox BTN_COPY_RESULT
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 114 ) ;
+        Pos = MAP_APPFONT ( 12 , 158 ) ;
         Size = MAP_APPFONT ( 128 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Copy ~results to..." ;
@@ -245,7 +315,7 @@ ModelessDialog RID_SCDLG_FILTER
     CheckBox BTN_DEST_PERS
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 142 , 114 ) ;
+        Pos = MAP_APPFONT ( 142 , 158 ) ;
         Size = MAP_APPFONT ( 94 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~Keep filter criteria" ;
@@ -254,7 +324,7 @@ ModelessDialog RID_SCDLG_FILTER
     {
         Border = TRUE ;
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 21 , 126 ) ;
+        Pos = MAP_APPFONT ( 21 , 170 ) ;
         Size = MAP_APPFONT ( 90 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -263,13 +333,13 @@ ModelessDialog RID_SCDLG_FILTER
     {
         Border = TRUE ;
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 115 , 126 ) ;
+        Pos = MAP_APPFONT ( 115 , 170 ) ;
         Size = MAP_APPFONT ( 104 , 12 ) ;
         TabStop = TRUE ;
     };
     ImageButton RB_COPY_AREA
     {
-        Pos = MAP_APPFONT ( 221 , 125 ) ;
+        Pos = MAP_APPFONT ( 221 , 169 ) ;
         Size = MAP_APPFONT ( 13 , 15 ) ;
         TabStop = FALSE ;
         QuickHelpText [ en-US ] = "Shrink" ;
@@ -277,14 +347,13 @@ ModelessDialog RID_SCDLG_FILTER
     FixedLine FL_OPTIONS
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 75 ) ;
-        Size = MAP_APPFONT ( 230 , 8 ) ;
-        Text [ en-US ] = "Options" ;
+        Pos = MAP_APPFONT ( 6 , 118 ) ;
+        Size = MAP_APPFONT ( 239 , 8 ) ;
     };
     FixedText FT_DBAREA
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 66 , 144 ) ;
+        Pos = MAP_APPFONT ( 66 , 188 ) ;
         Size = MAP_APPFONT ( 167 , 8 ) ;
         Left = TRUE ;
         Text [ en-US ] = "dummy" ;
@@ -292,36 +361,41 @@ ModelessDialog RID_SCDLG_FILTER
     FixedText FT_DBAREA_LABEL
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 144 ) ;
+        Pos = MAP_APPFONT ( 6 , 188 ) ;
         Size = MAP_APPFONT ( 58 , 8 ) ;
         Text [ en-US ] = "Data range:" ;
     };
     OKButton BTN_OK
     {
-        Pos = MAP_APPFONT ( 242 , 6 ) ;
+        Pos = MAP_APPFONT ( 141 , 101 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         DefButton = TRUE ;
     };
     CancelButton BTN_CANCEL
     {
-        Pos = MAP_APPFONT ( 242 , 23 ) ;
+        Pos = MAP_APPFONT ( 195 , 101 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
     };
     HelpButton BTN_HELP
     {
-        Pos = MAP_APPFONT ( 242 , 43 ) ;
+        Pos = MAP_APPFONT ( 62 , 101 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
     };
     MoreButton BTN_MORE
     {
-        Pos = MAP_APPFONT ( 242 , 63 ) ;
+        Pos = MAP_APPFONT ( 6 , 101 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         MapUnit = MAP_APPFONT ;
-        Delta = 75 ;
+        Delta = 81 ;
+    };
+    FixedLine FL_SEPARATOR
+    {
+        Pos = MAP_APPFONT ( 0 , 91 ) ;
+        Size = MAP_APPFONT ( 251 , 6 ) ;
     };
 };
  //============================================================================
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index f6e401b1f76d..05d10b9813bd 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -183,6 +183,12 @@ Menu RID_POPUP_TAB
         };
         MenuItem
         {
+            Identifier = FID_TAB_DESELECTALL ;
+            HelpId = FID_TAB_DESELECTALL ;
+            Text [ en-US ] = "D~eselect All Sheets" ;
+        };
+        MenuItem
+        {
             Identifier = FID_TAB_RTL ;
             HelpId = FID_TAB_RTL ;
             Text [ en-US ] = "S~heet Right-To-Left" ;
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index b182b7ce98ab..6e8371be5e1d 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -728,6 +728,16 @@ String RID_SCSTR_ONCLICK
     Text [ en-US ] = "Mouse button pressed";
 };
 
+String SCSTR_MOREBTN_MOREOPTIONS
+{
+    Text [ en-US ] = "More ~Options";
+};
+
+String SCSTR_MOREBTN_FEWEROPTIONS
+{
+    Text [ en-US ] = "Fewer ~Options";
+};
+
 StringArray SCSTR_PRINT_OPTIONS
 {
     ItemList [en-US] =
@@ -752,3 +762,4 @@ StringArray SCSTR_PRINT_OPTIONS
         < "Print only some pages of the printable content."; >;
     };
 };
+