diff options
| -rw-r--r-- | desktop/source/app/langselect.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_commandenvironments.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_extensionmanager.cxx | 4 |
3 files changed, 3 insertions, 14 deletions
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index e25449390e0b..ab3043827c87 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -85,16 +85,10 @@ static OUString locateSofficeIniFile() if ( utl::Bootstrap::locateUserData( aUserDataPath ) == utl::Bootstrap::PATH_EXISTS ) { - const char CONFIG_DIR[] = "/config"; - sal_Int32 nIndex = aSofficeIniFileURL.lastIndexOf( '/'); if ( nIndex > 0 ) { - OUString aUserSofficeIniFileURL; - OUStringBuffer aBuffer( aUserDataPath ); - aBuffer.appendAscii( CONFIG_DIR ); - aBuffer.append( aSofficeIniFileURL.copy( nIndex )); - aUserSofficeIniFileURL = aBuffer.makeStringAndClear(); + OUString aUserSofficeIniFileURL = aUserDataPath + "/config" + aSofficeIniFileURL.copy( nIndex ); if ( existsURL( aUserSofficeIniFileURL )) return aUserSofficeIniFileURL; 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()); |