diff options
Diffstat (limited to 'desktop')
7 files changed, 9 insertions, 9 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index e9732ee90462..ab5e0494289f 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -1102,8 +1102,8 @@ void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage { long nPos = iIndex - m_vEntries.begin(); - // Entries mustn't removed here, because they contain a hyperlink control - // which can only be deleted when the thread has the solar mutex. Therefor + // Entries mustn't be removed here, because they contain a hyperlink control + // which can only be deleted when the thread has the solar mutex. Therefore // the entry will be moved into the m_vRemovedEntries list which will be // cleared on the next paint event m_vRemovedEntries.push_back( *iIndex ); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 501cdd04cc8a..871183f4f6b2 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -490,7 +490,7 @@ void UpdateInstallDialog::Thread::installExtensions() { OSL_ASSERT(curData.aUpdateSource.is()); //I am not sure if we should obtain the install properties and pass them into - //add extension. Currently it contains only "SUPPRESS_LICENSE". So it it could happen + //add extension. Currently it contains only "SUPPRESS_LICENSE". So it could happen //that a license is displayed when updating from the shared repository, although the //shared extension was installed using "SUPPRESS_LICENSE". css::beans::NamedValue prop("EXTENSION_UPDATE", css::uno::makeAny(OUString("1"))); diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 8adba12ac067..72dab66b9231 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -1342,7 +1342,7 @@ sal_Bool ExtensionManager::synchronize( catch (...) { //We catch the exception, so we can write the lastmodified file - //so we will no repeat this everytime OOo starts. + //so we will no repeat this every time OOo starts. OSL_FAIL("Extensions Manager: synchronize"); } OUString lastSyncBundled("$BUNDLED_EXTENSIONS_USER/lastsynchronized"); diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 1529fb407ae5..a4eb6c6bde33 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -170,7 +170,7 @@ void PackageManagerImpl::initActivationLayer( create_folder( 0, m_registrationData_expanded, xCmdEnv, true); dbName = m_registrationData_expanded + "/extensions.pmap"; } - // The data base can always be written because it it always in the user installation + // The data base can always be written because it is always in the user installation m_activePackagesDB.reset( new ActivePackages( dbName, false ) ); if (! m_readOnly && ! (m_context == "bundled")) @@ -1337,7 +1337,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions( rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8); - //It it sufficient to check for the folder name, because when the administor + //It is sufficient to check for the folder name, because when the administor //installed the extension it was already checked if there is one with the //same identifier. const MatchTempDir match(titleEncoded); diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index cf1bc1f1683b..9fee2525eb58 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -411,7 +411,7 @@ void BackendImpl::PackageImpl::processPackage_( //We cannot just call removeLibrary(name) because this could remove a //script which was added by an extension in a different repository. For //example, extension foo is contained in the bundled repository and then - //the user adds it it to the user repository. The extension manager will + //the user adds it to the user repository. The extension manager will //then register the new script and revoke the script from the bundled //extension. removeLibrary(name) would now remove the script from the //user repository. That is, the script of the newly added user extension does diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 5f419f319029..78b5a71ec1d9 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -428,7 +428,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const OUString& rMigrationName) uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW); uno::Reference< XNameAccess > xMigrationData( aMigrationAccess->getByName(rMigrationName), uno::UNO_QUERY_THROW ); - // get migration description from from org.openoffice.Setup/Migration + // get migration description from org.openoffice.Setup/Migration // and build vector of migration steps OUString aMigrationSteps( "MigrationSteps" ); uno::Reference< XNameAccess > theNameAccess(xMigrationData->getByName(aMigrationSteps), uno::UNO_QUERY_THROW); diff --git a/desktop/test/deployment/update/readme.txt b/desktop/test/deployment/update/readme.txt index a7662b3fe1cf..efcba3206f33 100644 --- a/desktop/test/deployment/update/readme.txt +++ b/desktop/test/deployment/update/readme.txt @@ -44,7 +44,7 @@ For example .../update/updatefeed/udpate -The different test folders for the update are also commited in project extensions/www +The different test folders for the update are also committed in project extensions/www so that the files can be obtain via an URL. The structure and the contents is about the same as the content of desktop/test/deployment/udpate |