[Libreoffice-commits] core.git: include/svtools svtools/source

[Caolán McNamara]

 include/svtools/svtabbx.hxx       |   12 ++++++------
 svtools/source/contnr/svtabbx.cxx |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit eb3c79c29d9a1963fca2f7c3a9d908dc175c480c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 17 12:40:05 2013 +0100

    ditch some XubStrings
    
    Change-Id: I4e54102819123a0b10fcade20df3485ec86543d0

diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index c88b418..167e41e 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -86,11 +86,11 @@ public:
                                          sal_uLong nPos = LIST_APPEND, void* pUserData = 0,
                                          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 );
-    virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, SvTreeListEntry* pParent,
+    virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent,
                                  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,
                                  sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
 
@@ -148,11 +148,11 @@ public:
     void            InitHeaderBar( HeaderBar* pHeaderBar );
     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 );
-    virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, SvTreeListEntry* pParent,
+    virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent,
                                  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,
                                  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);
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 6e77b49..e165bea 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -204,7 +204,7 @@ SvTreeListEntry* SvTabListBox::InsertEntry( const XubString& rText,
                                 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 )
 {
     XubString aStr;
@@ -230,7 +230,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvTreeL
     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,
     SvTreeListEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, void* pUser )
 {
@@ -261,7 +261,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr,
         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 )
 {
     return InsertEntryToColumn( rStr,0,nPos, nCol, pUser );
@@ -636,7 +636,7 @@ sal_Bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16
 // -----------------------------------------------------------------------
 
 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 );
     RecalculateAccessibleChildren();
@@ -646,7 +646,7 @@ 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 );
     RecalculateAccessibleChildren();
@@ -656,7 +656,7 @@ 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* pEntry = SvTabListBox::InsertEntryToColumn(