diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2012-12-28 18:19:25 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2012-12-28 18:19:25 +0100 |
commit | 8394c5a19170af5e62ba1a5adc236465e5d65bde (patch) | |
tree | 7e0baad049d6a5fc23f18b3a92091232d4281a90 /desktop/source/deployment | |
parent | f52e8908a6924ad7786874ca45deb46f0dfe4e30 (diff) |
Some cppcheck cleaning + Related fdo#57950
Change-Id: I7ac04bf39004f8fd86404710ef2f15cf9678f63d
Diffstat (limited to 'desktop/source/deployment')
-rw-r--r-- | desktop/source/deployment/manager/dp_commandenvironments.cxx | 5 | ||||
-rw-r--r-- | desktop/source/deployment/manager/dp_extensionmanager.cxx | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index fcd51f4e3eec..d9693ce1bc16 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -250,13 +250,10 @@ void SilentCheckPrerequisitesCommandEnv::handle( deployment::LicenseException licExc; deployment::PlatformException platformExc; deployment::DependencyException depExc; - bool approve = false; - bool abort = false; if (request >>= licExc) { - approve = true; - handle_(approve, abort, xRequest); + handle_(true, false, xRequest); // approve = true, abort = false } else if ((request >>= platformExc) || (request >>= depExc)) diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 3213c1a18a55..3d73b5dc5f57 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -1304,13 +1304,11 @@ sal_Bool ExtensionManager::synchronize( { try { - sal_Bool bModified = sal_False; - ::osl::MutexGuard guard(getMutex()); String sSynchronizingShared(StrSyncRepository::get()); sSynchronizingShared.SearchAndReplaceAllAscii( "%NAME", OUSTR("shared")); dp_misc::ProgressLevel progressShared(xCmdEnv, sSynchronizingShared); - bModified = getSharedRepository()->synchronize(xAbortChannel, xCmdEnv); + sal_Bool bModified = getSharedRepository()->synchronize(xAbortChannel, xCmdEnv); progressShared.update(OUSTR("\n\n")); String sSynchronizingBundled(StrSyncRepository::get()); |