change: use SvNumberFormatter ctor using XMultiServiceFactory

3 files changed, 50 insertions, 11 deletions

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index b27bde397ed2..a623be14fb6f 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docfmt.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:15 $
+ *  last change: $Author: os $ $Date: 2000-10-20 09:51:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -187,6 +187,15 @@ SO2_DECL_REF(SvLinkName)
 #ifndef _FMTINFMT_HXX //autogen
 #include <fmtinfmt.hxx>
 #endif
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
+#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
+#include <unotools/processfactory.hxx>
+#endif
+
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
 
 
 SV_IMPL_PTRARR(SwFrmFmts,SwFrmFmtPtr)
@@ -2053,7 +2062,8 @@ void SwDoc::_CreateNumberFormatter()
 /*              ((const SvxLanguageItem&)GetAttrPool().
                     GetDefaultItem( RES_CHRATR_LANGUAGE )).GetLanguage();
 */
-    pNumberFormatter = new SvNumberFormatter( eLang );
+    Reference< XMultiServiceFactory > xMSF = ::utl::getProcessServiceFactory();
+    pNumberFormatter = new SvNumberFormatter( xMSF, eLang );
     pNumberFormatter->SetEvalDateFormat( NF_EVALDATEFORMAT_FORMAT_INTL );
     pNumberFormatter->SetYear2000(SFX_APP()->GetMiscConfig()->GetYear2000());
 
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 08814d439c38..f52edc830598 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tautofmt.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:48 $
+ *  last change: $Author: os $ $Date: 2000-10-20 09:51:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,7 +78,12 @@
 #ifndef _SV_SYSTEM_HXX //autogen
 #include <vcl/system.hxx>
 #endif
-
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
+#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
+#include <unotools/processfactory.hxx>
+#endif
 
 #ifndef _UIPARAM_HXX
 #include <uiparam.hxx>
@@ -91,6 +96,9 @@
 #include "shellres.hxx"
 #include "tautofmt.hrc"
 
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
 #define FRAME_OFFSET 4
 
 //========================================================================
@@ -664,9 +672,11 @@ AutoFmtPreview::AutoFmtPreview( Window* pParent, const ResId& rRes ) :
         nLabelColWidth  ( (USHORT)(((aPrvSize.Width()-4)/4)-12) ),
         nDataColWidth1  ( (USHORT)(((aPrvSize.Width()-4)-(nLabelColWidth*2)) / 3) ),
         nDataColWidth2  ( (USHORT)(((aPrvSize.Width()-4)-(nLabelColWidth*2)) / 4) ),
-        nRowHeight      ( (USHORT)((aPrvSize.Height()-4) / 5) ),
-        pNumFmt         ( new SvNumberFormatter( LANGUAGE_SYSTEM ) )
+        nRowHeight      ( (USHORT)((aPrvSize.Height()-4) / 5) )
 {
+    Reference< XMultiServiceFactory > xMSF = ::utl::getProcessServiceFactory();
+    pNumFmt = new SvNumberFormatter( xMSF, LANGUAGE_SYSTEM );
+
     Init();
 }
 
@@ -1714,6 +1724,9 @@ void lcl_SwLinkLine(const SwLineStruct& dLine,
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:48  hr
+    initial import
+
     Revision 1.46  2000/09/18 16:06:09  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 1184dd2410fd..4d96890b9037 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numfmtlb.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:50 $
+ *  last change: $Author: os $ $Date: 2000-10-20 09:51:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,6 +66,13 @@
 
 #include "hintids.hxx"
 
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
+#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
+#include <unotools/processfactory.hxx>
+#endif
+
 #ifndef _SV_SVAPP_HXX //autogen
 #include <vcl/svapp.hxx>
 #endif
@@ -112,6 +119,9 @@
 #include "utlui.hrc"
 #include "numfmtlb.hxx"
 
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
 #define C2S(cChar) UniString::CreateFromAscii(cChar)
 
 // STATIC DATA -----------------------------------------------------------
@@ -174,7 +184,10 @@ void NumFormatListBox::Init(short nFormatType, BOOL bUsrFmts)
         eCurLanguage = Application::GetAppInternational().GetLanguage();
 
     if (bUsrFmts == FALSE)
-        pOwnFormatter = new SvNumberFormatter(eCurLanguage);
+       {
+        Reference< XMultiServiceFactory > xMSF = ::utl::getProcessServiceFactory();
+        pOwnFormatter = new SvNumberFormatter(xMSF, eCurLanguage);
+    }
 
     SetFormatType(nFormatType);
     SetDefFormat(nDefFormat);
@@ -588,6 +601,9 @@ void NumFormatListBox::Clear()
       Source Code Control System - History
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:50  hr
+      initial import
+
       Revision 1.31  2000/09/18 16:06:18  willem.vandorp
       OpenOffice header added.