diff options
| author | Joachim Lingner <jl@openoffice.org> | 2011-01-04 15:06:50 +0100 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2011-01-04 15:06:50 +0100 |
| commit | b4c21506e335f8d419d85f55b70508d805ee3d8b (patch) | |
| tree | ba918ce909c2257e2dff37e9f7fffcfd3274077d /desktop/source/deployment/manager/dp_extensionmanager.cxx | |
| parent | 7508b11431ad7e08ab49a8a239a79ee9ae80334d (diff) | |
jl160 resolve merge conflicts
Diffstat (limited to 'desktop/source/deployment/manager/dp_extensionmanager.cxx')
| -rw-r--r-- | desktop/source/deployment/manager/dp_extensionmanager.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index fb01dc838459..6eb547c4e98a 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -662,9 +662,9 @@ Reference<deploy::XPackage> ExtensionManager::addExtension( //Determine the repository to use Reference<deploy::XPackageManager> xPackageManager; if (repository.equals(OUSTR("user"))) - xPackageManager = m_userRepository; + xPackageManager = getUserRepository(); else if (repository.equals(OUSTR("shared"))) - xPackageManager = m_sharedRepository; + xPackageManager = getSharedRepository(); else throw lang::IllegalArgumentException( OUSTR("No valid repository name provided."), @@ -677,7 +677,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension( getTempExtension(url, xAbortChannel, xCmdEnv); //Make sure the extension is removed from the tmp repository in case //of an exception - ExtensionRemoveGuard tmpExtensionRemoveGuard(xTmpExtension, m_tmpRepository); + ExtensionRemoveGuard tmpExtensionRemoveGuard(xTmpExtension, getTmpRepository()); const OUString sIdentifier = dp_misc::getIdentifier(xTmpExtension); const OUString sFileName = xTmpExtension->getName(); Reference<deploy::XPackage> xOldExtension; @@ -721,7 +721,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension( //the xTmpExtension //no command environment supplied, only this class shall interact //with the user! - xExtensionBackup = getTmpRepository->importExtension( + xExtensionBackup = getTmpRepository()->importExtension( xOldExtension, Reference<task::XAbortChannel>(), Reference<ucb::XCommandEnvironment>()); tmpExtensionRemoveGuard.reset(xExtensionBackup); |