diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:15:12 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:15:12 +0100 |
commit | e1740510b7786803134411d9aa3a125642cf9fdc (patch) | |
tree | 24b829557ce13acc23dbd4b3da25fb2e9726a0c5 /desktop/source | |
parent | 06fc1ee4c4ee8de3a4d758cbca761a5e80a0873f (diff) | |
parent | 99fe0a11ca01d9e7f10acc1e138a579457c2f004 (diff) |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
sfx2/source/appl/appserv.cxx
Diffstat (limited to 'desktop/source')
-rw-r--r-- | desktop/source/deployment/manager/dp_extensionmanager.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index fac52892f450..1b84fea78f77 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -729,9 +729,13 @@ Reference<deploy::XPackage> ExtensionManager::addExtension( if (repository.equals(OUSTR("user"))) bUserDisabled2 = false; + // pass the two values via variables to workaround gcc-4.3.4 specific bug (bnc#655912) + OUString sNewExtensionIdentifier = dp_misc::getIdentifier(xNewExtension); + OUString sNewExtensionFileName = xNewExtension->getName(); + activateExtension( - dp_misc::getIdentifier(xNewExtension), - xNewExtension->getName(), bUserDisabled2, false, xAbortChannel, + sNewExtensionIdentifier, sNewExtensionFileName, + bUserDisabled2, false, xAbortChannel, Reference<ucb::XCommandEnvironment>()); } else |