diff options
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/helpwin.hxx | 14 | ||||
| -rw-r--r-- | vcl/inc/vcl/help.hxx | 32 |
2 files changed, 23 insertions, 23 deletions
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index 40a969f5b40c..7dd0c31ba964 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -44,8 +44,8 @@ private: Rectangle maTextRect; // For wrapped text in QuickHelp - String maHelpText; - String maStatusText; + OUString maHelpText; + OUString maStatusText; Timer maShowTimer; Timer maHideTimer; @@ -61,16 +61,16 @@ protected: void ImplShow(); public: - HelpTextWindow( Window* pParent, const String& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ); + HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ); ~HelpTextWindow(); - const String& GetHelpText() const { return maHelpText; } - void SetHelpText( const String& rHelpText ); + const OUString& GetHelpText() const { return maHelpText; } + void SetHelpText( const OUString& rHelpText ); sal_uInt16 GetWinStyle() const { return mnHelpWinStyle; } sal_uInt16 GetStyle() const { return mnStyle; } // Nur merken: - void SetStatusText( const String& rStatusText ) { maStatusText = rStatusText; } + void SetStatusText( const OUString& rStatusText ) { maStatusText = rStatusText; } void SetHelpArea( const Rectangle& rRect ) { maHelpArea = rRect; } void ShowHelp( sal_uInt16 nDelayMode ); @@ -82,7 +82,7 @@ public: }; void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, - const String& rHelpText, const String& rStatusText, + const OUString& rHelpText, const OUString& rStatusText, const Point& rScreenPos, const Rectangle* pHelpArea = NULL ); void ImplDestroyHelpWindow( bool bUpdateHideTime ); void ImplSetHelpWindowPos( Window* pHelpWindow, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx index 1906bcaa7e56..8753c3c8fd08 100644 --- a/vcl/inc/vcl/help.hxx +++ b/vcl/inc/vcl/help.hxx @@ -29,7 +29,7 @@ #ifndef _SV_HELP_HXX #define _SV_HELP_HXX -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <tools/solar.h> #include <vcl/dllapi.h> @@ -69,19 +69,19 @@ class Window; class VCL_DLLPUBLIC Help { private: - String maHelpFile; + OUString maHelpFile; public: Help(); virtual ~Help(); - void SetHelpFile( const String& rFileName ) { maHelpFile = rFileName; } - const String& GetHelpFile() const { return maHelpFile; } + void SetHelpFile( const OUString& rFileName ) { maHelpFile = rFileName; } + const OUString& GetHelpFile() const { return maHelpFile; } - virtual sal_Bool Start( const XubString& rHelpId, const Window* pWindow ); - virtual sal_Bool SearchKeyword( const XubString& rKeyWord ); - virtual void OpenHelpAgent( const rtl::OString& rHelpId ); - virtual XubString GetHelpText( const String& aHelpURL, const Window* pWindow ); + virtual sal_Bool Start( const OUString& rHelpId, const Window* pWindow ); + virtual sal_Bool SearchKeyword( const OUString& rKeyWord ); + virtual void OpenHelpAgent( const OString& rHelpId ); + virtual OUString GetHelpText( const OUString& aHelpURL, const Window* pWindow ); static void EnableContextHelp(); static void DisableContextHelp(); @@ -98,35 +98,35 @@ public: static sal_Bool IsBalloonHelpEnabled(); static sal_Bool ShowBalloon( Window* pParent, const Point& rScreenPos, - const XubString& rHelpText ); + const OUString& rHelpText ); static sal_Bool ShowBalloon( Window* pParent, const Point& rScreenPos, const Rectangle&, - const XubString& rHelpText ); + const OUString& rHelpText ); static void EnableQuickHelp(); static void DisableQuickHelp(); static sal_Bool IsQuickHelpEnabled(); static sal_Bool ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, - const XubString& rHelpText, - const XubString& rLongHelpText, + const OUString& rHelpText, + const OUString& rLongHelpText, sal_uInt16 nStyle = 0 ); static sal_Bool ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, - const XubString& rHelpText, + const OUString& rHelpText, sal_uInt16 nStyle = 0 ) - { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, XubString(), nStyle ); } + { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, OUString(), nStyle ); } static void HideBalloonAndQuickHelp(); static sal_uLong ShowTip( Window* pParent, const Rectangle& rScreenRect, - const XubString& rText, sal_uInt16 nStyle = 0 ); + const OUString& rText, sal_uInt16 nStyle = 0 ); static void UpdateTip( sal_uLong nId, Window* pParent, const Rectangle& rScreenRect, - const XubString& rText ); + const OUString& rText ); static void HideTip( sal_uLong nId ); }; |