diff options
Diffstat (limited to 'desktop/source/migration/migration_impl.hxx')
| -rw-r--r-- | desktop/source/migration/migration_impl.hxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index ebb7c96c620c..d66cabad941e 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,21 +106,21 @@ struct MigrationItem { } - MigrationItem(const ::rtl::OUString& sParentNodeName, - const ::rtl::OUString& sPrevSibling, - const ::rtl::OUString& sCommandURL, + MigrationItem(const ::rtl::OUString& sParentNodeName, + const ::rtl::OUString& sPrevSibling, + const ::rtl::OUString& sCommandURL, const NS_UNO::Reference< NS_CSS::container::XIndexContainer > xPopupMenu) { m_sParentNodeName = sParentNodeName; - m_sPrevSibling = sPrevSibling; - m_sCommandURL = sCommandURL; - m_xPopupMenu = xPopupMenu; + m_sPrevSibling = sPrevSibling; + m_sCommandURL = sCommandURL; + m_xPopupMenu = xPopupMenu; } MigrationItem& operator=(const MigrationItem& aMigrationItem) { m_sParentNodeName = aMigrationItem.m_sParentNodeName; - m_sPrevSibling = aMigrationItem.m_sPrevSibling; + m_sPrevSibling = aMigrationItem.m_sPrevSibling; m_sCommandURL = aMigrationItem.m_sCommandURL; m_xPopupMenu = aMigrationItem.m_xPopupMenu; @@ -130,17 +130,17 @@ struct MigrationItem sal_Bool operator==(const MigrationItem& aMigrationItem) { return ( aMigrationItem.m_sParentNodeName == m_sParentNodeName && - aMigrationItem.m_sPrevSibling == m_sPrevSibling && - aMigrationItem.m_sCommandURL == m_sCommandURL && + aMigrationItem.m_sPrevSibling == m_sPrevSibling && + aMigrationItem.m_sCommandURL == m_sCommandURL && aMigrationItem.m_xPopupMenu.is() == m_xPopupMenu.is() ); } ::rtl::OUString GetPrevSibling() const { return m_sPrevSibling; } }; -typedef ::std::hash_map< ::rtl::OUString, - ::std::vector< MigrationItem >, - ::rtl::OUStringHash, +typedef ::std::hash_map< ::rtl::OUString, + ::std::vector< MigrationItem >, + ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > MigrationHashMap; struct MigrationItemInfo @@ -164,7 +164,7 @@ struct MigrationItemInfo struct MigrationModuleInfo { ::rtl::OUString sModuleShortName; - sal_Bool bHasMenubar; + sal_Bool bHasMenubar; ::std::vector< ::rtl::OUString > m_vToolbars; MigrationModuleInfo():bHasMenubar(sal_False){}; @@ -172,7 +172,7 @@ struct MigrationModuleInfo //__________________________________________ /** - get the information before copying the ui configuration files of old version to new version + get the information before copying the ui configuration files of old version to new version */ class NewVersionUIInfo { @@ -221,10 +221,10 @@ private: ::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const; void compareOldAndNewConfig(const ::rtl::OUString& sParentNodeName, - const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xOldIndexContainer, + const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xOldIndexContainer, const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xNewIndexContainer, const ::rtl::OUString& sToolbarName); - void mergeOldToNewVersion(const NS_UNO::Reference< NS_CSS::ui::XUIConfigurationManager >& xCfgManager, + void mergeOldToNewVersion(const NS_UNO::Reference< NS_CSS::ui::XUIConfigurationManager >& xCfgManager, const NS_UNO::Reference< NS_CSS::container::XIndexContainer>& xIndexContainer, const ::rtl::OUString& sModuleIdentifier, const ::rtl::OUString& sResourceURL); |