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--[-rwxr-xr-x]automation/util/manually_added_ids.hid0
-rw-r--r--avmedia/inc/helpids.hrc26
-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.cxx2
-rw-r--r--basctl/source/basicide/basidesh.src16
-rw-r--r--basctl/source/basicide/brkdlg.src7
-rw-r--r--basctl/source/basicide/macrodlg.src11
-rw-r--r--basctl/source/basicide/makefile.mk2
-rw-r--r--basctl/source/basicide/moduldlg.src29
-rw-r--r--basctl/source/basicide/moptions.src5
-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
-rw-r--r--basic/inc/basic/ttstrhlp.hxx4
-rw-r--r--basic/source/app/basic.src64
-rw-r--r--[-rwxr-xr-x]basic/source/runtime/runtime.cxx0
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertDataLabel.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertErrorBars.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertLegend.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTitle.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTrendline.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_View3D.src3
-rw-r--r--chart2/source/controller/dialogs/hidother.src3
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneAppearance.src4
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.src9
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.src13
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.src8
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.src16
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.src16
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.src9
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.src2
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.src1
-rw-r--r--chart2/source/controller/dialogs/tp_Location.src2
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.src2
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.src4
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.src7
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.src13
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.src12
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.src2
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src1
-rw-r--r--chart2/source/controller/inc/HelpIds.hrc268
-rw-r--r--chart2/source/controller/main/ChartWindow.cxx2
-rw-r--r--configure.in16
-rw-r--r--cui/inc/pch/precompiled_cui.hxx1
-rw-r--r--cui/source/customize/acccfg.cxx1
-rw-r--r--cui/source/customize/acccfg.src7
-rw-r--r--cui/source/customize/cfg.cxx58
-rw-r--r--cui/source/customize/cfg.src19
-rw-r--r--cui/source/customize/eventdlg.src3
-rw-r--r--cui/source/customize/macropg.src7
-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.src26
-rw-r--r--cui/source/dialogs/hyperdlg.src42
-rw-r--r--[-rwxr-xr-x]cui/source/dialogs/hyphen.cxx0
-rw-r--r--[-rwxr-xr-x]cui/source/dialogs/hyphen.hrc0
-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.src7
-rw-r--r--cui/source/dialogs/showcols.src2
-rw-r--r--cui/source/dialogs/splitcelldlg.src5
-rw-r--r--cui/source/dialogs/srchxtra.src4
-rw-r--r--cui/source/dialogs/svuidlg.src44
-rw-r--r--cui/source/dialogs/tbxform.src2
-rw-r--r--[-rwxr-xr-x]cui/source/dialogs/thesdlg.hrc0
-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
-rwxr-xr-xcui/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--[-rwxr-xr-x]cui/source/inc/hyphen.hxx0
-rw-r--r--cui/source/inc/insrc.hxx2
-rw-r--r--[-rwxr-xr-x]cui/source/inc/macroass.hxx0
-rw-r--r--[-rwxr-xr-x]cui/source/inc/thesdlg.hxx0
-rw-r--r--cui/source/options/connpooloptions.src5
-rw-r--r--cui/source/options/dbregister.src5
-rw-r--r--cui/source/options/doclinkdialog.src4
-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
-rw-r--r--cui/source/options/optdict.src9
-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.src10
-rw-r--r--cui/source/options/optmemory.src6
-rw-r--r--cui/source/options/optpath.cxx3
-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.src1
-rw-r--r--cui/source/options/webconninfo.src3
-rw-r--r--cui/source/tabpages/align.src10
-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--dbaccess/inc/dbaccess_helpid.hrc861
-rw-r--r--dbaccess/inc/dbaccess_slotid.hrc3
-rw-r--r--dbaccess/inc/genericcontroller.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/macromigration.src8
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx15
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx2
-rw-r--r--dbaccess/source/ui/app/app.src19
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx4
-rw-r--r--dbaccess/source/ui/browser/sbabrw.src2
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx8
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx8
-rw-r--r--dbaccess/source/ui/dlg/AdabasStat.src7
-rw-r--r--dbaccess/source/ui/dlg/AutoControls_tmpl.hrc25
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.src4
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.src7
-rw-r--r--dbaccess/source/ui/dlg/ExtensionNotPresent.src1
-rw-r--r--dbaccess/source/ui/dlg/RelationDlg.src1
-rw-r--r--dbaccess/source/ui/dlg/TablesSingleDlg.cxx7
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.src3
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.src5
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.src2
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.src23
-rw-r--r--dbaccess/source/ui/dlg/dbadmin2.src2
-rw-r--r--dbaccess/source/ui/dlg/dbadminsetup.src41
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.src8
-rw-r--r--dbaccess/source/ui/dlg/directsql.src6
-rw-r--r--dbaccess/source/ui/dlg/dlgsave.src3
-rw-r--r--dbaccess/source/ui/dlg/dlgsize.src4
-rw-r--r--dbaccess/source/ui/dlg/dsselect.src4
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.src3
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.src4
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.src11
-rw-r--r--dbaccess/source/ui/dlg/queryorder.src6
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx13
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.src1
-rw-r--r--dbaccess/source/ui/dlg/textconnectionsettings.src1
-rw-r--r--dbaccess/source/ui/inc/FieldDescControl.hxx4
-rw-r--r--dbaccess/source/ui/inc/UITools.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbu_resource.hrc2
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx4
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx2
-rw-r--r--dbaccess/source/ui/misc/WizardPages.src30
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.src1
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/table.src4
-rw-r--r--dbaccess/util/hidother.src37
-rw-r--r--desktop/source/app/desktop.src1
-rw-r--r--desktop/source/deployment/gui/dp_gui_dependencydialog.src2
-rw-r--r--[-rwxr-xr-x]desktop/source/deployment/gui/dp_gui_dialog.src3
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.src4
-rw-r--r--[-rwxr-xr-x]desktop/source/deployment/gui/dp_gui_extlistbox.cxx0
-rw-r--r--[-rwxr-xr-x]desktop/source/deployment/gui/dp_gui_extlistbox.hxx0
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.src3
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.src1
-rw-r--r--desktop/source/inc/helpid.hrc71
-rw-r--r--[-rwxr-xr-x]desktop/source/migration/services/oo3extensionmigration.cxx0
-rw-r--r--[-rwxr-xr-x]desktop/source/migration/services/oo3extensionmigration.hxx0
-rw-r--r--desktop/source/migration/wizard.src11
-rw-r--r--[-rwxr-xr-x]editeng/inc/editeng/editeng.hxx0
-rw-r--r--[-rwxr-xr-x]editeng/inc/editeng/splwrap.hxx0
-rw-r--r--editeng/inc/helpid.hrc71
-rw-r--r--editeng/inc/pch/precompiled_editeng.hxx1
-rw-r--r--[-rwxr-xr-x]editeng/source/editeng/impedit.cxx0
-rw-r--r--editeng/source/misc/svxacorr.cxx30
-rw-r--r--[-rwxr-xr-x]editeng/source/outliner/outlvw.cxx0
-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/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.cxx6
-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.cxx36
-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.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.src17
-rw-r--r--[-rwxr-xr-x]extensions/source/update/check/download.cxx0
-rw-r--r--[-rwxr-xr-x]extensions/source/update/check/updatecheck.cxx0
-rw-r--r--[-rwxr-xr-x]extensions/source/update/check/updatecheckconfig.cxx0
-rw-r--r--extensions/source/update/check/updatehdl.cxx21
-rw-r--r--filter/inc/filter.hrc13
-rw-r--r--filter/source/flash/impswfdialog.src9
-rw-r--r--filter/source/pdf/impdialog.src65
-rw-r--r--filter/source/xsltdialog/xmlfilterhelpids.hrc93
-rw-r--r--formula/inc/formula/IFunctionDescription.hxx2
-rw-r--r--formula/inc/formula/formdata.hxx6
-rw-r--r--formula/inc/formula/formula.hxx8
-rw-r--r--formula/inc/helpids.hrc50
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx2
-rw-r--r--formula/source/ui/dlg/formdlgs.src12
-rw-r--r--formula/source/ui/dlg/formula.cxx77
-rw-r--r--formula/source/ui/dlg/funcpage.cxx12
-rw-r--r--formula/source/ui/dlg/funcpage.hxx2
-rw-r--r--formula/source/ui/dlg/funcutl.cxx4
-rw-r--r--formula/source/ui/dlg/parawin.cxx12
-rw-r--r--formula/source/ui/dlg/parawin.src17
-rw-r--r--formula/util/hidother.src4
-rw-r--r--fpicker/source/office/OfficeControlAccess.cxx44
-rw-r--r--fpicker/source/office/iodlg.hrc20
-rw-r--r--fpicker/source/office/iodlg.src15
-rw-r--r--[-rwxr-xr-x]framework/inc/helper/mischelper.hxx0
-rw-r--r--framework/inc/helpid.hrc22
-rw-r--r--framework/inc/uielement/commandinfo.hxx2
-rw-r--r--framework/inc/uielement/toolbarmerger.hxx1
-rw-r--r--framework/inc/uielement/toolbarsmenucontroller.hxx2
-rw-r--r--framework/source/classes/resource.src4
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx4
-rw-r--r--framework/source/services/backingwindow.cxx18
-rw-r--r--framework/source/services/menudocumenthandler.cxx903
-rw-r--r--framework/source/uielement/macrosmenucontroller.cxx5
-rw-r--r--framework/source/uielement/menubarmanager.cxx3
-rw-r--r--framework/source/uielement/statusbarmanager.cxx10
-rw-r--r--framework/source/uielement/toolbarmanager.cxx14
-rw-r--r--framework/source/uielement/toolbarmerger.cxx10
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx15
-rw-r--r--instsetoo_native/prj/d.lst1
-rw-r--r--instsetoo_native/util/makefile.mk1
-rw-r--r--l10ntools/source/help/HelpLinker.cxx45
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/spellcheck/spell/sspellimp.cxx0
-rw-r--r--nss/makefile.mk4
-rw-r--r--[-rwxr-xr-x]odk/configure.pl0
-rw-r--r--offapi/com/sun/star/awt/XDialog2.idl2
-rw-r--r--offapi/com/sun/star/inspection/LineDescriptor.idl4
-rw-r--r--[-rwxr-xr-x]offapi/com/sun/star/text/TextFrame.idl0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Setup.xcu0
-rw-r--r--[-rwxr-xr-x]oox/inc/oox/ole/vbahelper.hxx0
-rw-r--r--[-rwxr-xr-x]oox/inc/oox/ole/vbaproject.hxx0
-rw-r--r--[-rwxr-xr-x]oox/source/core/filterbase.cxx0
-rw-r--r--[-rwxr-xr-x]oox/source/ole/vbacontrol.cxx0
-rw-r--r--[-rwxr-xr-x]oox/source/ole/vbahelper.cxx0
-rw-r--r--[-rwxr-xr-x]oox/source/ole/vbamodule.cxx0
-rw-r--r--[-rwxr-xr-x]oox/source/ole/vbaproject.cxx0
-rw-r--r--padmin/source/padialog.src64
-rw-r--r--padmin/source/rtsetup.src38
-rw-r--r--python/Python-parallel-make.patch36
-rw-r--r--python/makefile.mk1
-rw-r--r--reportbuilder/util/hidother.src146
-rwxr-xr-x[-rw-r--r--]reportbuilder/util/makefile.pmk0
-rw-r--r--reportdesign/inc/helpids.hrc174
-rw-r--r--reportdesign/source/ui/dlg/DateTime.src4
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx4
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.src6
-rw-r--r--reportdesign/source/ui/dlg/Navigator.src5
-rw-r--r--reportdesign/source/ui/dlg/PageNumber.src6
-rw-r--r--reportdesign/source/ui/inc/FunctionHelper.hxx2
-rw-r--r--reportdesign/source/ui/inc/metadata.hxx4
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx4
-rw-r--r--reportdesign/source/ui/inspection/DefaultInspection.cxx11
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx10
-rw-r--r--reportdesign/source/ui/inspection/metadata.cxx14
-rw-r--r--reportdesign/source/ui/misc/FunctionHelper.cxx4
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx4
-rw-r--r--reportdesign/source/ui/report/report.src24
-rw-r--r--reportdesign/util/hidother.src22
-rw-r--r--rsc/inc/rscdb.hxx1
-rw-r--r--rsc/inc/vclrsc.hxx6
-rw-r--r--rsc/source/parser/rscdb.cxx3
-rw-r--r--rsc/source/parser/rscicpx.cxx10
-rw-r--r--rsc/source/parser/rscinit.cxx2
-rw-r--r--sc/inc/addincol.hxx7
-rw-r--r--sc/inc/funcdesc.hxx4
-rw-r--r--sc/inc/helpids.h692
-rw-r--r--sc/inc/sc.hrc380
-rw-r--r--sc/inc/scabstdlg.hxx6
-rw-r--r--sc/inc/sccommands.h336
-rw-r--r--sc/inc/scdll.hxx1
-rw-r--r--sc/inc/scfuncs.hrc290
-rw-r--r--sc/inc/scmod.hxx1
-rw-r--r--sc/sdi/tabvwsh.sdi1
-rw-r--r--[-rwxr-xr-x]sc/source/core/data/documen2.cxx0
-rwxr-xr-x[-rw-r--r--]sc/source/core/data/drwlayer.cxx0
-rw-r--r--sc/source/core/data/global.cxx9
-rwxr-xr-x[-rw-r--r--]sc/source/core/data/makefile.mk0
-rw-r--r--sc/source/core/inc/addinhelpid.hxx4
-rw-r--r--sc/source/core/tool/addincol.cxx14
-rw-r--r--sc/source/core/tool/addinhelpid.cxx10
-rw-r--r--[-rwxr-xr-x]sc/source/filter/excel/xichart.cxx0
-rw-r--r--[-rwxr-xr-x]sc/source/filter/excel/xlchart.cxx0
-rw-r--r--[-rwxr-xr-x]sc/source/filter/inc/xlchart.hxx0
-rw-r--r--sc/source/ui/app/scdll.cxx54
-rw-r--r--sc/source/ui/app/scmod.cxx62
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx12
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx6
-rw-r--r--sc/source/ui/dbgui/asciiopt.src17
-rw-r--r--sc/source/ui/dbgui/consdlg.src16
-rw-r--r--sc/source/ui/dbgui/dapitype.src11
-rw-r--r--sc/source/ui/dbgui/dpgroupdlg.src16
-rw-r--r--sc/source/ui/dbgui/imoptdlg.src6
-rw-r--r--sc/source/ui/dbgui/pivot.src16
-rw-r--r--sc/source/ui/dbgui/pvfundlg.src23
-rw-r--r--sc/source/ui/dbgui/scendlg.src11
-rw-r--r--sc/source/ui/dbgui/textimportoptions.src5
-rw-r--r--sc/source/ui/dbgui/validate.src20
-rw-r--r--sc/source/ui/docshell/docsh4.cxx4
-rw-r--r--sc/source/ui/drawfunc/drformsh.src18
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx6
-rw-r--r--sc/source/ui/drawfunc/objdraw.src896
-rw-r--r--sc/source/ui/formdlg/dwfunctr.src4
-rw-r--r--sc/source/ui/inc/shtabdlg.hxx2
-rw-r--r--sc/source/ui/inc/strindlg.hxx2
-rw-r--r--sc/source/ui/inc/tabbgcolordlg.hxx4
-rw-r--r--sc/source/ui/miscdlgs/acredlin.src4
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.src4
-rw-r--r--sc/source/ui/miscdlgs/highred.src7
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.src10
-rw-r--r--sc/source/ui/miscdlgs/linkarea.src6
-rw-r--r--sc/source/ui/miscdlgs/protectiondlg.src4
-rw-r--r--sc/source/ui/miscdlgs/retypepassdlg.src12
-rw-r--r--sc/source/ui/miscdlgs/scuiautofmt.cxx4
-rw-r--r--sc/source/ui/miscdlgs/sharedocdlg.src3
-rw-r--r--sc/source/ui/miscdlgs/shtabdlg.cxx6
-rw-r--r--sc/source/ui/miscdlgs/strindlg.cxx24
-rw-r--r--sc/source/ui/miscdlgs/tabbgcolordlg.cxx6
-rw-r--r--sc/source/ui/pagedlg/hfedtdlg.src49
-rw-r--r--sc/source/ui/pagedlg/pagedlg.src26
-rw-r--r--sc/source/ui/src/attrdlg.src4
-rw-r--r--sc/source/ui/src/autofmt.src12
-rw-r--r--sc/source/ui/src/condfrmt.src27
-rw-r--r--sc/source/ui/src/crnrdlg.src9
-rw-r--r--sc/source/ui/src/dbnamdlg.src12
-rw-r--r--sc/source/ui/src/filter.src58
-rw-r--r--sc/source/ui/src/hdrcont.src40
-rw-r--r--sc/source/ui/src/miscdlgs.src113
-rw-r--r--sc/source/ui/src/namedlg.src12
-rw-r--r--sc/source/ui/src/opredlin.src6
-rw-r--r--sc/source/ui/src/optdlg.src57
-rw-r--r--sc/source/ui/src/optsolver.src37
-rw-r--r--sc/source/ui/src/popup.src106
-rw-r--r--sc/source/ui/src/scfuncs.src3
-rw-r--r--sc/source/ui/src/simpref.src2
-rw-r--r--sc/source/ui/src/solveroptions.src4
-rw-r--r--sc/source/ui/src/solvrdlg.src7
-rw-r--r--sc/source/ui/src/sortdlg.src24
-rw-r--r--sc/source/ui/src/subtdlg.src8
-rw-r--r--sc/source/ui/src/tabopdlg.src8
-rw-r--r--sc/source/ui/src/toolbox.src130
-rwxr-xr-x[-rw-r--r--]sc/source/ui/view/gridwin3.cxx0
-rwxr-xr-x[-rw-r--r--]sc/source/ui/view/printfun.cxx0
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx14
-rw-r--r--sc/source/ui/view/tabvwshb.cxx9
-rw-r--r--sc/source/ui/view/tabvwshf.cxx16
-rw-r--r--sc/util/hidother.src34
-rw-r--r--scp2/source/testtool/file_testtool.scp7
-rwxr-xr-xsd/inc/app.hrc44
-rwxr-xr-x[-rw-r--r--]sd/inc/helpids.h472
-rwxr-xr-xsd/inc/sdabstdlg.hxx2
-rw-r--r--sd/inc/sdcommands.h310
-rwxr-xr-xsd/inc/sdmod.hxx2
-rwxr-xr-x[-rw-r--r--]sd/qa/unoapi/sd.sce0
-rw-r--r--sd/sdi/ToolPanelViewShell.sdi177
-rwxr-xr-xsd/sdi/ViewShellBase.sdi213
-rwxr-xr-xsd/sdi/_drvwsh.sdi5
-rwxr-xr-xsd/sdi/sdraw.sdi391
-rwxr-xr-xsd/source/core/drawdoc4.cxx1
-rwxr-xr-xsd/source/core/sdpage.cxx2
-rwxr-xr-xsd/source/core/stlpool.cxx1
-rwxr-xr-xsd/source/filter/html/pubdlg.cxx2
-rw-r--r--sd/source/filter/html/pubdlg.src47
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.src4
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.src41
-rw-r--r--sd/source/ui/annotations/annotations.src29
-rwxr-xr-xsd/source/ui/app/makefile.mk1
-rwxr-xr-xsd/source/ui/app/menuids2_tmpl.src190
-rw-r--r--sd/source/ui/app/menuids3_tmpl.src38
-rw-r--r--sd/source/ui/app/menuids4_tmpl.src2
-rw-r--r--sd/source/ui/app/menuids_tmpl.src274
-rw-r--r--sd/source/ui/app/popup.src57
-rw-r--r--sd/source/ui/app/popup2_tmpl.src28
-rwxr-xr-xsd/source/ui/app/sdmod.cxx51
-rw-r--r--[-rwxr-xr-x]sd/source/ui/app/strings.src5
-rw-r--r--sd/source/ui/app/tbx_ww.src1124
-rw-r--r--sd/source/ui/app/toolbox.src737
-rw-r--r--[-rwxr-xr-x]sd/source/ui/dlg/PaneDockingWindow.src3
-rw-r--r--sd/source/ui/dlg/animobjs.src20
-rw-r--r--sd/source/ui/dlg/brkdlg.src1
-rw-r--r--sd/source/ui/dlg/copydlg.src14
-rw-r--r--sd/source/ui/dlg/custsdlg.src13
-rwxr-xr-xsd/source/ui/dlg/dlgass.cxx4
-rw-r--r--sd/source/ui/dlg/dlgass.src25
-rw-r--r--sd/source/ui/dlg/dlgfield.src5
-rw-r--r--sd/source/ui/dlg/dlgsnap.src10
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.src14
-rw-r--r--sd/source/ui/dlg/ins_paste.src3
-rw-r--r--sd/source/ui/dlg/inspagob.src4
-rw-r--r--sd/source/ui/dlg/layeroptionsdlg.src9
-rw-r--r--sd/source/ui/dlg/masterlayoutdlg.src5
-rw-r--r--sd/source/ui/dlg/morphdlg.src8
-rw-r--r--sd/source/ui/dlg/navigatr.cxx12
-rw-r--r--sd/source/ui/dlg/paragr.src6
-rw-r--r--sd/source/ui/dlg/present.src19
-rw-r--r--sd/source/ui/dlg/prntopts.src18
-rwxr-xr-xsd/source/ui/dlg/sddlgfact.cxx4
-rwxr-xr-xsd/source/ui/dlg/sddlgfact.hxx2
-rw-r--r--sd/source/ui/dlg/sdpreslt.src7
-rw-r--r--sd/source/ui/dlg/tpaction.src11
-rw-r--r--[-rwxr-xr-x]sd/source/ui/dlg/tpoption.src19
-rw-r--r--sd/source/ui/dlg/vectdlg.src8
-rwxr-xr-xsd/source/ui/func/fuinsert.cxx5
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/futempl.cxx2
-rw-r--r--sd/source/ui/inc/PaneDockingWindow.hxx1
-rwxr-xr-xsd/source/ui/inc/taskpane/ScrollPanel.hxx2
-rwxr-xr-xsd/source/ui/notes/NotesChildWindow.src3
-rw-r--r--sd/source/ui/table/TableDesignPane.src1
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx4
-rwxr-xr-xsd/source/ui/toolpanel/LayoutMenu.cxx4
-rwxr-xr-xsd/source/ui/toolpanel/ScrollPanel.cxx4
-rwxr-xr-xsd/source/ui/toolpanel/TestPanel.cxx6
-rwxr-xr-xsd/source/ui/toolpanel/ToolPanelViewShell.cxx8
-rwxr-xr-xsd/source/ui/toolpanel/controls/MasterPagesPanel.cxx19
-rwxr-xr-xsd/source/ui/toolpanel/controls/MasterPagesSelector.cxx4
-rwxr-xr-xsd/source/ui/toolpanel/controls/MasterPagesSelector.hxx3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviews5.cxx14
-rwxr-xr-xsd/source/ui/view/drviews7.cxx14
-rwxr-xr-xsd/source/ui/view/drviews8.cxx1
-rwxr-xr-xsd/source/ui/view/drviewsa.cxx17
-rw-r--r--sd/source/ui/view/drviewsb.cxx6
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewsc.cxx4
-rwxr-xr-xsd/source/ui/view/outlnvsh.cxx6
-rwxr-xr-x[-rw-r--r--]sd/uiconfig/sdraw/menubar/menubar.xml0
-rwxr-xr-x[-rw-r--r--]sd/util/hidother.src26
-rw-r--r--set_soenv.in3
-rw-r--r--sfx2/inc/pch/precompiled_sfx2.hxx1
-rw-r--r--sfx2/inc/sfx2/basedlgs.hxx3
-rw-r--r--sfx2/inc/sfx2/dispatch.hxx4
-rw-r--r--sfx2/inc/sfx2/filedlghelper.hxx3
-rw-r--r--sfx2/inc/sfx2/mnumgr.hxx2
-rw-r--r--sfx2/inc/sfx2/msg.hxx5
-rw-r--r--sfx2/inc/sfx2/opengrf.hxx5
-rw-r--r--sfx2/inc/sfx2/passwd.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxcommands.h345
-rw-r--r--sfx2/inc/sfx2/sfxdlg.hxx4
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc1
-rw-r--r--sfx2/inc/sfx2/titledockwin.hxx4
-rw-r--r--sfx2/inc/sfxhelp.hxx12
-rwxr-xr-xsfx2/sdi/sfx.sdi2
-rw-r--r--sfx2/source/appl/app.src163
-rw-r--r--sfx2/source/appl/appcfg.cxx18
-rw-r--r--sfx2/source/appl/appserv.cxx7
-rw-r--r--sfx2/source/appl/appuno.cxx1
-rw-r--r--sfx2/source/appl/dde.src4
-rw-r--r--sfx2/source/appl/newhelp.cxx6
-rw-r--r--sfx2/source/appl/newhelp.src12
-rw-r--r--sfx2/source/appl/opengrf.cxx7
-rw-r--r--sfx2/source/appl/sfxhelp.cxx583
-rw-r--r--sfx2/source/control/dispatch.cxx25
-rw-r--r--sfx2/source/control/msg.cxx15
-rw-r--r--sfx2/source/dialog/about.cxx5
-rw-r--r--sfx2/source/dialog/alienwarn.src1
-rw-r--r--sfx2/source/dialog/basedlgs.cxx59
-rw-r--r--[-rwxr-xr-x]sfx2/source/dialog/dinfdlg.src41
-rw-r--r--sfx2/source/dialog/dinfedt.src4
-rw-r--r--sfx2/source/dialog/dockwin.cxx53
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx55
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx3
-rw-r--r--sfx2/source/dialog/mgetempl.src6
-rw-r--r--sfx2/source/dialog/newstyle.src4
-rw-r--r--sfx2/source/dialog/passwd.src3
-rw-r--r--sfx2/source/dialog/printopt.src22
-rw-r--r--sfx2/source/dialog/recfloat.src1
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/securitypage.src0
-rw-r--r--sfx2/source/dialog/srchdlg.src6
-rw-r--r--sfx2/source/dialog/tabdlg.cxx10
-rw-r--r--sfx2/source/dialog/taskpane.cxx17
-rw-r--r--sfx2/source/dialog/templdlg.cxx44
-rw-r--r--sfx2/source/dialog/templdlg.src10
-rw-r--r--sfx2/source/dialog/titledockwin.cxx2
-rw-r--r--sfx2/source/dialog/versdlg.src10
-rw-r--r--sfx2/source/doc/applet.cxx383
-rw-r--r--sfx2/source/doc/doc.hrc1
-rw-r--r--sfx2/source/doc/doc.src8
-rw-r--r--sfx2/source/doc/doctdlg.src8
-rw-r--r--sfx2/source/doc/docvor.src7
-rw-r--r--sfx2/source/doc/iframe.cxx2
-rw-r--r--sfx2/source/doc/makefile.mk2
-rw-r--r--sfx2/source/doc/new.src18
-rw-r--r--sfx2/source/doc/objcont.cxx11
-rw-r--r--sfx2/source/doc/querytemplate.cxx4
-rw-r--r--[-rwxr-xr-x]sfx2/source/doc/syspath.cxx0
-rw-r--r--sfx2/source/inc/applet.hxx122
-rwxr-xr-xsfx2/source/inc/helpid.hrc619
-rw-r--r--sfx2/source/menu/menu.src7
-rwxr-xr-xsfx2/source/menu/mnumgr.cxx5
-rw-r--r--sfx2/source/menu/virtmenu.cxx25
-rw-r--r--sfx2/source/statbar/stbitem.cxx5
-rw-r--r--sfx2/source/view/frame2.cxx10
-rw-r--r--sfx2/util/hidother.src62
-rw-r--r--soldep/source/soldlg.src24
-rw-r--r--solenv/bin/mhids.pl398
-rw-r--r--solenv/inc/_tg_rslb.mk160
-rw-r--r--solenv/inc/_tg_sdi.mk90
-rw-r--r--solenv/inc/_tg_srs.mk140
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--solenv/inc/rules.mk7
-rwxr-xr-x[-rw-r--r--]solenv/inc/set_wntx64.mk0
-rw-r--r--solenv/inc/target.mk58
-rw-r--r--solenv/inc/tg_rslb.mk16
-rw-r--r--solenv/inc/tg_sdi.mk9
-rw-r--r--solenv/inc/tg_srs.mk14
-rwxr-xr-x[-rw-r--r--]solenv/inc/wntmsci11.mk0
-rwxr-xr-xsoltools/HIDCompiler/hidclex.l951
-rw-r--r--soltools/HIDCompiler/makefile.mk63
-rw-r--r--soltools/HIDCompiler/wrap_hidclex.cxx31
-rw-r--r--soltools/prj/build.lst1
-rw-r--r--soltools/prj/d.lst2
-rw-r--r--starmath/inc/dialog.hxx2
-rw-r--r--starmath/inc/helpids.h326
-rw-r--r--starmath/inc/smcommands.h68
-rw-r--r--starmath/inc/smmod.hxx1
-rwxr-xr-xstarmath/inc/starmath.hrc295
-rwxr-xr-xstarmath/source/dialog.cxx9
-rwxr-xr-x[-rw-r--r--]starmath/source/parse.cxx0
-rw-r--r--starmath/source/smmod.cxx10
-rw-r--r--[-rwxr-xr-x]starmath/source/smres.src150
-rw-r--r--starmath/util/hidother.src3
-rw-r--r--svl/inc/pickerhelper.hxx69
-rw-r--r--svl/source/filepicker/makefile.mk1
-rw-r--r--svl/source/filepicker/pickerhelper.cxx99
-rw-r--r--svtools/bmpmaker/bmp.src8
-rw-r--r--svtools/inc/fileview.hxx4
-rw-r--r--svtools/inc/svtools/headbar.hxx8
-rw-r--r--svtools/inc/svtools/helpid.hrc141
-rw-r--r--svtools/inc/svtools/roadmapwizard.hxx4
-rw-r--r--svtools/inc/svtools/svtdata.hxx1
-rw-r--r--svtools/inc/svtools/toolpanel/toolpanel.hxx3
-rw-r--r--svtools/inc/tabbar.hxx10
-rw-r--r--svtools/inc/taskbar.hxx6
-rw-r--r--svtools/source/contnr/fileview.cxx6
-rw-r--r--svtools/source/contnr/fileview.src4
-rw-r--r--svtools/source/contnr/templwin.src2
-rw-r--r--svtools/source/control/headbar.cxx26
-rw-r--r--svtools/source/control/inettbc.cxx2
-rwxr-xr-xsvtools/source/control/tabbar.cxx25
-rw-r--r--svtools/source/control/taskstat.cxx6
-rw-r--r--svtools/source/dialogs/addresstemplate.src4
-rw-r--r--svtools/source/dialogs/colrdlg.src13
-rw-r--r--svtools/source/dialogs/filedlg2.cxx12
-rw-r--r--svtools/source/dialogs/printdlg.cxx8
-rw-r--r--svtools/source/dialogs/printdlg.src16
-rw-r--r--svtools/source/dialogs/prnsetup.src4
-rw-r--r--svtools/source/dialogs/roadmapwizard.cxx8
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx4
-rw-r--r--[-rwxr-xr-x]svtools/source/filter.vcl/filter/exportdialog.src24
-rw-r--r--svtools/source/java/javainteractionhandler.cxx6
-rw-r--r--svtools/source/plugapp/testtool.src7
-rw-r--r--svtools/source/productregistration/registrationdlg.src4
-rw-r--r--svtools/source/toolpanel/drawerlayouter.cxx2
-rw-r--r--svtools/source/toolpanel/dummypanel.cxx4
-rw-r--r--svtools/source/toolpanel/dummypanel.hxx2
-rw-r--r--svtools/source/uno/wizard/unowizard.cxx31
-rw-r--r--svtools/util/hidother.src20
-rwxr-xr-xsvtools/workben/toolpanel/toolpaneltest.cxx6
-rw-r--r--svtools/workben/unodialog/roadmapskeleton.src5
-rw-r--r--svx/inc/fmhelp.hrc164
-rw-r--r--svx/inc/globlmn_tmpl.hrc202
-rw-r--r--svx/inc/helpid.hrc500
-rw-r--r--svx/inc/pch/precompiled_svx.hxx1
-rw-r--r--svx/inc/pfiledlg.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dialogs.hrc4
-rw-r--r--svx/inc/svx/exthelpid.hrc17
-rw-r--r--svx/inc/svx/simptabl.hxx2
-rw-r--r--svx/inc/svx/svxcommands.h604
-rw-r--r--svx/inc/svx/svxdlg.hxx8
-rw-r--r--svx/prj/d.lst1
-rw-r--r--svx/sdi/svx.sdi27
-rw-r--r--svx/source/dialog/bmpmask.src17
-rw-r--r--svx/source/dialog/contdlg.src2
-rw-r--r--svx/source/dialog/docrecovery.cxx1
-rw-r--r--svx/source/dialog/docrecovery.src19
-rw-r--r--svx/source/dialog/fontwork.src7
-rw-r--r--svx/source/dialog/hdft.src18
-rw-r--r--svx/source/dialog/hyprlink.src4
-rw-r--r--svx/source/dialog/imapdlg.src4
-rw-r--r--svx/source/dialog/optgrid.src17
-rw-r--r--svx/source/dialog/passwd.src3
-rw-r--r--svx/source/dialog/pfiledlg.cxx5
-rw-r--r--svx/source/dialog/rubydialog.src14
-rw-r--r--svx/source/dialog/srchdlg.cxx2
-rw-r--r--svx/source/dialog/srchdlg.src33
-rw-r--r--svx/source/engine3d/float3d.src72
-rw-r--r--svx/source/fmcomp/fmgridif.cxx13
-rw-r--r--svx/source/fmcomp/gridctrl.src44
-rw-r--r--svx/source/form/datanavi.src35
-rw-r--r--svx/source/form/filtnav.src10
-rw-r--r--svx/source/form/fmexpl.src65
-rw-r--r--svx/source/form/formshell.src7
-rw-r--r--svx/source/gallery2/gallery.src2
-rw-r--r--svx/source/intro/iso.src2
-rw-r--r--svx/source/intro/ooo.src2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx0
-rw-r--r--svx/source/stbctrls/insctrl.cxx1
-rw-r--r--svx/source/stbctrls/pszctrl.cxx19
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx6
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.src5
-rw-r--r--svx/source/tbxctrls/fontworkgallery.src5
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx5
-rw-r--r--svx/source/tbxctrls/lboxctrl.src1
-rw-r--r--svx/source/tbxctrls/makefile.mk1
-rw-r--r--svx/source/tbxctrls/tbxdraw.src265
-rw-r--r--svx/source/toolbars/extrusionbar.src59
-rw-r--r--svx/source/toolbars/fontworkbar.src34
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src8
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src4
-rw-r--r--svx/util/hidother.src5
-rw-r--r--[-rwxr-xr-x]sw/inc/dochdl.hrc0
-rwxr-xr-x[-rw-r--r--]sw/inc/docsh.hxx0
-rw-r--r--sw/inc/helpid.h1885
-rw-r--r--sw/inc/swabstdlg.hxx2
-rw-r--r--sw/inc/swcommands.h434
-rwxr-xr-x[-rw-r--r--]sw/inc/viewsh.hxx0
-rw-r--r--sw/sdi/_textsh.sdi6
-rwxr-xr-x[-rw-r--r--]sw/source/core/view/viewsh.cxx0
-rw-r--r--sw/source/ui/app/docsh2.cxx36
-rw-r--r--sw/source/ui/app/mn.src155
-rw-r--r--sw/source/ui/chrdlg/ccoll.src5
-rw-r--r--sw/source/ui/chrdlg/chardlg.src8
-rw-r--r--sw/source/ui/chrdlg/drpcps.src7
-rw-r--r--sw/source/ui/chrdlg/numpara.src8
-rw-r--r--sw/source/ui/chrdlg/swbreak.src8
-rw-r--r--sw/source/ui/config/mailconfigpage.src22
-rw-r--r--sw/source/ui/config/optcomp.src3
-rw-r--r--[-rwxr-xr-x]sw/source/ui/config/optdlg.src80
-rw-r--r--sw/source/ui/config/optload.src18
-rw-r--r--sw/source/ui/config/redlopt.src8
-rw-r--r--sw/source/ui/dbui/addresslistdialog.src5
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.src13
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.src7
-rw-r--r--sw/source/ui/dbui/dbinsdlg.src21
-rw-r--r--sw/source/ui/dbui/dbui.src1
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.src1
-rw-r--r--sw/source/ui/dbui/mailmergewizard.src1
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx21
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.src23
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.src8
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.src6
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.src6
-rw-r--r--sw/source/ui/dbui/mmmergepage.src6
-rw-r--r--sw/source/ui/dbui/mmoutputpage.src27
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.src2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.src7
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.src1
-rw-r--r--sw/source/ui/dialog/abstract.src2
-rw-r--r--sw/source/ui/dialog/ascfldlg.src6
-rw-r--r--sw/source/ui/dialog/docstdlg.src1
-rw-r--r--sw/source/ui/dialog/regionsw.src44
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx2
-rw-r--r--[-rwxr-xr-x]sw/source/ui/dochdl/dochdl.src0
-rw-r--r--[-rwxr-xr-x]sw/source/ui/dochdl/gloshdl.cxx0
-rw-r--r--sw/source/ui/dochdl/selglos.src3
-rw-r--r--[-rwxr-xr-x]sw/source/ui/docvw/SidebarWin.cxx0
-rw-r--r--sw/source/ui/docvw/docvw.src22
-rw-r--r--sw/source/ui/envelp/envfmt.src9
-rw-r--r--sw/source/ui/envelp/envlop.src7
-rw-r--r--sw/source/ui/envelp/envprt.src17
-rw-r--r--sw/source/ui/envelp/label.src44
-rw-r--r--sw/source/ui/envelp/labfmt.src11
-rw-r--r--sw/source/ui/envelp/labprt.src6
-rw-r--r--sw/source/ui/envelp/mailmrge.src29
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.src3
-rw-r--r--sw/source/ui/fldui/changedb.src2
-rw-r--r--sw/source/ui/fldui/flddb.src8
-rw-r--r--sw/source/ui/fldui/flddinf.src3
-rw-r--r--sw/source/ui/fldui/flddok.src8
-rw-r--r--sw/source/ui/fldui/fldedt.cxx17
-rw-r--r--sw/source/ui/fldui/fldfunc.src15
-rw-r--r--sw/source/ui/fldui/fldref.src5
-rw-r--r--sw/source/ui/fldui/fldvar.src9
-rw-r--r--sw/source/ui/fldui/inpdlg.src3
-rw-r--r--sw/source/ui/fldui/javaedit.src9
-rw-r--r--sw/source/ui/frmdlg/column.src15
-rw-r--r--sw/source/ui/frmdlg/cption.src13
-rw-r--r--sw/source/ui/frmdlg/frmpage.src44
-rw-r--r--sw/source/ui/frmdlg/wrap.src14
-rw-r--r--sw/source/ui/inc/ribbar.hrc3
-rw-r--r--sw/source/ui/inc/swmn_tmpl.hrc47
-rw-r--r--sw/source/ui/index/cnttab.src72
-rw-r--r--sw/source/ui/index/idxmrk.src13
-rw-r--r--sw/source/ui/index/multmrk.src3
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx9
-rw-r--r--sw/source/ui/misc/bookmark.src4
-rw-r--r--sw/source/ui/misc/docfnote.src26
-rw-r--r--sw/source/ui/misc/glosbib.src5
-rw-r--r--sw/source/ui/misc/glossary.src15
-rw-r--r--sw/source/ui/misc/insfnote.src9
-rw-r--r--sw/source/ui/misc/linenum.src11
-rw-r--r--sw/source/ui/misc/num.src12
-rw-r--r--sw/source/ui/misc/outline.src10
-rw-r--r--sw/source/ui/misc/pgfnote.src8
-rw-r--r--sw/source/ui/misc/pggrid.src13
-rw-r--r--sw/source/ui/misc/srtdlg.src25
-rw-r--r--sw/source/ui/ribbar/inputwin.src12
-rw-r--r--sw/source/ui/ribbar/makefile.mk1
-rw-r--r--sw/source/ui/ribbar/tblctrl.src94
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx2
-rw-r--r--sw/source/ui/ribbar/workctrl.src147
-rwxr-xr-x[-rw-r--r--]sw/source/ui/shells/langhelper.cxx0
-rw-r--r--sw/source/ui/shells/shells.src834
-rw-r--r--sw/source/ui/shells/tabsh.cxx3
-rw-r--r--sw/source/ui/shells/textsh.cxx45
-rw-r--r--sw/source/ui/shells/textsh1.cxx4
-rw-r--r--sw/source/ui/table/chartins.src6
-rw-r--r--sw/source/ui/table/colwd.src4
-rw-r--r--sw/source/ui/table/convert.src14
-rw-r--r--sw/source/ui/table/instable.src11
-rw-r--r--sw/source/ui/table/mergetbl.src4
-rw-r--r--sw/source/ui/table/rowht.src4
-rw-r--r--sw/source/ui/table/splittbl.src6
-rw-r--r--sw/source/ui/table/tabledlg.src40
-rw-r--r--sw/source/ui/table/tautofmt.src11
-rwxr-xr-xsw/source/ui/uiview/pview.cxx4
-rw-r--r--[-rwxr-xr-x]sw/source/ui/uiview/pview.src90
-rw-r--r--sw/source/ui/uiview/view.src154
-rw-r--r--sw/source/ui/uiview/viewdlg2.cxx4
-rw-r--r--[-rwxr-xr-x]sw/source/ui/uiview/viewling.cxx0
-rw-r--r--sw/source/ui/uno/unomod.cxx18
-rw-r--r--sw/source/ui/utlui/glbltree.cxx2
-rw-r--r--sw/source/ui/utlui/gloslst.src1
-rw-r--r--sw/source/ui/utlui/navipi.cxx11
-rw-r--r--sw/source/ui/utlui/unotools.src1
-rw-r--r--sw/source/ui/web/web.src252
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx17
-rw-r--r--sw/util/hidother.src19
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-base-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-calc-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-calc-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-chart-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-draw-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-draw-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-impress-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-impress-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-master-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-math-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-writer-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-writer-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-base-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-base-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-calc-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-calc-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-calc-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-chart-doc.icobin10134 -> 10134 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-configuration.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-draw-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-draw-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-draw-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-empty-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-empty-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-image-doc.icobin10134 -> 10134 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-impress-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-impress-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-impress-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-macro-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-main-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-master-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-math-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-math-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-open.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-printer.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-web-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-writer-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-writer-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-writer-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_base_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_calc_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_calc_tem.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_chart_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_draw_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_draw_tem.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_empty_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_empty_tem.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_global_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_html_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_impress_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_impress_tem.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_macro_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_math_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_writer_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_writer_tem.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/optional/ch2_flexible_source_range_selection.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/optional/ch2_xml_format.bas0
-rw-r--r--testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/optional/includes/loadsave/ch2_losa.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/required/ch2_updt_calc.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/required/includes/ch2_file.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/required/includes/ch2_format.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/required/includes/ch2_format1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/required/includes/ch2_insert.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/required/includes/ch2_ole.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/required/includes/ch2_toolbars.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/required/includes/ch2_view.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/required/includes/ch2_window.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/required/includes/ch2_wizard.inc0
-rw-r--r--testautomation/chart2/tools/ch_tools_common.inc8
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/dba_misc_Macros.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_General.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Grid.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Several1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Several2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_TextControl.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/ctrl_Wizards.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_ADOAccess.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_AdabasD.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Dbase.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_DbaseFunction.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_IndexDesign.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Query.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Relations.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Spreadsheet.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Text.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_Windows.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/db_hsqldb.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/misc_Macros.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_DateTime.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_Grouping.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_PageNumber.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_FormWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/includes/wiz_TableWizard.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/required/includes/DatabaseTypes.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/required/includes/Forms.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/required/includes/MainApp.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/required/includes/Query.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/required/includes/ReportBuilder01.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/required/includes/Table.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/required/includes/TableDesign.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/required/includes/Wizards.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/required/includes/Xforms01.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/tools/controltools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/tools/dbcreatetools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/tools/dbinit.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/tools/dbtools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/tools/formtools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/tools/querytools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/tools/tabletools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/includes/display_name.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/includes/extensions.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/includes/fileopen.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/includes/help.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/includes/identifiers.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/includes/location.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/includes/meta-inf.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/includes/online_update.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/includes/options.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/includes/publisher.inc0
-rw-r--r--testautomation/extensions/optional/input/dependencies/version34.oxtbin1494 -> 1441 bytes
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/config.properties0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/optional/input/issues/Logging.xcu0
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/required/e_update.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/f_basic_gridcontrol.bas1
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc19
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_delete_modules.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_documents.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_eventbinding.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_formcontrols.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_gridcontrol.inc51
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_ide.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_library_export.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_library_import.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_macros.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_modulehide.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_modulenames.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_modules.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_package_export.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_package_import.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_protected_libraries.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_shared_modules.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_usertemplate.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_vba-compat_application-union.inc8
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/basic_vba_compat_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/configuration.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/extras_file_open.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/extras_modify_objects.inc100
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/extras_preview.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/extras_table_autoformat.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/f_usage_tracking.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_allowed_names.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_autocomplete.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_cjk_files.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_cjk_folders.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_document_properties.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_filternames.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_folders1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_folders2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_folders3.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_folders4.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_folders5.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_folders6.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_folders7.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_multiselection.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_passwords.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/filedlg_triggers.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/fontworkgallery.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/help_bookmarks.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/help_compare_applications.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/help_compare_content.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/help_compare_topics.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/help_search.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/help_view_topics.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/loadsave_files.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/loadsave_new.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/menuentries.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/ole_1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/ole_2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/ole_3.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/ole_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_asia.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_data.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_int1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_lan1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_loadsave_general.inc103
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_loadsave_html.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_loadsave_msoffice.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_loadsave_vba.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_accessibility.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_appearance.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_colors.inc15
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_fontreplacement.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_general.inc252
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_java.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_memory.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_paths.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_print.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_security.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_userdata.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/options_ooo_view.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/scripting_organizers.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/security_broken_signature.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/security_evilmacro1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/security_evilmacro2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/security_evilmacro3.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/security_incorrect_password.inc8
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/security_macrosecurity.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/security_recommend_password.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/security_trusted_path.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/standardbar2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/includes/toolbar_behavior.inc0
-rwxr-xr-xtestautomation/framework/optional/includes/w_grid_layout1.inc21
-rwxr-xr-xtestautomation/framework/optional/input/filternames/OpenOffice.org_Filternames_en-US.txt2
-rw-r--r--testautomation/framework/optional/input/filternames/Oracle_Open_Office_Filternames_add_en-US.txt2
-rw-r--r--testautomation/framework/optional/input/filternames/Oracle_Open_Office_Filternames_en-US.txt2
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt21694
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/basic_dialog_export.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/basic_dialog_i18n.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/basic_macroassignment.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/basic_organizer.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/first.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/help_browser.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/printer_administration.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/security_dialogs.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/smoketest.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/standard_toolbar_1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/standard_toolbar_3.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/standard_toolbar_4.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/standard_toolbar_5.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/standard_toolbar_6.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/tools_customize.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/tools_options.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/topten.inc0
-rwxr-xr-xtestautomation/framework/required/includes/window_functions.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/wizard_agenda.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/wizard_documentconverter.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/wizard_euroconverter.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/wizard_fax.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/wizard_firsttime.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/wizard_letter.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/wizard_mailmerge.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/wizard_presentation.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/wizard_webpage.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/CJK_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/customize_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/fileoperations.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/formcontrols.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/help_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/i18n_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/options_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/pbrowser_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/private_environment.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/scriptorganizer_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/spadmin_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/template_tools.inc36
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/toolbar_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/webtools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/window_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/framework/tools/includes/wizards.inc0
-rwxr-xr-xtestautomation/global/hid/hid.lst8
-rw-r--r--testautomation/global/hid/readme.txt130
-rwxr-xr-x[-rw-r--r--]testautomation/global/input/empty/please_do_not_delete_this_file0
-rw-r--r--[-rwxr-xr-x]testautomation/global/required/includes/g_001.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/required/includes/g_009.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/required/includes/g_numberformatter1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/required/includes/g_option.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/required/includes/g_option_application.inc0
-rwxr-xr-xtestautomation/global/sid/all.sid989
-rw-r--r--[-rwxr-xr-x]testautomation/global/sid/bars.sid1115
-rw-r--r--testautomation/global/sid/context.sid36
-rwxr-xr-xtestautomation/global/sid/e_all.sid1016
-rw-r--r--testautomation/global/sid/others.sid41
-rw-r--r--[-rwxr-xr-x]testautomation/global/system/includes/declare.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/system/includes/gvariabl.inc11
-rw-r--r--[-rwxr-xr-x]testautomation/global/system/includes/iniinfo.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/system/includes/inivalue.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/system/includes/master.inc98
-rw-r--r--[-rwxr-xr-x]testautomation/global/system/includes/status.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/system/includes/sysinfo.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/closeoffice.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_accels.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_basic_ide_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_control_objects.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_docfuncs.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_extension_manager_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_filetools.inc93
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_key_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_listfuncs.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_locale_strings1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_macro_tools.inc40
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_ole.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_security_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_stringtools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_treelist_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_xml1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/optional/t_xml2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/required/t_dir.inc51
-rwxr-xr-xtestautomation/global/tools/includes/required/t_doc1.inc19
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/required/t_doc2.inc129
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/required/t_files.inc165
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/required/t_filters.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/required/t_lists.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/required/t_menu.inc6
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/required/t_option.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/required/t_tools1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/required/t_tools2.inc26
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/includes/required/t_tools3.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/bars.win362
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/dial_a_c.win512
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/dial_d_h.win1078
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/dial_i_o.win840
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/dial_p_s.win728
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/dial_t_z.win642
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/dokument.win98
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/e_mathop.win386
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/edia_a_c.win940
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/edia_d_h.win1032
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/edia_i_o.win626
-rwxr-xr-xtestautomation/global/win/edia_p_s.win1169
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/edia_t_z.win553
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/etab_a_d.win910
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/etab_e_g.win678
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/etab_h_o.win464
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/etab_p_s.win216
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/etab_t_z.win292
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/etoolbox.win90
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/mathop.win382
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/piloten.win130
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/reportdesigner.win126
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/spadmin.win210
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/sys_dial.win183
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/tab_a_d.win724
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/tab_e_g.win540
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/tab_h_o.win946
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/tab_p_s.win524
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/tab_t_z.win738
-rw-r--r--[-rwxr-xr-x]testautomation/global/win/w_autop.win56
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/d_export_graphic_a.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/d_export_graphic_b.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/export_graphic_a.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/export_graphic_b.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_accessability.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_area.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_arrangealign.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_autocorrection.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_character.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_clipboard.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_clipexport.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_convertto.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_crossfading.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_customshapes.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_demoguide.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_dimensions.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_edit.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_export_html.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_findreplace.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_format.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_group.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_imagemap.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_insert.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_line.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_load_save.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_mediaplayer.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_navigator.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_ole.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_paneview.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_paragraph.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_savepictureas.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_shaddow.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_slidelayer.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_stylist.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_tables.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_toolbars.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_tools.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/g_zoom.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/gallery.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/gallery2.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/i_animation.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/i_headerfooter.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/i_pengine.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/i_saveloadlayout.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/i_shape.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/i_slidecopy.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/i_slideshow.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/i_view.bas0
-rw-r--r--testautomation/graphics/optional/includes/global/export_graphic.inc112
-rw-r--r--testautomation/graphics/optional/includes/global/export_graphic_2.inc29
-rw-r--r--testautomation/graphics/optional/includes/global/g_clipboard.inc57
-rw-r--r--testautomation/graphics/optional/includes/global/g_demoguide.inc30
-rw-r--r--testautomation/graphics/optional/includes/global/g_find_replace.inc2
-rw-r--r--testautomation/graphics/optional/includes/global/g_paneview.inc4
-rw-r--r--testautomation/graphics/optional/includes/global/g_spellcheck.inc235
-rw-r--r--testautomation/graphics/optional/includes/global/g_stylist.inc38
-rw-r--r--testautomation/graphics/optional/includes/global/g_tools.inc446
-rw-r--r--testautomation/graphics/optional/includes/global/g_tools.inc.orig586
-rw-r--r--testautomation/graphics/optional/includes/impress/i_slideshow.inc50
-rw-r--r--testautomation/graphics/optional/includes/impress/i_slideshow3.inc42
-rw-r--r--testautomation/graphics/optional/includes/impress/i_view.inc8
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/required/d_opt.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/required/d_updt.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/required/i_opt.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/required/i_updt_1.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/required/i_updt_2.bas0
-rw-r--r--testautomation/graphics/required/includes/global/id_006.inc5
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/tools/makeLokaleTxt.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/math/optional/includes/m_101_.inc27
-rw-r--r--[-rwxr-xr-x]testautomation/math/optional/includes/m_106_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/math/required/includes/m_002_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/math/required/includes/m_003_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/math/required/includes/m_004_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/math/required/includes/m_006_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/math/required/includes/m_007_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/math/required/includes/m_010_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/math/required/includes/m_020_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/optional/c_solver.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc14
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc12
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc0
-rw-r--r--testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc97
-rw-r--r--testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc156
-rw-r--r--testautomation/spreadsheet/optional/includes/solver/c_solver.inc8
-rw-r--r--testautomation/spreadsheet/optional/includes/validity/c_validity.inc574
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_datamenu.inc10
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_editmenu.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc5
-rw-r--r--testautomation/spreadsheet/required/includes/c_upd_filemenu.inc22
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc29
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc39
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc0
-rw-r--r--testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc34
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/tools/includes/c_cell_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/tools/includes/c_l10n_tools.inc221
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/tools/includes/c_select_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/tools/includes/c_tool_options.inc0
-rwxr-xr-xtestautomation/tools/hid/cons.txt83
-rwxr-xr-xtestautomation/tools/hid/hid.bat2
-rwxr-xr-xtestautomation/tools/hid/hid.pl92
-rwxr-xr-xtestautomation/tools/hid/hid.sh2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc0
-rw-r--r--testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc9
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc32
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/autotext/w_autotext.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/calculate/w_calculate.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/clipbrd_func.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_210_.inc12
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_211_.inc18
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_212_.inc18
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_213_.inc18
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_214_.inc18
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_215_.inc36
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_216_.inc30
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_217_.inc34
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_218_.inc34
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_219_.inc34
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_220_.inc36
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_221_.inc42
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/clipboard/w_222_.inc42
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc35
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc30
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/fields/w_fields1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/fields/w_fields2.inc179
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/fields/w_fields3.inc20
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/fields/w_fields4.inc114
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/fields/w_fields5.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/fields/w_fields6.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/fields/w_fields7.inc35
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/filter/w_filter.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/fontwork/w_fontwork1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc163
-rw-r--r--testautomation/writer/optional/includes/formatpage/w_formatpage1.inc18
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/formatpage/w_formatpage2.inc32
-rw-r--r--testautomation/writer/optional/includes/formatpage/w_formatpage3.inc38
-rw-r--r--testautomation/writer/optional/includes/formatpage/w_formatpage4.inc8
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc56
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc107
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc44
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc42
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc60
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc39
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc16
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc12
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc0
-rw-r--r--testautomation/writer/optional/includes/loadsave/w_loadsave.inc415
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/navigator/w_navigator.inc18
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/number/w_205_.inc8
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/number/w_205a_.inc18
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/number/w_206_.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/number/w_207_.inc10
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/option/wh_o_1.inc12
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/option/wh_o_2.inc22
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/option/wh_o_3.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/option/wr_o_1.inc16
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/option/wr_o_2.inc38
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/option/wr_o_3.inc16
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/option/wr_o_4.inc5
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/option/wr_o_5.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/option/wr_o_a.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/redlining/w_redlining1.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/redlining/w_redlining2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/regexp/regular.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/regexp/search.inc12
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc22
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/section/w_section_1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/section/w_section_2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/section/w_section_3.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/section/w_section_4.inc12
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/section/w_section_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/shortcut/w_shortcuts.inc3
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/sorting/w_sorting1.inc39
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/sorting/w_sorting2.inc8
-rw-r--r--testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc48
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/stylist/w_stylist.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/table/w_204_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/table/w_204a_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/table/w_204b_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/textframes/w_textframes1.inc36
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/textframes/w_textframes2.inc20
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/textframes/w_textframes3.inc12
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/textframes/w_textframes4.inc80
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/includes/textframes/w_textframes5.inc40
-rwxr-xr-xtestautomation/writer/optional/includes/tools/tools1.inc4
-rwxr-xr-xtestautomation/writer/optional/includes/undo/w_undo_history_4.inc4
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_CJKCTLDependency.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_alternative_text.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_autotext.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_calculate.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_chinesetranslate.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_clipbrd.bas48
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_drawing_tools.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_dropdownLB.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_fields.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_fontwork.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_formatpage.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_formatparagraph.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_hhConversion.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_hyphenation.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_insertgraphic.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_loadsave.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_navigator.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_redlining.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_section.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_sorting.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_spellcheck.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_stylist.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_textframes.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/w_undo.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_001_.inc6
-rw-r--r--testautomation/writer/required/includes/w_001b_.inc24
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_002_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_003_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_005_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_005b_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_006_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_007_.inc17
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_008_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_009_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_010_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_011_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/required/includes/w_020_.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/tools/includes/w_locale_strings2.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/tools/includes/w_tool1.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/tools/includes/w_tool3.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/writer/tools/includes/w_tool4.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/tools/includes/w_tool6.inc0
-rwxr-xr-xtestautomation/writer/tools/includes/w_tools.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/docbook_losa.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/f_xml_save_ms_ole.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxd7_01.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxd7_02.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxd7_03.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxd7_04.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxd7_05.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxi7_01.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxm7_01.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxw7_01.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxw7_01a.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxw7_02.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxw7_03.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/w_xml_vertical_alignment.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/required/includes/oasis_graphics_01.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/tools/includes/itools1.inc0
-rw-r--r--[-rwxr-xr-x]testgraphical/prj/d.lst0
-rw-r--r--toolkit/inc/layout/layout.hxx21
-rw-r--r--toolkit/inc/toolkit/awt/vclxwindows.hxx2
-rw-r--r--toolkit/inc/toolkit/controls/dialogcontrol.hxx2
-rw-r--r--toolkit/source/awt/vclxdialog.cxx4
-rw-r--r--toolkit/source/awt/vclxdialog.hxx2
-rw-r--r--toolkit/source/awt/vclxwindow.cxx31
-rw-r--r--toolkit/source/awt/vclxwindows.cxx4
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx2
-rw-r--r--toolkit/source/layout/core/import.cxx2
-rw-r--r--toolkit/source/layout/vcl/wrapper.cxx44
-rw-r--r--toolkit/workben/layout/sortdlg.src22
-rw-r--r--tools/inc/tools/rc.h1
-rw-r--r--tools/inc/tools/rc.hxx3
-rw-r--r--tools/inc/tools/resmgr.hxx11
-rw-r--r--tools/inc/tools/urlobj.hxx4
-rw-r--r--tools/source/fsys/urlobj.cxx9
-rw-r--r--tools/source/rc/resmgr.cxx198
-rw-r--r--ucbhelper/workben/ucbexplorer/ucbexplorer.src2
-rw-r--r--[-rwxr-xr-x]unotools/inc/unotools/lingucfg.hxx0
-rw-r--r--[-rwxr-xr-x]unotools/source/config/lingucfg.cxx0
-rw-r--r--uui/source/cookiedg.src5
-rw-r--r--uui/source/fltdlg.src1
-rwxr-xr-xuui/source/ids.hrc37
-rw-r--r--[-rwxr-xr-x]uui/source/masterpasscrtdlg.src2
-rw-r--r--uui/source/masterpassworddlg.src1
-rw-r--r--[-rwxr-xr-x]uui/source/nameclashdlg.src3
-rw-r--r--uui/source/newerverwarn.src1
-rw-r--r--[-rwxr-xr-x]uui/source/passworddlg.src2
-rw-r--r--uui/source/secmacrowarnings.src2
-rw-r--r--uui/source/sslwarndlg.src2
-rw-r--r--uui/source/unknownauthdlg.src4
-rw-r--r--vcl/inc/vcl/btndlg.hxx4
-rw-r--r--vcl/inc/vcl/help.hxx11
-rw-r--r--vcl/inc/vcl/menu.hxx4
-rwxr-xr-xvcl/inc/vcl/smartid.hxx87
-rw-r--r--vcl/inc/vcl/status.hxx10
-rw-r--r--vcl/inc/vcl/tabctrl.hxx11
-rw-r--r--vcl/inc/vcl/toolbox.h2
-rw-r--r--vcl/inc/vcl/toolbox.hxx10
-rw-r--r--vcl/inc/vcl/window.h8
-rw-r--r--vcl/inc/vcl/window.hxx15
-rw-r--r--vcl/prj/d.lst1
-rw-r--r--vcl/source/app/help.cxx13
-rw-r--r--[-rwxr-xr-x]vcl/source/app/settings.cxx0
-rw-r--r--vcl/source/control/tabctrl.cxx47
-rw-r--r--vcl/source/helper/makefile.mk1
-rwxr-xr-xvcl/source/helper/smartid.cxx264
-rw-r--r--vcl/source/src/print.src28
-rw-r--r--vcl/source/window/btndlg.cxx11
-rw-r--r--vcl/source/window/menu.cxx46
-rw-r--r--vcl/source/window/msgbox.cxx7
-rw-r--r--vcl/source/window/printdlg.cxx24
-rw-r--r--vcl/source/window/status.cxx36
-rw-r--r--vcl/source/window/toolbox.cxx14
-rw-r--r--vcl/source/window/toolbox2.cxx29
-rw-r--r--vcl/source/window/window.cxx87
-rw-r--r--vcl/source/window/window2.cxx104
-rw-r--r--vcl/unx/source/fontmanager/fontconfig.cxx43
-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--[-rwxr-xr-x]writerfilter/source/dmapper/DomainMapper.cxx0
-rw-r--r--[-rwxr-xr-x]writerfilter/source/dmapper/DomainMapper_Impl.hxx0
-rw-r--r--[-rwxr-xr-x]writerfilter/source/dmapper/SettingsTable.cxx0
-rw-r--r--[-rwxr-xr-x]writerfilter/source/dmapper/ThemeTable.cxx0
-rw-r--r--[-rwxr-xr-x]writerfilter/source/dmapper/makefile.mk0
-rw-r--r--[-rwxr-xr-x]writerfilter/source/ooxml/OOXMLFactory.cxx0
-rw-r--r--[-rwxr-xr-x]writerfilter/source/ooxml/status.sh0
-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
1581 files changed, 41550 insertions, 43398 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/automation/util/manually_added_ids.hid b/automation/util/manually_added_ids.hid
index 7372dc0d9879..7372dc0d9879 100755..100644
--- a/automation/util/manually_added_ids.hid
+++ b/automation/util/manually_added_ids.hid
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index 2d7ccd764762..4b1d2e04d628 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -28,19 +28,17 @@
#ifndef _AVMEDIA_HELPIDS_HRC
#define _AVMEDIA_HELPIDS_HRC
-#include <svl/solar.hrc>
-
-#define HID_AVMEDIA_TOOLBOXITEM_PLAY (HID_AVMEDIA_START+0)
-#define HID_AVMEDIA_TOOLBOXITEM_PAUSE (HID_AVMEDIA_START+1)
-#define HID_AVMEDIA_TOOLBOXITEM_STOP (HID_AVMEDIA_START+2)
-#define HID_AVMEDIA_TOOLBOXITEM_MUTE (HID_AVMEDIA_START+3)
-#define HID_AVMEDIA_TOOLBOXITEM_LOOP (HID_AVMEDIA_START+4)
-#define HID_AVMEDIA_TOOLBOXITEM_OPEN (HID_AVMEDIA_START+5)
-#define HID_AVMEDIA_TOOLBOXITEM_INSERT (HID_AVMEDIA_START+6)
-#define HID_AVMEDIA_ZOOMLISTBOX (HID_AVMEDIA_START+7)
-#define HID_AVMEDIA_TIMESLIDER (HID_AVMEDIA_START+8)
-#define HID_AVMEDIA_TIMEEDIT (HID_AVMEDIA_START+9)
-#define HID_AVMEDIA_VOLUMESLIDER (HID_AVMEDIA_START+10)
-#define HID_AVMEDIA_PLAYERWINDOW (HID_AVMEDIA_START+11)
+#define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"
+#define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"
+#define HID_AVMEDIA_TOOLBOXITEM_STOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP"
+#define HID_AVMEDIA_TOOLBOXITEM_MUTE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE"
+#define HID_AVMEDIA_TOOLBOXITEM_LOOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP"
+#define HID_AVMEDIA_TOOLBOXITEM_OPEN "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN"
+#define HID_AVMEDIA_TOOLBOXITEM_INSERT "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT"
+#define HID_AVMEDIA_ZOOMLISTBOX "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX"
+#define HID_AVMEDIA_TIMESLIDER "AVMEDIA_HID_AVMEDIA_TIMESLIDER"
+#define HID_AVMEDIA_TIMEEDIT "AVMEDIA_HID_AVMEDIA_TIMEEDIT"
+#define HID_AVMEDIA_VOLUMESLIDER "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"
+#define HID_AVMEDIA_PLAYERWINDOW "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"
#endif // _AVMEDIA_HELPIDS_HRC
diff --git a/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..ce5e8ee53a14 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -258,7 +258,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 )
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/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.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/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.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 = S