[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                   |    8 -------
 patches/dev300/calc-string-number.diff |   36 ---------------------------------
 2 files changed, 44 deletions(-)

New commits:
commit 697958e6a9cfcee198b9503ea822d16ed71769ff
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Apr 6 23:44:12 2011 -0400

    Removed; moved to git.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 386fd3f..9e9aafb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -264,14 +264,6 @@ gnome-vfs-locking-config_office.diff, i#91151, jholesov
 # (up-stream does not like it, because it adds dependency to VCL in URE)
 # FIXME dev300-m77 gnome-vfs-late-init.diff, i#84137, jholesov # FIXME careful, double check that we haven't lost anything
 
-[ CalcFixes ]
-
-# Excel compatibility for handling of "string numbers".
-# FIXME: Please check, there was some change in this between OOO330_m4 and m6;
-# I have just updated the patch to apply again, but maybe it is not necessary
-# any more? -- kendy
-calc-string-number.diff, kohei
-
 [ LinuxOnly ]
 # make some symbols from svtools visible for the kde fpicker when compiling with gcc4
 # fix: this breaks win32
diff --git a/patches/dev300/calc-string-number.diff b/patches/dev300/calc-string-number.diff
deleted file mode 100644
index f15fcae..0000000
--- a/patches/dev300/calc-string-number.diff
+++ /dev/null
@@ -1,36 +0,0 @@
----
- sc/source/core/tool/interpr4.cxx |   11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
-index e7651e5..9fe8b53 100644
---- sc/source/core/tool/interpr4.cxx
-+++ sc/source/core/tool/interpr4.cxx
-@@ -229,6 +229,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;
-     if (mnStringNoValueError == errCellNoValue)
-@@ -392,6 +402,7 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
-             fValue = 0.0;
-     }
-     return fValue;
-+#endif
- }
- 
- 
--- 
-1.7.0.1
-