mib16: rebase to m82

3 files changed, 22 insertions, 37 deletions

diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 1cc66ca13af6..bbf20c436065 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -927,10 +927,6 @@ Resource RID_GLOBSTR
 
     /* END error constants and error strings. */
 
-    String STR_ODER_SO
-    {
-        Text [ en-US ] = "%s or similar" ;
-    };
     String STR_GRIDCOLOR
     {
         Text [ en-US ] = "Grid color" ;
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index 8c9279a602c1..06a19af7a8a7 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -154,11 +154,6 @@ ModalDialog RID_SCDLG_INSCELL
     };
 };
 
-Bitmap RID_SCTEAMDLGBMP1
-{
-    File = "calcteam.bmp";
-};
-
 ModalDialog RID_SCDLG_DELCONT
 {
     OutputSize = TRUE ;
@@ -1331,18 +1326,6 @@ ModalDialog RID_SCDLG_NAMES_PASTE
     Text [ en-US ] = "Insert Name" ;
 };
 
-FloatingWindow RID_SCDLG_TEAM
-{
-    Hide = TRUE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    FixedBitmap 1 { Pos = MAP_APPFONT ( 1 , 1 ) ; };
-    Text [ en-US ] = "The %PRODUCTNAME Calc Team" ;
-};
-
 ModalDialog RID_SCDLG_CHARTCOLROW
 {
     OutputSize = TRUE ;
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 856463e27e40..ea7cabf7716d 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -119,22 +119,6 @@ TabPage RID_SCPAGE_CALC
         Pos = MAP_APPFONT ( 6 , 64 ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
     };
-    FixedText FT_PREC
-    {
-        Pos = MAP_APPFONT ( 150 , 77 ) ;
-        Size = MAP_APPFONT ( 72 , 8 ) ;
-        Text [ en-US ] = "~Decimal places" ;
-        Right = TRUE ;
-    };
-    NumericField ED_PREC
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 226 , 75 ) ;
-        Size = MAP_APPFONT ( 25 , 12 ) ;
-        Maximum = 20 ;
-        Spin = TRUE ;
-        Repeat = TRUE ;
-    };
     CheckBox BTN_CASE
     {
         Pos = MAP_APPFONT ( 12 , 77 ) ;
@@ -165,6 +149,28 @@ TabPage RID_SCPAGE_CALC
         Size = MAP_APPFONT ( 239 , 10 ) ;
         Text [ en-US ] = "~Automatically find column and row labels " ;
     };
+    CheckBox BTN_GENERAL_PREC
+    {
+        Pos = MAP_APPFONT ( 12 , 147 ) ;
+        Size = MAP_APPFONT ( 136 , 10 ) ;
+        Text [ en-US ] = "Limit decimals for general number format" ;
+    };
+    FixedText FT_PREC
+    {
+        Pos = MAP_APPFONT ( 150 , 148 ) ;
+        Size = MAP_APPFONT ( 72 , 8 ) ;
+        Text [ en-US ] = "~Decimal places" ;
+        Right = TRUE ;
+    };
+    NumericField ED_PREC
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 226 , 146 ) ;
+        Size = MAP_APPFONT ( 25 , 12 ) ;
+        Maximum = 20 ;
+        Spin = TRUE ;
+        Repeat = TRUE ;
+    };
 };
 
 /**************************************************************************/