diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:36:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:36:14 +0000 |
| commit | 7ef396e8dabf6a5cb58432165bd5f45742996d3d (patch) | |
| tree | 8c46c4f6f5bd24eb5ad920f1ae01c39765aee235 /xmloff | |
| parent | 8f47ea7a06ec4f47f3f87ea586bba3b55039ba72 (diff) | |
INTEGRATION: CWS binfilter (1.35.10); FILE MERGED
2003/08/08 10:42:07 aw 1.35.10.3: RESYNC: (1.35-1.36); FILE MERGED
2003/07/08 17:33:23 aw 1.35.10.2: #110680#
2003/07/07 15:46:22 aw 1.35.10.1: #110680#
Changed all components to use the ServiceManager they were created with.
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 5504c8fd028d..50a081c22351 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlnumfe.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: rt $ $Date: 2003-05-21 07:39:11 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:36:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,10 @@ #include <unotools/charclass.hxx> #include <com/sun/star/lang/Locale.hpp> #include <rtl/ustrbuf.hxx> -#include <comphelper/processfactory.hxx> + +// #110680# +//#include <comphelper/processfactory.hxx> + #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> #include "xmlnumfe.hxx" @@ -320,8 +323,12 @@ SvXMLNumFmtExport::SvXMLNumFmtExport( else { lang::Locale aLocale( SvNumberFormatter::ConvertLanguageToLocale( ::GetSystemLanguage() ) ); - pCharClass = new CharClass( ::comphelper::getProcessServiceFactory(), aLocale ); - pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aLocale ); + + // #110680# + // pCharClass = new CharClass( ::comphelper::getProcessServiceFactory(), aLocale ); + // pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aLocale ); + pCharClass = new CharClass( rExport.getServiceFactory(), aLocale ); + pLocaleData = new LocaleDataWrapper( rExport.getServiceFactory(), aLocale ); } pUsedList = new SvXMLNumUsedList_Impl; @@ -354,8 +361,12 @@ SvXMLNumFmtExport::SvXMLNumFmtExport( else { lang::Locale aLocale( SvNumberFormatter::ConvertLanguageToLocale( ::GetSystemLanguage() ) ); - pCharClass = new CharClass( ::comphelper::getProcessServiceFactory(), aLocale ); - pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aLocale ); + + // #110680# + // pCharClass = new CharClass( ::comphelper::getProcessServiceFactory(), aLocale ); + // pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aLocale ); + pCharClass = new CharClass( rExport.getServiceFactory(), aLocale ); + pLocaleData = new LocaleDataWrapper( rExport.getServiceFactory(), aLocale ); } pUsedList = new SvXMLNumUsedList_Impl; |