diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-06-04 20:20:37 +0200 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-06-04 20:20:37 +0200 |
| commit | f8a801d058e39e89a71c85afdb0b1c1718f36b45 (patch) | |
| tree | 1d10a25b538c2dde2d3c44f8a34d6f6dc60428d1 | |
| parent | e2ad46c4d4bb61681caf69938ee0fc41f69d9de3 (diff) | |
fix windows compile
| -rw-r--r-- | sfx2/inc/sfxhelp.hxx | 4 | ||||
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx index 6a87729e30e3..b19f78c6184b 100644 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfxhelp.hxx @@ -48,7 +48,8 @@ private: // FIXME: HELPID // SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); - SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); + // FIXME: HELPID + // SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); SAL_DLLPRIVATE String GetHelpModuleName_Impl(); // FIXME: HELPID @@ -69,6 +70,7 @@ public: // FIXME: HELPID // static String CreateHelpURL( ULONG nHelpId, const String& rModuleName ); static String CreateHelpURL( const String& aCommandURL, const String& rModuleName ); + using Help::OpenHelpAgent; static void OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId ); static String GetDefaultHelpModule(); static ::rtl::OUString GetCurrentModuleIdentifier(); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index cd2f6b189fd1..9c246c592b82 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -974,11 +974,18 @@ String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleN void SfxHelp::OpenHelpAgent( SfxFrame*, ULONG nHelpId ) { +// FIXME HELPID +#if 0 SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); if ( pHelp ) pHelp->OpenHelpAgent( nHelpId ); +#else +(void)nHelpId; +#endif } +// FIXME: HELPID +#if 0 void SfxHelp::OpenHelpAgent( ULONG nHelpId ) { if ( SvtHelpOptions().IsHelpAgentAutoStartMode() ) @@ -1023,6 +1030,7 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId ) // } } } +#endif String SfxHelp::GetDefaultHelpModule() { |