From 912cfe7a54217c718fc62e55187c09576564a962 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 16 Jul 2008 17:44:11 +0200 Subject: [PATCH] Manually set help id for zoom and wordcount dialogs. --- svx/source/dialog/zoom.cxx | 3 +++ sw/source/ui/dialog/wordcountdialog.cxx | 4 ++++ toolkit/workben/layout/makefile.mk | 2 +- toolkit/workben/layout/wordcountdialog.cxx | 4 ++++ toolkit/workben/layout/zoom.cxx | 3 +++ 5 files changed, 15 insertions(+), 1 deletions(-) diff --git a/svx/source/dialog/zoom.cxx b/svx/source/dialog/zoom.cxx index a28021a..50dc336 100644 --- a/svx/source/dialog/zoom.cxx +++ b/svx/source/dialog/zoom.cxx @@ -224,6 +224,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : bModified ( FALSE ) { +#if ENABLE_LAYOUT + SetHelpId (SID_ATTR_ZOOM); +#endif /* ENABLE_LAYOUT */ Link aLink = LINK( this, SvxZoomDialog, UserHdl ); a100Btn.SetClickHdl( aLink ); aOptimalBtn.SetClickHdl( aLink ); diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index c75ac9a..8ae35e6 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -47,6 +47,7 @@ #undef SfxModalDialog #define SfxModalDialog( parent, id ) Dialog( parent, "wordcount.xml", id ) #define SW_WORDCOUNTDIALOG_HRC +#include #endif /* ENABLE_LAYOUT */ /*-- 06.04.2004 16:05:55--------------------------------------------------- @@ -75,6 +76,9 @@ SwWordCountDialog::SwWordCountDialog(Window* pParent) : #pragma warning (default : 4355) #endif { +#if ENABLE_LAYOUT + SetHelpId (HID_DLG_WORDCOUNT); +#endif /* ENABLE_LAYOUT */ FreeResource(); } /*-- 06.04.2004 16:05:56--------------------------------------------------- diff --git a/toolkit/workben/layout/makefile.mk b/toolkit/workben/layout/makefile.mk index 3380cdc..df1cbf0 100644 --- a/toolkit/workben/layout/makefile.mk +++ b/toolkit/workben/layout/makefile.mk @@ -47,7 +47,7 @@ ENABLE_EXCEPTIONS=TRUE CFLAGS += -I$(PRJ)/source/layout # Allow zoom and wordcount to be built without depending on svx,sv,sfx2 -CFLAGS += -I../$(PRJ)/svx/inc -I../$(PRJ)/svtools/inc -I../$(PRJ)/sfx2/inc -I../$(PRJ)/sc/inc -I../$(PRJ)/sc/source/ui/inc +CFLAGS += -I../$(PRJ)/svx/inc -I../$(PRJ)/svtools/inc -I../$(PRJ)/sfx2/inc -I../$(PRJ)/sc/inc -I../$(PRJ)/sc/source/ui/inc -I../$(PRJ)/sw/inc .INCLUDE : $(PRJ)$/util$/makefile.pmk diff --git a/toolkit/workben/layout/wordcountdialog.cxx b/toolkit/workben/layout/wordcountdialog.cxx index 4fdf02c..1eebbe5 100644 --- a/toolkit/workben/layout/wordcountdialog.cxx +++ b/toolkit/workben/layout/wordcountdialog.cxx @@ -53,6 +53,7 @@ #undef SfxModalDialog #define SfxModalDialog( parent, id ) Dialog( parent, "wordcount.xml", id ) #define SW_WORDCOUNTDIALOG_HRC +#include #endif /* ENABLE_LAYOUT */ /*-- 06.04.2004 16:05:55--------------------------------------------------- @@ -81,6 +82,9 @@ SwWordCountDialog::SwWordCountDialog(Window* pParent) : #pragma warning (default : 4355) #endif { +#if ENABLE_LAYOUT + SetHelpId (HID_DLG_WORDCOUNT); +#endif /* ENABLE_LAYOUT */ FreeResource(); } /*-- 06.04.2004 16:05:56--------------------------------------------------- diff --git a/toolkit/workben/layout/zoom.cxx b/toolkit/workben/layout/zoom.cxx index d4cb388..6d7ade8 100644 --- a/toolkit/workben/layout/zoom.cxx +++ b/toolkit/workben/layout/zoom.cxx @@ -291,6 +291,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : bModified ( FALSE ) { +#if ENABLE_LAYOUT + SetHelpId (SID_ATTR_ZOOM); +#endif /* ENABLE_LAYOUT */ Link aLink = LINK( this, SvxZoomDialog, UserHdl ); a100Btn.SetClickHdl( aLink ); aOptimalBtn.SetClickHdl( aLink ); -- 1.5.6.3.317.g5d44c9.dirty