[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 953 commits - accessibility/bridge accessibility/inc accessibility/prj accessibility/source automation/inc automation/source basctl/inc basctl/prj basctl/source basctl/util bean/com bean/prj bean/qa crashrep/source cui/inc cui/source embedserv/prj embedserv/source embedserv/util extensions/inc extensions/prj extensions/qa extensions/source extensions/test forms/inc forms/prj forms/qa forms/source forms/util javainstaller2/src lingucomponent/prj lingucomponent/source package/prj package/source package/util setup_native/scripts setup_native/source UnoControls/inc UnoControls/prj UnoControls/source UnoControls/util wizards/com wizards/prj wizards/source wizards/util xmlsecurity/prj xmlsecurity/source xmlsecurity/util
Michael Meeks
mmeeks at kemper.freedesktop.org
Tue Mar 1 07:32:00 PST 2011
UnoControls/inc/definesunocontrols.hxx | 135 +
UnoControls/prj/build.lst | 2
UnoControls/prj/d.lst | 1
UnoControls/source/base/registercontrols.cxx | 100
UnoControls/util/ctl.component | 43
UnoControls/util/makefile.mk | 8
accessibility/bridge/org/openoffice/accessibility/AccessBridge.java | 5
accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component | 34
accessibility/bridge/org/openoffice/accessibility/makefile.mk | 7
accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx | 2
accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx | 3
accessibility/prj/build.lst | 2
accessibility/prj/d.lst | 2
automation/inc/automation/commtypes.hxx | 7
automation/inc/automation/communi.hxx | 4
automation/inc/automation/simplecm.hxx | 32
automation/source/communi/communi.cxx | 38
automation/source/inc/cmdbasestream.hxx | 29
automation/source/inc/rcontrol.hxx | 4
automation/source/inc/testapp.hxx | 3
automation/source/miniapp/servres.hrc | 6
automation/source/miniapp/servres.src | 2
automation/source/miniapp/servuid.hxx | 22
automation/source/miniapp/testapp.cxx | 3
automation/source/server/XMLParser.cxx | 42
automation/source/server/cmdbasestream.cxx | 85
automation/source/server/recorder.cxx | 76
automation/source/server/recorder.hxx | 9
automation/source/server/retstrm.cxx | 51
automation/source/server/retstrm.hxx | 31
automation/source/server/server.cxx | 5
automation/source/server/sta_list.cxx | 50
automation/source/server/statemnt.cxx | 585 ++--
automation/source/server/statemnt.hxx | 28
automation/source/simplecm/simplecm.cxx | 4
automation/source/testtool/cmdstrm.cxx | 5
automation/source/testtool/cretstrm.hxx | 2
automation/source/testtool/objtest.cxx | 186 +
automation/source/testtool/objtest.hxx | 25
basctl/inc/helpid.hrc | 84
basctl/prj/build.lst | 2
basctl/prj/d.lst | 1
basctl/source/basicide/basdoc.cxx | 36
basctl/source/basicide/basdoc.hxx | 1
basctl/source/basicide/basicprint.src | 2
basctl/source/basicide/basicrenderable.cxx | 14
basctl/source/basicide/baside2.cxx | 28
basctl/source/basicide/baside2b.cxx | 16
basctl/source/basicide/baside3.cxx | 4
basctl/source/basicide/basides1.cxx | 8
basctl/source/basicide/basidesh.cxx | 5
basctl/source/basicide/basidesh.src | 68
basctl/source/basicide/bastype2.cxx | 6
basctl/source/basicide/bastype3.cxx | 23
basctl/source/basicide/bastypes.cxx | 5
basctl/source/basicide/brkdlg.src | 7
basctl/source/basicide/macrodlg.cxx | 9
basctl/source/basicide/macrodlg.src | 11
basctl/source/basicide/makefile.mk | 4
basctl/source/basicide/moduldl2.cxx | 4
basctl/source/basicide/moduldlg.cxx | 13
basctl/source/basicide/moduldlg.src | 29
basctl/source/basicide/moptions.src | 5
basctl/source/basicide/objdlg.cxx | 7
basctl/source/basicide/objdlg.src | 1
basctl/source/basicide/register.cxx | 22
basctl/source/basicide/scriptdocument.cxx | 6
basctl/source/basicide/tbxctl.src | 273 --
basctl/source/dlged/managelang.src | 5
basctl/util/basctl.component | 34
basctl/util/basctl.map | 1
basctl/util/makefile.mk | 10
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 13
bean/com/sun/star/comp/beans/OOoBean.java | 11
bean/prj/build.lst | 4
bean/qa/complex/OOoBeanTest.java | 656 -----
bean/qa/complex/ScreenComparer.java | 233 -
bean/qa/complex/WriterFrame.java | 209 -
bean/qa/complex/bean/OOoBeanTest.java | 737 +++++
bean/qa/complex/bean/ScreenComparer.java | 249 +
bean/qa/complex/bean/WriterFrame.java | 210 +
bean/qa/complex/bean/makefile.mk | 134 +
crashrep/source/win32/soreport.cpp | 2
cui/inc/pch/precompiled_cui.hxx | 3
cui/source/customize/acccfg.cxx | 167 -
cui/source/customize/acccfg.hrc | 2
cui/source/customize/acccfg.src | 11
cui/source/customize/cfg.cxx | 278 --
cui/source/customize/cfg.src | 19
cui/source/customize/cfgutil.cxx | 71
cui/source/customize/eventdlg.src | 3
cui/source/customize/macropg.cxx | 1
cui/source/customize/macropg.src | 6
cui/source/customize/selector.cxx | 46
cui/source/dialogs/SpellDialog.cxx | 107
cui/source/dialogs/SpellDialog.src | 15
cui/source/dialogs/charmap.src | 5
cui/source/dialogs/commonlingui.cxx | 46
cui/source/dialogs/commonlingui.hxx | 12
cui/source/dialogs/cuigaldlg.cxx | 3
cui/source/dialogs/cuihyperdlg.cxx | 5
cui/source/dialogs/cuiimapdlg.src | 6
cui/source/dialogs/dlgname.src | 6
cui/source/dialogs/fmsearch.src | 8
cui/source/dialogs/gallery.src | 11
cui/source/dialogs/grfflt.src | 18
cui/source/dialogs/hangulhanjadlg.cxx | 13
cui/source/dialogs/hangulhanjadlg.src | 26
cui/source/dialogs/hldocntp.cxx | 33
cui/source/dialogs/hlinettp.cxx | 2
cui/source/dialogs/hlmailtp.cxx | 2
cui/source/dialogs/hlmarkwn.cxx | 4
cui/source/dialogs/hyperdlg.src | 42
cui/source/dialogs/hyphen.src | 8
cui/source/dialogs/iconcdlg.cxx | 187 -
cui/source/dialogs/insdlg.cxx | 5
cui/source/dialogs/insrc.cxx | 4
cui/source/dialogs/insrc.src | 4
cui/source/dialogs/multipat.src | 3
cui/source/dialogs/newtabledlg.src | 3
cui/source/dialogs/postdlg.src | 7
cui/source/dialogs/scriptdlg.cxx | 69
cui/source/dialogs/scriptdlg.src | 7
cui/source/dialogs/showcols.src | 2
cui/source/dialogs/splitcelldlg.src | 5
cui/source/dialogs/srchxtra.cxx | 2
cui/source/dialogs/srchxtra.src | 4
cui/source/dialogs/svuidlg.src | 44
cui/source/dialogs/tbxform.src | 2
cui/source/dialogs/thesdlg.cxx | 38
cui/source/dialogs/thesdlg.hrc | 5
cui/source/dialogs/thesdlg.src | 16
cui/source/dialogs/thesdlg_impl.hxx | 18
cui/source/dialogs/zoom.cxx | 46
cui/source/dialogs/zoom.src | 14
cui/source/factory/dlgfact.cxx | 51
cui/source/factory/dlgfact.hxx | 13
cui/source/inc/SpellDialog.hxx | 4
cui/source/inc/acccfg.hxx | 5
cui/source/inc/align.hxx | 2
cui/source/inc/cfg.hxx | 16
cui/source/inc/cfgutil.hxx | 5
cui/source/inc/chardlg.hxx | 1
cui/source/inc/cuigaldlg.hxx | 3
cui/source/inc/cuires.hrc | 2
cui/source/inc/cuisrchdlg.hxx | 1
cui/source/inc/cuitabarea.hxx | 6
cui/source/inc/cuitabline.hxx | 2
cui/source/inc/dbregister.hxx | 7
cui/source/inc/dlgname.hxx | 2
cui/source/inc/hangulhanjadlg.hxx | 3
cui/source/inc/helpid.hrc | 716 ++---
cui/source/inc/hldocntp.hxx | 1
cui/source/inc/iconcdlg.hxx | 18
cui/source/inc/insdlg.hxx | 2
cui/source/inc/insrc.hxx | 2
cui/source/inc/macroass.hxx | 9
cui/source/inc/optimprove.hxx | 20
cui/source/inc/paragrph.hxx | 1
cui/source/inc/postdlg.hxx | 2
cui/source/inc/scriptdlg.hxx | 11
cui/source/inc/selector.hxx | 6
cui/source/inc/splitcelldlg.hxx | 2
cui/source/inc/treeopt.hxx | 7
cui/source/inc/zoom.hxx | 3
cui/source/options/connpooloptions.src | 5
cui/source/options/connpoolsettings.cxx | 7
cui/source/options/connpoolsettings.hxx | 1
cui/source/options/cuisrchdlg.cxx | 7
cui/source/options/dbregister.cxx | 58
cui/source/options/dbregister.src | 4
cui/source/options/dbregisterednamesconfig.cxx | 2
cui/source/options/doclinkdialog.src | 4
cui/source/options/fontsubs.cxx | 2
cui/source/options/fontsubs.src | 6
cui/source/options/internationaloptions.src | 5
cui/source/options/optaccessibility.src | 9
cui/source/options/optasian.src | 9
cui/source/options/optchart.src | 2
cui/source/options/optcolor.cxx | 98
cui/source/options/optcolor.src | 11
cui/source/options/optctl.src | 6
cui/source/options/optdict.cxx | 2
cui/source/options/optdict.src | 9
cui/source/options/optfltr.cxx | 2
cui/source/options/optfltr.src | 23
cui/source/options/optgdlg.cxx | 43
cui/source/options/optgdlg.src | 60
cui/source/options/optgenrl.cxx | 19
cui/source/options/optgenrl.src | 20
cui/source/options/opthtml.src | 18
cui/source/options/optimprove.cxx | 29
cui/source/options/optimprove.src | 5
cui/source/options/optimprove2.cxx | 25
cui/source/options/optinet2.cxx | 193 -
cui/source/options/optinet2.src | 39
cui/source/options/optjava.cxx | 50
cui/source/options/optjava.hxx | 21
cui/source/options/optjava.src | 12
cui/source/options/optjsearch.src | 19
cui/source/options/optlingu.cxx | 8
cui/source/options/optlingu.src | 10
cui/source/options/optmemory.src | 6
cui/source/options/optpath.cxx | 6
cui/source/options/optpath.src | 2
cui/source/options/optsave.cxx | 45
cui/source/options/optsave.src | 13
cui/source/options/optspell.src | 5
cui/source/options/optupdt.src | 7
cui/source/options/sdbcdriverenum.cxx | 7
cui/source/options/sdbcdriverenum.hxx | 1
cui/source/options/securityoptions.src | 7
cui/source/options/treeopt.cxx | 33
cui/source/options/treeopt.src | 1
cui/source/options/webconninfo.cxx | 8
cui/source/options/webconninfo.src | 3
cui/source/tabpages/align.src | 10
cui/source/tabpages/autocdlg.cxx | 8
cui/source/tabpages/autocdlg.src | 47
cui/source/tabpages/backgrnd.src | 11
cui/source/tabpages/border.cxx | 11
cui/source/tabpages/border.src | 11
cui/source/tabpages/borderconn.cxx | 7
cui/source/tabpages/borderconn.hxx | 7
cui/source/tabpages/chardlg.cxx | 42
cui/source/tabpages/chardlg.src | 49
cui/source/tabpages/connect.src | 8
cui/source/tabpages/dstribut.src | 10
cui/source/tabpages/grfpage.src | 11
cui/source/tabpages/labdlg.src | 7
cui/source/tabpages/macroass.cxx | 49
cui/source/tabpages/macroass.src | 4
cui/source/tabpages/measure.src | 12
cui/source/tabpages/numfmt.cxx | 2
cui/source/tabpages/numfmt.src | 12
cui/source/tabpages/numpages.cxx | 55
cui/source/tabpages/numpages.src | 30
cui/source/tabpages/page.src | 18
cui/source/tabpages/paragrph.cxx | 5
cui/source/tabpages/paragrph.src | 38
cui/source/tabpages/swpossizetabpage.src | 18
cui/source/tabpages/tabarea.src | 82
cui/source/tabpages/tabline.src | 37
cui/source/tabpages/tabstpge.src | 15
cui/source/tabpages/textanim.src | 14
cui/source/tabpages/textattr.src | 11
cui/source/tabpages/tpbitmap.cxx | 2
cui/source/tabpages/tpcolor.cxx | 2
cui/source/tabpages/tpgradnt.cxx | 2
cui/source/tabpages/tphatch.cxx | 2
cui/source/tabpages/tplnedef.cxx | 2
cui/source/tabpages/tplneend.cxx | 2
cui/source/tabpages/transfrm.src | 16
embedserv/prj/build.lst | 2
embedserv/prj/d.lst | 1
embedserv/source/embed/register.cxx | 28
embedserv/util/emser.component | 34
embedserv/util/exports.dxp | 1
embedserv/util/makefile.mk | 8
extensions/inc/abpilot.hrc | 20
extensions/inc/bibliography.hrc | 102
extensions/inc/dbpilots.hrc | 40
extensions/inc/pch/precompiled_extensions.hxx | 2
extensions/inc/propctrlr.hrc | 603 ++--
extensions/inc/update.hrc | 28
extensions/prj/build.lst | 5
extensions/prj/d.lst | 17
extensions/qa/complex/extensions/OfficeResourceLoader.java | 84
extensions/qa/complex/extensions/makefile.mk | 59
extensions/source/abpilot/abp.component | 34
extensions/source/abpilot/abpresid.hrc | 3
extensions/source/abpilot/abpservices.cxx | 21
extensions/source/abpilot/abspilot.src | 23
extensions/source/abpilot/exports.dxp | 1
extensions/source/abpilot/makefile.mk | 8
extensions/source/bibliography/bib.component | 35
extensions/source/bibliography/bib.hrc | 2
extensions/source/bibliography/bibload.cxx | 29
extensions/source/bibliography/datman.cxx | 8
extensions/source/bibliography/datman.src | 31
extensions/source/bibliography/general.cxx | 16
extensions/source/bibliography/general.hxx | 4
extensions/source/bibliography/makefile.mk | 9
extensions/source/bibliography/menu.src | 6
extensions/source/bibliography/toolbar.src | 77
extensions/source/config/ldap/componentdef.cxx | 7
extensions/source/config/ldap/exports.dxp | 1
extensions/source/config/ldap/ldapaccess.cxx | 2
extensions/source/config/ldap/ldapbe2.component | 34
extensions/source/config/ldap/makefile.mk | 8
extensions/source/dbpilots/commonpagesdbp.src | 9
extensions/source/dbpilots/dbp.component | 40
extensions/source/dbpilots/dbpilots.src | 3
extensions/source/dbpilots/dbpresid.hrc | 1
extensions/source/dbpilots/dbpservices.cxx | 21
extensions/source/dbpilots/gridpages.src | 7
extensions/source/dbpilots/groupboxpages.src | 14
extensions/source/dbpilots/listcombopages.src | 8
extensions/source/dbpilots/makefile.mk | 8
extensions/source/inc/componentmodule.cxx | 48
extensions/source/inc/componentmodule.hxx | 15
extensions/source/logging/log.component | 47
extensions/source/logging/makefile.mk | 8
extensions/source/macosx/spotlight/makefile.mk | 3
extensions/source/nsplugin/source/makefile.mk | 2
extensions/source/nsplugin/source/so_env.cxx | 5
extensions/source/ole/makefile.mk | 7
extensions/source/ole/oleautobridge.component | 46
extensions/source/ole/oleautobridge.uno.dxp | 1
extensions/source/ole/oleobjw.cxx | 299 ++
extensions/source/ole/oleobjw.hxx | 17
extensions/source/ole/servreg.cxx | 41
extensions/source/oooimprovecore/makefile.mk | 8
extensions/source/oooimprovecore/oooimprovecore.component | 34
extensions/source/oooimprovement/makefile.mk | 8
extensions/source/oooimprovement/onlogrotate_job.cxx | 70
extensions/source/oooimprovement/oooimprovement.component | 38
extensions/source/oooimprovement/oooimprovement_exports.cxx | 22
extensions/source/plugin/base/service.cxx | 27
extensions/source/plugin/util/makefile.mk | 8
extensions/source/plugin/util/pl.component | 37
extensions/source/preload/makefile.mk | 8
extensions/source/preload/preload.component | 34
extensions/source/preload/preload.src | 8
extensions/source/preload/services.cxx | 21
extensions/source/propctrlr/browserline.cxx | 12
extensions/source/propctrlr/browserline.hxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 4
extensions/source/propctrlr/defaultforminspection.cxx | 2
extensions/source/propctrlr/eformspropertyhandler.cxx | 12
extensions/source/propctrlr/eventhandler.cxx | 16
extensions/source/propctrlr/eventhandler.hxx | 14
extensions/source/propctrlr/fontdialog.cxx | 3
extensions/source/propctrlr/formcomponenthandler.cxx | 38
extensions/source/propctrlr/formcomponenthandler.hxx | 2
extensions/source/propctrlr/formlinkdialog.src | 2
extensions/source/propctrlr/formmetadata.cxx | 14
extensions/source/propctrlr/formmetadata.hxx | 2
extensions/source/propctrlr/listselectiondlg.src | 2
extensions/source/propctrlr/makefile.mk | 8
extensions/source/propctrlr/newdatatype.src | 2
extensions/source/propctrlr/pcr.component | 91
extensions/source/propctrlr/pcrcommon.cxx | 21
extensions/source/propctrlr/pcrcommon.hxx | 5
extensions/source/propctrlr/pcrservices.cxx | 21
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/propctrlr/propertyeditor.cxx | 10
extensions/source/propctrlr/propertyeditor.hxx | 4
extensions/source/propctrlr/propertyinfo.hxx | 3
extensions/source/propctrlr/selectlabeldialog.cxx | 2
extensions/source/propctrlr/selectlabeldialog.src | 2
extensions/source/propctrlr/standardcontrol.cxx | 2
extensions/source/propctrlr/taborder.src | 4
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 4
extensions/source/resource/exports.dxp | 1
extensions/source/resource/makefile.mk | 8
extensions/source/resource/res.component | 38
extensions/source/resource/res_services.cxx | 42
extensions/source/scanner/exports.dxp | 1
extensions/source/scanner/grid.src | 3
extensions/source/scanner/makefile.mk | 8
extensions/source/scanner/sanedlg.cxx | 13
extensions/source/scanner/sanedlg.src | 17
extensions/source/scanner/scanwin.cxx | 5
extensions/source/scanner/scn.component | 34
extensions/source/scanner/scnserv.cxx | 31
extensions/source/scanner/twain.cxx | 7
extensions/source/svg/svguno.cxx | 30
extensions/source/update/check/makefile.mk | 8
extensions/source/update/check/updatecheckconfig.cxx | 100
extensions/source/update/check/updatecheckconfig.hxx | 10
extensions/source/update/check/updatecheckjob.cxx | 20
extensions/source/update/check/updatehdl.cxx | 21
extensions/source/update/check/updateprotocol.cxx | 10
extensions/source/update/check/updchk.uno.component | 37
extensions/source/update/feed/makefile.mk | 8
extensions/source/update/feed/updatefeed.component | 34
extensions/source/update/feed/updatefeed.cxx | 12
extensions/source/update/ui/makefile.mk | 8
extensions/source/update/ui/updatecheckui.cxx | 14
extensions/source/update/ui/updchk.component | 34
extensions/source/xmlextract/makefile.mk | 8
extensions/source/xmlextract/xmx.component | 34
extensions/source/xmlextract/xmxuno.cxx | 21
extensions/test/stm/datatest.cxx | 2
extensions/test/stm/marktest.cxx | 4
extensions/test/stm/pipetest.cxx | 2
extensions/test/stm/testfactreg.cxx | 2
forms/inc/pch/precompiled_forms.hxx | 4
forms/prj/build.lst | 3
forms/prj/d.lst | 1
forms/qa/complex/forms/CheckOGroupBoxModel.java | 203 +
forms/qa/complex/forms/makefile.mk | 115
forms/qa/integration/forms/ListSelection.java | 5
forms/qa/unoapi/forms.sce | 2
forms/qa/unoapi/knownissues.xcl | 8
forms/source/component/Edit.cxx | 2
forms/source/component/Filter.cxx | 50
forms/source/component/Filter.hxx | 5
forms/source/component/FormComponent.cxx | 54
forms/source/component/FormattedField.cxx | 2
forms/source/component/ListBox.cxx | 31
forms/source/helper/windowstateguard.cxx | 28
forms/source/inc/forms_module.hxx | 15
forms/source/inc/forms_module_impl.hxx | 48
forms/source/inc/property.hrc | 1
forms/source/misc/services.cxx | 67
forms/source/richtext/richtextcontrol.hxx | 2
forms/source/richtext/richtextengine.cxx | 2
forms/source/richtext/richtextimplcontrol.cxx | 2
forms/source/richtext/rtattributehandler.cxx | 2
forms/source/solar/component/navbarcontrol.hxx | 2
forms/util/frm.component | 255 +
forms/util/frm.dxp | 1
forms/util/makefile.mk | 8
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java | 5
lingucomponent/prj/build.lst | 2
lingucomponent/prj/d.lst | 5
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp | 1
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx | 9
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component | 34
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 865 +++---
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx | 94
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 8
lingucomponent/source/languageguessing/guesslang.component | 34
lingucomponent/source/languageguessing/guesslang.cxx | 7
lingucomponent/source/languageguessing/makefile.mk | 8
lingucomponent/source/lingutil/lingutil.cxx | 23
lingucomponent/source/lingutil/lingutil.hxx | 8
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component | 34
lingucomponent/source/spellcheck/macosxspell/macreg.cxx | 9
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 26
lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx | 93
lingucomponent/source/spellcheck/macosxspell/makefile.mk | 8
lingucomponent/source/spellcheck/spell/exports.dxp | 1
lingucomponent/source/spellcheck/spell/makefile.mk | 8
lingucomponent/source/spellcheck/spell/spell.component | 34
lingucomponent/source/spellcheck/spell/sreg.cxx | 9
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 318 +-
lingucomponent/source/spellcheck/spell/sspellimp.hxx | 90
lingucomponent/source/thesaurus/libnth/exports.dxp | 1
lingucomponent/source/thesaurus/libnth/lnth.component | 34
lingucomponent/source/thesaurus/libnth/makefile.mk | 8
lingucomponent/source/thesaurus/libnth/nthesdta.hxx | 22
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 483 +--
lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 53
lingucomponent/source/thesaurus/libnth/ntreg.cxx | 9
package/prj/build.lst | 2
package/prj/d.lst | 2
package/source/manifest/ManifestExport.cxx | 5
package/source/manifest/UnoRegister.cxx | 63
package/source/xstor/makefile.mk | 8
package/source/xstor/ohierarchyholder.cxx | 21
package/source/xstor/ohierarchyholder.hxx | 18
package/source/xstor/owriteablestream.cxx | 206 -
package/source/xstor/owriteablestream.hxx | 39
package/source/xstor/register.cxx | 28
package/source/xstor/xstor.component | 35
package/source/xstor/xstor.dxp | 1
package/source/xstor/xstorage.cxx | 594 ++--
package/source/xstor/xstorage.hxx | 66
package/source/zippackage/ZipPackage.cxx | 2
package/source/zippackage/ZipPackageFolder.cxx | 65
package/source/zippackage/ZipPackageStream.cxx | 2
package/util/exports.dxp | 1
package/util/makefile.mk | 8
package/util/package2.component | 44
setup_native/scripts/admin.pl | 2
setup_native/scripts/install_solaris.sh | 2
setup_native/scripts/osx_install_languagepack.applescript | 38
setup_native/scripts/osx_install_patch.applescript | 38
setup_native/source/mac/Info.plist.langpack | 6
setup_native/source/packinfo/packinfo_office.txt | 32
setup_native/source/packinfo/shellscripts_extensions.txt | 168 -
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx | 33
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx | 162 -
wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java | 2
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java | 55
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java | 7
wizards/com/sun/star/wizards/agenda/CallWizard.java | 18
wizards/com/sun/star/wizards/agenda/TopicsControl.java | 7
wizards/com/sun/star/wizards/agenda/agenda.component | 35
wizards/com/sun/star/wizards/agenda/makefile.mk | 8
wizards/com/sun/star/wizards/common/Configuration.java | 2
wizards/com/sun/star/wizards/common/HelpIds.java | 1047 ++++++++
wizards/com/sun/star/wizards/common/NumberFormatter.java | 2
wizards/com/sun/star/wizards/document/OfficeDocument.java | 10
wizards/com/sun/star/wizards/fax/CallWizard.java | 19
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java | 68
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java | 4
wizards/com/sun/star/wizards/fax/fax.component | 35
wizards/com/sun/star/wizards/fax/makefile.mk | 8
wizards/com/sun/star/wizards/form/CallFormWizard.java | 17
wizards/com/sun/star/wizards/form/DataEntrySetter.java | 10
wizards/com/sun/star/wizards/form/FieldLinker.java | 5
wizards/com/sun/star/wizards/form/Finalizer.java | 6
wizards/com/sun/star/wizards/form/FormConfiguration.java | 8
wizards/com/sun/star/wizards/form/FormDocument.java | 4
wizards/com/sun/star/wizards/form/StyleApplier.java | 10
wizards/com/sun/star/wizards/form/UIControlArranger.java | 6
wizards/com/sun/star/wizards/form/form.component | 35
wizards/com/sun/star/wizards/form/makefile.mk | 8
wizards/com/sun/star/wizards/letter/CallWizard.java | 19
wizards/com/sun/star/wizards/letter/LetterWizardDialog.java | 93
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 4
wizards/com/sun/star/wizards/letter/letter.component | 35
wizards/com/sun/star/wizards/letter/makefile.mk | 8
wizards/com/sun/star/wizards/makefile.mk | 1
wizards/com/sun/star/wizards/query/CallQueryWizard.java | 17
wizards/com/sun/star/wizards/query/Finalizer.java | 8
wizards/com/sun/star/wizards/query/makefile.mk | 8
wizards/com/sun/star/wizards/query/query.component | 35
wizards/com/sun/star/wizards/report/CallReportWizard.java | 20
wizards/com/sun/star/wizards/report/Dataimport.java | 2
wizards/com/sun/star/wizards/report/ReportFinalizer.java | 10
wizards/com/sun/star/wizards/report/ReportLayouter.java | 8
wizards/com/sun/star/wizards/report/makefile.mk | 8
wizards/com/sun/star/wizards/report/report.component | 35
wizards/com/sun/star/wizards/table/CallTableWizard.java | 17
wizards/com/sun/star/wizards/table/FieldFormatter.java | 14
wizards/com/sun/star/wizards/table/Finalizer.java | 12
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 14
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 6
wizards/com/sun/star/wizards/table/makefile.mk | 8
wizards/com/sun/star/wizards/table/table.component | 35
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 13
wizards/com/sun/star/wizards/ui/ButtonList.java | 9
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 2
wizards/com/sun/star/wizards/ui/ControlScroller.java | 3
wizards/com/sun/star/wizards/ui/FieldSelection.java | 18
wizards/com/sun/star/wizards/ui/FilterComponent.java | 12
wizards/com/sun/star/wizards/ui/ImageList.java | 7
wizards/com/sun/star/wizards/ui/SortingComponent.java | 6
wizards/com/sun/star/wizards/ui/TitlesComponent.java | 2
wizards/com/sun/star/wizards/ui/WizardDialog.java | 12
wizards/com/sun/star/wizards/web/CallWizard.java | 19
wizards/com/sun/star/wizards/web/FTPDialog.java | 19
wizards/com/sun/star/wizards/web/ImageListDialog.java | 11
wizards/com/sun/star/wizards/web/WWD_Events.java | 2
wizards/com/sun/star/wizards/web/WWD_General.java | 3
wizards/com/sun/star/wizards/web/WebWizardDialog.java | 89
wizards/com/sun/star/wizards/web/makefile.mk | 8
wizards/com/sun/star/wizards/web/web.component | 35
wizards/prj/build.lst | 2
wizards/prj/d.lst | 8
wizards/source/depot/Dialog2.xdl | 24
wizards/source/depot/Dialog3.xdl | 30
wizards/source/depot/Dialog4.xdl | 8
wizards/source/euro/DlgConvert.xdl | 40
wizards/source/euro/DlgPassword.xdl | 6
wizards/source/formwizard/DlgFormDB.xdl | 40
wizards/source/importwizard/ImportDialog.xdl | 54
wizards/source/schedule/DlgCalendar.xdl | 32
wizards/source/template/DialogStyles.xdl | 8
wizards/source/template/TemplateDialog.xdl | 16
wizards/source/webwizard/WebWzrd.xdl | 16
wizards/util/helpids.h | 859 ++++++
wizards/util/hidother.src | 1279 +++++-----
xmlsecurity/prj/build.lst | 2
xmlsecurity/prj/d.lst | 3
xmlsecurity/source/component/registerservices.cxx | 42
xmlsecurity/source/dialogs/certificatechooser.src | 1
xmlsecurity/source/dialogs/certificateviewer.src | 3
xmlsecurity/source/dialogs/digitalsignaturesdialog.src | 3
xmlsecurity/source/dialogs/helpids.hrc | 44
xmlsecurity/source/dialogs/macrosecurity.cxx | 1
xmlsecurity/source/dialogs/macrosecurity.src | 10
xmlsecurity/source/dialogs/warnings.src | 3
xmlsecurity/source/framework/xsec_framework.cxx | 77
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 14
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 71
xmlsecurity/util/exports_xsmscrypt.dxp | 1
xmlsecurity/util/exports_xsnss.dxp | 1
xmlsecurity/util/makefile.mk | 27
xmlsecurity/util/xmlsecurity.component | 37
xmlsecurity/util/xsec_fw.component | 56
xmlsecurity/util/xsec_fw.dxp | 1
xmlsecurity/util/xsec_xmlsec.component | 55
xmlsecurity/util/xsec_xmlsec.windows.component | 55
580 files changed, 12580 insertions(+), 9648 deletions(-)
New commits:
commit e72c836c389877d786d8d31d4b5b17b67dfcc1bf
Merge: ea96281... 54a0d55...
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Mar 1 15:19:25 2011 +0000
Merge remote branch 'stage/ooo/dev300_m98_fixed' into integration/dev300_m98
Conflicts:
UnoControls/inc/basecontainercontrol.hxx
UnoControls/inc/basecontrol.hxx
UnoControls/inc/definesunocontrols.hxx
UnoControls/inc/multiplexer.hxx
UnoControls/source/base/basecontainercontrol.cxx
UnoControls/source/base/basecontrol.cxx
UnoControls/source/base/multiplexer.cxx
UnoControls/source/base/registercontrols.cxx
UnoControls/source/controls/OConnectionPointHelper.cxx
UnoControls/source/controls/progressbar.cxx
UnoControls/source/controls/progressmonitor.cxx
UnoControls/source/controls/statusindicator.cxx
UnoControls/source/inc/OConnectionPointContainerHelper.hxx
UnoControls/source/inc/OConnectionPointHelper.hxx
UnoControls/source/inc/framecontrol.hxx
UnoControls/source/inc/progressbar.hxx
UnoControls/source/inc/progressmonitor.hxx
UnoControls/source/inc/statusindicator.hxx
accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
accessibility/source/extended/AccessibleGridControlHeader.cxx
accessibility/source/extended/AccessibleGridControlTable.cxx
accessibility/source/extended/AccessibleToolPanelDeck.cxx
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
accessibility/source/extended/accessiblelistbox.cxx
accessibility/source/helper/characterattributeshelper.cxx
accessibility/source/standard/vclxaccessiblescrollbar.cxx
automation/inc/automation/communi.hxx
automation/inc/automation/simplecm.hxx
automation/source/communi/communi.cxx
automation/source/miniapp/servuid.hxx
automation/source/server/recorder.cxx
automation/source/server/statemnt.cxx
automation/source/simplecm/simplecm.cxx
automation/source/simplecm/tcpio.cxx
automation/source/simplecm/tcpio.hxx
automation/source/testtool/httprequest.cxx
automation/source/testtool/objtest.cxx
automation/source/testtool/tcommuni.hxx
basctl/inc/basidesh.hrc
basctl/inc/helpid.hrc
basctl/source/accessibility/accessibledialogcontrolshape.cxx
basctl/source/accessibility/accessibledialogwindow.cxx
basctl/source/basicide/baside2.cxx
basctl/source/basicide/baside2b.cxx
basctl/source/basicide/baside3.cxx
basctl/source/basicide/basides1.cxx
basctl/source/basicide/basidesh.cxx
basctl/source/basicide/basidesh.src
basctl/source/basicide/bastype2.cxx
basctl/source/basicide/bastype2.hxx
basctl/source/basicide/bastype3.cxx
basctl/source/basicide/bastypes.cxx
basctl/source/basicide/brkdlg.cxx
basctl/source/basicide/localizationmgr.cxx
basctl/source/basicide/macrodlg.cxx
basctl/source/basicide/makefile.mk
basctl/source/basicide/moduldl2.cxx
basctl/source/basicide/moduldlg.cxx
basctl/source/basicide/scriptdocument.cxx
basctl/source/basicide/tbxctl.cxx
basctl/source/basicide/tbxctl.src
basctl/source/basicide/unomodel.cxx
basctl/source/dlged/dlged.cxx
basctl/source/dlged/dlgedfac.cxx
basctl/source/dlged/dlgedobj.cxx
basctl/source/dlged/propbrw.cxx
basctl/source/inc/bastypes.hxx
bean/qa/complex/makefile.mk
cui/source/customize/acccfg.cxx
cui/source/customize/acccfg.hrc
cui/source/customize/acccfg.src
cui/source/customize/cfg.cxx
cui/source/customize/cfgutil.cxx
cui/source/customize/macropg.cxx
cui/source/customize/macropg.src
cui/source/customize/selector.cxx
cui/source/customize/selector.hrc
cui/source/customize/selector.src
cui/source/dialogs/SpellDialog.cxx
cui/source/dialogs/SpellDialog.hrc
cui/source/dialogs/SpellDialog.src
cui/source/dialogs/commonlingui.hxx
cui/source/dialogs/cuihyperdlg.cxx
cui/source/dialogs/cuiimapwnd.cxx
cui/source/dialogs/hldocntp.cxx
cui/source/dialogs/hldoctp.cxx
cui/source/dialogs/hlinettp.cxx
cui/source/dialogs/hlmailtp.cxx
cui/source/dialogs/hlmarkwn.cxx
cui/source/dialogs/hltpbase.cxx
cui/source/dialogs/hyperdlg.hrc
cui/source/dialogs/hyperdlg.src
cui/source/dialogs/hyphen.cxx
cui/source/dialogs/hyphen.src
cui/source/dialogs/iconcdlg.cxx
cui/source/dialogs/passwdomdlg.cxx
cui/source/dialogs/passwdomdlg.hrc
cui/source/dialogs/passwdomdlg.src
cui/source/dialogs/scriptdlg.cxx
cui/source/dialogs/scriptdlg.hrc
cui/source/dialogs/scriptdlg.src
cui/source/dialogs/splitcelldlg.cxx
cui/source/dialogs/splitcelldlg.hrc
cui/source/dialogs/splitcelldlg.src
cui/source/dialogs/thesdlg.cxx
cui/source/dialogs/thesdlg.hrc
cui/source/dialogs/thesdlg.src
cui/source/dialogs/thesdlg_impl.hxx
cui/source/dialogs/winpluginlib.cpp
cui/source/factory/dlgfact.cxx
cui/source/factory/dlgfact.hxx
cui/source/inc/SpellDialog.hxx
cui/source/inc/autocdlg.hxx
cui/source/inc/cfg.hxx
cui/source/inc/cfgutil.hxx
cui/source/inc/connect.hxx
cui/source/inc/cuires.hrc
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/hangulhanjadlg.hxx
cui/source/inc/helpid.hrc
cui/source/inc/hldocntp.hxx
cui/source/inc/hyphen.hxx
cui/source/inc/iconcdlg.hxx
cui/source/inc/numpages.hxx
cui/source/inc/passwdomdlg.hxx
cui/source/inc/postdlg.hxx
cui/source/inc/scriptdlg.hxx
cui/source/inc/selector.hxx
cui/source/options/cuisrchdlg.cxx
cui/source/options/dbregister.cxx
cui/source/options/dbregister.src
cui/source/options/dbregisterednamesconfig.cxx
cui/source/options/optcolor.cxx
cui/source/options/optfltr.src
cui/source/options/optgdlg.cxx
cui/source/options/optgdlg.src
cui/source/options/optgenrl.cxx
cui/source/options/optimprove.cxx
cui/source/options/optimprove2.cxx
cui/source/options/optinet2.cxx
cui/source/options/optpath.cxx
cui/source/options/optsave.cxx
cui/source/options/readonlyimage.cxx
cui/source/options/treeopt.cxx
cui/source/tabpages/align.cxx
cui/source/tabpages/autocdlg.cxx
cui/source/tabpages/autocdlg.src
cui/source/tabpages/border.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/dstribut.cxx
cui/source/tabpages/dstribut.hrc
cui/source/tabpages/dstribut.src
cui/source/tabpages/labdlg.cxx
cui/source/tabpages/macroass.cxx
cui/source/tabpages/numfmt.cxx
cui/source/tabpages/numfmt.hrc
cui/source/tabpages/numfmt.src
cui/source/tabpages/numpages.cxx
cui/source/tabpages/page.cxx
cui/source/tabpages/paragrph.cxx
cui/source/tabpages/tabarea.src
cui/source/tabpages/textattr.cxx
cui/source/tabpages/tpbitmap.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tpgradnt.cxx
cui/source/tabpages/tphatch.cxx
cui/source/tabpages/tpline.cxx
cui/source/tabpages/tplnedef.cxx
cui/source/tabpages/tplneend.cxx
embedserv/source/embed/register.cxx
extensions/inc/abpilot.hrc
extensions/inc/bibliography.hrc
extensions/inc/dbpilots.hrc
extensions/inc/pch/precompiled_extensions.hxx
extensions/inc/propctrlr.hrc
extensions/inc/update.hrc
extensions/source/abpilot/datasourcehandling.cxx
extensions/source/bibliography/bibload.cxx
extensions/source/bibliography/datman.cxx
extensions/source/bibliography/framectr.cxx
extensions/source/config/ldap/ldapuserprofilebe.cxx
extensions/source/dbpilots/controlwizard.cxx
extensions/source/dbpilots/gridwizard.cxx
extensions/source/inc/componentmodule.cxx
extensions/source/nsplugin/source/so_env.cxx
extensions/source/nsplugin/source/so_instance.cxx
extensions/source/ole/oleobjw.cxx
extensions/source/ole/oleobjw.hxx
extensions/source/ole/olethread.cxx
extensions/source/oooimprovement/invite_job.cxx
extensions/source/oooimprovement/onlogrotate_job.cxx
extensions/source/plugin/base/service.cxx
extensions/source/plugin/base/xplugin.cxx
extensions/source/plugin/inc/plugin/unx/mediator.hxx
extensions/source/plugin/inc/plugin/unx/plugcon.hxx
extensions/source/plugin/unx/mediator.cxx
extensions/source/plugin/unx/nppapi.cxx
extensions/source/plugin/unx/plugcon.cxx
extensions/source/propctrlr/browserline.cxx
extensions/source/propctrlr/browserline.hxx
extensions/source/propctrlr/fontdialog.cxx
extensions/source/scanner/sane.hxx
extensions/source/scanner/scanunx.cxx
extensions/source/scanner/scanwin.cxx
extensions/source/scanner/twain.cxx
extensions/source/scanner/twain.hxx
extensions/source/update/check/updatecheck.cxx
extensions/source/update/check/updatecheckconfig.cxx
extensions/source/update/check/updatecheckjob.cxx
extensions/test/stm/datatest.cxx
extensions/test/stm/marktest.cxx
extensions/test/stm/pipetest.cxx
extensions/test/stm/testfactreg.cxx
extensions/workben/testframecontrol.cxx
extensions/workben/testpgp.cxx
extensions/workben/testresource.cxx
forms/prj/build.lst
forms/qa/complex/forms/CheckOGroupBoxModel.java
forms/qa/unoapi/knownissues.xcl
forms/source/component/DatabaseForm.cxx
forms/source/component/Filter.cxx
forms/source/component/ListBox.cxx
forms/source/helper/commanddescriptionprovider.cxx
forms/source/helper/commandimageprovider.cxx
forms/source/helper/formnavigation.cxx
forms/source/inc/commanddescriptionprovider.hxx
forms/source/inc/commandimageprovider.hxx
forms/source/inc/forms_module_impl.hxx
forms/source/inc/property.hrc
forms/source/misc/InterfaceContainer.cxx
forms/source/misc/services.cxx
forms/source/resource/frm_resource.cxx
forms/source/richtext/richtextimplcontrol.cxx
forms/source/richtext/rtattributehandler.cxx
forms/source/richtext/specialdispatchers.cxx
forms/source/solar/component/navbarcontrol.hxx
forms/source/solar/control/navtoolbar.cxx
lingucomponent/prj/build.lst
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/inc/ZipFile.hxx
package/source/manifest/UnoRegister.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/owriteablestream.hxx
package/source/xstor/selfterminatefilestream.cxx
package/source/xstor/selfterminatefilestream.hxx
package/source/xstor/xstorage.cxx
package/source/xstor/xstorage.hxx
package/source/zipapi/XFileStream.cxx
package/source/zipapi/XFileStream.hxx
package/source/zipapi/XUnbufferedStream.cxx
package/source/zipapi/XUnbufferedStream.hxx
package/source/zipapi/ZipFile.cxx
package/source/zippackage/ZipPackageFolder.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/scripts/admin.pl
setup_native/source/mac/broffice/DS_Store
setup_native/source/mac/broffice/osxdndinstall.png
setup_native/source/mac/broffice/osxdndinstall_nologo.png
setup_native/source/mac/ooo/DS_Store
setup_native/source/mac/ooo/DS_Store_Langpack
setup_native/source/mac/ooo/osxdndinstall.png
setup_native/source/mac/ooo/osxdndinstall_nologo.png
setup_native/source/packinfo/package_names.txt
setup_native/source/packinfo/packinfo_brand.txt
setup_native/source/packinfo/packinfo_office.txt
setup_native/source/packinfo/shellscripts_extensions.txt
setup_native/source/packinfo/spellchecker_selection.txt
setup_native/source/win32/customactions/reg64/reg64.cxx
setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
setup_native/source/win32/nsis/brobanner.bmp
setup_native/source/win32/nsis/brobitmap.bmp
setup_native/source/win32/nsis/ooobanner.bmp
setup_native/source/win32/nsis/ooobitmap.bmp
setup_native/source/win32/nsis/ooosdkbanner.bmp
setup_native/source/win32/nsis/ooosetup.ico
wizards/com/sun/star/wizards/ui/FilterComponent.java
wizards/prj/build.lst
xmlsecurity/prj/build.lst
xmlsecurity/source/component/registerservices.cxx
xmlsecurity/source/dialogs/digitalsignaturesdialog.src
xmlsecurity/source/framework/xsec_framework.cxx
xmlsecurity/source/helper/documentsignaturehelper.cxx
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
xmlsecurity/test_docs/tools/httpserv/src/httpserv/Main.java
diff --cc UnoControls/inc/definesunocontrols.hxx
index 0000000,1314fc6..0e19657
mode 000000,100644..100644
--- a/UnoControls/inc/definesunocontrols.hxx
+++ b/UnoControls/inc/definesunocontrols.hxx
@@@ -1,0 -1,135 +1,135 @@@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
++ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+ #ifndef _UNOCONTROLS_DEFINES_CTRL_HXX
+ #define _UNOCONTROLS_DEFINES_CTRL_HXX
+
+ //-------------------------------------------------------------------------------------------------------------------
+ // includes
+ #include <limits.h> // defines for min/max of INT
+
+ namespace unocontrols{
+
+ //-------------------------------------------------------------------------------------------------------------------
+ // global defines for all UnoControls
+ //-------------------------------------------------------------------------------------------------------------------
+ #define UNOCONTROLS_TRGB_COLORDATA( t,r,g,b ) ((INT32)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)|(((UINT32)((UINT8)(t)))<<24))
+ //-------------------------------------------------------------------------------------------------------------------
+
+ // defines for BaseControl
+ #ifdef _UNOCONTROLS_BASECONTROL_CTRL_HXX
+ #define BASECONTROL_IDLCLASSNAME "BaseControl"
+ #define BASECONTROL_DEFAULT_PMULTIPLEXER NULL
+ #define BASECONTROL_DEFAULT_X 0
+ #define BASECONTROL_DEFAULT_Y 0
+ #define BASECONTROL_DEFAULT_WIDTH 100
+ #define BASECONTROL_DEFAULT_HEIGHT 100
+ #define BASECONTROL_DEFAULT_VISIBLE FALSE
+ #define BASECONTROL_DEFAULT_INDESIGNMODE FALSE
+ #define BASECONTROL_DEFAULT_ENABLE TRUE
+ #define BASECONTROL_SERVICE_VCLTOOLKIT "com.sun.star.awt.VclToolkit"
+ #endif
+ //-------------------------------------------------------------------------------------------------------------------
+
+ //-------------------------------------------------------------------------------------------------------------------
+ // defines for BaseContainerControl
+ #ifdef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
+ #define BASECONTAINERCONTROL_IDLCLASSNAME "BaseContainerControl"
+ #endif
+ //-------------------------------------------------------------------------------------------------------------------
+
+ //-------------------------------------------------------------------------------------------------------------------
+ // defines for ProgressBar
+ #ifdef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
+ #define PROGRESSBAR_IDLCLASSNAME "XProgressbar"
+ #define PROGRESSBAR_SERVICENAME "com.sun.star.awt.XProgressBar"
+ #define PROGRESSBAR_IMPLEMENTATIONNAME "stardiv.UnoControls.ProgressBar"
+ #define PROGRESSBAR_FREEBORDER 2
+ #define PROGRESSBAR_DEFAULT_HORIZONTAL TRUE
+ #define PROGRESSBAR_DEFAULT_BLOCKDIMENSION Size(1,1)
+ #define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray
+ #define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR UNOCONTROLS_TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 ) // blue
+ #define PROGRESSBAR_DEFAULT_MINRANGE INT_MIN
+ #define PROGRESSBAR_DEFAULT_MAXRANGE INT_MAX
+ #define PROGRESSBAR_DEFAULT_BLOCKVALUE 1
+ #define PROGRESSBAR_DEFAULT_VALUE PROGRESSBAR_DEFAULT_MINRANGE
+ #define PROGRESSBAR_LINECOLOR_BRIGHT UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
+ #define PROGRESSBAR_LINECOLOR_SHADOW UNOCONTROLS_TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
+ #endif
+ //-------------------------------------------------------------------------------------------------------------------
+
+ //-------------------------------------------------------------------------------------------------------------------
+ // defines for FrameControl
+ #ifdef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
+ #define FRAMECONTROL_IDLCLASSNAME "FrameControl"
+ #define FRAMECONTROL_SERVICENAME "com.sun.star.frame.FrameControl"
+ #define FRAMECONTROL_IMPLEMENTATIONNAME "stardiv.UnoControls.FrameControl"
+ #define FRAMECONTROL_DEFAULT_COMPONENTURL "private:factory/swriter"
+ #define FRAMECONTROL_PROPERTYNAME_LOADERARGUMENTS "LoaderArguments"
+ #define FRAMECONTROL_PROPERTYNAME_COMPONENTURL "ComponentURL"
+ #define FRAMECONTROL_PROPERTYNAME_FRAME "Frame"
+ #define FRAMECONTROL_PROPERTYNAME_IDLCLASSES "IDLClasses"
+ #define FRAMECONTROL_ERRORTEXT_VOSENSHURE "This is an invalid property handle."
+ #define FRAMECONTROL_PROPERTY_COUNT 4 // you must count the propertys
+ #define FRAMECONTROL_PROPERTY_COMPONENTURL 0 // Id must be the index into the array
+ #define FRAMECONTROL_PROPERTY_FRAME 1
+ #define FRAMECONTROL_PROPERTY_IDLCLASSES 2
+ #define FRAMECONTROL_PROPERTY_LOADERARGUMENTS 3
+ #endif
+ //-------------------------------------------------------------------------------------------------------------------
+
+ //-------------------------------------------------------------------------------------------------------------------
+ // defines for ProgressMonitor
+ #ifdef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
+ #define PROGRESSMONITOR_IDLCLASSNAME "XProgressMonitor"
+ #define PROGRESSMONITOR_SERVICENAME "com.sun.star.awt.XProgressMonitor"
+ #define PROGRESSMONITOR_IMPLEMENTATIONNAME "stardiv.UnoControls.ProgressMonitor"
+ #define PROGRESSMONITOR_FREEBORDER 10 // border around and between the controls
+ #define PROGRESSMONITOR_WIDTH_RELATION 4 // reserve 1/4 for button width and rest for progressbar width
+ #define PROGRESSMONITOR_HEIGHT_RELATION 5 // reserve 1/5 for button and progressbar heigth and rest for text height
+ #define PROGRESSMONITOR_FIXEDTEXT_SERVICENAME "com.sun.star.awt.UnoControlFixedText"
+ #define PROGRESSMONITOR_BUTTON_SERVICENAME "com.sun.star.awt.UnoControlButton"
+ #define PROGRESSMONITOR_FIXEDTEXT_MODELNAME "com.sun.star.awt.UnoControlFixedTextModel"
+ #define PROGRESSMONITOR_BUTTON_MODELNAME "com.sun.star.awt.UnoControlButtonModel"
+ #define PROGRESSMONITOR_CONTROLNAME_TEXT "Text" // identifier the control in container
+ #define PROGRESSMONITOR_CONTROLNAME_BUTTON "Button" // -||-
+ #define PROGRESSMONITOR_CONTROLNAME_PROGRESSBAR "ProgressBar" // -||-
+ #define PROGRESSMONITOR_DEFAULT_BUTTONLABEL "Abbrechen"
+ #define PROGRESSMONITOR_DEFAULT_TOPIC "\0"
+ #define PROGRESSMONITOR_DEFAULT_TEXT "\0"
+ #define PROGRESSMONITOR_BACKGROUNDCOLOR UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lighgray
+ #define PROGRESSMONITOR_LINECOLOR_BRIGHT UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white
+ #define PROGRESSMONITOR_LINECOLOR_SHADOW UNOCONTROLS_TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black
+ #define PROGRESSMONITOR_HEIGHT_PROGRESSBAR 15
+ #define PROGRESSMONITOR_DEFAULT_WIDTH 350
+ #define PROGRESSMONITOR_DEFAULT_HEIGHT 100
+ #endif
+ //-------------------------------------------------------------------------------------------------------------------
+
+ } // namespace unocontrols
+
+ #endif // #ifndef _UNOCONTROLS_DEFINES_CTRL_HXX
diff --cc accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index ccfd6e6,24b507c..c97f680
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@@ -31,9 -30,11 +31,9 @@@
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-#ifndef ACCESSIBILITY_EXT_BROWSE_BOX_CELL_HXX
#include "accessibility/extended/accessiblebrowseboxcell.hxx"
-#endif
#include <cppuhelper/implbase2.hxx>
- #include <vcl/wintypes.hxx>
+ #include <tools/wintypes.hxx>
// ============================================================================
namespace accessibility
{
diff --cc accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index f4aa0d6,16c996f..10f8188
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@@ -28,9 -27,9 +28,8 @@@
#ifndef ACCESSIBILITY_HELPER_COMBOLISTBOXHELPER_HXX
#define ACCESSIBILITY_HELPER_COMBOLISTBOXHELPER_HXX
-#include <tools/gen.hxx>
#include <tools/string.hxx>
- #include <vcl/wintypes.hxx>
- #include <tools/gen.hxx>
+ #include <tools/wintypes.hxx>
namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {
class XClipboard;
diff --cc accessibility/source/helper/acc_factory.cxx
index 0c0bf17,df71877..0c0bf17
mode 100644,100755..100755
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
diff --cc automation/inc/automation/commtypes.hxx
index b95f894,3cb1ac1..11f4c47
--- a/automation/inc/automation/commtypes.hxx
+++ b/automation/inc/automation/commtypes.hxx
@@@ -94,7 -94,7 +95,9 @@@ typedef UINT32 comm_UINT32
typedef sal_uInt16 comm_WORD;
typedef sal_uInt32 comm_DWORD;
- class SmartId;
-class rtl::OString;
++namespace rtl {
++ class OString;
++}
class String;
#define comm_String String
diff --cc automation/inc/automation/communi.hxx
index 079deb7,822613e..8adc756
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@@ -47,7 -46,7 +47,7 @@@ class MultiCommunicationManager : publi
public:
MultiCommunicationManager( BOOL bUseMultiChannel = FALSE );
virtual ~MultiCommunicationManager();
-- virtual BOOL StopCommunication(); // Hält alle CommunicationLinks an
++ virtual BOOL StopCommunication(); // H�lt alle CommunicationLinks an
virtual BOOL IsLinkValid( CommunicationLink* pCL );
virtual USHORT GetCommunicationLinkCount();
virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr );
@@@ -60,7 -59,7 +60,7 @@@ protected
CommunicationLinkList *ActiveLinks;
CommunicationLinkList *InactiveLinks; /// Hier sind die CommunicationLinks drin, die sich noch nicht selbst abgemeldet haben.
/// allerdings schon ein StopCommunication gekriegt haben, bzw ein ConnectionTerminated
-- virtual void DestroyingLink( CommunicationLink *pCL ); // Link trägt sich im Destruktor aus
++ virtual void DestroyingLink( CommunicationLink *pCL ); // Link tr�gt sich im Destruktor aus
BOOL bGracefullShutdown;
};
diff --cc automation/inc/automation/simplecm.hxx
index 65da5a0,44bd6e6..65c10a5
--- a/automation/inc/automation/simplecm.hxx
+++ b/automation/inc/automation/simplecm.hxx
@@@ -37,7 -36,7 +37,7 @@@
#include <automation/commdefines.hxx>
--// CM steht für CommunicationManager
++// CM steht f�r CommunicationManager
#define CM_UNLIMITED_CONNECTIONS 0xffff
typedef USHORT CM_NameType;
@@@ -133,9 -132,9 +133,9 @@@ protected
friend class SingleCommunicationManager;
friend class MultiCommunicationManager;
friend class CommunicationManagerServerAcceptThread;
-- // Darf nicht abgeräumt werden zwischen Empfang des Streams und ende des Callbacks
++ // Darf nicht abger�umt werden zwischen Empfang des Streams und ende des Callbacks
--protected: // so daß nur über Ref gelöscht werden kann
++protected: // so da� nur �ber Ref gel�scht werden kann
virtual ~CommunicationLink();
void InvalidateManager() { pMyManager = NULL; }
@@@ -163,19 -162,19 +163,19 @@@ public
BOOL TransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE );
// Liefert die ID, die vom Sender angegeben wurde.
-- // Dadurch lassen sich virtuelle Kommunikationen über einen physikalischen Link realisiren.
-- // Da die Kommunikation zu älteren Versionen kompatibel bleiben muß, muß der Empfänger raten,
-- // die neue oder die alte verwendet wird, da sich der Kopf eines Auftrages dann ändert.
++ // Dadurch lassen sich virtuelle Kommunikationen �ber einen physikalischen Link realisiren.
++ // Da die Kommunikation zu �lteren Versionen kompatibel bleiben mu�, mu� der Empf�nger raten,
++ // die neue oder die alte verwendet wird, da sich der Kopf eines Auftrages dann �ndert.
UINT16 GetProtocol(){ return nServiceProtocol; }
-- // Der Stream wird hier übergeben. Der Aufrufer ist für dessen Löschung zuständig
++ // Der Stream wird hier �bergeben. Der Aufrufer ist f�r dessen L�schung zust�ndig
// Die Methode MUSS gerufen werden, da sonst keine weiteren Daten empfangen werden.
SvStream* GetServiceData(){ SvStream *pTemp = pServiceData; pServiceData = NULL; return pTemp; }
-- /// Ermöglicht das Auslösen des nächsten Callbacks. Wird auch Implizit gerufen.
++ /// Erm�glicht das Ausl�sen des n�chsten Callbacks. Wird auch Implizit gerufen.
void FinishCallback(){ bIsInsideCallback = FALSE; }
-- /// Syncrones Empfangen der Daten. Nur für Kommandozeile, sonst leer implementiert
++ /// Syncrones Empfangen der Daten. Nur f�r Kommandozeile, sonst leer implementiert
virtual BOOL ReceiveDataStream(){ return FALSE; }
/// Statistics
@@@ -199,7 -198,7 +199,7 @@@ protected
UINT16 nServiceProtocol;
UINT16 nServiceHeaderType;
-- /// Verhindert das vorzeitige Auslösen des nächsten Callbacks.
++ /// Verhindert das vorzeitige Ausl�sen des n�chsten Callbacks.
void StartCallback(){ bIsInsideCallback = TRUE; }
BOOL bIsInsideCallback;
@@@ -238,14 -237,14 +238,14 @@@ public
virtual BOOL StartCommunication()=0;
virtual BOOL StartCommunication( String aApp, String aParams );
virtual BOOL StartCommunication( ByteString aHost, ULONG nPort );
-- virtual BOOL StopCommunication()=0; // Hält alle CommunicationLinks an
++ virtual BOOL StopCommunication()=0; // H�lt alle CommunicationLinks an
virtual BOOL IsCommunicationRunning() { return bIsCommunicationRunning; }
// virtual BOOL IsCommunicationError();
// Der Name oder die IP-Adresse oder sonstwas um den Communikationspartner zu identifizieren
virtual ByteString GetMyName( CM_NameType eType );
-- virtual BOOL IsLinkValid( CommunicationLink* pCL )=0; // Notwendig für call im Destruktor
++ virtual BOOL IsLinkValid( CommunicationLink* pCL )=0; // Notwendig f�r call im Destruktor
virtual USHORT GetCommunicationLinkCount()=0;
virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr )=0;
@@@ -275,7 -274,7 +275,7 @@@ protected
CM_InfoType nInfoType;
-- // Diese Routinen rufen den Link oder sind überladen
++ // Diese Routinen rufen den Link oder sind �berladen
virtual void ConnectionOpened( CommunicationLink* pCL ){ mlConnectionOpened.Call( pCL ); }
virtual void ConnectionClosed( CommunicationLink* pCL ){ mlConnectionClosed.Call( pCL ); }
virtual void DataReceived( CommunicationLink* pCL ){ mlDataReceived.Call( pCL ); }
@@@ -283,7 -282,7 +283,7 @@@
BOOL bIsCommunicationRunning;
-- virtual void DestroyingLink( CommunicationLink *pCL )=0; // Link trägt sich im Destruktor aus
++ virtual void DestroyingLink( CommunicationLink *pCL )=0; // Link tr�gt sich im Destruktor aus
private:
ByteString maApplication;
@@@ -301,7 -300,7 +301,7 @@@ class SingleCommunicationManager : publ
public:
SingleCommunicationManager( BOOL bUseMultiChannel = FALSE );
virtual ~SingleCommunicationManager();
-- virtual BOOL StopCommunication(); // Hält alle CommunicationLinks an
++ virtual BOOL StopCommunication(); // H�lt alle CommunicationLinks an
virtual BOOL IsLinkValid( CommunicationLink* pCL );
virtual USHORT GetCommunicationLinkCount();
virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr );
@@@ -311,7 -310,7 +311,7 @@@ protected
virtual void CallConnectionClosed( CommunicationLink* pCL );
CommunicationLinkRef xActiveLink;
CommunicationLink *pInactiveLink;
-- virtual void DestroyingLink( CommunicationLink *pCL ); // Link trägt sich im Destruktor aus
++ virtual void DestroyingLink( CommunicationLink *pCL ); // Link tr�gt sich im Destruktor aus
};
class ICommunicationManagerClient
diff --cc automation/source/communi/communi.cxx
index ede17dd,0fe86ae..8b3e758
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@@ -56,7 -55,7 +56,7 @@@ _SV_IMPL_SORTAR_ALG( nm,AE )
if( nL ) {\
DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\
for( USHORT n=nP; n < nP + nL; n++ ) \
-- DBG_ERROR("Das Element der Liste wurde nicht gelöscht"); \
++ DBG_ERROR("Das Element der Liste wurde nicht gel�scht"); \
SvPtrarr::Remove( nP, nL ); \
} \
} \
@@@ -98,8 -97,8 +98,8 @@@ CommunicationLinkViaSocket::~Communicat
{
GetpApp()->RemoveUserEvent( nConnectionClosedEventId );
nConnectionClosedEventId = 0;
-- INFO_MSG( CByteString("Event gelöscht"),
-- CByteString( "ConnectionClosedEvent aus Queue gelöscht"),
++ INFO_MSG( CByteString("Event gel�scht"),
++ CByteString( "ConnectionClosedEvent aus Queue gel�scht"),
CM_MISC, NULL );
}
}
@@@ -110,8 -109,8 +110,8 @@@
GetpApp()->RemoveUserEvent( nDataReceivedEventId );
nDataReceivedEventId = 0;
delete GetServiceData();
-- INFO_MSG( CByteString("Event gelöscht"),
-- CByteString( "DataReceivedEvent aus Queue gelöscht"),
++ INFO_MSG( CByteString("Event gel�scht"),
++ CByteString( "DataReceivedEvent aus Queue gel�scht"),
CM_MISC, NULL );
}
}
@@@ -129,7 -128,7 +129,7 @@@ BOOL CommunicationLinkViaSocket::Shutdo
if ( GetStreamSocket() ) // Mal wieder nach oben verschoben, da sonst nicht vom Read runtergesprungen wird.
GetStreamSocket()->close();
-- resume(); // So daß das run auch die Schleife verlassen kann
++ resume(); // So da� das run auch die Schleife verlassen kann
join();
@@@ -239,8 -238,8 +239,8 @@@ BOOL CommunicationLinkViaSocket::DoTran
long CommunicationLinkViaSocket::ConnectionClosed( void* EMPTYARG )
{
{
- vos::OGuard aGuard( aMConnectionClosed );
- nConnectionClosedEventId = 0; // Achtung!! alles andere muß oben gemacht werden.
+ osl::MutexGuard aGuard( aMConnectionClosed );
- nConnectionClosedEventId = 0; // Achtung!! alles andere muß oben gemacht werden.
++ nConnectionClosedEventId = 0; // Achtung!! alles andere mu� oben gemacht werden.
}
ShutdownCommunication();
return CommunicationLink::ConnectionClosed( );
@@@ -250,8 -249,8 +250,8 @@@
long CommunicationLinkViaSocket::DataReceived( void* EMPTYARG )
{
{
- vos::OGuard aGuard( aMDataReceived );
- nDataReceivedEventId = 0; // Achtung!! alles andere muß oben gemacht werden.
+ osl::MutexGuard aGuard( aMDataReceived );
- nDataReceivedEventId = 0; // Achtung!! alles andere muß oben gemacht werden.
++ nDataReceivedEventId = 0; // Achtung!! alles andere mu� oben gemacht werden.
}
return CommunicationLink::DataReceived( );
}
@@@ -297,8 -296,8 +297,8 @@@ MultiCommunicationManager::~MultiCommun
}
}
-- // Alles weghauen, was nicht rechtzeitig auf die Bäume gekommen ist
-- // Was bei StopCommunication übrig geblieben ist, da es sich asynchron austragen wollte
++ // Alles weghauen, was nicht rechtzeitig auf die B�ume gekommen ist
++ // Was bei StopCommunication �brig geblieben ist, da es sich asynchron austragen wollte
USHORT i = ActiveLinks->Count();
while ( i-- )
{
@@@ -310,7 -309,7 +310,7 @@@
delete ActiveLinks;
/// Die Links zwischen ConnectionClosed und Destruktor.
-- /// Hier NICHT gerefcounted, da sie sich sonst im Kreis festhaten würden,
++ /// Hier NICHT gerefcounted, da sie sich sonst im Kreis festhaten w�rden,
/// da die Links sich erst in ihrem Destruktor austragen
i = InactiveLinks->Count();
while ( i-- )
@@@ -326,13 -325,13 +326,13 @@@ BOOL MultiCommunicationManager::StopCom
{
// Alle Verbindungen abbrechen
// ConnectionClosed entfernt die Links aus der Liste. Je nach Implementation syncron
-- // oder asyncron. Daher Von oben nach unten Abräumen, so daß sich nichts verschiebt.
++ // oder asyncron. Daher Von oben nach unten Abr�umen, so da� sich nichts verschiebt.
USHORT i = ActiveLinks->Count();
int nFail = 0;
while ( i )
{
if ( !ActiveLinks->GetObject(i-1)->StopCommunication() )
-- nFail++; // Hochzählen, da Verbindung sich nicht (sofort) beenden lässt.
++ nFail++; // Hochz�hlen, da Verbindung sich nicht (sofort) beenden l�sst.
i--;
}
@@@ -359,7 -358,7 +359,7 @@@ CommunicationLinkRef MultiCommunication
void MultiCommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
{
-- CommunicationLinkRef rHold(pCL); // Hält den Zeiger bis zum Ende des calls
++ CommunicationLinkRef rHold(pCL); // H�lt den Zeiger bis zum Ende des calls
ActiveLinks->C40_PTR_INSERT(CommunicationLink, pCL);
rHold->AddRef();
@@@ -368,7 -367,7 +368,7 @@@
void MultiCommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
{
-- CommunicationLinkRef rHold(pCL); // Hält denm Zeiger bis zum Ende des calls
++ CommunicationLinkRef rHold(pCL); // H�lt denm Zeiger bis zum Ende des calls
CommunicationManager::CallConnectionClosed( pCL );
@@@ -478,20 -477,20 +478,20 @@@ CommunicationManagerServerAcceptThread:
pAcceptorSocket = NULL;
}
#else
-- DEBUGPRINTF ("Destructor CommunicationManagerServerAcceptThread Übersprungen!!!! (wegen Solaris BUG)\n");
++ DEBUGPRINTF ("Destructor CommunicationManagerServerAcceptThread �bersprungen!!!! (wegen Solaris BUG)\n");
#endif
{
- vos::OGuard aGuard( aMAddConnection );
+ osl::MutexGuard aGuard( aMAddConnection );
if ( nAddConnectionEventId )
{
GetpApp()->RemoveUserEvent( nAddConnectionEventId );
nAddConnectionEventId = 0;
CommunicationLinkRef xNewConnection = GetNewConnection();
-- INFO_MSG( CByteString("Event gelöscht"),
-- CByteString( "AddConnectionEvent aus Queue gelöscht"),
++ INFO_MSG( CByteString("Event gel�scht"),
++ CByteString( "AddConnectionEvent aus Queue gel�scht"),
CM_MISC, xNewConnection );
xNewConnection->InvalidateManager();
-- xNewConnection.Clear(); // sollte das Objekt hier löschen
++ xNewConnection.Clear(); // sollte das Objekt hier l�schen
}
}
}
diff --cc automation/source/miniapp/servuid.hxx
index 362b803,26ec517..b7c801a
--- a/automation/source/miniapp/servuid.hxx
+++ b/automation/source/miniapp/servuid.hxx
@@@ -25,16 -24,14 +25,16 @@@
* 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"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc automation/source/server/cmdbasestream.cxx
index a4e62f4,9217c7a..601e023
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@@ -294,10 -342,9 +343,10 @@@ void CmdBaseStream::Write( comm_String
(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");
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc automation/source/server/recorder.cxx
index 712c3fd,8ee70a2..4d8d079
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@@ -483,9 -507,25 +483,9 @@@ IMPL_LINK( MacroRecorder, EventListener
}
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
- case M_Open :
- {
- MouseEvent aMEvnt;
- Point aPt( pControl->GetSizePixel().Width() / 2, pControl->GetSizePixel().Height() / 2 );
- aMEvnt = MouseEvent( aPt,1,MOUSE_SIMPLECLICK,MOUSE_LEFT );
- ImplMouseButtonDown( pControl, aMEvnt );
-
- ULONG nStart = Time::GetSystemTicks();
- ULONG nDelay = pControl->GetSettings().GetMouseSettings().GetActionDelay();
- while ( ( Time::GetSystemTicks() - nStart ) < nDelay + 100 )
- SafeReschedule();
-
- ImplMouseButtonUp ( pControl, aMEvnt );
- }
- break;*/
}
break;
case WINDOW_TOOLBOX:
@@@ -500,14 -540,17 +500,14 @@@
// 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 )
- {
- }*/
}
break;
case VCLEVENT_TOOLBOX_CLICK: /// ATTENTION this is called during initialisation of toolbox. whoever 'invented' this
@@@ -535,7 -676,12 +535,7 @@@
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( rtl::OString(), 0, aKeyUniqueID, CUniString("TypeKeysStart") );
- }
if ( ( !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) &&
(( aKeyCode.GetGroup() == KEYGROUP_NUM) ||
( aKeyCode.GetGroup() == KEYGROUP_ALPHA) ||
diff --cc automation/source/server/statemnt.cxx
index 7d335fd,5d88b6d..19179e0
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@@ -106,8 -129,10 +105,9 @@@
using namespace com::sun::star::frame;
using namespace com::sun::star::uno;
-//using namespace com::sun::star::util; geht wegen Color nicht
using namespace com::sun::star::beans;
using namespace svt;
+ //using namespace svt::table;
#ifndef SBX_VALUE_DECL_DEFINED
@@@ -131,12 -156,13 +131,12 @@@ pfunc_osl_printDebugMessage StatementCo
#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") );
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
StatementFlow::StatementFlow( StatementList *pAfterThis, USHORT nArtP )
: nArt(nArtP)
@@@ -193,7 -219,7 +193,7 @@@ void StatementFlow::SendViaSocket(
bSending = TRUE;
if ( pCommLink )
{
-- if ( !pCommLink->TransferDataStream( pRet->GetStream() ) ) // tritt ein Fehler auf, so wird sofort gelöscht ...
++ if ( !pCommLink->TransferDataStream( pRet->GetStream() ) ) // tritt ein Fehler auf, so wird sofort gel�scht ...
pCommLink = NULL;
}
else
@@@ -271,34 -298,12 +271,11 @@@ BOOL StatementFlow::Execute(
return TRUE;
}
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// 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 & 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;
@@@ -675,9 -695,9 +643,9 @@@ BOOL StatementSlot::Execute(
/* Neues Verfahren ab 334!
-- Neue Methode zum einstellen, daß Modale Dialoge immer Asynchron aufgerufen werden
++ Neue Methode zum einstellen, da� Modale Dialoge immer Asynchron aufgerufen werden
und echter Returnwert, ob Slot geklappt hat
-- und Testen ob Slot überhaupt durch UI aufgerufen werden kann */
++ und Testen ob Slot �berhaupt durch UI aufgerufen werden kann */
SendProfile( SlotString( nFunctionId ) );
@@@ -789,7 -807,7 +753,7 @@@ StatementCommand::StatementCommand( SCm
m_pDbgWin->AddText( "*Deleting all Commands:\n" );
#endif
bReadingCommands = FALSE;
-- while ( StatementList::pFirst != this ) // Alles Löschen außer mich selbst
++ while ( StatementList::pFirst != this ) // Alles L�schen au�er mich selbst
{
StatementList *pDeQue = StatementList::pFirst;
pDeQue->Advance();
@@@ -819,7 -837,7 +783,14 @@@ void StatementCommand::WriteControlData
pBase = pBase->GetParent();
}
-- { // Klammerung, so daß der String nicht während der Rekursion bestehen bleibt
++ if ( bFirst )
++ {
++ if ( pBase->GetType() == WINDOW_WINDOW && pBase->GetParent() && pBase->GetParent()->GetType() == WINDOW_CONTROL &&
++ dynamic_cast< svt::table::TableControl* > ( pBase->GetParent() ) )
++ pBase = pBase->GetParent();
++ }
++
++ { // Klammerung, so da� der String nicht w�hrend der Rekursion bestehen bleibt
String aName;
BOOL bSkip = FALSE;
@@@ -1044,9 -1061,9 +1012,9 @@@
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!
++ 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.
@@@ -1408,7 -1429,7 +1376,7 @@@ BOOL StatementCommand::DisplayHID(
if ( !(nParams & PARAM_ULONG_1) )
{
-- if( GetTTSettings()->pDisplayHidWin ) // Nichts verändern
++ if( GetTTSettings()->pDisplayHidWin ) // Nichts ver�ndern
nLNr1 = GetTTSettings()->pDisplayHidWin->GetConfig();
else // Beim ersten Aufruf wollen wir alles richtig einstellen
nLNr1 = DH_MODE_KURZNAME | DH_MODE_LANGNAME;
@@@ -1520,17 -1542,23 +1488,18 @@@
}
else if ( GetTTSettings()->Act )
{
- if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().Len() > 0 )
-// SET_WIN(GetTTSettings()->Act);
+ // 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();
}
}
-/* if ( Application::GetLastInputInterval() > 5000 ) // 5 Sekunden lang nix geschehen
- {
- GetTTSettings()->pDisplayHidWin->ToTop( TOTOP_NOGRABFOCUS );
- }
-*/
- if ( GetTTSettings()->pDisplayHidWin->IsSendData() /*&& bBool2*/ && GetTTSettings()->Act )
+
+ if ( GetTTSettings()->pDisplayHidWin->IsSendData() && GetTTSettings()->Act )
{
if ( !StatementFlow::bSending )
-- { // Normalerweise syncronisierung über Protokoll. Hier ist das aber asyncron!!!
++ { // Normalerweise syncronisierung �ber Protokoll. Hier ist das aber asyncron!!!
WriteControlData( GetTTSettings()->Act, GetTTSettings()->pDisplayHidWin->GetConfig() );
new StatementFlow( this, F_EndCommandBlock ); // Kommando zum Senden erzeugen und in que eintragen
}
@@@ -1546,7 -1574,7 +1515,7 @@@
}
if ( pFirst == this ) // Sollte immer so sein, aber besser isses
-- if ( pNext ) // Befehle warten auf Ausführung
++ if ( pNext ) // Befehle warten auf Ausf�hrung
{ // An Ende neu einsortieren
Advance();
QueStatement( NULL );
@@@ -1723,7 -1762,7 +1692,7 @@@ IMPL_LINK( TranslateWin, DoRestore, Pus
sTT_E_NEW.SearchAndReplaceAll( CUniString("\\t"), CUniString("\t") );
if ( StatementList::WinPtrValid( pTranslateWin ) && pTranslateWin->GetText().CompareTo( sTT_E_NEW ) == COMPARE_EQUAL )
-- { // Im ersten schritt nur in der UI zurück
++ { // Im ersten schritt nur in der UI zur�ck
pTranslateWin->SetText( sTT_E_OLD );
}
else
@@@ -2076,8 -2123,8 +2045,8 @@@ void StatementCommand::Translate(
if ( pTranslationWindow->GetType() == WINDOW_BORDERWINDOW && pTranslationWindow->GetWindow( WINDOW_CLIENT ) )
{
Window* pNew = pTranslationWindow->GetWindow( WINDOW_CLIENT );
-- // Bei Dockingwindoes das kanze Geraffel von Docking Floating überspringen
- while ( IsDialog( pNew ) && !pNew->GetSmartUniqueOrHelpId().HasAny() && pNew->GetChildCount() == 1 )
++ // Bei Dockingwindoes das kanze Geraffel von Docking Floating �berspringen
+ while ( IsDialog( pNew ) && !pNew->GetUniqueOrHelpId().getLength() && pNew->GetChildCount() == 1 )
pNew = pNew->GetChild( 0 );
pTranslationWindow = pNew;
}
@@@ -2156,8 -2203,8 +2125,8 @@@
}
Window* StatementCommand::GetNextOverlap( Window* pBase )
--{ // Findet irgendwelche Overlap-Fenster, die schließbar aussehen
-- // Eventuell muß noch die Auswahl verfeinert werden.
++{ // Findet irgendwelche Overlap-Fenster, die schlie�bar aussehen
++ // Eventuell mu� noch die Auswahl verfeinert werden.
if ( pBase->GetType() != WINDOW_BORDERWINDOW )
pBase = pBase->GetWindow( WINDOW_OVERLAP );
@@@ -2190,7 -2237,7 +2159,7 @@@
Window* StatementCommand::GetNextRecoverWin()
{
-- // über die TopLevelWindows der App iterieren
++ // �ber die TopLevelWindows der App iterieren
Window* pBase = Application::GetFirstTopLevelWindow();
Window *pControl = NULL;
Window* pMyFirstDocFrame = NULL;
@@@ -2212,7 -2260,7 +2181,7 @@@
}
// dann das Fenster selbst Schliessen
-- // erstes DocWin überspringen
++ // erstes DocWin �berspringen
// Assumption that Doc Windows are Borderwindows and ButtonDialog and such are not
if ( pBase->IsVisible() && !IsFirstDocFrame( pBase ) && pBase->GetType() != WINDOW_BORDERWINDOW && !IsIMEWin( pBase ) )
return pBase;
@@@ -2306,7 -2354,7 +2275,7 @@@ BOOL StatementCommand::Execute(
nLNr1 = 0; // Speichern des AppWin
aString1 = UniString(); // Liste der geschlossenen Fenster
-- // So daß nacher auch wieder alles auf Default steht
++ // So da� nacher auch wieder alles auf Default steht
nUseBindings = 0;
bCatchGPF = TRUE;
bUsePostEvents = TRUE;
@@@ -2334,12 -2382,12 +2303,12 @@@
&& 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
++ { // Bei Tabcontrol den zugeh�rigen Tabdialog nehmen
pControl = pControl->GET_REAL_PARENT();
- nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() );
+ nRT = ImpGetRType( pControl );
}
switch( nRT )
@@@ -2437,9 -2485,9 +2406,9 @@@
SET_WINP_CLOSING(pControl);
((DockingWindow*)pControl)->Close();
-- // Eigentlich nur bei TaskWindows! Hoffen wir mal, daß keine anderen DockingWindows dazwischen hauen.
++ // Eigentlich nur bei TaskWindows! Hoffen wir mal, da� keine anderen DockingWindows dazwischen hauen.
if ( (Window*)nLNr1 != pControl )
-- nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen
++ nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
nLNr1 = (ULONG)pControl;
return FALSE;
@@@ -2451,45 -2499,48 +2420,45 @@@
|| (pControl->GetType() == WINDOW_WORKWINDOW)
|| (pControl->GetType() == WINDOW_BORDERWINDOW) ) )
{
- // if ( pControl->GetStyle() & WB_CLOSEABLE )
- {
#ifdef RESET_APPLICATION_TO_BACKING_WINDOW
- // Special handling for last Document; do not close the Frame, only the Document
- if ( GetDocWinCount() == 1 && IsDocFrame( pControl ) )
+ // Special handling for last Document; do not close the Frame, only the Document
+ if ( GetDocWinCount() == 1 && IsDocFrame( pControl ) )
+ {
+ if ( IsDocWin( pControl ) )
{
- if ( IsDocWin( pControl ) )
+ if ( GetDocFrameMenuBar( pControl ) )
{
- if ( GetDocFrameMenuBar( pControl ) )
+ MenuBar* pMenu = GetDocFrameMenuBar( pControl );
+ if ( pMenu->HasCloser() )
{
- MenuBar* pMenu = GetDocFrameMenuBar( pControl );
- if ( pMenu->HasCloser() )
- {
- REPORT_WIN_CLOSED( pControl, TypeString(pControl->GetType()));
- SET_WINP_CLOSING(pControl);
+ REPORT_WIN_CLOSED( pControl, TypeString(pControl->GetType()));
+ SET_WINP_CLOSING(pControl);
- pMenu->GetCloserHdl().Call( pMenu );
+ pMenu->GetCloserHdl().Call( pMenu );
- // nur bei TaskWindows!
- if ( (Window*)nLNr1 != pControl )
- nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen
- nLNr1 = (ULONG)pControl;
+ // nur bei TaskWindows!
+ if ( (Window*)nLNr1 != pControl )
- nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen
++ nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
+ nLNr1 = (ULONG)pControl;
- return FALSE;
- }
+ return FALSE;
}
}
}
- else
+ }
+ else
#endif // def RESET_APPLICATION_TO_BACKING_WINDOW
- {
- REPORT_WIN_CLOSED( pControl, TypeString(pControl->GetType()));
- SET_WINP_CLOSING(pControl);
- ((SystemWindow*)pControl)->Close();
+ {
+ REPORT_WIN_CLOSED( pControl, TypeString(pControl->GetType()));
+ SET_WINP_CLOSING(pControl);
+ ((SystemWindow*)pControl)->Close();
- // Eigentlich nur bei TaskWindows!
- if ( (Window*)nLNr1 != pControl )
- nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen
- nLNr1 = (ULONG)pControl;
+ // Eigentlich nur bei TaskWindows!
+ if ( (Window*)nLNr1 != pControl )
- nNr1 = 1; // Zum durchprobieren der Buttons beim Schließen
++ nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
+ nLNr1 = (ULONG)pControl;
- return FALSE;
- }
+ return FALSE;
}
}
}
@@@ -2540,11 -2591,11 +2509,11 @@@
case RC_ResetApplication:
case RC_WaitSlot:
-- case RC_AppAbort: // Sofortiges Löschen aller Befehle
++ case RC_AppAbort: // Sofortiges L�schen aller Befehle
break;
case RC_Assert:
{
-- ByteString aAssertion( "Diese Assertion wurde vom Testtool per Befehl ausgelöst" );
++ ByteString aAssertion( "Diese Assertion wurde vom Testtool per Befehl ausgel�st" );
aAssertion = ByteString( String( aAssertion, RTL_TEXTENCODING_MS_1252 ), RTL_TEXTENCODING_UTF8 );
DBG_ASSERT( !aString1.Len(), ByteString( aString1, RTL_TEXTENCODING_UTF8 ).GetBuffer() );
DBG_ASSERT( aString1.Len(), aAssertion.GetBuffer() );
@@@ -2573,7 -2624,9 +2542,7 @@@
{
BOOL bWait = FALSE;
ReportError( GEN_RES_STR0( S_NO_ACTIVE_WINDOW ) );
- pRet->GenReturn ( RET_Value, aSmartMethodId, bWait );
-// if ( Application::GetAppWindow() )
-// bWait = Application::GetAppWindow()->IsWait();
+ pRet->GenReturn ( RET_Value, nMethodId, bWait );
break;
}
case RC_GetClipboard:
@@@ -2623,10 -2678,10 +2594,10 @@@
case RC_Profile:
// Bei folgenden Parametern passiert folgendes:
// ein boolean=false Alles Profiling stoppen (Ergebnisse liefern)
-- // ein boolean=true, 1-4 ints Einteilung der Zeiten in Kästchen
++ // ein boolean=true, 1-4 ints Einteilung der Zeiten in K�stchen
// kein! boolean keine ints loggen jeden Befehls
// kein! boolean 1 int loggen alle int Millisekunden
-- // ein String wird in das Logfile übernommen(sonst passiert nichts)
++ // ein String wird in das Logfile �bernommen(sonst passiert nichts)
if( !(nParams & PARAM_BOOL_1) || bBool1 )
{
if ( !pProfiler )
@@@ -2643,8 -2698,8 +2614,8 @@@
}
pProfiler->StartAutoProfiling( nNr1 );
-- // Der Header ist abhängig vom Modus
- pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() );
++ // Der Header ist abh�ngig vom Modus
+ pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() );
}
else if ( nParams & PARAM_USHORT_1 )
{ // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr]
@@@ -2654,16 -2709,16 +2625,16 @@@
if ( nParams & PARAM_USHORT_3 ) { nAnzahl++; };
if ( nParams & PARAM_USHORT_4 ) { nAnzahl++; };
-- // Hier werden die Parameter ans Testtool zurück übertragen.
-- // Das ist zwar etwas eigenartig, aber ansonsten müsste man im Testtool
++ // 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();
}
@@@ -2681,8 -2736,8 +2652,8 @@@
}
pProfiler->StartProfilingPerCommand();
-- // Der Header ist abhängig vom Modus
- pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() );
++ // Der Header ist abh�ngig vom Modus
+ pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() );
}
}
else // Profiling wieder ausschalten: Profile false
@@@ -3025,39 -3075,69 +2989,15 @@@
break;
}
DirEntry aNextEntry=(*(pDir))[nDirPos++];
- aPath = aNextEntry.GetName(); //Full();
+ aPath = aNextEntry.GetName();
- #ifdef WIN
- aNextEntry.ToAbs();
- String sFull(aNextEntry.GetFull());
- unsigned nFlags;
-
- if (_dos_getfileattr( sFull.GetStr(), &nFlags ))
- nErrorcode = FSYS_ERR_NOTEXISTS;
- else
- {
- INT16 nCurFlags = nDirFlags;
- if( (nCurFlags == Sb_ATTR_NORMAL)
- && !(nFlags & ( _A_HIDDEN | _A_SYSTEM | _A_VOLID | _A_SUBDIR ) ) )
- break;
- else if( (nCurFlags & Sb_ATTR_HIDDEN) && (nFlags & _A_HIDDEN) )
- break;
- else if( (nCurFlags & Sb_ATTR_SYSTEM) && (nFlags & _A_SYSTEM) )
- break;
- else if( (nCurFlags & Sb_ATTR_VOLUME) && (nFlags & _A_VOLID) )
- break;
- else if( (nCurFlags & Sb_ATTR_DIRECTORY) && (nFlags & _A_SUBDIR) )
- break;
- }
- #else
break;
- #endif
}
}
if ( !nErrorcode )
{
- pRet->GenReturn ( RET_Value, aSmartMethodId, aPath );
+ pRet->GenReturn ( RET_Value, nMethodId, aPath );
}
-
-
-/* keep old Implementation for now
- // neues Verzeichnis einlesen
- if ( (nParams & PARAM_STR_1) )
- {
- if ( pDir )
- {
- delete pDir;
- pDir = NULL;
- }
- DirEntryKind aDirEntryKind = FSYS_KIND_FILE | FSYS_KIND_DIR;
- if ( (nParams & PARAM_USHORT_1) && nNr1 )
- {
- if ( nNr1 & 16 )
- aDirEntryKind = FSYS_KIND_DIR;
- else
- ReportError( GEN_RES_STR0( S_SELECTION_BY_ATTRIBUTE_ONLY_DIRECTORIES ) );
- }
-
- DirEntry aEntry( aString1 );
- nErrorcode = aEntry.GetError();
- if ( !nErrorcode )
- {
- nDirPos = 0;
- FileStat aFS( aEntry );
- 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, nMethodId, String() );
- else
- pRet->GenReturn ( RET_Value, nMethodId, (String)(aEntry.GetName()) );
-
- break;
- }
- else
- {
- pDir = new Dir( aEntry, aDirEntryKind );
- nErrorcode = pDir->GetError();
- }
- }
- }
-
- if ( !pDir )
- pDir = new Dir;
-
- if ( !nErrorcode && ValueOK( nMethodId, GEN_RES_STR0( S_NO_MORE_FILES ), nDirPos+1, pDir->Count()+1 ) )
- {
- if ( nDirPos == pDir->Count() )
- pRet->GenReturn ( RET_Value, nMethodId, String() );
- else
- pRet->GenReturn ( RET_Value, nMethodId, (String)((*pDir)[ nDirPos ].GetName()) );
- nDirPos++;
- }*/
}
break;
case RC_FileLen:
@@@ -3197,15 -3277,20 +3137,15 @@@
case RC_GetMouseStyle:
{
Pointer aPointer;
-// if ( DragManager::GetDragManager() )
-// aPointer = DragManager::GetDragManager()->GetDragPointer();
-// else
+ Window *pActualWin = GetMouseWin();
+ if ( pActualWin )
+ aPointer = pActualWin->GetPointer();
+ else
{
- Window *pActualWin = GetMouseWin();
- if ( pActualWin )
- aPointer = pActualWin->GetPointer();
- else
- {
- ReportError( GEN_RES_STR1( S_POINTER_OUTSIDE_APPWIN, RcString( nMethodId ) ) );
- aPointer = Pointer( POINTER_NULL );
- }
+ ReportError( GEN_RES_STR1( S_POINTER_OUTSIDE_APPWIN, RcString( nMethodId ) ) );
+ 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:
@@@ -3682,7 -3775,7 +3624,7 @@@ void StatementControl::AnimateMouse( Wi
aDiff /= nSteps;
StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack
-- // Das verhindert, daß schon der nächste Befehl ausgeführt wird.
++ // Das verhindert, da� schon der n�chste Befehl ausgef�hrt wird.
for ( ; nSteps ; nSteps-- )
{
@@@ -3709,7 -3802,7 +3651,7 @@@ BOOL StatementControl::MaybeDoTypeKeysD
aTimer.SetTimeout( nTimeWait );
aTimer.Start();
StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack
-- // Das verhindert, daß schon der nächste Befehl ausgeführt wird.
++ // Das verhindert, da� schon der n�chste Befehl ausgef�hrt wird.
while ( aTimer.IsActive() )
{
SafeReschedule( TRUE );
@@@ -3738,11 -3831,11 +3680,11 @@@ BOOL StatementControl::HandleVisibleCon
break;
case M_GetPosX:
if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r FloatingWindows
if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r TabDialoge
if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r Border
if ( (nParams & PARAM_BOOL_1) && bBool1 )
pControl = pControl->GetWindow( WINDOW_OVERLAP );
@@@ -3757,11 -3850,11 +3699,11 @@@
break;
case M_GetPosY:
if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r FloatingWindows
if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r TabDialoge
if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r Border
if ( (nParams & PARAM_BOOL_1) && bBool1 )
pControl = pControl->GetWindow( WINDOW_OVERLAP );
@@@ -3776,11 -3869,11 +3718,11 @@@
break;
case M_GetSizeX:
if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r FloatingWindows
if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r TabDialoge
if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r Border
if ( (nParams & PARAM_BOOL_1) && bBool1 )
pControl = pControl->GetWindow( WINDOW_OVERLAP );
@@@ -3788,11 -3881,11 +3730,11 @@@
break;
case M_GetSizeY:
if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r FloatingWindows
if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r TabDialoge
if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r Border
if ( (nParams & PARAM_BOOL_1) && bBool1 )
pControl = pControl->GetWindow( WINDOW_OVERLAP );
@@@ -3801,11 -3894,11 +3743,11 @@@
case M_SnapShot:
{
if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für FloatingWindows
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r FloatingWindows
if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für TabDialoge
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r TabDialoge
if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-- pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung für Border
++ pControl = pControl->GET_REAL_PARENT(); // Sonderbehandlung f�r Border
if ( (nParams & PARAM_BOOL_1) && bBool1 )
pControl = pControl->GetWindow( WINDOW_OVERLAP );
@@@ -3876,9 -3969,9 +3818,9 @@@
BOOL StatementControl::HandleCommonMethods( Window *pControl )
{
-- switch( nMethodId ) // Diese können an jedem Window ausgeführt werden
++ switch( nMethodId ) // Diese k�nnen an jedem Window ausgef�hrt werden
{
-- case M_Exists: // Oben schon Behandelt. Unterdrückt hier nur Fehler
++ case M_Exists: // Oben schon Behandelt. Unterdr�ckt hier nur Fehler
case M_NotExists:
case M_IsEnabled:
case M_IsVisible:
@@@ -4121,7 -4221,7 +4063,7 @@@
Edit *pMyEd = new Edit(pDlg,WB_CENTER | WB_BORDER );
pMyEd->SetSizePixel(Size(100,30));
-- pDlg->SetText(UniString("Schließen", RTL_TEXTENCODING_ISO_8859_1));
++ pDlg->SetText(UniString("Schlie�en", RTL_TEXTENCODING_ISO_8859_1));
pDlg->Show();
pMyEd->Show();
ULONG nTime = Time().GetTime();
@@@ -4236,9 -4337,13 +4178,9 @@@
break;
}
-- pControl = pTemp; // So daß wir unten ohne Fehler durchkommen
++ pControl = pTemp; // So da� wir unten ohne Fehler durchkommen
SplitWindow *pSW = (SplitWindow*) pTemp;
-// Rectangle GetAutoHideRect() const;
-// Rectangle GetFadeInRect() const;
-// Rectangle GetFadeOutRect() const;
-
switch( nMethodId )
{
case M_FadeIn:
@@@ -4475,7 -4581,7 +4417,7 @@@ BOOL StatementControl::Execute(
bBool2 = TRUE;
nNr2 = aSeconds;
if( !(nParams & PARAM_USHORT_1) )
-- nNr1 = 0; // defaultmäßig sofort zurück
++ nNr1 = 0; // defaultm��ig sofort zur�ck
}
if ( aSeconds < nNr2 ) // Falls die Stunde umgesprungen ist
aSeconds += 60*60;
@@@ -4484,7 -4590,7 +4426,7 @@@
pControl = NULL;
if ( ((nMethodId == M_Exists) && pControl) ||
((nMethodId == M_NotExists) && !pControl) )
-- { // Wenn Bedingung erfüllt
++ { // Wenn Bedingung erf�llt
pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)TRUE );
}
else
@@@ -4551,10 -4660,11 +4493,10 @@@
// TODO: handle GetFocus for all Methods and Windows like this (remove part below)
// See for impact of changed focus for HandleVisibleControls() (taking Snapshots might be different, possible exclude those methods)
if (( (nRT == C_TreeListBox) && !bBool2 )
-- && nMethodId != M_TypeKeys // TypeKeys macht das selbst, falls eigenes Focushandling gewünscht
++ && nMethodId != M_TypeKeys // TypeKeys macht das selbst, falls eigenes Focushandling gew�nscht
&& nMethodId != M_MouseDown
&& nMethodId != M_MouseUp
- && nMethodId != M_MouseMove
- /*&& nMethodId != M_MouseDoubleClick*/ )
+ && nMethodId != M_MouseMove )
{
if ( !pControl->HasFocus() )
{
@@@ -4592,12 -4702,22 +4534,12 @@@
|| nRT == C_TreeListBox
)
|| nMethodId == M_OpenContextMenu )
-- && nMethodId != M_TypeKeys // TypeKeys macht das selbst, falls eigenes Focushandling gewünscht
++ && nMethodId != M_TypeKeys // TypeKeys macht das selbst, falls eigenes Focushandling gew�nscht
&& nMethodId != M_MouseDown
&& nMethodId != M_MouseUp
- && nMethodId != M_MouseMove
- /*&& nMethodId != M_MouseDoubleClick*/ )
+ && nMethodId != M_MouseMove )
pControl->GrabFocus();
-/* leads to problems because settext sets the text whereas typekeys adds to the text.
- if ( bDoTypeKeysDelay && nMethodId == M_SetText && ( nParams & PARAM_STR_1 ) )
- { // Hier wird das Statement auf ein TypeKeys umgebogen
- nMethodId = M_TypeKeys;
- nParams = PARAM_BOOL_1 | PARAM_STR_1;
- bBool1 = TRUE;
- pControl->GrabFocus();
- }
-*/
if ( !HandleCommonMethods( pControl ) )
{
switch( nRT )
@@@ -5118,21 -5240,12 +5062,12 @@@
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();
- }
++ { // Wir f�lschen einen Parameter
+ nParams |= PARAM_STR_1;
+ aString1 = Id2Str( aUId );
}
else
ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
@@@ -5207,10 -5320,13 +5142,10 @@@
if ( aRect.IsEmpty() )
{
pTB->ExecuteCustomMenu();
-/* aRect = pTB->GetMenubuttonRect();
- 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 );
@@@ -5239,7 -5355,7 +5174,7 @@@
Window *pWin = NULL;
// Wait for the window to open.
StatementList::bExecuting = TRUE; // Bah ist das ein ekliger Hack
-- { // Das verhindert, daß schon der nächste Befehl ausgeführt wird.
++ { // Das verhindert, da� schon der n�chste Befehl ausgef�hrt wird.
Time aDelay;
while ( !pWin && ( (pWin = GetPopupFloatingWin()) == NULL ) && ( Time() - aDelay ).GetSec() < 15 )
SafeReschedule();
@@@ -6050,7 -6303,8 +5987,7 @@@
pRet->GenReturn ( RET_Value, aUId, (comm_BOOL) !((DockingWindow*)pControl)->IsFloatingMode());
break;
case M_Close:
- DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
- //aWindowWaitUId = aUId;
+ DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
SET_WINP_CLOSING(pControl);
((DockingWindow*)pControl)->Close();
break;
diff --cc automation/source/simplecm/simplecm.cxx
index ef77010,5a105e7..40fcea4
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@@ -479,7 -479,7 +479,7 @@@ void CommunicationManager::CallDataRece
{
pCL->StartCallback(); // Sollte bereits vor dem Aufruf gerufen werden
pCL->aLastAccess = DateTime();
-- CommunicationLinkRef rHold(pCL); // Hält den Zeiger bis zum Ende des calls
++ CommunicationLinkRef rHold(pCL); // H�lt den Zeiger bis zum Ende des calls
// should be impossible but happens for mysterious reasons
if ( !pCL->pServiceData )
@@@ -629,7 -629,7 +629,7 @@@ void SingleCommunicationManager::CallCo
if ( pInactiveLink )
pInactiveLink->InvalidateManager();
pInactiveLink = xActiveLink;
-- xActiveLink->StopCommunication(); // Den alten Link brutal abwürgen
++ xActiveLink->StopCommunication(); // Den alten Link brutal abw�rgen
}
xActiveLink = pCL;
CommunicationManager::CallConnectionOpened( pCL );
diff --cc automation/source/testtool/objtest.cxx
index a6fde25,21b9bac..9737e6d
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@@ -478,7 -549,7 +488,7 @@@ void TestToolObj::LoadIniFile() // L
pMeth->SetUserData( nID ); \
}
--// SetUserData muß irgendwas sein, sonst wird es im Find rausgefiltert!!!
++// SetUserData mu� irgendwas sein, sonst wird es im Find rausgefiltert!!!
#define MAKE_USHORT_CONSTANT(cName, nValue) \
{ \
SbxProperty *pVal = new SbxProperty( CUniString( cName) , SbxINTEGER ); \
@@@ -3186,9 -3466,12 +3240,9 @@@ BOOL TestToolObj::ReturnResults( SvStre
case RET_Value:
if ( pImpl->pNextReturn )
{
- if ( aNextReturnId.Matches( aUId ) )
-// ULONG nHintUserData = pImpl->pNextReturn->GetParent()->GetUserData();
-// pImpl->pNextReturn->GetParent()->SetUserData(0);
-// if ( nUId == pImpl->pNextReturn->GetParent()->GetULong() )
+ 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 );
diff --cc basctl/source/basicide/baside2.cxx
index d5330b1,93625b0..f608f98
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@@ -352,11 -357,18 +352,19 @@@ BOOL ModulWindow::BasicExecute(
SbMethod* pM = (SbMethod*)xModule->GetMethods()->Get( nMacro );
DBG_ASSERT( pM, "Method?" );
pM->GetLineRange( nStart, nEnd );
- if ( nCurMethodStart >= nStart && nCurMethodStart <= nEnd )
+ if ( aDocument.isInVBAMode() )
+ {
+ if ( nCurMethodStart >= nStart && nCurMethodStart <= nEnd )
+ {
+ pMethod = pM;
+ break;
+ }
+ }
+ else if ( !pMethod || ( nStart < nCurMethodStart && !pM->IsHidden() ) )
{
+ // matched a method to the cursor position
pMethod = pM;
- nCurMethodStart = nStart;
+ break;
}
}
if ( !pMethod )
diff --cc basctl/source/basicide/basidesh.cxx
index b446453,71d1585..049df83
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@@ -283,6 -284,10 +283,7 @@@ BasicIDEShell::~BasicIDEShell(
// Destroy all ContainerListeners for Basic Container.
if ( pListener )
pListener->removeContainerListener( m_aCurDocument, m_aCurLibName );
+
- // MI: Das gab einen GPF im SDT beim Schliessen da dann der ViewFrame die
- // ObjSh loslaesst. Es wusste auch keiner mehr wozu das gut war.
- // GetViewFrame()->GetObjectShell()->Broadcast( SfxSimpleHint( SFX_HINT_DYING ) );
SFX_APP()->LeaveBasicCall();
IDE_DLL()->GetExtraData()->ShellInCriticalSection() = FALSE;
diff --cc basctl/source/basicide/basidesh.src
index 5996978,880afec..b0e0fa1
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@@ -48,7 -50,7 +50,7 @@@ String RID_STR_NOMODUL
};
String RID_STR_WRONGPASSWORD
{
-- /* ### ACHTUNG: Neuer Text in Resource? Fehlerhaftes Paßwort. : Fehlerhaftes Pa˜wort. */
++ /* ### ACHTUNG: Neuer Text in Resource? Fehlerhaftes Pa�wort. : Fehlerhaftes Pa�wort. */
Text [ en-US ] = "Incorrect Password" ;
};
String RID_STR_OPEN
@@@ -61,12 -63,12 +63,12 @@@ String RID_STR_SAV
};
String RID_STR_SOURCETOBIG
{
-- /* ### ACHTUNG: Neuer Text in Resource? Der Quelltext ist zu groß und kann weder gespeichert noch compiliert werden.\nLöschen Sie einige Kommentare oder übertragen Sie einige Methoden in ein anderes Modul. : Der Quelltext ist zu gro˜ und kann weder gespeichert noch compiliert werden.\nL÷schen Sie einige Kommentare oder ³bertragen Sie einige Methoden in ein anderes Modul. */
++ /* ### ACHTUNG: Neuer Text in Resource? Der Quelltext ist zu gro� und kann weder gespeichert noch compiliert werden.\nL�schen Sie einige Kommentare oder �bertragen Sie einige Methoden in ein anderes Modul. : Der Quelltext ist zu gro� und kann weder gespeichert noch compiliert werden.\nL�schen Sie einige Kommentare oder �bertragen Sie einige Methoden in ein anderes Modul. */
Text [ en-US ] = "The source text is too large and can be neither compiled nor saved.\nDelete some of the comments or transfer some methods into another module." ;
};
String RID_STR_ERROROPENSTORAGE
{
-- /* ### ACHTUNG: Neuer Text in Resource? Fehler beim Öffnen der Datei : Fehler beim Íffnen der Datei */
++ /* ### ACHTUNG: Neuer Text in Resource? Fehler beim �ffnen der Datei : Fehler beim �ffnen der Datei */
Text [ en-US ] = "Error opening file" ;
};
String RID_STR_ERROROPENLIB
@@@ -75,12 -77,12 +77,12 @@@
};
String RID_STR_NOLIBINSTORAGE
{
-- /* ### ACHTUNG: Neuer Text in Resource? Die Datei enthält keine BASIC-Bibliotheken : Die Datei enthõlt keine BASIC-Bibliotheken */
++ /* ### ACHTUNG: Neuer Text in Resource? Die Datei enth�lt keine BASIC-Bibliotheken : Die Datei enth�lt keine BASIC-Bibliotheken */
Text [ en-US ] = "The file does not contain any BASIC libraries" ;
};
String RID_STR_BADSBXNAME
{
-- /* ### ACHTUNG: Neuer Text in Resource? Ungültiger Bezeichner : Ung³ltiger Bezeichner */
++ /* ### ACHTUNG: Neuer Text in Resource? Ung�ltiger Bezeichner : Ung�ltiger Bezeichner */
Text [ en-US ] = "Invalid Name" ;
};
String RID_STR_LIBNAMETOLONG
@@@ -134,7 -136,7 +136,7 @@@ String RID_STR_CANNOTRUNMACR
};
String RID_STR_COMPILEERROR
{
-- /* ### ACHTUNG: Neuer Text in Resource? Übersetzungs-Fehler: : šbersetzungs-Fehler: */
++ /* ### ACHTUNG: Neuer Text in Resource? �bersetzungs-Fehler: : �bersetzungs-Fehler: */
Text [ en-US ] = "Compile Error: " ;
};
String RID_STR_RUNTIMEERROR
@@@ -147,7 -149,7 +149,7 @@@ String RID_STR_SEARCHNOTFOUN
};
String RID_STR_SEARCHFROMSTART
{
-- /* ### ACHTUNG: Neuer Text in Resource? Es wurde bis zum letzten Modul gesucht. Möchten Sie die Suche beim ersten Modul fortsetzen? : Es wurde bis zum letzten Modul gesucht. M÷chten Sie die Suche beim ersten Modul fortsetzen? */
++ /* ### ACHTUNG: Neuer Text in Resource? Es wurde bis zum letzten Modul gesucht. M�chten Sie die Suche beim ersten Modul fortsetzen? : Es wurde bis zum letzten Modul gesucht. M�chten Sie die Suche beim ersten Modul fortsetzen? */
Text [ en-US ] = "Search to last module complete. Continue at first module?" ;
};
String RID_STR_SEARCHREPLACES
@@@ -164,12 -166,12 +166,12 @@@ String RID_STR_COULDNTWRIT
};
String RID_STR_CANNOTCHANGENAMESTDLIB
{
-- /* ### ACHTUNG: Neuer Text in Resource? Der Name der Standard-Bibliothek kann nicht geändert werden : Der Name der Standard-Bibliothek kann nicht geõndert werden */
++ /* ### ACHTUNG: Neuer Text in Resource? Der Name der Standard-Bibliothek kann nicht ge�ndert werden : Der Name der Standard-Bibliothek kann nicht ge�ndert werden */
Text [ en-US ] = "The name of the default library cannot be changed." ;
};
String RID_STR_CANNOTCHANGENAMEREFLIB
{
-- /* ### ACHTUNG: Neuer Text in Resource? Der Name einer referenzierten Bibliothek kann nicht geändert werden : Der Name einer referenzierten Bibliothek kann nicht geõndert werden */
++ /* ### ACHTUNG: Neuer Text in Resource? Der Name einer referenzierten Bibliothek kann nicht ge�ndert werden : Der Name einer referenzierten Bibliothek kann nicht ge�ndert werden */
Text [ en-US ] = "The name of a referenced library cannot be changed." ;
};
String RID_STR_CANNOTUNLOADSTDLIB
@@@ -186,32 -188,32 +188,32 @@@ String RID_STR_FILENAM
};
String RID_STR_APPENDLIBS
{
-- /* ### ACHTUNG: Neuer Text in Resource? Bibliotheken hinzufügen : Bibliotheken hinzuf³gen */
++ /* ### ACHTUNG: Neuer Text in Resource? Bibliotheken hinzuf�gen : Bibliotheken hinzuf�gen */
Text [ en-US ] = "Import Libraries" ;
};
String RID_STR_QUERYDELMACRO
{
-- /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie das Makro XX löschen ? : M÷chten Sie das Makro XX l÷schen ? */
++ /* ### ACHTUNG: Neuer Text in Resource? M�chten Sie das Makro XX l�schen ? : M�chten Sie das Makro XX l�schen ? */
Text [ en-US ] = "Do you want to delete the macro XX?" ;
};
String RID_STR_QUERYDELDIALOG
{
-- /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie den Dialog XX löschen ? : M÷chten Sie den Dialog XX l÷schen ? */
++ /* ### ACHTUNG: Neuer Text in Resource? M�chten Sie den Dialog XX l�schen ? : M�chten Sie den Dialog XX l�schen ? */
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list