[ooo-build-commit] .: 2 commits - patches/dev300 patches/vba

[Kohei Yoshida]

 patches/dev300/apply                           |    2 -
 patches/dev300/calc-string-number-decimal.diff |   34 -------------------------
 patches/dev300/calc-string-number.diff         |   29 +++++++++++++++++++++
 patches/vba/cws-vbasupportdev300.diff          |    6 ++--
 4 files changed, 33 insertions(+), 38 deletions(-)

New commits:
commit 3af69115b51343700090bfeba5bc522daa76dbf9
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Mar 8 23:51:17 2010 -0500

    Adjusted for patch dependency.
    
    * patches/vba/cws-vbasupportdev300.diff:

diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 996df7c..1f3188d 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -13195,9 +13195,9 @@
  
 +    VolatileType meVolaileType;
 +
-     sal_Unicode cDecSep;                // decimal separator 
-     sal_Unicode cGrpSep;                // group separator
- 
+ //---------------------------------Funktionen in interpre.cxx---------
+ // nMust <= nAct <= nMax ? ok : PushError
+ inline BOOL MustHaveParamCount( short nAct, short nMust );
 --- sc/source/core/tool/address.cxx.old	2010-03-03 16:44:05.000000000 +0100
 +++ sc/source/core/tool/address.cxx	2010-03-03 16:59:35.000000000 +0100
 @@ -1377,7 +1377,7 @@ lcl_ScRange_Parse_OOo( ScRange &aRange,
commit c646a8f16dd16ebdaaada2fd445536ffea1dd224
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Mar 8 23:37:52 2010 -0500

    Convert locale-specific date strings to values.
    
    * patches/dev300/apply:
    * patches/dev300/calc-string-number-decimal.diff: removed.
    * patches/dev300/calc-string-number.diff: added to bring back
      the old string number behavior. (n#584693)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f9f58c5..d9c3c65 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -881,7 +881,7 @@ hack-readd-XclExpInterfaceEnd-WriteBody.diff
 calc-xls-export-encryption-condfmt-fix.diff, n#541058, i#105933, kohei
 
 # Excel compatibility for handling of "string numbers".
-calc-string-number-decimal.diff, kohei
+calc-string-number.diff, kohei
 
 # Set reference edge to bottom when importing cells with slanted text.
 calc-xls-import-slanted-border-sc.diff,  n#549728, i#38709, kohei
diff --git a/patches/dev300/calc-string-number-decimal.diff b/patches/dev300/calc-string-number-decimal.diff
deleted file mode 100644
index 9448f0f..0000000
--- a/patches/dev300/calc-string-number-decimal.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- sc/source/core/inc/interpre.hxx.old	2010-03-03 16:44:03.000000000 +0100
-+++ sc/source/core/inc/interpre.hxx	2010-03-03 16:59:16.000000000 +0100
-@@ -179,6 +179,9 @@ private:
-     BOOL        bCalcAsShown;           // precision as shown
-     BOOL        bMatrixFormula;         // formula cell is a matrix formula
- 
-+    sal_Unicode cDecSep;                // decimal separator 
-+    sal_Unicode cGrpSep;                // group separator
-+
- //---------------------------------Funktionen in interpre.cxx---------
- // nMust <= nAct <= nMax ? ok : PushError
- inline BOOL MustHaveParamCount( short nAct, short nMust );
---- sc/source/core/tool/interpr4.cxx.old	2010-03-03 16:44:03.000000000 +0100
-+++ sc/source/core/tool/interpr4.cxx	2010-03-03 16:59:16.000000000 +0100
-@@ -249,7 +249,7 @@ double ScInterpreter::ConvertStringToVal
-     sal_Int32 nParseEnd;
-     // Decimal and group separator 0 => only integer and possibly exponent, 
-     // stops at first non-digit non-sign.
--    fValue = ::rtl::math::stringToDouble( aStr, 0, 0, &eStatus, &nParseEnd);
-+    fValue = ::rtl::math::stringToDouble( aStr, cDecSep, cGrpSep, &eStatus, &nParseEnd);
-     sal_Int32 nLen;
-     if (eStatus == rtl_math_ConversionStatus_Ok && nParseEnd < (nLen = aStr.getLength()))
-     {
-@@ -3586,6 +3586,10 @@ ScInterpreter::ScInterpreter( ScFormulaC
-         pStackObj = new ScTokenStack;
-     }
-     pStack = pStackObj->pPointer;
-+
-+    const i18n::LocaleDataItem& rLocaleData = ScGlobal::GetpLocaleData()->getLocaleItem();
-+    cDecSep = rLocaleData.decimalSeparator.getLength() ? rLocaleData.decimalSeparator.getStr()[0] : 0;
-+    cGrpSep = rLocaleData.thousandSeparator.getLength() ? rLocaleData.thousandSeparator.getStr()[0] : 0;
- }
- 
- ScInterpreter::~ScInterpreter()
diff --git a/patches/dev300/calc-string-number.diff b/patches/dev300/calc-string-number.diff
new file mode 100644
index 0000000..7f264a6
--- /dev/null
+++ b/patches/dev300/calc-string-number.diff
@@ -0,0 +1,29 @@
+diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
+index 79ad2b8..45450e7 100644
+--- sc/source/core/tool/interpr4.cxx
++++ sc/source/core/tool/interpr4.cxx
+@@ -250,6 +250,16 @@ double ScInterpreter::GetValueCellValue( const ScAddress& rPos, const ScValueCel
+ 
+ double ScInterpreter::ConvertStringToValue( const String& rStr )
+ {
++#if 1
++    double fValue = 0.0;
++    sal_uInt32 nFIndex = 0;
++    if (!pFormatter->IsNumberFormat(rStr, nFIndex, fValue))
++    {
++        SetError(errNoValue);
++        fValue = 0.0;
++    }
++    return fValue;
++#else
+     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ConvertStringToValue" );
+     double fValue = 0.0;
+     ::rtl::OUString aStr( rStr);
+@@ -413,6 +423,7 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
+             fValue = 0.0;
+     }
+     return fValue;
++#endif
+ }
+ 
+