diff options
author | Joachim Lingner <jl@openoffice.org> | 2010-04-21 16:04:34 +0200 |
---|---|---|
committer | Joachim Lingner <jl@openoffice.org> | 2010-04-21 16:04:34 +0200 |
commit | c2d9d80b487dd0d7353b22eee44bee3b84fc7838 (patch) | |
tree | 6377659aba194b2b571b838aac5aa834ffe8843c /desktop/source/deployment/registry/package | |
parent | e1703d7ac3e485fb7b94787ecdf04a7910bb20c5 (diff) |
jl152 import 263449 from native0jl:#i77196# no registration of components in uno.exe at startup, fixed extension activation, basic, etc.
Diffstat (limited to 'desktop/source/deployment/registry/package')
-rw-r--r-- | desktop/source/deployment/registry/package/dp_package.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 822e744b8fc2..a5426bf26b54 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -159,6 +159,7 @@ class BackendImpl : public ImplBaseT virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, + bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, Reference<ucb::XCommandEnvironment> const & xCmdEnv ); @@ -847,6 +848,7 @@ uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool void BackendImpl::PackageImpl::processPackage_( ::osl::ResettableMutexGuard &, bool doRegisterPackage, + bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, Reference<ucb::XCommandEnvironment> const & xCmdEnv ) { @@ -865,7 +867,7 @@ void BackendImpl::PackageImpl::processPackage_( xPackage->createAbortChannel() ); AbortChannel::Chain chain( abortChannel, xSubAbortChannel ); try { - xPackage->registerPackage( xSubAbortChannel, xCmdEnv ); + xPackage->registerPackage( startup, xSubAbortChannel, xCmdEnv ); } catch (RuntimeException &) { throw; |