diff options
5 files changed, 16 insertions, 33 deletions
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") |