diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-10-01 11:03:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-02 00:05:57 +0100 |
| commit | d67dff5719b32c17f4bf02990de5d7a772db484c (patch) | |
| tree | fec9e2fe2ba0a81df0ae951a6dd608b9a2572677 /sfx2/inc | |
| parent | 2ffa6b313acc322a2502c6c200b39ec652699bf9 (diff) | |
XubString->OUString
Change-Id: Id64cdd70c2877ff71c5bc90286fab6b3d8ab7ad4
Diffstat (limited to 'sfx2/inc')
| -rw-r--r-- | sfx2/inc/sfx2/sfxhelp.hxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sfx2/inc/sfx2/sfxhelp.hxx b/sfx2/inc/sfx2/sfxhelp.hxx index 12c58c29aff8..9de00f008736 100644 --- a/sfx2/inc/sfx2/sfxhelp.hxx +++ b/sfx2/inc/sfx2/sfxhelp.hxx @@ -19,45 +19,45 @@ #ifndef _SFX_HELP_HXX #define _SFX_HELP_HXX +#include <rtl/ustring.hxx> #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" #include <vcl/help.hxx> -#include <tools/string.hxx> class SfxHelp_Impl; class SfxFrame; class SFX2_DLLPUBLIC SfxHelp : public Help { - String aTicket; // for Plugins - String aUser; - String aLanguageStr; - String aCountryStr; + OUString aTicket; // for Plugins + OUString aUser; + OUString aLanguageStr; + OUString aCountryStr; sal_Bool bIsDebug; SfxHelp_Impl* pImp; private: - SAL_DLLPRIVATE sal_Bool Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ); - SAL_DLLPRIVATE virtual sal_Bool SearchKeyword( const XubString& rKeyWord ); - SAL_DLLPRIVATE virtual sal_Bool Start( const String& rURL, const Window* pWindow ); - SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId ); - SAL_DLLPRIVATE String GetHelpModuleName_Impl(); - SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ); + SAL_DLLPRIVATE sal_Bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword ); + SAL_DLLPRIVATE virtual sal_Bool SearchKeyword( const OUString& rKeyWord ); + SAL_DLLPRIVATE virtual sal_Bool Start( const OUString& rURL, const Window* pWindow ); + SAL_DLLPRIVATE virtual void OpenHelpAgent( const OString& sHelpId ); + SAL_DLLPRIVATE OUString GetHelpModuleName_Impl(); + SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName ); public: SfxHelp(); ~SfxHelp(); - inline void SetTicket( const String& rTicket ) { aTicket = rTicket; } - inline void SetUser( const String& rUser ) { aUser = rUser; } + inline void SetTicket( const OUString& rTicket ) { aTicket = rTicket; } + inline void SetUser( const OUString& rUser ) { aUser = rUser; } - virtual XubString GetHelpText( const String&, const Window* pWindow ); + virtual OUString GetHelpText( const OUString&, const Window* pWindow ); - static String CreateHelpURL( const String& aCommandURL, const String& rModuleName ); + static OUString CreateHelpURL( const OUString& aCommandURL, const OUString& rModuleName ); using Help::OpenHelpAgent; - static void OpenHelpAgent( SfxFrame* pFrame, const rtl::OString& sHelpId ); - static String GetDefaultHelpModule(); - static ::rtl::OUString GetCurrentModuleIdentifier(); + static void OpenHelpAgent( SfxFrame* pFrame, const OString& sHelpId ); + static OUString GetDefaultHelpModule(); + static OUString GetCurrentModuleIdentifier(); }; #endif // #ifndef _SFX_HELP_HXX |