diff options
| author | Jörg Barfurth <jb@openoffice.org> | 2002-07-03 14:54:38 +0000 |
|---|---|---|
| committer | Jörg Barfurth <jb@openoffice.org> | 2002-07-03 14:54:38 +0000 |
| commit | dcf9961a3671543acbe85da0edca7db95e083529 (patch) | |
| tree | 77fb1947234488fbcb216ce98c169aef652e98ed /configmgr | |
| parent | ca963ff9e9b6ccb55b3e1ca869cdc3d2198002b5 (diff) | |
#98489# Added support for uno backend bootstrapping
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/misc/bootstrap.cxx | 7 | ||||
| -rw-r--r-- | configmgr/source/misc/providerfactory.cxx | 18 |
2 files changed, 15 insertions, 10 deletions
diff --git a/configmgr/source/misc/bootstrap.cxx b/configmgr/source/misc/bootstrap.cxx index b0ca51a1c287..da57fa412a71 100644 --- a/configmgr/source/misc/bootstrap.cxx +++ b/configmgr/source/misc/bootstrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: jb $ $Date: 2002-06-12 16:44:14 $ + * last change: $Author: jb $ $Date: 2002-07-03 15:54:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -222,7 +222,8 @@ namespace configmgr SETTING_SERVER, SETTING_SERVICE, SETTING_PORT, SETTING_TIMEOUT, SETTING_LOCALE, SETTING_ASYNC, - SETTING_SOURCEPATH, SETTING_UPDATEPATH, SETTING_REINITIALIZE + SETTING_SOURCEPATH, SETTING_UPDATEPATH, SETTING_REINITIALIZE, + SETTING_UNOSERVICE, SETTING_UNOWRAPPER, SETTING_OFFLINE }; // --------------------------------------------------------------------------------------- diff --git a/configmgr/source/misc/providerfactory.cxx b/configmgr/source/misc/providerfactory.cxx index 622a0b042404..e421b0956fa4 100644 --- a/configmgr/source/misc/providerfactory.cxx +++ b/configmgr/source/misc/providerfactory.cxx @@ -2,9 +2,9 @@ * * $RCSfile: providerfactory.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: jb $ $Date: 2002-06-12 16:44:14 $ + * last change: $Author: jb $ $Date: 2002-07-03 15:54:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -309,17 +309,18 @@ namespace configmgr // detect a plugin session. Can be specified only as argument sal_Bool bIsPluginSession = aThisRoundSettings.isPlugin(); - if (bIsPluginSession) - { - OSL_ENSURE(!aThisRoundSettings.isSourcePathValid(),"Invalid Argument: No explicit source path should be specified for plugin session"); - bUseBootstrapData = true; - } + OSL_ASSERT(bUseBootstrapData || !bIsPluginSession); + OSL_ENSURE(!bIsPluginSession || !aThisRoundSettings.isSourcePathValid(),"Invalid Argument: No explicit source path should be specified for plugin session"); // use bootstrap data if necessary if (bUseBootstrapData) { ensureBootstrapSettings(); + // hack to disable 'plugin' behavior for new-style sessions + if (bIsPluginSession && m_pPureSettings->settings.isUnoBackend()) + return this->createProvider(); //--> use default provider + ConnectionSettings aMergedSettings = m_pPureSettings->settings; aMergedSettings.mergeOverrides(aThisRoundSettings); aMergedSettings.swap(aThisRoundSettings); @@ -431,6 +432,9 @@ namespace configmgr /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.16 2002/06/12 16:44:14 jb + * #98489# Initial support for new UNO-based backends + * * Revision 1.15 2001/11/09 12:03:36 jb * #86080# Corrected exception thrown for creation failures * |