From f46477e934e0bc1dc2e1da36f28db6d23bfeaa97 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 22 Jan 2024 11:13:14 +0000 Subject: cid#1586675 Missing move assignment operator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../source/extended/accessibleiconchoicectrlentry.cxx | 7 +++---- .../source/extended/accessiblelistboxentry.cxx | 9 +++------ accessibility/source/extended/accessibletabbar.cxx | 18 ++++++------------ accessibility/source/extended/accessibletabbarpage.cxx | 12 +++--------- 4 files changed, 15 insertions(+), 31 deletions(-) (limited to 'accessibility') 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(); 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 ); -- cgit