summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-18 10:22:29 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-09-18 13:47:29 +0200
commitcb315646e2cecd9bc31806064ee285403ba5c46e (patch)
treefa0f71420dd97c6be9d9a3dfe6399c08d8298ca3
parentfba231b21b3d2403679e626f7a1b30aefde6879e (diff)
headString in SvTreeListBox is unused
ever since being added in commit b755fb8c0f6b1282f62c12f378c0a5ecac64d490 Date: Mon Nov 25 16:15:58 2013 +0000 Integrate branch of IAccessible2 Change-Id: Iebb8d30d53cc08e7cc35d610f04db8ed6c853b70
-rw-r--r--accessibility/source/extended/accessiblelistboxentry.cxx4
-rw-r--r--include/svtools/treelistbox.hxx3
-rw-r--r--svtools/source/contnr/treelistbox.cxx37
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++;
}