[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-formula-variable-separators-sc.diff |    2 +-
 patches/dev300/cws-koheidatapilot03-sc.diff             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 777a87aa83cf595445b9e6a59c18ff188dfb3182
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Sep 11 17:46:35 2009 -0400

    Fixed build breakage in sc on dev300-m58.
    
    Static data members of ScGlobal are no longer public; we now
    need to call their accessor methods to access them.
    
    * patches/dev300/cws-koheidatapilot03-sc.diff:
    * patches/dev300/calc-formula-variable-separators-sc.diff:

diff --git a/patches/dev300/calc-formula-variable-separators-sc.diff b/patches/dev300/calc-formula-variable-separators-sc.diff
index dc251bf..8bfbec7 100644
--- a/patches/dev300/calc-formula-variable-separators-sc.diff
+++ b/patches/dev300/calc-formula-variable-separators-sc.diff
@@ -216,7 +216,7 @@ index ffbb2d9..4338af6 100644
 +
 +    do
 +    {
-+        const Locale& rLocale = *ScGlobal::pLocale;
++        const Locale& rLocale = *ScGlobal::GetLocale();
 +        const OUString& rLang = rLocale.Language;
 +        if (rLang.equalsAscii("ru"))
 +            // Don't do automatic guess for these languages, and fall back to 
diff --git a/patches/dev300/cws-koheidatapilot03-sc.diff b/patches/dev300/cws-koheidatapilot03-sc.diff
index cb8fe85..2427c76 100644
--- a/patches/dev300/cws-koheidatapilot03-sc.diff
+++ b/patches/dev300/cws-koheidatapilot03-sc.diff
@@ -2286,7 +2286,7 @@ index 0699892..e472dbf 100644
  {
      //! name from source instead of caption?
 -    return ScGlobal::GetpTransliteration()->isEqual( rFilter.maFieldName, rField.aCaption );
-+    return ScGlobal::pTransliteration->isEqual( rFilter.maFieldName, rField.maName );
++    return ScGlobal::GetpTransliteration()->isEqual( rFilter.maFieldName, rField.maName );
  }
  
  bool lcl_IsCondition( const sheet::MemberResult& rResultEntry, const ScDPGetPivotDataField& rFilter )