diff options
author | Christian Lippka <christian.lippka@sun.com> | 2010-01-04 15:43:22 +0100 |
---|---|---|
committer | Christian Lippka <christian.lippka@sun.com> | 2010-01-04 15:43:22 +0100 |
commit | 6de0e6f144f2e329f09572fa10bd2867fd96a6ea (patch) | |
tree | bda19998d895cf6279af08d04a01be3aa4ff7c49 /sfx2/source/appl/newhelp.cxx | |
parent | b354b53c2d2c28a93fc06b06e1e855f38a46e841 (diff) | |
parent | 0de34b05f3c1a0409d23b63b9e69d4d7abbe1090 (diff) |
merge to m68
Diffstat (limited to 'sfx2/source/appl/newhelp.cxx')
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index df47180c9f77..c5412f35d0f6 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -95,10 +95,10 @@ #include <com/sun/star/view/XViewSettingsSupplier.hpp> #include <com/sun/star/ui/XDockingAreaAcceptor.hpp> #include <svtools/helpopt.hxx> -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> #include <svtools/menuoptions.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/viewoptions.hxx> #include <svtools/svtdata.hxx> #include <tools/urlobj.hxx> #include <tools/cachestr.hxx> @@ -2139,7 +2139,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : if ( pEnv ) bIsDebug = sal_True; - SvtMiscOptions().AddListener( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) ); + SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) ); if ( aOnStartupCB.GetHelpId() == 0 ) aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX ); @@ -2152,7 +2152,7 @@ SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl() sfx2::RemoveFromTaskPaneList( &aToolBox ); bIsInClose = sal_True; - SvtMiscOptions().RemoveListener( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) ); + SvtMiscOptions().RemoveListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) ); delete pSrchDlg; } |