diff options
Diffstat (limited to 'desktop/source/deployment/manager/dp_manager.cxx')
-rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index a0eb96fdcc02..8244d4f88ee3 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -20,6 +20,7 @@ #include <config_features.h> #include "dp_registry.hxx" +#include "dp_shared.hxx" #include "dp_ucb.h" #include "dp_resource.h" #include "dp_platform.hxx" @@ -738,7 +739,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( Reference<deployment::XPackage> xPackage; // copy file: progressUpdate( - getResourceString(RID_STR_COPYING_PACKAGE) + title, xCmdEnv ); + DpResId(RID_STR_COPYING_PACKAGE) + title, xCmdEnv ); if (m_activePackages.isEmpty()) { ::ucbhelper::Content docFolderContent; @@ -829,7 +830,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( Any exc( ::cppu::getCaughtException() ); logIntern( exc ); throw deployment::DeploymentException( - getResourceString(RID_STR_ERROR_WHILE_ADDING) + url, + DpResId(RID_STR_ERROR_WHILE_ADDING) + url, static_cast<OWeakObject *>(this), exc ); } } @@ -928,7 +929,7 @@ void PackageManagerImpl::removePackage( Any exc( ::cppu::getCaughtException() ); logIntern( exc ); throw deployment::DeploymentException( - getResourceString(RID_STR_ERROR_WHILE_REMOVING) + id, + DpResId(RID_STR_ERROR_WHILE_REMOVING) + id, static_cast<OWeakObject *>(this), exc ); } } @@ -962,7 +963,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( return getDeployedPackage_( id, val, xCmdEnv ); } throw lang::IllegalArgumentException( - getResourceString(RID_STR_NO_SUCH_PACKAGE) + id, + DpResId(RID_STR_NO_SUCH_PACKAGE) + id, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } @@ -980,7 +981,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( auto const iter = params.find(OString("platform")); if (iter != params.end() && !platform_fits(iter->second.m_sValue)) throw lang::IllegalArgumentException( - getResourceString(RID_STR_NO_SUCH_PACKAGE) + id, + DpResId(RID_STR_NO_SUCH_PACKAGE) + id, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } |