summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-10-29 09:09:38 +0200
committersb <sb@openoffice.org>2010-10-29 09:09:38 +0200
commitcdb541abfd3e47997bad2a1b27b7a11d1b2d468a (patch)
tree13fdcb56e401ae0f2e085aaaa9547ce0af8eb10d
parent43c80a7f3d338ef28b9d4a94415ca72acccbd8dc (diff)
parente2cfe20f42c94c784531446ebeddc0d720e277d8 (diff)
sb132: merged in DEV300_m91
-rw-r--r--avmedia/inc/helpids.hrc26
-rw-r--r--basic/inc/basic/ttstrhlp.hxx4
-rw-r--r--basic/source/app/basic.src64
-rw-r--r--desktop/source/app/desktop.src1
-rw-r--r--desktop/source/deployment/gui/dp_gui_dependencydialog.src2
-rw-r--r--[-rwxr-xr-x]desktop/source/deployment/gui/dp_gui_dialog.src3
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.src4
-rw-r--r--[-rwxr-xr-x]desktop/source/deployment/gui/dp_gui_extlistbox.cxx0
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.src3
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.src1
-rw-r--r--desktop/source/inc/helpid.hrc71
-rw-r--r--desktop/source/migration/wizard.src11
-rw-r--r--editeng/inc/helpid.hrc71
-rw-r--r--editeng/inc/pch/precompiled_editeng.hxx1
-rw-r--r--editeng/source/misc/svxacorr.cxx30
-rw-r--r--formula/inc/formula/IFunctionDescription.hxx2
-rw-r--r--formula/inc/formula/formdata.hxx6
-rw-r--r--formula/inc/formula/formula.hxx8
-rw-r--r--formula/inc/helpids.hrc50
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx2
-rw-r--r--formula/source/ui/dlg/formdlgs.src12
-rw-r--r--formula/source/ui/dlg/formula.cxx77
-rw-r--r--formula/source/ui/dlg/funcpage.cxx12
-rw-r--r--formula/source/ui/dlg/funcpage.hxx2
-rw-r--r--formula/source/ui/dlg/funcutl.cxx4
-rw-r--r--formula/source/ui/dlg/parawin.cxx12
-rw-r--r--formula/source/ui/dlg/parawin.src17
-rw-r--r--formula/util/hidother.src4
-rw-r--r--fpicker/source/office/OfficeControlAccess.cxx44
-rw-r--r--fpicker/source/office/iodlg.hrc20
-rw-r--r--fpicker/source/office/iodlg.src15
-rw-r--r--framework/inc/helpid.hrc22
-rw-r--r--framework/inc/uielement/commandinfo.hxx2
-rw-r--r--framework/inc/uielement/toolbarmerger.hxx1
-rw-r--r--framework/inc/uielement/toolbarsmenucontroller.hxx2
-rw-r--r--framework/source/classes/resource.src4
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx4
-rw-r--r--framework/source/services/backingwindow.cxx18
-rw-r--r--framework/source/services/menudocumenthandler.cxx903
-rw-r--r--framework/source/uielement/macrosmenucontroller.cxx7
-rw-r--r--framework/source/uielement/menubarmanager.cxx3
-rw-r--r--framework/source/uielement/statusbarmanager.cxx10
-rw-r--r--framework/source/uielement/toolbarmanager.cxx14
-rw-r--r--framework/source/uielement/toolbarmerger.cxx10
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx15
-rw-r--r--sfx2/inc/pch/precompiled_sfx2.hxx1
-rw-r--r--sfx2/inc/sfx2/basedlgs.hxx3
-rw-r--r--sfx2/inc/sfx2/dispatch.hxx4
-rw-r--r--sfx2/inc/sfx2/filedlghelper.hxx3
-rw-r--r--sfx2/inc/sfx2/mnumgr.hxx2
-rw-r--r--sfx2/inc/sfx2/msg.hxx5
-rw-r--r--sfx2/inc/sfx2/opengrf.hxx5
-rw-r--r--sfx2/inc/sfx2/passwd.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxcommands.h345
-rw-r--r--sfx2/inc/sfx2/sfxdlg.hxx4
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc1
-rw-r--r--sfx2/inc/sfx2/titledockwin.hxx4
-rw-r--r--sfx2/inc/sfxhelp.hxx12
-rw-r--r--[-rwxr-xr-x]sfx2/sdi/sfx.sdi2
-rw-r--r--sfx2/source/appl/app.src163
-rw-r--r--sfx2/source/appl/appcfg.cxx18
-rw-r--r--sfx2/source/appl/appserv.cxx7
-rw-r--r--sfx2/source/appl/appuno.cxx1
-rw-r--r--sfx2/source/appl/dde.src4
-rw-r--r--sfx2/source/appl/newhelp.cxx6
-rw-r--r--sfx2/source/appl/newhelp.src12
-rw-r--r--sfx2/source/appl/opengrf.cxx7
-rw-r--r--sfx2/source/appl/sfxhelp.cxx583
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/dispatch.cxx25
-rw-r--r--sfx2/source/control/msg.cxx15
-rw-r--r--sfx2/source/dialog/about.cxx5
-rw-r--r--sfx2/source/dialog/alienwarn.src1
-rw-r--r--sfx2/source/dialog/basedlgs.cxx59
-rw-r--r--[-rwxr-xr-x]sfx2/source/dialog/dinfdlg.src41
-rw-r--r--sfx2/source/dialog/dinfedt.src4
-rw-r--r--sfx2/source/dialog/dockwin.cxx53
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx55
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx3
-rw-r--r--sfx2/source/dialog/mgetempl.src6
-rw-r--r--sfx2/source/dialog/newstyle.src4
-rw-r--r--sfx2/source/dialog/passwd.src3
-rw-r--r--sfx2/source/dialog/printopt.src22
-rw-r--r--sfx2/source/dialog/recfloat.src1
-rw-r--r--sfx2/source/dialog/srchdlg.src6
-rw-r--r--sfx2/source/dialog/tabdlg.cxx10
-rw-r--r--sfx2/source/dialog/taskpane.cxx17
-rw-r--r--sfx2/source/dialog/templdlg.cxx44
-rw-r--r--sfx2/source/dialog/templdlg.src10
-rw-r--r--sfx2/source/dialog/titledockwin.cxx2
-rw-r--r--sfx2/source/dialog/versdlg.src10
-rw-r--r--sfx2/source/doc/applet.cxx383
-rw-r--r--sfx2/source/doc/doc.hrc1
-rw-r--r--sfx2/source/doc/doc.src8
-rw-r--r--sfx2/source/doc/doctdlg.src8
-rw-r--r--sfx2/source/doc/docvor.src7
-rw-r--r--sfx2/source/doc/iframe.cxx2
-rw-r--r--sfx2/source/doc/makefile.mk2
-rw-r--r--sfx2/source/doc/new.src18
-rw-r--r--sfx2/source/doc/objcont.cxx11
-rw-r--r--sfx2/source/doc/querytemplate.cxx4
-rw-r--r--sfx2/source/inc/applet.hxx122
-rw-r--r--[-rwxr-xr-x]sfx2/source/inc/helpid.hrc621
-rw-r--r--sfx2/source/menu/menu.src7
-rwxr-xr-xsfx2/source/menu/mnumgr.cxx5
-rw-r--r--sfx2/source/menu/virtmenu.cxx25
-rw-r--r--sfx2/source/statbar/stbitem.cxx5
-rw-r--r--sfx2/source/view/frame2.cxx10
-rw-r--r--sfx2/util/hidother.src62
-rw-r--r--svx/inc/fmhelp.hrc164
-rw-r--r--svx/inc/globlmn_tmpl.hrc202
-rw-r--r--svx/inc/helpid.hrc500
-rw-r--r--svx/inc/pch/precompiled_svx.hxx1
-rw-r--r--svx/inc/pfiledlg.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dialogs.hrc4
-rw-r--r--svx/inc/svx/exthelpid.hrc17
-rw-r--r--svx/inc/svx/simptabl.hxx2
-rw-r--r--svx/inc/svx/svxcommands.h604
-rw-r--r--svx/inc/svx/svxdlg.hxx8
-rw-r--r--svx/prj/d.lst1
-rw-r--r--svx/sdi/svx.sdi27
-rw-r--r--svx/source/dialog/bmpmask.src17
-rw-r--r--svx/source/dialog/contdlg.src2
-rw-r--r--svx/source/dialog/docrecovery.cxx1
-rw-r--r--svx/source/dialog/docrecovery.src19
-rw-r--r--svx/source/dialog/fontwork.src7
-rw-r--r--svx/source/dialog/hdft.src18
-rw-r--r--svx/source/dialog/hyprlink.src4
-rw-r--r--svx/source/dialog/imapdlg.src4
-rw-r--r--svx/source/dialog/optgrid.src17
-rw-r--r--svx/source/dialog/passwd.src3
-rw-r--r--svx/source/dialog/pfiledlg.cxx5
-rw-r--r--svx/source/dialog/rubydialog.src14
-rw-r--r--svx/source/dialog/srchdlg.cxx2
-rw-r--r--svx/source/dialog/srchdlg.src33
-rw-r--r--svx/source/engine3d/float3d.src72
-rw-r--r--svx/source/fmcomp/fmgridif.cxx13
-rw-r--r--svx/source/fmcomp/gridctrl.src44
-rw-r--r--svx/source/form/datanavi.src35
-rw-r--r--svx/source/form/filtnav.src10
-rw-r--r--svx/source/form/fmexpl.src65
-rw-r--r--svx/source/form/formshell.src7
-rw-r--r--svx/source/gallery2/gallery.src2
-rw-r--r--svx/source/intro/iso.src2
-rw-r--r--svx/source/intro/ooo.src2
-rw-r--r--svx/source/stbctrls/insctrl.cxx1
-rw-r--r--svx/source/stbctrls/pszctrl.cxx19
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx6
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.src5
-rw-r--r--svx/source/tbxctrls/fontworkgallery.src5
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx5
-rw-r--r--svx/source/tbxctrls/lboxctrl.src1
-rw-r--r--svx/source/tbxctrls/makefile.mk1
-rw-r--r--svx/source/tbxctrls/tbxdraw.src265
-rw-r--r--svx/source/toolbars/extrusionbar.src59
-rw-r--r--svx/source/toolbars/fontworkbar.src34
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src8
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src4
-rw-r--r--svx/util/hidother.src5
-rw-r--r--uui/source/cookiedg.src5
-rw-r--r--uui/source/fltdlg.src1
-rw-r--r--[-rwxr-xr-x]uui/source/ids.hrc37
-rw-r--r--[-rwxr-xr-x]uui/source/masterpasscrtdlg.src2
-rw-r--r--uui/source/masterpassworddlg.src1
-rw-r--r--[-rwxr-xr-x]uui/source/nameclashdlg.src3
-rw-r--r--uui/source/newerverwarn.src1
-rw-r--r--[-rwxr-xr-x]uui/source/passworddlg.src2
-rw-r--r--uui/source/secmacrowarnings.src2
-rw-r--r--uui/source/sslwarndlg.src2
-rw-r--r--uui/source/unknownauthdlg.src4
169 files changed, 3023 insertions, 3870 deletions
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index 1f7ffb6172..a16eaa6ce9 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -28,19 +28,17 @@
#ifndef _AVMEDIA_HELPIDS_HRC
#define _AVMEDIA_HELPIDS_HRC
-#include <svl/solar.hrc>
-
-#define HID_AVMEDIA_TOOLBOXITEM_PLAY (HID_AVMEDIA_START+0)
-#define HID_AVMEDIA_TOOLBOXITEM_PAUSE (HID_AVMEDIA_START+1)
-#define HID_AVMEDIA_TOOLBOXITEM_STOP (HID_AVMEDIA_START+2)
-#define HID_AVMEDIA_TOOLBOXITEM_MUTE (HID_AVMEDIA_START+3)
-#define HID_AVMEDIA_TOOLBOXITEM_LOOP (HID_AVMEDIA_START+4)
-#define HID_AVMEDIA_TOOLBOXITEM_OPEN (HID_AVMEDIA_START+5)
-#define HID_AVMEDIA_TOOLBOXITEM_INSERT (HID_AVMEDIA_START+6)
-#define HID_AVMEDIA_ZOOMLISTBOX (HID_AVMEDIA_START+7)
-#define HID_AVMEDIA_TIMESLIDER (HID_AVMEDIA_START+8)
-#define HID_AVMEDIA_TIMEEDIT (HID_AVMEDIA_START+9)
-#define HID_AVMEDIA_VOLUMESLIDER (HID_AVMEDIA_START+10)
-#define HID_AVMEDIA_PLAYERWINDOW (HID_AVMEDIA_START+11)
+#define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"
+#define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"
+#define HID_AVMEDIA_TOOLBOXITEM_STOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP"
+#define HID_AVMEDIA_TOOLBOXITEM_MUTE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE"
+#define HID_AVMEDIA_TOOLBOXITEM_LOOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP"
+#define HID_AVMEDIA_TOOLBOXITEM_OPEN "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN"
+#define HID_AVMEDIA_TOOLBOXITEM_INSERT "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT"
+#define HID_AVMEDIA_ZOOMLISTBOX "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX"
+#define HID_AVMEDIA_TIMESLIDER "AVMEDIA_HID_AVMEDIA_TIMESLIDER"
+#define HID_AVMEDIA_TIMEEDIT "AVMEDIA_HID_AVMEDIA_TIMEEDIT"
+#define HID_AVMEDIA_VOLUMESLIDER "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"
+#define HID_AVMEDIA_PLAYERWINDOW "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"
#endif // _AVMEDIA_HELPIDS_HRC
diff --git a/basic/inc/basic/ttstrhlp.hxx b/basic/inc/basic/ttstrhlp.hxx
index 4eb42f3a3e..b971d5c1d1 100644
--- a/basic/inc/basic/ttstrhlp.hxx
+++ b/basic/inc/basic/ttstrhlp.hxx
@@ -31,6 +31,8 @@
#define CByteString( constAsciiStr ) ByteString( RTL_CONSTASCII_STRINGPARAM ( constAsciiStr ) )
#define CUniString( constAsciiStr ) UniString( RTL_CONSTASCII_USTRINGPARAM ( constAsciiStr ) )
+#define Str2Id( Str ) rtl::OUStringToOString( Str, RTL_TEXTENCODING_ASCII_US )
+#define Id2Str( Id ) String( rtl::OStringToOUString( Id, RTL_TEXTENCODING_ASCII_US ) )
#define StartKenn CUniString("%")
#define EndKenn CUniString("%")
@@ -42,7 +44,7 @@
#define TabKenn ( StartKenn.AppendAscii("Tab") )
#define MakeStringParam(Type,aText) ( Type.AppendAscii("=").Append( aText ).Append( EndKenn ) )
#define MakeStringNumber(Type,nNumber) MakeStringParam (Type, UniString::CreateFromInt32(nNumber))
-#define UIdString(aID) MakeStringParam(UIdKenn,aID.GetText())
+#define UIdString(aID) MakeStringParam(UIdKenn,String(rtl::OStringToOUString( aID, RTL_TEXTENCODING_ASCII_US )))
#define MethodString(nNumber) MakeStringNumber(MethodKenn,nNumber)
#define TypeString(nNumber) MakeStringNumber(TypeKenn,nNumber)
#define SlotString(nNumber) MakeStringNumber(SlotKenn,nNumber)
diff --git a/basic/source/app/basic.src b/basic/source/app/basic.src
index d93ca2fa23..045dec2683 100644
--- a/basic/source/app/basic.src
+++ b/basic/source/app/basic.src
@@ -29,6 +29,7 @@
#include "resids.hrc"
ModalDialog RID_CALLDLG {
+ HelpID = "basic:ModalDialog:RID_CALLDLG";
PosSize = MAP_SYSFONT (18,18,142,142);
SVLook = TRUE;
MOVEABLE = TRUE;
@@ -43,11 +44,13 @@ ModalDialog RID_CALLDLG {
PosSize = MAP_SYSFONT (10,70,120,8);
};
Edit RID_RETVAL {
+ HelpID = "basic:Edit:RID_CALLDLG:RID_RETVAL";
PosSize = MAP_SYSFONT (10,85,120,12);
Border = TRUE;
TabStop = TRUE;
};
ListBox RID_PARAMS {
+ HelpID = "basic:ListBox:RID_CALLDLG:RID_PARAMS";
PosSize = MAP_SYSFONT (10,25,120,40);
TabStop = TRUE;
Border = TRUE;
@@ -61,6 +64,7 @@ ModalDialog RID_CALLDLG {
};
ModalDialog IDD_ABOUT_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_ABOUT_DIALOG";
Pos = MAP_APPFONT( 58, 17 );
Size = MAP_APPFONT( 155, 106 );
SVLook = TRUE;
@@ -107,6 +111,7 @@ ModalDialog IDD_ABOUT_DIALOG {
};
ModalDialog IDD_TT_ABOUT_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_TT_ABOUT_DIALOG";
Pos = MAP_APPFONT( 58, 17 );
Size = MAP_APPFONT( 120, 81 );
SVLook = TRUE;
@@ -138,6 +143,7 @@ ModalDialog IDD_TT_ABOUT_DIALOG {
};
ModalDialog IDD_FIND_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_FIND_DIALOG";
Pos = MAP_APPFONT( 69, 30 );
Size = MAP_APPFONT( 185, 70 );
SVLook = TRUE;
@@ -150,6 +156,7 @@ ModalDialog IDD_FIND_DIALOG {
TEXT[ en-US ] = "~Text";
};
Edit RID_FIND {
+ HelpID = "basic:Edit:IDD_FIND_DIALOG:RID_FIND";
BORDER = TRUE;
Pos = MAP_APPFONT( 40, 8 );
Size = MAP_APPFONT( 135, 12 );
@@ -172,6 +179,7 @@ ModalDialog IDD_FIND_DIALOG {
};
ModalDialog IDD_REPLACE_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_REPLACE_DIALOG";
Pos = MAP_APPFONT( 69, 30 );
Size = MAP_APPFONT( 185, 88 );
SVLook = TRUE;
@@ -188,12 +196,14 @@ ModalDialog IDD_REPLACE_DIALOG {
TEXT[ en-US ] = "~Replace by";
};
Edit RID_FIND {
+ HelpID = "basic:Edit:IDD_REPLACE_DIALOG:RID_FIND";
BORDER = TRUE;
Pos = MAP_APPFONT( 65, 8 );
Size = MAP_APPFONT( 110, 12 );
TABSTOP = TRUE;
};
Edit RID_REPLACE {
+ HelpID = "basic:Edit:IDD_REPLACE_DIALOG:RID_REPLACE";
BORDER = TRUE;
Pos = MAP_APPFONT( 65, 28 );
Size = MAP_APPFONT( 110, 12 );
@@ -718,6 +728,7 @@ Menu RID_HELP {
};
};
ModelessDialog IDD_PRINT_DIALOG {
+ HelpID = "basic:ModelessDialog:IDD_PRINT_DIALOG";
Pos = MAP_APPFONT( 83, 42 );
Size = MAP_APPFONT( 171, 94 );
MOVEABLE = TRUE;
@@ -784,6 +795,7 @@ TabDialog IDD_OPTIONS_DLG
TabPage RID_TP_GENERIC {
+ HelpID = "basic:TabPage:RID_TP_GENERIC";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -793,6 +805,7 @@ TabPage RID_TP_GENERIC {
Text[ en-US ] = "Area";
};
ComboBox RID_CB_AREA {
+ HelpID = "basic:ComboBox:RID_TP_GENERIC:RID_CB_AREA";
HScroll = TRUE;
VScroll = TRUE;
AutoHScroll = TRUE;
@@ -803,12 +816,14 @@ TabPage RID_TP_GENERIC {
DropDown = TRUE;
};
PushButton RID_PB_NEW_AREA {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_NEW_AREA";
Pos = MAP_APPFONT( 144, 12 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "New";
};
PushButton RID_PD_DEL_AREA {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PD_DEL_AREA";
Pos = MAP_APPFONT( 188, 12 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -820,6 +835,7 @@ TabPage RID_TP_GENERIC {
Text[ en-US ] = "Setting";
};
ComboBox RID_CB_VALUE {
+ HelpID = "basic:ComboBox:RID_TP_GENERIC:RID_CB_VALUE";
HScroll = TRUE;
VScroll = TRUE;
AutoHScroll = TRUE;
@@ -829,6 +845,7 @@ TabPage RID_TP_GENERIC {
TabStop = TRUE;
};
PushButton RID_PB_SELECT_FILE {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_SELECT_FILE";
Pos = MAP_APPFONT( 188, 48 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -837,12 +854,14 @@ TabPage RID_TP_GENERIC {
Hide = TRUE;
};
PushButton RID_PB_NEW_VALUE {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_NEW_VALUE";
Pos = MAP_APPFONT( 188, 48 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "New";
};
PushButton RID_PB_DEL_VALUE {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_DEL_VALUE";
Pos = MAP_APPFONT( 188, 64 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -852,6 +871,7 @@ TabPage RID_TP_GENERIC {
TabPage RID_TP_PROFILE {
+ HelpID = "basic:TabPage:RID_TP_PROFILE";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -861,6 +881,7 @@ TabPage RID_TP_PROFILE {
Text[ en-US ] = "Profile";
};
ComboBox RID_CB_PROFILE {
+ HelpID = "basic:ComboBox:RID_TP_PROFILE:RID_CB_PROFILE";
HScroll = TRUE;
VScroll = TRUE;
AutoHScroll = TRUE;
@@ -871,12 +892,14 @@ TabPage RID_TP_PROFILE {
DropDown = TRUE;
};
PushButton RID_PB_NEW_PROFILE {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:RID_PB_NEW_PROFILE";
Pos = MAP_APPFONT( 144, 2 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "New";
};
PushButton RID_PD_DEL_PROFILE {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:RID_PD_DEL_PROFILE";
Pos = MAP_APPFONT( 188, 2 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -898,6 +921,7 @@ TabPage RID_TP_PROFILE {
Text[ en-US ] = "Base directory";
};
CheckBox HID_CHECK {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:HID_CHECK";
Pos = MAP_APPFONT( 7, 58 );
Size = MAP_APPFONT( 86, 12 );
Text[ en-US ] = "Default HID directory";
@@ -905,52 +929,61 @@ TabPage RID_TP_PROFILE {
Hide = FALSE;
};
Edit LOG_NAME {
+ HelpID = "basic:Edit:RID_TP_PROFILE:LOG_NAME";
Border = TRUE;
Pos = MAP_APPFONT( 97, 26 );
Size = MAP_APPFONT( 116, 12 );
TabStop = TRUE;
};
Edit BASIS_NAME {
+ HelpID = "basic:Edit:RID_TP_PROFILE:BASIS_NAME";
Border = TRUE;
Pos = MAP_APPFONT( 97, 42 );
Size = MAP_APPFONT( 116, 12 );
TabStop = TRUE;
};
Edit HID_NAME {
+ HelpID = "basic:Edit:RID_TP_PROFILE:HID_NAME";
Border = TRUE;
Pos = MAP_APPFONT( 97, 58 );
Size = MAP_APPFONT( 116, 12 );
TabStop = TRUE;
};
PushButton LOG_SET {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:LOG_SET";
Pos = MAP_APPFONT( 217, 26 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
Text[ en-US ] = "...";
};
PushButton BASIS_SET {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:BASIS_SET";
Pos = MAP_APPFONT( 217, 42 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
Text[ en-US ] = "...";
};
PushButton HID_SET {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:HID_SET";
Pos = MAP_APPFONT( 217, 58 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
Text[ en-US ] = "...";
};
CheckBox CB_AUTORELOAD {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_AUTORELOAD";
Pos = MAP_APPFONT( 7, 74 );
Size = MAP_APPFONT( 115, 12 );
Text[ en-US ] = "AutoReload";
};
CheckBox CB_AUTOSAVE {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_AUTOSAVE";
Pos = MAP_APPFONT( 7, 87 );
Size = MAP_APPFONT( 115, 12 );
Text[ en-US ] = "Save before execute";
};
CheckBox CB_STOPONSYNTAXERRORS {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_STOPONSYNTAXERRORS";
Pos = MAP_APPFONT( 132, 74 );
Size = MAP_APPFONT( 115, 12 );
Text[ en-US ] = "Stop on Syntax Errors";
@@ -958,6 +991,7 @@ TabPage RID_TP_PROFILE {
};
TabPage RID_TP_CRASH {
+ HelpID = "basic:TabPage:RID_TP_CRASH";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -967,6 +1001,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "Crashreport";
};
CheckBox CB_USEPROXY {
+ HelpID = "basic:CheckBox:RID_TP_CRASH:CB_USEPROXY";
Pos = MAP_APPFONT( 8, 12 );
Size = MAP_APPFONT( 120, 12 );
Text[ en-US ] = "Use Proxy";
@@ -977,6 +1012,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "Host";
};
Edit ED_CRHOST {
+ HelpID = "basic:Edit:RID_TP_CRASH:ED_CRHOST";
Border = TRUE;
Pos = MAP_APPFONT( 43+12, 12+13 );
Size = MAP_APPFONT( 80, 12 );
@@ -988,6 +1024,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "Port";
};
NumericField NF_CRPORT {
+ HelpID = "basic:NumericField:RID_TP_CRASH:NF_CRPORT";
Border = TRUE;
Pos = MAP_APPFONT( 43+12, 12+13+16 );
Size = MAP_APPFONT( 40, 12 );
@@ -1001,6 +1038,7 @@ TabPage RID_TP_CRASH {
Last = 0xffff;
};
CheckBox CB_ALLOWCONTACT {
+ HelpID = "basic:CheckBox:RID_TP_CRASH:CB_ALLOWCONTACT";
Pos = MAP_APPFONT( 8, 12+13+16+16 );
Size = MAP_APPFONT( 120, 12 );
Text[ en-US ] = "Allow Contact";
@@ -1011,6 +1049,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "EMail";
};
Edit ED_EMAIL {
+ HelpID = "basic:Edit:RID_TP_CRASH:ED_EMAIL";
Border = TRUE;
Pos = MAP_APPFONT( 43+12, 12+13+16+16+13 );
Size = MAP_APPFONT( 80, 12 );
@@ -1020,6 +1059,7 @@ TabPage RID_TP_CRASH {
TabPage RID_TP_MISC {
+ HelpID = "basic:TabPage:RID_TP_MISC";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -1034,6 +1074,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Host";
};
Edit ED_HOST {
+ HelpID = "basic:Edit:RID_TP_MISC:ED_HOST";
Border = TRUE;
Pos = MAP_APPFONT( 43, 12);
Size = MAP_APPFONT( 80, 12 );
@@ -1045,6 +1086,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Testtool Port";
};
NumericField NF_TTPORT {
+ HelpID = "basic:NumericField:RID_TP_MISC:NF_TTPORT";
Border = TRUE;
Pos = MAP_APPFONT( 191, 12);
Size = MAP_APPFONT( 40, 12 );
@@ -1063,6 +1105,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Remote UNO Port";
};
NumericField NF_UNOPORT {
+ HelpID = "basic:NumericField:RID_TP_MISC:NF_UNOPORT";
Border = TRUE;
Pos = MAP_APPFONT( 191, 12+15);
Size = MAP_APPFONT( 40, 12 );
@@ -1087,6 +1130,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Server Timeout";
};
TimeField SERVER_TIMEOUT {
+ HelpID = "basic:TimeField:RID_TP_MISC:SERVER_TIMEOUT";
Border = TRUE;
Pos = MAP_APPFONT( 83, 50 );
Size = MAP_APPFONT( 40, 12 );
@@ -1102,6 +1146,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Max LRU Files";
};
NumericField TF_MAX_LRU {
+ HelpID = "basic:NumericField:RID_TP_MISC:TF_MAX_LRU";
Border = TRUE;
Pos = MAP_APPFONT( 191, 50);
Size = MAP_APPFONT( 40, 12 );
@@ -1118,12 +1163,14 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "OOo Program Dir";
};
Edit ED_PROGDIR {
+ HelpID = "basic:Edit:RID_TP_MISC:ED_PROGDIR";
Border = TRUE;
Pos = MAP_APPFONT( 83, 50+15 );
Size = MAP_APPFONT( 219-83-4, 12 );
TabStop = TRUE;
};
PushButton PB_PROGDIR {
+ HelpID = "basic:PushButton:RID_TP_MISC:PB_PROGDIR";
Pos = MAP_APPFONT( 219, 50+15 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
@@ -1133,6 +1180,7 @@ TabPage RID_TP_MISC {
TabPage RID_TP_FONT {
+ HelpID = "basic:TabPage:RID_TP_FONT";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -1142,6 +1190,7 @@ TabPage RID_TP_FONT {
Text[ en-US ] = "Type";
};
ComboBox CB_FONTNAME {
+ HelpID = "basic:ComboBox:RID_TP_FONT:CB_FONTNAME";
Pos = MAP_APPFONT( 4, 12 );
Size = MAP_APPFONT( 123, 12*4 );
Sort = TRUE;
@@ -1153,6 +1202,7 @@ TabPage RID_TP_FONT {
Text[ en-US ] = "Typeface";
};
ComboBox CB_FONTSTYLE {
+ HelpID = "basic:ComboBox:RID_TP_FONT:CB_FONTSTYLE";
Pos = MAP_APPFONT( 131, 12 );
Size = MAP_APPFONT( 65, 12*4 );
AutoHScroll = TRUE;
@@ -1163,6 +1213,7 @@ TabPage RID_TP_FONT {
Text[ en-US ] = "Size";
};
MetricBox MB_FONTSIZE {
+ HelpID = "basic:MetricBox:RID_TP_FONT:MB_FONTSIZE";
Pos = MAP_APPFONT( 200, 12 );
Size = MAP_APPFONT( 29, 12*4 );
AutoHScroll = TRUE;
@@ -1178,6 +1229,7 @@ TabPage RID_TP_FONT {
FloatingWindow IDD_DISPLAY_HID {
+ HelpID = "basic:FloatingWindow:IDD_DISPLAY_HID";
OutputSize = TRUE;
SVLook = TRUE;
Size = MAP_APPFONT( 261, 160 );
@@ -1204,6 +1256,7 @@ FloatingWindow IDD_DISPLAY_HID {
Text[ en-US ] = "Controls";
};
MultiListBox RID_MLB_CONTROLS {
+ HelpID = "basic:MultiListBox:IDD_DISPLAY_HID:RID_MLB_CONTROLS";
Border = TRUE;
AutoHScroll = TRUE;
Pos = MAP_APPFONT( 4, 28 );
@@ -1216,6 +1269,7 @@ FloatingWindow IDD_DISPLAY_HID {
Text[ en-US ] = "Slots";
};
MultiListBox RID_MLB_SLOTS {
+ HelpID = "basic:MultiListBox:IDD_DISPLAY_HID:RID_MLB_SLOTS";
Border = TRUE;
AutoHScroll = TRUE;
Pos = MAP_APPFONT( 4, 132 );
@@ -1223,12 +1277,14 @@ FloatingWindow IDD_DISPLAY_HID {
TabStop = TRUE;
};
PushButton RID_PB_KOPIEREN {
+ HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_KOPIEREN";
Pos = MAP_APPFONT( 216, 28 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "Copy";
};
PushButton RID_PB_BENENNEN {
+ HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_BENENNEN";
Pos = MAP_APPFONT( 216, 44 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -1236,6 +1292,7 @@ FloatingWindow IDD_DISPLAY_HID {
Text[ en-US ] = "Name";
};
PushButton RID_PB_SELECTALL {
+ HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_SELECTALL";
Pos = MAP_APPFONT( 216, 44 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -1356,6 +1413,7 @@ ImageList RID_IMGLST_LAYOUT
};
ModelessDialog IDD_EDIT_VAR {
+ HelpID = "basic:ModelessDialog:IDD_EDIT_VAR";
Pos = MAP_APPFONT( 0, 0 );
Size = MAP_APPFONT( 171, 87 );
Moveable = TRUE;
@@ -1386,6 +1444,7 @@ ModelessDialog IDD_EDIT_VAR {
Text[ en-US ] = "Previous contents";
};
RadioButton RID_RB_NEW_BOOL_T {
+ HelpID = "basic:RadioButton:IDD_EDIT_VAR:RID_RB_NEW_BOOL_T";
Hide = TRUE;
Pos = MAP_APPFONT( 53, 37 );
Size = MAP_APPFONT( 40, 12 );
@@ -1393,6 +1452,7 @@ ModelessDialog IDD_EDIT_VAR {
Text[ en-US ] = "True";
};
RadioButton RID_RB_NEW_BOOL_F {
+ HelpID = "basic:RadioButton:IDD_EDIT_VAR:RID_RB_NEW_BOOL_F";
Hide = TRUE;
Pos = MAP_APPFONT( 98, 37 );
Size = MAP_APPFONT( 40, 12 );
@@ -1400,6 +1460,7 @@ ModelessDialog IDD_EDIT_VAR {
Text[ en-US ] = "False";
};
NumericField RID_NF_NEW_INTEGER {
+ HelpID = "basic:NumericField:IDD_EDIT_VAR:RID_NF_NEW_INTEGER";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 53, 37 );
@@ -1414,6 +1475,7 @@ ModelessDialog IDD_EDIT_VAR {
SpinSize = 10;
};
NumericField RID_NF_NEW_LONG {
+ HelpID = "basic:NumericField:IDD_EDIT_VAR:RID_NF_NEW_LONG";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 53, 37 );
@@ -1428,6 +1490,7 @@ ModelessDialog IDD_EDIT_VAR {
SpinSize = 10;
};
Edit RID_ED_NEW_STRING {
+ HelpID = "basic:Edit:IDD_EDIT_VAR:RID_ED_NEW_STRING";
Hide = TRUE;
Border = TRUE;
Pos = MAP_APPFONT( 53, 37 );
@@ -1449,6 +1512,7 @@ ModelessDialog IDD_EDIT_VAR {
};
FloatingWindow LOAD_CONF {
+ HelpID = "basic:FloatingWindow:LOAD_CONF";
SVLook = TRUE;
Pos = MAP_APPFONT( 66, 23 );
Size = MAP_APPFONT( 156, 51 );
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index e333c44181..10411e5adb 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -159,6 +159,7 @@ InfoBox INFOBOX_CMDLINEHELP
ModalDialog DLG_CMDLINEHELP
{
+ HelpID = "desktop:ModalDialog:DLG_CMDLINEHELP";
Text = "Help Message...";
Size = MAP_APPFONT(250, 365);
Border = True;
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.src b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
index 80b584f894..1e5d273943 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
@@ -34,6 +34,7 @@
#define LOCAL_LIST_HEIGHT (6 * RSC_BS_CHARHEIGHT)
ModalDialog RID_DLG_DEPENDENCIES {
+ HelpID = "desktop:ModalDialog:RID_DLG_DEPENDENCIES";
Size = MAP_APPFONT(
(RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH +
RSC_SP_DLG_INNERBORDER_RIGHT),
@@ -52,6 +53,7 @@ ModalDialog RID_DLG_DEPENDENCIES {
NoLabel = TRUE;
};
ListBox RID_DLG_DEPENDENCIES_LIST {
+ HelpID = "desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST";
Pos = MAP_APPFONT(
RSC_SP_DLG_INNERBORDER_LEFT,
(RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT +
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index db2e09769d..cf000640c3 100755..100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -169,6 +169,7 @@ String RID_STR_ERROR_MISSING_LICENSE
ModalDialog RID_DLG_LICENSE
{
+ HelpID = "desktop:ModalDialog:RID_DLG_LICENSE";
Text [ en-US ] = "Extension Software License Agreement";
Size = MAP_APPFONT(LIC_DLG_WIDTH, LIC_DLG_HEIGHT);
@@ -181,6 +182,7 @@ ModalDialog RID_DLG_LICENSE
MultiLineEdit ML_LICENSE
{
+ HelpID = "desktop:MultiLineEdit:RID_DLG_LICENSE:ML_LICENSE";
Pos = MAP_APPFONT(COL1_X, ROW1_Y);
Size = MAP_APPFONT(BODYWIDTH, ROW1_HEIGHT);
Border = TRUE;
@@ -230,6 +232,7 @@ ModalDialog RID_DLG_LICENSE
};
PushButton PB_LICENSE_DOWN
{
+ HelpID = "desktop:PushButton:RID_DLG_LICENSE:PB_LICENSE_DOWN";
TabStop = TRUE ;
Pos = MAP_APPFONT(COL5_X , ROW3_Y) ;
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT) ;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index b74a802ceb..daeb5d0125 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -43,6 +43,7 @@ ModelessDialog RID_DLG_EXTENSION_MANAGER
PushButton RID_EM_BTN_ADD
{
+ HelpID = "desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_ADD";
TabStop = TRUE;
Text [ en-US ] = "~Add...";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
@@ -50,6 +51,7 @@ ModelessDialog RID_DLG_EXTENSION_MANAGER
PushButton RID_EM_BTN_CHECK_UPDATES
{
+ HelpID = "desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_CHECK_UPDATES";
TabStop = TRUE;
Text [ en-US ] = "Check for ~Updates...";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
@@ -131,6 +133,7 @@ ModalDialog RID_DLG_UPDATE_REQUIRED
PushButton RID_EM_BTN_CHECK_UPDATES
{
+ HelpID = "desktop:PushButton:RID_DLG_UPDATE_REQUIRED:RID_EM_BTN_CHECK_UPDATES";
TabStop = TRUE;
Text [ en-US ] = "Check for ~Updates...";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
@@ -138,6 +141,7 @@ ModalDialog RID_DLG_UPDATE_REQUIRED
PushButton RID_EM_BTN_CLOSE
{
+ HelpID = "desktop:PushButton:RID_DLG_UPDATE_REQUIRED:RID_EM_BTN_CLOSE";
TabStop = TRUE;
DefButton = TRUE;
Text [ en-US ] = "Disable all";
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index e1e517a55c..e1e517a55c 100755..100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 59539d55c1..ad098bb387 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -86,6 +86,7 @@ ModalDialog RID_DLG_UPDATE {
TabStop = TRUE;
};
CheckBox RID_DLG_UPDATE_ALL {
+ HelpID = "desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL";
Disable = TRUE;
Pos = MAP_APPFONT(
RSC_SP_DLG_INNERBORDER_LEFT,
@@ -150,6 +151,7 @@ ModalDialog RID_DLG_UPDATE {
Text[en-US] = "Release Notes";
};
MultiLineEdit RID_DLG_UPDATE_DESCRIPTIONS {
+ HelpID = "desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS";
Disable = TRUE;
Border = TRUE;
Pos = MAP_APPFONT(
@@ -183,6 +185,7 @@ ModalDialog RID_DLG_UPDATE {
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
};
PushButton RID_DLG_UPDATE_OK {
+ HelpID = "desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK";
Disable = TRUE;
Pos = MAP_APPFONT(
(RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - RSC_CD_PUSHBUTTON_WIDTH -
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
index 7c43817754..a3ded83be1 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
@@ -90,6 +90,7 @@ ModalDialog RID_DLG_UPDATEINSTALL {
};
MultiLineEdit RID_DLG_UPDATE_INSTALL_INFO {
+ HelpID = "desktop:MultiLineEdit:RID_DLG_UPDATEINSTALL:RID_DLG_UPDATE_INSTALL_INFO";
Pos = MAP_APPFONT(
RSC_SP_DLG_INNERBORDER_LEFT,
RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index 2435467f76..facdc1f410 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -28,51 +28,40 @@
#if ! defined INCLUDED_DESKTOP_HELPID_HRC
#define INCLUDED_DESKTOP_HELPID_HRC
-#include "svl/solar.hrc"
+#define HID_PACKAGE_MANAGER "DESKTOP_HID_PACKAGE_MANAGER"
+#define HID_PACKAGE_MANAGER_TREELISTBOX "DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX"
+#define HID_PACKAGE_MANAGER_PROGRESS "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS"
+#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL"
+#define HID_PACKAGE_MANAGER_MENU_ITEM "DESKTOP_HID_PACKAGE_MANAGER_MENU_ITEM"
-#define HID_GLOBAL_FALLBACK 0xFFFFFFFF
+#define HID_FIRSTSTART_DIALOG "DESKTOP_HID_FIRSTSTART_DIALOG"
+#define HID_FIRSTSTART_WELCOME "DESKTOP_HID_FIRSTSTART_WELCOME"
+#define HID_FIRSTSTART_LICENSE "DESKTOP_HID_FIRSTSTART_LICENSE"
+#define HID_FIRSTSTART_MIGRATION "DESKTOP_HID_FIRSTSTART_MIGRATION"
+#define HID_FIRSTSTART_REGISTRATION "DESKTOP_HID_FIRSTSTART_REGISTRATION"
+#define HID_FIRSTSTART_USER "DESKTOP_HID_FIRSTSTART_USER"
+#define HID_FIRSTSTART_PREV "DESKTOP_HID_FIRSTSTART_PREV"
+#define HID_FIRSTSTART_NEXT "DESKTOP_HID_FIRSTSTART_NEXT"
+#define HID_FIRSTSTART_CANCEL "DESKTOP_HID_FIRSTSTART_CANCEL"
+#define HID_FIRSTSTART_FINISH "DESKTOP_HID_FIRSTSTART_FINISH"
+#define UID_FIRSTSTART_HELP "DESKTOP_UID_FIRSTSTART_HELP"
+#define UID_BTN_LICENSE_ACCEPT "DESKTOP_UID_BTN_LICENSE_ACCEPT"
+#define HID_FIRSTSTART_UPDATE_CHECK "DESKTOP_HID_FIRSTSTART_UPDATE_CHECK"
+#define HID_DEPLOYMENT_GUI_UPDATE "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE"
+#define HID_DEPLOYMENT_GUI_UPDATEINSTALL "DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL"
+#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER"
+#define HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES"
+#define HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES"
-#define HID_PACKAGE_MANAGER (HID_DESKTOP_START + 0)
-#define HID_PACKAGE_MANAGER_TREELISTBOX (HID_DESKTOP_START + 1)
-#define HID_PACKAGE_MANAGER_PROGRESS (HID_DESKTOP_START + 2)
-#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL (HID_DESKTOP_START + 3)
-#define HID_PACKAGE_MANAGER_MENU_ITEM (HID_DESKTOP_START + 4)
+#define HID_EXTENSION_MANAGER_LISTBOX "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX"
+#define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS"
+#define HID_EXTENSION_MANAGER_LISTBOX_ENABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE"
+#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE"
+#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE"
-#define HID_FIRSTSTART_DIALOG (HID_DESKTOP_START + 5)
-#define HID_FIRSTSTART_WELCOME (HID_DESKTOP_START + 6)
-#define HID_FIRSTSTART_LICENSE (HID_DESKTOP_START + 7)
-#define HID_FIRSTSTART_MIGRATION (HID_DESKTOP_START + 8)
-#define HID_FIRSTSTART_REGISTRATION (HID_DESKTOP_START + 9)
-#define HID_FIRSTSTART_USER (HID_DESKTOP_START + 10)
-#define HID_FIRSTSTART_PREV (HID_DESKTOP_START + 11)
-#define HID_FIRSTSTART_NEXT (HID_DESKTOP_START + 12)
-#define HID_FIRSTSTART_CANCEL (HID_DESKTOP_START + 13)
-#define HID_FIRSTSTART_FINISH (HID_DESKTOP_START + 14)
-#define UID_FIRSTSTART_HELP (HID_DESKTOP_START + 15)
-#define UID_BTN_LICENSE_ACCEPT (HID_DESKTOP_START + 16)
-#define HID_FIRSTSTART_UPDATE_CHECK (HID_DESKTOP_START + 17)
-#define HID_DEPLOYMENT_GUI_UPDATE (HID_DESKTOP_START + 18)
-#define HID_DEPLOYMENT_GUI_UPDATEINSTALL (HID_DESKTOP_START + 19)
-#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER (HID_DESKTOP_START + 20)
-#define HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES (HID_DESKTOP_START + 21)
-#define HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES (HID_DESKTOP_START + 22)
+#define HID_EXTENSION_DEPENDENCIES "DESKTOP_HID_EXTENSION_DEPENDENCIES"
-#define HID_EXTENSION_MANAGER_LISTBOX (HID_DESKTOP_START + 23)
-#define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS (HID_DESKTOP_START + 24)
-#define HID_EXTENSION_MANAGER_LISTBOX_ENABLE (HID_DESKTOP_START + 25)
-#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE (HID_DESKTOP_START + 26)
-#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE (HID_DESKTOP_START + 27)
-
-#define HID_EXTENSION_DEPENDENCIES (HID_DESKTOP_START + 28)
-
-#define HID_PACKAGE_MANAGER_UPD_REQ (HID_DESKTOP_START + 29)
-
-#define ACT_DESKTOP_HID_END HID_PACKAGE_MANAGER_UPD_REQ
-
-// check bounds:
-#if ACT_DESKTOP_HID_END > HID_DESKTOP_END
-#error Resource overflow in #line, #file
-#endif
+#define HID_PACKAGE_MANAGER_UPD_REQ "DESKTOP_HID_PACKAGE_MANAGER_UPD_REQ"
#endif
diff --git a/desktop/source/migration/wizard.src b/desktop/source/migration/wizard.src
index ed6e8d486b..369ce4080b 100644
--- a/desktop/source/migration/wizard.src
+++ b/desktop/source/migration/wizard.src
@@ -188,6 +188,7 @@ TabPage TP_LICENSE
};
MultiLineEdit ML_LICENSE
{
+ HelpID = "desktop:MultiLineEdit:TP_LICENSE:ML_LICENSE";
PosSize = MAP_APPFONT (MARGINLEFT+INDENT, MARGINTOP + 8*ROWHEIGHT, BODYWIDTH-INDENT , BODYHEIGHT - 8*ROWHEIGHT - 20-2*MARGINBOTTOM) ;
Border = TRUE;
VScroll = TRUE;
@@ -195,6 +196,7 @@ TabPage TP_LICENSE
};
PushButton PB_LICENSE_DOWN
{
+ HelpID = "desktop:PushButton:TP_LICENSE:PB_LICENSE_DOWN";
TabStop = TRUE ;
Pos = MAP_APPFONT ( TP_WIDTH-MARGINRIGHT-50 , TP_HEIGHT-MARGINBOTTOM-18 ) ;
Size = MAP_APPFONT ( 50, 15 ) ;
@@ -240,6 +242,7 @@ TabPage TP_MIGRATION
CheckBox CB_MIGRATION
{
+ HelpID = "desktop:CheckBox:TP_MIGRATION:CB_MIGRATION";
Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*10);
Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT*2);
Check = TRUE;
@@ -275,6 +278,7 @@ TabPage TP_UPDATE_CHECK
CheckBox CB_UPDATE_CHECK
{
+ HelpID = "desktop:CheckBox:TP_UPDATE_CHECK:CB_UPDATE_CHECK";
Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*10);
Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT*2);
Check = TRUE;
@@ -321,6 +325,7 @@ TabPage TP_USER
};
Edit ED_USER_FIRST
{
+ HelpID = "desktop:Edit:TP_USER:ED_USER_FIRST";
Border = TRUE;
Pos = MAP_APPFONT(MARGINLEFT+USERINDENT, MARGINTOP+ROWHEIGHT*7);
Size = MAP_APPFONT(BODYWIDTH-USERINDENT, EDHEIGHT);
@@ -333,6 +338,7 @@ TabPage TP_USER
};
Edit ED_USER_LAST
{
+ HelpID = "desktop:Edit:TP_USER:ED_USER_LAST";
Border = TRUE;
Pos = MAP_APPFONT(MARGINLEFT+USERINDENT, MARGINTOP+ROWHEIGHT*9);
Size = MAP_APPFONT(BODYWIDTH-USERINDENT, EDHEIGHT);
@@ -345,6 +351,7 @@ TabPage TP_USER
};
Edit ED_USER_INITIALS
{
+ HelpID = "desktop:Edit:TP_USER:ED_USER_INITIALS";
Border = TRUE;
Pos = MAP_APPFONT(MARGINLEFT+USERINDENT, MARGINTOP+ROWHEIGHT*11);
Size = MAP_APPFONT(INITIALSWIDTH, EDHEIGHT);
@@ -359,6 +366,7 @@ TabPage TP_USER
};
Edit ED_USER_FATHER
{
+ HelpID = "desktop:Edit:TP_USER:ED_USER_FATHER";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT(MARGINLEFT+USERINDENT*2+INITIALSWIDTH+10, MARGINTOP+ROWHEIGHT*11);
@@ -391,6 +399,7 @@ TabPage TP_REGISTRATION
};
RadioButton RB_REGISTRATION_NOW
{
+ HelpID = "desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NOW";
Text [ en-US ] = "I want to register ~now";
Pos = MAP_APPFONT(MARGINLEFT+INDENT2, ROWHEIGHT*12+2);
Size = MAP_APPFONT(BODYWIDTH-INDENT2, RSC_CD_CHECKBOX_HEIGHT);
@@ -398,12 +407,14 @@ TabPage TP_REGISTRATION
};
RadioButton RB_REGISTRATION_LATER
{
+ HelpID = "desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_LATER";
Text [ en-US ] = "I want to register ~later";
Pos = MAP_APPFONT(MARGINLEFT+INDENT2, ROWHEIGHT*12+2+RB_HEIGHT);
Size = MAP_APPFONT(BODYWIDTH-INDENT2, RSC_CD_CHECKBOX_HEIGHT);
};
RadioButton RB_REGISTRATION_NEVER
{
+ HelpID = "desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NEVER";
Text [ en-US ] = "I do not want to ~register";
Pos = MAP_APPFONT(MARGINLEFT+INDENT2, ROWHEIGHT*12+2+RB_HEIGHT*2);
Size = MAP_APPFONT(BODYWIDTH-INDENT2, RSC_CD_CHECKBOX_HEIGHT);
diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc
index 32c109aad2..5eef98a021 100644
--- a/editeng/inc/helpid.hrc
+++ b/editeng/inc/helpid.hrc
@@ -30,52 +30,31 @@
#ifndef _EDITENG_HELPID_HRC
#define _EDITENG_HELPID_HRC
-// include ---------------------------------------------------------------
-
-#include <svl/solar.hrc>
-
-// Help-Ids --------------------------------------------------------------
-#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_EDIT_START)
-#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_EDIT_START + 1)
-#define HID_EDITENG_SPELLER_ADDWORD (HID_EDIT_START + 2)
-#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_EDIT_START + 3)
-#define HID_EDITENG_SPELLER_IGNORE (HID_EDIT_START + 4)
-#define HID_EDITENG_SPELLER_START (HID_EDIT_START + 5)
-#define HID_AUTOCORR_HELP_END (HID_EDIT_START + 6)
-#define HID_AUTOCORR_HELP_START (HID_EDIT_START + 7)
-#define HID_AUTOCORR_HELP_WORD HID_AUTOCORR_HELP_START
-
-#define HID_AUTOCORR_HELP_SENT (HID_AUTOCORR_HELP_START+1)
-#define HID_AUTOCORR_HELP_SENTWORD (HID_AUTOCORR_HELP_START+2)
-#define HID_AUTOCORR_HELP_ACORWORD (HID_AUTOCORR_HELP_START+3)
-
-#define HID_AUTOCORR_HELP_ACORSENTWORD (HID_AUTOCORR_HELP_START+5)
-
-#define HID_AUTOCORR_HELP_CHGTOENEMDASH (HID_AUTOCORR_HELP_START+7)
-#define HID_AUTOCORR_HELP_WORDENEMDASH (HID_AUTOCORR_HELP_START+8)
-#define HID_AUTOCORR_HELP_SENTENEMDASH (HID_AUTOCORR_HELP_START+9)
-#define HID_AUTOCORR_HELP_SENTWORDENEMDASH (HID_AUTOCORR_HELP_START+10)
-#define HID_AUTOCORR_HELP_ACORWORDENEMDASH (HID_AUTOCORR_HELP_START+11)
-
-#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH (HID_AUTOCORR_HELP_START+13)
-#define HID_AUTOCORR_HELP_CHGQUOTES (HID_AUTOCORR_HELP_START+15)
-#define HID_AUTOCORR_HELP_CHGSGLQUOTES (HID_AUTOCORR_HELP_START+16)
-#define HID_AUTOCORR_HELP_SETINETATTR (HID_AUTOCORR_HELP_START+17)
-#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE (HID_AUTOCORR_HELP_START+18)
-#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL (HID_AUTOCORR_HELP_START+19)
-#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL (HID_AUTOCORR_HELP_START+20)
-#define HID_AUTOCORR_HELP_CHGORDINALNUMBER (HID_AUTOCORR_HELP_START+21) // HID_EDIT_START + 28
-
-// please adjust ACT_SVX_HID_END2 below if you add entries here!
-
-// -----------------------------------------------------------------------
-// Overrun check ---------------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_SVX_HID_END (HID_EDIT_START+28)
-#if ACT_SVX_HID_END > HID_EDIT_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_EDITENG_SPELLER_WORDLANGUAGE "EDITENG_HID_EDITENG_SPELLER_WORDLANGUAGE"
+#define HID_EDITENG_SPELLER_PARALANGUAGE "EDITENG_HID_EDITENG_SPELLER_PARALANGUAGE"
+#define HID_EDITENG_SPELLER_ADDWORD "EDITENG_HID_EDITENG_SPELLER_ADDWORD"
+#define HID_EDITENG_SPELLER_AUTOCORRECT "EDITENG_HID_EDITENG_SPELLER_AUTOCORRECT"
+#define HID_EDITENG_SPELLER_IGNORE "EDITENG_HID_EDITENG_SPELLER_IGNORE"
+#define HID_EDITENG_SPELLER_START "EDITENG_HID_EDITENG_SPELLER_START"
+
+#define HID_AUTOCORR_HELP_WORD "EDITENG_HID_AUTOCORR_HELP_START"
+#define HID_AUTOCORR_HELP_SENT "EDITENG_HID_AUTOCORR_HELP_SENT"
+#define HID_AUTOCORR_HELP_SENTWORD "EDITENG_HID_AUTOCORR_HELP_SENTWORD"
+#define HID_AUTOCORR_HELP_ACORWORD "EDITENG_HID_AUTOCORR_HELP_ACORWORD"
+#define HID_AUTOCORR_HELP_ACORSENTWORD "EDITENG_HID_AUTOCORR_HELP_ACORSENTWORD"
+#define HID_AUTOCORR_HELP_CHGTOENEMDASH "EDITENG_HID_AUTOCORR_HELP_CHGTOENEMDASH"
+#define HID_AUTOCORR_HELP_WORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_WORDENEMDASH"
+#define HID_AUTOCORR_HELP_SENTENEMDASH "EDITENG_HID_AUTOCORR_HELP_SENTENEMDASH"
+#define HID_AUTOCORR_HELP_SENTWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_SENTWORDENEMDASH"
+#define HID_AUTOCORR_HELP_ACORWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_ACORWORDENEMDASH"
+#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH"
+#define HID_AUTOCORR_HELP_CHGQUOTES "EDITENG_HID_AUTOCORR_HELP_CHGQUOTES"
+#define HID_AUTOCORR_HELP_CHGSGLQUOTES "EDITENG_HID_AUTOCORR_HELP_CHGSGLQUOTES"
+#define HID_AUTOCORR_HELP_SETINETATTR "EDITENG_HID_AUTOCORR_HELP_SETINETATTR"
+#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE "EDITENG_HID_AUTOCORR_HELP_INGNOREDOUBLESPACE"
+#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL "EDITENG_HID_AUTOCORR_HELP_CHGWEIGHTUNDERL"
+#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL "EDITENG_HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL"
+#define HID_AUTOCORR_HELP_CHGORDINALNUMBER "EDITENG_HID_AUTOCORR_HELP_CHGORDINALNUMBER"
#endif
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index d82ecc6cb6..9d432f73a7 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -739,7 +739,6 @@
#include "svtools/parhtml.hxx"
#include "svtools/parrtf.hxx"
#include "unotools/pathoptions.hxx"
-#include "svl/pickerhelper.hxx"
#include "svl/poolitem.hxx"
#include "unotools/printwarningoptions.hxx"
#include "svl/ptitem.hxx"
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 8eea009a4e..c083f02fab 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1387,6 +1387,32 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
if( nRet )
{
+ const char* aHelpIds[] =
+ {
+ HID_AUTOCORR_HELP_WORD,
+ HID_AUTOCORR_HELP_SENT,
+ HID_AUTOCORR_HELP_SENTWORD,
+ HID_AUTOCORR_HELP_ACORWORD,
+ "",
+ HID_AUTOCORR_HELP_ACORSENTWORD,
+ "",
+ HID_AUTOCORR_HELP_CHGTOENEMDASH,
+ HID_AUTOCORR_HELP_WORDENEMDASH,
+ HID_AUTOCORR_HELP_SENTENEMDASH,
+ HID_AUTOCORR_HELP_SENTWORDENEMDASH,
+ HID_AUTOCORR_HELP_ACORWORDENEMDASH,
+ "",
+ HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH,
+ "",
+ HID_AUTOCORR_HELP_CHGQUOTES,
+ HID_AUTOCORR_HELP_CHGSGLQUOTES,
+ HID_AUTOCORR_HELP_SETINETATTR,
+ HID_AUTOCORR_HELP_INGNOREDOUBLESPACE,
+ HID_AUTOCORR_HELP_CHGWEIGHTUNDERL,
+ HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL,
+ HID_AUTOCORR_HELP_CHGORDINALNUMBER
+ };
+
ULONG nHelpId = 0;
if( nRet & ( Autocorrect|CptlSttSntnc|CptlSttWrd|ChgToEnEmDash ) )
{
@@ -1413,8 +1439,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
if( nHelpId )
{
- nHelpId += HID_AUTOCORR_HELP_START - 1;
- Application::GetHelp()->OpenHelpAgent( nHelpId );
+ nHelpId -= 1;
+ Application::GetHelp()->OpenHelpAgent( aHelpIds[nHelpId] );
}
}
diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx
index c0579f1ac7..9ecdff4263 100644
--- a/formula/inc/formula/IFunctionDescription.hxx
+++ b/formula/inc/formula/IFunctionDescription.hxx
@@ -92,7 +92,7 @@ namespace formula
virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const = 0;
virtual void initArgumentInfo() const = 0;
virtual ::rtl::OUString getSignature() const = 0;
- virtual long getHelpId() const = 0;
+ virtual rtl::OString getHelpId() const = 0;
// parameter
virtual sal_uInt32 getParameterCount() const = 0;
diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx
index 0ae141cc30..e9d9f06b37 100644
--- a/formula/inc/formula/formdata.hxx
+++ b/formula/inc/formula/formdata.hxx
@@ -53,7 +53,7 @@ public:
inline USHORT GetEdFocus() const { return nEdFocus; }
inline const String& GetUndoStr() const { return aUndoStr; }
inline BOOL GetMatrixFlag()const{ return bMatrix;}
- inline ULONG GetUniqueId()const { return nUniqueId;}
+ inline rtl::OString GetUniqueId()const { return aUniqueId;}
inline const Selection& GetSelection()const { return aSelection;}
inline void SetMode( USHORT nNew ) { nMode = nNew; }
@@ -64,7 +64,7 @@ public:
inline void SetEdFocus( USHORT nNew ) { nEdFocus = nNew; }
inline void SetUndoStr( const String& rNew ) { aUndoStr = rNew; }
inline void SetMatrixFlag(BOOL bNew) { bMatrix=bNew;}
- inline void SetUniqueId(ULONG nNew) { nUniqueId=nNew;}
+ inline void SetUniqueId(const rtl::OString nNew) { aUniqueId=nNew;}
inline void SetSelection(const Selection& aSel) { aSelection=aSel;}
protected:
void Reset();
@@ -81,7 +81,7 @@ private:
USHORT nEdFocus;
String aUndoStr;
BOOL bMatrix;
- ULONG nUniqueId;
+ rtl::OString aUniqueId;
Selection aSelection;
};
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 812c6631d3..2f59807a34 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -80,8 +80,8 @@ protected:
::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputDoneAfter( BOOL bForced = FALSE );
- ULONG FindFocusWin(Window *pWin);
- void SetFocusWin(Window *pWin,ULONG nUniqueId);
+ rtl::OString FindFocusWin(Window *pWin);
+ void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
void HighlightFunctionParas(const String& aFormula);
void SetMeText(const String& _sText);
@@ -129,8 +129,8 @@ protected:
::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputDoneAfter( BOOL bForced = FALSE );
- ULONG FindFocusWin(Window *pWin);
- void SetFocusWin(Window *pWin,ULONG nUniqueId);
+ rtl::OString FindFocusWin(Window *pWin);
+ void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
void HighlightFunctionParas(const String& aFormula);
void SetMeText(const String& _sText);
diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc
index dfd7403f8d..c2f6903517 100644
--- a/formula/inc/helpids.hrc
+++ b/formula/inc/helpids.hrc
@@ -27,36 +27,26 @@
#ifndef FORMULA_HELPID_HRC
#define FORMULA_HELPID_HRC
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc> // HID_FORMULA_START
-#endif
-
-#define HID_FORMULADLG_FORMULA (HID_FORMULA_START + 0)
-#define HID_FORMULA_FAP_FORMULA (HID_FORMULA_START + 1)
-#define HID_FORMULA_FAP_STRUCT (HID_FORMULA_START + 2)
-#define HID_FORMULA_FAP_PAGE (HID_FORMULA_START + 3)
-#define HID_FORMULA_FAP_EDIT1 (HID_FORMULA_START + 4)
-#define HID_FORMULA_FAP_EDIT2 (HID_FORMULA_START + 5)
-#define HID_FORMULA_FAP_EDIT3 (HID_FORMULA_START + 6)
-#define HID_FORMULA_FAP_EDIT4 (HID_FORMULA_START + 7)
-#define HID_FORMULA_FAP_BTN_FX1 (HID_FORMULA_START + 8)
-#define HID_FORMULA_FAP_BTN_FX2 (HID_FORMULA_START + 9)
-#define HID_FORMULA_FAP_BTN_FX3 (HID_FORMULA_START +10)
-#define HID_FORMULA_FAP_BTN_FX4 (HID_FORMULA_START +11)
-#define HID_FORMULA_FAP_BTN_REF1 (HID_FORMULA_START +12)
-#define HID_FORMULA_FAP_BTN_REF2 (HID_FORMULA_START +13)
-#define HID_FORMULA_FAP_BTN_REF3 (HID_FORMULA_START +14)
-#define HID_FORMULA_FAP_BTN_REF4 (HID_FORMULA_START +15)
-#define HID_FORMULA_LB_CATEGORY (HID_FORMULA_START +16)
-#define HID_FORMULA_LB_FUNCTION (HID_FORMULA_START +17)
-#define HID_FORMULATAB_FUNCTION (HID_FORMULA_START +18)
-#define HID_FORMULATAB_STRUCT (HID_FORMULA_START +19)
-
-
-#if HID_FORMULATAB_STRUCT > HID_FORMULA_END
-#error Help-Id Ueberlauf in #file, #line
-#endif
-// don't forget to update the file util/hidother.src
+#define HID_FORMULADLG_FORMULA "FORMULA_HID_FORMULADLG_FORMULA"
+#define HID_FORMULA_FAP_FORMULA "FORMULA_HID_FORMULA_FAP_FORMULA"
+#define HID_FORMULA_FAP_STRUCT "FORMULA_HID_FORMULA_FAP_STRUCT"
+#define HID_FORMULA_FAP_PAGE "FORMULA_HID_FORMULA_FAP_PAGE"
+#define HID_FORMULA_FAP_EDIT1 "FORMULA_HID_FORMULA_FAP_EDIT1"
+#define HID_FORMULA_FAP_EDIT2 "FORMULA_HID_FORMULA_FAP_EDIT2"
+#define HID_FORMULA_FAP_EDIT3 "FORMULA_HID_FORMULA_FAP_EDIT3"
+#define HID_FORMULA_FAP_EDIT4 "FORMULA_HID_FORMULA_FAP_EDIT4"
+#define HID_FORMULA_FAP_BTN_FX1 "FORMULA_HID_FORMULA_FAP_BTN_FX1"
+#define HID_FORMULA_FAP_BTN_FX2 "FORMULA_HID_FORMULA_FAP_BTN_FX2"
+#define HID_FORMULA_FAP_BTN_FX3 "FORMULA_HID_FORMULA_FAP_BTN_FX3"
+#define HID_FORMULA_FAP_BTN_FX4 "FORMULA_HID_FORMULA_FAP_BTN_FX4"
+#define HID_FORMULA_FAP_BTN_REF1 "FORMULA_HID_FORMULA_FAP_BTN_REF1"
+#define HID_FORMULA_FAP_BTN_REF2 "FORMULA_HID_FORMULA_FAP_BTN_REF2"
+#define HID_FORMULA_FAP_BTN_REF3 "FORMULA_HID_FORMULA_FAP_BTN_REF3"
+#define HID_FORMULA_FAP_BTN_REF4 "FORMULA_HID_FORMULA_FAP_BTN_REF4"
+#define HID_FORMULA_LB_CATEGORY "FORMULA_HID_FORMULA_LB_CATEGORY"
+#define HID_FORMULA_LB_FUNCTION "FORMULA_HID_FORMULA_LB_FUNCTION"
+#define HID_FORMULATAB_FUNCTION "FORMULA_HID_FORMULATAB_FUNCTION"
+#define HID_FORMULATAB_STRUCT "FORMULA_HID_FORMULATAB_STRUCT"
#endif //FORMULA_HELPID_HRC
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 89d3508bc1..5f5f2b8623 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -50,7 +50,7 @@ namespace formula
virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& ) const {}
virtual void initArgumentInfo() const {}
virtual ::rtl::OUString getSignature() const { return ::rtl::OUString(); }
- virtual long getHelpId() const { return 0; }
+ virtual rtl::OString getHelpId() const { return ""; }
virtual sal_uInt32 getParameterCount() const { return 0; }
virtual ::rtl::OUString getParameterName(sal_uInt32 ) const { return ::rtl::OUString(); }
virtual ::rtl::OUString getParameterDescription(sal_uInt32 ) const { return ::rtl::OUString(); }
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 8ea9545c09..40a87e3b23 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -163,6 +163,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
Moveable = TRUE ;
TabControl TC_FUNCTION
{
+ HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA_MODAL:TC_FUNCTION";
Pos = MAP_APPFONT ( 6 , 5 ) ;
Size = MAP_APPFONT ( 102 , 199 ) ;
PageList =
@@ -249,6 +250,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
};
CheckBox BTN_MATRIX
{
+ HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA_MODAL:BTN_MATRIX";
Pos = MAP_APPFONT ( 6 , 208 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
TabStop = TRUE ;
@@ -256,12 +258,14 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
};
Edit ED_REF
{
+ HelpID = "formula:Edit:RID_FORMULADLG_FORMULA_MODAL:ED_REF";
Border = TRUE ;
Pos = MAP_APPFONT ( 76 , 205 ) ;
Size = MAP_APPFONT ( 66 , 12 ) ;
};
ImageButton RB_REF
{
+ HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA_MODAL:RB_REF";
Pos = MAP_APPFONT ( 144 , 205 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
@@ -281,6 +285,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
};
PushButton BTN_BACKWARD
{
+ HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_BACKWARD";
Pos = MAP_APPFONT ( 171 , 208 ) ;
Size = MAP_APPFONT ( 45 , 14 ) ;
TabStop = TRUE ;
@@ -288,6 +293,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
};
PushButton BTN_FORWARD
{
+ HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_FORWARD";
Pos = MAP_APPFONT ( 219 , 208 ) ;
Size = MAP_APPFONT ( 45 , 14 ) ;
TabStop = TRUE ;
@@ -324,6 +330,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
Moveable = TRUE ;
TabControl TC_FUNCTION
{
+ HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA:TC_FUNCTION";
Pos = MAP_APPFONT ( 6 , 5 ) ;
Size = MAP_APPFONT ( 102 , 199 ) ;
PageList =
@@ -410,6 +417,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
};
CheckBox BTN_MATRIX
{
+ HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA:BTN_MATRIX";
Pos = MAP_APPFONT ( 6 , 208 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
TabStop = TRUE ;
@@ -417,12 +425,14 @@ ModelessDialog RID_FORMULADLG_FORMULA
};
Edit ED_REF
{
+ HelpID = "formula:Edit:RID_FORMULADLG_FORMULA:ED_REF";
Border = TRUE ;
Pos = MAP_APPFONT ( 76 , 205 ) ;
Size = MAP_APPFONT ( 66 , 12 ) ;
};
ImageButton RB_REF
{
+ HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA:RB_REF";
Pos = MAP_APPFONT ( 144 , 205 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = FALSE ;
@@ -442,6 +452,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
};
PushButton BTN_BACKWARD
{
+ HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_BACKWARD";
Pos = MAP_APPFONT ( 171 , 208 ) ;
Size = MAP_APPFONT ( 45 , 14 ) ;
TabStop = TRUE ;
@@ -449,6 +460,7 @@ ModelessDialog RID_FORMULADLG_FORMULA
};
PushButton BTN_FORWARD
{
+ HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_FORWARD";
Pos = MAP_APPFONT ( 219 , 208 ) ;
Size = MAP_APPFONT ( 45 , 14 ) ;
TabStop = TRUE ;
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index caa22cd3c0..eaca92a81d 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -143,7 +143,7 @@ namespace formula
void PreNotify( NotifyEvent& rNEvt );
RefEdit* GetCurrRefEdit();
- ULONG FindFocusWin(Window *pWin);
+ rtl::OString FindFocusWin(Window *pWin);
const FormulaHelper& GetFormulaHelper() const;
uno::Reference< sheet::XFormulaOpCodeMapper > GetFormulaOpCodeMapper() const;
@@ -226,11 +226,11 @@ namespace formula
FormulaHelper
m_aFormulaHelper;
- SmartId m_aSmartEditHelpId;
+ rtl::OString m_aEditHelpId;
- ULONG nOldHelp;
- ULONG nOldUnique;
- ULONG nActivWinId;
+ rtl::OString aOldHelp;
+ rtl::OString aOldUnique;
+ rtl::OString aActivWinId;
BOOL bIsShutDown;
@@ -300,7 +300,6 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
aTxtOk ( aBtnEnd.GetText() ),
m_aFormulaHelper(_pFunctionMgr),
//
- nActivWinId (0),
bIsShutDown (FALSE),
nEdFocus (0),
pFuncDesc (NULL),
@@ -314,8 +313,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
aRefBtn.Hide();
pMEdit = aMEFormula.GetEdit();
- m_aSmartEditHelpId = pMEdit->GetSmartHelpId();
- pMEdit->SetSmartUniqueId(m_aSmartEditHelpId);
+ m_aEditHelpId = pMEdit->GetHelpId();
+ pMEdit->SetUniqueId( m_aEditHelpId );
bEditFlag=FALSE;
bStructUpdate=TRUE;
@@ -331,8 +330,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage);
aTabCtrl.SetTabPage( TP_STRUCT, pStructPage);
- nOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1"
- nOldUnique = pParent->GetUniqueId();
+ aOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1"
+ aOldUnique = pParent->GetUniqueId();
aFtResult.Show( _bSupportResult );
aWndResult.Show( _bSupportResult );
@@ -408,27 +407,27 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
Window* pWin=rNEvt.GetWindow();
if(pWin!=NULL)
{
- nActivWinId = pWin->GetUniqueId();
- if(nActivWinId==0)
+ aActivWinId = pWin->GetUniqueId();
+ if(aActivWinId.getLength()==0)
{
Window* pParent=pWin->GetParent();
while(pParent!=NULL)
{
- nActivWinId=pParent->GetUniqueId();
+ aActivWinId=pParent->GetUniqueId();
- if(nActivWinId!=0) break;
+ if(aActivWinId.getLength()!=0) break;
pParent=pParent->GetParent();
}
}
- if(nActivWinId!=0)
+ if(aActivWinId.getLength())
{
FormEditData* pData = m_pHelper->getFormEditData();
if (pData && !aTimer.IsActive()) // wird nicht ueber Close zerstoert;
{
- pData->SetUniqueId(nActivWinId);
+ pData->SetUniqueId(aActivWinId);
}
}
}
@@ -825,8 +824,8 @@ void FormulaDlg_Impl::FillListboxes()
aNewTitle = aTitle1;
// HelpId fuer 1. Seite ist die aus der Resource
- m_pParent->SetHelpId( nOldHelp );
- m_pParent->SetUniqueId( nOldUnique );
+ m_pParent->SetHelpId( aOldHelp );
+ m_pParent->SetUniqueId( aOldUnique );
}
// -----------------------------------------------------------------------------
void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
@@ -862,9 +861,9 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
aFtEditName.SetText( pFuncDesc->getFunctionName() );
aFtEditName.Show();
pParaWin->Show();
- const long nHelpId = pFuncDesc->getHelpId();
- if ( nHelpId )
- pMEdit->SetSmartHelpId(SmartId(nHelpId));
+ const rtl::OString aHelpId = pFuncDesc->getHelpId();
+ if ( aHelpId.getLength() )
+ pMEdit->SetHelpId(aHelpId);
}
xub_StrLen nOldStart, nOldEnd;
@@ -920,7 +919,7 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev)
else
{
aFtEditName.SetText(String());
- pMEdit->SetSmartHelpId(m_aSmartEditHelpId);
+ pMEdit->SetHelpId( m_aEditHelpId );
}
// Test, ob vorne/hinten noch mehr Funktionen sind
@@ -1790,20 +1789,20 @@ BOOL FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
}
return pTheRefEdit == NULL;
}
-ULONG FormulaDlg_Impl::FindFocusWin(Window *pWin)
+rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin)
{
- ULONG nUniqueId=0;
+ rtl::OString aUniqueId;
if(pWin->HasFocus())
{
- nUniqueId=pWin->GetUniqueId();
- if(nUniqueId==0)
+ aUniqueId=pWin->GetUniqueId();
+ if(aUniqueId.getLength()==0)
{
Window* pParent=pWin->GetParent();
while(pParent!=NULL)
{
- nUniqueId=pParent->GetUniqueId();
+ aUniqueId=pParent->GetUniqueId();
- if(nUniqueId!=0) break;
+ if(aUniqueId.getLength()!=0) break;
pParent=pParent->GetParent();
}
@@ -1816,11 +1815,11 @@ ULONG FormulaDlg_Impl::FindFocusWin(Window *pWin)
for(USHORT i=0;i<nCount;i++)
{
Window* pChild=pWin->GetChild(i);
- nUniqueId=FindFocusWin(pChild);
- if(nUniqueId>0) break;
+ aUniqueId=FindFocusWin(pChild);
+ if(aUniqueId.getLength()>0) break;
}
}
- return nUniqueId;
+ return aUniqueId;
}
void FormulaDlg_Impl::SetEdSelection()
@@ -1925,12 +1924,12 @@ void FormulaModalDialog::RefInputDoneAfter( BOOL bForced )
m_pImpl->RefInputDoneAfter( bForced );
}
-ULONG FormulaModalDialog::FindFocusWin(Window *pWin)
+rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin)
{
return m_pImpl->FindFocusWin( pWin );
}
-void FormulaModalDialog::SetFocusWin(Window *pWin,ULONG nUniqueId)
+void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
{
if(pWin->GetUniqueId()==nUniqueId)
{
@@ -2007,7 +2006,7 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
,_pHelper,_pFunctionMgr,_pDlg))
{
FreeResource();
- if(GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId
+ if(!GetHelpId().getLength()) //Hack, da im SfxModelessDialog die HelpId
SetHelpId(GetUniqueId()); //fuer einen ModelessDialog entfernt und
//in eine UniqueId gewandelt wird, machen
//wir das an dieser Stelle rueckgaengig.
@@ -2080,12 +2079,12 @@ void FormulaDlg::RefInputDoneAfter( BOOL bForced )
m_pImpl->RefInputDoneAfter( bForced );
}
-ULONG FormulaDlg::FindFocusWin(Window *pWin)
+rtl::OString FormulaDlg::FindFocusWin(Window *pWin)
{
return m_pImpl->FindFocusWin( pWin );
}
-void FormulaDlg::SetFocusWin(Window *pWin,ULONG nUniqueId)
+void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
{
if(pWin->GetUniqueId()==nUniqueId)
{
@@ -2156,7 +2155,7 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG )
if (pData) // wird nicht ueber Close zerstoert;
{
m_pImpl->m_pHelper->setReferenceInput(pData);
- ULONG nUniqueId=pData->GetUniqueId();
+ rtl::OString nUniqueId(pData->GetUniqueId());
SetFocusWin(this,nUniqueId);
}
return 0;
@@ -2182,7 +2181,7 @@ void FormEditData::Reset()
nOffset = 0;
nEdFocus = 0;
bMatrix =FALSE;
- nUniqueId=0;
+ aUniqueId=rtl::OString();
aSelection.Min()=0;
aSelection.Max()=0;
aUndoStr.Erase();
@@ -2211,7 +2210,7 @@ const FormEditData& FormEditData::operator=( const FormEditData& r )
nEdFocus = r.nEdFocus;
aUndoStr = r.aUndoStr;
bMatrix = r.bMatrix ;
- nUniqueId = r.nUniqueId;
+ aUniqueId = r.aUniqueId;
aSelection = r.aSelection;
return *this;
}
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 1da4aef269..cd06ea99ce 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -102,8 +102,8 @@ FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager):
m_pFunctionManager(_pFunctionManager)
{
FreeResource();
- m_aSmartHelpId = aLbFunction.GetSmartHelpId();
- aLbFunction.SetSmartUniqueId(m_aSmartHelpId);
+ m_aHelpId = aLbFunction.GetHelpId();
+ aLbFunction.SetUniqueId(m_aHelpId);
InitLRUList();
@@ -190,15 +190,15 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb )
const IFunctionDescription* pDesc = GetFuncDesc( GetFunction() );
if ( pDesc )
{
- const long nHelpId = pDesc->getHelpId();
- if ( nHelpId )
- aLbFunction.SetSmartHelpId(SmartId(nHelpId));
+ const rtl::OString sHelpId = pDesc->getHelpId();
+ if ( sHelpId.getLength() )
+ aLbFunction.SetHelpId(sHelpId);
}
aSelectionLink.Call(this);
}
else
{
- aLbFunction.SetSmartHelpId(m_aSmartHelpId);
+ aLbFunction.SetHelpId(m_aHelpId);
UpdateFunctionList();
}
return 0;
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 77b32f495c..51e3609351 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -82,7 +82,7 @@ private:
m_pFunctionManager;
::std::vector< TFunctionDesc > aLRUList;
- SmartId m_aSmartHelpId;
+ rtl::OString m_aHelpId;
void impl_addFunctions(const IFunctionCategory* _pCategory);
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 6298e94c4b..d41a051e47 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -758,8 +758,8 @@ EditBox::EditBox( Window* pParent, const ResId& rResId )
// #105582# the HelpId from the resource must be set for the MultiLineEdit,
// not for the control that contains it.
- pMEdit->SetSmartHelpId( GetSmartHelpId() );
- SetSmartHelpId( SmartId() );
+ pMEdit->SetHelpId( GetHelpId() );
+ SetHelpId( "" );
}
EditBox::~EditBox()
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 0de42f971e..adb3681345 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -294,15 +294,15 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc)
{
SetEditDesc(aDefaultString);
}
- long nHelpId = pFuncDesc->getHelpId();
nArgs = pFuncDesc->getSuppressedArgumentCount();
pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping);
aSlider.Hide();
- SetHelpId( nHelpId );
- aEdArg1.SetHelpId( nHelpId );
- aEdArg2.SetHelpId( nHelpId );
- aEdArg3.SetHelpId( nHelpId );
- aEdArg4.SetHelpId( nHelpId );
+ rtl::OString sHelpId = pFuncDesc->getHelpId();
+ SetHelpId( sHelpId );
+ aEdArg1.SetHelpId( sHelpId );
+ aEdArg2.SetHelpId( sHelpId );
+ aEdArg3.SetHelpId( sHelpId );
+ aEdArg4.SetHelpId( sHelpId );
// Unique-IDs muessen gleich bleiben fuer Automatisierung
SetUniqueId( HID_FORMULA_FAP_PAGE );
diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src
index 78be77040b..eec5237ced 100644
--- a/formula/source/ui/dlg/parawin.src
+++ b/formula/source/ui/dlg/parawin.src
@@ -68,6 +68,7 @@
TabPage RID_FORMULATAB_PARAMETER
{
+ HelpID = "formula:TabPage:RID_FORMULATAB_PARAMETER";
Border = FALSE;
Size = MAP_APPFONT( 203, 128 );
DialogControl = TRUE;
@@ -119,10 +120,18 @@ TabPage RID_FORMULATAB_PARAMETER
HelpId=HID_FORMULA_FAP_BTN_FX4;
FXBUTTONBLOCK ( 109 )
};
- Edit ED_ARG1 { ED_ARGBLOCK ( 64 ) };
- Edit ED_ARG2 { ED_ARGBLOCK ( 79 ) };
- Edit ED_ARG3 { ED_ARGBLOCK ( 94 ) };
- Edit ED_ARG4 { ED_ARGBLOCK ( 109 ) };
+ Edit ED_ARG1 { ED_ARGBLOCK ( 64 )
+ HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG1";
+ };
+ Edit ED_ARG2 { ED_ARGBLOCK ( 79 )
+ HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG2";
+ };
+ Edit ED_ARG3 { ED_ARGBLOCK ( 94 )
+ HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG3";
+ };
+ Edit ED_ARG4 { ED_ARGBLOCK ( 109 )
+ HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG4";
+ };
ImageButton RB_ARG1
{
diff --git a/formula/util/hidother.src b/formula/util/hidother.src
index 8f56afa1cd..a6d3111b5b 100644
--- a/formula/util/hidother.src
+++ b/formula/util/hidother.src
@@ -27,10 +27,6 @@
#include "../inc/helpids.hrc"
-#ifndef _SBASLTID_HRC
-#include <svx/svxids.hrc>
-#endif
-
hidspecial HID_FORMULADLG_FORMULA { HelpId = HID_FORMULADLG_FORMULA; };
hidspecial HID_FORMULA_FAP_FORMULA { HelpId = HID_FORMULA_FAP_FORMULA; };
hidspecial HID_FORMULA_FAP_STRUCT { HelpId = HID_FORMULA_FAP_STRUCT; };
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 8f48eddc28..a7f9aeebf8 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -33,9 +33,8 @@
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ControlActions.hpp>
#include <vcl/lstbox.hxx>
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HPP_
#include <com/sun/star/uno/Sequence.hxx>
-#endif
+#include <tools/urlobj.hxx>
#include <algorithm>
#include <functional>
@@ -201,37 +200,36 @@ namespace svt
}
//---------------------------------------------------------------------
- void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& _rURL, sal_Bool _bFileView )
+ void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& sHelpURL, sal_Bool _bFileView )
{
- String sHelpURL( _rURL );
- if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) )
- {
- String sID = sHelpURL.Copy( sizeof( "HID:" ) - 1 );
- sal_Int32 nHelpId = sID.ToInt32();
+ rtl::OUString sHelpID( sHelpURL );
+ INetURLObject aHID( sHelpURL );
+ if ( aHID.GetProtocol() == INET_PROT_HID )
+ sHelpID = aHID.GetURLPath();
- if ( _bFileView )
- // the file view "overloaded" the SetHelpId
- static_cast< SvtFileView* >( _pControl )->SetHelpId( nHelpId );
- else
- _pControl->SetHelpId( nHelpId );
- }
+ // URLs should always be UTF8 encoded and escaped
+ rtl::OString sID( rtl::OUStringToOString( sHelpID, RTL_TEXTENCODING_UTF8 ) );
+ if ( _bFileView )
+ // the file view "overloaded" the SetHelpId
+ static_cast< SvtFileView* >( _pControl )->SetHelpId( sID );
else
- {
- DBG_ERRORFILE( "OControlAccess::setHelpURL: unsupported help URL type!" );
- }
+ _pControl->SetHelpId( sID );
}
//---------------------------------------------------------------------
::rtl::OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView )
{
- sal_Int32 nHelpId = _pControl->GetHelpId();
+ rtl::OString aHelpId = _pControl->GetHelpId();
if ( _bFileView )
// the file view "overloaded" the SetHelpId
- nHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
-
- ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
- sHelpURL += ::rtl::OUString::valueOf( (sal_Int32)nHelpId );
-
+ aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
+
+ ::rtl::OUString sHelpURL;
+ ::rtl::OUString aTmp( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) );
+ INetURLObject aHID( aTmp );
+ if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
+ sHelpURL = rtl::OUString::createFromAscii( INET_HID_SCHEME );
+ sHelpURL += aTmp;
return sHelpURL;
}
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index f28cb90925..ac0b4944be 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -28,9 +28,8 @@
#ifndef _SVTOOLS_IODLGIMPL_HRC
#define _SVTOOLS_IODLGIMPL_HRC
-#ifndef _SVTOOLS_HRC
#include "svtools/svtools.hrc"
-#endif
+#include "svtools/helpid.hrc"
// ModalDialog DLG_SVT_EXPLORERFILE
@@ -86,22 +85,5 @@
#define SID_SFX_START 5000
#define SID_OPENURL (SID_SFX_START + 596)
-#define HID_FILEDLG_STANDARD (HID_SFX_START + 27)
-#define HID_FILEDLG_MANAGER (HID_SFX_START + 28)
-#define HID_FILEDLG_URL (HID_SFX_START + 29)
-#define HID_FILEDLG_USE_PASSWD (HID_SFX_START + 31)
-#define HID_FILEDLG_READ_ONLY (HID_SFX_START + 32)
-
-#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218)
-#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219)
-#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220)
-#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221)
-#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222)
-#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223)
-#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224)
-#define HID_FILEDLG_FOLDER_BTN (HID_SFX_START + 225)
-#define HID_FILEDLG_FOLDER_FILENAME (HID_SFX_START + 226)
-#define HID_FILEDLG_SRCHFOLDER_BTN (HID_SFX_START + 227)
-
#endif
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 4ddb6bb8e8..f8d82758ad 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -79,12 +79,14 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
ImageButton BTN_EXPLORERFILE_NEWFOLDER
{
+ HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER";
TabStop = FALSE ;
Pos = MAP_APPFONT ( 59 , 6 ) ;
QuickHelpText [ en-US ] = "Create New Directory" ;
};
ImageButton BTN_EXPLORERFILE_LISTVIEW
{
+ HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_LISTVIEW";
TabStop = FALSE ;
Pos = MAP_APPFONT ( 109 , 6 ) ;
ButtonImage = Image
@@ -99,6 +101,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
ImageButton BTN_EXPLORERFILE_DETAILSVIEW
{
+ HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_DETAILSVIEW";
TabStop = FALSE ;
Pos = MAP_APPFONT ( 109 , 6 ) ;
ButtonImage = Image
@@ -113,6 +116,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
MenuButton BTN_EXPLORERFILE_UP
{
+ HelpID = "fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP";
TabStop = FALSE ;
Pos = MAP_APPFONT ( 109 , 6 ) ;
QuickHelpText [ en-US ] = "Up One Level" ;
@@ -120,6 +124,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
MenuButton BTN_EXPLORERFILE_STANDARD
{
+ HelpID = "fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD";
TabStop = FALSE ;
Pos = MAP_APPFONT ( 59 , 6 ) ;
QuickHelpText [ en-US ] = "Default Directory" ;
@@ -139,6 +144,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
Edit ED_EXPLORERFILE_FILENAME
{
+ HelpID = "fpicker:Edit:DLG_SVT_EXPLORERFILE:ED_EXPLORERFILE_FILENAME";
Pos = MAP_APPFONT ( 59 , 117 ) ;
Size = MAP_APPFONT ( 159 , 12 ) ;
Border = TRUE ;
@@ -152,6 +158,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
ListBox LB_EXPLORERFILE_SHARED_LISTBOX
{
+ HelpID = "fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_SHARED_LISTBOX";
Pos = MAP_APPFONT ( 59 , 132 ) ;
Size = MAP_APPFONT ( 159 , 40 ) ;
DropDown = TRUE ;
@@ -166,6 +173,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
ListBox LB_EXPLORERFILE_FILETYPE
{
+ HelpID = "fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE";
Pos = MAP_APPFONT ( 59 , 147 ) ;
Size = MAP_APPFONT ( 159 , 80 ) ;
DropDown = TRUE ;
@@ -175,26 +183,31 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
CheckBox CB_EXPLORERFILE_READONLY
{
+ HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_READONLY";
Size = MAP_APPFONT ( 80 , 10 ) ;
Text [ en-US ] = "~Read-only" ;
};
CheckBox CB_EXPLORERFILE_PASSWORD
{
+ HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_PASSWORD";
Size = MAP_APPFONT ( 100, 10 ) ;
Text [ en-US ] = "Save with password" ;
};
CheckBox CB_AUTO_EXTENSION
{
+ HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_AUTO_EXTENSION";
Size = MAP_APPFONT ( 160 , 10 ) ;
Text [ en-US ] = "~Automatic file name extension" ;
};
CheckBox CB_OPTIONS
{
+ HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_OPTIONS";
Size = MAP_APPFONT ( 120 , 10 ) ;
Text [ en-US ] = "Edit ~filter settings";
};
PushButton BTN_EXPLORERFILE_OPEN
{
+ HelpID = "fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN";
Pos = MAP_APPFONT ( 224 , 117 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
DefButton = TRUE ;
@@ -243,6 +256,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
// QueryFolderNameDialog ----------------------------------------------------------
ModalDialog DLG_SVT_QUERYFOLDERNAME
{
+ HelpID = "fpicker:ModalDialog:DLG_SVT_QUERYFOLDERNAME";
Border = TRUE ;
Moveable = TRUE ;
OutputSize = TRUE ;
@@ -257,6 +271,7 @@ ModalDialog DLG_SVT_QUERYFOLDERNAME
};
Edit ED_SVT_QUERYFOLDERNAME_DLG_NAME
{
+ HelpID = "fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_NAME";
Pos = MAP_APPFONT ( 12 , 27 ) ;
Size = MAP_APPFONT ( 138 , 12 ) ;
Border = TRUE ;
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
index 4fd3bdfbfd..a092a83a10 100644
--- a/framework/inc/helpid.hrc
+++ b/framework/inc/helpid.hrc
@@ -27,23 +27,11 @@
#ifndef _FRAMEWORK_HELPID_HRC
#define _FRAMEWORK_HELPID_HRC
-// include ------------------------------------------------------------------
-
-#include <svl/solar.hrc>
-
-// Help-Ids -----------------------------------------------------------------
-
-#define HID_BACKINGWINDOW (HID_FRAMEWORK_START + 0)
-#define HID_LICENSEDIALOG (HID_FRAMEWORK_START + 1)
-#define HID_STATUSBAR (HID_FRAMEWORK_START + 2)
-
-#define ACT_FRAMEWORK_HID_END HID_BACKINGWINDOW
-
-// "Uberlaufpr"ufung --------------------------------------------------------
-
-#if ACT_FRAMEWORK_HID_END > HID_FRAMEWORK_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_BACKINGWINDOW "FWK_HID_BACKINGWINDOW"
+#define HID_LICENSEDIALOG "FWK_HID_LICENSEDIALOG"
+#define HID_STATUSBAR "FWK_HID_STATUSBAR"
+#define HID_SVX_COMMON_MACRO_ORGANIZER "FWK_HID_SVX_COMMON_MACRO_ORGANIZER"
+#define HID_SVX_BASIC_MACRO_ORGANIZER "FWK_HID_SVX_BASIC_MACRO_ORGANIZER"
#endif // #ifndef _FRAMEWORK_HELPID_HRC
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index dc4f24891f..b33f90cf4d 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -47,11 +47,13 @@ namespace framework
struct CommandInfo
{
CommandInfo() : nId( 0 ),
+ nWidth( 0 ),
nImageInfo( 0 ),
bMirrored( false ),
bRotated( false ) {}
USHORT nId;
+ sal_uInt16 nWidth;
::std::vector< USHORT > aIds;
sal_Int16 nImageInfo;
sal_Bool bMirrored : 1,
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 2fe68b6d41..bf29b6475a 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -145,6 +145,7 @@ class ToolBarMerger
const ::rtl::OUString& rControlType );
static void CreateToolbarItem( ToolBox* pToolbox,
+ CommandToInfoMap& rCommandMap,
sal_uInt16 nPos,
sal_uInt16 nItemId,
const AddonToolbarItem& rAddonToolbarItem );
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 0fa60c9e68..4911090db6 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -105,7 +105,7 @@ namespace framework
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager );
rtl::OUString getUINameFromCommand( const rtl::OUString& rCommandURL );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const rtl::OUString& rCommandURL );
- void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId, const rtl::OUString& aLabel );
+ void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OUString& aLabel );
sal_Bool isContextSensitiveToolbarNonVisible();
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState;
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 5c0f7d087a..702fb431f5 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -175,6 +175,7 @@ ModalDialog DLG_LICENSE
MultiLineEdit ML_LICENSE
{
+ HelpID = "framework:MultiLineEdit:DLG_LICENSE:ML_LICENSE";
PosSize = MAP_APPFONT ( LICENSE_COL_1 , LICENSE_ROW_1 , LICENSE_WIDTH , LICENSE_HEIGHT ) ;
Border = TRUE ;
VScroll = TRUE ;
@@ -221,6 +222,7 @@ ModalDialog DLG_LICENSE
PushButton PB_PAGEDOWN
{
+ HelpID = "framework:PushButton:DLG_LICENSE:PB_PAGEDOWN";
TabStop = TRUE ;
Pos = MAP_APPFONT ( LICENSE_COL_4 , LICENSE_ROW_3 ) ;
Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ;
@@ -261,6 +263,7 @@ ModalDialog DLG_LICENSE
PushButton PB_ACCEPT
{
+ HelpID = "framework:PushButton:DLG_LICENSE:PB_ACCEPT";
TabStop = TRUE ;
Pos = MAP_APPFONT ( LICENSE_COL_4 - PD_WIDTH - OFFSET_IMG , LICENSE_ROW_6 ) ;
Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ;
@@ -268,6 +271,7 @@ ModalDialog DLG_LICENSE
PushButton PB_DECLINE
{
+ HelpID = "framework:PushButton:DLG_LICENSE:PB_DECLINE";
TabStop = TRUE ;
Pos = MAP_APPFONT ( LICENSE_COL_4 , LICENSE_ROW_6 ) ;
Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 1b0cd5717a..6a668cd12a 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -4005,7 +4005,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent )
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
{
pToolBox = (ToolBox *)pWindow;
- aToolbarName = pToolBox->GetSmartHelpId().GetStr();
+ aToolbarName = rtl::OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 );
sal_Int32 i = aToolbarName.lastIndexOf( ':' );
if (( aToolbarName.getLength() > 0 ) &&
( i > 0 ) && (( i+ 1 ) < aToolbarName.getLength() ))
@@ -4066,7 +4066,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent )
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
{
pToolBox = (ToolBox *)pWindow;
- aToolbarName = pToolBox->GetSmartHelpId().GetStr();
+ aToolbarName = rtl::OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 );
if (( aToolbarName.getLength() > 0 ) && ( m_nLockCount == 0 ))
m_aAsyncLayoutTimer.Start();
}
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 8817e60e92..884fdc06ff 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -231,15 +231,15 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
if( mxDesktop.is() )
mxDesktopDispatchProvider = Reference< XDispatchProvider >( mxDesktop, UNO_QUERY );
- maWriterButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:WriterButton" ) ) ) );
- maCalcButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:CalcButton" ) ) ) );
- maImpressButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:ImpressButton" ) ) ) );
- maDrawButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:DrawButton" ) ) ) );
- maDBButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:DBButton" ) ) ) );
- maMathButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:MathButton" ) ) ) );
- maTemplateButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:TemplateButton" ) ) ) );
- maOpenButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:OpenButton" ) ) ) );
- maToolbox.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Toolbox" ) ) ) );
+ maWriterButton.SetHelpId( ".HelpId:StartCenter:WriterButton" );
+ maCalcButton.SetHelpId( ".HelpId:StartCenter:CalcButton" );
+ maImpressButton.SetHelpId( ".HelpId:StartCenter:ImpressButton" );
+ maDrawButton.SetHelpId( ".HelpId:StartCenter:DrawButton" );
+ maDBButton.SetHelpId( ".HelpId:StartCenter:DBButton" );
+ maMathButton.SetHelpId( ".HelpId:StartCenter:MathButton" );
+ maTemplateButton.SetHelpId( ".HelpId:StartCenter:TemplateButton" );
+ maOpenButton.SetHelpId( ".HelpId:StartCenter:OpenButton" );
+ maToolbox.SetHelpId( ".HelpId:StartCenter:Toolbox" );
// init background
initBackground();
diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx
deleted file mode 100644
index 0fb110c3a3..0000000000
--- a/framework/source/services/menudocumenthandler.cxx
+++ /dev/null
@@ -1,903 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_framework.hxx"
-
-#include <stdio.h>
-#include <services/menudocumenthandler.hxx>
-#include <classes/menuconfiguration.hxx>
-#include <classes/addonmenu.hxx>
-
-#ifndef __FRAMEWORK_SERVICES_ATTRIBUTELIST_HXX_
-#include <services/attributelist.hxx>
-#endif
-
-#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#endif
-
-
-using namespace ::rtl;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
-
-const int ITEMID_START_VALUE = 1000;
-
-#define XMLNS_MENU "http://openoffice.org/2001/menu"
-#define XMLNS_PREFIX "menu:"
-
-#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar"
-#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu"
-#define ELEMENT_MENUPOPUP "http://openoffice.org/2001/menu^menupopup"
-#define ELEMENT_MENUITEM "http://openoffice.org/2001/menu^menuitem"
-#define ELEMENT_MENUSEPARATOR "http://openoffice.org/2001/menu^menuseparator"
-
-#define ELEMENT_NS_MENUBAR "menu:menubar"
-#define ELEMENT_NS_MENU "menu:menu"
-#define ELEMENT_NS_MENUPOPUP "menu:menupopup"
-#define ELEMENT_NS_MENUITEM "menu:menuitem"
-#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator"
-
-#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id"
-#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label"
-#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid"
-#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak"
-
-#define ATTRIBUTE_NS_ID "menu:id"
-#define ATTRIBUTE_NS_LABEL "menu:label"
-#define ATTRIBUTE_NS_HELPID "menu:helpid"
-#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak"
-
-#define ATTRIBUTE_XMLNS_MENU "xmlns:menu"
-
-#define ATTRIBUTE_TYPE_CDATA "CDATA"
-
-#define MENUBAR_DOCTYPE "<!DOCTYPE menu:menubar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">"
-
-
-// special popup menus (filled during runtime) must be saved as a menuitem!!!
-// same as in menumanager.cxx - you have to change both files!!!
-#define SID_SFX_START 5000
-#define SID_NEWDOCDIRECT (SID_SFX_START + 537)
-#define SID_AUTOPILOTMENU (SID_SFX_START + 1381)
-#define SID_FORMATMENU (SID_SFX_START + 780)
-
-const ::rtl::OUString aSlotProtocol( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
-const ::rtl::OUString aSlotNewDocDirect( RTL_CONSTASCII_USTRINGPARAM( "slot:5537" ));
-const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" ));
-
-const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" ));
-const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" ));
-
-const ULONG MENU_SAVE_LABEL = 0x00000001;
-
-namespace framework
-{
-
-// -----------------------------------------------------------------------------
-// Base class implementation
-
-ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() :
- m_xLocator( 0 ),
- m_xReader( 0 )
-{
-}
-
-ReadMenuDocumentHandlerBase::~ReadMenuDocumentHandlerBase()
-{
-}
-
-Any SAL_CALL ReadMenuDocumentHandlerBase::queryInterface(
- const Type & rType )
-throw( RuntimeException )
-{
- Any a = ::cppu::queryInterface(
- rType ,
- SAL_STATIC_CAST( XDocumentHandler*, this ));
- if ( a.hasValue() )
- return a;
-
- return OWeakObject::queryInterface( rType );
-}
-
-void SAL_CALL ReadMenuDocumentHandlerBase::ignorableWhitespace(
- const OUString& aWhitespaces )
-throw( SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL ReadMenuDocumentHandlerBase::processingInstruction(
- const OUString& aTarget, const OUString& aData )
-throw( SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator(
- const Reference< XLocator > &xLocator)
-throw( SAXException, RuntimeException )
-{
- m_xLocator = xLocator;
-}
-
-::rtl::OUString ReadMenuDocumentHandlerBase::getErrorLineString()
-{
- char buffer[32];
-
- if ( m_xLocator.is() )
- {
- snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast<long>( m_xLocator->getLineNumber() ));
- return OUString::createFromAscii( buffer );
- }
- else
- return OUString();
-}
-
-// -----------------------------------------------------------------------------
-
-// #110897#
-OReadMenuDocumentHandler::OReadMenuDocumentHandler(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- MenuBar* pMenuBar )
-: // #110897#
- mxServiceFactory(xServiceFactory),
- m_pMenuBar( pMenuBar ),
- m_nElementDepth( 0 ),
- m_bMenuBarMode( sal_False ),
- m_nItemId( ITEMID_START_VALUE )
-{
-}
-
-// #110897#
-const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuDocumentHandler::getServiceFactory()
-{
- // #110897#
- return mxServiceFactory;
-}
-
-OReadMenuDocumentHandler::~OReadMenuDocumentHandler()
-{
-}
-
-
-void SAL_CALL OReadMenuDocumentHandler::startDocument(void)
- throw ( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuDocumentHandler::endDocument(void)
- throw( SAXException, RuntimeException )
-{
- if ( m_nElementDepth > 0 )
- {
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "A closing element is missing!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
-}
-
-
-void SAL_CALL OReadMenuDocumentHandler::startElement(
- const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException )
-{
- if ( m_bMenuBarMode )
- {
- ++m_nElementDepth;
- m_xReader->startElement( aName, xAttrList );
- }
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUBAR )))
- {
- ++m_nElementDepth;
- m_bMenuBarMode = sal_True;
-
- // #110897# m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( m_pMenuBar, &m_nItemId ));
- m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( getServiceFactory(), m_pMenuBar, &m_nItemId ));
-
- m_xReader->startDocument();
- }
-}
-
-
-void SAL_CALL OReadMenuDocumentHandler::characters(const rtl::OUString& aChars)
-throw( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException )
-{
- if ( m_bMenuBarMode )
- {
- --m_nElementDepth;
- m_xReader->endElement( aName );
- if ( 0 == m_nElementDepth )
- {
- m_xReader->endDocument();
- m_xReader = Reference< XDocumentHandler >();
- m_bMenuBarMode = sal_False;
- if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUBAR )))
- {
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menubar expected!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
- }
- }
-}
-
-
-// -----------------------------------------------------------------------------
-
-
-// #110897#
-OReadMenuBarHandler::OReadMenuBarHandler(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- MenuBar* pMenuBar, USHORT* pItemId )
-: // #110897#
- mxServiceFactory( xServiceFactory ),
- m_pMenuBar( pMenuBar ),
- m_nElementDepth( 0 ),
- m_bMenuMode( sal_False ),
- m_pItemId( pItemId )
-{
-}
-
-// #110897#
-const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuBarHandler::getServiceFactory()
-{
- // #110897#
- return mxServiceFactory;
-}
-
-OReadMenuBarHandler::~OReadMenuBarHandler()
-{
-}
-
-
-void SAL_CALL OReadMenuBarHandler::startDocument(void)
- throw ( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuBarHandler::endDocument(void)
- throw( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuBarHandler::startElement(
- const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException )
-{
- if ( m_bMenuMode )
- {
- ++m_nElementDepth;
- m_xReader->startElement( aName, xAttrList );
- }
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU )))
- {
- ++m_nElementDepth;
-
- ULONG nHelpId = 0;
- OUString aCommandId;
- OUString aLabel;
-
- m_bMenuMode = sal_True;
- PopupMenu* pMenu = new PopupMenu();
-
- // read attributes for menu
- for ( int i=0; i< xAttrList->getLength(); i++ )
- {
- OUString aName = xAttrList->getNameByIndex( i );
- OUString aValue = xAttrList->getValueByIndex( i );
- if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID )))
- aCommandId = aValue;
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL )))
- aLabel = aValue;
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
- nHelpId = aValue.toInt32();
- }
-
- if ( aCommandId.getLength() > 0 )
- {
- USHORT nItemId;
- if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 )
- nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32();
- else
- nItemId = ++(*m_pItemId);
-
- m_pMenuBar->InsertItem( nItemId, String() );
- m_pMenuBar->SetPopupMenu( nItemId, pMenu );
- m_pMenuBar->SetItemCommand( nItemId, aCommandId );
- if ( nHelpId > 0 )
- m_pMenuBar->SetHelpId( nItemId, nHelpId );
- if ( aLabel.getLength() > 0 )
- {
- m_pMenuBar->SetItemText( nItemId, aLabel );
- m_pMenuBar->SetUserValue( nItemId, MENU_SAVE_LABEL );
- }
- else
- {
- m_pMenuBar->SetUserValue( nItemId, 0 );
- }
- }
- else
- {
- delete pMenu;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
-
- m_xReader = Reference< XDocumentHandler >( new OReadMenuHandler( pMenu, m_pItemId ));
- m_xReader->startDocument();
- }
- else
- {
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "element menu expected!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
-}
-
-
-void SAL_CALL OReadMenuBarHandler::characters(const rtl::OUString& aChars)
-throw( SAXException, RuntimeException )
-{
-}
-
-
-void OReadMenuBarHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException )
-{
- if ( m_bMenuMode )
- {
- --m_nElementDepth;
- if ( 0 == m_nElementDepth )
- {
- m_xReader->endDocument();
- m_xReader = Reference< XDocumentHandler >();
- m_bMenuMode = sal_False;
- if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU )))
- {
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menu expected!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
- }
- else
- m_xReader->endElement( aName );
- }
-}
-
-
-// -----------------------------------------------------------------------------
-
-
-OReadMenuHandler::OReadMenuHandler( Menu* pMenu, USHORT* pItemId ) :
- m_pMenu( pMenu ),
- m_nElementDepth( 0 ),
- m_bMenuPopupMode( sal_False ),
- m_pItemId( pItemId )
-{
-}
-
-
-OReadMenuHandler::~OReadMenuHandler()
-{
-}
-
-
-void SAL_CALL OReadMenuHandler::startDocument(void)
- throw ( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuHandler::endDocument(void)
- throw( SAXException, RuntimeException)
-{
-}
-
-
-void SAL_CALL OReadMenuHandler::startElement(
- const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException )
-{
- if ( m_bMenuPopupMode )
- {
- ++m_nElementDepth;
- m_xReader->startElement( aName, xAttrList );
- }
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUPOPUP )))
- {
- ++m_nElementDepth;
- m_bMenuPopupMode = sal_True;
- m_xReader = Reference< XDocumentHandler >( new OReadMenuPopupHandler( m_pMenu, m_pItemId ));
- m_xReader->startDocument();
- }
- else
- {
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown element found!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
-}
-
-
-void SAL_CALL OReadMenuHandler::characters(const rtl::OUString& aChars)
-throw( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException )
-{
- if ( m_bMenuPopupMode )
- {
- --m_nElementDepth;
- if ( 0 == m_nElementDepth )
- {
- m_xReader->endDocument();
- m_xReader = Reference< XDocumentHandler >();
- m_bMenuPopupMode = sal_False;
- if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUPOPUP )))
- {
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menupopup expected!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
- }
- else
- m_xReader->endElement( aName );
- }
-}
-
-
-// -----------------------------------------------------------------------------
-
-
-OReadMenuPopupHandler::OReadMenuPopupHandler( Menu* pMenu, USHORT* pItemId ) :
- m_pMenu( pMenu ),
- m_nElementDepth( 0 ),
- m_bMenuMode( sal_False ),
- m_pItemId( pItemId ),
- m_nNextElementExpected( ELEM_CLOSE_NONE )
-{
-}
-
-
-OReadMenuPopupHandler::~OReadMenuPopupHandler()
-{
-}
-
-
-void SAL_CALL OReadMenuPopupHandler::startDocument(void)
- throw ( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuPopupHandler::endDocument(void)
- throw( SAXException, RuntimeException)
-{
-}
-
-
-void SAL_CALL OReadMenuPopupHandler::startElement(
- const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException )
-{
- ++m_nElementDepth;
-
- if ( m_bMenuMode )
- m_xReader->startElement( aName, xAttrList );
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU )))
- {
- ULONG nHelpId = 0;
- OUString aCommandId;
- OUString aLabel;
-
- m_bMenuMode = sal_True;
- PopupMenu* pMenu = new PopupMenu();
-
- // read attributes for menu
- for ( int i=0; i< xAttrList->getLength(); i++ )
- {
- OUString aName = xAttrList->getNameByIndex( i );
- OUString aValue = xAttrList->getValueByIndex( i );
- if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID )))
- aCommandId = aValue;
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL )))
- aLabel = aValue;
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
- nHelpId = aValue.toInt32();
- }
-
- if ( aCommandId.getLength() > 0 )
- {
- USHORT nItemId;
- if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 )
- nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32();
- else
- nItemId = ++(*m_pItemId);
-
- m_pMenu->InsertItem( nItemId, String() );
- m_pMenu->SetPopupMenu( nItemId, pMenu );
- m_pMenu->SetItemCommand( nItemId, aCommandId );
- if ( nHelpId > 0 )
- m_pMenu->SetHelpId( nItemId, nHelpId );
- if ( aLabel.getLength() > 0 )
- {
- m_pMenu->SetItemText( nItemId, aLabel );
- m_pMenu->SetUserValue( nItemId, MENU_SAVE_LABEL );
- }
- else
- {
- m_pMenu->SetUserValue( nItemId, 0 );
- }
- }
- else
- {
- delete pMenu;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
-
- m_xReader = Reference< XDocumentHandler >( new OReadMenuHandler( pMenu, m_pItemId ));
- m_xReader->startDocument();
- }
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM )))
- {
- ULONG nHelpId = 0;
- OUString aCommandId;
- OUString aLabel;
-
- // read attributes for menu item
- for ( int i=0; i< xAttrList->getLength(); i++ )
- {
- OUString aName = xAttrList->getNameByIndex( i );
- OUString aValue = xAttrList->getValueByIndex( i );
- if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID )))
- aCommandId = aValue;
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL )))
- aLabel = aValue;
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
- nHelpId = aValue.toInt32();
- }
-
- if ( aCommandId.getLength() > 0 )
- {
- USHORT nItemId;
- if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 )
- nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32();
- else
- nItemId = ++(*m_pItemId);
-
- m_pMenu->InsertItem( nItemId, String() );
- m_pMenu->SetItemCommand( nItemId, aCommandId );
- if ( nHelpId > 0 )
- m_pMenu->SetHelpId( nItemId, nHelpId );
- if ( aLabel.getLength() > 0 )
- {
- m_pMenu->SetItemText( nItemId, aLabel );
- m_pMenu->SetUserValue( nItemId, MENU_SAVE_LABEL );
- }
- else
- {
- m_pMenu->SetUserValue( nItemId, 0 );
- }
- }
-
- m_nNextElementExpected = ELEM_CLOSE_MENUITEM;
- }
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUSEPARATOR )))
- {
- m_pMenu->InsertSeparator();
- m_nNextElementExpected = ELEM_CLOSE_MENUSEPARATOR;
- }
- else
- {
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown element found!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
-}
-
-
-void SAL_CALL OReadMenuPopupHandler::characters(const rtl::OUString& aChars)
-throw( SAXException, RuntimeException )
-{
-}
-
-
-void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException )
-{
- --m_nElementDepth;
- if ( m_bMenuMode )
- {
- if ( 0 == m_nElementDepth )
- {
- m_xReader->endDocument();
- m_xReader = Reference< XDocumentHandler >();
- m_bMenuMode = sal_False;
- if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU )))
- {
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menu expected!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
- }
- else
- m_xReader->endElement( aName );
- }
- else
- {
- if ( m_nNextElementExpected == ELEM_CLOSE_MENUITEM )
- {
- if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM )))
- {
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menuitem expected!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
- }
- else if ( m_nNextElementExpected == ELEM_CLOSE_MENUSEPARATOR )
- {
- if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUSEPARATOR )))
- {
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menuseparator expected!" ));
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
- }
- }
-
- m_nNextElementExpected = ELEM_CLOSE_NONE;
- }
-}
-
-
-// --------------------------------- Write XML ---------------------------------
-
-
-OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( MenuBar* pMenu, Reference< XDocumentHandler > rxWriteDocumentHandler ) :
- m_pMenuBar( pMenu ),
- m_xWriteDocumentHandler( rxWriteDocumentHandler )
-{
- m_xEmptyList = Reference< XAttributeList >( (XAttributeList *)new AttributeListImpl, UNO_QUERY );
- m_aAttributeType = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA ));
-}
-
-
-OWriteMenuDocumentHandler::~OWriteMenuDocumentHandler()
-{
-}
-
-
-void OWriteMenuDocumentHandler::WriteMenuDocument()
-throw ( SAXException, RuntimeException )
-{
- AttributeListImpl* pList = new AttributeListImpl;
- Reference< XAttributeList > rList( (XAttributeList *) pList , UNO_QUERY );
-
- m_xWriteDocumentHandler->startDocument();
-
- // write DOCTYPE line!
- Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY );
- if ( xExtendedDocHandler.is() )
- {
- xExtendedDocHandler->unknown( OUString( RTL_CONSTASCII_USTRINGPARAM( MENUBAR_DOCTYPE )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- }
-
- pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_MENU )),
- m_aAttributeType,
- OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_MENU )) );
-
- pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )),
- m_aAttributeType,
- OUString( RTL_CONSTASCII_USTRINGPARAM( "menubar" )) );
-
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUBAR )), pList );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-
- WriteMenu( m_pMenuBar );
-
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUBAR )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endDocument();
-}
-
-
-void OWriteMenuDocumentHandler::WriteMenu( Menu* pMenu )
-throw ( SAXException, RuntimeException )
-{
- USHORT nItemCount = pMenu->GetItemCount();
- BOOL bSeparator = FALSE;
-
- for ( USHORT nItemPos = 0; nItemPos < nItemCount; nItemPos++ )
- {
- USHORT nItemId = pMenu->GetItemId( nItemPos );
-
- PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nItemId );
- if ( pPopupMenu )
- {
- OUString aItemCommand = pMenu->GetItemCommand( nItemId );
-
- if ( nItemId == SID_NEWDOCDIRECT ||
- nItemId == SID_AUTOPILOTMENU )
- {
- // special popup menus (filled during runtime) must be saved as a menuitem!!!
- WriteMenuItem( pMenu, nItemId );
- bSeparator = FALSE;
- }
- else if ( nItemId == SID_FORMATMENU )
- {
- // special popup menu - must be written as empty popup!
- AttributeListImpl* pListMenu = new AttributeListImpl;
- Reference< XAttributeList > xListMenu( (XAttributeList *)pListMenu , UNO_QUERY );
-
- String aCommand( pMenu->GetItemCommand( nItemId ) );
- if ( !aCommand.Len() )
- {
- aCommand = String::CreateFromAscii("slot:");
- aCommand += String::CreateFromInt32( nItemId );
- }
-
- pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )),
- m_aAttributeType,
- aCommand );
-
-// if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL )
- pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
- m_aAttributeType,
- pMenu->GetItemText( nItemId ) );
-
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )), m_xEmptyList );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- bSeparator = FALSE;
- }
- else if ( !AddonPopupMenu::IsCommandURLPrefix ( aItemCommand ))
- {
- AttributeListImpl* pListMenu = new AttributeListImpl;
- Reference< XAttributeList > xListMenu( (XAttributeList *)pListMenu , UNO_QUERY );
-
- String aCommand( pMenu->GetItemCommand( nItemId ) );
- if ( !aCommand.Len() )
- {
- aCommand = String::CreateFromAscii("slot:");
- aCommand += String::CreateFromInt32( nItemId );
- }
-
- pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )),
- m_aAttributeType,
- aCommand );
-
-// if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL )
- pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
- m_aAttributeType,
- pMenu->GetItemText( nItemId ) );
-
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )), m_xEmptyList );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
-
- WriteMenu( pPopupMenu );
-
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- bSeparator = FALSE;
- }
- }
- else
- {
- if ( pMenu->GetItemType( nItemPos ) != MENUITEM_SEPARATOR )
- {
- // don't save special menu items for (window list and pickup list, add-ons )
- if ( !MenuConfiguration::IsPickListItemId( nItemId ) &&
- !MenuConfiguration::IsWindowListItemId( nItemId ) &&
- !AddonMenuManager::IsAddonMenuId( nItemId ))
- {
- bSeparator = FALSE;
- WriteMenuItem( pMenu, nItemId );
- }
- }
- else if ( !bSeparator )
- {
- // Don't write two separators together
- WriteMenuSeparator();
- bSeparator = TRUE;
- }
- }
- }
-}
-
-
-void OWriteMenuDocumentHandler::WriteMenuItem( Menu* pMenu, USHORT nItemId )
-{
- AttributeListImpl* pList = new AttributeListImpl;
- Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY );
-
- String aCommand( pMenu->GetItemCommand( nItemId ) );
- if ( !aCommand.Len() )
- {
- aCommand = String::CreateFromAscii("slot:");
- aCommand += String::CreateFromInt32( nItemId );
- }
-
- pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )),
- m_aAttributeType,
- aCommand );
-
- ULONG nHelpId = pMenu->GetHelpId( nItemId );
- if ( nHelpId > 0 )
- {
- pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_HELPID )),
- m_aAttributeType,
- OUString::valueOf( sal_Int64( nHelpId )) );
- }
-
-// if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL )
- pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
- m_aAttributeType,
- pMenu->GetItemText( nItemId ));
-
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )), xList );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )) );
-}
-
-
-void OWriteMenuDocumentHandler::WriteMenuSeparator()
-{
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUSEPARATOR )), m_xEmptyList );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUSEPARATOR )) );
-}
-
-} // namespace framework
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 7c82e2e825..c9f78c020d 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -48,6 +48,7 @@
#include <rtl/ustrbuf.hxx>
#include <dispatch/uieventloghelper.hxx>
#include "helper/mischelper.hxx"
+#include "helpid.hrc"
#include <vos/mutex.hxx>
using namespace com::sun::star::uno;
@@ -101,9 +102,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo
String aDisplayName = RetrieveLabelFromCommand( aCommand );
pPopupMenu->InsertItem( 2, aDisplayName );
pPopupMenu->SetItemCommand( 2, aCommand );
- //pPopupMenu->SetHelpId( 2, HID_SVX_BASIC_MACRO_ORGANIZER );
- pPopupMenu->SetHelpId( 2, 40012 );
-
+
// insert providers but not basic or java
addScriptItems( pPopupMenu, 4);
}
@@ -222,8 +221,6 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt
aDisplayName.Append( ellipsis );
pPopupMenu->InsertItem( itemId, aDisplayName );
pPopupMenu->SetItemCommand( itemId, aCommand );
- //pPopupMenu->SetHelpId( itemId, HID_SVX_COMMON_MACRO_ORGANIZER );
- pPopupMenu->SetHelpId( itemId, 40014 );
itemId++;
break;
}
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index b76ab6f697..224665167b 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1798,9 +1798,6 @@ void MenuBarManager::FillMenu(
pMenu->InsertItem( nId, aLabel );
pMenu->SetItemCommand( nId, aCommandURL );
- sal_Int32 nHelpId = aHelpURL.toInt32();
- if ( nHelpId > 0 )
- pMenu->SetHelpId( nId, (USHORT)nHelpId );
if ( nStyle )
{
MenuItemBits nBits = pMenu->GetItemBits( nId );
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 957857fe3e..0c3dd83a41 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -531,16 +531,6 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
m_pStatusBar->InsertItem( nId, nWidth, nItemBits, nOffset );
m_pStatusBar->SetItemCommand( nId, aCommandURL );
m_pStatusBar->SetAccessibleName( nId, aString );
-// m_pStatusBar->SetHelpText( nId, aString );
-
- if ( aHelpURL.indexOf( aHelpIdPrefix ) == 0 )
- {
- rtl::OUString aId( aHelpURL.copy( HELPID_PREFIX_LENGTH ));
- sal_uInt16 nHelpId = (sal_uInt16)(aId.toInt32());
- if ( nHelpId > 0 )
- m_pStatusBar->SetHelpId( nId, nHelpId );
- }
-
++nId;
}
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index e4cb7fd3ed..3c23f44e9c 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -310,10 +310,10 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
// set name for testtool, the useful part is after the last '/'
sal_Int32 idx = rResourceName.lastIndexOf('/');
idx++; // will become 0 if '/' not found: use full string
- ::rtl::OUString aHelpIdAsString( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX_TESTTOOL ));
+ ::rtl::OString aHelpIdAsString( HELPID_PREFIX_TESTTOOL );
::rtl::OUString aToolbarName = rResourceName.copy( idx );
- aHelpIdAsString += aToolbarName;
- m_pToolBar->SetSmartHelpId( SmartId( aHelpIdAsString ) );
+ aHelpIdAsString += rtl::OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 );;
+ m_pToolBar->SetHelpId( aHelpIdAsString );
m_aAsyncUpdateControllersTimer.SetTimeout( 50 );
m_aAsyncUpdateControllersTimer.SetTimeoutHdl( LINK( this, ToolBarManager, AsyncUpdateControllersHdl ) );
@@ -947,16 +947,16 @@ void ToolBarManager::CreateControllers()
if ( nId == 0 )
continue;
- sal_Int16 nWidth( sal_Int16( m_pToolBar->GetHelpId( nId )));
rtl::OUString aLoadURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:OpenUrl" ));
rtl::OUString aCommandURL( m_pToolBar->GetItemCommand( nId ));
sal_Bool bInit( sal_True );
sal_Bool bCreate( sal_True );
Reference< XStatusListener > xController;
+ CommandToInfoMap::iterator pCommandIter = m_aCommandMap.find( aCommandURL );
+ sal_Int16 nWidth = ( pCommandIter != m_aCommandMap.end() ? pCommandIter->second.nWidth : 0 );
svt::ToolboxController* pController( 0 );
- m_pToolBar->SetHelpId( nId, 0 ); // reset value again
if ( bHasDisabledEntries )
{
aURL.Complete = aCommandURL;
@@ -1405,6 +1405,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
if ( pIter == m_aCommandMap.end())
{
aCmdInfo.nId = nId;
+ aCmdInfo.nWidth = nWidth;
m_aCommandMap.insert( CommandToInfoMap::value_type( aCommandURL, aCmdInfo ));
}
else
@@ -1412,9 +1413,6 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
pIter->second.aIds.push_back( nId );
}
- // Add additional information for the controller to the obsolete help id
- m_pToolBar->SetHelpId( ULONG( nWidth ));
-
if ( !bIsVisible )
m_pToolBar->HideItem( nId );
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index 43f9068513..d6e7349cbf 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -512,7 +512,6 @@ bool ToolBarMerger::MergeItems(
pToolbar->InsertSeparator( sal_uInt16( nInsPos ));
else
{
- ToolBarMerger::CreateToolbarItem( pToolbar, sal_uInt16( nInsPos ), rItemId, rItem );
CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL );
if ( pIter == rCommandMap.end())
{
@@ -524,6 +523,8 @@ bool ToolBarMerger::MergeItems(
{
pIter->second.aIds.push_back( rItemId );
}
+
+ ToolBarMerger::CreateToolbarItem( pToolbar, rCommandMap, sal_uInt16( nInsPos ), rItemId, rItem );
}
++nIndex;
@@ -691,7 +692,7 @@ bool ToolBarMerger::RemoveItems(
return pResult;
}
-void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem )
+void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, CommandToInfoMap& rCommandMap, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem )
{
pToolbar->InsertItem( nItemId, rItem.aLabel, 0, nPos );
pToolbar->SetItemCommand( nItemId, rItem.aCommandURL );
@@ -700,8 +701,9 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_u
pToolbar->EnableItem( nItemId, sal_True );
pToolbar->SetItemState( nItemId, STATE_NOCHECK );
- // Use obsolete help id to transport the width of the item
- pToolbar->SetHelpId( nItemId, rItem.nWidth );
+ CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL );
+ if ( pIter != rCommandMap.end() )
+ pIter->second.nWidth = rItem.nWidth;
// Use the user data to store add-on specific data with the toolbar item
AddonsParams* pAddonParams = new AddonsParams;
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index bb97a82ec8..8d441dc2bf 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -180,7 +180,7 @@ ToolbarsMenuController::~ToolbarsMenuController()
}
void ToolbarsMenuController::addCommand(
- Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId, const rtl::OUString& rLabel )
+ Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OUString& rLabel )
{
USHORT nItemId = m_xPopupMenu->getItemCount()+1;
@@ -215,7 +215,6 @@ void ToolbarsMenuController::addCommand(
PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
if ( !!aImage )
pVCLPopupMenu->SetItemImage( nItemId, aImage );
- pVCLPopupMenu->SetHelpId( nItemId, nHelpId );
}
m_aCommandVector.push_back( rCommandURL );
@@ -507,14 +506,14 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) ||
m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ))
{
- addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR )), 10360, aEmptyString );
+ addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR )), aEmptyString );
if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) ||
m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" ))
- addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), 10417, aEmptyString );
+ addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), aEmptyString );
else if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ))
- addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), 26241, aEmptyString );
+ addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), aEmptyString );
else
- addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), 20128, aEmptyString );
+ addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), aEmptyString );
}
sal_Bool bAddCommand( sal_True );
@@ -537,7 +536,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
m_xPopupMenu->insertSeparator( nItemCount+1 );
}
- addCommand( m_xPopupMenu, aConfigureToolbar, 5904, aEmptyString );
+ addCommand( m_xPopupMenu, aConfigureToolbar, aEmptyString );
}
// Add separator if no configure has been added
@@ -553,7 +552,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
String aLabelStr = String( FwkResId( STR_RESTORE_TOOLBARS ));
rtl::OUString aRestoreCmd( RTL_CONSTASCII_USTRINGPARAM( CMD_RESTOREVISIBILITY ));
- addCommand( m_xPopupMenu, aRestoreCmd, 9999, aLabelStr );
+ addCommand( m_xPopupMenu, aRestoreCmd, aLabelStr );
}
}
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 2fa36042db..4463b0003e 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -543,7 +543,6 @@
#include "svl/ownlist.hxx"
#include "svtools/parhtml.hxx"
#include "unotools/pathoptions.hxx"
-#include "svl/pickerhelper.hxx"
#include "svl/poolitem.hxx"
#include "svtools/printoptions.hxx"
#include "unotools/printwarningoptions.hxx"
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index e8f7feaacf..953c8df5e1 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -69,7 +69,6 @@ class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog
{
sal_uInt32 nUniqId;
String aExtraData;
- Timer aTimer;
const SfxItemSet* pInputSet;
SfxItemSet* pOutputSet;
@@ -77,8 +76,6 @@ private:
SAL_DLLPRIVATE SfxModalDialog(SfxModalDialog &); // not defined
SAL_DLLPRIVATE void operator =(SfxModalDialog &); // not defined
- DECL_DLLPRIVATE_LINK( TimerHdl_Impl, Timer* );
-
SAL_DLLPRIVATE void SetDialogData_Impl();
SAL_DLLPRIVATE void GetDialogData_Impl();
SAL_DLLPRIVATE void init();
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 97027bf3c5..265c123e9c 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -122,7 +122,7 @@ friend class SfxViewFrame;
DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * );
SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, BOOL bRecord );
- SAL_DLLPRIVATE sal_uInt32 _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*);
+ SAL_DLLPRIVATE void _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*);
SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*);
protected:
@@ -237,7 +237,7 @@ public:
//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT );
SAL_DLLPRIVATE void SetMenu_Impl();
- SAL_DLLPRIVATE long Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc.
+ SAL_DLLPRIVATE void Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc.
SAL_DLLPRIVATE BOOL IsUpdated_Impl() const;
SAL_DLLPRIVATE void DebugOutput_Impl() const;
SAL_DLLPRIVATE void ResetObjectBars_Impl();
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index 4257353c9b..bdb53a17a1 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -281,8 +281,7 @@ public:
Pointer to an array of help ids. For each element in _pControlId, there must be
a corresponding element herein.
*/
- void SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId );
- void SetDialogHelpId( const sal_Int32 _nHelpId );
+ void SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId );
void CreateMatcher( const String& rName );
/** sets the context of the dialog and trigger necessary actions e.g. loading config, setting help id
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 4221d2b405..c0bfb134f9 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -134,7 +134,7 @@ public:
void EndInsert();
void CheckItem( USHORT, BOOL );
void RemoveItem( USHORT );
- void InsertItem( USHORT, const String&, MenuItemBits,
+ void InsertItem( USHORT, const String&, MenuItemBits, const rtl::OString& rHelpId,
USHORT nPos = MENU_APPEND );
void InsertSeparator( USHORT nPos = MENU_APPEND );
// @deprecated (end)
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index 453231f075..cb206ff5f5 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -29,6 +29,9 @@
#include <tools/rtti.hxx>
#include <sfx2/shell.hxx>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sfx2/dllapi.h>
//--------------------------------------------------------------------
@@ -287,6 +290,8 @@ public:
USHORT GetValue() const { return nValue; }
const SfxType* GetType() const { return pType; }
const char* GetUnoName() const { return pUnoName; }
+ SFX2_DLLPUBLIC rtl::OString GetCommand() const;
+ SFX2_DLLPUBLIC rtl::OUString GetCommandString() const;
USHORT GetFormalArgumentCount() const { return nArgDefCount; }
const SfxFormalArgument& GetFormalArgument( USHORT nNo ) const
diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx
index bfa3015d97..09f6752a27 100644
--- a/sfx2/inc/sfx2/opengrf.hxx
+++ b/sfx2/inc/sfx2/opengrf.hxx
@@ -54,10 +54,7 @@ public:
String GetCurrentFilter() const;
void SetCurrentFilter(const String&);
- /// Set dialog help id at FileDlgHelper
- void SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId );
- /// Set control help ids at FileDlgHelper
- void SetDialogHelpId( const INT32 _nHelpId );
+ void SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId );
private:
// disable copy and assignment
SFX2_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&);
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index e6cbed2f98..f761a3965c 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -78,7 +78,7 @@ public:
void SetMinLen( USHORT Len );
void SetMaxLen( USHORT Len );
- void SetEditHelpId( ULONG nId ) { maPasswordED.SetHelpId( nId ); }
+ void SetEditHelpId( const rtl::OString& rId ) { maPasswordED.SetHelpId( rId ); }
void ShowExtras( USHORT nExtras ) { mnExtras = nExtras; }
void AllowAsciiOnly( bool i_bAsciiOnly = true ) { mbAsciiOnly = i_bAsciiOnly; }
diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h
new file mode 100644
index 0000000000..bdf27baac7
--- /dev/null
+++ b/sfx2/inc/sfx2/sfxcommands.h
@@ -0,0 +1,345 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef SFX2_SFXCOMMANDS_HRC
+#define SFX2_SFXCOMMANDS_HRC
+
+#define CMD_SID_VIEWSHELL0 ".uno:_SwitchViewShell0"
+#define CMD_SID_VIEWSHELL1 ".uno:_SwitchViewShell1"
+#define CMD_SID_VIEWSHELL2 ".uno:_SwitchViewShell2"
+#define CMD_SID_VIEWSHELL3 ".uno:_SwitchViewShell3"
+#define CMD_SID_VIEWSHELL4 ".uno:_SwitchViewShell4"
+#define CMD_SID_ABOUT ".uno:About"
+#define CMD_SID_ACTIVATE ".uno:Activate"
+#define CMD_SID_HELPBALLOONS ".uno:ActiveHelp"
+#define CMD_SID_STYLE_FAMILY ".uno:ActualStyleFamily"
+#define CMD_SID_NEWDOC ".uno:NewDoc"
+#define CMD_SID_CREATELINK ".uno:AddBookmark"
+#define CMD_SID_NEWDOCDIRECT ".uno:AddDirect"
+#define CMD_SID_TEMPLATE_ADDRESSBOKSOURCE ".uno:AddressBookSource"
+#define CMD_SID_BASICIDE_ADDWATCH ".uno:AddWatch"
+#define CMD_SID_DOCINFO_AUTHOR ".uno:Author"
+#define CMD_SID_AUTOHIDE ".uno:AutoHide"
+#define CMD_SID_AUTOPILOTMENU ".uno:AutoPilotMenu"
+#define CMD_SID_GALLERY_BG_BRUSH ".uno:BackgroundImage"
+#define CMD_SID_BACKSPACE ".uno:Backspace"
+#define CMD_SID_BASICBREAK ".uno:BasicBreak"
+#define CMD_SID_BASICIDE_APPEAR ".uno:BasicIDEAppear"
+#define CMD_SID_BASICSTEPINTO ".uno:BasicStepInto"
+#define CMD_SID_BASICSTEPOUT ".uno:BasicStepOut"
+#define CMD_SID_BASICSTEPOVER ".uno:BasicStepOver"
+#define CMD_SID_BASICSTOP ".uno:BasicStop"
+#define CMD_SID_BROWSER ".uno:Beamer"
+#define CMD_SID_BASICIDE_BRKPNTSCHANGED ".uno:BreakPointsChanged"
+#define CMD_SID_BROWSE_BACKWARD ".uno:BrowseBackward"
+#define CMD_SID_BROWSE_FORWARD ".uno:BrowseForward"
+#define CMD_SID_BROWSER_MODE ".uno:BrowseView"
+#define CMD_SID_BUILD_VERSION ".uno:BuildVersion"
+#define CMD_SID_CAPTION ".uno:Caption"
+#define CMD_SID_STYLE_FAMILY1 ".uno:CharStyle"
+#define CMD_SID_CHECK_KEY ".uno:CheckKey"
+#define CMD_SID_BASICIDE_CHOOSEMACRO ".uno:ChooseMacro"
+#define CMD_SID_CLEARHISTORY ".uno:ClearHistory"
+#define CMD_SID_CLOSEWINS ".uno:CloseWins"
+#define CMD_SID_CLOSEDOCS ".uno:CloseDocs"
+#define CMD_SID_CLOSEDOC ".uno:CloseDoc"
+#define CMD_SID_CLOSEWIN ".uno:CloseWin"
+#define CMD_SID_CLOSING ".uno:Closing"
+#define CMD_SID_DOCINFO_COMMENTS ".uno:Comments"
+#define CMD_SID_OFFICE_COMMERCIAL_USE ".uno:CommercialUse"
+#define CMD_SID_DOCUMENT_COMPARE ".uno:CompareDocuments"
+#define CMD_SID_BASICCOMPILE ".uno:CompileBasic"
+#define CMD_SID_CONFIG ".uno:ConfigureDialog"
+#define CMD_SID_CONTEXT ".uno:Context"
+#define CMD_SID_COPY ".uno:Copy"
+#define CMD_SID_CRASH ".uno:Crash"
+#define CMD_SID_BASICIDE_CREATEMACRO ".uno:CreateMacro"
+#define CMD_SID_CURRENT_URL ".uno:CurrentURL"
+#define CMD_SID_CURSORENDOFSCREEN ".uno:CursorEndOfScreen"
+#define CMD_SID_CURSORTOPOFSCREEN ".uno:CursorTopOfScreen"
+#define CMD_SID_OFFICE_CUSTOMERNUMBER ".uno:CustomerNumber"
+#define CMD_SID_CUT ".uno:Cut"
+#define CMD_SID_DEFAULTFILEPATH ".uno:DefaultFilePath"
+#define CMD_SID_DEFAULTFILENAME ".uno:DefaultFileName"
+#define CMD_SID_DELETE ".uno:Delete"
+#define CMD_SID_BASICIDE_DELETECURRENT ".uno:DeleteCurrent"
+#define CMD_SID_STYLE_DELETE ".uno:DeleteStyle"
+#define CMD_SID_STYLE_DESIGNER ".uno:DesignerDialog"
+#define CMD_SID_STYLE_DRAGHIERARCHIE ".uno:DragHierarchy"
+#define CMD_SID_EDITDOC ".uno:EditDoc"
+#define CMD_SID_BASICIDE_EDITMACRO ".uno:EditMacro"
+#define CMD_SID_STYLE_EDIT ".uno:EditStyle"
+#define CMD_FID_SEARCH_NOW ".uno:ExecuteSearch"
+#define CMD_SID_EXTENDEDHELP ".uno:ExtendedHelp"
+#define CMD_SID_FILE_NAME ".uno:FileName"
+#define CMD_SID_FOCUSURLBOX ".uno:FocusUrlBox"
+#define CMD_SID_FORMATMENU ".uno:FormatMenu"
+#define CMD_SID_STYLE_FAMILY3 ".uno:FrameStyle"
+#define CMD_SID_FRAMETITLE ".uno:FrameTitle"
+#define CMD_SID_PROGFILENAME ".uno:FullName"
+#define CMD_SID_DOCFULLNAME ".uno:FullName"
+#define CMD_SID_WIN_FULLSCREEN ".uno:FullScreen"
+#define CMD_SID_FILLFRAME ".uno:GetFrameWindow"
+#define CMD_SID_CURSORDOWN ".uno:GoDown"
+#define CMD_SID_CURSORPAGEDOWN ".uno:GoDownBlock"
+#define CMD_SID_CURSORPAGEDOWN_SEL ".uno:GoDownBlockSel"
+#define CMD_SID_CURSORDOWN_SEL ".uno:GoDownSel"
+#define CMD_SID_CURSORLEFT ".uno:GoLeft"
+#define CMD_SID_CURSORPAGELEFT ".uno:GoLeftBlock"
+#define CMD_SID_CURSORPAGELEFT_SEL ".uno:GoLeftBlockSel"
+#define CMD_SID_CURSORLEFT_SEL ".uno:GoLeftSel"
+#define CMD_SID_CURSORRIGHT ".uno:GoRight"
+#define CMD_SID_CURSORRIGHT_SEL ".uno:GoRightSel"
+#define CMD_SID_CURSORENDOFFILE ".uno:GoToEndOfData"
+#define CMD_SID_CURSORENDOFFILE_SEL ".uno:GoToEndOfDataSel"
+#define CMD_SID_CURSOREND ".uno:GoToEndOfRow"
+#define CMD_SID_CURSOREND_SEL ".uno:GoToEndOfRowSel"
+#define CMD_SID_CURSORTOPOFFILE ".uno:GoToStart"
+#define CMD_SID_CURSORHOME ".uno:GoToStartOfRow"
+#define CMD_SID_CURSORHOME_SEL ".uno:GoToStartOfRowSel"
+#define CMD_SID_CURSORTOPOFFILE_SEL ".uno:GoToStartSel"
+#define CMD_SID_CURSORUP ".uno:GoUp"
+#define CMD_SID_CURSORPAGEUP ".uno:GoUpBlock"
+#define CMD_SID_CURSORPAGEUP_SEL ".uno:GoUpBlockSel"
+#define CMD_SID_CURSORUP_SEL ".uno:GoUpSel"
+#define CMD_SID_HELP_ANNOTATE ".uno:HelpAnnotate"
+#define CMD_SID_HELP_BOOKMARK ".uno:HelpBookmark"
+#define CMD_SID_HELP_HELPFILEBOX ".uno:HelpChooseFile"
+#define CMD_SID_HELP_DOWNLOAD ".uno:HelpDownload"
+#define CMD_SID_HELP_PI ".uno:HelperDialog"
+#define CMD_SID_HELPINDEX ".uno:HelpIndex"
+#define CMD_SID_HELPMENU ".uno:HelpMenu"
+#define CMD_SID_HELPONHELP ".uno:HelpOnHelp"
+#define CMD_SID_HELP_SEARCH ".uno:HelpSearch"
+#define CMD_SID_HELPTIPS ".uno:HelpTip"
+#define CMD_SID_HELP_ZOOMIN ".uno:HelpZoomIn"
+#define CMD_SID_HELP_ZOOMOUT ".uno:HelpZoomOut"
+#define CMD_SID_BASICIDE_HIDECURPAGE ".uno:HideCurPage"
+#define CMD_SID_HYPERLINK_DIALOG ".uno:HyperlinkDialog"
+#define CMD_SID_INSERTDOC ".uno:InsertDoc"
+#define CMD_SID_HYPERLINK_INSERT ".uno:InsertHyperlink"
+#define CMD_SID_INSERT_FLOATINGFRAME ".uno:InsertObjectFloatingFrame"
+#define CMD_SID_INTERNET_ONLINE ".uno:InternetOnline"
+#define CMD_SID_INTERNET_SEARCH ".uno:InternetSearch"
+#define CMD_SID_DOC_LOADING ".uno:IsLoading"
+#define CMD_SID_IMG_LOADING ".uno:IsLoadingImages"
+#define CMD_SID_PRINTOUT ".uno:IsPrinting"
+#define CMD_SID_JUMPTOMARK ".uno:JumpToMark"
+#define CMD_SID_DOCINFO_KEYWORDS ".uno:Keywords"
+#define CMD_SID_BASICIDE_LIBLOADED ".uno:LibLoaded"
+#define CMD_SID_BASICIDE_LIBREMOVED ".uno:LibRemoved"
+#define CMD_SID_BASICIDE_LIBSELECTED ".uno:LibSelect"
+#define CMD_SID_BASICIDE_LIBSELECTOR ".uno:LibSelector"
+#define CMD_SID_OFFICE_PLK ".uno:LicenceKey"
+#define CMD_SID_CONFIGACCEL ".uno:LoadAccel"
+#define CMD_SID_BASICLOAD ".uno:LoadBasic"
+#define CMD_SID_LOADCONFIG ".uno:LoadConfiguration"
+#define CMD_SID_CONFIGEVENT ".uno:LoadEvents"
+#define CMD_SID_CONFIGMENU ".uno:LoadMenu"
+#define CMD_SID_CONFIGSTATUSBAR ".uno:LoadStatusBar"
+#define CMD_SID_TOOLBOXOPTIONS ".uno:LoadToolBox"
+#define CMD_SID_LOGOUT ".uno:Logout"
+#define CMD_SID_SCRIPTORGANIZER ".uno:ScriptOrganizer"
+#define CMD_SID_MACROORGANIZER ".uno:MacroOrganizer"
+#define CMD_SID_RUNMACRO ".uno:RunMacro"
+#define CMD_SID_BASICCHOOSER ".uno:MacroDialog"
+#define CMD_SID_MAIL_NOTIFY ".uno:MailReceipt"
+#define CMD_SID_MAIL_CHILDWIN ".uno:MailWindow"
+#define CMD_SID_BASICIDE_MATCHGROUP ".uno:MatchGroup"
+#define CMD_SID_TOGGLE_MENUBAR ".uno:MenuBarVisible"
+#define CMD_SID_DOCUMENT_MERGE ".uno:MergeDocuments"
+#define CMD_SID_ATTR_METRIC ".uno:MetricUnit"
+#define CMD_SID_MODIFIED ".uno:Modified"
+#define CMD_SID_DOC_MODIFIED ".uno:ModifiedStatus"
+#define CMD_SID_BASICIDE_MODULEDLG ".uno:ModuleDialog"
+#define CMD_SID_BASICIDE_NAMECHANGEDONTAB ".uno:NameChangedOnTab"
+#define CMD_SID_NAVIGATOR ".uno:Navigator"
+#define CMD_SID_RESTORE_EDITING_VIEW ".uno:RestoreEditingView"
+#define CMD_SID_BASICIDE_NEWDIALOG ".uno:NewDialog"
+#define CMD_SID_BASICIDE_NEWMODULE ".uno:NewModule"
+#define CMD_SID_CREATE_BASICOBJECT ".uno:NewObject"
+#define CMD_SID_STYLE_NEW ".uno:NewStyle"
+#define CMD_SID_NEWWINDOW ".uno:NewWindow"
+#define CMD_SID_BASICIDE_OBJCAT ".uno:ObjectCatalog"
+#define CMD_SID_OBJECT ".uno:ObjectMenue"
+#define CMD_SID_OLD_PALK ".uno:OldPALK"
+#define CMD_SID_OPENDOC ".uno:Open"
+#define CMD_SID_WEBHTML ".uno:WebHtml"
+#define CMD_SID_OPENHYPERLINK ".uno:OpenHyperlink"
+#define CMD_SID_DOCINFO_TITLE ".uno:DocInfoTitle"
+#define CMD_SID_OPENTEMPLATE ".uno:OpenTemplate"
+#define CMD_SID_OPENURL ".uno:OpenUrl"
+#define CMD_SID_OPTIONS ".uno:Options"
+#define CMD_SID_ORGANIZER ".uno:Organizer"
+#define CMD_SID_STYLE_FAMILY4 ".uno:PageStyle"
+#define CMD_SID_STYLE_FAMILY2 ".uno:ParaStyle"
+#define CMD_SID_PARTWIN ".uno:PartWindow"
+#define CMD_SID_PASTE ".uno:Paste"
+#define CMD_SID_CLIPBOARD_FORMAT_ITEMS ".uno:ClipboardFormatItems"
+#define CMD_SID_PASTE_SPECIAL ".uno:PasteSpecial"
+#define CMD_SID_DOCPATH ".uno:DocPath"
+#define CMD_SID_PICKLIST ".uno:PickList"
+#define CMD_SID_PLAYMACRO ".uno:PlayMacro"
+#define CMD_SID_PLUGINS_ACTIVE ".uno:PlugInsActive"
+#define CMD_SID_PRINTDOC ".uno:Print"
+#define CMD_SID_PRINTDOCDIRECT ".uno:PrintDefault"
+#define CMD_SID_PRINTER_NAME ".uno:Printer"
+#define CMD_SID_SETUPPRINTER ".uno:PrinterSetup"
+#define CMD_SID_PRINTPREVIEW ".uno:PrintPreview"
+#define CMD_SID_OFFICE_PRIVATE_USE ".uno:PrivateUse"
+#define CMD_SID_DOCINFO ".uno:SetDocumentProperties"
+#define CMD_SID_QUITAPP ".uno:Quit"
+#define CMD_SID_DOC_READONLY ".uno:ReadOnly"
+#define CMD_SID_RECORDMACRO ".uno:MacroRecorder"
+#define CMD_SID_STOP_RECORDING ".uno:StopRecording"
+#define CMD_SID_RECORDING_FLOATWINDOW ".uno:MacroRecordingFloat"
+#define CMD_SID_REDO ".uno:Redo"
+#define CMD_SID_DELETE_BASICOBJECT ".uno:ReleaseObject"
+#define CMD_SID_RELOAD ".uno:Reload"
+#define CMD_SID_BASICIDE_REMOVEWATCH ".uno:RemoveWatch"
+#define CMD_SID_BASICIDE_RENAMECURRENT ".uno:RenameCurrent"
+#define CMD_SID_REPAINT ".uno:Repaint"
+#define CMD_SID_REPEAT ".uno:RepeatAction"
+#define CMD_SID_RUBY_DIALOG ".uno:RubyDialog"
+#define CMD_SID_BASICRUN ".uno:RunBasic"
+#define CMD_SID_STARTSW ".uno:RunStarWriter"
+#define CMD_SID_SAVEDOC ".uno:Save"
+#define CMD_SID_SAVEDOCS ".uno:SaveAll"
+#define CMD_SID_SAVEASDOC ".uno:SaveAs"
+#define CMD_SID_DOCTEMPLATE ".uno:SaveAsTemplate"
+#define CMD_SID_BASICSAVEAS ".uno:SaveBasicAs"
+#define CMD_SID_EXPORT_DIALOG ".uno:ExportDialog"
+#define CMD_SID_IMPORT_DIALOG ".uno:ImportDialog"
+#define CMD_SID_SAVECONFIG ".uno:SaveConfiguration"
+#define CMD_SID_DOC_SAVED ".uno:Saved"
+#define CMD_SID_BASICIDE_SBXDELETED ".uno:SbxDeleted"
+#define CMD_SID_BASICIDE_SBXINSERTED ".uno:SbxInserted"
+#define CMD_SID_BASICIDE_SBXRENAMED ".uno:SbxRenamed"
+#define CMD_SID_MAIL_SCROLLBODY_PAGEDOWN ".uno:ScrollBodyPageDown"
+#define CMD_SID_SEARCH_DLG ".uno:SearchDialog"
+#define CMD_SID_SEARCH_OPTIONS ".uno:SearchOptions"
+#define CMD_SID_SEARCH_ITEM ".uno:SearchProperties"
+#define CMD_SID_SELECTALL ".uno:SelectAll"
+#define CMD_FN_FAX ".uno:SendFax"
+#define CMD_SID_MAIL_SENDDOC ".uno:SendMail"
+#define CMD_SID_MAIL_SENDDOCASPDF ".uno:SendMailDocAsPDF"
+#define CMD_SID_MAIL_SENDDOCASFORMAT ".uno:SendMailDocAsFormat"
+#define CMD_SID_MAIL_SENDDOCASMS ".uno:SendMailDocAsMS"
+#define CMD_SID_MAIL_SENDDOCASOOO ".uno:SendMailDocAsOOo"
+#define CMD_SID_SETOPTIONS ".uno:SetOptions"
+#define CMD_SID_OFFICE_PALK ".uno:SetPALK"
+#define CMD_SID_SHOW_BROWSER ".uno:ShowBrowser"
+#define CMD_SID_SHOWPOPUPS ".uno:ShowPopups"
+#define CMD_SID_BASICIDE_SHOWSBX ".uno:ShowSbx"
+#define CMD_SID_SOURCEVIEW ".uno:SourceView"
+#define CMD_SID_ONLINE_REGISTRATION_DLG ".uno:StartRegistrationDialog"
+#define CMD_SID_STATUSBARTEXT ".uno:StatusBar"
+#define CMD_SID_TOGGLESTATUSBAR ".uno:StatusBarVisible"
+#define CMD_SID_BASICIDE_STAT_DATE ".uno:StatusGetDate"
+#define CMD_SID_BASICIDE_STAT_POS ".uno:StatusGetPosition"
+#define CMD_SID_BASICIDE_STAT_TITLE ".uno:StatusGetTitle"
+#define CMD_SID_BASICIDE_STOREALLMODULESOURCES ".uno:StoreAllModuleSources"
+#define CMD_SID_BASICIDE_STOREMODULESOURCE ".uno:StoreModuleSource"
+#define CMD_SID_STYLE_APPLY ".uno:StyleApplyState"
+#define CMD_SID_STYLE_CATALOG ".uno:StyleCatalog"
+#define CMD_SID_STYLE_NEW_BY_EXAMPLE ".uno:StyleNewByExample"
+#define CMD_SID_STYLE_UPDATE_BY_EXAMPLE ".uno:StyleUpdateByExample"
+#define CMD_SID_STYLE_WATERCAN ".uno:StyleWatercanMode"
+#define CMD_SID_VIEWSHELL ".uno:SwitchViewShell"
+#define CMD_SID_TASKBAR ".uno:TaskBarVisible"
+#define CMD_SID_STYLE_FAMILY5 ".uno:ListStyle"
+#define CMD_SID_TIPWINDOW ".uno:TipsDialog"
+#define CMD_SID_DOCTITLE ".uno:Title"
+#define CMD_SID_TITLE ".uno:Title"
+#define CMD_SID_BASICIDE_TOGGLEBRKPNT ".uno:ToggleBreakPoint"
+#define CMD_SID_BASICIDE_SHOWWINDOW ".uno:BasicIDEShowWindow"
+#define CMD_SID_EDITMACRO ".uno:ToolsMacroEdit"
+#define CMD_SID_UNDO ".uno:Undo"
+#define CMD_SID_FORMATPAINTBRUSH ".uno:FormatPaintbrush"
+#define CMD_SID_ATTR_UNDO_COUNT ".uno:UndoCount"
+#define CMD_SID_BASICIDE_UPDATEALLMODULESOURCES ".uno:UpdateAllModuleSources"
+#define CMD_SID_BASICIDE_UPDATEMODULESOURCE ".uno:UpdateModuleSource"
+#define CMD_SID_BASICIDE_MANAGEBRKPNTS ".uno:ManageBreakPoints"
+#define CMD_SID_BASICIDE_TOGGLEBRKPNTENABLED ".uno:ToggleBreakPointEnabled"
+#define CMD_SID_UPDATE_VERSION ".uno:UpdateVersion"
+#define CMD_SID_VERSION ".uno:VersionDialog"
+#define CMD_SID_SIGNATURE ".uno:Signature"
+#define CMD_SID_MACRO_SIGNATURE ".uno:MacroSignature"
+#define CMD_SID_VERSION_VISIBLE ".uno:VersionVisible"
+#define CMD_SID_VIEW_DATA_SOURCE_BROWSER ".uno:ViewDataSourceBrowser"
+#define CMD_SID_WIN_VISIBLE ".uno:WinVisible"
+#define CMD_SID_MDIWINDOWLIST ".uno:WindowList"
+#define CMD_SID_ZOOM_IN ".uno:ZoomMinus"
+#define CMD_SID_ZOOM ".uno:Zooming"
+#define CMD_SID_ZOOM_NEXT ".uno:ZoomNext"
+#define CMD_SID_ZOOM_OUT ".uno:ZoomPlus"
+#define CMD_SID_ZOOM_PREV ".uno:ZoomPrevious"
+#define CMD_SID_ZOOM_TOOLBOX ".uno:ZoomToolBox"
+#define CMD_SID_EXPORTDOC ".uno:ExportTo"
+#define CMD_SID_EXPORTDOCASPDF ".uno:ExportToPDF"
+#define CMD_SID_DIRECTEXPORTDOCASPDF ".uno:ExportDirectToPDF"
+#define CMD_SID_IMAGE_ORIENTATION ".uno:ImageOrientation"
+#define CMD_SID_SAVE_VERSION_ON_CLOSE ".uno:SaveVersionOnClose"
+#define CMD_SID_ADDONS ".uno:Addons"
+#define CMD_SID_SHOW_IME_STATUS_WINDOW ".uno:ShowImeStatusWindow"
+#define CMD_SID_UPDATE_CONFIG ".uno:UpdateConfiguration"
+#define CMD_SID_HELP_SUPPORTPAGE ".uno:HelpSupport"
+#define CMD_SID_HELP_TUTORIALS ".uno:HelpTutorials"
+#define CMD_SID_ADDONHELP ".uno:AddonHelp"
+#define CMD_SID_FORMATMENUSTATE ".uno:FormatMenuState"
+#define CMD_SID_INET_DLG ".uno:InternetDialog"
+#define CMD_SID_ONLINE_REGISTRATION ".uno:OnlineRegistrationDlg"
+#define CMD_SID_OFFICE_CHECK_PLZ ".uno:CheckPLZ"
+#define CMD_SID_ADDRESS_DATA_SOURCE ".uno:AutoPilotAddressDataSource"
+#define CMD_FN_BUSINESS_CARD ".uno:InsertBusinessCard"
+#define CMD_FN_LABEL ".uno:InsertLabels"
+#define CMD_FN_XFORMS_INIT ".uno:NewXForms"
+#define CMD_SID_SD_AUTOPILOT ".uno:AutoPilotPresentations"
+#define CMD_SID_NEWSD ".uno:NewPresentation"
+#define CMD_SID_COMP_BIBLIOGRAPHY ".uno:BibliographyComponent"
+#define CMD_SID_MINIMIZED ".uno:Minimized"
+#define CMD_SID_AUTO_CORRECT_DLG ".uno:AutoCorrectDlg"
+#define CMD_SID_OPTIONS_TREEDIALOG ".uno:OptionsTreeDialog"
+#define CMD_SID_TERMINATE_INPLACEACTIVATION ".uno:TerminateInplaceActivation"
+#define CMD_SID_RECENTFILELIST ".uno:RecentFileList"
+#define CMD_SID_AVAILABLE_TOOLBARS ".uno:AvailableToolbars"
+#define CMD_SID_AVMEDIA_PLAYER ".uno:AVMediaPlayer"
+#define CMD_SID_INSERT_AVMEDIA ".uno:InsertAVMedia"
+#define CMD_SID_MORE_DICTIONARIES ".uno:MoreDictionaries"
+#define CMD_SID_ACTIVATE_STYLE_APPLY ".uno:ActivateStyleApply"
+#define CMD_SID_DOCKWIN_0 ".uno:DockingWindow0"
+#define CMD_SID_DOCKWIN_1 ".uno:DockingWindow1"
+#define CMD_SID_DOCKWIN_2 ".uno:DockingWindow2"
+#define CMD_SID_DOCKWIN_3 ".uno:DockingWindow3"
+#define CMD_SID_DOCKWIN_4 ".uno:DockingWindow4"
+#define CMD_SID_DOCKWIN_5 ".uno:DockingWindow5"
+#define CMD_SID_DOCKWIN_6 ".uno:DockingWindow6"
+#define CMD_SID_DOCKWIN_7 ".uno:DockingWindow7"
+#define CMD_SID_DOCKWIN_8 ".uno:DockingWindow8"
+#define CMD_SID_DOCKWIN_9 ".uno:DockingWindow9"
+#define CMD_SID_PASTE_UNFORMATTED ".uno:PasteUnformatted"
+
+#endif
diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx
index b6eaeb9c0d..cab0c677ca 100644
--- a/sfx2/inc/sfx2/sfxdlg.hxx
+++ b/sfx2/inc/sfx2/sfxdlg.hxx
@@ -133,10 +133,10 @@ public:
const String *pUserButtonText=0 ) = 0;
virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0;
virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0;
- virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId,
+ virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor,
const SvObjectServerList* pList = 0 )=0;
- virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, USHORT nSlotId,
+ virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand,
const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0;
virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0;
virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML=FALSE, sfx2::SvBaseLink* p=0 )=0;
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 457dbad41c..2a4b77b3d1 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -421,7 +421,6 @@
#define SID_INSERT_PLUGIN (SID_SFX_START + 672)
#define SID_INSERT_SOUND (SID_SFX_START + 676)
#define SID_INSERT_VIDEO (SID_SFX_START + 677)
-#define SID_INSERT_APPLET (SID_SFX_START + 673)
#define SID_HYPERLINK_DIALOG (SID_SFX_START + 678)
diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx
index f173d6aac7..924f3e16c4 100644
--- a/sfx2/inc/sfx2/titledockwin.hxx
+++ b/sfx2/inc/sfx2/titledockwin.hxx
@@ -76,7 +76,7 @@ namespace sfx2
@return
the ID of the newly created toolbox item
*/
- USHORT AddDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback )
+ USHORT AddDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback )
{
return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback );
}
@@ -126,7 +126,7 @@ namespace sfx2
/** internal version of AddDropDownToolBoxItem
*/
- USHORT impl_addDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback );
+ USHORT impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback );
/** returns the current title.
diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx
index 3e61b8ee18..ff08edbd66 100644
--- a/sfx2/inc/sfxhelp.hxx
+++ b/sfx2/inc/sfxhelp.hxx
@@ -45,12 +45,11 @@ class SFX2_DLLPUBLIC SfxHelp : public Help
SfxHelp_Impl* pImp;
private:
- SAL_DLLPRIVATE virtual BOOL Start( ULONG nHelpId, const Window* pWindow );
+ SAL_DLLPRIVATE BOOL Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword );
+ SAL_DLLPRIVATE virtual BOOL SearchKeyword( const XubString& rKeyWord );
SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow );
- SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId );
-
+ SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId );
SAL_DLLPRIVATE String GetHelpModuleName_Impl();
- SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName );
SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName );
public:
@@ -60,12 +59,11 @@ public:
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 );
- static String CreateHelpURL( ULONG nHelpId, const String& rModuleName );
static String CreateHelpURL( const String& aCommandURL, const String& rModuleName );
- static void OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId );
+ using Help::OpenHelpAgent;
+ static void OpenHelpAgent( SfxFrame* pFrame, const rtl::OString& sHelpId );
static String GetDefaultHelpModule();
static ::rtl::OUString GetCurrentModuleIdentifier();
};
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index df825c4ef1..53ad04a78a 100755..100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -6411,7 +6411,7 @@ SfxBoolItem TaskBarVisible SID_TASKBAR
]
//--------------------------------------------------------------------------
-SfxTemplateItem TemplateFamily5 SID_STYLE_FAMILY5
+SfxTemplateItem ListStyle SID_STYLE_FAMILY5
[
/* flags: */
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index e1c43c072e..0883e30f30 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -626,169 +626,6 @@ String RID_ENVTOOLBOX
Text [ en-US ] = "Function Bar" ;
};
-ToolBox RID_ENVTOOLBOX
-{
- HelpId = RID_ENVTOOLBOX ;
- ButtonType = BUTTON_SYMBOL ;
- LineSpacing = TRUE ;
- Border = TRUE ;
- Scroll = TRUE ;
- SVLook = TRUE ;
- Dockable = TRUE ;
- Moveable = TRUE ;
- Sizeable = TRUE ;
- Closeable = TRUE ;
- Zoomable = TRUE ;
- Customize = TRUE ;
- FloatingMode = FALSE ;
- Hide = TRUE ;
- HideWhenDeactivate = TRUE ;
- Align = BOXALIGN_TOP ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = SID_OPENURL ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_NEWDOCDIRECT ;
- DropDown = TRUE;
- };
- ToolBoxItem
- {
- Identifier = SID_NEWDOC ;
- Hide = TRUE;
- };
- ToolBoxItem
- {
- Identifier = SID_OPENDOC ;
- };
- ToolBoxItem
- {
- Identifier = SID_SAVEDOC ;
- };
- ToolBoxItem
- {
- Identifier = SID_SAVEASDOC ;
- Hide = TRUE;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_EDITDOC ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_DIRECTEXPORTDOCASPDF ;
- };
- ToolBoxItem
- {
- Identifier = SID_PRINTDOCDIRECT ;
- };
- ToolBoxItem
- {
- Identifier = FN_FAX ;
- Hide = TRUE;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_CUT ;
- };
- ToolBoxItem
- {
- Identifier = SID_COPY ;
- };
- ToolBoxItem
- {
- Identifier = SID_PASTE ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_UNDO ;
- };
- ToolBoxItem
- {
- Identifier = SID_REDO ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_NAVIGATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_STYLE_DESIGNER ;
- };
- ToolBoxItem
- {
- Identifier = SID_HYPERLINK_DIALOG ;
- };
- ToolBoxItem
- {
- Identifier = SID_HYPERLINK_INSERT ;
- Hide = TRUE;
- };
- ToolBoxItem
- {
- Identifier = SID_WIN_FULLSCREEN ;
- Hide = TRUE;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_RECORDMACRO;
- Hide = TRUE;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_GALLERY ;
- };
- ToolBoxItem
- {
- Identifier = SID_AVMEDIA_PLAYER ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_CLOSEDOC;
- Hide = TRUE;
- };
- };
-};
-
String RID_SPECIALCONFIG_ERROR
{
Text [ en-US ] = "An error has occurred in the special configuration.\nPlease contact your administrator." ;
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 44b970e82b..7ec3ea7eb8 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -58,8 +58,6 @@
#include <sfx2/sfxsids.hrc>
#include <sot/exchange.hxx>
-//#include <svtools/agprop.hxx>
-//#include <sj2/sjapplet.hxx>
#include <svl/isethint.hxx>
#include <unotools/configmgr.hxx>
@@ -828,22 +826,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
#endif
}
- // INet Session neu aufsetzen
- if ( bResetSession )
- {
- // no more sj2
- #if 0
- try
- {
- SjApplet2::settingsChanged();
- }
- catch ( ... )
- {
- DBG_ERRORFILE( "SjApplet2::settingsChanged() throws an exception" );
- }
- #endif
- }
-
// geaenderte Daten speichern
aInetOptions.flush();
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 2f4c757121..8cb0918ff8 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -346,11 +346,10 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Help* pHelp = Application::GetHelp();
if ( pHelp )
{
- ULONG nHelpId = ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE ) ? 66056 : 0;
- if ( 66056 == nHelpId )
+ if ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE )
{
// show Support page with new URL
- String sHelpURL = SfxHelp::CreateHelpURL( nHelpId, String() );
+ String sHelpURL = SfxHelp::CreateHelpURL( String::CreateFromAscii(".uno:HelpSupport"), String() );
String sParams = sHelpURL.Copy( sHelpURL.Search( '?' ) );
sHelpURL = String::CreateFromAscii("vnd.sun.star.help://shared/text/shared/05/00000001.xhp");
sHelpURL += sParams;
@@ -358,7 +357,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
pHelp->Start( sHelpURL, NULL );
}
else
- pHelp->Start( nHelpId, NULL ); // show start page
+ pHelp->Start( String::CreateFromAscii(".uno:HelpIndex"), NULL ); // show start page
bDone = TRUE;
}
break;
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 3768fe1409..5384d11ead 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -134,7 +134,6 @@ using namespace ::com::sun::star::io;
#include "brokenpackageint.hxx"
#include "eventsupplier.hxx"
#include "xpackcreator.hxx"
-// #include "applet.hxx"
#include "plugin.hxx"
#include "iframe.hxx"
#include <ownsubfilterservice.hxx>
diff --git a/sfx2/source/appl/dde.src b/sfx2/source/appl/dde.src
index 9b87bb94e6..4c846078ae 100644
--- a/sfx2/source/appl/dde.src
+++ b/sfx2/source/appl/dde.src
@@ -29,6 +29,7 @@
ModalDialog MD_DDE_LINKEDIT
{
+ HelpID = "sfx2:ModalDialog:MD_DDE_LINKEDIT";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 223 , 74 ) ;
@@ -42,6 +43,7 @@ ModalDialog MD_DDE_LINKEDIT
};
Edit ED_DDE_APP
{
+ HelpID = "sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_APP";
Border = TRUE ;
Pos = MAP_APPFONT ( 55 , 14 ) ;
Size = MAP_APPFONT ( 100 , 12 ) ;
@@ -54,6 +56,7 @@ ModalDialog MD_DDE_LINKEDIT
};
Edit ED_DDE_TOPIC
{
+ HelpID = "sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_TOPIC";
Border = TRUE ;
Pos = MAP_APPFONT ( 55 , 32 ) ;
Size = MAP_APPFONT ( 100 , 12 ) ;
@@ -66,6 +69,7 @@ ModalDialog MD_DDE_LINKEDIT
};
Edit ED_DDE_ITEM
{
+ HelpID = "sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_ITEM";
Border = TRUE ;
Pos = MAP_APPFONT ( 55 , 50 ) ;
Size = MAP_APPFONT ( 100 , 12 ) ;
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index ecf471ce68..e7f15659ca 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2138,7 +2138,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
- if ( aOnStartupCB.GetHelpId() == 0 )
+ if ( !aOnStartupCB.GetHelpId().getLength() )
aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX );
}
@@ -2640,7 +2640,7 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
aMenu.InsertSeparator();
aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ),
Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) );
- aMenu.SetHelpId( TBI_COPY, SID_COPY );
+ aMenu.SetHelpId( TBI_COPY, ".uno:Copy" );
aMenu.EnableItem( TBI_COPY, HasSelection() );
if ( bIsDebug )
@@ -3180,7 +3180,7 @@ void SfxHelpWindow_Impl::openDone(const ::rtl::OUString& sURL ,
xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("PreventHelpTips"), aBoolAny );
xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowGraphics"), aBoolAny );
xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowTables"), aBoolAny );
- xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("HelpURL"), makeAny( DEFINE_CONST_OUSTRING("HID:68245") ) );
+ xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("HelpURL"), makeAny( DEFINE_CONST_OUSTRING("HID:SFX2_HID_HELP_ONHELP") ) );
::rtl::OUString sProperty( DEFINE_CONST_OUSTRING("IsExecuteHyperlinks") );
if ( xInfo->hasPropertyByName( sProperty ) )
xViewProps->setPropertyValue( sProperty, aBoolAny );
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index cb89ed9231..5b07cc5404 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -93,12 +93,14 @@ TabPage TP_HELP_INDEX
};
ComboBox CB_INDEX
{
+ HelpID = "sfx2:ComboBox:TP_HELP_INDEX:CB_INDEX";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 17 ) ;
Size = MAP_APPFONT ( 108 , 97 ) ;
};
PushButton PB_OPEN_INDEX
{
+ HelpID = "sfx2:PushButton:TP_HELP_INDEX:PB_OPEN_INDEX";
Pos = MAP_APPFONT ( 64 , 115 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Display" ;
@@ -119,6 +121,7 @@ TabPage TP_HELP_SEARCH
};
ComboBox ED_SEARCH
{
+ HelpID = "sfx2:ComboBox:TP_HELP_SEARCH:ED_SEARCH";
Border = TRUE ;
DropDown = TRUE;
Pos = MAP_APPFONT ( 6 , 17 ) ;
@@ -126,30 +129,35 @@ TabPage TP_HELP_SEARCH
};
PushButton PB_SEARCH
{
+ HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_SEARCH";
Pos = MAP_APPFONT ( 101 , 17 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Find";
};
CheckBox CB_FULLWORDS
{
+ HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_FULLWORDS";
Pos = MAP_APPFONT ( 6, 34 ) ;
Size = MAP_APPFONT ( 128 , 10 ) ;
Text [ en-US ] = "~Complete words only";
};
CheckBox CB_SCOPE
{
+ HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_SCOPE";
Pos = MAP_APPFONT ( 6, 47 ) ;
Size = MAP_APPFONT ( 128 , 10 ) ;
Text [ en-US ] = "Find in ~headings only";
};
ListBox LB_RESULT
{
+ HelpID = "sfx2:ListBox:TP_HELP_SEARCH:LB_RESULT";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 60 ) ;
Size = MAP_APPFONT ( 128 , 30 ) ;
};
PushButton PB_OPEN_SEARCH
{
+ HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_OPEN_SEARCH";
Pos = MAP_APPFONT ( 84 , 182 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Display" ;
@@ -170,6 +178,7 @@ TabPage TP_HELP_BOOKMARKS
};
ListBox LB_BOOKMARKS
{
+ HelpID = "sfx2:ListBox:TP_HELP_BOOKMARKS:LB_BOOKMARKS";
Border = TRUE ;
Sort = TRUE;
Pos = MAP_APPFONT ( 6 , 19 ) ;
@@ -177,6 +186,7 @@ TabPage TP_HELP_BOOKMARKS
};
PushButton PB_BOOKMARKS
{
+ HelpID = "sfx2:PushButton:TP_HELP_BOOKMARKS:PB_BOOKMARKS";
Pos = MAP_APPFONT ( 64 , 119 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Display" ;
@@ -337,6 +347,7 @@ String STR_HELP_MENU_TEXT_COPY
};
ModalDialog DLG_HELP_ADDBOOKMARK
{
+ HelpID = "sfx2:ModalDialog:DLG_HELP_ADDBOOKMARK";
Size = MAP_APPFONT ( 208 , 43 ) ;
Text [ en-US ] = "Add to Bookmarks";
MOVEABLE = TRUE ;
@@ -353,6 +364,7 @@ ModalDialog DLG_HELP_ADDBOOKMARK
};
Edit ED_BOOKMARK_TITLE
{
+ HelpID = "sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE";
PosSize = MAP_APPFONT ( 6 , 19 , 140 , 12 ) ;
TABSTOP = TRUE ;
BORDER = TRUE ;
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 5e05ff45aa..0d18659ec6 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -284,12 +284,9 @@ void SvxOpenGraphicDialog::SetCurrentFilter(const String& rStr)
mpImpl->aFileDlg.SetCurrentFilter(rStr);
}
-void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId )
+void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId )
{
mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId );
}
-void SvxOpenGraphicDialog::SetDialogHelpId( const INT32 _nHelpId )
-{
- mpImpl->aFileDlg.SetDialogHelpId( _nHelpId );
-}
+
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index d5e6f24c72..b281b5135b 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -29,7 +29,7 @@
#include "precompiled_sfx2.hxx"
#include "sfxhelp.hxx"
-
+#include <set>
#include <algorithm>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/frame/XFrame.hpp>
@@ -76,6 +76,7 @@
#include <sfx2/sfxuno.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/frame.hxx>
+#include <rtl/string.hxx>
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
@@ -221,13 +222,13 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
class SfxHelpOptions_Impl : public utl::ConfigItem
{
private:
- SvULongsSort* m_pIds;
+ std::set < rtl::OString > m_aIds;
public:
SfxHelpOptions_Impl();
~SfxHelpOptions_Impl();
- BOOL HasId( ULONG nId ) { USHORT nDummy; return m_pIds ? m_pIds->Seek_Entry( nId, &nDummy ) : FALSE; }
+ bool HasId( const rtl::OString& rId ) { return m_aIds.size() ? m_aIds.find( rId ) != m_aIds.end() : false; }
virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
virtual void Commit();
};
@@ -254,7 +255,6 @@ static Sequence< ::rtl::OUString > GetPropertyNames()
SfxHelpOptions_Impl::SfxHelpOptions_Impl()
: ConfigItem( ::rtl::OUString::createFromAscii("Office.SFX/Help") )
- , m_pIds( NULL )
{
Sequence< ::rtl::OUString > aNames = GetPropertyNames();
Sequence< Any > aValues = GetProperties( aNames );
@@ -275,11 +275,15 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl()
::rtl::OUString aCodedList;
if ( pValues[nProp] >>= aCodedList )
{
- String aTmp( aCodedList );
- USHORT nCount = aTmp.GetTokenCount( ',' );
- m_pIds = new SvULongsSort();
- for ( USHORT n=0; n<nCount; n++ )
- m_pIds->Insert( (ULONG) aTmp.GetToken( n, ',' ).ToInt64() );
+ rtl::OString aTmp( aCodedList, aCodedList.getLength(), RTL_TEXTENCODING_UTF8 );
+ sal_Int32 nIndex = 0;
+ do
+ {
+ rtl::OString aToken = aTmp.getToken( 0, ',', nIndex );
+ if ( aToken.getLength() )
+ m_aIds.insert( aToken );
+ }
+ while ( nIndex >= 0 );
}
else {
DBG_ERRORFILE( "Wrong property type!" );
@@ -299,7 +303,6 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl()
SfxHelpOptions_Impl::~SfxHelpOptions_Impl()
{
- delete m_pIds;
}
@@ -326,8 +329,7 @@ public:
~SfxHelp_Impl();
SfxHelpOptions_Impl* GetOptions();
- String GetHelpText( ULONG nHelpId, const String& rModule ); // get "Active Help"
- String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule );
+ static String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule );
sal_Bool HasModule( const ::rtl::OUString& rModule ); // module installed
sal_Bool IsHelpInstalled(); // module list not empty
};
@@ -370,16 +372,6 @@ void SfxHelp_Impl::Load()
}
}
-String SfxHelp_Impl::GetHelpText( ULONG nHelpId, const String& rModule )
-{
- // create help url
- String aHelpURL = SfxHelp::CreateHelpURL( nHelpId, rModule );
- // added 'active' parameter
- aHelpURL.Insert( String( DEFINE_CONST_UNICODE("&Active=true") ), aHelpURL.SearchBackward( '#' ) );
- // load help string
- return SfxContentHelper::GetActiveHelpString( aHelpURL );
-}
-
String SfxHelp_Impl::GetHelpText( const rtl::OUString& aCommandURL, const String& rModule )
{
// create help url
@@ -413,6 +405,199 @@ sal_Bool SfxHelp_Impl::IsHelpInstalled()
}
// class SfxHelp ---------------------------------------------------------
+/* some test code for HID conversion - please don't remove
+
+#include <tools/stream.hxx>
+void TestHids()
+{
+ static const char* aModules[] =
+ {
+ "swriter",
+ "scalc",
+ "simpress",
+ "sdraw",
+ "sdatabase",
+ "smath",
+ "schart",
+ "sbasic"
+ };
+
+ SvFileStream* pOut[] =
+ {
+ 0,0,0,0,0,0,0,0,0
+ };
+
+ String aIn = String::CreateFromAscii("/data/OOo/replacer/hidsin.lst");
+ String aOut = String::CreateFromAscii("/data/OOo/replacer/");
+ SvFileStream aInStrm( aIn, STREAM_READ );
+ ByteString aBuffer;
+ while ( aInStrm.ReadLine( aBuffer ) )
+ {
+ ByteString aHid = aBuffer.GetToken(0, ' ');
+ ByteString aNr = aBuffer.GetToken(1, ' ');
+ bool bFound=false;
+ for (sal_Int32 n= 0; n<8; n++)
+ {
+ bFound = false;
+ String aHelpURL = SfxHelp::CreateHelpURL( String( aNr, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
+ if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
+ {
+ if (!pOut[n])
+ {
+ String aTmp( aOut );
+ aTmp += String( aModules[n], RTL_TEXTENCODING_UTF8 );
+ aTmp += String::CreateFromAscii(".lst");
+ pOut[n] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
+ }
+ pOut[n]->WriteLine( aHid );
+ bFound = true;
+ break;
+ }
+ }
+
+ if (!bFound)
+ {
+ if (!pOut[8])
+ {
+ String aTmp( aOut );
+ aTmp += String( "notfound", RTL_TEXTENCODING_UTF8 );
+ aTmp += String::CreateFromAscii(".lst");
+ pOut[8] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
+ }
+ pOut[8]->WriteLine( aHid );
+ }
+ }
+
+ for (sal_Int32 n= 0; n<9; n++)
+ DELETEZ( pOut[n] );
+}
+
+void TestHids2()
+{
+ static const char* aModules[] =
+ {
+ "swriter",
+ "scalc",
+ "simpress",
+ "smath",
+ "sbasic"
+ };
+
+ String aOut = String::CreateFromAscii("/data/OOo/replacer/");
+ aOut += String::CreateFromAscii("lost.lst");
+ SvFileStream aOutStrm( aOut, STREAM_WRITE | STREAM_TRUNC );
+ for (sal_Int32 n= 0; n<5; n++)
+ {
+ String aIn = String::CreateFromAscii("/data/OOo/replacer/help/");
+ aIn += String::CreateFromAscii( aModules[n] );
+ aIn += String::CreateFromAscii(".lst");
+ SvFileStream aInStrm( aIn, STREAM_READ );
+ ByteString aBuffer;
+ while ( aInStrm.ReadLine( aBuffer ) )
+ {
+ String aHelpURL = SfxHelp::CreateHelpURL( String( aBuffer, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
+ if ( SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
+ aOutStrm.WriteLine( aBuffer );
+ }
+ }
+}
+
+#include <tools/stream.hxx>
+void TestHids3()
+{
+ static const char* aModules[] =
+ {
+ "swriter",
+ "scalc",
+ "simpress",
+ "sdraw",
+ "sdatabase",
+ "smath",
+ "schart",
+ "sbasic"
+ };
+
+ SvFileStream* pOut[] =
+ {
+ 0,0,0,0,0,0,0,0,0
+ };
+
+ String aIn = String::CreateFromAscii("/data/OOo/replacer/hidsin.lst");
+ String aOut = String::CreateFromAscii("/data/OOo/replacer/quickhelp/");
+ SvFileStream aInStrm( aIn, STREAM_READ );
+ ByteString aBuffer;
+ while ( aInStrm.ReadLine( aBuffer ) )
+ {
+ ByteString aHid = aBuffer.GetToken(0, ' ');
+ ByteString aNr = aBuffer.GetToken(1, ' ');
+ bool bFound=false;
+ for (sal_Int32 n= 0; n<8; n++)
+ {
+ bFound = false;
+ String aHelpURL = SfxHelp::CreateHelpURL( String( aNr, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
+ if ( SfxContentHelper::GetActiveHelpString( aHelpURL ).Len() )
+// if ( SfxHelp_Impl::GetHelpText( String( aNr, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) ).Len() )
+ {
+ if (!pOut[n])
+ {
+ String aTmp( aOut );
+ aTmp += String( aModules[n], RTL_TEXTENCODING_UTF8 );
+ aTmp += String::CreateFromAscii(".lst");
+ pOut[n] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
+ }
+ pOut[n]->WriteLine( aHid );
+ bFound = true;
+ break;
+ }
+ }
+
+ if (!bFound)
+ {
+ if (!pOut[8])
+ {
+ String aTmp( aOut );
+ aTmp += String( "notfound", RTL_TEXTENCODING_UTF8 );
+ aTmp += String::CreateFromAscii(".lst");
+ pOut[8] = new SvFileStream( aTmp, STREAM_WRITE | STREAM_TRUNC );
+ }
+ pOut[8]->WriteLine( aHid );
+ }
+ }
+
+ for (sal_Int32 n= 0; n<9; n++)
+ DELETEZ( pOut[n] );
+}
+
+void TestHids4()
+{
+ static const char* aModules[] =
+ {
+ "swriter",
+ "scalc",
+ "simpress",
+ "smath",
+ "sbasic"
+ };
+
+ String aOut = String::CreateFromAscii("/data/OOo/replacer/quickhelp/");
+ aOut += String::CreateFromAscii("lost.lst");
+ SvFileStream aOutStrm( aOut, STREAM_WRITE | STREAM_TRUNC );
+ for (sal_Int32 n= 0; n<5; n++)
+ {
+ String aIn = String::CreateFromAscii("/data/OOo/replacer/quickhelp/");
+ aIn += String::CreateFromAscii( aModules[n] );
+ aIn += String::CreateFromAscii(".lst");
+ SvFileStream aInStrm( aIn, STREAM_READ );
+ ByteString aBuffer;
+ while ( aInStrm.ReadLine( aBuffer ) )
+ {
+ String aHelpURL = SfxHelp::CreateHelpURL( String( aBuffer, RTL_TEXTENCODING_UTF8 ), String( aModules[n], RTL_TEXTENCODING_UTF8 ) );
+ if ( !SfxContentHelper::GetActiveHelpString( aHelpURL ).Len() )
+ aOutStrm.WriteLine( aBuffer );
+ }
+ }
+}
+*/
SfxHelp::SfxHelp() :
@@ -581,76 +766,6 @@ String SfxHelp::GetHelpModuleName_Impl()
return sModuleName;
}
-String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName )
-{
- String aModuleName( rModuleName );
- if ( aModuleName.Len() == 0 )
- aModuleName = getDefaultModule_Impl();
-
- // build up the help URL
- String aHelpURL;
- if ( aTicket.Len() )
- {
- // if there is a ticket, we are inside a plugin, so a special Help URL must be sent
- aHelpURL = DEFINE_CONST_UNICODE("vnd.sun.star.cmd:help?");
- aHelpURL += DEFINE_CONST_UNICODE("HELP_Request_Mode=contextIndex&HELP_Session_Mode=context&HELP_CallMode=portal&HELP_Device=html");
-
- if ( !nHelpId )
- {
- // no help id -> start page
- aHelpURL += DEFINE_CONST_UNICODE("&HELP_ContextID=start");
- }
- else
- {
- aHelpURL += DEFINE_CONST_UNICODE("&HELP_ContextID=");
- aHelpURL += String::CreateFromInt64( nHelpId );
- }
-
- aHelpURL += DEFINE_CONST_UNICODE("&HELP_ProgramID=");
- aHelpURL += aModuleName;
- aHelpURL += DEFINE_CONST_UNICODE("&HELP_User=");
- aHelpURL += aUser;
- aHelpURL += DEFINE_CONST_UNICODE("&HELP_Ticket=");
- aHelpURL += aTicket;
- aHelpURL += DEFINE_CONST_UNICODE("&HELP_Language=");
- aHelpURL += aLanguageStr;
- if ( aCountryStr.Len() )
- {
- aHelpURL += DEFINE_CONST_UNICODE("&HELP_Country=");
- aHelpURL += aCountryStr;
- }
- }
- else
- {
- sal_Bool bHasAnchor = sal_False;
- String aAnchor;
- aHelpURL = String::CreateFromAscii("vnd.sun.star.help://");
- aHelpURL += aModuleName;
-
- if ( !nHelpId )
- aHelpURL += String::CreateFromAscii("/start");
- else
- {
- aHelpURL += '/';
- aHelpURL += String::CreateFromInt64( nHelpId );
-
- String aTempURL = aHelpURL;
- AppendConfigToken_Impl( aTempURL, sal_True );
- bHasAnchor = GetHelpAnchor_Impl( aTempURL, aAnchor );
- }
-
- AppendConfigToken_Impl( aHelpURL, sal_True );
-
- if ( bHasAnchor )
- {
- aHelpURL += '#';
- aHelpURL += aAnchor;
- }
- }
-
- return aHelpURL;
-}
-
String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName )
{
// build up the help URL
@@ -660,28 +775,7 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rMo
String aModuleName( rModuleName );
if ( aModuleName.Len() == 0 )
- {
- // no active module (quicklaunch?) -> detect default module
- SvtModuleOptions aModOpt;
- if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
- aModuleName = DEFINE_CONST_UNICODE("swriter");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
- aModuleName = DEFINE_CONST_UNICODE("scalc");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
- aModuleName = DEFINE_CONST_UNICODE("simpress");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
- aModuleName = DEFINE_CONST_UNICODE("sdraw");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) )
- aModuleName = DEFINE_CONST_UNICODE("smath");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCHART ) )
- aModuleName = DEFINE_CONST_UNICODE("schart");
- else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SBASIC ) )
- aModuleName = DEFINE_CONST_UNICODE("sbasic");
- else
- {
- DBG_ERRORFILE( "no installed module found" );
- }
- }
+ aModuleName = getDefaultModule_Impl();
aHelpURL = String::CreateFromAscii("vnd.sun.star.help://");
aHelpURL += aModuleName;
@@ -694,7 +788,7 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rMo
aHelpURL += String( rtl::Uri::encode( aCommandURL,
rtl_UriCharClassRelSegment,
rtl_UriEncodeKeepEscapes,
- RTL_TEXTENCODING_ASCII_US ));
+ RTL_TEXTENCODING_UTF8 ));
String aTempURL = aHelpURL;
AppendConfigToken_Impl( aTempURL, sal_True );
@@ -762,8 +856,60 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask ,
return pHelpWindow;
}
+XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow )
+{
+ String sModuleName = GetHelpModuleName_Impl();
+ String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName );
+
+ ByteString aNewHelpId;
+
+ if ( pWindow && !sHelpText.Len() )
+ {
+ // no help text found -> try with parent help id.
+ Window* pParent = pWindow->GetParent();
+ while ( pParent )
+ {
+ aNewHelpId = pParent->GetHelpId();
+ sHelpText = pImp->GetHelpText( String( aNewHelpId, RTL_TEXTENCODING_UTF8 ), sModuleName );
+ if ( sHelpText.Len() > 0 )
+ pParent = NULL;
+ else
+ pParent = pParent->GetParent();
+ }
+
+ if ( bIsDebug && !sHelpText.Len() )
+ aNewHelpId.Erase();
+ }
+
+ // add some debug information?
+ if ( bIsDebug )
+ {
+ sHelpText += DEFINE_CONST_UNICODE("\n-------------\n");
+ sHelpText += String( sModuleName );
+ sHelpText += DEFINE_CONST_UNICODE(": ");
+ sHelpText += aCommandURL;
+ if ( aNewHelpId.Len() )
+ {
+ sHelpText += DEFINE_CONST_UNICODE(" - ");
+ sHelpText += String( aNewHelpId, RTL_TEXTENCODING_UTF8 );
+ }
+ }
+
+ return sHelpText;
+}
+
+BOOL SfxHelp::SearchKeyword( const XubString& rKeyword )
+{
+ return Start_Impl( String(), NULL, rKeyword );
+}
+
BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
{
+ return Start_Impl( rURL, pWindow, String() );
+}
+
+BOOL SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword )
+{
// check if help is available
String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
AppendConfigToken_Impl( aHelpRootURL, sal_True );
@@ -776,54 +922,60 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
return FALSE;
}
- // check if it's an URL or a jump mark!
- String aHelpURL(rURL );
- INetURLObject aParser (aHelpURL);
- ::rtl::OUString sKeyword;
+ /* rURL may be
+ - a "real" URL
+ - a HelpID (formerly a long, now a string)
+ If rURL is a URL, CreateHelpURL should be called for this URL
+ If rURL is an arbitrary string, the same should happen, but the URL should be tried out
+ if it delivers real help content. In case only the Help Error Document is returned, the
+ parent of the window for that help was called, is asked for its HelpID.
+ For compatibility reasons this upward search is not implemented for "real" URLs.
+ Help keyword search now is implemented as own method; in former versions it
+ was done via Help::Start, but this implementation conflicted with the upward search.
+ */
+ String aHelpURL;
+ INetURLObject aParser( rURL );
INetProtocol nProtocol = aParser.GetProtocol();
- if ( nProtocol != INET_PROT_VND_SUN_STAR_HELP )
+ String aHelpModuleName( GetHelpModuleName_Impl() );
+ switch ( nProtocol )
{
- // #i90162 Accept anything that is not invalid as help id, as both
- // uno: URLs used as commands/help ids in the Office and the scheme
- // used in extension help ids (e.g. com.foocorp.foo-ext:FooDialogButton)
- // are accepted as INET_PROT_UNO respectively INET_PROT_GENERIC
- bool bAcceptAsURL = ( nProtocol != INET_PROT_NOT_VALID );
-
- // #i94891 As in some extensions help ids like foo.bar.dummy without
- // any : have been used that worked before the fix of #i90162 (see
- // above) strings containing . will be also accepted to avoid brea-
- // king the help of existing extensions.
- if( !bAcceptAsURL )
- bAcceptAsURL = ( rURL.Search( '.' ) != STRING_NOTFOUND );
-
- if ( bAcceptAsURL )
+ case INET_PROT_VND_SUN_STAR_HELP:
+ // already a vnd.sun.star.help URL -> nothing to do
+ aHelpURL = rURL;
+ break;
+ default:
{
- aHelpURL = CreateHelpURL_Impl( rURL, GetHelpModuleName_Impl( ) );
- }
- else
- {
- aHelpURL = CreateHelpURL_Impl( 0, GetHelpModuleName_Impl( ) );
-
- // pb i91715: strings begin with ".HelpId:" are not words of the basic ide
- // they are helpid-strings used by the testtool -> so we ignore them
- static const String sHelpIdScheme( DEFINE_CONST_OUSTRING(".HelpId:") );
- if ( rURL.Search( sHelpIdScheme ) != 0 )
- sKeyword = ::rtl::OUString( rURL );
+ // no URL, just a HelpID (maybe empty in case of keyword search)
+ aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName );
+ if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
+ {
+ // no help found -> try with parent help id.
+ Window* pParent = pWindow->GetParent();
+ while ( pParent )
+ {
+ ByteString aHelpId = pParent->GetHelpId();
+ aHelpURL = CreateHelpURL( String( aHelpId, RTL_TEXTENCODING_UTF8 ), aHelpModuleName );
+ if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
+ break;
+ else
+ {
+ pParent = pParent->GetParent();
+ if ( !pParent )
+ // create help url of start page ( helpid == 0 -> start page)
+ aHelpURL = CreateHelpURL( String(), aHelpModuleName );
+ }
+ }
+ }
+ break;
}
}
Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
- // check if help is still open
- // If not - create new one and return acces directly
- // to the internal sub frame, which shows the help content.
-
- // Note further: We search for this sub frame here directly instead of
- // the real top level help task ... It's needed to have the same
- // sub frame available - so we can use it for loading (which is done
- // in both cases)!
-
+ // check if help window is still open
+ // If not, create a new one and return access directly to the internal sub frame showing the help content
+ // search must be done here; search one desktop level could return an arbitraty frame
Reference< XFrame > xHelp = xDesktop->findFrame(
::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")),
FrameSearchFlag::CHILDREN);
@@ -839,10 +991,16 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow)
return FALSE;
+#ifdef DBG_UTIL
+ ByteString aTmp("SfxHelp: HelpId = ");
+ aTmp += ByteString( aHelpURL, RTL_TEXTENCODING_UTF8 );
+ DBG_TRACE( aTmp.GetBuffer() );
+#endif
+
pHelpWindow->SetHelpURL( aHelpURL );
pHelpWindow->loadHelpContent(aHelpURL);
- if ( sKeyword.getLength() > 0 )
- pHelpWindow->OpenKeyword( sKeyword );
+ if ( rKeyword.Len() )
+ pHelpWindow->OpenKeyword( rKeyword );
Reference < ::com::sun::star::awt::XTopWindow > xTopWindow( xHelp->getContainerWindow(), UNO_QUERY );
if ( xTopWindow.is() )
@@ -851,101 +1009,6 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
return TRUE;
}
-BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow )
-{
- String aHelpModuleName( GetHelpModuleName_Impl() );
- String aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName );
- if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
- {
- // no help found -> try with parent help id.
- Window* pParent = pWindow->GetParent();
- while ( pParent )
- {
- nHelpId = pParent->GetSmartUniqueOrHelpId().GetNum();
- aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName );
-
- if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
- break;
- else
- {
- pParent = pParent->GetParent();
- if ( !pParent )
- // create help url of start page ( helpid == 0 -> start page)
- aHelpURL = CreateHelpURL( 0, aHelpModuleName );
- }
- }
- }
-
- return Start( aHelpURL, pWindow );
-}
-
-XubString SfxHelp::GetHelpText( ULONG nHelpId, const Window* pWindow )
-{
- String aModuleName = GetHelpModuleName_Impl();
- String aHelpText = pImp->GetHelpText( nHelpId, aModuleName );
- ULONG nNewHelpId = 0;
-
- if ( pWindow && aHelpText.Len() == 0 )
- {
- // no help text found -> try with parent help id.
- Window* pParent = pWindow->GetParent();
- while ( pParent )
- {
- nNewHelpId = pParent->GetHelpId();
- aHelpText = pImp->GetHelpText( nNewHelpId, aModuleName );
-
- if ( aHelpText.Len() > 0 )
- pParent = NULL;
- else
- pParent = pParent->GetParent();
- }
-
- if ( bIsDebug && aHelpText.Len() == 0 )
- nNewHelpId = 0;
- }
-
- if ( bIsDebug )
- {
- aHelpText += DEFINE_CONST_UNICODE("\n\n");
- aHelpText += aModuleName;
- aHelpText += DEFINE_CONST_UNICODE(" - ");
- aHelpText += String::CreateFromInt64( nHelpId );
- if ( nNewHelpId )
- {
- aHelpText += DEFINE_CONST_UNICODE(" - ");
- aHelpText += String::CreateFromInt64( nNewHelpId );
- }
- }
-
- return aHelpText;
-}
-
-XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* )
-{
- String sModuleName = GetHelpModuleName_Impl();
- String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName );
-
- // add some debug information?
- if ( bIsDebug )
- {
- sHelpText += DEFINE_CONST_UNICODE("\n-------------\n");
- sHelpText += String( sModuleName );
- sHelpText += DEFINE_CONST_UNICODE(": ");
- sHelpText += aCommandURL;
- }
-
- return sHelpText;
-}
-
-String SfxHelp::CreateHelpURL( ULONG nHelpId, const String& rModuleName )
-{
- String aURL;
- SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
- if ( pHelp )
- aURL = pHelp->CreateHelpURL_Impl( nHelpId, rModuleName );
- return aURL;
-}
-
String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName )
{
String aURL;
@@ -955,28 +1018,25 @@ String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleN
return aURL;
}
-void SfxHelp::OpenHelpAgent( SfxFrame*, ULONG nHelpId )
+void SfxHelp::OpenHelpAgent( SfxFrame*, const rtl::OString& sHelpId )
{
- SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
- if ( pHelp )
- pHelp->OpenHelpAgent( nHelpId );
+ SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
+ if ( pHelp )
+ pHelp->OpenHelpAgent( sHelpId );
}
-void SfxHelp::OpenHelpAgent( ULONG nHelpId )
+void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId )
{
if ( SvtHelpOptions().IsHelpAgentAutoStartMode() )
{
-// SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() );
-// if ( pHelp )
-// {
SfxHelpOptions_Impl *pOpt = pImp->GetOptions();
- if ( !pOpt->HasId( nHelpId ) )
+ if ( !pOpt->HasId( sHelpId ) )
return;
try
{
URL aURL;
- aURL.Complete = CreateHelpURL_Impl( nHelpId, GetHelpModuleName_Impl() );
+ aURL.Complete = CreateHelpURL_Impl( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8 ), GetHelpModuleName_Impl() );
Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ), UNO_QUERY );
xTrans->parseStrict(aURL);
@@ -1002,7 +1062,6 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId )
{
DBG_ERRORFILE( "OpenHelpAgent: caught an exception while executing the dispatch!" );
}
-// }
}
}
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 2549af2a6a..fa3025acab 100644..100755
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -281,7 +281,11 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
if ( !pView )
pView = SfxViewFrame::Current();
if ( pView )
- SfxHelp::OpenHelpAgent( &pView->GetFrame(), rReq.GetSlot() );
+ {
+ rtl::OString aCmd(".uno:");
+ aCmd += rSlot.GetUnoName();
+ SfxHelp::OpenHelpAgent( &pView->GetFrame(), aCmd );
+ }
SfxExecFunc pFunc = rSlot.GetExecFnc();
rShell.CallExec( pFunc, rReq );
@@ -1675,14 +1679,14 @@ void SfxDispatcher::SetMenu_Impl()
}
//--------------------------------------------------------------------
-long SfxDispatcher::Update_Impl( sal_Bool bForce )
+void SfxDispatcher::Update_Impl( sal_Bool bForce )
{
SFX_STACK(SfxDispatcher::Update_Impl);
Flush();
if ( !pImp->pFrame || pImp->bUILocked )
- return 0;
+ return;
SFX_APP(); // -Wall is this required???
SfxDispatcher *pDisp = this;
@@ -1704,7 +1708,7 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce )
}
if ( !bUpdate || pImp->pFrame->GetFrame().IsClosing_Impl() )
- return 0;
+ return;
SfxViewFrame* pTop = pImp->pFrame ? pImp->pFrame->GetTopViewFrame() : NULL;
sal_Bool bUIActive = pTop && pTop->GetBindings().GetDispatcher() == this;
@@ -1778,12 +1782,11 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce )
if ( xLayoutManager.is() )
xLayoutManager->unlock();
- return 1;
+ return;
}
-sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin )
+void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin )
{
- sal_uInt32 nHelpId = 0;
SFX_APP();
SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl();
sal_Bool bIsActive = sal_False;
@@ -1798,7 +1801,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
}
if ( pImp->pParent && !pImp->bQuiet /* && bUIActive */ )
- nHelpId = pImp->pParent->_Update_Impl( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin );
+ pImp->pParent->_Update_Impl( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin );
for (sal_uInt16 n=0; n<SFX_OBJECTBAR_MAX; n++)
pImp->aObjBars[n].nResId = 0;
@@ -1807,7 +1810,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
// bQuiet : own shells aren't considered for UI and SlotServer
// bNoUI: own Shells aren't considered fors UI
if ( pImp->bQuiet || pImp->bNoUI || (pImp->pFrame && pImp->pFrame->GetObjectShell()->IsPreview()) )
- return nHelpId;
+ return;
sal_uInt32 nStatBarId=0;
SfxShell *pStatusBarShell = NULL;
@@ -1818,8 +1821,6 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
{
SfxShell *pShell = GetShell( nShell-1 );
SfxInterface *pIFace = pShell->GetInterface();
- if (pShell->GetHelpId())
- nHelpId = pShell->GetHelpId();
// don't consider shells if "Hidden" oder "Quiet"
sal_Bool bReadOnlyShell = IsReadOnlyShell_Impl( nShell-1 );
@@ -1950,8 +1951,6 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp,
pImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl( nStatBarId, pStatusBarShell, rBindings );
}
}
-
- return nHelpId;
}
//--------------------------------------------------------------------
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index 95ab30d49e..5f26113b4b 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -29,9 +29,6 @@
#include "precompiled_sfx2.hxx"
#include <svl/itempool.hxx>
#include <svl/eitem.hxx>
-#ifndef GCC
-#endif
-
#include <sfx2/msg.hxx>
//====================================================================
@@ -63,4 +60,16 @@ USHORT SfxSlot::GetWhich( const SfxItemPool &rPool ) const
return nMasterSlotId;
}
+::rtl::OString SfxSlot::GetCommand() const
+{
+ rtl::OString sRet(".uno:");
+ sRet += pUnoName;
+ return sRet;
+}
+
+::rtl::OUString SfxSlot::GetCommandString() const
+{
+ rtl::OString aCmd(GetCommand());
+ return rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 );
+}
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index fba842e129..41f13b6d39 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -55,7 +55,7 @@
#include "sfxresid.hxx"
#include <sfx2/sfxdefs.hxx>
#include <sfx2/app.hxx>
-
+#include <sfx2/sfxcommands.h>
#include "dialog.hrc"
// defines ---------------------------------------------------------------
@@ -283,8 +283,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
FreeResource();
- // explizite Help-Id
- SetHelpId( SID_ABOUT );
+ SetHelpId( CMD_SID_ABOUT );
}
// -----------------------------------------------------------------------
diff --git a/sfx2/source/dialog/alienwarn.src b/sfx2/source/dialog/alienwarn.src
index 1d3bd34c44..df9392b34f 100644
--- a/sfx2/source/dialog/alienwarn.src
+++ b/sfx2/source/dialog/alienwarn.src
@@ -81,6 +81,7 @@ ModalDialog RID_DLG_ALIEN_WARNING
};
CheckBox CB_WARNING_OFF
{
+ HelpID = "sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF";
Pos = MAP_APPFONT( AW_COL_2, AW_ROW_4 );
Size = MAP_APPFONT( DIALOG_WIDTH-AW_COL_2-RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT );
WordBreak = TRUE ;
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index c96fa7008b..7aa488baec 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -160,9 +160,6 @@ void SfxModalDialog::GetDialogData_Impl()
void SfxModalDialog::init()
{
GetDialogData_Impl();
- aTimer.SetTimeout( 100 );
- aTimer.SetTimeoutHdl( LINK( this, SfxModalDialog, TimerHdl_Impl ) );
- aTimer.Start();
}
// -----------------------------------------------------------------------
@@ -214,13 +211,7 @@ SfxModalDialog::~SfxModalDialog()
*/
{
-/*
- SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI();
- if ( pHelpPI )
- pHelpPI->ResetTopic();
-*/
SetDialogData_Impl();
- aTimer.Stop();
delete pOutputSet;
}
@@ -233,16 +224,6 @@ void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool )
// -----------------------------------------------------------------------
-IMPL_LINK( SfxModalDialog, TimerHdl_Impl, Timer*, EMPTYARG )
-{
-/*
- SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI();
- if ( pHelpPI )
- pHelpPI->LoadTopic( GetHelpId() );
- */
- return 0L;
-}
-
void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet )
{
DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" );
@@ -373,9 +354,8 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
{
pImp->pMgr = pCW;
pImp->bConstructed = FALSE;
- sal_uInt32 nId = GetHelpId();
- SetHelpId(0);
- SetUniqueId( nId );
+ SetUniqueId( GetHelpId() );
+ SetHelpId("");
if ( pBindinx )
pImp->StartListening( *pBindinx );
pImp->aMoveTimer.SetTimeout(50);
@@ -393,9 +373,8 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
{
pImp->pMgr = pCW;
pImp->bConstructed = FALSE;
- sal_uInt32 nId = GetHelpId();
- SetHelpId(0);
- SetUniqueId( nId );
+ SetUniqueId( GetHelpId() );
+ SetHelpId("");
if ( pBindinx )
pImp->StartListening( *pBindinx );
pImp->aMoveTimer.SetTimeout(50);
@@ -418,15 +397,15 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt )
pBindings->SetActiveFrame( pImp->pMgr->GetFrame() );
pImp->pMgr->Activate_Impl();
Window* pWindow = rEvt.GetWindow();
- ULONG nHelpId = 0;
- while ( !nHelpId && pWindow )
+ rtl::OString sHelpId;
+ while ( !sHelpId.getLength() && pWindow )
{
- nHelpId = pWindow->GetHelpId();
+ sHelpId = pWindow->GetHelpId();
pWindow = pWindow->GetParent();
}
- if ( nHelpId )
- SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId );
+ if ( sHelpId.getLength() )
+ SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId );
}
else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() )
{
@@ -520,15 +499,15 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt )
pBindings->SetActiveFrame( pImp->pMgr->GetFrame() );
pImp->pMgr->Activate_Impl();
Window* pWindow = rEvt.GetWindow();
- ULONG nHelpId = 0;
- while ( !nHelpId && pWindow )
+ rtl::OString sHelpId;
+ while ( !sHelpId.getLength() && pWindow )
{
- nHelpId = pWindow->GetHelpId();
+ sHelpId = pWindow->GetHelpId();
pWindow = pWindow->GetParent();
}
- if ( nHelpId )
- SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId );
+ if ( sHelpId.getLength() )
+ SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId );
}
else if ( rEvt.GetType() == EVENT_LOSEFOCUS )
{
@@ -561,9 +540,8 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
{
pImp->pMgr = pCW;
pImp->bConstructed = FALSE;
- sal_uInt32 nId = GetHelpId();
- SetHelpId(0);
- SetUniqueId( nId );
+ SetUniqueId( GetHelpId() );
+ SetHelpId("");
if ( pBindinx )
pImp->StartListening( *pBindinx );
pImp->aMoveTimer.SetTimeout(50);
@@ -582,9 +560,8 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
{
pImp->pMgr = pCW;
pImp->bConstructed = FALSE;
- sal_uInt32 nId = GetHelpId();
- SetHelpId(0);
- SetUniqueId( nId );
+ SetUniqueId( GetHelpId() );
+ SetHelpId("");
if ( pBindinx )
pImp->StartListening( *pBindinx );
pImp->aMoveTimer.SetTimeout(50);
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 3290983c5b..9a45eac92d 100755..100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -53,6 +53,7 @@ TabPage TP_DOCINFODESC
};
Edit ED_TITLE
{
+ HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_TITLE";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 6 ) ;
Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -68,6 +69,7 @@ TabPage TP_DOCINFODESC
};
Edit ED_THEMA
{
+ HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_THEMA";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 21 ) ;
Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -83,6 +85,7 @@ TabPage TP_DOCINFODESC
};
Edit ED_KEYWORDS
{
+ HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_KEYWORDS";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 36 ) ;
Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -98,6 +101,7 @@ TabPage TP_DOCINFODESC
};
MultiLineEdit ED_COMMENT
{
+ HelpID = "sfx2:MultiLineEdit:TP_DOCINFODESC:ED_COMMENT";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 51 ) ;
Size = MAP_APPFONT ( 184 , 128 ) ;
@@ -121,6 +125,7 @@ TabPage TP_DOCINFODOC
};
Edit ED_FILE_NAME
{
+ HelpID = "sfx2:Edit:TP_DOCINFODOC:ED_FILE_NAME";
Pos = MAP_APPFONT ( 54 , 12 ) ;
Size = MAP_APPFONT ( 200 , RSC_CD_TEXTBOX_HEIGHT ) ;
Border = TRUE ;
@@ -138,11 +143,13 @@ TabPage TP_DOCINFODOC
};
Edit FT_FILE_SHOW_TYP
{
+ HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_FILE_SHOW_TYP";
Pos = MAP_APPFONT ( 78 , 37 ) ;
Size = MAP_APPFONT ( 106 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
CheckBox CB_FILE_READONLY
{
+ HelpID = "sfx2:CheckBox:TP_DOCINFODOC:CB_FILE_READONLY";
Pos = MAP_APPFONT ( 163 , 37 ) ;
Size = MAP_APPFONT ( 91 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "~Read-only" ;
@@ -155,6 +162,7 @@ TabPage TP_DOCINFODOC
};
Edit FT_FILE_VAL
{
+ HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_FILE_VAL";
Pos = MAP_APPFONT ( 78 , 49 ) ;
Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
@@ -166,6 +174,7 @@ TabPage TP_DOCINFODOC
};
Edit FT_FILE_SHOW_SIZE
{
+ HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_FILE_SHOW_SIZE";
Pos = MAP_APPFONT ( 78 , 61 ) ;
Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
@@ -182,6 +191,7 @@ TabPage TP_DOCINFODOC
};
Edit FT_CREATE_VAL
{
+ HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_CREATE_VAL";
Pos = MAP_APPFONT ( 78 , 80 ) ;
Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
@@ -193,6 +203,7 @@ TabPage TP_DOCINFODOC
};
Edit FT_CHANGE_VAL
{
+ HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_CHANGE_VAL";
Pos = MAP_APPFONT ( 78 , 92 ) ;
Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
@@ -204,11 +215,13 @@ TabPage TP_DOCINFODOC
};
Edit FT_SIGNED_VAL
{
+ HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_SIGNED_VAL";
Pos = MAP_APPFONT ( 78 , 104 ) ;
Size = MAP_APPFONT ( 123 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
PushButton BTN_SIGNATURE
{
+ HelpID = "sfx2:PushButton:TP_DOCINFODOC:BTN_SIGNATURE";
Pos = MAP_APPFONT ( 204 , 101 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "Digital Signature...";
@@ -225,6 +238,7 @@ TabPage TP_DOCINFODOC
};
Edit FT_PRINT_VAL
{
+ HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_PRINT_VAL";
Pos = MAP_APPFONT ( 78 , 116 ) ;
Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
@@ -236,6 +250,7 @@ TabPage TP_DOCINFODOC
};
Edit FT_TIMELOG_VAL
{
+ HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_TIMELOG_VAL";
Pos = MAP_APPFONT ( 78 , 128 ) ;
Size = MAP_APPFONT ( 30 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
@@ -247,11 +262,13 @@ TabPage TP_DOCINFODOC
};
Edit FT_DOCNO_VAL
{
+ HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_DOCNO_VAL";
Pos = MAP_APPFONT ( 78 , 140 ) ;
Size = MAP_APPFONT ( 30 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
PushButton BTN_DELETE
{
+ HelpID = "sfx2:PushButton:TP_DOCINFODOC:BTN_DELETE";
Pos = MAP_APPFONT ( 204 , 150 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Hide = TRUE;
@@ -259,6 +276,7 @@ TabPage TP_DOCINFODOC
};
CheckBox CB_USE_USERDATA
{
+ HelpID = "sfx2:CheckBox:TP_DOCINFODOC:CB_USE_USERDATA";
Pos = MAP_APPFONT ( 6 , 152 ) ;
Size = MAP_APPFONT ( 192 , RSC_CD_CHECKBOX_HEIGHT ) ;
Hide = TRUE;
@@ -277,6 +295,7 @@ TabPage TP_DOCINFODOC
};
Edit FT_TEMPL_VAL
{
+ HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_TEMPL_VAL";
Pos = MAP_APPFONT ( 78 , 172 ) ;
Size = MAP_APPFONT ( 180 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
@@ -301,6 +320,7 @@ TabPage TP_DOCINFOUSER
};
Edit ED_INFO1
{
+ HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO1";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 17 ) ;
Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -314,6 +334,7 @@ TabPage TP_DOCINFOUSER
};
Edit ED_INFO2
{
+ HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO2";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 43 ) ;
Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -327,6 +348,7 @@ TabPage TP_DOCINFOUSER
};
Edit ED_INFO3
{
+ HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO3";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 69 ) ;
Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -340,6 +362,7 @@ TabPage TP_DOCINFOUSER
};
Edit ED_INFO4
{
+ HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO4";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 95 ) ;
Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -347,6 +370,7 @@ TabPage TP_DOCINFOUSER
};
PushButton BTN_EDITLABEL
{
+ HelpID = "sfx2:PushButton:TP_DOCINFOUSER:BTN_EDITLABEL";
Pos = MAP_APPFONT ( 194 , 165 ) ;
Size = MAP_APPFONT ( 60 , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "~Info fields..." ;
@@ -362,6 +386,7 @@ TabPage TP_DOCINFORELOAD
Size = MAP_APPFONT ( 260 , 185 ) ;
RadioButton RB_NOAUTOUPDATE
{
+ HelpID = "sfx2:RadioButton:TP_DOCINFORELOAD:RB_NOAUTOUPDATE";
TabStop = TRUE ;
Pos = MAP_APPFONT( COL_0 , ROW_0 ) ;
Size = MAP_APPFONT( COL_7 - COL_1 , RSC_CD_RADIOBUTTON_HEIGHT ) ;
@@ -370,6 +395,7 @@ TabPage TP_DOCINFORELOAD
RadioButton RB_RELOADUPDATE
{
+ HelpID = "sfx2:RadioButton:TP_DOCINFORELOAD:RB_RELOADUPDATE";
TabStop = TRUE ;
Pos = MAP_APPFONT( COL_0, ROW_1 ) ;
Size = MAP_APPFONT( COL_7 - COL_1, RSC_CD_RADIOBUTTON_HEIGHT ) ;
@@ -383,6 +409,7 @@ TabPage TP_DOCINFORELOAD
};
NumericField ED_RELOAD
{
+ HelpID = "sfx2:NumericField:TP_DOCINFORELOAD:ED_RELOAD";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , ROW_2 - ROWDIFF_FT_EDTFLD ) ;
Size = MAP_APPFONT ( WIDTH_2 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -403,6 +430,7 @@ TabPage TP_DOCINFORELOAD
RadioButton RB_FORWARDUPDATE
{
+ HelpID = "sfx2:RadioButton:TP_DOCINFORELOAD:RB_FORWARDUPDATE";
TabStop = TRUE ;
Pos = MAP_APPFONT( COL_0, ROW_3 ) ;
Size = MAP_APPFONT( COL_7 - COL_1, RSC_CD_RADIOBUTTON_HEIGHT ) ;
@@ -416,6 +444,7 @@ TabPage TP_DOCINFORELOAD
};
NumericField ED_FORWARD
{
+ HelpID = "sfx2:NumericField:TP_DOCINFORELOAD:ED_FORWARD";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , ROW_4 - ROWDIFF_FT_EDTFLD ) ;
Size = MAP_APPFONT ( WIDTH_2 , RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -441,12 +470,14 @@ TabPage TP_DOCINFORELOAD
};
Edit ED_URL
{
+ HelpID = "sfx2:Edit:TP_DOCINFORELOAD:ED_URL";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , ROW_5 - ROWDIFF_FT_EDTFLD ) ;
Size = MAP_APPFONT ( COL_5 - COL_2 , RSC_CD_TEXTBOX_HEIGHT ) ;
};
PushButton PB_BROWSEURL
{
+ HelpID = "sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL";
Pos = MAP_APPFONT ( COL_6 , ROW_5 - ROWDIFF_FT_EDTFLD ) ;
Size = MAP_APPFONT ( COL_7 - COL_6 , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text = "..." ;
@@ -459,6 +490,7 @@ TabPage TP_DOCINFORELOAD
};
ComboBox CB_FRAME
{
+ HelpID = "sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME";
Pos = MAP_APPFONT ( COL_2 , ROW_6 - ROWDIFF_FT_EDTFLD ) ;
Size = MAP_APPFONT ( COL_7 - COL_2 , RSC_CD_DROPDOWN_HEIGHT * 10 ) ;
DropDown = TRUE ;
@@ -524,6 +556,7 @@ TabPage TP_CUSTOMPROPERTIES
};
PushButton BTN_ADD
{
+ HelpID = "sfx2:PushButton:TP_CUSTOMPROPERTIES:BTN_ADD";
Pos = MAP_APPFONT( 204 , 165 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "~Add";
@@ -756,6 +789,7 @@ ModalDialog RID_EDIT_DURATIONS
};
CheckBox CB_NEGATIVE
{
+ HelpID = "sfx2:CheckBox:RID_EDIT_DURATIONS:CB_NEGATIVE";
Pos = MAP_APPFONT ( 6 , 21 ) ;
Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
Text [ en-US ] = "~Negative" ;
@@ -769,6 +803,7 @@ ModalDialog RID_EDIT_DURATIONS
};
NumericField ED_YEAR
{
+ HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_YEAR";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 36 ) ;
Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -789,6 +824,7 @@ ModalDialog RID_EDIT_DURATIONS
};
NumericField ED_MONTH
{
+ HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MONTH";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 50 ) ;
Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -809,6 +845,7 @@ ModalDialog RID_EDIT_DURATIONS
};
NumericField ED_DAY
{
+ HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_DAY";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 64 ) ;
Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -829,6 +866,7 @@ ModalDialog RID_EDIT_DURATIONS
};
NumericField ED_HOUR
{
+ HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_HOUR";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 78 ) ;
Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -849,6 +887,7 @@ ModalDialog RID_EDIT_DURATIONS
};
NumericField ED_MINUTE
{
+ HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MINUTE";
Border = TRUE ;
Pos = MAP_APPFONT ( 70, 92) ;
Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -869,6 +908,7 @@ ModalDialog RID_EDIT_DURATIONS
};
NumericField ED_SECOND
{
+ HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_SECOND";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 106 ) ;
Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
@@ -889,6 +929,7 @@ ModalDialog RID_EDIT_DURATIONS
};
NumericField ED_MSECOND
{
+ HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MSECOND";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 120 ) ;
Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
diff --git a/sfx2/source/dialog/dinfedt.src b/sfx2/source/dialog/dinfedt.src
index ebc18731f7..476690de0b 100644
--- a/sfx2/source/dialog/dinfedt.src
+++ b/sfx2/source/dialog/dinfedt.src
@@ -45,24 +45,28 @@ ModalDialog DLG_DOCINFO_EDT
};
Edit ED_INFO1
{
+ HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO1";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 86 , 12 ) ;
};
Edit ED_INFO2
{
+ HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO2";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 29 ) ;
Size = MAP_APPFONT ( 86 , 12 ) ;
};
Edit ED_INFO3
{
+ HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 44 ) ;
Size = MAP_APPFONT ( 86 , 12 ) ;
};
Edit ED_INFO4
{
+ HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 59 ) ;
Size = MAP_APPFONT ( 86 , 12 ) ;
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index c090ccc532..3dd0bb15ec 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -46,6 +46,7 @@
#include <sfx2/viewsh.hxx>
#include "sfxhelp.hxx"
#include <sfx2/objsh.hxx>
+#include <sfx2/msgpool.hxx>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -918,11 +919,23 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
*/
{
- ULONG nId = GetHelpId();
- if ( !nId && pCW )
- nId = pCW->GetType();
- SetHelpId( 0 );
- SetUniqueId( nId );
+ if ( GetHelpId().getLength() )
+ {
+ SetUniqueId( GetHelpId() );
+ SetHelpId("");
+ }
+ else
+ {
+ SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
+ SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
+ const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() );
+ if ( pSlot )
+ {
+ rtl::OString aCmd("SFXDOCKINGWINDOW_");
+ aCmd += pSlot->GetUnoName();
+ SetUniqueId( aCmd );
+ }
+ }
pImp = new SfxDockingWindow_Impl;
pImp->bConstructed = FALSE;
@@ -960,9 +973,23 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
*/
{
- ULONG nId = GetHelpId();
- SetHelpId(0);
- SetUniqueId( nId );
+ if ( GetHelpId().getLength() )
+ {
+ SetUniqueId( GetHelpId() );
+ SetHelpId("");
+ }
+ else
+ {
+ SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
+ SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
+ const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() );
+ if ( pSlot )
+ {
+ rtl::OString aCmd("SFXDOCKINGWINDOW_");
+ aCmd += pSlot->GetUnoName();
+ SetUniqueId( aCmd );
+ }
+ }
pImp = new SfxDockingWindow_Impl;
pImp->bConstructed = FALSE;
@@ -1844,15 +1871,15 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt )
pMgr->Activate_Impl();
Window* pWindow = rEvt.GetWindow();
- ULONG nHelpId = 0;
- while ( !nHelpId && pWindow )
+ rtl::OString sHelpId;
+ while ( !sHelpId.getLength() && pWindow )
{
- nHelpId = pWindow->GetHelpId();
+ sHelpId = pWindow->GetHelpId();
pWindow = pWindow->GetParent();
}
- if ( nHelpId )
- SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId );
+ if ( sHelpId.getLength() )
+ SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId );
// In VCL geht Notify zun"achst an das Fenster selbst,
// also base class rufen, sonst erf"ahrt der parent nichts
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 07faf55df9..3114009fe2 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -79,7 +79,6 @@
#include <unotools/viewoptions.hxx>
#include <unotools/moduleoptions.hxx>
#include <svtools/helpid.hrc>
-#include <svl/pickerhelper.hxx>
#include <comphelper/docpasswordrequest.hxx>
#include <comphelper/docpasswordhelper.hxx>
#include <ucbhelper/content.hxx>
@@ -98,7 +97,7 @@
#include "filtergrouping.hxx"
#include <sfx2/request.hxx>
#include "filedlgimpl.hxx"
-
+#include <helpid.hrc>
#include <sfxlocal.hrc>
//-----------------------------------------------------------------------------
@@ -221,55 +220,55 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve
{
//!!! todo: cache the help strings (here or TRA)
- ULONG nHelpId = 0;
+ rtl::OString sHelpId;
// mapping from element id -> help id
switch ( aEvent.ElementId )
{
case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION :
- nHelpId = HID_FILESAVE_AUTOEXTENSION;
+ sHelpId = HID_FILESAVE_AUTOEXTENSION;
break;
case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD :
- nHelpId = HID_FILESAVE_SAVEWITHPASSWORD;
+ sHelpId = HID_FILESAVE_SAVEWITHPASSWORD;
break;
case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS :
- nHelpId = HID_FILESAVE_CUSTOMIZEFILTER;
+ sHelpId = HID_FILESAVE_CUSTOMIZEFILTER;
break;
case ExtendedFilePickerElementIds::CHECKBOX_READONLY :
- nHelpId = HID_FILEOPEN_READONLY;
+ sHelpId = HID_FILEOPEN_READONLY;
break;
case ExtendedFilePickerElementIds::CHECKBOX_LINK :
- nHelpId = HID_FILEDLG_LINK_CB;
+ sHelpId = HID_FILEDLG_LINK_CB;
break;
case ExtendedFilePickerElementIds::CHECKBOX_PREVIEW :
- nHelpId = HID_FILEDLG_PREVIEW_CB;
+ sHelpId = HID_FILEDLG_PREVIEW_CB;
break;
case ExtendedFilePickerElementIds::PUSHBUTTON_PLAY :
- nHelpId = HID_FILESAVE_DOPLAY;
+ sHelpId = HID_FILESAVE_DOPLAY;
break;
case ExtendedFilePickerElementIds::LISTBOX_VERSION_LABEL :
case ExtendedFilePickerElementIds::LISTBOX_VERSION :
- nHelpId = HID_FILEOPEN_VERSION;
+ sHelpId = HID_FILEOPEN_VERSION;
break;
case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE_LABEL :
case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE :
- nHelpId = HID_FILESAVE_TEMPLATE;
+ sHelpId = HID_FILESAVE_TEMPLATE;
break;
case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE_LABEL :
case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE :
- nHelpId = HID_FILEOPEN_IMAGE_TEMPLATE;
+ sHelpId = HID_FILEOPEN_IMAGE_TEMPLATE;
break;
case ExtendedFilePickerElementIds::CHECKBOX_SELECTION :
- nHelpId = HID_FILESAVE_SELECTION;
+ sHelpId = HID_FILESAVE_SELECTION;
break;
default:
@@ -279,7 +278,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve
OUString aHelpText;
Help* pHelp = Application::GetHelp();
if ( pHelp )
- aHelpText = String( pHelp->GetHelpText( nHelpId, NULL ) );
+ aHelpText = String( pHelp->GetHelpText( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8), NULL ) );
return aHelpText;
}
@@ -1204,7 +1203,7 @@ void SAL_CALL PickerThread_Impl::run()
}
// ------------------------------------------------------------------------
-void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId )
+void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId )
{
DBG_ASSERT( _pControlId && _pHelpId, "FileDialogHelper_Impl::setControlHelpIds: invalid array pointers!" );
if ( !_pControlId || !_pHelpId )
@@ -1213,17 +1212,16 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con
// forward these ids to the file picker
try
{
- const ::rtl::OUString sHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) );
+ const ::rtl::OUString sHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME ) );
// the ids for the single controls
uno::Reference< XFilePickerControlAccess > xControlAccess( mxFileDlg, UNO_QUERY );
if ( xControlAccess.is() )
{
while ( *_pControlId )
{
- // calc the help id of the element
+ DBG_ASSERT( INetURLObject( rtl::OStringToOUString( *_pHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
::rtl::OUString sId( sHelpIdPrefix );
- sId += ::rtl::OUString::valueOf( *_pHelpId );
- // set the help id
+ sId += ::rtl::OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 );
xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, makeAny( sId ) );
++_pControlId; ++_pHelpId;
@@ -1237,12 +1235,6 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con
}
// ------------------------------------------------------------------------
-void FileDialogHelper_Impl::setDialogHelpId( const sal_Int32 _nHelpId )
-{
- svt::SetDialogHelpId( mxFileDlg, _nHelpId );
-}
-
-// ------------------------------------------------------------------------
IMPL_LINK( FileDialogHelper_Impl, InitControls, void*, NOTINTERESTEDIN )
{
(void)NOTINTERESTEDIN;
@@ -2346,9 +2338,6 @@ void FileDialogHelper_Impl::SetContext( FileDialogHelper::Context _eNewContext )
const OUString* pConfigId = GetLastFilterConfigId( _eNewContext );
if( pConfigId )
LoadLastUsedFilter( *pConfigId );
-
-// if( nNewHelpId )
-// this->setDialogHelpId( nNewHelpId );
}
// ------------------------------------------------------------------------
@@ -2494,17 +2483,11 @@ void FileDialogHelper::CreateMatcher( const String& rFactory )
}
// ------------------------------------------------------------------------
-void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId )
+void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId )
{
mpImp->setControlHelpIds( _pControlId, _pHelpId );
}
-// ------------------------------------------------------------------------
-void FileDialogHelper::SetDialogHelpId( const sal_Int32 _nHelpId )
-{
- mpImp->setDialogHelpId( _nHelpId );
-}
-
void FileDialogHelper::SetContext( Context _eNewContext )
{
mpImp->SetContext( _eNewContext );
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index f7b6f8d41c..e2d2bfbf40 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -142,8 +142,7 @@ namespace sfx2
void correctVirtualDialogType();
- void setControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId );
- void setDialogHelpId( const sal_Int32 _nHelpId );
+ void setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId );
sal_Bool CheckFilterOptionsCapability( const SfxFilter* _pFilter );
diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src
index 49cfb04cd0..be60b35f7d 100644
--- a/sfx2/source/dialog/mgetempl.src
+++ b/sfx2/source/dialog/mgetempl.src
@@ -44,12 +44,14 @@ TabPage TP_MANAGE_STYLES
};
Edit ED_NAME
{
+ HelpID = "sfx2:Edit:TP_MANAGE_STYLES:ED_NAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 6 ) ;
Size = MAP_APPFONT ( 184 , 12 ) ;
};
CheckBox CB_AUTO
{
+ HelpID = "sfx2:CheckBox:TP_MANAGE_STYLES:CB_AUTO";
Pos = MAP_APPFONT ( 164 , 8 ) ;
Size = MAP_APPFONT ( 90 , 10 ) ;
Hide = TRUE ;
@@ -63,6 +65,7 @@ TabPage TP_MANAGE_STYLES
};
ListBox LB_NEXT
{
+ HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_NEXT";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 24 ) ;
Size = MAP_APPFONT ( 184 , 65 ) ;
@@ -79,6 +82,7 @@ TabPage TP_MANAGE_STYLES
};
ListBox LB_BASE
{
+ HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_BASE";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 42 ) ;
Size = MAP_APPFONT ( 184 , 65 ) ;
@@ -93,6 +97,7 @@ TabPage TP_MANAGE_STYLES
};
ListBox LB_REGION
{
+ HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_REGION";
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 60 ) ;
Size = MAP_APPFONT ( 184 , 64 ) ;
@@ -107,6 +112,7 @@ TabPage TP_MANAGE_STYLES
};
MultiLineEdit ED_DESC
{
+ HelpID = "sfx2:MultiLineEdit:TP_MANAGE_STYLES:ED_DESC";
Pos = MAP_APPFONT ( 12 , 88 ) ;
Size = MAP_APPFONT ( 236 , 85 ) ;
ReadOnly = TRUE ;
diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src
index b691c64fa7..28dddf7fd6 100644
--- a/sfx2/source/dialog/newstyle.src
+++ b/sfx2/source/dialog/newstyle.src
@@ -28,10 +28,11 @@
#include <sfx2/sfx.hrc>
#include "dialog.hrc"
#include "newstyle.hrc"
+#include "sfx2/sfxcommands.h"
ModalDialog DLG_NEW_STYLE_BY_EXAMPLE
{
- HelpId = SID_STYLE_NEW_BY_EXAMPLE ;
+ HelpId = CMD_SID_STYLE_NEW_BY_EXAMPLE ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 177 , 112 ) ;
@@ -45,6 +46,7 @@ ModalDialog DLG_NEW_STYLE_BY_EXAMPLE
};
ComboBox LB_COL
{
+ HelpID = "sfx2:ComboBox:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 94 , 92 ) ;
TabStop = TRUE ;
diff --git a/sfx2/source/dialog/passwd.src b/sfx2/source/dialog/passwd.src
index b95c14cba0..4111597e1c 100644
--- a/sfx2/source/dialog/passwd.src
+++ b/sfx2/source/dialog/passwd.src
@@ -47,6 +47,7 @@ ModalDialog DLG_PASSWD
};
Edit ED_PASSWD_USER
{
+ HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER";
Border = TRUE;
Pos = MAP_APPFONT( 57, 14 );
Size = MAP_APPFONT( 75, 12 );
@@ -59,6 +60,7 @@ ModalDialog DLG_PASSWD
};
Edit ED_PASSWD_PASSWORD
{
+ HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD";
Border = TRUE;
PassWord = TRUE;
Pos = MAP_APPFONT( 57, 29 );
@@ -72,6 +74,7 @@ ModalDialog DLG_PASSWD
};
Edit ED_PASSWD_CONFIRM
{
+ HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM";
Border = TRUE;
PassWord = TRUE;
Pos = MAP_APPFONT( 57, 44 );
diff --git a/sfx2/source/dialog/printopt.src b/sfx2/source/dialog/printopt.src
index d5b1602e13..065cf926e1 100644
--- a/sfx2/source/dialog/printopt.src
+++ b/sfx2/source/dialog/printopt.src
@@ -60,6 +60,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
RadioButton RB_PRINTEROUTPUT
{
+ HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT";
TabStop = TRUE;
Pos = MAP_APPFONT ( 81, 14 ) ;
Size = MAP_APPFONT ( 60, 10 ) ;
@@ -67,6 +68,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
RadioButton RB_PRINTFILEOUTPUT
{
+ HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTFILEOUTPUT";
TabStop = TRUE;
Pos = MAP_APPFONT ( 142, 14 ) ;
Size = MAP_APPFONT ( 100, 10 ) ;
@@ -83,6 +85,7 @@ TabPage TP_COMMONPRINTOPTIONS
CheckBox CB_REDUCETRANSPARENCY
{
+ HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCETRANSPARENCY";
TabStop = TRUE;
Pos = MAP_APPFONT ( 18, 38 ) ;
Size = MAP_APPFONT ( 115, 10 ) ;
@@ -90,6 +93,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
RadioButton RB_REDUCETRANSPARENCY_AUTO
{
+ HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_AUTO";
TabStop = TRUE;
Pos = MAP_APPFONT ( 28, 51 ) ;
Size = MAP_APPFONT ( 105, 10 ) ;
@@ -97,6 +101,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
RadioButton RB_REDUCETRANSPARENCY_NONE
{
+ HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_NONE";
TabStop = TRUE;
Pos = MAP_APPFONT ( 28, 64 ) ;
Size = MAP_APPFONT ( 105, 10 ) ;
@@ -107,6 +112,7 @@ TabPage TP_COMMONPRINTOPTIONS
CheckBox CB_REDUCEGRADIENTS
{
+ HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEGRADIENTS";
TabStop = TRUE;
Pos = MAP_APPFONT ( 136, 38 ) ;
Size = MAP_APPFONT ( 121, 10 ) ;
@@ -114,6 +120,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
RadioButton RB_REDUCEGRADIENTS_STRIPES
{
+ HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_STRIPES";
TabStop = TRUE;
Pos = MAP_APPFONT ( 146, 51 ) ;
Size = MAP_APPFONT ( 77, 10 ) ;
@@ -121,6 +128,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
NumericField NF_REDUCEGRADIENTS_STEPCOUNT
{
+ HelpID = "sfx2:NumericField:TP_COMMONPRINTOPTIONS:NF_REDUCEGRADIENTS_STEPCOUNT";
TabStop = TRUE;
Border = TRUE ;
Pos = MAP_APPFONT ( 224, 49 ) ;
@@ -132,6 +140,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
RadioButton RB_REDUCEGRADIENTS_COLOR
{
+ HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_COLOR";
TabStop = TRUE;
Pos = MAP_APPFONT ( 146, 64 ) ;
Size = MAP_APPFONT ( 108, 10 ) ;
@@ -142,6 +151,7 @@ TabPage TP_COMMONPRINTOPTIONS
CheckBox CB_REDUCEBITMAPS
{
+ HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS";
TabStop = TRUE;
Pos = MAP_APPFONT ( 18, 80 ) ;
Size = MAP_APPFONT ( 115, 10 ) ;
@@ -149,6 +159,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
RadioButton RB_REDUCEBITMAPS_OPTIMAL
{
+ HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_OPTIMAL";
TabStop = TRUE;
Pos = MAP_APPFONT ( 28, 93 ) ;
Size = MAP_APPFONT ( 226, 10 ) ;
@@ -156,6 +167,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
RadioButton RB_REDUCEBITMAPS_NORMAL
{
+ HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_NORMAL";
TabStop = TRUE;
Pos = MAP_APPFONT ( 28, 106 ) ;
Size = MAP_APPFONT ( 226, 10 ) ;
@@ -163,6 +175,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
RadioButton RB_REDUCEBITMAPS_RESOLUTION
{
+ HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_RESOLUTION";
TabStop = TRUE;
Pos = MAP_APPFONT ( 28, 119 ) ;
Size = MAP_APPFONT ( 52, 10 ) ;
@@ -170,6 +183,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
ListBox LB_REDUCEBITMAPS_RESOLUTION
{
+ HelpID = "sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION";
TabStop = TRUE;
Border = TRUE ;
Pos = MAP_APPFONT ( 81, 117 ) ;
@@ -188,6 +202,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
CheckBox CB_REDUCEBITMAPS_TRANSPARENCY
{
+ HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS_TRANSPARENCY";
TabStop = TRUE;
Pos = MAP_APPFONT ( 28, 132 ) ;
Size = MAP_APPFONT ( 226, 10 ) ;
@@ -198,6 +213,7 @@ TabPage TP_COMMONPRINTOPTIONS
CheckBox CB_CONVERTTOGREYSCALES
{
+ HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_CONVERTTOGREYSCALES";
TabStop = TRUE;
Pos = MAP_APPFONT ( 136, 80 ) ;
Size = MAP_APPFONT ( 123, 10 ) ;
@@ -214,6 +230,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
CheckBox CB_PAPERSIZE
{
+ HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERSIZE";
TabStop = TRUE;
Pos = MAP_APPFONT ( 12, 159 ) ;
Size = MAP_APPFONT ( 123, 10 ) ;
@@ -221,6 +238,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
CheckBox CB_PAPERORIENTATION
{
+ HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERORIENTATION";
TabStop = TRUE;
Pos = MAP_APPFONT ( 12, 172 ) ;
Size = MAP_APPFONT ( 123 , 10 ) ;
@@ -228,6 +246,7 @@ TabPage TP_COMMONPRINTOPTIONS
};
CheckBox CB_TRANSPARENCY
{
+ HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_TRANSPARENCY";
TabStop = TRUE;
Pos = MAP_APPFONT ( 136, 159 ) ;
Size = MAP_APPFONT ( 123, 10 ) ;
@@ -241,6 +260,7 @@ TabPage TP_COMMONPRINTOPTIONS
ModalDialog RID_WARN_PRINTTRANSPARENCY
{
+ HelpID = "sfx2:ModalDialog:RID_WARN_PRINTTRANSPARENCY";
OutputSize = TRUE ;
Size = MAP_APPFONT ( 195 , 85 ) ;
Text [ en-US ] = "Warning" ;
@@ -266,6 +286,7 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY
};
PushButton BTN_PRINTTRANS_NO
{
+ HelpID = "sfx2:PushButton:RID_WARN_PRINTTRANSPARENCY:BTN_PRINTTRANS_NO";
Pos = MAP_APPFONT ( 68 , 48 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~No" ;
@@ -278,6 +299,7 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY
};
CheckBox CBX_NOPRINTTRANSWARN
{
+ HelpID = "sfx2:CheckBox:RID_WARN_PRINTTRANSPARENCY:CBX_NOPRINTTRANSWARN";
Pos = MAP_APPFONT ( 6 , 68 ) ;
Size = MAP_APPFONT ( 183 , 10 ) ;
Text [ en-US ] = "~Do not show warning again" ;
diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src
index f87e521a29..0e55ac8170 100644
--- a/sfx2/source/dialog/recfloat.src
+++ b/sfx2/source/dialog/recfloat.src
@@ -34,6 +34,7 @@
FloatingWindow SID_RECORDING_FLOATWINDOW
{
+ HelpID = "sfx2:FloatingWindow:SID_RECORDING_FLOATWINDOW";
Moveable = TRUE ;
Closeable = TRUE ;
Hide = TRUE ;
diff --git a/sfx2/source/dialog/srchdlg.src b/sfx2/source/dialog/srchdlg.src
index aaa367b1b1..8ffcadf4d6 100644
--- a/sfx2/source/dialog/srchdlg.src
+++ b/sfx2/source/dialog/srchdlg.src
@@ -52,6 +52,7 @@ ModelessDialog RID_DLG_SEARCH
};
ComboBox ED_SEARCH
{
+ HelpID = "sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH";
Border = TRUE;
Pos = MAP_APPFONT( 6, 14 );
Size = MAP_APPFONT( 150, 50 );
@@ -60,6 +61,7 @@ ModelessDialog RID_DLG_SEARCH
};
CheckBox CB_WHOLEWORDS
{
+ HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS";
Pos = MAP_APPFONT( 6, 29 );
Size = MAP_APPFONT( 150, 10 );
Text [ en-US ] = "~Whole words only" ;
@@ -67,6 +69,7 @@ ModelessDialog RID_DLG_SEARCH
};
CheckBox CB_MATCHCASE
{
+ HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE";
Pos = MAP_APPFONT( 6, 42 );
Size = MAP_APPFONT( 150, 10 );
Text[ en-US ] = "~Match case";
@@ -74,6 +77,7 @@ ModelessDialog RID_DLG_SEARCH
};
CheckBox CB_WRAPAROUND
{
+ HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND";
Pos = MAP_APPFONT( 6, 55 );
Size = MAP_APPFONT( 150, 10 );
Text [ en-US ] = "Wrap ~around" ;
@@ -81,6 +85,7 @@ ModelessDialog RID_DLG_SEARCH
};
CheckBox CB_BACKWARDS
{
+ HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS";
Pos = MAP_APPFONT( 6, 68 );
Size = MAP_APPFONT( 150, 10 );
Text [ en-US ] = "~Backwards" ;
@@ -88,6 +93,7 @@ ModelessDialog RID_DLG_SEARCH
};
PushButton PB_FIND
{
+ HelpID = "sfx2:PushButton:RID_DLG_SEARCH:PB_FIND";
Pos = MAP_APPFONT( 162, 6 );
Size = MAP_APPFONT( 50, 14 );
Text [ en-US ] = "~Find" ;
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 5bb4a26fcf..a9cc9b9d2b 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1780,15 +1780,15 @@ long SfxTabDialog::Notify( NotifyEvent& rNEvt )
if ( pViewFrame )
{
Window* pWindow = rNEvt.GetWindow();
- ULONG nHelpId = 0;
- while ( !nHelpId && pWindow )
+ rtl::OString sHelpId;
+ while ( !sHelpId.getLength() && pWindow )
{
- nHelpId = pWindow->GetHelpId();
+ sHelpId = pWindow->GetHelpId();
pWindow = pWindow->GetParent();
}
- if ( nHelpId )
- SfxHelp::OpenHelpAgent( &pViewFrame->GetFrame(), nHelpId );
+ if ( sHelpId.getLength() )
+ SfxHelp::OpenHelpAgent( &pViewFrame->GetFrame(), sHelpId );
}
}
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index ed29ae0032..f1339fca85 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -60,7 +60,7 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-
+#include <tools/urlobj.hxx>
#include <boost/noncopyable.hpp>
//......................................................................................................................
@@ -310,7 +310,7 @@ namespace sfx2
virtual ::rtl::OUString GetDisplayName() const;
virtual Image GetImage() const;
- virtual SmartId GetHelpID() const;
+ virtual rtl::OString GetHelpID() const;
virtual void Activate( Window& i_rParentWindow );
virtual void Deactivate();
virtual void SetSizePixel( const Size& i_rPanelWindowSize );
@@ -409,10 +409,19 @@ namespace sfx2
return m_aPanelImage;
}
+ static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL )
+ {
+ INetURLObject aHID( _rHelpURL );
+ if ( aHID.GetProtocol() == INET_PROT_HID )
+ return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 );
+ else
+ return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 );
+ }
+
//------------------------------------------------------------------------------------------------------------------
- SmartId CustomToolPanel::GetHelpID() const
+ rtl::OString CustomToolPanel::GetHelpID() const
{
- return SmartId( m_aPanelHelpURL );
+ return lcl_getHelpId( m_aPanelHelpURL );
}
//------------------------------------------------------------------------------------------------------------------
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 97310b04b1..8aba652021 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2208,32 +2208,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
// HilfePI antriggern, wenn von Call als Handler und Bereich erlaubt ist
if( !pListBox || pListBox->IsSelected( pListBox->GetHdlEntry() ) )
{
-#ifdef WIR_KOENNEN_WIEDER_HILFE_FUER_STYLESHEETS
- SfxHelpPI* pHelpPI = SFX_APP()->GetHelpPI();
- if ( pHelpPI && pListBox && IsInitialized() &&
- GetSelectedEntry().Len() )
- {
- const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
- const SfxStyleFamily eFam = pItem->GetFamily();
- DBG_ASSERT(pStyleSheetPool, "Kein Pool");
- // SfxStyleSheetBase* pStyle = pStyleSheetPool
- // ? pStyleSheetPool->Find( GetSelectedEntry(), eFam ) : 0;
- SfxStyleSheetBase *pStyle;
- if ( pStyleSheetPool )
- pStyle = pStyleSheetPool->Find ( GetSelectedEntry(), eFam );
- else
- pStyle = 0;
-
- if ( pStyle )
- {
- String aHelpFile;
- ULONG nHelpId=pStyle->GetHelpId(aHelpFile);
- if ( nHelpId )
- pHelpPI->LoadTopic( nHelpId );
- }
- }
-#endif
-
// nur, wenn Giesskanne an ist
if ( IsInitialized() &&
IsCheckedItem(SID_STYLE_WATERCAN) &&
@@ -2373,18 +2347,18 @@ void SfxTemplateDialog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
void SfxTemplateDialog_Impl::InsertFamilyItem(USHORT nId,const SfxStyleFamilyItem *pItem)
{
- USHORT nHelpId = 0;
+ rtl::OString sHelpId;
switch( (USHORT) pItem->GetFamily() )
{
- case SFX_STYLE_FAMILY_CHAR: nHelpId = SID_STYLE_FAMILY1; break;
- case SFX_STYLE_FAMILY_PARA: nHelpId = SID_STYLE_FAMILY2; break;
- case SFX_STYLE_FAMILY_FRAME:nHelpId = SID_STYLE_FAMILY3; break;
- case SFX_STYLE_FAMILY_PAGE: nHelpId = SID_STYLE_FAMILY4; break;
- case SFX_STYLE_FAMILY_PSEUDO: nHelpId = SID_STYLE_FAMILY5; break;
- default: DBG_ERROR("unbekannte StyleFamily"); break;
+ case SFX_STYLE_FAMILY_CHAR: sHelpId = ".uno:CharStyle"; break;
+ case SFX_STYLE_FAMILY_PARA: sHelpId = ".uno:ParaStyle"; break;
+ case SFX_STYLE_FAMILY_FRAME: sHelpId = ".uno:FrameStyle"; break;
+ case SFX_STYLE_FAMILY_PAGE: sHelpId = ".uno:PageStyle"; break;
+ case SFX_STYLE_FAMILY_PSEUDO: sHelpId = ".uno:ListStyle"; break;
+ default: DBG_ERROR("unknown StyleFamily"); break;
}
m_aActionTbL.InsertItem( nId, pItem->GetImage(), pItem->GetText(), 0, 0);
- m_aActionTbL.SetHelpId( nId, nHelpId );
+ m_aActionTbL.SetHelpId( nId, sHelpId );
}
// ------------------------------------------------------------------------
@@ -2694,7 +2668,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:LoadStyles"));
sLabel = lcl_GetLabel( aCommand );
pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel );
- pMenu->SetHelpId(SID_TEMPLATE_LOAD, SID_TEMPLATE_LOAD);
+ pMenu->SetHelpId(SID_TEMPLATE_LOAD, ".uno:LoadStyles");
pMenu->SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, MenuSelectHdl));
pMenu->Execute( pBox,
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index 6bb33ca207..31cf999d37 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -57,7 +57,7 @@ ImageList IMG_LST_STYLE_DESIGNER_HC
// RID_STYLECATALOG ------------------------------------------------------
ModalDialog RID_STYLECATALOG
{
- HelpId = SID_STYLE_CATALOG ;
+ HelpId = CMD_SID_STYLE_CATALOG ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 181 , 134 ) ;
@@ -78,6 +78,7 @@ ModalDialog RID_STYLECATALOG
};
PushButton BT_ORG
{
+ HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_ORG";
Pos = MAP_APPFONT ( 123 , 97 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Organizer..." ;
@@ -85,6 +86,7 @@ ModalDialog RID_STYLECATALOG
};
PushButton BT_DEL
{
+ HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_DEL";
Pos = MAP_APPFONT ( 123 , 78 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Delete..." ;
@@ -92,6 +94,7 @@ ModalDialog RID_STYLECATALOG
};
PushButton BT_EDIT
{
+ HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_EDIT";
Pos = MAP_APPFONT ( 123 , 60 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Modify..." ;
@@ -99,6 +102,7 @@ ModalDialog RID_STYLECATALOG
};
PushButton BT_NEW
{
+ HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_NEW";
Pos = MAP_APPFONT ( 123 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~New..." ;
@@ -112,6 +116,7 @@ ModalDialog RID_STYLECATALOG
};
ListBox BT_TOOL
{
+ HelpID = "sfx2:ListBox:RID_STYLECATALOG:BT_TOOL";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 110 , 55 ) ;
@@ -128,6 +133,7 @@ ModalDialog RID_STYLECATALOG
};
ListBox BT_FLIST
{
+ HelpID = "sfx2:ListBox:RID_STYLECATALOG:BT_FLIST";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 114 ) ;
Size = MAP_APPFONT ( 110 , 77 ) ;
@@ -146,7 +152,7 @@ DockingWindow DLG_STYLE_DESIGNER
{
Text [ en-US ] = "Styles and Formatting" ;
- HelpId = SID_STYLE_DESIGNER ;
+ HelpId = CMD_SID_STYLE_DESIGNER ;
OutputSize = TRUE ;
Hide = TRUE ;
SVLook = TRUE ;
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 89a22ee062..9b09b5fe63 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -256,7 +256,7 @@ namespace sfx2
}
//------------------------------------------------------------------------------------------------------------------
- USHORT TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, ULONG i_nHelpId, const Link& i_rCallback )
+ USHORT TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback )
{
// Add the menu before the closer button.
const USHORT nItemCount( m_aToolbox.GetItemCount() );
diff --git a/sfx2/source/dialog/versdlg.src b/sfx2/source/dialog/versdlg.src
index 5e0f35cf65..ff33b8d239 100644
--- a/sfx2/source/dialog/versdlg.src
+++ b/sfx2/source/dialog/versdlg.src
@@ -28,6 +28,7 @@
#include "versdlg.hrc"
ModalDialog DLG_VERSIONS
{
+ HelpID = "sfx2:ModalDialog:DLG_VERSIONS";
OutputSize = TRUE ;
Size = MAP_APPFONT ( 340 , 184 ) ;
SvLook = TRUE ;
@@ -41,6 +42,7 @@ ModalDialog DLG_VERSIONS
};
PushButton PB_SAVE
{
+ HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_SAVE";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 90 , 14 ) ;
TabStop = TRUE ;
@@ -48,6 +50,7 @@ ModalDialog DLG_VERSIONS
};
CheckBox CB_SAVEONCLOSE
{
+ HelpID = "sfx2:CheckBox:DLG_VERSIONS:CB_SAVEONCLOSE";
Pos = MAP_APPFONT ( 108 , 16 ) ;
Size = MAP_APPFONT ( 164 , 10 ) ;
TabStop = TRUE ;
@@ -93,6 +96,7 @@ ModalDialog DLG_VERSIONS
};
PushButton PB_OPEN
{
+ HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_OPEN";
Pos = MAP_APPFONT ( 284 , 26 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -100,6 +104,7 @@ ModalDialog DLG_VERSIONS
};
PushButton PB_VIEW
{
+ HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_VIEW";
Pos = MAP_APPFONT ( 284 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -108,6 +113,7 @@ ModalDialog DLG_VERSIONS
};
PushButton PB_DELETE
{
+ HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_DELETE";
Pos = MAP_APPFONT ( 284 , 60 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -115,6 +121,7 @@ ModalDialog DLG_VERSIONS
};
PushButton PB_COMPARE
{
+ HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_COMPARE";
Pos = MAP_APPFONT ( 284 , 77 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -130,6 +137,7 @@ ModalDialog DLG_VERSIONS
};
ModalDialog DLG_COMMENTS
{
+ HelpID = "sfx2:ModalDialog:DLG_COMMENTS";
OutputSize = TRUE ;
Size = MAP_APPFONT ( 180 , 118 ) ;
SvLook = TRUE ;
@@ -148,6 +156,7 @@ ModalDialog DLG_COMMENTS
};
MultiLineEdit ME_VERSIONS
{
+ HelpID = "sfx2:MultiLineEdit:DLG_COMMENTS:ME_VERSIONS";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 32 ) ;
Size = MAP_APPFONT ( 168 , 60 ) ;
@@ -168,6 +177,7 @@ ModalDialog DLG_COMMENTS
};
PushButton PB_CLOSE
{
+ HelpID = "sfx2:PushButton:DLG_COMMENTS:PB_CLOSE";
Pos = MAP_APPFONT ( 68 , 98 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
diff --git a/sfx2/source/doc/applet.cxx b/sfx2/source/doc/applet.cxx
deleted file mode 100644
index 05b7ffa731..0000000000
--- a/sfx2/source/doc/applet.cxx
+++ /dev/null
@@ -1,383 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-
-#include "applet.hxx"
-#include <sfx2/sfxdlg.hxx>
-#include <sfx2/sfxsids.hrc>
-
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "cppuhelper/factory.hxx"
-#include <tools/urlobj.hxx>
-#include <tools/debug.hxx>
-#include <sj2/sjapplet.hxx>
-#include <vcl/syschild.hxx>
-#include <rtl/ustring.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <unotools/javaoptions.hxx>
-#include <svtools/miscopt.hxx>
-#include <comphelper/TypeGeneration.hxx>
-
-using namespace ::com::sun::star;
-using namespace ::comphelper;
-
-namespace sfx2
-{
-class AppletWindow_Impl : public SystemChildWindow
-{
-public:
- SjApplet2* pApplet;
- AppletWindow_Impl( Window* pParent, SjApplet2* pApp )
- : SystemChildWindow( pParent, WB_CLIPCHILDREN )
- , pApplet(pApp)
- {}
-
- virtual void Resize();
-};
-
-void AppletWindow_Impl::Resize()
-{
- Size aSize( GetOutputSizePixel() );
- if ( pApplet )
- pApplet->setSizePixel( aSize );
-}
-
-class AppletWrapper_Impl : public SjApplet2
-{
- virtual void appletResize( const Size & );
- virtual void showDocument( const INetURLObject &, const XubString & );
- virtual void showStatus( const XubString & );
-};
-
-void AppletWrapper_Impl::appletResize( const Size & ) {}
-void AppletWrapper_Impl::showDocument( const INetURLObject &, const XubString & ) {}
-void AppletWrapper_Impl::showStatus( const XubString & ) {}
-
-#define PROPERTY_UNBOUND 0
-#define PROPERTY_MAYBEVOID ::com::sun::star::beans::PropertyAttribute::MAYBEVOID
-
-#define WID_APPLET_CODE 1
-#define WID_APPLET_CODEBASE 2
-#define WID_APPLET_COMMANDS 3
-#define WID_APPLET_DOCBASE 4
-#define WID_APPLET_ISSCRIPT 5
-#define WID_APPLET_NAME 6
-const SfxItemPropertyMapEntry* lcl_GetAppletPropertyMap_Impl()
-{
- static SfxItemPropertyMapEntry aAppletPropertyMap_Impl[] =
- {
- { MAP_CHAR_LEN("AppletCode") , WID_APPLET_CODE , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 },
- { MAP_CHAR_LEN("AppletCodeBase"), WID_APPLET_CODEBASE , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 },
- { MAP_CHAR_LEN("AppletCommands"), WID_APPLET_COMMANDS , CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_UNBOUND, 0 },
- { MAP_CHAR_LEN("AppletDocBase"), WID_APPLET_DOCBASE , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 },
- { MAP_CHAR_LEN("AppletIsScript"), WID_APPLET_ISSCRIPT , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_UNBOUND, 0 },
- { MAP_CHAR_LEN("AppletName") , WID_APPLET_NAME , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 },
- {0,0,0,0,0,0}
- };
-return aAppletPropertyMap_Impl;
-}
-
-::rtl::OUString AppletObject::getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException )
-{
- return impl_getStaticImplementationName();
-}
-
-::sal_Bool AppletObject::supportsService( const ::rtl::OUString& sServiceName )
- throw( ::com::sun::star::uno::RuntimeException )
-{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames =
- getSupportedServiceNames();
- const ::rtl::OUString* pArray = seqServiceNames.getConstArray();
- for ( ::sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength();
- nCounter++ )
- {
- if ( pArray[nCounter] == sServiceName )
- {
- return sal_True ;
- }
- }
- return sal_False ;
-}
-
-::com::sun::star::uno::Sequence< ::rtl::OUString >
-AppletObject::getSupportedServiceNames()
- throw( ::com::sun::star::uno::RuntimeException )
-{
- return impl_getStaticSupportedServiceNames();
-}
-
-::com::sun::star::uno::Sequence< ::rtl::OUString >
-AppletObject::impl_getStaticSupportedServiceNames()
-{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 );
- seqServiceNames.getArray() [0] = ::rtl::OUString::createFromAscii(
- "com.sun.star.embed.SpecialEmbeddedObject" );
- return seqServiceNames ;
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-AppletObject::impl_createInstance(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& xContext )
- throw( ::com::sun::star::uno::Exception )
-{
- return static_cast< ::cppu::OWeakObject * >( new AppletObject( xContext ) );
-}
-
-::rtl::OUString AppletObject::impl_getStaticImplementationName()
-{
- return ::rtl::OUString::createFromAscii(
- "com.sun.star.comp.sfx2.AppletObject" );
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-AppletObject::impl_createFactory()
-{
- return uno::Reference< uno::XInterface >(
- cppu::createSingleComponentFactory(
- impl_createInstance, impl_getStaticImplementationName(),
- impl_getStaticSupportedServiceNames() ),
- uno::UNO_QUERY_THROW );
-}
-
-AppletObject::AppletObject(
- const uno::Reference < uno::XComponentContext >& rContext )
- : mxContext( rContext )
- , maPropMap( lcl_GetAppletPropertyMap_Impl() )
- , mpApplet( NULL )
- , mbMayScript( FALSE )
-{
-}
-
-AppletObject::~AppletObject()
-{
-}
-
-void SAL_CALL AppletObject::initialize( const uno::Sequence< uno::Any >& aArguments ) throw ( uno::Exception, uno::RuntimeException )
-{
- if ( aArguments.getLength() )
- aArguments[0] >>= mxObj;
-}
-
-sal_Bool SAL_CALL AppletObject::load(
- const uno::Sequence < com::sun::star::beans::PropertyValue >& /*lDescriptor*/,
- const uno::Reference < frame::XFrame >& xFrame )
-throw( uno::RuntimeException )
-{
- if ( SvtJavaOptions().IsExecuteApplets() && SvtMiscOptions().IsPluginsEnabled() )
- {
- mpApplet = new AppletWrapper_Impl;
-
- Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
- Window* pWin = new AppletWindow_Impl( pParent, mpApplet );
- pWin->SetBackground();
- pWin->Show();
-
- // aCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "width" ) ), String( aPosSize.GetWidth() ) );
- // aCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "height" ) ), String( aPosSize.GetHeight() ) );
-
- if( maName.getLength() )
- maCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "name" ) ), maName );
-
- if( maCodeBase.getLength() )
- {
- for ( sal_uInt32 nParams=0; nParams<maCmdList.Count(); nParams++ )
- {
- if ( maCmdList[nParams].GetCommand().EqualsAscii("codebase") )
- {
- maCmdList.Remove(nParams);
- break;
- }
- }
-
- maCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "codebase" ) ), maCodeBase );
- }
-
- if( maClass.getLength() )
- maCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "code" ) ), maClass );
-
- if( mbMayScript )
- maCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "mayscript" ) ), String() );
-
- INetURLObject aDocBase( maDocBase );
- mpApplet->Init( mxContext, pWin, aDocBase, maCmdList );
- uno::Reference < awt::XWindow > xWindow( pWin->GetComponentInterface(), uno::UNO_QUERY );
-
- // we must destroy the applet before the parent is destroyed
- xWindow->addEventListener( this );
-
- xFrame->setComponent( xWindow, uno::Reference < frame::XController >() );
- return TRUE;
- }
-
- return FALSE;
-}
-
-void SAL_CALL AppletObject::cancel() throw( com::sun::star::uno::RuntimeException )
-{
- if ( mpApplet )
- {
- mpApplet->appletClose(); // reparenting window
- DELETEZ( mpApplet );
- }
-}
-
-void SAL_CALL AppletObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::disposing( const com::sun::star::lang::EventObject& ) throw (com::sun::star::uno::RuntimeException)
-{
- cancel();
-}
-
-uno::Reference< beans::XPropertySetInfo > SAL_CALL AppletObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException )
-{
- static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( &maPropMap );
- return xInfo;
-}
-
-void SAL_CALL AppletObject::setPropertyValue(const ::rtl::OUString& aPropertyName, const uno::Any& aAny)
- throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
-{
-
- const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName );
- if( !pEntry )
- throw beans::UnknownPropertyException();
- switch( pEntry->nWID )
- {
- case WID_APPLET_CODE :
- aAny >>= maClass;
- break;
- case WID_APPLET_CODEBASE :
- //pImpl->aCodeBase = rURL.GetMainURL( INetURLObject::NO_DECODE );
- //if( rURL.GetProtocol() == INET_PROT_FILE
- // && pImpl->aCodeBase.GetChar( 9 ) == INET_ENC_DELIM_TOKEN )
- // // Laufwerksbuchstabe auf ':' patchen
- // pImpl->aCodeBase.SetChar( 9, INET_DELIM_TOKEN );
-
- aAny >>= maCodeBase;
- break;
- case WID_APPLET_COMMANDS :
- {
- maCmdList.Clear();
- uno::Sequence < beans::PropertyValue > aCommandSequence;
- if( aAny >>= aCommandSequence )
- maCmdList.FillFromSequence( aCommandSequence );
- }
- break;
- case WID_APPLET_DOCBASE :
- aAny >>= maDocBase;
- break;
- case WID_APPLET_ISSCRIPT :
- aAny >>= mbMayScript;
- break;
- case WID_APPLET_NAME :
- aAny >>= maName;
- break;
- default:;
-
- }
-}
-
-uno::Any SAL_CALL AppletObject::getPropertyValue(const ::rtl::OUString& aPropertyName) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
-{
- uno::Any aAny;
- const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName );
- if( !pEntry )
- throw beans::UnknownPropertyException();
- switch( pEntry->nWID )
- {
- case WID_APPLET_CODE :
- aAny <<= maClass;
- break;
- case WID_APPLET_CODEBASE :
- aAny <<= maCodeBase;
- break;
- case WID_APPLET_COMMANDS :
- {
- uno::Sequence< beans::PropertyValue > aCommandSequence;
- maCmdList.FillSequence( aCommandSequence );
- aAny <<= aCommandSequence;
- }
- break;
- case WID_APPLET_DOCBASE :
- break;
- case WID_APPLET_ISSCRIPT :
- aAny <<= mbMayScript;
- break;
- case WID_APPLET_NAME :
- aAny <<= maName;
- break;
- default:;
-
- }
- return aAny;
-}
-
-void SAL_CALL AppletObject::addPropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::removePropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::addVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException )
-{
-}
-
-void SAL_CALL AppletObject::removeVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException )
-{
-}
-
-::sal_Int16 SAL_CALL AppletObject::execute() throw (::com::sun::star::uno::RuntimeException)
-{
- SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- uno::Reference < beans::XPropertySet > xSet( this );
- VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, SID_INSERT_APPLET, mxObj );
- if ( pDlg )
- pDlg->Execute();
- return 0;
-}
-
-void SAL_CALL AppletObject::setTitle( const ::rtl::OUString& ) throw (::com::sun::star::uno::RuntimeException)
-{
-}
-
-}
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 0f6dd6b94a..09e7c58476 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -44,7 +44,6 @@
#define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 8)
#define MSG_CONFIRM_FILTER (RID_SFX_DOC_START+11)
#define MSG_CONFIRM_OVERWRITE_TEMPLATE (RID_SFX_DOC_START+12)
-#define MSG_QUERY_LOAD_TEMPLATE (RID_SFX_DOC_START+13)
#define STR_DELETE_REGION (RID_SFX_DOC_START+14)
#define STR_DELETE_TEMPLATE (RID_SFX_DOC_START+15)
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 8386febfae..3081374941 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -43,14 +43,6 @@ QueryBox MSG_CONFIRM_OVERWRITE_TEMPLATE
DefButton = WB_DEF_NO ;
Message [ en-US ] = "Name already in use.\nDo you want to overwrite document template?" ;
};
-QueryBox MSG_QUERY_LOAD_TEMPLATE
-{
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_NO ;
- HelpId = MSG_QUERY_LOAD_TEMPLATE;
-
- Message [ en-US ] = "The Styles in this document do not match your current Styles. Should your current Styles be applied to this document?";
-};
String STR_DELETE_REGION
{
Text [ en-US ] = "Are you sure you want to delete the region \"$1\"?" ;
diff --git a/sfx2/source/doc/doctdlg.src b/sfx2/source/doc/doctdlg.src
index ee878a85ca..8756da18cf 100644
--- a/sfx2/source/doc/doctdlg.src
+++ b/sfx2/source/doc/doctdlg.src
@@ -28,10 +28,11 @@
#include <sfx2/sfx.hrc>
#include "doc.hrc"
#include "doctdlg.hrc"
+#include <sfx2/sfxcommands.h>
ModalDialog DLG_DOC_TEMPLATE
{
- HelpId = SID_DOCTEMPLATE ;
+ HelpId = CMD_SID_DOCTEMPLATE ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 280 , 128 ) ;
@@ -45,6 +46,7 @@ ModalDialog DLG_DOC_TEMPLATE
};
Edit ED_NAME
{
+ HelpID = "sfx2:Edit:DLG_DOC_TEMPLATE:ED_NAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 200 , 12 ) ;
@@ -63,6 +65,7 @@ ModalDialog DLG_DOC_TEMPLATE
};
ListBox LB_SECTION
{
+ HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_SECTION";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 56 ) ;
Size = MAP_APPFONT ( 97 , 66 ) ;
@@ -75,6 +78,7 @@ ModalDialog DLG_DOC_TEMPLATE
};
ListBox LB_STYLESHEETS
{
+ HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_STYLESHEETS";
Border = TRUE ;
Pos = MAP_APPFONT ( 115 , 56 ) ;
Size = MAP_APPFONT ( 97 , 66 ) ;
@@ -98,12 +102,14 @@ ModalDialog DLG_DOC_TEMPLATE
};
PushButton BT_EDIT
{
+ HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_EDIT";
Pos = MAP_APPFONT ( 224 , 62 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Edit" ;
};
PushButton BT_ORGANIZE
{
+ HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_ORGANIZE";
Pos = MAP_APPFONT ( 224 , 79 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Organizer..." ;
diff --git a/sfx2/source/doc/docvor.src b/sfx2/source/doc/docvor.src
index a471a42e89..78ec832d56 100644
--- a/sfx2/source/doc/docvor.src
+++ b/sfx2/source/doc/docvor.src
@@ -37,7 +37,7 @@
ModalDialog DLG_ORGANIZE
{
- HelpId = SID_ORGANIZER ;
+ HelpId = CMD_SID_ORGANIZER ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 271 , 162 ) ;
@@ -61,6 +61,7 @@ ModalDialog DLG_ORGANIZE
};
PushButton BTN_FILES
{
+ HelpID = "sfx2:PushButton:DLG_ORGANIZE:BTN_FILES";
Pos = MAP_APPFONT ( 205 , 143 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~File..." ;
@@ -68,12 +69,14 @@ ModalDialog DLG_ORGANIZE
};
PushButton BTN_ADDRESSTEMPLATE
{
+ HelpID = "sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE";
Pos = MAP_APPFONT ( 205 , 124 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Address Book..." ;
};
ListBox LB_LEFT_TYP
{
+ HelpID = "sfx2:ListBox:DLG_ORGANIZE:LB_LEFT_TYP";
Border = TRUE ;
Pos = MAP_APPFONT ( 3 , 144 ) ;
Size = MAP_APPFONT ( 94 , 55 ) ;
@@ -88,6 +91,7 @@ ModalDialog DLG_ORGANIZE
};
ListBox LB_RIGHT_TYP
{
+ HelpID = "sfx2:ListBox:DLG_ORGANIZE:LB_RIGHT_TYP";
Border = TRUE ;
Pos = MAP_APPFONT ( 103 , 144 ) ;
Size = MAP_APPFONT ( 94 , 55 ) ;
@@ -142,6 +146,7 @@ ModalDialog DLG_ORGANIZE
};
MenuButton BTN_EDIT
{
+ HelpID = "sfx2:MenuButton:DLG_ORGANIZE:BTN_EDIT";
Pos = MAP_APPFONT ( 205 , 23 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "Commands" ;
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index f8db2447cd..1e4ebbb977 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -384,7 +384,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const ::rtl::OUString&,
::sal_Int16 SAL_CALL IFrameObject::execute() throw (::com::sun::star::uno::RuntimeException)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, SID_INSERT_FLOATINGFRAME, mxObj );
+ VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, rtl::OUString::createFromAscii(".uno:InsertObjectFloatingFrame"), mxObj );
if ( pDlg )
pDlg->Execute();
return 0;
diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk
index b1bddf82e4..d663d34cf5 100644
--- a/sfx2/source/doc/makefile.mk
+++ b/sfx2/source/doc/makefile.mk
@@ -87,8 +87,6 @@ SLOFILES = \
$(SLO)$/syspath.obj \
$(SLO)$/syspathw32.obj
-# $(SLO)$/applet.obj \
-
.IF "$(GUI)" == "WNT"
#HACK TO DISABLE PCH
diff --git a/sfx2/source/doc/new.src b/sfx2/source/doc/new.src
index dc7bcac962..db53b1267f 100644
--- a/sfx2/source/doc/new.src
+++ b/sfx2/source/doc/new.src
@@ -28,12 +28,14 @@
#include <sfx2/sfx.hrc>
#include "doc.hrc"
#include "new.hrc"
+#include <sfx2/sfxcommands.h>
+
// pragma ----------------------------------------------------------------
// DLG_NEW_FILE ----------------------------------------------------------
ModalDialog DLG_NEW_FILE
{
- HelpId = SID_NEWDOC ;
+ HelpId = CMD_SID_NEWDOC ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 336 , 96 ) ;
@@ -57,6 +59,7 @@ ModalDialog DLG_NEW_FILE
};
ListBox LB_REGION
{
+ HelpID = "sfx2:ListBox:DLG_NEW_FILE:LB_REGION";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 18 ) ;
Size = MAP_APPFONT ( 127 , 72 ) ;
@@ -78,6 +81,7 @@ ModalDialog DLG_NEW_FILE
};
ListBox LB_TEMPLATE
{
+ HelpID = "sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE";
Border = TRUE ;
Pos = MAP_APPFONT ( 139 , 18 ) ;
Size = MAP_APPFONT ( 127 , 72 ) ;
@@ -85,6 +89,7 @@ ModalDialog DLG_NEW_FILE
};
MoreButton BT_MORE
{
+ HelpID = "sfx2:MoreButton:DLG_NEW_FILE:BT_MORE";
Pos = MAP_APPFONT ( 274 , 70 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~More" ;
@@ -101,6 +106,7 @@ ModalDialog DLG_NEW_FILE
};
CheckBox BTN_PREVIEW
{
+ HelpID = "sfx2:CheckBox:DLG_NEW_FILE:BTN_PREVIEW";
Pos = MAP_APPFONT ( 6 , 96 ) ;
Size = MAP_APPFONT ( 97 , 10 ) ;
Text [ en-US ] = "Pre~view" ;
@@ -115,6 +121,7 @@ ModalDialog DLG_NEW_FILE
};
CheckBox CB_TEXT_STYLE
{
+ HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_TEXT_STYLE";
Pos = MAP_APPFONT ( 6 , 94 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Hide = TRUE;
@@ -122,6 +129,7 @@ ModalDialog DLG_NEW_FILE
};
CheckBox CB_FRAME_STYLE
{
+ HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_FRAME_STYLE";
Pos = MAP_APPFONT ( 60 , 94 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Hide = TRUE;
@@ -129,6 +137,7 @@ ModalDialog DLG_NEW_FILE
};
CheckBox CB_PAGE_STYLE
{
+ HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_PAGE_STYLE";
Pos = MAP_APPFONT ( 114 , 94 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Hide = TRUE;
@@ -136,6 +145,7 @@ ModalDialog DLG_NEW_FILE
};
CheckBox CB_NUM_STYLE
{
+ HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_NUM_STYLE";
Pos = MAP_APPFONT ( 168 , 94 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Hide = TRUE;
@@ -143,6 +153,7 @@ ModalDialog DLG_NEW_FILE
};
CheckBox CB_MERGE_STYLE
{
+ HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_MERGE_STYLE";
Pos = MAP_APPFONT ( 222 , 94 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Hide = TRUE;
@@ -150,6 +161,7 @@ ModalDialog DLG_NEW_FILE
};
PushButton PB_LOAD_FILE
{
+ HelpID = "sfx2:PushButton:DLG_NEW_FILE:PB_LOAD_FILE";
Pos = MAP_APPFONT ( 274 , 92 ) ;
Size = MAP_APPFONT ( 56 , 14 ) ;
Hide = TRUE;
@@ -168,6 +180,7 @@ ModalDialog DLG_NEW_FILE
};
Edit ED_TITLE
{
+ HelpID = "sfx2:Edit:DLG_NEW_FILE:ED_TITLE";
Border = TRUE ;
Pos = MAP_APPFONT ( 145 , 121 ) ;
Size = MAP_APPFONT ( 175 , 12 ) ;
@@ -183,6 +196,7 @@ ModalDialog DLG_NEW_FILE
};
Edit ED_THEMA
{
+ HelpID = "sfx2:Edit:DLG_NEW_FILE:ED_THEMA";
Border = TRUE ;
Pos = MAP_APPFONT ( 145 , 148 ) ;
Size = MAP_APPFONT ( 175 , 12 ) ;
@@ -198,6 +212,7 @@ ModalDialog DLG_NEW_FILE
};
Edit ED_KEYWORDS
{
+ HelpID = "sfx2:Edit:DLG_NEW_FILE:ED_KEYWORDS";
Border = TRUE ;
Pos = MAP_APPFONT ( 145 , 175 ) ;
Size = MAP_APPFONT ( 175 , 12 ) ;
@@ -213,6 +228,7 @@ ModalDialog DLG_NEW_FILE
};
MultiLineEdit ED_DESC
{
+ HelpID = "sfx2:MultiLineEdit:DLG_NEW_FILE:ED_DESC";
Border = TRUE ;
Pos = MAP_APPFONT ( 144 , 202 ) ;
Size = MAP_APPFONT ( 175 , 32 ) ;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 910bf6f5d5..31959f23e4 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -365,17 +365,6 @@ void SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2, USHORT)
{
SfxStyleSheetBasePool *pStylePool = GetStyleSheetPool();
SetOrganizerSearchMask(pStylePool);
-#ifdef WIR_KOENNEN_WIEDER_HILFE_FUER_STYLESHEETS
- SfxStyleSheetBase *pStyle = (*pStylePool)[nIdx2];
- if(pStyle)
- {
- String aHelpFile;
- ULONG nHelpId=pStyle->GetHelpId(aHelpFile);
- SfxHelpPI* pHelpPI = SFX_APP()->GetHelpPI();
- if ( pHelpPI && nHelpId )
- pHelpPI->LoadTopic( nHelpId );
- }
-#endif
}
}
diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx
index c0989dc055..5a8c6f5e90 100644
--- a/sfx2/source/doc/querytemplate.cxx
+++ b/sfx2/source/doc/querytemplate.cxx
@@ -31,7 +31,7 @@
#include "querytemplate.hxx"
#include "sfxresid.hxx"
#include "doc.hrc"
-
+#include "helpid.hrc"
#include <vcl/svapp.hxx>
namespace sfx2
@@ -41,7 +41,7 @@ QueryTemplateBox::QueryTemplateBox( Window* pParent, const String& rMessage ) :
MessBox ( pParent, 0, Application::GetDisplayName(), rMessage )
{
SetImage( QueryBox::GetStandardImage() );
- SetHelpId( MSG_QUERY_LOAD_TEMPLATE );
+ SetHelpId( HID_QUERY_LOAD_TEMPLATE );
AddButton( String( SfxResId( STR_QRYTEMPL_UPDATE_BTN ) ), RET_YES,
BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );
diff --git a/sfx2/source/inc/applet.hxx b/sfx2/source/inc/applet.hxx
deleted file mode 100644
index 54ae8865c3..0000000000
--- a/sfx2/source/inc/applet.hxx
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SFX_APPLET_HXX
-#define _SFX_APPLET_HXX
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <cppuhelper/implbase6.hxx>
-
-#include <rtl/ustring.hxx>
-#include <svl/ownlist.hxx>
-#include <svl/itemprop.hxx>
-
-namespace com { namespace sun { namespace star { namespace uno {
- class XComponentContext;
- class XInterface;
-} } } }
-
-class SjApplet2;
-namespace sfx2
-{
-
-class AppletObject : public ::cppu::WeakImplHelper6 <
- com::sun::star::util::XCloseable,
- com::sun::star::lang::XEventListener,
- com::sun::star::frame::XSynchronousFrameLoader,
- com::sun::star::ui::dialogs::XExecutableDialog,
- com::sun::star::lang::XInitialization,
- com::sun::star::beans::XPropertySet >
-{
- com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >
- mxContext;
- com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxObj;
- SfxItemPropertyMap maPropMap;
- SvCommandList maCmdList;
- ::rtl::OUString maClass;
- ::rtl::OUString maName;
- ::rtl::OUString maCodeBase;
- ::rtl::OUString maDocBase;
- SjApplet2* mpApplet;
- sal_Bool mbMayScript;
-
- AppletObject( AppletObject & ); // not defined
- void operator =( AppletObject & ); // not defined
-
- AppletObject( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rContext );
- ~AppletObject();
-
- virtual sal_Bool SAL_CALL load( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& lDescriptor,
- const com::sun::star::uno::Reference < com::sun::star::frame::XFrame >& xFrame ) throw( com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL cancel() throw( com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ;
- virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-
- virtual ::rtl::OUString SAL_CALL getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException );
- virtual ::sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString& sServiceName )
- throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
- getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
-
- static ::com::sun::star::uno::Sequence< ::rtl::OUString >
- impl_getStaticSupportedServiceNames();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
- SAL_CALL impl_createInstance(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& xContext )
- throw( ::com::sun::star::uno::Exception );
-
-public:
- static ::rtl::OUString impl_getStaticImplementationName();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
- impl_createFactory();
-};
-
-}
-#endif
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index b1c39a2cef..0e96396065 100755..100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -28,342 +28,313 @@
#define _SFX_HELPID_HRC
// include ------------------------------------------------------------------
-
-#include <svl/solar.hrc>
+
+#include <sfx2/sfxcommands.h>
// Help-Ids -----------------------------------------------------------------
-#define HID_GLOBAL_FALLBACK 0xFFFFFFFF
-
-#define HID_FILTER_SELECT (HID_SFX_START + 0)
-#define HID_USERDEFBMP (HID_SFX_START + 1)
-#define HID_DOCINFO_EDT (HID_SFX_START + 2)
-#define HID_PASSWD (HID_SFX_START + 3)
-#define HID_PRINTMONITOR (HID_SFX_START + 4)
-#define HID_CONFIG_OBJECTBAR (HID_SFX_START + 5)
-#define HID_MANAGE_STYLES (HID_SFX_START + 6)
-#define HID_CONFIG_EVENT (HID_SFX_START + 7)
-#define HID_DOCINFODESC (HID_SFX_START + 8)
-#define HID_DOCINFODOC (HID_SFX_START + 9)
-#define HID_DOCINFOUSER (HID_SFX_START + 10)
-#define HID_DOCINFOSECURITY (HID_SFX_START + 11)
-#define HID_BOOKMARKPROPS (HID_SFX_START + 14)
-#define HID_BOOKGROUPPROPS (HID_SFX_START + 15)
-#define HID_BOOKFILEPROPS (HID_SFX_START + 16)
-#define HID_NEWS_SERVERPROPS (HID_SFX_START + 20)
-#define HID_NEWS_RULEPAGE (HID_SFX_START + 21)
-#define HID_MAILINTRAYPROPS (HID_SFX_START + 23)
-#define HID_DOCINFORELOAD (HID_SFX_START + 24)
-#define HID_NEWS_GROUPPAGE (HID_SFX_START + 25)
-#define HID_NEWS_SERVERPAGE (HID_SFX_START + 26)
-#define HID_FILEDLG_STANDARD (HID_SFX_START + 27)
-#define HID_FILEDLG_MANAGER (HID_SFX_START + 28)
-#define HID_FILEDLG_URL (HID_SFX_START + 29)
-#define HID_FILEDLG_FILE (HID_SFX_START + 30)
-#define HID_FILEDLG_USE_PASSWD (HID_SFX_START + 31)
-#define HID_FILEDLG_READ_ONLY (HID_SFX_START + 32)
-#define HID_EXPLORERCONTROL (HID_SFX_START + 33)
-#define HID_BROWSERCONTROL (HID_SFX_START + 34)
-#define HID_CTL_ORGANIZER_LEFT (HID_SFX_START + 35)
-#define HID_CTL_ORGANIZER_RIGHT (HID_SFX_START + 36)
-#define HID_EXPLMAILSRV_GENERAL_PAGE (HID_SFX_START + 37)
-#define HID_EXPLMAILSRV_PROTOCOL_PAGE (HID_SFX_START + 38)
-#define HID_EXPLMAILSRV_DATAMATCH_PAGE (HID_SFX_START + 39)
-#define HID_EXPLMAILSRV_SENDJOURNAL_PAGE (HID_SFX_START + 40)
-#define HID_EXPLMAIL_GENERAL_PAGE (HID_SFX_START + 41)
-#define HID_NEWS_CTL_RULES (HID_SFX_START + 42)
-#define HID_NEWS_CTL_GROUPS (HID_SFX_START + 43)
-#define HID_CONFIG_OBJECTBAR_CTL (HID_SFX_START + 44)
-#define HID_NEWS_QUICKSEARCH (HID_SFX_START + 45)
-#define HID_NEWS_SERVERVIEWPROPS (HID_SFX_START + 46)
-#define HID_NEWS_SHOWARTICLEPROPS (HID_SFX_START + 47)
-#define HID_NEWS_SHOWGROUPPROPS (HID_SFX_START + 48)
-#define HID_NEWS_USER (HID_SFX_START + 49)
-#define HID_MULTISELECTION_GENERAL_PAGE (HID_SFX_START + 50)
-#define HID_LINK_GENERAL_PAGE (HID_SFX_START + 51)
-#define HID_LINK_ADDRESS_PAGE (HID_SFX_START + 52)
-#define HID_FOLDER_GENERAL_PAGE (HID_SFX_START + 53)
-#define HID_FILE_GENERAL_PAGE (HID_SFX_START + 54)
-#define HID_FTP_GENERAL_PAGE (HID_SFX_START + 55)
-#define HID_PRINT_OPTIONS (HID_SFX_START + 56)
-#define HID_PREVIEW_FRAME (HID_SFX_START + 57)
-#define HID_DOCINFO_FRAME (HID_SFX_START + 58)
-#define HID_EXPLORER_FRAME (HID_SFX_START + 59)
-#define HID_APP_WIN (HID_SFX_START + 60)
-#define HID_TEMPLATE_FMT (HID_SFX_START + 61)
-#define HID_TEMPLATE_FILTER (HID_SFX_START + 62)
-#define HID_FTPSERVER_PAGE (HID_SFX_START + 63)
-#define HID_DLG_SFX_EXP_SEARCH (HID_SFX_START + 65)
-#define HID_TP_SFX_EXP_SEARCH_CRITERIA (HID_SFX_START + 66)
-#define HID_TP_SFX_EXP_SEARCH_PLACE (HID_SFX_START + 67)
-#define HID_SEARCH_DLG_TABLB (HID_SFX_START + 68)
-#define HID_TEMPLDLG_NEWBYEXAMPLE (HID_SFX_START + 69)
-#define HID_TEMPLDLG_UPDATEBYEXAMPLE (HID_SFX_START + 70)
-#define HID_TEMPLDLG_WATERCAN (HID_SFX_START + 71)
-#define HID_DESKTOP (HID_SFX_START + 78)
-#define HID_EXPLORERTOOLSTOOLBOX (HID_SFX_START + 79)
-#define HID_EXPLOREROBJECTTOOLBOX (HID_SFX_START + 80)
-#define HID_RECORDINGTOOLBOX (HID_SFX_START + 81)
-#define HID_FULLSCREENTOOLBOX (HID_SFX_START + 82)
-#define HID_HELPBAR (HID_SFX_START + 83)
-#define HID_ENVTOOLBOX (HID_SFX_START + 84)
-#define HID_FRAMESETEDIT_TOOLBOX (HID_SFX_START + 85)
-#define HID_NAVIGATOR_WINDOW (HID_SFX_START + 86)
-#define HID_TABDLG_RESET_BTN (HID_SFX_START + 89)
-#define HID_TABDLG_STANDARD_BTN (HID_SFX_START + 90)
-#define HID_HELPAGENT_TIP_BOX (HID_SFX_START + 91)
-#define HID_TEMPLDLG_TOOLBOX_LEFT (HID_SFX_START + 92)
-#define HID_TEMPLDLG_TOOLBOX_RIGHT (HID_SFX_START + 93)
-#define HID_EXPLORER_SRCH_COUNT (HID_SFX_START + 94)
-#define HID_BEAMER_SORT_ASCENDING (HID_SFX_START + 95)
-#define HID_BEAMER_SORT_DESCENDING (HID_SFX_START + 96)
-#define HID_EXPLORER_SRCH_LATEST_COUNT (HID_SFX_START + 97)
-#define HID_CONFIG_EVENT_OFFICE_BASED (HID_SFX_START + 98)
-#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_SFX_START + 99)
-#define HID_ORGANIZE_NEW (HID_SFX_START + 100)
-#define HID_ORGANIZE_DELETE (HID_SFX_START + 101)
-#define HID_ORGANIZE_EDIT (HID_SFX_START + 102)
-#define HID_ORGANIZE_COPY_FROM (HID_SFX_START + 103)
-#define HID_ORGANIZE_COPY_TO (HID_SFX_START + 104)
-#define HID_ORGANIZE_PRINT (HID_SFX_START + 105)
-#define HID_ORGANIZE_PRINTER_SETUP (HID_SFX_START + 106)
-#define HID_ORGANIZE_RESCAN (HID_SFX_START + 107)
-#define HID_STYLIST_NEW (HID_SFX_START + 108)
-#define HID_STYLIST_EDIT (HID_SFX_START + 109)
-#define HID_STYLIST_DELETE (HID_SFX_START + 110)
-#define HID_EXPLORERMENU_ARRANGEICONS (HID_SFX_START + 111)
-#define HID_EXPLORERMENU_ARRANGEICONS_ONGRID (HID_SFX_START + 112)
-#define HID_EXPLORERMENU_FIXEDICONPOS (HID_SFX_START + 113)
-#define HID_EXPLORERMENU_OPEN (HID_SFX_START + 114)
-#define HID_EXPLORERMENU_PRINT (HID_SFX_START + 115)
-#define HID_EXPLORERMENU_SEARCH (HID_SFX_START + 116)
-#define HID_EXPLORERMENU_COPY (HID_SFX_START + 117)
-#define HID_EXPLORERMENU_DELETE (HID_SFX_START + 118)
-#define HID_EXPLORERMENU_CREATELINK (HID_SFX_START + 119)
-#define HID_EXPLORERMENU_EDITPROPERTIES (HID_SFX_START + 120)
-#define HID_EXPLORERMENU_DOWNLOAD (HID_SFX_START + 121)
-#define HID_EXPLORERMENU_STDTEMPLATE (HID_SFX_START + 122)
-#define HID_EXPLORERDLG_FILELIST (HID_SFX_START + 124)
-#define HID_PDFOLDERS_WORKPLACE (HID_SFX_START + 125)
-#define HID_PDFOLDERS_EXPLORER (HID_SFX_START + 126)
-#define HID_PDFOLDERS_STANDARD (HID_SFX_START + 127)
-#define HID_PDFOLDERS_ROOT (HID_SFX_START + 128)
-#define HID_PDFOLDERS_DESKTOP (HID_SFX_START + 129)
-#define HID_CNTMENU_REMOVE_GROUP (HID_SFX_START + 130)
-#define HID_CNTMENU_CLEAR_CACHE (HID_SFX_START + 131)
-#define HID_CNT_SYNC_INFO_DLG (HID_SFX_START + 132)
-#define HID_CNT_REMOVE_REMOVEDLIST (HID_SFX_START + 133)
-#define HID_CNT_ABORT_DIALOG (HID_SFX_START + 134)
-#define HID_CNT_PAGE_PRJ_DATAEXCHANGE (HID_SFX_START + 135)
-#define HID_CHAOSDOC_OBJECTBAR_FILE (HID_SFX_START + 136)
-#define HID_CHAOSDOC_OBJECTBAR_MESSAGE (HID_SFX_START + 137)
-#define HID_CHAOSDOC_MN_PART_OPEN (HID_SFX_START + 138)
-#define HID_CHAOSDOC_MN_PART_DELETE (HID_SFX_START + 139)
-#define HID_CHAOSDOC_MN_PART_RENAME (HID_SFX_START + 140)
-#define HID_CHAOSDOC_MN_PART_SAVEAS (HID_SFX_START + 141)
-#define HID_EXPLORER_DOCVIEW_ICON (HID_SFX_START + 142)
-#define HID_EXPLORER_DOCVIEW_DETAILS (HID_SFX_START + 143)
-#define HID_CHAOSDOC_WIN (HID_SFX_START + 144)
-#define HID_CHAOSDOC_WIN_HEADER (HID_SFX_START + 145)
-#define HID_CHAOSDOC_WIN_PARTS (HID_SFX_START + 146)
-#define HID_CHAOSDOC_WIN_BODY (HID_SFX_START + 147)
-#define HID_CNT_INSERT_COLUMN (HID_SFX_START + 148)
-#define HID_CNT_REMOVE_COLUMN (HID_SFX_START + 149)
-#define HID_CNT_OPT_WIDTH (HID_SFX_START + 150)
-#define HID_CNT_SORT_ASC (HID_SFX_START + 151)
-#define HID_CNT_SORT_DESC (HID_SFX_START + 152)
-#define HID_CNT_RULEPG_OPEN_DIR (HID_SFX_START + 153)
-#define HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK (HID_SFX_START + 154)
-#define HID_CHAOSDOC_MN_HEADER_COPYLINK (HID_SFX_START + 155)
-#define HID_CLEAN_CACHE (HID_SFX_START + 156)
-#define HID_SBOX_LOCATION (HID_SFX_START + 157)
-#define HID_SBOX_SUBSCRIBTION (HID_SFX_START + 158)
-#define HID_SBOX_CDF_SUBSCRIBTION (HID_SFX_START + 159)
-#define HID_SBOX_SCHEDULE (HID_SFX_START + 160)
-#define HID_SBOX_NOTIFICATION (HID_SFX_START + 161)
-#define HID_SBOX_SDC_GENERAL (HID_SFX_START + 162)
-#define HID_BRWBOX_HEADERBAR (HID_SFX_START + 163)
-#define HID_CANNOT_CREATE_BMK_HERE (HID_SFX_START + 164)
-#define HID_CREATE_BOOKMARK (HID_SFX_START + 165)
-#define HID_TASKBAR (HID_SFX_START + 166)
-#define HID_TASKBUTTONBAR (HID_SFX_START + 167)
-#define HID_TASKTOOLBAR (HID_SFX_START + 168)
-#define HID_CHAOSDOC_SHOW_FSYS_EXTENSION (HID_SFX_START + 169)
-#define HID_CNT_FILE (HID_SFX_START + 170)
-#define HID_CHAOSDOC_MN_BODY_OPENLINK (HID_SFX_START + 171)
-#define HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK (HID_SFX_START + 172)
-#define HID_CHAOSDOC_MN_BODY_DOWNLOAD (HID_SFX_START + 173)
-#define HID_CHAOSDOC_MN_BODY_ADDBOOKMARK (HID_SFX_START + 174)
-#define HID_OPEN_MENU_CNT (HID_SFX_START + 175)
-#define HID_CNT_OPEN_AS_TEMPLATE (HID_SFX_START + 176)
-#define HID_CNT_OPEN_AS_DOC (HID_SFX_START + 177)
-#define HID_PDFOLDERS_TEMPLATE (HID_SFX_START + 178)
-#define HID_EXPLORER_ROOT (HID_SFX_START + 179)
-#define HID_RESET_URL (HID_SFX_START + 180)
-#define HID_PHONE_DIALOG (HID_SFX_START + 181)
-#define HID_QB_RESOLVE_LINK (HID_SFX_START + 182)
-#define HID_CHAOSDOC_MN_HEADER_FLAG_BOLD (HID_SFX_START + 183)
-#define HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC (HID_SFX_START + 184)
-#define HID_CHAOSDOC_MN_HEADER_BIG_HEADER (HID_SFX_START + 185)
-#define HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER (HID_SFX_START + 186)
-#define HID_CNT_MARK_THREAD_MARKED (HID_SFX_START + 187)
-#define HID_CNT_MARK_THREAD_UNMARKED (HID_SFX_START + 188)
-#define HID_CNT_DLG_SEARCH_BT_SHOW (HID_SFX_START + 189)
-#define HID_CNT_DLG_SEARCH_BT_UPDATE (HID_SFX_START + 190)
-#define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE (HID_SFX_START + 191)
-#define HID_CNT_DLG_SEARCH_BT_STOP (HID_SFX_START + 192)
-#define HID_CNT_PAGE_HEADER (HID_SFX_START + 193)
-#define HID_CNT_DLG_ADDRESS (HID_SFX_START + 194)
-#define HID_EXPLORERMENU_AUTO_ARRANGEICONS (HID_SFX_START + 195)
-#define HID_EXPLORERMENU_AUTO_ADJUSTICONS (HID_SFX_START + 196)
-#define HID_EXPLORERMENU_FREE_POSITIONING (HID_SFX_START + 197)
-#define HID_CNT_TARGET_MENU (HID_SFX_START + 198)
-#define HID_CNT_PAGE_DESCRIPTION (HID_SFX_START + 199)
-#define HID_CNT_LB_HEADER (HID_SFX_START + 200)
-#define HID_CNT_LB_DESCRIPTION (HID_SFX_START + 201)
-#define HID_GROUPVIEW_BIG_SYMBOLS (HID_SFX_START + 202)
-#define HID_GROUPVIEW_SMALL_SYMBOLS (HID_SFX_START + 203)
-#define HID_GROUPVIEW_ADD_GROUP (HID_SFX_START + 204)
-#define HID_GROUPVIEW_REMOVE_GROUP (HID_SFX_START + 205)
-#define HID_GROUPVIEW_RENAME_GROUP (HID_SFX_START + 206)
-#define HID_GROUPVIEW_ADD_BOOKMARK (HID_SFX_START + 207)
-#define HID_GROUPVIEW_TREE (HID_SFX_START + 208)
-#define HID_GROUPVIEW_ADD_AS_FOLDER (HID_SFX_START + 209)
-#define HID_GROUPVIEW_ADD_AS_BMK (HID_SFX_START + 210)
-#define HID_GROUPVIEW_REMOVE_BMK (HID_SFX_START + 211)
-#define HID_GROUPVIEW_CONTENT_BIG (HID_SFX_START + 212)
-#define HID_GROUPVIEW_CONTENT_SMALL (HID_SFX_START + 213)
-#define HID_GROUPVIEW_CONTENT_TREE (HID_SFX_START + 214)
-#define HID_GROUPVIEW_SHOW_DOCS (HID_SFX_START + 215)
-#define HID_EDIT_TEMPLATE (HID_SFX_START + 216)
-#define HID_PDFOLDERS_GRAPHICS (HID_SFX_START + 217)
-#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218)
-#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219)
-#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220)
-#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221)
-#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222)
-#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223)
-#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224)
-#define HID_FILEDLG_FOLDER_BTN (HID_SFX_START + 225)
-#define HID_FILEDLG_FOLDER_FILENAME (HID_SFX_START + 226)
-#define HID_FILEDLG_SRCHFOLDER_BTN (HID_SFX_START + 227)
-#define HID_PDFOLDERS_GROUPS (HID_SFX_START + 228)
-#define HID_OPEN_CHOOSE_FILTER (HID_SFX_START + 229)
-#define HID_PDFOLDERS_BOOKMARKS (HID_SFX_START + 230)
-#define HID_PDFOLDERS_FAVORITES_ADD (HID_SFX_START + 231)
-#define HID_PDFOLDERS_FAVORITES_REMOVE (HID_SFX_START + 232)
-#define HID_PDFOLDERS_HISTORY (HID_SFX_START + 233)
-#define HID_FILEDLG_EDIT_FAVORITES (HID_SFX_START + 234)
-#define HID_FILEDLG_NEW_FAVORITE (HID_SFX_START + 235)
-#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX (HID_SFX_START + 236)
-#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR (HID_SFX_START + 237)
-#define HID_CNT_CB_FORCE_BODY_EXPORT (HID_SFX_START + 240)
-#define HID_CNT_PAGE_REPSTATE_CONTROL (HID_SFX_START + 241)
-#define HID_TASKSTATUSBAR (HID_SFX_START + 242)
-#define HID_CNT_PAGE_HEADER_TABBAR (HID_SFX_START + 244)
-#define HID_CNT_PAGE_SUBSCR_TABBAR (HID_SFX_START + 245)
-#define HID_CHAOSDOC_MN_PART_PRINT (HID_SFX_START + 246)
-#define HID_STATUSINDICATOR_TEXT (HID_SFX_START + 247)
-#define HID_STATUSINDICATOR_PROGRESS (HID_SFX_START + 248)
-#define HID_CNT_VALUE_ADDED_NONE (HID_SFX_START + 249)
-#define HID_CNT_VALUE_ADDED_DOCINFO (HID_SFX_START + 250)
-#define HID_CNT_VALUE_ADDED_FULL (HID_SFX_START + 251)
-#define HID_CNT_MESSAGE_STOREMODE_REMOTE (HID_SFX_START + 252)
-#define HID_CNT_MESSAGE_STOREMODE_LOCAL (HID_SFX_START + 253)
-#define HID_CNT_VIEW_ALL_ARTICLES (HID_SFX_START + 254)
-#define HID_CNT_VIEW_UNREAD_ARTICLES (HID_SFX_START + 255)
-#define HID_CNT_VIEW_READ_ARTICLES (HID_SFX_START + 256)
-#define HID_CNT_VIEW_MARKED_ARTICLES (HID_SFX_START + 257)
-#define HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES (HID_SFX_START + 258)
-#define HID_CNT_VIEW_ALL_FOLDERS (HID_SFX_START + 259)
-#define HID_CNT_VIEW_SUBSCRIBED_FOLDERS (HID_SFX_START + 260)
-#define HID_CNT_VIEW_ACTIVE_FOLDERS (HID_SFX_START + 261)
-#define HID_CNT_SENT_VIEW_ALL_ARTICLES (HID_SFX_START + 262)
-#define HID_CNT_SENT_VIEW_SENT_ARTICLES (HID_SFX_START + 263)
-#define HID_CNT_SENT_VIEW_UNSENT_ARTICLES (HID_SFX_START + 264)
-#define HID_CNT_SENT_VIEW_MARKED_ARTICLES (HID_SFX_START + 265)
-#define HID_MAILWIN_SEND_BUTTON (HID_SFX_START + 266)
-#define HID_MAILWIN_CLOSE_BUTTON (HID_SFX_START + 267)
-#define HID_MAILWIN_ROLE_BOX (HID_SFX_START + 268)
-#define HID_MAILWIN_ADDRESS_EDIT (HID_SFX_START + 269)
-#define HID_MAILWIN_ADDRESS_BOX (HID_SFX_START + 270)
-#define HID_MAILWIN_SUBJECT_EDIT (HID_SFX_START + 271)
-#define HID_MAILWIN_FROM_EDIT (HID_SFX_START + 272)
-#define HID_MAILWIN_PRIO_BOX (HID_SFX_START + 273)
-#define HID_TABDLG_APPLY_BTN (HID_SFX_START + 274)
-#define HID_TP_COMMONPRINTOPTIONS (HID_SFX_START + 275)
-#define HID_FILEDLG_LINK_CB (HID_SFX_START + 276)
-#define HID_FILEDLG_PREVIEW_CB (HID_SFX_START + 277)
-#define HID_HELP_WINDOW (HID_SFX_START + 278)
-#define HID_HELP_LISTBOX (HID_SFX_START + 279)
-#define HID_HELP_TABCONTROL (HID_SFX_START + 280)
-#define HID_HELP_TOOLBOX (HID_SFX_START + 281)
-#define HID_HELP_TOOLBOXITEM_INDEX (HID_SFX_START + 282)
-#define HID_HELP_TOOLBOXITEM_START (HID_SFX_START + 283)
-#define HID_HELP_TOOLBOXITEM_BACKWARD (HID_SFX_START + 284)
-#define HID_HELP_TOOLBOXITEM_FORWARD (HID_SFX_START + 285)
-#define HID_HELP_TOOLBOXITEM_PRINT (HID_SFX_START + 286)
-#define HID_HELP_TOOLBOXITEM_BOOKMARKS (HID_SFX_START + 287)
-#define HID_HELP_TABPAGE_CONTENTS (HID_SFX_START + 288)
-#define HID_HELP_TABPAGE_INDEX (HID_SFX_START + 289)
-#define HID_HELP_TABPAGE_SEARCH (HID_SFX_START + 290)
-#define HID_HELP_TABPAGE_BOOKMARKS (HID_SFX_START + 291)
-#define HID_TBXCONTROL_FILENEW (HID_SFX_START + 292)
-#define HID_ORGANIZE_STDTEMPLATE_ADD (HID_SFX_START + 293)
-#define HID_ORGANIZE_STDTEMPLATE_DEL (HID_SFX_START + 294)
-#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG (HID_SFX_START + 295)
-#define HID_HELP_BOOKMARKS_OPEN (HID_SFX_START + 296)
-#define HID_HELP_BOOKMARKS_RENAME (HID_SFX_START + 297)
-#define HID_HELP_BOOKMARKS_DELETE (HID_SFX_START + 298)
-#define HID_CLOSE_WARNING (HID_SFX_START + 299)
-#define HID_DID_SAVE_PACKED_XML (HID_SFX_START + 300)
-#define HID_HELP_TREELISTBOX_CONTENTS (HID_SFX_START + 301)
-#define HID_CUSTOMIZETOOLBOX (HID_SFX_START + 302)
-#define HID_CUSTOMIZETOOLBOX_FUNCTIONS (HID_SFX_START + 303)
-#define HID_CUSTOMIZETOOLBOX_TOOLBOX (HID_SFX_START + 304)
-#define HID_HELP_TEXT_SELECTION_MODE (HID_SFX_START + 305)
+#define HID_FILTER_SELECT "SFX2_HID_FILTER_SELECT"
+#define HID_USERDEFBMP "SFX2_HID_USERDEFBMP"
+#define HID_DOCINFO_EDT "SFX2_HID_DOCINFO_EDT"
+#define HID_PASSWD "SFX2_HID_PASSWD"
+#define HID_PRINTMONITOR "SFX2_HID_PRINTMONITOR"
+#define HID_CONFIG_OBJECTBAR "SFX2_HID_CONFIG_OBJECTBAR"
+#define HID_MANAGE_STYLES "SFX2_HID_MANAGE_STYLES"
+#define HID_CONFIG_EVENT "SFX2_HID_CONFIG_EVENT"
+#define HID_DOCINFODESC "SFX2_HID_DOCINFODESC"
+#define HID_DOCINFODOC "SFX2_HID_DOCINFODOC"
+#define HID_DOCINFOUSER "SFX2_HID_DOCINFOUSER"
+#define HID_BOOKMARKPROPS "SFX2_HID_BOOKMARKPROPS"
+#define HID_BOOKGROUPPROPS "SFX2_HID_BOOKGROUPPROPS"
+#define HID_BOOKFILEPROPS "SFX2_HID_BOOKFILEPROPS"
+#define HID_NEWS_SERVERPROPS "SFX2_HID_NEWS_SERVERPROPS"
+#define HID_NEWS_RULEPAGE "SFX2_HID_NEWS_RULEPAGE"
+#define HID_MAILINTRAYPROPS "SFX2_HID_MAILINTRAYPROPS"
+#define HID_DOCINFORELOAD "SFX2_HID_DOCINFORELOAD"
+#define HID_NEWS_GROUPPAGE "SFX2_HID_NEWS_GROUPPAGE"
+#define HID_NEWS_SERVERPAGE "SFX2_HID_NEWS_SERVERPAGE"
+#define HID_EXPLORERCONTROL "SFX2_HID_EXPLORERCONTROL"
+#define HID_BROWSERCONTROL "SFX2_HID_BROWSERCONTROL"
+#define HID_CTL_ORGANIZER_LEFT "SFX2_HID_CTL_ORGANIZER_LEFT"
+#define HID_CTL_ORGANIZER_RIGHT "SFX2_HID_CTL_ORGANIZER_RIGHT"
+#define HID_EXPLMAILSRV_GENERAL_PAGE "SFX2_HID_EXPLMAILSRV_GENERAL_PAGE"
+#define HID_EXPLMAILSRV_PROTOCOL_PAGE "SFX2_HID_EXPLMAILSRV_PROTOCOL_PAGE"
+#define HID_EXPLMAILSRV_DATAMATCH_PAGE "SFX2_HID_EXPLMAILSRV_DATAMATCH_PAGE"
+#define HID_EXPLMAILSRV_SENDJOURNAL_PAGE "SFX2_HID_EXPLMAILSRV_SENDJOURNAL_PAGE"
+#define HID_EXPLMAIL_GENERAL_PAGE "SFX2_HID_EXPLMAIL_GENERAL_PAGE"
+#define HID_NEWS_CTL_RULES "SFX2_HID_NEWS_CTL_RULES"
+#define HID_NEWS_CTL_GROUPS "SFX2_HID_NEWS_CTL_GROUPS"
+#define HID_CONFIG_OBJECTBAR_CTL "SFX2_HID_CONFIG_OBJECTBAR_CTL"
+#define HID_NEWS_QUICKSEARCH "SFX2_HID_NEWS_QUICKSEARCH"
+#define HID_NEWS_SERVERVIEWPROPS "SFX2_HID_NEWS_SERVERVIEWPROPS"
+#define HID_NEWS_SHOWARTICLEPROPS "SFX2_HID_NEWS_SHOWARTICLEPROPS"
+#define HID_NEWS_SHOWGROUPPROPS "SFX2_HID_NEWS_SHOWGROUPPROPS"
+#define HID_NEWS_USER "SFX2_HID_NEWS_USER"
+#define HID_MULTISELECTION_GENERAL_PAGE "SFX2_HID_MULTISELECTION_GENERAL_PAGE"
+#define HID_LINK_GENERAL_PAGE "SFX2_HID_LINK_GENERAL_PAGE"
+#define HID_LINK_ADDRESS_PAGE "SFX2_HID_LINK_ADDRESS_PAGE"
+#define HID_FOLDER_GENERAL_PAGE "SFX2_HID_FOLDER_GENERAL_PAGE"
+#define HID_FILE_GENERAL_PAGE "SFX2_HID_FILE_GENERAL_PAGE"
+#define HID_FTP_GENERAL_PAGE "SFX2_HID_FTP_GENERAL_PAGE"
+#define HID_PRINT_OPTIONS "SFX2_HID_PRINT_OPTIONS"
+#define HID_PREVIEW_FRAME "SFX2_HID_PREVIEW_FRAME"
+#define HID_DOCINFO_FRAME "SFX2_HID_DOCINFO_FRAME"
+#define HID_EXPLORER_FRAME "SFX2_HID_EXPLORER_FRAME"
+#define HID_APP_WIN "SFX2_HID_APP_WIN"
+#define HID_TEMPLATE_FMT "SFX2_HID_TEMPLATE_FMT"
+#define HID_TEMPLATE_FILTER "SFX2_HID_TEMPLATE_FILTER"
+#define HID_FTPSERVER_PAGE "SFX2_HID_FTPSERVER_PAGE"
+#define HID_DLG_SFX_EXP_SEARCH "SFX2_HID_DLG_SFX_EXP_SEARCH"
+#define HID_TP_SFX_EXP_SEARCH_CRITERIA "SFX2_HID_TP_SFX_EXP_SEARCH_CRITERIA"
+#define HID_TP_SFX_EXP_SEARCH_PLACE "SFX2_HID_TP_SFX_EXP_SEARCH_PLACE"
+#define HID_SEARCH_DLG_TABLB "SFX2_HID_SEARCH_DLG_TABLB"
+#define HID_TEMPLDLG_NEWBYEXAMPLE "SFX2_HID_TEMPLDLG_NEWBYEXAMPLE"
+#define HID_TEMPLDLG_UPDATEBYEXAMPLE "SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE"
+#define HID_TEMPLDLG_WATERCAN "SFX2_HID_TEMPLDLG_WATERCAN"
+#define HID_DESKTOP "SFX2_HID_DESKTOP"
+#define HID_EXPLORERTOOLSTOOLBOX "SFX2_HID_EXPLORERTOOLSTOOLBOX"
+#define HID_EXPLOREROBJECTTOOLBOX "SFX2_HID_EXPLOREROBJECTTOOLBOX"
+#define HID_RECORDINGTOOLBOX "SFX2_HID_RECORDINGTOOLBOX"
+#define HID_FULLSCREENTOOLBOX "SFX2_HID_FULLSCREENTOOLBOX"
+#define HID_HELPBAR "SFX2_HID_HELPBAR"
+#define HID_ENVTOOLBOX "SFX2_HID_ENVTOOLBOX"
+#define HID_FRAMESETEDIT_TOOLBOX "SFX2_HID_FRAMESETEDIT_TOOLBOX"
+#define HID_NAVIGATOR_WINDOW "SFX2_HID_NAVIGATOR_WINDOW"
+#define HID_TABDLG_RESET_BTN "SFX2_HID_TABDLG_RESET_BTN"
+#define HID_TABDLG_STANDARD_BTN "SFX2_HID_TABDLG_STANDARD_BTN"
+#define HID_HELPAGENT_TIP_BOX "SFX2_HID_HELPAGENT_TIP_BOX"
+#define HID_TEMPLDLG_TOOLBOX_LEFT "SFX2_HID_TEMPLDLG_TOOLBOX_LEFT"
+#define HID_TEMPLDLG_TOOLBOX_RIGHT "SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT"
+#define HID_EXPLORER_SRCH_COUNT "SFX2_HID_EXPLORER_SRCH_COUNT"
+#define HID_BEAMER_SORT_ASCENDING "SFX2_HID_BEAMER_SORT_ASCENDING"
+#define HID_BEAMER_SORT_DESCENDING "SFX2_HID_BEAMER_SORT_DESCENDING"
+#define HID_EXPLORER_SRCH_LATEST_COUNT "SFX2_HID_EXPLORER_SRCH_LATEST_COUNT"
+#define HID_CONFIG_EVENT_OFFICE_BASED "SFX2_HID_CONFIG_EVENT_OFFICE_BASED"
+#define HID_CONFIG_EVENT_DOCUMENT_BASED "SFX2_HID_CONFIG_EVENT_DOCUMENT_BASED"
+#define HID_ORGANIZE_NEW "SFX2_HID_ORGANIZE_NEW"
+#define HID_ORGANIZE_DELETE "SFX2_HID_ORGANIZE_DELETE"
+#define HID_ORGANIZE_EDIT "SFX2_HID_ORGANIZE_EDIT"
+#define HID_ORGANIZE_COPY_FROM "SFX2_HID_ORGANIZE_COPY_FROM"
+#define HID_ORGANIZE_COPY_TO "SFX2_HID_ORGANIZE_COPY_TO"
+#define HID_ORGANIZE_PRINT "SFX2_HID_ORGANIZE_PRINT"
+#define HID_ORGANIZE_PRINTER_SETUP "SFX2_HID_ORGANIZE_PRINTER_SETUP"
+#define HID_ORGANIZE_RESCAN "SFX2_HID_ORGANIZE_RESCAN"
+#define HID_STYLIST_NEW "SFX2_HID_STYLIST_NEW"
+#define HID_STYLIST_EDIT "SFX2_HID_STYLIST_EDIT"
+#define HID_STYLIST_DELETE "SFX2_HID_STYLIST_DELETE"
+#define HID_EXPLORERMENU_ARRANGEICONS "SFX2_HID_EXPLORERMENU_ARRANGEICONS"
+#define HID_EXPLORERMENU_ARRANGEICONS_ONGRID "SFX2_HID_EXPLORERMENU_ARRANGEICONS_ONGRID"
+#define HID_EXPLORERMENU_FIXEDICONPOS "SFX2_HID_EXPLORERMENU_FIXEDICONPOS"
+#define HID_EXPLORERMENU_OPEN "SFX2_HID_EXPLORERMENU_OPEN"
+#define HID_EXPLORERMENU_PRINT "SFX2_HID_EXPLORERMENU_PRINT"
+#define HID_EXPLORERMENU_SEARCH "SFX2_HID_EXPLORERMENU_SEARCH"
+#define HID_EXPLORERMENU_COPY "SFX2_HID_EXPLORERMENU_COPY"
+#define HID_EXPLORERMENU_DELETE "SFX2_HID_EXPLORERMENU_DELETE"
+#define HID_EXPLORERMENU_CREATELINK "SFX2_HID_EXPLORERMENU_CREATELINK"
+#define HID_EXPLORERMENU_EDITPROPERTIES "SFX2_HID_EXPLORERMENU_EDITPROPERTIES"
+#define HID_EXPLORERMENU_DOWNLOAD "SFX2_HID_EXPLORERMENU_DOWNLOAD"
+#define HID_EXPLORERMENU_STDTEMPLATE "SFX2_HID_EXPLORERMENU_STDTEMPLATE"
+#define HID_EXPLORERDLG_FILELIST "SFX2_HID_EXPLORERDLG_FILELIST"
+#define HID_PDFOLDERS_WORKPLACE "SFX2_HID_PDFOLDERS_WORKPLACE"
+#define HID_PDFOLDERS_EXPLORER "SFX2_HID_PDFOLDERS_EXPLORER"
+#define HID_PDFOLDERS_STANDARD "SFX2_HID_PDFOLDERS_STANDARD"
+#define HID_PDFOLDERS_ROOT "SFX2_HID_PDFOLDERS_ROOT"
+#define HID_PDFOLDERS_DESKTOP "SFX2_HID_PDFOLDERS_DESKTOP"
+#define HID_CNTMENU_REMOVE_GROUP "SFX2_HID_CNTMENU_REMOVE_GROUP"
+#define HID_CNTMENU_CLEAR_CACHE "SFX2_HID_CNTMENU_CLEAR_CACHE"
+#define HID_CNT_SYNC_INFO_DLG "SFX2_HID_CNT_SYNC_INFO_DLG"
+#define HID_CNT_REMOVE_REMOVEDLIST "SFX2_HID_CNT_REMOVE_REMOVEDLIST"
+#define HID_CNT_ABORT_DIALOG "SFX2_HID_CNT_ABORT_DIALOG"
+#define HID_CNT_PAGE_PRJ_DATAEXCHANGE "SFX2_HID_CNT_PAGE_PRJ_DATAEXCHANGE"
+#define HID_CHAOSDOC_OBJECTBAR_FILE "SFX2_HID_CHAOSDOC_OBJECTBAR_FILE"
+#define HID_CHAOSDOC_OBJECTBAR_MESSAGE "SFX2_HID_CHAOSDOC_OBJECTBAR_MESSAGE"
+#define HID_CHAOSDOC_MN_PART_OPEN "SFX2_HID_CHAOSDOC_MN_PART_OPEN"
+#define HID_CHAOSDOC_MN_PART_DELETE "SFX2_HID_CHAOSDOC_MN_PART_DELETE"
+#define HID_CHAOSDOC_MN_PART_RENAME "SFX2_HID_CHAOSDOC_MN_PART_RENAME"
+#define HID_CHAOSDOC_MN_PART_SAVEAS "SFX2_HID_CHAOSDOC_MN_PART_SAVEAS"
+#define HID_EXPLORER_DOCVIEW_ICON "SFX2_HID_EXPLORER_DOCVIEW_ICON"
+#define HID_EXPLORER_DOCVIEW_DETAILS "SFX2_HID_EXPLORER_DOCVIEW_DETAILS"
+#define HID_CHAOSDOC_WIN "SFX2_HID_CHAOSDOC_WIN"
+#define HID_CHAOSDOC_WIN_HEADER "SFX2_HID_CHAOSDOC_WIN_HEADER"
+#define HID_CHAOSDOC_WIN_PARTS "SFX2_HID_CHAOSDOC_WIN_PARTS"
+#define HID_CHAOSDOC_WIN_BODY "SFX2_HID_CHAOSDOC_WIN_BODY"
+#define HID_CNT_INSERT_COLUMN "SFX2_HID_CNT_INSERT_COLUMN"
+#define HID_CNT_REMOVE_COLUMN "SFX2_HID_CNT_REMOVE_COLUMN"
+#define HID_CNT_OPT_WIDTH "SFX2_HID_CNT_OPT_WIDTH"
+#define HID_CNT_SORT_ASC "SFX2_HID_CNT_SORT_ASC"
+#define HID_CNT_SORT_DESC "SFX2_HID_CNT_SORT_DESC"
+#define HID_CNT_RULEPG_OPEN_DIR "SFX2_HID_CNT_RULEPG_OPEN_DIR"
+#define HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK "SFX2_HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK"
+#define HID_CHAOSDOC_MN_HEADER_COPYLINK "SFX2_HID_CHAOSDOC_MN_HEADER_COPYLINK"
+#define HID_CLEAN_CACHE "SFX2_HID_CLEAN_CACHE"
+#define HID_SBOX_LOCATION "SFX2_HID_SBOX_LOCATION"
+#define HID_SBOX_SUBSCRIBTION "SFX2_HID_SBOX_SUBSCRIBTION"
+#define HID_SBOX_CDF_SUBSCRIBTION "SFX2_HID_SBOX_CDF_SUBSCRIBTION"
+#define HID_SBOX_SCHEDULE "SFX2_HID_SBOX_SCHEDULE"
+#define HID_SBOX_NOTIFICATION "SFX2_HID_SBOX_NOTIFICATION"
+#define HID_SBOX_SDC_GENERAL "SFX2_HID_SBOX_SDC_GENERAL"
+#define HID_BRWBOX_HEADERBAR "SFX2_HID_BRWBOX_HEADERBAR"
+#define HID_CANNOT_CREATE_BMK_HERE "SFX2_HID_CANNOT_CREATE_BMK_HERE"
+#define HID_CREATE_BOOKMARK "SFX2_HID_CREATE_BOOKMARK"
+#define HID_TASKBAR "SFX2_HID_TASKBAR"
+#define HID_TASKBUTTONBAR "SFX2_HID_TASKBUTTONBAR"
+#define HID_TASKTOOLBAR "SFX2_HID_TASKTOOLBAR"
+#define HID_CHAOSDOC_SHOW_FSYS_EXTENSION "SFX2_HID_CHAOSDOC_SHOW_FSYS_EXTENSION"
+#define HID_CNT_FILE "SFX2_HID_CNT_FILE"
+#define HID_CHAOSDOC_MN_BODY_OPENLINK "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK"
+#define HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK"
+#define HID_CHAOSDOC_MN_BODY_DOWNLOAD "SFX2_HID_CHAOSDOC_MN_BODY_DOWNLOAD"
+#define HID_CHAOSDOC_MN_BODY_ADDBOOKMARK "SFX2_HID_CHAOSDOC_MN_BODY_ADDBOOKMARK"
+#define HID_OPEN_MENU_CNT "SFX2_HID_OPEN_MENU_CNT"
+#define HID_CNT_OPEN_AS_TEMPLATE "SFX2_HID_CNT_OPEN_AS_TEMPLATE"
+#define HID_CNT_OPEN_AS_DOC "SFX2_HID_CNT_OPEN_AS_DOC"
+#define HID_PDFOLDERS_TEMPLATE "SFX2_HID_PDFOLDERS_TEMPLATE"
+#define HID_EXPLORER_ROOT "SFX2_HID_EXPLORER_ROOT"
+#define HID_RESET_URL "SFX2_HID_RESET_URL"
+#define HID_PHONE_DIALOG "SFX2_HID_PHONE_DIALOG"
+#define HID_QB_RESOLVE_LINK "SFX2_HID_QB_RESOLVE_LINK"
+#define HID_CHAOSDOC_MN_HEADER_FLAG_BOLD "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_BOLD"
+#define HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC"
+#define HID_CHAOSDOC_MN_HEADER_BIG_HEADER "SFX2_HID_CHAOSDOC_MN_HEADER_BIG_HEADER"
+#define HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER "SFX2_HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER"
+#define HID_CNT_MARK_THREAD_MARKED "SFX2_HID_CNT_MARK_THREAD_MARKED"
+#define HID_CNT_MARK_THREAD_UNMARKED "SFX2_HID_CNT_MARK_THREAD_UNMARKED"
+#define HID_CNT_DLG_SEARCH_BT_SHOW "SFX2_HID_CNT_DLG_SEARCH_BT_SHOW"
+#define HID_CNT_DLG_SEARCH_BT_UPDATE "SFX2_HID_CNT_DLG_SEARCH_BT_UPDATE"
+#define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE "SFX2_HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE"
+#define HID_CNT_DLG_SEARCH_BT_STOP "SFX2_HID_CNT_DLG_SEARCH_BT_STOP"
+#define HID_CNT_PAGE_HEADER "SFX2_HID_CNT_PAGE_HEADER"
+#define HID_CNT_DLG_ADDRESS "SFX2_HID_CNT_DLG_ADDRESS"
+#define HID_EXPLORERMENU_AUTO_ARRANGEICONS "SFX2_HID_EXPLORERMENU_AUTO_ARRANGEICONS"
+#define HID_EXPLORERMENU_AUTO_ADJUSTICONS "SFX2_HID_EXPLORERMENU_AUTO_ADJUSTICONS"
+#define HID_EXPLORERMENU_FREE_POSITIONING "SFX2_HID_EXPLORERMENU_FREE_POSITIONING"
+#define HID_CNT_TARGET_MENU "SFX2_HID_CNT_TARGET_MENU"
+#define HID_CNT_PAGE_DESCRIPTION "SFX2_HID_CNT_PAGE_DESCRIPTION"
+#define HID_CNT_LB_HEADER "SFX2_HID_CNT_LB_HEADER"
+#define HID_CNT_LB_DESCRIPTION "SFX2_HID_CNT_LB_DESCRIPTION"
+#define HID_GROUPVIEW_BIG_SYMBOLS "SFX2_HID_GROUPVIEW_BIG_SYMBOLS"
+#define HID_GROUPVIEW_SMALL_SYMBOLS "SFX2_HID_GROUPVIEW_SMALL_SYMBOLS"
+#define HID_GROUPVIEW_ADD_GROUP "SFX2_HID_GROUPVIEW_ADD_GROUP"
+#define HID_GROUPVIEW_REMOVE_GROUP "SFX2_HID_GROUPVIEW_REMOVE_GROUP"
+#define HID_GROUPVIEW_RENAME_GROUP "SFX2_HID_GROUPVIEW_RENAME_GROUP"
+#define HID_GROUPVIEW_ADD_BOOKMARK "SFX2_HID_GROUPVIEW_ADD_BOOKMARK"
+#define HID_GROUPVIEW_TREE "SFX2_HID_GROUPVIEW_TREE"
+#define HID_GROUPVIEW_ADD_AS_FOLDER "SFX2_HID_GROUPVIEW_ADD_AS_FOLDER"
+#define HID_GROUPVIEW_ADD_AS_BMK "SFX2_HID_GROUPVIEW_ADD_AS_BMK"
+#define HID_GROUPVIEW_REMOVE_BMK "SFX2_HID_GROUPVIEW_REMOVE_BMK"
+#define HID_GROUPVIEW_CONTENT_BIG "SFX2_HID_GROUPVIEW_CONTENT_BIG"
+#define HID_GROUPVIEW_CONTENT_SMALL "SFX2_HID_GROUPVIEW_CONTENT_SMALL"
+#define HID_GROUPVIEW_CONTENT_TREE "SFX2_HID_GROUPVIEW_CONTENT_TREE"
+#define HID_GROUPVIEW_SHOW_DOCS "SFX2_HID_GROUPVIEW_SHOW_DOCS"
+#define HID_EDIT_TEMPLATE "SFX2_HID_EDIT_TEMPLATE"
+#define HID_PDFOLDERS_GRAPHICS "SFX2_HID_PDFOLDERS_GRAPHICS"
+#define HID_PDFOLDERS_GROUPS "SFX2_HID_PDFOLDERS_GROUPS"
+#define HID_OPEN_CHOOSE_FILTER "SFX2_HID_OPEN_CHOOSE_FILTER"
+#define HID_PDFOLDERS_BOOKMARKS "SFX2_HID_PDFOLDERS_BOOKMARKS"
+#define HID_PDFOLDERS_FAVORITES_ADD "SFX2_HID_PDFOLDERS_FAVORITES_ADD"
+#define HID_PDFOLDERS_FAVORITES_REMOVE "SFX2_HID_PDFOLDERS_FAVORITES_REMOVE"
+#define HID_PDFOLDERS_HISTORY "SFX2_HID_PDFOLDERS_HISTORY"
+#define HID_CNT_CB_FORCE_BODY_EXPORT "SFX2_HID_CNT_CB_FORCE_BODY_EXPORT"
+#define HID_CNT_PAGE_REPSTATE_CONTROL "SFX2_HID_CNT_PAGE_REPSTATE_CONTROL"
+#define HID_TASKSTATUSBAR "SFX2_HID_TASKSTATUSBAR"
+#define HID_CNT_PAGE_HEADER_TABBAR "SFX2_HID_CNT_PAGE_HEADER_TABBAR"
+#define HID_CNT_PAGE_SUBSCR_TABBAR "SFX2_HID_CNT_PAGE_SUBSCR_TABBAR"
+#define HID_CHAOSDOC_MN_PART_PRINT "SFX2_HID_CHAOSDOC_MN_PART_PRINT"
+#define HID_STATUSINDICATOR_TEXT "SFX2_HID_STATUSINDICATOR_TEXT"
+#define HID_STATUSINDICATOR_PROGRESS "SFX2_HID_STATUSINDICATOR_PROGRESS"
+#define HID_CNT_VALUE_ADDED_NONE "SFX2_HID_CNT_VALUE_ADDED_NONE"
+#define HID_CNT_VALUE_ADDED_DOCINFO "SFX2_HID_CNT_VALUE_ADDED_DOCINFO"
+#define HID_CNT_VALUE_ADDED_FULL "SFX2_HID_CNT_VALUE_ADDED_FULL"
+#define HID_CNT_MESSAGE_STOREMODE_REMOTE "SFX2_HID_CNT_MESSAGE_STOREMODE_REMOTE"
+#define HID_CNT_MESSAGE_STOREMODE_LOCAL "SFX2_HID_CNT_MESSAGE_STOREMODE_LOCAL"
+#define HID_CNT_VIEW_ALL_ARTICLES "SFX2_HID_CNT_VIEW_ALL_ARTICLES"
+#define HID_CNT_VIEW_UNREAD_ARTICLES "SFX2_HID_CNT_VIEW_UNREAD_ARTICLES"
+#define HID_CNT_VIEW_READ_ARTICLES "SFX2_HID_CNT_VIEW_READ_ARTICLES"
+#define HID_CNT_VIEW_MARKED_ARTICLES "SFX2_HID_CNT_VIEW_MARKED_ARTICLES"
+#define HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES "SFX2_HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES"
+#define HID_CNT_VIEW_ALL_FOLDERS "SFX2_HID_CNT_VIEW_ALL_FOLDERS"
+#define HID_CNT_VIEW_SUBSCRIBED_FOLDERS "SFX2_HID_CNT_VIEW_SUBSCRIBED_FOLDERS"
+#define HID_CNT_VIEW_ACTIVE_FOLDERS "SFX2_HID_CNT_VIEW_ACTIVE_FOLDERS"
+#define HID_CNT_SENT_VIEW_ALL_ARTICLES "SFX2_HID_CNT_SENT_VIEW_ALL_ARTICLES"
+#define HID_CNT_SENT_VIEW_SENT_ARTICLES "SFX2_HID_CNT_SENT_VIEW_SENT_ARTICLES"
+#define HID_CNT_SENT_VIEW_UNSENT_ARTICLES "SFX2_HID_CNT_SENT_VIEW_UNSENT_ARTICLES"
+#define HID_CNT_SENT_VIEW_MARKED_ARTICLES "SFX2_HID_CNT_SENT_VIEW_MARKED_ARTICLES"
+#define HID_MAILWIN_SEND_BUTTON "SFX2_HID_MAILWIN_SEND_BUTTON"
+#define HID_MAILWIN_CLOSE_BUTTON "SFX2_HID_MAILWIN_CLOSE_BUTTON"
+#define HID_MAILWIN_ROLE_BOX "SFX2_HID_MAILWIN_ROLE_BOX"
+#define HID_MAILWIN_ADDRESS_EDIT "SFX2_HID_MAILWIN_ADDRESS_EDIT"
+#define HID_MAILWIN_ADDRESS_BOX "SFX2_HID_MAILWIN_ADDRESS_BOX"
+#define HID_MAILWIN_SUBJECT_EDIT "SFX2_HID_MAILWIN_SUBJECT_EDIT"
+#define HID_MAILWIN_FROM_EDIT "SFX2_HID_MAILWIN_FROM_EDIT"
+#define HID_MAILWIN_PRIO_BOX "SFX2_HID_MAILWIN_PRIO_BOX"
+#define HID_TABDLG_APPLY_BTN "SFX2_HID_TABDLG_APPLY_BTN"
+#define HID_TP_COMMONPRINTOPTIONS "SFX2_HID_TP_COMMONPRINTOPTIONS"
+#define HID_HELP_WINDOW "SFX2_HID_HELP_WINDOW"
+#define HID_HELP_LISTBOX "SFX2_HID_HELP_LISTBOX"
+#define HID_HELP_TABCONTROL "SFX2_HID_HELP_TABCONTROL"
+#define HID_HELP_TOOLBOX "SFX2_HID_HELP_TOOLBOX"
+#define HID_HELP_TOOLBOXITEM_INDEX "SFX2_HID_HELP_TOOLBOXITEM_INDEX"
+#define HID_HELP_TOOLBOXITEM_START "SFX2_HID_HELP_TOOLBOXITEM_START"
+#define HID_HELP_TOOLBOXITEM_BACKWARD "SFX2_HID_HELP_TOOLBOXITEM_BACKWARD"
+#define HID_HELP_TOOLBOXITEM_FORWARD "SFX2_HID_HELP_TOOLBOXITEM_FORWARD"
+#define HID_HELP_TOOLBOXITEM_PRINT "SFX2_HID_HELP_TOOLBOXITEM_PRINT"
+#define HID_HELP_TOOLBOXITEM_BOOKMARKS "SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS"
+#define HID_HELP_TABPAGE_CONTENTS "SFX2_HID_HELP_TABPAGE_CONTENTS"
+#define HID_HELP_TABPAGE_INDEX "SFX2_HID_HELP_TABPAGE_INDEX"
+#define HID_HELP_TABPAGE_SEARCH "SFX2_HID_HELP_TABPAGE_SEARCH"
+#define HID_HELP_TABPAGE_BOOKMARKS "SFX2_HID_HELP_TABPAGE_BOOKMARKS"
+#define HID_TBXCONTROL_FILENEW "SFX2_HID_TBXCONTROL_FILENEW"
+#define HID_ORGANIZE_STDTEMPLATE_ADD "SFX2_HID_ORGANIZE_STDTEMPLATE_ADD"
+#define HID_ORGANIZE_STDTEMPLATE_DEL "SFX2_HID_ORGANIZE_STDTEMPLATE_DEL"
+#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG "SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG"
+#define HID_HELP_BOOKMARKS_OPEN "SFX2_HID_HELP_BOOKMARKS_OPEN"
+#define HID_HELP_BOOKMARKS_RENAME "SFX2_HID_HELP_BOOKMARKS_RENAME"
+#define HID_HELP_BOOKMARKS_DELETE "SFX2_HID_HELP_BOOKMARKS_DELETE"
+#define HID_CLOSE_WARNING "SFX2_HID_CLOSE_WARNING"
+#define HID_DID_SAVE_PACKED_XML "SFX2_HID_DID_SAVE_PACKED_XML"
+#define HID_HELP_TREELISTBOX_CONTENTS "SFX2_HID_HELP_TREELISTBOX_CONTENTS"
+#define HID_CUSTOMIZETOOLBOX "SFX2_HID_CUSTOMIZETOOLBOX"
+#define HID_CUSTOMIZETOOLBOX_FUNCTIONS "SFX2_HID_CUSTOMIZETOOLBOX_FUNCTIONS"
+#define HID_CUSTOMIZETOOLBOX_TOOLBOX "SFX2_HID_CUSTOMIZETOOLBOX_TOOLBOX"
+#define HID_HELP_TEXT_SELECTION_MODE "SFX2_HID_HELP_TEXT_SELECTION_MODE"
-#define HID_WARNING_SECURITY_HYPERLINK (HID_SFX_START + 306)
-#define HID_FILEDLG_EXPORTASPDF (HID_SFX_START + 307)
-#define HID_USERDEFBMP_TOOLBOX (HID_SFX_START + 308)
+#define HID_WARNING_SECURITY_HYPERLINK "SFX2_HID_WARNING_SECURITY_HYPERLINK"
+#define HID_USERDEFBMP_TOOLBOX "SFX2_HID_USERDEFBMP_TOOLBOX"
-#define HID_CONFIG_LOAD (HID_SFX_START + 309)
-#define HID_CONFIG_SAVE (HID_SFX_START + 310)
+#define HID_CONFIG_LOAD "SFX2_HID_CONFIG_LOAD"
+#define HID_CONFIG_SAVE "SFX2_HID_CONFIG_SAVE"
-#define HID_SEARCHDIALOG (HID_SFX_START + 311)
-#define HID_TASKPANE_WINDOW (HID_SFX_START + 312)
-#define HID_TASKPANE_VIEW_MENU (HID_SFX_START + 313)
-#define HID_XMLSEC_WARNING_BROKENSIGNATURE (HID_SFX_START + 314)
-#define HID_XMLSEC_QUERY_LOSINGSIGNATURE (HID_SFX_START + 315)
-#define HID_XMLSEC_QUERY_SAVEBEFORESIGN (HID_SFX_START + 316)
-#define HID_XMLSECDLG_MACROWARN (HID_SFX_START + 317)
-#define HID_XMLSEC_INFO_WRONGDOCFORMAT (HID_SFX_START + 318)
-#define HID_WARNING_MACROSDISABLED (HID_SFX_START + 319)
-#define HID_WARNING_ALIENFORMAT (HID_SFX_START + 320)
-#define HID_HELP_ONSTARTUP_BOX (HID_SFX_START + 321)
-#define HID_DLG_CHECKFORONLINEUPDATE (HID_SFX_START + 322)
-#define HID_TP_CUSTOMPROPERTIES (HID_SFX_START + 324)
-#define HID_CTRL_CUSTOMPROPERTIES (HID_SFX_START + 325)
-#define HID_CTRL_CUSTOMPROPS_YES_NO (HID_SFX_START + 326)
-#define HID_DLG_CUSTOMPROPS_DURATION (HID_SFX_START + 327)
+#define HID_SEARCHDIALOG "SFX2_HID_SEARCHDIALOG"
-#define HID_SECURITYTAB_PASSWORD_TO_OPEN (HID_SFX_START + 328)
-#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN (HID_SFX_START + 329)
-#define HID_SECURITYTAB_PASSWORD_TO_MODIFY (HID_SFX_START + 330)
-#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY (HID_SFX_START + 331)
-#define HID_SECURITYTAB_OPEN_FILE_READONLY (HID_SFX_START + 332)
-#define HID_SECURITYTAB_RECORD_CHANGES (HID_SFX_START + 333)
-#define HID_SECURITYTAB_PROTECTION (HID_SFX_START + 334)
+#define HID_XMLSEC_WARNING_BROKENSIGNATURE "SFX2_HID_XMLSEC_WARNING_BROKENSIGNATURE"
+#define HID_XMLSEC_QUERY_LOSINGSIGNATURE "SFX2_HID_XMLSEC_QUERY_LOSINGSIGNATURE"
+#define HID_XMLSEC_QUERY_SAVEBEFORESIGN "SFX2_HID_XMLSEC_QUERY_SAVEBEFORESIGN"
+#define HID_XMLSECDLG_MACROWARN "SFX2_HID_XMLSECDLG_MACROWARN"
+#define HID_XMLSEC_INFO_WRONGDOCFORMAT "SFX2_HID_XMLSEC_INFO_WRONGDOCFORMAT"
+#define HID_WARNING_MACROSDISABLED "SFX2_HID_WARNING_MACROSDISABLED"
+#define HID_WARNING_ALIENFORMAT "SFX2_HID_WARNING_ALIENFORMAT"
+#define HID_HELP_ONSTARTUP_BOX "SFX2_HID_HELP_ONSTARTUP_BOX"
+#define HID_DLG_CHECKFORONLINEUPDATE "SFX2_HID_DLG_CHECKFORONLINEUPDATE"
+#define HID_TP_CUSTOMPROPERTIES "SFX2_HID_TP_CUSTOMPROPERTIES"
+#define HID_CTRL_CUSTOMPROPERTIES "SFX2_HID_CTRL_CUSTOMPROPERTIES"
+#define HID_CTRL_CUSTOMPROPS_YES_NO "SFX2_HID_CTRL_CUSTOMPROPS_YES_NO"
+#define HID_DLG_CUSTOMPROPS_DURATION "SFX2_HID_DLG_CUSTOMPROPS_DURATION"
-#define ACT_SFX_HID_END HID_SECURITYTAB_PROTECTION
+#define HID_HELP_ONHELP "SFX2_HID_HELP_ONHELP"
-// "Uberlaufpr"ufung --------------------------------------------------------
+#define HID_QUERY_LOAD_TEMPLATE "SFX2_HID_QUERY_LOAD_TEMPLATE"
-#if ACT_SFX_HID_END > HID_SFX_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_SECURITYTAB_PASSWORD_TO_OPEN "SFX2_HID_SECURITYTAB_PASSWORD_TO_OPEN"
+#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN "SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN"
+#define HID_SECURITYTAB_PASSWORD_TO_MODIFY "SFX2_HID_SECURITYTAB_PASSWORD_TO_MODIFY"
+#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY "SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY"
+#define HID_SECURITYTAB_OPEN_FILE_READONLY "SFX2_HID_SECURITYTAB_OPEN_FILE_READONLY"
+#define HID_SECURITYTAB_RECORD_CHANGES "SFX2_HID_SECURITYTAB_RECORD_CHANGES"
+#define HID_SECURITYTAB_PROTECTION "SFX2_HID_SECURITYTAB_PROTECTION"
-#define HID_HELP_ONHELP 68245
+#define HID_TASKPANE_WINDOW "SFX2_HID_TASKPANE_WINDOW"
+#define HID_TASKPANE_VIEW_MENU "SFX2_HID_TASKPANE_VIEW_MENU"
+#define HID_DOCINFOSECURITY "SFX2_HID_DOCINFOSECURITY"
#endif // #ifndef _SFX_HELPID_HRC
diff --git a/sfx2/source/menu/menu.src b/sfx2/source/menu/menu.src
index cf13af67c3..17008794bd 100644
--- a/sfx2/source/menu/menu.src
+++ b/sfx2/source/menu/menu.src
@@ -26,6 +26,7 @@
************************************************************************/
#include "menu.hrc"
+#include <sfx2/sfxcommands.h>
String STR_MENU_CFGITEM
{
@@ -44,19 +45,19 @@ Menu MN_CLIPBOARDFUNCS
MenuItem
{
Identifier = SID_CUT ;
- HelpID = SID_CUT ;
+ HelpID = CMD_SID_CUT ;
Text [ en-US ] = "Cu~t" ;
};
MenuItem
{
Identifier = SID_COPY ;
- HelpID = SID_COPY ;
+ HelpID = CMD_SID_COPY ;
Text [ en-US ] = "~Copy" ;
};
MenuItem
{
Identifier = SID_PASTE ;
- HelpID = SID_PASTE ;
+ HelpID = CMD_SID_PASTE ;
Text [ en-US ] = "~Paste" ;
};
};
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index e1c50e4f3f..7c86548478 100755
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -173,7 +173,6 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
// einf"ugen
pMenu->InsertItem( nId, aVerbs[n].VerbName );
- pMenu->SetHelpId( nId, (ULONG) nId );
}
}
}
@@ -485,10 +484,10 @@ void SfxPopupMenuManager::InsertSeparator( USHORT nPos )
//-------------------------------------------------------------------------
-void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, USHORT nPos )
+void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, USHORT nPos )
{
pSVMenu->InsertItem( nId, rName, nBits,nPos );
- pSVMenu->SetHelpId( nId, (ULONG) nId );
+ pSVMenu->SetHelpId( nId, rHelpId );
}
//-------------------------------------------------------------------------
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 7a06bc08aa..20f758da0c 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -345,7 +345,9 @@ void SfxVirtualMenu::CreateFromSVMenu()
DBG_CHKTHIS(SfxVirtualMenu, 0);
// Merge Addon popup menus into the SV Menu
- Reference< com::sun::star::frame::XFrame > xFrame( pBindings->GetDispatcher()->GetFrame()->GetFrame().GetFrameInterface() );
+ SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame();
+ SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool();
+ Reference< com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() );
if ( pSVMenu->IsMenuBar() )
{
@@ -448,23 +450,14 @@ void SfxVirtualMenu::CreateFromSVMenu()
}
else
{
-/*
- if ( nSlotId >= SID_SFX_START && !SfxMenuManager::IsPopupFunction(nSlotId) )
+ const SfxSlot* pSlot = pSlotPool->GetSlot( nSlotId );
+ if ( pSlot )
{
- // Echte Popups sollen keine SlotIds haben; leider sind
- // da noch Altlasten mit herumzuschleppen ...
- String aTitle = pSVMenu->GetItemText( nSlotId );
- pSVMenu->SetPopupMenu( nSlotId, NULL );
- USHORT nPos = pSVMenu->GetItemPos( nSlotId );
- pSVMenu->RemoveItem( nPos );
- nSlotId = 1;
- while ( pSVMenu->GetItemPos(nSlotId) != MENU_ITEM_NOTFOUND )
- nSlotId++;
- pSVMenu->InsertItem( nSlotId, aTitle, 0, nPos );
- pSVMenu->SetPopupMenu( nSlotId, pPopup );
+ rtl::OString aCmd(".uno:");
+ aCmd += pSlot->GetUnoName();
+ pSVMenu->SetHelpId( nSlotId, pSlot->GetUnoName() );
}
-*/
- pSVMenu->SetHelpId( nSlotId, 0L );
+
pMnuCtrl = pItems+nPos;
// normalerweise jetzt erst im Activate-Handler
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 0dc0a63a1e..33a8776a44 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -132,7 +132,12 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
{
USHORT nSlotId = pSlot->GetSlotId();
if ( nSlotId > 0 )
+ {
+ rtl::OString aCmd(".uno:");
+ aCmd += pSlot->GetUnoName();
+ pStatusBar->SetHelpId( nSlotId, aCmd );
return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule );
+ }
}
return NULL;
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 5b302047ac..71b406d7d7 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -127,15 +127,15 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt )
// TODO/LATER: do we still need this code?
Window* pWindow = rNEvt.GetWindow();
- ULONG nHelpId = 0;
- while ( !nHelpId && pWindow )
+ rtl::OString sHelpId;
+ while ( !sHelpId.getLength() && pWindow )
{
- nHelpId = pWindow->GetHelpId();
+ sHelpId = pWindow->GetHelpId();
pWindow = pWindow->GetParent();
}
- if ( nHelpId )
- SfxHelp::OpenHelpAgent( pFrame, nHelpId );
+ if ( sHelpId.getLength() )
+ SfxHelp::OpenHelpAgent( pFrame, sHelpId );
// if focus was on an external window, the clipboard content might have been changed
pView->GetBindings().Invalidate( SID_PASTE );
diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src
index 81633539dc..d0ea3dc928 100644
--- a/sfx2/util/hidother.src
+++ b/sfx2/util/hidother.src
@@ -26,41 +26,20 @@
************************************************************************/
#include "../source/inc/helpid.hrc" // HID_XXX
-#include "../inc/sfx2/sfxsids.hrc" // SID_XXX
-#include "../inc/sfx2/sfx.hrc"
-
hidspecial HID_APP_WIN { HelpID = HID_APP_WIN; };
hidspecial HID_DESKTOP { HelpID = HID_DESKTOP; };
hidspecial HID_DOCINFO_FRAME { HelpID = HID_DOCINFO_FRAME; };
hidspecial HID_EXPLORER_FRAME { HelpID = HID_EXPLORER_FRAME; };
-hidspecial HID_FILEDLG_FILE { HelpID = HID_FILEDLG_FILE; };
-hidspecial HID_FILEDLG_MANAGER { HelpID = HID_FILEDLG_MANAGER; };
-hidspecial HID_FILEDLG_READ_ONLY { HelpID = HID_FILEDLG_READ_ONLY; };
-hidspecial HID_FILEDLG_STANDARD { HelpID = HID_FILEDLG_STANDARD; };
-hidspecial HID_FILEDLG_URL { HelpID = HID_FILEDLG_URL; };
-hidspecial HID_FILEDLG_USE_PASSWD { HelpID = HID_FILEDLG_USE_PASSWD; };
-hidspecial HID_INTERFACE_SFXMAILVIEW { HelpID = HID_INTERFACE_SFXMAILVIEW; };
-hidspecial HID_INTERFACE_SFXEXPLVIEWSH { HelpID = HID_INTERFACE_SFXEXPLVIEWSH; };
-hidspecial HID_INTERFACE_SFXFRAMESETVIEW { HelpID = HID_INTERFACE_SFXFRAMESETVIEW; };
-hidspecial HID_INTERFACE_SFXFRAMESETSOURCEVIEW { HelpID = HID_INTERFACE_SFXFRAMESETSOURCEVIEW; };
-hidspecial HID_INTERFACE_SFXHELP_VIEWSH { HelpID = HID_INTERFACE_SFXHELP_VIEWSH; };
hidspecial HID_PREVIEW_FRAME { HelpID = HID_PREVIEW_FRAME; };
hidspecial HID_PRINT_OPTIONS { HelpID = HID_PRINT_OPTIONS; };
hidspecial HID_TEMPLATE_FILTER { HelpID = HID_TEMPLATE_FILTER; };
hidspecial HID_TEMPLATE_FMT { HelpID = HID_TEMPLATE_FMT; };
hidspecial HID_SEARCH_DLG_TABLB { HelpID = HID_SEARCH_DLG_TABLB; };
-hidspecial SID_STYLE_FAMILY1 { HelpID = SID_STYLE_FAMILY1; };
-hidspecial SID_STYLE_FAMILY2 { HelpID = SID_STYLE_FAMILY2; };
-hidspecial SID_STYLE_FAMILY3 { HelpID = SID_STYLE_FAMILY3; };
-hidspecial SID_STYLE_FAMILY4 { HelpID = SID_STYLE_FAMILY4; };
-hidspecial SID_STYLE_FAMILY5 { HelpID = SID_STYLE_FAMILY5; };
-hidspecial SID_FILTER_NAME { HelpID = SID_FILTER_NAME; };
hidspecial HID_NAVIGATOR_WINDOW { HelpID = HID_NAVIGATOR_WINDOW; };
hidspecial HID_HELPAGENT_TIP_BOX { HelpId = HID_HELPAGENT_TIP_BOX; };
hidspecial HID_TEMPLDLG_TOOLBOX_LEFT { HelpId = HID_TEMPLDLG_TOOLBOX_LEFT;};
hidspecial HID_EXPLORER_SRCH_COUNT { HelpId = HID_EXPLORER_SRCH_COUNT;};
-hidspecial HID_INTERFACE_SFXPLUGINVIEW { HelpID = HID_INTERFACE_SFXPLUGINVIEW; };
hidspecial HID_TABDLG_RESET_BTN { HelpID = HID_TABDLG_RESET_BTN; };
hidspecial HID_TABDLG_STANDARD_BTN { HelpID = HID_TABDLG_STANDARD_BTN; };
hidspecial HID_CONFIG_EVENT_OFFICE_BASED { HelpID = HID_CONFIG_EVENT_OFFICE_BASED; };
@@ -70,35 +49,10 @@ hidspecial HID_EXPLORERMENU_ARRANGEICONS { HelpID = HID_EXPLORERMENU_ARRANGEICO
hidspecial HID_EXPLORERMENU_STDTEMPLATE { HelpID = HID_EXPLORERMENU_STDTEMPLATE; };
hidspecial HID_EXPLORER_DOCVIEW_ICON { HelpID = HID_EXPLORER_DOCVIEW_ICON; };
hidspecial HID_EXPLORER_DOCVIEW_DETAILS { HelpID = HID_EXPLORER_DOCVIEW_DETAILS; };
-hidspecial HID_CHAOSDOC_WIN { HelpID = HID_CHAOSDOC_WIN; };
-hidspecial HID_CHAOSDOC_WIN_HEADER { HelpID = HID_CHAOSDOC_WIN_HEADER; };
-hidspecial HID_CHAOSDOC_WIN_PARTS { HelpID = HID_CHAOSDOC_WIN_PARTS; };
-hidspecial HID_CHAOSDOC_WIN_BODY { HelpID = HID_CHAOSDOC_WIN_BODY; };
hidspecial HID_BRWBOX_HEADERBAR { HelpID = HID_BRWBOX_HEADERBAR; };
hidspecial HID_TASKBAR { HelpID = HID_TASKBAR; };
hidspecial HID_TASKBUTTONBAR { HelpID = HID_TASKBUTTONBAR; };
hidspecial HID_TASKTOOLBAR { HelpID = HID_TASKTOOLBAR; };
-hidspecial HID_CHAOS_NEW_IMAP_BOX { HelpID = HID_CHAOS_NEW_IMAP_BOX; };
-hidspecial HID_CHAOS_NEW_IMAP_MSG { HelpID = HID_CHAOS_NEW_IMAP_MSG; };
-hidspecial HID_CHAOS_NEW_IMAP_FLD { HelpID = HID_CHAOS_NEW_IMAP_FLD; };
-hidspecial HID_CHAOS_NEW_NEWS_BOX { HelpID = HID_CHAOS_NEW_NEWS_BOX; };
-hidspecial HID_CHAOS_NEW_NEWS_MSG { HelpID = HID_CHAOS_NEW_NEWS_MSG; };
-hidspecial HID_CHAOS_NEW_IMAP_BOX { HelpID = HID_CHAOS_NEW_IMAP_BOX; };
-hidspecial HID_CHAOS_NEW_FSYS_FLD { HelpID = HID_CHAOS_NEW_FSYS_FLD; };
-hidspecial HID_CHAOS_NEW_FSYS_LNK { HelpID = HID_CHAOS_NEW_FSYS_LNK; };
-hidspecial HID_CHAOS_NEW_FTP_BOX { HelpID = HID_CHAOS_NEW_FTP_BOX; };
-hidspecial HID_CHAOS_NEW_FTP_FLD { HelpID = HID_CHAOS_NEW_FTP_FLD; };
-hidspecial HID_CHAOS_NEW_OUT_BOX { HelpID = HID_CHAOS_NEW_OUT_BOX; };
-hidspecial HID_CHAOS_NEW_OUT_MSG { HelpID = HID_CHAOS_NEW_OUT_MSG; };
-hidspecial HID_CHAOS_NEW_POP3_BOX { HelpID = HID_CHAOS_NEW_POP3_BOX; };
-hidspecial HID_CHAOS_NEW_POP3_MSG { HelpID = HID_CHAOS_NEW_POP3_MSG; };
-hidspecial HID_CHAOS_NEW_SEARCH { HelpID = HID_CHAOS_NEW_SEARCH; };
-hidspecial HID_CHAOS_NEW_VIM_BOX { HelpID = HID_CHAOS_NEW_VIM_BOX; };
-hidspecial HID_CHAOS_NEW_VIM_MSG { HelpID = HID_CHAOS_NEW_VIM_MSG; };
-hidspecial HID_CHAOS_NEW_SUBSCR_BOX { HelpID = HID_CHAOS_NEW_SUBSCR_BOX; };
-hidspecial HID_CHAOS_NEW_BOOKMARK { HelpID = HID_CHAOS_NEW_BOOKMARK; };
-hidspecial HID_CHAOS_NEW_PUB_BOX { HelpID = HID_CHAOS_NEW_PUB_BOX; };
-hidspecial HID_UUI_END { HelpID = HID_UUI_END; }; // aka HID_CHAOS_NEW_DATABASE
hidspecial HID_CNT_DLG_SEARCH_BT_SHOW { HelpID = HID_CNT_DLG_SEARCH_BT_SHOW; };
hidspecial HID_CNT_DLG_SEARCH_BT_UPDATE { HelpID = HID_CNT_DLG_SEARCH_BT_UPDATE; };
hidspecial HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE { HelpID = HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE; };
@@ -107,22 +61,9 @@ hidspecial HID_CNT_PAGE_HEADER { HelpID = HID_CNT_PAGE_HEADER; };
hidspecial HID_CNT_PAGE_DESCRIPTION { HelpID = HID_CNT_PAGE_DESCRIPTION; };
hidspecial HID_CNT_LB_HEADER { HelpID = HID_CNT_LB_HEADER; };
hidspecial HID_CNT_LB_DESCRIPTION { HelpID = HID_CNT_LB_DESCRIPTION; };
-hidspecial SID_GROUPVIEW { HelpID = SID_GROUPVIEW; };
hidspecial HID_GROUPVIEW_CONTENT_BIG { HelpID = HID_GROUPVIEW_CONTENT_BIG; };
hidspecial HID_GROUPVIEW_CONTENT_SMALL { HelpID = HID_GROUPVIEW_CONTENT_SMALL; };
hidspecial HID_GROUPVIEW_CONTENT_TREE { HelpID = HID_GROUPVIEW_CONTENT_TREE; };
-hidspecial HID_FILEDLG_AUTOCOMPLETEBOX { HelpID = HID_FILEDLG_AUTOCOMPLETEBOX; };
-hidspecial HID_FILEDLG_SAVE_BTN { HelpID = HID_FILEDLG_SAVE_BTN; };
-hidspecial HID_FILEDLG_SAVE_FILENAME { HelpID = HID_FILEDLG_SAVE_FILENAME; };
-hidspecial HID_FILEDLG_SAVE_FILETYPE { HelpID = HID_FILEDLG_SAVE_FILETYPE; };
-hidspecial HID_FILEDLG_INSERT_BTN { HelpID = HID_FILEDLG_INSERT_BTN; };
-hidspecial HID_FILEDLG_PATH_BTN { HelpID = HID_FILEDLG_PATH_BTN; };
-hidspecial HID_FILEDLG_PATH_FILENAME { HelpID = HID_FILEDLG_PATH_FILENAME; };
-hidspecial HID_FILEDLG_FOLDER_BTN { HelpID = HID_FILEDLG_FOLDER_BTN; };
-hidspecial HID_FILEDLG_FOLDER_FILENAME { HelpID = HID_FILEDLG_FOLDER_FILENAME; };
-hidspecial HID_FILEDLG_SRCHFOLDER_BTN { HelpID = HID_FILEDLG_SRCHFOLDER_BTN; };
-hidspecial HID_FILEDLG_EDIT_FAVORITES_LISTBOX { HelpID = HID_FILEDLG_EDIT_FAVORITES_LISTBOX; };
-hidspecial HID_FILEDLG_EDIT_FAVORITES_HEADERBAR { HelpID = HID_FILEDLG_EDIT_FAVORITES_HEADERBAR; };
hidspecial HID_BROWSERCONTROL { HelpID = HID_BROWSERCONTROL; };
hidspecial HID_TASKSTATUSBAR { HelpID = HID_TASKSTATUSBAR; };
hidspecial HID_CNT_PAGE_HEADER_TABBAR { HelpID = HID_CNT_PAGE_HEADER_TABBAR; };
@@ -147,8 +88,6 @@ hidspecial HID_CNT_SENT_VIEW_SENT_ARTICLES { HelpID = HID_CNT_SENT_VIEW_SENT_AR
hidspecial HID_CNT_SENT_VIEW_UNSENT_ARTICLES { HelpID = HID_CNT_SENT_VIEW_UNSENT_ARTICLES; };
hidspecial HID_CNT_SENT_VIEW_MARKED_ARTICLES { HelpID = HID_CNT_SENT_VIEW_MARKED_ARTICLES; };
hidspecial HID_TABDLG_APPLY_BTN { HelpID = HID_TABDLG_APPLY_BTN; };
-hidspecial HID_FILEDLG_LINK_CB { HelpID = HID_FILEDLG_LINK_CB; };
-hidspecial HID_FILEDLG_PREVIEW_CB { HelpID = HID_FILEDLG_PREVIEW_CB; };
hidspecial HID_HELP_WINDOW { HelpID = HID_HELP_WINDOW; };
hidspecial HID_HELP_TOOLBOX { HelpID = HID_HELP_TOOLBOX; };
hidspecial HID_HELP_TOOLBOXITEM_INDEX { HelpID = HID_HELP_TOOLBOXITEM_INDEX; };
@@ -159,7 +98,6 @@ hidspecial HID_HELP_TOOLBOXITEM_PRINT { HelpID = HID_HELP_TOOLBOXITEM_
hidspecial HID_HELP_TOOLBOXITEM_BOOKMARKS { HelpID = HID_HELP_TOOLBOXITEM_BOOKMARKS; };
hidspecial HID_HELP_TOOLBOXITEM_SEARCHDIALOG { HelpID = HID_HELP_TOOLBOXITEM_SEARCHDIALOG; };
hidspecial HID_TBXCONTROL_FILENEW { HelpID = HID_TBXCONTROL_FILENEW; };
-hidspecial HID_GLOBAL_FALLBACK { HelpID = HID_GLOBAL_FALLBACK; };
hidspecial HID_CLOSE_WARNING { HelpID = HID_CLOSE_WARNING; };
hidspecial HID_DID_SAVE_PACKED_XML { HelpID = HID_DID_SAVE_PACKED_XML; };
hidspecial HID_HELP_ONHELP { HelpID = HID_HELP_ONHELP; };
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 6745d7047e..5458ab9a04 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -27,91 +27,87 @@
#ifndef _SVX_FMHELP_HRC
#define _SVX_FMHELP_HRC
-// include -----------------------------------------------------------
-#include <svl/solar.hrc>
-
-// in solar.hrc
-//#define HID_FORMS_START (HID_LIB_START+4000)
-//#define HID_FORMS_END (HID_LIB_START+4999)
-
// Help-Ids --------------------------------------------------------------
-#define HID_DLG_DBMSG ( HID_FORMS_START + 1)
-#define HID_FORM_NAVIGATOR ( HID_FORMS_START + 2)
-#define HID_FORM_NAVIGATOR_WIN ( HID_FORMS_START + 3)
-#define HID_FIELD_SEL ( HID_FORMS_START + 4)
-#define HID_FIELD_SEL_WIN ( HID_FORMS_START + 5)
-#define HID_FILTER_NAVIGATOR ( HID_FORMS_START + 6)
-#define HID_FILTER_NAVIGATOR_WIN ( HID_FORMS_START + 7)
-#define HID_FM_DLG_SEARCH ( HID_FORMS_START + 8)
-#define HID_SEARCH_TEXT ( HID_FORMS_START + 9)
-#define HID_SEARCH_ALLFIELDS ( HID_FORMS_START + 10)
-//#define HID_SEARCH_SINGLEFIELD ( HID_FORMS_START + 11)
-#define HID_SEARCH_FIELDSELECTION ( HID_FORMS_START + 12)
-#define HID_SEARCH_POSITION ( HID_FORMS_START + 13)
-#define HID_SEARCH_FORMATTER ( HID_FORMS_START + 14)
-#define HID_SEARCH_CASE ( HID_FORMS_START + 15)
-#define HID_SEARCH_BACKWARD ( HID_FORMS_START + 16)
-#define HID_SEARCH_STARTOVER ( HID_FORMS_START + 17)
-#define HID_SEARCH_WILDCARD ( HID_FORMS_START + 18)
-#define HID_SEARCH_REGULAR ( HID_FORMS_START + 19)
-#define HID_SEARCH_APPROX ( HID_FORMS_START + 20)
-#define HID_SEARCH_APPROXSETTINGS ( HID_FORMS_START + 21)
-#define HID_SEARCH_BTN_SEARCH ( HID_FORMS_START + 22)
-#define HID_SEARCH_BTN_CLOSE ( HID_FORMS_START + 23)
-#define HID_CONTROLS_DATE_N_TIME ( HID_FORMS_START + 24)
-#define HID_GRID_TRAVEL_FIRST ( HID_FORMS_START + 25)
-#define HID_GRID_TRAVEL_PREV ( HID_FORMS_START + 26)
-#define HID_GRID_TRAVEL_NEXT ( HID_FORMS_START + 27)
-#define HID_GRID_TRAVEL_LAST ( HID_FORMS_START + 28)
-#define HID_GRID_TRAVEL_NEW ( HID_FORMS_START + 29)
-#define HID_GRID_TRAVEL_ABSOLUTE ( HID_FORMS_START + 30)
-#define HID_GRID_NUMBEROFRECORDS ( HID_FORMS_START + 31)
-#define UID_SEARCH_RECORDSTATUS ( HID_FORMS_START + 32)
-#define UID_FORMPROPBROWSER_FRAME ( HID_FORMS_START + 33)
-#define UID_ABSOLUTE_RECORD_WINDOW ( HID_FORMS_START + 34)
-#define HID_DATA_NAVIGATOR_WIN ( HID_FORMS_START + 35)
-#define HID_XFORMS_ADDDATAITEM_DLG ( HID_FORMS_START + 36)
-#define HID_XFORMS_ADDCONDITION_DLG ( HID_FORMS_START + 37)
-#define HID_XFORMS_NAMESPACEITEM_DLG ( HID_FORMS_START + 38)
-#define HID_XFORMS_NAMESPACEITEM_LIST ( HID_FORMS_START + 39)
-#define HID_XFORMS_MANAGENAMESPACE_DLG ( HID_FORMS_START + 40)
-//#define HID_TP_XFORMS_INSTANCE ( HID_FORMS_START + 41)
-//#define HID_TP_XFORMS_SUBMISSION ( HID_FORMS_START + 42)
-//#define HID_TP_XFORMS_BINDING ( HID_FORMS_START + 43)
-#define HID_MN_XFORMS_MODELS_ADD ( HID_FORMS_START + 44)
-#define HID_MN_XFORMS_MODELS_EDIT ( HID_FORMS_START + 45)
-#define HID_MN_XFORMS_MODELS_REMOVE ( HID_FORMS_START + 46)
-#define HID_MN_XFORMS_INSTANCES_ADD ( HID_FORMS_START + 47)
-#define HID_MN_XFORMS_INSTANCES_EDIT ( HID_FORMS_START + 48)
-#define HID_MN_XFORMS_INSTANCES_REMOVE ( HID_FORMS_START + 49)
-#define HID_MN_XFORMS_SHOW_DETAILS ( HID_FORMS_START + 50)
-#define HID_XFORMS_TOOLBOX ( HID_FORMS_START + 51)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD ( HID_FORMS_START + 52)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT ( HID_FORMS_START + 53)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE ( HID_FORMS_START + 54)
-#define HID_XFORMS_TOOLBOX_ITEM_EDIT ( HID_FORMS_START + 55)
-#define HID_XFORMS_TOOLBOX_ITEM_REMOVE ( HID_FORMS_START + 56)
-#define HID_XFORMS_ITEMS_LIST ( HID_FORMS_START + 57)
-#define HID_XFORMS_MODELS_LIST ( HID_FORMS_START + 58)
-#define HID_XFORMS_MODELS_MENUBTN ( HID_FORMS_START + 59)
-#define HID_XFORMS_INSTANCES_MENUBTN ( HID_FORMS_START + 60)
-#define HID_XFORMS_ADDSUBMISSION_DLG ( HID_FORMS_START + 61)
-#define HID_XFORMS_ADDMODEL_DLG ( HID_FORMS_START + 62)
-#define HID_XFORMS_ADDINSTANCE_DLG ( HID_FORMS_START + 63)
-#define HID_XFORMS_MID_INSERT_CONTROL ( HID_FORMS_START + 64)
-#define HID_XFORMS_TAB_CONTROL ( HID_FORMS_START + 65)
- // if you add a new define here, please adjust the overflow check
- // at the end of the file!!
-
-// -----------------------------------------------------------------------
-// "Uberlaufpr"ufung -----------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_FM_HID_END HID_XFORMS_TAB_CONTROL
-
-#if ACT_FM_HID_END > HID_FORMS_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_DLG_DBMSG "SVX_HID_DLG_DBMSG"
+#define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR"
+#define HID_FORM_NAVIGATOR_WIN "SVX_HID_FORM_NAVIGATOR_WIN"
+#define HID_FIELD_SEL "SVX_HID_FIELD_SEL"
+#define HID_FIELD_SEL_WIN "SVX_HID_FIELD_SEL_WIN"
+#define HID_FILTER_NAVIGATOR "SVX_HID_FILTER_NAVIGATOR"
+#define HID_FILTER_NAVIGATOR_WIN "SVX_HID_FILTER_NAVIGATOR_WIN"
+#define HID_FM_DLG_SEARCH "SVX_HID_FM_DLG_SEARCH"
+#define HID_SEARCH_TEXT "SVX_HID_SEARCH_TEXT"
+#define HID_SEARCH_ALLFIELDS "SVX_HID_SEARCH_ALLFIELDS"
+#define HID_SEARCH_FIELDSELECTION "SVX_HID_SEARCH_FIELDSELECTION"
+#define HID_SEARCH_POSITION "SVX_HID_SEARCH_POSITION"
+#define HID_SEARCH_FORMATTER "SVX_HID_SEARCH_FORMATTER"
+#define HID_SEARCH_CASE "SVX_HID_SEARCH_CASE"
+#define HID_SEARCH_BACKWARD "SVX_HID_SEARCH_BACKWARD"
+#define HID_SEARCH_STARTOVER "SVX_HID_SEARCH_STARTOVER"
+#define HID_SEARCH_WILDCARD "SVX_HID_SEARCH_WILDCARD"
+#define HID_SEARCH_REGULAR "SVX_HID_SEARCH_REGULAR"
+#define HID_SEARCH_APPROX "SVX_HID_SEARCH_APPROX"
+#define HID_SEARCH_APPROXSETTINGS "SVX_HID_SEARCH_APPROXSETTINGS"
+#define HID_SEARCH_BTN_SEARCH "SVX_HID_SEARCH_BTN_SEARCH"
+#define HID_SEARCH_BTN_CLOSE "SVX_HID_SEARCH_BTN_CLOSE"
+#define HID_CONTROLS_DATE_N_TIME "SVX_HID_CONTROLS_DATE_N_TIME"
+#define HID_GRID_TRAVEL_FIRST "SVX_HID_GRID_TRAVEL_FIRST"
+#define HID_GRID_TRAVEL_PREV "SVX_HID_GRID_TRAVEL_PREV"
+#define HID_GRID_TRAVEL_NEXT "SVX_HID_GRID_TRAVEL_NEXT"
+#define HID_GRID_TRAVEL_LAST "SVX_HID_GRID_TRAVEL_LAST"
+#define HID_GRID_TRAVEL_NEW "SVX_HID_GRID_TRAVEL_NEW"
+#define HID_GRID_TRAVEL_ABSOLUTE "SVX_HID_GRID_TRAVEL_ABSOLUTE"
+#define HID_GRID_NUMBEROFRECORDS "SVX_HID_GRID_NUMBEROFRECORDS"
+#define UID_SEARCH_RECORDSTATUS "SVX_UID_SEARCH_RECORDSTATUS"
+#define UID_FORMPROPBROWSER_FRAME "SVX_UID_FORMPROPBROWSER_FRAME"
+#define UID_ABSOLUTE_RECORD_WINDOW "SVX_UID_ABSOLUTE_RECORD_WINDOW"
+#define HID_DATA_NAVIGATOR_WIN "SVX_HID_DATA_NAVIGATOR_WIN"
+#define HID_XFORMS_ADDDATAITEM_DLG "SVX_HID_XFORMS_ADDDATAITEM_DLG"
+#define HID_XFORMS_ADDCONDITION_DLG "SVX_HID_XFORMS_ADDCONDITION_DLG"
+#define HID_XFORMS_NAMESPACEITEM_DLG "SVX_HID_XFORMS_NAMESPACEITEM_DLG"
+#define HID_XFORMS_NAMESPACEITEM_LIST "SVX_HID_XFORMS_NAMESPACEITEM_LIST"
+#define HID_XFORMS_MANAGENAMESPACE_DLG "SVX_HID_XFORMS_MANAGENAMESPACE_DLG"
+#define HID_MN_XFORMS_MODELS_ADD "SVX_HID_MN_XFORMS_MODELS_ADD"
+#define HID_MN_XFORMS_MODELS_EDIT "SVX_HID_MN_XFORMS_MODELS_EDIT"
+#define HID_MN_XFORMS_MODELS_REMOVE "SVX_HID_MN_XFORMS_MODELS_REMOVE"
+#define HID_MN_XFORMS_INSTANCES_ADD "SVX_HID_MN_XFORMS_INSTANCES_ADD"
+#define HID_MN_XFORMS_INSTANCES_EDIT "SVX_HID_MN_XFORMS_INSTANCES_EDIT"
+#define HID_MN_XFORMS_INSTANCES_REMOVE "SVX_HID_MN_XFORMS_INSTANCES_REMOVE"
+#define HID_MN_XFORMS_SHOW_DETAILS "SVX_HID_MN_XFORMS_SHOW_DETAILS"
+#define HID_XFORMS_TOOLBOX "SVX_HID_XFORMS_TOOLBOX"
+#define HID_XFORMS_TOOLBOX_ITEM_ADD "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD"
+#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT"
+#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE"
+#define HID_XFORMS_TOOLBOX_ITEM_EDIT "SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT"
+#define HID_XFORMS_TOOLBOX_ITEM_REMOVE "SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE"
+#define HID_XFORMS_ITEMS_LIST "SVX_HID_XFORMS_ITEMS_LIST"
+#define HID_XFORMS_MODELS_LIST "SVX_HID_XFORMS_MODELS_LIST"
+#define HID_XFORMS_MODELS_MENUBTN "SVX_HID_XFORMS_MODELS_MENUBTN"
+#define HID_XFORMS_INSTANCES_MENUBTN "SVX_HID_XFORMS_INSTANCES_MENUBTN"
+#define HID_XFORMS_ADDSUBMISSION_DLG "SVX_HID_XFORMS_ADDSUBMISSION_DLG"
+#define HID_XFORMS_ADDMODEL_DLG "SVX_HID_XFORMS_ADDMODEL_DLG"
+#define HID_XFORMS_ADDINSTANCE_DLG "SVX_HID_XFORMS_ADDINSTANCE_DLG"
+#define HID_XFORMS_MID_INSERT_CONTROL "SVX_HID_XFORMS_MID_INSERT_CONTROL"
+#define HID_XFORMS_TAB_CONTROL "SVX_HID_XFORMS_TAB_CONTROL"
+#define HID_FM_DELETEROWS "SVX_HID_FM_DELETEROWS"
+#define HID_FM_INSERTCOL "SVX_HID_FM_INSERTCOL"
+#define HID_FM_CHANGECOL "SVX_HID_FM_CHANGECOL"
+#define HID_FM_DELETECOL "SVX_HID_FM_DELETECOL"
+#define HID_FM_HIDECOL "SVX_HID_FM_HIDECOL"
+#define HID_FM_SHOWCOLS "SVX_HID_FM_SHOWCOLS"
+#define HID_FM_SHOWCOLS_MORE "SVX_HID_FM_SHOWCOLS_MORE"
+#define HID_FM_SHOWALLCOLS "SVX_HID_FM_SHOWALLCOLS"
+#define HID_FM_DELETE "SVX_HID_FM_DELETE"
+#define HID_FM_FILTER_EDIT "SVX_HID_FM_EDIT"
+#define HID_FM_FILTER_IS_NULL "SVX_HID_FM_FILTER_IS_NULL"
+#define HID_FM_FILTER_IS_NOT_NULL "SVX_HID_FM_IS_NOT_NULL"
+#define HID_FM_NEW "SVX_HID_FM_NEW"
+#define HID_FM_NEW_FORM "SVX_HID_FM_NEW_FORM"
+#define HID_FM_NEW_HIDDEN "SVX_HID_FM_NEW_HIDDEN"
+#define HID_FM_RENAME_OBJECT "SVX_HID_FM_RENAME_OBJECT"
+#define HID_MENU_FM_TEXTATTRIBUTES_STYLE "SVX_HID_MENU_FM_TEXTATTRIBUTES_STYLE"
+#define HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT "SVX_HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT"
+#define HID_MENU_FM_TEXTATTRIBUTES_SPACING "SVX_HID_MENU_FM_TEXTATTRIBUTES_SPACING"
#endif
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 22dc0b1772..09cc85f8bc 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -38,288 +38,242 @@
#define ITEM_FORM_CONTROL_PROPERTIES\
Identifier = SID_FM_CTL_PROPERTIES ; \
Command = ".uno:ControlProperties" ; \
- HelpID = SID_FM_CTL_PROPERTIES ; \
Text [ en-US ] = "Con~trol..." ; \
#define ITEM_FORM_PROPERTIES\
Identifier = SID_FM_PROPERTIES ; \
Command = ".uno:FormProperties" ; \
- HelpID = SID_FM_PROPERTIES ; \
Text [ en-US ] = "For~m..." ; \
#define ITEM_REPLACE_CONTROL\
Identifier = SID_FM_CHANGECONTROLTYPE ;\
Command = ".uno:ChangeControlType" ; \
- HelpID = SID_FM_CHANGECONTROLTYPE ; \
Text [ en-US ] = "~Replace with"; \
#define ITEM_FORMAT_TEMPLATECATALOG \
Identifier = SID_STYLE_CATALOG ; \
Command = ".uno:StyleCatalog" ; \
- HelpID = SID_STYLE_CATALOG ; \
Text [ en-US ] = "~Catalog..." ; \
#define ITEM_FORMAT_TEMPLATE \
Identifier = SID_STYLE_DESIGNER ; \
Command = ".uno:DesignerDialog" ; \
- HelpID = SID_STYLE_DESIGNER ; \
Text [ en-US ] = "St~ylist" ; \
#define ITEM_FORMAT_AUTOFORMAT \
Identifier = SID_AUTOFORMAT ; \
Command = ".uno:AutoFormat" ; \
- HelpID = SID_AUTOFORMAT ; \
Text [ en-US ] = "Auto~Format..." ;\
#define ITEM_FORMAT_CHAR_DLG \
Identifier = SID_CHAR_DLG ; \
Command = ".uno:FontDialog" ; \
- HelpID = SID_CHAR_DLG ; \
Text [ en-US ] = "C~haracter..." ;\
#define ITEM_FORMAT_PARA_DLG \
Identifier = SID_PARA_DLG ; \
Command = ".uno:ParagraphDialog" ; \
- HelpID = SID_PARA_DLG ; \
Text [ en-US ] = "P~aragraph..." ;\
#define ITEM_FORMAT_FONTWORK \
Identifier = SID_FONTWORK ; \
Command = ".uno:FontWork" ; \
- HelpID = SID_FONTWORK ; \
Text [ en-US ] = "F~ontwork" ;\
#define ITEM_EDIT_CUT \
Identifier = SID_CUT ; \
Command = ".uno:Cut" ; \
- HelpID = SID_CUT ; \
Text [ en-US ] = "Cu~t" ;\
#define ITEM_EDIT_COPY \
Identifier = SID_COPY ; \
Command = ".uno:Copy" ; \
- HelpID = SID_COPY ; \
Text [ en-US ] = "~Copy" ;\
#define ITEM_EDIT_DELETE \
Identifier = SID_DELETE ; \
Command = ".uno:Delete" ; \
- HelpID = SID_DELETE ; \
Text [ en-US ] = "~Delete" ;\
#define ITEM_FORMAT_ATTR_CHAR_FONT \
Identifier = SID_ATTR_CHAR_FONT ; \
Command = ".uno:CharFontName" ; \
- HelpID = SID_ATTR_CHAR_FONT ; \
Text [ en-US ] = "Font" ;\
#define ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT \
Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \
Command = ".uno:FontHeight" ; \
- HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \
Text [ en-US ] = "Size" ;\
#define ITEM_FORMAT_ATTR_CHAR_WEIGHT \
Identifier = SID_ATTR_CHAR_WEIGHT ; \
Command = ".uno:Bold" ; \
- HelpID = SID_ATTR_CHAR_WEIGHT ; \
Text [ en-US ] = "Bold" ; \
#define ITEM_FORMAT_ATTR_CHAR_POSTURE \
Identifier = SID_ATTR_CHAR_POSTURE ; \
Command = ".uno:Italic" ; \
- HelpID = SID_ATTR_CHAR_POSTURE ; \
Text [ en-US ] = "Italic" ;\
#define ITEM_FORMAT_ATTR_CHAR_UNDERLINE \
Identifier = SID_ATTR_CHAR_UNDERLINE ; \
Command = ".uno:Underline" ; \
- HelpID = SID_ATTR_CHAR_UNDERLINE ; \
Text [ en-US ] = "Underline" ;\
#define ITEM_FORMAT_ATTR_CHAR_OVERLINE \
Identifier = SID_ATTR_CHAR_OVERLINE ; \
Command = ".uno:Overline" ; \
- HelpID = SID_ATTR_CHAR_OVERLINE ; \
Text [ en-US ] = "Overline" ;\
#define ITEM_FORMAT_ATTR_CHAR_STRIKEOUT \
Identifier = SID_ATTR_CHAR_STRIKEOUT ; \
Command = ".uno:Strikeout" ; \
- HelpID = SID_ATTR_CHAR_STRIKEOUT ; \
Text [ en-US ] = "Strikethrough" ;\
#define ITEM_FORMAT_ATTR_CHAR_SHADOWED \
Identifier = SID_ATTR_CHAR_SHADOWED ; \
Command = ".uno:Shadowed" ; \
- HelpID = SID_ATTR_CHAR_SHADOWED ; \
Text [ en-US ] = "Shadow" ;\
#define ITEM_FORMAT_ATTR_CHAR_CONTOUR \
Identifier = SID_ATTR_CHAR_CONTOUR ; \
Command = ".uno:OutlineFont" ; \
- HelpID = SID_ATTR_CHAR_CONTOUR ; \
Text [ en-US ] = "Outline" ;\
#define ITEM_FORMAT_SET_SUPER_SCRIPT \
Identifier = SID_SET_SUPER_SCRIPT; \
- HelpID = SID_SET_SUPER_SCRIPT; \
+ Command = CMD_SID_SET_SUPER_SCRIPT; \
Text [ en-US ] = "Su~perscript"; \
#define ITEM_FORMAT_SET_SUB_SCRIPT \
Identifier = SID_SET_SUB_SCRIPT; \
- HelpID = SID_SET_SUB_SCRIPT; \
+ Command = CMD_SID_SET_SUB_SCRIPT; \
Text [ en-US ] = "Su~bscript"; \
#define ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT \
Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \
Command = ".uno:LeftPara" ; \
- HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \
Text [ en-US ] = "~Left" ;\
#define ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT \
Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \
Command = ".uno:RightPara" ; \
- HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \
Text [ en-US ] = "~Right" ;\
#define ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER \
Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \
Command = ".uno:CenterPara" ; \
- HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \
Text [ en-US ] = "~Centered" ;\
#define ITEM_FORMAT_ATTR_PARA_ADJUST_BLOCK \
Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
Command = ".uno:JustifyPara" ; \
- HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \
Text [ en-US ] = "Justified" ;\
#define ITEM_FORMAT_PARA_LINESPACE_10 \
Identifier = SID_ATTR_PARA_LINESPACE_10 ; \
Command = ".uno:SpacePara1" ; \
- HelpID = SID_ATTR_PARA_LINESPACE_10 ; \
Text [ en-US ] = "Single" ;\
#define ITEM_FORMAT_PARA_LINESPACE_15 \
Identifier = SID_ATTR_PARA_LINESPACE_15 ; \
Command = ".uno:SpacePara15" ; \
- HelpID = SID_ATTR_PARA_LINESPACE_15 ; \
Text [ en-US ] = "1.5 lines" ;\
#define ITEM_FORMAT_PARA_LINESPACE_20 \
Identifier = SID_ATTR_PARA_LINESPACE_20 ; \
Command = ".uno:SpacePara2" ; \
- HelpID = SID_ATTR_PARA_LINESPACE_20 ; \
Text [ en-US ] = "~Double" ;\
#define ITEM_FORMAT_FRAME_TO_TOP \
Identifier = SID_FRAME_TO_TOP ; \
Command = ".uno:BringToFront" ; \
- HelpID = SID_FRAME_TO_TOP ; \
Text [ en-US ] = "~Bring to Front" ;\
#define ITEM_FORMAT_FRAME_TO_BOTTOM \
Identifier = SID_FRAME_TO_BOTTOM ; \
Command = ".uno:SendToBack" ; \
- HelpID = SID_FRAME_TO_BOTTOM ; \
Text [ en-US ] = "~Send to Back" ;\
#define ITEM_FORMAT_OBJECT_ALIGN \
Identifier = SID_OBJECT_ALIGN ; \
Command = ".uno:ObjectAlign" ; \
- HelpID = SID_OBJECT_ALIGN ; \
Text [ en-US ] = "A~lignment" ;\
#define ITEM_FORMAT_OBJECT_ALIGN_LEFT \
Identifier = SID_OBJECT_ALIGN_LEFT ; \
Command = ".uno:ObjectAlignLeft" ; \
- HelpID = SID_OBJECT_ALIGN_LEFT ; \
Text [ en-US ] = "~Left" ;\
#define ITEM_FORMAT_OBJECT_ALIGN_CENTER \
Identifier = SID_OBJECT_ALIGN_CENTER ; \
Command = ".uno:AlignCenter" ; \
- HelpID = SID_OBJECT_ALIGN_CENTER ; \
Text [ en-US ] = "~Centered" ;\
#define ITEM_FORMAT_OBJECT_ALIGN_RIGHT \
Identifier = SID_OBJECT_ALIGN_RIGHT ; \
Command = ".uno:ObjectAlignRight" ; \
- HelpID = SID_OBJECT_ALIGN_RIGHT ; \
Text [ en-US ] = "~Right" ;\
#define ITEM_FORMAT_OBJECT_ALIGN_UP \
Identifier = SID_OBJECT_ALIGN_UP ; \
Command = ".uno:AlignUp" ; \
- HelpID = SID_OBJECT_ALIGN_UP ; \
Text [ en-US ] = "~Top" ;\
#define ITEM_FORMAT_OBJECT_ALIGN_MIDDLE \
Identifier = SID_OBJECT_ALIGN_MIDDLE ; \
Command = ".uno:AlignMiddle" ; \
- HelpID = SID_OBJECT_ALIGN_MIDDLE ; \
Text [ en-US ] = "C~enter" ;\
#define ITEM_FORMAT_OBJECT_ALIGN_DOWN \
Identifier = SID_OBJECT_ALIGN_DOWN ; \
Command = ".uno:AlignDown" ; \
- HelpID = SID_OBJECT_ALIGN_DOWN ; \
Text [ en-US ] = "~Bottom" ;\
#define ITEM_FORMAT_ATTRIBUTES_LINE \
Identifier = SID_ATTRIBUTES_LINE ; \
Command = ".uno:FormatLine" ; \
- HelpID = SID_ATTRIBUTES_LINE ; \
Text [ en-US ] = "L~ine..." ;\
#define ITEM_FORMAT_ATTRIBUTES_AREA \
Identifier = SID_ATTRIBUTES_AREA ; \
Command = ".uno:FormatArea" ; \
- HelpID = SID_ATTRIBUTES_AREA ; \
Text [ en-US ] = "A~rea..." ;\
#define ITEM_FORMAT_ATTR_TRANSFORM \
Identifier = SID_ATTR_TRANSFORM ; \
Command = ".uno:TransformDialog" ; \
- HelpID = SID_ATTR_TRANSFORM ; \
Text [ en-US ] = "Position and Si~ze..." ;\
#define ITEM_FORMAT_OBJECT_HEAVEN \
Identifier = SID_OBJECT_HEAVEN ; \
Command = ".uno:SetObjectToForeground" ; \
- HelpID = SID_OBJECT_HEAVEN ; \
Text [ en-US ] = "~To Foreground" ;\
#define ITEM_FORMAT_OBJECT_HELL \
Identifier = SID_OBJECT_HELL ; \
Command = ".uno:SetObjectToBackground" ; \
- HelpID = SID_OBJECT_HELL ; \
Text [ en-US ] = "T~o Background" ;\
#define ITEM_FORMAT_BEZIER_EDIT \
Identifier = SID_BEZIER_EDIT ; \
Command = ".uno:ToggleObjectBezierMode" ; \
- HelpID = SID_BEZIER_EDIT ; \
Text [ en-US ] = "Edit ~Points" ;\
#define ITEM_FILE_PICKLIST \
Identifier = SID_PICKLIST ; \
Command = ".uno:PickList" ; \
- HelpID = SID_PICKLIST ; \
Text [ en-US ] = "~File" ; \
#define ITEM_FILE_NEWDOC \
Identifier = SID_NEWDOCDIRECT ; \
Command = ".uno:AddDirect" ; \
- HelpID = SID_NEWDOCDIRECT ; \
Text [ en-US ] = "~New" ;\
#define ITEM_FILE_OPENDOC \
Identifier = SID_OPENDOC ; \
Command = ".uno:Open" ; \
- HelpID = SID_OPENDOC ; \
Text [ en-US ] = "~Open..." ;\
@@ -328,62 +282,52 @@
{\
Identifier = SID_AUTOPILOTMENU ; \
Command = ".uno:AutoPilotMenu" ; \
- HelpID = SID_AUTOPILOTMENU ; \
Text [ en-US ] = "A~utoPilot" ; \
};
#define ITEM_FILE_CLOSEDOC \
Identifier = SID_CLOSEDOC ; \
Command = ".uno:CloseDoc" ; \
- HelpID = SID_CLOSEDOC ; \
Text [ en-US ] = "~Close" ;\
#define ITEM_FILE_SAVEDOC \
Identifier = SID_SAVEDOC ; \
Command = ".uno:Save" ; \
- HelpID = SID_SAVEDOC ; \
Text [ en-US ] = "~Save" ; \
#define ITEM_FILE_SAVEDOCS \
Identifier = SID_SAVEDOCS ; \
Command = ".uno:SaveAll" ; \
- HelpID = SID_SAVEDOCS ; \
Text [ en-US ] = "Sa~ve All" ; \
#define ITEM_FILE_SAVEASDOC \
Identifier = SID_SAVEASDOC ; \
Command = ".uno:SaveAs" ; \
- HelpID = SID_SAVEASDOC ; \
Text [ en-US ] = "Save ~As..." ; \
#define ITEM_FILE_EXPORTDOC \
Identifier = SID_EXPORTDOC ; \
Command = ".uno:ExportTo" ; \
- HelpID = SID_EXPORTDOC ; \
Text [ en-US ] = "Expor~t..." ; \
#define ITEM_FILE_EXPORTDOCASPDF \
Identifier = SID_EXPORTDOCASPDF ; \
Command = ".uno:ExportToPDF" ; \
- HelpID = SID_EXPORTDOCASPDF ; \
Text [ en-US ] = "Export as P~DF..." ; \
#define ITEM_FILE_VERSIONDIALOG \
Identifier = SID_VERSION ; \
Command = ".uno:VersionDialog" ; \
- HelpID = SID_VERSION ; \
Text [ en-US ] = "Versions..." ; \
#define ITEM_FILE_LASTVERSIONDOC \
Identifier = SID_RELOAD ; \
Command = ".uno:Reload" ; \
- HelpID = SID_RELOAD ; \
Text [ en-US ] = "Reload" ;\
#define ITEM_FILE_DOCINFO \
Identifier = SID_DOCINFO ; \
Command = ".uno:SetDocumentProperties" ; \
- HelpID = SID_DOCINFO ; \
Text [ en-US ] = "Propert~ies..." ;\
#define ITEM_FILE_DOCTEMPLATE \
@@ -398,28 +342,24 @@
{ \
Identifier = SID_ORGANIZER ; \
Command = ".uno:Organizer" ; \
- HelpId = SID_ORGANIZER ; \
Text [ en-US ] = "~Organize...";\
}; \
MenuItem \
{ \
Identifier = SID_TEMPLATE_ADDRESSBOKSOURCE; \
Command = ".uno:AddressBookSource" ; \
- HelpId = SID_TEMPLATE_ADDRESSBOKSOURCE; \
Text [ en-US ] = "~Address Book Source..."; \
}; \
MenuItem \
{ \
Identifier = SID_DOCTEMPLATE ; \
Command = ".uno:SaveAsTemplate" ; \
- HelpId = SID_DOCTEMPLATE ; \
Text [ en-US ] = "~Save...";\
}; \
MenuItem \
{ \
Identifier = SID_OPENTEMPLATE ; \
Command = ".uno:OpenTemplate" ; \
- HelpId = SID_OPENTEMPLATE ; \
Text [ en-US ] = "~Edit...";\
}; \
}; \
@@ -428,164 +368,138 @@
#define ITEM_FILE_PRINTPREVIEW \
Identifier = SID_PRINTPREVIEW ; \
Command = ".uno:PrintPreview" ; \
- HelpID = SID_PRINTPREVIEW ; \
Text [ en-US ] = "Pa~ge Preview" ;\
#define ITEM_FILE_SETUPPRINTER \
Identifier = SID_SETUPPRINTER ; \
Command = ".uno:PrinterSetup" ; \
- HelpID = SID_SETUPPRINTER ; \
Text [ en-US ] = "P~rinter Settings..." ; \
#define ITEM_FILE_PRINTDOC \
Identifier = SID_PRINTDOC ; \
Command = ".uno:Print" ; \
- HelpID = SID_PRINTDOC ; \
Text [ en-US ] = "~Print..." ; \
#define ITEM_FILE_MAIL_SENDDOC \
Identifier = SID_MAIL_SENDDOC ; \
Command = ".uno:SendMail" ; \
- HelpID = SID_MAIL_SENDDOC ; \
Text [ en-US ] = "Document as ~E-mail..." ; \
#define ITEM_FILE_MAIL_SENDDOCASPDF \
Identifier = SID_MAIL_SENDDOCASPDF ; \
Command = ".uno:SendMailDocAsPDF" ; \
- HelpID = SID_MAIL_SENDDOCASPDF ; \
Text [ en-US ] = "Document as P~DF Attachment..." ; \
#define ITEM_FILE_QUITAPP \
Identifier = SID_QUITAPP ; \
Command = ".uno:Quit" ; \
- HelpID = SID_QUITAPP ; \
Text [ en-US ] = "E~xit" ; \
#define ITEM_FILE_LOGOUT \
Identifier = SID_LOGOUT ; \
Command = ".uno:Logout" ; \
- HelpID = SID_LOGOUT ; \
Text [ en-US ] = "Logout" ; \
#define ITEM_EDIT_UNDO \
Identifier = SID_UNDO ; \
Command = ".uno:UndoAction" ; \
- HelpID = SID_UNDO ; \
Text [ en-US ] = "Can't Undo" ; \
#define ITEM_EDIT_REDO \
Identifier = SID_REDO ; \
Command = ".uno:Redo" ; \
- HelpID = SID_REDO ; \
Text [ en-US ] = "Can't Restore" ; \
#define ITEM_EDIT_REPEAT \
Identifier = SID_REPEAT ; \
Command = ".uno:Repeat" ; \
- HelpID = SID_REPEAT ; \
Text [ en-US ] = "~Repeat" ; \
#define ITEM_EDIT_PASTE \
Identifier = SID_PASTE ; \
Command = ".uno:Paste" ; \
- HelpID = SID_PASTE ; \
Text [ en-US ] = "~Paste" ; \
#define ITEM_EDIT_SELECTALL \
Identifier = SID_SELECTALL ; \
Command = ".uno:SelectAll" ; \
- HelpID = SID_SELECTALL ; \
Text [ en-US ] = "Select ~All" ; \
#define ITEM_EDIT_SEARCH_DLG \
Identifier = SID_SEARCH_DLG ; \
Command = ".uno:SearchDialog" ; \
- HelpID = SID_SEARCH_DLG ; \
Text [ en-US ] = "~Find & Replace..." ; \
#define ITEM_EDIT_NAVIGATOR \
Identifier = SID_NAVIGATOR ; \
Command = ".uno:Navigator" ; \
- HelpID = SID_NAVIGATOR ; \
Text [ en-US ] = "~Navigator" ; \
#define ITEM_EDIT_BIBLIOGRAPHY \
Identifier = SID_COMP_BIBLIOGRAPHY ; \
Command = ".uno:BibliographyComponent" ; \
- HelpID = SID_COMP_BIBLIOGRAPHY ; \
Text [ en-US ] = "~Bibliography Database"; \
#define ITEM_EDIT_PLUGINS_ACTIVE \
Identifier = SID_PLUGINS_ACTIVE ; \
Command = ".uno:PlugInsActive" ; \
- HelpID = SID_PLUGINS_ACTIVE ; \
Text [ en-US ] = "P~lug-in" ; \
#define ITEM_EDIT_IMAP \
Identifier = SID_IMAP ; \
Command = ".uno:ImageMapDialog" ; \
- HelpID = SID_IMAP ; \
Text [ en-US ] = "ImageMap" ; \
#define ITEM_EDIT_OBJECT \
Identifier = SID_OBJECT ; \
Command = ".uno:ObjectMenue" ; \
- HelpID = SID_OBJECT ; \
Text [ en-US ] = "~Object" ; \
#define ITEM_VIEW_ATTR_ZOOM \
Identifier = SID_ATTR_ZOOM ; \
Command = ".uno:Zoom" ; \
- HelpID = SID_ATTR_ZOOM ; \
Text [ en-US ] = "~Zoom..." ; \
#define ITEM_VIEW_TOGGLEFUNCTIONBAR \
Identifier = SID_TOGGLEFUNCTIONBAR ; \
Command = ".uno:FunctionBarVisible" ; \
- HelpID = SID_TOGGLEFUNCTIONBAR ; \
Text [ en-US ] = "~Function Bar" ; \
#define ITEM_VIEW_TOGGLEOBJECTBAR \
Identifier = SID_TOGGLEOBJECTBAR ; \
Command = ".uno:ObjectBarVisible" ; \
- HelpID = SID_TOGGLEOBJECTBAR ; \
Text [ en-US ] = "~Object Bar" ; \
#define ITEM_VIEW_TOGGLEINETBAR \
Identifier = SID_TOGGLEINETBAR ; \
- HelpID = SID_TOGGLEINETBAR ; \
+ Command = CMD_SID_TOGGLEINETBAR; \
Text [ en-US ] = "Internet Bar" ; \
#define ITEM_VIEW_TOGGLESTATUSBAR \
Identifier = SID_TOGGLESTATUSBAR ; \
Command = ".uno:StatusBarVisible" ; \
- HelpID = SID_TOGGLESTATUSBAR ; \
Text [ en-US ] = "~Status Bar" ; \
#define ITEM_VIEW_TOGGLEIMESTATUSWINDOW \
Identifier = SID_SHOW_IME_STATUS_WINDOW ; \
Command = ".uno:ShowImeStatusWindow" ; \
- HelpID = SID_SHOW_IME_STATUS_WINDOW ; \
Text [ en-US ] = "~Input Method Status"; \
#define ITEM_VIEW_TASKBAR \
Identifier = SID_TASKBAR ; \
Command = ".uno:TaskBarVisible" ; \
- HelpID = SID_TASKBAR ; \
Text [ en-US ] = "~Status Bar" ; \
#define ITEM_VIEW_COLORBAR \
Identifier = SID_COLOR_CONTROL ; \
Command = ".uno:ColorControl" ; \
- HelpID = SID_COLOR_CONTROL ; \
Text [ en-US ] = "~Color Bar" ; \
#define ITEM_VIEW_FULLSCREEN \
Identifier = SID_WIN_FULLSCREEN ; \
Command = ".uno:FullScreen" ; \
- HelpID = SID_WIN_FULLSCREEN ; \
Text [ en-US ] = "F~ull Screen" ; \
@@ -598,26 +512,22 @@
#define ITEM_VIEW_BROWSER_MODE \
Identifier = SID_BROWSER_MODE ; \
Command = ".uno:BrowseView" ; \
- HelpID = SID_BROWSER_MODE ; \
Text [ en-US ] = "~Online Layout" ; \
#define ITEM_VIEW_BROWSER \
Identifier = SID_BROWSER ; \
Command = ".uno:Beamer" ; \
- HelpID = SID_BROWSER ; \
Text [ en-US ] = "~Beamer" ; \
#define ITEM_INSERT_HYPERLINK_INSERT \
Identifier = SID_HYPERLINK_INSERT ; \
Command = ".uno:InsertHyperlink" ; \
- HelpID = SID_HYPERLINK_INSERT ; \
Text [ en-US ] = "~Hyperlink Bar" ; \
#define ITEM_INSERT_INSERT_GRAPHIC \
Identifier = SID_INSERT_GRAPHIC ; \
Command = ".uno:InsertGraphic" ; \
- HelpID = SID_INSERT_GRAPHIC ; \
Text [ en-US ] = "~Graphics..." ; \
#define ITEM_INSERT_TWAIN_SELECT \
@@ -625,7 +535,6 @@
{\
Identifier = SID_TWAIN_SELECT ; \
Command = ".uno:TwainSelect" ; \
- HelpID = SID_TWAIN_SELECT ; \
Text [ en-US ] = "~Select Source..." ; \
};
@@ -634,7 +543,6 @@
{\
Identifier = SID_TWAIN_TRANSFER ; \
Command = ".uno:TwainTransfer" ; \
- HelpID = SID_TWAIN_TRANSFER ; \
Text [ en-US ] = "~Request..." ; \
};
@@ -643,7 +551,6 @@
{\
Identifier = SID_SCAN ; \
Command = ".uno:Scan" ; \
- HelpID = SID_SCAN ; \
Text [ en-US ] = "Scan" ; \
SubMenu = Menu\
{\
@@ -658,19 +565,16 @@
#define ITEM_INSERT_INSERT_DIAGRAM \
Identifier = SID_INSERT_DIAGRAM ; \
Command = ".uno:InsertObjectChart" ; \
- HelpID = SID_INSERT_DIAGRAM ; \
Text [ en-US ] = "~Chart..." ; \
#define ITEM_INSERT_GALLERY \
Identifier = SID_GALLERY ; \
Command = ".uno:Gallery" ; \
- HelpID = SID_GALLERY ; \
Text [ en-US ] = "~Gallery" ; \
#define ITEM_INSERT_INSERTDOC \
Identifier = SID_INSERTDOC ; \
Command = ".uno:InsertDoc" ; \
- HelpID = SID_INSERTDOC ; \
Text [ en-US ] = "~File..." ; \
#define TMP_SID_INSERT_PLUGIN \
@@ -678,7 +582,6 @@
{\
Identifier = SID_INSERT_PLUGIN ; \
Command = ".uno:InsertPlugin" ; \
- HelpID = SID_INSERT_PLUGIN ; \
Text [ en-US ] = "~Plug-in..." ; \
};
@@ -687,7 +590,6 @@
{\
Identifier = SID_INSERT_SOUND ; \
Command = ".uno:InsertSound" ; \
- HelpID = SID_INSERT_SOUND ; \
Text [ en-US ] = "~Sound..." ; \
};
@@ -696,27 +598,13 @@
{\
Identifier = SID_INSERT_VIDEO ; \
Command = ".uno:InsertVideo" ; \
- HelpID = SID_INSERT_VIDEO ; \
Text [ en-US ] = "~Video..." ; \
};
-#ifdef SOLAR_JAVA
-#define TMP_SID_INSERT_APPLET \
- MenuItem\
- {\
- Identifier = SID_INSERT_APPLET ; \
- Command = ".uno:InsertApplet" ; \
- HelpID = SID_INSERT_APPLET ; \
- Text [ en-US ] = "~Applet..." ; \
- };
-#else
-#define TMP_SID_INSERT_APPLET
-#endif
#define ITEM_INSERT_OBJECT_MN \
MenuItem\
{\
Identifier = SID_MN_INSERT_OBJECT_DLGS ; \
- HelpID = SID_MN_INSERT_OBJECT_DLGS ; \
Command = ".uno:ObjectMenu" ; \
Text [ en-US ] = "~Object" ; \
SubMenu = Menu\
@@ -727,18 +615,15 @@
{\
Identifier = SID_INSERT_OBJECT ; \
Command = ".uno:InsertObject" ; \
- HelpID = SID_INSERT_OBJECT ; \
Text [ en-US ] = "~OLE Object..." ; \
};\
TMP_SID_INSERT_PLUGIN\
TMP_SID_INSERT_SOUND\
TMP_SID_INSERT_VIDEO\
- TMP_SID_INSERT_APPLET\
MenuItem\
{\
Identifier = SID_INSERT_MATH ; \
Command = ".uno:InsertMath" ; \
- HelpID = SID_INSERT_MATH ; \
Text [ en-US ] = "~Formula..." ; \
};\
};\
@@ -749,7 +634,6 @@
MenuItem\
{\
Identifier = SID_MN_INSERT_OBJECT_DLGS ; \
- HelpID = SID_MN_INSERT_OBJECT_DLGS ; \
Command = ".uno:ObjectMenu" ; \
Text [ en-US ] = "~Object" ; \
SubMenu = Menu\
@@ -760,14 +644,12 @@
{\
Identifier = SID_INSERT_OBJECT ; \
Command = ".uno:InsertObject" ; \
- HelpID = SID_INSERT_OBJECT ; \
Text [ en-US ] = "~OLE Object..." ; \
};\
MenuItem\
{\
Identifier = SID_INSERT_MATH ; \
Command = ".uno:InsertMath" ; \
- HelpID = SID_INSERT_MATH ; \
Text [ en-US ] = "~Formula" ; \
};\
};\
@@ -778,7 +660,6 @@
MenuItem\
{\
Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \
- HelpID = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \
Text [ en-US ] = "~Numbering/Bullets..." ; \
};
@@ -786,7 +667,6 @@
#define ITEM_FORMAT \
Identifier = SID_OBJECTMENU0 ; \
- HelpID = SID_OBJECTMENU0 ; \
Command = ".uno:FormatMenu" ; \
Text [ en-US ] = "F~ormat" ; \
@@ -794,7 +674,6 @@
#define ITEM_TOOLS_MACROS \
Identifier = SID_SCRIPTORGANIZER ; \
- HelpId = SID_SCRIPTORGANIZER ; \
Command = ".uno:ScriptOrganizer" ; \
Text [ en-US ] = "Scripts/Macros" ; \
@@ -810,13 +689,11 @@
{ \
Identifier = SID_RECORDMACRO ; \
Command = ".uno:MacroRecorder" ; \
- HelpId = SID_RECORDMACRO ; \
Text [ en-US ] = "Record Macro"; }; \
MenuItem \
{ \
Identifier = SID_BASICCHOOSER ; \
Command = ".uno:MacroDialog" ; \
- HelpID = SID_BASICCHOOSER ; \
Text [ en-US ] = "~Macro..." ; \
}; \
}; \
@@ -829,7 +706,6 @@
#define ITEM_TOOLS_CONFIG \
Identifier = SID_CONFIG ; \
Command = ".uno:ConfigureDialog"; \
- HelpID = SID_CONFIG ; \
Text [ en-US ] = "~Configure..." ; \
@@ -838,7 +714,6 @@
{\
Identifier = SID_AUTO_CORRECT_DLG ; \
Command = ".uno:AutoCorrectDlg" ; \
- HelpID = SID_AUTO_CORRECT_DLG ; \
Text [ en-US ] = "~AutoCorrect..." ; \
};
@@ -847,7 +722,6 @@
{\
Identifier = SID_SD_GRAPHIC_OPTIONS ; \
Command = ".uno:SdGraphicOptions" ; \
- HelpID = SID_SD_GRAPHIC_OPTIONS ; \
Text [ en-US ] = "~Drawing..." ; \
};
@@ -856,7 +730,6 @@
{\
Identifier = SID_OPTIONS_TREEDIALOG ; \
Command = ".uno:OptionsTreeDialog" ; \
- HelpID = SID_OPTIONS_TREEDIALOG ; \
Text [ en-US ] = "~Options..." ; \
};
@@ -867,13 +740,11 @@
#define ITEM_WINDOW_MDIWINDOWLIST \
Identifier = SID_MDIWINDOWLIST ; \
Command = ".uno:WindowList" ; \
- HelpID = SID_MDIWINDOWLIST ; \
Text [ en-US ] = "~Window" ; \
#define ITEM_WINDOW_CLONEWIN \
Identifier = SID_NEWWINDOW ; \
Command = ".uno:NewWindow" ; \
- HelpID = SID_NEWWINDOW ; \
Text [ en-US ] = "~New Window" ; \
#define ITEM_WINDOW_CASCADEWINS \
@@ -881,7 +752,6 @@
{\
Identifier = SID_CASCADEWINS ; \
Command = ".uno:Cascade" ; \
- HelpID = SID_CASCADEWINS ; \
Text [ en-US ] = "~Cascade" ; \
};
@@ -890,7 +760,6 @@
{\
Identifier = SID_TILEWINS ; \
Command = ".uno:Tile" ; \
- HelpID = SID_TILEWINS ; \
Text [ en-US ] = "~Tile" ; \
};
@@ -899,7 +768,6 @@
{\
Identifier = SID_HORIZONTALWINS ; \
Command = ".uno:ArrangeHorizontal" ; \
- HelpID = SID_HORIZONTALWINS ; \
Text [ en-US ] = "~Horizontally" ; \
};
@@ -908,14 +776,12 @@
{\
Identifier = SID_VERTICALWINS ; \
Command = ".uno:ArrangeVertical" ; \
- HelpID = SID_VERTICALWINS ; \
Text [ en-US ] = "~Vertically" ; \
};
#define ITEM_WINDOW_CLOSEWIN \
Identifier = SID_CLOSEWIN ; \
Command = ".uno:CloseWin" ; \
- HelpID = SID_CLOSEWIN ; \
Text [ en-US ] = "Close Window" ; \
#define ITEM_HYPERLINK_DIALOG \
@@ -923,7 +789,6 @@
{\
Identifier = SID_HYPERLINK_DIALOG ; \
Command = ".uno:HyperlinkDialog" ; \
- HelpID = SID_HYPERLINK_DIALOG ; \
Text [ en-US ] = "~Hyperlink" ; \
} ;
@@ -932,7 +797,6 @@
{\
Identifier = SID_POLY_MERGE ; \
Command = ".uno:Merge" ; \
- HelpID = SID_POLY_MERGE ; \
Text [ en-US ] = "~Merge" ; \
};
#define ITEM_POLY_SUBSTRACT \
@@ -940,7 +804,6 @@
{\
Identifier = SID_POLY_SUBSTRACT ; \
Command = ".uno:Substract" ; \
- HelpID = SID_POLY_SUBSTRACT ; \
Text [ en-US ] = "~Subtract" ; \
};
#define ITEM_POLY_INTERSECT \
@@ -948,7 +811,6 @@
{\
Identifier = SID_POLY_INTERSECT ; \
Command = ".uno:Intersect" ; \
- HelpID = SID_POLY_INTERSECT ; \
Text [ en-US ] = "I~ntersect" ; \
};
@@ -957,7 +819,6 @@
{ \
Identifier = SID_POLY_FORMEN ; \
Command = ".uno:PolyFormen" ; \
- HelpID = SID_POLY_FORMEN ; \
Text [ en-US ] = "~Shapes" ; \
SubMenu = Menu \
{\
@@ -1016,56 +877,47 @@
#define ITEM_HELP_HELPMENU \
Identifier = SID_HELPMENU ; \
Command = ".uno:HelpMenu" ; \
- HelpID = SID_HELPMENU ; \
Text [ en-US ] = "~Help" ; \
#define ITEM_HELP_HELPINDEX \
Identifier = SID_HELPINDEX ; \
Command = ".uno:HelpIndex" ; \
- HelpID = SID_HELPINDEX ; \
Text [ en-US ] = "~Contents" ; \
#define ITEM_HELP_HELPONHELP \
Identifier = SID_HELPONHELP ; \
Command = ".uno:HelpOnHelp" ; \
- HelpID = SID_HELPONHELP ; \
Text [ en-US ] = "Using Help" ; \
#define ITEM_HELP_HELP_PI \
Identifier = SID_HELP_PI ; \
Command = ".uno:HelperDialog" ; \
- HelpID = SID_HELP_PI ; \
Text [ en-US ] = "Help ~Agent" ; \
#define ITEM_HELP_HELPTIPS \
Identifier = SID_HELPTIPS ; \
Command = ".uno:HelpTip" ; \
- HelpID = SID_HELPTIPS ; \
Text [ en-US ] = "~Tips" ; \
#define ITEM_HELP_BALLOONHELP \
Identifier = SID_HELPBALLOONS ; \
Command = ".uno:ActiveHelp" ; \
- HelpID = SID_HELPBALLOONS ; \
Text [ en-US ] = "~Extended Tips" ; \
#define ITEM_HELP_SUPPORTPAGE \
Identifier = SID_HELP_SUPPORTPAGE ; \
Command = ".uno:HelpSupport" ; \
- HelpID = SID_HELP_SUPPORTPAGE ; \
Text [ en-US ] = "~Support" ; \
#define ITEM_HELP_ONLINE_REGISTRATION \
Identifier = SID_ONLINE_REGISTRATION ; \
Command = ".uno:OnlineRegistrationDlg" ; \
- HelpID = SID_ONLINE_REGISTRATION ; \
Text [ en-US ] = "~Registration..." ; \
#define ITEM_HELP_ABOUT \
Identifier = SID_ABOUT ; \
Command = ".uno:About" ; \
- HelpID = SID_ABOUT ; \
Text [ en-US ] = "A~bout %PRODUCTNAME..." ; \
/*------------------------------------------------------------------------
@@ -1131,39 +983,33 @@
#define ITEM_POPUP_TEMPLATE_EDIT \
Identifier = SID_STYLE_EDIT ; \
Command = ".uno:EditStyle" ; \
- HelpID = SID_STYLE_EDIT ; \
Text [ en-US ] = "Edit Paragraph Style..." ; \
// Gruppen-/Kombination-Funktionen
#define ITEM_POPUP_GROUP \
Identifier = SID_GROUP ; \
Command = ".uno:FormatGroup" ; \
- HelpID = SID_GROUP ; \
Text [ en-US ] = "~Group" ; \
#define ITEM_POPUP_UNGROUP \
Identifier = SID_UNGROUP ; \
Command = ".uno:FormatUngroup" ; \
- HelpID = SID_UNGROUP ; \
Text [ en-US ] = "~Ungroup" ; \
#define ITEM_POPUP_ENTER_GROUP \
Identifier = SID_ENTER_GROUP ; \
Command = ".uno:EnterGroup" ; \
- HelpID = SID_ENTER_GROUP ; \
Text [ en-US ] = "~Edit Group" ; \
#define ITEM_POPUP_LEAVE_GROUP \
Identifier = SID_LEAVE_GROUP ; \
Command = ".uno:LeaveGroup" ; \
- HelpID = SID_LEAVE_GROUP ; \
Text [ en-US ] = "E~xit Group" ; \
#define ITEM_GROUP_MENU \
MenuItem\
{\
Identifier = SID_MN_GROUP ; \
- HelpID = SID_MN_GROUP ; \
Command = ".uno:GroupMenu" ; \
SubMenu = Menu\
{\
@@ -1195,14 +1041,12 @@
{ \
Identifier = SID_DATASOURCE_ADMINISTRATION ; \
Command = ".uno:DatasourceAdministration" ; \
- HelpID = SID_DATASOURCE_ADMINISTRATION ; \
Text [ en-US ] = "~Data Sources..." ; \
};
#define ITEM_VIEW_DATA_SOURCE_BROWSER \
Identifier = SID_VIEW_DATA_SOURCE_BROWSER; \
Command = ".uno:ViewDataSourceBrowser" ; \
- HelpID = SID_VIEW_DATA_SOURCE_BROWSER; \
Text [ en-US ] = "~Data Sources" ; \
/*------------------------------------------------------------------------
@@ -1211,112 +1055,92 @@
#define ITEM_TOOLBAR_SET_JUSTIFY_PARA \
Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
Command = ".uno:JustifyPara" ; \
- HelpID = SID_ATTR_PARA_ADJUST_BLOCK ;
#define ITEM_TOOLBAR_NEWDOCDIRECT \
Identifier = SID_NEWDOCDIRECT ; \
Command = ".uno:AddDirect" ; \
- HelpID = SID_NEWDOCDIRECT ;
#define ITEM_TOOLBAR_PRINTDOCDIRECT \
Identifier = SID_PRINTDOCDIRECT ; \
Command = ".uno:PrintDefault" ; \
- HelpID = SID_PRINTDOCDIRECT ;
#define ITEM_TOOLBAR_INSERT_DRAW \
Identifier = SID_INSERT_DRAW ; \
Command = ".uno:InsertDraw" ; \
- HelpID = SID_INSERT_DRAW ; \
DropDown = TRUE ;
#define ITEM_TOOLBAR_CHOOSE_CONTROLS \
Identifier = SID_CHOOSE_CONTROLS ; \
Command = ".uno:ChooseControls" ; \
- HelpID = SID_CHOOSE_CONTROLS ; \
DropDown = TRUE ;
#define ITEM_TOOLBAR_AUTOSPELL_CHECK \
Identifier = SID_AUTOSPELL_CHECK ; \
Command = ".uno:SpellOnline" ; \
- HelpID = SID_AUTOSPELL_CHECK ;
#define ITEM_TOOLBAR_TEMPLATE_APPLY \
Identifier = SID_STYLE_APPLY ; \
Command = ".uno:StyleApply" ; \
- HelpID = SID_STYLE_APPLY ;
#define ITEM_TOOLBAR_ATTR_CHAR_COLOR \
Identifier = SID_ATTR_CHAR_COLOR ; \
Command = ".uno:Color" ; \
- HelpID = SID_ATTR_CHAR_COLOR ;\
DropDown = TRUE ;
#define ITEM_TOOLBAR_BACKGROUND_PATTERN \
Identifier = SID_BACKGROUND_PATTERN ; \
Command = ".uno:BackgroundPatternController" ; \
- HelpID = SID_BACKGROUND_PATTERN ;\
DropDown = TRUE ;
#define ITEM_TOOLBAR_BACKGROUND_COLOR \
Identifier = SID_BACKGROUND_COLOR ; \
Command = ".uno:BackgroundColor" ; \
- HelpID = SID_BACKGROUND_COLOR ;\
DropDown = TRUE ;
#define ITEM_TOOLBAR_ATTR_BORDER \
Identifier = SID_ATTR_BORDER ; \
Command = ".uno:BorderStyle" ; \
- HelpID = SID_ATTR_BORDER ;
#define ITEM_TOOLBAR_FRAME_LINESTYLE \
Identifier = SID_FRAME_LINESTYLE ; \
Command = ".uno:LineStyle" ; \
- HelpID = SID_FRAME_LINESTYLE ;
#define ITEM_TOOLBAR_FRAME_LINECOLOR \
Identifier = SID_FRAME_LINECOLOR ; \
Command = ".uno:FrameLineColor" ; \
- HelpID = SID_FRAME_LINECOLOR ;
#define ITEM_TOOLBAR_SIM_START \
Identifier = SID_SIM_START ; \
Command = ".uno:LaunchStarImage" ; \
- HelpID = SID_SIM_START ;
#define ITEM_TOOLBAR_ATTR_LINEEND_STYLE \
Identifier = SID_ATTR_LINEEND_STYLE ; \
Command = ".uno:LineEndStyle" ; \
- HelpID = SID_ATTR_LINEEND_STYLE ; \
DropDown = TRUE ;
#define ITEM_TOOLBAR_ATTR_LINE_STYLE \
Identifier = SID_ATTR_LINE_STYLE ; \
Command = ".uno:XLineStyle" ; \
- HelpID = SID_ATTR_LINE_STYLE ;
#define ITEM_TOOLBAR_ATTR_LINE_WIDTH \
Identifier = SID_ATTR_LINE_WIDTH ; \
Command = ".uno:LineWidth" ; \
- HelpID = SID_ATTR_LINE_WIDTH ;
#define ITEM_TOOLBAR_ATTR_LINE_COLOR \
Identifier = SID_ATTR_LINE_COLOR ; \
Command = ".uno:XLineColor" ; \
- HelpID = SID_ATTR_LINE_COLOR ;
#define ITEM_TOOLBAR_ATTR_FILL_STYLE \
Identifier = SID_ATTR_FILL_STYLE ; \
Command = ".uno:FillStyle" ; \
- HelpID = SID_ATTR_FILL_STYLE ;
#define ITEM_TOOLBAR_OBJECT_ROTATE \
Identifier = SID_OBJECT_ROTATE ; \
Command = ".uno:ToggleObjectRotateMode" ; \
- HelpID = SID_OBJECT_ROTATE ;
#define ITEM_VIEW_OFFICEBAR \
Identifier = SID_GROUPVIEW; \
- HelpID = SID_GROUPVIEW; \
+ Command = CMD_SID_GROUPVIEW; \
Text [ en-US ] = "~Office Bar" ; \
@@ -1324,7 +1148,6 @@
MenuItem\
{\
Identifier = SID_MN_SUB_TRANSLITERATE ; \
- HelpID = SID_MN_SUB_TRANSLITERATE ; \
Command = ".uno:TransliterateMenu" ; \
SubMenu = Menu\
{\
@@ -1334,63 +1157,54 @@
{\
Identifier = SID_TRANSLITERATE_SENTENCE_CASE; \
Command = ".uno:ChangeCaseToSentenceCase" ; \
- HelpID = SID_TRANSLITERATE_SENTENCE_CASE; \
Text [ en-US ] = "~Sentence case";\
};\
MenuItem\
{\
Identifier = SID_TRANSLITERATE_LOWER; \
Command = ".uno:ChangeCaseToLower" ; \
- HelpID = SID_TRANSLITERATE_LOWER; \
Text [ en-US ] = "~lowercase";\
};\
MenuItem\
{\
Identifier = SID_TRANSLITERATE_UPPER ; \
Command = ".uno:ChangeCaseToUpper" ; \
- HelpID = SID_TRANSLITERATE_UPPER ; \
Text [ en-US ] = "~UPPERCASE";\
};\
MenuItem\
{\
Identifier = SID_TRANSLITERATE_TITLE_CASE; \
Command = ".uno:ChangeCaseToTitleCase" ; \
- HelpID = SID_TRANSLITERATE_TITLE_CASE; \
Text [ en-US ] = "~Capitalize Every Word";\
};\
MenuItem\
{\
Identifier = SID_TRANSLITERATE_TOGGLE_CASE; \
Command = ".uno:ChangeCaseToToggleCase" ; \
- HelpID = SID_TRANSLITERATE_TOGGLE_CASE; \
Text [ en-US ] = "~tOGGLE cASE";\
};\
MenuItem\
{\
Identifier = SID_TRANSLITERATE_HALFWIDTH; \
Command = ".uno:ChangeCaseToHalfWidth" ; \
- HelpID = SID_TRANSLITERATE_HALFWIDTH; \
Text [ en-US ] = "H~alf-width";\
};\
MenuItem\
{\
Identifier = SID_TRANSLITERATE_FULLWIDTH; \
Command = ".uno:ChangeCaseToFullWidth" ; \
- HelpID = SID_TRANSLITERATE_FULLWIDTH; \
Text [ en-US ] = "Full-width";\
};\
MenuItem\
{\
Identifier = SID_TRANSLITERATE_HIRAGANA; \
Command = ".uno:ChangeCaseToHiragana" ; \
- HelpID = SID_TRANSLITERATE_HIRAGANA; \
Text [ en-US ] = "~Hiragana";\
};\
MenuItem\
{\
Identifier = SID_TRANSLITERATE_KATAGANA; \
Command = ".uno:ChangeCaseToKatakana" ; \
- HelpID = SID_TRANSLITERATE_KATAGANA; \
Text [ en-US ] = "~Katakana";\
};\
};\
@@ -1400,23 +1214,23 @@
#define ITEM_OPEN_HYPERLINK \
Identifier = SID_OPEN_HYPERLINK ; \
- HelpID = SID_OPEN_HYPERLINK ; \
+ Command = CMD_SID_OPEN_HYPERLINK; \
Text [ en-US ] = "~Open Hyperlink" ; \
#define ITEM_OPEN_SMARTTAGMENU \
Identifier = SID_OPEN_SMARTTAGMENU ; \
- HelpID = SID_OPEN_SMARTTAGMENU ; \
+ Command = CMD_SID_OPEN_SMARTTAGMENU; \
Text [ en-US ] = "Open ~Smart Tag Menu" ; \
#define ITEM_OPEN_XML_FILTERSETTINGS \
Identifier = SID_OPEN_XML_FILTERSETTINGS ; \
- HelpID = SID_OPEN_XML_FILTERSETTINGS ; \
+ Command = CMD_SID_OPEN_XML_FILTERSETTINGS; \
Text [ en-US ] = "~XML Filter Settings..."; \
#define ITEM_HANGUL_HANJA_CONVERSION \
Identifier = SID_HANGUL_HANJA_CONVERSION; \
- HelpId = SID_HANGUL_HANJA_CONVERSION; \
+ Command = CMD_SID_HANGUL_HANJA_CONVERSION; \
Text [ en-US ] = "Hangul/Hanja Conversion..."; \
#endif // #ifndef _GLOBLMN_HRC
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 29899ed5ae..fcab99591f 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -26,270 +26,258 @@
************************************************************************/
#ifndef _SVX_HELPID_HRC
#define _SVX_HELPID_HRC
-// include ---------------------------------------------------------------
-
-#include <svl/solar.hrc>
#include <svx/exthelpid.hrc>
+#include <svx/svxcommands.h>
+#include <sfx2/sfxcommands.h>
// Help-Ids --------------------------------------------------------------
-#define HID_ALIGN_TBX (HID_SVX_START + 1)
-#define HID_BMPMASK_CTL_PIPETTE (HID_SVX_START + 4)
-#define HID_BMPMASK_CTL_QCOL_1 (HID_SVX_START + 5)
-#define HID_BMPMASK_TBI_PIPETTE (HID_SVX_START + 6)
-#define HID_COLOR_CTL_COLORS (HID_SVX_START + 7)
-#define HID_CONTDLG_APPLY (HID_SVX_START + 8)
-#define HID_CONTDLG_AUTOCONTOUR (HID_SVX_START + 9)
-#define HID_CONTDLG_CIRCLE (HID_SVX_START + 10)
-#define HID_CONTDLG_FREEPOLY (HID_SVX_START + 11)
-#define HID_CONTDLG_GRAPHWND (HID_SVX_START + 12)
-#define HID_CONTDLG_PIPETTE (HID_SVX_START + 13)
-#define HID_CONTDLG_POLY (HID_SVX_START + 14)
-#define HID_CONTDLG_POLYDELETE (HID_SVX_START + 15)
-#define HID_CONTDLG_POLYEDIT (HID_SVX_START + 16)
-#define HID_CONTDLG_POLYINSERT (HID_SVX_START + 17)
-#define HID_CONTDLG_POLYMOVE (HID_SVX_START + 18)
-#define HID_CONTDLG_RECT (HID_SVX_START + 19)
-#define HID_CONTDLG_REDO (HID_SVX_START + 20)
-#define HID_CONTDLG_SELECT (HID_SVX_START + 21)
-#define HID_CONTDLG_TOOLBOX (HID_SVX_START + 22)
-#define HID_CONTDLG_UNDO (HID_SVX_START + 23)
-#define HID_CONTDLG_WORKPLACE (HID_SVX_START + 24)
-#define HID_CTL_FONTWORK_FAVORITES (HID_SVX_START + 25)
-#define HID_CTRL3D_HSCROLL (HID_SVX_START + 26)
-#define HID_CTRL3D_SWITCHER (HID_SVX_START + 27)
-#define HID_CTRL3D_VSCROLL (HID_SVX_START + 28)
-#define HID_CTRL_COLOR (HID_SVX_START + 29)
-#define HID_DRAWTOOL_TBX (HID_SVX_START + 30)
-#define HID_EDITENG_SPELLER_ADDWORD (HID_SVX_START + 31)
-#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_SVX_START + 32)
-#define HID_EDITENG_SPELLER_IGNORE (HID_SVX_START + 33)
-#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_SVX_START + 34)
-#define HID_EDITENG_SPELLER_START (HID_SVX_START + 35)
-#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_SVX_START + 36)
-#define HID_FILL_ATTR_LISTBOX (HID_SVX_START + 37)
-#define HID_FILL_TYPE_LISTBOX (HID_SVX_START + 38)
-#define HID_FONTWORK_CTL_FORMS (HID_SVX_START + 39)
-#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE (HID_SVX_START + 40)
-#define HID_FONTWORK_TBI_ADJUST_CENTER (HID_SVX_START + 41)
-#define HID_FONTWORK_TBI_ADJUST_LEFT (HID_SVX_START + 42)
-#define HID_FONTWORK_TBI_ADJUST_MIRROR (HID_SVX_START + 43)
-#define HID_FONTWORK_TBI_ADJUST_RIGHT (HID_SVX_START + 44)
-#define HID_FONTWORK_TBI_OUTLINE (HID_SVX_START + 45)
-#define HID_FONTWORK_TBI_SHADOW_NORMAL (HID_SVX_START + 46)
-#define HID_FONTWORK_TBI_SHADOW_OFF (HID_SVX_START + 47)
-#define HID_FONTWORK_TBI_SHADOW_SLANT (HID_SVX_START + 48)
-#define HID_FONTWORK_TBI_SHOWFORM (HID_SVX_START + 49)
-#define HID_FONTWORK_TBI_STYLE_OFF (HID_SVX_START + 50)
-#define HID_FONTWORK_TBI_STYLE_ROTATE (HID_SVX_START + 51)
-#define HID_FONTWORK_TBI_STYLE_SLANTX (HID_SVX_START + 52)
-#define HID_FONTWORK_TBI_STYLE_SLANTY (HID_SVX_START + 53)
-#define HID_FONTWORK_TBI_STYLE_UPRIGHT (HID_SVX_START + 54)
-#define HID_FORMAT_FOOTER (HID_SVX_START + 55)
-#define HID_FORMAT_HEADER (HID_SVX_START + 56)
+#define HID_ALIGN_TBX "SVX_HID_ALIGN_TBX"
+#define HID_BMPMASK_CTL_PIPETTE "SVX_HID_BMPMASK_CTL_PIPETTE"
+#define HID_BMPMASK_CTL_QCOL_1 "SVX_HID_BMPMASK_CTL_QCOL_1"
+#define HID_BMPMASK_TBI_PIPETTE "SVX_HID_BMPMASK_TBI_PIPETTE"
+#define HID_COLOR_CTL_COLORS "SVX_HID_COLOR_CTL_COLORS"
+#define HID_CONTDLG_APPLY "SVX_HID_CONTDLG_APPLY"
+#define HID_CONTDLG_AUTOCONTOUR "SVX_HID_CONTDLG_AUTOCONTOUR"
+#define HID_CONTDLG_CIRCLE "SVX_HID_CONTDLG_CIRCLE"
+#define HID_CONTDLG_FREEPOLY "SVX_HID_CONTDLG_FREEPOLY"
+#define HID_CONTDLG_GRAPHWND "SVX_HID_CONTDLG_GRAPHWND"
+#define HID_CONTDLG_PIPETTE "SVX_HID_CONTDLG_PIPETTE"
+#define HID_CONTDLG_POLY "SVX_HID_CONTDLG_POLY"
+#define HID_CONTDLG_POLYDELETE "SVX_HID_CONTDLG_POLYDELETE"
+#define HID_CONTDLG_POLYEDIT "SVX_HID_CONTDLG_POLYEDIT"
+#define HID_CONTDLG_POLYINSERT "SVX_HID_CONTDLG_POLYINSERT"
+#define HID_CONTDLG_POLYMOVE "SVX_HID_CONTDLG_POLYMOVE"
+#define HID_CONTDLG_RECT "SVX_HID_CONTDLG_RECT"
+#define HID_CONTDLG_REDO "SVX_HID_CONTDLG_REDO"
+#define HID_CONTDLG_SELECT "SVX_HID_CONTDLG_SELECT"
+#define HID_CONTDLG_TOOLBOX "SVX_HID_CONTDLG_TOOLBOX"
+#define HID_CONTDLG_UNDO "SVX_HID_CONTDLG_UNDO"
+#define HID_CONTDLG_WORKPLACE "SVX_HID_CONTDLG_WORKPLACE"
+#define HID_CTL_FONTWORK_FAVORITES "SVX_HID_CTL_FONTWORK_FAVORITES"
+#define HID_CTRL3D_HSCROLL "SVX_HID_CTRL3D_HSCROLL"
+#define HID_CTRL3D_SWITCHER "SVX_HID_CTRL3D_SWITCHER"
+#define HID_CTRL3D_VSCROLL "SVX_HID_CTRL3D_VSCROLL"
+#define HID_CTRL_COLOR "SVX_HID_CTRL_COLOR"
+#define HID_DRAWTOOL_TBX "SVX_HID_DRAWTOOL_TBX"
+#define HID_EDITENG_SPELLER_ADDWORD "SVX_HID_EDITENG_SPELLER_ADDWORD"
+#define HID_EDITENG_SPELLER_AUTOCORRECT "SVX_HID_EDITENG_SPELLER_AUTOCORRECT"
+#define HID_EDITENG_SPELLER_IGNORE "SVX_HID_EDITENG_SPELLER_IGNORE"
+#define HID_EDITENG_SPELLER_PARALANGUAGE "SVX_HID_EDITENG_SPELLER_PARALANGUAGE"
+#define HID_EDITENG_SPELLER_START "SVX_HID_EDITENG_SPELLER_START"
+#define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE"
+#define HID_FILL_ATTR_LISTBOX "SVX_HID_FILL_ATTR_LISTBOX"
+#define HID_FILL_TYPE_LISTBOX "SVX_HID_FILL_TYPE_LISTBOX"
+#define HID_FONTWORK_CTL_FORMS "SVX_HID_FONTWORK_CTL_FORMS"
+#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE "SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE"
+#define HID_FONTWORK_TBI_ADJUST_CENTER "SVX_HID_FONTWORK_TBI_ADJUST_CENTER"
+#define HID_FONTWORK_TBI_ADJUST_LEFT "SVX_HID_FONTWORK_TBI_ADJUST_LEFT"
+#define HID_FONTWORK_TBI_ADJUST_MIRROR "SVX_HID_FONTWORK_TBI_ADJUST_MIRROR"
+#define HID_FONTWORK_TBI_ADJUST_RIGHT "SVX_HID_FONTWORK_TBI_ADJUST_RIGHT"
+#define HID_FONTWORK_TBI_OUTLINE "SVX_HID_FONTWORK_TBI_OUTLINE"
+#define HID_FONTWORK_TBI_SHADOW_NORMAL "SVX_HID_FONTWORK_TBI_SHADOW_NORMAL"
+#define HID_FONTWORK_TBI_SHADOW_OFF "SVX_HID_FONTWORK_TBI_SHADOW_OFF"
+#define HID_FONTWORK_TBI_SHADOW_SLANT "SVX_HID_FONTWORK_TBI_SHADOW_SLANT"
+#define HID_FONTWORK_TBI_SHOWFORM "SVX_HID_FONTWORK_TBI_SHOWFORM"
+#define HID_FONTWORK_TBI_STYLE_OFF "SVX_HID_FONTWORK_TBI_STYLE_OFF"
+#define HID_FONTWORK_TBI_STYLE_ROTATE "SVX_HID_FONTWORK_TBI_STYLE_ROTATE"
+#define HID_FONTWORK_TBI_STYLE_SLANTX "SVX_HID_FONTWORK_TBI_STYLE_SLANTX"
+#define HID_FONTWORK_TBI_STYLE_SLANTY "SVX_HID_FONTWORK_TBI_STYLE_SLANTY"
+#define HID_FONTWORK_TBI_STYLE_UPRIGHT "SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT"
+#define HID_FORMAT_FOOTER "SVX_HID_FORMAT_FOOTER"
+#define HID_FORMAT_HEADER "SVX_HID_FORMAT_HEADER"
// free
-#define HID_GALLERY_ICONVIEW (HID_SVX_START + 58)
-#define HID_GALLERY_LISTVIEW (HID_SVX_START + 59)
-#define HID_GALLERY_MN_ADD (HID_SVX_START + 60)
-#define HID_GALLERY_MN_ADDMENU (HID_SVX_START + 61)
-#define HID_GALLERY_MN_ADD_LINK (HID_SVX_START + 62)
-#define HID_GALLERY_MN_BACKGROUND (HID_SVX_START + 63)
-#define HID_GALLERY_MN_COPYCLIPBOARD (HID_SVX_START + 64)
-#define HID_GALLERY_MN_DELETE (HID_SVX_START + 65)
-#define HID_GALLERY_MN_PASTECLIPBOARD (HID_SVX_START + 66)
-#define HID_GALLERY_MN_PREVIEW (HID_SVX_START + 67)
-#define HID_GALLERY_NEWTHEME (HID_SVX_START + 68)
-#define HID_GALLERY_PREVIEW (HID_SVX_START + 69)
-#define HID_GALLERY_PROPERTIES (HID_SVX_START + 70)
-#define HID_GALLERY_RENAME (HID_SVX_START + 71)
-#define HID_GALLERY_THEMELIST (HID_SVX_START + 72)
+#define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW"
+#define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW"
+#define HID_GALLERY_MN_ADD "SVX_HID_GALLERY_MN_ADD"
+#define HID_GALLERY_MN_ADDMENU "SVX_HID_GALLERY_MN_ADDMENU"
+#define HID_GALLERY_MN_ADD_LINK "SVX_HID_GALLERY_MN_ADD_LINK"
+#define HID_GALLERY_MN_BACKGROUND "SVX_HID_GALLERY_MN_BACKGROUND"
+#define HID_GALLERY_MN_COPYCLIPBOARD "SVX_HID_GALLERY_MN_COPYCLIPBOARD"
+#define HID_GALLERY_MN_DELETE "SVX_HID_GALLERY_MN_DELETE"
+#define HID_GALLERY_MN_PASTECLIPBOARD "SVX_HID_GALLERY_MN_PASTECLIPBOARD"
+#define HID_GALLERY_MN_PREVIEW "SVX_HID_GALLERY_MN_PREVIEW"
+#define HID_GALLERY_NEWTHEME "SVX_HID_GALLERY_NEWTHEME"
+#define HID_GALLERY_PREVIEW "SVX_HID_GALLERY_PREVIEW"
+#define HID_GALLERY_PROPERTIES "SVX_HID_GALLERY_PROPERTIES"
+#define HID_GALLERY_RENAME "SVX_HID_GALLERY_RENAME"
+#define HID_GALLERY_THEMELIST "SVX_HID_GALLERY_THEMELIST"
// free
-#define HID_GALLERY_WINDOW (HID_SVX_START + 74)
-#define HID_GRFFILTER (HID_SVX_START + 75)
-#define HID_GRFFILTER_EMBOSS (HID_SVX_START + 76)
-#define HID_GRFFILTER_INVERT (HID_SVX_START + 77)
-#define HID_GRFFILTER_MOSAIC (HID_SVX_START + 78)
-#define HID_GRFFILTER_POPART (HID_SVX_START + 79)
-#define HID_GRFFILTER_POSTER (HID_SVX_START + 80)
-#define HID_GRFFILTER_REMOVENOISE (HID_SVX_START + 81)
-#define HID_GRFFILTER_SEPIA (HID_SVX_START + 82)
-#define HID_GRFFILTER_SHARPEN (HID_SVX_START + 83)
-#define HID_GRFFILTER_SMOOTH (HID_SVX_START + 84)
-#define HID_GRFFILTER_SOBEL (HID_SVX_START + 85)
-#define HID_GRFFILTER_SOLARIZE (HID_SVX_START + 86)
-
-#define HID_IMAPDLG_ACTIVE (HID_SVX_START + 88)
-#define HID_IMAPDLG_APPLY (HID_SVX_START + 89)
-#define HID_IMAPDLG_CIRCLE (HID_SVX_START + 90)
-#define HID_IMAPDLG_FREEPOLY (HID_SVX_START + 91)
-#define HID_IMAPDLG_GRAPHWND (HID_SVX_START + 92)
-#define HID_IMAPDLG_MACRO (HID_SVX_START + 93)
-#define HID_IMAPDLG_OPEN (HID_SVX_START + 94)
-#define HID_IMAPDLG_POLY (HID_SVX_START + 95)
-#define HID_IMAPDLG_POLYDELETE (HID_SVX_START + 96)
-#define HID_IMAPDLG_POLYEDIT (HID_SVX_START + 97)
-#define HID_IMAPDLG_POLYINSERT (HID_SVX_START + 98)
-#define HID_IMAPDLG_POLYMOVE (HID_SVX_START + 99)
-#define HID_IMAPDLG_PROPERTY (HID_SVX_START + 100)
-#define HID_IMAPDLG_RECT (HID_SVX_START + 101)
-#define HID_IMAPDLG_REDO (HID_SVX_START + 102)
-#define HID_IMAPDLG_SAVEAS (HID_SVX_START + 103)
-#define HID_IMAPDLG_SELECT (HID_SVX_START + 104)
-#define HID_IMAPDLG_TOOLBOX (HID_SVX_START + 105)
-#define HID_IMAPDLG_UNDO (HID_SVX_START + 106)
-#define HID_MENU_EXTRUSION_DEPTH (HID_SVX_START + 107)
-#define HID_MENU_EXTRUSION_DIRECTION (HID_SVX_START + 108)
-#define HID_MENU_EXTRUSION_LIGHTING (HID_SVX_START + 109)
-#define HID_MENU_EXTRUSION_SURFACE (HID_SVX_START + 110)
-#define HID_MNU_FUNC_AVG (HID_SVX_START + 111)
-#define HID_MNU_FUNC_COUNT (HID_SVX_START + 112)
-#define HID_MNU_FUNC_COUNT2 (HID_SVX_START + 113)
-#define HID_MNU_FUNC_MAX (HID_SVX_START + 114)
-#define HID_MNU_FUNC_MIN (HID_SVX_START + 115)
-#define HID_MNU_FUNC_NONE (HID_SVX_START + 116)
-#define HID_MNU_FUNC_SUM (HID_SVX_START + 117)
-#define HID_MNU_ZOOM_100 (HID_SVX_START + 118)
-#define HID_MNU_ZOOM_150 (HID_SVX_START + 119)
-#define HID_MNU_ZOOM_200 (HID_SVX_START + 120)
-#define HID_MNU_ZOOM_50 (HID_SVX_START + 121)
-#define HID_MNU_ZOOM_75 (HID_SVX_START + 122)
-#define HID_MNU_ZOOM_OPTIMAL (HID_SVX_START + 123)
-#define HID_MNU_ZOOM_PAGE_WIDTH (HID_SVX_START + 124)
-#define HID_MNU_ZOOM_WHOLE_PAGE (HID_SVX_START + 125)
-#define HID_OPTIONS_GRID (HID_SVX_START + 126)
-#define HID_PASSWORD (HID_SVX_START + 127)
-#define HID_POPUP_COLOR (HID_SVX_START + 128)
-#define HID_POPUP_COLOR_CTRL (HID_SVX_START + 129)
-#define HID_POPUP_EXTRUSION_DEPTH (HID_SVX_START + 130)
-#define HID_POPUP_EXTRUSION_DIRECTION (HID_SVX_START + 131)
-#define HID_POPUP_EXTRUSION_LIGHTING (HID_SVX_START + 132)
-#define HID_POPUP_EXTRUSION_SURFACE (HID_SVX_START + 133)
-#define HID_POPUP_FONTWORK_ALIGN (HID_SVX_START + 134)
-#define HID_POPUP_FONTWORK_CHARSPACE (HID_SVX_START + 135)
-#define HID_POPUP_FRAME (HID_SVX_START + 136)
-#define HID_POPUP_LINE (HID_SVX_START + 137)
-#define HID_POPUP_LINEEND (HID_SVX_START + 138)
-#define HID_POPUP_LINEEND_CTRL (HID_SVX_START + 139)
-#define HID_REDLINING_FILTER_BTN_REF (HID_SVX_START + 140)
-#define HID_REDLINING_FILTER_CB_ACTION (HID_SVX_START + 141)
-#define HID_REDLINING_FILTER_CB_AUTOR (HID_SVX_START + 142)
-#define HID_REDLINING_FILTER_CB_COMMENT (HID_SVX_START + 143)
-#define HID_REDLINING_FILTER_CB_DATE (HID_SVX_START + 144)
-#define HID_REDLINING_FILTER_CB_RANGE (HID_SVX_START + 145)
-#define HID_REDLINING_FILTER_DF_DATE (HID_SVX_START + 146)
-#define HID_REDLINING_FILTER_DF_DATE2 (HID_SVX_START + 147)
-#define HID_REDLINING_FILTER_ED_COMMENT (HID_SVX_START + 148)
-#define HID_REDLINING_FILTER_ED_RANGE (HID_SVX_START + 149)
-#define HID_REDLINING_FILTER_IB_CLOCK (HID_SVX_START + 150)
-#define HID_REDLINING_FILTER_IB_CLOCK2 (HID_SVX_START + 151)
-#define HID_REDLINING_FILTER_LB_ACTION (HID_SVX_START + 152)
-#define HID_REDLINING_FILTER_LB_AUTOR (HID_SVX_START + 153)
-#define HID_REDLINING_FILTER_LB_DATE (HID_SVX_START + 154)
-#define HID_REDLINING_FILTER_PAGE (HID_SVX_START + 155)
-#define HID_REDLINING_FILTER_TF_DATE (HID_SVX_START + 156)
-#define HID_REDLINING_FILTER_TF_DATE2 (HID_SVX_START + 157)
-#define HID_REDLINING_TABCONTROL (HID_SVX_START + 158)
-#define HID_REDLINING_VIEW_DG_VIEW (HID_SVX_START + 159)
-#define HID_REDLINING_VIEW_DG_VIEW_HEADER (HID_SVX_START + 160)
-#define HID_REDLINING_VIEW_DG_VIEW_TABLE (HID_SVX_START + 161)
-#define HID_REDLINING_VIEW_PAGE (HID_SVX_START + 162)
-#define HID_REDLINING_VIEW_PB_ACCEPT (HID_SVX_START + 163)
-#define HID_REDLINING_VIEW_PB_ACCEPTALL (HID_SVX_START + 164)
-#define HID_REDLINING_VIEW_PB_REJECT (HID_SVX_START + 165)
-#define HID_REDLINING_VIEW_PB_REJECTALL (HID_SVX_START + 166)
-#define HID_REDLINING_VIEW_PB_UNDO (HID_SVX_START + 167)
-#define HID_RUBY_DIALOG (HID_SVX_START + 168)
-#define HID_STYLE_LISTBOX (HID_SVX_START + 169)
-#define HID_SVXTBX_ALIGNMENT (HID_SVX_START + 170)
-#define HID_SVXTBX_DRAW (HID_SVX_START + 171)
-#define HID_SVXTBX_UNDO_REDO_CTRL (HID_SVX_START + 172)
-#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE (HID_SVX_START + 173)
-#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER (HID_SVX_START + 174)
-#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED (HID_SVX_START + 175)
-#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL (HID_SVX_START + 176)
-#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 177)
-#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 178)
-#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS (HID_SVX_START + 179)
-#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 180)
-#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 181)
-#define HID_SVX_MDLG_DOCRECOVERY_BROKEN (HID_SVX_START + 182)
-#define HID_SVX_MDLG_DOCRECOVERY_PROGR (HID_SVX_START + 183)
-#define HID_SVX_MDLG_ERR_REP_OPTIONS (HID_SVX_START + 184)
-#define HID_SVX_MDLG_ERR_REP_PREVIEW (HID_SVX_START + 185)
-#define HID_SVX_TABDLG_DOCRECOVERY (HID_SVX_START + 186)
-#define HID_SVX_TP_DOCRECOVERY_RECOVER (HID_SVX_START + 187)
-#define HID_SVX_TP_DOCRECOVERY_SAVE (HID_SVX_START + 188)
-#define HID_SVX_TP_ERR_REP_SEND (HID_SVX_START + 189)
-#define HID_SVX_TP_ERR_REP_WELCOME (HID_SVX_START + 190)
-
-#define HID_VALUESET_EXTRUSION_DIRECTION (HID_SVX_START + 192)
-#define HID_VALUESET_EXTRUSION_LIGHTING (HID_SVX_START + 193)
-#define HID_WIN_FONTWORK_ALIGN (HID_SVX_START + 194)
-#define HID_WIN_FONTWORK_CHARSPACE (HID_SVX_START + 195)
-#define HID_XMLSEC_CALL (HID_SVX_START + 196)
-#define HID_OFA_HYPERLINK_DLG (HID_SVX_START + 197)
-#define HID_OFA_HYPERLINK_NAME (HID_SVX_START + 198)
-#define HID_OFA_HYPERLINK_SEARCH (HID_SVX_START + 199)
-#define HID_OFA_HYPERLINK_TARGET (HID_SVX_START + 200)
-#define HID_OFA_HYPERLINK_URL (HID_SVX_START + 201)
-#define HID_OFA_HYPERLINK_URL_TXT (HID_SVX_START + 202)
-#define HID_AUTOCORR_DLG (HID_SVX_START + 203)
-#define HID_SVXCTL_MAIL_ATTACH (HID_SVX_START + 204)
-#define HID_SVXDLG_REGISTRATION (HID_SVX_START + 205)
-#define HID_SVXDLG_TREE_BASE (HID_SVX_START + 206)
-#define HID_SVXDLG_TREE_CHART (HID_SVX_START + 207)
-#define HID_SVXDLG_TREE_FILTER (HID_SVX_START + 208)
-#define HID_SVXDLG_TREE_LANGUAGE (HID_SVX_START + 209)
-#define HID_SVXWIN_MAIL_ATTACH (HID_SVX_START + 210)
-#define HID_SVXWIN_MAIL_HEADER (HID_SVX_START + 211)
-#define HID_SVX_DLGFORMNEW (HID_SVX_START + 212)
-#define HID_SVX_DLGTABNEW (HID_SVX_START + 213)
-#define HID_SVX_HYPERLINK (HID_SVX_START + 214)
-#define HID_SVX_MAILATTACH_ASCII_CB (HID_SVX_START + 215)
-#define HID_SVX_MAILATTACH_HTML_CB (HID_SVX_START + 216)
-#define HID_SVX_MAILATTACH_OFFICE_CB (HID_SVX_START + 217)
-#define HID_SVX_MAILATTACH_PRIORITY_LB (HID_SVX_START + 218)
-#define HID_SVX_MAILATTACH_RECEIPT_CB (HID_SVX_START + 219)
-#define HID_SVX_MAILATTACH_RTF_CB (HID_SVX_START + 220)
-#define HID_SVX_MAILHEAD_HEAD_WIN (HID_SVX_START + 221)
-#define HID_SVX_MAILHEAD_PRIORITY_LB (HID_SVX_START + 222)
-#define HID_SVX_MAILHEAD_PROTOCOL_LB (HID_SVX_START + 223)
-#define HID_SVX_MAILHEAD_RCPT_CB (HID_SVX_START + 224)
-#define HID_SVX_MAILHEAD_RCPT_ED (HID_SVX_START + 225)
-#define HID_SVX_MAILHEAD_RCPT_LB (HID_SVX_START + 226)
-#define HID_SVX_MAILHEAD_RECEIPT_CB (HID_SVX_START + 227)
-#define HID_SVX_MAILHEAD_ROLE_LB (HID_SVX_START + 228)
-#define HID_SVX_MAILHEAD_SUBJECT_ED (HID_SVX_START + 229)
-#define HID_SVX_MAILMENU_ADDADDRESS (HID_SVX_START + 230)
-#define HID_SVX_MAILMENU_COPYLINK (HID_SVX_START + 231)
-#define HID_SVX_MAILMENU_DELETE (HID_SVX_START + 232)
-#define HID_SVX_MAILMENU_FILE (HID_SVX_START + 233)
-#define HID_SVX_MAILMENU_OPEN (HID_SVX_START + 234)
-#define HID_SVX_MAILMENU_RENAME (HID_SVX_START + 235)
-#define HID_SVX_MAILMENU_SAVEAS (HID_SVX_START + 236)
-#define HID_SVX_MAILMENU_SIG1 (HID_SVX_START + 237)
-#define HID_SVX_MAILMENU_SIG2 (HID_SVX_START + 238)
-#define HID_SVX_MAILMENU_SIG3 (HID_SVX_START + 239)
-#define HID_SVX_MAILMENU_SIG4 (HID_SVX_START + 240)
-#define HID_SVX_MAILTOOLBOX (HID_SVX_START + 241)
-#define HID_SVX_SENDMENU_ENCRYPT (HID_SVX_START + 242)
-#define HID_SVX_SENDMENU_PLAIN (HID_SVX_START + 243)
-#define HID_SVX_SENDMENU_SIGN (HID_SVX_START + 244)
-#define HID_SVX_SENDMENU_SIGNANDENCRYPT (HID_SVX_START + 245)
-#define HID_SVX_TP_APPEARANCE (HID_SVX_START + 246)
-#define HID_SVX_TP_DESKTOP (HID_SVX_START + 247)
-#define HID_CT_THES_ALTERNATIVES (HID_SVX_START + 248)
+#define HID_GALLERY_WINDOW "SVX_HID_GALLERY_WINDOW"
+#define HID_GRFFILTER "SVX_HID_GRFFILTER"
+#define HID_GRFFILTER_EMBOSS "SVX_HID_GRFFILTER_EMBOSS"
+#define HID_GRFFILTER_INVERT "SVX_HID_GRFFILTER_INVERT"
+#define HID_GRFFILTER_MOSAIC "SVX_HID_GRFFILTER_MOSAIC"
+#define HID_GRFFILTER_POPART "SVX_HID_GRFFILTER_POPART"
+#define HID_GRFFILTER_POSTER "SVX_HID_GRFFILTER_POSTER"
+#define HID_GRFFILTER_REMOVENOISE "SVX_HID_GRFFILTER_REMOVENOISE"
+#define HID_GRFFILTER_SEPIA "SVX_HID_GRFFILTER_SEPIA"
+#define HID_GRFFILTER_SHARPEN "SVX_HID_GRFFILTER_SHARPEN"
+#define HID_GRFFILTER_SMOOTH "SVX_HID_GRFFILTER_SMOOTH"
+#define HID_GRFFILTER_SOBEL "SVX_HID_GRFFILTER_SOBEL"
+#define HID_GRFFILTER_SOLARIZE "SVX_HID_GRFFILTER_SOLARIZE"
-// please adjust ACT_SVX_HID_END2 below if you add entries here!
+#define HID_IMAPDLG_ACTIVE "SVX_HID_IMAPDLG_ACTIVE"
+#define HID_IMAPDLG_APPLY "SVX_HID_IMAPDLG_APPLY"
+#define HID_IMAPDLG_CIRCLE "SVX_HID_IMAPDLG_CIRCLE"
+#define HID_IMAPDLG_FREEPOLY "SVX_HID_IMAPDLG_FREEPOLY"
+#define HID_IMAPDLG_GRAPHWND "SVX_HID_IMAPDLG_GRAPHWND"
+#define HID_IMAPDLG_MACRO "SVX_HID_IMAPDLG_MACRO"
+#define HID_IMAPDLG_OPEN "SVX_HID_IMAPDLG_OPEN"
+#define HID_IMAPDLG_POLY "SVX_HID_IMAPDLG_POLY"
+#define HID_IMAPDLG_POLYDELETE "SVX_HID_IMAPDLG_POLYDELETE"
+#define HID_IMAPDLG_POLYEDIT "SVX_HID_IMAPDLG_POLYEDIT"
+#define HID_IMAPDLG_POLYINSERT "SVX_HID_IMAPDLG_POLYINSERT"
+#define HID_IMAPDLG_POLYMOVE "SVX_HID_IMAPDLG_POLYMOVE"
+#define HID_IMAPDLG_PROPERTY "SVX_HID_IMAPDLG_PROPERTY"
+#define HID_IMAPDLG_RECT "SVX_HID_IMAPDLG_RECT"
+#define HID_IMAPDLG_REDO "SVX_HID_IMAPDLG_REDO"
+#define HID_IMAPDLG_SAVEAS "SVX_HID_IMAPDLG_SAVEAS"
+#define HID_IMAPDLG_SELECT "SVX_HID_IMAPDLG_SELECT"
+#define HID_IMAPDLG_TOOLBOX "SVX_HID_IMAPDLG_TOOLBOX"
+#define HID_IMAPDLG_UNDO "SVX_HID_IMAPDLG_UNDO"
+#define HID_MENU_EXTRUSION_DEPTH "SVX_HID_MENU_EXTRUSION_DEPTH"
+#define HID_MENU_EXTRUSION_DIRECTION "SVX_HID_MENU_EXTRUSION_DIRECTION"
+#define HID_MENU_EXTRUSION_LIGHTING "SVX_HID_MENU_EXTRUSION_LIGHTING"
+#define HID_MENU_EXTRUSION_SURFACE "SVX_HID_MENU_EXTRUSION_SURFACE"
+#define HID_MNU_FUNC_AVG "SVX_HID_MNU_FUNC_AVG"
+#define HID_MNU_FUNC_COUNT "SVX_HID_MNU_FUNC_COUNT"
+#define HID_MNU_FUNC_COUNT2 "SVX_HID_MNU_FUNC_COUNT2"
+#define HID_MNU_FUNC_MAX "SVX_HID_MNU_FUNC_MAX"
+#define HID_MNU_FUNC_MIN "SVX_HID_MNU_FUNC_MIN"
+#define HID_MNU_FUNC_NONE "SVX_HID_MNU_FUNC_NONE"
+#define HID_MNU_FUNC_SUM "SVX_HID_MNU_FUNC_SUM"
+#define HID_MNU_ZOOM_100 "SVX_HID_MNU_ZOOM_100"
+#define HID_MNU_ZOOM_150 "SVX_HID_MNU_ZOOM_150"
+#define HID_MNU_ZOOM_200 "SVX_HID_MNU_ZOOM_200"
+#define HID_MNU_ZOOM_50 "SVX_HID_MNU_ZOOM_50"
+#define HID_MNU_ZOOM_75 "SVX_HID_MNU_ZOOM_75"
+#define HID_MNU_ZOOM_OPTIMAL "SVX_HID_MNU_ZOOM_OPTIMAL"
+#define HID_MNU_ZOOM_PAGE_WIDTH "SVX_HID_MNU_ZOOM_PAGE_WIDTH"
+#define HID_MNU_ZOOM_WHOLE_PAGE "SVX_HID_MNU_ZOOM_WHOLE_PAGE"
+#define HID_OPTIONS_GRID "SVX_HID_OPTIONS_GRID"
+#define HID_PASSWORD "SVX_HID_PASSWORD"
+#define HID_POPUP_COLOR "SVX_HID_POPUP_COLOR"
+#define HID_POPUP_COLOR_CTRL "SVX_HID_POPUP_COLOR_CTRL"
+#define HID_POPUP_EXTRUSION_DEPTH "SVX_HID_POPUP_EXTRUSION_DEPTH"
+#define HID_POPUP_EXTRUSION_DIRECTION "SVX_HID_POPUP_EXTRUSION_DIRECTION"
+#define HID_POPUP_EXTRUSION_LIGHTING "SVX_HID_POPUP_EXTRUSION_LIGHTING"
+#define HID_POPUP_EXTRUSION_SURFACE "SVX_HID_POPUP_EXTRUSION_SURFACE"
+#define HID_POPUP_FONTWORK_ALIGN "SVX_HID_POPUP_FONTWORK_ALIGN"
+#define HID_POPUP_FONTWORK_CHARSPACE "SVX_HID_POPUP_FONTWORK_CHARSPACE"
+#define HID_POPUP_FRAME "SVX_HID_POPUP_FRAME"
+#define HID_POPUP_LINE "SVX_HID_POPUP_LINE"
+#define HID_POPUP_LINEEND "SVX_HID_POPUP_LINEEND"
+#define HID_POPUP_LINEEND_CTRL "SVX_HID_POPUP_LINEEND_CTRL"
+#define HID_REDLINING_FILTER_BTN_REF "SVX_HID_REDLINING_FILTER_BTN_REF"
+#define HID_REDLINING_FILTER_CB_ACTION "SVX_HID_REDLINING_FILTER_CB_ACTION"
+#define HID_REDLINING_FILTER_CB_AUTOR "SVX_HID_REDLINING_FILTER_CB_AUTOR"
+#define HID_REDLINING_FILTER_CB_COMMENT "SVX_HID_REDLINING_FILTER_CB_COMMENT"
+#define HID_REDLINING_FILTER_CB_DATE "SVX_HID_REDLINING_FILTER_CB_DATE"
+#define HID_REDLINING_FILTER_CB_RANGE "SVX_HID_REDLINING_FILTER_CB_RANGE"
+#define HID_REDLINING_FILTER_DF_DATE "SVX_HID_REDLINING_FILTER_DF_DATE"
+#define HID_REDLINING_FILTER_DF_DATE2 "SVX_HID_REDLINING_FILTER_DF_DATE2"
+#define HID_REDLINING_FILTER_ED_COMMENT "SVX_HID_REDLINING_FILTER_ED_COMMENT"
+#define HID_REDLINING_FILTER_ED_RANGE "SVX_HID_REDLINING_FILTER_ED_RANGE"
+#define HID_REDLINING_FILTER_IB_CLOCK "SVX_HID_REDLINING_FILTER_IB_CLOCK"
+#define HID_REDLINING_FILTER_IB_CLOCK2 "SVX_HID_REDLINING_FILTER_IB_CLOCK2"
+#define HID_REDLINING_FILTER_LB_ACTION "SVX_HID_REDLINING_FILTER_LB_ACTION"
+#define HID_REDLINING_FILTER_LB_AUTOR "SVX_HID_REDLINING_FILTER_LB_AUTOR"
+#define HID_REDLINING_FILTER_LB_DATE "SVX_HID_REDLINING_FILTER_LB_DATE"
+#define HID_REDLINING_FILTER_PAGE "SVX_HID_REDLINING_FILTER_PAGE"
+#define HID_REDLINING_FILTER_TF_DATE "SVX_HID_REDLINING_FILTER_TF_DATE"
+#define HID_REDLINING_FILTER_TF_DATE2 "SVX_HID_REDLINING_FILTER_TF_DATE2"
+#define HID_REDLINING_TABCONTROL "SVX_HID_REDLINING_TABCONTROL"
+#define HID_REDLINING_VIEW_DG_VIEW "SVX_HID_REDLINING_VIEW_DG_VIEW"
+#define HID_REDLINING_VIEW_DG_VIEW_HEADER "SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER"
+#define HID_REDLINING_VIEW_DG_VIEW_TABLE "SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE"
+#define HID_REDLINING_VIEW_PAGE "SVX_HID_REDLINING_VIEW_PAGE"
+#define HID_REDLINING_VIEW_PB_ACCEPT "SVX_HID_REDLINING_VIEW_PB_ACCEPT"
+#define HID_REDLINING_VIEW_PB_ACCEPTALL "SVX_HID_REDLINING_VIEW_PB_ACCEPTALL"
+#define HID_REDLINING_VIEW_PB_REJECT "SVX_HID_REDLINING_VIEW_PB_REJECT"
+#define HID_REDLINING_VIEW_PB_REJECTALL "SVX_HID_REDLINING_VIEW_PB_REJECTALL"
+#define HID_REDLINING_VIEW_PB_UNDO "SVX_HID_REDLINING_VIEW_PB_UNDO"
+#define HID_RUBY_DIALOG "SVX_HID_RUBY_DIALOG"
+#define HID_STYLE_LISTBOX "SVX_HID_STYLE_LISTBOX"
+#define HID_SVXTBX_ALIGNMENT "SVX_HID_SVXTBX_ALIGNMENT"
+#define HID_SVXTBX_DRAW "SVX_HID_SVXTBX_DRAW"
+#define HID_SVXTBX_UNDO_REDO_CTRL "SVX_HID_SVXTBX_UNDO_REDO_CTRL"
+#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE "SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE"
+#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER "SVX_HID_SVX_CHINESE_DICTIONARY_LB_HEADER"
+#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED"
+#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL"
+#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED"
+#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL"
+#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS "SVX_HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS"
+#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED"
+#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL"
+#define HID_SVX_MDLG_DOCRECOVERY_BROKEN "SVX_HID_SVX_MDLG_DOCRECOVERY_BROKEN"
+#define HID_SVX_MDLG_DOCRECOVERY_PROGR "SVX_HID_SVX_MDLG_DOCRECOVERY_PROGR"
+#define HID_SVX_MDLG_ERR_REP_OPTIONS "SVX_HID_SVX_MDLG_ERR_REP_OPTIONS"
+#define HID_SVX_MDLG_ERR_REP_PREVIEW "SVX_HID_SVX_MDLG_ERR_REP_PREVIEW"
+#define HID_SVX_TABDLG_DOCRECOVERY "SVX_HID_SVX_TABDLG_DOCRECOVERY"
+#define HID_SVX_TP_DOCRECOVERY_RECOVER "SVX_HID_SVX_TP_DOCRECOVERY_RECOVER"
+#define HID_SVX_TP_DOCRECOVERY_SAVE "SVX_HID_SVX_TP_DOCRECOVERY_SAVE"
+#define HID_SVX_TP_ERR_REP_SEND "SVX_HID_SVX_TP_ERR_REP_SEND"
+#define HID_SVX_TP_ERR_REP_WELCOME "SVX_HID_SVX_TP_ERR_REP_WELCOME"
-// -----------------------------------------------------------------------
-// Overrun check ---------------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_SVX_HID_END (HID_SVX_START+248)
-#if ACT_SVX_HID_END > HID_SVX_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_VALUESET_EXTRUSION_DIRECTION "SVX_HID_VALUESET_EXTRUSION_DIRECTION"
+#define HID_VALUESET_EXTRUSION_LIGHTING "SVX_HID_VALUESET_EXTRUSION_LIGHTING"
+#define HID_WIN_FONTWORK_ALIGN "SVX_HID_WIN_FONTWORK_ALIGN"
+#define HID_WIN_FONTWORK_CHARSPACE "SVX_HID_WIN_FONTWORK_CHARSPACE"
+#define HID_XMLSEC_CALL "SVX_HID_XMLSEC_CALL"
+#define HID_OFA_HYPERLINK_DLG "SVX_HID_OFA_HYPERLINK_DLG"
+#define HID_OFA_HYPERLINK_NAME "SVX_HID_OFA_HYPERLINK_NAME"
+#define HID_OFA_HYPERLINK_SEARCH "SVX_HID_OFA_HYPERLINK_SEARCH"
+#define HID_OFA_HYPERLINK_TARGET "SVX_HID_OFA_HYPERLINK_TARGET"
+#define HID_OFA_HYPERLINK_URL "SVX_HID_OFA_HYPERLINK_URL"
+#define HID_OFA_HYPERLINK_URL_TXT "SVX_HID_OFA_HYPERLINK_URL_TXT"
+#define HID_AUTOCORR_DLG "SVX_HID_AUTOCORR_DLG"
+#define HID_SVXCTL_MAIL_ATTACH "SVX_HID_SVXCTL_MAIL_ATTACH"
+#define HID_SVXDLG_REGISTRATION "SVX_HID_SVXDLG_REGISTRATION"
+#define HID_SVXDLG_TREE_BASE "SVX_HID_SVXDLG_TREE_BASE"
+#define HID_SVXDLG_TREE_CHART "SVX_HID_SVXDLG_TREE_CHART"
+#define HID_SVXDLG_TREE_FILTER "SVX_HID_SVXDLG_TREE_FILTER"
+#define HID_SVXDLG_TREE_LANGUAGE "SVX_HID_SVXDLG_TREE_LANGUAGE"
+#define HID_SVXWIN_MAIL_ATTACH "SVX_HID_SVXWIN_MAIL_ATTACH"
+#define HID_SVXWIN_MAIL_HEADER "SVX_HID_SVXWIN_MAIL_HEADER"
+#define HID_SVX_DLGFORMNEW "SVX_HID_SVX_DLGFORMNEW"
+#define HID_SVX_DLGTABNEW "SVX_HID_SVX_DLGTABNEW"
+#define HID_SVX_HYPERLINK "SVX_HID_SVX_HYPERLINK"
+#define HID_SVX_MAILATTACH_ASCII_CB "SVX_HID_SVX_MAILATTACH_ASCII_CB"
+#define HID_SVX_MAILATTACH_HTML_CB "SVX_HID_SVX_MAILATTACH_HTML_CB"
+#define HID_SVX_MAILATTACH_OFFICE_CB "SVX_HID_SVX_MAILATTACH_OFFICE_CB"
+#define HID_SVX_MAILATTACH_PRIORITY_LB "SVX_HID_SVX_MAILATTACH_PRIORITY_LB"
+#define HID_SVX_MAILATTACH_RECEIPT_CB "SVX_HID_SVX_MAILATTACH_RECEIPT_CB"
+#define HID_SVX_MAILATTACH_RTF_CB "SVX_HID_SVX_MAILATTACH_RTF_CB"
+#define HID_SVX_MAILHEAD_HEAD_WIN "SVX_HID_SVX_MAILHEAD_HEAD_WIN"
+#define HID_SVX_MAILHEAD_PRIORITY_LB "SVX_HID_SVX_MAILHEAD_PRIORITY_LB"
+#define HID_SVX_MAILHEAD_PROTOCOL_LB "SVX_HID_SVX_MAILHEAD_PROTOCOL_LB"
+#define HID_SVX_MAILHEAD_RCPT_CB "SVX_HID_SVX_MAILHEAD_RCPT_CB"
+#define HID_SVX_MAILHEAD_RCPT_ED "SVX_HID_SVX_MAILHEAD_RCPT_ED"
+#define HID_SVX_MAILHEAD_RCPT_LB "SVX_HID_SVX_MAILHEAD_RCPT_LB"
+#define HID_SVX_MAILHEAD_RECEIPT_CB "SVX_HID_SVX_MAILHEAD_RECEIPT_CB"
+#define HID_SVX_MAILHEAD_ROLE_LB "SVX_HID_SVX_MAILHEAD_ROLE_LB"
+#define HID_SVX_MAILHEAD_SUBJECT_ED "SVX_HID_SVX_MAILHEAD_SUBJECT_ED"
+#define HID_SVX_MAILMENU_ADDADDRESS "SVX_HID_SVX_MAILMENU_ADDADDRESS"
+#define HID_SVX_MAILMENU_COPYLINK "SVX_HID_SVX_MAILMENU_COPYLINK"
+#define HID_SVX_MAILMENU_DELETE "SVX_HID_SVX_MAILMENU_DELETE"
+#define HID_SVX_MAILMENU_FILE "SVX_HID_SVX_MAILMENU_FILE"
+#define HID_SVX_MAILMENU_OPEN "SVX_HID_SVX_MAILMENU_OPEN"
+#define HID_SVX_MAILMENU_RENAME "SVX_HID_SVX_MAILMENU_RENAME"
+#define HID_SVX_MAILMENU_SAVEAS "SVX_HID_SVX_MAILMENU_SAVEAS"
+#define HID_SVX_MAILMENU_SIG1 "SVX_HID_SVX_MAILMENU_SIG1"
+#define HID_SVX_MAILMENU_SIG2 "SVX_HID_SVX_MAILMENU_SIG2"
+#define HID_SVX_MAILMENU_SIG3 "SVX_HID_SVX_MAILMENU_SIG3"
+#define HID_SVX_MAILMENU_SIG4 "SVX_HID_SVX_MAILMENU_SIG4"
+#define HID_SVX_MAILTOOLBOX "SVX_HID_SVX_MAILTOOLBOX"
+#define HID_SVX_SENDMENU_ENCRYPT "SVX_HID_SVX_SENDMENU_ENCRYPT"
+#define HID_SVX_SENDMENU_PLAIN "SVX_HID_SVX_SENDMENU_PLAIN"
+#define HID_SVX_SENDMENU_SIGN "SVX_HID_SVX_SENDMENU_SIGN"
+#define HID_SVX_SENDMENU_SIGNANDENCRYPT "SVX_HID_SVX_SENDMENU_SIGNANDENCRYPT"
+#define HID_SVX_TP_APPEARANCE "SVX_HID_SVX_TP_APPEARANCE"
+#define HID_SVX_TP_DESKTOP "SVX_HID_SVX_TP_DESKTOP"
+#define HID_CT_THES_ALTERNATIVES "SVX_HID_CT_THES_ALTERNATIVES"
#endif
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 8dda799ab3..30d19ad230 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -805,7 +805,6 @@
#include "svtools/parhtml.hxx"
#include "svtools/parrtf.hxx"
#include "unotools/pathoptions.hxx"
-#include "svl/pickerhelper.hxx"
#include "svl/poolitem.hxx"
#include "unotools/printwarningoptions.hxx"
#include "svl/ptitem.hxx"
diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/pfiledlg.hxx
index c604769d61..b6f5ec7802 100644
--- a/svx/inc/pfiledlg.hxx
+++ b/svx/inc/pfiledlg.hxx
@@ -54,8 +54,6 @@ public:
static bool IsAvailable (USHORT nKind);
- // setting HelpId and/or context of FileDialogHelper
- void SetDialogHelpId( const sal_Int32 nHelpId );
void SetContext( sfx2::FileDialogHelper::Context eNewContext );
};
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 26cd56c2ef..07d56108b7 100644..100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -317,10 +317,6 @@
#define RID_SVXBMP_3D_FOCAL_LENGTH_09 (RID_SVX_START + 180)
#define RID_SVXBMP_3D_FOCAL_LENGTH_10 (RID_SVX_START + 181)
-// fuer ToolboxControls Alignment und Drawobjekte
-#define RID_SVXTBX_DRAW (RID_SVX_START + 189)
-#define RID_SVXTBX_ALIGNMENT (RID_SVX_START + 190)
-
// Ids fuer Autokorrektur
#define RID_SVX_AUTOCORR (RID_SVX_START + 192)
diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc
index 2008375dde..828ed6c124 100644
--- a/svx/inc/svx/exthelpid.hrc
+++ b/svx/inc/svx/exthelpid.hrc
@@ -28,8 +28,6 @@
#define _SVX_EXTHELPID_HRC
// include ---------------------------------------------------------------
-#include <svl/solar.hrc>
-
// these HIDs are used in SVX and also in other modules, mainly CUI
// the reason is that different controls have the same help texts assigned
// but are implemented in different libraries
@@ -37,19 +35,8 @@
// are moved to this exported (delivered) hrc file
// Help-Ids --------------------------------------------------------------
-#define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0)
-#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1)
-
-// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here!
-
-// -----------------------------------------------------------------------
-// Overrun check ---------------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_SVX_EXT_HID_END (HID_SVX_EXT0_START + 1)
-#if ACT_SVX_EXT_HID_END > HID_SVX_EXT0_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE"
+#define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE"
#endif
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index 6f313b4419..19cf26d3dc 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -172,7 +172,7 @@ public:
void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; }
const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; }
- void SetHeaderBarHelpId(ULONG nHelpId) {aHeaderBar.SetHelpId(nHelpId);}
+ void SetHeaderBarHelpId(const rtl::OString& rHelpId) {aHeaderBar.SetHelpId(rHelpId);}
};
diff --git a/svx/inc/svx/svxcommands.h b/svx/inc/svx/svxcommands.h
new file mode 100644
index 0000000000..01ff0bcd95
--- /dev/null
+++ b/svx/inc/svx/svxcommands.h
@@ -0,0 +1,604 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef SVX_SVXCOMMANDS_HRC
+#define SVX_SVXCOMMANDS_HRC
+
+#define CMD_SID_INET_DLG ".uno:InternetDialog"
+#define CMD_SID_FM_RECORD_ABSOLUTE ".uno:AbsoluteRecord"
+#define CMD_SID_FM_ADD_FIELD ".uno:AddField"
+#define CMD_SID_FM_ADDTABLE ".uno:AddTable"
+#define CMD_SID_OBJECT_ALIGN_CENTER ".uno:AlignCenter"
+#define CMD_SID_OBJECT_ALIGN_DOWN ".uno:AlignDown"
+#define CMD_SID_OBJECT_ALIGN_LEFT ".uno:ObjectAlignLeft"
+#define CMD_SID_ATTR_PARA_ADJUST ".uno:Alignment"
+#define CMD_SID_OBJECT_ALIGN_MIDDLE ".uno:AlignMiddle"
+#define CMD_SID_OBJECT_ALIGN_RIGHT ".uno:ObjectAlignRight"
+#define CMD_SID_OBJECT_ALIGN_UP ".uno:AlignUp"
+#define CMD_SID_DRAW_ARC ".uno:Arc"
+#define CMD_SID_3D_ASSIGN ".uno:Assign3D"
+#define CMD_SID_FM_AUTOCONTROLFOCUS ".uno:AutoControlFocus"
+#define CMD_SID_FM_AUTOFILTER ".uno:AutoFilter"
+#define CMD_SID_AUTOFORMAT ".uno:AutoFormat"
+#define CMD_SID_TABLE_STYLE ".uno:TableStyle"
+#define CMD_SID_TABLE_STYLE_SETTINGS ".uno:TableStyleSettings"
+#define CMD_SID_TABLEDESIGN ".uno:TableDesign"
+#define CMD_SID_BACKGROUND_COLOR ".uno:BackgroundColor"
+#define CMD_SID_ATTR_BRUSH ".uno:BackgroundPattern"
+#define CMD_SID_BACKGROUND_PATTERN ".uno:BackgroundPatternController"
+#define CMD_SID_DRAW_BEZIER_NOFILL ".uno:Bezier_Unfilled"
+#define CMD_SID_BEZIER_APPEND ".uno:BezierAppend"
+#define CMD_SID_BEZIER_CLOSE ".uno:BezierClose"
+#define CMD_SID_BEZIER_CONVERT ".uno:BezierConvert"
+#define CMD_SID_BEZIER_CUTLINE ".uno:BezierCutLine"
+#define CMD_SID_BEZIER_DELETE ".uno:BezierDelete"
+#define CMD_SID_BEZIER_EDGE ".uno:BezierEdge"
+#define CMD_SID_BEZIER_ELIMINATE_POINTS ".uno:BezierEliminatePoints"
+#define CMD_SID_DRAW_BEZIER_FILL ".uno:BezierFill"
+#define CMD_SID_BEZIER_INSERT ".uno:BezierInsert"
+#define CMD_SID_BEZIER_MOVE ".uno:BezierMove"
+#define CMD_SID_BEZIER_SMOOTH ".uno:BezierSmooth"
+#define CMD_SID_BEZIER_SYMMTR ".uno:BezierSymmetric"
+#define CMD_SID_BEZIERTO ".uno:BezierTo"
+#define CMD_SID_BMPMASK ".uno:BmpMask"
+#define CMD_SID_BMPMASK_EXEC ".uno:BmpMaskExec"
+#define CMD_SID_BMPMASK_PIPETTE ".uno:BmpMaskPipette"
+#define CMD_SID_ATTR_CHAR_WEIGHT ".uno:Bold"
+#define CMD_SID_ATTR_CHAR_LATIN_WEIGHT ".uno:BoldLatin"
+#define CMD_SID_ATTR_CHAR_CJK_WEIGHT ".uno:BoldCJK"
+#define CMD_SID_ATTR_CHAR_CTL_WEIGHT ".uno:BoldCTL"
+#define CMD_SID_BORDER_OBJECT ".uno:Border"
+#define CMD_SID_ATTR_BORDER_INNER ".uno:BorderInner"
+#define CMD_SID_ATTR_BORDER_OUTER ".uno:BorderOuter"
+#define CMD_SID_ATTR_BORDER ".uno:SetBorderStyle"
+#define CMD_SID_FRAME_TO_TOP ".uno:BringToFront"
+#define CMD_SID_DRAW_CAPTION ".uno:DrawCaption"
+#define CMD_SID_ATTR_CHAR_CASEMAP ".uno:CaseMap"
+#define CMD_SID_ATTR_PARA_ADJUST_CENTER ".uno:CenterPara"
+#define CMD_SID_TRANSLITERATE_FULLWIDTH ".uno:ChangeCaseToFullWidth"
+#define CMD_SID_TRANSLITERATE_HALFWIDTH ".uno:ChangeCaseToHalfWidth"
+#define CMD_SID_TRANSLITERATE_HIRAGANA ".uno:ChangeCaseToHiragana"
+#define CMD_SID_TRANSLITERATE_KATAGANA ".uno:ChangeCaseToKatakana"
+#define CMD_SID_TRANSLITERATE_LOWER ".uno:ChangeCaseToLower"
+#define CMD_SID_TRANSLITERATE_UPPER ".uno:ChangeCaseToUpper"
+#define CMD_SID_FM_CHANGECONTROLTYPE ".uno:ChangeControlType"
+#define CMD_SID_ATTR_CHAR_FONT ".uno:CharFontName"
+#define CMD_SID_ATTR_CHAR_LATIN_FONT ".uno:CharFontNameLatin"
+#define CMD_SID_ATTR_CHAR_CJK_FONT ".uno:CharFontNameCJK"
+#define CMD_SID_ATTR_CHAR_CTL_FONT ".uno:CharFontNameCTL"
+#define CMD_SID_INSERT_CHECKBOX ".uno:Checkbox"
+#define CMD_SID_FM_CHECKBOX ".uno:CheckBox"
+#define CMD_SID_CHOOSE_CONTROLS ".uno:ChooseControls"
+#define CMD_SID_CHOOSE_POLYGON ".uno:ChoosePolygon"
+#define CMD_SID_DRAW_CIRCLE ".uno:Circle"
+#define CMD_SID_DRAW_CIRCLE_NOFILL ".uno:Circle_Unfilled"
+#define CMD_SID_DRAW_CIRCLEARC ".uno:CircleArc"
+#define CMD_SID_DRAW_CIRCLECUT ".uno:CircleCut"
+#define CMD_SID_DRAW_CIRCLECUT_NOFILL ".uno:CircleCut_Unfilled"
+#define CMD_SID_DRAW_CIRCLEPIE ".uno:CirclePie"
+#define CMD_SID_DRAW_CIRCLEPIE_NOFILL ".uno:CirclePie_Unfilled"
+#define CMD_SID_OUTLINE_DELETEALL ".uno:ClearOutline"
+#define CMD_SID_ATTR_CHAR_COLOR ".uno:Color"
+#define CMD_SID_COLOR_CONTROL ".uno:ColorControl"
+#define CMD_SID_FM_COMBOBOX ".uno:ComboBox"
+#define CMD_SID_FM_NAVIGATIONBAR ".uno:NavigationBar"
+#define CMD_SID_INSERT_COMBOBOX ".uno:Combobox"
+#define CMD_SID_FM_CONFIG ".uno:Config"
+#define CMD_SID_FM_MORE_CONTROLS ".uno:MoreControls"
+#define CMD_SID_FM_FORM_DESIGN_TOOLS ".uno:FormDesignTools"
+#define CMD_SID_CONTOUR_DLG ".uno:ContourDialog"
+#define CMD_SID_CONTOUR_EXEC ".uno:ContourExecute"
+#define CMD_SID_FM_CTL_PROPERTIES ".uno:ControlProperties"
+#define CMD_SID_FM_CONVERTTO_BUTTON ".uno:ConvertToButton"
+#define CMD_SID_FM_CONVERTTO_CHECKBOX ".uno:ConvertToCheckBox"
+#define CMD_SID_FM_CONVERTTO_COMBOBOX ".uno:ConvertToCombo"
+#define CMD_SID_FM_CONVERTTO_CURRENCY ".uno:ConvertToCurrency"
+#define CMD_SID_FM_CONVERTTO_DATE ".uno:ConvertToDate"
+#define CMD_SID_FM_CONVERTTO_EDIT ".uno:ConvertToEdit"
+#define CMD_SID_FM_CONVERTTO_FILECONTROL ".uno:ConvertToFileControl"
+#define CMD_SID_FM_CONVERTTO_FIXEDTEXT ".uno:ConvertToFixed"
+#define CMD_SID_FM_CONVERTTO_FORMATTED ".uno:ConvertToFormatted"
+#define CMD_SID_FM_CONVERTTO_SCROLLBAR ".uno:ConvertToScrollBar"
+#define CMD_SID_FM_CONVERTTO_SPINBUTTON ".uno:ConvertToSpinButton"
+#define CMD_SID_FM_CONVERTTO_GROUPBOX ".uno:ConvertToGroup"
+#define CMD_SID_FM_CONVERTTO_IMAGEBUTTON ".uno:ConvertToImageBtn"
+#define CMD_SID_FM_CONVERTTO_IMAGECONTROL ".uno:ConvertToImageControl"
+#define CMD_SID_FM_CONVERTTO_LISTBOX ".uno:ConvertToList"
+#define CMD_SID_FM_CONVERTTO_NUMERIC ".uno:ConvertToNumeric"
+#define CMD_SID_FM_CONVERTTO_PATTERN ".uno:ConvertToPattern"
+#define CMD_SID_FM_CONVERTTO_RADIOBUTTON ".uno:ConvertToRadio"
+#define CMD_SID_FM_CONVERTTO_TIME ".uno:ConvertToTime"
+#define CMD_SID_FM_CONVERTTO_NAVIGATIONBAR ".uno:ConvertToNavigationBar"
+#define CMD_SID_FM_COUNTALL ".uno:CountAll"
+#define CMD_SID_FM_CREATE_CONTROL ".uno:CreateControl"
+#define CMD_SID_INSERT_CURRENCYFIELD ".uno:InsertCurrencyField"
+#define CMD_SID_FM_CURRENCYFIELD ".uno:CurrencyField"
+#define CMD_SID_DASH ".uno:Dash"
+#define CMD_SID_INSERT_DATEFIELD ".uno:AddDateField"
+#define CMD_SID_FM_DATEFIELD ".uno:DateField"
+#define CMD_FN_NUM_BULLET_ON ".uno:DefaultBullet"
+#define CMD_SID_FM_RECORD_DELETE ".uno:DeleteRecord"
+#define CMD_SID_FM_DESIGN_MODE ".uno:SwitchControlDesignMode"
+#define CMD_SID_DISTRIBUTE_DLG ".uno:DistributeSelection"
+#define CMD_SID_DRAW_SELECT ".uno:DrawSelect"
+#define CMD_SID_INSERT_DRAW ".uno:InsertDraw"
+#define CMD_SID_DSBROWSER_EXPLORER ".uno:DSBrowserExplorer"
+#define CMD_SID_FM_EDIT ".uno:Edit"
+#define CMD_SID_INSERT_EDIT ".uno:InsertEdit"
+#define CMD_SID_DRAW_ELLIPSE ".uno:Ellipse"
+#define CMD_SID_DRAW_ELLIPSE_NOFILL ".uno:Ellipse_Unfilled"
+#define CMD_SID_DRAW_ELLIPSECUT ".uno:EllipseCut"
+#define CMD_SID_DRAW_ELLIPSECUT_NOFILL ".uno:EllipseCut_Unfilled"
+#define CMD_SID_ENTER_GROUP ".uno:EnterGroup"
+#define CMD_SID_ATTR_CHAR_ESCAPEMENT ".uno:Escapement"
+#define CMD_SID_FM_FIELDS_CONTROL ".uno:FieldController"
+#define CMD_SID_FM_FILECONTROL ".uno:FileControl"
+#define CMD_SID_INSERT_FILECONTROL ".uno:InsertFileControl"
+#define CMD_SID_INSERT_TREECONTROL ".uno:InsertTreeControl"
+#define CMD_SID_ATTR_FILL_BITMAP ".uno:FillBitmap"
+#define CMD_SID_ATTR_FILL_COLOR ".uno:FillColor"
+#define CMD_SID_ATTR_FILL_GRADIENT ".uno:FillGradient"
+#define CMD_SID_ATTR_FILL_HATCH ".uno:FillHatch"
+#define CMD_SID_ATTR_FILL_STYLE ".uno:FillStyle"
+#define CMD_SID_FM_FILTERCRIT ".uno:FilterCrit"
+#define CMD_SID_FM_RECORD_FIRST ".uno:FirstRecord"
+#define CMD_SID_ATTR_FLASH ".uno:Flash"
+#define CMD_SID_FM_FMEXPLORER_CONTROL ".uno:FmExplorerController"
+#define CMD_SID_FM_FILTER_NAVIGATOR_CONTROL ".uno:FmFilterNavigatorController"
+#define CMD_SID_CHAR_DLG ".uno:FontDialog"
+#define CMD_SID_ATTR_CHAR_FONTHEIGHT ".uno:FontHeight"
+#define CMD_SID_ATTR_CHAR_LATIN_FONTHEIGHT ".uno:FontHeighLatin"
+#define CMD_SID_ATTR_CHAR_CJK_FONTHEIGHT ".uno:FontHeightCJK"
+#define CMD_SID_ATTR_CHAR_CTL_FONTHEIGHT ".uno:FontHeightCTL"
+#define CMD_SID_FONTWORK ".uno:FontWork"
+#define CMD_SID_FORMTEXT_ADJUST ".uno:FontWorkTextAdjust"
+#define CMD_SID_FORMTEXT_STDFORM ".uno:FontWorkTextClearAttributes"
+#define CMD_SID_FORMTEXT_DISTANCE ".uno:FontWorkTextDistance"
+#define CMD_SID_FORMTEXT_MIRROR ".uno:FontWorkTextMirror"
+#define CMD_SID_FORMTEXT_OUTLINE ".uno:FontWorkTextOutline"
+#define CMD_SID_FORMTEXT_SHADOW ".uno:FontWorkTextShadow"
+#define CMD_SID_FORMTEXT_SHDWCOLOR ".uno:FontWorkTextShadowColor"
+#define CMD_SID_FORMTEXT_SHDWXVAL ".uno:FontWorkTextShadowXVal"
+#define CMD_SID_FORMTEXT_SHDWYVAL ".uno:FontWorkTextShadowYVal"
+#define CMD_SID_FORMTEXT_START ".uno:FontWorkTextStart"
+#define CMD_SID_FORMTEXT_STYLE ".uno:FontWorkTextStyle"
+#define CMD_SID_ATTRIBUTES_AREA ".uno:FormatArea"
+#define CMD_SID_FORMTEXT_HIDEFORM ".uno:FormatFontWorkClose"
+#define CMD_SID_GROUP ".uno:FormatGroup"
+#define CMD_SID_ATTRIBUTES_LINE ".uno:FormatLine"
+#define CMD_SID_FM_FORMATTEDFIELD ".uno:FormattedField"
+#define CMD_SID_FM_SCROLLBAR ".uno:ScrollBar"
+#define CMD_SID_FM_SPINBUTTON ".uno:SpinButton"
+#define CMD_SID_INSERT_FORMATTEDFIELD ".uno:InsertFormattedField"
+#define CMD_SID_UNGROUP ".uno:FormatUngroup"
+#define CMD_SID_FM_FILTER_START ".uno:FormFilter"
+#define CMD_SID_FM_FORM_FILTERED ".uno:FormFiltered"
+#define CMD_SID_FM_FILTER_EXECUTE ".uno:FormFilterExecute"
+#define CMD_SID_FM_FILTER_EXIT ".uno:FormFilterExit"
+#define CMD_SID_FM_FILTER_NAVIGATOR ".uno:FormFilterNavigator"
+#define CMD_SID_FM_PROPERTIES ".uno:FormProperties"
+#define CMD_SID_DRAW_FREELINE ".uno:Freeline"
+#define CMD_SID_DRAW_FREELINE_NOFILL ".uno:Freeline_Unfilled"
+#define CMD_SID_ATTR_AUTO_COLOR_INVALID ".uno:AutoColorInvalid"
+#define CMD_SID_GALLERY ".uno:Gallery"
+#define CMD_SID_GALLERY_ENABLE_ADDCOPY ".uno:GalleryEnableAddCopy"
+#define CMD_SID_GETREDOSTRINGS ".uno:GetRedoStrings"
+#define CMD_SID_GETUNDOSTRINGS ".uno:GetUndoStrings"
+#define CMD_SID_ATTR_GRAF_CROP ".uno:GrafAttrCrop"
+#define CMD_SID_ATTR_GRAF_BLUE ".uno:GrafBlue"
+#define CMD_SID_ATTR_GRAF_CONTRAST ".uno:GrafContrast"
+#define CMD_SID_ATTR_GRAF_GAMMA ".uno:GrafGamma"
+#define CMD_SID_ATTR_GRAF_GREEN ".uno:GrafGreen"
+#define CMD_SID_ATTR_GRAF_INVERT ".uno:GrafInvert"
+#define CMD_SID_ATTR_GRAF_LUMINANCE ".uno:GrafLuminance"
+#define CMD_SID_ATTR_GRAF_MODE ".uno:GrafMode"
+#define CMD_SID_ATTR_GRAF_RED ".uno:GrafRed"
+#define CMD_SID_ATTR_GRAF_TRANSPARENCE ".uno:GrafTransparence"
+#define CMD_SID_GRFFILTER_INVERT ".uno:GraphicFilterInvert"
+#define CMD_SID_GRFFILTER_MOSAIC ".uno:GraphicFilterMosaic"
+#define CMD_SID_GRFFILTER_POPART ".uno:GraphicFilterPopart"
+#define CMD_SID_GRFFILTER_POSTER ".uno:GraphicFilterPoster"
+#define CMD_SID_GRFFILTER_EMBOSS ".uno:GraphicFilterRelief"
+#define CMD_SID_GRFFILTER_REMOVENOISE ".uno:GraphicFilterRemoveNoise"
+#define CMD_SID_GRFFILTER_SEPIA ".uno:GraphicFilterSepia"
+#define CMD_SID_GRFFILTER_SHARPEN ".uno:GraphicFilterSharpen"
+#define CMD_SID_GRFFILTER_SMOOTH ".uno:GraphicFilterSmooth"
+#define CMD_SID_GRFFILTER_SOBEL ".uno:GraphicFilterSobel"
+#define CMD_SID_GRFFILTER_SOLARIZE ".uno:GraphicFilterSolarize"
+#define CMD_SID_GRFFILTER ".uno:GraphicFilterToolbox"
+#define CMD_SID_FM_DBGRID ".uno:Grid"
+#define CMD_SID_GRID_USE ".uno:GridUse"
+#define CMD_SID_GRID_VISIBLE ".uno:GridVisible"
+#define CMD_SID_OUTLINE_MAKE ".uno:Group"
+#define CMD_SID_FM_GROUPBOX ".uno:GroupBox"
+#define CMD_SID_INSERT_GROUPBOX ".uno:Groupbox"
+#define CMD_SID_RULER_LR_MIN_MAX ".uno:HeaderFooterBorder"
+#define CMD_SID_HELPLINES_MOVE ".uno:HelplinesMove"
+#define CMD_SID_INSERT_HFIXEDLINE ".uno:HFixedLine"
+#define CMD_SID_OUTLINE_HIDE ".uno:HideDetail"
+#define CMD_SID_INSERT_HSCROLLBAR ".uno:HScrollbar"
+#define CMD_SID_HYPERLINK_GETLINK ".uno:Hyperlink"
+#define CMD_SID_FM_IMAGEBUTTON ".uno:Imagebutton"
+#define CMD_SID_FM_IMAGECONTROL ".uno:ImageControl"
+#define CMD_SID_INSERT_IMAGECONTROL ".uno:InsertImageControl"
+#define CMD_SID_IMAP ".uno:ImageMapDialog"
+#define CMD_SID_IMAP_EXEC ".uno:ImageMapExecute"
+#define CMD_SID_3D_INIT ".uno:Init3D"
+#define CMD_SID_OBJECTRESIZE ".uno:InPlaceObjectResize"
+#define CMD_SID_ENTER_STRING ".uno:EnterString"
+#define CMD_SID_INSERT_POSTIT ".uno:InsertAnnotation"
+#define CMD_SID_SHOW_POSTIT ".uno:ShowAnnotations"
+#define CMD_SID_REPLYTO_POSTIT ".uno:ReplyToAnnotation"
+#define CMD_SID_DELETE_POSTIT ".uno:DeleteAnnotation"
+#define CMD_SID_DELETEALL_POSTIT ".uno:DeleteAllAnnotation"
+#define CMD_SID_DELETEALLBYAUTHOR_POSTIT ".uno:DeleteAllAnnotationByAuthor"
+#define CMD_SID_NEXT_POSTIT ".uno:NextAnnotation"
+#define CMD_SID_PREVIOUS_POSTIT ".uno:PreviousAnnotation"
+#define CMD_SID_INSERT_APPLET ".uno:InsertApplet"
+#define CMD_SID_GALLERY_FORMATS ".uno:InsertGalleryPic"
+#define CMD_SID_INSERT_GRAPHIC ".uno:InsertGraphic"
+#define CMD_SID_INSERT_IMAGE ".uno:InsertImage"
+#define CMD_SID_INSERT_MATH ".uno:InsertMath"
+#define CMD_SID_ATTR_INSERT ".uno:InsertMode"
+#define CMD_FN_NUM_NUMBERING_ON ".uno:DefaultNumbering"
+#define CMD_SID_INSERT_OBJECT ".uno:InsertObject"
+#define CMD_SID_INSERT_DIAGRAM ".uno:InsertObjectChart"
+#define CMD_SID_INSERT_PLUGIN ".uno:InsertPlugin"
+#define CMD_SID_INSERT_SOUND ".uno:InsertSound"
+#define CMD_SID_CHARMAP ".uno:InsertSymbol"
+#define CMD_SID_ATTR_TABLE ".uno:InsertSpreadsheet"
+#define CMD_SID_INSERT_TABLE ".uno:InsertTable"
+#define CMD_SID_INSERT_FRAME ".uno:InsertTextFrame"
+#define CMD_SID_INSERT_VIDEO ".uno:InsertVideo"
+#define CMD_SID_POLY_INTERSECT ".uno:Intersect"
+#define CMD_SID_ATTR_CHAR_POSTURE ".uno:Italic"
+#define CMD_SID_ATTR_CHAR_LATIN_POSTURE ".uno:ItalicLatin"
+#define CMD_SID_ATTR_CHAR_CJK_POSTURE ".uno:ItalicCJK"
+#define CMD_SID_ATTR_CHAR_CTL_POSTURE ".uno:ItalicCTL"
+#define CMD_SID_ATTR_PARA_ADJUST_BLOCK ".uno:JustifyPara"
+#define CMD_SID_INSERT_FIXEDTEXT ".uno:InsertFixedText"
+#define CMD_SID_FM_FIXEDTEXT ".uno:Label"
+#define CMD_SID_ATTR_CHAR_LANGUAGE ".uno:Language"
+#define CMD_SID_ATTR_CHAR_LATIN_LANGUAGE ".uno:LanguageLatin"
+#define CMD_SID_FM_RECORD_LAST ".uno:LastRecord"
+#define CMD_SID_FM_LEAVE_CREATE ".uno:LeaveFMCreateMode"
+#define CMD_SID_LEAVE_GROUP ".uno:LeaveGroup"
+#define CMD_SID_ATTR_PARA_ADJUST_LEFT ".uno:LeftPara"
+#define CMD_SID_ATTR_LRSPACE ".uno:LeftRightMargin"
+#define CMD_SID_ATTR_PARA_LRSPACE ".uno:LeftRightParaMargin"
+#define CMD_SID_ATTR_PARA_LRSPACE_VERTICAL ".uno:LeftRightParaMargin_Vertical"
+#define CMD_SID_DRAW_LINE ".uno:Line"
+#define CMD_SID_DRAW_XLINE ".uno:Line_Diagonal"
+#define CMD_SID_FRAME_LINECOLOR ".uno:FrameLineColor"
+#define CMD_SID_ATTR_LINE_DASH ".uno:LineDash"
+#define CMD_SID_ATTR_LINEEND_STYLE ".uno:LineEndStyle"
+#define CMD_SID_ATTR_PARA_LINESPACE ".uno:LineSpacing"
+#define CMD_SID_FRAME_LINESTYLE ".uno:LineStyle"
+#define CMD_SID_ATTR_LINE_WIDTH ".uno:LineWidth"
+#define CMD_SID_FM_LISTBOX ".uno:ListBox"
+#define CMD_SID_INSERT_LISTBOX ".uno:InsertListbox"
+#define CMD_SID_POLY_MERGE ".uno:Merge"
+#define CMD_SID_BASICIDE_NEWJAVAMODULE ".uno:NewJavaModule"
+#define CMD_SID_FM_RECORD_NEW ".uno:NewRecord"
+#define CMD_SID_FM_RECORD_NEXT ".uno:NextRecord"
+#define CMD_SID_FM_NUMERICFIELD ".uno:NumericField"
+#define CMD_SID_INSERT_NUMERICFIELD ".uno:InsertNumericField"
+#define CMD_SID_OBJECT_ALIGN ".uno:ObjectAlign"
+#define CMD_SID_FRAME_DOWN ".uno:ObjectBackOne"
+#define CMD_SID_FRAME_UP ".uno:ObjectForwardOne"
+#define CMD_SID_FM_OPEN_READONLY ".uno:OpenReadOnly"
+#define CMD_SID_FM_ORDERCRIT ".uno:OrderCrit"
+#define CMD_SID_ATTR_PARA_ORPHANS ".uno:Orphan"
+#define CMD_SID_OUTLINE_BULLET ".uno:OutlineBullet"
+#define CMD_SID_OUTLINE_COLLAPSE ".uno:OutlineCollapse"
+#define CMD_SID_OUTLINE_COLLAPSE_ALL ".uno:OutlineCollapseAll"
+#define CMD_SID_OUTLINE_DOWN ".uno:OutlineDown"
+#define CMD_SID_OUTLINE_EXPAND ".uno:OutlineExpand"
+#define CMD_SID_OUTLINE_EXPAND_ALL ".uno:OutlineExpandAll"
+#define CMD_SID_ATTR_CHAR_CONTOUR ".uno:OutlineFont"
+#define CMD_SID_OUTLINE_FORMAT ".uno:OutlineFormat"
+#define CMD_SID_OUTLINE_LEFT ".uno:OutlineLeft"
+#define CMD_SID_OUTLINE_RIGHT ".uno:OutlineRight"
+#define CMD_SID_OUTLINE_UP ".uno:OutlineUp"
+#define CMD_SID_ATTR_PARA_PAGEBREAK ".uno:Pagebreak"
+#define CMD_SID_ATTR_PAGE_PAPERBIN ".uno:PagePaperBin"
+#define CMD_SID_ATTR_PAGE_SIZE ".uno:AttributePageSize"
+#define CMD_SID_ATTR_PARA_MODEL ".uno:AttributeParaModel"
+#define CMD_SID_ATTR_PAGE ".uno:AttributePage"
+#define CMD_SID_ATTR_CHAR_AUTOKERN ".uno:PairKerning"
+#define CMD_SID_PARA_DLG ".uno:ParagraphDialog"
+#define CMD_SID_ATTR_PARA_KEEP ".uno:ParaKeepTogether"
+#define CMD_SID_ATTR_PARA_SPLIT ".uno:ParaSplit"
+#define CMD_SID_INSERT_PATTERNFIELD ".uno:InsertPatternField"
+#define CMD_SID_FM_PATTERNFIELD ".uno:PatternField"
+#define CMD_SID_DRAW_PIE ".uno:Pie"
+#define CMD_SID_DRAW_PIE_NOFILL ".uno:Pie_Unfilled"
+#define CMD_SID_POLY_FORMEN ".uno:PolyFormen"
+#define CMD_SID_DRAW_XPOLYGON ".uno:Polygon_Diagonal"
+#define CMD_SID_DRAW_XPOLYGON_NOFILL ".uno:Polygon_Diagonal_Unfilled"
+#define CMD_SID_DRAW_POLYGON_NOFILL ".uno:Polygon_Unfilled"
+#define CMD_SID_ATTR_POSITION ".uno:Position"
+#define CMD_SID_INSERT_PREVIEW ".uno:Preview"
+#define CMD_SID_FM_RECORD_PREV ".uno:PrevRecord"
+#define CMD_SID_INSERT_PROGRESSBAR ".uno:ProgressBar"
+#define CMD_SID_FM_PROPERTY_CONTROL ".uno:PropertyController"
+#define CMD_SID_FM_PUSHBUTTON ".uno:Pushbutton"
+#define CMD_SID_INSERT_PUSHBUTTON ".uno:InsertPushbutton"
+#define CMD_SID_INSERT_RADIOBUTTON ".uno:Radiobutton"
+#define CMD_SID_FM_RADIOBUTTON ".uno:RadioButton"
+#define CMD_SID_READONLY_MODE ".uno:ReadOnlyMode"
+#define CMD_SID_FM_RECORD_FROM_TEXT ".uno:RecFromText"
+#define CMD_SID_FM_RECORD_SAVE ".uno:RecSave"
+#define CMD_SID_FM_SEARCH ".uno:RecSearch"
+#define CMD_SID_DRAW_RECT ".uno:Rect"
+#define CMD_SID_DRAW_RECT_ROUND ".uno:Rect_Rounded"
+#define CMD_SID_DRAW_RECT_ROUND_NOFILL ".uno:Rect_Rounded_Unfilled"
+#define CMD_SID_DRAW_RECT_NOFILL ".uno:Rect_Unfilled"
+#define CMD_SID_FM_RECORD_TEXT ".uno:RecText"
+#define CMD_SID_FM_RECORD_TOTAL ".uno:RecTotal"
+#define CMD_SID_FM_RECORD_UNDO ".uno:RecUndo"
+#define CMD_SID_FM_REFRESH ".uno:Refresh"
+#define CMD_SID_FM_REFRESH_FORM_CONTROL ".uno:RefreshFormControl"
+#define CMD_SID_FM_FILTER_REMOVE ".uno:RemoveFilter"
+#define CMD_SID_FM_REMOVE_FILTER_SORT ".uno:RemoveFilterSort"
+#define CMD_FID_SEARCH_REPLACESET ".uno:ReplaceSet"
+#define CMD_SID_ATTR_PARA_ADJUST_RIGHT ".uno:RightPara"
+#define CMD_SID_RULER_BORDER_DISTANCE ".uno:RulerBorderDistance"
+#define CMD_SID_RULER_BORDERS ".uno:RulerBorders"
+#define CMD_SID_RULER_BORDERS_VERTICAL ".uno:RulerBordersVertical"
+#define CMD_SID_RULER_NULL_OFFSET ".uno:RulerNullOffset"
+#define CMD_SID_RULER_PAGE_POS ".uno:RulerPagePos"
+#define CMD_SID_RULER_PROTECT ".uno:RulerProtect"
+#define CMD_SID_FM_EXECUTE ".uno:SbaExecuteSql"
+#define CMD_SID_FM_NATIVESQL ".uno:SbaNativeSql"
+#define CMD_SID_SCAN ".uno:Scan"
+#define CMD_SID_SC_EDITOPTIONS ".uno:ScEditOptions"
+#define CMD_SID_SCH_EDITOPTIONS ".uno:SchEditOptions"
+#define CMD_SID_SD_EDITOPTIONS ".uno:SdEditOptions"
+#define CMD_SID_SD_GRAPHIC_OPTIONS ".uno:SdGraphicOptions"
+#define CMD_FID_SEARCH_OFF ".uno:SearchOff"
+#define CMD_FID_SEARCH_ON ".uno:SearchOn"
+#define CMD_FID_SEARCH_SEARCHSET ".uno:SearchSet"
+#define CMD_SID_SELECT ".uno:Select"
+#define CMD_SID_FRAME_TO_BOTTOM ".uno:SendToBack"
+#define CMD_SID_SET_DEFAULT ".uno:SetDefault"
+#define CMD_SID_HYPERLINK_SETLINK ".uno:SetHyperlink"
+#define CMD_SID_ATTR_PARA_HYPHENZONE ".uno:SetHyphenZone"
+#define CMD_SID_ATTR_LONG_LRSPACE ".uno:SetLongLeftRightMargin"
+#define CMD_SID_ATTR_LONG_ULSPACE ".uno:SetLongTopBottomMargin"
+#define CMD_SID_OBJECT_HELL ".uno:SetObjectToBackground"
+#define CMD_SID_OBJECT_HEAVEN ".uno:SetObjectToForeground"
+#define CMD_SID_ATTR_PAGE_MAXSIZE ".uno:SetPageMaxSize"
+#define CMD_SID_ATTR_BORDER_SHADOW ".uno:BorderShadow"
+#define CMD_SID_ATTR_FILL_SHADOW ".uno:FillShadow"
+#define CMD_SID_ATTR_CHAR_SHADOWED ".uno:Shadowed"
+#define CMD_SID_OUTLINE_SHOW ".uno:ShowDetail"
+#define CMD_SID_FM_SHOW_FMEXPLORER ".uno:ShowFmExplorer"
+#define CMD_SID_SHOW_ITEMBROWSER ".uno:ShowItemBrowser"
+#define CMD_SID_SHOW_PROPERTYBROWSER ".uno:ShowPropBrowser"
+#define CMD_SID_FM_SHOW_PROPERTIES ".uno:ShowProperties"
+#define CMD_SID_FM_SHOW_PROPERTY_BROWSER ".uno:ShowPropertyBrowser"
+#define CMD_SID_RULER ".uno:ShowRuler"
+#define CMD_SID_SIM_EDITOPTIONS ".uno:SimEditOptions"
+#define CMD_SID_ATTR_SIZE ".uno:Size"
+#define CMD_SID_SM_EDITOPTIONS ".uno:SmEditOptions"
+#define CMD_SID_FM_SORTDOWN ".uno:SortDown"
+#define CMD_SID_FM_SORTUP ".uno:Sortup"
+#define CMD_SID_ATTR_PARA_LINESPACE_10 ".uno:SpacePara1"
+#define CMD_SID_ATTR_PARA_LINESPACE_15 ".uno:SpacePara15"
+#define CMD_SID_ATTR_PARA_LINESPACE_20 ".uno:SpacePara2"
+#define CMD_SID_ATTR_CHAR_KERNING ".uno:Spacing"
+#define CMD_SID_AUTOSPELL_CHECK ".uno:SpellOnline"
+#define CMD_SID_INSERT_SPINBUTTON ".uno:Spinbutton"
+#define CMD_SID_DRAW_SQUARE ".uno:Square"
+#define CMD_SID_DRAW_SQUARE_ROUND ".uno:Square_Rounded"
+#define CMD_SID_DRAW_SQUARE_ROUND_NOFILL ".uno:Square_Rounded_Unfilled"
+#define CMD_SID_DRAW_SQUARE_NOFILL ".uno:Square_Unfilled"
+#define CMD_SID_3D_STATE ".uno:State3D"
+#define CMD_SID_ATTR_CHAR_STRIKEOUT ".uno:Strikeout"
+#define CMD_SID_SET_SUB_SCRIPT ".uno:SubScript"
+#define CMD_SID_POLY_SUBSTRACT ".uno:Substract"
+#define CMD_SID_SET_SUPER_SCRIPT ".uno:SuperScript"
+#define CMD_SID_SW_EDITOPTIONS ".uno:SwEditOptions"
+#define CMD_SID_FM_TAB_DIALOG ".uno:TabDialog"
+#define CMD_SID_ATTR_TABSTOP ".uno:Tabstops"
+#define CMD_SID_ATTR_TABSTOP_VERTICAL ".uno:TabstopsVertical"
+#define CMD_SID_DIALOG_TESTMODE ".uno:TestMode"
+#define CMD_SID_ATTR_CHAR ".uno:Text"
+#define CMD_SID_DRAW_TEXT ".uno:DrawText"
+#define CMD_SID_DRAW_TEXT_MARQUEE ".uno:Text_Marquee"
+#define CMD_SID_TEXTDIRECTION_LEFT_TO_RIGHT ".uno:TextdirectionLeftToRight"
+#define CMD_SID_TEXTDIRECTION_TOP_TO_BOTTOM ".uno:TextdirectionTopToBottom"
+#define CMD_SID_ATTR_TEXT_FITTOSIZE ".uno:TextFitToSize"
+#define CMD_SID_THESAURUS ".uno:ThesaurusDialog"
+#define CMD_SID_INSERT_TIMEFIELD ".uno:InsertTimeField"
+#define CMD_SID_FM_TIMEFIELD ".uno:TimeField"
+#define CMD_SID_BEZIER_EDIT ".uno:ToggleObjectBezierMode"
+#define CMD_SID_OBJECT_ROTATE ".uno:ToggleObjectRotateMode"
+#define CMD_SID_TEXTEDIT ".uno:ToolEdit"
+#define CMD_SID_OBJECT_SELECT ".uno:SelectObject"
+#define CMD_SID_ATTR_ULSPACE ".uno:TopBottomMargin"
+#define CMD_SID_ATTR_TRANSFORM ".uno:TransformDialog"
+#define CMD_SID_TWAIN_SELECT ".uno:TwainSelect"
+#define CMD_SID_TWAIN_TRANSFER ".uno:TwainTransfer"
+#define CMD_SID_ATTR_CHAR_UNDERLINE ".uno:Underline"
+#define CMD_SID_ATTR_CHAR_OVERLINE ".uno:Overline"
+#define CMD_SID_OUTLINE_REMOVE ".uno:Ungroup"
+#define CMD_SID_INSERT_URLBUTTON ".uno:URLButton"
+#define CMD_SID_FM_USE_WIZARDS ".uno:UseWizards"
+#define CMD_SID_DRAW_CAPTION_VERTICAL ".uno:VerticalCaption"
+#define CMD_SID_DRAW_TEXT_VERTICAL ".uno:VerticalText"
+#define CMD_SID_INSERT_VFIXEDLINE ".uno:VFixedLine"
+#define CMD_SID_FM_VIEW_AS_GRID ".uno:ViewFormAsGrid"
+#define CMD_SID_INSERT_VSCROLLBAR ".uno:VScrollbar"
+#define CMD_SID_ATTR_PARA_WIDOWS ".uno:Widow"
+#define CMD_SID_3D_WIN ".uno:Window3D"
+#define CMD_SID_ATTR_CHAR_WORDLINEMODE ".uno:WordMode"
+#define CMD_SID_ATTR_LINE_COLOR ".uno:XLineColor"
+#define CMD_SID_ATTR_LINE_STYLE ".uno:XLineStyle"
+#define CMD_SID_ATTR_ZOOM ".uno:Zoom"
+#define CMD_SID_SIZE_REAL ".uno:Zoom100Percent"
+#define CMD_SID_SIZE_OPTIMAL ".uno:ZoomObjects"
+#define CMD_SID_SIZE_ALL ".uno:ZoomOptimal"
+#define CMD_SID_SIZE_PAGE ".uno:ZoomPage"
+#define CMD_SID_SIZE_PAGE_WIDTH ".uno:ZoomPageWidth"
+#define CMD_SID_SIZE_VISAREA ".uno:ZoomVisArea"
+#define CMD_SID_FM_GRABCONTROLFOCUS ".uno:GrabControlFocus"
+#define CMD_SID_FM_CREATE_FIELDCONTROL ".uno:CreateFieldControl"
+#define CMD_SID_INSERT_SELECT ".uno:SelectMode"
+#define CMD_SID_PARA_VERTALIGN ".uno:VerticalParagraphAlignment"
+#define CMD_SID_ATTR_CHAR_RELIEF ".uno:CharacterRelief"
+#define CMD_SID_ATTR_BRUSH_CHAR ".uno:CharacterBackgroundPattern"
+#define CMD_SID_ATTR_CHAR_ROTATED ".uno:CharacterRotation"
+#define CMD_SID_ATTR_CHAR_SCALEWIDTH ".uno:CharacterWidthScalingFactor"
+#define CMD_SID_ATTR_NUMBERFORMAT_VALUE ".uno:NumberFormatValue"
+#define CMD_SID_ATTR_ALIGN_HOR_JUSTIFY ".uno:HorizontalJustification"
+#define CMD_SID_ATTR_ALIGN_VER_JUSTIFY ".uno:VerticalJustification"
+#define CMD_SID_ATTR_ALIGN_INDENT ".uno:AlignmentIndent"
+#define CMD_SID_ATTR_ALIGN_HYPHENATION ".uno:AlignmentHyphenation"
+#define CMD_SID_ATTR_ALIGN_DEGREES ".uno:AlignmentRotation"
+#define CMD_SID_ATTR_ALIGN_LOCKPOS ".uno:AlignmentRotationMode"
+#define CMD_SID_ATTR_ALIGN_MARGIN ".uno:AlignmentMargin"
+#define CMD_SID_ATTR_ALIGN_STACKED ".uno:AlignmentStacked"
+#define CMD_SID_ATTR_PARA_LEFT_TO_RIGHT ".uno:ParaLeftToRight"
+#define CMD_SID_ATTR_PARA_RIGHT_TO_LEFT ".uno:ParaRightToLeft"
+#define CMD_SID_RULER_TEXT_RIGHT_TO_LEFT ".uno:TextRTL"
+#define CMD_SID_OPEN_HYPERLINK ".uno:OpenHyperlinkOnCursor"
+#define CMD_SID_CTLFONT_STATE ".uno:CTLFontState"
+#define CMD_SID_VERTICALTEXT_STATE ".uno:VerticalTextState"
+#define CMD_SID_OPEN_XML_FILTERSETTINGS ".uno:OpenXMLFilterSettings"
+#define CMD_SID_HANGUL_HANJA_CONVERSION ".uno:HangulHanjaConversion"
+#define CMD_SID_CHINESE_CONVERSION ".uno:ChineseConversion"
+#define CMD_SID_SPELL_DIALOG ".uno:SpellDialog"
+#define CMD_SID_RULER_ROWS ".uno:RulerRows"
+#define CMD_SID_RULER_ROWS_VERTICAL ".uno:RulerRowsVertical"
+#define CMD_SID_ATTR_CHAR_FONTLIST ".uno:FontNameList"
+#define CMD_SID_EXTRUSION_TOOGLE ".uno:ExtrusionToggle"
+#define CMD_SID_EXTRUSION_TILT_DOWN ".uno:ExtrusionTiltDown"
+#define CMD_SID_EXTRUSION_TILT_UP ".uno:ExtrusionTiltUp"
+#define CMD_SID_EXTRUSION_TILT_LEFT ".uno:ExtrusionTiltLeft"
+#define CMD_SID_EXTRUSION_TILT_RIGHT ".uno:ExtrusionTiltRight"
+#define CMD_SID_EXTRUSION_DEPTH_FLOATER ".uno:ExtrusionDepthFloater"
+#define CMD_SID_EXTRUSION_DEPTH_DIALOG ".uno:ExtrusionDepthDialog"
+#define CMD_SID_EXTRUSION_DIRECTION_FLOATER ".uno:ExtrusionDirectionFloater"
+#define CMD_SID_EXTRUSION_LIGHTING_FLOATER ".uno:ExtrusionLightingFloater"
+#define CMD_SID_EXTRUSION_SURFACE_FLOATER ".uno:ExtrusionSurfaceFloater"
+#define CMD_SID_EXTRUSION_3D_COLOR ".uno:Extrusion3DColor"
+#define CMD_SID_EXTRUSION_DEPTH ".uno:ExtrusionDepth"
+#define CMD_SID_EXTRUSION_DIRECTION ".uno:ExtrusionDirection"
+#define CMD_SID_EXTRUSION_PROJECTION ".uno:ExtrusionProjection"
+#define CMD_SID_EXTRUSION_LIGHTING_DIRECTION ".uno:ExtrusionLightingDirection"
+#define CMD_SID_EXTRUSION_LIGHTING_INTENSITY ".uno:ExtrusionLightingIntensity"
+#define CMD_SID_EXTRUSION_SURFACE ".uno:ExtrusionSurface"
+#define CMD_SID_FONTWORK_GALLERY_FLOATER ".uno:FontworkGalleryFloater"
+#define CMD_SID_FONTWORK_SHAPE_TYPE ".uno:FontworkShapeType"
+#define CMD_SID_FONTWORK_SAME_LETTER_HEIGHTS ".uno:FontworkSameLetterHeights"
+#define CMD_SID_FONTWORK_ALIGNMENT_FLOATER ".uno:FontworkAlignmentFloater"
+#define CMD_SID_FONTWORK_CHARACTER_SPACING_FLOATER ".uno:FontworkCharacterSpacingFloater"
+#define CMD_SID_FONTWORK_SHAPE ".uno:FontworkShape"
+#define CMD_SID_FONTWORK_ALIGNMENT ".uno:FontworkAlignment"
+#define CMD_SID_FONTWORK_CHARACTER_SPACING ".uno:FontworkCharacterSpacing"
+#define CMD_SID_FONTWORK_CHARACTER_SPACING_DIALOG ".uno:FontworkCharacterSpacingDialog"
+#define CMD_SID_FONTWORK_KERN_CHARACTER_PAIRS ".uno:FontworkKernCharacterPairs"
+#define CMD_SID_GET_COLORTABLE ".uno:GetColorTable"
+#define CMD_SID_SPELLCHECKER_CHANGED ".uno:SpellCheckerChanged"
+#define CMD_SID_ATTR_YEAR2000 ".uno:Year2000"
+#define CMD_SID_INC_INDENT ".uno:IncrementIndent"
+#define CMD_SID_DEC_INDENT ".uno:DecrementIndent"
+#define CMD_SID_TABLE_CELL ".uno:StateTableCell"
+#define CMD_SID_OUTLINE_TO_IMPRESS ".uno:SendOutlineToImpress"
+#define CMD_SID_ATTR_DEFTABSTOP ".uno:DefTabStop"
+#define CMD_SID_ATTR_LANGUAGE ".uno:DocumentLanguage"
+#define CMD_SID_ATTR_CHAR_CJK_LANGUAGE ".uno:DocumentLanguageCJK"
+#define CMD_SID_ATTR_CHAR_CTL_LANGUAGE ".uno:DocumentLanguageCTL"
+#define CMD_SID_OPT_LOCALE_CHANGED ".uno:OptionsLocaleChanged"
+#define CMD_SID_SBA_BRW_INSERT ".uno:SbaBrwInsert"
+#define CMD_SID_DRAWTBX_CS_BASIC ".uno:BasicShapes"
+#define CMD_SID_DRAWTBX_CS_SYMBOL ".uno:SymbolShapes"
+#define CMD_SID_DRAWTBX_CS_ARROW ".uno:ArrowShapes"
+#define CMD_SID_DRAWTBX_CS_FLOWCHART ".uno:FlowChartShapes"
+#define CMD_SID_DRAWTBX_CS_CALLOUT ".uno:CalloutShapes"
+#define CMD_SID_DRAWTBX_CS_STAR ".uno:StarShapes"
+#define CMD_SID_DRAW_CS_ID ".uno:CustomShape"
+#define CMD_SID_DASH_LIST ".uno:DashListState"
+#define CMD_SID_LINEEND_LIST ".uno:LineEndListState"
+#define CMD_SID_COLOR_TABLE ".uno:ColorTableState"
+#define CMD_SID_GRADIENT_LIST ".uno:GradientListState"
+#define CMD_SID_HATCH_LIST ".uno:HatchListState"
+#define CMD_SID_BITMAP_LIST ".uno:BitmapListState"
+#define CMD_SID_ATTR_CHAR_EMPHASISMARK ".uno:EmphasisMark"
+#define CMD_SID_FM_SHOW_DATANAVIGATOR ".uno:ShowDataNavigator"
+#define CMD_SID_FM_DATANAVIGATOR_CONTROL ".uno:FmDataNavigatorController"
+#define CMD_SID_ALIGN_ANY_LEFT ".uno:CommonAlignLeft"
+#define CMD_SID_ALIGN_ANY_HCENTER ".uno:CommonAlignHorizontalCenter"
+#define CMD_SID_ALIGN_ANY_RIGHT ".uno:CommonAlignRight"
+#define CMD_SID_ALIGN_ANY_JUSTIFIED ".uno:CommonAlignJustified"
+#define CMD_SID_ALIGN_ANY_TOP ".uno:CommonAlignTop"
+#define CMD_SID_ALIGN_ANY_VCENTER ".uno:CommonAlignVerticalCenter"
+#define CMD_SID_ALIGN_ANY_BOTTOM ".uno:CommonAlignBottom"
+#define CMD_SID_ALIGN_ANY_HDEFAULT ".uno:CommonAlignHorizontalDefault"
+#define CMD_SID_ALIGN_ANY_VDEFAULT ".uno:CommonAlignVerticalDefault"
+#define CMD_SID_AVMEDIA_TOOLBOX ".uno:AVMediaToolBox"
+#define CMD_SID_BORDER_REDUCED_MODE ".uno:BorderReducedMode"
+#define CMD_SID_COLOR_SETTINGS ".uno:ColorSettings"
+#define CMD_SID_MAIL_EXPORT_FINISHED ".uno:MailExportFinished"
+#define CMD_SID_INSERT_ZWSP ".uno:InsertZWSP"
+#define CMD_SID_INSERT_ZWNBSP ".uno:InsertZWNBSP"
+#define CMD_SID_INSERT_LRM ".uno:InsertLRM"
+#define CMD_SID_INSERT_RLM ".uno:InsertRLM"
+#define CMD_FN_INSERT_SOFT_HYPHEN ".uno:InsertSoftHyphen"
+#define CMD_FN_INSERT_HARDHYPHEN ".uno:InsertHardHyphen"
+#define CMD_FN_INSERT_HARD_SPACE ".uno:InsertNonBreakingSpace"
+#define CMD_SID_BASICIDE_MANAGE_LANG ".uno:ManageLanguage"
+#define CMD_SID_BASICIDE_CURRENT_LANG ".uno:CurrentLanguage"
+#define CMD_SID_TABLE_MERGE_CELLS ".uno:MergeCells"
+#define CMD_SID_TABLE_SPLIT_CELLS ".uno:SplitCell"
+#define CMD_SID_OPTIMIZE_TABLE ".uno:OptimizeTable"
+#define CMD_SID_TABLE_VERT_BOTTOM ".uno:CellVertBottom"
+#define CMD_SID_TABLE_VERT_CENTER ".uno:CellVertCenter"
+#define CMD_SID_TABLE_VERT_NONE ".uno:CellVertTop"
+#define CMD_SID_TABLE_INSERT_ROW ".uno:InsertRows"
+#define CMD_SID_TABLE_INSERT_COL ".uno:InsertColumns"
+#define CMD_SID_TABLE_DELETE_ROW ".uno:DeleteRows"
+#define CMD_SID_TABLE_DELETE_COL ".uno:DeleteColumns"
+#define CMD_SID_TABLE_SELECT_ALL ".uno:SelectTable"
+#define CMD_SID_TABLE_SELECT_COL ".uno:EntireColumn"
+#define CMD_SID_TABLE_SELECT_ROW ".uno:EntireRow"
+#define CMD_SID_FORMAT_TABLE_DLG ".uno:TableDialog"
+#define CMD_SID_TABLE_AUTOSUM ".uno:AutoSum"
+#define CMD_SID_TABLE_SORT_DIALOG ".uno:TableSort"
+#define CMD_SID_OPEN_SMARTTAGMENU ".uno:OpenSmartTagMenuOnCursor"
+#define CMD_SID_ATTR_ZOOMSLIDER ".uno:ZoomSlider"
+#define CMD_SID_FONTNAMELIST ".uno:FontNameStringList"
+#define CMD_SID_LANGUAGE_STATUS ".uno:LanguageStatus"
+#define CMD_SID_CHAR_DLG_FOR_PARAGRAPH ".uno:FontDialogForParagraph"
+#define CMD_SID_GROW_FONT_SIZE ".uno:Grow"
+#define CMD_SID_SHRINK_FONT_SIZE ".uno:Shrink"
+#define CMD_SID_RECHECK_DOCUMENT ".uno:RecheckDocument"
+#define CMD_SID_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog"
+#define CMD_SID_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog"
+
+#endif
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index 77a4e40e75..a041bdbbe2 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -195,9 +195,9 @@ class AbstractSvxNameDialog :public VclAbstractDialog //add for SvxNameDialog
public:
virtual void GetName( String& rName ) = 0;
virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) = 0;
- virtual void SetEditHelpId(ULONG nHelpId) = 0;
+ virtual void SetEditHelpId(const rtl::OString&) = 0;
//from class Window
- virtual void SetHelpId( ULONG nHelpId ) = 0;
+ virtual void SetHelpId( const rtl::OString& ) = 0;
virtual void SetText( const XubString& rStr ) = 0;
};
@@ -243,7 +243,7 @@ public:
//from SvxMultiPathDialog
virtual void SetClassPathMode() = 0;
//From Class Window
- virtual void SetHelpId( ULONG nHelpId ) = 0;
+ virtual void SetHelpId( const rtl::OString& ) = 0;
};
class AbstractSvxHpLinkDlg : public VclAbstractDialog //add for SvxHpLinkDlg
@@ -500,7 +500,7 @@ public:
virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0;
- virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ) = 0;
+ virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) = 0;
};
#endif
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index f8b71ea694..fe15afbdf4 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -15,6 +15,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\global
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
mkdir: %_DEST%\inc%_EXT%\svx
+..\inc\svx\svxcommands.h %_DEST%\inc%_EXT%\svx\svxcommands.h
..\sdi\svx.sdi %_DEST%\inc%_EXT%\svx\svx.sdi
..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi
..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index c5069ad2eb..74d965b4dc 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -6205,33 +6205,6 @@ SfxVoidItem PreviousAnnotation SID_PREVIOUS_POSTIT
]
//--------------------------------------------------------------------------
-SfxVoidItem InsertApplet SID_INSERT_APPLET
-(SfxStringItem Class FN_PARAM_1,
- SfxStringItem ClassLocation FN_PARAM_2,
- SfxStringItem Commands FN_PARAM_3)
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_INSERT;
-]
-
-//--------------------------------------------------------------------------
SfxUInt32Item InsertGalleryPic SID_GALLERY_FORMATS
()
[
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
index d299defde4..681e677186 100644
--- a/svx/source/dialog/bmpmask.src
+++ b/svx/source/dialog/bmpmask.src
@@ -37,7 +37,7 @@
// RID_SVXDLG_BMPMASK ----------------------------------------------------
DockingWindow RID_SVXDLG_BMPMASK
{
- HelpId = SID_BMPMASK ;
+ HelpId = CMD_SID_BMPMASK ;
OutputSize = TRUE ;
Hide = TRUE ;
SVLook = TRUE ;
@@ -78,6 +78,7 @@ DockingWindow RID_SVXDLG_BMPMASK
CheckBox CBX_1
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_1";
Pos = MAP_APPFONT ( 12 , 50 ) ;
Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ;
@@ -92,6 +93,7 @@ DockingWindow RID_SVXDLG_BMPMASK
};
MetricField SP_1
{
+ HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_1";
Border = TRUE ;
Pos = MAP_APPFONT ( 58 , 48 ) ;
Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -106,6 +108,7 @@ DockingWindow RID_SVXDLG_BMPMASK
};
ListBox LB_1
{
+ HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_1";
Border = TRUE ;
Pos = MAP_APPFONT ( 93 , 48 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ;
@@ -118,6 +121,7 @@ DockingWindow RID_SVXDLG_BMPMASK
CheckBox CBX_2
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_2";
Pos = MAP_APPFONT ( 12 , 65 ) ;
Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ;
@@ -132,6 +136,7 @@ DockingWindow RID_SVXDLG_BMPMASK
};
MetricField SP_2
{
+ HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_2";
Border = TRUE ;
Pos = MAP_APPFONT ( 58 , 63 ) ;
Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -146,6 +151,7 @@ DockingWindow RID_SVXDLG_BMPMASK
};
ListBox LB_2
{
+ HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_2";
Border = TRUE ;
Pos = MAP_APPFONT ( 93 , 63 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ;
@@ -158,6 +164,7 @@ DockingWindow RID_SVXDLG_BMPMASK
CheckBox CBX_3
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_3";
Pos = MAP_APPFONT ( 12 , 80 ) ;
Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ;
@@ -172,6 +179,7 @@ DockingWindow RID_SVXDLG_BMPMASK
};
MetricField SP_3
{
+ HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_3";
Border = TRUE ;
Pos = MAP_APPFONT ( 58, 78 ) ;
Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -186,6 +194,7 @@ DockingWindow RID_SVXDLG_BMPMASK
};
ListBox LB_3
{
+ HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_3";
Border = TRUE ;
Pos = MAP_APPFONT ( 93 , 78 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ;
@@ -198,6 +207,7 @@ DockingWindow RID_SVXDLG_BMPMASK
CheckBox CBX_4
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_4";
Pos = MAP_APPFONT ( 12 , 95 ) ;
Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ;
@@ -212,6 +222,7 @@ DockingWindow RID_SVXDLG_BMPMASK
};
MetricField SP_4
{
+ HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_4";
Border = TRUE ;
Pos = MAP_APPFONT ( 58 , 93 ) ;
Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -226,6 +237,7 @@ DockingWindow RID_SVXDLG_BMPMASK
};
ListBox LB_4
{
+ HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_4";
Border = TRUE ;
Pos = MAP_APPFONT ( 93 , 93 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ;
@@ -236,6 +248,7 @@ DockingWindow RID_SVXDLG_BMPMASK
CheckBox CBX_TRANS
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_TRANS";
Pos = MAP_APPFONT ( 12 , 110 ) ;
Size = MAP_APPFONT ( 71 , 10 ) ;
TabStop = TRUE ;
@@ -244,6 +257,7 @@ DockingWindow RID_SVXDLG_BMPMASK
PushButton BTN_EXEC
{
+ HelpID = "svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC";
Pos = MAP_APPFONT ( 93 , 6 ) ;
Size = MAP_APPFONT ( 64 , 14 ) ;
Text [ en-US ] = "~Replace" ;
@@ -251,6 +265,7 @@ DockingWindow RID_SVXDLG_BMPMASK
ListBox LB_TRANS
{
+ HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_TRANS";
Border = TRUE ;
Pos = MAP_APPFONT ( 93 , 108 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ;
diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index df5805daa6..76f538985d 100644
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.src
@@ -33,6 +33,7 @@
// RID_SVXDLG_CONTOUR ----------------------------------------------------
FloatingWindow RID_SVXDLG_CONTOUR
{
+ HelpID = "svx:FloatingWindow:RID_SVXDLG_CONTOUR";
OutputSize = TRUE ;
Hide = TRUE ;
SVLook = TRUE ;
@@ -176,6 +177,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
};
MetricField MTF_TOLERANCE
{
+ HelpID = "svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE";
Border = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 28 , 12 ) ;
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 0b97433d53..3aa4ec8daa 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -1585,7 +1585,6 @@ void BrokenRecoveryDialog::impl_askForSavePath()
{
css::uno::Reference< css::ui::dialogs::XFolderPicker > xFolderPicker(
m_pCore->getSMGR()->createInstance(SERVICENAME_FOLDERPICKER), css::uno::UNO_QUERY_THROW);
-// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER );
INetURLObject aURL(m_sSavePath, INET_PROT_FILE);
xFolderPicker->setDisplayDirectory(aURL.GetMainURL(INetURLObject::NO_DECODE));
diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
index 32c3560031..e73f4a919e 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -79,6 +79,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_SAVE
};
ListBox LB_SAVE_FILELIST
{
+ HelpID = "svx:ListBox:RID_SVXPAGE_DOCRECOVERY_SAVE:LB_SAVE_FILELIST";
Pos = MAP_APPFONT( SAVE_COL0 , SAVE_ROW4 );
Size = MAP_APPFONT( SAVE_CONTROLWIDTH, SAVE_FILELISTHEIGHT );
Border = TRUE;
@@ -193,6 +194,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER
};
PushButton BTN_RECOV_NEXT
{
+ HelpID = "svx:PushButton:RID_SVXPAGE_DOCRECOVERY_RECOVER:BTN_RECOV_NEXT";
Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH*2, RSC_CD_PUSHBUTTON_HEIGHT );
Text[ en-US ] = "~Start Recovery >";
@@ -300,6 +302,7 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN
};
ListBox LB_BROKEN_FILELIST
{
+ HelpID = "svx:ListBox:RID_SVX_MDLG_DOCRECOVERY_BROKEN:LB_BROKEN_FILELIST";
Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW2 );
Size = MAP_APPFONT( BROKEN_CONTROLWIDTH, (BROKEN_ROW3-BROKEN_ROW2) );
Border = TRUE;
@@ -313,12 +316,14 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN
};
Edit ED_BROKEN_SAVEDIR
{
+ HelpID = "svx:Edit:RID_SVX_MDLG_DOCRECOVERY_BROKEN:ED_BROKEN_SAVEDIR";
Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW5 + 1 ); // center to pushbutton
Size = MAP_APPFONT( BROKEN_COL2 - BROKEN_COL0, RSC_CD_TEXTBOX_HEIGHT );
Border = TRUE;
};
PushButton BTN_BROKEN_SAVEDIR
{
+ HelpID = "svx:PushButton:RID_SVX_MDLG_DOCRECOVERY_BROKEN:BTN_BROKEN_SAVEDIR";
Pos = MAP_APPFONT( BROKEN_COL3, BROKEN_ROW5 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "Chan~ge...";
@@ -379,6 +384,7 @@ TabPage RID_SVXPAGE_ERR_REP_WELCOME
};
PushButton BTN_RECOV_PREV
{
+ HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_WELCOME:BTN_RECOV_PREV";
Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text[ en-US ] = "< ~Back";
@@ -437,6 +443,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
};
Edit ED_ERRSEND_DOCTYPE
{
+ HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_DOCTYPE";
Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW5 );
Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_TEXTBOX_HEIGHT );
Border = TRUE;
@@ -449,6 +456,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
};
MultiLineEdit ML_ERRSEND_USING
{
+ HelpID = "svx:MultiLineEdit:RID_SVXPAGE_ERR_REP_SEND:ML_ERRSEND_USING";
Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW8 );
Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, (ERRSEND_ROW12-ERRSEND_ROW8-RSC_SP_CTRL_Y) );
VScroll = TRUE;
@@ -457,18 +465,21 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
};
PushButton BTN_ERRSEND_SHOWREP
{
+ HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_SHOWREP";
Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW8 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text[ en-US ] = "Show ~Report";
};
PushButton BTN_ERRSEND_OPT
{
+ HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_OPT";
Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW10 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text[ en-US ] = "~Options...";
};
CheckBox CB_ERRSEND_CONTACT
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_ERR_REP_SEND:CB_ERRSEND_CONTACT";
Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW12 );
Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_CHECKBOX_HEIGHT );
Check = FALSE;
@@ -482,6 +493,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
};
Edit ED_ERRSEND_EMAILADDR
{
+ HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_EMAILADDR";
Pos = MAP_APPFONT( ERRSEND_COL1, ERRSEND_ROW14 );
Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH3, RSC_CD_TEXTBOX_HEIGHT );
Border = TRUE;
@@ -493,6 +505,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
};
PushButton BTN_RECOV_PREV
{
+ HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_RECOV_PREV";
Pos = MAP_APPFONT( ERRSEND_COL5, ERRSEND_ROW16 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text[ en-US ] = "< ~Back";
@@ -530,6 +543,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS
RadioButton BTN_ERROPT_SYSTEM
{
+ HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_SYSTEM";
Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW1 );
Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT );
Text[ en-US ] = "Use ~system settings";
@@ -537,6 +551,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS
RadioButton BTN_ERROPT_DIRECT
{
+ HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_DIRECT";
Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW2 );
Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT );
Text[ en-US ] = "Use ~direct connection to the Internet";
@@ -544,6 +559,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS
RadioButton BTN_ERROPT_MANUAL
{
+ HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_MANUAL";
Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW3 );
Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT );
Text[ en-US ] = "Use ~manual settings";
@@ -558,6 +574,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS
Edit ED_ERROPT_PROXYSERVER
{
+ HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYSERVER";
Pos = MAP_APPFONT( ERROPT_COLC, ERROPT_ROW5 );
Size = MAP_APPFONT( ERROPT_SERVER_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
Border = TRUE;
@@ -572,6 +589,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS
Edit ED_ERROPT_PROXYPORT
{
+ HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYPORT";
Pos = MAP_APPFONT( ERROPT_COLC + ERROPT_SERVER_WIDTH + RSC_SP_CTRL_GROUP_X, ERROPT_ROW5 );
Size = MAP_APPFONT( ERROPT_PORT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
Border = TRUE;
@@ -618,6 +636,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_PREVIEW
MultiLineEdit ML_ERRPREVIEW_CONTENT
{
+ HelpID = "svx:MultiLineEdit:RID_SVX_MDLG_ERR_REP_PREVIEW:ML_ERRPREVIEW_CONTENT";
Pos = MAP_APPFONT( ERRPREVIEW_COLA, ERRPREVIEW_ROW0 );
Size = MAP_APPFONT( ERRPREVIEW_COLC - ERRPREVIEW_COLA, ERRPREVIEW_ROW1 - ERRPREVIEW_ROW0 );
VScroll = TRUE;
diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src
index 667ab90f96..01cf483a67 100644
--- a/svx/source/dialog/fontwork.src
+++ b/svx/source/dialog/fontwork.src
@@ -34,7 +34,7 @@
// RID_SVXDLG_FONTWORK ---------------------------------------------------
DockingWindow RID_SVXDLG_FONTWORK
{
- HelpId = SID_FONTWORK ;
+ HelpId = CMD_SID_FONTWORK ;
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
@@ -164,6 +164,7 @@ DockingWindow RID_SVXDLG_FONTWORK
};
MetricField MTR_FLD_DISTANCE
{
+ HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 85 ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
@@ -188,6 +189,7 @@ DockingWindow RID_SVXDLG_FONTWORK
};
MetricField MTR_FLD_TEXTSTART
{
+ HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 100 ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
@@ -261,6 +263,7 @@ DockingWindow RID_SVXDLG_FONTWORK
};
MetricField MTR_FLD_SHADOW_X
{
+ HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 144 ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
@@ -285,6 +288,7 @@ DockingWindow RID_SVXDLG_FONTWORK
};
MetricField MTR_FLD_SHADOW_Y
{
+ HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 159 ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
@@ -302,6 +306,7 @@ DockingWindow RID_SVXDLG_FONTWORK
};
ListBox CLB_SHADOW_COLOR
{
+ HelpID = "svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 174 ) ;
Size = MAP_APPFONT ( 71 , 60 ) ;
diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src
index adb89ce3bf..f2f2f7c6d0 100644
--- a/svx/source/dialog/hdft.src
+++ b/svx/source/dialog/hdft.src
@@ -46,12 +46,14 @@ TabPage RID_SVXPAGE_HEADER
Size = MAP_APPFONT ( 260 , 185 ) ;
CheckBox CB_TURNON
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 152 , 10 ) ;
Text [ en-US ] = "Hea~der on" ;
};
CheckBox CB_SHARED
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED";
Pos = MAP_APPFONT ( 12 , 30 ) ;
Size = MAP_APPFONT ( 152 , 10 ) ;
Text [ en-US ] = "Same ~content left/right" ;
@@ -65,6 +67,7 @@ TabPage RID_SVXPAGE_HEADER
};
MetricField ED_LMARGIN
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 124 , 46 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -87,6 +90,7 @@ TabPage RID_SVXPAGE_HEADER
};
MetricField ED_RMARGIN
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 124 , 62 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -109,6 +113,7 @@ TabPage RID_SVXPAGE_HEADER
};
MetricField ED_DIST
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 124 , 80 ) ;
@@ -124,6 +129,7 @@ TabPage RID_SVXPAGE_HEADER
};
CheckBox CB_DYNSPACING
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_DYNSPACING";
Pos = MAP_APPFONT ( 12 , 96 ) ;
Size = MAP_APPFONT ( 152 , 10 ) ;
Hide = TRUE;
@@ -137,6 +143,7 @@ TabPage RID_SVXPAGE_HEADER
};
MetricField ED_HEIGHT
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 124 , 96 ) ;
@@ -154,6 +161,7 @@ TabPage RID_SVXPAGE_HEADER
};
CheckBox CB_HEIGHT_DYN
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN";
Pos = MAP_APPFONT ( 12 , 112 ) ;
Size = MAP_APPFONT ( 152 , 10 ) ;
Text [ en-US ] = "~AutoFit height" ;
@@ -171,6 +179,7 @@ TabPage RID_SVXPAGE_HEADER
};
PushButton BTN_EXTRAS
{
+ HelpID = "svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS";
Pos = MAP_APPFONT ( 12 , 130 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~More..." ;
@@ -185,12 +194,14 @@ TabPage RID_SVXPAGE_FOOTER
Size = MAP_APPFONT ( 260 , 185 ) ;
CheckBox CB_TURNON
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 152 , 10 ) ;
Text [ en-US ] = "~Footer on" ;
};
CheckBox CB_SHARED
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED";
Pos = MAP_APPFONT ( 12 , 30 ) ;
Size = MAP_APPFONT ( 152 , 10 ) ;
Text [ en-US ] = "Same ~content left/right" ;
@@ -204,6 +215,7 @@ TabPage RID_SVXPAGE_FOOTER
};
MetricField ED_LMARGIN
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 124 , 46 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -226,6 +238,7 @@ TabPage RID_SVXPAGE_FOOTER
};
MetricField ED_RMARGIN
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 124 , 62 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -247,6 +260,7 @@ TabPage RID_SVXPAGE_FOOTER
};
MetricField ED_DIST
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 124 , 80 ) ;
@@ -262,6 +276,7 @@ TabPage RID_SVXPAGE_FOOTER
};
CheckBox CB_DYNSPACING
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_DYNSPACING";
Pos = MAP_APPFONT ( 12 , 96 ) ;
Size = MAP_APPFONT ( 152 , 10 ) ;
Hide = TRUE;
@@ -276,6 +291,7 @@ TabPage RID_SVXPAGE_FOOTER
};
MetricField ED_HEIGHT
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 124 , 96 ) ;
@@ -293,6 +309,7 @@ TabPage RID_SVXPAGE_FOOTER
};
CheckBox CB_HEIGHT_DYN
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN";
Pos = MAP_APPFONT ( 12 , 112 ) ;
Size = MAP_APPFONT ( 152 , 10 ) ;
Text [ en-US ] = "~AutoFit height" ;
@@ -311,6 +328,7 @@ TabPage RID_SVXPAGE_FOOTER
};
PushButton BTN_EXTRAS
{
+ HelpID = "svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS";
Pos = MAP_APPFONT ( 12 , 130 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~More..." ;
diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src
index 75d6775340..4554a5f0bd 100644
--- a/svx/source/dialog/hyprlink.src
+++ b/svx/source/dialog/hyprlink.src
@@ -98,7 +98,7 @@ ToolBox RID_SVXDLG_HYPERLINK
};
ToolBoxItem
{
- HelpID = SID_HYPERLINK_SETLINK ;
+ HelpID = CMD_SID_HYPERLINK_SETLINK ;
Identifier = BTN_LINK ;
Disable = TRUE ;
DropDown = TRUE ;
@@ -106,7 +106,7 @@ ToolBox RID_SVXDLG_HYPERLINK
};
ToolBoxItem
{
- HelpID = SID_CREATELINK ;
+ HelpID = CMD_SID_CREATELINK ;
Identifier = BTN_INSERT_BOOKMARK ;
Disable = TRUE ;
Hide = TRUE;
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index 6c4facd2f0..202dc6d984 100644
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -32,6 +32,7 @@
// RID_SVXDLG_IMAP ----------------------------------------------------
ModelessDialog RID_SVXDLG_IMAP
{
+ HelpID = "svx:ModelessDialog:RID_SVXDLG_IMAP";
OutputSize = TRUE ;
Hide = TRUE ;
SVLook = TRUE ;
@@ -193,6 +194,7 @@ ModelessDialog RID_SVXDLG_IMAP
};
ComboBox CBB_URL
{
+ HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:CBB_URL";
Pos = MAP_APPFONT ( 39 , 23 ) ;
Size = MAP_APPFONT ( 225 , 69 ) ;
TabStop = TRUE ;
@@ -208,6 +210,7 @@ ModelessDialog RID_SVXDLG_IMAP
};
Edit EDT_TEXT
{
+ HelpID = "svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT";
Border = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 39 , 41 ) ;
@@ -226,6 +229,7 @@ ModelessDialog RID_SVXDLG_IMAP
// nur temporaer
ComboBox RID_SVXCTL_CBB_TARGET
{
+ HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:RID_SVXCTL_CBB_TARGET";
Border = TRUE ;
Sort = TRUE ;
Pos = MAP_APPFONT ( 213 , 41 ) ;
diff --git a/svx/source/dialog/optgrid.src b/svx/source/dialog/optgrid.src
index e427ddfd08..3d281d2e39 100644
--- a/svx/source/dialog/optgrid.src
+++ b/svx/source/dialog/optgrid.src
@@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_GRID
};
CheckBox CBX_USE_GRIDSNAP
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 204 , 10 ) ;
TabStop = TRUE ;
@@ -52,6 +53,7 @@ TabPage RID_SVXPAGE_GRID
};
CheckBox CBX_GRID_VISIBLE
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE";
Pos = MAP_APPFONT ( 12 , 27 ) ;
Size = MAP_APPFONT ( 204 , 10 ) ;
TabStop = TRUE ;
@@ -77,6 +79,7 @@ TabPage RID_SVXPAGE_GRID
};
MetricField MTR_FLD_DRAW_X
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_X";
Border = TRUE ;
Pos = MAP_APPFONT ( 75 , 54 ) ;
Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -94,6 +97,7 @@ TabPage RID_SVXPAGE_GRID
};
MetricField MTR_FLD_DRAW_Y
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y";
Border = TRUE ;
Pos = MAP_APPFONT ( 75 , 69 ) ;
Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -129,6 +133,7 @@ TabPage RID_SVXPAGE_GRID
};
NumericField NUM_FLD_DIVISION_X
{
+ HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X";
Border = TRUE ;
Pos = MAP_APPFONT ( 195 , 54 ) ;
Size = MAP_APPFONT ( 25 , 12 ) ;
@@ -148,6 +153,7 @@ TabPage RID_SVXPAGE_GRID
};
NumericField NUM_FLD_DIVISION_Y
{
+ HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y";
Border = TRUE ;
Pos = MAP_APPFONT ( 195 , 69 ) ;
Size = MAP_APPFONT ( 25 , 12 ) ;
@@ -167,6 +173,7 @@ TabPage RID_SVXPAGE_GRID
};
CheckBox CBX_SYNCHRONIZE
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE";
Pos = MAP_APPFONT ( 12 , 84 ) ;
Size = MAP_APPFONT ( 127 , 10 ) ;
TabStop = TRUE ;
@@ -182,6 +189,7 @@ TabPage RID_SVXPAGE_GRID
CheckBox CBX_SNAP_HELPLINES
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES";
Pos = MAP_APPFONT ( 12 , 111 ) ;
Size = MAP_APPFONT ( 106 , 10 ) ;
Hide = TRUE;
@@ -190,6 +198,7 @@ TabPage RID_SVXPAGE_GRID
};
CheckBox CBX_SNAP_BORDER
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER";
Hide = TRUE;
TabStop = TRUE ;
Pos = MAP_APPFONT ( 12 , 125 ) ;
@@ -198,6 +207,7 @@ TabPage RID_SVXPAGE_GRID
};
CheckBox CBX_SNAP_FRAME
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME";
Pos = MAP_APPFONT ( 12 , 139 ) ;
Size = MAP_APPFONT ( 106 , 10 ) ;
Hide = TRUE;
@@ -206,6 +216,7 @@ TabPage RID_SVXPAGE_GRID
};
CheckBox CBX_SNAP_POINTS
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS";
Pos = MAP_APPFONT ( 12 , 153 ) ;
Size = MAP_APPFONT ( 106 , 10 ) ;
Hide = TRUE;
@@ -221,6 +232,7 @@ TabPage RID_SVXPAGE_GRID
};
MetricField MTR_FLD_SNAP_AREA
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_SNAP_AREA";
Border = TRUE ;
Pos = MAP_APPFONT ( 83 , 167 ) ;
Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -252,6 +264,7 @@ TabPage RID_SVXPAGE_GRID
};
CheckBox CBX_ORTHO
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ORTHO";
Pos = MAP_APPFONT ( 136 , 111 ) ;
Size = MAP_APPFONT ( 112 , 10 ) ;
Hide = TRUE;
@@ -260,6 +273,7 @@ TabPage RID_SVXPAGE_GRID
};
CheckBox CBX_BIGORTHO
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_BIGORTHO";
Pos = MAP_APPFONT ( 136 , 125 ) ;
Size = MAP_APPFONT ( 112 , 10 ) ;
Hide = TRUE;
@@ -268,6 +282,7 @@ TabPage RID_SVXPAGE_GRID
};
CheckBox CBX_ROTATE
{
+ HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ROTATE";
Pos = MAP_APPFONT ( 136 , 139 ) ;
// 136, 111
Size = MAP_APPFONT ( 55 , 10 ) ;
@@ -277,6 +292,7 @@ TabPage RID_SVXPAGE_GRID
};
MetricField MTR_FLD_ANGLE
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_ANGLE";
Border = TRUE ;
Pos = MAP_APPFONT ( 194 , 137 ) ;
// 190, 111
@@ -302,6 +318,7 @@ TabPage RID_SVXPAGE_GRID
};
MetricField MTR_FLD_BEZ_ANGLE
{
+ HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_BEZ_ANGLE";
Border = TRUE ;
Pos = MAP_APPFONT ( 194 , 154 ) ;
Size = MAP_APPFONT ( 54 , 12 ) ;
diff --git a/svx/source/dialog/passwd.src b/svx/source/dialog/passwd.src
index 587150bc85..800c20c95d 100644
--- a/svx/source/dialog/passwd.src
+++ b/svx/source/dialog/passwd.src
@@ -46,6 +46,7 @@ ModalDialog RID_SVXDLG_PASSWORD
};
Edit ED_OLD_PASSWD
{
+ HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD";
Border = TRUE ;
Pos = MAP_APPFONT ( 71 , 14 ) ;
Size = MAP_APPFONT ( 71 , 12 ) ;
@@ -65,6 +66,7 @@ ModalDialog RID_SVXDLG_PASSWORD
};
Edit ED_NEW_PASSWD
{
+ HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD";
Border = TRUE ;
Pos = MAP_APPFONT ( 71 , 43 ) ;
Size = MAP_APPFONT ( 71 , 12 ) ;
@@ -78,6 +80,7 @@ ModalDialog RID_SVXDLG_PASSWORD
};
Edit ED_REPEAT_PASSWD
{
+ HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD";
Border = TRUE ;
Pos = MAP_APPFONT ( 71 , 59 ) ;
Size = MAP_APPFONT ( 71 , 12 ) ;
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index ddad68af0b..ae8b95344c 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -274,11 +274,6 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind)
return bFound;
}
-void SvxPluginFileDlg::SetDialogHelpId( const sal_Int32 _nHelpId )
-{
- maFileDlg.SetDialogHelpId( _nHelpId );
-}
-
void SvxPluginFileDlg::SetContext( sfx2::FileDialogHelper::Context _eNewContext )
{
maFileDlg.SetContext( _eNewContext );
diff --git a/svx/source/dialog/rubydialog.src b/svx/source/dialog/rubydialog.src
index b1537c1fa7..e44b68046c 100644
--- a/svx/source/dialog/rubydialog.src
+++ b/svx/source/dialog/rubydialog.src
@@ -42,6 +42,7 @@ ModelessDialog RID_SVXDLG_RUBY
Closeable = TRUE ;
CheckBox CB_AUTO_DETECT
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_RUBY:CB_AUTO_DETECT";
Pos = MAP_APPFONT ( 6, 6 ) ;
Size = MAP_APPFONT ( 186 , 12 ) ;
Text [ en-US ] = "Automatic detection";
@@ -60,6 +61,7 @@ ModelessDialog RID_SVXDLG_RUBY
};
Edit ED_LEFT_1
{
+ HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_1";
Pos = MAP_APPFONT ( 6 , 30 ) ;
Size = MAP_APPFONT ( 102 , 12 ) ;
Hide = False;
@@ -67,42 +69,49 @@ ModelessDialog RID_SVXDLG_RUBY
};
Edit ED_RIGHT_1
{
+ HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_1";
Pos = MAP_APPFONT ( 109 , 30 ) ;
Size = MAP_APPFONT ( 102 , 12 ) ;
Border = TRUE;
};
Edit ED_LEFT_2
{
+ HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_2";
Pos = MAP_APPFONT ( 6 , 42) ;
Size = MAP_APPFONT ( 102 , 12 ) ;
Border = TRUE;
};
Edit ED_RIGHT_2
{
+ HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_2";
Pos = MAP_APPFONT ( 109 , 42 ) ;
Size = MAP_APPFONT ( 102 , 12 ) ;
Border = TRUE;
};
Edit ED_LEFT_3
{
+ HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_3";
Pos = MAP_APPFONT ( 6 , 54 ) ;
Size = MAP_APPFONT ( 102 , 12 ) ;
Border = TRUE;
};
Edit ED_RIGHT_3
{
+ HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_3";
Pos = MAP_APPFONT ( 109 , 54 ) ;
Size = MAP_APPFONT ( 102 , 12 ) ;
Border = TRUE;
};
Edit ED_LEFT_4
{
+ HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_4";
Pos = MAP_APPFONT ( 6 , 66 ) ;
Size = MAP_APPFONT ( 102 , 12 ) ;
Border = TRUE;
};
Edit ED_RIGHT_4
{
+ HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_4";
Pos = MAP_APPFONT ( 109 , 66 ) ;
Size = MAP_APPFONT ( 102 , 12 ) ;
Border = TRUE;
@@ -122,6 +131,7 @@ ModelessDialog RID_SVXDLG_RUBY
};
ListBox LB_ADJUST
{
+ HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_ADJUST";
Pos = MAP_APPFONT ( 6 , 93) ;
Size = MAP_APPFONT ( 35 , 60 ) ;
DropDown = TRUE;
@@ -143,6 +153,7 @@ ModelessDialog RID_SVXDLG_RUBY
};
ListBox LB_POSITION
{
+ HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_POSITION";
Pos = MAP_APPFONT ( 43 , 93) ;
Size = MAP_APPFONT ( 35 , 60 ) ;
DropDown = TRUE;
@@ -161,6 +172,7 @@ ModelessDialog RID_SVXDLG_RUBY
};
ListBox LB_CHAR_STYLE
{
+ HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_CHAR_STYLE";
Pos = MAP_APPFONT ( 80 , 93) ;
Size = MAP_APPFONT ( 89 , 60 ) ;
DropDown = TRUE;
@@ -169,6 +181,7 @@ ModelessDialog RID_SVXDLG_RUBY
};
PushButton PB_STYLIST
{
+ HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_STYLIST";
Pos = MAP_APPFONT ( 171 , 92 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Styles";
@@ -194,6 +207,7 @@ ModelessDialog RID_SVXDLG_RUBY
};
PushButton PB_CLOSE
{
+ HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_CLOSE";
Pos = MAP_APPFONT ( 118, 175 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Close";
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 5a2824c24d..77856898f5 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -427,7 +427,7 @@ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset )
void SvxSearchDialog::Construct_Impl()
{
#if ENABLE_LAYOUT
- SetHelpId (SID_SEARCH_DLG);
+ SetHelpId (".uno:SearchDialog");
#endif /* ENABLE_LAYOUT */
// temporary to avoid incompatibility
diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index f00a6c8093..c3ddec8bfb 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -29,6 +29,7 @@
#include <svx/dialogs.hrc>
#include "srchdlg.hrc"
+#include <sfx2/sfxcommands.h>
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
@@ -51,7 +52,7 @@ String RID_SVXSTR_REPLACE
ModelessDialog RID_SVXDLG_SEARCH
{
- HelpId = SID_SEARCH_DLG ;
+ HelpId = CMD_SID_SEARCH_DLG ;
OutputSize = TRUE ;
Hide = TRUE ;
SvLook = TRUE ;
@@ -66,6 +67,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
ComboBox ED_SEARCH
{
+ HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH";
Pos = MAP_APPFONT ( 6 , 18 ) ;
Size = MAP_APPFONT ( 132 , 98 ) ;
TabStop = TRUE ;
@@ -73,6 +75,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
ListBox LB_SEARCH
{
+ HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 18 ) ;
Size = MAP_APPFONT ( 132 , 98 ) ;
@@ -103,6 +106,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
ComboBox ED_REPLACE
{
+ HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE";
Pos = MAP_APPFONT ( 6 , 65 ) ;
Size = MAP_APPFONT ( 132 , 98 ) ;
TabStop = TRUE ;
@@ -110,6 +114,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
ListBox LB_REPLACE
{
+ HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 65 ) ;
Size = MAP_APPFONT ( 132 , 98 ) ;
@@ -134,6 +139,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
PushButton BTN_SEARCH
{
+ HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH";
Pos = MAP_APPFONT ( 144 , 9 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Find" ;
@@ -142,6 +148,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
PushButton BTN_SEARCH_ALL
{
+ HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL";
Pos = MAP_APPFONT ( 144 , 26 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Find ~All" ;
@@ -154,6 +161,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
PushButton BTN_REPLACE
{
+ HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE";
Pos = MAP_APPFONT ( 144 , 56 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Replace" ;
@@ -161,6 +169,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
PushButton BTN_REPLACE_ALL
{
+ HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL";
Pos = MAP_APPFONT ( 144 , 73 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Replace A~ll" ;
@@ -174,6 +183,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
PushButton BTN_COMPONENT_1
{
+ HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_1";
Pos = MAP_APPFONT ( 144 , 103 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -181,6 +191,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
PushButton BTN_COMPONENT_2
{
+ HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_2";
Pos = MAP_APPFONT ( 144 , 120 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -188,6 +199,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
CheckBox CB_MATCH_CASE
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE";
Pos = MAP_APPFONT ( 12 , 101 ) ;
Size = MAP_APPFONT ( 126 , 10 ) ;
TabStop = TRUE ;
@@ -195,6 +207,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
CheckBox CB_WHOLE_WORDS
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS";
Pos = MAP_APPFONT ( 12 , 114 ) ;
Size = MAP_APPFONT ( 126 , 10 ) ;
Text [ en-US ] = "Whole wor~ds only" ;
@@ -207,6 +220,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
MoreButton BTN_MORE
{
+ HelpID = "svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE";
Pos = MAP_APPFONT ( 6 , 135 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -235,6 +249,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
CheckBox CB_SELECTIONS
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS";
Pos = MAP_APPFONT ( 12 , 163 ) ;
Size = MAP_APPFONT ( 126 , 10 ) ;
Text [ en-US ] = "C~urrent selection only" ;
@@ -243,6 +258,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
CheckBox CB_BACKWARDS
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS";
Pos = MAP_APPFONT ( 12 , 176 ) ;
Size = MAP_APPFONT ( 126 , 10 ) ;
Text [ en-US ] = "Bac~kwards" ;
@@ -251,6 +267,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
CheckBox CB_REGEXP
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP";
Pos = MAP_APPFONT ( 12 , 189 ) ;
Size = MAP_APPFONT ( 126 , 10 ) ;
Text [ en-US ] = "Regular e~xpressions" ;
@@ -259,6 +276,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
CheckBox CB_SIMILARITY
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SIMILARITY";
Pos = MAP_APPFONT ( 12 , 204 ) ;
Size = MAP_APPFONT ( 109 , 10 ) ;
Text [ en-US ] = "S~imilarity search" ;
@@ -267,6 +285,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
PushButton PB_SIMILARITY
{
+ HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_SIMILARITY";
Pos = MAP_APPFONT ( 124 , 202 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
Text = "~..." ;
@@ -275,6 +294,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
CheckBox CB_LAYOUTS
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS";
Pos = MAP_APPFONT ( 12 , 219 ) ;
Size = MAP_APPFONT ( 126 , 10 ) ;
Text [ en-US ] = "Search for St~yles" ;
@@ -283,6 +303,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
CheckBox CB_NOTES
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES";
Pos = MAP_APPFONT ( 12 , 232 ) ;
Size = MAP_APPFONT ( 126 , 10 ) ;
TabStop = TRUE ;
@@ -290,6 +311,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_MATCH_FULL_HALF_WIDTH";
Pos = MAP_APPFONT ( 12 , 247 ) ;
Size = MAP_APPFONT ( 126 , 10 ) ;
TabStop = TRUE ;
@@ -298,6 +320,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
CheckBox CB_JAP_SOUNDS_LIKE
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_SOUNDS_LIKE";
Pos = MAP_APPFONT ( 12 , 260 ) ;
Size = MAP_APPFONT ( 109 , 10 ) ;
TabStop = TRUE ;
@@ -306,6 +329,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
PushButton PB_JAP_OPTIONS
{
+ HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_JAP_OPTIONS";
Pos = MAP_APPFONT ( 124 , 258 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
Text = "..." ;
@@ -314,6 +338,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
PushButton BTN_ATTRIBUTE
{
+ HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE";
Pos = MAP_APPFONT ( 144 , 163 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Attri~butes..." ;
@@ -322,6 +347,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
PushButton BTN_FORMAT
{
+ HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT";
Pos = MAP_APPFONT ( 144 , 180 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "For~mat..." ;
@@ -330,6 +356,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
PushButton BTN_NOFORMAT
{
+ HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_NOFORMAT";
Pos = MAP_APPFONT ( 144 , 197 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~No Format" ;
@@ -351,6 +378,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
ListBox LB_CALC_SEARCHIN
{
+ HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 75 , 283 ) ;
Size = MAP_APPFONT ( 63 , 48 ) ;
@@ -373,6 +401,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
RadioButton RB_CALC_ROWS
{
+ HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS";
Pos = MAP_APPFONT ( 75 , 300 ) ;
Size = MAP_APPFONT ( 63 , 10 ) ;
Text [ en-US ] = "Ro~ws" ;
@@ -380,6 +409,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
RadioButton RB_CALC_COLUMNS
{
+ HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS";
Pos = MAP_APPFONT ( 75 , 313 ) ;
Size = MAP_APPFONT ( 63 , 10 ) ;
Text [ en-US ] = "Colu~mns" ;
@@ -387,6 +417,7 @@ ModelessDialog RID_SVXDLG_SEARCH
};
CheckBox CB_ALL_SHEETS
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS";
Pos = MAP_APPFONT ( 12 , 326 ) ;
Size = MAP_APPFONT ( 126 , 10 ) ;
Text [ en-US ] = "Search in all sheets" ;
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index 0fce465eca..791fb8de37 100644
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.src
@@ -27,6 +27,8 @@
#include <svx/dialogs.hrc>
#include "float3d.hrc"
+#include <svx/svxcommands.h>
+
#define WIDTH 158
#define HEIGHT 209
#define BORDER 3
@@ -64,7 +66,7 @@
DockingWindow RID_SVXFLOAT_3D
{
- HelpID = SID_3D_WIN ;
+ HelpID = CMD_SID_3D_WIN ;
Border = TRUE ;
Hide = TRUE ;
SVLook = TRUE ;
@@ -81,6 +83,7 @@ DockingWindow RID_SVXFLOAT_3D
ImageButton BTN_GEO
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_GEO";
Pos = MAP_APPFONT ( 4 , BORDER ) ;
Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ;
TabStop = TRUE ;
@@ -93,6 +96,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_REPRESENTATION
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_REPRESENTATION";
Pos = MAP_APPFONT ( 22 , BORDER ) ;
Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ;
TabStop = TRUE ;
@@ -105,6 +109,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_LIGHT
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT";
Pos = MAP_APPFONT ( 40 , BORDER ) ;
Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ;
TabStop = TRUE ;
@@ -117,6 +122,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEXTURE
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEXTURE";
Pos = MAP_APPFONT ( 58 , BORDER ) ;
Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ;
ButtonImage = Image
@@ -129,6 +135,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_MATERIAL
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MATERIAL";
Pos = MAP_APPFONT ( 76 , BORDER ) ;
Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ;
TabStop = TRUE ;
@@ -142,6 +149,7 @@ DockingWindow RID_SVXFLOAT_3D
ImageButton BTN_UPDATE
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_UPDATE";
Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH * 2 , BORDER ) ;
Size = IMG_BUTTON_SIZE;
TabStop = TRUE ;
@@ -154,6 +162,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_ASSIGN
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_ASSIGN";
Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH , BORDER ) ;
Size = IMG_BUTTON_SIZE;
TabStop = TRUE ;
@@ -167,6 +176,7 @@ DockingWindow RID_SVXFLOAT_3D
// Unterer Teil
ImageButton BTN_CHANGE_TO_3D
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D";
Pos = MAP_APPFONT ( 9 , 200 - BUTTON_HEIGHT ) ;
Size = IMG_BUTTON_SIZE;
TabStop = TRUE ;
@@ -180,6 +190,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_LATHE_OBJ
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LATHE_OBJ";
Pos = MAP_APPFONT ( 9 + BUTTON_WIDTH + 1 , 200 - BUTTON_HEIGHT ) ;
Size = IMG_BUTTON_SIZE;
TabStop = TRUE ;
@@ -193,6 +204,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_PERSPECTIVE
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_PERSPECTIVE";
Pos = MAP_APPFONT ( 9 + ( BUTTON_WIDTH + 1 ) * 2 , 200 - BUTTON_HEIGHT ) ;
Size = IMG_BUTTON_SIZE;
TabStop = TRUE ;
@@ -232,6 +244,7 @@ DockingWindow RID_SVXFLOAT_3D
};
MetricField MTR_PERCENT_DIAGONAL
{
+ HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , FIRST_FT_START_Y - 2 ) ;
Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -252,6 +265,7 @@ DockingWindow RID_SVXFLOAT_3D
};
MetricField MTR_BACKSCALE
{
+ HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_BACKSCALE";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1,
FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ;
@@ -273,6 +287,7 @@ DockingWindow RID_SVXFLOAT_3D
};
MetricField MTR_END_ANGLE
{
+ HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_END_ANGLE";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1,
FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ;
@@ -295,6 +310,7 @@ DockingWindow RID_SVXFLOAT_3D
};
MetricField MTR_DEPTH
{
+ HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DEPTH";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1,
FIRST_FT_START_Y + 3*FT_OFFSET_NEXT - 2 ) ;
@@ -326,6 +342,7 @@ DockingWindow RID_SVXFLOAT_3D
};
NumericField NUM_HORIZONTAL
{
+ HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_HORIZONTAL";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + 42, SEGMENTS_START_Y+13-2 ) ;
Size = MAP_APPFONT ( 22 , 12 ) ;
@@ -345,6 +362,7 @@ DockingWindow RID_SVXFLOAT_3D
};
NumericField NUM_VERTICAL
{
+ HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_VERTICAL";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + 114+2 , SEGMENTS_START_Y+13-2 ) ;
Size = MAP_APPFONT ( 22 , 12 ) ;
@@ -365,6 +383,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_NORMALS_OBJ
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ";
Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y ) ;
Size = IMG_BUTTON_SIZE;
ButtonImage = Image
@@ -377,6 +396,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_NORMALS_FLAT
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT";
Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) , NORMALS_BT_START_Y ) ;
Size = IMG_BUTTON_SIZE;
ButtonImage = Image
@@ -389,6 +409,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_NORMALS_SPHERE
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE";
Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 , NORMALS_BT_START_Y ) ;
Size = IMG_BUTTON_SIZE;
ButtonImage = Image
@@ -401,6 +422,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_NORMALS_INVERT
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT";
Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ;
Size = IMG_BUTTON_SIZE;
ButtonImage = Image
@@ -413,6 +435,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TWO_SIDED_LIGHTING
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING";
Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 ,
NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ;
Size = IMG_BUTTON_SIZE;
@@ -426,6 +449,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_DOUBLE_SIDED
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED";
Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + 2*IMG_BUTTON_NEXT ) ;
Size = IMG_BUTTON_SIZE;
ButtonImage = Image
@@ -446,6 +470,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_SHADEMODE
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_SHADEMODE";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , 30 ) ;
Size = MAP_APPFONT ( 83 , 100 ) ;
@@ -466,6 +491,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_SHADOW_3D
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SHADOW_3D";
Pos = MAP_APPFONT ( FT_INDENT , SHADOW_START_Y + 11 ) ;
Size = IMG_BUTTON_SIZE;
TabStop = TRUE ;
@@ -486,6 +512,7 @@ DockingWindow RID_SVXFLOAT_3D
};
MetricField MTR_SLANT
{
+ HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_SLANT";
Border = TRUE ;
Pos = MAP_APPFONT ( 99 , SHADOW_START_Y + 11 ) ;
Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -513,6 +540,7 @@ DockingWindow RID_SVXFLOAT_3D
};
MetricField MTR_DISTANCE
{
+ HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DISTANCE";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 ,
CAMERA_START_Y + 11 - 2 ) ;
@@ -537,6 +565,7 @@ DockingWindow RID_SVXFLOAT_3D
};
MetricField MTR_FOCAL_LENGTH
{
+ HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 ,
CAMERA_START_Y + 11 + FT_OFFSET_NEXT - 2 ) ;
@@ -568,6 +597,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_LIGHT_1
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_1";
Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 12 , 14 ) ;
ButtonImage = Image
@@ -580,6 +610,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_LIGHT_2
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_2";
Pos = MAP_APPFONT ( FT_INDENT + 13 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 12 , 14 ) ;
ButtonImage = Image
@@ -592,6 +623,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_LIGHT_3
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_3";
Pos = MAP_APPFONT ( FT_INDENT + 2*13 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 12 , 14 ) ;
ButtonImage = Image
@@ -604,6 +636,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_LIGHT_4
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_4";
Pos = MAP_APPFONT ( FT_INDENT + 3*13 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 12 , 14 ) ;
ButtonImage = Image
@@ -616,6 +649,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_LIGHT_5
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_5";
Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 26 ) ;
Size = MAP_APPFONT ( 12 , 14 ) ;
ButtonImage = Image
@@ -628,6 +662,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_LIGHT_6
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_6";
Pos = MAP_APPFONT ( FT_INDENT + 13, FIRST_FT_START_Y + 26 ) ;
Size = MAP_APPFONT ( 12 , 14 ) ;
ButtonImage = Image
@@ -640,6 +675,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_LIGHT_7
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_7";
Pos = MAP_APPFONT ( FT_INDENT + 2*13, FIRST_FT_START_Y + 26 ) ;
Size = MAP_APPFONT ( 12 , 14 ) ;
ButtonImage = Image
@@ -652,6 +688,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_LIGHT_8
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_8";
Pos = MAP_APPFONT ( FT_INDENT +3*13 , FIRST_FT_START_Y + 26 ) ;
Size = MAP_APPFONT ( 12 , 14 ) ;
ButtonImage = Image
@@ -664,6 +701,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_LIGHT_1
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_1";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -672,6 +710,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_LIGHT_2
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_2";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -680,6 +719,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_LIGHT_3
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_3";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -688,6 +728,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_LIGHT_4
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_4";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -696,6 +737,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_LIGHT_5
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_5";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -704,6 +746,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_LIGHT_6
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_6";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -712,6 +755,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_LIGHT_7
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_7";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -720,6 +764,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_LIGHT_8
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_8";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -728,6 +773,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_LIGHT_COLOR
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR";
Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 11 ) ;
Size = MAP_APPFONT ( 12 , 14 ) ;
ButtonImage = Image
@@ -746,6 +792,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_AMBIENTLIGHT
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + 53 ) ;
Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -754,6 +801,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_AMBIENT_COLOR
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR";
Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 53 ) ;
Size = MAP_APPFONT ( 12 , 14 ) ;
ButtonImage = Image
@@ -780,6 +828,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_LUMINANCE
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
FIRST_FT_START_Y - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -793,6 +842,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_COLOR
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_COLOR";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH,
FIRST_FT_START_Y - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -812,6 +862,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_REPLACE
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_REPLACE";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -825,6 +876,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_MODULATE
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_MODULATE";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH,
FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -838,6 +890,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_BLEND
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_BLEND";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH,
FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -857,6 +910,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_OBJECT_X
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -870,6 +924,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_PARALLEL_X
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH,
FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -883,6 +938,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_CIRCLE_X
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH,
FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -902,6 +958,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_OBJECT_Y
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -915,6 +972,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_PARALLEL_Y
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH,
FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -928,6 +986,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_CIRCLE_Y
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH,
FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -947,6 +1006,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_TEX_FILTER
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_FILTER";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
FIRST_FT_START_Y + 4*IMG_BUTTON_NEXT - 2 ) ;
Size = IMG_BUTTON_SIZE;
@@ -984,6 +1044,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_MAT_FAVORITES
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_FAVORITES";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1,
FIRST_FT_START_Y - 2 ) ;
@@ -1008,6 +1069,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_MAT_COLOR
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_COLOR";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 ,
FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ;
@@ -1017,6 +1079,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_MAT_COLOR
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_COLOR";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 ,
FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ;
Size = MAP_APPFONT ( 12, 14 ) ;
@@ -1036,6 +1099,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_MAT_EMISSION
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_EMISSION";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 ,
FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ;
@@ -1045,6 +1109,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_EMISSION_COLOR
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_EMISSION_COLOR";
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 ,
FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ;
Size = MAP_APPFONT ( 12, 14 ) ;
@@ -1071,6 +1136,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ListBox LB_MAT_SPECULAR
{
+ HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_SPECULAR";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, SPECULAR_START_Y + 13 - 2 ) ;
Size = MAP_APPFONT ( 68 , 100 ) ;
@@ -1079,6 +1145,7 @@ DockingWindow RID_SVXFLOAT_3D
};
ImageButton BTN_SPECULAR_COLOR
{
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SPECULAR_COLOR";
Pos = MAP_APPFONT ( 137 , SPECULAR_START_Y + 13 - 2 ) ;
Size = MAP_APPFONT ( 12, 14 ) ;
ButtonImage = Image
@@ -1097,6 +1164,7 @@ DockingWindow RID_SVXFLOAT_3D
};
MetricField MTR_MAT_SPECULAR_INTENSITY
{
+ HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_MAT_SPECULAR_INTENSITY";
Border = TRUE ;
Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 ,
SPECULAR_START_Y + 13 + FT_OFFSET_NEXT ) ;
@@ -1114,6 +1182,7 @@ DockingWindow RID_SVXFLOAT_3D
};
/*
ImageButton BTN_MAT_FAVORITES {
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_FAVORITES";
Pos = MAP_APPFONT( BORDER, GROUP_PREV_Y+1 );
Size = IMG_BUTTON_SIZE;
QuickHelpText = "Material Favoriten" ;
@@ -1125,6 +1194,7 @@ DockingWindow RID_SVXFLOAT_3D
TabStop = TRUE;
};
ImageButton BTN_MAT_EDITOR {
+ HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_EDITOR";
Pos = MAP_APPFONT( BORDER + BUTTON_WIDTH, GROUP_PREV_Y+1 );
Size = IMG_BUTTON_SIZE;
QuickHelpText = "Material Editor" ;
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index e5cc168025..d7a264f354 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -38,6 +38,7 @@
#include "sdbdatacolumn.hxx"
#include "svx/fmgridcl.hxx"
#include "svx/svxids.hrc"
+#include <tools/urlobj.hxx>
/** === begin UNO includes === **/
#include <com/sun/star/awt/PosSize.hpp>
@@ -1973,14 +1974,10 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
}
else if ( 0 == PropertyName.compareTo( FM_PROP_HELPURL ) )
{
- String sHelpURL(::comphelper::getString(Value));
- String sPattern;
- sPattern.AssignAscii("HID:");
- if (sHelpURL.Equals(sPattern, 0, sPattern.Len()))
- {
- String sID = sHelpURL.Copy(sPattern.Len());
- pGrid->SetHelpId(sID.ToInt32());
- }
+ INetURLObject aHID( ::comphelper::getString(Value) );
+ DBG_ASSERT( aHID.GetProtocol() == INET_PROT_HID, "Wrong HelpURL!" );
+ if ( aHID.GetProtocol() == INET_PROT_HID )
+ pGrid->SetHelpId( rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) );
}
else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) )
{
diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src
index f6e4c16404..883a452075 100644
--- a/svx/source/fmcomp/gridctrl.src
+++ b/svx/source/fmcomp/gridctrl.src
@@ -29,6 +29,8 @@
#include <svx/svxids.hrc>
#include "globlmn.hrc"
#include "fmhelp.hrc"
+#include <svx/svxcommands.h>
+
Menu RID_SVXMNU_ROWS
{
ItemList =
@@ -36,19 +38,19 @@ Menu RID_SVXMNU_ROWS
MenuItem
{
Identifier = SID_FM_DELETEROWS ;
- HelpID = SID_FM_DELETEROWS ;
+ HelpId = HID_FM_DELETEROWS ;
Text [ en-US ] = "Delete Rows" ;
};
MenuItem
{
Identifier = SID_FM_RECORD_SAVE ;
- HelpID = SID_FM_RECORD_SAVE ;
+ HelpId = CMD_SID_FM_RECORD_SAVE ;
Text [ en-US ] = "Save Record" ;
};
MenuItem
{
Identifier = SID_FM_RECORD_UNDO ;
- HelpID = SID_FM_RECORD_UNDO ;
+ HelpId = CMD_SID_FM_RECORD_UNDO ;
Text [ en-US ] = "Undo: Data entry" ;
};
};
@@ -60,7 +62,7 @@ Menu RID_SVXMNU_COLS
MenuItem
{
Identifier = SID_FM_INSERTCOL ;
- HelpID = SID_FM_INSERTCOL ;
+ HelpId = HID_FM_INSERTCOL ;
Text [ en-US ] = "Insert ~Column" ;
SubMenu = Menu
{
@@ -69,61 +71,61 @@ Menu RID_SVXMNU_COLS
MenuItem
{
Identifier = SID_FM_EDIT ;
- HelpID = SID_FM_EDIT ;
+ HelpId = CMD_SID_FM_EDIT ;
Text [ en-US ] = "Text Box" ;
};
MenuItem
{
Identifier = SID_FM_CHECKBOX ;
- HelpID = SID_FM_CHECKBOX ;
+ HelpId = CMD_SID_FM_CHECKBOX ;
Text [ en-US ] = "Check Box" ;
};
MenuItem
{
Identifier = SID_FM_COMBOBOX ;
- HelpID = SID_FM_COMBOBOX ;
+ HelpId = CMD_SID_FM_COMBOBOX ;
Text [ en-US ] = "Combo Box" ;
};
MenuItem
{
Identifier = SID_FM_LISTBOX ;
- HelpID = SID_FM_LISTBOX ;
+ HelpId = CMD_SID_FM_LISTBOX ;
Text [ en-US ] = "List Box" ;
};
MenuItem
{
Identifier = SID_FM_DATEFIELD ;
- HelpID = SID_FM_DATEFIELD ;
+ HelpId = CMD_SID_FM_DATEFIELD ;
Text [ en-US ] = "Date Field" ;
};
MenuItem
{
Identifier = SID_FM_TIMEFIELD ;
- HelpID = SID_FM_TIMEFIELD ;
+ HelpId = CMD_SID_FM_TIMEFIELD ;
Text [ en-US ] = "Time Field" ;
};
MenuItem
{
Identifier = SID_FM_NUMERICFIELD ;
- HelpID = SID_FM_NUMERICFIELD ;
+ HelpId = CMD_SID_FM_NUMERICFIELD ;
Text [ en-US ] = "Numeric Field" ;
};
MenuItem
{
Identifier = SID_FM_CURRENCYFIELD ;
- HelpID = SID_FM_CURRENCYFIELD ;
+ HelpId = CMD_SID_FM_CURRENCYFIELD ;
Text [ en-US ] = "Currency Field" ;
};
MenuItem
{
Identifier = SID_FM_PATTERNFIELD ;
- HelpID = SID_FM_PATTERNFIELD ;
+ HelpId = CMD_SID_FM_PATTERNFIELD ;
Text [ en-US ] = "Pattern Field" ;
};
MenuItem
{
Identifier = SID_FM_FORMATTEDFIELD ;
- HelpID = SID_FM_FORMATTEDFIELD ;
+ HelpId = CMD_SID_FM_FORMATTEDFIELD ;
Text [ en-US ] = "Formatted Field" ;
};
MenuItem
@@ -140,25 +142,25 @@ Menu RID_SVXMNU_COLS
MenuItem
{
Identifier = SID_FM_CHANGECOL ;
- HelpID = SID_FM_CHANGECOL ;
+ HelpId = HID_FM_CHANGECOL ;
Text [ en-US ] = "~Replace with" ;
};
MenuItem
{
Identifier = SID_FM_DELETECOL ;
- HelpID = SID_FM_DELETECOL ;
+ HelpId = HID_FM_DELETECOL ;
Text [ en-US ] = "Delete Column" ;
};
MenuItem
{
Identifier = SID_FM_HIDECOL ;
- HelpID = SID_FM_HIDECOL ;
+ HelpId = HID_FM_HIDECOL ;
Text [ en-US ] = "~Hide Column";
};
MenuItem
{
Identifier = SID_FM_SHOWCOLS ;
- HelpID = SID_FM_SHOWCOLS ;
+ HelpId = HID_FM_SHOWCOLS ;
SubMenu = Menu
{
ItemList =
@@ -166,7 +168,7 @@ Menu RID_SVXMNU_COLS
MenuItem
{
Identifier = SID_FM_SHOWCOLS_MORE ;
- HelpID = SID_FM_SHOWCOLS_MORE ;
+ HelpId = HID_FM_SHOWCOLS_MORE ;
Text [ en-US ] = "~More...";
};
MenuItem
@@ -176,7 +178,7 @@ Menu RID_SVXMNU_COLS
MenuItem
{
Identifier = SID_FM_SHOWALLCOLS ;
- HelpID = SID_FM_SHOWALLCOLS ;
+ HelpId = HID_FM_SHOWALLCOLS ;
Text [ en-US ] = "~All";
};
};
@@ -186,7 +188,7 @@ Menu RID_SVXMNU_COLS
MenuItem
{
Identifier = SID_FM_SHOW_PROPERTY_BROWSER ;
- HelpID = SID_FM_SHOW_PROPERTY_BROWSER ;
+ HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ;
Text [ en-US ] = "Column..." ;
};
};
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 5d4aaf69b2..a57398758c 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -34,6 +34,7 @@
TabPage RID_SVX_XFORMS_TABPAGES
{
+ HelpID = "svx:TabPage:RID_SVX_XFORMS_TABPAGES";
Hide = TRUE ;
DialogControl = TRUE;
Size = MAP_APPFONT ( 63 , 100 ) ;
@@ -348,6 +349,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
Edit ED_NAME
{
+ HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME";
Pos = MAP_APPFONT ( 78 , 14 ) ;
Size = MAP_APPFONT ( 96 , 12 ) ;
Border = TRUE ;
@@ -361,12 +363,14 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
Edit ED_DEFAULT
{
+ HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT";
Pos = MAP_APPFONT ( 78 , 29 ) ;
Size = MAP_APPFONT ( 96 , 12 ) ;
Border = TRUE ;
};
PushButton PB_DEFAULT
{
+ HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_DEFAULT";
Pos = MAP_APPFONT ( 160 , 29 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
TabStop = TRUE ;
@@ -388,6 +392,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
ListBox LB_DATATYPE
{
+ HelpID = "svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE";
Pos = MAP_APPFONT ( 78 , 55 ) ;
Size = MAP_APPFONT ( 96 , 45 ) ;
Border = TRUE ;
@@ -395,6 +400,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
CheckBox CB_REQUIRED
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED";
Pos = MAP_APPFONT ( 6 , 72 ) ;
Size = MAP_APPFONT ( 69 , 10 ) ;
TabStop = TRUE ;
@@ -402,6 +408,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
PushButton PB_REQUIRED
{
+ HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED";
Pos = MAP_APPFONT ( 78 , 70 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -409,6 +416,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
CheckBox CB_RELEVANT
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT";
Pos = MAP_APPFONT ( 6 , 89 ) ;
Size = MAP_APPFONT ( 69 , 10 ) ;
TabStop = TRUE ;
@@ -416,6 +424,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
PushButton PB_RELEVANT
{
+ HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT";
Pos = MAP_APPFONT ( 78 , 87 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -423,6 +432,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
CheckBox CB_CONSTRAINT
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT";
Pos = MAP_APPFONT ( 6 , 106 ) ;
Size = MAP_APPFONT ( 69 , 10 ) ;
TabStop = TRUE ;
@@ -430,6 +440,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
PushButton PB_CONSTRAINT
{
+ HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT";
Pos = MAP_APPFONT ( 78 , 104 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -437,6 +448,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
CheckBox CB_READONLY
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY";
Pos = MAP_APPFONT ( 6 , 123 ) ;
Size = MAP_APPFONT ( 69 , 10 ) ;
TabStop = TRUE ;
@@ -444,6 +456,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
PushButton PB_READONLY
{
+ HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY";
Pos = MAP_APPFONT ( 78 , 121 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -451,6 +464,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
CheckBox CB_CALCULATE
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE";
Pos = MAP_APPFONT ( 6 , 140 ) ;
Size = MAP_APPFONT ( 69 , 10 ) ;
TabStop = TRUE ;
@@ -458,6 +472,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
};
PushButton PB_CALCULATE
{
+ HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE";
Pos = MAP_APPFONT ( 78 , 138 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -574,6 +589,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION
};
MultiLineEdit ED_CONDITION
{
+ HelpID = "svx:MultiLineEdit:RID_SVXDLG_ADD_CONDITION:ED_CONDITION";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 198 , 34 ) ;
@@ -599,6 +615,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION
};
PushButton PB_EDIT_NAMESPACES
{
+ HelpID = "svx:PushButton:RID_SVXDLG_ADD_CONDITION:PB_EDIT_NAMESPACES";
Pos = MAP_APPFONT ( 132 , 102 ) ;
Size = MAP_APPFONT ( 72 , 14 ) ;
TabStop = TRUE ;
@@ -655,6 +672,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
};
PushButton PB_ADD_NAMESPACE
{
+ HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_ADD_NAMESPACE";
Pos = MAP_APPFONT ( 184 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -662,6 +680,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
};
PushButton PB_EDIT_NAMESPACE
{
+ HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_EDIT_NAMESPACE";
Pos = MAP_APPFONT ( 184 , 31 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -669,6 +688,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
};
PushButton PB_DELETE_NAMESPACE
{
+ HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_DELETE_NAMESPACE";
Pos = MAP_APPFONT ( 184 , 48 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -725,6 +745,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE
};
Edit ED_PREFIX
{
+ HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_PREFIX";
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 45 , 12 ) ;
Border = TRUE;
@@ -738,6 +759,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE
};
Edit ED_URL
{
+ HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_URL";
Pos = MAP_APPFONT ( 54 , 14 ) ;
Size = MAP_APPFONT ( 150 , 12 ) ;
Border = TRUE;
@@ -795,6 +817,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
};
Edit ED_SUBMIT_NAME
{
+ HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_NAME";
Pos = MAP_APPFONT ( 78 , 14 ) ;
Size = MAP_APPFONT ( 96 , 12 ) ;
Border = TRUE ;
@@ -808,6 +831,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
};
Edit ED_SUBMIT_ACTION
{
+ HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_ACTION";
Pos = MAP_APPFONT ( 78 , 29 ) ;
Size = MAP_APPFONT ( 96 , 12 ) ;
Border = TRUE ;
@@ -821,6 +845,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
};
ListBox LB_SUBMIT_METHOD
{
+ HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_METHOD";
Pos = MAP_APPFONT ( 78 , 44 ) ;
Size = MAP_APPFONT ( 96 , 51 ) ;
Border = TRUE ;
@@ -835,12 +860,14 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
};
Edit ED_SUBMIT_REF
{
+ HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_REF";
Pos = MAP_APPFONT ( 78 , 60 ) ;
Size = MAP_APPFONT ( 79, 12 ) ;
Border = TRUE ;
};
PushButton PB_SUBMIT_REF
{
+ HelpID = "svx:PushButton:RID_SVXDLG_ADD_SUBMISSION:PB_SUBMIT_REF";
Pos = MAP_APPFONT ( 159 , 59 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
TabStop = TRUE ;
@@ -855,6 +882,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
};
ListBox LB_SUBMIT_BIND
{
+ HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_BIND";
Pos = MAP_APPFONT ( 78 , 75 ) ;
Size = MAP_APPFONT ( 96 , 51 ) ;
Border = TRUE ;
@@ -869,6 +897,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
};
ListBox LB_SUBMIT_REPLACE
{
+ HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_REPLACE";
Pos = MAP_APPFONT ( 78 , 90 ) ;
Size = MAP_APPFONT ( 96 , 51 ) ;
Border = TRUE ;
@@ -949,12 +978,14 @@ ModalDialog RID_SVXDLG_ADD_MODEL
};
Edit ED_INST_NAME
{
+ HelpID = "svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME";
Pos = MAP_APPFONT ( 60 , 14 ) ;
Size = MAP_APPFONT ( 114 , 12 ) ;
Border = TRUE ;
};
CheckBox CB_MODIFIES_DOCUMENT
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_ADD_MODEL:CB_MODIFIES_DOCUMENT";
Pos = MAP_APPFONT( 6, 32 );
Size = MAP_APPFONT( 168, 16 );
Top = TRUE;
@@ -1015,6 +1046,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
};
Edit ED_INST_NAME
{
+ HelpID = "svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME";
Pos = MAP_APPFONT ( 60 , 14 ) ;
Size = MAP_APPFONT ( 144 , 12 ) ;
Border = TRUE ;
@@ -1028,6 +1060,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
};
ComboBox ED_INST_URL
{
+ HelpID = "svx:ComboBox:RID_SVXDLG_ADD_INSTANCE:ED_INST_URL";
Pos = MAP_APPFONT ( 60 , 29 ) ;
Size = MAP_APPFONT ( 127 , 48 ) ;
DropDown = TRUE ;
@@ -1035,6 +1068,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
};
PushButton PB_FILEPICKER
{
+ HelpID = "svx:PushButton:RID_SVXDLG_ADD_INSTANCE:PB_FILEPICKER";
Pos = MAP_APPFONT ( 190 , 28 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
TabStop = TRUE ;
@@ -1042,6 +1076,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
};
CheckBox CB_INST_LINKINST
{
+ HelpID = "svx:CheckBox:RID_SVXDLG_ADD_INSTANCE:CB_INST_LINKINST";
Pos = MAP_APPFONT ( 6 , 44 ) ;
Size = MAP_APPFONT ( 198 , 10 ) ;
TabStop = TRUE ;
diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src
index 36c12a001e..5035b276e4 100644
--- a/svx/source/form/filtnav.src
+++ b/svx/source/form/filtnav.src
@@ -27,6 +27,8 @@
#include <svx/svxids.hrc>
#include "fmresids.hrc"
+#include "fmhelp.hrc"
+
Menu RID_FM_FILTER_MENU
{
ItemList =
@@ -34,25 +36,25 @@ Menu RID_FM_FILTER_MENU
MenuItem
{
Identifier = SID_FM_DELETE ;
- HelpID = SID_FM_DELETE ;
+ HelpId = HID_FM_DELETE;
Text [ en-US ] = "~Delete" ;
};
MenuItem
{
Identifier = SID_FM_FILTER_EDIT ;
- HelpID = SID_FM_FILTER_EDIT ;
+ HelpId = HID_FM_FILTER_EDIT;
Text [ en-US ] = "~Edit" ;
};
MenuItem
{
Identifier = SID_FM_FILTER_IS_NULL ;
- HelpID = SID_FM_FILTER_IS_NULL ;
+ HelpId = HID_FM_FILTER_IS_NULL;
Text [ en-US ] = "~Is Null" ;
};
MenuItem
{
Identifier = SID_FM_FILTER_IS_NOT_NULL ;
- HelpID = SID_FM_FILTER_IS_NOT_NULL ;
+ HelpId = HID_FM_FILTER_IS_NOT_NULL;
Text [ en-US ] = "I~s not Null" ;
};
};
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index 218df02f07..0fe0e38734 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -29,6 +29,9 @@
#include "fmresids.hrc"
#include "fmexpl.hrc"
#include "globlmn.hrc"
+#include <svx/svxcommands.h>
+#include "fmhelp.hrc"
+
Menu RID_FMEXPLORER_POPUPMENU
{
ItemList =
@@ -36,7 +39,7 @@ Menu RID_FMEXPLORER_POPUPMENU
MenuItem
{
Identifier = SID_FM_NEW ;
- HelpID = SID_FM_NEW ;
+ HelpId = HID_FM_NEW ;
Text [ en-US ] = "~New" ;
SubMenu = Menu
{
@@ -45,13 +48,13 @@ Menu RID_FMEXPLORER_POPUPMENU
MenuItem
{
Identifier = SID_FM_NEW_FORM ;
- HelpID = SID_FM_NEW_FORM ;
+ HelpId = HID_FM_NEW_FORM ;
Text [ en-US ] = "Form" ;
};
MenuItem
{
Identifier = SID_FM_NEW_HIDDEN ;
- HelpID = SID_FM_NEW_HIDDEN ;
+ HelpId = HID_FM_NEW_HIDDEN ;
Text [ en-US ] = "Hidden Control" ;
};
};
@@ -60,7 +63,7 @@ Menu RID_FMEXPLORER_POPUPMENU
MenuItem
{
Identifier = SID_FM_CHANGECONTROLTYPE ;
- HelpID = SID_FM_CHANGECONTROLTYPE ;
+ HelpId = CMD_SID_FM_CHANGECONTROLTYPE ;
Text [ en-US ] = "Replace with";
};
MenuItem { ITEM_EDIT_CUT };
@@ -69,37 +72,37 @@ Menu RID_FMEXPLORER_POPUPMENU
MenuItem
{
Identifier = SID_FM_DELETE ;
- HelpID = SID_FM_DELETE ;
+ HelpId = HID_FM_DELETE ;
Text [ en-US ] = "~Delete" ;
};
MenuItem
{
Identifier = SID_FM_TAB_DIALOG ;
- HelpID = SID_FM_TAB_DIALOG ;
+ HelpId = CMD_SID_FM_TAB_DIALOG ;
Text [ en-US ] = "Tab Order..." ;
};
MenuItem
{
Identifier = SID_FM_RENAME_OBJECT ;
- HelpID = SID_FM_RENAME_OBJECT ;
+ HelpId = HID_FM_RENAME_OBJECT ;
Text [ en-US ] = "~Rename" ;
};
MenuItem
{
Identifier = SID_FM_SHOW_PROPERTY_BROWSER ;
- HelpID = SID_FM_SHOW_PROPERTY_BROWSER ;
+ HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ;
Text [ en-US ] = "Propert~ies" ;
};
MenuItem
{
Identifier = SID_FM_OPEN_READONLY ;
- HelpID = SID_FM_OPEN_READONLY ;
+ HelpId = CMD_SID_FM_OPEN_READONLY ;
Text [ en-US ] = "Open in Design Mode" ;
};
MenuItem
{
Identifier = SID_FM_AUTOCONTROLFOCUS ;
- HelpID = SID_FM_AUTOCONTROLFOCUS ;
+ HelpId = CMD_SID_FM_AUTOCONTROLFOCUS ;
Text [ en-US ] = "Automatic Control Focus";
};
};
@@ -112,140 +115,140 @@ Menu RID_FMSHELL_CONVERSIONMENU
MenuItem
{
Identifier = SID_FM_CONVERTTO_EDIT ;
- HelpID = SID_FM_CONVERTTO_EDIT ;
+ HelpId = CMD_SID_FM_CONVERTTO_EDIT ;
Command = ".uno:ConvertToEdit" ;
Text [ en-US ] = "~Text Box";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_BUTTON ;
- HelpID = SID_FM_CONVERTTO_BUTTON ;
+ HelpId = CMD_SID_FM_CONVERTTO_BUTTON ;
Command = ".uno:ConvertToButton" ;
Text [ en-US ] = "~Button";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_FIXEDTEXT ;
- HelpID = SID_FM_CONVERTTO_FIXEDTEXT ;
+ HelpId = CMD_SID_FM_CONVERTTO_FIXEDTEXT ;
Command = ".uno:ConvertToFixed" ;
Text [ en-US ] = "La~bel field";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_GROUPBOX ;
- HelpID = SID_FM_CONVERTTO_GROUPBOX ;
+ HelpId = CMD_SID_FM_CONVERTTO_GROUPBOX ;
Command = ".uno:ConvertToGroup" ;
Text [ en-US ] = "G~roup Box";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_LISTBOX ;
- HelpID = SID_FM_CONVERTTO_LISTBOX ;
+ HelpId = CMD_SID_FM_CONVERTTO_LISTBOX ;
Command = ".uno:ConvertToList" ;
Text [ en-US ] = "L~ist Box";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_CHECKBOX ;
- HelpID = SID_FM_CONVERTTO_CHECKBOX ;
+ HelpId = CMD_SID_FM_CONVERTTO_CHECKBOX ;
Command = ".uno:ConvertToCheckBox" ;
Text [ en-US ] = "~Check Box";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_RADIOBUTTON ;
- HelpID = SID_FM_CONVERTTO_RADIOBUTTON ;
+ HelpId = CMD_SID_FM_CONVERTTO_RADIOBUTTON ;
Command = ".uno:ConvertToRadio" ;
Text [ en-US ] = "~Radio Button";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_COMBOBOX ;
- HelpID = SID_FM_CONVERTTO_COMBOBOX ;
+ HelpId = CMD_SID_FM_CONVERTTO_COMBOBOX ;
Command = ".uno:ConvertToCombo" ;
Text [ en-US ] = "Combo Bo~x";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_IMAGEBUTTON ;
- HelpID = SID_FM_CONVERTTO_IMAGEBUTTON ;
+ HelpId = CMD_SID_FM_CONVERTTO_IMAGEBUTTON ;
Command = ".uno:ConvertToImageBtn" ;
Text [ en-US ] = "I~mage Button";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_FILECONTROL ;
- HelpID = SID_FM_CONVERTTO_FILECONTROL ;
+ HelpId = CMD_SID_FM_CONVERTTO_FILECONTROL ;
Command = ".uno:ConvertToFileControl" ;
Text [ en-US ] = "~File Selection";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_DATE ;
- HelpID = SID_FM_CONVERTTO_DATE ;
+ HelpId = CMD_SID_FM_CONVERTTO_DATE ;
Command = ".uno:ConvertToDate" ;
Text [ en-US ] = "~Date Field";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_TIME ;
- HelpID = SID_FM_CONVERTTO_TIME ;
+ HelpId = CMD_SID_FM_CONVERTTO_TIME ;
Command = ".uno:ConvertToTime" ;
Text [ en-US ] = "Tim~e Field";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_NUMERIC ;
- HelpID = SID_FM_CONVERTTO_NUMERIC ;
+ HelpId = CMD_SID_FM_CONVERTTO_NUMERIC ;
Command = ".uno:ConvertToNumeric" ;
Text [ en-US ] = "~Numerical Field";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_CURRENCY ;
- HelpID = SID_FM_CONVERTTO_CURRENCY ;
+ HelpId = CMD_SID_FM_CONVERTTO_CURRENCY ;
Command = ".uno:ConvertToCurrency" ;
Text [ en-US ] = "C~urrency Field";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_PATTERN ;
- HelpID = SID_FM_CONVERTTO_PATTERN ;
+ HelpId = CMD_SID_FM_CONVERTTO_PATTERN ;
Command = ".uno:ConvertToPattern" ;
Text [ en-US ] = "~Pattern Field";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_IMAGECONTROL ;
- HelpID = SID_FM_CONVERTTO_IMAGECONTROL ;
+ HelpId = CMD_SID_FM_CONVERTTO_IMAGECONTROL ;
Command = ".uno:ConvertToImageControl" ;
Text [ en-US ] = "Ima~ge Control";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_FORMATTED ;
- HelpID = SID_FM_CONVERTTO_FORMATTED ;
+ HelpId = CMD_SID_FM_CONVERTTO_FORMATTED ;
Command = ".uno:ConvertToFormatted" ;
Text [ en-US ] = "Fo~rmatted Field";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_SCROLLBAR ;
- HelpID = SID_FM_CONVERTTO_SCROLLBAR ;
+ HelpId = CMD_SID_FM_CONVERTTO_SCROLLBAR ;
Command = ".uno:ConvertToScrollBar" ;
Text [ en-US ] = "Scroll bar";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_SPINBUTTON;
- HelpID = SID_FM_CONVERTTO_SPINBUTTON;
+ HelpId = CMD_SID_FM_CONVERTTO_SPINBUTTON;
Command = ".uno:ConvertToSpinButton" ;
Text [ en-US ] = "Spin Button";
};
MenuItem
{
Identifier = SID_FM_CONVERTTO_NAVIGATIONBAR;
- HelpID = SID_FM_CONVERTTO_NAVIGATIONBAR;
+ HelpId = CMD_SID_FM_CONVERTTO_NAVIGATIONBAR;
Command = ".uno:ConvertToNavigationBar" ;
Text [ en-US ] = "Navigation Bar" ;
};
@@ -304,6 +307,7 @@ ImageList RID_SVXIMGLIST_FMEXPL_HC
ModalDialog RID_SVXDLG_SETFORM
{
+ HelpID = "svx:ModalDialog:RID_SVXDLG_SETFORM";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 200 , 200 ) ;
@@ -342,6 +346,7 @@ ModalDialog RID_SVXDLG_SETFORM
};
DockingWindow RID_SVX_FMEXPLORER
{
+ HelpID = "svx:DockingWindow:RID_SVX_FMEXPLORER";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 200 , 200 ) ;
diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src
index f92b762b84..aca0a9e13c 100644
--- a/svx/source/form/formshell.src
+++ b/svx/source/form/formshell.src
@@ -31,6 +31,7 @@
#include <sfx2/sfxsids.hrc>
#include "globlmn.hrc"
#include "helpid.hrc"
+#include "fmhelp.hrc"
Menu RID_FM_TEXTATTRIBUTE_MENU
{
@@ -47,7 +48,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU
MenuItem
{
Identifier = MENU_FM_TEXTATTRIBITES_STYLE;
- HelpID = MENU_FM_TEXTATTRIBITES_STYLE;
+ HelpID = HID_MENU_FM_TEXTATTRIBUTES_STYLE;
Text [ en-US ] = "St~yle";
SubMenu = Menu
{
@@ -96,7 +97,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU
MenuItem
{
Identifier = MENU_FM_TEXTATTRIBITES_ALIGNMENT;
- HelpID = MENU_FM_TEXTATTRIBITES_ALIGNMENT;
+ HelpID = HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT;
Text [ en-US ] = "~Alignment";
RadioCheck = TRUE;
SubMenu = Menu
@@ -129,7 +130,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU
MenuItem
{
Identifier = MENU_FM_TEXTATTRIBITES_SPACING;
- HelpID = MENU_FM_TEXTATTRIBITES_SPACING;
+ HelpID = HID_MENU_FM_TEXTATTRIBUTES_SPACING;
Text [ en-US ] = "~Line Spacing";
_MenuItemFlags = MIB_RADIOCHECK;
SubMenu = Menu
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index 4fe6116fec..5600bebf82 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -35,7 +35,7 @@
DockingWindow RID_SVXDLG_GALLERYBROWSER
{
- HelpId = SID_GALLERY;
+ HelpId = "SVX_HID_GALLERY_BROWSER" ;
OutputSize = TRUE ;
Hide = TRUE ;
SVLook = TRUE ;
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
index a7395f49be..46585a7eb5 100644
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.src
@@ -58,6 +58,7 @@ String RID_BUILDVERSION
ModalDialog RID_DEFAULTABOUT
{
+ HelpID = "svx:ModalDialog:RID_DEFAULTABOUT";
OutputSize = TRUE ;
Size = MAP_APPFONT ( 245 , 260 ) ;
Moveable = TRUE ;
@@ -78,6 +79,7 @@ ModalDialog RID_DEFAULTABOUT
};
MultiLineEdit ABOUT_FTXT_COPYRIGHT
{
+ HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 54 , 25 ) ;
Size = MAP_APPFONT ( 168 , 51 ) ;
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index b63a0f131a..c5b5114aa5 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
@@ -64,6 +64,7 @@ String RID_BUILDVERSION
ModalDialog RID_DEFAULTABOUT
{
+ HelpID = "svx:ModalDialog:RID_DEFAULTABOUT";
OutputSize = TRUE ;
Size = MAP_APPFONT ( 245 , 260 ) ;
Moveable = TRUE ;
@@ -84,6 +85,7 @@ ModalDialog RID_DEFAULTABOUT
};
MultiLineEdit ABOUT_FTXT_COPYRIGHT
{
+ HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 54 , 25 ) ;
Size = MAP_APPFONT ( 168 , 51 ) ;
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 5b74b49cce..785298fee9 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -57,7 +57,6 @@ SvxInsertStatusBarControl::SvxInsertStatusBarControl( USHORT _nSlotId,
SfxStatusBarControl( _nSlotId, _nId, rStb ),
bInsert( TRUE )
{
- rStb.SetHelpId( _nId, _nSlotId );
}
// -----------------------------------------------------------------------
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 9db5f4bf71..338cab3001 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -176,6 +176,10 @@ struct SvxPosSizeStatusBarControl_Impl
Images fu"r die Position und Gro"sse laden.
*/
+#define STR_POSITION ".uno:Position"
+#define STR_TABLECELL ".uno:StateTableCell"
+#define STR_FUNC ".uno:StatusBarFunc"
+
SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId,
USHORT _nId,
StatusBar& rStb ) :
@@ -190,9 +194,9 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId,
pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
- addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Position" )));
- addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StateTableCell" )));
- addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StatusBarFunc" )));
+ addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION ))); // SID_ATTR_POSITION
+ addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL ))); // SID_TABLE_CELL
+ addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC ))); // SID_PSZ_FUNCTION
}
// -----------------------------------------------------------------------
@@ -233,7 +237,14 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
// da Kombi-Controller, immer die aktuelle Id als HelpId setzen
// gecachten HelpText vorher l"oschen
GetStatusBar().SetHelpText( GetId(), String() );
- GetStatusBar().SetHelpId( GetId(), nSID );
+
+ switch ( nSID )
+ {
+ case SID_ATTR_POSITION : GetStatusBar().SetHelpId( GetId(), STR_POSITION ); break;
+ case SID_TABLE_CELL: GetStatusBar().SetHelpId( GetId(), STR_TABLECELL ); break;
+ case SID_PSZ_FUNCTION: GetStatusBar().SetHelpId( GetId(), STR_FUNC ); break;
+ default: break;
+ }
if ( nSID == SID_PSZ_FUNCTION )
{
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 43226a06e7..b268ba8ea1 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -107,12 +107,8 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl()
delete mpImpl;
}
-void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
{
- GetStatusBar().SetHelpText( GetId(), String() );// necessary ?
-
- GetStatusBar().SetHelpId( GetId(), nSID ); // necessary ?
-
if( SFX_ITEM_AVAILABLE != eState )
{
mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
index 8262348890..240065ce87 100644
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.src
@@ -32,6 +32,7 @@
DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
{
+ HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DIRECTION";
Border = FALSE ;
Hide = TRUE ;
SVLook = TRUE ;
@@ -202,6 +203,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
{
+ HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DEPTH";
Border = FALSE ;
Hide = TRUE ;
SVLook = TRUE ;
@@ -292,6 +294,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
{
+ HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_LIGHTING";
Border = FALSE ;
Hide = TRUE ;
SVLook = TRUE ;
@@ -608,6 +611,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
{
+ HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_SURFACE";
Border = FALSE ;
Hide = TRUE ;
SVLook = TRUE ;
@@ -686,6 +690,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH
{
+ HelpID = "svx:ModalDialog:RID_SVX_MDLG_EXTRUSION_DEPTH";
OutputSize = TRUE;
SVLook = TRUE ;
Moveable = TRUE;
diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src
index f4d5e421bc..fa3ede424c 100644
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.src
@@ -37,6 +37,7 @@
ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
{
+ HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_GALLERY";
OutputSize = TRUE;
SVLook = TRUE ;
Moveable = TRUE;
@@ -94,6 +95,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY
DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
{
+ HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_ALIGNMENT";
Border = FALSE ;
Hide = TRUE ;
SVLook = TRUE ;
@@ -229,6 +231,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
{
+ HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_CHARSPACING";
Border = FALSE ;
Hide = TRUE ;
SVLook = TRUE ;
@@ -271,6 +274,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING
{
+ HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 139 , 64 ) ;
@@ -306,6 +310,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING
};
MetricField MF_VALUE
{
+ HelpID = "svx:MetricField:RID_SVX_MDLG_FONTWORK_CHARSPACING:MF_VALUE";
Border = FALSE ;
Pos = MAP_APPFONT ( 6 , 17 ) ;
Size = MAP_APPFONT ( 32 , 12 ) ;
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 4b8cd532e1..2ba5e0c732 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -316,7 +316,7 @@ public:
// -----------------------------------------------------------------------------
-ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) :
+ImplGrafControl::ImplGrafControl( Window* pParent, USHORT, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) :
Control( pParent, WB_TABSTOP ),
maImage ( this ),
maField ( this, rCmd, rFrame )
@@ -353,8 +353,7 @@ ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OU
maImage.Show();
- maField.SetHelpId( nSlotId );
- maField.SetSmartHelpId( SmartId( rCmd ));
+ maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) );
maField.Show();
}
diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src
index 481c35851f..d640d76cb0 100644
--- a/svx/source/tbxctrls/lboxctrl.src
+++ b/svx/source/tbxctrls/lboxctrl.src
@@ -42,6 +42,7 @@ FloatingWindow RID_SVXTBX_UNDO_REDO_CTRL
ListBox LB_SVXTBX_UNDO_REDO_CTRL
{
+ HelpID = "svx:ListBox:RID_SVXTBX_UNDO_REDO_CTRL:LB_SVXTBX_UNDO_REDO_CTRL";
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 150 , 60 ) ;
Border = TRUE ;
diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk
index a9ea745f3c..351ed4f162 100644
--- a/svx/source/tbxctrls/makefile.mk
+++ b/svx/source/tbxctrls/makefile.mk
@@ -75,7 +75,6 @@ SRC1FILES = \
linectrl.src \
tbcontrl.src \
tbunosearchcontrollers.src \
- tbxdraw.src \
grafctrl.src
# --- Targets -------------------------------------------------------
diff --git a/svx/source/tbxctrls/tbxdraw.src b/svx/source/tbxctrls/tbxdraw.src
deleted file mode 100644
index e4c7c1d296..0000000000
--- a/svx/source/tbxctrls/tbxdraw.src
+++ /dev/null
@@ -1,265 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- // include ---------------------------------------------------------------
-#include "tbxdraw.hrc"
-#include <svx/dialogs.hrc>
-#include "helpid.hrc"
-#include <svx/svxids.hrc>
- // pragma ----------------------------------------------------------------
-
- // -----------------------------------------------------------------------
-#define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
-FloatingWindow RID_SVXTBX_DRAW
-{
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE ;
- HelpID = HID_DRAWTOOL_TBX ;
- ToolBox TBX_DRAW
- {
- HelpId = HID_SVXTBX_DRAW ;
- SVLook = TRUE ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = SID_OBJECT_SELECT ;
- HelpID = SID_OBJECT_SELECT ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Selection" ;
- };
- ToolBoxItem
- {
- Identifier = SID_DRAW_LINE ;
- HelpID = SID_DRAW_LINE ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Line" ;
- };
- ToolBoxItem
- {
- Identifier = SID_DRAW_RECT ;
- HelpID = SID_DRAW_RECT ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Rectangle" ;
- };
- ToolBoxItem
- {
- Identifier = SID_DRAW_ELLIPSE ;
- HelpID = SID_DRAW_ELLIPSE ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Ellipse" ;
- };
- ToolBoxItem
- {
- Identifier = SID_DRAW_POLYGON_NOFILL ;
- HelpID = SID_DRAW_POLYGON_NOFILL ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Polygon" ;
- };
- ToolBoxItem
- {
- Identifier = SID_DRAW_BEZIER_NOFILL ;
- HelpID = SID_DRAW_BEZIER_NOFILL ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Curve";
- };
- ToolBoxItem
- {
- Identifier = SID_DRAW_FREELINE_NOFILL ;
- HelpID = SID_DRAW_FREELINE_NOFILL ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Freeform Line";
- };
- ToolBoxItem
- {
- Identifier = SID_DRAW_ARC ;
- HelpID = SID_DRAW_ARC ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Arc" ;
- };
- ToolBoxItem
- {
- Identifier = SID_DRAW_PIE ;
- HelpID = SID_DRAW_PIE ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Ellipse Pie" ;
- };
- ToolBoxItem
- {