summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--automation/inc/automation/commtypes.hxx5
-rw-r--r--automation/source/inc/cmdbasestream.hxx29
-rw-r--r--automation/source/inc/rcontrol.hxx4
-rw-r--r--automation/source/inc/testapp.hxx3
-rw-r--r--automation/source/miniapp/servres.hrc6
-rw-r--r--automation/source/miniapp/servres.src2
-rw-r--r--automation/source/miniapp/servuid.hxx22
-rw-r--r--automation/source/miniapp/testapp.cxx3
-rw-r--r--automation/source/server/XMLParser.cxx42
-rw-r--r--automation/source/server/cmdbasestream.cxx85
-rw-r--r--automation/source/server/recorder.cxx84
-rw-r--r--automation/source/server/recorder.hxx9
-rw-r--r--automation/source/server/retstrm.cxx51
-rw-r--r--automation/source/server/retstrm.hxx31
-rw-r--r--automation/source/server/server.cxx5
-rw-r--r--automation/source/server/sta_list.cxx50
-rw-r--r--automation/source/server/statemnt.cxx446
-rw-r--r--automation/source/server/statemnt.hxx26
-rw-r--r--automation/source/testtool/cmdstrm.cxx5
-rw-r--r--automation/source/testtool/cretstrm.hxx2
-rw-r--r--automation/source/testtool/objtest.cxx188
-rw-r--r--automation/source/testtool/objtest.hxx25
-rw-r--r--basctl/inc/helpid.hrc84
-rw-r--r--basctl/source/basicide/basdoc.cxx36
-rw-r--r--basctl/source/basicide/basdoc.hxx1
-rw-r--r--basctl/source/basicide/baside2b.cxx9
-rw-r--r--basctl/source/basicide/basidesh.src16
-rw-r--r--basctl/source/basicide/bastype3.cxx21
-rw-r--r--basctl/source/basicide/brkdlg.src7
-rw-r--r--basctl/source/basicide/macrodlg.cxx7
-rw-r--r--basctl/source/basicide/macrodlg.src11
-rw-r--r--basctl/source/basicide/makefile.mk2
-rw-r--r--basctl/source/basicide/moduldl2.cxx2
-rw-r--r--basctl/source/basicide/moduldlg.cxx7
-rw-r--r--basctl/source/basicide/moduldlg.src29
-rw-r--r--basctl/source/basicide/moptions.src5
-rw-r--r--basctl/source/basicide/objdlg.cxx7
-rw-r--r--basctl/source/basicide/objdlg.src1
-rw-r--r--basctl/source/basicide/tbxctl.src273
-rw-r--r--basctl/source/dlged/managelang.src5
-rw-r--r--basctl/util/hidother.src1
-rwxr-xr-xcrashrep/source/win32/soreport.cpp2
-rw-r--r--cui/inc/pch/precompiled_cui.hxx1
-rw-r--r--cui/source/customize/acccfg.cxx5
-rw-r--r--cui/source/customize/acccfg.src7
-rw-r--r--cui/source/customize/cfg.cxx60
-rw-r--r--cui/source/customize/cfg.src19
-rw-r--r--cui/source/customize/cfgutil.cxx4
-rw-r--r--cui/source/customize/eventdlg.src3
-rw-r--r--cui/source/customize/macropg.src7
-rw-r--r--cui/source/customize/selector.cxx4
-rw-r--r--cui/source/dialogs/SpellDialog.src15
-rw-r--r--cui/source/dialogs/charmap.src27
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx3
-rw-r--r--cui/source/dialogs/cuiimapdlg.src6
-rw-r--r--cui/source/dialogs/dlgname.src6
-rw-r--r--cui/source/dialogs/fmsearch.src8
-rw-r--r--cui/source/dialogs/gallery.src11
-rw-r--r--cui/source/dialogs/grfflt.src18
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx2
-rw-r--r--cui/source/dialogs/hangulhanjadlg.src26
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx4
-rw-r--r--cui/source/dialogs/hyperdlg.src42
-rw-r--r--[-rwxr-xr-x]cui/source/dialogs/hyphen.src6
-rw-r--r--cui/source/dialogs/insrc.cxx4
-rw-r--r--cui/source/dialogs/insrc.src4
-rw-r--r--cui/source/dialogs/multipat.src3
-rw-r--r--cui/source/dialogs/newtabledlg.src3
-rw-r--r--cui/source/dialogs/postdlg.src7
-rw-r--r--cui/source/dialogs/scriptdlg.cxx2
-rw-r--r--cui/source/dialogs/scriptdlg.src7
-rw-r--r--cui/source/dialogs/showcols.src2
-rw-r--r--cui/source/dialogs/splitcelldlg.src5
-rw-r--r--cui/source/dialogs/srchxtra.cxx2
-rw-r--r--cui/source/dialogs/srchxtra.src4
-rw-r--r--cui/source/dialogs/svuidlg.src44
-rw-r--r--cui/source/dialogs/tbxform.src2
-rwxr-xr-xcui/source/dialogs/thesdlg.cxx2
-rw-r--r--[-rwxr-xr-x]cui/source/dialogs/thesdlg.src6
-rw-r--r--cui/source/dialogs/zoom.cxx2
-rw-r--r--cui/source/dialogs/zoom.src14
-rw-r--r--[-rwxr-xr-x]cui/source/factory/dlgfact.cxx50
-rw-r--r--cui/source/factory/dlgfact.hxx12
-rw-r--r--cui/source/inc/cfg.hxx2
-rw-r--r--cui/source/inc/dlgname.hxx2
-rw-r--r--[-rwxr-xr-x]cui/source/inc/helpid.hrc716
-rw-r--r--cui/source/inc/insrc.hxx2
-rw-r--r--cui/source/options/connpooloptions.src5
-rw-r--r--cui/source/options/dbregister.cxx2
-rw-r--r--cui/source/options/dbregister.src5
-rw-r--r--cui/source/options/doclinkdialog.src4
-rw-r--r--cui/source/options/fontsubs.cxx2
-rw-r--r--cui/source/options/fontsubs.src6
-rw-r--r--cui/source/options/internationaloptions.src5
-rw-r--r--cui/source/options/optaccessibility.src9
-rw-r--r--cui/source/options/optasian.src9
-rw-r--r--cui/source/options/optchart.src2
-rw-r--r--cui/source/options/optcolor.cxx96
-rw-r--r--cui/source/options/optcolor.src11
-rw-r--r--cui/source/options/optctl.src6
-rwxr-xr-xcui/source/options/optdict.cxx2
-rw-r--r--cui/source/options/optdict.src9
-rw-r--r--cui/source/options/optfltr.cxx2
-rw-r--r--cui/source/options/optfltr.src11
-rw-r--r--cui/source/options/optgdlg.src34
-rw-r--r--cui/source/options/optgenrl.src20
-rw-r--r--cui/source/options/opthtml.src18
-rw-r--r--cui/source/options/optimprove.src5
-rw-r--r--[-rwxr-xr-x]cui/source/options/optinet2.src39
-rw-r--r--cui/source/options/optjava.src12
-rw-r--r--cui/source/options/optjsearch.src19
-rw-r--r--cui/source/options/optlingu.cxx8
-rw-r--r--cui/source/options/optlingu.src10
-rw-r--r--cui/source/options/optmemory.src6
-rw-r--r--cui/source/options/optpath.cxx4
-rw-r--r--cui/source/options/optpath.src2
-rw-r--r--cui/source/options/optsave.src13
-rw-r--r--cui/source/options/optspell.src5
-rw-r--r--cui/source/options/optupdt.src7
-rw-r--r--cui/source/options/securityoptions.src7
-rw-r--r--cui/source/options/treeopt.cxx4
-rw-r--r--cui/source/options/treeopt.src1
-rw-r--r--[-rwxr-xr-x]cui/source/options/webconninfo.cxx2
-rw-r--r--cui/source/options/webconninfo.src3
-rw-r--r--cui/source/tabpages/align.src10
-rw-r--r--cui/source/tabpages/autocdlg.cxx8
-rw-r--r--cui/source/tabpages/autocdlg.src41
-rw-r--r--cui/source/tabpages/backgrnd.src11
-rw-r--r--cui/source/tabpages/border.src11
-rw-r--r--cui/source/tabpages/chardlg.src49
-rw-r--r--cui/source/tabpages/connect.src8
-rw-r--r--cui/source/tabpages/dstribut.src10
-rw-r--r--cui/source/tabpages/grfpage.src11
-rw-r--r--cui/source/tabpages/labdlg.src7
-rw-r--r--cui/source/tabpages/macroass.src4
-rw-r--r--cui/source/tabpages/measure.src12
-rw-r--r--cui/source/tabpages/numfmt.src10
-rw-r--r--cui/source/tabpages/numpages.cxx1
-rw-r--r--cui/source/tabpages/numpages.src30
-rw-r--r--cui/source/tabpages/page.src18
-rw-r--r--cui/source/tabpages/paragrph.src38
-rw-r--r--cui/source/tabpages/swpossizetabpage.src18
-rw-r--r--cui/source/tabpages/tabarea.src82
-rw-r--r--cui/source/tabpages/tabline.src37
-rw-r--r--cui/source/tabpages/tabstpge.src15
-rw-r--r--cui/source/tabpages/textanim.src14
-rw-r--r--cui/source/tabpages/textattr.src11
-rw-r--r--cui/source/tabpages/transfrm.src16
-rw-r--r--extensions/inc/abpilot.hrc20
-rw-r--r--extensions/inc/bibliography.hrc102
-rw-r--r--extensions/inc/dbpilots.hrc40
-rw-r--r--extensions/inc/propctrlr.hrc601
-rw-r--r--extensions/inc/update.hrc28
-rw-r--r--extensions/prj/build.lst2
-rw-r--r--extensions/source/abpilot/abpresid.hrc1
-rw-r--r--extensions/source/abpilot/abspilot.src23
-rw-r--r--extensions/source/bibliography/bib.hrc2
-rw-r--r--extensions/source/bibliography/datman.cxx8
-rw-r--r--extensions/source/bibliography/datman.src31
-rw-r--r--extensions/source/bibliography/general.cxx16
-rw-r--r--extensions/source/bibliography/general.hxx4
-rw-r--r--extensions/source/bibliography/toolbar.src77
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.src9
-rw-r--r--extensions/source/dbpilots/dbpilots.src3
-rw-r--r--extensions/source/dbpilots/dbpresid.hrc1
-rw-r--r--extensions/source/dbpilots/gridpages.src7
-rw-r--r--extensions/source/dbpilots/groupboxpages.src14
-rw-r--r--extensions/source/dbpilots/listcombopages.src8
-rw-r--r--extensions/source/preload/preload.src8
-rw-r--r--extensions/source/propctrlr/browserline.cxx12
-rw-r--r--extensions/source/propctrlr/browserline.hxx2
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx4
-rw-r--r--extensions/source/propctrlr/defaultforminspection.cxx2
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx12
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx16
-rw-r--r--extensions/source/propctrlr/eventhandler.hxx12
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx38
-rw-r--r--extensions/source/propctrlr/formlinkdialog.src2
-rw-r--r--extensions/source/propctrlr/formmetadata.cxx14
-rw-r--r--extensions/source/propctrlr/formmetadata.hxx2
-rw-r--r--extensions/source/propctrlr/listselectiondlg.src2
-rw-r--r--extensions/source/propctrlr/newdatatype.src2
-rw-r--r--extensions/source/propctrlr/pcrcommon.cxx21
-rw-r--r--extensions/source/propctrlr/pcrcommon.hxx5
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx2
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx10
-rw-r--r--extensions/source/propctrlr/propertyeditor.hxx4
-rw-r--r--extensions/source/propctrlr/propertyinfo.hxx3
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.cxx2
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.src2
-rw-r--r--extensions/source/propctrlr/taborder.src4
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx4
-rw-r--r--extensions/source/scanner/grid.src3
-rw-r--r--extensions/source/scanner/sanedlg.cxx13
-rw-r--r--extensions/source/scanner/sanedlg.src17
-rw-r--r--extensions/source/update/check/updatehdl.cxx21
-rw-r--r--forms/qa/integration/forms/ListSelection.java5
-rw-r--r--forms/qa/unoapi/knownissues.xcl4
-rw-r--r--forms/source/component/Filter.cxx48
-rw-r--r--forms/source/component/Filter.hxx5
-rw-r--r--forms/source/component/FormComponent.cxx54
-rw-r--r--forms/source/component/ListBox.cxx28
-rw-r--r--forms/source/helper/windowstateguard.cxx28
-rw-r--r--package/inc/ZipPackageFolder.hxx7
-rw-r--r--package/source/xstor/owriteablestream.cxx20
-rw-r--r--package/source/xstor/xstorage.cxx20
-rw-r--r--package/source/zippackage/ZipPackage.cxx16
-rw-r--r--package/source/zippackage/ZipPackageFolder.cxx15
-rw-r--r--package/source/zippackage/ZipPackageStream.cxx15
-rw-r--r--package/source/zippackage/ZipPackageStream.hxx6
-rw-r--r--setup_native/scripts/install_solaris.sh2
-rw-r--r--setup_native/scripts/osx_install_languagepack.applescript2
-rw-r--r--setup_native/scripts/osx_install_patch.applescript2
-rw-r--r--setup_native/source/mac/Info.plist.langpack6
-rw-r--r--setup_native/source/mac/broffice/DS_Storebin12292 -> 12292 bytes
-rw-r--r--setup_native/source/mac/ooo/DS_Storebin12292 -> 12292 bytes
-rw-r--r--setup_native/source/mac/ooo/DS_Store_Langpackbin12292 -> 12292 bytes
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java3
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java66
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java6
-rw-r--r--wizards/com/sun/star/wizards/agenda/TopicsControl.java7
-rw-r--r--wizards/com/sun/star/wizards/common/HelpIds.java1047
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java69
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java2
-rw-r--r--wizards/com/sun/star/wizards/form/DataEntrySetter.java10
-rw-r--r--wizards/com/sun/star/wizards/form/FieldLinker.java5
-rw-r--r--wizards/com/sun/star/wizards/form/Finalizer.java6
-rw-r--r--wizards/com/sun/star/wizards/form/FormConfiguration.java8
-rw-r--r--wizards/com/sun/star/wizards/form/StyleApplier.java8
-rw-r--r--wizards/com/sun/star/wizards/form/UIControlArranger.java6
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterWizardDialog.java94
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java2
-rw-r--r--wizards/com/sun/star/wizards/makefile.mk1
-rw-r--r--wizards/com/sun/star/wizards/query/Finalizer.java8
-rw-r--r--wizards/com/sun/star/wizards/report/Dataimport.java2
-rw-r--r--wizards/com/sun/star/wizards/report/ReportFinalizer.java10
-rw-r--r--wizards/com/sun/star/wizards/report/ReportLayouter.java8
-rw-r--r--wizards/com/sun/star/wizards/table/FieldFormatter.java14
-rw-r--r--wizards/com/sun/star/wizards/table/Finalizer.java12
-rw-r--r--wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java14
-rw-r--r--wizards/com/sun/star/wizards/table/ScenarioSelector.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/AggregateComponent.java13
-rw-r--r--wizards/com/sun/star/wizards/ui/ButtonList.java9
-rw-r--r--wizards/com/sun/star/wizards/ui/CommandFieldSelection.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/ControlScroller.java3
-rw-r--r--wizards/com/sun/star/wizards/ui/FieldSelection.java18
-rw-r--r--wizards/com/sun/star/wizards/ui/FilterComponent.java11
-rw-r--r--wizards/com/sun/star/wizards/ui/ImageList.java7
-rw-r--r--wizards/com/sun/star/wizards/ui/SortingComponent.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/TitlesComponent.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java12
-rw-r--r--wizards/com/sun/star/wizards/web/FTPDialog.java19
-rw-r--r--wizards/com/sun/star/wizards/web/ImageListDialog.java11
-rw-r--r--wizards/com/sun/star/wizards/web/WWD_General.java3
-rw-r--r--wizards/com/sun/star/wizards/web/WebWizardDialog.java89
-rw-r--r--wizards/source/depot/Dialog2.xdl24
-rw-r--r--wizards/source/depot/Dialog3.xdl30
-rw-r--r--wizards/source/depot/Dialog4.xdl8
-rw-r--r--wizards/source/euro/DlgConvert.xdl40
-rw-r--r--wizards/source/euro/DlgPassword.xdl6
-rw-r--r--wizards/source/formwizard/DlgFormDB.xdl40
-rw-r--r--wizards/source/importwizard/ImportDialog.xdl54
-rw-r--r--wizards/source/schedule/DlgCalendar.xdl32
-rw-r--r--wizards/source/template/DialogStyles.xdl8
-rw-r--r--wizards/source/template/TemplateDialog.xdl16
-rw-r--r--wizards/source/webwizard/WebWzrd.xdl16
-rw-r--r--wizards/util/helpids.h859
-rw-r--r--wizards/util/hidother.src1279
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.src1
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.src3
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.src3
-rw-r--r--xmlsecurity/source/dialogs/helpids.hrc44
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx1
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.src10
-rw-r--r--xmlsecurity/source/dialogs/warnings.src3
275 files changed, 6072 insertions, 3250 deletions
diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx
index ad8443518e85..72a362e5e052 100644
--- a/automation/inc/automation/commtypes.hxx
+++ b/automation/inc/automation/commtypes.hxx
@@ -31,7 +31,7 @@
* This file is intended to supply the types and defines for Environment independent
* building of the packethandler
* Only adaption of this file should be necessary. Else it is a bug!
- * Eather including apropriate files or defining the types when not available in the environment
+ * Ether including apropriate files or defining the types when not available in the environment
*
************************************************************************/
@@ -52,6 +52,7 @@
#include <sal/types.h>
typedef sal_Unicode comm_UniChar;
+#include "rtl/string.hxx"
// this is a trick to be sure the SO types are unknown, so the compiler will yell at us in case we use them
#ifndef _SOLAR_H
@@ -93,7 +94,7 @@ typedef UINT32 comm_UINT32;
typedef sal_uInt16 comm_WORD;
typedef sal_uInt32 comm_DWORD;
-class SmartId;
+class rtl::OString;
class String;
#define comm_String String
diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx
index d103dd071e43..408492cd8ac9 100644
--- a/automation/source/inc/cmdbasestream.hxx
+++ b/automation/source/inc/cmdbasestream.hxx
@@ -48,20 +48,25 @@ protected:
public:
- void GenError( SmartId *pUId, comm_String *pString );
+ void GenError( rtl::OString *pUId, comm_String *pString );
void GenReturn( comm_USHORT nRet, comm_ULONG nNr );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_String *pString );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_String *pString );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool );
+
+ void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr );
+ void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString );
+ void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr );
// MacroRecorder
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_BOOL bBool );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_ULONG nNr );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ); // also used outside MacroRecorder
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr );
void Read ( comm_USHORT &nNr );
void Read ( comm_ULONG &nNr );
@@ -76,10 +81,10 @@ public:
// Complex Datatypes to be handled system dependent
virtual void Read ( comm_String *&pString );
- virtual void Read ( SmartId* &pId );
+ virtual void Read ( rtl::OString* &pId );
virtual void Write( comm_String *pString );
- virtual void Write( SmartId* pId );
+ virtual void Write( rtl::OString* pId );
};
#endif
diff --git a/automation/source/inc/rcontrol.hxx b/automation/source/inc/rcontrol.hxx
index 7313603096b4..cf13fdadd469 100644
--- a/automation/source/inc/rcontrol.hxx
+++ b/automation/source/inc/rcontrol.hxx
@@ -37,13 +37,13 @@
#define _RCONTROL_HXX
-#define UID_ACTIVE 0
+#define UID_ACTIVE "UID_ACTIVE"
#define SI_IPCCommandBlock 1
#define SI_SocketCommandBlock SI_IPCCommandBlock // Zumindest erstmal
#define SI_DirectCommandBlock 2
-#define SIControl 3
+#define SIControl 3 // remove after numeric HelpIDs are completely removed and no legacy testtool is used anymore
#define SISlot 4
#define SIFlow 5
#define SICommand 6
diff --git a/automation/source/inc/testapp.hxx b/automation/source/inc/testapp.hxx
index 14b9e30362d0..8393019d1605 100644
--- a/automation/source/inc/testapp.hxx
+++ b/automation/source/inc/testapp.hxx
@@ -30,7 +30,6 @@
#include <basic/sbmod.hxx>
#include <basic/testtool.hxx>
-#include <vcl/smartid.hxx>
class CommunicationLink;
class CommunicationManagerClientViaSocketTT;
@@ -129,7 +128,7 @@ private:
BOOL bReturnOK; // Bricht WaitForAnswer ab
CRevNames *pShortNames; // Aktuell verwendete Controls, zur gewinnung des Namens aus Fehlermeldung
ULONG nSequence; // Sequence um Antwort und Anfrage zu syncronisieren
- SmartId aNextReturnId; // Id des Returnwertes i.e. UId
+ rtl::OString aNextReturnId; // Id des Returnwertes i.e. UId
void ReplaceNumbers(String &aText); // Zahlen im String mit speziellem Format in Namen umwandeln
String aLastRecordedKontext;// Keeps the last kontext recorded by the Macro Recorder
diff --git a/automation/source/miniapp/servres.hrc b/automation/source/miniapp/servres.hrc
index 2f95a34a60b6..6efd2ce57460 100644
--- a/automation/source/miniapp/servres.hrc
+++ b/automation/source/miniapp/servres.hrc
@@ -29,9 +29,9 @@
#define IDM_FILE 1
#define IDM_FILE_OPEN_TEST 2
#define IDM_FILE_EXIT 3
-#define IDM_FILE_EXIT_HELP 4
-#define IDM_FILE_OPEN_TEST_HELP 1
-#define IDM_FILE_HELP 3
+#define IDM_FILE_EXIT_HELP "AUTOMATION_IDM_FILE_EXIT_HELP"
+#define IDM_FILE_OPEN_TEST_HELP "AUTOMATION_IDM_FILE_OPEN_TEST_HELP"
+#define IDM_FILE_HELP "AUTOMATION_IDM_FILE_HELP"
#define GROSSER_TEST_DLG 256
#define IDM_TEST 5
#define IDM_TEST_GROSS 6
diff --git a/automation/source/miniapp/servres.src b/automation/source/miniapp/servres.src
index 426be8b81532..c1af1caa775a 100644
--- a/automation/source/miniapp/servres.src
+++ b/automation/source/miniapp/servres.src
@@ -54,7 +54,7 @@ ModalDialog GROSSER_TEST_DLG
};
OKButton 1
{
- HelpID = 1 ;
+ HelpID = "hid1" ;
Pos = MAP_APPFONT ( 132 , 92 ) ;
Size = MAP_APPFONT ( 64 , 12 ) ;
TabStop = TRUE ;
diff --git a/automation/source/miniapp/servuid.hxx b/automation/source/miniapp/servuid.hxx
index 7d66c5473fac..c1ba920f3667 100644
--- a/automation/source/miniapp/servuid.hxx
+++ b/automation/source/miniapp/servuid.hxx
@@ -24,14 +24,14 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define UID_GROSSER_TEST_DLG 101
-#define UID_CheckBox 202
-#define UID_TriStateBox 303
-#define UID_OKButton 404
-#define UID_TimeField 505
-#define UID_MultiLineEdit 606
-#define UID_RadioButton1 707
-#define UID_RadioButton2 708
-#define UID_MultiListBox 809
-#define UID_ComboBox 910
-#define UID_DateBox 1011
+#define UID_GROSSER_TEST_DLG "AUTOMATION_UID_GROSSER_TEST_DLG"
+#define UID_CheckBox "AUTOMATION_UID_CheckBox"
+#define UID_TriStateBox "AUTOMATION_UID_TriStateBox"
+#define UID_OKButton "AUTOMATION_UID_OKButton"
+#define UID_TimeField "AUTOMATION_UID_TimeField"
+#define UID_MultiLineEdit "AUTOMATION_UID_MultiLineEdit"
+#define UID_RadioButton1 "AUTOMATION_UID_RadioButton1"
+#define UID_RadioButton2 "AUTOMATION_UID_RadioButton2"
+#define UID_MultiListBox "AUTOMATION_UID_MultiListBox"
+#define UID_ComboBox "AUTOMATION_UID_ComboBox"
+#define UID_DateBox "AUTOMATION_UID_DateBox"
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index 0a29fcc7e6e1..eec1d8ac837b 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -122,7 +122,8 @@ void MainWindow::Tree(GHEditWindow *aEditWin, Window *pBase, USHORT Indent)
aText.SearchAndReplaceAllAscii("\n",CUniString("\\n"));
aEditWin->AddText(String(sIndent).AppendAscii("Text: ").Append(aText).AppendAscii("\n"));
- aEditWin->AddText(String(sIndent).AppendAscii("Help: ").Append(String::CreateFromInt64(pBase->GetHelpId())).AppendAscii(":").Append(pBase->GetQuickHelpText()).AppendAscii(":").Append(pBase->GetHelpText()).AppendAscii("\n"));
+ // FIXME: HELPID
+ aEditWin->AddText(String(sIndent).AppendAscii("Help: ").Append(String(rtl::OStringToOUString(pBase->GetHelpId(), RTL_TEXTENCODING_UTF8))).AppendAscii(":").Append(pBase->GetQuickHelpText()).AppendAscii(":").Append(pBase->GetHelpText()).AppendAscii("\n"));
USHORT i;
for (i = 0 ; i < pBase->GetChildCount() ; i++)
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index 6e6c3dc859a7..e07f1654ecd5 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -458,7 +458,7 @@ void StatementCommand::HandleSAXParser()
{
if ( !pSAXParser->Parse( PARSE_ONLY ) )
ReportError( GEN_RES_STR1( S_NO_SAX_PARSER, RcString( nMethodId ) ) );
- pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetErrors() );
+ pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetErrors() );
}
xParserKeepaliveReference.clear();
@@ -488,7 +488,7 @@ void StatementCommand::HandleSAXParser()
if ( !pSAXParser->Parse( aAction ) )
ReportError( GEN_RES_STR1( S_NO_SAX_PARSER, RcString( nMethodId ) ) );
- pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetErrors() );
+ pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetErrors() );
}
}
else
@@ -497,7 +497,7 @@ void StatementCommand::HandleSAXParser()
break;
case RC_SAXGetNodeType:
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pSAXParser->GetCurrentNode()->GetNodeType() );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pSAXParser->GetCurrentNode()->GetNodeType() );
}
break;
case RC_SAXGetAttributeCount:
@@ -512,23 +512,23 @@ void StatementCommand::HandleSAXParser()
switch ( nMethodId )
{
case RC_SAXGetElementName:
- pRet->GenReturn ( RET_Value, aSmartMethodId, pElementNode->GetNodeName() );
+ pRet->GenReturn ( RET_Value, nMethodId, pElementNode->GetNodeName() );
break;
case RC_SAXGetChildCount:
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pElementNode->GetChildCount() );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pElementNode->GetChildCount() );
break;
case RC_SAXGetAttributeCount:
if ( xAttributeList.is() )
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)xAttributeList->getLength() );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)xAttributeList->getLength() );
else
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)0 );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)0 );
break;
case RC_SAXGetAttributeName:
{
- if( (nParams & PARAM_USHORT_1) && ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
+ if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
{
String aRet( xAttributeList->getNameByIndex( nNr1-1 ) );
- pRet->GenReturn ( RET_Value, aSmartMethodId, aRet );
+ pRet->GenReturn ( RET_Value, nMethodId, aRet );
}
else
ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) );
@@ -537,15 +537,15 @@ void StatementCommand::HandleSAXParser()
case RC_SAXGetAttributeValue:
// Number or String
{
- if( (nParams & PARAM_USHORT_1) && ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
+ if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
{
String aRet( xAttributeList->getValueByIndex( nNr1-1 ) );
- pRet->GenReturn ( RET_Value, aSmartMethodId, aRet );
+ pRet->GenReturn ( RET_Value, nMethodId, aRet );
}
else if( (nParams & PARAM_STR_1) && xAttributeList.is() )
{
String aRet( xAttributeList->getValueByName( aString1 ) );
- pRet->GenReturn ( RET_Value, aSmartMethodId, aRet );
+ pRet->GenReturn ( RET_Value, nMethodId, aRet );
}
else
ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) );
@@ -566,7 +566,7 @@ void StatementCommand::HandleSAXParser()
{
NodeRef xNode=pSAXParser->GetCurrentNode();
CharacterNode* aCharacterNode = (CharacterNode*)(&xNode);
- pRet->GenReturn ( RET_Value, aSmartMethodId, aCharacterNode->GetCharacters() );
+ pRet->GenReturn ( RET_Value, nMethodId, aCharacterNode->GetCharacters() );
}
else
ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) );
@@ -584,15 +584,15 @@ void StatementCommand::HandleSAXParser()
if ( nNr1 == 0 )
{
if ( bCheckOnly )
- pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetCurrentNode()->GetParent().Is() );
+ pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetCurrentNode()->GetParent().Is() );
else if ( pSAXParser->GetCurrentNode()->GetParent().Is() )
pSAXParser->SetCurrentNode( pSAXParser->GetCurrentNode()->GetParent() );
}
else if ( !pElementNode )
ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) );
else if ( bCheckOnly )
- pRet->GenReturn ( RET_Value, aSmartMethodId, ValueOK( aSmartMethodId, String(), nNr1, pElementNode->GetChildCount() ) );
- else if ( ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) )
+ pRet->GenReturn ( RET_Value, nMethodId, ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) );
+ else if ( ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) )
pSAXParser->SetCurrentNode( pElementNode->GetChild( nNr1-1 ) );
}
else if( (nParams & PARAM_STR_1) )
@@ -600,7 +600,7 @@ void StatementCommand::HandleSAXParser()
if ( aString1.EqualsAscii( "/" ) )
{
if ( bCheckOnly )
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)TRUE );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)TRUE );
else
pSAXParser->SetCurrentNode( pSAXParser->GetRootNode() );
}
@@ -609,7 +609,7 @@ void StatementCommand::HandleSAXParser()
ULONG nTimestamp = (ULONG)aString1.GetToken( 1, ':' ).ToInt64();
ULONG nPointer = (ULONG)aString1.GetToken( 2, ':' ).ToInt64();
if ( bCheckOnly )
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)(pSAXParser->GetTimestamp() == nTimestamp) );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)(pSAXParser->GetTimestamp() == nTimestamp) );
else
if ( pSAXParser->GetTimestamp() == nTimestamp )
{
@@ -652,7 +652,7 @@ void StatementCommand::HandleSAXParser()
xNew.Clear();
}
if ( bCheckOnly )
- pRet->GenReturn ( RET_Value, aSmartMethodId, xNew.Is() );
+ pRet->GenReturn ( RET_Value, nMethodId, xNew.Is() );
else
if ( xNew.Is() )
pSAXParser->SetCurrentNode( xNew );
@@ -661,7 +661,7 @@ void StatementCommand::HandleSAXParser()
}
else
if ( bCheckOnly )
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)FALSE );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)FALSE );
else
ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) );
}
@@ -679,7 +679,7 @@ void StatementCommand::HandleSAXParser()
NodeRef xNode=pSAXParser->GetCurrentNode();
Node* pNode = (Node*)(&xNode);
aPath.Append( String::CreateFromInt64( (ULONG)pNode ) );
- pRet->GenReturn ( RET_Value, aSmartMethodId, aPath );
+ pRet->GenReturn ( RET_Value, nMethodId, aPath );
}
break;
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 718bc52dad70..7f867c3a997c 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -49,7 +49,7 @@ CmdBaseStream::~CmdBaseStream()
{
}
-void CmdBaseStream::GenError (SmartId *pUId, comm_String *pString )
+void CmdBaseStream::GenError (rtl::OString *pUId, comm_String *pString )
{
Write(comm_USHORT(SIReturnError));
Write(pUId);
@@ -64,46 +64,95 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_ULONG nUId )
Write(comm_USHORT(PARAM_NONE)); // Typ der folgenden Parameter
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr )
+void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr )
{
Write(comm_USHORT(SIReturn));
Write(nRet);
- Write(pUId);
+ if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+ Write(comm_ULONG(0));
+ else
+ Write(pUId);
Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter
Write(nNr);
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_String *pString )
+void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_String *pString )
{
Write(comm_USHORT(SIReturn));
Write(nRet);
- Write(pUId);
+ if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+ Write(comm_ULONG(0));
+ else
+ Write(pUId);
Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter
Write(pString);
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool )
+void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool )
{
Write(comm_USHORT(SIReturn));
Write(nRet);
- Write(pUId);
+ if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+ Write(comm_ULONG(0));
+ else
+ Write(pUId);
Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(bBool);
}
-void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool )
+void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool )
{
Write(comm_USHORT(SIReturn));
Write(nRet);
- Write(pUId);
+ if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+ Write(comm_ULONG(0));
+ else
+ Write(pUId);
Write(comm_USHORT(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(nNr);
Write(pString);
Write(bBool);
}
+void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr )
+{
+ Write(comm_USHORT(SIReturn));
+ Write(nRet);
+ Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed)
+ Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter
+ Write(nNr);
+}
+
+void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString )
+{
+ Write(comm_USHORT(SIReturn));
+ Write(nRet);
+ Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed)
+ Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter
+ Write(pString);
+}
+
+void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool )
+{
+ Write(comm_USHORT(SIReturn));
+ Write(nRet);
+ Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed)
+ Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter
+ Write(bBool);
+}
+
+void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr )
+{
+ Write(comm_USHORT(SIReturn));
+ Write(nRet);
+ Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed)
+ Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter
+ Write(nNr);
+}
+
+
// MacroRecorder
-void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod )
+void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod )
{
Write(comm_USHORT(SIReturn));
Write(nRet);
@@ -112,7 +161,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
Write(nMethod);
}
-void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString )
+void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString )
{
Write(comm_USHORT(SIReturn));
Write(nRet);
@@ -122,7 +171,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
Write(pString);
}
-void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool )
+void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool )
{
Write(comm_USHORT(SIReturn));
Write(nRet);
@@ -133,7 +182,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
Write(bBool);
}
-void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_BOOL bBool )
+void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool )
{
Write(comm_USHORT(SIReturn));
Write(nRet);
@@ -143,7 +192,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
Write(bBool);
}
-void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_ULONG nNr )
+void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr )
{
Write(comm_USHORT(SIReturn));
Write(nRet);
@@ -282,10 +331,10 @@ void CmdBaseStream::Read ( comm_String* &pString )
(void) pString; /* avoid warning about unused parameter */
DBG_ERROR("Read ( comm_String* &pString ) Not Implemented");
}
-void CmdBaseStream::Read ( SmartId* &pId )
+void CmdBaseStream::Read ( rtl::OString* &pId )
{
(void) pId; /* avoid warning about unused parameter */
- DBG_ERROR("Read ( SmartId* &pId ) Not Implemented");
+ DBG_ERROR("Read ( rtl::OString* &pId ) Not Implemented");
}
void CmdBaseStream::Write( comm_String *pString )
@@ -293,9 +342,9 @@ void CmdBaseStream::Write( comm_String *pString )
(void) pString; /* avoid warning about unused parameter */
DBG_ERROR("Write( comm_String *pString ) Not Implemented");
}
-void CmdBaseStream::Write( SmartId* pId )
+void CmdBaseStream::Write( rtl::OString* pId )
{
(void) pId; /* avoid warning about unused parameter */
- DBG_ERROR("Write( SmartId* pId ) Not Implemented");
+ DBG_ERROR("Write( rtl::OString* pId ) Not Implemented");
}
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 6c941032f104..ac0b9db9aaf8 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -105,30 +105,30 @@ IMPL_LINK( MacroRecorder, HookRefreshHdl, void*, EMPTYARG )
return 0;
}
-void MacroRecorder::LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod, USHORT nParam )
+void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT nParam )
{
- ::comphelper::UiEventsLogger::logVcl( aParentID.GetText(), nVCLWindowType, aID.GetText(), aMethod, nParam );
+ ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod, nParam );
}
-void MacroRecorder::LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod )
+void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod )
{
- ::comphelper::UiEventsLogger::logVcl( aParentID.GetText(), nVCLWindowType, aID.GetText(), aMethod );
+ ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod );
}
Window* MacroRecorder::GetParentWithID( Window* pThis )
{
Window *pOverlap = pThis->GetWindow( WINDOW_OVERLAP );
- while ( pOverlap != pThis && !pThis->GetSmartUniqueOrHelpId().HasAny() && pThis->GET_REAL_PARENT() )
+ while ( pOverlap != pThis && !pThis->GetUniqueOrHelpId().getLength() && pThis->GET_REAL_PARENT() )
pThis = pThis->GET_REAL_PARENT();
return pThis;
}
-SmartId MacroRecorder::GetParentID( Window* pThis )
+rtl::OString MacroRecorder::GetParentID( Window* pThis )
{
if ( pThis->GetParent() )
- return pThis->GetParent()->GetSmartUniqueOrHelpId();
+ return pThis->GetParent()->GetUniqueOrHelpId();
else
- return SmartId();
+ return rtl::OString();
}
IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
@@ -177,7 +177,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bLog )
{
-// HACK Too many KeyEvents generated LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() );
+// HACK Too many KeyEvents generated LogVCL( rtl::OString(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() );
}
// cleanup
aKeyString.Erase();
@@ -193,12 +193,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_WINDOW_ACTIVATE:
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pWin->GetSmartUniqueOrHelpId().GetNum()) ); //GetNum() ULONG != comm_ULONG on 64bit
+ StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), Id2Str( pWin->GetUniqueOrHelpId() ) );
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("SetPage") );
+ LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("SetPage") );
}
break;
}
@@ -213,12 +213,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
{
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Check );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Check );
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Check") );
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Check") );
}
}
}
@@ -243,12 +243,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod );
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
}
}
break;
@@ -277,12 +277,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_LISTBOX_SELECT:
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() );
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() );
}
break;
}
@@ -312,13 +312,13 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
Sound::Beep();
else
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 );
bSendData = TRUE;
}
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), nPos );
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), nPos );
}
}
}
@@ -334,7 +334,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_BUTTON_CLICK:
Window* pParent = pWin->GetParent();
BOOL bDone = FALSE;
- if ( pParent->IsDialog() && !pWin->GetSmartUniqueOrHelpId().HasAny() )
+ if ( pParent->IsDialog() && !pWin->GetUniqueOrHelpId().getLength() )
{
switch ( pParent->GetType() )
{
@@ -374,17 +374,17 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
if ( m_bRecord )
{
if ( nMethod != M_Click )
- StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod );
else
- StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod, (comm_ULONG)nCurrentButtonId );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_ULONG)nCurrentButtonId );
bSendData = TRUE;
}
if ( m_bLog )
{
if ( nMethod != M_Click )
- LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
+ LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
else
- LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod, nCurrentButtonId );
+ LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod, nCurrentButtonId );
bDone = TRUE;
}
}
@@ -403,12 +403,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetSmartUniqueOrHelpId(), nMethod );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetUniqueOrHelpId(), nMethod );
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
bDone = TRUE;
}
}
@@ -417,16 +417,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bRecord )
{
- if ( !bSendData && pWin->GetSmartUniqueOrHelpId().HasAny() )
+ if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click );
bSendData = TRUE;
}
}
if ( m_bLog )
{
if ( !bDone )
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") );
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") );
}
}
break;
@@ -480,12 +480,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod );
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
}
}
break;
@@ -502,12 +502,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_BUTTON_CLICK:
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click );
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") );
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") );
}
break;
/* Keyevent or Timeout
@@ -540,12 +540,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
// compare to 1 for floating ToolBoxes
if ( m_bRecord )
{
- if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) )
+ if ( !pWin->GetUniqueOrHelpId().getLength() /* || pWin->GetUniqueOrHelpId().Matches( 1 ) */ )
// generate direct Button access
- StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, Str2Id( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) );
else
// access via Toolbox
- StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pTB->GetHelpId( pTB->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), Id2Str( pTB->GetHelpId( pTB->GetCurItemId() ) ) );
bSendData = TRUE;
}
/* not needed if ( m_bLog )
@@ -566,7 +566,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
// {
// if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) )
// // generate direct Button access
-// StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) );
+// StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) );
// else
// // access via Toolbox
// StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_TearOff|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pActionParent->GetHelpId( pActionParent->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit
@@ -574,7 +574,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
// }
// if ( m_bLog )
// {
-// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") );
+// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), pActionParent->GetHelpId( pActionParent->GetCurItemId() ), CUniString("TearOff") );
// }
// }
// pActionParent = NULL;
@@ -676,11 +676,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
Window *pIdWin = GetParentWithID( pWin );
if ( pIdWin != pWin )
bKeyFollowFocus = TRUE;
- aKeyUniqueID = pIdWin->GetSmartUniqueOrHelpId();
+ aKeyUniqueID = pIdWin->GetUniqueOrHelpId();
if ( m_bLog )
{
// HACK Too many KeyEvents generated if ( aKeyString.Len() == 0 )
-// HACK Too many KeyEvents generated LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeysStart") );
+// HACK Too many KeyEvents generated LogVCL( rtl::OString(), 0, aKeyUniqueID, CUniString("TypeKeysStart") );
}
if ( ( !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) &&
(( aKeyCode.GetGroup() == KEYGROUP_NUM) ||
@@ -1024,12 +1024,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
{
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), M_SetText, aEditModifyString );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), M_SetText, aEditModifyString );
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Modify") );
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Modify") );
}
pEditModify = NULL;
aEditModifyString.Erase(); //could be somewhat lengthy
diff --git a/automation/source/server/recorder.hxx b/automation/source/server/recorder.hxx
index baa6355848ff..5a409513cacc 100644
--- a/automation/source/server/recorder.hxx
+++ b/automation/source/server/recorder.hxx
@@ -27,7 +27,6 @@
#include <tools/string.hxx>
#include <tools/link.hxx>
-#include <vcl/smartid.hxx>
#include <vcl/timer.hxx>
class ToolBox;
@@ -38,7 +37,7 @@ class MacroRecorder
{
private:
Window* GetParentWithID( Window* pThis );
- SmartId GetParentID( Window* pThis );
+ rtl::OString GetParentID( Window* pThis );
Link aEventListenerHdl;
DECL_LINK( EventListener, VclSimpleEvent* );
@@ -51,7 +50,7 @@ private:
// record keys
String aKeyString;
- SmartId aKeyUniqueID; // has to be remembered seperately since Window might be gone when needed
+ rtl::OString aKeyUniqueID; // has to be remembered seperately since Window might be gone when needed
Window* pKeyWin;
BOOL bKeyFollowFocus;
@@ -60,8 +59,8 @@ private:
void RemoveEventHooks();
DECL_LINK( HookRefreshHdl, void* );
- void LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod, USHORT aParam );
- void LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod );
+ void LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT aParam );
+ void LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod );
static MacroRecorder *pMacroRecorder;
diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index 13a9e9b72258..951237dbcd2f 100644
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@ -28,6 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
#include <tools/stream.hxx>
+#include <basic/ttstrhlp.hxx>
#include "retstrm.hxx"
#include "rcontrol.hxx"
@@ -47,41 +48,50 @@ RetStream::~RetStream()
delete pSammel;
}
-void RetStream::GenError ( SmartId aUId, String aString )
+void RetStream::GenError ( rtl::OString aUId, String aString )
{
CmdBaseStream::GenError ( &aUId, &aString );
}
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, String aString )
+void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, String aString )
{
CmdBaseStream::GenReturn ( nRet, &aUId, &aString );
}
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue )
-{
- Write(USHORT(SIReturn));
- Write(nRet);
- Write(&aUId);
- Write(USHORT(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter
- Write(aValue);
-}
-
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool )
+void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool )
{
CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool );
}
-void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString )
+// MacroRecorder
+void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString )
{
CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString );
}
-void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool )
+void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, BOOL bBool )
{
CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString, bBool );
}
+void RetStream::GenReturn ( USHORT nRet, USHORT nMethod, SbxValue &aValue )
+{
+ Write(USHORT(SIReturn));
+ Write(nRet);
+ Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed)
+ Write(USHORT(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter
+ Write(aValue);
+}
+
+void RetStream::GenReturn( USHORT nRet, USHORT nMethod, String aString )
+{
+ CmdBaseStream::GenReturn ( nRet, nMethod, &aString );
+}
+
+
+
+
void RetStream::Write( String *pString )
{
CmdBaseStream::Write( pString->GetBuffer(), pString->Len() );
@@ -93,16 +103,11 @@ void RetStream::Write( SbxValue &aValue )
aValue.Store( *pSammel );
}
-void RetStream::Write( SmartId* pId )
+void RetStream::Write( rtl::OString* pId )
{
- DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "SmartId contains Number and String. using String only." );
- if ( pId->HasString() )
- {
- String aTmp( pId->GetStr() );
- Write( &aTmp );
- }
- else
- Write( static_cast<comm_ULONG>(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit
+ //HELPID BACKWARD (should use ByteString or OString)
+ String aTmp( Id2Str( *pId ) );
+ Write( &aTmp );
}
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx
index 888d1717422c..a7033714ba6d 100644
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@ -28,7 +28,6 @@
#define _RETSTRM_HXX
#include <basic/sbxvar.hxx>
-#include <vcl/smartid.hxx>
#include "cmdbasestream.hxx"
class SvStream;
@@ -41,26 +40,30 @@ public:
~RetStream();
using CmdBaseStream::GenError;
-// void GenError( comm_ULONG nError, const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::GenError( nError, aString, nLenInChars );}
// new
- void GenError( SmartId aUId, String aString );
+ void GenError( rtl::OString aUId, String aString );
using CmdBaseStream::GenReturn;
void GenReturn( comm_USHORT nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
+
// MacroRecorder
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
// new
- void GenReturn( USHORT nRet, SmartId aUId, String aString );
- void GenReturn( USHORT nRet, SmartId aUId, SbxValue &aValue );
- void GenReturn( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool );
+ void GenReturn( USHORT nRet, rtl::OString aUId, String aString );
+ void GenReturn( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool );
+
+// needed for RemoteCommand and Profiling
+ void GenReturn( USHORT nRet, USHORT nMethod, SbxValue &aValue );
+ void GenReturn( USHORT nRet, USHORT nMethod, String aString );
+
// MacroRecorder
- void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString );
- void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool );
+ void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString );
+ void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, BOOL bBool );
void Reset();
SvStream* GetStream();
@@ -75,7 +78,7 @@ public:
void Write( SbxValue &aValue );
// Complex Datatypes to be handled system dependent
- virtual void Write( SmartId* pId );
+ virtual void Write( rtl::OString* pId );
virtual void Write( String *pString );
SvStream *pSammel;
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index e4e59251dd63..00d2aaabd197 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -709,7 +709,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
m_bInsideExecutionLoop = FALSE;
}
- StatementList::aWindowWaitUId = SmartId(); // Warten rücksetzen, da handler sowieso verlassen wird
+ StatementList::aWindowWaitUId = rtl::OString(); // Warten rücksetzen, da handler sowieso verlassen wird
/* if( StatementList::pFirst && !StatementList::bReadingCommands )
// Abfrage nötig, da andere CommandHdl aktiv sein können oder
@@ -857,6 +857,9 @@ ImplRemoteControl::ImplRemoteControl()
m_pDbgWin = new EditWindow( NULL, CUniString("Debug Window"), WB_VSCROLL );
m_pDbgWin->bQuiet = TRUE;
m_pDbgWin->Hide();
+ m_pDbgWin->bQuiet = FALSE;
+ m_pDbgWin->Show();
+
StatementList::m_pDbgWin = m_pDbgWin;
}
#endif
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index c0abcb057f8b..f663665c20b6 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -78,15 +78,15 @@ EditWindow *StatementList::m_pDbgWin;
#endif
-SmartId StatementList::aWindowWaitUId = SmartId();
+rtl::OString StatementList::aWindowWaitUId = rtl::OString();
Window *StatementList::pWindowWaitPointer = NULL;
-SmartId StatementList::aWindowWaitOldHelpId = SmartId();
-SmartId StatementList::aWindowWaitOldUniqueId = SmartId();
+rtl::OString StatementList::aWindowWaitOldHelpId = rtl::OString();
+rtl::OString StatementList::aWindowWaitOldUniqueId = rtl::OString();
USHORT StatementList::nUseBindings = 0;
-SmartId StatementList::aSubMenuId1 = SmartId(); // Untermenüs bei PopupMenus
-SmartId StatementList::aSubMenuId2 = SmartId(); // erstmal 2-Stufig
-SmartId StatementList::aSubMenuId3 = SmartId(); // and now even 3 levels #i31512#
+USHORT StatementList::aSubMenuId1 = 0; // Untermenüs bei PopupMenus
+USHORT StatementList::aSubMenuId2 = 0; // erstmal 2-Stufig
+USHORT StatementList::aSubMenuId3 = 0; // and now even 3 levels #i31512#
SystemWindow *StatementList::pMenuWindow = NULL;
TTProperties *StatementList::pTTProperties = NULL;
@@ -130,7 +130,8 @@ TTSettings* GetTTSettings()
-#define IS_WINP_CLOSING(pWin) (pWin->GetSmartHelpId().Matches( 4321 ) && pWin->GetSmartUniqueId().Matches( 1234 ))
+// FIXME: HELPID
+#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "TT_Win_is_closing_HID" ) && pWin->GetUniqueId().equals( "TT_Win_is_closing_UID" ))
/*
UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); }
@@ -155,7 +156,7 @@ void StatementList::InitProfile()
#if OSL_DEBUG_LEVEL > 1
if ( pCurrentProfileStatement != NULL && pCurrentProfileStatement != this )
- pRet->GenReturn( RET_ProfileInfo, SmartId(), CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") );
+ pRet->GenReturn( RET_ProfileInfo, 0, CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") );
#endif
pCurrentProfileStatement = this;
}
@@ -171,18 +172,19 @@ void StatementList::SendProfile( String aText )
pProfiler->EndProfileInterval();
if ( pProfiler->IsProfilingPerCommand() )
- pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileLine( aText ) );
+ pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileLine( aText ) );
if ( pProfiler->IsPartitioning() )
- pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileTime ), static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit
+ // FIXME: HELPID
+ pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit
}
if ( pProfiler->IsAutoProfiling() )
- pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() );
+ pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() );
#if OSL_DEBUG_LEVEL > 1
if ( pCurrentProfileStatement == NULL )
- pRet->GenReturn( RET_ProfileInfo, SmartId(), CUniString("SendProfile ohne InitProfile\n") );
+ pRet->GenReturn( RET_ProfileInfo, 0, CUniString("SendProfile ohne InitProfile\n") );
#endif
pCurrentProfileStatement = NULL;
}
@@ -390,7 +392,7 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May
BOOL SearchUID::IsWinOK( Window *pWin )
{
- if ( aUId.Matches( pWin->GetSmartUniqueOrHelpId() ) )
+ if ( aUId.equals( pWin->GetUniqueOrHelpId() ) )
{
if ( ( pWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pWin->IsVisible() )
return TRUE;
@@ -407,7 +409,7 @@ BOOL SearchUID::IsWinOK( Window *pWin )
USHORT i;
for ( i = 0; i < pTB->GetItemCount() ; i++ )
{
- if ( aUId.Matches( pTB->GetItemCommand(pTB->GetItemId( i )) ) || aUId.Matches( pTB->GetHelpId(pTB->GetItemId( i )) ) )
+ if ( aUId.equals( Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ) ) || aUId.equals( pTB->GetHelpId(pTB->GetItemId( i )) ) )
{ // ID matches.
Window *pItemWin;
pItemWin = pTB->GetItemWindow( pTB->GetItemId( i ) );
@@ -455,7 +457,7 @@ BOOL SearchUID::IsWinOK( Window *pWin )
return FALSE;
}
-Window* StatementList::SearchTree( SmartId aUId ,BOOL bSearchButtonOnToolbox )
+Window* StatementList::SearchTree( rtl::OString aUId ,BOOL bSearchButtonOnToolbox )
{
SearchUID aSearch(aUId,bSearchButtonOnToolbox);
@@ -974,7 +976,7 @@ String StatementList::ClientTree(Window *pBase, int Indent)
WRITE(sIndent);
WRITEc("UId : ");
- WRITE(UIdString(pBase->GetSmartUniqueOrHelpId()));
+ WRITE(Id2Str(pBase->GetUniqueOrHelpId()));
WRITEc(":0x");
WRITE(
String::CreateFromInt64(
@@ -1031,7 +1033,7 @@ BOOL StatementList::CheckWindowWait()
if ( WinPtrValid(pWindowWaitPointer) && IS_WINP_CLOSING(pWindowWaitPointer) )
{
#if OSL_DEBUG_LEVEL > 1
- m_pDbgWin->AddText( aWindowWaitUId.GetText().AppendAscii(" Still Open. RType=") );
+ m_pDbgWin->AddText( Id2Str(aWindowWaitUId).AppendAscii(" Still Open. RType=") );
m_pDbgWin->AddText( String::CreateFromInt32( pWindowWaitPointer->GetType() ).AppendAscii("\n") );
#endif
@@ -1041,10 +1043,10 @@ BOOL StatementList::CheckWindowWait()
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Close timed out. Going on!! " );
#endif
- pWindowWaitPointer->SetSmartHelpId(aWindowWaitOldHelpId, SMART_SET_ALL);
- pWindowWaitPointer->SetSmartUniqueId(aWindowWaitOldUniqueId, SMART_SET_ALL);
+ pWindowWaitPointer->SetHelpId(aWindowWaitOldHelpId);
+ pWindowWaitPointer->SetUniqueId(aWindowWaitOldUniqueId);
- aWindowWaitUId = SmartId();
+ aWindowWaitUId = rtl::OString();
pWindowWaitPointer = NULL;
StartTime = Time(0L);
return TRUE;
@@ -1053,7 +1055,7 @@ BOOL StatementList::CheckWindowWait()
return FALSE;
}
pWindowWaitPointer = NULL;
- aWindowWaitUId = SmartId();
+ aWindowWaitUId = rtl::OString();
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Closed, Going on.\n" );
#endif
@@ -1064,10 +1066,10 @@ BOOL StatementList::CheckWindowWait()
void StatementList::ReportError(String aMessage)
{
- ReportError ( SmartId(), aMessage );
+ ReportError ( rtl::OString(), aMessage );
}
-void StatementList::ReportError(SmartId aUId, String aMessage)
+void StatementList::ReportError(rtl::OString aUId, String aMessage)
{
pRet->GenError ( aUId, aMessage );
IsError = TRUE;
@@ -1081,7 +1083,7 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever)
void StatementList::DirectLog( ULONG nType, String aMessage )
{
if ( pRet )
- pRet->GenReturn( RET_DirectLoging, SmartId(nType), aMessage );
+ pRet->GenReturn( RET_DirectLoging, (USHORT) nType, aMessage );
}
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index e5ea0ef6f357..a288c3d4d3a7 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -157,11 +157,11 @@ pfunc_osl_printDebugMessage StatementCommand::pOriginal_osl_DebugMessageFunc = N
#define SET_WINP_CLOSING(pWin) \
pWindowWaitPointer = pWin; \
- aWindowWaitUId = pControl->GetSmartUniqueOrHelpId(); \
- aWindowWaitOldHelpId = pWin->GetSmartHelpId(); \
- aWindowWaitOldUniqueId = pWin->GetSmartUniqueId(); \
- pWin->SetSmartHelpId( SmartId(4321) ); \
- pWin->SetSmartUniqueId( SmartId(1234) );
+ aWindowWaitUId = pControl->GetUniqueOrHelpId(); \
+ aWindowWaitOldHelpId = pWin->GetHelpId(); \
+ aWindowWaitOldUniqueId = pWin->GetUniqueId(); \
+ pWin->SetHelpId( rtl::OString("TT_Win_is_closing_HID") ); \
+ pWin->SetUniqueId( rtl::OString("TT_Win_is_closing_UID") );
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -302,33 +302,9 @@ BOOL StatementFlow::Execute()
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// neue Hilfsfunktion, die stetig erweitert werden muss
-static short ImpGetRType( Window *pWin, SmartId aUId )
+static short ImpGetRType( Window *pWin )
{
- ULONG nUId = aUId.GetNum(); // GetNum() is always zero if no num is defined
- // GGGg gggg::gggg gggg::ggLL LLLl::llll llll
- DBG_ASSERT( pWin, "missing Parameter" );
- short nRT;
- if( (nUId & 0xE0000000) == 0 ) // keine auto ID
- nRT = C_NoType;
- else {
-// if( (nUId & 0x1F) == 0 ) // globale Resource
- if( (nUId & 0x1FF) == 0 ) // globale Resource GH: soweit ich das verstanden habe 1FF
- nRT = (short)(C_TabPage - 1 + (nUId >> 29));
- else
- nRT = (short)((nUId & 0x00003E00) >> 9);
- if ( nRT == C_TabPage ) // wegen TabDialog.UId = TabPage.UId
- nRT = C_NoType;
- else
- {
-#ifndef DBG_UTIL
- return nRT;
-#endif
- }
- }
-
-#ifdef DBG_UTIL
- short n = nRT;
-#endif
+ short nRT = C_NoType;
WindowType eRT = pWin->GetType();
switch( eRT ) {
case WINDOW_WINDOW: nRT = C_Window ; break;
@@ -394,15 +370,6 @@ static short ImpGetRType( Window *pWin, SmartId aUId )
case WINDOW_DIALOG: nRT = C_Dialog; break;
}
-#ifdef DBG_UTIL
- // Die Werte n sind bei den WindowTypen nicht mehr vergeben, werden aber in der AutoID noch verwendet
- // Sie werden jetzt durch den Typ nRT implementiert.
- DBG_ASSERT( n == C_NoType || n == nRT
- || ( n == C_ImageButton && nRT == C_PushButton )
- || ( n == C_TriStateBox && nRT == C_CheckBox )
- || ( n == C_ImageRadioButton && nRT == C_RadioButton )
- , "error in algorithm" );
-#endif
return nRT;
}
@@ -591,9 +558,9 @@ BOOL StatementSlot::Execute()
if ( !bMenuClosed )
{
pPopup->EndExecute(0);
- aSubMenuId1 = SmartId();
- aSubMenuId2 = SmartId();
- aSubMenuId3 = SmartId();
+ aSubMenuId1 = 0;
+ aSubMenuId2 = 0;
+ aSubMenuId3 = 0;
pMenuWindow = NULL;
bMenuClosed = TRUE;
#if OSL_DEBUG_LEVEL > 1
@@ -715,12 +682,12 @@ BOOL StatementSlot::Execute()
{
case TT_PR_ERR_NODISPATCHER:
{
- ReportError( SmartId(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED_NO_DISPATCHER ) );
+ ReportError( rtl::OString::valueOf((sal_Int32)nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED_NO_DISPATCHER ) );
}
break;
case TT_PR_ERR_NOEXECUTE:
{
- ReportError(SmartId(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) );
+ ReportError( rtl::OString::valueOf((sal_Int32)nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) );
}
break;
}
@@ -759,7 +726,6 @@ StatementUnoSlot::StatementUnoSlot(SCmdStream *pIn)
StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, USHORT Params, USHORT Nr1 )
: nMethodId( MethodId )
-, aSmartMethodId()
, nParams(Params)
, nNr1(Nr1)
, nNr2(0)
@@ -772,12 +738,11 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId,
, bBool2(FALSE)
{
QueStatement( pAfterThis );
- aSmartMethodId = SmartId( nMethodId );
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Directly adding Conmmand:" );
m_pDbgWin->AddText( " Methode: " );
- m_pDbgWin->AddText( aSmartMethodId.GetText() );
+ m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( " Params:" );
if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
@@ -795,7 +760,6 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId,
StatementCommand::StatementCommand( SCmdStream *pCmdIn )
: nMethodId(0)
-, aSmartMethodId()
, nParams(0)
, nNr1(0)
, nNr2(0)
@@ -809,7 +773,6 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
{
QueStatement( NULL );
pCmdIn->Read( nMethodId );
- aSmartMethodId = SmartId( nMethodId );
pCmdIn->Read( nParams );
if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 );
@@ -825,7 +788,7 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Reading Conmmand:" );
m_pDbgWin->AddText( " Methode: " );
- m_pDbgWin->AddText( aSmartMethodId.GetText() );
+ m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( " Params:" );
if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
@@ -866,7 +829,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
return;
if ( bFirst )
- pRet->GenReturn ( RET_WinInfo, SmartId(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), TRUE );
+ pRet->GenReturn ( RET_WinInfo, rtl::OString(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), TRUE );
if ( bFirst )
{
@@ -943,8 +906,9 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
break;
default:
- if ( pBase->GetSmartUniqueOrHelpId().Equals( SmartId() ) && !( nConf & DH_MODE_ALLWIN ) )
+ if ( ( pBase->GetUniqueOrHelpId().getLength() == 0 ) && !( nConf & DH_MODE_ALLWIN ) )
bSkip = TRUE;
+ break;
}
if ( !bSkip )
@@ -974,13 +938,9 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
aTypeSuffix.AppendAscii( "/Unknown", 8 );
}
- SmartId aId = pBase->GetSmartUniqueOrHelpId();
- if ( aId.HasString() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, SmartId( aId.GetStr() ), (comm_ULONG)pBase->GetType(),
- TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE );
- if ( !aId.HasString() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, SmartId( aId.GetNum() ), (comm_ULONG)pBase->GetType(),
- TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE );
+ rtl::OString aId = pBase->GetUniqueOrHelpId();
+ pRet->GenReturn ( RET_WinInfo, aId, (comm_ULONG)pBase->GetType(),
+ TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE );
if ( pBase->GetType() == WINDOW_TOOLBOX ) // Buttons und Controls auf Toolboxen.
@@ -1002,10 +962,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
if ( pTB->GetItemType( i ) == TOOLBOXITEM_BUTTON && ( !pItemWin || !pItemWin->IsVisible() ) )
{
if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON,
+ pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_ULONG)WINDOW_BUTTON,
TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), FALSE );
if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON,
+ pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)WINDOW_BUTTON,
TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), FALSE );
}
else
@@ -1013,10 +973,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
if ( pItemWin )
{
if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(),
+ pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_ULONG)pItemWin->GetType(),
TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), FALSE );
if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(),
+ pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)pItemWin->GetType(),
TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), FALSE );
USHORT ii;
for( ii = 0 ; ii < pItemWin->GetChildCount(); ii++ )
@@ -1048,10 +1008,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
DBG_ERROR1( "Unknown TOOLBOXITEM %i", pTB->GetItemType( i ) );
}
if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE,
+ pRet->GenReturn ( RET_WinInfo, Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE,
aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE );
if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE,
+ pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)WINDOW_BASE,
aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE );
}
}
@@ -1076,35 +1036,35 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
aName = String();
if ( aName.Len() == 0 )
aName = pBD->GetPushButton( pBD->GetButtonId(i) )->GetText();
- String aID;
+ ByteString aID;
switch ( pBD->GetButtonId(i) )
{
case BUTTONID_OK:
- aID.AssignAscii("Ok");
+ aID.Assign("Ok");
break;
case BUTTONID_CANCEL:
- aID.AssignAscii("Cancel");
+ aID.Assign("Cancel");
break;
case BUTTONID_YES:
- aID.AssignAscii("Yes");
+ aID.Assign("Yes");
break;
case BUTTONID_NO:
- aID.AssignAscii("No");
+ aID.Assign("No");
break;
case BUTTONID_RETRY:
- aID.AssignAscii("Retry");
+ aID.Assign("Retry");
break;
case BUTTONID_HELP:
- aID.AssignAscii("Help");
+ aID.Assign("Help");
break;
default:
- aID = UniString::CreateFromInt32( pBD->GetButtonId(i) );
+ aID = ByteString::CreateFromInt32( pBD->GetButtonId(i) );
break;
}
- pRet->GenReturn ( RET_WinInfo, SmartId( aID ), (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So daß der Text angezeigt wird!
+ pRet->GenReturn ( RET_WinInfo, aID, (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So daß der Text angezeigt wird!
TypeString(pBD->GetPushButton( pBD->GetButtonId(i) )->GetType()).AppendAscii(": ").Append(aName)
- .AppendAscii(" ButtonId = ").Append(aID), FALSE );
+ .AppendAscii(" ButtonId = ").AppendAscii( aID.GetBuffer() ), FALSE );
}
return; // ButtonDialog ist hier schon komplett abgehandelt.
@@ -1151,10 +1111,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
DBG_ERROR1( "Unknown MENUITEM %i", pMenu->GetItemType( i ) );
}
if ( pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, SmartId( pMenu->GetItemCommand(nID) ), (comm_ULONG)0,
+ pRet->GenReturn ( RET_WinInfo, Str2Id( pMenu->GetItemCommand(nID) ), (comm_ULONG)0,
aMenuItemType.AppendAscii(": ").Append(aName), FALSE );
if ( !pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) )
- pRet->GenReturn ( RET_WinInfo, SmartId( nID ), (comm_ULONG)0,
+ pRet->GenReturn ( RET_WinInfo, rtl::OString::valueOf( (sal_Int32)nID ), (comm_ULONG)0,
aMenuItemType.AppendAscii(": ").Append(aName), FALSE );
}
}
@@ -1571,10 +1531,10 @@ BOOL StatementCommand::DisplayHID()
if ( GetTTSettings()->Act )
{
SET_WIN(GetTTSettings()->Act);
- GetTTSettings()->pDisplayHidWin->SetDisplayText(GetTTSettings()->Act->GetSmartUniqueOrHelpId().GetText().AppendAscii(" WinType: ")
+ GetTTSettings()->pDisplayHidWin->SetDisplayText( Id2Str(GetTTSettings()->Act->GetUniqueOrHelpId()).AppendAscii(" WinType: ")
.Append(UniString::CreateFromInt64(GetTTSettings()->Act->GetType())).AppendAscii(" ").Append(GetTTSettings()->Act->GetText()));
- if ( GetTTSettings()->Act && !GetTTSettings()->Act->GetSmartUniqueId().Equals( GetTTSettings()->Act->GetSmartHelpId() ) )
- GetTTSettings()->pDisplayHidWin->SetText(UniString( TTProperties::GetSvtResId( TT_ALTERNATE_CAPTION ) ).Append(GetTTSettings()->Act->GetSmartHelpId().GetText()));
+ if ( GetTTSettings()->Act && !GetTTSettings()->Act->GetUniqueId().equals( GetTTSettings()->Act->GetHelpId() ) )
+ GetTTSettings()->pDisplayHidWin->SetText(UniString( TTProperties::GetSvtResId( TT_ALTERNATE_CAPTION ) ).AppendAscii(GetTTSettings()->Act->GetHelpId().getStr()));
else
GetTTSettings()->pDisplayHidWin->SetText( GetTTSettings()->aOriginalCaption );
}
@@ -1584,9 +1544,10 @@ BOOL StatementCommand::DisplayHID()
else if ( GetTTSettings()->Act )
{
// SET_WIN(GetTTSettings()->Act);
- if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().Len() > 0 )
+ // allow setting a HelpID manually (just enter the ID in the displayHID Window and terminate it by |
+ if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().GetTokenCount( '|' ) > 1 )
{
- GetTTSettings()->Act->SetSmartUniqueId( SmartId( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) );
+ GetTTSettings()->Act->SetUniqueId( Str2Id( GetTTSettings()->pDisplayHidWin->GetDisplayText().GetToken( '|' ) ) );
GetTTSettings()->pDisplayHidWin->ClearDisplayTextModified();
}
}
@@ -2122,16 +2083,16 @@ void TranslateWin::EnableTranslation()
void StatementCommand::Translate()
{
// Es wurde eine initale UniqueId mitgegeben. Dann nur die dopelten Shortcuts liefern
- if( (nParams & PARAM_ULONG_1) && nLNr1 )
+ if( (nParams & PARAM_STR_1) && nLNr1 )
{
String aDouble;
- Window *pWin = SearchTree( SmartId( nLNr1 ) ,FALSE );
+ Window *pWin = SearchTree( Str2Id( aString1 ) ,FALSE );
if ( pWin )
{
pWin = pWin->GetWindow( WINDOW_OVERLAP );
aDouble = TranslateWin::MarkShortcutErrors( pWin, TRUE );
}
- pRet->GenReturn ( RET_Value, aSmartMethodId, aDouble );
+ pRet->GenReturn ( RET_Value, nMethodId, aDouble );
return;
}
@@ -2164,14 +2125,14 @@ void StatementCommand::Translate()
{
Window* pNew = pTranslationWindow->GetWindow( WINDOW_CLIENT );
// Bei Dockingwindoes das kanze Geraffel von Docking Floating überspringen
- while ( IsDialog( pNew ) && !pNew->GetSmartUniqueOrHelpId().HasAny() && pNew->GetChildCount() == 1 )
+ while ( IsDialog( pNew ) && !pNew->GetUniqueOrHelpId().getLength() && pNew->GetChildCount() == 1 )
pNew = pNew->GetChild( 0 );
pTranslationWindow = pNew;
}
aTranslation = CUniString("0;");
- aTranslation += pTranslationWindow->GetSmartUniqueOrHelpId().GetText();
+ aTranslation += Id2Str( pTranslationWindow->GetUniqueOrHelpId() );
aTranslation += ';';
aTranslation += TypeString( pTranslationWindow->GetType() );
@@ -2185,7 +2146,7 @@ void StatementCommand::Translate()
if ( pParentDialog )
{
- aTranslation += pParentDialog->GetSmartUniqueOrHelpId().GetText();
+ aTranslation += Id2Str(pParentDialog->GetUniqueOrHelpId());
aTranslation += ';';
aTranslation += TypeString( pParentDialog->GetType() );
}
@@ -2214,13 +2175,13 @@ void StatementCommand::Translate()
// alle TABSs quoten ()
aTranslation.SearchAndReplaceAll( CUniString("\t"), CUniString("\\t") );
- pRet->GenReturn ( RET_Value, aSmartMethodId, aTranslation );
+ pRet->GenReturn ( RET_Value, nMethodId, aTranslation );
GetTTSettings()->pTranslateWin->EnableTranslation();
GetTTSettings()->bToTop = TRUE;
}
else
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, String() );
+ pRet->GenReturn ( RET_Value, nMethodId, String() );
GetTTSettings()->pTranslateWin->EnableTranslation();
ErrorBox err( GetTTSettings()->pTranslateWin, TTProperties::GetSvtResId( TT_NO_CONTROL ));
err.Execute();
@@ -2230,7 +2191,7 @@ void StatementCommand::Translate()
}
else if ( GetTTSettings()->pTranslateWin->IsNextDialog() )
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, CUniString("1") );
+ pRet->GenReturn ( RET_Value, nMethodId, CUniString("1") );
GetTTSettings()->pTranslateWin->ResetNextDialog();
GetTTSettings()->pTranslateWin->LoseFocus();
GetTTSettings()->bToTop = TRUE;
@@ -2238,7 +2199,7 @@ void StatementCommand::Translate()
else
{
GetTTSettings()->pTranslateWin->EnableTranslation();
- pRet->GenReturn ( RET_Value, aSmartMethodId, String() );
+ pRet->GenReturn ( RET_Value, nMethodId, String() );
}
}
@@ -2326,7 +2287,7 @@ BOOL StatementCommand::Execute()
{
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Skipping Command: " );
- m_pDbgWin->AddText( aSmartMethodId.GetText() );
+ m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( "\n" );
#endif
@@ -2338,7 +2299,7 @@ BOOL StatementCommand::Execute()
InitProfile();
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Executing Command: " );
- m_pDbgWin->AddText( aSmartMethodId.GetText() );
+ m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( "\n" );
#endif
@@ -2349,7 +2310,7 @@ BOOL StatementCommand::Execute()
#if OSL_DEBUG_LEVEL > 1
#define REPORT_WIN_CLOSED(pControl, aInfo) \
_REPORT_WIN_CLOSED(pControl, aInfo) \
- m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( UIdString(pControl->GetSmartUniqueOrHelpId()) ) );
+ m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( UIdString( pControl->GetUniqueOrHelpId() ) ) );
#else
#define REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo)
#endif
@@ -2366,7 +2327,7 @@ BOOL StatementCommand::Execute()
aString1.AppendAscii("\" geschlossen, RType = ");\
aString1 += TypeString(pControl->GetType()); \
aString1.AppendAscii(", UId = "); \
- aString1 += UIdString(pControl->GetSmartUniqueOrHelpId());
+ aString1 += UIdString(pControl->GetUniqueOrHelpId());
switch ( nMethodId )
@@ -2399,9 +2360,9 @@ BOOL StatementCommand::Execute()
bCatchGPF = TRUE;
bUsePostEvents = TRUE;
- aSubMenuId1 = SmartId();
- aSubMenuId2 = SmartId();
- aSubMenuId3 = SmartId();
+ aSubMenuId1 = 0;
+ aSubMenuId2 = 0;
+ aSubMenuId3 = 0;
pMenuWindow = NULL;
}
if ( !nRetryCount )
@@ -2422,12 +2383,12 @@ BOOL StatementCommand::Execute()
&& pControl->GetType() != WINDOW_BORDERWINDOW
&& nRetryCount-- )
{
- short nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() );
+ short nRT = ImpGetRType( pControl );
if ( nRT == C_TabControl && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
{ // Bei Tabcontrol den zugehörigen Tabdialog nehmen
pControl = pControl->GET_REAL_PARENT();
- nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() );
+ nRT = ImpGetRType( pControl );
}
switch( nRT )
@@ -2595,7 +2556,7 @@ BOOL StatementCommand::Execute()
if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit
return FALSE;
else
- pRet->GenReturn ( RET_Value, aSmartMethodId, aString1);
+ pRet->GenReturn ( RET_Value, nMethodId, aString1);
}
break;
case RC_WaitSlot:
@@ -2609,12 +2570,12 @@ BOOL StatementCommand::Execute()
}
if ( !bIsSlotInExecute )
- pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSFinished) );
+ pRet->GenReturn ( RET_Value, nMethodId, comm_USHORT(CONST_WSFinished) );
else
{
if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit
return FALSE;
- pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSTimeout) );
+ pRet->GenReturn ( RET_Value, nMethodId, comm_USHORT(CONST_WSTimeout) );
}
}
break;
@@ -2666,21 +2627,21 @@ BOOL StatementCommand::Execute()
ReportError( GEN_RES_STR0( S_NO_ACTIVE_WINDOW ) );
// if ( Application::GetAppWindow() )
// bWait = Application::GetAppWindow()->IsWait();
- pRet->GenReturn ( RET_Value, aSmartMethodId, bWait );
+ pRet->GenReturn ( RET_Value, nMethodId, bWait );
break;
}
case RC_GetClipboard:
{
::rtl::OUString aTemp;
::svt::OStringTransfer::PasteString( aTemp, GetFirstDocFrame() );
- pRet->GenReturn ( RET_Value, aSmartMethodId, String( aTemp ) );
+ pRet->GenReturn ( RET_Value, nMethodId, String( aTemp ) );
}
break;
case RC_SetClipboard:
::svt::OStringTransfer::CopyString(aString1,GetFirstDocFrame());
break;
case RC_WinTree:
- pRet->GenReturn ( RET_Value, aSmartMethodId, Tree( NULL, 0));
+ pRet->GenReturn ( RET_Value, nMethodId, Tree( NULL, 0));
break;
#if OSL_DEBUG_LEVEL > 1
case RC_NoDebug:
@@ -2704,7 +2665,9 @@ BOOL StatementCommand::Execute()
else if ( !IsDialog(pWin) )
ReportError( GEN_RES_STR0( S_NO_DIALOG_IN_GETACTIVE ) );
else
- pRet->GenReturn( RET_Value, aSmartMethodId, static_cast<comm_ULONG>(pWin->GetSmartUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit
+ {
+ pRet->GenReturn( RET_Value, nMethodId, Id2Str(pWin->GetUniqueOrHelpId()) );
+ }
}
break;
case RC_UseBindings:
@@ -2737,7 +2700,7 @@ BOOL StatementCommand::Execute()
pProfiler->StartAutoProfiling( nNr1 );
// Der Header ist abhängig vom Modus
- pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() );
+ pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() );
}
else if ( nParams & PARAM_USHORT_1 )
{ // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr]
@@ -2750,32 +2713,32 @@ BOOL StatementCommand::Execute()
// Hier werden die Parameter ans Testtool zurück übertragen.
// Das ist zwar etwas eigenartig, aber ansonsten müsste man im Testtool
// die einfache Struktur der Remotebefehle aufbrechen.
- pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileReset ), nAnzahl );
+ pRet->GenReturn( RET_ProfileInfo, S_ProfileReset, nAnzahl );
// Und die einzelnen Grenzen
- if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder1 ), (comm_ULONG)nNr1 ); };
- if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder2 ), (comm_ULONG)nNr2 ); };
- if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder3 ), (comm_ULONG)nNr3 ); };
- if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder4 ), (comm_ULONG)nNr4 ); };
+ if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder1, (comm_ULONG)nNr1 ); };
+ if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder2, (comm_ULONG)nNr2 ); };
+ if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder3, (comm_ULONG)nNr3 ); };
+ if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder4, (comm_ULONG)nNr4 ); };
pProfiler->StartPartitioning();
}
else if( nParams == PARAM_STR_1 ) // Genau ein String!
{ // Nur einen String ins Profiling aufnehmen
aString1 += '\n';
- pRet->GenReturn( RET_ProfileInfo, SmartId(), aString1 );
+ pRet->GenReturn( RET_ProfileInfo, 0, aString1 );
}
else
{ // Normales Profiling je Kommando: profile
if ( pProfiler->IsAutoProfiling() )
{
- pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() );
+ pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() );
pProfiler->StopAutoProfiling();
}
pProfiler->StartProfilingPerCommand();
// Der Header ist abhängig vom Modus
- pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() );
+ pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() );
}
}
else // Profiling wieder ausschalten: Profile false
@@ -2786,13 +2749,13 @@ BOOL StatementCommand::Execute()
if ( pProfiler->IsAutoProfiling() )
{
- pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() );
+ pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() );
pProfiler->StopAutoProfiling();
}
if ( pProfiler->IsPartitioning() )
{
- pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileDump ), (comm_ULONG)0 );
+ pRet->GenReturn( RET_ProfileInfo, S_ProfileDump, (comm_ULONG)0 );
pProfiler->StopPartitioning();
}
@@ -2890,13 +2853,13 @@ BOOL StatementCommand::Execute()
{
case RC_MenuGetItemCount:
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)nItemCount );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)nItemCount );
}
break;
case RC_MenuGetItemId:
{
- if ( ValueOK(aSmartMethodId, RcString( nMethodId ),nNr1,nItemCount) )
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pMenu->GetItemId(nPhysicalIndex-1) );
+ if ( ValueOK( rtl::OString(), RcString( nMethodId ),nNr1,nItemCount) )
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pMenu->GetItemId(nPhysicalIndex-1) );
}
break;
case RC_MenuGetItemPos:
@@ -2918,50 +2881,50 @@ BOOL StatementCommand::Execute()
}
}
}
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)(nLogicalPos+1) );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)(nLogicalPos+1) );
}
break;
case RC_MenuIsSeperator:
{
- if ( ValueOK(aSmartMethodId, RcString( nMethodId ),nNr1,nItemCount) )
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)(pMenu->GetItemType(nPhysicalIndex-1) == MENUITEM_SEPARATOR) );
+ if ( ValueOK( rtl::OString(), RcString( nMethodId ),nNr1,nItemCount) )
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)(pMenu->GetItemType(nPhysicalIndex-1) == MENUITEM_SEPARATOR) );
}
break;
case RC_MenuIsItemChecked:
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)pMenu->IsItemChecked(nNr1) );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)pMenu->IsItemChecked(nNr1) );
}
break;
case RC_MenuIsItemEnabled:
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)pMenu->IsItemEnabled(nNr1) );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)pMenu->IsItemEnabled(nNr1) );
}
break;
case RC_MenuGetItemText:
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, (String)pMenu->GetItemText(nNr1) );
+ pRet->GenReturn ( RET_Value, nMethodId, (String)pMenu->GetItemText(nNr1) );
}
break;
case RC_MenuGetItemCommand:
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, (String)pMenu->GetItemCommand(nNr1) );
+ pRet->GenReturn ( RET_Value, nMethodId, (String)pMenu->GetItemCommand(nNr1) );
}
break;
case RC_MenuHasSubMenu:
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, (BOOL)(pMenu->GetPopupMenu(nNr1) != NULL) );
+ pRet->GenReturn ( RET_Value, nMethodId, (BOOL)(pMenu->GetPopupMenu(nNr1) != NULL) );
}
break;
case RC_MenuSelect:
{
if ( pMenu->GetPopupMenu(nNr1) )
{
- if ( !aSubMenuId1.GetNum() )
- aSubMenuId1 = SmartId(nNr1);
- else if ( !aSubMenuId2.GetNum() )
- aSubMenuId2 = SmartId(nNr1);
- else if ( !aSubMenuId3.GetNum() )
- aSubMenuId3 = SmartId(nNr1);
+ if ( !aSubMenuId1 )
+ aSubMenuId1 = nNr1;
+ else if ( !aSubMenuId2 )
+ aSubMenuId2 = nNr1;
+ else if ( !aSubMenuId3 )
+ aSubMenuId3 = nNr1;
if ( pPopup )
pPopup->SelectEntry(nNr1);
@@ -2973,17 +2936,17 @@ BOOL StatementCommand::Execute()
if ( pPopup )
{
pPopup->EndExecute(nNr1);
- aSubMenuId1 = SmartId();
- aSubMenuId2 = SmartId();
- aSubMenuId3 = SmartId();
+ aSubMenuId1 = 0;
+ aSubMenuId2 = 0;
+ aSubMenuId3 = 0;
pMenuWindow = NULL;
}
else
{
pMenuBar->SelectEntry(nNr1);
- aSubMenuId1 = SmartId();
- aSubMenuId2 = SmartId();
- aSubMenuId3 = SmartId();
+ aSubMenuId1 = 0;
+ aSubMenuId2 = 0;
+ aSubMenuId3 = 0;
pMenuWindow = NULL;
}
}
@@ -3119,7 +3082,7 @@ BOOL StatementCommand::Execute()
}
if ( !nErrorcode )
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, aPath );
+ pRet->GenReturn ( RET_Value, nMethodId, aPath );
}
@@ -3151,9 +3114,9 @@ BOOL StatementCommand::Execute()
if ( !aFS.IsKind( FSYS_KIND_WILD ) && !aFS.IsKind( FSYS_KIND_DIR ) && aEntry.Exists() )
{ // Sonderbehandlung für genau einen Eintrag
if ( !aFS.IsKind( FSYS_KIND_DIR ) && ( aDirEntryKind == FSYS_KIND_DIR ) )
- pRet->GenReturn ( RET_Value, aSmartMethodId, String() );
+ pRet->GenReturn ( RET_Value, nMethodId, String() );
else
- pRet->GenReturn ( RET_Value, aSmartMethodId, (String)(aEntry.GetName()) );
+ pRet->GenReturn ( RET_Value, nMethodId, (String)(aEntry.GetName()) );
break;
}
@@ -3168,12 +3131,12 @@ BOOL StatementCommand::Execute()
if ( !pDir )
pDir = new Dir;
- if ( !nErrorcode && ValueOK( aSmartMethodId, GEN_RES_STR0( S_NO_MORE_FILES ), nDirPos+1, pDir->Count()+1 ) )
+ if ( !nErrorcode && ValueOK( nMethodId, GEN_RES_STR0( S_NO_MORE_FILES ), nDirPos+1, pDir->Count()+1 ) )
{
if ( nDirPos == pDir->Count() )
- pRet->GenReturn ( RET_Value, aSmartMethodId, String() );
+ pRet->GenReturn ( RET_Value, nMethodId, String() );
else
- pRet->GenReturn ( RET_Value, aSmartMethodId, (String)((*pDir)[ nDirPos ].GetName()) );
+ pRet->GenReturn ( RET_Value, nMethodId, (String)((*pDir)[ nDirPos ].GetName()) );
nDirPos++;
}*/
}
@@ -3185,7 +3148,7 @@ BOOL StatementCommand::Execute()
if ( FSYS_ERR_OK == nErrorcode )
{
FileStat aFS( aFile );
- pRet->GenReturn ( RET_Value, aSmartMethodId, static_cast<comm_ULONG>(aFS.GetSize()) ); //GetSize() ULONG != comm_ULONG on 64bit
+ pRet->GenReturn ( RET_Value, nMethodId, static_cast<comm_ULONG>(aFS.GetSize()) ); //GetSize() ULONG != comm_ULONG on 64bit
nErrorcode = aFS.GetError();
}
}
@@ -3212,7 +3175,7 @@ BOOL StatementCommand::Execute()
SbxValueRef xValue = new SbxValue( SbxDATE );
xValue->PutDate( fSerial );
- pRet->GenReturn ( RET_Value, aSmartMethodId, *xValue );
+ pRet->GenReturn ( RET_Value, nMethodId, *xValue );
}
}
break;
@@ -3328,7 +3291,7 @@ BOOL StatementCommand::Execute()
aPointer = Pointer( POINTER_NULL );
}
}
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)aPointer.GetStyle() );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)aPointer.GetStyle() );
}
break;
case RC_UnpackStorage:
@@ -3397,7 +3360,7 @@ BOOL StatementCommand::Execute()
break;
case RC_ExistsSysDialog:
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)xPicker.is() );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)xPicker.is() );
}
break;
default:
@@ -3438,14 +3401,14 @@ BOOL StatementCommand::Execute()
break;
case RC_GetDocumentCount :
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_USHORT)GetDocWinCount() );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_USHORT)GetDocWinCount() );
}
break;
case RC_ActivateDocument :
{
if( nParams & PARAM_USHORT_1 )
{
- if ( ValueOK(aSmartMethodId, RcString( nMethodId ), nNr1, GetDocWinCount() ) )
+ if ( ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, GetDocWinCount() ) )
{
Window* pWin = GetDocWin( nNr1-1 );
if ( pWin )
@@ -3461,7 +3424,7 @@ BOOL StatementCommand::Execute()
break;
case RC_GetSystemLanguage :
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_USHORT)Application::GetSettings().GetLanguage() );
+ pRet->GenReturn ( RET_Value, nMethodId, (comm_USHORT)Application::GetSettings().GetLanguage() );
}
break;
case RC_CatchGPF :
@@ -3480,7 +3443,7 @@ BOOL StatementCommand::Execute()
#else
bIsProduct = TRUE;
#endif
- pRet->GenReturn ( RET_Value, aSmartMethodId, (BOOL)bIsProduct );
+ pRet->GenReturn ( RET_Value, nMethodId, (BOOL)bIsProduct );
}
break;
case RC_UsePostEvents :
@@ -3559,17 +3522,22 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
, bBool2(FALSE)
{
QueStatement( NULL );
+ //HELPID BACKWARD (SIControl is no longer needed)
if ( nControlIdType == SIControl )
{
comm_ULONG nId;
pCmdIn->Read( nId );
- aUId = SmartId( nId );
+ aUId = rtl::OString( nId );
+ if ( nId == 0 )
+ aUId = UID_ACTIVE;
+ else
+ ReportError( aUId, GEN_RES_STR1c( S_INTERNAL_ERROR, "using numeric HelpID from old Testtool" ) );
}
else if ( nControlIdType == SIStringControl )
{
String aId;
pCmdIn->Read( aId );
- aUId = SmartId( aId );
+ aUId = Str2Id( aId );
}
else
{
@@ -3591,7 +3559,7 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Reading Control: UId: " );
- m_pDbgWin->AddText( aUId.GetText() );
+ m_pDbgWin->AddText( Id2Str( aUId ) );
m_pDbgWin->AddText( " Methode: " );
m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( " Params:" );
@@ -3680,7 +3648,7 @@ BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung
{
if ( pControl && ( ( ( IsAccessable(pControl) || (nMethodId & M_WITH_RETURN) ) &&
pControl->IsVisible() ) ||
- aUId.Matches( UID_ACTIVE ) ) )
+ aUId.equals( UID_ACTIVE ) ) )
return TRUE;
else
{
@@ -3703,7 +3671,7 @@ BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung
}
-BOOL StatementList::ValueOK( SmartId aId, String aBezeichnung, ULONG nValue, ULONG nMax )
+BOOL StatementList::ValueOK( rtl::OString aId, String aBezeichnung, ULONG nValue, ULONG nMax )
{
if ( nMax < nValue )
@@ -3737,24 +3705,21 @@ USHORT StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar,
if ( !pMenu )
return 1;
- if ( aSubMenuId1.GetNum() )
+ if ( aSubMenuId1 )
{
- pPopup = pMenu->GetPopupMenu(
- sal::static_int_cast< USHORT >(aSubMenuId1.GetNum()));
+ pPopup = pMenu->GetPopupMenu( aSubMenuId1 );
pMenu = pPopup;
}
- if ( pMenu && aSubMenuId2.GetNum() )
+ if ( pMenu && aSubMenuId2 )
{
- pPopup = pMenu->GetPopupMenu(
- sal::static_int_cast< USHORT >(aSubMenuId2.GetNum()));
+ pPopup = pMenu->GetPopupMenu( aSubMenuId2 );
pMenu = pPopup;
}
- if ( pMenu && aSubMenuId3.GetNum() )
+ if ( pMenu && aSubMenuId3 )
{
- pPopup = pMenu->GetPopupMenu(
- sal::static_int_cast< USHORT >(aSubMenuId3.GetNum()));
+ pPopup = pMenu->GetPopupMenu( aSubMenuId3 );
pMenu = pPopup;
}
@@ -4282,9 +4247,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
break;
case M_OpenContextMenu:
{
- aSubMenuId1 = SmartId();
- aSubMenuId2 = SmartId();
- aSubMenuId3 = SmartId();
+ aSubMenuId1 = 0;
+ aSubMenuId2 = 0;
+ aSubMenuId3 = 0;
pMenuWindow = NULL;
Point aPos;
ToolBox* pTB = (ToolBox*)pControl;
@@ -4318,9 +4283,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
break;
case M_UseMenu:
{
- aSubMenuId1 = SmartId();
- aSubMenuId2 = SmartId();
- aSubMenuId3 = SmartId();
+ aSubMenuId1 = 0;
+ aSubMenuId2 = 0;
+ aSubMenuId3 = 0;
pMenuWindow = NULL;
while ( pControl && !( ( pControl->GetType() == WINDOW_SYSWINDOW || pControl->GetType() == WINDOW_WORKWINDOW ) && ControlOK( pControl, "" ) ) )
@@ -4546,7 +4511,7 @@ BOOL StatementControl::Execute()
{
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Skipping Window: " );
- m_pDbgWin->AddText( aUId.GetText() );
+ m_pDbgWin->AddText( Id2Str( aUId ) );
m_pDbgWin->AddText( " Method: " );
m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( "\n" );
@@ -4559,14 +4524,14 @@ BOOL StatementControl::Execute()
InitProfile();
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Executing Window: " );
- m_pDbgWin->AddText( aUId.GetText() );
+ m_pDbgWin->AddText( Id2Str( aUId ) );
m_pDbgWin->AddText( " Method: " );
m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
m_pDbgWin->AddText( "\n" );
#endif
- if ( aUId.Matches( UID_ACTIVE ) )
+ if ( aUId.equals( UID_ACTIVE ) )
pControl = GetAnyActive();
else
{
@@ -4587,7 +4552,7 @@ BOOL StatementControl::Execute()
if ( pControl && pControl->GetType() == WINDOW_TOOLBOX )
{
- if ( !aUId.Matches( pControl->GetSmartUniqueOrHelpId() ) )
+ if ( !aUId.equals( pControl->GetUniqueOrHelpId() ) )
{ // Also wenn wir irgendwas auf einer Toolbox gefunden haben
switch ( nMethodId )
{
@@ -4646,7 +4611,7 @@ BOOL StatementControl::Execute()
if( pControl ) // Das Fenster Existiert irgendwo, kann aber auch hidden sein!
{
- nRT = ImpGetRType( pControl, aUId ); // If not Numeric pControl is used
+ nRT = ImpGetRType( pControl );
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Type is: " );
m_pDbgWin->AddText( String::CreateFromInt32( nRT ) );
@@ -4789,42 +4754,44 @@ BOOL StatementControl::Execute()
}
break;
case M_GetPage:
- pRet->GenReturn ( RET_Value, aUId, ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetSmartUniqueOrHelpId().GetText());
+ pRet->GenReturn ( RET_Value, aUId, Id2Str( ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetUniqueOrHelpId() ) );
break;
case M_SetPage :
{ // Wegen lokaler Variablen
TabControl *pTControl = ((TabControl*)pControl);
USHORT nActive = pTControl->GetCurPageId();
USHORT i,anz;
- SmartId aID;
- SmartId aWantedID;
+ rtl::OString aID;
+ rtl::OString aWantedID;
+ //HELPID BACKWARD (No numbers please (remove PARAM_ULONG_1 part)
if ( (nParams & PARAM_ULONG_1) )
{
- aWantedID = SmartId( nLNr1 );
+ //aWantedID = rtl::OString( nLNr1 );
+ ReportError( aUId, GEN_RES_STR1c( S_INTERNAL_ERROR, "using numeric HelpID from old Testtool" ) );
}
else if ( (nParams & PARAM_STR_1) )
{
- aWantedID = SmartId( aString1 );
+ aWantedID = Str2Id( aString1 );
}
else
ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
i = pTControl->GetPagePos( pTControl->GetCurPageId() );
- for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.Matches( aWantedID ) ; anz++ )
+ for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.equals( aWantedID ) ; anz++ )
{
pTControl->SelectTabPage( pTControl->GetPageId(i) );
/*if (pTControl->GetCurPageId())
pTControl->DeactivatePage();
pTControl->SetCurPageId( pTControl->GetPageId(i) );
pTControl->ActivatePage();*/
- aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetSmartUniqueOrHelpId();
+ aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetUniqueOrHelpId();
i++;
if ( i >= pTControl->GetPageCount() )
i = 0;
if ( !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) ) // 3 Mal aufrufen
break;
}
- if ( !aID.Matches( aWantedID ) )
+ if ( !aID.equals( aWantedID ) )
{
pTControl->SelectTabPage( nActive );
/*if (pTControl->GetCurPageId())
@@ -5260,9 +5227,9 @@ BOOL StatementControl::Execute()
ImplMouseButtonUp ( pControl, aMEvnt, FORCE_DIRECT_CALL );
- aSubMenuId1 = SmartId();
- aSubMenuId2 = SmartId();
- aSubMenuId3 = SmartId();
+ aSubMenuId1 = 0;
+ aSubMenuId2 = 0;
+ aSubMenuId3 = 0;
pMenuWindow = NULL;
}
break;
@@ -5274,21 +5241,12 @@ BOOL StatementControl::Execute()
case C_ToolBox:
{
ToolBox *pTB = ((ToolBox*)pControl);
- if ( !aUId.Matches( pTB->GetSmartUniqueOrHelpId() ) ) // Also Button auf der ToolBox gefunden
+ if ( !aUId.equals( pTB->GetUniqueOrHelpId() ) ) // So we found a Button on the ToolBox
{
if ( (nParams == PARAM_NONE) || (nParams == PARAM_USHORT_1) )
{ // Wir fälschen einen Parameter
- if ( aUId.HasNumeric() )
- {
- nParams |= PARAM_ULONG_1;
- nLNr1 = USHORT( aUId.GetNum() );
- DBG_ASSERT( nLNr1 <= 0xFFFF, "ID on ToolBox > 0xFFFF" );
- }
- else
- {
- nParams |= PARAM_STR_1;
- aString1 = aUId.GetStr();
- }
+ nParams |= PARAM_STR_1;
+ aString1 = Id2Str( aUId );
}
else
ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
@@ -5298,14 +5256,14 @@ BOOL StatementControl::Execute()
USHORT nItemPos = 0;\
BOOL bItemFound = FALSE;\
{\
- SmartId aButtonId;\
+ rtl::OString aButtonId;\
if( nParams & PARAM_STR_1 )\
- aButtonId = SmartId( aString1 );\
- if( nParams & PARAM_ULONG_1 )\
- aButtonId = SmartId( nLNr1 );\
- for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) &&\
- !aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\
- bItemFound = aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) || aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos)));\
+ aButtonId = Str2Id( aString1 );\
+ else\
+ ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );\
+ for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.equals(Str2Id( pTB->GetItemCommand(pTB->GetItemId(nItemPos)) )) &&\
+ !aButtonId.equals(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\
+ bItemFound = aButtonId.equals(Str2Id( pTB->GetItemCommand(pTB->GetItemId(nItemPos)) )) || aButtonId.equals(pTB->GetHelpId(pTB->GetItemId(nItemPos)));\
if ( !bItemFound )\
ReportError( aUId, GEN_RES_STR1( S_HELPID_ON_TOOLBOX_NOT_FOUND, MethodString( nMethodId ) ) );\
else\
@@ -5347,7 +5305,7 @@ BOOL StatementControl::Execute()
}\
}\
}\
- }\
+ }
switch( nMethodId )
{
@@ -5367,9 +5325,9 @@ BOOL StatementControl::Execute()
MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT);
ImplMouseButtonDown( pTB, aMEvnt );*/
- aSubMenuId1 = SmartId();
- aSubMenuId2 = SmartId();
- aSubMenuId3 = SmartId();
+ aSubMenuId1 = 0;
+ aSubMenuId2 = 0;
+ aSubMenuId3 = 0;
pMenuWindow = NULL;
new StatementCommand( this, RC_MenuSelect, PARAM_USHORT_1, pTB->GetItemId(nItemPos) + TOOLBOX_MENUITEM_START );
@@ -5432,9 +5390,9 @@ BOOL StatementControl::Execute()
ImplMouseButtonUp( pTB, aMEvnt);
// Das Fenster ist offen.
- aSubMenuId1 = SmartId();
- aSubMenuId2 = SmartId();
- aSubMenuId3 = SmartId();
+ aSubMenuId1 = 0;
+ aSubMenuId2 = 0;
+ aSubMenuId3 = 0;
pMenuWindow = NULL;
}
}
@@ -5453,24 +5411,26 @@ BOOL StatementControl::Execute()
FIND_ITEM;
if ( bItemFound ) // FIND_ITEM Erfolgreich
{
- switch (nNr1)
- {
- case 0:
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetHelpId(pTB->GetItemId(nItemPos)));
- break;
- case 1:
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemType(nItemPos));
- break;
- case 2:
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemState(pTB->GetItemId(nItemPos)));
- break;
- case 3:
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemId(nItemPos));
- break;
- default:
- pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
- break;
- }
+ if ( ValueOK( aUId, CUniString("GetState"), nNr1, 4 ) )
+ switch (nNr1)
+ {
+ case 0:
+ pRet->GenReturn ( RET_Value, aUId, Id2Str( pTB->GetHelpId(pTB->GetItemId(nItemPos)) ) );
+ break;
+ case 1:
+ pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemType(nItemPos));
+ break;
+ case 2:
+ pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemState(pTB->GetItemId(nItemPos)));
+ break;
+ case 3:
+ pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemId(nItemPos));
+ break;
+ default:
+ ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
+ pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
+ break;
+ }
}
}
break;
@@ -6345,7 +6305,7 @@ protected:
break;
case M_Close:
//aWindowWaitUId = aUId;
- DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+ DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
SET_WINP_CLOSING(pControl);
((DockingWindow*)pControl)->Close();
break;
@@ -6421,7 +6381,7 @@ protected:
break;
}
case M_Close:
- DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+ DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
SET_WINP_CLOSING(pControl);
((FloatingWindow*)pControl)->Close();
break;
@@ -6444,7 +6404,7 @@ protected:
AnimateMouse( pControl, MitteOben);
break;
case M_Close:
- DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+ DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
SET_WINP_CLOSING(pControl);
((SystemWindow*)pControl)->Close();
break;
@@ -6453,7 +6413,7 @@ protected:
Window *pChild = GetWinByRT( pControl, WINDOW_OKBUTTON );
if( ControlOK( pChild, "OK Button" ) )
{
- DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+ DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
SET_WINP_CLOSING(pControl);
((Button*)pChild)->Click();
}
@@ -6464,7 +6424,7 @@ protected:
Window *pChild = GetWinByRT( pControl, WINDOW_CANCELBUTTON );
if( ControlOK( pChild, "Cancel Button" ) )
{
- DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+ DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
SET_WINP_CLOSING(pControl);
((Button*)pChild)->Click();
}
@@ -6501,7 +6461,7 @@ protected:
AnimateMouse( pControl, MitteOben);
break;
case M_Close:
- DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+ DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
SET_WINP_CLOSING(pControl);
((WorkWindow*)pControl)->Close();
break;
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index 4e580a09749c..ada6c60a6b35 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -54,7 +54,6 @@
#include <basic/sbstar.hxx>
#include <vcl/event.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <vcl/smartid.hxx>
#include <automation/commtypes.hxx>
class Window;
@@ -241,7 +240,7 @@ public:
protected:
static Window* SearchClientWin( Window *pBase, Search &aSearch, BOOL MaybeBase = TRUE );
- Window* SearchTree( SmartId aUId, BOOL bSearchButtonOnToolbox = FALSE );
+ Window* SearchTree( rtl::OString aUId, BOOL bSearchButtonOnToolbox = FALSE );
Window* GetActive( WindowType nRT, BOOL MaybeBase = TRUE );
Window* GetFocus( WindowType nRT, BOOL MaybeBase = TRUE );
Window* GetAnyActive( BOOL MaybeBase = TRUE );
@@ -253,7 +252,7 @@ protected:
Window* GetDocWin( USHORT nNr );
USHORT GetDocWinCount();
Window* GetFadeSplitWin( Window *pBase, WindowAlign nAlign, BOOL MaybeBase = TRUE );
- BOOL ValueOK(SmartId nId, String aBezeichnung, ULONG nValue, ULONG nMax);
+ BOOL ValueOK(rtl::OString nId, String aBezeichnung, ULONG nValue, ULONG nMax);
USHORT GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu );
@@ -274,7 +273,7 @@ public:
***************************************************************************/
void ReportError(String aMessage);
- void ReportError(SmartId aUId, String aMessage);
+ void ReportError(rtl::OString aUId, String aMessage);
void ReportError(String aMessage, ULONG nWhatever);
static void DirectLog( ULONG nType, String aString );
@@ -285,18 +284,18 @@ public:
StatementList *pNext;
static StatementList /**pCurrent,*/ *pFirst;
static BOOL bReadingCommands;
- static SmartId aWindowWaitUId;
+ static rtl::OString aWindowWaitUId;
static Window *pWindowWaitPointer;
- static SmartId aWindowWaitOldHelpId;
- static SmartId aWindowWaitOldUniqueId;
+ static rtl::OString aWindowWaitOldHelpId;
+ static rtl::OString aWindowWaitOldUniqueId;
static RetStream *pRet;
static BOOL IsError;
static BOOL bDying;
static BOOL bExecuting; // Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben
BOOL bWasExecuting; // Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt
- static SmartId aSubMenuId1; // Untermenüs bei PopupMenus
- static SmartId aSubMenuId2; // erstmal 2-Stufig
- static SmartId aSubMenuId3; // and now even 3 levels #i31512#
+ static USHORT aSubMenuId1; // Untermenüs bei PopupMenus
+ static USHORT aSubMenuId2; // erstmal 2-Stufig
+ static USHORT aSubMenuId3; // and now even 3 levels #i31512#
static SystemWindow *pMenuWindow; // when using MenuBar as base for MenuCommands
static TTProperties *pTTProperties; // Hier stehen die SlotIDs aus dem SFX drin
@@ -350,7 +349,6 @@ class StatementCommand : public StatementList // Befehl ausführen (wintree, re
friend class ImplRemoteControl;
protected:
USHORT nMethodId;
- SmartId aSmartMethodId;
USHORT nParams;
comm_USHORT nNr1,nNr2,nNr3,nNr4;
comm_ULONG nLNr1;
@@ -385,7 +383,7 @@ enum TTHotSpots { MitteLinks, Mitte, MitteOben };
class StatementControl : public StatementList
{
protected:
- SmartId aUId;
+ rtl::OString aUId;
USHORT nMethodId;
USHORT nParams;
comm_USHORT nNr1,nNr2,nNr3,nNr4;
@@ -436,10 +434,10 @@ class SearchUID : public Search
{
Window *pMaybeResult;
Window *pAlternateResult;
- SmartId aUId;
+ rtl::OString aUId;
BOOL bSearchButtonOnToolbox;
public:
- SearchUID( SmartId aUIdP, BOOL bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), pAlternateResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {}
+ SearchUID( rtl::OString aUIdP, BOOL bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), pAlternateResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {}
virtual BOOL IsWinOK( Window *pWin );
Window* GetMaybeWin() { return pMaybeResult; }
Window* GetAlternateResultWin() { return pAlternateResult; }
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index 4f6d413f4280..a0e50e912498 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -98,11 +98,12 @@ String CmdStream::WandleKeyEventString( String aKeys )
{
Token = Work.GetToken(0,' ');
Work.Erase(0,Token.Len()+1);
- ControlDef WhatName(Token,SmartId());
+ ControlDef WhatName(Token,rtl::OString());
USHORT nElement;
if (pKeyCodes->Seek_Entry(&WhatName,&nElement))
{
- USHORT nCode = (USHORT) pKeyCodes->GetObject(nElement)->pData->aUId.GetNum();
+ // FIXME: HELPID
+ USHORT nCode = 0;//(USHORT) pKeyCodes->GetObject(nElement)->pData->aUId.GetNum();
if ( nCode >= KEY_SHIFT )
nModify ^= nCode;
else
diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx
index 75229bb32cb7..147b04bc0414 100644
--- a/automation/source/testtool/cretstrm.hxx
+++ b/automation/source/testtool/cretstrm.hxx
@@ -45,7 +45,7 @@ public:
void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );}
void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );}
// void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );}
- virtual void Read ( SmartId* &pId ){CmdBaseStream::Read ( pId );}
+ virtual void Read ( rtl::OString* &pId ){CmdBaseStream::Read ( pId );}
void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
// new
void Read( String &aString );
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 2361361f277f..4f0f5084ad37 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -137,7 +137,7 @@ CErrors *TestToolObj::pFehlerListe = NULL; // Hier werden die Fehler des Te
DBG_NAME( ControlItem )
DBG_NAME( ControlDef )
-ControlItem::ControlItem( const sal_Char *Name, SmartId aUIdP )
+ControlItem::ControlItem( const sal_Char *Name, rtl::OString aUIdP )
{
DBG_CTOR(ControlItem,0);
InitData();
@@ -145,7 +145,7 @@ DBG_CTOR(ControlItem,0);
pData->aUId = aUIdP;
}
-ControlItem::ControlItem( const String &Name, SmartId aUIdP )
+ControlItem::ControlItem( const String &Name, rtl::OString aUIdP )
{
DBG_CTOR(ControlItem,0);
InitData();
@@ -196,7 +196,7 @@ ControlSon::~ControlSon()
}
}
-ControlItemSon::ControlItemSon(const String &Name, SmartId aUIdP )
+ControlItemSon::ControlItemSon(const String &Name, rtl::OString aUIdP )
: ControlItem( Name, aUIdP )
{}
@@ -226,6 +226,8 @@ BOOL ControlDef::operator == (const ControlItem &rPar)
void ControlDef::Write( SvStream &aStream )
{
+ // FIXME: HELPID
+ #if 0
if ( pSons )
aStream.WriteByteString( String('*').Append( pData->Kurzname ), RTL_TEXTENCODING_UTF8 );
else
@@ -238,9 +240,12 @@ void ControlDef::Write( SvStream &aStream )
if ( pSons )
for ( USHORT i = 0 ; pSons->Count() > i ; i++ )
((ControlDef*)(*pSons)[i])->Write(aStream);
+ #else
+ (void)aStream;
+ #endif
}
-ControlDef::ControlDef(const String &Name, SmartId aUIdP )
+ControlDef::ControlDef(const String &Name, rtl::OString aUIdP )
: ControlItemSon( Name, aUIdP)
{
DBG_CTOR(ControlDef,0);
@@ -292,7 +297,7 @@ BOOL ControlItemUId::operator == (const ControlItem &rPar)
SV_IMPL_OP_PTRARR_SORT( CNames, ControlItem* )
-void CRevNames::Insert( String aName, SmartId aUId, ULONG nSeq )
+void CRevNames::Insert( String aName, rtl::OString aUId, ULONG nSeq )
{
ControlItem *pRN = new ReverseName(aName,aUId,nSeq);
USHORT nPos;
@@ -307,7 +312,7 @@ void CRevNames::Insert( String aName, SmartId aUId, ULONG nSeq )
}
-String CRevNames::GetName( SmartId aUId )
+String CRevNames::GetName( rtl::OString aUId )
{
ReverseName *pRN = new ReverseName(UniString(),aUId,0);
USHORT nPos;
@@ -318,10 +323,15 @@ String CRevNames::GetName( SmartId aUId )
return GetObject(nPos)->pData->Kurzname;
else
{
+ // FIXME: HELPID
+ #if 0
if ( aUId.Matches( UID_ACTIVE ) )
return CUniString("Active");
else
return GEN_RES_STR1( S_NAME_NOT_THERE, aUId.GetText() );
+ #else
+ return String();
+ #endif
}
}
@@ -686,7 +696,12 @@ void TestToolObj::InitTestToolObj()
SbxTransportMethod *pMeth = new SbxTransportMethod( SbxVARIANT );
pMeth->SetName( pRCommands->GetObject( i )->pData->Kurzname );
pMeth->SetUserData( ID_RemoteCommand );
+ // FIXME: HELPID
+ #if 0
pMeth->nValue = pRCommands->GetObject( i )->pData->aUId.GetNum();
+ #else
+ pMeth->nValue = 0;
+ #endif
Insert( pMeth );
StartListening( pMeth->GetBroadcaster(), TRUE );
}
@@ -866,7 +881,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
SvFileStream Stream;
String aLine,aShortname,aLongname;
- SmartId aUId;
+ rtl::OString aUId;
xub_StrLen nLineNr;
USHORT nElement;
ControlDef *pNewDef, *pNewDef2;
@@ -884,7 +899,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
ReadFlat( aFileName ,pUIds, TRUE );
if ( !pUIds )
return;
- pNewDef = new ControlDef("Active",SmartId(0));
+ pNewDef = new ControlDef("Active",rtl::OString());
const ControlItem *pItem = pNewDef;
if (! pUIds->Insert(pItem))
{
@@ -986,7 +1001,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
if ( aShortname.GetChar(0) == '+' ) // Kompletten Eintrag kopieren
{
aShortname.Erase(0,1);
- ControlDef WhatName(aLongname,SmartId());
+ ControlDef WhatName(aLongname,rtl::OString());
ControlDef *OldTree;
if (pNames->Seek_Entry(&WhatName,&nElement))
{
@@ -1015,11 +1030,15 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
else
{
+ // FIXME: HELPID
+ #if 0
if (aShortname.CompareIgnoreCaseToAscii("*Active") == COMPARE_EQUAL)
- aUId = SmartId( UID_ACTIVE );
- else if ( !bUnoName && !bMozillaName )
+ aUId = rtl::OString( UID_ACTIVE );
+ else
+ #endif
+ if ( !bUnoName && !bMozillaName )
{ // Bestimmen der ID aus der Hid.Lst
- ControlDef WhatName(aLongname,SmartId());
+ ControlDef WhatName(aLongname,rtl::OString());
if (pUIds->Seek_Entry(&WhatName,&nElement))
aUId = pUIds->GetObject(nElement)->pData->aUId;
else
@@ -1030,14 +1049,17 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
}
else
{
+ // FIXME: HELPID
+ #if 0
if ( bUnoName )
- aUId = SmartId( aLongname );
+ aUId = rtl::OString( aLongname );
else if ( bMozillaName )
- aUId = SmartId( aLongname );
+ aUId = rtl::OString( aLongname );
else
{
DBG_ERROR("Unknown URL schema");
}
+ #endif
}
@@ -1121,7 +1143,7 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName )
{
SvFileStream Stream;
String aLine,aLongname;
- SmartId aUId;
+ rtl::OString aUId;
xub_StrLen nLineNr;
ControlItem *pNewItem;
USHORT nDoubleCount = 0;
@@ -1162,7 +1184,8 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName )
}
aLongname = aLine.GetToken(0,cMyDelim);
- aUId = SmartId( (ULONG)aLine.GetToken(1,cMyDelim).ToInt64() );
+ // FIXME: HELPID
+ aUId = rtl::OUStringToOString( aLine.GetToken(1,cMyDelim), RTL_TEXTENCODING_UTF8 );
if ( bSortByName )
pNewItem = new ControlDef( aLongname, aUId );
@@ -1211,7 +1234,8 @@ void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames )
while ( String::CreateFromAscii(arWas[nIndex].Kurzname).Len() > 0 )
{
- SmartId aUId (arWas[nIndex].nUId);
+ // FIXME: HELPID
+ rtl::OString aUId;// (arWas[nIndex].nUId);
const ControlItem *pX = new ControlDef( arWas[nIndex].Kurzname, aUId);
pNames->C40_PTR_INSERT(ControlItem, pX);
nIndex++;
@@ -1472,7 +1496,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
{
SvFileStream aStream;
String aName,aURL;
- SmartId aUId;
+ rtl::OString aUId;
ControlDef *pNewDef, *pNewDef2;
ControlDef *pFatherDef = NULL;
@@ -1510,13 +1534,16 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
{
String aStrId;
aStream.ReadByteString( aStrId, RTL_TEXTENCODING_UTF8 );
- aUId = SmartId( aStrId );
+ // FIXME: HELPID
+ #if 0
+ aUId = rtl::OString( aStrId );
+ #endif
}
else
{
comm_ULONG nUId;
aStream >> nUId;
- aUId = SmartId( nUId );
+ aUId = rtl::OString();// nUId;
}
if (aName.GetChar(0) == '*' || bIsFlat ) // Globaler Kurzname (Dialogname oder SId)
@@ -1661,7 +1688,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
USHORT nElement;
SbxVariableRef pArg = rPar->Get( 1 );
String aKontext = pArg->GetString();
- ControlDef WhatName(aKontext,SmartId());
+ ControlDef WhatName(aKontext,rtl::OString());
if (m_pControls && m_pControls->Seek_Entry(&WhatName,&nElement))
{
m_pNameKontext = ((ControlDef*)m_pControls->GetObject(nElement))->GetSons();
@@ -2154,7 +2181,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
((Controls*)pVar)->PutULong( ((Controls*)pVar)->pMethodVar->GetULong() );
((Controls*)pVar)->pMethodVar->SetUserData(ID_Control);
- pShortNames->Insert( CUniString("xxx"), SmartId( ((Controls*)pVar)->pMethodVar->nValue ), nSequence );
+ pShortNames->Insert( CUniString("xxx"), rtl::OString( ((Controls*)pVar)->pMethodVar->nValue ), nSequence );
nOldValue = ((Controls*)pVar)->GetULong();
@@ -2193,7 +2220,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN )
{
pImpl->pNextReturn = ((SbxTransportMethod*)pVar);
- aNextReturnId = SmartId( ((SbxTransportMethod*)pVar)->nValue );
+ // FIXME: HELPID
+ aNextReturnId = rtl::OString();// ((SbxTransportMethod*)pVar)->nValue );
}
if ( SingleCommandBlock )
EndBlock();
@@ -2266,13 +2294,17 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
{
In->GenCmdControl (pMember->GetULong(),
(USHORT)((SbxTransportMethod*)pVar)->nValue, rPar);
- aNextReturnId = SmartId( pMember->GetULong() );
+ // FIXME: HELPID
+ aNextReturnId = rtl::OString();// pMember->GetULong() );
}
else
{
In->GenCmdControl (pMember->GetString(),
(USHORT)((SbxTransportMethod*)pVar)->nValue, rPar);
- aNextReturnId = SmartId( pMember->GetString() );
+ // FIXME: HELPID
+ #if 0
+ aNextReturnId = rtl::OString( pMember->GetString() );
+ #endif
}
}
@@ -2283,7 +2315,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
else
{
pImpl->pNextReturn = NULL;
- aNextReturnId = SmartId();
+ aNextReturnId = rtl::OString();
}
}
@@ -2839,7 +2871,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
{
USHORT nElement;
- ControlDef *pWhatName = new ControlDef(aStr,SmartId());
+ ControlDef *pWhatName = new ControlDef(aStr,rtl::OString());
/// nach Controls suchen
if (m_pNameKontext && m_pNameKontext->Seek_Entry(pWhatName,&nElement))
@@ -2854,9 +2886,12 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
// Will be set on method-child further down
+ // FIXME: HELPID
+ #if 0
if ( pWhatName->pData->aUId.HasNumeric() )
pImpl->pControlsObj->SetUserData( ID_Control );
else
+ #endif
pImpl->pControlsObj->SetUserData( ID_StringControl );
pShortNames->Insert(pWhatName->pData->Kurzname,pWhatName->pData->aUId,nSequence);
@@ -2869,10 +2904,13 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
pImpl->pControlsObj->SetDfltProperty(pID);
pMember = pID;
}
+ // FIXME: HELPID
+ #if 0
if ( pWhatName->pData->aUId.HasNumeric() )
pMember->PutULong(pWhatName->pData->aUId.GetNum());
else
pMember->PutString(pWhatName->pData->aUId.GetStr());
+ #endif
pMember = pImpl->pControlsObj->Find(CUniString("name"),SbxCLASS_DONTCARE);
if ( pMember != NULL )
@@ -2892,6 +2930,8 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) );
pMyVar->SetName( pWhatName->pData->Kurzname );
+ // FIXME: HELPID
+ #if 0
if ( pWhatName->pData->aUId.HasNumeric() )
{
pMyVar->SetUserData( ID_Dispatch );
@@ -2903,6 +2943,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
pMyVar->SetUserData( ID_UNODispatch );
pMyVar->aUnoSlot = pWhatName->pData->aUId.GetStr();
}
+ #endif
return pMyVar;
}
@@ -2910,7 +2951,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
if ( aStr.Copy( aStr.Len()-3, 3 ).CompareIgnoreCaseToAscii("_ID") == COMPARE_EQUAL && m_pSIds )
{
delete pWhatName;
- pWhatName = new ControlDef( aStr.Copy( 0, aStr.Len()-3 ), SmartId() );
+ pWhatName = new ControlDef( aStr.Copy( 0, aStr.Len()-3 ), rtl::OString() );
if ( m_pSIds->Seek_Entry( pWhatName, &nElement ) )
{ // Nach slots suchen
SbxVariable *pReturn = new SbxVariable;
@@ -2918,10 +2959,13 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) );
pReturn->SetName( pWhatName->pData->Kurzname );
+ // FIXME: HELPID
+ #if 0
if ( pWhatName->pData->aUId.HasNumeric() )
pReturn->PutULong(pWhatName->pData->aUId.GetNum());
else
pReturn->PutString(pWhatName->pData->aUId.GetStr());
+ #endif
return pReturn;
}
}
@@ -3320,7 +3364,8 @@ void TestToolObj::SortControlsByNumber( BOOL bIncludeActive )
}
if ( !bIncludeActive )
{
- ControlItem *pZeroItem = new ControlItemUId( UniString(), SmartId(0) );
+ // FIXME: HELPID
+ ControlItem *pZeroItem = new ControlItemUId( UniString(), rtl::OString() );
USHORT nNr;
if ( m_pReverseControls->Seek_Entry( pZeroItem, &nNr ) )
{
@@ -3356,19 +3401,25 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
case SIReturn:
{
USHORT nRet,nParams;
- SmartId aUId;
+ rtl::OString aUId;
pRetStream->Read(nRet);
if ( pRetStream->GetNextType() == BinString )
{
String aUStrId; // UniqueStringID Used for Mozilla Integration
pRetStream->Read( aUStrId );
- aUId = SmartId( aUStrId );
+ // FIXME: HELPID
+ #if 0
+ aUId = rtl::OString( aUStrId );
+ #endif
}
else
{
comm_ULONG nUId;
pRetStream->Read( nUId ); // bei Sequence einfach die Sequence
- aUId = SmartId( nUId );
+ // FIXME: HELPID
+ #if 0
+ aUId = rtl::OString( nUId );
+ #endif
}
pRetStream->Read(nParams);
@@ -3397,6 +3448,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
{
case RET_Sequence:
{
+ // FIXME: HELPID
+ #if 0
ULONG nUId = aUId.GetNum();
if ( nSequence != nUId )
{
@@ -3407,6 +3460,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
{
nClearSequence = nUId;
}
+ #endif
}
break;
case RET_Value:
@@ -3415,9 +3469,9 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
// ULONG nHintUserData = pImpl->pNextReturn->GetParent()->GetUserData();
// pImpl->pNextReturn->GetParent()->SetUserData(0);
// if ( nUId == pImpl->pNextReturn->GetParent()->GetULong() )
- if ( aNextReturnId.Matches( aUId ) )
+ if ( aNextReturnId.equals( aUId ) )
{
- if( nParams & PARAM_ULONG_1 )
+ if( nParams & PARAM_ULONG_1 ) // FIXME this is to allow negative numbers, hoping that no large numbers are interpreted wrong. should have new PARAM_LONG_1 instead
{
if ( nLNr1 > 0x7fffffff )
pImpl->pNextReturn->PutLong( long(nLNr1 - 0xffffffff) -1 );
@@ -3427,7 +3481,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
if( nParams & PARAM_USHORT_1 ) pImpl->pNextReturn->PutUShort( nNr1 );
if( nParams & PARAM_STR_1 ) pImpl->pNextReturn->PutString( aString1 );
if( nParams & PARAM_BOOL_1 ) pImpl->pNextReturn->PutBool( bBool1 );
- if( nParams & PARAM_SBXVALUE_1 )
+ if( nParams & PARAM_SBXVALUE_1 ) // FIXME: allow generic datatype
{
SbxValues aValues( SbxDATE );
xValue1->Get( aValues );
@@ -3468,7 +3522,10 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
}
WinInfoRec *pWinInfo = new WinInfoRec;
+ // FIXME: HELPID
+ #if 0
pWinInfo->aUId = aUId.GetText();
+ #endif
pWinInfo->nRType = (USHORT)nLNr1; // just ULONG for Transport, data is always USHORT
pWinInfo->aRName = aString1;
pWinInfo->bIsReset = bBool1;
@@ -3504,7 +3561,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
ControlItem *pNewItem = new ControlItemUId( String(), aUId );
if ( pReverseControlsKontext->Seek_Entry(pNewItem,&nNr) )
{
-// SmartId aID = pReverseControlsKontext->GetObject(nNr)->pData->aUId;
+// rtl::OString aID = pReverseControlsKontext->GetObject(nNr)->pData->aUId;
pWinInfo->aKurzname += pReverseControlsKontext->GetObject(nNr)->pData->Kurzname;
}
delete pNewItem;
@@ -3521,6 +3578,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
}
// Langname feststellen
+ // FIXME: HELPID
+ #if 0
if ( aUId.HasString() )
{ // use the String ID since there is no LongName in hid.lst
pWinInfo->aLangname = aUId.GetStr();
@@ -3536,6 +3595,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
delete pNewItem;
}
}
+ #endif
aWinInfoHdl.Call( pWinInfo );
@@ -3544,6 +3604,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
break;
case RET_ProfileInfo:
{
+ // FIXME: HELPID
+ #if 0
ULONG nUId = aUId.GetNum();
if ( nParams & PARAM_STR_1 )
{
@@ -3672,10 +3734,13 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
break;
}
}
+ #endif
}
break;
case RET_DirectLoging:
{
+ // FIXME: HELPID
+ #if 0
ULONG nUId = aUId.GetNum();
switch ( nUId )
{
@@ -3694,6 +3759,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
default:
;
}
+ #endif
}
break;
case RET_MacroRecorder:
@@ -3724,7 +3790,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
if ( m_pReverseControls )
{
USHORT nNr;
- ControlItem *pNewItem = new ControlItemUId( String(), SmartId( nLNr1 ) );
+ // FIXME: HELPID
+ ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString( /*nLNr1*/ ) );
if ( m_pReverseControls->Seek_Entry(pNewItem,&nNr) )
aULongNames = m_pReverseControls->GetObject(nNr)->pData->Kurzname;
delete pNewItem;
@@ -3959,18 +4026,24 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
case SIReturnError:
{
String aString;
- SmartId aUId;
+ rtl::OString aUId;
if ( pRetStream->GetNextType() == BinString )
{
String aUStrId; // UniqueStringID Used for Mozilla Integration
pRetStream->Read( aUStrId );
- aUId = SmartId( aUStrId );
+ // FIXME: HELPID
+ #if 0
+ aUId = rtl::OString( aUStrId );
+ #endif
}
else
{
comm_ULONG nUId;
pRetStream->Read( nUId ); // bei Sequence einfach die Sequence
- aUId = SmartId( nUId );
+ // FIXME: HELPID
+ #if 0
+ aUId = rtl::OString( nUId );
+ #endif
}
pRetStream->Read( aString );
ReplaceNumbers (aString);
@@ -4016,9 +4089,15 @@ String TestToolObj::GetMethodName( ULONG nMethodId )
ReadFlatArray( Controls::arClasses, Controls::pClasses );
if ( Controls::pClasses )
{
+ // FIXME: HELPID
+ #if 0
for ( nElement = 0 ; nElement < Controls::pClasses->Count() ; nElement++ )
if ( Controls::pClasses->GetObject(nElement)->pData->aUId.Matches( nMethodId ) )
return Controls::pClasses->GetObject(nElement)->pData->Kurzname;
+ #else
+ (void)nElement;
+ (void)nMethodId;
+ #endif
}
return String();
}
@@ -4030,9 +4109,15 @@ String TestToolObj::GetKeyName( USHORT nKeyCode )
ReadFlatArray( CmdStream::arKeyCodes, CmdStream::pKeyCodes );
if ( CmdStream::pKeyCodes )
{
+ // FIXME: HELPID
+ #if 0
for ( nElement = 0 ; nElement < CmdStream::pKeyCodes->Count() ; nElement++ )
if ( CmdStream::pKeyCodes->GetObject(nElement)->pData->aUId.Matches( nKeyCode ) )
return CmdStream::pKeyCodes->GetObject(nElement)->pData->Kurzname;
+ #else
+ (void)nElement;
+ (void)nKeyCode;
+ #endif
}
return CUniString( "UnknownKeyCode" );
}
@@ -4061,7 +4146,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] =
bFound = FALSE;
if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL )
{
- aResult = pShortNames->GetName(SmartId(nNumber));
+ // FIXME: HELPID
+ aResult = pShortNames->GetName(rtl::OString(/*nNumber*/));
bFound = TRUE;
}
if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL )
@@ -4078,12 +4164,17 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] =
USHORT nElement;
if ( pRCommands )
{
+ // FIXME: HELPID
+ #if 0
for ( nElement = 0 ; nElement < pRCommands->Count() ; nElement++ )
if ( pRCommands->GetObject(nElement)->pData->aUId.Matches( nNumber ) )
{
aResult = pRCommands->GetObject(nElement)->pData->Kurzname;
nElement = pRCommands->Count();
}
+ #else
+ (void)nElement;
+ #endif
}
}
if ( aType.CompareTo(TypeKenn ) == COMPARE_EQUAL )
@@ -4095,17 +4186,23 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] =
USHORT nElement;
if ( pRTypes )
{
+ // FIXME: HELPID
+ #if 0
for ( nElement = 0 ; nElement < pRTypes->Count() ; nElement++ )
if ( pRTypes->GetObject(nElement)->pData->aUId.Matches( nNumber ) )
{
aResult = pRTypes->GetObject(nElement)->pData->Kurzname;
nElement = pRTypes->Count();
}
+ #else
+ (void)nElement;
+ #endif
}
}
if ( aType.CompareTo(SlotKenn ) == COMPARE_EQUAL )
{
- aResult = pShortNames->GetName(SmartId(nNumber));
+ // FIXME: HELPID
+ aResult = pShortNames->GetName(rtl::OString(/*nNumber*/));
bFound = TRUE;
}
if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL )
@@ -4142,7 +4239,7 @@ SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl )
}
- ControlDef WhatName( rSymbol, SmartId() );
+ ControlDef WhatName( rSymbol, rtl::OString() );
if ( bWasControl )
{
@@ -4233,11 +4330,12 @@ SbxVariable* Controls::Find( const String& aStr, SbxClassType aType)
USHORT nElement;
- ControlDef WhatName(aStr,SmartId());
+ ControlDef WhatName(aStr,rtl::OString());
if (pClasses && pClasses->Seek_Entry(&WhatName,&nElement))
{
pMethodVar->SetName(aStr);
- ULONG nUId = pClasses->GetObject(nElement)->pData->aUId.GetNum();
+ // FIXME: HELPID
+ ULONG nUId = 0;//pClasses->GetObject(nElement)->pData->aUId.GetNum();
pMethodVar->nValue = nUId;
pMethodVar->SetUserData( GetUserData() );
diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx
index d82e4626a4d2..f62d59311024 100644
--- a/automation/source/testtool/objtest.hxx
+++ b/automation/source/testtool/objtest.hxx
@@ -35,7 +35,6 @@
#include <testtool.hxx>
#include "cmdstrm.hxx"
#include <basic/basicrt.hxx>
-#include <vcl/smartid.hxx>
#include "httprequest.hxx"
#include <map>
@@ -106,7 +105,7 @@ class ControlData
{
public:
String Kurzname;
- SmartId aUId;
+ rtl::OString aUId;
};
DBG_NAMEEX( ControlItem )
@@ -118,8 +117,8 @@ private:
public:
ControlData *pData;
- ControlItem( const char *Name, SmartId aUIdP );
- ControlItem( const String &Name, SmartId aUIdP );
+ ControlItem( const char *Name, rtl::OString aUIdP );
+ ControlItem( const String &Name, rtl::OString aUIdP );
// ControlItem( const String &Name, const String &URL, const URLType aType );
// ControlItem( const String &Name, const String &URL, const ULONG nUId );
// ControlItem( const char *Name, const String &URL, const ULONG nUId );
@@ -158,9 +157,9 @@ public:
class ControlItemSon : public ControlItem, public ControlSon
{
public:
- ControlItemSon(const char *Name, SmartId aUIdP )
+ ControlItemSon(const char *Name, rtl::OString aUIdP )
: ControlItem( Name, aUIdP ) {}
- ControlItemSon(const String &Name, SmartId aUIdP );
+ ControlItemSon(const String &Name, rtl::OString aUIdP );
// ControlItemSon(const String &Name, const String &URL, const URLType aType );
// ControlItemSon(const String &Name, const String &URL, const ULONG nUId );
// ControlItemSon(const char *Name, const String &URL, const ULONG nUId );
@@ -170,9 +169,9 @@ public:
class ControlDef : public ControlItemSon
{
public:
- ControlDef(const char *Name, SmartId aUIdP )
+ ControlDef(const char *Name, rtl::OString aUIdP )
: ControlItemSon( Name, aUIdP ) {DBG_CTOR(ControlDef,0);}
- ControlDef(const String &Name, SmartId aUIdP );
+ ControlDef(const String &Name, rtl::OString aUIdP );
// ControlDef(const String &Name, const String &URL, const URLType aType );
ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE );
~ControlDef() {DBG_DTOR(ControlDef,0);}
@@ -185,7 +184,7 @@ public:
class ControlItemUId : public ControlItem
{
public:
- ControlItemUId(String Name, SmartId aUIdP)
+ ControlItemUId(String Name, rtl::OString aUIdP)
: ControlItem( Name, aUIdP){}
virtual BOOL operator < (const ControlItem &rPar);
virtual BOOL operator == (const ControlItem &rPar);
@@ -194,7 +193,7 @@ public:
class ControlItemUIdSon : public ControlItemUId, public ControlSon
{
public:
- ControlItemUIdSon(String Name, SmartId aUIdP) : ControlItemUId( Name, aUIdP) {}
+ ControlItemUIdSon(String Name, rtl::OString aUIdP) : ControlItemUId( Name, aUIdP) {}
MK_SON_ACCESS( ControlItemUId )
};
@@ -203,14 +202,14 @@ class ReverseName : public ControlItemUId
public:
ULONG LastSequence;
- ReverseName(String Name, SmartId aUIdP, ULONG nSeq) : ControlItemUId( Name, aUIdP), LastSequence(nSeq) {}
+ ReverseName(String Name, rtl::OString aUIdP, ULONG nSeq) : ControlItemUId( Name, aUIdP), LastSequence(nSeq) {}
};
class CRevNames: public CNames
{
public:
- void Insert( String aName, SmartId aUId, ULONG nSeq );
- String GetName( SmartId aUId );
+ void Insert( String aName, rtl::OString aUId, ULONG nSeq );
+ String GetName( rtl::OString aUId );
void Invalidate ( ULONG nSeq );
};
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 0f666941e57e..4b2f2ba90952 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -27,59 +27,53 @@
#ifndef _BASCTL_HELPID_HRC
#define _BASCTL_HELPID_HRC
-// include ---------------------------------------------------------------
+#define HID_BASICIDE_TOOLBOX "BASCTL_HID_BASICIDE_TOOLBOX"
+#define HID_BASICIDE_OBJECTS "BASCTL_HID_BASICIDE_OBJECTS"
+#define HID_MACRO_OPTIONS "BASCTL_HID_MACRO_OPTIONS"
+#define HID_BASICIDE_BRKPNTS "BASCTL_HID_BASICIDE_BRKPNTS"
+#define HID_BASICIDE_MODULS "BASCTL_HID_BASICIDE_MODULS"
+#define HID_BASICIDE_LIBS_TP "BASCTL_HID_BASICIDE_LIBS_TP"
+#define HID_BASICIDE_LIBS_DLG "BASCTL_HID_BASICIDE_LIBS_DLG"
+#define HID_BASICIDE_CONTROLS "BASCTL_HID_BASICIDE_CONTROLS"
+#define HID_BASICIDE_MACROS "BASCTL_HID_BASICIDE_MACROS"
+#define HID_BASICIDE_LIBS "BASCTL_HID_BASICIDE_LIBS"
+#define HID_BASICIDE_ORG_TC "BASCTL_HID_BASICIDE_ORG_TC"
-#include <svl/solar.hrc>
+#define HID_BASICIDE_MODULES_TREE "BASCTL_HID_BASICIDE_MODULES_TREE"
+#define HID_BASICIDE_LIBS_TREE "BASCTL_HID_BASICIDE_LIBS_TREE"
+#define HID_BASICIDE_LIBSDLG_TREE "BASCTL_HID_BASICIDE_LIBSDLG_TREE"
+#define HID_BASICIDE_OBJECTCAT "BASCTL_HID_BASICIDE_OBJECTCAT"
-// Help-Ids --------------------------------------------------------------
+#define HID_BASICIDE_PROP_BROWSER "BASCTL_HID_BASICIDE_PROP_BROWSER"
-#define HID_BASICIDE_TOOLBOX (HID_BASICIDE_START + 0)
-#define HID_BASICIDE_OBJECTS (HID_BASICIDE_START + 1)
-#define HID_MACRO_OPTIONS (HID_BASICIDE_START + 2)
-#define HID_BASICIDE_BRKPNTS (HID_BASICIDE_START + 3)
-#define HID_BASICIDE_MODULS (HID_BASICIDE_START + 4)
-#define HID_BASICIDE_LIBS_TP (HID_BASICIDE_START + 5)
-#define HID_BASICIDE_LIBS_DLG (HID_BASICIDE_START + 6)
-#define HID_BASICIDE_CONTROLS (HID_BASICIDE_START + 7)
-#define HID_BASICIDE_MACROS (HID_BASICIDE_START + 8)
-#define HID_BASICIDE_LIBS (HID_BASICIDE_START + 9)
-#define HID_BASICIDE_ORG_TC (HID_BASICIDE_START + 10)
+#define HID_BASICIDE_PROP_BROWSER_LBOX "BASCTL_HID_BASICIDE_PROP_BROWSER_LBOX"
-#define HID_BASICIDE_MODULES_TREE (HID_BASICIDE_START + 11)
-#define HID_BASICIDE_LIBS_TREE (HID_BASICIDE_START + 12)
-#define HID_BASICIDE_LIBSDLG_TREE (HID_BASICIDE_START + 13)
-#define HID_BASICIDE_OBJECTCAT (HID_BASICIDE_START + 14)
+#define HID_BASICIDE_OBJCAT_SHOW "BASCTL_HID_BASICIDE_OBJCAT_SHOW"
+#define HID_BASICIDE_OBJCAT_PROPS "BASCTL_HID_BASICIDE_OBJCAT_PROPS"
+#define HID_BASICIDE_OBJCAT_HELP "BASCTL_HID_BASICIDE_OBJCAT_HELP"
-#define HID_BASICIDE_PROP_BROWSER (HID_BASICIDE_START + 15)
+#define HID_BASICIDE_BRKDLG "BASCTL_HID_BASICIDE_BRKDLG"
+#define HID_BASICIDE_ACTIV "BASCTL_HID_BASICIDE_ACTIV"
+#define HID_BASICIDE_BRKPROPS "BASCTL_HID_BASICIDE_BRKPROPS"
+#define HID_BASICIDE_REMOVEWATCH "BASCTL_HID_BASICIDE_REMOVEWATCH"
+#define HID_BASICIDE_GOTOALL "BASCTL_HID_BASICIDE_GOTOALL"
-#define HID_BASICIDE_PROP_BROWSER_LBOX (HID_BASICIDE_START + 16)
+#define HID_BASICIDE_MODULWINDOW "BASCTL_HID_BASICIDE_MODULWINDOW"
+#define HID_BASICIDE_DIALOGWINDOW "BASCTL_HID_BASICIDE_DIALOGWINDOW"
-#define HID_BASICIDE_OBJCAT_SHOW (HID_BASICIDE_START + 17)
-#define HID_BASICIDE_OBJCAT_PROPS (HID_BASICIDE_START + 18)
-#define HID_BASICIDE_OBJCAT_HELP (HID_BASICIDE_START + 19)
+#define HID_BASICIDE_EDITORWINDOW "BASCTL_HID_BASICIDE_EDITORWINDOW"
+#define HID_BASICIDE_BREAKPOINTWINDOW "BASCTL_HID_BASICIDE_BREAKPOINTWINDOW"
+#define HID_BASICIDE_WATCHWINDOW "BASCTL_HID_BASICIDE_WATCHWINDOW"
+#define HID_BASICIDE_STACKWINDOW "BASCTL_HID_BASICIDE_STACKWINDOW"
+#define HID_BASICIDE_TABBAR "BASCTL_HID_BASICIDE_TABBAR"
+#define HID_BASICIDE_WATCHWINDOW_EDIT "BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT"
+#define HID_BASICIDE_WATCHWINDOW_LIST "BASCTL_HID_BASICIDE_WATCHWINDOW_LIST"
+#define HID_BASICIDE_STACKWINDOW_LIST "BASCTL_HID_BASICIDE_STACKWINDOW_LIST"
-#define HID_BASICIDE_BRKDLG (HID_BASICIDE_START + 20)
-#define HID_BASICIDE_ACTIV (HID_BASICIDE_START + 21)
-#define HID_BASICIDE_BRKPROPS (HID_BASICIDE_START + 22)
-#define HID_BASICIDE_REMOVEWATCH (HID_BASICIDE_START + 23)
-#define HID_BASICIDE_GOTOALL (HID_BASICIDE_START + 24)
-
-#define HID_BASICIDE_MODULWINDOW (HID_BASICIDE_START + 25)
-#define HID_BASICIDE_DIALOGWINDOW (HID_BASICIDE_START + 26)
-
-#define HID_BASICIDE_EDITORWINDOW (HID_BASICIDE_START + 27)
-#define HID_BASICIDE_BREAKPOINTWINDOW (HID_BASICIDE_START + 28)
-#define HID_BASICIDE_WATCHWINDOW (HID_BASICIDE_START + 29)
-#define HID_BASICIDE_STACKWINDOW (HID_BASICIDE_START + 30)
-#define HID_BASICIDE_TABBAR (HID_BASICIDE_START + 31)
-#define HID_BASICIDE_WATCHWINDOW_EDIT (HID_BASICIDE_START + 32)
-#define HID_BASICIDE_WATCHWINDOW_LIST (HID_BASICIDE_START + 33)
-#define HID_BASICIDE_STACKWINDOW_LIST (HID_BASICIDE_START + 34)
-
-#define HID_BASICIDE_MANAGE_LANGUAGE (HID_BASICIDE_START + 35)
-#define HID_BASICIDE_SETDEFAULT_LANGUAGE (HID_BASICIDE_START + 36)
-#define HID_BASICIDE_ADDNEW_LANGUAGE (HID_BASICIDE_START + 37)
-#define HID_BASICIDE_ADDNEW_CONTROL (HID_BASICIDE_START + 38)
+#define HID_BASICIDE_MANAGE_LANGUAGE "BASCTL_HID_BASICIDE_MANAGE_LANGUAGE"
+#define HID_BASICIDE_SETDEFAULT_LANGUAGE "BASCTL_HID_BASICIDE_SETDEFAULT_LANGUAGE"
+#define HID_BASICIDE_ADDNEW_LANGUAGE "BASCTL_HID_BASICIDE_ADDNEW_LANGUAGE"
+#define HID_BASICIDE_ADDNEW_CONTROL "BASCTL_HID_BASICIDE_ADDNEW_CONTROL"
#endif
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index cdf4c58015ba..7b91d7c3a7d8 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -88,42 +88,6 @@ void BasicDocShell::SetPrinter( SfxPrinter* pPr )
}
}
-void BasicDocShell::FillStatusBar( StatusBar& rStatusBar )
-{
- String aTmp;
-
- // Titel
- aTmp.Fill( 30, 'X' );
- rStatusBar.InsertItem( SID_BASICIDE_STAT_TITLE,
- rStatusBar.GetTextWidth( aTmp ), SIB_AUTOSIZE | SIB_LEFT);
-
- // Modify
- rStatusBar.InsertItem( SID_DOC_MODIFIED,
- rStatusBar.GetTextWidth( '*' ) );
-
- // signatures
- rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW );
- rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE);
-
- // Position
- aTmp.Erase();
- aTmp.Fill( 15, 'X' );
- rStatusBar.InsertItem( SID_BASICIDE_STAT_POS,
- rStatusBar.GetTextWidth( aTmp ), SIB_LEFT);
-
- // Insert/Overwrite
- rStatusBar.InsertItem( SID_ATTR_INSERT,
- rStatusBar.GetTextWidth( String( RTL_CONSTASCII_USTRINGPARAM( "XXXXX" /* "EINFG" */ ) ) ) );
-
- // Uhrzeit
- aTmp.Fill( 20, 'X' );
- rStatusBar.InsertItem( SID_ATTR_SIZE,
- rStatusBar.GetTextWidth( aTmp ), SIB_AUTOSIZE | SIB_LEFT | SIB_USERDRAW );
-
-// return pStatusBar;
-
-}
-
void BasicDocShell::FillClass( SvGlobalName*, sal_uInt32*, String*, String*, String*, sal_Int32, sal_Bool bTemplate) const
{
(void)bTemplate;
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 1ef5991cfab4..a2ec0917ceb5 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -39,7 +39,6 @@ class BasicDocShell: public SfxObjectShell
SfxPrinter* pPrinter;
protected:
- virtual void FillStatusBar( StatusBar& rBar);
virtual void Draw( OutputDevice *, const JobSetup & rSetup,
USHORT nAspect = ASPECT_CONTENT );
virtual void FillClass( SvGlobalName * pClassName,
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index b6b4accb7dd6..782485b535a2 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -28,8 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-
-#include <svl/svarray.hxx>
+#include <vector>
#define _BASIC_TEXTPORTIONS
#include <basic/sbdef.hxx>
#include <ide_pch.hxx>
@@ -258,7 +257,7 @@ void __EXPORT EditorWindow::RequestHelp( const HelpEvent& rHEvt )
if ( rHEvt.GetMode() & HELPMODE_CONTEXT )
{
String aKeyword = GetWordAtCursor();
- Application::GetHelp()->Start( aKeyword, this );
+ Application::GetHelp()->SearchKeyword( aKeyword );
bDone = TRUE;
}
else if ( rHEvt.GetMode() & HELPMODE_QUICK )
@@ -773,8 +772,8 @@ void EditorWindow::ImpDoHighlight( ULONG nLine )
pEditEngine->RemoveAttribs( nLine, TRUE );
HighlightPortions aPortions;
aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
- USHORT nCount = aPortions.Count();
- for ( USHORT i = 0; i < nCount; i++ )
+
+ for ( size_t i = 0; i < aPortions.size(); i++ )
{
HighlightPortion& r = aPortions[i];
const Color& rColor = ((ModulWindowLayout*)pModulWindow->GetLayoutWindow())->getSyntaxColor(r.tokenType);
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 556211f690af..e114c04bc898 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -31,6 +31,8 @@
#include <svx/globlmn.hrc>
#endif
#include "dlgresid.hrc"
+#include <sfx2/sfxcommands.h>
+#include <svx/svxcommands.h>
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
@@ -442,13 +444,13 @@ Menu RID_POPUP_TABBAR
MenuItem
{
Identifier = SID_BASICIDE_NEWMODULE ;
- HelpId = SID_BASICIDE_NEWMODULE ;
+ HelpId = CMD_SID_BASICIDE_NEWMODULE ;
Text [ en-US ] = "BASIC Module" ;
};
MenuItem
{
Identifier = SID_BASICIDE_NEWDIALOG ;
- HelpId = SID_BASICIDE_NEWDIALOG ;
+ HelpId = CMD_SID_BASICIDE_NEWDIALOG ;
Text [ en-US ] = "BASIC Dialog" ;
};
};
@@ -458,7 +460,7 @@ Menu RID_POPUP_TABBAR
MenuItem
{
Identifier = SID_BASICIDE_DELETECURRENT ;
- HelpId = SID_BASICIDE_DELETECURRENT ;
+ HelpId = CMD_SID_BASICIDE_DELETECURRENT ;
/* ### ACHTUNG: Neuer Text in Resource? Löschen : L÷schen */
Text [ en-US ] = "Delete" ;
/* ### ACHTUNG: Neuer Text in Resource? Modul oder Dialog löschen : Modul oder Dialog l÷schen */
@@ -466,13 +468,13 @@ Menu RID_POPUP_TABBAR
MenuItem
{
Identifier = SID_BASICIDE_RENAMECURRENT ;
- HelpId = SID_BASICIDE_RENAMECURRENT ;
+ HelpId = CMD_SID_BASICIDE_RENAMECURRENT ;
Text [ en-US ] = "Rename" ;
};
MenuItem
{
Identifier = SID_BASICIDE_HIDECURPAGE ;
- HelpId = SID_BASICIDE_HIDECURPAGE ;
+ HelpId = CMD_SID_BASICIDE_HIDECURPAGE ;
Text [ en-US ] = "Hide" ;
};
MenuItem
@@ -482,7 +484,7 @@ Menu RID_POPUP_TABBAR
MenuItem
{
Identifier = SID_BASICIDE_MODULEDLG ;
- HelpId = SID_BASICIDE_MODULEDLG ;
+ HelpId = CMD_SID_BASICIDE_MODULEDLG ;
Text [ en-US ] = "Modules..." ;
};
};
@@ -495,7 +497,7 @@ Menu RID_POPUP_DLGED
MenuItem
{
Identifier = SID_SHOW_PROPERTYBROWSER ;
- HelpId = SID_SHOW_PROPERTYBROWSER ;
+ HelpId = CMD_SID_SHOW_PROPERTYBROWSER ;
Text [ en-US ] = "Properties...";
};
};
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index de9eff56ca24..77e92189507b 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -42,14 +42,13 @@
#include <basdoc.hxx>
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
+#include <deque>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-SV_DECL_VARARR( EntryArray, SvLBoxEntry*, 4, 4 )
-
-SV_IMPL_VARARR( EntryArray, SvLBoxEntry*);
+typedef std::deque< SvLBoxEntry* > EntryArray;
void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
@@ -196,7 +195,7 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry )
case 2:
case 1:
{
- aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
+ aEntries.push_front( pEntry );
}
break;
case 0:
@@ -210,14 +209,14 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry )
SbxVariable* pVar = 0;
bool bDocumentObjects = false;
- if ( aEntries.Count() )
+ if ( !aEntries.empty() )
{
- for ( USHORT n = 0; n < aEntries.Count(); n++ )
+ for ( size_t n = 0; n < aEntries.size(); n++ )
{
SvLBoxEntry* pLE = aEntries[n];
- DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" );
+ DBG_ASSERT( pLE, "Can not find entry in array" );
BasicEntry* pBE = (BasicEntry*)pLE->GetUserData();
- DBG_ASSERT( pBE, "Keine Daten im Eintrag gefunden!" );
+ DBG_ASSERT( pBE, "The data in the entry not found!" );
String aName( GetEntryText( pLE ) );
switch ( pBE->GetType() )
@@ -301,7 +300,7 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
case 2:
case 1:
{
- aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
+ aEntries.push_front( pEntry );
}
break;
case 0:
@@ -319,9 +318,9 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
pEntry = GetParent( pEntry );
}
- if ( aEntries.Count() )
+ if ( !aEntries.empty() )
{
- for ( USHORT n = 0; n < aEntries.Count(); n++ )
+ for ( size_t n = 0; n < aEntries.size(); n++ )
{
SvLBoxEntry* pLE = aEntries[n];
DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" );
diff --git a/basctl/source/basicide/brkdlg.src b/basctl/source/basicide/brkdlg.src
index 00fd8fbf8968..6f243a8548db 100644
--- a/basctl/source/basicide/brkdlg.src
+++ b/basctl/source/basicide/brkdlg.src
@@ -29,7 +29,7 @@
#include <brkdlg.hrc>
ModalDialog RID_BASICIDE_BREAKPOINTDLG
{
- // HelpId = HID_BASICIDE_BRKPNTS ;
+ HelpId = "basctl:RID_BASICIDE_BREAKPOINTDLG" ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 178 , 116 ) ;
@@ -37,6 +37,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
// Closeable = TRUE;
ComboBox RID_CB_BRKPOINTS
{
+ HelpID = "basctl:ComboBox:RID_BASICIDE_BREAKPOINTDLG:RID_CB_BRKPOINTS";
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 110 , 70 ) ;
TabStop = TRUE ;
@@ -55,6 +56,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
};
PushButton RID_PB_NEW
{
+ HelpID = "basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_NEW";
Pos = MAP_APPFONT ( 122 , 57 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -62,6 +64,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
};
PushButton RID_PB_DEL
{
+ HelpID = "basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_DEL";
Pos = MAP_APPFONT ( 122 , 74 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
/* ### ACHTUNG: Neuer Text in Resource? Löschen : L÷schen */
@@ -70,6 +73,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
};
CheckBox RID_CHKB_ACTIVE
{
+ HelpID = "basctl:CheckBox:RID_BASICIDE_BREAKPOINTDLG:RID_CHKB_ACTIVE";
Pos = MAP_APPFONT ( 6 , 87 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
@@ -89,6 +93,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
};
NumericField RID_FLD_PASS
{
+ HelpID = "basctl:NumericField:RID_BASICIDE_BREAKPOINTDLG:RID_FLD_PASS";
Border = TRUE ;
Pos = MAP_APPFONT ( 81 , 100 ) ;
Size = MAP_APPFONT ( 35 , 12 ) ;
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 24bc5beacb30..996e98f52ce4 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -121,9 +121,10 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bCreateEntries ) :
aMacroBox.SetSelectHdl( LINK( this, MacroChooser, MacroSelectHdl ) );
aBasicBox.SetMode( BROWSEMODE_MODULES );
- aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT |
- WB_HASBUTTONS | WB_HASBUTTONSATROOT |
- WB_HSCROLL );
+ aBasicBox.SetStyle( WB_TABSTOP | WB_BORDER |
+ WB_HASLINES | WB_HASLINESATROOT |
+ WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+ WB_HSCROLL );
BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src
index 5037879802b0..347e73906222 100644
--- a/basctl/source/basicide/macrodlg.src
+++ b/basctl/source/basicide/macrodlg.src
@@ -31,7 +31,7 @@
#include <helpid.hrc>
ModalDialog RID_MACROCHOOSER
{
- // HelpId = SID_BASICCHOOSER ;
+ HelpId = "basctl:ModalDialog:RID_MACROCHOOSER" ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 287 , 165 ) ;
@@ -70,6 +70,7 @@ ModalDialog RID_MACROCHOOSER
};
Edit RID_ED_MACRONAME
{
+ HelpID = "basctl:Edit:RID_MACROCHOOSER:RID_ED_MACRONAME";
Border = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
@@ -97,6 +98,7 @@ ModalDialog RID_MACROCHOOSER
};
PushButton RID_PB_RUN
{
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN";
Pos = MAP_APPFONT ( 231 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
DefButton = TRUE;
@@ -114,6 +116,7 @@ ModalDialog RID_MACROCHOOSER
PushButton RID_PB_ASSIGN
{
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ASSIGN";
Pos = MAP_APPFONT ( 231 , 60 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Assign..." ;
@@ -121,6 +124,7 @@ ModalDialog RID_MACROCHOOSER
};
PushButton RID_PB_EDIT
{
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_EDIT";
Size = MAP_APPFONT ( 50 , 14 ) ;
Pos = MAP_APPFONT ( 231 , 77 ) ;
Text [ en-US ] = "~Edit" ;
@@ -128,18 +132,21 @@ ModalDialog RID_MACROCHOOSER
};
PushButton RID_PB_NEWLIB
{
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWLIB";
Pos = MAP_APPFONT ( 231 , 60 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "New ~Library";
};
PushButton RID_PB_NEWMOD
{
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWMOD";
Size = MAP_APPFONT ( 50 , 14 ) ;
Pos = MAP_APPFONT ( 231 , 77 ) ;
Text [ en-US ] = "New M~odule";
};
PushButton RID_PB_DEL
{
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL";
Pos = MAP_APPFONT ( 231 , 94 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
/* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */
@@ -148,6 +155,7 @@ ModalDialog RID_MACROCHOOSER
};
PushButton RID_PB_ORG
{
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ORG";
Pos = MAP_APPFONT ( 231 , 114 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Organizer..." ;
@@ -160,6 +168,7 @@ ModalDialog RID_MACROCHOOSER
};
MultiLineEdit RID_ML_DESCRIPTION
{
+ HelpID = "basctl:MultiLineEdit:RID_MACROCHOOSER:RID_ML_DESCRIPTION";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 131 ) ;
Size = MAP_APPFONT ( 216 , 28 ) ;
diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk
index b225b987b24b..452d698d0428 100644
--- a/basctl/source/basicide/makefile.mk
+++ b/basctl/source/basicide/makefile.mk
@@ -81,7 +81,7 @@ SLOFILES = $(EXCEPTIONSFILES) \
$(SLO)$/objdlg.obj \
SRS1NAME=$(TARGET)
-SRC1FILES= basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src tbxctl.src basicprint.src
+SRC1FILES= basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src basicprint.src
.INCLUDE : target.mk
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 714fc6656941..35bc94e24fca 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -521,7 +521,7 @@ LibPage::LibPage( Window * pParent )
aLibBox.SetMode( LIBMODE_MANAGER );
aLibBox.EnableInplaceEditing( TRUE );
- aLibBox.SetWindowBits( WB_HSCROLL );
+ aLibBox.SetStyle( WB_HSCROLL | WB_BORDER | WB_TABSTOP );
aCloseButton.GrabFocus();
long aTabs[] = { 2, 30, 120 };
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 0f66a6ebe120..c877b2f35bb2 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -596,9 +596,10 @@ ObjectPage::ObjectPage( Window * pParent, const ResId& rResId, USHORT nMode ) :
aBasicBox.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY );
aBasicBox.EnableInplaceEditing( TRUE );
aBasicBox.SetMode( nMode );
- aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT |
- WB_HASBUTTONS | WB_HASBUTTONSATROOT |
- WB_HSCROLL );
+ aBasicBox.SetStyle( WB_BORDER | WB_TABSTOP |
+ WB_HASLINES | WB_HASLINESATROOT |
+ WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+ WB_HSCROLL );
aBasicBox.ScanAllEntries();
aEditButton.GrabFocus();
diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src
index a6ac943f29d0..130aad751a77 100644
--- a/basctl/source/basicide/moduldlg.src
+++ b/basctl/source/basicide/moduldlg.src
@@ -64,7 +64,7 @@ TabDialog RID_TD_ORGANIZE
};
TabPage RID_TP_MODULS
{
- // HelpId = HID_BASICIDE_MODULS ;
+ HelpId = "basctl:TabPage:RID_TP_MODULS" ;
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 210 , 140 ) ;
@@ -84,6 +84,7 @@ TabPage RID_TP_MODULS
};
PushButton RID_PB_EDIT
{
+ HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_EDIT";
Text [ en-US ] = "~Edit";
Pos = MAP_APPFONT ( 144 , 6 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -99,6 +100,7 @@ TabPage RID_TP_MODULS
};
PushButton RID_PB_NEWMOD
{
+ HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_NEWMOD";
Pos = MAP_APPFONT ( 144 , 103 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~New..." ;
@@ -106,6 +108,7 @@ TabPage RID_TP_MODULS
};
PushButton RID_PB_NEWDLG
{
+ HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_NEWDLG";
Pos = MAP_APPFONT ( 144 , 103 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~New..." ;
@@ -113,6 +116,7 @@ TabPage RID_TP_MODULS
};
PushButton RID_PB_DELETE
{
+ HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_DELETE";
Pos = MAP_APPFONT ( 144 , 120 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
/* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */
@@ -122,6 +126,7 @@ TabPage RID_TP_MODULS
};
TabPage RID_TP_DLGS
{
+ HelpID = "basctl:TabPage:RID_TP_DLGS";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 210 , 140 ) ;
@@ -141,6 +146,7 @@ TabPage RID_TP_DLGS
};
PushButton RID_PB_EDIT
{
+ HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_EDIT";
Text [ en-US ] = "~Edit";
Pos = MAP_APPFONT ( 144 , 6 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -156,6 +162,7 @@ TabPage RID_TP_DLGS
};
PushButton RID_PB_NEWMOD
{
+ HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_NEWMOD";
Pos = MAP_APPFONT ( 144 , 103 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~New..." ;
@@ -163,6 +170,7 @@ TabPage RID_TP_DLGS
};
PushButton RID_PB_NEWDLG
{
+ HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_NEWDLG";
Pos = MAP_APPFONT ( 144 , 103 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~New..." ;
@@ -170,6 +178,7 @@ TabPage RID_TP_DLGS
};
PushButton RID_PB_DELETE
{
+ HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_DELETE";
Pos = MAP_APPFONT ( 144 , 120 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
/* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */
@@ -179,7 +188,7 @@ TabPage RID_TP_DLGS
};
TabPage RID_TP_LIBS
{
- // HelpId = HID_BASICIDE_LIBS_TP ;
+ HelpId = "basctl:TabPage:RID_TP_LIBS" ;
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 210 , 140 ) ;
@@ -191,6 +200,7 @@ TabPage RID_TP_LIBS
};
ListBox RID_LB_BASICS
{
+ HelpID = "basctl:ListBox:RID_TP_LIBS:RID_LB_BASICS";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 17 ) ;
Size = MAP_APPFONT ( 130 , 80 ) ;
@@ -214,6 +224,7 @@ TabPage RID_TP_LIBS
PushButton RID_PB_EDIT
{
+ HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_EDIT";
Text [ en-US ] = "~Edit";
Pos = MAP_APPFONT ( 144 , 6 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -230,6 +241,7 @@ TabPage RID_TP_LIBS
};
PushButton RID_PB_PASSWORD
{
+ HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_PASSWORD";
Pos = MAP_APPFONT ( 144 , 43 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Password..." ;
@@ -238,6 +250,7 @@ TabPage RID_TP_LIBS
PushButton RID_PB_NEWLIB
{
+ HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_NEWLIB";
Pos = MAP_APPFONT ( 144 , 69 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~New..." ;
@@ -245,6 +258,7 @@ TabPage RID_TP_LIBS
};
PushButton RID_PB_APPEND
{
+ HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_APPEND";
Pos = MAP_APPFONT ( 144 , 86 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
/* ### ACHTUNG: Neuer Text in Resource? Hin~zufügen... : Hin~zuf³gen... */
@@ -252,6 +266,7 @@ TabPage RID_TP_LIBS
};
PushButton RID_PB_EXPORT
{
+ HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_EXPORT";
Pos = MAP_APPFONT ( 144 , 103 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "E~xport..." ;
@@ -259,6 +274,7 @@ TabPage RID_TP_LIBS
};
PushButton RID_PB_DELETE
{
+ HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_DELETE";
Pos = MAP_APPFONT ( 144 , 120 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
/* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */
@@ -268,7 +284,7 @@ TabPage RID_TP_LIBS
};
ModalDialog RID_DLG_LIBS
{
- // HelpId = HID_BASICIDE_LIBS_DLG ;
+ HelpId = "basctl:ModalDialog:RID_DLG_LIBS" ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 168 , 132 ) ;
@@ -308,6 +324,7 @@ ModalDialog RID_DLG_LIBS
};
CheckBox RID_CB_REF
{
+ HelpID = "basctl:CheckBox:RID_DLG_LIBS:RID_CB_REF";
Pos = MAP_APPFONT ( 12 , 100 ) ;
Size = MAP_APPFONT ( 146 , 10 ) ;
TabStop = TRUE ;
@@ -315,6 +332,7 @@ ModalDialog RID_DLG_LIBS
};
CheckBox RID_CB_REPL
{
+ HelpID = "basctl:CheckBox:RID_DLG_LIBS:RID_CB_REPL";
Pos = MAP_APPFONT ( 12 , 113 ) ;
Size = MAP_APPFONT ( 146 , 10 ) ;
Text [ en-US ] = "Replace existing libraries" ;
@@ -322,6 +340,7 @@ ModalDialog RID_DLG_LIBS
};
ModalDialog RID_DLG_NEWLIB
{
+ HelpID = "basctl:ModalDialog:RID_DLG_NEWLIB";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 160 , 55 ) ;
@@ -348,6 +367,7 @@ ModalDialog RID_DLG_NEWLIB
};
Edit RID_ED_LIBNAME
{
+ HelpID = "basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 19 ) ;
Size = MAP_APPFONT ( 92 , 12 ) ;
@@ -357,6 +377,7 @@ ModalDialog RID_DLG_NEWLIB
ModalDialog RID_DLG_EXPORT
{
+ HelpID = "basctl:ModalDialog:RID_DLG_EXPORT";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 115 , 55 ) ;
@@ -379,6 +400,7 @@ ModalDialog RID_DLG_EXPORT
RadioButton RB_EXPORTASPACKAGE
{
+ HelpID = "basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASPACKAGE";
Pos = MAP_APPFONT( 6, 6 );
Size = MAP_APPFONT( 103, 10 );
Group = TRUE;
@@ -387,6 +409,7 @@ ModalDialog RID_DLG_EXPORT
};
RadioButton RB_EXPORTASBASIC
{
+ HelpID = "basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASBASIC";
Pos = MAP_APPFONT( 6, 19 );
Size = MAP_APPFONT( 103, 10 );
//Group = TRUE;
diff --git a/basctl/source/basicide/moptions.src b/basctl/source/basicide/moptions.src
index ef1be222095c..43efcf1dd6a9 100644
--- a/basctl/source/basicide/moptions.src
+++ b/basctl/source/basicide/moptions.src
@@ -29,7 +29,7 @@
#include <moptions.hrc>
ModalDialog RID_MACROOPTIONS
{
- // HelpId = HID_MACRO_OPTIONS ;
+ HelpId = "basctl:ModalDialog:RID_MACROOPTIONS" ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 224 , 121 ) ;
@@ -70,6 +70,7 @@ ModalDialog RID_MACROOPTIONS
};
MultiLineEdit RID_ME_DESCR
{
+ HelpID = "basctl:MultiLineEdit:RID_MACROOPTIONS:RID_ME_DESCR";
Border = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 32 ) ;
@@ -93,6 +94,7 @@ ModalDialog RID_MACROOPTIONS
};
NumericField RID_NF_HELPID
{
+ HelpID = "basctl:NumericField:RID_MACROOPTIONS:RID_NF_HELPID";
Border = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 95 , 83 ) ;
@@ -110,6 +112,7 @@ ModalDialog RID_MACROOPTIONS
};
Edit RID_ED_HELPNAME
{
+ HelpID = "basctl:Edit:RID_MACROOPTIONS:RID_ED_HELPNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 95 , 99 ) ;
Size = MAP_APPFONT ( 120 , 12 ) ;
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index ac7a2c28531d..82030adfccee 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -102,9 +102,10 @@ ObjectCatalog::ObjectCatalog( Window * pParent )
aToolBox.SetSizePixel( aToolBox.CalcWindowSizePixel() );
aToolBox.SetSelectHdl( LINK( this, ObjectCatalog, ToolBoxHdl ) );
- aMacroTreeList.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT |
- WB_HASBUTTONS | WB_HASBUTTONSATROOT |
- WB_HSCROLL );
+ aMacroTreeList.SetStyle( WB_BORDER | WB_TABSTOP |
+ WB_HASLINES | WB_HASLINESATROOT |
+ WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+ WB_HSCROLL );
aMacroTreeList.SetSelectHdl( LINK( this, ObjectCatalog, TreeListHighlightHdl ) );
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
index c8de023dec53..2d7981dd1c28 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -32,6 +32,7 @@
FloatingWindow RID_BASICIDE_OBJCAT
{
+ HelpID = "basctl:FloatingWindow:RID_BASICIDE_OBJCAT";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 191 , 179 ) ;
diff --git a/basctl/source/basicide/tbxctl.src b/basctl/source/basicide/tbxctl.src
deleted file mode 100644
index 89d839619238..000000000000
--- a/basctl/source/basicide/tbxctl.src
+++ /dev/null
@@ -1,273 +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 "svx/svxids.hrc"
-#include "tbxctl.hrc"
-#include "helpid.hrc"
-FloatingWindow RID_TBXCONTROLS
-{
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE ;
- HelpId = HID_BASICIDE_CONTROLS ;
- Text [ en-US ] = "Controls" ;
- String RID_TOOLBOX
- {
- Text [ en-US ] = "Controls" ;
- };
-};
-ToolBox RID_TOOLBOX
-{
- SVLook = TRUE ;
- // HelpId = HID_BASICIDE_CONTROLS ;
- LineCount = 2 ;
- ItemList =
- {
- ToolBoxItem
- {
- HelpId = SID_INSERT_PUSHBUTTON ;
- Identifier = SID_INSERT_PUSHBUTTON ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Button" ;
- /* ### ACHTUNG: Neuer Text in Resource? CommandButton einfügen : CommandButton einf³gen */
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_CHECKBOX ;
- Identifier = SID_INSERT_CHECKBOX ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Check Box" ;
- /* ### ACHTUNG: Neuer Text in Resource? CheckBox einfügen : CheckBox einf³gen */
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_FIXEDTEXT ;
- Identifier = SID_INSERT_FIXEDTEXT ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Label field" ;
- /* ### ACHTUNG: Neuer Text in Resource? Label einfügen : Label einf³gen */
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_LISTBOX ;
- Identifier = SID_INSERT_LISTBOX ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "List Box" ;
- /* ### ACHTUNG: Neuer Text in Resource? ListBox einfügen : ListBox einf³gen */
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_HSCROLLBAR ;
- Identifier = SID_INSERT_HSCROLLBAR ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Horizontal Scroll Bar" ;
- /* ### ACHTUNG: Neuer Text in Resource? Horizontale ScrollBar einfügen : Horizontale ScrollBar einf³gen */
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_GROUPBOX ;
- Identifier = SID_INSERT_GROUPBOX ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Group Box" ;
- /* ### ACHTUNG: Neuer Text in Resource? GroupBox einfügen : GroupBox einf³gen */
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_HFIXEDLINE ;
- Identifier = SID_INSERT_HFIXEDLINE ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Horizontal Line" ;
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_DATEFIELD ;
- Identifier = SID_INSERT_DATEFIELD ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Date Field";
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_NUMERICFIELD ;
- Identifier = SID_INSERT_NUMERICFIELD ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Numeric Field";
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_FORMATTEDFIELD ;
- Identifier = SID_INSERT_FORMATTEDFIELD ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Formatted Field";
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_FILECONTROL ;
- Identifier = SID_INSERT_FILECONTROL ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "File Selection";
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_TREECONTROL ;
- Identifier = SID_INSERT_TREECONTROL ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Tree Control";
- };
- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
- ToolBoxItem
- {
- HelpId = SID_SHOW_PROPERTYBROWSER ;
- Identifier = SID_SHOW_PROPERTYBROWSER ;
- Text [ en-US ] = "Properties" ;
- };
- ToolBoxItem { Type = TOOLBOXITEM_BREAK ; };
- ToolBoxItem
- {
- HelpId = SID_INSERT_IMAGECONTROL ;
- Identifier = SID_INSERT_IMAGECONTROL ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Image Control" ;
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_RADIOBUTTON ;
- Identifier = SID_INSERT_RADIOBUTTON ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Option Button" ;
- /* ### ACHTUNG: Neuer Text in Resource? RadioButton einfügen : RadioButton einf³gen */
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_EDIT ;
- Identifier = SID_INSERT_EDIT ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Text Box" ;
- /* ### ACHTUNG: Neuer Text in Resource? Edit einfügen : Edit einf³gen */
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_COMBOBOX ;
- Identifier = SID_INSERT_COMBOBOX ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Combo Box" ;
- /* ### ACHTUNG: Neuer Text in Resource? ComboBox einfügen : ComboBox einf³gen */
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_VSCROLLBAR ;
- Identifier = SID_INSERT_VSCROLLBAR ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Vertical Scroll Bar" ;
- /* ### ACHTUNG: Neuer Text in Resource? Vertikale ScrollBar einfügen : Vertikale ScrollBar einf³gen */
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_PROGRESSBAR ;
- Identifier = SID_INSERT_PROGRESSBAR ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Progress Bar" ;
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_VFIXEDLINE ;
- Identifier = SID_INSERT_VFIXEDLINE ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Vertical Line" ;
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_TIMEFIELD ;
- Identifier = SID_INSERT_TIMEFIELD ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Time Field";
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_CURRENCYFIELD ;
- Identifier = SID_INSERT_CURRENCYFIELD ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Currency Field";
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_PATTERNFIELD ;
- Identifier = SID_INSERT_PATTERNFIELD ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Pattern Field";
- };
- ToolBoxItem
- {
- HelpId = SID_INSERT_SELECT ;
- Identifier = SID_INSERT_SELECT ;
- RadioCheck = TRUE ;
- Text [ en-US ] = "Select" ;
- };
- ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
- ToolBoxItem
- {
- HelpId = SID_DIALOG_TESTMODE ;
- Identifier = SID_DIALOG_TESTMODE ;
- Text [ en-US ] = "Activate Test Mode" ;
- };
- };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/basctl/source/dlged/managelang.src b/basctl/source/dlged/managelang.src
index b03421e1aa22..c83af6be6e38 100644
--- a/basctl/source/dlged/managelang.src
+++ b/basctl/source/dlged/managelang.src
@@ -45,6 +45,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
};
ListBox LB_LANGUAGE
{
+ HelpID = "basctl:ListBox:RID_DLG_MANAGE_LANGUAGE:LB_LANGUAGE";
Pos = MAP_APPFONT ( MANAGE_COL1 , MANAGE_ROW2 ) ;
Size = MAP_APPFONT ( MANAGE_LB_WIDTH , MANAGE_LB_HEIGHT ) ;
Border = TRUE;
@@ -52,6 +53,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
};
PushButton PB_ADD_LANG
{
+ HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_ADD_LANG";
Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW2 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
@@ -59,6 +61,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
};
PushButton PB_DEL_LANG
{
+ HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_DEL_LANG";
Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW3 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
@@ -66,6 +69,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
};
PushButton PB_MAKE_DEFAULT
{
+ HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_MAKE_DEFAULT";
Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW4 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
@@ -135,6 +139,7 @@ ModalDialog RID_DLG_SETDEF_LANGUAGE
};
ListBox LB_DEF_LANGUAGE
{
+ HelpID = "basctl:ListBox:RID_DLG_SETDEF_LANGUAGE:LB_DEF_LANGUAGE";
Pos = MAP_APPFONT ( SETDEF_COL1 , SETDEF_ROW2 ) ;
Size = MAP_APPFONT ( SETDEF_LB_WIDTH , SETDEF_LB_HEIGHT ) ;
Border = TRUE;
diff --git a/basctl/util/hidother.src b/basctl/util/hidother.src
index cd8fe7b26bf5..ce2607b3296d 100644
--- a/basctl/util/hidother.src
+++ b/basctl/util/hidother.src
@@ -25,7 +25,6 @@
*
************************************************************************/
#include "../inc/helpid.hrc" // HID_XXX
-//#include "hidother.hrc"
hidspecial HID_BASICIDE_PROP_BROWSER_LBOX { HelpID = HID_BASICIDE_PROP_BROWSER_LBOX; };
hidspecial HID_BASICIDE_PROP_BROWSER { HelpID = HID_BASICIDE_PROP_BROWSER; };
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index f3d19ca98790..abca528dc987 100755
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -1847,7 +1847,7 @@ bool WriteChecksumFile( FILE *fchksum, const hash_map< string, string >& rLibrar
for ( int i = 0; i < sizeof(checksum); fprintf( fchksum, "%02X", checksum[i++] ) );
fprintf( fchksum, "\" bytes=\"%d\" file=\"%s\"/>\n",
nBytesProcessed,
- GetFileName( iter->first ) );
+ GetFileName( iter->first ).c_str() );
}
}
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index d6dd418d30d6..de24ee12e98a 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -806,7 +806,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/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index ad5c8b1b3201..e074c0a19ff5 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -744,7 +744,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
aModuleButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, RadioHdl ));
// initialize Entriesbox
- aEntriesBox.SetWindowBits(WB_HSCROLL|WB_CLIPCHILDREN);
+ aEntriesBox.SetStyle(aEntriesBox.GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN);
aEntriesBox.SetSelectionMode(SINGLE_SELECTION);
aEntriesBox.SetTabs(&AccCfgTabs[0], MAP_APPFONT);
aEntriesBox.Resize(); // OS: Hack for right selection
@@ -768,7 +768,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
pGroupLBox->SetFunctionListBox(pFunctionBox);
// initialize KeyBox
- aKeyBox.SetWindowBits(WB_CLIPCHILDREN|WB_HSCROLL|WB_SORT);
+ aKeyBox.SetStyle(aKeyBox.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_SORT);
}
//-----------------------------------------------
@@ -1377,7 +1377,6 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi
m_pFileDlg = new sfx2::FileDialogHelper( nDialogType, 0 );
m_pFileDlg->SetTitle( rTitle );
-// m_pFileDlg->SetDialogHelpId( bSave ? HID_CONFIG_SAVE : HID_CONFIG_LOAD );
m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) );
m_pFileDlg->AddFilter( aFilterCfgStr, DEFINE_CONST_UNICODE( "*.cfg" ) );
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index 74188426a787..b94ea163e0c7 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -67,18 +67,21 @@ TabPage RID_SVXPAGE_KEYBOARD
Size = MAP_APPFONT ( 273 , 258 ) ;
RadioButton RB_OFFICE
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE";
Pos = MAP_APPFONT ( 192 , 6 ) ;
Size = MAP_APPFONT ( 75 , 10 ) ;
Text = "%PRODUCTNAME" ;
};
RadioButton RB_MODULE
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE";
Pos = MAP_APPFONT ( 192 , 19 ) ;
Size = MAP_APPFONT ( 75 , 10 ) ;
Text = "$(MODULE)" ;
};
PushButton BTN_ACC_CHANGE
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE";
Pos = MAP_APPFONT ( 192 , 35 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
@@ -86,6 +89,7 @@ TabPage RID_SVXPAGE_KEYBOARD
};
PushButton BTN_ACC_REMOVE
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE";
Pos = MAP_APPFONT ( 192 , 52 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
@@ -162,6 +166,7 @@ TabPage RID_SVXPAGE_KEYBOARD
};
PushButton BTN_LOAD
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD";
Pos = MAP_APPFONT ( 192 , 86 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
@@ -170,6 +175,7 @@ TabPage RID_SVXPAGE_KEYBOARD
};
PushButton BTN_SAVE
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE";
Pos = MAP_APPFONT ( 192 , 103 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
@@ -178,6 +184,7 @@ TabPage RID_SVXPAGE_KEYBOARD
};
PushButton BTN_RESET
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET";
Pos = MAP_APPFONT ( 192 , 120 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index bdfc0764a944..858564af4e40 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -112,7 +112,6 @@
#define ENTRY_HEIGHT 16
static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
-static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL";
static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer";
static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
static const char ITEM_DESCRIPTOR_TYPE[] = "Type";
@@ -522,7 +521,6 @@ bool GetMenuItemData(
const uno::Reference< container::XIndexAccess >& rItemContainer,
sal_Int32 nIndex,
OUString& rCommandURL,
- OUString& rHelpURL,
OUString& rLabel,
sal_uInt16& rType,
uno::Reference< container::XIndexAccess >& rSubMenu )
@@ -538,10 +536,6 @@ bool GetMenuItemData(
{
aProp[i].Value >>= rCommandURL;
}
- else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
- {
- aProp[i].Value >>= rHelpURL;
- }
else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER ))
{
aProp[i].Value >>= rSubMenu;
@@ -570,7 +564,6 @@ bool GetToolbarItemData(
const uno::Reference< container::XIndexAccess >& rItemContainer,
sal_Int32 nIndex,
OUString& rCommandURL,
- OUString& rHelpURL,
OUString& rLabel,
sal_uInt16& rType,
sal_Bool& rIsVisible,
@@ -592,10 +585,6 @@ bool GetToolbarItemData(
{
aProp[i].Value >>= rStyle;
}
- else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
- {
- aProp[i].Value >>= rHelpURL;
- }
else if (aProp[i].Name.equalsAscii(ITEM_DESCRIPTOR_CONTAINER))
{
aProp[i].Value >>= rSubMenu;
@@ -638,13 +627,10 @@ ConvertSvxConfigEntry(
static const OUString aDescriptorLabel(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) );
- static const OUString aDescriptorHelpURL(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) );
-
static const OUString aDescriptorContainer(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) );
- uno::Sequence< beans::PropertyValue > aPropSeq( 4 );
+ uno::Sequence< beans::PropertyValue > aPropSeq( 3 );
aPropSeq[0].Name = aDescriptorCommandURL;
aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() );
@@ -702,9 +688,6 @@ ConvertSvxConfigEntry(
aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() );
}
- aPropSeq[3].Name = aDescriptorHelpURL;
- aPropSeq[3].Value <<= rtl::OUString( pEntry->GetHelpURL() );
-
return aPropSeq;
}
@@ -722,16 +705,13 @@ ConvertToolbarEntry(
static const OUString aDescriptorLabel(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) );
- static const OUString aDescriptorHelpURL(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) );
-
static const OUString aDescriptorContainer(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) );
static const OUString aIsVisible(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_ISVISIBLE ) );
- uno::Sequence< beans::PropertyValue > aPropSeq( 5 );
+ uno::Sequence< beans::PropertyValue > aPropSeq( 4 );
aPropSeq[0].Name = aDescriptorCommandURL;
aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() );
@@ -789,11 +769,8 @@ ConvertToolbarEntry(
aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() );
}
- aPropSeq[3].Name = aDescriptorHelpURL;
- aPropSeq[3].Value <<= rtl::OUString( pEntry->GetHelpURL() );
-
- aPropSeq[4].Name = aIsVisible;
- aPropSeq[4].Value <<= pEntry->IsVisible();
+ aPropSeq[3].Name = aIsVisible;
+ aPropSeq[3].Value <<= pEntry->IsVisible();
return aPropSeq;
}
@@ -1186,14 +1163,13 @@ bool MenuSaveInData::LoadSubMenus(
{
uno::Reference< container::XIndexAccess > xSubMenu;
OUString aCommandURL;
- OUString aHelpURL;
OUString aLabel;
bool bIsUserDefined = TRUE;
sal_uInt16 nType( css::ui::ItemType::DEFAULT );
bool bItem = GetMenuItemData( xMenuSettings, nIndex,
- aCommandURL, aHelpURL, aLabel, nType, xSubMenu );
+ aCommandURL, aLabel, nType, xSubMenu );
if ( bItem )
{
@@ -1235,7 +1211,6 @@ bool MenuSaveInData::LoadSubMenus(
aLabel, aCommandURL, TRUE );
pEntry->SetUserDefined( bIsUserDefined );
- pEntry->SetHelpURL( aHelpURL );
pEntries->push_back( pEntry );
@@ -1260,7 +1235,6 @@ bool MenuSaveInData::LoadSubMenus(
SvxConfigEntry* pEntry = new SvxConfigEntry(
aLabel, aCommandURL, FALSE );
pEntry->SetUserDefined( bIsUserDefined );
- pEntry->SetHelpURL( aHelpURL );
pEntries->push_back( pEntry );
}
}
@@ -1491,7 +1465,7 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox(
, pPage( (SvxMenuConfigPage*) pParent )
, m_bIsInternalDrag( FALSE )
{
- SetWindowBits(
+ SetStyle(
GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HIDESELECTION );
SetSpaceBetweenEntries( 3 );
@@ -2157,7 +2131,6 @@ SvLBoxEntry* SvxConfigPage::AddFunction(
SvxConfigEntry* pNewEntryData =
new SvxConfigEntry( aDisplayName, aURL, FALSE );
pNewEntryData->SetUserDefined( TRUE );
- pNewEntryData->SetHelpURL( aURL );
// check that this function is not already in the menu
SvxConfigEntry* pParent = GetTopLevelSelection();
@@ -3066,21 +3039,9 @@ SvxConfigEntry::GetHelpText()
{
if ( aHelpText.getLength() == 0 )
{
- OUString helpid = OUString::createFromAscii( "helpid:" );
- if ( aHelpURL.indexOf( helpid ) != -1 )
- {
- aHelpURL = aHelpURL.copy( helpid.getLength() );
- }
-
- Help* pHelp = Application::GetHelp();
- if ( aHelpURL.toInt32() != 0 )
- {
- aHelpText = pHelp->GetHelpText( aHelpURL.toInt32(), NULL );
- }
-
- if ( aHelpText.getLength() == 0 && aCommand.getLength() != 0 )
+ if ( aCommand.getLength() )
{
- aHelpText = pHelp->GetHelpText( aCommand, NULL );
+ aHelpText = Application::GetHelp()->GetHelpText( aCommand, NULL );
}
}
@@ -4515,7 +4476,6 @@ bool ToolbarSaveInData::LoadToolbar(
{
uno::Reference< container::XIndexAccess > xSubMenu;
OUString aCommandURL;
- OUString aHelpURL;
OUString aLabel;
bool bIsUserDefined = TRUE;
sal_Bool bIsVisible;
@@ -4524,7 +4484,7 @@ bool ToolbarSaveInData::LoadToolbar(
sal_uInt16 nType( css::ui::ItemType::DEFAULT );
bool bItem = GetToolbarItemData( xToolbarSettings, nIndex, aCommandURL,
- aHelpURL, aLabel, nType, bIsVisible, nStyle, xSubMenu );
+ aLabel, nType, bIsVisible, nStyle, xSubMenu );
if ( bItem )
{
@@ -4565,7 +4525,6 @@ bool ToolbarSaveInData::LoadToolbar(
aLabel, aCommandURL, TRUE );
pEntry->SetUserDefined( bIsUserDefined );
- pEntry->SetHelpURL( aHelpURL );
pEntry->SetVisible( bIsVisible );
pEntries->push_back( pEntry );
@@ -4577,7 +4536,6 @@ bool ToolbarSaveInData::LoadToolbar(
SvxConfigEntry* pEntry = new SvxConfigEntry(
aLabel, aCommandURL, FALSE );
pEntry->SetUserDefined( bIsUserDefined );
- pEntry->SetHelpURL( aHelpURL );
pEntry->SetVisible( bIsVisible );
pEntry->SetStyle( nStyle );
pEntries->push_back( pEntry );
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 0b2489557053..743aa7009fbc 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -136,6 +136,7 @@ TabPage RID_SVXPAGE_MENUS
};
ListBox LB_MENUS
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS";
Border = TRUE ;
Pos = MAP_APPFONT ( 64 , 22 ) ;
Size = MAP_APPFONT ( 108 , 108 ) ;
@@ -143,6 +144,7 @@ TabPage RID_SVXPAGE_MENUS
};
PushButton BTN_NEW
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW";
Pos = MAP_APPFONT ( 192 , 22 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
@@ -151,6 +153,7 @@ TabPage RID_SVXPAGE_MENUS
};
MenuButton BTN_CHANGE
{
+ HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE";
Pos = MAP_APPFONT ( 192 , 39 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
@@ -181,6 +184,7 @@ TabPage RID_SVXPAGE_MENUS
};
PushButton BTN_ADD_COMMANDS
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS";
Pos = MAP_APPFONT ( 192 , 67 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
@@ -189,6 +193,7 @@ TabPage RID_SVXPAGE_MENUS
};
MenuButton BTN_CHANGE_ENTRY
{
+ HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY";
Pos = MAP_APPFONT ( 192 , 84 ) ;
Size = MAP_APPFONT ( 75 , 14 ) ;
TabStop = TRUE ;
@@ -197,6 +202,7 @@ TabPage RID_SVXPAGE_MENUS
};
ImageButton BTN_UP
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP";
Pos = MAP_APPFONT ( 175 , 102 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
TabStop = TRUE ;
@@ -205,6 +211,7 @@ TabPage RID_SVXPAGE_MENUS
};
ImageButton BTN_DOWN
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN";
Pos = MAP_APPFONT ( 175 , 119 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
TabStop = TRUE ;
@@ -220,6 +227,7 @@ TabPage RID_SVXPAGE_MENUS
};
ListBox LB_SAVEIN
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 64 , 188 ) ;
Size = MAP_APPFONT ( 108 , 53 ) ;
@@ -234,6 +242,7 @@ TabPage RID_SVXPAGE_MENUS
};
MultiLineEdit ED_DESCRIPTION
{
+ HelpID = "cui:MultiLineEdit:RID_SVXPAGE_MENUS:ED_DESCRIPTION";
Pos = MAP_APPFONT ( 6 , 216 ) ;
Size = MAP_APPFONT ( 261 , 36 ) ;
Border = TRUE;
@@ -493,6 +502,7 @@ ModalDialog MD_MENU_ORGANISER
};
Edit EDIT_MENU_NAME
{
+ HelpID = "cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 19 ) ;
Size = MAP_APPFONT ( 93 , 12 ) ;
@@ -517,6 +527,7 @@ ModalDialog MD_MENU_ORGANISER
};
ImageButton BTN_MENU_UP
{
+ HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP";
Pos = MAP_APPFONT ( 102 , 80 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
TabStop = TRUE ;
@@ -524,6 +535,7 @@ ModalDialog MD_MENU_ORGANISER
};
ImageButton BTN_MENU_DOWN
{
+ HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN";
Pos = MAP_APPFONT ( 102 , 97 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
TabStop = TRUE ;
@@ -550,6 +562,7 @@ ModalDialog MD_MENU_ORGANISER
// MD_NEW_TOOLBAR -------------------------------------------------
ModalDialog MD_NEW_TOOLBAR
{
+ HelpID = "cui:ModalDialog:MD_NEW_TOOLBAR";
OutputSize = TRUE ;
SvLook = TRUE ;
Size = MAP_APPFONT ( 165 , 63 ) ;
@@ -565,6 +578,7 @@ ModalDialog MD_NEW_TOOLBAR
};
Edit EDT_STRING
{
+ HelpID = "cui:Edit:MD_NEW_TOOLBAR:EDT_STRING";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 17 ) ;
Size = MAP_APPFONT ( 97 , 12 ) ;
@@ -579,6 +593,7 @@ ModalDialog MD_NEW_TOOLBAR
};
ListBox LB_SAVEIN
{
+ HelpID = "cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 43 ) ;
Size = MAP_APPFONT ( 97 , 53 ) ;
@@ -654,6 +669,7 @@ ModalDialog MD_ICONSELECTOR
};
PushButton BTN_IMPORT
{
+ HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT";
Pos = MAP_APPFONT ( 184 , 7 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -662,6 +678,7 @@ ModalDialog MD_ICONSELECTOR
};
PushButton BTN_DELETE
{
+ HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_DELETE";
Pos = MAP_APPFONT ( 184 , 24 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -691,6 +708,7 @@ ModalDialog MD_ICONSELECTOR
//added for issue83555
ModalDialog MD_ICONCHANGE
{
+ HelpID = "cui:ModalDialog:MD_ICONCHANGE";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 200 , 150 ) ;
@@ -714,6 +732,7 @@ ModalDialog MD_ICONCHANGE
MultiLineEdit EDT_ADDR
{
+ HelpID = "cui:MultiLineEdit:MD_ICONCHANGE:EDT_ADDR";
Pos = MAP_APPFONT ( 30 , 38) ;
Size = MAP_APPFONT ( 140 , 83 ) ;
Border = TRUE;
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index da294a4526b0..b85ec24adee2 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -287,7 +287,7 @@ SfxConfigFunctionListBox_Impl::SfxConfigFunctionListBox_Impl( Window* pParent, c
, pCurEntry( 0 )
, pStylesInfo( 0 )
{
- SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
+ SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
GetModel()->SetSortMode( SortAscending );
// Timer f"ur die BallonHelp
@@ -488,7 +488,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
: SvTreeListBox( pParent, rResId )
, pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), nMode( nConfigMode ), bShowSF( FALSE ), bShowBasic( TRUE ), pStylesInfo(0)
{
- SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
+ SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage, BMP_COLOR_NORMAL );
SetNodeBitmaps( pImp->m_collapsedImage_hc, pImp->m_expandedImage_hc, BMP_COLOR_HIGHCONTRAST );
diff --git a/cui/source/customize/eventdlg.src b/cui/source/customize/eventdlg.src
index e8c0e21677ac..8b19a1e79794 100644
--- a/cui/source/customize/eventdlg.src
+++ b/cui/source/customize/eventdlg.src
@@ -63,6 +63,7 @@ TabPage RID_SVXPAGE_EVENTS
};
ListBox LB_SAVEIN
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 54 , 238 ) ;
Size = MAP_APPFONT ( 132 , 53 ) ;
@@ -76,6 +77,7 @@ TabPage RID_SVXPAGE_EVENTS
};
PushButton PB_ASSIGN
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN";
Pos = MAP_APPFONT ( 217 , ROW0A ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Disable = TRUE ;
@@ -83,6 +85,7 @@ TabPage RID_SVXPAGE_EVENTS
};
PushButton PB_DELETE
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE";
Pos = MAP_APPFONT ( 217 , ROW0A+RSC_CD_PUSHBUTTON_HEIGHT+12 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Disable = TRUE ;
diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
index 10d9149233e0..50e8498dc8e9 100644
--- a/cui/source/customize/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -36,7 +36,7 @@
TabPage RID_SVXPAGE_MACROASSIGN
{
- // HelpID = HID_MACROASSIGN ;
+ HelpID = "cui:TabPage:RID_SVXPAGE_MACROASSIGN" ;
Hide = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
@@ -66,6 +66,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
};
PushButton PB_ASSIGN
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN";
Pos = MAP_APPFONT ( COL4 , ROW0A ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "M~acro..." ;
@@ -74,6 +75,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
};
PushButton PB_ASSIGN_COMPONENT
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT";
Pos = MAP_APPFONT ( COL4 , ROW2 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Disable = TRUE ;
@@ -82,6 +84,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
};
PushButton PB_DELETE
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE";
Pos = MAP_APPFONT ( COL4 , ROW5_REMOVE ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "~Remove" ;
@@ -112,6 +115,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
ModalDialog RID_SVXDLG_ASSIGNCOMPONENT
{
+ HelpID = "cui:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( COMP_WIDTH , COMP_HEIGHT ) ;
@@ -144,6 +148,7 @@ ModalDialog RID_SVXDLG_ASSIGNCOMPONENT
};
Edit EDIT_METHOD
{
+ HelpID = "cui:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD";
Border = TRUE ;
Pos = MAP_APPFONT ( COMP_COL0 , COMP_ROWEDIT ) ;
Size = MAP_APPFONT ( COMP_EDIT_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 833dc0f32c82..3defe910f5a5 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -90,7 +90,7 @@ SvxConfigFunctionListBox_Impl::SvxConfigFunctionListBox_Impl( Window* pParent, c
, pCurEntry( 0 )
, m_pDraggingEntry( 0 )
{
- SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
+ SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
GetModel()->SetSortMode( SortAscending );
// Timer f"ur die BallonHelp
@@ -226,7 +226,7 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
m_xFrame.set( xFrame );
}
- SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
+ SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src
index 5a97025f02af..3c3c7a6be3ca 100644
--- a/cui/source/dialogs/SpellDialog.src
+++ b/cui/source/dialogs/SpellDialog.src
@@ -61,6 +61,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
};
ListBox LB_LANGUAGE
{
+ HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE";
Pos = MAP_APPFONT( 110, 6 );
Size = MAP_APPFONT( 93, 55 );
Border = TRUE;
@@ -76,6 +77,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
MultiLineEdit ED_NEWWORD
{
+ HelpID = "cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD";
Pos = MAP_APPFONT( 6, 37 );
Size = MAP_APPFONT( 197, 48 );
Border = TRUE;
@@ -91,6 +93,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
};
ListBox LB_SUGGESTION
{
+ HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION";
Pos = MAP_APPFONT( 6, 99 );
Size = MAP_APPFONT( 197, 48 );
Border = TRUE;
@@ -98,6 +101,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
CheckBox CB_CHECK_GRAMMAR
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_SPELLCHECK:CB_CHECK_GRAMMAR";
Pos = MAP_APPFONT( 6, 153 );
Size = MAP_APPFONT( 100, 10 );
Text [ en-US ] = "Check ~grammar" ;
@@ -106,6 +110,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
PushButton PB_IGNORE
{
+ HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORE";
Pos = MAP_APPFONT( 209, 37 );
Size = MAP_APPFONT( 55, 14 );
Text [ en-US ] = "~Ignore Once" ;
@@ -113,12 +118,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
PushButton PB_IGNOREALL
{
+ HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNOREALL";
Pos = MAP_APPFONT( 209, 54 );
Size = MAP_APPFONT( 55, 14 );
Text [ en-US ] = "I~gnore All" ;
};
PushButton PB_IGNORERULE
{
+ HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORERULE";
Pos = MAP_APPFONT( 209, 54 );
Size = MAP_APPFONT( 55, 14 );
Text [ en-US ] = "I~gnore Rule" ;
@@ -126,6 +133,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
};
MenuButton MB_ADDTODICT
{
+ HelpID = "cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT";
Pos = MAP_APPFONT( 209, 71 );
Size = MAP_APPFONT( 55, 14 );
Text [ en-US ] = "~Add" ;
@@ -133,6 +141,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
PushButton PB_CHANGE
{
+ HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGE";
Pos = MAP_APPFONT( 209, 99 );
Size = MAP_APPFONT( 55, 14 );
Text [ en-US ] = "~Change" ;
@@ -141,12 +150,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
PushButton PB_CHANGEALL
{
+ HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGEALL";
Pos = MAP_APPFONT( 209, 117 );
Size = MAP_APPFONT( 55, 14 );
Text [ en-US ] = "Change A~ll" ;
};
PushButton PB_EXPLAIN
{
+ HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_EXPLAIN";
Pos = MAP_APPFONT( 209, 117 );
Size = MAP_APPFONT( 55, 14 );
Hide = TRUE;
@@ -154,6 +165,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
};
PushButton PB_AUTOCORR
{
+ HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR";
Pos = MAP_APPFONT( 209, 134 );
Size = MAP_APPFONT( 55, 14 );
Text [ en-US ] = "AutoCor~rect" ;
@@ -172,12 +184,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
};
PushButton PB_OPTIONS
{
+ HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS";
Pos = MAP_APPFONT( 87, 170 );
Size = MAP_APPFONT( 55, 14 );
Text [ en-US ] = "O~ptions..." ;
};
PushButton PB_UNDO
{
+ HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO";
Pos = MAP_APPFONT( 148, 170 );
Size = MAP_APPFONT( 55, 14 );
Text [ en-US ] = "~Undo" ;
@@ -185,6 +199,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
PushButton PB_CLOSE
{
+ HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CLOSE";
Pos = MAP_APPFONT ( 209 , 170 ) ;
Size = MAP_APPFONT ( 55 , 14 ) ;
TabStop = TRUE ;
diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src
index 02e2e728f412..8d7f655b179f 100644
--- a/cui/source/dialogs/charmap.src
+++ b/cui/source/dialogs/charmap.src
@@ -35,10 +35,9 @@
// RID_SVXDLG_CHARMAP ----------------------------------------------------
ModalDialog RID_SVXDLG_CHARMAP
{
- HelpId = SID_CHARMAP ;
+ HelpId = CMD_SID_CHARMAP ;
SvLook = TRUE ;
Text [ en-US ] = "Special Characters";
-/* Size = MAP_APPFONT ( 297 , 169 ) ; */
Size = MAP_APPFONT ( 297 , 153 ) ;
OutputSize = TRUE ;
Moveable = TRUE ;
@@ -61,6 +60,7 @@ ModalDialog RID_SVXDLG_CHARMAP
};
ListBox LB_FONT
{
+ HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT";
Pos = MAP_APPFONT ( 42 , 6 ) ;
Size = MAP_APPFONT ( 70 , 58 ) ;
Sort = TRUE ;
@@ -75,6 +75,7 @@ ModalDialog RID_SVXDLG_CHARMAP
};
ListBox LB_SUBSET
{
+ HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET";
Pos = MAP_APPFONT ( 161 , 6 ) ;
Size = MAP_APPFONT ( 63 , 68 ) ;
Sort = FALSE ;
@@ -92,7 +93,6 @@ ModalDialog RID_SVXDLG_CHARMAP
{
HelpId = HID_CHARMAP_CTL_SHOWTEXT ;
Pos = MAP_APPFONT ( 46 , 137 ) ;
-/* Size = MAP_APPFONT ( 190 , 16 ) ; */
Size = MAP_APPFONT ( 244 , 16 ) ;
Group = TRUE ;
};
@@ -130,30 +130,11 @@ ModalDialog RID_SVXDLG_CHARMAP
};
PushButton BTN_DELETE
{
+ HelpID = "cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE";
Pos = MAP_APPFONT ( 242 , 63 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Delete";
};
-/*
- PushButton BT_ASSIGN
- {
- Pos = MAP_APPFONT ( 242 , 140 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Assign shortcut...";
- };
- FixedText FT_ASSIGN
- {
- Pos = MAP_APPFONT ( 6 , 156 ) ;
- Size = MAP_APPFONT ( 100 , 8 ) ;
- Left = TRUE ;
- Text [ en-US ] = "Shortcut key: ";
- };
- Control CT_ASSIGN
- {
- Pos = MAP_APPFONT ( 60 , 156 ) ;
- Size = MAP_APPFONT ( 160 , 8 ) ;
- };
-*/
};
// ********************************************************************** EOF
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 93e37c4e163f..4acfe2b8eec7 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -40,7 +40,6 @@
#include <svx/gallery1.hxx>
#include <svx/galtheme.hxx>
#include "cuigaldlg.hxx"
-#include <svl/pickerhelper.hxx>
#include "helpid.hrc"
#include <unotools/syslocale.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -1035,7 +1034,6 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG )
if ( xFolderPicker.is() )
{
-// svt::SetDialogHelpId( xFolderPicker, HID_GALLERY_NEWTHEME_FINDFILES );
String aDlgPathName( SvtPathOptions().GetGraphicPath() );
xFolderPicker->setDisplayDirectory(aDlgPathName);
@@ -1146,7 +1144,6 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG )
if( !aLbxFound.GetSelectEntryCount() || !bEntriesFound )
{
SvxOpenGraphicDialog aDlg(String( RTL_CONSTASCII_USTRINGPARAM( "Gallery" ) ) );
-// aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES );
aDlg.EnableLink(sal_False);
aDlg.AsLink(sal_False);
diff --git a/cui/source/dialogs/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src
index 9b60adf854ca..05475f880a3c 100644
--- a/cui/source/dialogs/cuiimapdlg.src
+++ b/cui/source/dialogs/cuiimapdlg.src
@@ -31,6 +31,7 @@
ModalDialog RID_SVXDLG_IMAPURL
{
+ HelpID = "cui:ModalDialog:RID_SVXDLG_IMAPURL";
SVLook = TRUE ;
OutputSize = TRUE ;
Closeable = TRUE ;
@@ -46,6 +47,7 @@ ModalDialog RID_SVXDLG_IMAPURL
};
Edit EDT_URL
{
+ HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_URL";
Border = TRUE ;
TabStop = TRUE ;
Left = TRUE ;
@@ -61,6 +63,7 @@ ModalDialog RID_SVXDLG_IMAPURL
};
ComboBox CBB_TARGETS
{
+ HelpID = "cui:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS";
Border = TRUE ;
Sort = TRUE ;
Pos = MAP_APPFONT ( 6 , 43 ) ;
@@ -78,6 +81,7 @@ ModalDialog RID_SVXDLG_IMAPURL
};
Edit EDT_NAME
{
+ HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_NAME";
Border = TRUE ;
TabStop = TRUE ;
Left = TRUE ;
@@ -94,6 +98,7 @@ ModalDialog RID_SVXDLG_IMAPURL
Edit EDT_URLDESCRIPTION
{
+ HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION";
Border = TRUE ;
TabStop = TRUE ;
Left = TRUE ;
@@ -109,6 +114,7 @@ ModalDialog RID_SVXDLG_IMAPURL
MultiLineEdit EDT_DESCRIPTION
{
+ HelpID = "cui:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 122 ) ;
Size = MAP_APPFONT ( 202 , 34 ) ;
diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src
index e3e961880dfc..0c6c864005fd 100644
--- a/cui/source/dialogs/dlgname.src
+++ b/cui/source/dialogs/dlgname.src
@@ -49,6 +49,7 @@ ModalDialog RID_SVXDLG_NAME
};
Edit EDT_STRING
{
+ HelpID = "cui:Edit:RID_SVXDLG_NAME:EDT_STRING";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 17 ) ;
Size = MAP_APPFONT ( 112 , 12 ) ;
@@ -96,6 +97,7 @@ ModalDialog RID_SVXDLG_OBJECT_NAME
};
Edit NTD_EDT_NAME
{
+ HelpID = "cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 168 , 12 ) ;
@@ -153,6 +155,7 @@ ModalDialog RID_SVXDLG_OBJECT_TITLE_DESC
};
Edit NTD_EDT_TITLE
{
+ HelpID = "cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 168 , 12 ) ;
@@ -169,6 +172,7 @@ ModalDialog RID_SVXDLG_OBJECT_TITLE_DESC
};
MultiLineEdit NTD_EDT_DESC
{
+ HelpID = "cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 41 ) ;
Size = MAP_APPFONT ( 168 , (12 * 3) - 2 ) ;
@@ -218,12 +222,14 @@ ModalDialog RID_SVXDLG_MESSBOX
Moveable = TRUE ;
PushButton BTN_1
{
+ HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_1";
Pos = MAP_APPFONT ( 25 , 44 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
PushButton BTN_2
{
+ HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_2";
Pos = MAP_APPFONT ( 78 , 44 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src
index 186db5a48735..c705f42c5789 100644
--- a/cui/source/dialogs/fmsearch.src
+++ b/cui/source/dialogs/fmsearch.src
@@ -45,6 +45,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
};
RadioButton RB_SEARCHFORTEXT
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT";
Pos = MAP_APPFONT( 12, 23 );
Size = MAP_APPFONT( 50, 10 );
Group = TRUE;
@@ -52,12 +53,14 @@ ModalDialog RID_SVXDLG_SEARCHFORM
};
RadioButton RB_SEARCHFORNULL
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL";
Pos = MAP_APPFONT( 12, 36 );
Size = MAP_APPFONT( 207, 10 );
Text [ en-US ] = "Field content is ~NULL";
};
RadioButton RB_SEARCHFORNOTNULL
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL";
Pos = MAP_APPFONT( 12, 49 );
Size = MAP_APPFONT( 207, 10 );
Text [ en-US ] = "Field content is not NU~LL";
@@ -86,6 +89,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
};
ListBox LB_FORM
{
+ HelpID = "cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM";
Border = TRUE;
Pos = MAP_APPFONT( 110, 76 );
Size = MAP_APPFONT( 109, 60 );
@@ -102,6 +106,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
};
RadioButton RB_SINGLEFIELD
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SINGLEFIELD";
Pos = MAP_APPFONT( 24, 106 );
Size = MAP_APPFONT( 75, 10 );
Text [ en-US ] = "Single field";
@@ -204,6 +209,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
};
CheckBox CB_HALFFULLFORMS
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_HALFFULLFORMS";
Pos = MAP_APPFONT( 105, 209 );
Size = MAP_APPFONT( 85, 10 );
TabStop = TRUE ;
@@ -211,6 +217,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
};
CheckBox CB_SOUNDSLIKECJK
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_SOUNDSLIKECJK";
Pos = MAP_APPFONT( 190, 209 );
Size = MAP_APPFONT( 84, 10 );
TabStop = TRUE ;
@@ -218,6 +225,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
};
PushButton PB_SOUNDSLIKESETTINGS
{
+ HelpID = "cui:PushButton:RID_SVXDLG_SEARCHFORM:PB_SOUNDSLIKESETTINGS";
Pos = MAP_APPFONT( 275, 207 );
Size = MAP_APPFONT( 14, 14 );
TabStop = TRUE ;
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index db0d4bbf3973..f8d035528c71 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -94,6 +94,7 @@ TabPage RID_SVXTABPAGE_GALLERY_GENERAL
};
Edit EDT_MS_NAME
{
+ HelpID = "cui:Edit:RID_SVXTABPAGE_GALLERY_GENERAL:EDT_MS_NAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 60 , 10 ) ;
Size = MAP_APPFONT ( 194 , 12 ) ;
@@ -174,6 +175,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
};
ComboBox CBB_FILETYPE
{
+ HelpID = "cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE";
Pos = MAP_APPFONT ( 57 , 6 ) ;
Size = MAP_APPFONT ( 121 , 69 ) ;
TabStop = TRUE ;
@@ -183,6 +185,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
};
MultiListBox LBX_FOUND
{
+ HelpID = "cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 23 ) ;
Size = MAP_APPFONT ( 172 , 156 ) ;
@@ -191,6 +194,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
};
PushButton BTN_SEARCH
{
+ HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH";
Pos = MAP_APPFONT ( 184 , 6 ) ;
Size = MAP_APPFONT ( 70 , 14 ) ;
TabStop = TRUE ;
@@ -198,6 +202,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
};
PushButton BTN_TAKE
{
+ HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE";
Pos = MAP_APPFONT ( 184 , 24 ) ;
Size = MAP_APPFONT ( 70 , 14 ) ;
TabStop = TRUE ;
@@ -205,6 +210,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
};
PushButton BTN_TAKEALL
{
+ HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL";
Pos = MAP_APPFONT ( 184 , 42 ) ;
Size = MAP_APPFONT ( 70 , 14 ) ;
TabStop = TRUE ;
@@ -212,6 +218,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
};
CheckBox CBX_PREVIEW
{
+ HelpID = "cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW";
Pos = MAP_APPFONT ( 184 , 76 ) ;
Size = MAP_APPFONT ( 70 , 12 ) ;
Text [ en-US ] = "Pr~eview" ;
@@ -224,6 +231,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
};
PushButton BTN_MADDIN1
{
+ HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_MADDIN1";
Pos = MAP_APPFONT ( 220 , 63 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -231,6 +239,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
};
PushButton BTN_MADDIN2
{
+ HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_MADDIN2";
Pos = MAP_APPFONT ( 220 , 80 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -388,6 +397,7 @@ ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS
ModalDialog RID_SVXDLG_GALLERY_THEMEID
{
+ HelpID = "cui:ModalDialog:RID_SVXDLG_GALLERY_THEMEID";
OutputSize = TRUE ;
Border = TRUE ;
SVLook = TRUE ;
@@ -415,6 +425,7 @@ ModalDialog RID_SVXDLG_GALLERY_THEMEID
};
ListBox LB_RESNAME
{
+ HelpID = "cui:ListBox:RID_SVXDLG_GALLERY_THEMEID:LB_RESNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 100 , 60 ) ;
diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src
index a94161c0a1ed..0970049622fb 100644
--- a/cui/source/dialogs/grfflt.src
+++ b/cui/source/dialogs/grfflt.src
@@ -37,7 +37,7 @@
ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
{
- HelpID = SID_GRFFILTER_MOSAIC;
+ HelpID = CMD_SID_GRFFILTER_MOSAIC;
OutputSize = TRUE ;
Moveable = TRUE ;
SVLook = TRUE ;
@@ -66,6 +66,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
#define MA_Y1 MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
MetricField DLG_FILTERMOSAIC_MTR_WIDTH
{
+ HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , MA_Y1 ) ;
Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -91,6 +92,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
#define MA_Y3 MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
MetricField DLG_FILTERMOSAIC_MTR_HEIGHT
{
+ HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 12, MA_Y3 ) ;
Size = MAP_APPFONT ( 35, 12 ) ;
@@ -109,6 +111,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
#define MA_Y4 MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y
CheckBox DLG_FILTERMOSAIC_CBX_EDGES
{
+ HelpID = "cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES";
Pos = MAP_APPFONT ( 12, MA_Y4 ) ;
Size = MAP_APPFONT ( 91, 12 ) ;
TabStop = TRUE ;
@@ -141,7 +144,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
{
- HelpID = SID_GRFFILTER_SOLARIZE;
+ HelpID = CMD_SID_GRFFILTER_SOLARIZE;
OutputSize = TRUE ;
Moveable = TRUE ;
SVLook = TRUE ;
@@ -170,6 +173,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
#define MA_Y6 MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
MetricField DLG_FILTERSOLARIZE_MTR_THRESHOLD
{
+ HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , MA_Y6 ) ;
Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -186,6 +190,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
#define MA_Y7 MA_Y6 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
CheckBox DLG_FILTERSOLARIZE_CBX_INVERT
{
+ HelpID = "cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT";
Pos = MAP_APPFONT ( 12, 46 ) ;
Size = MAP_APPFONT ( 77, 12 ) ;
TabStop = TRUE ;
@@ -218,7 +223,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
{
- HelpID = SID_GRFFILTER_SEPIA;
+ HelpID = CMD_SID_GRFFILTER_SEPIA;
OutputSize = TRUE ;
Moveable = TRUE ;
SVLook = TRUE ;
@@ -247,6 +252,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
#define MA_Y9 MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
MetricField DLG_FILTERSEPIA_MTR_SEPIA
{
+ HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , MA_Y9 ) ;
Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -290,7 +296,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
{
- HelpID = SID_GRFFILTER_POSTER;
+ HelpID = CMD_SID_GRFFILTER_POSTER;
OutputSize = TRUE ;
Moveable = TRUE ;
SVLook = TRUE ;
@@ -319,6 +325,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
#define MA_Y11 MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
NumericField DLG_FILTERPOSTER_NUM_POSTER
{
+ HelpID = "cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , MA_Y11 ) ;
Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -359,13 +366,14 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB
{
+ HelpID = "cui:TabPage:RID_SVX_GRFFILTER_DLG_EMBOSS_TAB";
Pos = MAP_APPFONT ( 0, 0 ) ;
Size = MAP_APPFONT ( 0, 0 ) ;
};
ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
{
- HelpID = SID_GRFFILTER_EMBOSS;
+ HelpID = CMD_SID_GRFFILTER_EMBOSS;
OutputSize = TRUE ;
Moveable = TRUE ;
SVLook = TRUE ;
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 32e62d3e7f80..169c88aebe71 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1158,7 +1158,7 @@ namespace svx
,m_pCheckButtonData ( NULL )
,m_xConversionDictionaryList( NULL )
{
- m_aDictsLB.SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
+ m_aDictsLB.SetStyle( m_aDictsLB.GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
m_aDictsLB.SetSelectionMode( SINGLE_SELECTION );
m_aDictsLB.SetHighlightRange();
// m_aDictsLB.SetHelpId( xxx );
diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src
index 11e2fe415c38..d4736a491490 100644
--- a/cui/source/dialogs/hangulhanjadlg.src
+++ b/cui/source/dialogs/hangulhanjadlg.src
@@ -44,6 +44,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
PushButton PB_FIND
{
+ HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND";
Pos = MAP_APPFONT( 207, 23 );
Size = MAP_APPFONT( 30, 14 );
@@ -67,6 +68,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
RadioButton RB_SIMPLE_CONVERSION
{
+ HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION";
Pos = MAP_APPFONT( 51, 81 );
Size = MAP_APPFONT( 60, 8 );
@@ -77,6 +79,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
RadioButton RB_HANJA_HANGUL_BRACKETED
{
+ HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED";
Pos = MAP_APPFONT( 114, 81 );
Size = MAP_APPFONT( 60, 8 );
@@ -85,6 +88,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
RadioButton RB_HANGUL_HANJA_BRACKETED
{
+ HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED";
Pos = MAP_APPFONT( 177, 81 );
Size = MAP_APPFONT( 60, 8 );
@@ -93,6 +97,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
RadioButton RB_HANGUL_HANJA_ABOVE
{
+ HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE";
Pos = MAP_APPFONT( 51, 95 );
Size = MAP_APPFONT( 60, 16 );
@@ -102,6 +107,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
RadioButton RB_HANGUL_HANJA_BELOW
{
+ HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW";
Pos = MAP_APPFONT( 114, 95 );
Size = MAP_APPFONT( 60, 16 );
@@ -111,6 +117,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
RadioButton RB_HANJA_HANGUL_ABOVE
{
+ HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE";
Pos = MAP_APPFONT( 56, 114 );
Size = MAP_APPFONT( 60, 16 );
@@ -120,6 +127,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
RadioButton RB_HANJA_HANGUL_BELOW
{
+ HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW";
Pos = MAP_APPFONT( 114, 114 );
Size = MAP_APPFONT( 60, 16 );
@@ -137,6 +145,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
CheckBox CB_HANGUL_ONLY
{
+ HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY";
Pos = MAP_APPFONT( 51, 134 );
Size = MAP_APPFONT( 60, 8 );
@@ -145,6 +154,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
CheckBox CB_HANJA_ONLY
{
+ HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY";
Pos = MAP_APPFONT( 114, 134 );
Size = MAP_APPFONT( 55, 8 );
@@ -159,6 +169,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
CheckBox CB_REPLACE_BY_CHARACTER
{
+ HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER";
Pos = MAP_APPFONT( 241, 81 );
Size = MAP_APPFONT( 55, 24 );
@@ -212,36 +223,42 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_OPT
};
CheckBox CB_IGNOREPOST
{
+ HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST";
Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_9 ) ;
Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ;
Text[ en-US ] = "Ignore post-positional word";
};
CheckBox CB_SHOWRECENTLYFIRST
{
+ HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST";
Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_11 ) ;
Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ;
Text [ en-US ] = "Show recently used entries first";
};
CheckBox CB_AUTOREPLACEUNIQUE
{
+ HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE";
Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_12 ) ;
Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ;
Text [ en-US ] = "Replace all unique entries automatically";
};
PushButton PB_HHO_NEW
{
+ HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW";
Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_2 ) ;
Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ;
Text [ en-US ] = "New...";
};
PushButton PB_HHO_EDIT
{
+ HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT";
Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_4 ) ;
Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ;
Text [ en-US ] = "Edit...";
};
PushButton PB_HHO_DELETE
{
+ HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE";
Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_6 ) ;
Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ;
Text [ en-US ] = "Delete";
@@ -291,6 +308,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_NEWDICT
};
Edit ED_DICTNAME
{
+ HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 55 , 14 ) ;
Size = MAP_APPFONT ( 90 , 12 ) ;
@@ -340,6 +358,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
};
ListBox LB_BOOK
{
+ HelpID = "cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK";
Pos = MAP_APPFONT ( HHE_COL_3 , HHE_ROW_1 ) ;
Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_3 , 60 ) ;
DropDown = TRUE;
@@ -353,6 +372,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
};
ComboBox LB_ORIGINAL
{
+ HelpID = "cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL";
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_5 ) ;
Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_1 , 60 ) ;
DropDown = TRUE;
@@ -366,6 +386,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
};
Edit ED_1
{
+ HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1";
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 ) ;
Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
Hide = False;
@@ -373,6 +394,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
};
Edit ED_2
{
+ HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2";
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 12 ) ;
Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
Hide = False;
@@ -380,6 +402,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
};
Edit ED_3
{
+ HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3";
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 24 ) ;
Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
Hide = False;
@@ -387,6 +410,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
};
Edit ED_4
{
+ HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4";
Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 36 ) ;
Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
Hide = False;
@@ -401,12 +425,14 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
};
PushButton PB_HHE_NEW
{
+ HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW";
Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a1 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "New";
};
PushButton PB_HHE_DELETE
{
+ HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE";
Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a3 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "Delete";
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index e7f40766d836..5d29e652a7d2 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -145,9 +145,9 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
maLbTree.SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
// Tree-ListBox mit Linien versehen
- maLbTree.SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES |
+ maLbTree.SetStyle( maLbTree.GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
WB_HASBUTTONS | //WB_HASLINESATROOT |
- WB_HSCROLL | WB_HASBUTTONSATROOT ) );
+ WB_HSCROLL | WB_HASBUTTONSATROOT );
}
SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd()
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 4ed7d1419bba..29b4b9b5951e 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -56,18 +56,21 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
};
RadioButton RB_LINKTYP_INTERNET
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET";
Pos = MAP_APPFONT( COL_2, 13 );
Size = MAP_APPFONT( 57, 10 );
Text [ en-US ] = "~Web";
};
RadioButton RB_LINKTYP_FTP
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP";
Pos = MAP_APPFONT( 114 + COL_DIFF, 13 );
Size = MAP_APPFONT( 56 - COL_DIFF, 10 );
Text [ en-US ] = "~FTP";
};
RadioButton RB_LINKTYP_TELNET
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET";
Pos = MAP_APPFONT( 173, 13 );
Size = MAP_APPFONT( 56, 10 );
Text [ en-US ] = "~Telnet";
@@ -86,6 +89,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
};
Edit ED_LOGIN
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 42 ) ;
Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ;
@@ -98,6 +102,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
};
Edit ED_PASSWD
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 59 ) ;
Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ;
@@ -105,6 +110,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
};
CheckBox CBX_ANONYMOUS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS";
Pos = MAP_APPFONT ( COL_2 , 75 ) ;
Size = MAP_APPFONT ( 89 - COL_DIFF , 10 ) ;
TabStop = TRUE ;
@@ -112,6 +118,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
};
ImageButton BTN_BROWSE
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE";
Pos = MAP_APPFONT ( 235, 24 ) ;
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
TabStop = TRUE ;
@@ -131,6 +138,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
};
ImageButton BTN_TARGET
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET";
Pos = MAP_APPFONT ( 235, 40+2 ) ;
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
TabStop = TRUE ;
@@ -162,6 +170,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
};
ComboBox CB_FRAME
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 104 ) ;
Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -177,6 +186,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
};
ListBox LB_FORM
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM";
Border = TRUE ;
Pos = MAP_APPFONT ( 160 , 104 ) ;
Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -198,6 +208,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
};
Edit ED_INDICATION
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 122 ) ;
Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -210,12 +221,14 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
};
Edit ED_TEXT
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 139 ) ;
Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
};
ImageButton BTN_SCRIPT
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT";
Pos = MAP_APPFONT ( 235, 103-1 ) ;
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
TabStop = TRUE ;
@@ -258,12 +271,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
};
RadioButton RB_LINKTYP_MAIL
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL";
Pos = MAP_APPFONT( COL_2, 13 );
Size = MAP_APPFONT( 56 - COL_DIFF, 10 );
Text [ en-US ] = "~E-mail";
};
RadioButton RB_LINKTYP_NEWS
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS";
Pos = MAP_APPFONT( 113, 13 );
Size = MAP_APPFONT( 56, 10 );
Text [ en-US ] = "~News";
@@ -282,12 +297,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
};
Edit ED_SUBJECT
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 42 ) ;
Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
};
ImageButton BTN_ADRESSBOOK
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK";
Pos = MAP_APPFONT ( 235, 24 ) ;
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
TabStop = TRUE ;
@@ -321,6 +338,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
};
ComboBox CB_FRAME
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 104 ) ;
Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -336,6 +354,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
};
ListBox LB_FORM
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM";
Border = TRUE ;
Pos = MAP_APPFONT ( 160 , 104 ) ;
Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -357,6 +376,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
};
Edit ED_INDICATION
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 122 ) ;
Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -369,12 +389,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
};
Edit ED_TEXT
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 139 ) ;
Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
};
ImageButton BTN_SCRIPT
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT";
Pos = MAP_APPFONT ( 235, 103-1 ) ;
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
TabStop = TRUE ;
@@ -422,6 +444,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
};
ImageButton BTN_FILEOPEN
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN";
Pos = MAP_APPFONT ( 235, 14 ) ;
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
TabStop = TRUE ;
@@ -453,6 +476,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
};
Edit ED_TARGET_DOC
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 52 ) ;
Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
@@ -471,6 +495,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
};
ImageButton BTN_BROWSE
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE";
Pos = MAP_APPFONT ( 235, 51 ) ;
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
TabStop = TRUE ;
@@ -502,6 +527,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
};
ComboBox CB_FRAME
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 104 ) ;
Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -517,6 +543,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
};
ListBox LB_FORM
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM";
Border = TRUE ;
Pos = MAP_APPFONT ( 160 , 104 ) ;
Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -538,6 +565,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
};
Edit ED_INDICATION
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 122 ) ;
Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -550,12 +578,14 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
};
Edit ED_TEXT
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 139 ) ;
Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
};
ImageButton BTN_SCRIPT
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT";
Pos = MAP_APPFONT ( 235, 103-1 ) ;
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
TabStop = TRUE ;
@@ -597,12 +627,14 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
};
RadioButton RB_EDITNOW
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW";
Pos = MAP_APPFONT( COL_2, 13 );
Size = MAP_APPFONT( 85 - COL_DIFF, 10 );
Text [ en-US ] = "Edit ~now";
};
RadioButton RB_EDITLATER
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER";
Pos = MAP_APPFONT( 142, 13 );
Size = MAP_APPFONT( 84, 10 );
Text [ en-US ] = "Edit ~later";
@@ -615,6 +647,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
};
Edit ED_PATH_NEWDOC
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 25 ) ;
Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
@@ -627,6 +660,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
};
ListBox LB_DOCUMENT_TYPES
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 42 ) ;
Size = MAP_APPFONT ( 176 - COL_DIFF , 40 ) ;
@@ -635,6 +669,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
};
ImageButton BTN_CREATE
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE";
Pos = MAP_APPFONT ( 235, 24 ) ;
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
TabStop = TRUE ;
@@ -667,6 +702,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
};
ComboBox CB_FRAME
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 104 ) ;
Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -682,6 +718,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
};
ListBox LB_FORM
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM";
Border = TRUE ;
Pos = MAP_APPFONT ( 160 , 104 ) ;
Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -703,6 +740,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
};
Edit ED_INDICATION
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 122 ) ;
Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -715,12 +753,14 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
};
Edit ED_TEXT
{
+ HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT";
Border = TRUE ;
Pos = MAP_APPFONT ( COL_2 , 139 ) ;
Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
};
ImageButton BTN_SCRIPT
{
+ HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT";
Pos = MAP_APPFONT ( 235, 103-1 ) ;
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
TabStop = TRUE ;
@@ -746,7 +786,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
*************************************************************************/
ModalDialog RID_SVXDLG_NEWHYPERLINK
{
- HelpID = SID_HYPERLINK_DIALOG;
+ HelpID = CMD_SID_HYPERLINK_DIALOG;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 325 , 185 ) ;
diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src
index f10e94626f31..39a7cc6fd3d9 100755..100644
--- a/cui/source/dialogs/hyphen.src
+++ b/cui/source/dialogs/hyphen.src
@@ -54,6 +54,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
};
Edit ED_WORD
{
+ HelpID = "cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD";
BORDER = TRUE ;
Pos = MAP_APPFONT ( 5 , 17 ) ;
Size = MAP_APPFONT ( 132 , 12 ) ;
@@ -62,6 +63,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
};
ImageButton BTN_LEFT
{
+ HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT";
Pos = MAP_APPFONT ( 56 , 33 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
TABSTOP = TRUE ;
@@ -69,6 +71,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
};
ImageButton BTN_RIGHT
{
+ HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT";
Pos = MAP_APPFONT ( 75 , 33 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
TABSTOP = TRUE ;
@@ -84,6 +87,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
};
PushButton BTN_HYPH_CONTINUE
{
+ HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE";
Pos = MAP_APPFONT ( 144 , 35 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Skip" ;
@@ -91,6 +95,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
};
PushButton BTN_HYPH_DELETE
{
+ HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE";
Pos = MAP_APPFONT ( 144 , 52 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Remove" ;
@@ -109,6 +114,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
};
PushButton BTN_HYPH_ALL
{
+ HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL";
Pos = MAP_APPFONT ( 63 , 93 ) ;
Size = MAP_APPFONT ( 74 , 14 ) ;
Text [ en-US ] = "Hyphenate ~All" ;
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 41d603c81802..4929c45b93e8 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -44,7 +44,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
return static_cast< sal_uInt16 >( aCountEdit.GetValue() );
}
-SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId )
+SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& sHelpId )
: ModalDialog( pParent, CUI_RES(DLG_INS_ROW_COL) ),
aCount( this, CUI_RES( FT_COUNT ) ),
aCountEdit( this, CUI_RES( ED_COUNT ) ),
@@ -70,7 +70,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId )
aTmp += aRow;
}
SetText( aTmp );
- SetHelpId( nHelpId );
+ SetHelpId( sHelpId );
}
short SvxInsRowColDlg::Execute(void)
diff --git a/cui/source/dialogs/insrc.src b/cui/source/dialogs/insrc.src
index 69f934a29049..f655620bcd54 100644
--- a/cui/source/dialogs/insrc.src
+++ b/cui/source/dialogs/insrc.src
@@ -31,6 +31,7 @@
ModalDialog DLG_INS_ROW_COL
{
+ HelpID = "cui:ModalDialog:DLG_INS_ROW_COL";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 136 , 84 ) ;
@@ -57,6 +58,7 @@ ModalDialog DLG_INS_ROW_COL
};
RadioButton CB_POS_BEFORE
{
+ HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE";
Pos = MAP_APPFONT ( 12 , 49 ) ;
Size = MAP_APPFONT ( 56 , 10 ) ;
Text [ en-US ] = "~Before" ;
@@ -64,6 +66,7 @@ ModalDialog DLG_INS_ROW_COL
};
RadioButton CB_POS_AFTER
{
+ HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER";
Pos = MAP_APPFONT ( 12 , 62 ) ;
Size = MAP_APPFONT ( 56 , 10 ) ;
Text [ en-US ] = "A~fter" ;
@@ -72,6 +75,7 @@ ModalDialog DLG_INS_ROW_COL
};
NumericField ED_COUNT
{
+ HelpID = "cui:NumericField:DLG_INS_ROW_COL:ED_COUNT";
Border = TRUE ;
Pos = MAP_APPFONT ( 44 , 14 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src
index 987867492e13..c16c13b9ed7f 100644
--- a/cui/source/dialogs/multipat.src
+++ b/cui/source/dialogs/multipat.src
@@ -47,6 +47,7 @@ ModalDialog RID_SVXDLG_MULTIPATH
};
ListBox LB_MULTIPATH
{
+ HelpID = "cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 189 , 80 ) ;
@@ -70,12 +71,14 @@ ModalDialog RID_SVXDLG_MULTIPATH
};
PushButton BTN_ADD_MULTIPATH
{
+ HelpID = "cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH";
Pos = MAP_APPFONT ( 204 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Add..." ;
};
PushButton BTN_DEL_MULTIPATH
{
+ HelpID = "cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH";
Pos = MAP_APPFONT ( 204 , 31 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Delete" ;
diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src
index 4bbbd564edd1..f9d3db8c5f0c 100644
--- a/cui/source/dialogs/newtabledlg.src
+++ b/cui/source/dialogs/newtabledlg.src
@@ -30,6 +30,7 @@
ModalDialog RID_SVX_NEWTABLE_DLG
{
+ HelpID = "cui:ModalDialog:RID_SVX_NEWTABLE_DLG";
OutputSize = TRUE;
SVLook = TRUE ;
Moveable = TRUE ;
@@ -44,6 +45,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG
};
NumericField NF_COLUMNS
{
+ HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS";
Border = TRUE ;
Pos = MAP_APPFONT ( 80 , 6 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -63,6 +65,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG
};
NumericField NF_ROWS
{
+ HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS";
Border = TRUE ;
Pos = MAP_APPFONT ( 80 , 6+15 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src
index 904319d45355..50daaedd58b8 100644
--- a/cui/source/dialogs/postdlg.src
+++ b/cui/source/dialogs/postdlg.src
@@ -27,12 +27,13 @@
// include ---------------------------------------------------------------
#include <cuires.hrc>
#include "postdlg.hrc"
+#include "helpid.hrc"
#include <svx/dialogs.hrc> // for RID_SVXDLG_POSTIT
// RID_SVXDLG_POSTIT -----------------------------------------------------
ModalDialog RID_SVXDLG_POSTIT
{
- HelpId = SID_POSTIT ;
+ HelpId = HID_POSTIT_DIALOG ;
OutputSize = TRUE ;
SvLook = TRUE ;
Size = MAP_APPFONT ( 198 , 134 ) ;
@@ -60,6 +61,7 @@ ModalDialog RID_SVXDLG_POSTIT
};
MultiLineEdit ED_EDIT
{
+ HelpID = "cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 38 ) ;
Size = MAP_APPFONT ( 123 , 72 ) ;
@@ -92,12 +94,14 @@ ModalDialog RID_SVXDLG_POSTIT
};
ImageButton BTN_PREV
{
+ HelpID = "cui:ImageButton:RID_SVXDLG_POSTIT:BTN_PREV";
Pos = MAP_APPFONT ( 141 , 60 ) ;
Size = MAP_APPFONT ( 24 , 14 ) ;
Symbol = IMAGEBUTTON_ARROW_LEFT ;
};
ImageButton BTN_NEXT
{
+ HelpID = "cui:ImageButton:RID_SVXDLG_POSTIT:BTN_NEXT";
Pos = MAP_APPFONT ( 167 , 60 ) ;
Size = MAP_APPFONT ( 24 , 14 ) ;
Symbol = IMAGEBUTTON_ARROW_RIGHT ;
@@ -110,6 +114,7 @@ ModalDialog RID_SVXDLG_POSTIT
};
PushButton BTN_AUTHOR
{
+ HelpID = "cui:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR";
Pos = MAP_APPFONT ( 75 , 114 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "Author" ;
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 62ec77c3c26a..139ef0071d37 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -99,7 +99,7 @@ SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) :
FreeResource();
SetSelectionMode( SINGLE_SELECTION );
- SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL |
+ SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL |
WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION |
WB_HASLINES | WB_HASLINESATROOT );
SetNodeDefaultImages();
diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
index 67a81376d662..bb691045dd21 100644
--- a/cui/source/dialogs/scriptdlg.src
+++ b/cui/source/dialogs/scriptdlg.src
@@ -106,6 +106,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
PushButton SF_PB_RUN
{
+ HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN";
Pos = MAP_APPFONT ( 144 , 6 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
DefButton = TRUE;
@@ -121,6 +122,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
PushButton SF_PB_CREATE
{
+ HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE";
Size = MAP_APPFONT ( 60 , 14 ) ;
Pos = MAP_APPFONT ( 144 , 60 ) ;
Text [ en-US ] = "~Create..." ;
@@ -128,6 +130,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
};
PushButton SF_PB_EDIT
{
+ HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT";
Size = MAP_APPFONT ( 60 , 14 ) ;
Pos = MAP_APPFONT ( 144 , 77 ) ;
Text [ en-US ] = "~Edit" ;
@@ -135,12 +138,14 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
};
PushButton SF_PB_RENAME
{
+ HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME";
Pos = MAP_APPFONT ( 144 , 94 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "Rename..." ;
};
PushButton SF_PB_DEL
{
+ HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL";
Pos = MAP_APPFONT ( 144 , 114 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Delete..." ;
@@ -156,6 +161,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
};
ModalDialog RID_DLG_NEWLIB
{
+ HelpID = "cui:ModalDialog:RID_DLG_NEWLIB";
Text [ en-US ] = "Create Library" ;
Size = MAP_APPFONT ( 160 , 50 ) ;
Moveable = TRUE ;
@@ -182,6 +188,7 @@ ModalDialog RID_DLG_NEWLIB
};
Edit ED_LIBNAME
{
+ HelpID = "cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 59 ) ;
Size = MAP_APPFONT ( 92 , 12 ) ;
diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src
index 465591e8f0a0..231c32effd7a 100644
--- a/cui/source/dialogs/showcols.src
+++ b/cui/source/dialogs/showcols.src
@@ -29,6 +29,7 @@
ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
{
+ HelpID = "cui:ModalDialog:RID_SVX_DLG_SHOWGRIDCOLUMNS";
OutputSize = TRUE;
SVLook = TRUE ;
Size = MAP_APPFONT( 200, 117 );
@@ -45,6 +46,7 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
ListBox 1
{
+ HelpID = "cui:ListBox:RID_SVX_DLG_SHOWGRIDCOLUMNS:1";
Border = TRUE;
Pos = MAP_APPFONT( 6, 39 );
Size = MAP_APPFONT( 188, 55 );
diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src
index 5326ca2d0e4d..9f07dc55ac38 100644
--- a/cui/source/dialogs/splitcelldlg.src
+++ b/cui/source/dialogs/splitcelldlg.src
@@ -30,6 +30,7 @@
ModalDialog RID_SVX_SPLITCELLDLG
{
+ HelpID = "cui:ModalDialog:RID_SVX_SPLITCELLDLG";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 169 , 108 ) ;
@@ -64,6 +65,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
};
NumericField ED_COUNT
{
+ HelpID = "cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT";
Border = TRUE ;
Pos = MAP_APPFONT ( 82 , 14 ) ;
Size = MAP_APPFONT ( 21 , 12 ) ;
@@ -85,6 +87,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
};
ImageRadioButton RB_HORZ
{
+ HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ";
Pos = MAP_APPFONT ( 12 , 47 ) ;
Size = MAP_APPFONT ( 90 , 18 ) ;
Group = TRUE;
@@ -98,6 +101,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
};
CheckBox CB_PROP
{
+ HelpID = "cui:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP";
Pos = MAP_APPFONT ( 18 , 68 ) ;
Size = MAP_APPFONT ( 91 , 12 ) ;
Text [ en-US ] = "~Into equal proportions";
@@ -112,6 +116,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
};
ImageRadioButton RB_VERT
{
+ HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT";
Pos = MAP_APPFONT ( 12 , 84 ) ;
Size = MAP_APPFONT ( 90 , 18 ) ;
Text [ en-US ] = "~Vertically" ;
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index dafec167af2c..6c670fc08e69 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -151,7 +151,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
{
FreeResource();
- aAttrLB.SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
+ aAttrLB.SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
aAttrLB.GetModel()->SetSortMode( SortAscending );
aOKBtn.SetClickHdl( LINK( this, SvxSearchAttributeDialog, OKHdl ) );
diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src
index 04265a6d6726..8131b4e68a81 100644
--- a/cui/source/dialogs/srchxtra.src
+++ b/cui/source/dialogs/srchxtra.src
@@ -148,6 +148,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
};
NumericField NF_OTHER
{
+ HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER";
Pos = MAP_APPFONT ( 86 , 14 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Border = TRUE ;
@@ -169,6 +170,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
};
NumericField NF_LONGER
{
+ HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER";
Pos = MAP_APPFONT ( 86 , 28 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Border = TRUE ;
@@ -190,6 +192,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
};
NumericField NF_SHORTER
{
+ HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER";
Pos = MAP_APPFONT ( 86 , 44 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Border = TRUE ;
@@ -205,6 +208,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
};
CheckBox CB_RELAX
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX";
Pos = MAP_APPFONT ( 12 , 60 ) ;
Size = MAP_APPFONT ( 98 , 10 ) ;
Text [ en-US ] = "~Combine" ;
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
index 74a8eae82274..3f737c10dcc8 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
@@ -30,6 +30,7 @@
ModalDialog MD_PASTE_OBJECT
{
+ HelpID = "cui:ModalDialog:MD_PASTE_OBJECT";
OutputSize = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
@@ -49,6 +50,7 @@ ModalDialog MD_PASTE_OBJECT
};
RadioButton RB_PASTE
{
+ HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE";
Hide = TRUE ;
Pos = MAP_APPFONT ( 12 , 48 ) ;
Size = MAP_APPFONT ( 63 , 10 ) ;
@@ -57,6 +59,7 @@ ModalDialog MD_PASTE_OBJECT
};
RadioButton RB_PASTE_LINK
{
+ HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE_LINK";
Hide = TRUE ;
Pos = MAP_APPFONT ( 78 , 48 ) ;
Size = MAP_APPFONT ( 63 , 10 ) ;
@@ -64,12 +67,14 @@ ModalDialog MD_PASTE_OBJECT
};
ListBox LB_INSERT_LIST
{
+ HelpID = "cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 49 ) ;
Size = MAP_APPFONT ( 202 , 74 ) ;
};
CheckBox CB_DISPLAY_AS_ICON
{
+ HelpID = "cui:CheckBox:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON";
Hide = TRUE ;
Disable = TRUE ;
Pos = MAP_APPFONT ( 150 , 62 ) ;
@@ -87,6 +92,7 @@ ModalDialog MD_PASTE_OBJECT
*/
PushButton PB_CHANGE_ICON
{
+ HelpID = "cui:PushButton:MD_PASTE_OBJECT:PB_CHANGE_ICON";
Hide = TRUE ;
Pos = MAP_APPFONT ( 150 , 111 ) ;
Size = MAP_APPFONT ( 64 , 14 ) ;
@@ -121,6 +127,7 @@ ModalDialog MD_PASTE_OBJECT
};
ModalDialog MD_UPDATE_BASELINKS
{
+ HelpID = "cui:ModalDialog:MD_UPDATE_BASELINKS";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 337 , 166 ) ;
@@ -164,24 +171,28 @@ ModalDialog MD_UPDATE_BASELINKS
};
PushButton PB_UPDATE_NOW
{
+ HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW";
Pos = MAP_APPFONT ( 270 , 43 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Update" ;
};
PushButton PB_OPEN_SOURCE
{
+ HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE";
Pos = MAP_APPFONT ( 270 , 60 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Open" ;
};
PushButton PB_CHANGE_SOURCE
{
+ HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE";
Pos = MAP_APPFONT ( 270 , 77 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Modify..." ;
};
PushButton PB_BREAK_LINK
{
+ HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK";
Pos = MAP_APPFONT ( 270 , 94 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Break Link" ;
@@ -212,12 +223,14 @@ ModalDialog MD_UPDATE_BASELINKS
};
RadioButton RB_AUTOMATIC
{
+ HelpID = "cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC";
Pos = MAP_APPFONT ( 70 , 150 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
Text [ en-US ] = "~Automatic" ;
};
RadioButton RB_MANUAL
{
+ HelpID = "cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL";
Pos = MAP_APPFONT ( 133 , 150 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
/* ### ACHTUNG: Neuer Text in Resource? ~Manuell : Ma~nuell */
@@ -273,6 +286,7 @@ ModalDialog MD_UPDATE_BASELINKS
};
ModalDialog MD_LINKEDIT
{
+ HelpID = "cui:ModalDialog:MD_LINKEDIT";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 222 , 58 ) ;
@@ -304,6 +318,7 @@ ModalDialog MD_LINKEDIT
};
Edit ED_FULL_SOURCE_NAME
{
+ HelpID = "cui:Edit:MD_LINKEDIT:ED_FULL_SOURCE_NAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 5 , 35 ) ;
Size = MAP_APPFONT ( 155 , 12 ) ;
@@ -312,42 +327,49 @@ ModalDialog MD_LINKEDIT
};
ModalDialog MD_INSERT_OLEOBJECT
{
+ HelpID = "cui:ModalDialog:MD_INSERT_OLEOBJECT";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 284 , 105 ) ;
Moveable = TRUE ;
RadioButton RB_NEW_OBJECT
{
+ HelpID = "cui:RadioButton:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT";
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 81 , 10 ) ;
Text [ en-US ] = "~Create new" ;
};
RadioButton RB_OBJECT_FROMFILE
{
+ HelpID = "cui:RadioButton:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE";
Pos = MAP_APPFONT ( 90 , 6 ) ;
Size = MAP_APPFONT ( 81 , 10 ) ;
Text [ en-US ] = "Create from ~file" ;
};
ListBox LB_OBJECTTYPE
{
+ HelpID = "cui:ListBox:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 33 ) ;
Size = MAP_APPFONT ( 204 , 60 ) ;
};
Edit ED_FILEPATH
{
+ HelpID = "cui:Edit:MD_INSERT_OLEOBJECT:ED_FILEPATH";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 33 ) ;
Size = MAP_APPFONT ( 204 , 12 ) ;
};
PushButton BTN_FILEPATH
{
+ HelpID = "cui:PushButton:MD_INSERT_OLEOBJECT:BTN_FILEPATH";
Pos = MAP_APPFONT ( 166 , 48 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Search..." ;
};
CheckBox CB_FILELINK
{
+ HelpID = "cui:CheckBox:MD_INSERT_OLEOBJECT:CB_FILELINK";
Pos = MAP_APPFONT ( 12 , 48 ) ;
Size = MAP_APPFONT ( 138 , 10 ) ;
Text [ en-US ] = "~Link to file" ;
@@ -385,18 +407,21 @@ ModalDialog MD_INSERT_OLEOBJECT
};
ModalDialog MD_INSERT_OBJECT_PLUGIN
{
+ HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_PLUGIN";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 284 , 123 ) ;
Moveable = TRUE ;
Edit ED_FILEURL
{
+ HelpID = "cui:Edit:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 204 , 12 ) ;
};
PushButton BTN_FILEURL
{
+ HelpID = "cui:PushButton:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL";
Pos = MAP_APPFONT ( 166 , 29 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Browse..." ;
@@ -409,6 +434,7 @@ ModalDialog MD_INSERT_OBJECT_PLUGIN
};
MultiLineEdit ED_PLUGINS_OPTIONS
{
+ HelpID = "cui:MultiLineEdit:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 66 ) ;
Size = MAP_APPFONT ( 204 , 45 ) ;
@@ -441,6 +467,7 @@ ModalDialog MD_INSERT_OBJECT_PLUGIN
};
ModalDialog MD_INSERT_OBJECT_APPLET
{
+ HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_APPLET";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 284 , 164 ) ;
@@ -453,6 +480,7 @@ ModalDialog MD_INSERT_OBJECT_APPLET
};
Edit ED_CLASSFILE
{
+ HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 27 ) ;
Size = MAP_APPFONT ( 204 , 12 ) ;
@@ -465,12 +493,14 @@ ModalDialog MD_INSERT_OBJECT_APPLET
};
Edit ED_CLASSLOCATION
{
+ HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 55 ) ;
Size = MAP_APPFONT ( 204 , 12 ) ;
};
PushButton BTN_CLASS
{
+ HelpID = "cui:PushButton:MD_INSERT_OBJECT_APPLET:BTN_CLASS";
Pos = MAP_APPFONT ( 166 , 70 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Search..." ;
@@ -483,6 +513,7 @@ ModalDialog MD_INSERT_OBJECT_APPLET
};
MultiLineEdit ED_APPLET_OPTIONS
{
+ HelpID = "cui:MultiLineEdit:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 107 ) ;
Size = MAP_APPFONT ( 204 , 45 ) ;
@@ -524,6 +555,7 @@ Control TB_LINKS
ModalDialog MD_INSERT_OBJECT_IFRAME
{
+ HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_IFRAME";
Size = MAP_APPFONT ( 302 , 98 ) ;
Hide = TRUE ;
Moveable = TRUE ;
@@ -554,6 +586,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
Edit ED_FRAMENAME
{
+ HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 45 , 6 ) ;
Size = MAP_APPFONT ( 178 , 12 ) ;
@@ -567,6 +600,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
Edit ED_URL
{
+ HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL";
Border = TRUE ;
Pos = MAP_APPFONT ( 45 , 24 ) ;
Size = MAP_APPFONT ( 178 , 12 ) ;
@@ -574,6 +608,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
PushButton BT_FILEOPEN
{
+ HelpID = "cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN";
Pos = MAP_APPFONT ( 226 , 24 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
Text = "~..." ;
@@ -581,6 +616,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
RadioButton RB_SCROLLINGON
{
+ HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 12 , 53 ) ;
Size = MAP_APPFONT ( 54 , 10 ) ;
@@ -588,6 +624,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
RadioButton RB_SCROLLINGOFF
{
+ HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 12 , 66 ) ;
Size = MAP_APPFONT ( 54 , 10 ) ;
@@ -595,6 +632,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
RadioButton RB_SCROLLINGAUTO
{
+ HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 12 , 79 ) ;
Size = MAP_APPFONT ( 54 , 10 ) ;
@@ -608,6 +646,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
RadioButton RB_FRMBORDER_ON
{
+ HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 81 , 53 ) ;
Size = MAP_APPFONT ( 42 , 10 ) ;
@@ -615,6 +654,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
RadioButton RB_FRMBORDER_OFF
{
+ HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 81 , 66 ) ;
Size = MAP_APPFONT ( 42 , 10 ) ;
@@ -639,6 +679,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
NumericField NM_MARGINWIDTH
{
+ HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH";
Border = TRUE ;
Pos = MAP_APPFONT ( 167 , 54 ) ;
Size = MAP_APPFONT ( 20 , 12 ) ;
@@ -652,6 +693,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
CheckBox CB_MARGINWIDTHDEFAULT
{
+ HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINWIDTHDEFAULT";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 190 , 56 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
@@ -665,6 +707,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
NumericField NM_MARGINHEIGHT
{
+ HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 167 , 72 ) ;
Size = MAP_APPFONT ( 20 , 12 ) ;
@@ -678,6 +721,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
};
CheckBox CB_MARGINHEIGHTDEFAULT
{
+ HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 190 , 74 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src
index 9e9d2fb6eb03..4d6b96445115 100644
--- a/cui/source/dialogs/tbxform.src
+++ b/cui/source/dialogs/tbxform.src
@@ -28,6 +28,7 @@
ModalDialog RID_SVX_DLG_INPUTRECORDNO
{
+ HelpID = "cui:ModalDialog:RID_SVX_DLG_INPUTRECORDNO";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 130 , 45 ) ;
@@ -43,6 +44,7 @@ ModalDialog RID_SVX_DLG_INPUTRECORDNO
};
NumericField 1
{
+ HelpID = "cui:NumericField:RID_SVX_DLG_INPUTRECORDNO:1";
Border = TRUE ;
Pos = MAP_APPFONT ( 79 , 6 ) ;
Size = MAP_APPFONT ( 45 , 12 ) ;
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index c1811b196895..5ad431567a72 100755
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -180,7 +180,7 @@ ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl(
SvxCheckListBox( pParent, CUI_RES( CT_THES_ALTERNATIVES ) ),
m_rDialogImpl( rImpl )
{
- SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
+ SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
SetHighlightRange();
}
diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src
index 6c6a6444b33d..8592a9fb50cc 100755..100644
--- a/cui/source/dialogs/thesdlg.src
+++ b/cui/source/dialogs/thesdlg.src
@@ -34,7 +34,7 @@
// RID_SVXDLG_THES -------------------------------------------------------
ModalDialog RID_SVXDLG_THESAURUS
{
- HelpId = SID_THESAURUS ;
+ HelpId = CMD_SID_THESAURUS ;
OutputSize = TRUE ;
Size = MAP_APPFONT ( 235, 230 ) ;
Text [ en-US ] = "Thesaurus" ;
@@ -50,6 +50,7 @@ ModalDialog RID_SVXDLG_THESAURUS
ImageButton BTN_LEFT
{
+ HelpID = "cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT";
Pos = MAP_APPFONT ( 5 , 15 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
TABSTOP = TRUE ;
@@ -64,12 +65,14 @@ ModalDialog RID_SVXDLG_THESAURUS
};
ComboBox CB_WORD
{
+ HelpID = "cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD";
DropDown = TRUE ;
Pos = MAP_APPFONT ( 24 , 16 ) ;
Size = MAP_APPFONT ( 141 , 60 ) ; // have drop down space for several lines
};
MenuButton MB_LANGUAGE
{
+ HelpID = "cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE";
Pos = MAP_APPFONT ( 170 , 16 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Language" ;
@@ -100,6 +103,7 @@ ModalDialog RID_SVXDLG_THESAURUS
};
Edit ED_REPL
{
+ HelpID = "cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL";
BORDER = TRUE ;
Pos = MAP_APPFONT ( 5 , 184 ) ;
Size = MAP_APPFONT ( 225 , 12 ) ;
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 55886b6b8032..e838e94c0db6 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -181,7 +181,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
{
#if ENABLE_LAYOUT
- SetHelpId (SID_ATTR_ZOOM);
+ SetHelpId (".uno:Zoom");
#endif /* ENABLE_LAYOUT */
Link aLink = LINK( this, SvxZoomDialog, UserHdl );
a100Btn.SetClickHdl( aLink );
diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src
index 8137b1c7bb89..56b274ef75ff 100644
--- a/cui/source/dialogs/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -28,11 +28,12 @@
#include <cuires.hrc>
#include "zoom.hrc"
#include <svx/dialogs.hrc> // for RID_SVXDLG_ZOOM
+#include "helpid.hrc"
// RID_SVXDLG_ZOOM -------------------------------------------------------
ModalDialog RID_SVXDLG_ZOOM
{
- HelpId = SID_ATTR_ZOOM ;
+ HelpId = CMD_SID_ATTR_ZOOM;
OutputSize = TRUE ;
SvLook = TRUE ;
Size = MAP_APPFONT ( 242 , 112 ) ;
@@ -46,36 +47,42 @@ ModalDialog RID_SVXDLG_ZOOM
};
RadioButton BTN_OPTIMAL
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 105 , 10 ) ;
Text [ en-US ] = "~Optimal" ;
};
RadioButton BTN_WHOLE_PAGE
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE";
Pos = MAP_APPFONT ( 12 , 27 ) ;
Size = MAP_APPFONT ( 105 , 10 ) ;
Text [ en-US ] = "~Fit width and height" ;
};
RadioButton BTN_PAGE_WIDTH
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH";
Pos = MAP_APPFONT ( 12 , 40 ) ;
Size = MAP_APPFONT ( 105, 10 ) ;
Text [ en-US ] = "Fit ~width" ;
};
RadioButton BTN_100
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100";
Pos = MAP_APPFONT ( 12 , 53 ) ;
Size = MAP_APPFONT ( 105, 10 ) ;
Text = "~100 %" ;
};
RadioButton BTN_USER
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER";
Pos = MAP_APPFONT ( 12 , 67 ) ;
Size = MAP_APPFONT ( 72 , 10 ) ;
Text [ en-US ] = "~Variable" ;
};
MetricField ED_USER
{
+ HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_USER";
Pos = MAP_APPFONT ( 86 , 66 ) ;
Size = MAP_APPFONT ( 32 , 12 ) ;
Border = TRUE ;
@@ -95,24 +102,28 @@ ModalDialog RID_SVXDLG_ZOOM
};
RadioButton BTN_AUTOMATIC
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC";
Pos = MAP_APPFONT ( 130 , 14 ) ;
Size = MAP_APPFONT ( 106 , 10 ) ;
Text [ en-US ] = "~Automatic" ;
};
RadioButton BTN_SINGLE
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE";
Pos = MAP_APPFONT ( 130, 27 ) ;
Size = MAP_APPFONT ( 106, 10 ) ;
Text [ en-US ] = "~Single page" ;
};
RadioButton BTN_COLUMNS
{
+ HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS";
Pos = MAP_APPFONT ( 130, 41 ) ;
Size = MAP_APPFONT ( 75 , 10 ) ;
Text [ en-US ] = "~Columns" ;
};
MetricField ED_COLUMNS
{
+ HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS";
Pos = MAP_APPFONT ( 209 , 40 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Border = TRUE ;
@@ -126,6 +137,7 @@ ModalDialog RID_SVXDLG_ZOOM
};
CheckBox CHK_BOOK
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK";
Pos = MAP_APPFONT ( 136 , 55 ) ;
Size = MAP_APPFONT ( 85 , 10 ) ;
Text [ en-US ] = "~Book mode" ;
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index bb3983e02d56..1f441d728d63 100755..100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -725,13 +725,13 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheck
else
pDlg->SetCheckNameHdl( Link(), bCheckImmediately );
}
-void AbstractSvxNameDialog_Impl::SetEditHelpId(ULONG nHelpId)
+void AbstractSvxNameDialog_Impl::SetEditHelpId(const rtl::OString& aHelpId)
{
- pDlg->SetEditHelpId( nHelpId );
+ pDlg->SetEditHelpId( aHelpId );
}
-void AbstractSvxNameDialog_Impl::SetHelpId( ULONG nHelpId )
+void AbstractSvxNameDialog_Impl::SetHelpId( const rtl::OString& aHelpId )
{
- pDlg->SetHelpId( nHelpId );
+ pDlg->SetHelpId( aHelpId );
}
void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr )
{
@@ -843,9 +843,9 @@ void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle )
pDlg->SetText( rNewTitle );
}
-void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId )
+void AbstractSvxMultiFileDialog_Impl::SetHelpId( const rtl::OString& aHelpId )
{
- pDlg->SetHelpId( nHelpId );
+ pDlg->SetHelpId( aHelpId );
}
Window * AbstractSvxHpLinkDlg_Impl::GetWindow()
@@ -1888,47 +1888,41 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( USHORT nId )
return 0;
}
-SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, USHORT nSlotId,
+SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand,
const Reference < com::sun::star::embed::XStorage >& xStor,
const SvObjectServerList* pList )
{
InsertObjectDialog_Impl* pDlg=0;
- switch ( nSlotId )
- {
- case SID_INSERT_OBJECT : pDlg = new SvInsertOleDlg( pParent, xStor, pList ); break;
- case SID_INSERT_PLUGIN : pDlg = new SvInsertPlugInDialog( pParent, xStor ); break;
- case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xStor ); break;
- case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor ); break;
- default: break;
- }
+ if ( rCommand.equalsAscii(".uno:InsertObject" ) )
+ pDlg = new SvInsertOleDlg( pParent, xStor, pList );
+ else if ( rCommand.equalsAscii(".uno:InsertPlugin" ) )
+ pDlg = new SvInsertPlugInDialog( pParent, xStor );
+ else if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) )
+ pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor );
if ( pDlg )
{
- pDlg->SetHelpId( nSlotId );
+ pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) );
return new AbstractInsertObjectDialog_Impl( pDlg );
}
return 0;
}
-VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, USHORT nSlotId,
+VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand,
const Reference < com::sun::star::embed::XEmbeddedObject >& xObj )
{
InsertObjectDialog_Impl* pDlg=0;
- switch ( nSlotId )
- {
- case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xObj ); break;
- case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); break;
- default: break;
- }
-
- if ( pDlg )
+ if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) )
{
- pDlg->SetHelpId( nSlotId );
+ pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj );
+ pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) );
return new VclAbstractDialog_Impl( pDlg );
}
return 0;
}
+
+
SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* pParent )
{
return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) );
@@ -1963,9 +1957,9 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog(
return new VclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) );
}
-SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId )
+SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId )
{
- return new SvxInsRowColDlg( pParent, bCol, nHelpId );
+ return new SvxInsRowColDlg( pParent, bCol, sHelpId );
}
AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog(
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index dd720bd0e4c5..b68e10c25cdd 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -396,9 +396,9 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog)
virtual void GetName( String& rName ) ;
virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) ;
- virtual void SetEditHelpId(ULONG nHelpId) ;
+ virtual void SetEditHelpId(const rtl::OString&) ;
//from class Window
- virtual void SetHelpId( ULONG nHelpId ) ;
+ virtual void SetHelpId( const rtl::OString& ) ;
virtual void SetText( const XubString& rStr ) ;
private:
Link aCheckNameHdl;
@@ -468,7 +468,7 @@ class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog
virtual void EnableRadioButtonMode();
virtual void SetTitle( const String& rNewTitle );
//From Class Window
- virtual void SetHelpId( ULONG nHelpId ) ;
+ virtual void SetHelpId( const rtl::OString& ) ;
};
//for SvxMultiFileDialog end
@@ -631,10 +631,10 @@ public:
const SfxItemSet& rAttr,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
SvxDistributeVertical eVer = SvxDistributeVerticalNone);
- virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId,
+ virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommmand,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor,
const SvObjectServerList* pList = 0 );
- virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, USHORT nSlotId,
+ virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommmand,
const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj );
virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent );
virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0 );
@@ -790,7 +790,7 @@ public:
virtual VclAbstractDialog* CreateOptionsDialog(
Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& rApplicationContext );
- virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId );
+ virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId );
virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify );
};
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 683bb6ff5010..8d63c5f8dd49 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -730,7 +730,7 @@ public:
aBtnOK.Enable( rLink.Call( this ) > 0 );
}
- void SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);}
+ void SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);}
};
class SvxIconSelectorDialog : public ModalDialog
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index ae7aa832d264..173ef8e45139 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -91,7 +91,7 @@ public:
aBtnOK.Enable( rLink.Call( this ) > 0 );
}
- void SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);}
+ void SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);}
};
///////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 6607c5aee4db..dff73253b086 100755..100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -28,373 +28,363 @@
#define _CUI_HELPID_HRC
// include ---------------------------------------------------------------
-#include <svl/solar.hrc>
+#include <svx/svxcommands.h>
+#include <sfx2/sfxcommands.h>
// Help-Ids --------------------------------------------------------------
-#define HID_OPTIONS_COLOR (HID_CUI_START + 1)
-#define HID_OPTIONS_SAVE (HID_CUI_START + 2)
-#define HID_OPTIONS_PATH (HID_CUI_START + 3)
-#define HID_OPTIONS_GENERAL (HID_CUI_START + 4)
-#define HID_OPTIONS_LINGU (HID_CUI_START + 5)
-#define HID_OPTIONS_SPELL (HID_CUI_START + 6)
-#define HID_OPTIONS_DICT_NEW (HID_CUI_START + 7)
-#define HID_OPTIONS_DICT_EDIT (HID_CUI_START + 8)
-#define HID_OPTIONS_INET (HID_CUI_START + 9)
-#define HID_OPTIONS_CHART_DEFCOLORS (HID_CUI_START + 10)
-#define HID_OPTIONS_CTL (HID_CUI_START + 11)
-#define HID_OPTIONS_PROXY (HID_CUI_START + 12)
-#define HID_OPTIONS_SEARCH (HID_CUI_START + 13)
-#define HID_OPTIONS_MAIL (HID_CUI_START + 14)
-#define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15)
-#define HID_CLB_EDIT_MODULES_DICS (HID_CUI_START + 16)
-#define HID_CLB_EDIT_MODULES_MODULES (HID_CUI_START + 17)
-#define HID_CLB_LINGU_MODULES (HID_CUI_START + 18)
-#define HID_CLB_LINGU_OPTIONS (HID_CUI_START + 19)
-#define HID_EDIT_MODULES (HID_CUI_START + 20)
-#define HID_LNGDLG_NUM_PREBREAK (HID_CUI_START + 21)
-#define HID_OPTIONS_COLORCONFIG (HID_CUI_START + 22)
-#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME (HID_CUI_START + 23)
-#define HID_OPTIONS_ACCESSIBILITYCONFIG (HID_CUI_START + 24)
-#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN (HID_CUI_START + 25)
-#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME (HID_CUI_START + 26)
-#define HID_OPTIONS_PATHS_SELECTFOLDER (HID_CUI_START + 27)
-#define HID_OPTIONS_JAVA (HID_CUI_START + 28)
-#define HID_OPTIONS_JAVA_LIST (HID_CUI_START + 29)
-#define HID_OPTIONS_JAVA_PARAMETER (HID_CUI_START + 30)
-#define HID_OPTIONS_JAVA_CLASSPATH (HID_CUI_START + 31)
-#define HID_SVXPAGE_JSEARCH_OPTIONS (HID_CUI_START + 32)
-#define HID_SVXDLG_FILTER_WARNING (HID_CUI_START + 33)
-#define HID_SVX_OPTIONS_ONLINEUPDATE (HID_CUI_START + 34)
-#define HID_DLG_SECURITY_OPTIONS (HID_CUI_START + 35)
-#define HID_OFADLG_OPTIONS_TREE (HID_CUI_START + 36)
-#define HID_OFA_CONNPOOL_DRIVERLIST (HID_CUI_START + 37)
-#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_CUI_START + 38)
-#define HID_OFA_FONT_SUBST_CLB (HID_CUI_START + 39)
-#define HID_OFA_TP_MISC (HID_CUI_START + 40)
-#define HID_OFA_TP_VIEW (HID_CUI_START + 41)
-#define HID_OFA_TP_LANGUAGES (HID_CUI_START + 42)
-#define HID_OFA_TP_MEMORY (HID_CUI_START + 43)
-#define HID_DBPATH_CTL_PATH (HID_CUI_START + 44)
-#define HID_DBPATH_HEADERBAR (HID_CUI_START + 45)
-#define HID_OFAPAGE_SMARTTAG_OPTIONS (HID_CUI_START + 46)
-#define HID_OFAPAGE_MSFLTR2_CLB (HID_CUI_START + 47)
-#define HID_OPTPATH_CTL_PATH (HID_CUI_START + 48)
-#define HID_OFADLG_TREELISTBOX (HID_CUI_START + 49)
-#define HID_DLG_WEBCONNECTION_INFO (HID_CUI_START + 50)
-#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST (HID_CUI_START + 51)
-#define HID_OPTPATH_HEADERBAR (HID_CUI_START + 52)
-#define HID_WARN_NAME_DUPLICATE (HID_CUI_START + 53)
-#define HID_COLORPAGE_LISTBOX_START (HID_CUI_START + 54)
-#define HID_COLORPAGE_DOCCOLOR_LB (HID_CUI_START + 54)
-#define HID_COLORPAGE_DOCBOUNDARIES_LB (HID_CUI_START + 55)
-#define HID_COLORPAGE_APPBACKGROUND_LB (HID_CUI_START + 56)
-#define HID_COLORPAGE_OBJECTBOUNDARIES_LB (HID_CUI_START + 57)
-#define HID_COLORPAGE_TABLEBOUNDARIES_LB (HID_CUI_START + 58)
-#define HID_COLORPAGE_FONTCOLOR_LB (HID_CUI_START + 59)
-#define HID_COLORPAGE_LINKS_LB (HID_CUI_START + 60)
-#define HID_COLORPAGE_LINKSVISITED_LB (HID_CUI_START + 61)
-#define HID_COLORPAGE_ANCHOR_LB (HID_CUI_START + 62)
-#define HID_COLORPAGE_SPELL_LB (HID_CUI_START + 63)
-#define HID_COLORPAGE_WRITERTEXTGRID_LB (HID_CUI_START + 64)
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB (HID_CUI_START + 65)
-#define HID_COLORPAGE_WRITERIDXSHADINGS_LB (HID_CUI_START + 66)
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB (HID_CUI_START + 67)
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB (HID_CUI_START + 68)
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB (HID_CUI_START + 69)
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB (HID_CUI_START + 70)
-#define HID_COLORPAGE_WRITERPAGEBREAKS_LB (HID_CUI_START + 71)
-#define HID_COLORPAGE_HTMLSGML_LB (HID_CUI_START + 72)
-#define HID_COLORPAGE_HTMLCOMMENT_LB (HID_CUI_START + 73)
-#define HID_COLORPAGE_HTMLKEYWORD_LB (HID_CUI_START + 74)
-#define HID_COLORPAGE_HTMLUNKNOWN_LB (HID_CUI_START + 75)
-#define HID_COLORPAGE_CALCGRID_LB (HID_CUI_START + 76)
-#define HID_COLORPAGE_CALCPAGEBREAK_LB (HID_CUI_START + 77)
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB (HID_CUI_START + 78)
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB (HID_CUI_START + 79)
-#define HID_COLORPAGE_CALCDETECTIVE_LB (HID_CUI_START + 80)
-#define HID_COLORPAGE_CALCDETECTIVEERROR_LB (HID_CUI_START + 81)
-#define HID_COLORPAGE_CALCREFERENCE_LB (HID_CUI_START + 82)
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB (HID_CUI_START + 83)
-#define HID_COLORPAGE_DRAWGRID_LB (HID_CUI_START + 84)
-#define HID_COLORPAGE_DRAWDRAWING_LB (HID_CUI_START + 85)
-#define HID_COLORPAGE_DRAWFILL_LB (HID_CUI_START + 86)
-#define HID_COLORPAGE_BASICIDENTIFIER_LB (HID_CUI_START + 87)
-#define HID_COLORPAGE_BASICCOMMENT_LB (HID_CUI_START + 88)
-#define HID_COLORPAGE_BASICNUMBER_LB (HID_CUI_START + 89)
-#define HID_COLORPAGE_BASICSTRING_LB (HID_CUI_START + 90)
-#define HID_COLORPAGE_BASICOPERATOR_LB (HID_CUI_START + 91)
-#define HID_COLORPAGE_BASICKEYWORD_LB (HID_CUI_START + 92)
-#define HID_COLORPAGE_BASICERROR_LB (HID_CUI_START + 93)
-#define HID_COLORPAGE_CHECKBOX_START (HID_CUI_START + 94)
-#define HID_COLORPAGE_DOCCOLOR_CB (HID_CUI_START + 94)
-#define HID_COLORPAGE_DOCBOUNDARIES_CB (HID_CUI_START + 95)
-#define HID_COLORPAGE_APPBACKGROUND_CB (HID_CUI_START + 96)
-#define HID_COLORPAGE_OBJECTBOUNDARIES_CB (HID_CUI_START + 97)
-#define HID_COLORPAGE_TABLEBOUNDARIES_CB (HID_CUI_START + 98)
-#define HID_COLORPAGE_FONTCOLOR_CB (HID_CUI_START + 99)
-#define HID_COLORPAGE_LINKS_CB (HID_CUI_START + 100)
-#define HID_COLORPAGE_LINKSVISITED_CB (HID_CUI_START + 101)
-#define HID_COLORPAGE_ANCHOR_CB (HID_CUI_START + 102)
-#define HID_COLORPAGE_SPELL_CB (HID_CUI_START + 103)
-#define HID_COLORPAGE_WRITERTEXTGRID_CB (HID_CUI_START + 104)
-#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB (HID_CUI_START + 105)
-#define HID_COLORPAGE_WRITERIDXSHADINGS_CB (HID_CUI_START + 106)
-#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB (HID_CUI_START + 107)
-#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB (HID_CUI_START + 108)
-#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB (HID_CUI_START + 109)
-#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB (HID_CUI_START + 110)
-#define HID_COLORPAGE_WRITERPAGEBREAKS_CB (HID_CUI_START + 111)
-#define HID_COLORPAGE_HTMLSGML_CB (HID_CUI_START + 112)
-#define HID_COLORPAGE_HTMLCOMMENT_CB (HID_CUI_START + 113)
-#define HID_COLORPAGE_HTMLKEYWORD_CB (HID_CUI_START + 114)
-#define HID_COLORPAGE_HTMLUNKNOWN_CB (HID_CUI_START + 115)
-#define HID_COLORPAGE_CALCGRID_CB (HID_CUI_START + 116)
-#define HID_COLORPAGE_CALCPAGEBREAK_CB (HID_CUI_START + 117)
-#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB (HID_CUI_START + 118)
-#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB (HID_CUI_START + 119)
-#define HID_COLORPAGE_CALCDETECTIVE_CB (HID_CUI_START + 120)
-#define HID_COLORPAGE_CALCDETECTIVEERROR_CB (HID_CUI_START + 121)
-#define HID_COLORPAGE_CALCREFERENCE_CB (HID_CUI_START + 122)
-#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB (HID_CUI_START + 123)
-#define HID_COLORPAGE_DRAWGRID_CB (HID_CUI_START + 124)
-#define HID_COLORPAGE_DRAWDRAWING_CB (HID_CUI_START + 125)
-#define HID_COLORPAGE_DRAWFILL_CB (HID_CUI_START + 126)
-#define HID_COLORPAGE_BASICIDENTIFIER_CB (HID_CUI_START + 127)
-#define HID_COLORPAGE_BASICCOMMENT_CB (HID_CUI_START + 128)
-#define HID_COLORPAGE_BASICNUMBER_CB (HID_CUI_START + 129)
-#define HID_COLORPAGE_BASICSTRING_CB (HID_CUI_START + 130)
-#define HID_COLORPAGE_BASICOPERATOR_CB (HID_CUI_START + 131)
-#define HID_COLORPAGE_BASICKEYWORD_CB (HID_CUI_START + 132)
-#define HID_COLORPAGE_BASICERROR_CB (HID_CUI_START + 133)
-#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE (HID_CUI_START + 134)
-#define HID_SVX_MACRO_LB_EVENT (HID_CUI_START + 135)
-#define HID_SVX_CONFIG_EVENT (HID_CUI_START + 136)
-#define HID_CONFIG_EVENT_OFFICE_BASED (HID_CUI_START + 137)
-#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_CUI_START + 138)
-#define HID_SELECTOR_DIALOG (HID_CUI_START + 139)
-#define HID_SELECTOR_CATEGORIES (HID_CUI_START + 140)
-#define HID_SVX_CONFIG_TOOLBAR (HID_CUI_START + 141)
-#define HID_SVX_CONFIG_TOOLBAR_CONTENTS (HID_CUI_START + 142)
-#define HID_SELECTOR_COMMANDS (HID_CUI_START + 143)
-#define HID_GALLERY_EDIT_MSNAME (HID_CUI_START + 144)
-#define HID_SVX_CONFIG_MENU (HID_CUI_START + 145)
-#define HID_SVX_CONFIG_MENU_CONTENTS (HID_CUI_START + 146)
-#define HID_GALLERY_NEWTHEME_FINDFILES (HID_CUI_START + 147)
-#define HID_GALLERY_NEWTHEME_ADDFILES (HID_CUI_START + 148)
-#define HID_HANGULDLG_BUTTON_OPTIONS (HID_CUI_START + 149)
-#define HID_HANGULDLG_BUTTON_CLOSE (HID_CUI_START + 150)
-#define HID_HANGULDLG_BUTTON_IGNORE (HID_CUI_START + 151)
-#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_CUI_START + 152)
-#define HID_HANGULDLG_BUTTON_CHANGE (HID_CUI_START + 153)
-#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_CUI_START + 154)
-#define HID_OFA_FONT_SUBSTITUTION (HID_CUI_START + 155)
-#define HID_HANGULDLG_EDIT_NEWWORD (HID_CUI_START + 156)
-#define HID_OFA_SUBST_APPLY (HID_CUI_START + 157)
-#define HID_OFA_SUBST_DELETE (HID_CUI_START + 158)
-#define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159)
-#define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160)
-#define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161)
-#define HID_SPLDLG_BUTTON_CHANGE (HID_CUI_START + 162)
-#define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163)
-#define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164)
-#define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165)
-#define HID_CHARMAP_CTL_SHOWTEXT (HID_CUI_START + 166)
-#define HID_CHARMAP_CTL_SHOWCHAR (HID_CUI_START + 167)
-#define HID_DLG_NAME (HID_CUI_START + 168)
-#define HID_DLG_MESSBOX (HID_CUI_START + 169)
-#define HID_HANGULDLG_SUGGESTIONS (HID_CUI_START + 170)
-#define HID_HANGULDLG_SUGGESTIONS_GRID (HID_CUI_START + 171)
-#define HID_HANGULDLG_SUGGESTIONS_LIST (HID_CUI_START + 172)
-#define HID_DLG_OBJECT_NAME (HID_CUI_START + 173)
-#define HID_DLG_OBJECT_TITLE_DESC (HID_CUI_START + 174)
-#define HID_SVX_CONFIG_MENU_ORGANIZER (HID_CUI_START + 175)
-#define HID_SVX_CONFIG_ICON_SELECTOR (HID_CUI_START + 176)
-#define HID_SVX_CONFIG_NAME_SUBMENU (HID_CUI_START + 177)
-#define HID_SVX_CONFIG_RENAME_MENU (HID_CUI_START + 178)
-#define HID_SVX_CONFIG_RENAME_MENU_ITEM (HID_CUI_START + 179)
-#define HID_SVX_CONFIG_RENAME_TOOLBAR (HID_CUI_START + 180)
-#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM (HID_CUI_START + 181)
-#define HID_SVX_NEW_TOOLBAR (HID_CUI_START + 182)
-#define HID_SVX_MODIFY_TOOLBAR (HID_CUI_START + 183)
-#define HID_SVX_NEW_TOOLBAR_ITEM (HID_CUI_START + 184)
-#define HID_SVX_CONFIG_MENU_LISTBOX (HID_CUI_START + 185)
-#define HID_SVX_MODIFY_TOOLBAR_ITEM (HID_CUI_START + 186)
-#define HID_SVX_SAVE_IN (HID_CUI_START + 187)
-#define HID_OPTIONS_MULTIPATH_LIST (HID_CUI_START + 188)
-#define HID_FM_DLG_SEARCH (HID_CUI_START + 189)
-#define HID_SEARCH_TEXT (HID_CUI_START + 190)
-#define HID_SEARCH_ALLFIELDS (HID_CUI_START + 191)
-#define HID_GALLERY_PROPERTIES_GENERAL (HID_CUI_START + 192)
-#define HID_SEARCH_FIELDSELECTION (HID_CUI_START + 193)
-#define HID_SEARCH_POSITION (HID_CUI_START + 194)
-#define HID_SEARCH_FORMATTER (HID_CUI_START + 195)
-#define HID_SEARCH_CASE (HID_CUI_START + 196)
-#define HID_SEARCH_BACKWARD (HID_CUI_START + 197)
-#define HID_SEARCH_STARTOVER (HID_CUI_START + 198)
-#define HID_SEARCH_WILDCARD (HID_CUI_START + 199)
-#define HID_SEARCH_REGULAR (HID_CUI_START + 200)
-#define HID_SEARCH_APPROX (HID_CUI_START + 201)
-#define HID_SEARCH_APPROXSETTINGS (HID_CUI_START + 202)
-#define HID_SEARCH_BTN_SEARCH (HID_CUI_START + 203)
-#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204)
-#define HID_GALLERY_BROWSER (HID_CUI_START + 205)
-#define HID_GALLERY_SEARCH (HID_CUI_START + 206)
-#define HID_GALLERY_APPLY (HID_CUI_START + 207)
-#define HID_SPLDLG_BUTTON_IGNORERULE (HID_CUI_START + 208)
-#define HID_CONFIG_ACCEL (HID_CUI_START + 209)
-#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210)
-#define HID_CONFIGGROUP_ACC_LISTBOX (HID_CUI_START + 211)
-#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_CUI_START + 212)
-#define HID_MACRO_LB_EVENT (HID_CUI_START + 213)
-#define HID_MACRO_GROUP (HID_CUI_START + 214)
-#define HID_MACRO_MACROS (HID_CUI_START + 215)
-#define HID_DIALOG_HANGULHANJA (HID_CUI_START + 216)
-#define HID_HANGULHANJA_OPT_DLG (HID_CUI_START + 217)
-#define HID_HANGULHANJA_NEWDICT_DLG (HID_CUI_START + 218)
-#define HID_HANGULHANJA_EDIT_DLG (HID_CUI_START + 219)
-#define HID_HANGULHANJA_OPT_DICTS_LB (HID_CUI_START + 220)
-#define HID_MULTIPATH (HID_CUI_START + 221)
-#define HID_SCRIPTORG_DIALOG (HID_CUI_START + 222)
-#define HID_SCRIPTSBOX (HID_CUI_START + 223)
-#define HID_SPELLCHECK (HID_CUI_START + 224)
-#define HID_TPSIZE_CTRL (HID_CUI_START + 225)
-#define HID_TPROTATION_CTRL1 (HID_CUI_START + 226)
-#define HID_TPROTATION_CTRL2 (HID_CUI_START + 227)
-#define HID_TRANS_ANGLE (HID_CUI_START + 228)
-#define HID_TPPOSITION_CTRL (HID_CUI_START + 229)
-#define HID_NUMBERFORMAT_LB_FORMAT (HID_CUI_START + 230)
-#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_CUI_START + 231)
-#define HID_TRANS_SLANT (HID_CUI_START + 232)
-#define HID_TPHATCH_CTRL (HID_CUI_START + 233)
-#define HID_SEARCHATTR_CTL_ATTR (HID_CUI_START + 234)
-#define HID_NUMBERFORMAT_TBI_INFO (HID_CUI_START + 235)
-#define HID_SEARCHATTR (HID_CUI_START + 236)
-#define HID_ALIGNMENT_CTR_DIAL (HID_CUI_START + 237)
-#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_CUI_START + 238)
-#define HID_SEARCHSIMILARITY (HID_CUI_START + 239)
-#define UID_SEARCH_RECORDSTATUS (HID_CUI_START + 240)
-#define HID_OFAPAGE_AUTOCORR_CLB (HID_CUI_START + 241)
-#define HID_AUTOCORR_LANGUAGE (HID_CUI_START + 242)
-#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_CUI_START + 243)
-#define HID_TPCOLOR_RGB_1 (HID_CUI_START + 244)
-#define HID_TPCOLOR_RGB_2 (HID_CUI_START + 245)
-#define HID_TPCOLOR_RGB_3 (HID_CUI_START + 246)
-#define HID_TPCOLOR_CMYK_1 (HID_CUI_START + 247)
-#define HID_TPCOLOR_CMYK_2 (HID_CUI_START + 248)
-#define HID_TPCOLOR_CMYK_3 (HID_CUI_START + 249)
-#define HID_ALIGNMENT (HID_CUI_START + 250)
-#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_CUI_START + 251)
-#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_CUI_START + 252)
-#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_CUI_START + 253)
-#define HID_OFACTL_AUTOCORR_REPLACE (HID_CUI_START + 254)
-#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_CUI_START + 255)
-#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_CUI_START + 256)
-#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_CUI_START + 257)
-#define HID_BACKGROUND (HID_CUI_START + 258)
-#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_CUI_START + 259)
-#define HID_BACKGROUND_CTL_POSITION (HID_CUI_START + 260)
-#define HID_BORDER (HID_CUI_START + 261)
-#define HID_BORDER_CTL_PRESETS (HID_CUI_START + 262)
-#define HID_BORDER_CTL_SHADOWS (HID_CUI_START + 263)
-#define HID_PAGE_CONNECTION (HID_CUI_START + 264)
-#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_CUI_START + 265)
-#define HID_PAGE_DISTRIBUTE (HID_CUI_START + 266)
-#define HID_SVXPAGE_GRFCROP (HID_CUI_START + 267)
-#define HID_CAPTION (HID_CUI_START + 268)
-#define HID_CAPTION_CTL_TYPE (HID_CUI_START + 269)
-#define HID_PAGE_MEASURE (HID_CUI_START + 270)
-#define HID_MEASURE_CTL_POSITION (HID_CUI_START + 271)
-#define HID_NUMBERFORMAT (HID_CUI_START + 272)
-#define HID_NUMBERFORMAT_TBI_ADD (HID_CUI_START + 273)
-#define HID_NUMBERFORMAT_TBI_REMOVE (HID_CUI_START + 274)
-#define HID_FORMAT_PAGE (HID_CUI_START + 275)
-#define HID_REDLINING_DLG (HID_CUI_START + 276)
-#define HID_REDLINING_EDIT (HID_CUI_START + 277)
-#define HID_REDLINING_PREV (HID_CUI_START + 278)
-#define HID_REDLINING_NEXT (HID_CUI_START + 279)
-#define HID_FORMAT_PARAGRAPH_STD (HID_CUI_START + 280)
-#define HID_VALUESET_SINGLENUM (HID_CUI_START + 281)
-#define HID_VALUESET_BULLET (HID_CUI_START + 282)
-#define HID_VALUESET_NUM (HID_CUI_START + 283)
-#define HID_VALUESET_NUMBMP (HID_CUI_START + 284)
-#define HID_SVXPAGE_PICK_NUM (HID_CUI_START + 285)
-#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_CUI_START + 286)
-#define HID_SVXPAGE_PICK_BMP (HID_CUI_START + 287)
-#define HID_SVXPAGE_PICK_BULLET (HID_CUI_START + 288)
-#define HID_SVXPAGE_NUM_OPTIONS (HID_CUI_START + 289)
-#define HID_SVXPAGE_NUM_POSITION (HID_CUI_START + 290)
-#define HID_MEASURE_CTL_PREVIEW (HID_CUI_START + 291)
-#define HID_FORMAT_PARAGRAPH_EXT (HID_CUI_START + 292)
-#define HID_FORMAT_PARAGRAPH_ALIGN (HID_CUI_START + 293)
-#define HID_SVXPAGE_PARA_ASIAN (HID_CUI_START + 294)
-#define HID_SVXPAGE_SWPOSSIZE (HID_CUI_START + 295)
-#define HID_AREA_TRANSPARENCE (HID_CUI_START + 296)
-#define HID_AREA_AREA (HID_CUI_START + 297)
-#define HID_AREA_SHADOW (HID_CUI_START + 298)
-#define HID_AREA_HATCH (HID_CUI_START + 299)
-#define HID_AREA_BITMAP (HID_CUI_START + 300)
-#define HID_TPSHADOW_CTRL (HID_CUI_START + 301)
-#define HID_AREA_GRADIENT (HID_CUI_START + 302)
-#define HID_LINE_ENDDEF (HID_CUI_START + 303)
-#define HID_LINE_LINE (HID_CUI_START + 304)
-#define HID_LINE_DEF (HID_CUI_START + 305)
-#define HID_SPELLDLG_SETWORD (HID_CUI_START + 306)
-#define HID_TABULATOR (HID_CUI_START + 307)
-#define HID_PAGE_TEXTATTR (HID_CUI_START + 308)
-#define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309)
-#define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310)
-#define HID_HYPHENATE (HID_CUI_START + 311)
-#define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312)
-#define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313)
-#define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314)
-#define HID_HYPERLINK_INTERNET (HID_CUI_START + 315)
-#define HID_HYPERLINK_MAIL (HID_CUI_START + 316)
-#define HID_HYPERLINK_DOCUMENT (HID_CUI_START + 317)
-#define HID_HYPERLINK_NEWDOCUMENT (HID_CUI_START + 318)
-#define HID_HYPERLINK_MARKWND (HID_CUI_START + 319)
-#define HID_ICCDIALOG_RESET_BTN (HID_CUI_START + 320)
-#define HID_ICCDIALOG_CHOICECTRL (HID_CUI_START + 321)
-#define HID_HYPERDLG_INET_PATH (HID_CUI_START + 322)
-#define HID_HYPERDLG_MAIL_PATH (HID_CUI_START + 323)
-#define HID_HYPERDLG_DOC_PATH (HID_CUI_START + 324)
-#define HID_ICCDIALOG_OK_BTN (HID_CUI_START + 325)
-#define HID_ICCDIALOG_CANCEL_BTN (HID_CUI_START + 326)
-#define HID_HYPERLINK_MARKWND_APPLY (HID_CUI_START + 327)
-#define HID_HYPERLINK_MARKWND_CLOSE (HID_CUI_START + 328)
-#define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329)
-#define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330)
-#define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331)
-#define HID_PASTE_DLG (HID_CUI_START + 333)
-#define HID_LINKDLG_TABLB (HID_CUI_START + 334)
-#define HID_MACRO_HEADERTABLISTBOX (HID_CUI_START + 335)
-#define HID_GALLERY_ENTER_TITLE (HID_CUI_START + 336)
-#define HID_GALLERY_TITLE_EDIT (HID_CUI_START + 337)
-#define HID_THES_LANGUAGE (HID_CUI_START + 338)
-#define HID_OFAPAGE_QUOTE_SW_CLB (HID_CUI_START + 339)
-#define HID_OFAPAGE_QUOTE_CLB (HID_CUI_START + 340)
-#define HID_CT_THES_ALTERNATIVES (HID_CUI_START + 341)
+#define HID_OPTIONS_COLOR "CUI_HID_OPTIONS_COLOR"
+#define HID_OPTIONS_SAVE "CUI_HID_OPTIONS_SAVE"
+#define HID_OPTIONS_PATH "CUI_HID_OPTIONS_PATH"
+#define HID_OPTIONS_GENERAL "CUI_HID_OPTIONS_GENERAL"
+#define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU"
+#define HID_OPTIONS_SPELL "CUI_HID_OPTIONS_SPELL"
+#define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW"
+#define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT"
+#define HID_OPTIONS_INET "CUI_HID_OPTIONS_INET"
+#define HID_OPTIONS_CHART_DEFCOLORS "CUI_HID_OPTIONS_CHART_DEFCOLORS"
+#define HID_OPTIONS_CTL "CUI_HID_OPTIONS_CTL"
+#define HID_OPTIONS_PROXY "CUI_HID_OPTIONS_PROXY"
+#define HID_OPTIONS_SEARCH "CUI_HID_OPTIONS_SEARCH"
+#define HID_OPTIONS_MAIL "CUI_HID_OPTIONS_MAIL"
+#define HID_OPTIONS_ASIAN_LAYOUT "CUI_HID_OPTIONS_ASIAN_LAYOUT"
+#define HID_CLB_EDIT_MODULES_DICS "CUI_HID_CLB_EDIT_MODULES_DICS"
+#define HID_CLB_EDIT_MODULES_MODULES "CUI_HID_CLB_EDIT_MODULES_MODULES"
+#define HID_CLB_LINGU_MODULES "CUI_HID_CLB_LINGU_MODULES"
+#define HID_CLB_LINGU_OPTIONS "CUI_HID_CLB_LINGU_OPTIONS"
+#define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES"
+#define HID_LNGDLG_NUM_PREBREAK "CUI_HID_LNGDLG_NUM_PREBREAK"
+#define HID_OPTIONS_COLORCONFIG "CUI_HID_OPTIONS_COLORCONFIG"
+#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
+#define HID_OPTIONS_ACCESSIBILITYCONFIG "CUI_HID_OPTIONS_ACCESSIBILITYCONFIG"
+#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN "CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN"
+#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME"
+#define HID_OPTIONS_PATHS_SELECTFOLDER "CUI_HID_OPTIONS_PATHS_SELECTFOLDER"
+#define HID_OPTIONS_JAVA "CUI_HID_OPTIONS_JAVA"
+#define HID_OPTIONS_JAVA_LIST "CUI_HID_OPTIONS_JAVA_LIST"
+#define HID_OPTIONS_JAVA_PARAMETER "CUI_HID_OPTIONS_JAVA_PARAMETER"
+#define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH"
+#define HID_SVXPAGE_JSEARCH_OPTIONS "CUI_HID_SVXPAGE_JSEARCH_OPTIONS"
+#define HID_SVXDLG_FILTER_WARNING "CUI_HID_SVXDLG_FILTER_WARNING"
+#define HID_SVX_OPTIONS_ONLINEUPDATE "CUI_HID_SVX_OPTIONS_ONLINEUPDATE"
+#define HID_DLG_SECURITY_OPTIONS "CUI_HID_DLG_SECURITY_OPTIONS"
+#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE"
+#define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST"
+#define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK"
+#define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB"
+#define HID_OFA_TP_MISC "CUI_HID_OFA_TP_MISC"
+#define HID_OFA_TP_VIEW "CUI_HID_OFA_TP_VIEW"
+#define HID_OFA_TP_LANGUAGES "CUI_HID_OFA_TP_LANGUAGES"
+#define HID_OFA_TP_MEMORY "CUI_HID_OFA_TP_MEMORY"
+#define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH"
+#define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR"
+#define HID_OFAPAGE_SMARTTAG_OPTIONS "CUI_HID_OFAPAGE_SMARTTAG_OPTIONS"
+#define HID_OFAPAGE_MSFLTR2_CLB "CUI_HID_OFAPAGE_MSFLTR2_CLB"
+#define HID_OPTPATH_CTL_PATH "CUI_HID_OPTPATH_CTL_PATH"
+#define HID_OFADLG_TREELISTBOX "CUI_HID_OFADLG_TREELISTBOX"
+#define HID_DLG_WEBCONNECTION_INFO "CUI_HID_DLG_WEBCONNECTION_INFO"
+#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST "CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST"
+#define HID_OPTPATH_HEADERBAR "CUI_HID_OPTPATH_HEADERBAR"
+#define HID_WARN_NAME_DUPLICATE "CUI_HID_WARN_NAME_DUPLICATE"
+#define HID_COLORPAGE_LISTBOX_START "CUI_HID_COLORPAGE_LISTBOX_START"
+#define HID_COLORPAGE_DOCCOLOR_LB "CUI_HID_COLORPAGE_DOCCOLOR_LB"
+#define HID_COLORPAGE_DOCBOUNDARIES_LB "CUI_HID_COLORPAGE_DOCBOUNDARIES_LB"
+#define HID_COLORPAGE_APPBACKGROUND_LB "CUI_HID_COLORPAGE_APPBACKGROUND_LB"
+#define HID_COLORPAGE_OBJECTBOUNDARIES_LB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_LB"
+#define HID_COLORPAGE_TABLEBOUNDARIES_LB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_LB"
+#define HID_COLORPAGE_FONTCOLOR_LB "CUI_HID_COLORPAGE_FONTCOLOR_LB"
+#define HID_COLORPAGE_LINKS_LB "CUI_HID_COLORPAGE_LINKS_LB"
+#define HID_COLORPAGE_LINKSVISITED_LB "CUI_HID_COLORPAGE_LINKSVISITED_LB"
+#define HID_COLORPAGE_ANCHOR_LB "CUI_HID_COLORPAGE_ANCHOR_LB"
+#define HID_COLORPAGE_SPELL_LB "CUI_HID_COLORPAGE_SPELL_LB"
+#define HID_COLORPAGE_WRITERTEXTGRID_LB "CUI_HID_COLORPAGE_WRITERTEXTGRID_LB"
+#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_LB"
+#define HID_COLORPAGE_WRITERIDXSHADINGS_LB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_LB"
+#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_LB"
+#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB"
+#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB"
+#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB"
+#define HID_COLORPAGE_WRITERPAGEBREAKS_LB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB"
+#define HID_COLORPAGE_HTMLSGML_LB "CUI_HID_COLORPAGE_HTMLSGML_LB"
+#define HID_COLORPAGE_HTMLCOMMENT_LB "CUI_HID_COLORPAGE_HTMLCOMMENT_LB"
+#define HID_COLORPAGE_HTMLKEYWORD_LB "CUI_HID_COLORPAGE_HTMLKEYWORD_LB"
+#define HID_COLORPAGE_HTMLUNKNOWN_LB "CUI_HID_COLORPAGE_HTMLUNKNOWN_LB"
+#define HID_COLORPAGE_CALCGRID_LB "CUI_HID_COLORPAGE_CALCGRID_LB"
+#define HID_COLORPAGE_CALCPAGEBREAK_LB "CUI_HID_COLORPAGE_CALCPAGEBREAK_LB"
+#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB"
+#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB"
+#define HID_COLORPAGE_CALCDETECTIVE_LB "CUI_HID_COLORPAGE_CALCDETECTIVE_LB"
+#define HID_COLORPAGE_CALCDETECTIVEERROR_LB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_LB"
+#define HID_COLORPAGE_CALCREFERENCE_LB "CUI_HID_COLORPAGE_CALCREFERENCE_LB"
+#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_LB"
+#define HID_COLORPAGE_DRAWGRID_LB "CUI_HID_COLORPAGE_DRAWGRID_LB"
+#define HID_COLORPAGE_DRAWDRAWING_LB "CUI_HID_COLORPAGE_DRAWDRAWING_LB"
+#define HID_COLORPAGE_DRAWFILL_LB "CUI_HID_COLORPAGE_DRAWFILL_LB"
+#define HID_COLORPAGE_BASICIDENTIFIER_LB "CUI_HID_COLORPAGE_BASICIDENTIFIER_LB"
+#define HID_COLORPAGE_BASICCOMMENT_LB "CUI_HID_COLORPAGE_BASICCOMMENT_LB"
+#define HID_COLORPAGE_BASICNUMBER_LB "CUI_HID_COLORPAGE_BASICNUMBER_LB"
+#define HID_COLORPAGE_BASICSTRING_LB "CUI_HID_COLORPAGE_BASICSTRING_LB"
+#define HID_COLORPAGE_BASICOPERATOR_LB "CUI_HID_COLORPAGE_BASICOPERATOR_LB"
+#define HID_COLORPAGE_BASICKEYWORD_LB "CUI_HID_COLORPAGE_BASICKEYWORD_LB"
+#define HID_COLORPAGE_BASICERROR_LB "CUI_HID_COLORPAGE_BASICERROR_LB"
+#define HID_COLORPAGE_CHECKBOX_START "CUI_HID_COLORPAGE_CHECKBOX_START"
+#define HID_COLORPAGE_DOCCOLOR_CB "CUI_HID_COLORPAGE_DOCCOLOR_CB"
+#define HID_COLORPAGE_DOCBOUNDARIES_CB "CUI_HID_COLORPAGE_DOCBOUNDARIES_CB"
+#define HID_COLORPAGE_APPBACKGROUND_CB "CUI_HID_COLORPAGE_APPBACKGROUND_CB"
+#define HID_COLORPAGE_OBJECTBOUNDARIES_CB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_CB"
+#define HID_COLORPAGE_TABLEBOUNDARIES_CB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_CB"
+#define HID_COLORPAGE_FONTCOLOR_CB "CUI_HID_COLORPAGE_FONTCOLOR_CB"
+#define HID_COLORPAGE_LINKS_CB "CUI_HID_COLORPAGE_LINKS_CB"
+#define HID_COLORPAGE_LINKSVISITED_CB "CUI_HID_COLORPAGE_LINKSVISITED_CB"
+#define HID_COLORPAGE_ANCHOR_CB "CUI_HID_COLORPAGE_ANCHOR_CB"
+#define HID_COLORPAGE_SPELL_CB "CUI_HID_COLORPAGE_SPELL_CB"
+#define HID_COLORPAGE_WRITERTEXTGRID_CB "CUI_HID_COLORPAGE_WRITERTEXTGRID_CB"
+#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_CB"
+#define HID_COLORPAGE_WRITERIDXSHADINGS_CB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_CB"
+#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_CB"
+#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_CB"
+#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB"
+#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB"
+#define HID_COLORPAGE_WRITERPAGEBREAKS_CB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_CB"
+#define HID_COLORPAGE_HTMLSGML_CB "CUI_HID_COLORPAGE_HTMLSGML_CB"
+#define HID_COLORPAGE_HTMLCOMMENT_CB "CUI_HID_COLORPAGE_HTMLCOMMENT_CB"
+#define HID_COLORPAGE_HTMLKEYWORD_CB "CUI_HID_COLORPAGE_HTMLKEYWORD_CB"
+#define HID_COLORPAGE_HTMLUNKNOWN_CB "CUI_HID_COLORPAGE_HTMLUNKNOWN_CB"
+#define HID_COLORPAGE_CALCGRID_CB "CUI_HID_COLORPAGE_CALCGRID_CB"
+#define HID_COLORPAGE_CALCPAGEBREAK_CB "CUI_HID_COLORPAGE_CALCPAGEBREAK_CB"
+#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB"
+#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB"
+#define HID_COLORPAGE_CALCDETECTIVE_CB "CUI_HID_COLORPAGE_CALCDETECTIVE_CB"
+#define HID_COLORPAGE_CALCDETECTIVEERROR_CB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_CB"
+#define HID_COLORPAGE_CALCREFERENCE_CB "CUI_HID_COLORPAGE_CALCREFERENCE_CB"
+#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_CB"
+#define HID_COLORPAGE_DRAWGRID_CB "CUI_HID_COLORPAGE_DRAWGRID_CB"
+#define HID_COLORPAGE_DRAWDRAWING_CB "CUI_HID_COLORPAGE_DRAWDRAWING_CB"
+#define HID_COLORPAGE_DRAWFILL_CB "CUI_HID_COLORPAGE_DRAWFILL_CB"
+#define HID_COLORPAGE_BASICIDENTIFIER_CB "CUI_HID_COLORPAGE_BASICIDENTIFIER_CB"
+#define HID_COLORPAGE_BASICCOMMENT_CB "CUI_HID_COLORPAGE_BASICCOMMENT_CB"
+#define HID_COLORPAGE_BASICNUMBER_CB "CUI_HID_COLORPAGE_BASICNUMBER_CB"
+#define HID_COLORPAGE_BASICSTRING_CB "CUI_HID_COLORPAGE_BASICSTRING_CB"
+#define HID_COLORPAGE_BASICOPERATOR_CB "CUI_HID_COLORPAGE_BASICOPERATOR_CB"
+#define HID_COLORPAGE_BASICKEYWORD_CB "CUI_HID_COLORPAGE_BASICKEYWORD_CB"
+#define HID_COLORPAGE_BASICERROR_CB "CUI_HID_COLORPAGE_BASICERROR_CB"
+#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE "CUI_HID_NUMBERINGOPT_SEL_GRF_FROM_FILE"
+#define HID_SVX_MACRO_LB_EVENT "CUI_HID_SVX_MACRO_LB_EVENT"
+#define HID_SVX_CONFIG_EVENT "CUI_HID_SVX_CONFIG_EVENT"
+#define HID_CONFIG_EVENT_OFFICE_BASED "CUI_HID_CONFIG_EVENT_OFFICE_BASED"
+#define HID_CONFIG_EVENT_DOCUMENT_BASED "CUI_HID_CONFIG_EVENT_DOCUMENT_BASED"
+#define HID_SELECTOR_DIALOG "CUI_HID_SELECTOR_DIALOG"
+#define HID_SELECTOR_CATEGORIES "CUI_HID_SELECTOR_CATEGORIES"
+#define HID_SVX_CONFIG_TOOLBAR "CUI_HID_SVX_CONFIG_TOOLBAR"
+#define HID_SVX_CONFIG_TOOLBAR_CONTENTS "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS"
+#define HID_SELECTOR_COMMANDS "CUI_HID_SELECTOR_COMMANDS"
+#define HID_GALLERY_EDIT_MSNAME "CUI_HID_GALLERY_EDIT_MSNAME"
+#define HID_SVX_CONFIG_MENU "CUI_HID_SVX_CONFIG_MENU"
+#define HID_SVX_CONFIG_MENU_CONTENTS "CUI_HID_SVX_CONFIG_MENU_CONTENTS"
+#define HID_GALLERY_NEWTHEME_FINDFILES "CUI_HID_GALLERY_NEWTHEME_FINDFILES"
+#define HID_GALLERY_NEWTHEME_ADDFILES "CUI_HID_GALLERY_NEWTHEME_ADDFILES"
+#define HID_HANGULDLG_BUTTON_OPTIONS "CUI_HID_HANGULDLG_BUTTON_OPTIONS"
+#define HID_HANGULDLG_BUTTON_CLOSE "CUI_HID_HANGULDLG_BUTTON_CLOSE"
+#define HID_HANGULDLG_BUTTON_IGNORE "CUI_HID_HANGULDLG_BUTTON_IGNORE"
+#define HID_HANGULDLG_BUTTON_IGNOREALL "CUI_HID_HANGULDLG_BUTTON_IGNOREALL"
+#define HID_HANGULDLG_BUTTON_CHANGE "CUI_HID_HANGULDLG_BUTTON_CHANGE"
+#define HID_HANGULDLG_BUTTON_CHANGEALL "CUI_HID_HANGULDLG_BUTTON_CHANGEALL"
+#define HID_OFA_FONT_SUBSTITUTION "CUI_HID_OFA_FONT_SUBSTITUTION"
+#define HID_HANGULDLG_EDIT_NEWWORD "CUI_HID_HANGULDLG_EDIT_NEWWORD"
+#define HID_OFA_SUBST_APPLY "CUI_HID_OFA_SUBST_APPLY"
+#define HID_OFA_SUBST_DELETE "CUI_HID_OFA_SUBST_DELETE"
+#define HID_SPLDLG_BUTTON_CLOSE "CUI_HID_SPLDLG_BUTTON_CLOSE"
+#define HID_SPLDLG_BUTTON_IGNORE "CUI_HID_SPLDLG_BUTTON_IGNORE"
+#define HID_SPLDLG_BUTTON_IGNOREALL "CUI_HID_SPLDLG_BUTTON_IGNOREALL"
+#define HID_SPLDLG_BUTTON_CHANGE "CUI_HID_SPLDLG_BUTTON_CHANGE"
+#define HID_SPLDLG_BUTTON_CHANGEALL "CUI_HID_SPLDLG_BUTTON_CHANGEALL"
+#define HID_SPLDLG_BUTTON_EXPLAIN "CUI_HID_SPLDLG_BUTTON_EXPLAIN"
+#define HID_CHARMAP_CTL_SHOWSET "CUI_HID_CHARMAP_CTL_SHOWSET"
+#define HID_CHARMAP_CTL_SHOWTEXT "CUI_HID_CHARMAP_CTL_SHOWTEXT"
+#define HID_CHARMAP_CTL_SHOWCHAR "CUI_HID_CHARMAP_CTL_SHOWCHAR"
+#define HID_DLG_NAME "CUI_HID_DLG_NAME"
+#define HID_DLG_MESSBOX "CUI_HID_DLG_MESSBOX"
+#define HID_HANGULDLG_SUGGESTIONS "CUI_HID_HANGULDLG_SUGGESTIONS"
+#define HID_HANGULDLG_SUGGESTIONS_GRID "CUI_HID_HANGULDLG_SUGGESTIONS_GRID"
+#define HID_HANGULDLG_SUGGESTIONS_LIST "CUI_HID_HANGULDLG_SUGGESTIONS_LIST"
+#define HID_DLG_OBJECT_NAME "CUI_HID_DLG_OBJECT_NAME"
+#define HID_DLG_OBJECT_TITLE_DESC "CUI_HID_DLG_OBJECT_TITLE_DESC"
+#define HID_SVX_CONFIG_MENU_ORGANIZER "CUI_HID_SVX_CONFIG_MENU_ORGANIZER"
+#define HID_SVX_CONFIG_ICON_SELECTOR "CUI_HID_SVX_CONFIG_ICON_SELECTOR"
+#define HID_SVX_CONFIG_NAME_SUBMENU "CUI_HID_SVX_CONFIG_NAME_SUBMENU"
+#define HID_SVX_CONFIG_RENAME_MENU "CUI_HID_SVX_CONFIG_RENAME_MENU"
+#define HID_SVX_CONFIG_RENAME_MENU_ITEM "CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM"
+#define HID_SVX_CONFIG_RENAME_TOOLBAR "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR"
+#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM"
+#define HID_SVX_NEW_TOOLBAR "CUI_HID_SVX_NEW_TOOLBAR"
+#define HID_SVX_MODIFY_TOOLBAR "CUI_HID_SVX_MODIFY_TOOLBAR"
+#define HID_SVX_NEW_TOOLBAR_ITEM "CUI_HID_SVX_NEW_TOOLBAR_ITEM"
+#define HID_SVX_CONFIG_MENU_LISTBOX "CUI_HID_SVX_CONFIG_MENU_LISTBOX"
+#define HID_SVX_MODIFY_TOOLBAR_ITEM "CUI_HID_SVX_MODIFY_TOOLBAR_ITEM"
+#define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN"
+#define HID_OPTIONS_MULTIPATH_LIST "CUI_HID_OPTIONS_MULTIPATH_LIST"
+#define HID_FM_DLG_SEARCH "CUI_HID_FM_DLG_SEARCH"
+#define HID_SEARCH_TEXT "CUI_HID_SEARCH_TEXT"
+#define HID_SEARCH_ALLFIELDS "CUI_HID_SEARCH_ALLFIELDS"
+#define HID_GALLERY_PROPERTIES_GENERAL "CUI_HID_GALLERY_PROPERTIES_GENERAL"
+#define HID_SEARCH_FIELDSELECTION "CUI_HID_SEARCH_FIELDSELECTION"
+#define HID_SEARCH_POSITION "CUI_HID_SEARCH_POSITION"
+#define HID_SEARCH_FORMATTER "CUI_HID_SEARCH_FORMATTER"
+#define HID_SEARCH_CASE "CUI_HID_SEARCH_CASE"
+#define HID_SEARCH_BACKWARD "CUI_HID_SEARCH_BACKWARD"
+#define HID_SEARCH_STARTOVER "CUI_HID_SEARCH_STARTOVER"
+#define HID_SEARCH_WILDCARD "CUI_HID_SEARCH_WILDCARD"
+#define HID_SEARCH_REGULAR "CUI_HID_SEARCH_REGULAR"
+#define HID_SEARCH_APPROX "CUI_HID_SEARCH_APPROX"
+#define HID_SEARCH_APPROXSETTINGS "CUI_HID_SEARCH_APPROXSETTINGS"
+#define HID_SEARCH_BTN_SEARCH "CUI_HID_SEARCH_BTN_SEARCH"
+#define HID_SEARCH_BTN_CLOSE "CUI_HID_SEARCH_BTN_CLOSE"
+#define HID_GALLERY_BROWSER "CUI_HID_GALLERY_BROWSER"
+#define HID_GALLERY_SEARCH "CUI_HID_GALLERY_SEARCH"
+#define HID_GALLERY_APPLY "CUI_HID_GALLERY_APPLY"
+#define HID_SPLDLG_BUTTON_IGNORERULE "CUI_HID_SPLDLG_BUTTON_IGNORERULE"
+#define HID_CONFIG_ACCEL "CUI_HID_CONFIG_ACCEL"
+#define HID_ACCELCONFIG_LISTBOX "CUI_HID_ACCELCONFIG_LISTBOX"
+#define HID_CONFIGGROUP_ACC_LISTBOX "CUI_HID_CONFIGGROUP_ACC_LISTBOX"
+#define HID_CONFIGFUNCTION_ACC_LISTBOX "CUI_HID_CONFIGFUNCTION_ACC_LISTBOX"
+#define HID_MACRO_LB_EVENT "CUI_HID_MACRO_LB_EVENT"
+#define HID_MACRO_GROUP "CUI_HID_MACRO_GROUP"
+#define HID_MACRO_MACROS "CUI_HID_MACRO_MACROS"
+#define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA"
+#define HID_HANGULHANJA_OPT_DLG "CUI_HID_HANGULHANJA_OPT_DLG"
+#define HID_HANGULHANJA_NEWDICT_DLG "CUI_HID_HANGULHANJA_NEWDICT_DLG"
+#define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG"
+#define HID_HANGULHANJA_OPT_DICTS_LB "CUI_HID_HANGULHANJA_OPT_DICTS_LB"
+#define HID_MULTIPATH "CUI_HID_MULTIPATH"
+#define HID_SCRIPTORG_DIALOG "CUI_HID_SCRIPTORG_DIALOG"
+#define HID_SCRIPTSBOX "CUI_HID_SCRIPTSBOX"
+#define HID_SPELLCHECK "CUI_HID_SPELLCHECK"
+#define HID_TPSIZE_CTRL "CUI_HID_TPSIZE_CTRL"
+#define HID_TPROTATION_CTRL1 "CUI_HID_TPROTATION_CTRL1"
+#define HID_TPROTATION_CTRL2 "CUI_HID_TPROTATION_CTRL2"
+#define HID_TRANS_ANGLE "CUI_HID_TRANS_ANGLE"
+#define HID_TPPOSITION_CTRL "CUI_HID_TPPOSITION_CTRL"
+#define HID_NUMBERFORMAT_LB_FORMAT "CUI_HID_NUMBERFORMAT_LB_FORMAT"
+#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW "CUI_HID_NUMBERFORMAT_WND_NUMBER_PREVIEW"
+#define HID_TRANS_SLANT "CUI_HID_TRANS_SLANT"
+#define HID_TPHATCH_CTRL "CUI_HID_TPHATCH_CTRL"
+#define HID_SEARCHATTR_CTL_ATTR "CUI_HID_SEARCHATTR_CTL_ATTR"
+#define HID_NUMBERFORMAT_TBI_INFO "CUI_HID_NUMBERFORMAT_TBI_INFO"
+#define HID_SEARCHATTR "CUI_HID_SEARCHATTR"
+#define HID_ALIGNMENT_CTR_DIAL "CUI_HID_ALIGNMENT_CTR_DIAL"
+#define HID_ALIGNMENT_CTR_BORDER_LOCK "CUI_HID_ALIGNMENT_CTR_BORDER_LOCK"
+#define HID_SEARCHSIMILARITY "CUI_HID_SEARCHSIMILARITY"
+#define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS"
+#define HID_OFAPAGE_AUTOCORR_CLB "CUI_HID_OFAPAGE_AUTOCORR_CLB"
+#define HID_AUTOCORR_LANGUAGE "CUI_HID_AUTOCORR_LANGUAGE"
+#define HID_OFAPAGE_AUTOFORMAT_CLB "CUI_HID_OFAPAGE_AUTOFORMAT_CLB"
+#define HID_TPCOLOR_RGB_1 "CUI_HID_TPCOLOR_RGB_1"
+#define HID_TPCOLOR_RGB_2 "CUI_HID_TPCOLOR_RGB_2"
+#define HID_TPCOLOR_RGB_3 "CUI_HID_TPCOLOR_RGB_3"
+#define HID_TPCOLOR_CMYK_1 "CUI_HID_TPCOLOR_CMYK_1"
+#define HID_TPCOLOR_CMYK_2 "CUI_HID_TPCOLOR_CMYK_2"
+#define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3"
+#define HID_ALIGNMENT "CUI_HID_ALIGNMENT"
+#define HID_OFAPAGE_AUTOCORR_OPTIONS "CUI_HID_OFAPAGE_AUTOCORR_OPTIONS"
+#define HID_OFAPAGE_AUTOFMT_OPTIONS "CUI_HID_OFAPAGE_AUTOFMT_OPTIONS"
+#define HID_OFAPAGE_AUTOCORR_REPLACE "CUI_HID_OFAPAGE_AUTOCORR_REPLACE"
+#define HID_OFACTL_AUTOCORR_REPLACE "CUI_HID_OFACTL_AUTOCORR_REPLACE"
+#define HID_OFAPAGE_AUTOCORR_EXCEPT "CUI_HID_OFAPAGE_AUTOCORR_EXCEPT"
+#define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE"
+#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS"
+#define HID_BACKGROUND "CUI_HID_BACKGROUND"
+#define HID_BACKGROUND_CTL_BGDCOLORSET "CUI_HID_BACKGROUND_CTL_BGDCOLORSET"
+#define HID_BACKGROUND_CTL_POSITION "CUI_HID_BACKGROUND_CTL_POSITION"
+#define HID_BORDER "CUI_HID_BORDER"
+#define HID_BORDER_CTL_PRESETS "CUI_HID_BORDER_CTL_PRESETS"
+#define HID_BORDER_CTL_SHADOWS "CUI_HID_BORDER_CTL_SHADOWS"
+#define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION"
+#define HID_PAGE_CONNECTION_CTL_PREVIEW "CUI_HID_PAGE_CONNECTION_CTL_PREVIEW"
+#define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE"
+#define HID_SVXPAGE_GRFCROP "CUI_HID_SVXPAGE_GRFCROP"
+#define HID_CAPTION "CUI_HID_CAPTION"
+#define HID_CAPTION_CTL_TYPE "CUI_HID_CAPTION_CTL_TYPE"
+#define HID_PAGE_MEASURE "CUI_HID_PAGE_MEASURE"
+#define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION"
+#define HID_NUMBERFORMAT "CUI_HID_NUMBERFORMAT"
+#define HID_NUMBERFORMAT_TBI_ADD "CUI_HID_NUMBERFORMAT_TBI_ADD"
+#define HID_NUMBERFORMAT_TBI_REMOVE "CUI_HID_NUMBERFORMAT_TBI_REMOVE"
+#define HID_FORMAT_PAGE "CUI_HID_FORMAT_PAGE"
+#define HID_REDLINING_DLG "CUI_HID_REDLINING_DLG"
+#define HID_REDLINING_EDIT "CUI_HID_REDLINING_EDIT"
+#define HID_REDLINING_PREV "CUI_HID_REDLINING_PREV"
+#define HID_REDLINING_NEXT "CUI_HID_REDLINING_NEXT"
+#define HID_FORMAT_PARAGRAPH_STD "CUI_HID_FORMAT_PARAGRAPH_STD"
+#define HID_VALUESET_SINGLENUM "CUI_HID_VALUESET_SINGLENUM"
+#define HID_VALUESET_BULLET "CUI_HID_VALUESET_BULLET"
+#define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM"
+#define HID_VALUESET_NUMBMP "CUI_HID_VALUESET_NUMBMP"
+#define HID_SVXPAGE_PICK_NUM "CUI_HID_SVXPAGE_PICK_NUM"
+#define HID_SVXPAGE_PICK_SINGLE_NUM "CUI_HID_SVXPAGE_PICK_SINGLE_NUM"
+#define HID_SVXPAGE_PICK_BMP "CUI_HID_SVXPAGE_PICK_BMP"
+#define HID_SVXPAGE_PICK_BULLET "CUI_HID_SVXPAGE_PICK_BULLET"
+#define HID_SVXPAGE_NUM_OPTIONS "CUI_HID_SVXPAGE_NUM_OPTIONS"
+#define HID_SVXPAGE_NUM_POSITION "CUI_HID_SVXPAGE_NUM_POSITION"
+#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
+#define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT"
+#define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN"
+#define HID_SVXPAGE_PARA_ASIAN "CUI_HID_SVXPAGE_PARA_ASIAN"
+#define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE"
+#define HID_AREA_TRANSPARENCE "CUI_HID_AREA_TRANSPARENCE"
+#define HID_AREA_AREA "CUI_HID_AREA_AREA"
+#define HID_AREA_SHADOW "CUI_HID_AREA_SHADOW"
+#define HID_AREA_HATCH "CUI_HID_AREA_HATCH"
+#define HID_AREA_BITMAP "CUI_HID_AREA_BITMAP"
+#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
+#define HID_AREA_GRADIENT "CUI_HID_AREA_GRADIENT"
+#define HID_LINE_ENDDEF "CUI_HID_LINE_ENDDEF"
+#define HID_LINE_LINE "CUI_HID_LINE_LINE"
+#define HID_LINE_DEF "CUI_HID_LINE_DEF"
+#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
+#define HID_TABULATOR "CUI_HID_TABULATOR"
+#define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR"
+#define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION"
+#define HID_TRANS_POSITION_SIZE "CUI_HID_TRANS_POSITION_SIZE"
+#define HID_HYPHENATE "CUI_HID_HYPHENATE"
+#define HID_SVXPAGE_CHAR_NAME "CUI_HID_SVXPAGE_CHAR_NAME"
+#define HID_SVXPAGE_CHAR_EFFECTS "CUI_HID_SVXPAGE_CHAR_EFFECTS"
+#define HID_SVXPAGE_CHAR_POSITION "CUI_HID_SVXPAGE_CHAR_POSITION"
+#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET"
+#define HID_HYPERLINK_MAIL "CUI_HID_HYPERLINK_MAIL"
+#define HID_HYPERLINK_DOCUMENT "CUI_HID_HYPERLINK_DOCUMENT"
+#define HID_HYPERLINK_NEWDOCUMENT "CUI_HID_HYPERLINK_NEWDOCUMENT"
+#define HID_HYPERLINK_MARKWND "CUI_HID_HYPERLINK_MARKWND"
+#define HID_ICCDIALOG_RESET_BTN "CUI_HID_ICCDIALOG_RESET_BTN"
+#define HID_ICCDIALOG_CHOICECTRL "CUI_HID_ICCDIALOG_CHOICECTRL"
+#define HID_HYPERDLG_INET_PATH "CUI_HID_HYPERDLG_INET_PATH"
+#define HID_HYPERDLG_MAIL_PATH "CUI_HID_HYPERDLG_MAIL_PATH"
+#define HID_HYPERDLG_DOC_PATH "CUI_HID_HYPERDLG_DOC_PATH"
+#define HID_ICCDIALOG_OK_BTN "CUI_HID_ICCDIALOG_OK_BTN"
+#define HID_ICCDIALOG_CANCEL_BTN "CUI_HID_ICCDIALOG_CANCEL_BTN"
+#define HID_HYPERLINK_MARKWND_APPLY "CUI_HID_HYPERLINK_MARKWND_APPLY"
+#define HID_HYPERLINK_MARKWND_CLOSE "CUI_HID_HYPERLINK_MARKWND_CLOSE"
+#define HID_HYPERLINK_MARKWND_TREE "CUI_HID_HYPERLINK_MARKWND_TREE"
+#define HID_SVXPAGE_CHAR_TWOLINES "CUI_HID_SVXPAGE_CHAR_TWOLINES"
+#define HID_GRFFILTER_EMBOSS_LIGHT "CUI_HID_GRFFILTER_EMBOSS_LIGHT"
+#define HID_PASTE_DLG "CUI_HID_PASTE_DLG"
+#define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB"
+#define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX"
+#define HID_GALLERY_ENTER_TITLE "CUI_HID_GALLERY_ENTER_TITLE"
+#define HID_GALLERY_TITLE_EDIT "CUI_HID_GALLERY_TITLE_EDIT"
+#define HID_THES_LANGUAGE "CUI_HID_THES_LANGUAGE"
+#define HID_OFAPAGE_QUOTE_SW_CLB "CUI_HID_OFAPAGE_QUOTE_SW_CLB"
+#define HID_OFAPAGE_QUOTE_CLB "CUI_HID_OFAPAGE_QUOTE_CLB"
+#define HID_POSTIT_DIALOG "CUI_HID_POSTIT_DIALOG"
+#define HID_CT_THES_ALTERNATIVES "CUI_HID_CT_THES_ALTERNATIVES"
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY (HID_CUI_START + 342)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN (HID_CUI_START + 343)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN (HID_CUI_START + 344)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE (HID_CUI_START + 345)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY (HID_CUI_START + 346)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY (HID_CUI_START + 347)
-#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY (HID_CUI_START + 348)
-#define HID_HYPERLINK_DIALOG (HID_CUI_START + 349)
-
-// please adjust ACT_SVX_HID_END2 below if you add entries here!
-
-// -----------------------------------------------------------------------
-// Overrun check ---------------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_CUI_HID_END (HID_CUI_START + 349)
-
-#if ACT_CUI_HID_END > HID_CUI_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY"
+#define HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY "CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY"
+#define HID_HYPERLINK_DIALOG "CUI_HID_HYPERLINK_DIALOG"
#endif
diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx
index b0c678009093..f75ab2471923 100644
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@ -57,7 +57,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog
bool bColumn;
public:
- SvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId );
+ SvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId );
virtual short Execute(void);
diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src
index 08e4f2043a40..89b45595b37a 100644
--- a/cui/source/options/connpooloptions.src
+++ b/cui/source/options/connpooloptions.src
@@ -35,7 +35,7 @@
TabPage RID_OFAPAGE_CONNPOOLOPTIONS
{
- // HelpId = ;
+ HelpID = "cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS";
OutputSize = TRUE ;
Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ;
SVLook = TRUE ;
@@ -49,6 +49,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
};
CheckBox CB_POOL_CONNS
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS";
Pos = MAP_APPFONT( 7, 15 );
Size = MAP_APPFONT( PAGE_SIZE_X - 14, 10 );
Text [ en-US ] = "Connection pooling enabled";
@@ -80,6 +81,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
};
CheckBox CB_DRIVERPOOLING
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING";
Pos = MAP_APPFONT( 17, 39 + LIST_SIZE_Y + 4 + 8 + 3 );
Size = MAP_APPFONT( PAGE_SIZE_X - 23, 10 );
Text [ en-US ] = "Enable pooling for this driver";
@@ -92,6 +94,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
};
NumericField NF_TIMEOUT
{
+ HelpID = "cui:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT";
Pos = MAP_APPFONT( 27 + 100 + 3, 39 + LIST_SIZE_Y + 4 + 8 + 3 + 10 + 3 );
Size = MAP_APPFONT( 40, 12 );
SvLook = TRUE;
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 7bfc72d1181e..cc199054d131 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -159,7 +159,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx
Size aHeadSize = pHeaderBar->GetSizePixel();
aPathCtrl.SetFocusControl( pPathBox );
- pPathBox->SetWindowBits( nBits );
+ pPathBox->SetStyle( pPathBox->GetStyle()|nBits );
pPathBox->SetDoubleClickHdl( LINK( this, DbRegistrationOptionsPage, EditHdl ) );
pPathBox->SetSelectHdl( LINK( this, DbRegistrationOptionsPage, PathSelect_Impl ) );
pPathBox->SetSelectionMode( SINGLE_SELECTION );
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index 444d4faac22d..e2ad56ceedd0 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -34,7 +34,7 @@
#define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
TabPage RID_SFXPAGE_DBREGISTER
{
- // HelpId = HID_OPTIONS_DBREGISTER ;
+ HelpId = "cui:TabPage:RID_SFXPAGE_DBREGISTER" ;
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
@@ -64,18 +64,21 @@ TabPage RID_SFXPAGE_DBREGISTER
};
PushButton BTN_NEW
{
+ HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW";
Pos = MAP_APPFONT ( 47 , 165 ) ;
Size = MAP_APPFONT ( 65 , 14 ) ;
Text [ en-US ] = "~New..." ;
};
PushButton BTN_EDIT
{
+ HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT";
Pos = MAP_APPFONT ( 183 , 165 ) ;
Size = MAP_APPFONT ( 65 , 14 ) ;
Text [ en-US ] = "~Edit..." ;
};
PushButton BTN_DELETE
{
+ HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE";
Pos = MAP_APPFONT ( 115 , 165 ) ;
Size = MAP_APPFONT ( 65 , 14 ) ;
Text [ en-US ] = "~Delete" ;
diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src
index f61f23092f37..f421afc56fe0 100644
--- a/cui/source/options/doclinkdialog.src
+++ b/cui/source/options/doclinkdialog.src
@@ -46,6 +46,7 @@
ModalDialog DLG_DOCUMENTLINK
{
+ HelpID = "cui:ModalDialog:DLG_DOCUMENTLINK";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ;
@@ -64,6 +65,7 @@ ModalDialog DLG_DOCUMENTLINK
};
ComboBox CMB_URL
{
+ HelpID = "cui:ComboBox:DLG_DOCUMENTLINK:CMB_URL";
Pos = MAP_APPFONT ( 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 3) ;
Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ;
@@ -75,6 +77,7 @@ ModalDialog DLG_DOCUMENTLINK
};
PushButton PB_BROWSEFILE
{
+ HelpID = "cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE";
Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 4) ;
Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y );
Text [ en-US ] = "~Browse...";
@@ -90,6 +93,7 @@ ModalDialog DLG_DOCUMENTLINK
};
Edit ET_NAME
{
+ HelpID = "cui:Edit:DLG_DOCUMENTLINK:ET_NAME";
Pos = MAP_APPFONT ( 6, LINE_1_Y + 3*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y - 6) ;
Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ;
TabStop = TRUE ;
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 36e43a88ecce..749b92ed54cc 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -98,7 +98,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
aNewDelTBX.SetPosPixel( aNewPnt );
aCheckLB.SetHelpId(HID_OFA_FONT_SUBST_CLB);
- aCheckLB.SetWindowBits(aCheckLB.GetStyle()|WB_HSCROLL|WB_VSCROLL);
+ aCheckLB.SetStyle(aCheckLB.GetStyle()|WB_HSCROLL|WB_VSCROLL);
aCheckLB.SetSelectionMode(MULTIPLE_SELECTION);
aCheckLB.SortByCol(2);
diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index 1b5f3298913e..034874388369 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -49,6 +49,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
Size = MAP_APPFONT ( 260 , 185 ) ;
CheckBox CB_USETABLE
{
+ HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE";
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 248 , 10 ) ;
TabStop = TRUE ;
@@ -63,6 +64,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
};
ComboBox CB_FONT1
{
+ HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 33 ) ;
Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -82,6 +84,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
};
ComboBox CB_FONT2
{
+ HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2";
Border = TRUE ;
Pos = MAP_APPFONT ( 110 , 33 ) ;
Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -145,6 +148,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
};
ListBox LB_FONTNAME
{
+ HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME";
Pos = MAP_APPFONT ( 65 , 140 ) ;
Size = MAP_APPFONT ( 100 , 68 ) ;
Border = TRUE ;
@@ -153,6 +157,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
};
CheckBox CB_NONPROP
{
+ HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP";
Pos = MAP_APPFONT ( 65 , 155 ) ;
Size = MAP_APPFONT ( 180 , 10 ) ;
TabStop = TRUE ;
@@ -166,6 +171,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
};
ListBox LB_FONTHEIGHT
{
+ HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT";
Pos = MAP_APPFONT ( 65 , 169 ) ;
Size = MAP_APPFONT ( 30 , 68 ) ;
Border = TRUE ;
diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src
index 3acd1ac2766c..b4caafc0feea 100644
--- a/cui/source/options/internationaloptions.src
+++ b/cui/source/options/internationaloptions.src
@@ -32,6 +32,7 @@
TabPage RID_OFA_TP_INTERNATIONAL
{
+ HelpID = "cui:TabPage:RID_OFA_TP_INTERNATIONAL";
OutputSize = TRUE ;
Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ;
SVLook = TRUE ;
@@ -46,6 +47,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
RadioButton RB_TXTDIR_LEFT2RIGHT
{
+ HelpID = "cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_LEFT2RIGHT";
Pos = MAP_APPFONT( COL_1, ROW_1 );
Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB );
Group = TRUE;
@@ -54,6 +56,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
RadioButton RB_TXTDIR_RIGHT2LEFT
{
+ HelpID = "cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_RIGHT2LEFT";
Pos = MAP_APPFONT( COL_1, ROW_2 );
Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB );
Text [ en-US ] = "~Right-to-left";
@@ -68,6 +71,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
CheckBox CB_SHTVW_RIGHT2LEFT
{
+ HelpID = "cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_RIGHT2LEFT";
Pos = MAP_APPFONT( COL_1, ROW_4 );
Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_CB );
Text [ en-US ] = "Right-~to-left";
@@ -75,6 +79,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
CheckBox CB_SHTVW_CURRENTDOCONLY
{
+ HelpID = "cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_CURRENTDOCONLY";
Pos = MAP_APPFONT( COL_2, ROW_5 );
Size = MAP_APPFONT( WIDTH2END( COL_2 ), HEIGHT_CB );
Text [ en-US ] = "~Current document only";
diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src
index 4d7e1985d838..a9a5ad16869d 100644
--- a/cui/source/options/optaccessibility.src
+++ b/cui/source/options/optaccessibility.src
@@ -44,6 +44,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
};
CheckBox CB_ACCESSIBILITY_TOOL
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL";
TabStop = TRUE ;
Pos = MAP_APPFONT( COL1, ROWA_1 );
Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -52,6 +53,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
};
CheckBox CB_TEXTSELECTION
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION";
TabStop = TRUE ;
Pos = MAP_APPFONT( COL1, ROWA_2 );
Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -59,6 +61,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
};
CheckBox CB_ANIMATED_GRAPHICS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS";
TabStop = TRUE ;
Pos = MAP_APPFONT( COL1, ROWA_3 );
Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -66,6 +69,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
};
CheckBox CB_ANIMATED_TEXTS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS";
TabStop = TRUE ;
Pos = MAP_APPFONT( COL1, ROWA_4 );
Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -73,6 +77,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
};
CheckBox CB_TIPHELP
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP";
TabStop = TRUE ;
Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROWA_5 ) );
Size = MAP_APPFONT( DIFF(COL2,COL3), RSC_CD_CHECKBOX_HEIGHT );
@@ -80,6 +85,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
};
NumericField NF_TIPHELP
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP";
TabStop = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT( COL3, ROWA_5 );
@@ -105,6 +111,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
};
CheckBox CB_AUTO_DETECT_HC
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC";
TabStop = TRUE ;
Pos = MAP_APPFONT( COL1, ROWB_1 );
Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -112,6 +119,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
};
CheckBox CB_AUTOMATIC_FONT_COLOR
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR";
TabStop = TRUE ;
Pos = MAP_APPFONT( COL1, ROWB_2 );
Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -119,6 +127,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
};
CheckBox CB_PAGE_PREVIEWS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS";
TabStop = TRUE ;
Pos = MAP_APPFONT( COL1, ROWB_3 );
Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src
index c9a2c9606c98..d9c81f5b9a6a 100644
--- a/cui/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -45,12 +45,14 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
};
RadioButton RB_CHAR_KERNING
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING";
Pos = MAP_APPFONT ( 12, 14 ) ;
Size = MAP_APPFONT ( 200 , 10 ) ;
Text [ en-US ] = "~Western characters only";
};
RadioButton RB_CHAR_PUNCT
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT";
Pos = MAP_APPFONT ( 12, 27 ) ;
Size = MAP_APPFONT ( 200 , 10 ) ;
Text [ en-US ] = "Western ~text and Asian punctuation";
@@ -63,18 +65,21 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
};
RadioButton RB_NO_COMP
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP";
Pos = MAP_APPFONT ( 12, 54 ) ;
Size = MAP_APPFONT ( 200 , 10 ) ;
Text [ en-US ] = "~No compression";
};
RadioButton RB_PUNCT_COMP
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP";
Pos = MAP_APPFONT ( 12, 67) ;
Size = MAP_APPFONT ( 200 , 10 ) ;
Text [ en-US ] = "~Compress punctuation only";
};
RadioButton RB_PUNCT_KANA_COMP
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP";
Pos = MAP_APPFONT ( 12, 80 ) ;
Size = MAP_APPFONT ( 200 , 10 ) ;
Text [ en-US ] = "Compress ~punctuation and Japanese Kana";
@@ -93,6 +98,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
};
ListBox LB_LANGUAGE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE";
Pos = MAP_APPFONT ( 95 , 107 ) ;
Size = MAP_APPFONT ( 80 , 48 ) ;
Border = TRUE ;
@@ -100,6 +106,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
};
CheckBox CB_STANDARD
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD";
Pos = MAP_APPFONT ( 180, 109 ) ;
Size = MAP_APPFONT ( 74 , 10 ) ;
Text [ en-US ] = "~Default";
@@ -112,6 +119,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
};
Edit ED_START
{
+ HelpID = "cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START";
Pos = MAP_APPFONT ( 95 , 123 ) ;
Size = MAP_APPFONT ( 159 , 12 ) ;
Border = TRUE ;
@@ -124,6 +132,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
};
Edit ED_END
{
+ HelpID = "cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END";
Pos = MAP_APPFONT ( 95 , 139 ) ;
Size = MAP_APPFONT ( 159 , 12 ) ;
Border = TRUE ;
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
index 374828b329c1..af2d7444612a 100644
--- a/cui/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -46,6 +46,7 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
};
ListBox LB_CHART_COLOR_LIST
{
+ HelpID = "cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST";
Border = TRUE;
Pos = MAP_APPFONT ( 12 , 15 );
Size = MAP_APPFONT ( 68 , 152 );
@@ -68,6 +69,7 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
};
PushButton PB_RESET_TO_DEFAULT
{
+ HelpID = "cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT";
Pos = MAP_APPFONT ( 204 , 165 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Default";
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 90befc998e01..ff10e2744533 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -60,6 +60,94 @@ using namespace ::svtools;
#define GROUP_BASIC 5
#define GROUP_SQL 6
+const char* aColorLBHids[] =
+{
+ HID_COLORPAGE_DOCCOLOR_LB,
+ HID_COLORPAGE_DOCBOUNDARIES_LB,
+ HID_COLORPAGE_APPBACKGROUND_LB,
+ HID_COLORPAGE_OBJECTBOUNDARIES_LB,
+ HID_COLORPAGE_TABLEBOUNDARIES_LB,
+ HID_COLORPAGE_FONTCOLOR_LB,
+ HID_COLORPAGE_LINKS_LB,
+ HID_COLORPAGE_LINKSVISITED_LB,
+ HID_COLORPAGE_ANCHOR_LB,
+ HID_COLORPAGE_SPELL_LB,
+ HID_COLORPAGE_WRITERTEXTGRID_LB,
+ HID_COLORPAGE_WRITERFIELDSHADINGS_LB,
+ HID_COLORPAGE_WRITERIDXSHADINGS_LB,
+ HID_COLORPAGE_WRITERDIRECTCURSOR_LB,
+ HID_COLORPAGE_WRITERNOTESINDICATOR_LB,
+ HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB,
+ HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB,
+ HID_COLORPAGE_WRITERPAGEBREAKS_LB,
+ HID_COLORPAGE_HTMLSGML_LB,
+ HID_COLORPAGE_HTMLCOMMENT_LB,
+ HID_COLORPAGE_HTMLKEYWORD_LB,
+ HID_COLORPAGE_HTMLUNKNOWN_LB,
+ HID_COLORPAGE_CALCGRID_LB,
+ HID_COLORPAGE_CALCPAGEBREAK_LB,
+ HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB,
+ HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB,
+ HID_COLORPAGE_CALCDETECTIVE_LB,
+ HID_COLORPAGE_CALCDETECTIVEERROR_LB,
+ HID_COLORPAGE_CALCREFERENCE_LB,
+ HID_COLORPAGE_CALCNOTESBACKGROUND_LB,
+ HID_COLORPAGE_DRAWGRID_LB,
+ HID_COLORPAGE_DRAWDRAWING_LB,
+ HID_COLORPAGE_DRAWFILL_LB,
+ HID_COLORPAGE_BASICIDENTIFIER_LB,
+ HID_COLORPAGE_BASICCOMMENT_LB,
+ HID_COLORPAGE_BASICNUMBER_LB,
+ HID_COLORPAGE_BASICSTRING_LB,
+ HID_COLORPAGE_BASICOPERATOR_LB,
+ HID_COLORPAGE_BASICKEYWORD_LB,
+ HID_COLORPAGE_BASICERROR_LB
+};
+
+const char* aColorCBHids[] =
+{
+ HID_COLORPAGE_DOCCOLOR_CB,
+ HID_COLORPAGE_DOCBOUNDARIES_CB,
+ HID_COLORPAGE_APPBACKGROUND_CB,
+ HID_COLORPAGE_OBJECTBOUNDARIES_CB,
+ HID_COLORPAGE_TABLEBOUNDARIES_CB,
+ HID_COLORPAGE_FONTCOLOR_CB,
+ HID_COLORPAGE_LINKS_CB,
+ HID_COLORPAGE_LINKSVISITED_CB,
+ HID_COLORPAGE_ANCHOR_CB,
+ HID_COLORPAGE_SPELL_CB,
+ HID_COLORPAGE_WRITERTEXTGRID_CB,
+ HID_COLORPAGE_WRITERFIELDSHADINGS_CB,
+ HID_COLORPAGE_WRITERIDXSHADINGS_CB,
+ HID_COLORPAGE_WRITERDIRECTCURSOR_CB,
+ HID_COLORPAGE_WRITERNOTESINDICATOR_CB,
+ HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB,
+ HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB,
+ HID_COLORPAGE_WRITERPAGEBREAKS_CB,
+ HID_COLORPAGE_HTMLSGML_CB,
+ HID_COLORPAGE_HTMLCOMMENT_CB,
+ HID_COLORPAGE_HTMLKEYWORD_CB,
+ HID_COLORPAGE_HTMLUNKNOWN_CB,
+ HID_COLORPAGE_CALCGRID_CB,
+ HID_COLORPAGE_CALCPAGEBREAK_CB,
+ HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB,
+ HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB,
+ HID_COLORPAGE_CALCDETECTIVE_CB,
+ HID_COLORPAGE_CALCDETECTIVEERROR_CB,
+ HID_COLORPAGE_CALCREFERENCE_CB,
+ HID_COLORPAGE_CALCNOTESBACKGROUND_CB,
+ HID_COLORPAGE_DRAWGRID_CB,
+ HID_COLORPAGE_DRAWDRAWING_CB,
+ HID_COLORPAGE_DRAWFILL_CB,
+ HID_COLORPAGE_BASICIDENTIFIER_CB,
+ HID_COLORPAGE_BASICCOMMENT_CB,
+ HID_COLORPAGE_BASICNUMBER_CB,
+ HID_COLORPAGE_BASICSTRING_CB,
+ HID_COLORPAGE_BASICOPERATOR_CB,
+ HID_COLORPAGE_BASICKEYWORD_CB,
+ HID_COLORPAGE_BASICERROR_CB
+};
+
/* -----------------------------2002/06/26 10:48------------------------------
---------------------------------------------------------------------------*/
@@ -815,7 +903,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
else
aCheckBoxes[i]->Hide();
aCheckBoxes[i]->SetBackground(aTransparentWall);
- aCheckBoxes[i]->SetHelpId(HID_COLORPAGE_CHECKBOX_START + i);
+ aCheckBoxes[i]->SetHelpId( aColorCBHids[i] );
if(bSetTextColor)
aCheckBoxes[i]->SetTextColor(aRCheckCol);
}
@@ -854,13 +942,15 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
XColorEntry* pEntry = aColorTable.GetColor(i);
aColorBoxes[0]->InsertEntry( pEntry->GetColor(), pEntry->GetName() );
}
- aColorBoxes[0]->SetHelpId(HID_COLORPAGE_LISTBOX_START);
+
+ aColorBoxes[0]->SetHelpId( aColorLBHids[0] );
+
for( sal_Int32 i = 1; i < nCount; i++ )
{
if(aColorBoxes[i])
{
aColorBoxes[i]->CopyEntries( *aColorBoxes[0] );
- aColorBoxes[i]->SetHelpId(HID_COLORPAGE_LISTBOX_START + i);
+ aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
}
}
}
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
index 5b4a58bd59c4..73cee3bfdc6f 100644
--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -52,6 +52,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
};
ListBox LB_COLORSCHEME
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME";
Pos = MAP_APPFONT ( 65 , 14 ) ;
Size = MAP_APPFONT ( 77 , 58 ) ;
Border = TRUE;
@@ -60,12 +61,14 @@ TabPage RID_SVXPAGE_COLORCONFIG
};
PushButton PB_SAVESCHEME
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME";
Pos = MAP_APPFONT ( 145, 13 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Save...";
};
PushButton PB_DELETESCHEME
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME";
Pos = MAP_APPFONT ( 198 , 13 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Delete";
@@ -150,6 +153,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
CheckBox CB_DOCBOUND
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_DOCBOUND";
CB_POS_SIZE( 2 );
Text [ en-US ] = "Text boundaries";
};
@@ -164,6 +168,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
CheckBox CB_OBJECTBOUNDARIES
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_OBJECTBOUNDARIES";
CB_POS_SIZE( 4 );
Text [ en-US ] = "Object boundaries";
};
@@ -171,6 +176,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
CheckBox CB_TABLEBOUNDARIES
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_TABLEBOUNDARIES";
CB_POS_SIZE( 5 );
Text [ en-US ] = "Table boundaries";
};
@@ -185,6 +191,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
CheckBox CB_LINKS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKS";
CB_POS_SIZE( 7 );
Text [ en-US ] = "Unvisited links";
};
@@ -192,6 +199,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
CheckBox CB_LINKSVISITED
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKSVISITED";
CB_POS_SIZE( 8 );
Text [ en-US ] = "Visited links";
};
@@ -226,6 +234,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
CheckBox CB_WRITERFIELDSHADINGS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERFIELDSHADINGS";
CB_POS_SIZE( 13 );
Text [ en-US ] = "Field shadings";
};
@@ -233,6 +242,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
CheckBox CB_WRITERIDXSHADINGS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERIDXSHADINGS";
CB_POS_SIZE( 14 );
Text [ en-US ] = "Index and table shadings";
};
@@ -248,6 +258,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
CheckBox CB_WRITERSECTIONBOUNDARIES
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERSECTIONBOUNDARIES";
CB_POS_SIZE( 16 );
Text [ en-US ] = "Section boundaries";
};
diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src
index defc62c95011..a9207701fd52 100644
--- a/cui/source/options/optctl.src
+++ b/cui/source/options/optctl.src
@@ -47,18 +47,21 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
};
CheckBox CB_SEQUENCECHECKING
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING";
Pos = MAP_APPFONT ( 12, ROW_1 ) ;
Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "Use se~quence checking";
};
CheckBox CB_RESTRICTED
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED";
Pos = MAP_APPFONT ( 18, ROW_2 );
Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT );
Text[ en-US ] = "Restricted";
};
CheckBox CB_TYPE_REPLACE
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE";
Pos = MAP_APPFONT ( 18, ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y );
Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT );
Text[ en-US ] = "~Type and replace";
@@ -77,12 +80,14 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
};
RadioButton RB_MOVEMENT_LOGICAL
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL";
Pos = MAP_APPFONT ( 105, ROW_4 ) ;
Size = MAP_APPFONT ( 69 , RSC_CD_RADIOBUTTON_HEIGHT ) ;
Text [ en-US ] = "Lo~gical";
};
RadioButton RB_MOVEMENT_VISUAL
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL";
Pos = MAP_APPFONT ( 177, ROW_4 ) ;
Size = MAP_APPFONT ( 69 , RSC_CD_RADIOBUTTON_HEIGHT ) ;
Text [ en-US ] = "~Visual";
@@ -101,6 +106,7 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
};
ListBox LB_NUMERALS
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS";
Pos = MAP_APPFONT ( 105, ROW_7 ) ;
Size = MAP_APPFONT ( 69 , 3*RSC_CD_DROPDOWN_HEIGHT ) ;
DropDown = TRUE ;
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index c9ee53ca13fb..7867c5de68b0 100755
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -256,7 +256,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
aWordsLB.SetTabs(nStaticTabs);
//! we use an algorithm of our own to insert elements sorted
- aWordsLB.SetWindowBits(/*WB_SORT|*/WB_HSCROLL|WB_CLIPCHILDREN);
+ aWordsLB.SetStyle(aWordsLB.GetStyle()|/*WB_SORT|*/WB_HSCROLL|WB_CLIPCHILDREN);
nWidth=aWordED.GetSizePixel().Width();
diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src
index b5d31ce90fe9..ae63c20f4013 100644
--- a/cui/source/options/optdict.src
+++ b/cui/source/options/optdict.src
@@ -51,6 +51,7 @@ ModalDialog RID_SFXDLG_NEWDICT
};
Edit ED_DICTNAME
{
+ HelpID = "cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 55 , 14 ) ;
Size = MAP_APPFONT ( 90 , 12 ) ;
@@ -65,6 +66,7 @@ ModalDialog RID_SFXDLG_NEWDICT
};
ListBox LB_DICTLANG
{
+ HelpID = "cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG";
Border = TRUE ;
Pos = MAP_APPFONT ( 55 , 30 ) ;
Size = MAP_APPFONT ( 90 , 66 ) ;
@@ -72,6 +74,7 @@ ModalDialog RID_SFXDLG_NEWDICT
};
CheckBox BTN_EXCEPT
{
+ HelpID = "cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT";
Pos = MAP_APPFONT ( 12 , 44 ) ;
Size = MAP_APPFONT ( 57 , 10 ) ;
Text [ en-US ] = "~Exception (-)" ;
@@ -124,6 +127,7 @@ ModalDialog RID_SFXDLG_EDITDICT
};
ListBox LB_ALLDICTS
{
+ HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS";
Border = TRUE ;
Pos = MAP_APPFONT ( 82 , 9 ) ;
Size = MAP_APPFONT ( 121 , 62 ) ;
@@ -137,6 +141,7 @@ ModalDialog RID_SFXDLG_EDITDICT
};
ListBox LB_DICTLANG
{
+ HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG";
Border = TRUE ;
Pos = MAP_APPFONT ( 82 , 25 ) ;
Size = MAP_APPFONT ( 121 , 66 ) ;
@@ -158,6 +163,7 @@ ModalDialog RID_SFXDLG_EDITDICT
};
Edit ED_WORD
{
+ HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD";
Pos = MAP_APPFONT ( 12 , 56 ) ;
Size = MAP_APPFONT ( 71 , 12 ) ;
Border = TRUE ;
@@ -172,6 +178,7 @@ ModalDialog RID_SFXDLG_EDITDICT
Edit ED_REPLACE
{
+ HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE";
Pos = MAP_APPFONT ( 83 , 56 ) ;
Size = MAP_APPFONT ( 120 , 12 ) ;
Border = TRUE ;
@@ -180,6 +187,7 @@ ModalDialog RID_SFXDLG_EDITDICT
PushButton PB_NEW_REPLACE
{
+ HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE";
Pos = MAP_APPFONT ( 209 , 56 ) ;
Size = MAP_APPFONT ( 55 , 12 ) ;
TabStop = TRUE ;
@@ -187,6 +195,7 @@ ModalDialog RID_SFXDLG_EDITDICT
};
PushButton PB_DELETE_REPLACE
{
+ HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE";
Pos = MAP_APPFONT ( 209 , 71 ) ;
Size = MAP_APPFONT ( 55 , 12 ) ;
TabStop = TRUE ;
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 637230587e6b..811a421223e9 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -165,7 +165,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent,
HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED );
aCheckLB.SetHelpId( HID_OFAPAGE_MSFLTR2_CLB );
- aCheckLB.SetWindowBits( WB_HSCROLL| WB_VSCROLL );
+ aCheckLB.SetStyle( aCheckLB.GetStyle()|WB_HSCROLL| WB_VSCROLL );
}
OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index 35659dd71f5b..cff77bad88b6 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -32,7 +32,7 @@
// RID_OFAPAGE_MSFILTEROPT -----------------------------------------------------
TabPage RID_OFAPAGE_MSFILTEROPT
{
- // HelpId = ;
+ HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT";
OutputSize = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
SVLook = TRUE ;
@@ -46,6 +46,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
};
CheckBox CB_WBAS_CODE
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
@@ -53,6 +54,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
};
CheckBox CB_WBAS_STG
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG";
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
@@ -67,6 +69,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
};
CheckBox CB_EBAS_CODE
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE";
Pos = MAP_APPFONT ( 12 , 55 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
@@ -74,6 +77,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
};
CheckBox CB_EBAS_EXECTBL
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL";
Pos = MAP_APPFONT ( 22 , 69 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
@@ -81,6 +85,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
};
CheckBox CB_EBAS_STG
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG";
Pos = MAP_APPFONT ( 12 , 83 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
@@ -95,6 +100,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
};
CheckBox CB_PBAS_CODE
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE";
Pos = MAP_APPFONT ( 12 , 110 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
@@ -102,6 +108,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
};
CheckBox CB_PBAS_STG
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG";
Pos = MAP_APPFONT ( 12 , 124 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
@@ -112,7 +119,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
// RID_OFAPAGE_MSFILTEROPT2 -----------------------------------------------------
TabPage RID_OFAPAGE_MSFILTEROPT2
{
- // HelpId = ;
+ HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT2";
OutputSize = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
SVLook = TRUE ;
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index dec9c4769481..ed7443ae04b4 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -50,24 +50,28 @@ TabPage OFA_TP_MISC
};
CheckBox CB_TOOLTIP
{
+ HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP";
Pos = MAP_APPFONT( COL1, ROW1 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Tips";
};
CheckBox CB_EXTHELP
{
+ HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP";
Pos = MAP_APPFONT( COL2, ROW2 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Extended tips";
};
CheckBox CB_HELPAGENT
{
+ HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT";
Pos = MAP_APPFONT( COL1, ROW3 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Help Agent";
};
PushButton PB_HELPAGENT_RESET
{
+ HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET";
Pos = MAP_APPFONT( COL2, ROW4 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "~Reset Help Agent";
@@ -80,6 +84,7 @@ TabPage OFA_TP_MISC
};
ListBox LB_HELPFORMAT
{
+ HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT";
Pos = MAP_APPFONT( COL4, ROW5 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 );
DropDown = TRUE ;
@@ -108,6 +113,7 @@ TabPage OFA_TP_MISC
};
CheckBox CB_FILEDLG
{
+ HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG";
Pos = MAP_APPFONT( COL1, ROW7 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
@@ -120,6 +126,7 @@ TabPage OFA_TP_MISC
};
CheckBox CB_DOCSTATUS
{
+ HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS";
Pos = MAP_APPFONT( COL1, ROW9 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Printing sets \"document modified\" status";
@@ -138,6 +145,7 @@ TabPage OFA_TP_MISC
};
NumericField NF_YEARVALUE
{
+ HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE";
Border = TRUE ;
Pos = MAP_APPFONT( COL4, ROW11 );
Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
@@ -160,6 +168,7 @@ TabPage OFA_TP_MISC
};
CheckBox CB_PRINTDLG
{
+ HelpID = "cui:CheckBox:OFA_TP_MISC:CB_PRINTDLG";
Pos = MAP_APPFONT( COL1, ROW9 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Use %PRODUCTNAME ~dialogs";
@@ -192,6 +201,7 @@ TabPage OFA_TP_VIEW
};
MetricField MF_WINDOWSIZE
{
+ HelpID = "cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE";
Pos = MAP_APPFONT ( 95 , ROW_MF_SCALING ) ;
Size = MAP_APPFONT ( 31 , 12 ) ;
Border = TRUE ;
@@ -220,6 +230,7 @@ TabPage OFA_TP_VIEW
};
ListBox LB_ICONSIZE
{
+ HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE";
Pos = MAP_APPFONT ( 12 , ROW_LB_ICONSIZESTYLE ) ;
Size = MAP_APPFONT ( 45 , 60 ) ;
DropDown = TRUE ;
@@ -234,6 +245,7 @@ TabPage OFA_TP_VIEW
};
ListBox LB_ICONSTYLE
{
+ HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE";
Pos = MAP_APPFONT ( 61 , ROW_LB_ICONSIZESTYLE ) ;
Size = MAP_APPFONT ( 65 , 70 ) ;
DropDown = TRUE ;
@@ -253,6 +265,7 @@ TabPage OFA_TP_VIEW
};
CheckBox CB_SYSTEM_FONT
{
+ HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT";
TabStop = TRUE ;
Pos = MAP_APPFONT( 12, ROW_CB_SYSTEM_FONT );
Size = MAP_APPFONT( 114, 16 );
@@ -262,6 +275,7 @@ TabPage OFA_TP_VIEW
CheckBox CB_FONTANTIALIASING
{
+ HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 12 , ROW_CB_FONTANTIALIASING ) ;
Size = MAP_APPFONT ( 110 , RSC_CD_CHECKBOX_HEIGHT ) ;
@@ -275,6 +289,7 @@ TabPage OFA_TP_VIEW
};
NumericField NF_AA_POINTLIMIT
{
+ HelpID = "cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT";
Border = TRUE ;
Pos = MAP_APPFONT ( 46, ROW_NF_AA_POINTLIMIT ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -304,6 +319,7 @@ TabPage OFA_TP_VIEW
};
ListBox LB_MENU_ICONS
{
+ HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS";
Pos = MAP_APPFONT ( 12 , ROW_LB_MENU_ICONS ) ;
Size = MAP_APPFONT ( 114 , 60 ) ;
DropDown = TRUE ;
@@ -324,12 +340,14 @@ TabPage OFA_TP_VIEW
};
CheckBox CB_FONT_SHOW
{
+ HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW";
Pos = MAP_APPFONT ( 12, ROW_CB_FONT_SHOW ) ;
Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "Show p~review of fonts" ;
};
CheckBox CB_FONT_HISTORY
{
+ HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY";
Pos = MAP_APPFONT ( 12, ROW_CB_FONT_HISTORY ) ;
Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "Show font h~istory" ;
@@ -343,6 +361,7 @@ TabPage OFA_TP_VIEW
CheckBox CB_USE_HARDACCELL
{
+ HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL";
Pos = MAP_APPFONT ( 139, ROW_CB_USE_HARDACCELL ) ;
Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "Use hardware acceleration" ;
@@ -350,6 +369,7 @@ TabPage OFA_TP_VIEW
CheckBox CB_USE_ANTIALIASE
{
+ HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE";
Pos = MAP_APPFONT ( 139, ROW_CB_USE_ANTIALIASE ) ;
Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "Use Anti-Aliasing" ;
@@ -369,6 +389,7 @@ TabPage OFA_TP_VIEW
};
ListBox LB_MOUSEPOS
{
+ HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS";
Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEPOS ) ;
Size = MAP_APPFONT ( 114 , 60 ) ;
DropDown = TRUE ;
@@ -389,6 +410,7 @@ TabPage OFA_TP_VIEW
};
ListBox LB_MOUSEMIDDLE
{
+ HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE";
Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEMIDDLE ) ;
Size = MAP_APPFONT ( 114 , 60 ) ;
DropDown = TRUE ;
@@ -412,6 +434,7 @@ TabPage OFA_TP_VIEW
CheckBox CB_SELECTION
{
+ HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SELECTION";
Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ;
Size = MAP_APPFONT ( 118 - 34 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "Transparency" ;
@@ -419,6 +442,7 @@ TabPage OFA_TP_VIEW
MetricField MF_SELECTION
{
+ HelpID = "cui:MetricField:OFA_TP_VIEW:MF_SELECTION";
Pos = MAP_APPFONT ( 139 + (95 - 12), ROW_CB_SELECTION ) ;
Size = MAP_APPFONT ( 31 , 12 ) ;
Border = TRUE ;
@@ -463,6 +487,7 @@ TabPage OFA_TP_LANGUAGES
};
ListBox LB_USERINTERFACE
{
+ HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE";
Pos = MAP_APPFONT ( 123 , 14 ) ;
Size = MAP_APPFONT ( 125 , 60 ) ;
DropDown = TRUE ;
@@ -484,6 +509,7 @@ TabPage OFA_TP_LANGUAGES
};
ListBox LB_LOCALESETTING
{
+ HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING";
Pos = MAP_APPFONT ( 123 , 30 ) ;
Size = MAP_APPFONT ( 125 , 60 ) ;
DropDown = TRUE ;
@@ -499,6 +525,7 @@ TabPage OFA_TP_LANGUAGES
};
CheckBox CB_DECIMALSEPARATOR
{
+ HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR";
Pos = MAP_APPFONT ( 123 , 46) ;
Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "~Same as locale setting ( %1 )";
@@ -517,6 +544,7 @@ TabPage OFA_TP_LANGUAGES
};
ListBox LB_CURRENCY
{
+ HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY";
Pos = MAP_APPFONT ( 123 , 59 ) ;
Size = MAP_APPFONT ( 125 , 60 ) ;
DropDown = TRUE ;
@@ -545,6 +573,7 @@ TabPage OFA_TP_LANGUAGES
ListBox LB_WEST_LANG
{
+ HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG";
Pos = MAP_APPFONT ( 123 , 88 ) ;
Size = MAP_APPFONT ( 125 , 60 ) ;
DropDown = TRUE ;
@@ -566,6 +595,7 @@ TabPage OFA_TP_LANGUAGES
};
ListBox LB_ASIAN_LANG
{
+ HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG";
Pos = MAP_APPFONT ( 123 , 104 ) ;
Size = MAP_APPFONT ( 125 , 60 ) ;
DropDown = TRUE ;
@@ -587,6 +617,7 @@ TabPage OFA_TP_LANGUAGES
};
ListBox LB_COMPLEX_LANG
{
+ HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG";
Pos = MAP_APPFONT ( 123 , 120 ) ;
Size = MAP_APPFONT ( 125 , 60 ) ;
DropDown = TRUE ;
@@ -596,6 +627,7 @@ TabPage OFA_TP_LANGUAGES
};
CheckBox CB_CURRENT_DOC
{
+ HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC";
Pos = MAP_APPFONT ( 123 , 135 ) ;
Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "For the current document only";
@@ -614,6 +646,7 @@ TabPage OFA_TP_LANGUAGES
};
CheckBox CB_ASIANSUPPORT
{
+ HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT";
Pos = MAP_APPFONT ( 12 , 158 ) ;
Size = MAP_APPFONT ( 236 ,RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "E~nabled for Asian languages";
@@ -626,6 +659,7 @@ TabPage OFA_TP_LANGUAGES
};
CheckBox CB_CTLSUPPORT
{
+ HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT";
Pos = MAP_APPFONT ( 12 , 173 ) ;
Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "Ena~bled for complex text layout (CTL)";
diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src
index 6f5fff55892d..bc5721024c1a 100644
--- a/cui/source/options/optgenrl.src
+++ b/cui/source/options/optgenrl.src
@@ -52,6 +52,7 @@ TabPage RID_SFXPAGE_GENERAL
};
Edit ED_COMPANY
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 0 ) ) ;
Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ;
@@ -81,6 +82,7 @@ TabPage RID_SFXPAGE_GENERAL
};
Edit ED_FATHERNAME
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME";
Border = TRUE ;
Hide = TRUE;
Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ;
@@ -88,18 +90,21 @@ TabPage RID_SFXPAGE_GENERAL
};
Edit ED_FIRSTNAME
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ;
Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
};
Edit ED_NAME
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME";
Border = TRUE ;
Pos = MAP_APPFONT ( MID+NAMELEN-8+HSPACE , LINE ( 1 ) ) ;
Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
};
Edit ED_SHORTNAME
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( MID+2* ( NAMELEN-8+HSPACE ) , LINE ( 1 ) ) ;
Size = MAP_APPFONT ( RIGHT- ( MID+2* ( NAMELEN-8+HSPACE ) ) , LINEH ) ;
@@ -121,12 +126,14 @@ TabPage RID_SFXPAGE_GENERAL
};
Edit ED_STREET
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 2 ) ) ;
Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ;
};
Edit ED_APARTMENTNR
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR";
Border = TRUE ;
Hide = TRUE;
Pos = MAP_APPFONT ( MID , LINE ( 2 ) ) ;
@@ -141,30 +148,35 @@ TabPage RID_SFXPAGE_GENERAL
};
Edit ED_PLZ
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 3 ) ) ;
Size = MAP_APPFONT ( 24 , LINEH ) ;
};
Edit ED_CITY
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY";
Border = TRUE ;
Pos = MAP_APPFONT ( MID + 24 + HSPACE , LINE ( 3 ) ) ;
Size = MAP_APPFONT ( RIGHT - ( MID + 24 + HSPACE ) , LINEH ) ;
};
Edit ED_US_CITY
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 3 ) ) ;
Size = MAP_APPFONT ( 90 , LINEH ) ;
};
Edit ED_US_STATE
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_STATE";
Border = TRUE ;
Pos = MAP_APPFONT ( MID + 90 + HSPACE, LINE ( 3 ) ) ;
Size = MAP_APPFONT ( 30 , LINEH ) ;
};
Edit ED_US_ZIPCODE
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE";
Border = TRUE ;
Pos = MAP_APPFONT ( MID + 90 + HSPACE + 30 + HSPACE, LINE ( 3 ) ) ;
Size = MAP_APPFONT ( RIGHT - ( MID + 90 + HSPACE + 30 + HSPACE ) , LINEH ) ;
@@ -178,6 +190,7 @@ TabPage RID_SFXPAGE_GENERAL
};
Edit ED_COUNTRY
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 4 ) ) ;
Size = MAP_APPFONT ( RIGHT - MID , LINEH ) ;
@@ -191,12 +204,14 @@ TabPage RID_SFXPAGE_GENERAL
};
Edit ED_TITLE
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 5 ) ) ;
Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
};
Edit ED_POSITION
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION";
Border = TRUE ;
Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 5 ) ) ;
Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
@@ -210,12 +225,14 @@ TabPage RID_SFXPAGE_GENERAL
};
Edit ED_TELPRIVAT
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 6 ) ) ;
Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
};
Edit ED_TELCOMPANY
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY";
Border = TRUE ;
Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 6 ) ) ;
Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
@@ -229,12 +246,14 @@ TabPage RID_SFXPAGE_GENERAL
};
Edit ED_FAX
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 7 ) ) ;
Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
};
Edit ED_EMAIL
{
+ HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL";
Border = TRUE ;
Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 7 ) ) ;
Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
@@ -247,6 +266,7 @@ TabPage RID_SFXPAGE_GENERAL
};
CheckBox CB_USEDATA
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_GENERAL:CB_USEDATA";
Pos = MAP_APPFONT ( 6 , 122 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Hide = TRUE;
diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src
index 60db286b192d..5de010b58948 100644
--- a/cui/source/options/opthtml.src
+++ b/cui/source/options/opthtml.src
@@ -32,7 +32,7 @@
// RID_OFAPAGE_HTMLOPT -----------------------------------------------------
TabPage RID_OFAPAGE_HTMLOPT
{
- // HelpId = ;
+ HelpID = "cui:TabPage:RID_OFAPAGE_HTMLOPT";
OutputSize = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
SVLook = TRUE ;
@@ -45,6 +45,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
NumericField NF_SIZE1
{
+ HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1";
Pos = MAP_APPFONT ( 45 , 14 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
@@ -67,6 +68,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
NumericField NF_SIZE2
{
+ HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2";
Pos = MAP_APPFONT ( 45 , 30 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
@@ -89,6 +91,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
NumericField NF_SIZE3
{
+ HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3";
Pos = MAP_APPFONT ( 45 , 46 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
@@ -111,6 +114,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
NumericField NF_SIZE4
{
+ HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4";
Pos = MAP_APPFONT ( 45 , 62 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
@@ -133,6 +137,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
NumericField NF_SIZE5
{
+ HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5";
Pos = MAP_APPFONT ( 45 , 78 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
@@ -155,6 +160,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
NumericField NF_SIZE6
{
+ HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6";
Pos = MAP_APPFONT ( 45 , 94 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
@@ -177,6 +183,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
NumericField NF_SIZE7
{
+ HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7";
Pos = MAP_APPFONT ( 45 , 110 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
@@ -205,6 +212,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
CheckBox CB_NUMBERS_ENGLISH_US
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US";
Pos = MAP_APPFONT ( 93 , 14 ) ;
Size = MAP_APPFONT ( 161 , 10 ) ;
TabStop = TRUE ;
@@ -212,6 +220,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
CheckBox CB_UNKNOWN_TAGS
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS";
Pos = MAP_APPFONT ( 93 , 28 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
TabStop = TRUE ;
@@ -219,6 +228,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
CheckBox CB_IGNORE_FONTNAMES
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES";
Pos = MAP_APPFONT ( 93 , 42 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
TabStop = TRUE ;
@@ -232,6 +242,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
ListBox LB_EXPORT
{
+ HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_EXPORT";
Pos = MAP_APPFONT ( 93 , 69 ) ;
Size = MAP_APPFONT ( 155 , 50 ) ;
Border = TRUE ;
@@ -246,24 +257,28 @@ TabPage RID_OFAPAGE_HTMLOPT
};
CheckBox CB_STARBASIC
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC";
Pos = MAP_APPFONT ( 93 , 88 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
Text = "%PRODUCTNAME ~Basic" ;
};
CheckBox CB_STARBASIC_WARNING
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING";
Pos = MAP_APPFONT ( 99 , 102 ) ;
Size = MAP_APPFONT ( 149 , 10 ) ;
Text [ en-US ] = "Display ~warning";
};
CheckBox CB_PRINT_EXTENSION
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION";
Pos = MAP_APPFONT ( 93 , 116 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
Text [ en-US ] = "~Print layout" ;
};
CheckBox CB_LOCAL_GRF
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF";
Pos = MAP_APPFONT ( 93 , 130 ) ;
Size = MAP_APPFONT ( 155 , 10 ) ;
Text [ en-US ] = "~Copy local graphics to Internet" ;
@@ -277,6 +292,7 @@ TabPage RID_OFAPAGE_HTMLOPT
};
ListBox LB_CHARSET
{
+ HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET";
Pos = MAP_APPFONT ( 162 , 143 ) ;
Size = MAP_APPFONT ( 86 , 61 ) ;
TabStop = TRUE ;
diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src
index c389b38cddfa..523dc8545ca9 100644
--- a/cui/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -34,7 +34,7 @@
TabPage RID_SVXPAGE_IMPROVEMENT
{
- //!HelpId = HID_OPTIONS_IMPROVEMENT ;
+ HelpId = "cui:TabPage:RID_SVXPAGE_IMPROVEMENT" ;
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
@@ -55,6 +55,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT
};
RadioButton RB_YES
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES";
Pos = MAP_APPFONT ( 12 , 92 ) ;
Size = MAP_APPFONT ( 215 , 10 ) ;
Check = TRUE ;
@@ -62,6 +63,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT
};
RadioButton RB_NO
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO";
Pos = MAP_APPFONT ( 12 , 105 ) ;
Size = MAP_APPFONT ( 215 , 10 ) ;
Text [ en-US ] = "~No, I do not wish to participate" ;
@@ -105,6 +107,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT
};
PushButton PB_SHOWDATA
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA";
Pos = MAP_APPFONT ( 12 , 161 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Show Data" ;
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 9023dfa52394..f4837b514483 100755..100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -41,6 +41,7 @@
TabPage RID_SVXPAGE_INET_MOZPLUGIN
{
+ HelpID = "cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN";
OutputSize = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
SVLook = TRUE ;
@@ -54,6 +55,7 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN
};
CheckBox CB_MOZPLUGIN_CODE
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
@@ -87,6 +89,7 @@ TabPage RID_SVXPAGE_INET_PROXY
};
ListBox LB_PROXYMODE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE";
Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 11 ) ;
Size = MAP_APPFONT ( 49 , 48 ) ;
Border = TRUE ;
@@ -110,6 +113,7 @@ TabPage RID_SVXPAGE_INET_PROXY
};
Edit ED_HTTP_PROXY
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY";
Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 27 ) ;
Size = MAP_APPFONT ( 123 , 12 ) ;
Border = TRUE ;
@@ -128,6 +132,7 @@ TabPage RID_SVXPAGE_INET_PROXY
};
Edit ED_HTTP_PORT
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT";
Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 27 ) ;
Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
Border = TRUE ;
@@ -141,6 +146,7 @@ TabPage RID_SVXPAGE_INET_PROXY
};
Edit ED_HTTPS_PROXY
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY";
Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 43 ) ;
Size = MAP_APPFONT ( 123 , 12 ) ;
Border = TRUE ;
@@ -154,6 +160,7 @@ TabPage RID_SVXPAGE_INET_PROXY
};
Edit ED_HTTPS_PORT
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT";
Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 43 ) ;
Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
Border = TRUE ;
@@ -167,6 +174,7 @@ TabPage RID_SVXPAGE_INET_PROXY
};
Edit ED_FTP_PROXY
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY";
Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 59 ) ;
Size = MAP_APPFONT ( 123 , 12 ) ;
Border = TRUE ;
@@ -180,6 +188,7 @@ TabPage RID_SVXPAGE_INET_PROXY
};
Edit ED_FTP_PORT
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT";
Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 59 ) ;
Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
Border = TRUE ;
@@ -192,6 +201,7 @@ TabPage RID_SVXPAGE_INET_PROXY
};
Edit ED_SOCKS_PROXY
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PROXY";
Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 75 ) ;
Size = MAP_APPFONT ( 123 , 12 ) ;
Border = TRUE ;
@@ -205,6 +215,7 @@ TabPage RID_SVXPAGE_INET_PROXY
};
Edit ED_SOCKS_PORT
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT";
Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 75 ) ;
Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
Border = TRUE ;
@@ -217,6 +228,7 @@ TabPage RID_SVXPAGE_INET_PROXY
};
Edit ED_NOPROXYFOR
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR";
Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 91 ) ;
Size = MAP_APPFONT ( 123 , 12 ) ;
Border = TRUE ;
@@ -235,18 +247,21 @@ TabPage RID_SVXPAGE_INET_PROXY
};
RadioButton RB_DNS_AUTO
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_INET_PROXY:RB_DNS_AUTO";
Pos = MAP_APPFONT( 12, 111 );
Size = MAP_APPFONT( 236, 10 );
Text [ en-US ] = "~Automatic" ;
};
RadioButton RB_DNS_MANUAL
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_INET_PROXY:RB_DNS_MANUAL";
Pos = MAP_APPFONT( 12, 124 );
Size = MAP_APPFONT( 75, 10 );
Text [ en-US ] = "~Manual" ;
};
PatternField ED_DNS
{
+ HelpID = "cui:PatternField:RID_SVXPAGE_INET_PROXY:ED_DNS";
Pos = MAP_APPFONT( 90, 126 );
Size = MAP_APPFONT( 66, 12 );
Border = TRUE ;
@@ -287,6 +302,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
};
ListBox LB_SEARCH
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH";
Pos = MAP_APPFONT ( 12 , GB_SEARCH_TOP + 11 ) ;
Size = MAP_APPFONT ( 39 , 120 ) ;
Border = TRUE ;
@@ -303,6 +319,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
};
Edit ED_SEARCH_NAME
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME";
Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 11 ) ;
Size = MAP_APPFONT ( 125 , 12 ) ;
Border = TRUE ;
@@ -315,6 +332,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
};
RadioButton RB_AND
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND";
Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 26 ) ;
Size = MAP_APPFONT ( 125 , 10 ) ;
Check = TRUE ;
@@ -322,12 +340,14 @@ TabPage RID_SVXPAGE_INET_SEARCH
};
RadioButton RB_OR
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR";
Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 39 ) ;
Size = MAP_APPFONT ( 125 , 10 ) ;
Text [ en-US ] = "~Or" ;
};
RadioButton RB_EXACT
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT";
Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 52 ) ;
Size = MAP_APPFONT ( 125 , 10 ) ;
Text [ en-US ] = "E~xact" ;
@@ -340,6 +360,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
};
Edit ED_URL
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL";
Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 65 ) ;
Size = MAP_APPFONT ( 125 , 12 ) ;
Border = TRUE ;
@@ -352,6 +373,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
};
Edit ED_POSTFIX
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX";
Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 80 ) ;
Size = MAP_APPFONT ( 125 , 12 ) ;
Border = TRUE ;
@@ -364,6 +386,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
};
Edit ED_SEPARATOR
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR";
Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 95 ) ;
Size = MAP_APPFONT ( 42 , 12 ) ;
Border = TRUE ;
@@ -376,6 +399,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
};
ListBox ED_CASE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE";
Pos = MAP_APPFONT ( EDIT_START_XPOS, GB_SEARCH_TOP + 110 ) ;
Size = MAP_APPFONT ( 42 , 48 ) ;
Border = TRUE ;
@@ -389,24 +413,28 @@ TabPage RID_SVXPAGE_INET_SEARCH
};
PushButton PB_NEW
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW";
Pos = MAP_APPFONT ( 39 , GB_SEARCH_TOP + 131 + 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "N~ew";
};
PushButton PB_ADD
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD";
Pos = MAP_APPFONT ( 92 , GB_SEARCH_TOP + 131 + 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Add" ;
};
PushButton PB_CHANGE
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE";
Pos = MAP_APPFONT ( 145 , GB_SEARCH_TOP + 131 + 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Modify" ;
};
PushButton PB_DELETE
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE";
Pos = MAP_APPFONT ( 198 , GB_SEARCH_TOP + 131 + 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Delete" ;
@@ -426,6 +454,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
TabPage RID_SVXPAGE_INET_SECURITY
{
+ HelpID = "cui:TabPage:RID_SVXPAGE_INET_SECURITY";
OutputSize = TRUE ;
Size = MAP_APPFONT( TP_WIDTH , TP_HEIGHT );
SVLook = TRUE;
@@ -446,6 +475,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
};
PushButton PB_SEC_SECURITYOPTIONS
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS";
Pos = MAP_APPFONT( COL_3, ROW_2a );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "Options...";
@@ -458,6 +488,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
};
CheckBox CB_SEC_SAVEPASSWORDS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS";
Pos = MAP_APPFONT( COL_1, ROW_3 - 4 );
Size = MAP_APPFONT( COL_2-COL_1, 16 );
Wordbreak = TRUE;
@@ -465,12 +496,14 @@ TabPage RID_SVXPAGE_INET_SECURITY
};
PushButton PB_SEC_CONNECTIONS
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS";
Pos = MAP_APPFONT( COL_3, ROW_3-1 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "Connections...";
};
CheckBox CB_SEC_MASTERPASSWORD
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_MASTERPASSWORD";
Pos = MAP_APPFONT( COL_1a, ROW_4 );
Size = MAP_APPFONT( COL_2-COL_1a, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Protected by a master password (recommended)";
@@ -484,6 +517,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
};
PushButton PB_SEC_MASTERPASSWORD
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD";
Pos = MAP_APPFONT( COL_3, ROW_4a );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "Master Password...";
@@ -503,6 +537,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
};
PushButton PB_SEC_MACROSEC
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC";
Pos = MAP_APPFONT( COL_3, ROW_6-2 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "Macro Security...";
@@ -523,6 +558,7 @@ ErrorBox RID_SVXERR_OPT_PROXYPORTS
ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
{
+ HelpID = "cui:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE";
OutputSize = TRUE;
Size = MAP_APPFONT( 150, 81 );
Moveable = TRUE;
@@ -541,6 +577,7 @@ ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
};
CheckBox CB_JSCPT_DISABLE
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE";
Pos = MAP_APPFONT( 39, 45 );
Size = MAP_APPFONT( 195, 12 );
Hide = TRUE;
@@ -591,6 +628,7 @@ TabPage RID_SVXPAGE_INET_MAIL
Edit ED_MAILERURL
{
+ HelpID = "cui:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL";
Pos = MAP_APPFONT ( 60 , 18 ) ;
Size = MAP_APPFONT ( 171 , 12 ) ;
Border = TRUE;
@@ -598,6 +636,7 @@ TabPage RID_SVXPAGE_INET_MAIL
PushButton PB_MAILERURL
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL";
Pos = MAP_APPFONT ( 234 , 17 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
Text = "..." ;
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
index 0d55fd6f64f8..db052d1c5fd8 100644
--- a/cui/source/options/optjava.src
+++ b/cui/source/options/optjava.src
@@ -50,6 +50,7 @@ TabPage RID_SVXPAGE_OPTIONS_JAVA
};
CheckBox CB_JAVA_ENABLE
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE";
Pos = MAP_APPFONT ( 12, 14 ) ;
Size = MAP_APPFONT ( 242 , 10 ) ;
Text [ en-US ] = "~Use a Java runtime environment" ;
@@ -75,18 +76,21 @@ TabPage RID_SVXPAGE_OPTIONS_JAVA
};
PushButton PB_ADD
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD";
Pos = MAP_APPFONT ( 204 , 38 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Add..." ;
};
PushButton PB_PARAMETER
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER";
Pos = MAP_APPFONT ( 204 , 55 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Parameters..." ;
};
PushButton PB_CLASSPATH
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH";
Pos = MAP_APPFONT ( 204 , 72 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Class Path..." ;
@@ -135,12 +139,14 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER
};
Edit ED_PARAMETER
{
+ HelpID = "cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER";
Pos = MAP_APPFONT ( 6 , 15 ) ;
Size = MAP_APPFONT ( 202 , 12 ) ;
Border = TRUE ;
};
PushButton PB_ASSIGN
{
+ HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN";
Pos = MAP_APPFONT ( 214 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Assign" ;
@@ -153,6 +159,7 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER
};
ListBox LB_ASSIGNED
{
+ HelpID = "cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 42 ) ;
Size = MAP_APPFONT ( 202 , 53 ) ;
@@ -166,6 +173,7 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER
};
PushButton PB_REMOVE
{
+ HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE";
Pos = MAP_APPFONT ( 214 , 42 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Remove" ;
@@ -211,6 +219,7 @@ ModalDialog RID_SVXDLG_JAVA_CLASSPATH
};
ListBox LB_PATH
{
+ HelpID = "cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH";
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 172 , 72 ) ;
Border = TRUE ;
@@ -218,18 +227,21 @@ ModalDialog RID_SVXDLG_JAVA_CLASSPATH
};
PushButton PB_ADDARCHIVE
{
+ HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE";
Pos = MAP_APPFONT ( 184 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Add Archive..." ;
};
PushButton PB_ADDPATH
{
+ HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH";
Pos = MAP_APPFONT ( 184 , 31 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Add ~Folder" ;
};
PushButton PB_REMOVE_PATH
{
+ HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH";
Pos = MAP_APPFONT ( 184 , 48 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Remove" ;
diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src
index 98963647e9c4..463e68881e4c 100644
--- a/cui/source/options/optjsearch.src
+++ b/cui/source/options/optjsearch.src
@@ -45,96 +45,112 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
};
CheckBox CB_MATCH_CASE
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~uppercase/lowercase";
};
CheckBox CB_MATCH_FULL_HALF_WIDTH
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH";
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~full-width/half-width forms";
};
CheckBox CB_MATCH_HIRAGANA_KATAKANA
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA";
Pos = MAP_APPFONT ( 12 , 42 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~hiragana/katakana";
};
CheckBox CB_MATCH_CONTRACTIONS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS";
Pos = MAP_APPFONT ( 12 , 56 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~contractions (yo-on, sokuon)";
};
CheckBox CB_MATCH_MINUS_DASH_CHOON
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON";
Pos = MAP_APPFONT ( 12 , 70 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~minus/dash/cho-on";
};
CheckBox CB_MATCH_REPEAT_CHAR_MARKS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS";
Pos = MAP_APPFONT ( 12 , 84 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "'re~peat character' marks";
};
CheckBox CB_MATCH_VARIANT_FORM_KANJI
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI";
Pos = MAP_APPFONT ( 12 , 98 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~variant-form kanji (itaiji)";
};
CheckBox CB_MATCH_OLD_KANA_FORMS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS";
Pos = MAP_APPFONT ( 12 , 112) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~old Kana forms";
};
CheckBox CB_MATCH_DIZI_DUZU
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU";
Pos = MAP_APPFONT ( 136 , 14 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~di/zi, du/zu";
};
CheckBox CB_MATCH_BAVA_HAFA
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA";
Pos = MAP_APPFONT ( 136 , 28 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~ba/va, ha/fa";
};
CheckBox CB_MATCH_TSITHICHI_DHIZI
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI";
Pos = MAP_APPFONT ( 136 , 42 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~tsi/thi/chi, dhi/zi";
};
CheckBox CB_MATCH_HYUFYU_BYUVYU
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU";
Pos = MAP_APPFONT ( 136 , 56 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "h~yu/fyu, byu/vyu";
};
CheckBox CB_MATCH_SESHE_ZEJE
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE";
Pos = MAP_APPFONT ( 136 , 70 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~se/she, ze/je";
};
CheckBox CB_MATCH_IAIYA
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA";
Pos = MAP_APPFONT ( 136 , 84 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~ia/iya (piano/piyano)";
};
CheckBox CB_MATCH_KIKU
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU";
Pos = MAP_APPFONT ( 136 , 98 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~ki/ku (tekisuto/tekusuto)";
};
CheckBox CB_MATCH_PROLONGED_SOUNDMARK
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK";
Pos = MAP_APPFONT ( 136 , 112 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "Prolon~ged vowels (ka-/kaa)";
@@ -147,18 +163,21 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
};
CheckBox CB_IGNORE_PUNCTUATION
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION";
Pos = MAP_APPFONT ( 12 , 139 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "Pu~nctuation characters";
};
CheckBox CB_IGNORE_WHITESPACES
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES";
Pos = MAP_APPFONT ( 12 , 153 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "~Whitespace characters";
};
CheckBox CB_IGNORE_MIDDLE_DOT
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT";
Pos = MAP_APPFONT ( 136 , 139 ) ;
Size = MAP_APPFONT ( 118 , 10 ) ;
Text [ en-US ] = "Midd~le dots";
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index f5bfd351ae45..dd7f3ddb840f 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1140,7 +1140,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
{
pCheckButtonData = NULL;
- aLinguModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
+ aLinguModulesCLB.SetStyle( aLinguModulesCLB.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
aLinguModulesCLB.SetHelpId(HID_CLB_LINGU_MODULES );
aLinguModulesCLB.SetHighlightRange();
aLinguModulesCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl ));
@@ -1150,7 +1150,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
aLinguModulesEditPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl ));
aLinguOptionsEditPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl ));
- aLinguDicsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
+ aLinguDicsCLB.SetStyle( aLinguDicsCLB.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
aLinguDicsCLB.SetHelpId(HID_CLB_EDIT_MODULES_DICS );
aLinguDicsCLB.SetHighlightRange();
aLinguDicsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl ));
@@ -1160,7 +1160,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
aLinguDicsEditPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl ));
aLinguDicsDelPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl ));
- aLinguOptionsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
+ aLinguOptionsCLB.SetStyle( aLinguOptionsCLB.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
aLinguOptionsCLB.SetHelpId(HID_CLB_LINGU_OPTIONS );
aLinguOptionsCLB.SetHighlightRange();
aLinguOptionsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl ));
@@ -2050,7 +2050,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData)
pDefaultLinguData = new SvxLinguData_Impl( rLinguData );
- aModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
+ aModulesCLB.SetStyle( aModulesCLB.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
aModulesCLB.SetHighlightRange();
aModulesCLB.SetHelpId(HID_CLB_EDIT_MODULES_MODULES );
aModulesCLB.SetSelectHdl( LINK( this, SvxEditModulesDlg, SelectHdl_Impl ));
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index be0378f171e8..ace1f8e193bf 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -59,6 +59,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
};
ListBox LB_EDIT_MODULES_LANGUAGE
{
+ HelpID = "cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE";
Border = TRUE ;
Pos = MAP_APPFONT ( 83 , 14 ) ;
Size = MAP_APPFONT ( 95 , 80 ) ;
@@ -74,6 +75,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
};
PushButton PB_EDIT_MODULES_PRIO_UP
{
+ HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP";
Pos = MAP_APPFONT ( 184 , 32 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
@@ -81,6 +83,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
};
PushButton PB_EDIT_MODULES_PRIO_DOWN
{
+ HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN";
Pos = MAP_APPFONT ( 184 , 49 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
@@ -88,6 +91,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
};
PushButton PB_EDIT_MODULES_PRIO_BACK
{
+ HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK";
Pos = MAP_APPFONT ( 184 , 66 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
@@ -164,6 +168,7 @@ ModalDialog RID_SVXDLG_LNG_ED_NUM_PREBREAK
};
NumericField ED_PREBREAK
{
+ HelpID = "cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK";
Border = TRUE ;
Pos = MAP_APPFONT ( 56 , 14 ) ;
Size = MAP_APPFONT ( 31 , 12 ) ;
@@ -220,6 +225,7 @@ TabPage RID_SFXPAGE_LINGU
};
PushButton PB_LINGU_MODULES_EDIT
{
+ HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT";
Pos = MAP_APPFONT ( 198 , 25 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -241,6 +247,7 @@ TabPage RID_SFXPAGE_LINGU
};
PushButton PB_LINGU_DICS_NEW_DIC
{
+ HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC";
Pos = MAP_APPFONT ( 198 , 70 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -248,6 +255,7 @@ TabPage RID_SFXPAGE_LINGU
};
PushButton PB_LINGU_DICS_EDIT_DIC
{
+ HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC";
Pos = MAP_APPFONT ( 198 , 87 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -255,6 +263,7 @@ TabPage RID_SFXPAGE_LINGU
};
PushButton PB_LINGU_DICS_DEL_DIC
{
+ HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC";
Pos = MAP_APPFONT ( 198 , 104 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -276,6 +285,7 @@ TabPage RID_SFXPAGE_LINGU
};
PushButton PB_LINGU_OPTIONS_EDIT
{
+ HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT";
Pos = MAP_APPFONT ( 198 , 133 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src
index 557fa6a8d960..5c95cbb53aa6 100644
--- a/cui/source/options/optmemory.src
+++ b/cui/source/options/optmemory.src
@@ -51,6 +51,7 @@ TabPage OFA_TP_MEMORY
};
NumericField ED_UNDO
{
+ HelpID = "cui:NumericField:OFA_TP_MEMORY:ED_UNDO";
Border = TRUE ;
Pos = MAP_APPFONT( COL3, ROW1 );
Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -80,6 +81,7 @@ TabPage OFA_TP_MEMORY
};
NumericField NF_GRAPHICCACHE
{
+ HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE";
Border = TRUE ;
Pos = MAP_APPFONT( COL3, ROW3 );
Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -103,6 +105,7 @@ TabPage OFA_TP_MEMORY
};
NumericField NF_GRAPHICOBJECTCACHE
{
+ HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE";
Border = TRUE ;
Pos = MAP_APPFONT( COL3, ROW4 );
Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -127,6 +130,7 @@ TabPage OFA_TP_MEMORY
};
TimeField TF_GRAPHICOBJECTTIME
{
+ HelpID = "cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME";
Border = TRUE ;
Pos = MAP_APPFONT( COL3, ROW5 );
Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -179,6 +183,7 @@ TabPage OFA_TP_MEMORY
};
NumericField NF_OLECACHE
{
+ HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE";
Border = TRUE ;
Pos = MAP_APPFONT( COL3, ROW7 );
Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -195,6 +200,7 @@ TabPage OFA_TP_MEMORY
};
CheckBox CB_QUICKLAUNCH
{
+ HelpID = "cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH";
Pos = MAP_APPFONT( COL1, ROW9 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Load %PRODUCTNAME during system start-up";
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index f3d31aa33025..3a7bb6328bdf 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -35,7 +35,6 @@
#include <vcl/msgbox.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/app.hxx>
-#include <svl/pickerhelper.hxx>
#include <svl/aeitem.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/filedlg.hxx>
@@ -254,7 +253,6 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) :
WinBits nBits = WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP;
pPathBox = new svx::OptHeaderTabListBox( &aPathCtrl, nBits );
aPathCtrl.SetFocusControl( pPathBox );
- pPathBox->SetWindowBits( nBits );
pPathBox->SetDoubleClickHdl( aLink );
pPathBox->SetSelectHdl( LINK( this, SvxPathTabPage, PathSelect_Impl ) );
pPathBox->SetSelectionMode( MULTIPLE_SELECTION );
@@ -639,8 +637,6 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG )
xFolderPicker = ::com::sun::star::uno::Reference< XFolderPicker >(
xFactory->createInstance( aService ), UNO_QUERY );
-// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER );
-
INetURLObject aURL( sWritable, INET_PROT_FILE );
xFolderPicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
index 6b02abb5764a..6adf8fa875ce 100644
--- a/cui/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -65,12 +65,14 @@ TabPage RID_SFXPAGE_PATH
};
PushButton BTN_PATH
{
+ HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_PATH";
Pos = MAP_APPFONT ( 183 , 165 ) ;
Size = MAP_APPFONT ( 65 , 14 ) ;
Text [ en-US ] = "~Edit..." ;
};
PushButton BTN_STANDARD
{
+ HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD";
Pos = MAP_APPFONT ( 115 , 165 ) ;
Size = MAP_APPFONT ( 65 , 14 ) ;
Text [ en-US ] = "~Default" ;
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 36fc60e94435..35ca394e2e57 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -51,12 +51,14 @@ TabPage RID_SFXPAGE_SAVE
};
CheckBox CB_LOAD_SETTINGS
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS";
Pos = MAP_APPFONT ( 12 , 11 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "Load user-specific settings with the document";
};
CheckBox CB_LOAD_DOCPRINTER
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER";
Pos = MAP_APPFONT ( 12 , 22 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "Load printer settings with the document";
@@ -69,6 +71,7 @@ TabPage RID_SFXPAGE_SAVE
};
CheckBox BTN_DOCINFO
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_DOCINFO";
Pos = MAP_APPFONT ( 12 , 41 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "~Edit document properties before saving" ;
@@ -82,18 +85,21 @@ TabPage RID_SFXPAGE_SAVE
};
CheckBox BTN_BACKUP
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP";
Pos = MAP_APPFONT ( 12 , 52 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "Al~ways create backup copy" ;
};
CheckBox BTN_AUTOSAVE
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE";
Pos = MAP_APPFONT ( 12 , 63 ) ;
Size = MAP_APPFONT ( 150 , 10 ) ;
Text [ en-US ] = "Save ~AutoRecovery information every" ;
};
NumericField ED_AUTOSAVE
{
+ HelpID = "cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE";
Border = TRUE ;
Pos = MAP_APPFONT ( 180 , 62 ) ;
Size = MAP_APPFONT ( 21 , 12 ) ;
@@ -116,12 +122,14 @@ TabPage RID_SFXPAGE_SAVE
};
CheckBox BTN_RELATIVE_FSYS
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS";
Pos = MAP_APPFONT ( 12 , 74 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "Save URLs relative to file system" ;
};
CheckBox BTN_RELATIVE_INET
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET";
Pos = MAP_APPFONT ( 12 , 85 ) ;
Size = MAP_APPFONT ( 248 , 10 ) ;
Text [ en-US ] = "Save URLs relative to internet" ;
@@ -140,6 +148,7 @@ TabPage RID_SFXPAGE_SAVE
};
ListBox LB_ODF_VERSION
{
+ HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_ODF_VERSION";
Pos = MAP_APPFONT ( 136 , 105 ) ;
Size = MAP_APPFONT ( 108 , 58 ) ;
Border = TRUE;
@@ -153,12 +162,14 @@ TabPage RID_SFXPAGE_SAVE
};
CheckBox BTN_NOPRETTYPRINTING
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING";
Pos = MAP_APPFONT ( 12 , 120 ) ;
Size = MAP_APPFONT ( 248 , 10 ) ;
Text [ en-US ] = "Size optimization for ODF format" ;
};
CheckBox BTN_WARNALIENFORMAT
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT";
Pos = MAP_APPFONT ( 12 , 131 ) ;
Size = MAP_APPFONT ( 248 , 10 ) ;
Text [ en-US ] = "Warn when not saving in ODF or default format" ;
@@ -177,6 +188,7 @@ TabPage RID_SFXPAGE_SAVE
};
ListBox LB_APP
{
+ HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_APP";
Pos = MAP_APPFONT ( 12 , 153 ) ;
Size = MAP_APPFONT ( 108 , 58 ) ;
Border = TRUE;
@@ -200,6 +212,7 @@ TabPage RID_SFXPAGE_SAVE
};
ListBox LB_FILTER
{
+ HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER";
Pos = MAP_APPFONT ( 136 , 153 ) ;
Size = MAP_APPFONT ( 108 , 58 ) ;
Border = TRUE;
diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src
index e4241d4e4bb4..8072c8ff6e23 100644
--- a/cui/source/options/optspell.src
+++ b/cui/source/options/optspell.src
@@ -39,6 +39,7 @@ TabPage RID_SFXPAGE_SPELL
Text [ en-US ] = "Spellcheck" ;
PushButton BTN_BOOK
{
+ HelpID = "cui:PushButton:RID_SFXPAGE_SPELL:BTN_BOOK";
Pos = MAP_APPFONT ( 128 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Edit..." ;
@@ -46,6 +47,7 @@ TabPage RID_SFXPAGE_SPELL
};
MultiListBox LB_BOOK
{
+ HelpID = "cui:MultiListBox:RID_SFXPAGE_SPELL:LB_BOOK";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 103 , 47 ) ;
@@ -62,6 +64,7 @@ TabPage RID_SFXPAGE_SPELL
};
CheckBox BTN_CAPS
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_CAPS";
Pos = MAP_APPFONT ( 12 , 82 ) ;
Size = MAP_APPFONT ( 103 , 10 ) ;
/* ### ACHTUNG: Neuer Text in Resource? ~Großgeschriebene Wörter : ~Gro˜geschriebene W÷rter */
@@ -71,6 +74,7 @@ TabPage RID_SFXPAGE_SPELL
};
CheckBox BTN_NUMS
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_NUMS";
Pos = MAP_APPFONT ( 12 , 95 ) ;
Size = MAP_APPFONT ( 103 , 10 ) ;
/* ### ACHTUNG: Neuer Text in Resource? ~Wörter mit Ziffern : ~W÷rter mit Ziffern */
@@ -80,6 +84,7 @@ TabPage RID_SFXPAGE_SPELL
};
CheckBox BTN_UPLOW
{
+ HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_UPLOW";
Pos = MAP_APPFONT ( 12 , 108 ) ;
Size = MAP_APPFONT ( 103 , 10 ) ;
/* ### ACHTUNG: Neuer Text in Resource? Groß- u. ~Kleinschreibung : Gro˜- u. ~Kleinschreibung */
diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src
index 094e23c2e60a..6b271b91c71c 100644
--- a/cui/source/options/optupdt.src
+++ b/cui/source/options/optupdt.src
@@ -47,24 +47,28 @@ TabPage RID_SVXPAGE_ONLINEUPDATE
};
CheckBox CB_AUTOCHECK
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK";
Pos = MAP_APPFONT ( 12, 14 ) ;
Size = MAP_APPFONT ( 210, 10 ) ;
Text [ en-US ] = "~Check for updates automatically" ;
};
RadioButton RB_EVERYDAY
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY";
Pos = MAP_APPFONT ( 18, 27 ) ;
Size = MAP_APPFONT ( 160, 10 ) ;
Text [ en-US ] = "Every Da~y" ;
};
RadioButton RB_EVERYWEEK
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK";
Pos = MAP_APPFONT ( 18, 40 ) ;
Size = MAP_APPFONT ( 160, 10 ) ;
Text [ en-US ] = "Every ~Week" ;
};
RadioButton RB_EVERYMONTH
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH";
Pos = MAP_APPFONT ( 18, 53 ) ;
Size = MAP_APPFONT ( 160, 10 ) ;
Text [ en-US ] = "Every ~Month" ;
@@ -77,12 +81,14 @@ TabPage RID_SVXPAGE_ONLINEUPDATE
};
PushButton PB_CHECKNOW
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW";
Pos = MAP_APPFONT ( 12, 82 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "Check ~now" ;
};
CheckBox CB_AUTODOWNLOAD
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD";
Pos = MAP_APPFONT ( 12, 130 ) ;
Size = MAP_APPFONT ( 160, 10 ) ;
Text [ en-US ] = "~Download updates automatically" ;
@@ -100,6 +106,7 @@ TabPage RID_SVXPAGE_ONLINEUPDATE
};
PushButton PB_CHANGEPATH
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH";
Pos = MAP_APPFONT ( 162, 151 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "Ch~ange..." ;
diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src
index de7d7b23dc37..4e946bfbfd9a 100644
--- a/cui/source/options/securityoptions.src
+++ b/cui/source/options/securityoptions.src
@@ -61,6 +61,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
};
CheckBox CB_SAVESENDDOCS
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS";
Pos = MAP_APPFONT( COL_2, ROW_2 );
Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "When saving or sending";
@@ -72,6 +73,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
};
CheckBox CB_SIGNDOCS
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS";
Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X, ROW_2 );
Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "When signing";
@@ -83,6 +85,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
};
CheckBox CB_PRINTDOCS
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS";
Pos = MAP_APPFONT( COL_2, ROW_3 );
Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "When printing";
@@ -94,6 +97,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
};
CheckBox CB_CREATEPDF
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF";
Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X, ROW_3 );
Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "When creating PDF files";
@@ -111,6 +115,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
};
CheckBox CB_REMOVEINFO
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO";
Pos = MAP_APPFONT( COL_1, ROW_5 );
Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Remove personal information on saving";
@@ -122,6 +127,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
};
CheckBox CB_RECOMMENDPWD
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD";
Pos = MAP_APPFONT( COL_1, ROW_6 );
Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Recommend password protection on saving";
@@ -133,6 +139,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
};
CheckBox CB_CTRLHYPERLINK
{
+ HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK";
Pos = MAP_APPFONT( COL_1, ROW_7 );
Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Ctrl-click required to follow hyperlinks";
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 581ab33ad467..ee82e89b93b3 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -891,9 +891,9 @@ void OfaTreeOptionsDialog::InitTreeAndHandler()
delete pIsoRes;
aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX );
- aTreeLB.SetWindowBits( WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+ aTreeLB.SetStyle( aTreeLB.GetStyle()|WB_HASBUTTONS | WB_HASBUTTONSATROOT |
WB_HASLINES | WB_HASLINESATROOT |
- WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
+ WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE | WB_QUICK_SEARCH );
aTreeLB.SetSpaceBetweenEntries( 0 );
aTreeLB.SetSelectionMode( SINGLE_SELECTION );
aTreeLB.SetSublistOpenWithLeftRight( TRUE );
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index cba8cd1e411b..b845bf29316d 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -63,6 +63,7 @@ ModalDialog RID_OFADLG_OPTIONS_TREE
};
PushButton PB_BACK
{
+ HelpID = "cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK";
Pos = MAP_APPFONT ( COL_10, ROW_3 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index c52168fb1ab6..dc59e4ce986d 100755..100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -52,7 +52,7 @@ namespace svx
PasswordTable::PasswordTable( Window* pParent, const ResId& rResId ) :
SvxSimpleTable( pParent, rResId )
{
- SetWindowBits( GetStyle() | WB_NOINITIALSELECTION );
+ SetStyle( GetStyle() | WB_NOINITIALSELECTION );
}
void PasswordTable::InsertHeaderItem( USHORT nColumn, const String& rText, HeaderBarItemBits nBits )
diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src
index 68560c1ecaa7..86c3a52509f6 100644
--- a/cui/source/options/webconninfo.src
+++ b/cui/source/options/webconninfo.src
@@ -56,18 +56,21 @@ ModalDialog RID_SVXDLG_WEBCONNECTION_INFO
};
PushButton PB_REMOVE
{
+ HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE";
Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "Remove";
};
PushButton PB_REMOVEALL
{
+ HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL";
Pos = MAP_APPFONT ( COL_1 , ROW_3 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "Remove All";
};
PushButton PB_CHANGE
{
+ HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE";
Pos = MAP_APPFONT ( COL_C , ROW_3 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Text [ en-US ] = "Change Password...";
diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src
index 807bfdb56132..acaa9234b87d 100644
--- a/cui/source/tabpages/align.src
+++ b/cui/source/tabpages/align.src
@@ -57,6 +57,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
ListBox LB_HORALIGN
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN";
Border = TRUE;
Pos = MAP_APPFONT ( 12 , 25 );
Size = MAP_APPFONT ( 100 , 60 );
@@ -80,6 +81,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
MetricField ED_INDENT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_ALIGNMENT:ED_INDENT";
Border = TRUE ;
Pos = MAP_APPFONT ( 118 , 25 ) ;
Size = MAP_APPFONT ( 36 , 12 ) ;
@@ -98,6 +100,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
ListBox LB_VERALIGN
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN";
Border = TRUE;
Pos = MAP_APPFONT ( 160 , 25 );
Size = MAP_APPFONT ( 88 , 60 );
@@ -119,6 +122,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
TriStateBox BTN_TXTSTACKED
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED";
Pos = MAP_APPFONT ( 133 , 54 ) ;
Size = MAP_APPFONT ( 115 , 10 ) ;
TabStop = TRUE ;
@@ -139,6 +143,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
NumericField NF_DEGREES
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_ALIGNMENT:NF_DEGREES";
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 65 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -165,6 +170,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
TriStateBox BTN_ASIAN_VERTICAL
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL";
Pos = MAP_APPFONT ( 143 , 68 ) ;
Size = MAP_APPFONT ( 105 , 10 ) ;
TabStop = TRUE ;
@@ -178,18 +184,21 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
TriStateBox BTN_WRAP
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP";
Pos = MAP_APPFONT ( 12 , 126 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "~Wrap text automatically" ;
};
TriStateBox BTN_HYPH
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH";
Pos = MAP_APPFONT ( 22 , 139 ) ;
Size = MAP_APPFONT ( 226 , 10 ) ;
Text [ en-US ] = "Hyphenation ~active";
};
TriStateBox BTN_SHRINK
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK";
Pos = MAP_APPFONT( 12, 152 );
Size = MAP_APPFONT( 236, 10 );
Text [ en-US ] = "~Shrink to fit cell size";
@@ -202,6 +211,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
};
ListBox LB_FRAMEDIR
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR";
Pos = MAP_APPFONT( 78 , 168 );
Size = MAP_APPFONT( 170 , 50 );
Border = TRUE;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 0ee3c38c1e1d..05ec88e5aa7f 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -493,7 +493,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
SvtSysLocale aSysLcl;
aCheckLB.SetHelpId(HID_OFAPAGE_AUTOFORMAT_CLB);
- aCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL);
+ aCheckLB.SetStyle(aCheckLB.GetStyle()|WB_HSCROLL| WB_VSCROLL);
aCheckLB.SetSelectHdl(LINK(this, OfaSwAutoFmtOptionsPage, SelectHdl));
aCheckLB.SetDoubleClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, EditHdl));
@@ -1022,7 +1022,7 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
static long nTabs[] = { 2 /* Tab-Count */, 1, 61 };
aReplaceTLB.SetTabs( &nTabs[0], MAP_APPFONT );
- aReplaceTLB.SetWindowBits(WB_HSCROLL|WB_CLIPCHILDREN);
+ aReplaceTLB.SetStyle(aReplaceTLB.GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN);
aReplaceTLB.SetSelectHdl(LINK(this, OfaAutocorrReplacePage, SelectHdl));
aNewReplacePB.SetClickHdl( LINK(this, OfaAutocorrReplacePage, NewDelHdl));
aDeleteReplacePB.SetClickHdl(LINK(this, OfaAutocorrReplacePage, NewDelHdl));
@@ -2076,7 +2076,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
3, 0, 20, 40
};
- aSwCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL);
+ aSwCheckLB.SetStyle(aSwCheckLB.GetStyle() | WB_HSCROLL| WB_VSCROLL);
aSwCheckLB.SvxSimpleTable::SetTabs(aStaticTabs);
String sHeader( sHeader1 );
@@ -2647,7 +2647,7 @@ OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent,
FreeResource();
// some options for the list box:
- m_aSmartTagTypesLB.SetWindowBits( m_aSmartTagTypesLB.GetStyle() | WB_HSCROLL | WB_HIDESELECTION );
+ m_aSmartTagTypesLB.SetStyle( m_aSmartTagTypesLB.GetStyle() | WB_HSCROLL | WB_HIDESELECTION );
m_aSmartTagTypesLB.SetHighlightRange();
// set the handlers:
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 9db3dbeb43b4..d698a8f8aa47 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -173,6 +173,7 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY
};
PushButton PB_EDIT
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT";
Pos = MAP_APPFONT ( 6 , 162 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Edit..." ;
@@ -247,7 +248,7 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY
ModalDialog RID_OFADLG_PRCNT_SET
{
- HelpID = SID_AUTOFORMAT ;
+ HelpID = CMD_SID_AUTOFORMAT ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 155 , 43 ) ;
@@ -273,6 +274,7 @@ ModalDialog RID_OFADLG_PRCNT_SET
};
MetricField ED_RIGHT_MARGIN
{
+ HelpID = "cui:MetricField:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 7 , 14 ) ;
Size = MAP_APPFONT ( 31 , 12 ) ;
@@ -312,6 +314,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
};
Edit ED_SHORT
{
+ HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT";
Pos = MAP_APPFONT ( 7 , 13 ) ;
Size = MAP_APPFONT ( 60 , 12 ) ;
Border = TRUE ;
@@ -326,6 +329,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
};
Edit ED_REPLACE
{
+ HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE";
Pos = MAP_APPFONT ( 71 , 13 ) ;
Size = MAP_APPFONT ( 123 , 12 ) ;
Border = TRUE ;
@@ -333,6 +337,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
};
CheckBox CB_TEXT_ONLY
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY";
Pos = MAP_APPFONT ( 140 , 3 ) ;
Size = MAP_APPFONT ( 108 , 10 ) ;
TabStop = TRUE ;
@@ -340,6 +345,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
};
PushButton PB_NEW_REPLACE
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE";
Pos = MAP_APPFONT ( 198 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -347,6 +353,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
};
PushButton PB_DELETE_REPLACE
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE";
Pos = MAP_APPFONT ( 198 , 32 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -385,6 +392,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
};
Edit ED_ABBREV
{
+ HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV";
Pos = MAP_APPFONT ( 7 , 14 ) ;
Size = MAP_APPFONT ( 123 , 12 ) ;
TabStop = TRUE ;
@@ -392,6 +400,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
};
ListBox LB_ABBREV
{
+ HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV";
Pos = MAP_APPFONT ( 7 , 30 ) ;
Size = MAP_APPFONT ( 123 , 58 ) ;
TabStop = TRUE ;
@@ -401,6 +410,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
};
PushButton PB_NEWABBREV
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV";
Pos = MAP_APPFONT ( 198 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -409,6 +419,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
};
PushButton PB_DELABBREV
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV";
Pos = MAP_APPFONT ( 198 , 31 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -417,6 +428,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
};
CheckBox CB_AUTOABBREV
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV";
Pos = MAP_APPFONT ( 137 , 78 ) ;
Size = MAP_APPFONT ( 111 , 10 ) ;
Text [ en-US ] = "~AutoInclude";
@@ -431,6 +443,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
};
Edit ED_DOUBLE_CAPS
{
+ HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS";
Pos = MAP_APPFONT ( 7 , 105 ) ;
Size = MAP_APPFONT ( 123 , 12 ) ;
TabStop = TRUE ;
@@ -438,6 +451,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
};
ListBox LB_DOUBLE_CAPS
{
+ HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS";
Pos = MAP_APPFONT ( 7 , 120 ) ;
Size = MAP_APPFONT ( 123 , 59 ) ;
TabStop = TRUE ;
@@ -447,6 +461,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
};
PushButton PB_NEWDOUBLECAPS
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS";
Pos = MAP_APPFONT ( 198 , 105 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Disable = TRUE ;
@@ -454,6 +469,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
};
PushButton PB_DELDOUBLECAPS
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS";
Pos = MAP_APPFONT ( 198 , 122 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Disable = TRUE ;
@@ -461,6 +477,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
};
CheckBox CB_AUTOCAPS
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS";
Pos = MAP_APPFONT ( 137 , 169 ) ;
Size = MAP_APPFONT ( 111 , 10 ) ;
Text [ en-US ] = "A~utoInclude";
@@ -509,8 +526,9 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
Size = MAP_APPFONT ( 122 , 8 ) ;
Text [ en-US ] = "Single quotes" ;
};
- Checkbox CB_SGL_TYPO
+ CheckBox CB_SGL_TYPO
{
+ HelpId = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO";
Pos = MAP_APPFONT ( 7 , 101 ) ;
Size = MAP_APPFONT ( 86 , 10 ) ;
Text [ en-US ] = "Repla~ce" ;
@@ -523,6 +541,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
};
PushButton PB_SGL_STARTQUOTE
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE";
Pos = MAP_APPFONT ( 10 , 125 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Text = "\'" ;
@@ -541,6 +560,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
};
PushButton PB_SGL_ENDQUOTE
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE";
Pos = MAP_APPFONT ( 10 , 151 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Text = "\'" ;
@@ -553,6 +573,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
};
PushButton PB_SGL_STD
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD";
Pos = MAP_APPFONT ( 7 , 167 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -566,6 +587,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
};
CheckBox CB_TYPO
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO";
Pos = MAP_APPFONT ( 137 , 101 ) ;
Size = MAP_APPFONT ( 86 , 10 ) ;
TabStop = TRUE ;
@@ -579,6 +601,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
};
PushButton PB_STARTQUOTE
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE";
Pos = MAP_APPFONT ( 140 , 125 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Text = "\"" ;
@@ -597,6 +620,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
};
PushButton PB_ENDQUOTE
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE";
Pos = MAP_APPFONT ( 140 , 151 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Text = "\"" ;
@@ -609,6 +633,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
};
PushButton PB_DBL_STD
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD";
Pos = MAP_APPFONT ( 137 , 167 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
@@ -642,30 +667,35 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
Hide = TRUE ;
CheckBox CB_ACTIV
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV";
Pos = MAP_APPFONT( 4, 3 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Enable word ~completion";
};
CheckBox CB_APPEND_SPACE
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE";
Pos = MAP_APPFONT( 10, 17 );
Size = MAP_APPFONT( 110, 10 );
Text [ en-US ] = "~Append space";
};
CheckBox CB_AS_TIP
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP";
Pos = MAP_APPFONT( 10, 31 );
Size = MAP_APPFONT( 110, 10 );
Text [ en-US ] = "~Show as tip";
};
CheckBox CB_COLLECT
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT";
Pos = MAP_APPFONT( 4, 45 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "C~ollect words";
};
CheckBox CB_REMOVE_LIST
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST";
Pos = MAP_APPFONT( 10, 59 );
Size = MAP_APPFONT( 110, 40 );
WordBreak = TRUE;
@@ -679,6 +709,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
};
ListBox DCB_EXPAND_KEY
{
+ HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY";
Pos = MAP_APPFONT( 4, 113 );
Size = MAP_APPFONT( 116, 60 );
TabStop = TRUE;
@@ -694,6 +725,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
};
NumericField NF_MIN_WORDLEN
{
+ HelpID = "cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN";
Border = TRUE;
Pos = MAP_APPFONT( 4, 140 );
Size = MAP_APPFONT( 30, 12 );
@@ -716,6 +748,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
};
NumericField NF_MAX_ENTRIES
{
+ HelpID = "cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES";
Border = TRUE;
Pos = MAP_APPFONT( 4, 167 );
Size = MAP_APPFONT( 30, 12 );
@@ -732,6 +765,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
};
MultiListBox LB_ENTRIES
{
+ HelpID = "cui:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES";
Pos = MAP_APPFONT( 127, 3 );
Size = MAP_APPFONT( 121, 158 );
TabStop = TRUE;
@@ -742,6 +776,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
};
PushButton PB_ENTRIES
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES";
Pos = MAP_APPFONT( 127, 165 );
Size = MAP_APPFONT( 121, 14 );
TabStop = TRUE ;
@@ -767,6 +802,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS
CheckBox CB_SMARTTAGS
{
+ HelpID = "cui:CheckBox:RID_OFAPAGE_SMARTTAG_OPTIONS:CB_SMARTTAGS";
Pos = MAP_APPFONT( 4, 3 );
Size = MAP_APPFONT( 116, 10 );
Text [ en-US ] = "Label text with smart tags";
@@ -789,6 +825,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS
PushButton PB_SMARTTAGS
{
+ HelpID = "cui:PushButton:RID_OFAPAGE_SMARTTAG_OPTIONS:PB_SMARTTAGS";
Pos = MAP_APPFONT ( 188 , 25 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "Properties...";
diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src
index 7f413f116aff..6d7c74e9b330 100644
--- a/cui/source/tabpages/backgrnd.src
+++ b/cui/source/tabpages/backgrnd.src
@@ -54,6 +54,7 @@ TabPage RID_SVXPAGE_BACKGROUND
};
ListBox LB_SELECTOR
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR";
Hide = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 33 , 3 ) ;
@@ -76,6 +77,7 @@ TabPage RID_SVXPAGE_BACKGROUND
};
ListBox LB_TBL_BOX
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX";
Hide = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 172 , 3 ) ;
@@ -90,6 +92,7 @@ TabPage RID_SVXPAGE_BACKGROUND
};
ListBox LB_PARA_BOX
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX";
Hide = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 172 , 3 ) ;
@@ -140,6 +143,7 @@ TabPage RID_SVXPAGE_BACKGROUND
};
MetricField MF_COL_TRANS
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_COL_TRANS";
Hide = TRUE ;
Pos = MAP_APPFONT ( 218 , 74 + RSC_SP_CTRL_Y ) ;
Size = MAP_APPFONT ( 30 , 12) ;
@@ -165,6 +169,7 @@ TabPage RID_SVXPAGE_BACKGROUND
};
PushButton BTN_BROWSE
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE";
Hide = TRUE ;
Pos = MAP_APPFONT ( 6 + RSC_SP_FLGR_INNERBORDER_LEFT , 23 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -172,6 +177,7 @@ TabPage RID_SVXPAGE_BACKGROUND
};
CheckBox BTN_LINK
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK";
Hide = TRUE ;
Pos = MAP_APPFONT ( 6 + RSC_SP_FLGR_INNERBORDER_LEFT + 60 + 2*RSC_SP_CTRL_X, 23 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + 3 ) ;
Size = MAP_APPFONT ( 78 , 10 ) ;
@@ -193,6 +199,7 @@ TabPage RID_SVXPAGE_BACKGROUND
};
RadioButton BTN_POSITION
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION";
Hide = TRUE ;
Pos = MAP_APPFONT ( 12 , 89 ) ;
Size = MAP_APPFONT ( 49 , 10 ) ;
@@ -200,6 +207,7 @@ TabPage RID_SVXPAGE_BACKGROUND
};
RadioButton BTN_AREA
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA";
Hide = TRUE ;
Pos = MAP_APPFONT ( 12 , 103 ) ;
Size = MAP_APPFONT ( 49 , 10 ) ;
@@ -208,6 +216,7 @@ TabPage RID_SVXPAGE_BACKGROUND
};
RadioButton BTN_TILE
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE";
Hide = TRUE ;
Pos = MAP_APPFONT ( 12 , 117 ) ;
Size = MAP_APPFONT ( 49 , 10 ) ;
@@ -231,6 +240,7 @@ TabPage RID_SVXPAGE_BACKGROUND
};
MetricField MF_GRAPH_TRANS
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_GRAPH_TRANS";
Hide = TRUE ;
Pos = MAP_APPFONT ( 12 , 168 ) ;
Size = MAP_APPFONT ( 30 , 12) ;
@@ -254,6 +264,7 @@ TabPage RID_SVXPAGE_BACKGROUND
};
CheckBox BTN_PREVIEW
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW";
Pos = MAP_APPFONT ( 170 , 23 + 4 + 139 + RSC_SP_CTRL_GROUP_Y ) ;
Size = MAP_APPFONT ( 141 , 10 ) ;
Text [ en-US ] = "Pre~view" ;
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index 811f5429aeb7..4fc781943d3a 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -93,6 +93,7 @@ TabPage RID_SVXPAGE_BORDER
};
ListBox LB_LINESTYLE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 25 ) ;
Size = MAP_APPFONT ( 74 , 66 ) ;
@@ -105,6 +106,7 @@ TabPage RID_SVXPAGE_BORDER
};
ListBox LB_LINECOLOR
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 106 ) ;
Size = MAP_APPFONT ( 74 , 68 ) ;
@@ -125,6 +127,7 @@ TabPage RID_SVXPAGE_BORDER
};
MetricField MF_LEFT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_LEFT";
Border = TRUE ;
Pos = MAP_APPFONT ( 213 , 14 ) ;
Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -146,6 +149,7 @@ TabPage RID_SVXPAGE_BORDER
};
MetricField MF_RIGHT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 213 , 30 ) ;
Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -167,6 +171,7 @@ TabPage RID_SVXPAGE_BORDER
};
MetricField MF_TOP
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_TOP";
Border = TRUE ;
Pos = MAP_APPFONT ( 213 , 46 ) ;
Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -188,6 +193,7 @@ TabPage RID_SVXPAGE_BORDER
};
MetricField MF_BOTTOM
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM";
Border = TRUE ;
Pos = MAP_APPFONT ( 213 , 62 ) ;
Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -203,6 +209,7 @@ TabPage RID_SVXPAGE_BORDER
};
CheckBox CB_SYNC
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC";
Pos = MAP_APPFONT ( 177 , 78 ) ;
Size = MAP_APPFONT ( 74 , 10 ) ;
Text [ en-US ] = "Synchronize";
@@ -236,6 +243,7 @@ TabPage RID_SVXPAGE_BORDER
};
MetricField ED_SHADOWSIZE
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 144 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -257,6 +265,7 @@ TabPage RID_SVXPAGE_BORDER
};
ListBox LB_SHADOWCOLOR
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR";
Border = TRUE ;
Pos = MAP_APPFONT ( 177 , 144 ) ;
Size = MAP_APPFONT ( 74 , 68 ) ;
@@ -278,6 +287,7 @@ TabPage RID_SVXPAGE_BORDER
};
CheckBox CB_MERGEWITHNEXT
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEWITHNEXT";
Pos = MAP_APPFONT ( 12 , 173 ) ;
Size = MAP_APPFONT ( 242 , 10 ) ;
Hide = TRUE;
@@ -285,6 +295,7 @@ TabPage RID_SVXPAGE_BORDER
};
CheckBox CB_MERGEADJACENTBORDERS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEADJACENTBORDERS";
Pos = MAP_APPFONT ( 12 , 173 ) ;
Size = MAP_APPFONT ( 242 , 10 ) ;
Hide = TRUE;
diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src
index 9673fc950f3f..60c511a87f61 100644
--- a/cui/source/tabpages/chardlg.src
+++ b/cui/source/tabpages/chardlg.src
@@ -58,6 +58,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ComboBox LB_WEST_NAME
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME";
Border = TRUE;
Pos = MAP_APPFONT ( 12 , 25 );
Size = MAP_APPFONT ( 80 , 72 );
@@ -66,6 +67,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ComboBox LB_WEST_NAME_NOCJK
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK";
Border = TRUE;
Pos = MAP_APPFONT ( 12 , 17 );
Size = MAP_APPFONT ( 112 , 71 );
@@ -86,6 +88,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ComboBox LB_WEST_STYLE
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE";
Border = TRUE;
Pos = MAP_APPFONT ( 96 , 25 );
Size = MAP_APPFONT ( 40 , 48 );
@@ -101,6 +104,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ComboBox LB_WEST_STYLE_NOCJK
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK";
Border = TRUE;
Pos = MAP_APPFONT ( 130 , 17 );
Size = MAP_APPFONT ( 72 , 71 );
@@ -128,6 +132,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
MetricBox LB_WEST_SIZE
{
+ HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE";
Border = TRUE;
Pos = MAP_APPFONT ( 140 , 25 );
Size = MAP_APPFONT ( 38 , 72 );
@@ -136,6 +141,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
MetricBox LB_WEST_SIZE_NOCJK
{
+ HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK";
Border = TRUE;
Pos = MAP_APPFONT ( 208 , 17 );
Size = MAP_APPFONT ( 40 , 71 );
@@ -156,6 +162,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ListBox LB_WEST_LANG
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG";
Border = TRUE;
Pos = MAP_APPFONT ( 182 , 25 );
Size = MAP_APPFONT ( 66 , 72 );
@@ -165,6 +172,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ListBox LB_WEST_LANG_NOCJK
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK";
Border = TRUE;
Pos = MAP_APPFONT ( 130 , 105 );
Size = MAP_APPFONT ( 72 , 72 );
@@ -186,6 +194,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ComboBox LB_EAST_NAME
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME";
Border = TRUE;
Pos = MAP_APPFONT ( 12 , 65 );
Size = MAP_APPFONT ( 80 , 72 );
@@ -200,6 +209,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ComboBox LB_EAST_STYLE
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE";
Border = TRUE;
Pos = MAP_APPFONT ( 96 , 65 );
Size = MAP_APPFONT ( 40 , 48 );
@@ -221,6 +231,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
MetricBox LB_EAST_SIZE
{
+ HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE";
Border = TRUE;
Pos = MAP_APPFONT ( 140 , 65 );
Size = MAP_APPFONT ( 38 , 72 );
@@ -235,6 +246,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ListBox LB_EAST_LANG
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG";
Border = TRUE;
Pos = MAP_APPFONT ( 182 , 65 );
Size = MAP_APPFONT ( 66 , 72 );
@@ -256,6 +268,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ComboBox LB_CTL_NAME
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME";
Border = TRUE;
Pos = MAP_APPFONT ( 12 , 105 );
Size = MAP_APPFONT ( 80 , 72 );
@@ -270,6 +283,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ComboBox LB_CTL_STYLE
{
+ HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE";
Border = TRUE;
Pos = MAP_APPFONT ( 96 , 105 );
Size = MAP_APPFONT ( 40 , 48 );
@@ -291,6 +305,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
MetricBox LB_CTL_SIZE
{
+ HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE";
Border = TRUE;
Pos = MAP_APPFONT ( 140 , 105 );
Size = MAP_APPFONT ( 38 , 72 );
@@ -305,6 +320,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ListBox LB_CTL_LANG
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG";
Border = TRUE;
Pos = MAP_APPFONT ( 182 , 105 );
Size = MAP_APPFONT ( 66 , 72 );
@@ -339,6 +355,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
};
ListBox LB_COLOR2
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2";
Border = TRUE;
Pos = MAP_APPFONT ( 12 , 105 );
Size = MAP_APPFONT ( 58 , 100 );
@@ -370,6 +387,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
ListBox LB_FONTCOLOR
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR";
Border = TRUE;
Pos = MAP_APPFONT ( 10 , 15 );
Size = MAP_APPFONT ( 82 , 72 );
@@ -384,6 +402,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
ListBox LB_EFFECTS2
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2";
Pos = MAP_APPFONT ( 10 , 44 ) ;
Size = MAP_APPFONT ( 82 , 56 ) ;
DropDown = TRUE;
@@ -404,6 +423,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
ListBox LB_RELIEF
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF";
Pos = MAP_APPFONT ( 10 , 73 ) ;
Size = MAP_APPFONT ( 82 , 56 ) ;
DropDown = TRUE;
@@ -416,18 +436,21 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
TriStateBox CB_OUTLINE
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE";
Pos = MAP_APPFONT ( 10 , 93 ) ;
Size = MAP_APPFONT ( 82 , 10 ) ;
Text [ en-US ] = "Out~line" ;
};
TriStateBox CB_SHADOW
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW";
Pos = MAP_APPFONT ( 10 , 107 ) ;
Size = MAP_APPFONT ( 82 , 10 ) ;
Text [ en-US ] = "Sha~dow" ;
};
TriStateBox CB_BLINKING
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING";
Pos = MAP_APPFONT ( 10 , 121 ) ;
Size = MAP_APPFONT ( 82 , 10 ) ;
Hide = TRUE;
@@ -435,6 +458,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
TriStateBox CB_CHARHIDDEN
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN";
Pos = MAP_APPFONT ( 10 , 135 ) ;
Size = MAP_APPFONT ( 82 , 10 ) ;
Text [ en-US ] = "H~idden" ;
@@ -453,6 +477,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
ListBox LB_OVERLINE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE";
Border = TRUE;
Pos = MAP_APPFONT ( 110 , 15 );
Size = MAP_APPFONT ( 68 , 72 );
@@ -487,6 +512,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
ListBox LB_OVERLINE_COLOR
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR";
Border = TRUE;
Pos = MAP_APPFONT ( 184 , 15 );
Size = MAP_APPFONT ( 68 , 100 );
@@ -501,6 +527,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
ListBox LB_STRIKEOUT
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT";
Border = TRUE;
Pos = MAP_APPFONT ( 110 , 44 );
Size = MAP_APPFONT ( 68 , 72 );
@@ -524,6 +551,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
ListBox LB_UNDERLINE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE";
Border = TRUE;
Pos = MAP_APPFONT ( 110 , 73 );
Size = MAP_APPFONT ( 68 , 72 );
@@ -558,6 +586,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
ListBox LB_UNDERLINE_COLOR
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR";
Border = TRUE;
Pos = MAP_APPFONT ( 184 , 73 );
Size = MAP_APPFONT ( 68 , 100 );
@@ -566,6 +595,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
CheckBox CB_INDIVIDUALWORDS
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS";
Pos = MAP_APPFONT ( 110 , 93 );
Size = MAP_APPFONT ( 68 , 10 );
TabStop = TRUE;
@@ -584,6 +614,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
ListBox LB_EMPHASIS
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS";
Border = TRUE;
Pos = MAP_APPFONT ( 110 , 128 );
Size = MAP_APPFONT ( 68 , 72 );
@@ -606,6 +637,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
};
ListBox LB_POSITION
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION";
Border = TRUE;
Pos = MAP_APPFONT ( 184 , 128 );
Size = MAP_APPFONT ( 68 , 48 );
@@ -680,6 +712,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
RadioButton RB_HIGHPOS
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS";
Pos = MAP_APPFONT ( 12 , 16 );
Size = MAP_APPFONT ( 58 , 10 );
Text [ en-US ] = "Superscript" ;
@@ -687,6 +720,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
RadioButton RB_NORMALPOS
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS";
Pos = MAP_APPFONT ( 12 , 30 );
Size = MAP_APPFONT ( 58 , 10 );
Text [ en-US ] = "Normal" ;
@@ -694,6 +728,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
RadioButton RB_LOWPOS
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS";
Pos = MAP_APPFONT ( 12 , 44 );
Size = MAP_APPFONT ( 58 , 10 );
Text [ en-US ] = "Subscript" ;
@@ -707,6 +742,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
MetricField ED_HIGHLOW
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW";
Border = TRUE;
Pos = MAP_APPFONT ( 136 , 14 );
Size = MAP_APPFONT ( 30 , 12 );
@@ -723,6 +759,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
CheckBox CB_HIGHLOW
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW";
Pos = MAP_APPFONT ( 172 , 16 );
Size = MAP_APPFONT ( 76 , 10 );
Text [ en-US ] = "A~utomatic" ;
@@ -736,6 +773,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
MetricField ED_FONTSIZE
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE";
Border = TRUE;
Pos = MAP_APPFONT ( 136 , 30 );
Size = MAP_APPFONT ( 30 , 12 );
@@ -764,6 +802,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
RadioButton RB_0_DEG
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG";
Pos = MAP_APPFONT ( 12 , 70 );
Size = MAP_APPFONT ( 46 , 10 );
TabStop = TRUE;
@@ -771,6 +810,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
RadioButton RB_90_DEG
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG";
Pos = MAP_APPFONT ( 62 , 70 );
Size = MAP_APPFONT ( 46 , 10 );
TabStop = TRUE;
@@ -778,6 +818,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
RadioButton RB_270_DEG
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG";
Pos = MAP_APPFONT ( 112 , 70 );
Size = MAP_APPFONT ( 46 , 10 );
TabStop = TRUE;
@@ -785,6 +826,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
CheckBox CB_FIT_TO_LINE
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE";
Pos = MAP_APPFONT ( 162 , 70 );
Size = MAP_APPFONT ( 86 , 10 );
TabStop = TRUE;
@@ -798,6 +840,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
MetricField MF_SCALE_WIDTH
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH";
Border = TRUE;
Pos = MAP_APPFONT ( 94 , 84 );
Size = MAP_APPFONT ( 30 , 12 );
@@ -820,6 +863,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
ListBox LB_KERNING2
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2";
Border = TRUE;
Pos = MAP_APPFONT ( 12 , 111 );
Size = MAP_APPFONT ( 72 , 48 ) ;
@@ -840,6 +884,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
MetricField ED_KERNING2
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2";
Border = TRUE;
Pos = MAP_APPFONT ( 112 , 111 );
Size = MAP_APPFONT ( 40 , 12 );
@@ -853,6 +898,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
};
CheckBox CB_PAIRKERNING
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING";
Pos = MAP_APPFONT ( 156 , 113 );
Size = MAP_APPFONT ( 92 , 10 );
Text [ en-US ] = "~Pair kerning" ;
@@ -887,6 +933,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
};
CheckBox CB_TWOLINES
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES";
Pos = MAP_APPFONT ( 12 , 14 );
Size = MAP_APPFONT ( 236 , 10 );
Text [ en-US ] = "~Write in double lines" ;
@@ -906,6 +953,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
};
ListBox ED_STARTBRACKET
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET";
Pos = MAP_APPFONT ( 12 , 52 );
Size = MAP_APPFONT ( 90 , 72 );
TabStop = TRUE;
@@ -928,6 +976,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
};
ListBox ED_ENDBRACKET
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET";
Pos = MAP_APPFONT ( 108 , 52 );
Size = MAP_APPFONT ( 90 , 72 );
TabStop = TRUE;
diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src
index 64623b0cee25..d2fe0796bb26 100644
--- a/cui/source/tabpages/connect.src
+++ b/cui/source/tabpages/connect.src
@@ -49,6 +49,7 @@ TabPage RID_SVXPAGE_CONNECTION
};
ListBox LB_TYPE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE";
Border = TRUE ;
Pos = MAP_APPFONT ( 37 , 6 ) ;
Size = MAP_APPFONT ( 83 , 54 ) ;
@@ -69,6 +70,7 @@ TabPage RID_SVXPAGE_CONNECTION
};
MetricField MTR_FLD_LINE_1
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1";
Border = TRUE ;
Pos = MAP_APPFONT ( 79 , 35 ) ;
Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -91,6 +93,7 @@ TabPage RID_SVXPAGE_CONNECTION
};
MetricField MTR_FLD_LINE_2
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2";
Border = TRUE ;
Pos = MAP_APPFONT ( 79 , 51 ) ;
Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -113,6 +116,7 @@ TabPage RID_SVXPAGE_CONNECTION
};
MetricField MTR_FLD_LINE_3
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3";
Border = TRUE ;
Pos = MAP_APPFONT ( 79 , 67 ) ;
Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -141,6 +145,7 @@ TabPage RID_SVXPAGE_CONNECTION
};
MetricField MTR_FLD_HORZ_1
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1";
Border = TRUE ;
Pos = MAP_APPFONT ( 79 , 96 ) ;
Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -163,6 +168,7 @@ TabPage RID_SVXPAGE_CONNECTION
};
MetricField MTR_FLD_HORZ_2
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2";
Border = TRUE ;
Pos = MAP_APPFONT ( 79 , 128 ) ;
Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -185,6 +191,7 @@ TabPage RID_SVXPAGE_CONNECTION
};
MetricField MTR_FLD_VERT_1
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1";
Border = TRUE ;
Pos = MAP_APPFONT ( 79 , 112 ) ;
Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -207,6 +214,7 @@ TabPage RID_SVXPAGE_CONNECTION
};
MetricField MTR_FLD_VERT_2
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2";
Border = TRUE ;
Pos = MAP_APPFONT ( 79 , 144 ) ;
Size = MAP_APPFONT ( 41 , 12 ) ;
diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src
index 18e38fd5236a..2c6e953e6b71 100644
--- a/cui/source/tabpages/dstribut.src
+++ b/cui/source/tabpages/dstribut.src
@@ -49,6 +49,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
RadioButton BTN_HOR_NONE
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 48 , 10 ) ;
Text [ en-US ] = "~None" ;
@@ -56,6 +57,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
RadioButton BTN_HOR_LEFT
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT";
Pos = MAP_APPFONT ( 56 , 26 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
Text [ en-US ] = "~Left" ;
@@ -63,6 +65,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
RadioButton BTN_HOR_CENTER
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER";
Pos = MAP_APPFONT ( 105 , 26 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
Text [ en-US ] = "~Center" ;
@@ -70,6 +73,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
RadioButton BTN_HOR_DISTANCE
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE";
Pos = MAP_APPFONT ( 154 , 26 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
Text [ en-US ] = "~Spacing" ;
@@ -77,6 +81,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
RadioButton BTN_HOR_RIGHT
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT";
Pos = MAP_APPFONT ( 203 , 26 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
Text [ en-US ] = "~Right" ;
@@ -131,6 +136,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
RadioButton BTN_VER_NONE
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE";
Pos = MAP_APPFONT ( 12 , 53 ) ;
Size = MAP_APPFONT ( 46 , 10 ) ;
Text [ en-US ] = "N~one" ;
@@ -138,6 +144,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
RadioButton BTN_VER_TOP
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP";
Pos = MAP_APPFONT ( 56 , 65 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
Text [ en-US ] = "~Top" ;
@@ -145,6 +152,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
RadioButton BTN_VER_CENTER
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER";
Pos = MAP_APPFONT ( 105 , 65 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
Text [ en-US ] = "C~enter" ;
@@ -152,6 +160,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
RadioButton BTN_VER_DISTANCE
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE";
Pos = MAP_APPFONT ( 154 , 65 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
Text [ en-US ] = "S~pacing" ;
@@ -159,6 +168,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
RadioButton BTN_VER_BOTTOM
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM";
Pos = MAP_APPFONT ( 203 , 65 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
Text [ en-US ] = "~Bottom" ;
diff --git a/cui/source/tabpages/grfpage.src b/cui/source/tabpages/grfpage.src
index 74b9e8e5cda0..085e92f2d0c0 100644
--- a/cui/source/tabpages/grfpage.src
+++ b/cui/source/tabpages/grfpage.src
@@ -58,6 +58,7 @@ TabPage RID_SVXPAGE_GRFCROP
};
MetricField MF_LEFT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT";
Border = TRUE ;
Pos = MAP_APPFONT ( 42 , 42 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -83,6 +84,7 @@ TabPage RID_SVXPAGE_GRFCROP
};
MetricField MF_RIGHT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 42 , 58 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -106,6 +108,7 @@ TabPage RID_SVXPAGE_GRFCROP
};
MetricField MF_TOP
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP";
Border = TRUE ;
Pos = MAP_APPFONT ( 124 , 42 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -131,6 +134,7 @@ TabPage RID_SVXPAGE_GRFCROP
};
MetricField MF_BOTTOM
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM";
Border = TRUE ;
Pos = MAP_APPFONT ( 124 , 58 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -148,12 +152,14 @@ TabPage RID_SVXPAGE_GRFCROP
};
RadioButton RB_SIZECONST
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST";
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 152 , 10 ) ;
Text [ en-US ] = "Keep image si~ze" ;
};
RadioButton RB_ZOOMCONST
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 152 , 10 ) ;
Check = TRUE ;
@@ -180,6 +186,7 @@ TabPage RID_SVXPAGE_GRFCROP
};
MetricField MF_WIDTHZOOM
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM";
Border = TRUE ;
Pos = MAP_APPFONT ( 42 , 87 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -207,6 +214,7 @@ TabPage RID_SVXPAGE_GRFCROP
};
MetricField MF_HEIGHTZOOM
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM";
Border = TRUE ;
Pos = MAP_APPFONT ( 42 , 103 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -239,6 +247,7 @@ TabPage RID_SVXPAGE_GRFCROP
};
MetricField MF_WIDTH
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH";
Border = TRUE ;
Pos = MAP_APPFONT ( 42 , 132 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -264,6 +273,7 @@ TabPage RID_SVXPAGE_GRFCROP
};
MetricField MF_HEIGHT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 42 , 148 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -286,6 +296,7 @@ TabPage RID_SVXPAGE_GRFCROP
};
PushButton PB_ORGSIZE
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE";
Pos = MAP_APPFONT ( 176 , 143 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src
index ed13f2de9b49..1e7da5393a2a 100644
--- a/cui/source/tabpages/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -53,6 +53,7 @@ TabPage RID_SVXPAGE_CAPTION
};
MetricField MF_ABSTAND
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ABSTAND";
Border = TRUE ;
Pos = MAP_APPFONT ( 50 , 51 ) ;
Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -73,6 +74,7 @@ TabPage RID_SVXPAGE_CAPTION
};
ListBox LB_WINKEL
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_WINKEL";
Border = TRUE ;
Pos = MAP_APPFONT ( 143 , 51 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
@@ -96,6 +98,7 @@ TabPage RID_SVXPAGE_CAPTION
};
ListBox LB_ANSATZ
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ";
Border = TRUE ;
Pos = MAP_APPFONT ( 50 , 67 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
@@ -119,6 +122,7 @@ TabPage RID_SVXPAGE_CAPTION
};
MetricField MF_ANSATZ
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ANSATZ";
Border = TRUE ;
Pos = MAP_APPFONT ( 143 , 67 ) ;
Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -139,6 +143,7 @@ TabPage RID_SVXPAGE_CAPTION
};
ListBox LB_ANSATZ_REL
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL";
Border = TRUE ;
Pos = MAP_APPFONT ( 143 , 67 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
@@ -155,6 +160,7 @@ TabPage RID_SVXPAGE_CAPTION
};
MetricField MF_LAENGE
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_LAENGE";
Border = TRUE ;
Pos = MAP_APPFONT ( 50 , 83 ) ;
Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -169,6 +175,7 @@ TabPage RID_SVXPAGE_CAPTION
};
CheckBox CB_LAENGE
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_CAPTION:CB_LAENGE";
Pos = MAP_APPFONT ( 106 , 84 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
TabStop = TRUE ;
diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src
index 4f5d78ffe795..9a5bb519d460 100644
--- a/cui/source/tabpages/macroass.src
+++ b/cui/source/tabpages/macroass.src
@@ -32,6 +32,7 @@
TabPage RID_SVXPAGE_EVENTASSIGN
{
+ HelpID = "cui:TabPage:RID_SVXPAGE_EVENTASSIGN";
Hide = TRUE ;
SVLook = TRUE ;
DialogControl = TRUE ;
@@ -89,6 +90,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN
};
PushButton PB_ASSIGN
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN";
Pos = MAP_APPFONT ( COL4 , ROW0 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
// ### ACHTUNG: Neuer Text in Resource? Z~uweisen : Zuweisen
@@ -98,6 +100,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN
};
PushButton PB_DELETE
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE";
Pos = MAP_APPFONT ( COL4 , ROW2 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
Disable = TRUE ;
@@ -106,6 +109,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN
};
ListBox LB_SCRIPTTYPE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE";
Pos = MAP_APPFONT ( COL4 , ROW4 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , 60 ) ;
// en-US was missing
diff --git a/cui/source/tabpages/measure.src b/cui/source/tabpages/measure.src
index 79c46b13079b..f01c2765ce0e 100644
--- a/cui/source/tabpages/measure.src
+++ b/cui/source/tabpages/measure.src
@@ -55,6 +55,7 @@ TabPage RID_SVXPAGE_MEASURE
};
MetricField MTR_LINE_DIST
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST";
Border = TRUE ;
Pos = MAP_APPFONT ( 78 , 14 ) ;
Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -77,6 +78,7 @@ TabPage RID_SVXPAGE_MEASURE
};
MetricField MTR_FLD_HELPLINE_OVERHANG
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG";
Border = TRUE ;
Pos = MAP_APPFONT ( 78 , 30 ) ;
Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -99,6 +101,7 @@ TabPage RID_SVXPAGE_MEASURE
};
MetricField MTR_FLD_HELPLINE_DIST
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST";
Border = TRUE ;
Pos = MAP_APPFONT ( 78 , 46 ) ;
Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -121,6 +124,7 @@ TabPage RID_SVXPAGE_MEASURE
};
MetricField MTR_FLD_HELPLINE1_LEN
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN";
Border = TRUE ;
Pos = MAP_APPFONT ( 78 , 62 ) ;
Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -143,6 +147,7 @@ TabPage RID_SVXPAGE_MEASURE
};
MetricField MTR_FLD_HELPLINE2_LEN
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN";
Border = TRUE ;
Pos = MAP_APPFONT ( 78 , 78 ) ;
Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -159,6 +164,7 @@ TabPage RID_SVXPAGE_MEASURE
};
TriStateBox TSB_BELOW_REF_EDGE
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE";
Pos = MAP_APPFONT ( 12 , 96 ) ;
Size = MAP_APPFONT ( 108 , 10 ) ;
TabStop = TRUE ;
@@ -173,6 +179,7 @@ TabPage RID_SVXPAGE_MEASURE
};
MetricField MTR_FLD_DECIMALPLACES
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES";
Border = TRUE ;
Pos = MAP_APPFONT ( 78 , 110 ) ;
Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -213,6 +220,7 @@ TabPage RID_SVXPAGE_MEASURE
};
TriStateBox TSB_AUTOPOSV
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV";
Pos = MAP_APPFONT ( 154 , 54 ) ;
Size = MAP_APPFONT ( 101 , 10 ) ;
TabStop = TRUE ;
@@ -220,6 +228,7 @@ TabPage RID_SVXPAGE_MEASURE
};
TriStateBox TSB_AUTOPOSH
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH";
Pos = MAP_APPFONT ( 154 , 68 ) ;
Size = MAP_APPFONT ( 101 , 10 ) ;
TabStop = TRUE ;
@@ -227,6 +236,7 @@ TabPage RID_SVXPAGE_MEASURE
};
TriStateBox TSB_PARALLEL
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL";
Pos = MAP_APPFONT ( 138 , 82 ) ;
Size = MAP_APPFONT ( 110 , 10 ) ;
TabStop = TRUE ;
@@ -234,6 +244,7 @@ TabPage RID_SVXPAGE_MEASURE
};
TriStateBox TSB_SHOW_UNIT
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT";
Pos = MAP_APPFONT ( 138 , 96 ) ;
Size = MAP_APPFONT ( 64+40 , 10 ) ;
TabStop = TRUE ;
@@ -241,6 +252,7 @@ TabPage RID_SVXPAGE_MEASURE
};
ListBox LB_UNIT
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT";
Border = TRUE ;
Pos = MAP_APPFONT ( 154 , 110 ) ;
Size = MAP_APPFONT ( 60 , 80+35 ) ;
diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src
index 2538b196932c..b3f2d22fd204 100644
--- a/cui/source/tabpages/numfmt.src
+++ b/cui/source/tabpages/numfmt.src
@@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
};
ListBox LB_CATEGORY
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 70 , 71 ) ;
@@ -72,6 +73,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
};
Edit ED_FORMAT
{
+ HelpID = "cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 147 ) ;
Size = MAP_APPFONT ( 200 , 12 ) ;
@@ -85,6 +87,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
};
Edit ED_COMMENT
{
+ HelpID = "cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT";
Hide = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 163 ) ;
@@ -99,6 +102,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
ListBox LB_CURRENCY
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY";
Border = TRUE ;
Pos = MAP_APPFONT ( 82 , 14 ) ;
Size = MAP_APPFONT ( 90 , 71 ) ;
@@ -127,6 +131,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
};
NumericField ED_DECIMALS
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS";
Border = TRUE ;
Pos = MAP_APPFONT ( 84 , 102 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -147,6 +152,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
};
NumericField ED_LEADZEROES
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES";
Border = TRUE ;
Pos = MAP_APPFONT ( 84 , 118 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -160,12 +166,14 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
};
CheckBox BTN_NEGRED
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED";
Pos = MAP_APPFONT ( 133 , 104 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
Text [ en-US ] = "~Negative numbers red" ;
};
CheckBox BTN_THOUSAND
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND";
Pos = MAP_APPFONT ( 133 , 120 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
Text [ en-US ] = "~Thousands separator" ;
@@ -184,6 +192,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
};
ListBox LB_LANGUAGE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE";
Border = TRUE ;
Sort = TRUE ;
Pos = MAP_APPFONT ( 178 , 14 ) ;
@@ -192,6 +201,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
};
CheckBox CB_SOURCEFORMAT
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT";
Pos = MAP_APPFONT ( 178 , 42 ) ;
Size = MAP_APPFONT ( 76 , 10 ) ;
Text [ en-US ] = "So~urce format" ;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index ff1abbce42ed..5b2bb4474573 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2247,7 +2247,6 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
Size aSize;
sal_Bool bSucc(sal_False);
SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) );
-// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE );
if(MN_GALLERY_ENTRY <= nItemId )
{
diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src
index 323b5cdd6ba6..e66e3dc2dd98 100644
--- a/cui/source/tabpages/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -128,6 +128,7 @@ TabPage RID_SVXPAGE_PICK_BMP
};
CheckBox CB_LINKED
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED";
Pos = MAP_APPFONT ( 9 , 169 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
@@ -161,6 +162,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
MultiListBox LB_LEVEL
{
+ HelpID = "cui:MultiListBox:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL";
Pos = MAP_APPFONT ( 12 , 25 ) ;
Size = MAP_APPFONT ( 26 , 154 ) ;
TabStop = TRUE ;
@@ -182,6 +184,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
ListBox LB_FMT
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_FMT";
Pos = MAP_APPFONT ( 103 , 25 ) ;
Size = MAP_APPFONT ( 67 , 72 ) ;
TabStop = TRUE ;
@@ -225,6 +228,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
Edit ED_PREFIX
{
+ HelpID = "cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX";
Border = TRUE ;
Pos = MAP_APPFONT ( 103 , 41 ) ;
Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -241,6 +245,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
Edit ED_SUFFIX
{
+ HelpID = "cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX";
Border = TRUE ;
Pos = MAP_APPFONT ( 103 , 57 ) ;
Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -256,6 +261,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
ListBox LB_CHARFMT
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT";
TabStop = TRUE ;
DropDown = TRUE ;
Pos = MAP_APPFONT ( 103 , 73 ) ;
@@ -270,6 +276,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
ListBox LB_BUL_COLOR
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_BUL_COLOR";
TabStop = TRUE ;
DropDown = TRUE ;
Pos = MAP_APPFONT ( 103 , 73 ) ;
@@ -285,6 +292,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
MetricField MF_BUL_REL_SIZE
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_BUL_REL_SIZE";
Pos = MAP_APPFONT ( 103 , 89 ) ;
Size = MAP_APPFONT ( 67 , 12 ) ;
Border = TRUE ;
@@ -307,6 +315,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
NumericField NF_ALL_LEVEL
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL";
Border = TRUE ;
Pos = MAP_APPFONT ( 103 , 89 ) ;
Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -329,6 +338,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
NumericField ED_START
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:ED_START";
Border = TRUE ;
Pos = MAP_APPFONT ( 103 , 105 ) ;
Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -351,6 +361,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
ListBox LB_ALIGN
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ALIGN";
Pos = MAP_APPFONT ( 103 , 133 ) ;
Size = MAP_APPFONT ( 40 , 40 ) ;
TabStop = TRUE ;
@@ -369,6 +380,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
PushButton PB_BULLET
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET";
Hide = TRUE ;
Pos = MAP_APPFONT ( 103 , 105 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
@@ -384,6 +396,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
MenuButton MB_BITMAP
{
+ HelpID = "cui:MenuButton:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP";
Hide = TRUE ;
Pos = MAP_APPFONT ( 103 , 41 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -416,6 +429,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
MetricField MF_WIDTH
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH";
Pos = MAP_APPFONT ( 103 , 59 ) ;
Size = MAP_APPFONT ( 67 , 12 ) ;
Border = TRUE ;
@@ -442,6 +456,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
MetricField MF_HEIGHT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT";
Pos = MAP_APPFONT ( 103 , 75 ) ;
Size = MAP_APPFONT ( 67 , 12 ) ;
Border = TRUE ;
@@ -461,6 +476,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
CheckBox CB_RATIO
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO";
Hide = TRUE ;
Pos = MAP_APPFONT ( 50 , 91 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
@@ -475,6 +491,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
ListBox LB_ORIENT
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT";
Hide = TRUE ;
Pos = MAP_APPFONT ( 103 , 103 ) ;
Size = MAP_APPFONT ( 67 , 72 ) ;
@@ -502,6 +519,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
};
CheckBox CB_SAME_LEVEL
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL";
Pos = MAP_APPFONT ( 53 , 167 ) ;
Size = MAP_APPFONT ( 114 , 10 ) ;
Text [ en-US ] = "~Consecutive numbering" ;
@@ -537,6 +555,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
MultiListBox LB_LEVEL
{
+ HelpID = "cui:MultiListBox:RID_SVXPAGE_NUM_POSITION:LB_LEVEL";
Pos = MAP_APPFONT ( 12 , 25 ) ;
Size = MAP_APPFONT ( 26 , 154 ) ;
TabStop = TRUE ;
@@ -559,6 +578,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
MetricField MF_BORDERDIST
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_BORDERDIST";
Pos = MAP_APPFONT ( 198 , 25 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Border = TRUE ;
@@ -577,6 +597,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
CheckBox CB_RELATIVE
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE";
Pos = MAP_APPFONT ( 198 , 41 ) ;
Size = MAP_APPFONT ( 52 , 10 ) ;
Text [ en-US ] = "Relati~ve" ;
@@ -589,6 +610,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
MetricField MF_INDENT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT";
Pos = MAP_APPFONT ( 198 , 57 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Border = TRUE ;
@@ -613,6 +635,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
MetricField MF_NUMDIST
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST";
Pos = MAP_APPFONT ( 198 , 73 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Left = TRUE ;
@@ -637,6 +660,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
ListBox LB_ALIGN
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN";
Pos = MAP_APPFONT ( 198 , 89 ) ;
Size = MAP_APPFONT ( 40 , 40 ) ;
TabStop = TRUE ;
@@ -656,6 +680,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
ListBox LB_LABEL_FOLLOWED_BY
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY";
Pos = MAP_APPFONT ( 198 , 25 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
@@ -676,6 +701,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
MetricField MF_LISTTAB
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB";
Pos = MAP_APPFONT ( 198 , 41 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Border = TRUE ;
@@ -699,6 +725,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
ListBox LB_ALIGN_2
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2";
Pos = MAP_APPFONT ( 198 , 57 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
@@ -712,6 +739,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
MetricField MF_ALIGNED_AT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT";
Pos = MAP_APPFONT ( 198 , 73 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Left = TRUE ;
@@ -736,6 +764,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
MetricField MF_INDENT_AT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT";
Pos = MAP_APPFONT ( 198 , 89 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Left = TRUE ;
@@ -754,6 +783,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
};
PushButton PB_STANDARD
{
+ HelpID = "cui:PushButton:RID_SVXPAGE_NUM_POSITION:PB_STANDARD";
Pos = MAP_APPFONT ( 198 , 165 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Default" ;
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index c96b43a5a966..5c919f1df17a 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -54,6 +54,7 @@ TabPage RID_SVXPAGE_PAGE
};
ListBox LB_PAPER_SIZE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE";
Pos = MAP_APPFONT ( 50 , 14 ) ;
Size = MAP_APPFONT ( 50 , 64 ) ;
DropDown = TRUE ;
@@ -68,6 +69,7 @@ TabPage RID_SVXPAGE_PAGE
};
MetricField ED_PAPER_WIDTH
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH";
Border = TRUE ;
Pos = MAP_APPFONT ( 50, 30 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -89,6 +91,7 @@ TabPage RID_SVXPAGE_PAGE
};
MetricField ED_PAPER_HEIGHT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 50 , 46 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -109,6 +112,7 @@ TabPage RID_SVXPAGE_PAGE
};
RadioButton RB_PORTRAIT
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT";
Pos = MAP_APPFONT ( 50 , 62 ) ;
Size = MAP_APPFONT ( 53 , 10 ) ;
Check = TRUE ;
@@ -116,6 +120,7 @@ TabPage RID_SVXPAGE_PAGE
};
RadioButton RB_LANDSCAPE
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE";
Pos = MAP_APPFONT ( 50 , 74 ) ;
Size = MAP_APPFONT ( 53 , 10 ) ;
Text [ en-US ] = "L~andscape";
@@ -136,6 +141,7 @@ TabPage RID_SVXPAGE_PAGE
};
ListBox LB_TEXT_FLOW
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW";
Border = TRUE ;
Pos = MAP_APPFONT ( 165 , 58 ) ;
Size = MAP_APPFONT ( 83 , 50 ) ;
@@ -152,6 +158,7 @@ TabPage RID_SVXPAGE_PAGE
};
ListBox LB_PAPER_TRAY
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY";
Pos = MAP_APPFONT ( 165 , 72 ) ;
Size = MAP_APPFONT ( 83 , 50 ) ;
DropDown = TRUE ;
@@ -172,6 +179,7 @@ TabPage RID_SVXPAGE_PAGE
};
MetricField ED_LEFT_MARGIN
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 55 , 101 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -193,6 +201,7 @@ TabPage RID_SVXPAGE_PAGE
};
MetricField ED_RIGHT_MARGIN
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 55 , 117 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -214,6 +223,7 @@ TabPage RID_SVXPAGE_PAGE
};
MetricField ED_TOP_MARGIN
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 55 , 133 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -235,6 +245,7 @@ TabPage RID_SVXPAGE_PAGE
};
MetricField ED_BOTTOM_MARGIN
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN";
Border = TRUE ;
Pos = MAP_APPFONT ( 55 , 149 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -267,6 +278,7 @@ TabPage RID_SVXPAGE_PAGE
};
ListBox LB_LAYOUT
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT";
Border = TRUE ;
Pos = MAP_APPFONT ( 170, 101 ) ;
Size = MAP_APPFONT ( 78 , 44 ) ;
@@ -287,6 +299,7 @@ TabPage RID_SVXPAGE_PAGE
};
ListBox LB_NUMBER_FORMAT
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 117 ) ;
Size = MAP_APPFONT ( 78 , 64 ) ;
@@ -310,6 +323,7 @@ TabPage RID_SVXPAGE_PAGE
};
CheckBox CB_HORZ
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ";
Hide = TRUE ;
Pos = MAP_APPFONT ( 175 , 133 ) ;
Size = MAP_APPFONT ( 73 , 10 ) ;
@@ -317,6 +331,7 @@ TabPage RID_SVXPAGE_PAGE
};
CheckBox CB_VERT
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT";
Hide = TRUE ;
Pos = MAP_APPFONT ( 175 , 147 ) ;
Size = MAP_APPFONT ( 73 , 10 ) ;
@@ -324,6 +339,7 @@ TabPage RID_SVXPAGE_PAGE
};
CheckBox CB_ADAPT
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT";
Hide = TRUE ;
Pos = MAP_APPFONT ( 113 , 133 ) ;
Size = MAP_APPFONT ( 135 , 10 ) ;
@@ -332,6 +348,7 @@ TabPage RID_SVXPAGE_PAGE
/* Registerhaltigkeit (fuer SW) */
CheckBox CB_REGISTER
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER";
Pos = MAP_APPFONT ( 113 , 133 ) ;
Size = MAP_APPFONT ( 135 , 10 ) ;
Hide = TRUE ;
@@ -346,6 +363,7 @@ TabPage RID_SVXPAGE_PAGE
};
ListBox LB_REGISTER
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_REGISTER";
Pos = MAP_APPFONT ( 122 , 157 ) ;
Size = MAP_APPFONT ( 126 , 50 ) ;
DropDown = TRUE ;
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index d52283ceea8f..e7e50842ba1c 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -46,6 +46,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
MetricField ED_LEFTINDENT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT";
Border = TRUE ;
Pos = MAP_APPFONT ( 135 , 14 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -68,6 +69,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
MetricField ED_RIGHTINDENT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT";
Border = TRUE ;
Pos = MAP_APPFONT ( 135 , 30 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -90,6 +92,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
MetricField ED_FLINEINDENT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT";
Border = TRUE ;
Pos = MAP_APPFONT ( 135 , 46 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -107,6 +110,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
CheckBox CB_AUTO
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO";
Pos = MAP_APPFONT ( 12 , 61 ) ;
Size = MAP_APPFONT ( 120 , 10 ) ;
Hide = TRUE ;
@@ -127,6 +131,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
MetricField ED_TOPDIST
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST";
Border = TRUE ;
Pos = MAP_APPFONT ( 135 , 88 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -149,6 +154,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
MetricField ED_BOTTOMDIST
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST";
Border = TRUE ;
Pos = MAP_APPFONT ( 135 , 104 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -170,6 +176,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
ListBox LB_LINEDIST
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST";
Pos = MAP_APPFONT ( 12 , 133 ) ;
Size = MAP_APPFONT ( 55 , 72 ) ;
DropDown = TRUE ;
@@ -197,6 +204,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
MetricField ED_LINEDISTPERCENT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 135 , 133 ) ;
@@ -216,6 +224,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
MetricField ED_LINEDISTMETRIC
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC";
Disable = TRUE ;
Border = TRUE ;
Hide = TRUE ;
@@ -245,6 +254,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
CheckBox CB_REGISTER
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER";
Pos = MAP_APPFONT ( 12 , 162 ) ;
Size = MAP_APPFONT ( 120 , 10 ) ;
Hide = TRUE ;
@@ -275,6 +285,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
};
RadioButton BTN_LEFTALIGN
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 161 , 10 ) ;
Text [ en-US ] = "~Left" ;
@@ -282,18 +293,21 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
};
RadioButton BTN_RIGHTALIGN
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN";
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 161 , 10 ) ;
Text [ en-US ] = "Righ~t" ;
};
RadioButton BTN_CENTERALIGN
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN";
Pos = MAP_APPFONT ( 12 , 42 ) ;
Size = MAP_APPFONT ( 161 , 10 ) ;
Text [ en-US ] = "~Center" ;
};
RadioButton BTN_JUSTIFYALIGN
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN";
Pos = MAP_APPFONT ( 12 , 56 ) ;
Size = MAP_APPFONT ( 161 , 10 ) ;
Text [ en-US ] = "Justified" ;
@@ -315,6 +329,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
};
ListBox LB_LASTLINE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE";
Pos = MAP_APPFONT ( 105 , 70 ) ;
Size = MAP_APPFONT ( 70 , 50 ) ;
DropDown = TRUE ;
@@ -329,6 +344,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
};
CheckBox CB_EXPAND
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND";
Pos = MAP_APPFONT ( 20 , 86 ) ;
Size = MAP_APPFONT ( 153 , 10 ) ;
Hide = TRUE ;
@@ -336,6 +352,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
};
CheckBox CB_SNAP
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP";
Pos = MAP_APPFONT ( 20 , 100 ) ;
Size = MAP_APPFONT ( 153 , 10 ) ;
Hide = TRUE ;
@@ -363,6 +380,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
};
ListBox LB_VERTALIGN
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN";
Pos = MAP_APPFONT ( 105 , 133 ) ;
Size = MAP_APPFONT ( 70 , 50 ) ;
DropDown = TRUE ;
@@ -392,6 +410,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
};
ListBox LB_TEXTDIRECTION
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION";
Border = TRUE ;
Pos = MAP_APPFONT ( 105 , 165 ) ;
Size = MAP_APPFONT ( 146 , 50 ) ;
@@ -408,12 +427,14 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
Size = MAP_APPFONT ( 260 , 185 ) ;
TriStateBox BTN_HYPHEN
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "A~utomatically" ;
};
NumericField ED_HYPHENBEFORE
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 21 , 26 ) ;
@@ -438,6 +459,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
NumericField ED_HYPHENAFTER
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 21 , 41 ) ;
@@ -469,6 +491,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
NumericField ED_MAXHYPH
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH";
Border = TRUE ;
Pos = MAP_APPFONT ( 21 , 55 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -501,6 +524,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
TriStateBox BTN_PAGEBREAK
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK";
// Disable = TRUE;
Pos = MAP_APPFONT ( 12 , 86 ) ;
Size = MAP_APPFONT ( 61 , 10 ) ;
@@ -515,6 +539,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
ListBox LB_BREAKTYPE
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE";
Border = TRUE ;
Pos = MAP_APPFONT ( 98 , 84 ) ;
Size = MAP_APPFONT ( 61 , 50 ) ;
@@ -534,6 +559,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
ListBox LB_BREAKPOSITION
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION";
Border = TRUE ;
Pos = MAP_APPFONT ( 211 , 84 ) ;
Size = MAP_APPFONT ( 40 , 50 ) ;
@@ -546,6 +572,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
TriStateBox BTN_PAGECOLL
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL";
// Disable = TRUE;
Pos = MAP_APPFONT (21 , 100 ) ;
Size = MAP_APPFONT ( 75 , 10 ) ;
@@ -554,6 +581,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
ListBox LB_PAGECOLL
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL";
// Disable = TRUE;
Pos = MAP_APPFONT ( 98 , 98 ) ;
Size = MAP_APPFONT ( 61 , 50 ) ;
@@ -569,6 +597,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
NumericField ED_PAGENUM
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM";
Border = TRUE ;
Pos = MAP_APPFONT ( 211 , 98 ) ;
Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -583,6 +612,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
TriStateBox BTN_KEEPTOGETHER
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER";
Pos = MAP_APPFONT ( 12 , 127 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "~Do not split paragraph" ;
@@ -590,12 +620,14 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
TriStateBox CB_KEEPTOGETHER
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER";
Pos = MAP_APPFONT ( 12, 141 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "~Keep with next paragraph" ;
};
TriStateBox BTN_ORPHANS
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS";
Disable = TRUE ;
Pos = MAP_APPFONT ( 12 , 155 ) ;
Size = MAP_APPFONT ( 120 , 10 ) ;
@@ -604,6 +636,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
NumericField ED_ORPHANS
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 134 , 153 ) ;
@@ -628,6 +661,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
TriStateBox BTN_WIDOWS
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS";
Disable = TRUE ;
Pos = MAP_APPFONT ( 12 , 169 ) ;
Size = MAP_APPFONT ( 120 , 10 ) ;
@@ -636,6 +670,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
};
NumericField ED_WIDOWS
{
+ HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 134 , 167 ) ;
@@ -676,18 +711,21 @@ TabPage RID_SVXPAGE_PARA_ASIAN
};
TriStateBox CB_AS_FORBIDDEN
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 242 , 10 ) ;
Text [ en-US ] = "Apply list of forbidden characters to the beginning and end of lines";
};
TriStateBox CB_AS_HANG_PUNC
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC";
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 242 , 10 ) ;
Text [ en-US ] = "Allow hanging punctuation";
};
TriStateBox CB_AS_SCRIPT_SPACE
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE";
Pos = MAP_APPFONT ( 12 , 42 ) ;
Size = MAP_APPFONT ( 242 , 10 ) ;
Text [ en-US ] = "Apply spacing between Asian, Latin and Complex text";
diff --git a/cui/source/tabpages/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src
index c5fd8e8816e9..f22227ac8061 100644
--- a/cui/source/tabpages/swpossizetabpage.src
+++ b/cui/source/tabpages/swpossizetabpage.src
@@ -52,6 +52,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
MetricField MF_WIDTH
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH";
Pos = MAP_APPFONT ( 59 , 14 ) ;
Size = MAP_APPFONT ( 45 , 12 ) ;
Border = TRUE ;
@@ -77,6 +78,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
MetricField MF_HEIGHT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT";
Pos = MAP_APPFONT ( 59 , 30 ) ;
Size = MAP_APPFONT ( 45 , 12 ) ;
Border = TRUE ;
@@ -95,6 +97,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
CheckBox CB_KEEPRATIO
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO";
Pos = MAP_APPFONT ( 12 , 45 ) ;
Size = MAP_APPFONT ( 95 , 10 ) ;
TabStop = TRUE ;
@@ -114,30 +117,35 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
RadioButton RB_TOPAGE
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE";
Pos = MAP_APPFONT ( 122 , 14 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "To ~page";
};
RadioButton RB_TOPARA
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA";
Pos = MAP_APPFONT ( 122 , 28 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "To paragrap~h";
};
RadioButton RB_TOCHAR
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR";
Pos = MAP_APPFONT ( 122 , 42 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "To cha~racter";
};
RadioButton RB_ASCHAR
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR";
Pos = MAP_APPFONT ( 122 , 56 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "~As character" ;
};
RadioButton RB_TOFRAME
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME";
Hide = TRUE;
Pos = MAP_APPFONT ( 122 , 70 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -156,6 +164,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
TriStateBox CB_POSITION
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION";
Pos = MAP_APPFONT ( 12 , 97 ) ;
Size = MAP_APPFONT ( 113 , 10 ) ;
TabStop = TRUE ;
@@ -163,6 +172,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
TriStateBox CB_SIZE
{
+ HelpID = "cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE";
Pos = MAP_APPFONT ( 122 , 97 ) ;
Size = MAP_APPFONT ( 113 , 10 ) ;
TabStop = TRUE ;
@@ -183,6 +193,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
ListBox LB_HORI
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI";
Pos = MAP_APPFONT ( 49 , 124 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
TabStop = TRUE ;
@@ -197,6 +208,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
MetricField MF_HORIBY
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY";
Border = TRUE ;
Pos = MAP_APPFONT ( 123 , 124 ) ;
Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -221,6 +233,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
ListBox LB_HORITO
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO";
Pos = MAP_APPFONT ( 183 , 124 ) ;
Size = MAP_APPFONT ( 65 , 60 ) ;
TabStop = TRUE ;
@@ -228,6 +241,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
CheckBox CB_HORIMIRROR
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR";
Pos = MAP_APPFONT ( 12 , 139 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
@@ -242,6 +256,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
ListBox LB_VERT
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT";
Pos = MAP_APPFONT ( 49 , 153 ) ;
Size = MAP_APPFONT ( 50 , 60 ) ;
TabStop = TRUE ;
@@ -256,6 +271,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
MetricField MF_VERTBY
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY";
Border = TRUE ;
Pos = MAP_APPFONT ( 123 , 153 ) ;
Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -280,6 +296,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
ListBox LB_VERTTO
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO";
Pos = MAP_APPFONT ( 183 , 153 ) ;
Size = MAP_APPFONT ( 65 , 60 ) ;
TabStop = TRUE ;
@@ -287,6 +304,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
};
CheckBox CB_FOLLOW
{
+ HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW";
Pos = MAP_APPFONT ( 12 , 168 ) ;
Size = MAP_APPFONT ( 113 , 10 ) ;
TabStop = TRUE ;
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index f5ff6b24ff66..a9e4ccd207a6 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -51,18 +51,21 @@ TabPage RID_SVXPAGE_TRANSPARENCE
};
RadioButton RBT_TRANS_OFF
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 110 , 10 ) ;
Text [ en-US ] = "~No transparency";
};
RadioButton RBT_TRANS_LINEAR
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR";
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
Text [ en-US ] = "~Transparency";
};
MetricField MTR_TRANSPARENT
{
+ HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT";
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 26 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -78,6 +81,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
};
RadioButton RBT_TRANS_GRADIENT
{
+ HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT";
Pos = MAP_APPFONT ( 12 , 42 ) ;
Size = MAP_APPFONT ( 110 , 10 ) ;
Text [ en-US ] = "Gradient";
@@ -90,6 +94,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
};
ListBox LB_TRGR_GRADIENT_TYPES
{
+ HelpID = "cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES";
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 54 ) ;
Size = MAP_APPFONT ( 53 , 63 ) ;
@@ -113,6 +118,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
};
MetricField MTR_TRGR_CENTER_X
{
+ HelpID