convert sc/source/ui/inc/h*.hxx from String to OUString

Change-Id: I261d23e42b46e8f7641a9780217847c1adeda0c5

6 files changed, 23 insertions, 23 deletions

diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx
index ccd168dbb2ca..a9b2b14cedec 100644
--- a/sc/source/ui/inc/colrowba.hxx
+++ b/sc/source/ui/inc/colrowba.hxx
@@ -41,8 +41,8 @@ public:
                 ~ScColBar();
 
     virtual SCCOLROW    GetPos();
-    virtual sal_uInt16      GetEntrySize( SCCOLROW nEntryNo );
-    virtual String      GetEntryText( SCCOLROW nEntryNo );
+    virtual sal_uInt16  GetEntrySize( SCCOLROW nEntryNo );
+    virtual OUString    GetEntryText( SCCOLROW nEntryNo );
 
     virtual sal_Bool        IsLayoutRTL();                      // only for columns
 
@@ -56,7 +56,7 @@ public:
 
     virtual void        DrawInvert( long nDragPos );
 
-    virtual String      GetDragHelp( long nVal );
+    virtual OUString    GetDragHelp( long nVal );
 
             sal_Bool        UseNumericHeader() const;
 };
@@ -74,8 +74,8 @@ public:
                 ~ScRowBar();
 
     virtual SCCOLROW    GetPos();
-    virtual sal_uInt16      GetEntrySize( SCCOLROW nEntryNo );
-    virtual String      GetEntryText( SCCOLROW nEntryNo );
+    virtual sal_uInt16  GetEntrySize( SCCOLROW nEntryNo );
+    virtual OUString    GetEntryText( SCCOLROW nEntryNo );
 
     virtual sal_Bool        IsMirrored();                       // only for columns
     virtual SCROW       GetHiddenCount( SCROW nEntryNo );   // only for columns
@@ -90,7 +90,7 @@ public:
 
     virtual void        DrawInvert( long nDragPos );
 
-    virtual String      GetDragHelp( long nVal );
+    virtual OUString    GetDragHelp( long nVal );
 };
 
 
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index c4e76c198b06..31a4bf603cc2 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -83,7 +83,7 @@ protected:
 
     virtual SCCOLROW    GetPos() = 0;                               // current position (Scrolling)
     virtual sal_uInt16  GetEntrySize( SCCOLROW nEntryNo ) = 0;      // width / height (Pixel)
-    virtual String  GetEntryText( SCCOLROW nEntryNo ) = 0;
+    virtual OUString  GetEntryText( SCCOLROW nEntryNo ) = 0;
 
     virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo );
     virtual sal_Bool    IsLayoutRTL();
@@ -96,7 +96,7 @@ protected:
     virtual void    SelectWindow();
     virtual sal_Bool    IsDisabled();
     virtual sal_Bool    ResizeAllowed();
-    virtual String  GetDragHelp( long nVal );
+    virtual OUString  GetDragHelp( long nVal );
 
     virtual void    DrawInvert( long nDragPos );
     virtual void    Command( const CommandEvent& rCEvt );
diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx
index 08838848aa5a..4328162712c8 100644
--- a/sc/source/ui/inc/hintwin.hxx
+++ b/sc/source/ui/inc/hintwin.hxx
@@ -25,18 +25,18 @@
 class ScHintWindow : public Window
 {
 private:
-    String  aTitle;
-    String  aMessage;
-    Point   aTextStart;
-    long    nTextHeight;
-    Font    aTextFont;
-    Font    aHeadFont;
+    OUString  aTitle;
+    OUString  aMessage;
+    Point     aTextStart;
+    long      nTextHeight;
+    Font      aTextFont;
+    Font      aHeadFont;
 
 protected:
     virtual void    Paint( const Rectangle& rRect );
 
 public:
-            ScHintWindow( Window* pParent, const String& rTit, const String& rMsg );
+            ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg );
             ~ScHintWindow();
 };
 
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 76029c0347cb..c504d3fd2e4f 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -89,7 +89,7 @@ sal_uInt16 ScColBar::GetEntrySize( SCCOLROW nEntryNo )
         return (sal_uInt16) ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(nEntryNo), nTab ), pViewData->GetPPTX() );
 }
 
-String ScColBar::GetEntryText( SCCOLROW nEntryNo )
+OUString ScColBar::GetEntryText( SCCOLROW nEntryNo )
 {
     return UseNumericHeader()
         ? OUString::number(nEntryNo + 1) //FIXME remove String again
@@ -211,7 +211,7 @@ void ScColBar::DrawInvert( long nDragPosP )
     pViewData->GetView()->InvertVertical(eWhich,nDragPosP);
 }
 
-String ScColBar::GetDragHelp( long nVal )
+OUString ScColBar::GetDragHelp( long nVal )
 {
     long nTwips = (long) ( nVal / pViewData->GetPPTX() );
     return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_WIDTH) );
@@ -255,7 +255,7 @@ sal_uInt16 ScRowBar::GetEntrySize( SCCOLROW nEntryNo )
                     nTab ), pViewData->GetPPTY() );
 }
 
-String ScRowBar::GetEntryText( SCCOLROW nEntryNo )
+OUString ScRowBar::GetEntryText( SCCOLROW nEntryNo )
 {
     return OUString::number( nEntryNo + 1 );
 }
@@ -375,7 +375,7 @@ void ScRowBar::DrawInvert( long nDragPosP )
     pViewData->GetView()->InvertHorizontal(eWhich,nDragPosP);
 }
 
-String ScRowBar::GetDragHelp( long nVal )
+OUString ScRowBar::GetDragHelp( long nVal )
 {
     long nTwips = (long) ( nVal / pViewData->GetPPTY() );
     return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_HEIGHT) );
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 4acfe81231cd..42af6b064d5d 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -991,7 +991,7 @@ void ScHeaderControl::DrawInvert( long /* nDragPos */ )
 {
 }
 
-String ScHeaderControl::GetDragHelp( long /* nVal */ )
+OUString ScHeaderControl::GetDragHelp( long /* nVal */ )
 {
     return EMPTY_STRING;
 }
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index ab53ab7b38be..f674eb6c3501 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -26,7 +26,7 @@
 
 //==================================================================
 
-ScHintWindow::ScHintWindow( Window* pParent, const String& rTit, const String& rMsg ) :
+ScHintWindow::ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg ) :
     Window( pParent, WinBits( WB_BORDER ) ),
     aTitle( rTit ),
     aMessage( convertLineEnd(rMsg, LINEEND_CR) )
@@ -49,7 +49,7 @@ ScHintWindow::ScHintWindow( Window* pParent, const String& rTit, const String& r
     sal_Int32 nIndex = 0;
     while ( nIndex != -1 )
     {
-        String aLine = aMessage.GetToken( 0, CHAR_CR, nIndex );
+        String aLine = aMessage.getToken( 0, CHAR_CR, nIndex );
         Size aLineSize( GetTextWidth( aLine ), GetTextHeight() );
         nTextHeight = aLineSize.Height();
         aTextSize.Height() += nTextHeight;
@@ -82,7 +82,7 @@ void ScHintWindow::Paint( const Rectangle& /* rRect */ )
     Point aLineStart = aTextStart;
     while ( nIndex != -1 )
     {
-        String aLine = aMessage.GetToken( 0, CHAR_CR, nIndex );
+        String aLine = aMessage.getToken( 0, CHAR_CR, nIndex );
         DrawText( aLineStart, aLine );
         aLineStart.Y() += nTextHeight;
     }