diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:35:07 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:35:07 +0000 |
| commit | 622c62f08d5e579f9fb1b74d7c4ff973639178a2 (patch) | |
| tree | f3d5a2be2d41dabd94a152636b8909bac59fb44f | |
| parent | c9964367dc7468d616ff676b2d76670a6af4f065 (diff) | |
INTEGRATION: CWS binfilter (1.37.50); FILE MERGED
2003/07/08 17:31:56 aw 1.37.50.2: #110680#
2003/07/07 15:46:17 aw 1.37.50.1: #110680#
Changed all components to use the ServiceManager they were created with.
| -rw-r--r-- | xmloff/source/draw/ximpstyl.cxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 9327a4aa774e..3cfd10129d75 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ximpstyl.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: rt $ $Date: 2004-03-30 16:17:06 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:35:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,9 +121,10 @@ #include <com/sun/star/presentation/XHandoutMasterSupplier.hpp> #endif -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ -#include <comphelper/processfactory.hxx> -#endif +// #110680# +//#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ +//#include <comphelper/processfactory.hxx> +//#endif #ifndef _XMLOFF_XMLPROPERTYSETCONTEXT_HXX #include "xmlprcon.hxx" @@ -996,9 +997,15 @@ SdXMLStylesContext::SdXMLStylesContext( : SvXMLStylesContext(rImport, nPrfx, rLName, xAttrList), mbIsAutoStyle(bIsAutoStyle) { - Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); + // #110680# + // Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); + Reference< lang::XMultiServiceFactory > xMSF = rImport.getServiceFactory(); + mpNumFormatter = new SvNumberFormatter( xMSF, LANGUAGE_SYSTEM ); - mpNumFmtHelper = new SvXMLNumFmtHelper( mpNumFormatter ); + + // #110680# + // mpNumFmtHelper = new SvXMLNumFmtHelper( mpNumFormatter ); + mpNumFmtHelper = new SvXMLNumFmtHelper( mpNumFormatter, xMSF ); } ////////////////////////////////////////////////////////////////////////////// |