XubString->OUString

Change-Id: I1049249741f445ad7bd9c070f99812c4404597c9

4 files changed, 12 insertions, 12 deletions

diff --git a/include/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx
index 775ac23c8ab2..6f9d0beddd38 100644
--- a/include/svtools/accessibletableprovider.hxx
+++ b/include/svtools/accessibletableprovider.hxx
@@ -87,7 +87,7 @@ public:
 
     /** @return  <TRUE/>, if the cell is visible. */
     virtual sal_Bool                IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
-    virtual String                  GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const = 0;
+    virtual OUString                GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const = 0;
 
     virtual Rectangle               calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ) = 0;
     virtual Rectangle               calcTableRect( sal_Bool _bOnScreen = sal_True ) = 0;
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 3005b213fd1f..207deedeb906 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -335,7 +335,7 @@ public:
 
 protected:
     // fuer Anzeige im VScrollBar z.B. auf "?" oder setzen
-    void            SetRealRowCount( const String &rRealRowCount );
+    void            SetRealRowCount( const OUString &rRealRowCount );
 
     // Return Value muss immer sal_True sein - SeekRow *muss* klappen!
     // (sonst ASSERT) MI: wer hat das eingebaut? Das darf nicht so sein!
@@ -468,10 +468,10 @@ public:
 
     // inserting, changing, removing and freezing of columns
     void            InsertHandleColumn( sal_uLong nWidth );
-    void            InsertDataColumn( sal_uInt16 nItemId, const XubString& rText,
+    void            InsertDataColumn( sal_uInt16 nItemId, const OUString& rText,
                                     long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE,
                                     sal_uInt16 nPos = HEADERBAR_APPEND );
-    void            SetColumnTitle( sal_uInt16 nColumnId, const String &rTitle );
+    void            SetColumnTitle( sal_uInt16 nColumnId, const OUString &rTitle );
     void            SetColumnWidth( sal_uInt16 nColumnId, sal_uLong nWidth );
     void            SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos );
     void            FreezeColumn( sal_uInt16 nColumnId, sal_Bool bFreeze = sal_True );
@@ -487,7 +487,7 @@ public:
     virtual long    GetTitleHeight() const;
 
     // access to dynamic values of cursor row
-    String          GetColumnTitle( sal_uInt16 nColumnId ) const;
+    OUString        GetColumnTitle( sal_uInt16 nColumnId ) const;
     Rectangle       GetFieldRect( sal_uInt16 nColumnId ) const;
     sal_uLong           GetColumnWidth( sal_uInt16 nColumnId ) const;
     sal_uInt16          GetColumnId( sal_uInt16 nPos ) const;
@@ -581,7 +581,7 @@ public:
 
         The width is calculated so that the text fits completely, plus som margin.
     */
-    sal_uLong           GetDefaultColumnWidth( const String& _rText ) const;
+    sal_uLong         GetDefaultColumnWidth( const OUString& _rText ) const;
 
     /** GetCellText returns the text at the given position
         @param  _nRow
@@ -591,7 +591,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;
 
     /** @return
             the current column count
@@ -797,7 +797,7 @@ public:
     virtual void                    GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const;
     virtual void                    GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const;
     virtual sal_Bool                IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
-    virtual String                  GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const;
+    virtual OUString                GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const;
     virtual sal_Bool                    GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
     virtual Rectangle               GetWindowExtentsRelative( Window *pRelativeWindow ) const;
     virtual void                    GrabFocus();
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index 66de4f8b23be..706dc37845aa 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -83,7 +83,7 @@ Name generiert, der dem Anwender praesentiert werden kann.
 
 --------------------------------------------------------------------------
 
-XubString FontList::GetFontMapText( const FontInfo& rInfo ) const;
+OUString FontList::GetFontMapText( const FontInfo& rInfo ) const;
 
 Diese Methode gibt einen Matchstring zurueck, der dem Anwender
 anzeigen soll, welche Probleme es mit diesem Font geben kann.
@@ -149,7 +149,7 @@ private:
     OUString                maMapScreenOnly;
     OUString                maMapSizeNotAvailable;
     OUString                maMapStyleNotAvailable;
-    OUString                maMapNotAvailable;
+    mutable OUString        maMapNotAvailable;
     OUString                maLight;
     OUString                maLightItalic;
     OUString                maNormal;
@@ -178,7 +178,7 @@ public:
 
     OutputDevice*           GetDevice() const { return mpDev; }
     OutputDevice*           GetDevice2() const { return mpDev2; }
-    XubString               GetFontMapText( const FontInfo& rInfo ) const;
+    OUString                GetFontMapText( const FontInfo& rInfo ) const;
 
     const OUString&         GetNormalStr() const { return maNormal; }
     const OUString&         GetItalicStr() const { return maNormalItalic; }
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 7bcd0591b2d1..4a722faf40dd 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -206,7 +206,7 @@ public:
 
     /** @return  <TRUE/>, if the cell is visible. */
     virtual sal_Bool                IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
-    virtual String                  GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const;
+    virtual OUString                GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const;
 
     virtual Rectangle               calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True );
     virtual Rectangle               calcTableRect( sal_Bool _bOnScreen = sal_True );