#90412# performance: moved English formatter from each document to one global

2 files changed, 9 insertions, 10 deletions

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 1b29d4dadbb9..ab7760e1e221 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: document.hxx,v $
  *
- *  $Revision: 1.43 $
+ *  $Revision: 1.44 $
  *
- *  last change: $Author: sab $ $Date: 2001-07-31 15:37:53 $
+ *  last change: $Author: er $ $Date: 2001-08-02 14:45:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -393,7 +393,6 @@ private:
     LanguageType        eCtlLanguage;                   // default language for complex text
     CharSet             eSrcSet;                        // Einlesen: Quell-Zeichensatz
 
-    long                nStandardIndexEnglishUS;
     ULONG               nFormulaCodeInTree;             // FormelRPN im Formelbaum
     USHORT              nInterpretLevel;                // >0 wenn im Interpreter
     USHORT              nMacroInterpretLevel;           // >0 wenn Macro im Interpreter
@@ -1257,11 +1256,6 @@ public:
                         const ScMarkData* pMarkData = NULL );
 
     SvNumberFormatter*  GetFormatTable() const;
-    SvNumberFormatter*  GetEnglishFormatTable() const;
-
-    // returns the standard english us
-    // numberformat of the english number formatter
-    ULONG               GetStandardIndexEnglishUS();
 
     void            Sort( USHORT nTab, const ScSortParam& rSortParam, BOOL bKeepQuery );
     USHORT          Query( USHORT nTab, const ScQueryParam& rQueryParam, BOOL bKeepSub );
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 9bfe2380e6eb..3f73370f83af 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: global.hxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: er $ $Date: 2001-07-11 15:16:28 $
+ *  last change: $Author: er $ $Date: 2001-08-02 14:45:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -558,6 +558,8 @@ class ScGlobal
 
     static ScUnitConverter* pUnitConverter;
 
+    static  SvNumberFormatter*  pEnglishFormatter;          // for UNO / XML export
+
 public:
     static ::com::sun::star::lang::Locale*      pLocale;
     static SvtSysLocale*        pSysLocale;
@@ -645,6 +647,9 @@ public:
 
     static  CharSet         GetCharsetValue( const String& rCharSet );
     static  String          GetCharsetString( CharSet eVal );
+
+    /// a "ReadOnly" formatter for UNO/XML export
+    static  SvNumberFormatter*  GetEnglishFormatter();
 };
 #endif