XubString->OUString

Change-Id: I1049249741f445ad7bd9c070f99812c4404597c9

4 files changed, 13 insertions, 15 deletions

diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index e1e51fa69de2..04cfbfa40cb5 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -84,7 +84,7 @@ public:
         @return
             the text out of the cell
     */
-    virtual String  GetCellText(long _nRow, sal_uInt16 _nColId) const;
+    virtual OUString  GetCellText(long _nRow, sal_uInt16 _nColId) const;
 
     const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; }
     XubString GetNewEntryValue() const                 { return pEditControl->GetText(); }
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 1437ef2435fc..1e623b075f84 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2689,11 +2689,11 @@ void DbGridControl::SetFilterMode(sal_Bool bMode)
     }
 }
 // -----------------------------------------------------------------------------
-String DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
+OUString DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
 {
     size_t Location = GetModelColumnPos( _nColId );
     DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
-    String sRet;
+    OUString sRet;
     if ( const_cast<DbGridControl*>(this)->SeekRow(_nRow) )
         sRet = GetCurrentRowCellText(pColumn, m_xPaintRow);
     return sRet;
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 3e085395ba77..a96a34e02661 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -570,9 +570,9 @@ sal_Bool GalleryListView::SeekRow( long nRow )
     return sal_True;
 }
 
-String GalleryListView::GetCellText(long _nRow, sal_uInt16 nColumnId) const
+OUString GalleryListView::GetCellText(long _nRow, sal_uInt16 nColumnId) const
 {
-    String sRet;
+    OUString sRet;
     if( mpTheme && ( _nRow < static_cast< long >( mpTheme->GetObjectCount() ) ) )
     {
         SgaObject* pObj = mpTheme->AcquireObject( _nRow );
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index a915915c9157..a971800caf03 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -298,9 +298,9 @@ sal_Bool _SdrItemBrowserControl::SeekRow(long nRow)
     return sal_True;
 }
 
-String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
+OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
 {
-    String sRet;
+    OUString sRet;
     if ( _nRow >= 0 && _nRow < (sal_Int32)aList.size() )
     {
         ImpItemListRow* pEntry = ImpGetEntry(_nRow);
@@ -313,9 +313,7 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
             }
             else
             {
-                rtl_TextEncoding aTextEncoding = osl_getThreadTextEncoding();
-
-                sRet = XubString("???", aTextEncoding);
+                sRet = OUString("???");
                 switch (_nColId)
                 {
                     case ITEMBROWSER_WHICHCOL_ID:
@@ -324,11 +322,11 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
                     {
                         switch (pEntry->eState)
                         {
-                            case SFX_ITEM_UNKNOWN : sRet=String("Uknown", aTextEncoding);   break;
-                            case SFX_ITEM_DISABLED: sRet=String("Disabled", aTextEncoding); break;
-                            case SFX_ITEM_DONTCARE: sRet=String("DontCare", aTextEncoding); break;
-                            case SFX_ITEM_SET     : sRet=String("Set", aTextEncoding);      break;
-                            case SFX_ITEM_DEFAULT : sRet=String("Default", aTextEncoding);  break;
+                            case SFX_ITEM_UNKNOWN : sRet=OUString("Unknown");   break;
+                            case SFX_ITEM_DISABLED: sRet=OUString("Disabled"); break;
+                            case SFX_ITEM_DONTCARE: sRet=OUString("DontCare"); break;
+                            case SFX_ITEM_SET     : sRet=OUString("Set");      break;
+                            case SFX_ITEM_DEFAULT : sRet=OUString("Default");  break;
                         } // switch
                     } break;
                     case ITEMBROWSER_TYPECOL_ID: sRet = pEntry->GetItemTypeStr(); break;