diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:12:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:12:56 +0000 |
| commit | ecbc6f9fe84061a8c3120891e50bc7502c043579 (patch) | |
| tree | 383e2970a1e11b860c1f84a8ef2420d1a765917b | |
| parent | ee35eee19dca5e5902bfe1627cf5f154d35ead34 (diff) | |
INTEGRATION: CWS sb59 (1.8.68); FILE MERGED
2006/08/22 08:28:12 sb 1.8.68.2: #i67487# Made code compile (warning-free) again after resync to SRC680m182.' source\migration\migration.cxx
2006/07/20 07:55:32 sb 1.8.68.1: #i67537# Made code warning-free.
| -rw-r--r-- | desktop/source/migration/migration.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index ac4a0ce0ec..e21090f98d 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -4,9 +4,9 @@ * * $RCSfile: migration.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-17 09:45:29 $ + * last change: $Author: obo $ $Date: 2006-10-12 14:12:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -142,8 +142,8 @@ sal_Bool MigrationImpl::checkMigration() } MigrationImpl::MigrationImpl(const Reference< XMultiServiceFactory >& xFactory) - : m_xFactory(xFactory) - , m_vrVersions(new strings_v) + : m_vrVersions(new strings_v) + , m_xFactory(xFactory) , m_vrMigrations(readMigrationSteps()) , m_aInfo(findInstallation()) , m_vrFileList(compileFileList()) @@ -217,7 +217,7 @@ sal_Bool MigrationImpl::checkMigrationCompleted() getConfigAccess("org.openoffice.Setup/Office"), UNO_QUERY_THROW); aPropertySet->getPropertyValue( OUString::createFromAscii("MigrationCompleted")) >>= bMigrationCompleted; - } catch (Exception& e) { + } catch (Exception&) { // just return false... } return bMigrationCompleted; @@ -323,7 +323,7 @@ install_info MigrationImpl::findInstallation() strings_v vInst; ByteString sInst; - for (int i=0; i<aVersion.GetKeyCount(); i++) { + for (USHORT i=0; i<aVersion.GetKeyCount(); i++) { sInst =aVersion.GetKeyName(i); vInst.push_back(OUString(static_cast< OString >(sInst), sInst.Len(), RTL_TEXTENCODING_UTF8)); } @@ -489,7 +489,7 @@ void MigrationImpl::copyConfig() OUString component = seqComponents[i]; importerArgs[2].Value = makeAny(seqComponents[i]); try { - Any aResult = xImporter->execute(importerArgs); + aResult = xImporter->execute(importerArgs); Exception myException; if (aResult >>= myException) throw myException; } catch(Exception& aException) { |