#94368# get rid of class International

2 files changed, 11 insertions, 16 deletions

diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 1a83c74fdae9..8a8a38cb821d 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: runtime.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mh $ $Date: 2001-10-17 18:35:14 $
+ *  last change: $Author: er $ $Date: 2001-11-23 19:17:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,9 +65,6 @@
 #ifndef _SV_SVAPP_HXX //autogen
 #include <vcl/svapp.hxx>
 #endif
-#ifndef _INTN_HXX //autogen
-#include <tools/intn.hxx>
-#endif
 
 #ifndef _ZFORLIST_HXX //autogen
 #include <svtools/zforlist.hxx>
@@ -86,6 +83,10 @@
 #include <comphelper/processfactory.hxx>
 #endif
 
+#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
+#include <svtools/syslocale.hxx>
+#endif
+
 // Makro MEMBER()
 #include <macfix.hxx>
 
@@ -344,8 +345,7 @@ SvNumberFormatter* SbiInstance::GetNumberFormatter()
 void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
     ULONG &rnStdDateIdx, ULONG &rnStdTimeIdx, ULONG &rnStdDateTimeIdx )
 {
-    const International& rInter = GetpApp()->GetAppInternational();
-    LanguageType eLangType = rInter.GetLanguage();
+    LanguageType eLangType = Application::GetSettings().GetLanguage();
 
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
         xFactory = comphelper::getProcessServiceFactory();
@@ -364,7 +364,7 @@ void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
     // austauscht. Problem: Print Year(Date) unter engl. BS
     // siehe auch svtools\source\sbx\sbxdate.cxx
 
-    DateFormat eDate = rInter.GetDateFormat();
+    DateFormat eDate = SvtSysLocale().GetLocaleData().getDateFormat();
     String aDateStr;
     switch( eDate )
     {
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index 0456d3ccefaa..8ac13b5513f0 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: step1.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2001-10-17 18:35:14 $
+ *  last change: $Author: er $ $Date: 2001-11-23 19:17:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,9 +64,6 @@
 #ifndef _TOOLS_SOLMATH_HXX //autogen wg. SolarMath
 #include <tools/solmath.hxx>
 #endif
-#ifndef _TOOLS_INTN_HXX //autogen wg. International
-#include <tools/intn.hxx>
-#endif
 #include "runtime.hxx"
 #pragma hdrstop
 #include "sbintern.hxx"
@@ -77,8 +74,6 @@
 
 void SbiRuntime::StepLOADNC( USHORT nOp1 )
 {
-    static International aEnglischIntn( LANGUAGE_ENGLISH_US, LANGUAGE_ENGLISH_US );
-
     SbxVariable* p = new SbxVariable( SbxDOUBLE );
 
     // #57844 Lokalisierte Funktion benutzen
@@ -94,7 +89,7 @@ void SbiRuntime::StepLOADNC( USHORT nOp1 )
         aStr += '.';
         aStr += aStr2;
     }
-    double n = SolarMath::StringToDouble( aStr.GetBuffer(), aEnglischIntn, nErrno );
+    double n = SolarMath::StringToDouble( aStr.GetBuffer(), '.', ',', nErrno );
     //ALT: double n = atof( pImg->GetString( nOp1 ) );
 
     p->PutDouble( n );