Do not use C++-UNO internal static_type functions in client code

...use cppu::UnoType instead.

Change-Id: I507914b30ef8acda910ee4ecc0589fd328eb6f31

4 files changed, 11 insertions, 11 deletions

diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 49ee4701f12b..3fc60b42688e 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1386,7 +1386,7 @@ void ExtensionManager::checkInstall(
                 static_cast<OWeakObject *>(this), displayName));
         bool approve = false, abort = false;
         if (! dp_misc::interactContinuation(
-                request, task::XInteractionApprove::static_type(),
+                request, cppu::UnoType<task::XInteractionApprove>::get(),
                 cmdEnv, &approve, &abort ))
         {
             OSL_ASSERT( !approve && !abort );
@@ -1419,7 +1419,7 @@ void ExtensionManager::checkUpdate(
             oldExtension ) ) );
     bool replace = false, abort = false;
     if (! dp_misc::interactContinuation(
-            request, task::XInteractionApprove::static_type(),
+            request, cppu::UnoType<task::XInteractionApprove>::get(),
             xCmdEnv, &replace, &abort )) {
         OSL_ASSERT( !replace && !abort );
         throw css::deployment::DeploymentException(
@@ -1494,7 +1494,7 @@ void ExtensionManager::check()
 void ExtensionManager::fireModified()
 {
     ::cppu::OInterfaceContainerHelper * pContainer = rBHelper.getContainer(
-        util::XModifyListener::static_type() );
+        cppu::UnoType<util::XModifyListener>::get() );
     if (pContainer != 0) {
         pContainer->forEach<util::XModifyListener>(
             boost::bind(&util::XModifyListener::modified, _1,
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 72b3413d70c7..1792ee1ef44b 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -439,7 +439,7 @@ PackageManagerImpl::~PackageManagerImpl()
 void PackageManagerImpl::fireModified()
 {
     ::cppu::OInterfaceContainerHelper * pContainer = rBHelper.getContainer(
-        util::XModifyListener::static_type() );
+        cppu::UnoType<util::XModifyListener>::get() );
     if (pContainer != 0) {
         pContainer->forEach<util::XModifyListener>(
             boost::bind(&util::XModifyListener::modified, _1,
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index 4d9f40df91b0..f25165e4eff4 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -134,7 +134,7 @@ bool interactContinuation( Any const & request,
                            bool * pcont, bool * pabort )
 {
     OSL_ASSERT(
-        task::XInteractionContinuation::static_type().isAssignableFrom(
+        cppu::UnoType<task::XInteractionContinuation>::get().isAssignableFrom(
             continuation ) );
     if (xCmdEnv.is()) {
         Reference<task::XInteractionHandler> xInteractionHandler(
@@ -146,7 +146,7 @@ bool interactContinuation( Any const & request,
             conts[ 0 ] = new InteractionContinuationImpl(
                 continuation, &cont );
             conts[ 1 ] = new InteractionContinuationImpl(
-                task::XInteractionAbort::static_type(), &abort );
+                cppu::UnoType<task::XInteractionAbort>::get(), &abort );
             xInteractionHandler->handle(
                 new InteractionRequest( request, conts ) );
             if (cont || abort) {
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 );
         }
     }