convert vcl/inc/brdwin.hxx from String to OUString

Change-Id: I3c575363527cb2fde00211de9bd5af2dd9ff9064

vcl/inc/brdwin.hxx

@@ -239,10 +239,10 @@ class ImplBorderWindowView
 public:
     virtual                 ~ImplBorderWindowView();
 
-    virtual sal_Bool            MouseMove( const MouseEvent& rMEvt );
-    virtual sal_Bool            MouseButtonDown( const MouseEvent& rMEvt );
-    virtual sal_Bool            Tracking( const TrackingEvent& rTEvt );
-    virtual String          RequestHelp( const Point& rPos, Rectangle& rHelpRect );
+    virtual sal_Bool        MouseMove( const MouseEvent& rMEvt );
+    virtual sal_Bool        MouseButtonDown( const MouseEvent& rMEvt );
+    virtual sal_Bool        Tracking( const TrackingEvent& rTEvt );
+    virtual OUString        RequestHelp( const Point& rPos, Rectangle& rHelpRect );
 
     virtual void            Init( OutputDevice* pDev, long nWidth, long nHeight ) = 0;
     virtual void            GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
@@ -252,11 +252,11 @@ public:
     virtual Rectangle       GetMenuRect() const;
 
     void                    ImplInitTitle( ImplBorderFrameData* pData );
-    sal_uInt16                  ImplHitTest( ImplBorderFrameData* pData, const Point& rPos );
-    sal_Bool                    ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
-    sal_Bool                    ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
-    sal_Bool                    ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt );
-    String                  ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect );
+    sal_uInt16              ImplHitTest( ImplBorderFrameData* pData, const Point& rPos );
+    sal_Bool                ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
+    sal_Bool                ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
+    sal_Bool                ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt );
+    OUString                ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect );
     long                    ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const;
 };
 
@@ -325,10 +325,10 @@ public:
                             ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow );
                             ~ImplStdBorderWindowView();
 
-    virtual sal_Bool            MouseMove( const MouseEvent& rMEvt );
-    virtual sal_Bool            MouseButtonDown( const MouseEvent& rMEvt );
-    virtual sal_Bool            Tracking( const TrackingEvent& rTEvt );
-    virtual String          RequestHelp( const Point& rPos, Rectangle& rHelpRect );
+    virtual sal_Bool        MouseMove( const MouseEvent& rMEvt );
+    virtual sal_Bool        MouseButtonDown( const MouseEvent& rMEvt );
+    virtual sal_Bool        Tracking( const TrackingEvent& rTEvt );
+    virtual OUString        RequestHelp( const Point& rPos, Rectangle& rHelpRect );
     virtual Rectangle       GetMenuRect() const;
 
     virtual void            Init( OutputDevice* pDev, long nWidth, long nHeight );

vcl/source/window/brdwin.cxx

@@ -181,9 +181,9 @@ sal_Bool ImplBorderWindowView::Tracking( const TrackingEvent& )
 
 // -----------------------------------------------------------------------
 
-String ImplBorderWindowView::RequestHelp( const Point&, Rectangle& )
+OUString ImplBorderWindowView::RequestHelp( const Point&, Rectangle& )
 {
-    return String();
+    return OUString();
 }
 
 // -----------------------------------------------------------------------
@@ -925,12 +925,12 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T
 
 // -----------------------------------------------------------------------
 
-String ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
+OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
                                               const Point& rPos,
                                               Rectangle& rHelpRect )
 {
     sal_uInt16 nHelpId = 0;
-    String aHelpStr;
+    OUString aHelpStr;
     sal_uInt16 nHitTest = ImplHitTest( pData, rPos );
     if ( nHitTest )
     {
@@ -1470,7 +1470,7 @@ sal_Bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt )
 
 // -----------------------------------------------------------------------
 
-String ImplStdBorderWindowView::RequestHelp( const Point& rPos, Rectangle& rHelpRect )
+OUString ImplStdBorderWindowView::RequestHelp( const Point& rPos, Rectangle& rHelpRect )
 {
     return ImplRequestHelp( &maFrameData, rPos, rHelpRect );
 }
@@ -2021,10 +2021,10 @@ void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt )
     {
         Point       aMousePosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
         Rectangle   aHelpRect;
-        String      aHelpStr( mpBorderView->RequestHelp( aMousePosPixel, aHelpRect ) );
+        OUString    aHelpStr( mpBorderView->RequestHelp( aMousePosPixel, aHelpRect ) );
 
         // Rechteck ermitteln
-        if ( aHelpStr.Len() )
+        if ( !aHelpStr.isEmpty() )
         {
             aHelpRect.SetPos( OutputToScreenPixel( aHelpRect.TopLeft() ) );
             if ( rHEvt.GetMode() & HELPMODE_BALLOON )