1. mst
  2. ooo340

Commits

Joachim Lingner  committed de072d0

jl155 solving conflicts after pulling and merging with jsc341

  • Participants
  • Parent commits a147d40
  • Branches jl155

Comments (0)

Files changed (1)

File desktop/source/deployment/manager/dp_extensionmanager.cxx

View file
  • Ignore whitespace
 
     if (xOldExtension.is())
     {
-        xBackup = getTmpRepository()->addPackage(
+        xBackup = getBakRepository()->addPackage(
             xOldExtension->getURL(), uno::Sequence<beans::NamedValue>(),
             OUString(), Reference<task::XAbortChannel>(), tmpCmdEnv);
 
                 {
                     xExtensionBackup = backupExtension(
                         identifier, fileName, xPackageManager);
-                    removeGuardExtensionBackup.reset(xExtensionBackup);
+                    removeGuardExtensionBackup.set(xExtensionBackup, getBakRepository());
                     if (dp_misc::Dependencies::inverseInterExtensionsDependencyCheck(
                             this, deploy::ExtensionManagerAction_Remove, xOldExtension, OUString(),
                             Reference<ucb::XCommandEnvironment>()))