mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

headString in SvTreeListBox is unused

Browse Source 
ever since being added in

    commit b755fb8c0f
    Date:   Mon Nov 25 16:15:58 2013 +0000
    Integrate branch of IAccessible2

Change-Id: Iebb8d30d53cc08e7cc35d610f04db8ed6c853b70
This commit is contained in:
Noel Grandin
2017-09-18 10:22:29 +02:00
parent fba231b21b
commit cb315646e2
3 changed files with 4 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accessibility/source/extended/accessiblelistboxentry.cxx
View File

@@ -194,7 +194,7 @@ namespace accessibility
OUString sRet; OUString sRet;
SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( pEntry ) if ( pEntry )
sRet = getListBox()->SearchEntryTextWithHeadTitle( pEntry ); sRet = SvTreeListBox::SearchEntryTextWithHeadTitle( pEntry );
return sRet; return sRet;
} }
@@ -459,7 +459,7 @@ namespace accessibility
} }
else else
{ {
return getListBox()->SearchEntryTextWithHeadTitle( pEntry ); return SvTreeListBox::SearchEntryTextWithHeadTitle( pEntry );
} }
} }

3
include/svtools/treelistbox.hxx
View File

@@ -515,8 +515,7 @@ public:
SvTreeFlags GetTreeFlags() const {return nTreeFlags;} SvTreeFlags GetTreeFlags() const {return nTreeFlags;}
OUString headString; static OUString SearchEntryTextWithHeadTitle(SvTreeListEntry* pEntry);
OUString SearchEntryTextWithHeadTitle(SvTreeListEntry* pEntry);
virtual OUString GetEntryAltText(SvTreeListEntry* pEntry) const; virtual OUString GetEntryAltText(SvTreeListEntry* pEntry) const;
virtual OUString GetEntryLongDescription(SvTreeListEntry* pEntry) const; virtual OUString GetEntryLongDescription(SvTreeListEntry* pEntry) const;

35
svtools/source/contnr/treelistbox.cxx
View File

@@ -1335,49 +1335,14 @@ OUString SvTreeListBox::SearchEntryTextWithHeadTitle( SvTreeListEntry* pEntry )
sal_uInt16 nCount = pEntry->ItemCount(); sal_uInt16 nCount = pEntry->ItemCount();
sal_uInt16 nCur = 0; sal_uInt16 nCur = 0;
sal_uInt16 nHeaderCur = 0;
while( nCur < nCount ) while( nCur < nCount )
{ {
SvLBoxItem& rItem = pEntry->GetItem( nCur ); SvLBoxItem& rItem = pEntry->GetItem( nCur );
if ( (rItem.GetType() == SvLBoxItemType::String) && if ( (rItem.GetType() == SvLBoxItemType::String) &&
!static_cast<SvLBoxString&>( rItem ).GetText().isEmpty() ) !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() + ","; sRet += static_cast<SvLBoxString&>( rItem ).GetText() + ",";
} }
//end want to the column header
}
nCur++; nCur++;
} }