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

[Tor Lillqvist]

 patches/dev300/calc-string-number.diff       |    2 +-
 patches/dev300/localize-pl-cygwin-paths.diff |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8c689c9704b86756e47e03b040a02342a8591fb1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Sep 9 18:01:13 2010 +0300

    Adapt to m7

diff --git a/patches/dev300/calc-string-number.diff b/patches/dev300/calc-string-number.diff
index f15fcae..3b7391b 100644
--- a/patches/dev300/calc-string-number.diff
+++ b/patches/dev300/calc-string-number.diff
@@ -22,7 +22,7 @@ index e7651e5..9fe8b53 100644
 +#else
      RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ConvertStringToValue" );
      double fValue = 0.0;
-     if (mnStringNoValueError == errCellNoValue)
+     ::rtl::OUString aStr( rStr);
 @@ -392,6 +402,7 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
              fValue = 0.0;
      }
commit 82e8ff8bae5be2ecd4ea22988793a2487edf45e9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Sep 9 17:25:13 2010 +0300

    Adapt to m7

diff --git a/patches/dev300/localize-pl-cygwin-paths.diff b/patches/dev300/localize-pl-cygwin-paths.diff
index 8731408..3469e2f 100644
--- a/patches/dev300/localize-pl-cygwin-paths.diff
+++ b/patches/dev300/localize-pl-cygwin-paths.diff
@@ -20,7 +20,7 @@ index 8310435..78b6b6e 100644
 @@ -492,7 +493,7 @@ sub collectfiles{
          # if ( -x $command ){
          if( $command ){
-             if( !$bVerbose  ){ $args .= " "; }
+             if( !$bVerbose  ){ $args .= " -QQ "; }
 -            $args .= " -e -f $localizeSDF -l ";
 +            $args .= " -e -f ".fix_cygwin_path($localizeSDF)." -l ";
              my $bFlag="";