summaryrefslogtreecommitdiff
path: root/sfx2/inc/sfxhelp.hxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-03-15 12:04:06 +0000
committerOliver Bolte <obo@openoffice.org>2005-03-15 12:04:06 +0000
commit7e08c77f88174459a028808b2107a833fe567c4f (patch)
tree7f628fddc5ef90e12d545165350b10f58a9118a2 /sfx2/inc/sfxhelp.hxx
parentbbe1650313432966da61e5f5045b20a16e51c83a (diff)
INTEGRATION: CWS c01v005 (1.18.114); FILE MERGED
2005/03/03 08:43:22 pb 1.18.114.1: fix: #120028# GetCurrentModuleIdentifier() added
Diffstat (limited to 'sfx2/inc/sfxhelp.hxx')
-rw-r--r--sfx2/inc/sfxhelp.hxx34
1 files changed, 16 insertions, 18 deletions
diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx
index 12db939155df..e6e3720543d5 100644
--- a/sfx2/inc/sfxhelp.hxx
+++ b/sfx2/inc/sfxhelp.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sfxhelp.hxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: rt $ $Date: 2005-01-11 14:57:03 $
+ * last change: $Author: obo $ $Date: 2005-03-15 13:04:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -64,19 +64,18 @@
#ifndef _SAL_CONFIG_H_
#include "sal/config.h"
#endif
-
#ifndef INCLUDED_SFX2_DLLAPI_H
#include "sfx2/dllapi.h"
#endif
-
#ifndef _SAL_TYPES_H_
#include "sal/types.h"
#endif
-#ifndef _HELP_HXX //autogen
+#ifndef _SV_HELP_HXX
#include <vcl/help.hxx>
#endif
-
+#ifndef _STRING_HXX
#include <tools/string.hxx>
+#endif
class SfxHelp_Impl;
class SfxFrame;
@@ -98,21 +97,20 @@ private:
SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName );
public:
+ SfxHelp();
+ ~SfxHelp();
- SfxHelp();
- ~SfxHelp();
- void SetTicket( const String& rTicket )
- { aTicket = rTicket;}
- void SetUser( const String& rUser )
- { aUser = rUser;}
+ inline void SetTicket( const String& rTicket ) { aTicket = rTicket; }
+ inline void SetUser( const String& rUser ) { aUser = rUser; }
- virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow );
- virtual XubString GetHelpText( const String&, const Window* pWindow );
+ virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow );
+ virtual XubString GetHelpText( const String&, const Window* pWindow );
- static String CreateHelpURL( ULONG nHelpId, const String& rModuleName );
- static String CreateHelpURL( const String& aCommandURL, const String& rModuleName );
- static void OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId );
- static String GetDefaultHelpModule();
+ static String CreateHelpURL( ULONG nHelpId, const String& rModuleName );
+ static String CreateHelpURL( const String& aCommandURL, const String& rModuleName );
+ static void OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId );
+ static String GetDefaultHelpModule();
+ static ::rtl::OUString GetCurrentModuleIdentifier();
};
#endif // #ifndef _SFX_HELP_HXX