Kaydet (Commit) eb3c79c2 authored tarafından Caolán McNamara's avatar Caolán McNamara

ditch some XubStrings

Change-Id: I4e54102819123a0b10fcade20df3485ec86543d0
üst 3083cadd
...@@ -86,11 +86,11 @@ public: ...@@ -86,11 +86,11 @@ public:
sal_uLong nPos = LIST_APPEND, void* pUserData = 0, sal_uLong nPos = LIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND, virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = LIST_APPEND,
sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, SvTreeListEntry* pParent, virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent,
sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ); sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL );
virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp, virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, const Image& rExpandedEntryBmp,
const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL, const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL,
sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
...@@ -148,11 +148,11 @@ public: ...@@ -148,11 +148,11 @@ public:
void InitHeaderBar( HeaderBar* pHeaderBar ); void InitHeaderBar( HeaderBar* pHeaderBar );
sal_Bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const; sal_Bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const;
virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND, virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = LIST_APPEND,
sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, SvTreeListEntry* pParent, virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent,
sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ); sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL );
virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp, virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, const Image& rExpandedEntryBmp,
const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL, const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL,
sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=LIST_APPEND); virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=LIST_APPEND);
......
...@@ -204,7 +204,7 @@ SvTreeListEntry* SvTabListBox::InsertEntry( const XubString& rText, ...@@ -204,7 +204,7 @@ SvTreeListEntry* SvTabListBox::InsertEntry( const XubString& rText,
pParent, nPos, 0xffff, pUserData ); pParent, nPos, 0xffff, pUserData );
} }
SvTreeListEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvTreeListEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, SvTreeListEntry* SvTabListBox::InsertEntryToColumn(const OUString& rStr,SvTreeListEntry* pParent,sal_uLong nPos,sal_uInt16 nCol,
void* pUser ) void* pUser )
{ {
XubString aStr; XubString aStr;
...@@ -230,7 +230,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvTreeL ...@@ -230,7 +230,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvTreeL
return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUser ); return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUser );
} }
SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const OUString& rStr,
const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp,
SvTreeListEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, void* pUser ) SvTreeListEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, void* pUser )
{ {
...@@ -261,7 +261,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, ...@@ -261,7 +261,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr,
pParent, sal_False, nPos, pUser ); pParent, sal_False, nPos, pUser );
} }
SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, sal_uLong nPos, SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const OUString& rStr, sal_uLong nPos,
sal_uInt16 nCol, void* pUser ) sal_uInt16 nCol, void* pUser )
{ {
return InsertEntryToColumn( rStr,0,nPos, nCol, pUser ); return InsertEntryToColumn( rStr,0,nPos, nCol, pUser );
...@@ -636,7 +636,7 @@ sal_Bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 ...@@ -636,7 +636,7 @@ sal_Bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
const XubString& rStr, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) const OUString& rStr, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
{ {
SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, nPos, nCol, pUserData ); SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, nPos, nCol, pUserData );
RecalculateAccessibleChildren(); RecalculateAccessibleChildren();
...@@ -646,7 +646,7 @@ SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( ...@@ -646,7 +646,7 @@ SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
const XubString& rStr, SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) const OUString& rStr, SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
{ {
SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, pParent, nPos, nCol, pUserData ); SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, pParent, nPos, nCol, pUserData );
RecalculateAccessibleChildren(); RecalculateAccessibleChildren();
...@@ -656,7 +656,7 @@ SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( ...@@ -656,7 +656,7 @@ SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
const XubString& rStr, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, const OUString& rStr, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp,
SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
{ {
SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment