diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-12 11:09:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-12 11:10:10 +0100 |
| commit | 83e191e25da8a508a2dafad339c0ee58e97c5c8b (patch) | |
| tree | 41ffadeda7fcf325b0d0bdd5764fe4bd7282319e /desktop/source/deployment/registry/package | |
| parent | 7bf2f528ef22f50aa167ba57f2e25d4452977060 (diff) | |
Do not use C++-UNO internal static_type functions in client code
...use cppu::UnoType instead.
Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31
Diffstat (limited to 'desktop/source/deployment/registry/package')
| -rw-r--r-- | desktop/source/deployment/registry/package/dp_package.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 8c721c5afde4..44333de608f0 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -697,7 +697,7 @@ bool BackendImpl::PackageImpl::checkDependencies( bool approve = false; bool abort = false; if (! interactContinuation( - Any(licExc), task::XInteractionApprove::static_type(), xCmdEnv, &approve, &abort )) + Any(licExc), cppu::UnoType<task::XInteractionApprove>::get(), xCmdEnv, &approve, &abort )) throw css::deployment::DeploymentException( "Could not interact with user.", 0, Any()); @@ -871,7 +871,7 @@ void BackendImpl::PackageImpl::processPackage_( Any( lang::WrappedTargetException( "bundle item registration error!", static_cast<OWeakObject *>(this), exc ) ), - task::XInteractionApprove::static_type(), xCmdEnv, + cppu::UnoType<task::XInteractionApprove>::get(), xCmdEnv, &approve, &abort )) { OSL_ASSERT( !approve && !abort ); if (m_legacyBundle) // default for legacy packages: ignore @@ -950,7 +950,7 @@ void BackendImpl::PackageImpl::processPackage_( Any( lang::WrappedTargetException( "bundle item revocation error!", static_cast<OWeakObject *>(this), exc ) ), - task::XInteractionApprove::static_type(), xCmdEnv, + cppu::UnoType<task::XInteractionApprove>::get(), xCmdEnv, &approve, &abort )) { OSL_ASSERT( !approve && !abort ); if (m_legacyBundle) // default for legacy packages: ignore @@ -1053,7 +1053,7 @@ void BackendImpl::PackageImpl::exportTo( static_cast<OWeakObject *>(this), task::InteractionClassification_QUERY, destFolderURL, title, OUString() ) ), - ucb::XInteractionReplaceExistingData::static_type(), xCmdEnv, + cppu::UnoType<ucb::XInteractionReplaceExistingData>::get(), xCmdEnv, &replace, &abort ) || !replace) { return; } @@ -1383,7 +1383,7 @@ Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem( interactContinuation( Any( lang::WrappedTargetException("bundle item error!", static_cast<OWeakObject *>(this), exc ) ), - task::XInteractionApprove::static_type(), xCmdEnv, 0, 0 ); + cppu::UnoType<task::XInteractionApprove>::get(), xCmdEnv, 0, 0 ); } } |