diff options
| -rw-r--r-- | accessibility/source/extended/accessiblelistboxentry.cxx | 4 | ||||
| -rw-r--r-- | include/svtools/treelistbox.hxx | 3 | ||||
| -rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 37 |
3 files changed, 4 insertions, 40 deletions
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index bd996fded674..e9d579ee4b79 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -194,7 +194,7 @@ namespace accessibility OUString sRet; SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( pEntry ) - sRet = getListBox()->SearchEntryTextWithHeadTitle( pEntry ); + sRet = SvTreeListBox::SearchEntryTextWithHeadTitle( pEntry ); return sRet; } @@ -459,7 +459,7 @@ namespace accessibility } else { - return getListBox()->SearchEntryTextWithHeadTitle( pEntry ); + return SvTreeListBox::SearchEntryTextWithHeadTitle( pEntry ); } } diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 987a7c85ae19..d9e4feb76cf0 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -515,8 +515,7 @@ public: SvTreeFlags GetTreeFlags() const {return nTreeFlags;} - OUString headString; - OUString SearchEntryTextWithHeadTitle(SvTreeListEntry* pEntry); + static OUString SearchEntryTextWithHeadTitle(SvTreeListEntry* pEntry); virtual OUString GetEntryAltText(SvTreeListEntry* pEntry) const; virtual OUString GetEntryLongDescription(SvTreeListEntry* pEntry) const; diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 894fa12ef6f4..4c2b8806e47c 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1335,48 +1335,13 @@ OUString SvTreeListBox::SearchEntryTextWithHeadTitle( SvTreeListEntry* pEntry ) sal_uInt16 nCount = pEntry->ItemCount(); sal_uInt16 nCur = 0; - sal_uInt16 nHeaderCur = 0; while( nCur < nCount ) { SvLBoxItem& rItem = pEntry->GetItem( nCur ); if ( (rItem.GetType() == SvLBoxItemType::String) && !static_cast<SvLBoxString&>( rItem ).GetText().isEmpty() ) { - //want the column header - if (!headString.isEmpty()) - { - sal_Int32 nEnd = headString.indexOf('\t'); - if( nEnd == -1 ) - { - if (!sRet.isEmpty()) - { - sRet += ","; - } - if (!headString.isEmpty()) - { - sRet += headString + ":"; - } - } - else - { - OUString aString=headString.getToken(nHeaderCur, '\t'); - if (!sRet.isEmpty()) - { - sRet += ","; - } - if (!aString.isEmpty()) - { - sRet += aString + ":"; - } - nHeaderCur++; - } - sRet += static_cast<SvLBoxString&>( rItem ).GetText(); - } - else - { - sRet += static_cast<SvLBoxString&>( rItem ).GetText() + ","; - } - //end want to the column header + sRet += static_cast<SvLBoxString&>( rItem ).GetText() + ","; } nCur++; } |