accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 7 +- accessibility/source/extended/accessiblelistboxentry.cxx | 9 +-- accessibility/source/extended/accessibletabbar.cxx | 18 ++----- accessibility/source/extended/accessibletabbarpage.cxx | 12 +---- dbaccess/source/ui/dlg/dbfindex.cxx | 3 - external/frozen/UnpackedTarball_frozen.mk | 1 external/frozen/cid1586676_use_move_ctor.0 | 24 ++++++++++ 7 files changed, 41 insertions(+), 33 deletions(-)
New commits: commit 4e7a0270c6efc371433c3c77772ca062d6747fe8 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Mon Jan 22 11:15:22 2024 +0000 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Mon Jan 22 15:15:31 2024 +0100 cid#1586676 Big parameter passed by value Change-Id: I803788650dda6947a62724fd936b4ed733efbd58 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162390 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/external/frozen/UnpackedTarball_frozen.mk b/external/frozen/UnpackedTarball_frozen.mk index b33a05c7dbd8..b0cc5c207d80 100644 --- a/external/frozen/UnpackedTarball_frozen.mk +++ b/external/frozen/UnpackedTarball_frozen.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,frozen,$(FROZEN_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,frozen,\ external/frozen/defines_h_constexpr_string.patch.0 \ external/frozen/cid1532449_use_move_ctor.0 \ + external/frozen/cid1586676_use_move_ctor.0 \ external/frozen/cid1538304_reference_ctor.0 \ )) diff --git a/external/frozen/cid1586676_use_move_ctor.0 b/external/frozen/cid1586676_use_move_ctor.0 new file mode 100644 index 000000000000..944d1747098c --- /dev/null +++ b/external/frozen/cid1586676_use_move_ctor.0 @@ -0,0 +1,24 @@ +--- include/frozen/unordered_set.h 2024-01-22 10:42:57.125966099 +0000 ++++ include/frozen/unordered_set.h 2024-01-22 10:46:07.701159961 +0000 +@@ -74,13 +74,19 @@ + public: + /* constructors */ + unordered_set(unordered_set const &) = default; +- constexpr unordered_set(container_type keys, Hash const &hash, ++ constexpr unordered_set(container_type&& keys, Hash const &hash, ++ KeyEqual const &equal) ++ : equal_{equal} ++ , keys_{std::move(keys)} ++ , tables_{bits::make_pmh_tables<storage_size>( ++ keys_, hash, bits::Get{}, default_prg_t{})} {} ++ constexpr unordered_set(const container_type& keys, Hash const &hash, + KeyEqual const &equal) + : equal_{equal} + , keys_{keys} + , tables_{bits::make_pmh_tables<storage_size>( + keys_, hash, bits::Get{}, default_prg_t{})} {} +- explicit constexpr unordered_set(container_type keys) ++ explicit constexpr unordered_set(const container_type& keys) + : unordered_set{keys, Hash{}, KeyEqual{}} {} + + constexpr unordered_set(std::initializer_list<Key> keys) commit f46477e934e0bc1dc2e1da36f28db6d23bfeaa97 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Mon Jan 22 11:13:14 2024 +0000 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Mon Jan 22 15:15:24 2024 +0100 cid#1586675 Missing move assignment operator and cid#1586677 Missing move assignment operator Change-Id: I1bd2cd0f102d8ce44feb579b85c41b3c1f789f23 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162369 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 25587444b154..edab950a855e 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -165,11 +165,10 @@ namespace accessibility OUString AccessibleIconChoiceCtrlEntry::implGetText() { - OUString sRet; SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( m_nIndex ); - if ( pEntry ) - sRet = pEntry->GetDisplayText(); - return sRet; + if (pEntry) + return pEntry->GetDisplayText(); + return OUString(); } Locale AccessibleIconChoiceCtrlEntry::implGetLocale() diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index f68e042f76ea..6c8fa6fc26dc 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -214,11 +214,10 @@ namespace accessibility OUString AccessibleListBoxEntry::implGetText() { - OUString sRet; SvTreeListEntry* pEntry = m_pTreeListBox->GetEntryFromPath( m_aEntryPath ); - if ( pEntry ) - sRet = SvTreeListBox::SearchEntryTextWithHeadTitle( pEntry ); - return sRet; + if (pEntry) + return SvTreeListBox::SearchEntryTextWithHeadTitle(pEntry); + return OUString(); } Locale AccessibleListBoxEntry::implGetLocale() @@ -232,8 +231,6 @@ namespace accessibility } // XTypeProvider - - Sequence< sal_Int8 > AccessibleListBoxEntry::getImplementationId() { return css::uno::Sequence<sal_Int8>(); diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index d928b45550ed..711d2a7b8c5c 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -296,31 +296,26 @@ namespace accessibility return AccessibleRole::PANEL; } - OUString AccessibleTabBar::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); - OUString sDescription; - if ( m_pTabBar ) - sDescription = m_pTabBar->GetAccessibleDescription(); + if (m_pTabBar) + return m_pTabBar->GetAccessibleDescription(); - return sDescription; + return OUString(); } - OUString AccessibleTabBar::getAccessibleName( ) { OExternalLockGuard aGuard( this ); - OUString sName; - if ( m_pTabBar ) - sName = m_pTabBar->GetAccessibleName(); + if (m_pTabBar) + return m_pTabBar->GetAccessibleName(); - return sName; + return OUString(); } - Reference< XAccessibleRelationSet > AccessibleTabBar::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -328,7 +323,6 @@ namespace accessibility return new utl::AccessibleRelationSetHelper; } - sal_Int64 AccessibleTabBar::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 6c8a9dd8bf34..5120b007d066 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -264,25 +264,21 @@ namespace accessibility return nIndexInParent; } - sal_Int16 AccessibleTabBarPage::getAccessibleRole( ) { return AccessibleRole::PAGE_TAB; } - OUString AccessibleTabBarPage::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); - OUString sDescription; - if ( m_pTabBar ) - sDescription = m_pTabBar->GetHelpText( m_nPageId ); + if (m_pTabBar) + return m_pTabBar->GetHelpText(m_nPageId); - return sDescription; + return OUString(); } - OUString AccessibleTabBarPage::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -290,7 +286,6 @@ namespace accessibility return m_sPageText; } - Reference< XAccessibleRelationSet > AccessibleTabBarPage::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -298,7 +293,6 @@ namespace accessibility return new utl::AccessibleRelationSetHelper; } - sal_Int64 AccessibleTabBarPage::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 521a7934e052..35db6e446ee4 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -368,7 +368,6 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const aInfFile.SetGroup( aGroupIdent ); // first, delete all table indices - OString aNDX; sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); sal_uInt16 nKey = 0; @@ -376,7 +375,7 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const { // Does the key point to an index file?... OString aKeyName = aInfFile.GetKeyName( nKey ); - aNDX = aKeyName.copy(0,3); + OString aNDX = aKeyName.copy(0,3); //...if yes, delete index file, nKey is at subsequent key if (aNDX == "NDX")