[Libreoffice-commits] .: Branch 'integration/dev300_m98' - svtools/Package_inc.mk vcl/inc vcl/source

[Michael Meeks]

 svtools/Package_inc.mk  |    1 +
 vcl/inc/vcl/help.hxx    |    1 +
 vcl/source/app/help.cxx |    6 ++++++
 3 files changed, 8 insertions(+)

New commits:
commit e312b20ea4a5afe0b94569e13695ce18a9003b8a
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Mar 1 09:32:58 2011 +0000

    more merge fixups

diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 94213d5..994b34e 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovide
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/borderhelper.hxx,svtools/borderhelper.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx))
diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx
index 841fe94..26f39a9 100644
--- a/vcl/inc/vcl/help.hxx
+++ b/vcl/inc/vcl/help.hxx
@@ -74,6 +74,7 @@ public:
 
     virtual BOOL		Start( const XubString& rHelpId, const Window* pWindow );
     virtual BOOL		SearchKeyword( const XubString& rKeyWord );
+    virtual void		OpenHelpAgent( const rtl::OString& rHelpId );
     virtual XubString   GetHelpText( const String& aHelpURL, const Window* pWindow );
 
     static void 		EnableContextHelp();
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index febc7a0..e170793 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -63,6 +63,12 @@ Help::~Help()
 
 // -----------------------------------------------------------------------
 
+void Help::OpenHelpAgent( const rtl::OString& )
+{
+}
+
+// -----------------------------------------------------------------------
+
 BOOL Help::Start( const XubString&, const Window* )
 {
     return FALSE;