[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-general-type-auto-decimal-sc.diff |   65 +++++++++++-------
 1 file changed, 43 insertions(+), 22 deletions(-)

New commits:
commit 561b6730a59abd57fcfb065f191df506a3529d1b
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Oct 15 13:09:19 2009 -0400

    Fixed the problem of the Decimal places spin button not being clickable.
    
    * patches/dev300/calc-general-type-auto-decimal-sc.diff: the reason
      was simple; I made the check box control so wide that it was
      covering up the spin button to its right.

diff --git a/patches/dev300/calc-general-type-auto-decimal-sc.diff b/patches/dev300/calc-general-type-auto-decimal-sc.diff
index c3c3a07..63a5e47 100644
--- a/patches/dev300/calc-general-type-auto-decimal-sc.diff
+++ b/patches/dev300/calc-general-type-auto-decimal-sc.diff
@@ -116,7 +116,7 @@ index 7052be4..3253f59 100644
      FixedText		aFtPrec;
      NumericField	aEdPrec;
 diff --git sc/source/ui/optdlg/tpcalc.cxx sc/source/ui/optdlg/tpcalc.cxx
-index 86a4476..dd37c89 100644
+index 86a4476..1a0ed0c 100644
 --- sc/source/ui/optdlg/tpcalc.cxx
 +++ sc/source/ui/optdlg/tpcalc.cxx
 @@ -91,6 +91,7 @@ ScTpCalcOptions::ScTpCalcOptions( Window*			pParent,
@@ -143,7 +143,7 @@ index 86a4476..dd37c89 100644
      aEdEps     .SetValue( pLocalOptions->GetIterEps(), 6 );
  
      pLocalOptions->GetDate( d, m, y );
-@@ -171,6 +172,21 @@ void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
+@@ -171,6 +173,21 @@ void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
              break;
      }
  
@@ -165,7 +165,7 @@ index 86a4476..dd37c89 100644
      CheckClickHdl( &aBtnIterate );
  }
  
-@@ -181,13 +197,18 @@ BOOL __EXPORT ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
+@@ -181,13 +198,18 @@ BOOL __EXPORT ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
  {
      // alle weiteren Optionen werden in den Handlern aktualisiert
      pLocalOptions->SetIterCount( (USHORT)aEdSteps.GetValue() );
@@ -185,7 +185,7 @@ index 86a4476..dd37c89 100644
      if ( *pLocalOptions != *pOldOptions )
      {
          rCoreAttrs.Put( ScTpCalcItem( nWhichCalc, *pLocalOptions ) );
-@@ -248,19 +269,35 @@ IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn )
+@@ -248,19 +270,35 @@ IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn )
  
  //-----------------------------------------------------------------------
  
@@ -231,37 +231,58 @@ index 86a4476..dd37c89 100644
  
      return 0;
 diff --git sc/source/ui/src/optdlg.src sc/source/ui/src/optdlg.src
-index dd4dd34..54bedfa 100644
+index dd4dd34..78f7864 100644
 --- sc/source/ui/src/optdlg.src
 +++ sc/source/ui/src/optdlg.src
-@@ -124,7 +124,7 @@ TabPage RID_SCPAGE_CALC
+@@ -122,22 +122,6 @@ TabPage RID_SCPAGE_CALC
+         Pos = MAP_APPFONT ( 6 , 64 ) ;
+         Size = MAP_APPFONT ( 248 , 8 ) ;
      };
-     FixedText FT_PREC
-     {
+-    FixedText FT_PREC
+-    {
 -        Pos = MAP_APPFONT ( 150 , 77 ) ;
-+        Pos = MAP_APPFONT ( 150 , 148 ) ;
-         Size = MAP_APPFONT ( 72 , 8 ) ;
-         Text [ en-US ] = "~Decimal places" ;
-         Right = TRUE ;
-@@ -132,7 +132,7 @@ TabPage RID_SCPAGE_CALC
-     NumericField ED_PREC
-     {
-         Border = TRUE ;
+-        Size = MAP_APPFONT ( 72 , 8 ) ;
+-        Text [ en-US ] = "~Decimal places" ;
+-        Right = TRUE ;
+-    };
+-    NumericField ED_PREC
+-    {
+-        Border = TRUE ;
 -        Pos = MAP_APPFONT ( 226 , 75 ) ;
-+        Pos = MAP_APPFONT ( 226 , 146 ) ;
-         Size = MAP_APPFONT ( 25 , 12 ) ;
-         Maximum = 20 ;
-         Spin = TRUE ;
-@@ -168,6 +168,12 @@ TabPage RID_SCPAGE_CALC
+-        Size = MAP_APPFONT ( 25 , 12 ) ;
+-        Maximum = 20 ;
+-        Spin = TRUE ;
+-        Repeat = TRUE ;
+-    };
+     CheckBox BTN_CASE
+     {
+         Pos = MAP_APPFONT ( 12 , 77 ) ;
+@@ -168,6 +152,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 ( 239 , 10 ) ;
++        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 ;
++    };
  };
  
  /**************************************************************************/