[Libreoffice-commits] core.git: desktop/source
Noel Grandin
noel at peralex.com
Tue Jan 6 22:56:05 PST 2015
desktop/source/deployment/manager/dp_extensionmanager.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a9c2d1c626c52ae595efc1000b0682ba6354fc54
Author: Noel Grandin <noel at peralex.com>
Date: Wed Jan 7 08:50:55 2015 +0200
fix spelling: garded -> guarded
Change-Id: I3e9f8781957a8b96afeb609501dff1f8bc9d718e
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 345a3e0..c0b41df 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -690,12 +690,12 @@ Reference<css::deployment::XPackage> ExtensionManager::addExtension(
{
bool bUserDisabled = false;
- // In this garded section (getMutex) we must not use the argument xCmdEnv
+ // In this guarded section (getMutex) we must not use the argument xCmdEnv
// because it may bring up dialogs (XInteractionHandler::handle) this
- //may potententially deadlock. See issue
- //http://qa.openoffice.org/issues/show_bug.cgi?id=114933
- //By not providing xCmdEnv the underlying APIs will throw an exception if
- //the XInteractionRequest cannot be handled
+ // may potententially deadlock. See issue
+ // http://qa.openoffice.org/issues/show_bug.cgi?id=114933
+ // By not providing xCmdEnv the underlying APIs will throw an exception if
+ // the XInteractionRequest cannot be handled.
::osl::MutexGuard guard(getMutex());
if (bCanInstall)
@@ -807,7 +807,7 @@ Reference<css::deployment::XPackage> ExtensionManager::addExtension(
}
::cppu::throwException(excOccurred2);
}
- } // leaving the garded section (getMutex())
+ } // leaving the guarded section (getMutex())
try
{
More information about the Libreoffice-commits
mailing list