XubString->OUString

Change-Id: I0b7c2753fd6974e0db88cc47156156a37cd92987

include/svtools/editbrowsebox.hxx

@@ -578,7 +578,7 @@ namespace svt
         // inserting columns
         // if you don't set a width, this will be calculated automatically
         // if the id isn't set the smallest unused will do it ...
-        virtual sal_uInt16 AppendColumn(const String& rName, sal_uInt16 nWidth = 0, sal_uInt16 nPos = HEADERBAR_APPEND, sal_uInt16 nId = (sal_uInt16)-1);
+        virtual sal_uInt16 AppendColumn(const OUString& rName, sal_uInt16 nWidth = 0, sal_uInt16 nPos = HEADERBAR_APPEND, sal_uInt16 nId = (sal_uInt16)-1);
 
         // called whenever (Shift)Tab or Enter is pressed. If true is returned, these keys
         // result in traveling to the next or to th previous cell

include/svx/gridctrl.hxx

@@ -321,7 +321,7 @@ protected:
     virtual sal_Bool SaveModified();
     virtual sal_Bool IsModified() const;
 
-    virtual sal_uInt16 AppendColumn(const String& rName, sal_uInt16 nWidth = 0, sal_uInt16 nPos = HEADERBAR_APPEND, sal_uInt16 nId = (sal_uInt16)-1);
+    virtual sal_uInt16 AppendColumn(const OUString& rName, sal_uInt16 nWidth = 0, sal_uInt16 nPos = HEADERBAR_APPEND, sal_uInt16 nId = (sal_uInt16)-1);
     virtual void RemoveColumn(sal_uInt16 nId);
     virtual DbGridColumn* CreateColumn(sal_uInt16 nId) const;
     virtual void ColumnMoved(sal_uInt16 nId);
@@ -557,7 +557,7 @@ protected:
     sal_Int32 AlignSeekCursor();
     sal_Bool SetCurrent(long nNewRow);
 
-    String GetCurrentRowCellText(DbGridColumn* pCol,const DbGridRowRef& _rRow) const;
+    OUString GetCurrentRowCellText(DbGridColumn* pCol,const DbGridRowRef& _rRow) const;
     virtual void DeleteSelectedRows();
     sal_Bool IsValid(const DbGridRowRef& _xRow) const {return _xRow && _xRow->IsValid();}
 

svtools/source/brwbox/editbrowsebox.cxx

@@ -1145,7 +1145,7 @@ namespace svt
     }
 
     //------------------------------------------------------------------------------
-    sal_uInt16 EditBrowseBox::AppendColumn(const String& rName, sal_uInt16 nWidth, sal_uInt16 nPos, sal_uInt16 nId)
+    sal_uInt16 EditBrowseBox::AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nPos, sal_uInt16 nId)
     {
         if (nId == BROWSER_INVALIDID)
         {

svx/source/fmcomp/gridctrl.cxx

@@ -466,7 +466,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls()
 
     // Controls Groessen und Positionen setzen
     //
-    XubString aText = m_aRecordText.GetText();
+    OUString aText = m_aRecordText.GetText();
     long nTextWidth = m_aRecordText.GetTextWidth(aText);
     m_aRecordText.SetPosPixel(Point(nX,nY));
     m_aRecordText.SetSizePixel(Size(nTextWidth,nH));
@@ -1653,7 +1653,7 @@ DbGridColumn* DbGridControl::CreateColumn(sal_uInt16 nId) const
 }
 
 //------------------------------------------------------------------------------
-sal_uInt16 DbGridControl::AppendColumn(const XubString& rName, sal_uInt16 nWidth, sal_uInt16 nModelPos, sal_uInt16 nId)
+sal_uInt16 DbGridControl::AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nModelPos, sal_uInt16 nId)
 {
     DBG_ASSERT(nId == BROWSER_INVALIDID, "DbGridControl::AppendColumn : I want to set the ID myself ...");
     sal_uInt16 nRealPos = nModelPos;
@@ -2705,10 +2705,10 @@ OUString DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
     return sRet;
 }
 //------------------------------------------------------------------------------
-XubString DbGridControl::GetCurrentRowCellText(DbGridColumn* pColumn,const DbGridRowRef& _rRow) const
+OUString DbGridControl::GetCurrentRowCellText(DbGridColumn* pColumn,const DbGridRowRef& _rRow) const
 {
     // Ausgabe des Textes fuer eine Zelle
-    XubString aText;
+    OUString aText;
     if ( pColumn && IsValid(_rRow) )
         aText = pColumn->GetCellText(_rRow, m_xFormatter);
     return aText;