[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 372 commits - accessibility/bridge accessibility/inc accessibility/prj accessibility/source automation/inc automation/source automation/util basctl/inc basctl/prj basctl/source basctl/util bean/com bean/prj bean/qa crashrep/prj 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 lingucomponent/prj lingucomponent/source package/prj package/source package/util setup_native/prj setup_native/scripts setup_native/source UnoControls/prj UnoControls/source UnoControls/util wizards/com wizards/prj wizards/source wizards/util xmlsecurity/inc xmlsecurity/prj xmlsecurity/source xmlsecurity/tools xmlsecurity/util xmlsecurity/workben
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Wed Mar 9 14:21:54 PST 2011
UnoControls/prj/build.lst | 2
UnoControls/prj/d.lst | 1
UnoControls/source/base/registercontrols.cxx | 83
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 | 6
accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx | 2
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 2
accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx | 33
accessibility/inc/accessibility/helper/listboxhelper.hxx | 34
accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx | 6
accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx | 108
accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx | 2
accessibility/prj/build.lst | 2
accessibility/prj/d.lst | 2
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 4
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx | 8
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 2
accessibility/source/extended/AccessibleGridControlTable.cxx | 6
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 5
accessibility/source/extended/accessiblebrowseboxcell.cxx | 4
accessibility/source/extended/accessibleiconchoicectrl.cxx | 2
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 6
accessibility/source/extended/accessiblelistbox.cxx | 8
accessibility/source/extended/accessiblelistboxentry.cxx | 10
accessibility/source/extended/accessibletabbar.cxx | 4
accessibility/source/extended/accessibletabbarpagelist.cxx | 6
accessibility/source/extended/accessibletablistboxtable.cxx | 8
accessibility/source/extended/textwindowaccessibility.cxx | 82
accessibility/source/standard/accessiblemenubasecomponent.cxx | 8
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 2
accessibility/source/standard/vclxaccessiblebox.cxx | 1
accessibility/source/standard/vclxaccessiblebutton.cxx | 2
accessibility/source/standard/vclxaccessibleedit.cxx | 2
accessibility/source/standard/vclxaccessiblelist.cxx | 56
accessibility/source/standard/vclxaccessiblelistitem.cxx | 20
accessibility/source/standard/vclxaccessiblemenubar.cxx | 2
accessibility/source/standard/vclxaccessiblestatusbar.cxx | 2
accessibility/source/standard/vclxaccessibletabcontrol.cxx | 8
accessibility/source/standard/vclxaccessibletoolbox.cxx | 34
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 8
automation/inc/automation/commtypes.hxx | 38
automation/inc/automation/communi.hxx | 64
automation/inc/automation/simplecm.hxx | 130 -
automation/source/app/testbasi.cxx | 12
automation/source/app/testbasi.hxx | 6
automation/source/communi/communi.cxx | 112
automation/source/inc/cmdbasestream.hxx | 29
automation/source/inc/rcontrol.hxx | 34
automation/source/inc/testapp.hxx | 59
automation/source/inc/testtool.hxx | 6
automation/source/miniapp/editwin.cxx | 10
automation/source/miniapp/editwin.hxx | 6
automation/source/miniapp/servres.cxx | 4
automation/source/miniapp/servres.hrc | 6
automation/source/miniapp/servres.hxx | 4
automation/source/miniapp/servres.src | 2
automation/source/miniapp/servuid.hxx | 22
automation/source/miniapp/testapp.cxx | 13
automation/source/miniapp/testapp.hxx | 8
automation/source/server/XMLParser.cxx | 84
automation/source/server/cmdbasestream.cxx | 85
automation/source/server/editwin.cxx | 14
automation/source/server/editwin.hxx | 10
automation/source/server/prof_nul.cxx | 2
automation/source/server/prof_usl.cxx | 6
automation/source/server/profiler.cxx | 40
automation/source/server/profiler.hxx | 42
automation/source/server/recorder.cxx | 138 -
automation/source/server/recorder.hxx | 21
automation/source/server/retstrm.cxx | 53
automation/source/server/retstrm.hxx | 30
automation/source/server/scmdstrm.cxx | 10
automation/source/server/server.cxx | 115
automation/source/server/server.hxx | 12
automation/source/server/sta_list.cxx | 264 +-
automation/source/server/statemnt.cxx | 1264 ++++-----
automation/source/server/statemnt.hxx | 274 +-
automation/source/simplecm/packethandler.cxx | 44
automation/source/simplecm/packethandler.hxx | 2
automation/source/simplecm/simplecm.cxx | 96
automation/source/testtool/cmdstrm.cxx | 91
automation/source/testtool/cmdstrm.hxx | 20
automation/source/testtool/comm_bas.cxx | 64
automation/source/testtool/comm_bas.hxx | 32
automation/source/testtool/cretstrm.cxx | 2
automation/source/testtool/cretstrm.hxx | 4
automation/source/testtool/httprequest.cxx | 26
automation/source/testtool/httprequest.hxx | 20
automation/source/testtool/objtest.cxx | 610 ++--
automation/source/testtool/objtest.hxx | 107
automation/source/testtool/tcommuni.cxx | 42
automation/source/testtool/tcommuni.hxx | 14
basctl/inc/helpid.hrc | 84
basctl/prj/build.lst | 2
basctl/prj/d.lst | 1
basctl/source/accessibility/accessibledialogwindow.cxx | 10
basctl/source/basicide/basdoc.cxx | 40
basctl/source/basicide/basdoc.hxx | 5
basctl/source/basicide/basicbox.cxx | 62
basctl/source/basicide/basicbox.hxx | 12
basctl/source/basicide/basicmod.hxx | 2
basctl/source/basicide/basicprint.src | 2
basctl/source/basicide/basicrenderable.cxx | 14
basctl/source/basicide/baside2.cxx | 266 +-
basctl/source/basicide/baside2.hxx | 99
basctl/source/basicide/baside2b.cxx | 274 +-
basctl/source/basicide/baside3.cxx | 70
basctl/source/basicide/basides1.cxx | 152 -
basctl/source/basicide/basides2.cxx | 34
basctl/source/basicide/basides3.cxx | 14
basctl/source/basicide/basidesh.cxx | 143 -
basctl/source/basicide/basidesh.src | 16
basctl/source/basicide/basobj2.cxx | 286 +-
basctl/source/basicide/basobj3.cxx | 28
basctl/source/basicide/bastype2.cxx | 32
basctl/source/basicide/bastype2.hxx | 10
basctl/source/basicide/bastype3.cxx | 37
basctl/source/basicide/bastype4.hxx | 14
basctl/source/basicide/bastypes.cxx | 114
basctl/source/basicide/brkdlg.cxx | 16
basctl/source/basicide/brkdlg.src | 7
basctl/source/basicide/iderdll.cxx | 24
basctl/source/basicide/iderdll2.hxx | 16
basctl/source/basicide/localizationmgr.cxx | 16
basctl/source/basicide/macrodlg.cxx | 79
basctl/source/basicide/macrodlg.hxx | 14
basctl/source/basicide/macrodlg.src | 11
basctl/source/basicide/makefile.mk | 2
basctl/source/basicide/moduldl2.cxx | 124
basctl/source/basicide/moduldlg.cxx | 103
basctl/source/basicide/moduldlg.hxx | 56
basctl/source/basicide/moduldlg.src | 29
basctl/source/basicide/moptions.src | 5
basctl/source/basicide/objdlg.cxx | 21
basctl/source/basicide/objdlg.hrc | 2
basctl/source/basicide/objdlg.hxx | 2
basctl/source/basicide/objdlg.src | 7
basctl/source/basicide/register.cxx | 22
basctl/source/basicide/scriptdocument.cxx | 16
basctl/source/basicide/tbxctl.cxx | 10
basctl/source/basicide/tbxctl.hxx | 8
basctl/source/basicide/tbxctl.src | 263 --
basctl/source/basicide/unomodel.hxx | 2
basctl/source/dlged/dlged.cxx | 88
basctl/source/dlged/dlgedfunc.cxx | 90
basctl/source/dlged/dlgedobj.cxx | 32
basctl/source/dlged/dlgedpage.cxx | 2
basctl/source/dlged/dlgedview.cxx | 4
basctl/source/dlged/managelang.cxx | 36
basctl/source/dlged/managelang.src | 5
basctl/source/inc/baside3.hxx | 19
basctl/source/inc/basidesh.hxx | 57
basctl/source/inc/basobj.hxx | 10
basctl/source/inc/bastypes.hxx | 81
basctl/source/inc/dlged.hxx | 32
basctl/source/inc/dlgeddef.hxx | 56
basctl/source/inc/dlgedfunc.hxx | 22
basctl/source/inc/dlgedpage.hxx | 2
basctl/source/inc/dlgedview.hxx | 2
basctl/source/inc/iderid.hxx | 2
basctl/source/inc/sbxitem.hxx | 22
basctl/util/basctl.component | 34
basctl/util/basctl.map | 1
basctl/util/makefile.mk | 11
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 +
bean/qa/complex/makefile.mk | 95
crashrep/prj/build.lst | 2
crashrep/source/win32/soreport.cpp | 2
cui/inc/pch/precompiled_cui.hxx | 962 +++++++
cui/source/customize/acccfg.cxx | 273 --
cui/source/customize/acccfg.hrc | 2
cui/source/customize/acccfg.src | 14
cui/source/customize/cfg.cxx | 793 ++----
cui/source/customize/cfg.hrc | 5
cui/source/customize/cfg.src | 27
cui/source/customize/cfgutil.cxx | 608 +---
cui/source/customize/eventdlg.cxx | 23
cui/source/customize/eventdlg.hxx | 4
cui/source/customize/eventdlg.src | 3
cui/source/customize/macropg.cxx | 57
cui/source/customize/macropg.src | 6
cui/source/customize/macropg_impl.hxx | 4
cui/source/customize/selector.cxx | 105
cui/source/dialogs/SpellDialog.cxx | 251 +
cui/source/dialogs/SpellDialog.src | 15
cui/source/dialogs/about.cxx | 424 +++
cui/source/dialogs/about.hrc | 34
cui/source/dialogs/about.src | 67
cui/source/dialogs/charmap.src | 5
cui/source/dialogs/commonlingui.cxx | 47
cui/source/dialogs/commonlingui.hxx | 12
cui/source/dialogs/cuicharmap.cxx | 46
cui/source/dialogs/cuifmsearch.cxx | 6
cui/source/dialogs/cuigaldlg.cxx | 94
cui/source/dialogs/cuigrfflt.cxx | 22
cui/source/dialogs/cuihyperdlg.cxx | 25
cui/source/dialogs/cuiimapdlg.src | 6
cui/source/dialogs/cuitbxform.cxx | 2
cui/source/dialogs/dlgname.cxx | 2
cui/source/dialogs/dlgname.src | 6
cui/source/dialogs/fmsearch.src | 8
cui/source/dialogs/gallery.src | 15
cui/source/dialogs/grfflt.src | 18
cui/source/dialogs/hangulhanjadlg.cxx | 61
cui/source/dialogs/hangulhanjadlg.src | 26
cui/source/dialogs/hldocntp.cxx | 52
cui/source/dialogs/hldoctp.cxx | 10
cui/source/dialogs/hlinettp.cxx | 51
cui/source/dialogs/hlmailtp.cxx | 7
cui/source/dialogs/hlmarkwn.cxx | 53
cui/source/dialogs/hlmarkwn.hrc | 3
cui/source/dialogs/hlmarkwn.src | 6
cui/source/dialogs/hltpbase.cxx | 59
cui/source/dialogs/hyperdlg.src | 42
cui/source/dialogs/hyphen.src | 6
cui/source/dialogs/iconcdlg.cxx | 232 -
cui/source/dialogs/insdlg.cxx | 80
cui/source/dialogs/insrc.cxx | 4
cui/source/dialogs/insrc.src | 4
cui/source/dialogs/linkdlg.cxx | 124
cui/source/dialogs/makefile.mk | 2
cui/source/dialogs/multifil.cxx | 16
cui/source/dialogs/multipat.cxx | 43
cui/source/dialogs/multipat.src | 3
cui/source/dialogs/newtabledlg.src | 3
cui/source/dialogs/passwdomdlg.cxx | 2
cui/source/dialogs/pastedlg.cxx | 20
cui/source/dialogs/plfilter.cxx | 6
cui/source/dialogs/postdlg.cxx | 28
cui/source/dialogs/postdlg.src | 7
cui/source/dialogs/scriptdlg.cxx | 113
cui/source/dialogs/scriptdlg.src | 7
cui/source/dialogs/sdrcelldlg.cxx | 2
cui/source/dialogs/showcols.src | 2
cui/source/dialogs/splitcelldlg.cxx | 6
cui/source/dialogs/splitcelldlg.src | 5
cui/source/dialogs/srchxtra.cxx | 40
cui/source/dialogs/srchxtra.src | 4
cui/source/dialogs/svuidlg.src | 44
cui/source/dialogs/tbxform.src | 2
cui/source/dialogs/thesdlg.cxx | 54
cui/source/dialogs/thesdlg.src | 6
cui/source/dialogs/thesdlg_impl.hxx | 4
cui/source/dialogs/zoom.cxx | 102
cui/source/dialogs/zoom.src | 14
cui/source/factory/dlgfact.cxx | 159 -
cui/source/factory/dlgfact.hxx | 111
cui/source/inc/SpellDialog.hxx | 22
cui/source/inc/about.hxx | 83
cui/source/inc/acccfg.hxx | 17
cui/source/inc/align.hxx | 4
cui/source/inc/autocdlg.hxx | 56
cui/source/inc/backgrnd.hxx | 52
cui/source/inc/bbdlg.hxx | 6
cui/source/inc/border.hxx | 10
cui/source/inc/cfg.hxx | 86
cui/source/inc/cfgutil.hxx | 51
cui/source/inc/chardlg.hxx | 69
cui/source/inc/connect.hxx | 4
cui/source/inc/cuicharmap.hxx | 10
cui/source/inc/cuigaldlg.hxx | 28
cui/source/inc/cuigrfflt.hxx | 30
cui/source/inc/cuihyperdlg.hxx | 12
cui/source/inc/cuioptgenrl.hxx | 2
cui/source/inc/cuisrchdlg.hxx | 7
cui/source/inc/cuitabarea.hxx | 170 -
cui/source/inc/cuitabline.hxx | 102
cui/source/inc/dbregister.hxx | 15
cui/source/inc/defdlgname.hxx | 4
cui/source/inc/dlgname.hxx | 4
cui/source/inc/dstribut.hxx | 4
cui/source/inc/gallery.hrc | 1
cui/source/inc/grfpage.hxx | 10
cui/source/inc/hangulhanjadlg.hxx | 9
cui/source/inc/headertablistbox.hxx | 2
cui/source/inc/helpid.hrc | 716 ++---
cui/source/inc/hldocntp.hxx | 5
cui/source/inc/hldoctp.hxx | 6
cui/source/inc/hlinettp.hxx | 12
cui/source/inc/hlmarkwn.hxx | 14
cui/source/inc/hltpbase.hxx | 26
cui/source/inc/iconcdlg.hxx | 91
cui/source/inc/insdlg.hxx | 21
cui/source/inc/insrc.hxx | 2
cui/source/inc/internationaloptions.hxx | 2
cui/source/inc/labdlg.hxx | 36
cui/source/inc/linkdlg.hxx | 30
cui/source/inc/macroass.hxx | 23
cui/source/inc/macropg.hxx | 16
cui/source/inc/measure.hxx | 6
cui/source/inc/multifil.hxx | 2
cui/source/inc/multipat.hxx | 2
cui/source/inc/numfmt.hxx | 31
cui/source/inc/numpages.hxx | 78
cui/source/inc/optasian.hxx | 4
cui/source/inc/optdict.hxx | 8
cui/source/inc/optimprove.hxx | 22
cui/source/inc/optlingu.hxx | 8
cui/source/inc/optpath.hxx | 8
cui/source/inc/page.hxx | 10
cui/source/inc/paragrph.hxx | 43
cui/source/inc/pastedlg.hxx | 12
cui/source/inc/postdlg.hxx | 14
cui/source/inc/scriptdlg.hxx | 28
cui/source/inc/sdrcelldlg.hxx | 2
cui/source/inc/selector.hxx | 32
cui/source/inc/splitcelldlg.hxx | 6
cui/source/inc/srchxtra.hxx | 22
cui/source/inc/tabstpge.hxx | 17
cui/source/inc/textanim.hxx | 8
cui/source/inc/textattr.hxx | 20
cui/source/inc/transfrm.hxx | 22
cui/source/inc/treeopt.hxx | 49
cui/source/inc/zoom.hxx | 13
cui/source/options/cfgchart.cxx | 10
cui/source/options/cfgchart.hxx | 6
cui/source/options/connpooloptions.cxx | 32
cui/source/options/connpooloptions.hxx | 2
cui/source/options/connpooloptions.src | 5
cui/source/options/connpoolsettings.cxx | 7
cui/source/options/connpoolsettings.hxx | 1
cui/source/options/cuisrchdlg.cxx | 13
cui/source/options/dbregister.cxx | 80
cui/source/options/dbregister.src | 4
cui/source/options/doclinkdialog.src | 4
cui/source/options/fontsubs.cxx | 66
cui/source/options/fontsubs.hxx | 20
cui/source/options/fontsubs.src | 6
cui/source/options/internationaloptions.cxx | 22
cui/source/options/internationaloptions.src | 5
cui/source/options/optHeaderTabListbox.cxx | 10
cui/source/options/optaccessibility.cxx | 4
cui/source/options/optaccessibility.hxx | 2
cui/source/options/optaccessibility.src | 9
cui/source/options/optasian.cxx | 40
cui/source/options/optasian.src | 9
cui/source/options/optchart.cxx | 16
cui/source/options/optchart.hxx | 2
cui/source/options/optchart.src | 2
cui/source/options/optcolor.cxx | 128 -
cui/source/options/optcolor.hxx | 4
cui/source/options/optcolor.src | 11
cui/source/options/optctl.cxx | 24
cui/source/options/optctl.hxx | 2
cui/source/options/optctl.src | 6
cui/source/options/optdict.cxx | 42
cui/source/options/optdict.src | 9
cui/source/options/optfltr.cxx | 48
cui/source/options/optfltr.hxx | 10
cui/source/options/optfltr.src | 11
cui/source/options/optgdlg.cxx | 225 -
cui/source/options/optgdlg.hxx | 14
cui/source/options/optgdlg.src | 33
cui/source/options/optgenrl.cxx | 57
cui/source/options/optgenrl.src | 20
cui/source/options/opthtml.cxx | 32
cui/source/options/opthtml.hxx | 2
cui/source/options/opthtml.src | 18
cui/source/options/optimprove.cxx | 29
cui/source/options/optimprove.src | 5
cui/source/options/optimprove2.cxx | 27
cui/source/options/optinet2.cxx | 289 --
cui/source/options/optinet2.hxx | 24
cui/source/options/optinet2.src | 39
cui/source/options/optjava.cxx | 94
cui/source/options/optjava.hxx | 23
cui/source/options/optjava.src | 12
cui/source/options/optjsearch.cxx | 58
cui/source/options/optjsearch.hxx | 16
cui/source/options/optjsearch.src | 19
cui/source/options/optlingu.cxx | 501 +--
cui/source/options/optlingu.hrc | 6
cui/source/options/optlingu.src | 30
cui/source/options/optmemory.cxx | 14
cui/source/options/optmemory.hxx | 2
cui/source/options/optmemory.src | 6
cui/source/options/optpath.cxx | 72
cui/source/options/optpath.src | 2
cui/source/options/optsave.cxx | 85
cui/source/options/optsave.hxx | 2
cui/source/options/optsave.src | 13
cui/source/options/optspell.src | 5
cui/source/options/optupdt.cxx | 36
cui/source/options/optupdt.hxx | 2
cui/source/options/optupdt.src | 7
cui/source/options/radiobtnbox.cxx | 4
cui/source/options/sdbcdriverenum.cxx | 7
cui/source/options/sdbcdriverenum.hxx | 1
cui/source/options/securityoptions.hxx | 14
cui/source/options/securityoptions.src | 7
cui/source/options/treeopt.cxx | 101
cui/source/options/treeopt.src | 73
cui/source/options/webconninfo.cxx | 24
cui/source/options/webconninfo.hxx | 2
cui/source/options/webconninfo.src | 3
cui/source/tabpages/align.cxx | 18
cui/source/tabpages/align.src | 10
cui/source/tabpages/autocdlg.cxx | 455 +--
cui/source/tabpages/autocdlg.hrc | 12
cui/source/tabpages/autocdlg.src | 81
cui/source/tabpages/backgrnd.cxx | 291 +-
cui/source/tabpages/backgrnd.src | 11
cui/source/tabpages/bbdlg.cxx | 4
cui/source/tabpages/border.cxx | 123
cui/source/tabpages/border.src | 11
cui/source/tabpages/borderconn.cxx | 11
cui/source/tabpages/borderconn.hxx | 9
cui/source/tabpages/chardlg.cxx | 530 +---
cui/source/tabpages/chardlg.src | 49
cui/source/tabpages/connect.cxx | 69
cui/source/tabpages/connect.src | 8
cui/source/tabpages/dstribut.cxx | 48
cui/source/tabpages/dstribut.src | 10
cui/source/tabpages/grfpage.cxx | 64
cui/source/tabpages/grfpage.src | 11
cui/source/tabpages/labdlg.cxx | 18
cui/source/tabpages/labdlg.src | 7
cui/source/tabpages/macroass.cxx | 356 --
cui/source/tabpages/macroass.hrc | 2
cui/source/tabpages/macroass.src | 15
cui/source/tabpages/measure.cxx | 102
cui/source/tabpages/measure.src | 12
cui/source/tabpages/numfmt.cxx | 275 +-
cui/source/tabpages/numfmt.src | 10
cui/source/tabpages/numpages.cxx | 759 ++---
cui/source/tabpages/numpages.src | 30
cui/source/tabpages/page.cxx | 221 -
cui/source/tabpages/page.h | 6
cui/source/tabpages/page.src | 20
cui/source/tabpages/paragrph.cxx | 437 +--
cui/source/tabpages/paragrph.hrc | 4
cui/source/tabpages/paragrph.src | 81
cui/source/tabpages/swpossizetabpage.cxx | 244 -
cui/source/tabpages/swpossizetabpage.hxx | 20
cui/source/tabpages/swpossizetabpage.src | 18
cui/source/tabpages/tabarea.cxx | 6
cui/source/tabpages/tabarea.hrc | 4
cui/source/tabpages/tabarea.src | 93
cui/source/tabpages/tabline.cxx | 8
cui/source/tabpages/tabline.hrc | 26
cui/source/tabpages/tabline.src | 89
cui/source/tabpages/tabstpge.cxx | 105
cui/source/tabpages/tabstpge.hrc | 3
cui/source/tabpages/tabstpge.src | 54
cui/source/tabpages/textanim.cxx | 90
cui/source/tabpages/textanim.src | 14
cui/source/tabpages/textattr.cxx | 60
cui/source/tabpages/textattr.src | 11
cui/source/tabpages/tparea.cxx | 318 +-
cui/source/tabpages/tpbitmap.cxx | 89
cui/source/tabpages/tpcolor.cxx | 125
cui/source/tabpages/tpgradnt.cxx | 114
cui/source/tabpages/tphatch.cxx | 62
cui/source/tabpages/tpline.cxx | 209 -
cui/source/tabpages/tplnedef.cxx | 57
cui/source/tabpages/tplneend.cxx | 47
cui/source/tabpages/tpshadow.cxx | 64
cui/source/tabpages/transfrm.cxx | 105
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/abpfinalpage.cxx | 4
extensions/source/abpilot/abpresid.hrc | 3
extensions/source/abpilot/abpservices.cxx | 21
extensions/source/abpilot/abspilot.cxx | 4
extensions/source/abpilot/abspilot.hxx | 2
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/bibbeam.cxx | 2
extensions/source/bibliography/bibconfig.cxx | 2
extensions/source/bibliography/bibcont.cxx | 8
extensions/source/bibliography/bibcont.hxx | 2
extensions/source/bibliography/bibload.cxx | 29
extensions/source/bibliography/bibresid.hxx | 2
extensions/source/bibliography/bibshortcuthandler.hxx | 2
extensions/source/bibliography/bibtools.hxx | 6
extensions/source/bibliography/bibview.cxx | 4
extensions/source/bibliography/bibview.hxx | 2
extensions/source/bibliography/datman.cxx | 10
extensions/source/bibliography/datman.src | 31
extensions/source/bibliography/framectr.cxx | 4
extensions/source/bibliography/general.cxx | 44
extensions/source/bibliography/general.hxx | 6
extensions/source/bibliography/makefile.mk | 9
extensions/source/bibliography/menu.src | 6
extensions/source/bibliography/toolbar.cxx | 4
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.cxx | 2
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/gridwizard.cxx | 12
extensions/source/dbpilots/groupboxpages.src | 14
extensions/source/dbpilots/groupboxwiz.cxx | 8
extensions/source/dbpilots/listcombopages.src | 8
extensions/source/dbpilots/makefile.mk | 8
extensions/source/inc/componentmodule.cxx | 48
extensions/source/inc/componentmodule.hxx | 17
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/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 | 29
extensions/source/ole/servreg.cxx | 41
extensions/source/ole/unoobjw.cxx | 2
extensions/source/oooimprovecore/makefile.mk | 8
extensions/source/oooimprovecore/oooimprovecore.component | 34
extensions/source/oooimprovement/invite_job.cxx | 2
extensions/source/oooimprovement/makefile.mk | 8
extensions/source/oooimprovement/onlogrotate_job.cxx | 76
extensions/source/oooimprovement/oooimprovement.component | 38
extensions/source/oooimprovement/oooimprovement_exports.cxx | 22
extensions/source/plugin/aqua/macmgr.cxx | 4
extensions/source/plugin/aqua/sysplug.cxx | 12
extensions/source/plugin/base/manager.cxx | 6
extensions/source/plugin/base/service.cxx | 27
extensions/source/plugin/base/xplugin.cxx | 8
extensions/source/plugin/inc/plugin/aqua/sysplug.hxx | 2
extensions/source/plugin/inc/plugin/impl.hxx | 6
extensions/source/plugin/inc/plugin/unx/mediator.hxx | 30
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 28
extensions/source/plugin/unx/mediator.cxx | 70
extensions/source/plugin/unx/npnapi.cxx | 74
extensions/source/plugin/unx/nppapi.cxx | 68
extensions/source/plugin/unx/npwrap.cxx | 12
extensions/source/plugin/unx/plugcon.cxx | 66
extensions/source/plugin/unx/sysplug.cxx | 2
extensions/source/plugin/unx/unxmgr.cxx | 4
extensions/source/plugin/util/makefile.mk | 8
extensions/source/plugin/util/pl.component | 37
extensions/source/preload/makefile.mk | 8
extensions/source/preload/oemwiz.cxx | 32
extensions/source/preload/oemwiz.hxx | 10
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 | 8
extensions/source/propctrlr/browserpage.cxx | 2
extensions/source/propctrlr/defaultforminspection.cxx | 4
extensions/source/propctrlr/eformspropertyhandler.cxx | 12
extensions/source/propctrlr/eventhandler.cxx | 16
extensions/source/propctrlr/eventhandler.hxx | 14
extensions/source/propctrlr/fontdialog.cxx | 4
extensions/source/propctrlr/formcomponenthandler.cxx | 44
extensions/source/propctrlr/formcomponenthandler.hxx | 2
extensions/source/propctrlr/formlinkdialog.cxx | 4
extensions/source/propctrlr/formlinkdialog.src | 2
extensions/source/propctrlr/formmetadata.cxx | 16
extensions/source/propctrlr/formmetadata.hxx | 2
extensions/source/propctrlr/genericpropertyhandler.cxx | 2
extensions/source/propctrlr/inspectorhelpwindow.cxx | 4
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 | 14
extensions/source/propctrlr/propertyeditor.hxx | 4
extensions/source/propctrlr/propertyinfo.hxx | 3
extensions/source/propctrlr/pushbuttonnavigation.cxx | 2
extensions/source/propctrlr/selectlabeldialog.cxx | 2
extensions/source/propctrlr/selectlabeldialog.src | 2
extensions/source/propctrlr/standardcontrol.cxx | 22
extensions/source/propctrlr/taborder.cxx | 14
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/resource/resource.cxx | 32
extensions/source/scanner/exports.dxp | 1
extensions/source/scanner/grid.cxx | 4
extensions/source/scanner/grid.hxx | 4
extensions/source/scanner/grid.src | 3
extensions/source/scanner/makefile.mk | 8
extensions/source/scanner/sane.cxx | 196 -
extensions/source/scanner/sane.hxx | 34
extensions/source/scanner/sanedlg.cxx | 169 -
extensions/source/scanner/sanedlg.hxx | 12
extensions/source/scanner/sanedlg.src | 17
extensions/source/scanner/scanner.hxx | 2
extensions/source/scanner/scanunx.cxx | 15
extensions/source/scanner/scanwin.cxx | 7
extensions/source/scanner/scn.component | 34
extensions/source/scanner/scnserv.cxx | 31
extensions/source/scanner/twain.cxx | 17
extensions/source/scanner/twain.hxx | 12
extensions/source/svg/svgaction.cxx | 50
extensions/source/svg/svgaction.hxx | 2
extensions/source/svg/svgprinter.cxx | 22
extensions/source/svg/svguno.cxx | 30
extensions/source/svg/svgwriter.cxx | 4
extensions/source/update/check/makefile.mk | 8
extensions/source/update/check/updatecheck.cxx | 2
extensions/source/update/check/updatecheckconfig.cxx | 100
extensions/source/update/check/updatecheckconfig.hxx | 10
extensions/source/update/check/updatecheckjob.cxx | 19
extensions/source/update/check/updatehdl.cxx | 35
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 | 40
extensions/source/update/ui/updchk.component | 34
extensions/source/xmlextract/makefile.mk | 8
extensions/source/xmlextract/xmx.component | 34
extensions/source/xmlextract/xmxtrct.cxx | 2
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/makefile.mk | 17
forms/qa/unoapi/forms.sce | 2
forms/qa/unoapi/knownissues.xcl | 8
forms/source/component/Button.cxx | 2
forms/source/component/Button.hxx | 2
forms/source/component/DatabaseForm.cxx | 4
forms/source/component/DatabaseForm.hxx | 2
forms/source/component/Edit.cxx | 2
forms/source/component/Filter.cxx | 62
forms/source/component/Filter.hxx | 6
forms/source/component/FormComponent.cxx | 60
forms/source/component/FormattedField.cxx | 4
forms/source/component/Hidden.cxx | 2
forms/source/component/ImageControl.cxx | 2
forms/source/component/ListBox.cxx | 24
forms/source/component/RadioButton.cxx | 2
forms/source/helper/windowstateguard.cxx | 28
forms/source/inc/FormComponent.hxx | 8
forms/source/inc/forms_module.hxx | 15
forms/source/inc/forms_module_impl.hxx | 48
forms/source/misc/services.cxx | 67
forms/source/richtext/clipboarddispatcher.cxx | 4
forms/source/richtext/richtextcontrol.cxx | 2
forms/source/richtext/richtextcontrol.hxx | 6
forms/source/richtext/richtextengine.cxx | 2
forms/source/richtext/richtextimplcontrol.cxx | 12
forms/source/richtext/richtextimplcontrol.hxx | 2
forms/source/richtext/richtextmodel.cxx | 2
forms/source/richtext/richtextunowrapper.cxx | 4
forms/source/richtext/richtextvclcontrol.cxx | 8
forms/source/richtext/richtextvclcontrol.hxx | 2
forms/source/richtext/richtextviewport.cxx | 2
forms/source/richtext/rtattributehandler.cxx | 14
forms/source/richtext/rtattributehandler.hxx | 2
forms/source/richtext/rtattributes.hxx | 6
forms/source/richtext/specialdispatchers.cxx | 4
forms/source/solar/component/navbarcontrol.cxx | 6
forms/source/solar/component/navbarcontrol.hxx | 6
forms/source/solar/control/navtoolbar.cxx | 68
forms/source/solar/inc/navtoolbar.hxx | 18
forms/source/xforms/xpathlib/xpathlib.cxx | 2
forms/util/frm.component | 255 +
forms/util/frm.dxp | 1
forms/util/makefile.mk | 8
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 | 875 +++---
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx | 96
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 | 21
lingucomponent/source/lingutil/lingutil.hxx | 10
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component | 34
lingucomponent/source/spellcheck/macosxspell/macreg.cxx | 9
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 66
lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx | 97
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 | 357 +-
lingucomponent/source/spellcheck/spell/sspellimp.hxx | 94
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.cxx | 4
lingucomponent/source/thesaurus/libnth/nthesdta.hxx | 26
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 503 +--
lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 57
lingucomponent/source/thesaurus/libnth/ntreg.cxx | 9
package/prj/build.lst | 2
package/prj/d.lst | 2
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 | 64
package/source/zippackage/ZipPackageStream.cxx | 1
package/util/exports.dxp | 1
package/util/makefile.mk | 8
package/util/package2.component | 44
setup_native/prj/build.lst | 2
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/mac/broffice/DS_Store |binary
setup_native/source/mac/ooo/DS_Store |binary
setup_native/source/mac/ooo/DS_Store_Langpack |binary
setup_native/source/mac/ooo3_installer.icns |binary
setup_native/source/packinfo/packinfo_office.txt | 6
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 | 208 -
setup_native/source/win32/msi-encodinglist.txt | 27
wizards/com/sun/star/wizards/agenda/AgendaTemplate.java | 3
wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java | 26
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 | 16
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 | 6
wizards/com/sun/star/wizards/common/HelpIds.java | 1047 ++++++++
wizards/com/sun/star/wizards/common/NumberFormatter.java | 2
wizards/com/sun/star/wizards/common/PropertyNames.java | 49
wizards/com/sun/star/wizards/db/ColumnPropertySet.java | 9
wizards/com/sun/star/wizards/db/DBMetaData.java | 27
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 2
wizards/com/sun/star/wizards/db/TableDescriptor.java | 21
wizards/com/sun/star/wizards/document/Control.java | 6
wizards/com/sun/star/wizards/document/DatabaseControl.java | 9
wizards/com/sun/star/wizards/document/FormHandler.java | 2
wizards/com/sun/star/wizards/document/GridControl.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/FaxDocument.java | 2
wizards/com/sun/star/wizards/fax/FaxWizardDialog.java | 110
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java | 68
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java | 84
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 | 35
wizards/com/sun/star/wizards/form/FieldLinker.java | 50
wizards/com/sun/star/wizards/form/Finalizer.java | 17
wizards/com/sun/star/wizards/form/FormConfiguration.java | 33
wizards/com/sun/star/wizards/form/FormControlArranger.java | 5
wizards/com/sun/star/wizards/form/FormDocument.java | 4
wizards/com/sun/star/wizards/form/FormWizard.java | 11
wizards/com/sun/star/wizards/form/StyleApplier.java | 25
wizards/com/sun/star/wizards/form/UIControlArranger.java | 61
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/LetterDocument.java | 6
wizards/com/sun/star/wizards/letter/LetterWizardDialog.java | 257 +-
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 215 -
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 | 2
wizards/com/sun/star/wizards/query/CallQueryWizard.java | 17
wizards/com/sun/star/wizards/query/Finalizer.java | 37
wizards/com/sun/star/wizards/query/QuerySummary.java | 11
wizards/com/sun/star/wizards/query/QueryWizard.java | 17
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/DBColumn.java | 2
wizards/com/sun/star/wizards/report/Dataimport.java | 14
wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 11
wizards/com/sun/star/wizards/report/ReportFinalizer.java | 40
wizards/com/sun/star/wizards/report/ReportLayouter.java | 42
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 2
wizards/com/sun/star/wizards/report/ReportWizard.java | 135 -
wizards/com/sun/star/wizards/report/makefile.mk | 8
wizards/com/sun/star/wizards/report/report.component | 35
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 16
wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java | 3
wizards/com/sun/star/wizards/table/CGTable.java | 3
wizards/com/sun/star/wizards/table/CallTableWizard.java | 17
wizards/com/sun/star/wizards/table/FieldDescription.java | 11
wizards/com/sun/star/wizards/table/FieldFormatter.java | 53
wizards/com/sun/star/wizards/table/Finalizer.java | 35
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 79
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 19
wizards/com/sun/star/wizards/table/TableWizard.java | 2
wizards/com/sun/star/wizards/table/makefile.mk | 8
wizards/com/sun/star/wizards/table/table.component | 35
wizards/com/sun/star/wizards/text/TextFieldHandler.java | 9
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 39
wizards/com/sun/star/wizards/ui/ButtonList.java | 83
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 10
wizards/com/sun/star/wizards/ui/ControlScroller.java | 21
wizards/com/sun/star/wizards/ui/FieldSelection.java | 66
wizards/com/sun/star/wizards/ui/FilterComponent.java | 204 -
wizards/com/sun/star/wizards/ui/ImageList.java | 78
wizards/com/sun/star/wizards/ui/PathSelection.java | 9
wizards/com/sun/star/wizards/ui/PeerConfig.java | 3
wizards/com/sun/star/wizards/ui/SortingComponent.java | 58
wizards/com/sun/star/wizards/ui/TitlesComponent.java | 22
wizards/com/sun/star/wizards/ui/UnoDialog.java | 60
wizards/com/sun/star/wizards/ui/UnoDialog2.java | 5
wizards/com/sun/star/wizards/ui/WizardDialog.java | 65
wizards/com/sun/star/wizards/ui/event/AbstractListener.java | 3
wizards/com/sun/star/wizards/ui/event/DataAware.java | 3
wizards/com/sun/star/wizards/ui/event/DataAwareFields.java | 2
wizards/com/sun/star/wizards/ui/event/MethodInvocation.java | 1
wizards/com/sun/star/wizards/ui/event/UnoDataAware.java | 9
wizards/com/sun/star/wizards/web/CallWizard.java | 19
wizards/com/sun/star/wizards/web/FTPDialog.java | 42
wizards/com/sun/star/wizards/web/ImageListDialog.java | 20
wizards/com/sun/star/wizards/web/StatusDialog.java | 15
wizards/com/sun/star/wizards/web/WWD_Events.java | 7
wizards/com/sun/star/wizards/web/WWD_General.java | 8
wizards/com/sun/star/wizards/web/WWD_Startup.java | 7
wizards/com/sun/star/wizards/web/WebWizardDialog.java | 150 -
wizards/com/sun/star/wizards/web/data/CGDocument.java | 3
wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java | 3
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/inc/xmlsecurity/certificatechooser.hxx | 4
xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 4
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 4
xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 2
xmlsecurity/inc/xmlsecurity/stbcontrl.hxx | 4
xmlsecurity/prj/build.lst | 2
xmlsecurity/prj/d.lst | 3
xmlsecurity/source/component/documentdigitalsignatures.cxx | 4
xmlsecurity/source/component/registerservices.cxx | 42
xmlsecurity/source/dialogs/certificatechooser.cxx | 20
xmlsecurity/source/dialogs/certificatechooser.src | 1
xmlsecurity/source/dialogs/certificateviewer.cxx | 14
xmlsecurity/source/dialogs/certificateviewer.src | 3
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 8
xmlsecurity/source/dialogs/digitalsignaturesdialog.src | 3
xmlsecurity/source/dialogs/helpids.hrc | 44
xmlsecurity/source/dialogs/macrosecurity.cxx | 19
xmlsecurity/source/dialogs/macrosecurity.src | 10
xmlsecurity/source/dialogs/resourcemanager.cxx | 12
xmlsecurity/source/dialogs/resourcemanager.hxx | 2
xmlsecurity/source/dialogs/stbcontrl.cxx | 4
xmlsecurity/source/dialogs/warnings.src | 3
xmlsecurity/source/framework/xsec_framework.cxx | 77
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 4
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 16
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 65
xmlsecurity/tools/demo/util.cxx | 6
xmlsecurity/tools/demo/util.hxx | 2
xmlsecurity/tools/demo/util2.cxx | 4
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
xmlsecurity/workben/signaturetest.cxx | 2
942 files changed, 24690 insertions(+), 20162 deletions(-)
New commits:
commit ab1deb45e8bdfcb406ed40cc279412bfb8ebb7da
Merge: 8d39bca... e887a29...
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Mar 9 16:20:50 2011 -0600
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (185 commits)
masterfix DEV300: #i10000# usage of L10N build_type
masterfix: #i10000# INT16 -> sal_Int16
fixed compile errors after resync to m100, part2
gridsort: post-rebase fixes
CWS gnumake3: found another tools integer type
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
native359: #i114398# changing mac langpack icon
native359: #i115669# fixing package description for solaris packages
gnumake3: remove comphelper version; fix including extract.hxx
locales34: #i106785# add Haitian_Haiti [ht-HT] to language list and locale data; locale data contributed by <jcpoulard>
sb138: #i116659# timely termination of OnLogRotateThread
accfixes: removed include of obsolete header file
accfixes: removed obsolete file
removetooltypes01: #i112600# Fix build problems on non-pro
accfixes: moved some shared strings to svx part2
accfixes: moved some shared strings to svx
accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)
removetooltypes01: #i112600# Remove tools types for Mac specific parts
fixed tab order in BasicIDE, Library dialog tab page
added some accessible names in BasicIDE
...
Conflicts:
UnoControls/source/base/registercontrols.cxx
accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
automation/inc/automation/communi.hxx
automation/inc/automation/simplecm.hxx
automation/source/communi/communi.cxx
automation/source/inc/rcontrol.hxx
automation/source/miniapp/servuid.hxx
automation/source/server/XMLParser.cxx
automation/source/server/cmdbasestream.cxx
automation/source/server/profiler.hxx
automation/source/server/recorder.cxx
automation/source/server/retstrm.hxx
automation/source/server/server.cxx
automation/source/server/sta_list.cxx
automation/source/server/statemnt.cxx
automation/source/server/statemnt.hxx
automation/source/simplecm/packethandler.cxx
automation/source/simplecm/simplecm.cxx
automation/source/simplecm/tcpio.cxx
automation/source/simplecm/tcpio.hxx
automation/source/testtool/comm_bas.hxx
automation/source/testtool/cretstrm.hxx
automation/source/testtool/httprequest.cxx
automation/source/testtool/httprequest.hxx
automation/source/testtool/objtest.cxx
automation/source/testtool/objtest.hxx
basctl/source/basicide/baside2.cxx
basctl/source/basicide/baside2.hxx
basctl/source/basicide/baside2b.cxx
basctl/source/basicide/baside3.cxx
basctl/source/basicide/basides1.cxx
basctl/source/basicide/basides2.cxx
basctl/source/basicide/basidesh.cxx
basctl/source/basicide/basidesh.src
basctl/source/basicide/basobj3.cxx
basctl/source/basicide/bastype2.cxx
basctl/source/basicide/bastype3.cxx
basctl/source/basicide/bastypes.cxx
basctl/source/basicide/brkdlg.cxx
basctl/source/basicide/iderdll.cxx
basctl/source/basicide/macrodlg.cxx
basctl/source/basicide/moduldl2.cxx
basctl/source/basicide/moduldlg.cxx
basctl/source/basicide/objdlg.cxx
basctl/source/basicide/scriptdocument.cxx
basctl/source/basicide/tbxctl.cxx
basctl/source/basicide/tbxctl.hxx
basctl/source/basicide/tbxctl.src
basctl/source/dlged/dlged.cxx
basctl/source/dlged/dlgedfunc.cxx
basctl/source/dlged/dlgedobj.cxx
basctl/source/inc/basidesh.hxx
basctl/source/inc/bastypes.hxx
basctl/source/inc/dlgedmod.hxx
basctl/source/inc/dlgedpage.hxx
crashrep/prj/build.lst
cui/inc/pch/precompiled_cui.hxx
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/dialogs/SpellDialog.cxx
cui/source/dialogs/commonlingui.cxx
cui/source/dialogs/cuicharmap.cxx
cui/source/dialogs/cuifmsearch.cxx
cui/source/dialogs/cuigaldlg.cxx
cui/source/dialogs/cuigrfflt.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/hlmarkwn.src
cui/source/dialogs/hltpbase.cxx
cui/source/dialogs/iconcdlg.cxx
cui/source/dialogs/passwdomdlg.cxx
cui/source/dialogs/pastedlg.cxx
cui/source/dialogs/scriptdlg.cxx
cui/source/dialogs/thesdlg.cxx
cui/source/dialogs/zoom.cxx
cui/source/factory/dlgfact.hxx
cui/source/inc/SpellDialog.hxx
cui/source/inc/autocdlg.hxx
cui/source/inc/backgrnd.hxx
cui/source/inc/bbdlg.hxx
cui/source/inc/cfg.hxx
cui/source/inc/cfgutil.hxx
cui/source/inc/cuigaldlg.hxx
cui/source/inc/cuigrfflt.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/hldocntp.hxx
cui/source/inc/hltpbase.hxx
cui/source/inc/iconcdlg.hxx
cui/source/inc/numpages.hxx
cui/source/inc/page.hxx
cui/source/inc/postdlg.hxx
cui/source/inc/scriptdlg.hxx
cui/source/inc/transfrm.hxx
cui/source/inc/zoom.hxx
cui/source/options/cfgchart.cxx
cui/source/options/cuisrchdlg.cxx
cui/source/options/dbregister.cxx
cui/source/options/dbregister.src
cui/source/options/fontsubs.cxx
cui/source/options/internationaloptions.cxx
cui/source/options/optasian.cxx
cui/source/options/optchart.cxx
cui/source/options/optcolor.cxx
cui/source/options/optcolor.src
cui/source/options/optfltr.cxx
cui/source/options/optfltr.src
cui/source/options/optgdlg.cxx
cui/source/options/optgdlg.src
cui/source/options/optgenrl.cxx
cui/source/options/opthtml.cxx
cui/source/options/optimprove.cxx
cui/source/options/optinet2.cxx
cui/source/options/optinet2.hxx
cui/source/options/optjava.cxx
cui/source/options/optlingu.cxx
cui/source/options/optsave.cxx
cui/source/options/optsave.hxx
cui/source/options/treeopt.cxx
cui/source/options/webconninfo.cxx
cui/source/tabpages/autocdlg.cxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/dstribut.cxx
cui/source/tabpages/grfpage.cxx
cui/source/tabpages/macroass.cxx
cui/source/tabpages/measure.cxx
cui/source/tabpages/numfmt.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/page.cxx
cui/source/tabpages/paragrph.cxx
cui/source/tabpages/swpossizetabpage.cxx
cui/source/tabpages/tabarea.src
cui/source/tabpages/textanim.cxx
cui/source/tabpages/textattr.cxx
cui/source/tabpages/tparea.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
cui/source/tabpages/tpshadow.cxx
cui/source/tabpages/transfrm.cxx
embedserv/source/embed/register.cxx
extensions/inc/pch/precompiled_extensions.hxx
extensions/inc/propctrlr.hrc
extensions/source/abpilot/abpservices.cxx
extensions/source/bibliography/bibload.cxx
extensions/source/bibliography/datman.cxx
extensions/source/bibliography/general.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/inc/componentmodule.cxx
extensions/source/nsplugin/source/so_env.cxx
extensions/source/ole/oleobjw.cxx
extensions/source/ole/oleobjw.hxx
extensions/source/oooimprovement/invite_job.cxx
extensions/source/oooimprovement/onlogrotate_job.cxx
extensions/source/plugin/base/service.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/preload/services.cxx
extensions/source/propctrlr/formmetadata.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/resource/resource.cxx
extensions/source/scanner/sane.hxx
extensions/source/scanner/sanedlg.cxx
extensions/source/scanner/scanunx.cxx
extensions/source/scanner/scanwin.cxx
extensions/source/scanner/twain.cxx
extensions/source/scanner/twain.hxx
extensions/source/update/check/updatecheckconfig.cxx
extensions/test/stm/datatest.cxx
extensions/test/stm/marktest.cxx
extensions/test/stm/pipetest.cxx
extensions/test/stm/testfactreg.cxx
extensions/workben/testpgp.cxx
forms/qa/complex/forms/CheckOGroupBoxModel.java
forms/qa/makefile.mk
forms/source/component/Button.cxx
forms/source/component/Button.hxx
forms/source/component/ListBox.cxx
forms/source/inc/forms_module_impl.hxx
forms/source/misc/services.cxx
forms/source/solar/control/navtoolbar.cxx
javainstaller2/prj/build.lst
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
lingucomponent/prj/build.lst
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sreg.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/source/manifest/ManifestExport.cxx
package/source/manifest/UnoRegister.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/owriteablestream.hxx
package/source/xstor/xstorage.hxx
package/source/zippackage/ZipPackageFolder.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/mac/ooo/DS_Store
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
xmlsecurity/prj/build.lst
xmlsecurity/source/component/registerservices.cxx
xmlsecurity/source/dialogs/stbcontrl.cxx
xmlsecurity/source/framework/xsec_framework.cxx
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
xmlsecurity/tools/demo/util.hxx
xmlsecurity/workben/signaturetest.cxx
diff --cc UnoControls/source/base/registercontrols.cxx
index 8d5e347,3eaf3a7..5d5f9fe
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@@ -76,52 -93,9 +76,8 @@@ using namespace ::com::sun::star::regis
}
//******************************************************************************************************************************
- #define COMPONENT_INFO(CLASS) \
- \
- try \
- { \
- /* Set default result of follow operations !!! */ \
- bReturn = sal_False ; \
- \
- /* Do the follow only, if given key is valid ! */ \
- if ( xKey.is () ) \
- { \
- /* Build new keyname */ \
- sKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/")) ; \
- sKeyName += CLASS::impl_getStaticImplementationName() ; \
- sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); \
- \
- /* Create new key with new name. */ \
- xNewKey = xKey->createKey( sKeyName ); \
- \
- /* If this new key valid ... */ \
- if ( xNewKey.is () ) \
- { \
- /* Get information about supported services. */ \
- seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \
- pArray = seqServiceNames.getArray() ; \
- nLength = seqServiceNames.getLength() ; \
- nCounter = 0 ; \
- \
- /* Then set this information on this key. */ \
- for ( nCounter = 0; nCounter < nLength; ++nCounter ) \
- { \
- xNewKey->createKey( pArray [nCounter] ); \
- } \
- \
- /* Result of this operations = OK. */ \
- bReturn = sal_True ; \
- } \
- } \
- } \
- catch( InvalidRegistryException& ) \
- { \
- bReturn = sal_False ; \
- } \
-
- //******************************************************************************************************************************
#define CREATEFACTORY_ONEINSTANCE(CLASS) \
\
- AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[start]\n" ) \
/* Create right factory ... */ \
xFactory = Reference< XSingleServiceFactory > \
( \
diff --cc accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index ccfd6e6,f3e321c..550dd40
--- 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,f80b0a3..c61274e
--- 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/extended/AccessibleGridControlTable.cxx
index d76dd78,16a3ead..ae6e558
mode 100644,100755..100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@@ -263,11 -261,10 +262,10 @@@ sal_Bool SAL_CALL AccessibleGridControl
void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection()
throw ( uno::RuntimeException )
{
- TCSolarGuard aSolarGuard;
+ SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getOslMutex() );
ensureIsAlive();
- for(unsigned int i=0;i<m_aTable.GetSelectedRows().size();i++)
- m_aTable.RemoveSelectedRow((sal_Int32)i);
+ m_aTable.SelectAllRows( false );
}
void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren()
throw ( uno::RuntimeException )
diff --cc automation/inc/automation/communi.hxx
index 079deb7,5edb40b..f9b1242
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@@ -45,14 -44,14 +45,14 @@@ SV_DECL_PTRARR_SORT( CommunicationLinkL
class MultiCommunicationManager : public CommunicationManager
{
public:
- MultiCommunicationManager( BOOL bUseMultiChannel = FALSE );
+ MultiCommunicationManager( sal_Bool bUseMultiChannel = sal_False );
virtual ~MultiCommunicationManager();
- virtual BOOL StopCommunication(); // Hält alle CommunicationLinks an
- virtual BOOL IsLinkValid( CommunicationLink* pCL );
- virtual USHORT GetCommunicationLinkCount();
- virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr );
- virtual sal_Bool StopCommunication(); // Hält alle CommunicationLinks an
++ virtual sal_Bool StopCommunication();
+ virtual sal_Bool IsLinkValid( CommunicationLink* pCL );
+ virtual sal_uInt16 GetCommunicationLinkCount();
+ virtual CommunicationLinkRef GetCommunicationLink( sal_uInt16 nNr );
- void DoQuickShutdown( BOOL bQuickShutdown = TRUE) { bGracefullShutdown = !bQuickShutdown; }
+ void DoQuickShutdown( sal_Bool bQuickShutdown = sal_True) { bGracefullShutdown = !bQuickShutdown; }
protected:
virtual void CallConnectionOpened( CommunicationLink* pCL );
@@@ -60,9 -59,9 +60,9 @@@
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 );
- BOOL bGracefullShutdown;
+ sal_Bool bGracefullShutdown;
};
class CommunicationManagerServer : public MultiCommunicationManager
@@@ -74,17 -73,17 +74,17 @@@ public
class CommunicationManagerClient : public MultiCommunicationManager, public ICommunicationManagerClient
{
public:
- CommunicationManagerClient( BOOL bUseMultiChannel = FALSE );
+ CommunicationManagerClient( sal_Bool bUseMultiChannel = sal_False );
};
-class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public vos::OThread
+class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public osl::Thread
{
public:
- CommunicationLinkViaSocket( CommunicationManager *pMan, vos::OStreamSocket *pSocket );
+ CommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket );
virtual ~CommunicationLinkViaSocket();
- virtual BOOL IsCommunicationError();
- virtual BOOL DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE );
+ virtual sal_Bool IsCommunicationError();
+ virtual sal_Bool DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE );
// Diese sind Virtuelle Links!!!!
virtual long ConnectionClosed( void* = NULL );
@@@ -99,11 -98,11 +99,11 @@@
protected:
virtual void SAL_CALL run();
- virtual BOOL ShutdownCommunication();
- ULONG nConnectionClosedEventId;
- ULONG nDataReceivedEventId;
+ virtual sal_Bool ShutdownCommunication();
+ sal_uLong nConnectionClosedEventId;
+ sal_uLong nDataReceivedEventId;
- vos::OMutex aMConnectionClosed; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
- vos::OMutex aMDataReceived; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
+ osl::Mutex aMConnectionClosed; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
+ osl::Mutex aMDataReceived; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
virtual void WaitForShutdown();
DECL_LINK( ShutdownLink, void* );
@@@ -134,10 -133,10 +134,10 @@@ private
void AddConnection( CommunicationLink *pNewConnection );
};
-class CommunicationManagerServerAcceptThread: public vos::OThread
+class CommunicationManagerServerAcceptThread: public osl::Thread
{
public:
- CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, ULONG nPort, USHORT nMaxCon = CM_UNLIMITED_CONNECTIONS );
+ CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, sal_uLong nPort, sal_uInt16 nMaxCon = CM_UNLIMITED_CONNECTIONS );
virtual ~CommunicationManagerServerAcceptThread();
CommunicationLinkRef GetNewConnection(){ CommunicationLinkRef xTemp = xmNewConnection; xmNewConnection.Clear(); return xTemp; }
@@@ -146,11 -145,11 +146,11 @@@ protected
private:
CommunicationManagerServerViaSocket* pMyServer;
- vos::OAcceptorSocket *pAcceptorSocket;
+ osl::AcceptorSocket* pAcceptorSocket;
- ULONG nPortToListen;
- USHORT nMaxConnections;
- ULONG nAddConnectionEventId;
+ sal_uLong nPortToListen;
+ sal_uInt16 nMaxConnections;
+ sal_uLong nAddConnectionEventId;
- vos::OMutex aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
+ osl::Mutex aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
void CallInfoMsg( InfoString aMsg ){ pMyServer->CallInfoMsg( aMsg ); }
CM_InfoType GetInfoType(){ return pMyServer->GetInfoType(); }
@@@ -173,9 -172,9 +173,9 @@@ public
private:
ByteString aHostToTalk;
- ULONG nPortToTalk;
+ sal_uLong nPortToTalk;
protected:
- virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS ){ return new CommunicationLinkViaSocket( pCM, pCS ); }
+ virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, osl::ConnectorSocket* pCS ){ return new CommunicationLinkViaSocket( pCM, pCS ); }
};
#endif
diff --cc automation/inc/automation/simplecm.hxx
index 2958304,2e9b509..d13abf4
--- a/automation/inc/automation/simplecm.hxx
+++ b/automation/inc/automation/simplecm.hxx
@@@ -37,10 -36,10 +37,10 @@@
#include <automation/commdefines.hxx>
--// CM steht für CommunicationManager
++// CM steht f�r CommunicationManager
#define CM_UNLIMITED_CONNECTIONS 0xffff
- typedef USHORT CM_NameType;
+ typedef sal_uInt16 CM_NameType;
#define CM_DOTTED ( (CM_NameType) 01 )
#define CM_FQDN ( (CM_NameType) 02 )
@@@ -124,9 -132,9 +124,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; }
@@@ -151,23 -159,23 +151,23 @@@ public
/** will call virtual function DoTransferDataStream to do actual work
Purpos is to allow housekeeping
**/
- BOOL TransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE );
+ sal_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.
- UINT16 GetProtocol(){ return nServiceProtocol; }
++ // 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.
+ sal_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.
- void FinishCallback(){ bIsInsideCallback = FALSE; }
++ /// Erm�glicht das Ausl�sen des n�chsten Callbacks. Wird auch Implizit gerufen.
+ void FinishCallback(){ bIsInsideCallback = sal_False; }
-- /// Syncrones Empfangen der Daten. Nur für Kommandozeile, sonst leer implementiert
- virtual BOOL ReceiveDataStream(){ return FALSE; }
++ /// Syncrones Empfangen der Daten. Nur f�r Kommandozeile, sonst leer implementiert
+ virtual sal_Bool ReceiveDataStream(){ return sal_False; }
/// Statistics
DateTime GetStart() { return aStart; }
@@@ -184,19 -192,19 +184,19 @@@ protected
virtual DECL_LINK( ConnectionClosed, void* = NULL );
virtual DECL_LINK( DataReceived, void* = NULL );
- virtual BOOL DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE );
+ virtual sal_Bool DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol = CM_PROTOCOL_OLDSTYLE );
SvStream *pServiceData;
- UINT16 nServiceProtocol;
- UINT16 nServiceHeaderType;
+ sal_uInt16 nServiceProtocol;
+ sal_uInt16 nServiceHeaderType;
-- /// Verhindert das vorzeitige Auslösen des nächsten Callbacks.
- void StartCallback(){ bIsInsideCallback = TRUE; }
- BOOL bIsInsideCallback;
++ /// Verhindert das vorzeitige Ausl�sen des n�chsten Callbacks.
+ void StartCallback(){ bIsInsideCallback = sal_True; }
+ sal_Bool bIsInsideCallback;
- virtual BOOL SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL)=0;
+ virtual sal_Bool SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL)=0;
- virtual BOOL ShutdownCommunication() = 0; /// Really stop the Communication
+ virtual sal_Bool ShutdownCommunication() = 0; /// Really stop the Communication
/// Statistics
DateTime aStart;
@@@ -223,23 -231,23 +223,23 @@@ class CommunicationManage
friend class CommunicationLink;
friend class CommonSocketFunctions;
public:
- CommunicationManager( BOOL bUseMultiChannel = FALSE );
+ CommunicationManager( sal_Bool bUseMultiChannel = sal_False );
virtual ~CommunicationManager();
- 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 IsCommunicationRunning() { return bIsCommunicationRunning; }
- // virtual BOOL IsCommunicationError();
+ virtual sal_Bool StartCommunication()=0;
+ virtual sal_Bool StartCommunication( String aApp, String aParams );
+ virtual sal_Bool StartCommunication( ByteString aHost, sal_uLong nPort );
- virtual sal_Bool StopCommunication()=0; // Hält alle CommunicationLinks an
++ virtual sal_Bool StopCommunication()=0; // H�lt alle CommunicationLinks an
+ virtual sal_Bool IsCommunicationRunning() { return bIsCommunicationRunning; }
+ // virtual sal_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 sal_Bool IsLinkValid( CommunicationLink* pCL )=0; // Notwendig für call im Destruktor
++ virtual sal_Bool IsLinkValid( CommunicationLink* pCL )=0; // Notwendig f�r call im Destruktor
- virtual USHORT GetCommunicationLinkCount()=0;
- virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr )=0;
+ virtual sal_uInt16 GetCommunicationLinkCount()=0;
+ virtual CommunicationLinkRef GetCommunicationLink( sal_uInt16 nNr )=0;
// Liefert den letzten neuen Link oder NULL wenn dieser schon wieder geschlossen ist.
CommunicationLinkRef GetLastNewLink() { return xLastNewLink; }
@@@ -266,15 -274,15 +266,15 @@@ 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 ); }
virtual void InfoMsg( InfoString aMsg ){ mlInfoMsg.Call( &aMsg ); }
- BOOL bIsCommunicationRunning;
+ sal_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;
@@@ -290,19 -298,19 +290,19 @@@
class SingleCommunicationManager : public CommunicationManager
{
public:
- SingleCommunicationManager( BOOL bUseMultiChannel = FALSE );
+ SingleCommunicationManager( sal_Bool bUseMultiChannel = sal_False );
virtual ~SingleCommunicationManager();
- virtual BOOL StopCommunication(); // Hält alle CommunicationLinks an
- virtual BOOL IsLinkValid( CommunicationLink* pCL );
- virtual USHORT GetCommunicationLinkCount();
- virtual CommunicationLinkRef GetCommunicationLink( USHORT nNr );
- virtual sal_Bool StopCommunication(); // Hält alle CommunicationLinks an
++ virtual sal_Bool StopCommunication(); // H�lt alle CommunicationLinks an
+ virtual sal_Bool IsLinkValid( CommunicationLink* pCL );
+ virtual sal_uInt16 GetCommunicationLinkCount();
+ virtual CommunicationLinkRef GetCommunicationLink( sal_uInt16 nNr );
protected:
virtual void CallConnectionOpened( CommunicationLink* pCL );
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
@@@ -329,20 -337,20 +329,20 @@@ private
ByteString aMyName;
TCPIO* pTCPIO;
- vos::OStreamSocket *pStreamSocket;
+ osl::StreamSocket* pStreamSocket;
protected:
- SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, vos::OStreamSocket *pSocket );
+ SimpleCommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket );
virtual ~SimpleCommunicationLinkViaSocket();
- vos::OStreamSocket* GetStreamSocket() { return pStreamSocket; }
- void SetStreamSocket( vos::OStreamSocket* pSocket );
+ osl::StreamSocket* GetStreamSocket() { return pStreamSocket; }
+ void SetStreamSocket( osl::StreamSocket* pSocket );
SvStream *pReceiveStream;
- BOOL DoReceiveDataStream(); /// Recieve DataPacket from Socket
- virtual BOOL SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL);
+ sal_Bool DoReceiveDataStream(); /// Recieve DataPacket from Socket
+ virtual sal_Bool SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL);
- void SetFinalRecieveTimeout();
+ bool IsReceiveReady();
- BOOL bIsRequestShutdownPending;
+ sal_Bool bIsRequestShutdownPending;
virtual void WaitForShutdown()=0;
void SetNewPacketAsCurrent();
};
@@@ -350,20 -358,20 +350,20 @@@
class SimpleCommunicationLinkViaSocketWithReceiveCallbacks : public SimpleCommunicationLinkViaSocket
{
public:
- SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, vos::OStreamSocket *pSocket );
+ SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, osl::StreamSocket* pSocket );
~SimpleCommunicationLinkViaSocketWithReceiveCallbacks();
- virtual BOOL ReceiveDataStream();
+ virtual sal_Bool ReceiveDataStream();
protected:
- virtual BOOL ShutdownCommunication(); /// Really stop the Communication
+ virtual sal_Bool ShutdownCommunication(); /// Really stop the Communication
virtual void WaitForShutdown();
};
class CommonSocketFunctions
{
public:
- BOOL DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, ULONG nPort );
+ sal_Bool DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, sal_uLong nPort );
protected:
- virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS )=0;
+ virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, osl::ConnectorSocket* pCS )=0;
};
class SingleCommunicationManagerClientViaSocket : public SingleCommunicationManager, public ICommunicationManagerClient, CommonSocketFunctions
@@@ -371,15 -379,15 +371,15 @@@
public:
using CommunicationManager::StartCommunication;
- SingleCommunicationManagerClientViaSocket( ByteString aHost, ULONG nPort, BOOL bUseMultiChannel = FALSE );
- SingleCommunicationManagerClientViaSocket( BOOL bUseMultiChannel = FALSE );
- virtual BOOL StartCommunication(){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHostToTalk, nPortToTalk );}
- virtual BOOL StartCommunication( ByteString aHost, ULONG nPort ){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHost, nPort );}
+ SingleCommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel = sal_False );
+ SingleCommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel = sal_False );
+ virtual sal_Bool StartCommunication(){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHostToTalk, nPortToTalk );}
+ virtual sal_Bool StartCommunication( ByteString aHost, sal_uLong nPort ){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHost, nPort );}
private:
ByteString aHostToTalk;
- ULONG nPortToTalk;
+ sal_uLong nPortToTalk;
protected:
- virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, vos::OConnectorSocket *pCS ){ return new SimpleCommunicationLinkViaSocketWithReceiveCallbacks( pCM, pCS ); }
+ virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, osl::ConnectorSocket* pCS ){ return new SimpleCommunicationLinkViaSocketWithReceiveCallbacks( pCM, pCS ); }
};
#endif
diff --cc automation/source/communi/communi.cxx
index a7f551d,cc14ad5..6dcfb7b
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@@ -52,11 -51,11 +52,11 @@@
#undef SV_IMPL_PTRARR_SORT
#define SV_IMPL_PTRARR_SORT( nm,AE )\
_SV_IMPL_SORTAR_ALG( nm,AE )\
- void nm::DeleteAndDestroy( USHORT nP, USHORT nL ) { \
+ void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL ) { \
if( nL ) {\
DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\
- for( USHORT n=nP; n < nP + nL; n++ ) \
- OSL_FAIL("Das Element der Liste wurde nicht gelöscht"); \
+ for( sal_uInt16 n=nP; n < nP + nL; n++ ) \
- DBG_ERROR("Das Element der Liste wurde nicht gelöscht"); \
++ OSL_FAIL("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 @@@ sal_Bool CommunicationLinkViaSocket::Sh
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 @@@ sal_Bool CommunicationLinkViaSocket::Do
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,9 -296,9 +297,9 @@@ 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
- USHORT i = ActiveLinks->Count();
++ // Alles weghauen, was nicht rechtzeitig auf die B�ume gekommen ist
++ // Was bei StopCommunication �brig geblieben ist, da es sich asynchron austragen wollte
+ sal_uInt16 i = ActiveLinks->Count();
while ( i-- )
{
CommunicationLinkRef rTempLink = ActiveLinks->GetObject( 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 @@@ sal_Bool MultiCommunicationManager::Sto
{
// 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.
- USHORT i = ActiveLinks->Count();
++ // oder asyncron. Daher Von oben nach unten Abr�umen, so da� sich nichts verschiebt.
+ sal_uInt16 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/inc/rcontrol.hxx
index dfa701a,2f02c66..67c8fa6
--- a/automation/source/inc/rcontrol.hxx
+++ b/automation/source/inc/rcontrol.hxx
@@@ -37,8 -36,10 +37,8 @@@
#ifndef _RCONTROL_HXX
#define _RCONTROL_HXX
- #define UID_ACTIVE 0
-
+ #define UID_ACTIVE "UID_ACTIVE"
-
#define SI_IPCCommandBlock 1
#define SI_SocketCommandBlock SI_IPCCommandBlock // Zumindest erstmal
#define SI_DirectCommandBlock 2
@@@ -207,7 -216,7 +207,7 @@@
#define M_LAST_NO_RETURN 200
#if ( M_LAST_NO_RETURN >= M_WITH_RETURN )
--#error "Bereich überschritten"
++#error "Bereich �berschritten"
#endif
#define M_Exists ( M_WITH_RETURN | 1 )
@@@ -315,7 -337,7 +315,7 @@@
#define _RC_LAST_NO_RETURN 27
#if ( _RC_LAST_NO_RETURN >= M_WITH_RETURN )
--#error "Bereich überschritten"
++#error "Bereich �berschritten"
#endif
// Befehle mit Returnwert
@@@ -374,21 -396,23 +374,21 @@@
#define RC_WaitSlot ( M_SOFFICE | M_WITH_RETURN | 44 )
// Flow Control
--#define F_EndCommandBlock 101 // Initiiert Rückmeldung des Status
--#define F_Sequence 102 // Übergibt Sequence Nummer (1. in jedem Stream)
++#define F_EndCommandBlock 101 // Initiiert R�ckmeldung des Status
++#define F_Sequence 102 // �bergibt Sequence Nummer (1. in jedem Stream)
// Return codes
--#define RET_Sequence 132 // Übergibt Sequence Nummer (1. in jedem Stream)
--#define RET_Value 133 // Übergibt Return-wert
--#define RET_WinInfo 134 // Information über aktuelles Fenster/Control
++#define RET_Sequence 132 // �bergibt Sequence Nummer (1. in jedem Stream)
++#define RET_Value 133 // �bergibt Return-wert
++#define RET_WinInfo 134 // Information �ber aktuelles Fenster/Control
#define RET_ProfileInfo 135 // Profile Information
--#define RET_DirectLoging 136 // Direktes Übertragen von Informationen in das Log
--#define RET_MacroRecorder 137 // MakroRecorder Befehl übertragen
-
-
++#define RET_DirectLoging 136 // Direktes �bertragen von Informationen in das Log
++#define RET_MacroRecorder 137 // MakroRecorder Befehl �bertragen
// Subcodes die in nUId geliefert werden
--// für F_ProfileInfo
++// f�r F_ProfileInfo
#define S_ProfileReset 201 // nNr1 = Anzahl Borders
-- // Achtung!! Diese Defines müssen aufeinanderfolgende Nummern haben!!
++ // Achtung!! Diese Defines m�ssen aufeinanderfolgende Nummern haben!!
#define S_ProfileBorder1 202 // nNr1 = Border1 in ms
#define S_ProfileBorder2 203 // nNr1 = Border2 in ms
#define S_ProfileBorder3 204 // nNr1 = Border3 in ms
@@@ -397,7 -421,7 +397,7 @@@
#define S_ProfileTime 210 // nNr1 = remote Zeit des Befehls
#define S_ProfileDump 211 // Gibt die daten aus.
--// für F_DirectLoging
++// f�r F_DirectLoging
#define S_AssertError 220
#define S_AssertWarning 221
#define S_AssertTrace 222
@@@ -413,7 -439,7 +413,7 @@@
#define CONST_CTTableControl 106
#define CONST_CTUnknown 199
--// Konstanten für das ALignment des gesuchten Splitters
++// Konstanten f�r das ALignment des gesuchten Splitters
#define CONST_ALIGN_LEFT 120
#define CONST_ALIGN_TOP 121
#define CONST_ALIGN_RIGHT 122
@@@ -455,8 -481,9 +455,8 @@@
#define PARAM_BOOL_2 0x0080
#define PARAM_SBXVALUE_1 0x0400 // hier mit 0x0400 Weiter!!! Siehe Oben!
--// Zusätzliche Beschreibung!! wird auch mit dem Rest verodert
--//#define PARAM_STR_RAW 0x8000 // Der Zeichensatz der Strings wird nicht konvertiert(für Fareastern)
-
++// Zus�tzliche Beschreibung!! wird auch mit dem Rest verodert
++//#define PARAM_STR_RAW 0x8000 // Der Zeichensatz der Strings wird nicht konvertiert(f�r Fareastern)
#define ERR_SEND_TIMEOUT 100
#define ERR_EXEC_TIMEOUT 101
diff --cc automation/source/miniapp/editwin.cxx
index 5cc15cf,6b7705a..54cf342
--- a/automation/source/miniapp/editwin.cxx
+++ b/automation/source/miniapp/editwin.cxx
@@@ -31,10 -30,12 +31,10 @@@
#include "editwin.hxx"
#include <tools/stream.hxx>
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
- BOOL GHEditWindow::Close()
+ sal_Bool GHEditWindow::Close()
{
if (aInhalt.IsModified())
{
diff --cc automation/source/miniapp/servres.hxx
index 21d796c,b50f0b4..f000dff
--- a/automation/source/miniapp/servres.hxx
+++ b/automation/source/miniapp/servres.hxx
@@@ -59,7 -76,6 +59,7 @@@ class MenuMENU_CLIENT : public MenuBa
{
protected:
public:
- MenuMENU_CLIENT( const ResId & rResId, BOOL bFreeRes = TRUE );
+ MenuMENU_CLIENT( const ResId & rResId, sal_Bool bFreeRes = sal_True );
};
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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/miniapp/testapp.cxx
index 89a8161,021976d..bc9badb
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@@ -193,10 -240,10 +194,10 @@@ void MyApp::Property( ApplicationProper
}
- USHORT MyDispatcher::ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs, USHORT nMode)
+ sal_uInt16 MyDispatcher::ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs, sal_uInt16 nMode)
{
- (void) ppArgs; /* avoid warning about unused parameter */
- (void) nMode; /* avoid warning about unused parameter */
+ (void) ppArgs; // avoid warning about unused parameter
+ (void) nMode; // avoid warning about unused parameter
switch (nSID)
{
diff --cc automation/source/server/XMLParser.cxx
index cd4f6a0,0a0fc3c..dc9d112
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@@ -622,13 -623,13 +622,13 @@@ void StatementCommand::HandleSAXParser(
}
else if ( pElementNode )
{
- USHORT nNthOccurrence;
- sal_uInt16 nNthOccurance;
++ sal_uInt16 nNthOccurrence;
if( (nParams & PARAM_USHORT_1) )
- nNthOccurance = nNr1;
+ nNthOccurrence = nNr1;
else
- nNthOccurance = 1;
+ nNthOccurrence = 1;
- USHORT i;
+ sal_uInt16 i;
NodeRef xNew;
for ( i = 0 ; i < pElementNode->GetChildCount() && !xNew.Is() ; i++ )
{
diff --cc automation/source/server/cmdbasestream.cxx
index d71dcf1,c1792cd..707f6b8
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@@ -282,23 -329,22 +331,23 @@@ void CmdBaseStream::Write( comm_BOOL bB
void CmdBaseStream::Read ( comm_String* &pString )
{
(void) pString; /* avoid warning about unused parameter */
- DBG_ERROR("Read ( comm_String* &pString ) Not Implemented");
+ OSL_FAIL("Read ( comm_String* &pString ) Not Implemented");
}
- void CmdBaseStream::Read ( SmartId* &pId )
+ void CmdBaseStream::Read ( rtl::OString* &pId )
{
(void) pId; /* avoid warning about unused parameter */
- OSL_FAIL("Read ( SmartId* &pId ) Not Implemented");
- DBG_ERROR("Read ( rtl::OString* &pId ) Not Implemented");
++ OSL_FAIL("Read ( rtl::OString* &pId ) Not Implemented");
}
void CmdBaseStream::Write( comm_String *pString )
{
(void) pString; /* avoid warning about unused parameter */
- DBG_ERROR("Write( comm_String *pString ) Not Implemented");
+ OSL_FAIL("Write( comm_String *pString ) Not Implemented");
}
- void CmdBaseStream::Write( SmartId* pId )
+ void CmdBaseStream::Write( rtl::OString* pId )
{
(void) pId; /* avoid warning about unused parameter */
- OSL_FAIL("Write( SmartId* pId ) Not Implemented");
- DBG_ERROR("Write( rtl::OString* pId ) Not Implemented");
++ OSL_FAIL("Write( rtl::OString* pId ) Not Implemented");
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc automation/source/server/profiler.hxx
index 7192441,9044684..4ae07f8
--- a/automation/source/server/profiler.hxx
+++ b/automation/source/server/profiler.hxx
@@@ -42,7 -41,7 +42,7 @@@
struct SysdepProfileSnapshot;
--struct SysdepStaticData; // Nicht wirklich statisch, sondern statisch über mehrere Snapshots
++struct SysdepStaticData; // Nicht wirklich statisch, sondern statisch �ber mehrere Snapshots
struct ProfileSnapshot
{
@@@ -59,8 -58,8 +59,8 @@@ public
TTProfiler();
~TTProfiler();
-- String GetProfileHeader(); // Titelzeile für Logdatei
- void StartProfileInterval( BOOL bReadAnyway = FALSE ); // Zustand merken
++ String GetProfileHeader(); // Titelzeile f�r Logdatei
+ void StartProfileInterval( sal_Bool bReadAnyway = sal_False ); // Zustand merken
void EndProfileInterval(); // Informationszeile zusammenbauen
String GetProfileLine( String &aPrefix );
@@@ -94,11 -93,11 +94,11 @@@ private
//
- BOOL bIsProfilingPerCommand;
- BOOL bIsPartitioning;
+ sal_Bool bIsProfilingPerCommand;
+ sal_Bool bIsPartitioning;
--// Für das Automatische Profiling in festen Intervallen
++// F�r das Automatische Profiling in festen Intervallen
ProfileSnapshot *pAutoStart;
ProfileSnapshot *pAutoEnd;
@@@ -110,11 -109,11 +110,11 @@@
// Einige Hilfsfunktionen
- // String Hex( ULONG nNr );
- String Dec( ULONG nNr ); // Ergebnis = nNr / 100 mit 2 Dezimalen
- String Pad( const String &aS, xub_StrLen nLen ); // Fügt blanks links an den String an
+ // String Hex( sal_uLong nNr );
+ String Dec( sal_uLong nNr ); // Ergebnis = nNr / 100 mit 2 Dezimalen
- String Pad( const String aS, xub_StrLen nLen ); // Fügt blanks links an den String an
++ String Pad( const String &aS, xub_StrLen nLen ); // F�gt blanks links an den String an
--/* Ab hier werden die Methoden Systemabhängig in den entsprechenden cxx implementiert
++/* Ab hier werden die Methoden Systemabh�ngig in den entsprechenden cxx implementiert
Sie werden von den oberen Methoden gerufen.
*/
@@@ -126,7 -125,7 +126,7 @@@
SysdepProfileSnapshot *NewSysdepSnapshotData();
void DeleteSysdepSnapshotData( SysdepProfileSnapshot *pSysdepProfileSnapshot );
-- // Titelzeile für Logdatei
++ // Titelzeile f�r Logdatei
String GetSysdepProfileHeader();
// Zustand merken
diff --cc automation/source/server/recorder.cxx
index 408c15c,7dff4b5..55ead04
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@@ -168,14 -167,18 +168,14 @@@ IMPL_LINK( MacroRecorder, EventListener
{
// we cannot access pKeyWin since it might have dissapeared
if ( bKeyFollowFocus )
- StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (USHORT)M_TypeKeys, aKeyString, bKeyFollowFocus );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (sal_uInt16)M_TypeKeys, aKeyString, bKeyFollowFocus );
else
- StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (USHORT)M_TypeKeys, aKeyString );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (sal_uInt16)M_TypeKeys, aKeyString );
#if OSL_DEBUG_LEVEL > 1
- StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (USHORT)M_TypeKeys, String::CreateFromInt32( nEventID ) );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (sal_uInt16)M_TypeKeys, String::CreateFromInt32( nEventID ) );
#endif
- bSendData = TRUE;
+ bSendData = sal_True;
}
- if ( m_bLog )
- {
-// HACK Too many KeyEvents generated LogVCL( rtl::OString(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() );
- }
// cleanup
aKeyString.Erase();
pKeyWin = NULL;
@@@ -483,9 -507,25 +483,9 @@@
}
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 );
-
- sal_uLong nStart = Time::GetSystemTicks();
- sal_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
- bSendData = TRUE;
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), Id2Str( pTB->GetHelpId( pTB->GetCurItemId() ) ) );
+ bSendData = sal_True;
}
-/* not needed if ( m_bLog )
- {
- }*/
}
break;
case VCLEVENT_TOOLBOX_CLICK: /// ATTENTION this is called during initialisation of toolbox. whoever 'invented' this
@@@ -534,8 -675,13 +534,8 @@@
pKeyWin = pWin;
Window *pIdWin = GetParentWithID( pWin );
if ( pIdWin != pWin )
- bKeyFollowFocus = TRUE;
- aKeyUniqueID = pIdWin->GetSmartUniqueOrHelpId();
+ bKeyFollowFocus = sal_True;
+ 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) ||
@@@ -579,10 -726,56 +579,10 @@@
{
// case 1 .. 0xffff:
DBG_TRACE3( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin );
- // BOOL bx = ((DockingWindow*)pWin)->IsFloatingMode();
+ // sal_Bool bx = ((DockingWindow*)pWin)->IsFloatingMode();
// break;
-/* case M_Dock :
- if ( ((DockingWindow*)pControl)->IsFloatingMode() )
- ((DockingWindow*)pControl)->SetFloatingMode(sal_False);
- else
- ReportError( nUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_FLOATING_MODE, MethodString( nMethodId ) ) );
- break;
- case M_Undock :
- if ( !((DockingWindow*)pControl)->IsFloatingMode() )
- ((DockingWindow*)pControl)->SetFloatingMode(sal_True);
- else
- ReportError( nUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_FLOATING_MODE, MethodString( nMethodId ) ) );
- break;
- case M_IsDocked :
- pRet->GenReturn ( RET_Value, nUId, (comm_BOOL) !((DockingWindow*)pControl)->IsFloatingMode());
- break;
- case M_Close:
- //nWindowWaitUId = nUId;
- DBG_ASSERT( nUId == pControl->GetUniqueOrHelpId(), "nUID != UniqueOrHelpId");
- SET_WINP_CLOSING(pControl);
- ((DockingWindow*)pControl)->Close();
- break;
- case M_Size:
- case M_Move:
- case M_IsMax :
- case M_Minimize :
- case M_Maximize :
- if ( ((DockingWindow*)pControl)->IsFloatingMode() )
- {
- pControl = ((DockingWindow*)pControl)->GetFloatingWindow();
- goto FloatWin;
- }
- else
- ReportError( nUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_DOCKING_MODE, MethodString( nMethodId ) ) );
- break;
- case M_Help: // Alles was unten weiterbehandelt werden soll
- goto MoreDialog;
-
- default:
- ReportError( nUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "DockingWindow" ) );
- break;*/
}
break;
-
-
-
-
-
-
case WINDOW_FLOATINGWINDOW:
{
DBG_TRACE3( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin );
diff --cc automation/source/server/recorder.hxx
index 362fc70,c3800c3..1793198
--- a/automation/source/server/recorder.hxx
+++ b/automation/source/server/recorder.hxx
@@@ -76,11 -74,10 +75,11 @@@ private
public:
- void SetActionRecord( BOOL bRecord = TRUE ) { m_bRecord = bRecord; CheckDelete(); };
- void SetActionLog( BOOL bLog = TRUE ) { m_bLog = bLog; CheckDelete(); };
+ void SetActionRecord( sal_Bool bRecord = sal_True ) { m_bRecord = bRecord; CheckDelete(); };
+ void SetActionLog( sal_Bool bLog = sal_True ) { m_bLog = bLog; CheckDelete(); };
static MacroRecorder* GetMacroRecorder();
- static BOOL HasMacroRecorder();
+ static sal_Bool HasMacroRecorder();
};
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc automation/source/server/retstrm.cxx
index cd434a3,49003c0..690575e
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@@ -94,16 -103,11 +104,11 @@@ void RetStream::Write( SbxValue &aValu
aValue.Store( *pSammel );
}
- void RetStream::Write( SmartId* pId )
+ void RetStream::Write( rtl::OString* pId )
{
- DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "SmartId contains Number and String. using String only." );
- if ( pId->HasString() )
- {
- String aTmp( pId->GetStr() );
- Write( &aTmp );
- }
- else
- Write( static_cast<comm_ULONG>(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit
+ //HELPID BACKWARD (should use ByteString or OString)
- String aTmp( Id2Str( *pId ) );
++ String aTmp( Id2Str( *pId ) );
+ Write( &aTmp );
}
diff --cc automation/source/server/retstrm.hxx
index 8f3e622,bb149d8..2190d15
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@@ -42,23 -40,30 +41,28 @@@ public
~RetStream();
using CmdBaseStream::GenError;
- void GenError( SmartId aUId, String aString );
-// new
+ void GenError( rtl::OString aUId, String aString );
using CmdBaseStream::GenReturn;
void GenReturn( comm_USHORT nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
+
// MacroRecorder
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
+
-// new
+ void GenReturn( sal_uInt16 nRet, rtl::OString aUId, String aString );
+ void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool );
+
+ // needed for RemoteCommand and Profiling
+ void GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValue );
+ void GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, String aString );
- void GenReturn( USHORT nRet, SmartId aUId, String aString );
- void GenReturn( USHORT nRet, SmartId aUId, SbxValue &aValue );
- void GenReturn( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool );
// MacroRecorder
- void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString );
- void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool );
+ void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString );
+ void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, sal_Bool bBool );
void Reset();
SvStream* GetStream();
diff --cc automation/source/server/server.cxx
index 4d22660,ab3278d..2ebcc36
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@@ -108,7 -113,7 +108,7 @@@ RemoteControlCommunicationManager::Remo
{
SetInfoType( CM_SHORT_TEXT | CM_ALL );
ByteString aByteString;
-- InfoMsg( InfoString( aByteString, CM_ALL ) ); // Anzeigen, daß wir da sind
++ InfoMsg( InfoString( aByteString, CM_ALL ) ); // Anzeigen, da� wir da sind
}
}
@@@ -149,7 -154,7 +149,7 @@@ IMPL_LINK( RemoteControlCommunicationMa
}
else
{ // Dann Probieren wir es eben in 1 Sekunde nochmal
-- pTimer = new Timer(); // Wird im Link gelöscht
++ pTimer = new Timer(); // Wird im Link gel�scht
pTimer->SetTimeout( 1000 );
pTimer->SetTimeoutHdl( LINK( this, RemoteControlCommunicationManager, SetWinCaption ) );
pTimer->Start();
@@@ -225,7 -230,7 +225,7 @@@ sal_uLong RemoteControlCommunicationMan
nPortIs = aConf.ReadKey("TTPort","0").ToInt32();
-- // noch prüfen ob dieses Office getestet werden soll.
++ // noch pr�fen ob dieses Office getestet werden soll.
if ( !bAutomate || aConf.ReadKey( aNoTesttoolKey, "" ) != "" )
nPortIs = 0;
@@@ -277,16 -282,16 +277,16 @@@ void ExtraIdle::Timeout(
return;
}
-- // Müssen wir selbst idlen?
++ // M�ssen wir selbst idlen?
#if OSL_DEBUG_LEVEL > 1
- ULONG nLastInputInterval = Application::GetLastInputInterval();
- BOOL bIsInModalMode = Application::IsInModalMode();
+ sal_uLong nLastInputInterval = Application::GetLastInputInterval();
+ sal_Bool bIsInModalMode = Application::IsInModalMode();
if ( bIsInModalMode || nLastInputInterval < MIN_IDLE )
#else
if ( Application::IsInModalMode() || Application::GetLastInputInterval() < MIN_IDLE )
#endif
{
-- if ( nStep ) // Schon angefangen? dann abbrechen, sonst später nochmal
++ if ( nStep ) // Schon angefangen? dann abbrechen, sonst sp�ter nochmal
{
if ( nStep < 15 )
{
@@@ -314,7 -319,7 +314,7 @@@
}
-- switch ( nStep++ ) // Probieren ob wir noch was machen können
++ switch ( nStep++ ) // Probieren ob wir noch was machen k�nnen
{
case 0:
{
@@@ -563,7 -610,7 +563,7 @@@ IMPL_LINK( ImplRemoteControl, CommandHd
if ( StatementList::MaybeResetSafeReschedule() )
{
- StatementList::bExecuting = FALSE; // Wird nacher im SafeReschedule wieder zurückgesetzt
- StatementList::bExecuting = sal_False; // Wird nacher im SafeReschedule wieder zurückgesetzt
++ StatementList::bExecuting = sal_False; // Wird nacher im SafeReschedule wieder zur�ckgesetzt
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "SafeReschedule has been reset\n" );
#endif
@@@ -590,14 -637,14 +590,14 @@@
}
m_pDbgWin->AddText( "Leaving CommandHdl\n" );
#endif
-- return 0; // Garnicht erst irgendwelchen blödsinn machen
++ return 0; // Garnicht erst irgendwelchen bl�dsinn machen
}
while( StatementList::pFirst && ( !StatementList::bReadingCommands || StatementList::bDying ) )
-- // Schleift hier bis Befehl nicht zurückkommt,
-- // Wird dann rekursiv über IdleHdl und PostUserEvent aufgerufen.
++ // Schleift hier bis Befehl nicht zur�ckkommt,
++ // Wird dann rekursiv �ber IdleHdl und PostUserEvent aufgerufen.
{
- m_bInsideExecutionLoop = TRUE;
+ m_bInsideExecutionLoop = sal_True;
#ifdef TIMERIDLE
m_aIdleTimer.Stop();
m_aIdleTimer.Start();
@@@ -611,7 -661,7 +611,7 @@@
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Leaving CommandHdl\n" );
#endif
-- return 0; // So dass die App nochmal ´ne chance bekommt
++ return 0; // So dass die App nochmal �ne chance bekommt
}
}
else
@@@ -623,7 -673,7 +623,7 @@@
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Leaving CommandHdl\n" );
#endif
-- return 0; // So dass die App nochmal ´ne chance bekommt
++ return 0; // So dass die App nochmal �ne chance bekommt
}
}
catch( ... )
@@@ -637,10 -687,10 +637,10 @@@
pDlg->SetOutputSizePixel(Size(150,0));
pDlg->SetText( String ( TTProperties::GetSvtResId( TT_GPF ) ) );
pDlg->Show();
- DBG_ERROR("GPF");
+ OSL_FAIL("GPF");
pC->ReportError( GEN_RES_STR0( S_GPF_ABORT ) );
- StatementList::bDying = TRUE;
- while ( StatementList::pFirst ) // Kommandos werden übersprungen
+ StatementList::bDying = sal_True;
- while ( StatementList::pFirst ) // Kommandos werden übersprungen
++ while ( StatementList::pFirst ) // Kommandos werden �bersprungen
StatementList::NormalReschedule();
delete pDlg;
}
@@@ -652,10 -702,23 +652,10 @@@
}
}
- m_bInsideExecutionLoop = FALSE;
-/* #i46293# remove reschedules
- for (int xx = 1;xx < 20;xx++)
- StatementList::NormalReschedule();
-*/
+ m_bInsideExecutionLoop = sal_False;
}
- StatementList::aWindowWaitUId = SmartId(); // Warten rücksetzen, da handler sowieso verlassen wird
- StatementList::aWindowWaitUId = rtl::OString(); // Warten rücksetzen, da handler sowieso verlassen wird
-
-/* if( StatementList::pFirst && !StatementList::bReadingCommands )
- // Abfrage nötig, da andere CommandHdl aktiv sein können oder
- // neue Commands gelesen werden können
- {
- delete StatementList::pFirst; // Löscht die gesamte Liste !!
- StatementList::pFirst = NULL;
- StatementList::pCurrent = NULL; // Nur zur Sicherheit, sollte hier sowieso NULL sein
- }*/
++ StatementList::aWindowWaitUId = rtl::OString(); // Warten r�cksetzen, da handler sowieso verlassen wird
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Leaving CommandHdl\n" );
@@@ -671,9 -734,10 +671,9 @@@ IMPL_LINK( ImplRemoteControl, QueComman
return 0;
}
- BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
+ sal_Bool ImplRemoteControl::QueCommands( sal_uLong nServiceId, SvStream *pIn )
{
- USHORT nId;
-// return sal_True;
+ sal_uInt16 nId;
if( !m_bIdleInserted )
{
@@@ -700,8 -764,8 +700,8 @@@
if( nServiceId != SI_IPCCommandBlock && nServiceId != SI_DirectCommandBlock )
{
-- DBG_ERROR1( "Ungültiger Request :%i", (int)nServiceId );
- return FALSE;
++ DBG_ERROR1( "Ung�ltiger Request :%i", (int)nServiceId );
+ return sal_False;
}
SCmdStream *pCmdStream = new SCmdStream(pIn);
@@@ -713,28 -777,28 +713,28 @@@
{
case SICommand:
{
-- new StatementCommand( pCmdStream ); // Wird im Konstruktor an Liste angehängt
++ new StatementCommand( pCmdStream ); // Wird im Konstruktor an Liste angeh�ngt
break;
}
case SIControl:
case SIStringControl:
{
-- new StatementControl( pCmdStream, nId ); // Wird im Konstruktor an Liste angehängt
++ new StatementControl( pCmdStream, nId ); // Wird im Konstruktor an Liste angeh�ngt
break;
}
case SISlot:
{
-- new StatementSlot( pCmdStream ); // Wird im Konstruktor an Liste angehängt
++ new StatementSlot( pCmdStream ); // Wird im Konstruktor an Liste angeh�ngt
break;
}
case SIUnoSlot:
{
-- new StatementUnoSlot( pCmdStream ); // Wird im Konstruktor an Liste angehängt
++ new StatementUnoSlot( pCmdStream ); // Wird im Konstruktor an Liste angeh�ngt
break;
}
case SIFlow:
{
-- new StatementFlow( nServiceId, pCmdStream, this ); // Wird im Konstruktor an Liste angehängt
++ new StatementFlow( nServiceId, pCmdStream, this ); // Wird im Konstruktor an Liste angeh�ngt
break;
}
default:
@@@ -764,8 -828,12 +764,8 @@@
GetpApp()->PostUserEvent( LINK( this, ImplRemoteControl, CommandHdl ) );
}
- return TRUE;
-#ifdef DEBUG
- else
- m_bInsideExecutionLoop = sal_True;
-#endif
+ return sal_True;
-} // sal_Bool ImplRemoteControl::QueCommands( sal_uLong nServiceId, SvStream *pIn )
+}
SvStream* ImplRemoteControl::GetReturnStream()
@@@ -829,16 -900,16 +832,16 @@@ ImplRemoteControl::~ImplRemoteControl(
#endif
#ifdef DBG_UTIL
-- // Zurücksetzen, so daß nachfolgende Assertions nicht verloren gehen
++ // Zur�cksetzen, so da� nachfolgende Assertions nicht verloren gehen
DbgSetPrintTestTool( NULL );
osl_setDebugMessageFunc( StatementCommand::pOriginal_osl_DebugMessageFunc );
#endif
if ( StatementList::pFirst )
-- { // Es sind noch Kommandos da, also auch eine Möglichkeit zurückzusenden.
++ { // Es sind noch Kommandos da, also auch eine M�glichkeit zur�ckzusenden.
StatementList::pFirst->ReportError( GEN_RES_STR0( S_APP_SHUTDOWN ) );
-- while ( StatementList::pFirst ) // Kommandos werden übersprungen
-- StatementList::NormalReschedule(); // Fehler zurückgeschickt
++ while ( StatementList::pFirst ) // Kommandos werden �bersprungen
++ StatementList::NormalReschedule(); // Fehler zur�ckgeschickt
}
if ( pServiceMgr )
@@@ -905,7 -976,6 +908,7 @@@ extern "C" void CreateEventLogger(
extern "C" void DestroyEventLogger()
{
- MacroRecorder::GetMacroRecorder()->SetActionLog( FALSE ); // Will delete MacroRecorder if necessary
+ MacroRecorder::GetMacroRecorder()->SetActionLog( sal_False ); // Will delete MacroRecorder if necessary
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc automation/source/server/sta_list.cxx
index 576b1cf,5d6507b..99906cd
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@@ -75,21 -78,21 +75,21 @@@ EditWindow *StatementList::m_pDbgWin
#endif
- SmartId StatementList::aWindowWaitUId = SmartId();
+ rtl::OString StatementList::aWindowWaitUId = rtl::OString();
Window *StatementList::pWindowWaitPointer = NULL;
- SmartId StatementList::aWindowWaitOldHelpId = SmartId();
- SmartId StatementList::aWindowWaitOldUniqueId = SmartId();
- USHORT StatementList::nUseBindings = 0;
+ rtl::OString StatementList::aWindowWaitOldHelpId = rtl::OString();
+ rtl::OString StatementList::aWindowWaitOldUniqueId = rtl::OString();
+ sal_uInt16 StatementList::nUseBindings = 0;
- SmartId StatementList::aSubMenuId1 = SmartId(); // Untermenüs bei PopupMenus
- SmartId StatementList::aSubMenuId2 = SmartId(); // erstmal 2-Stufig
- SmartId StatementList::aSubMenuId3 = SmartId(); // and now even 3 levels #i31512#
-sal_uInt16 StatementList::aSubMenuId1 = 0; // Untermenüs bei PopupMenus
++sal_uInt16 StatementList::aSubMenuId1 = 0; // Untermen�s bei PopupMenus
+ sal_uInt16 StatementList::aSubMenuId2 = 0; // erstmal 2-Stufig
+ sal_uInt16 StatementList::aSubMenuId3 = 0; // and now even 3 levels #i31512#
SystemWindow *StatementList::pMenuWindow = NULL;
TTProperties *StatementList::pTTProperties = NULL;
- USHORT StatementList::nMinTypeKeysDelay = 0; // Verzögerung der einzelnen Anschläge für TypeKeys
- USHORT StatementList::nMaxTypeKeysDelay = 0;
- BOOL StatementList::bDoTypeKeysDelay = FALSE;
-sal_uInt16 StatementList::nMinTypeKeysDelay = 0; // Verzögerung der einzelnen Anschläge für TypeKeys
++sal_uInt16 StatementList::nMinTypeKeysDelay = 0; // Verz�gerung der einzelnen Anschl�ge f�r TypeKeys
+ sal_uInt16 StatementList::nMaxTypeKeysDelay = 0;
+ sal_Bool StatementList::bDoTypeKeysDelay = sal_False;
Window* StatementList::pFirstDocFrame = NULL;
@@@ -127,14 -130,21 +127,15 @@@ TTSettings* GetTTSettings(
- #define IS_WINP_CLOSING(pWin) (pWin->GetSmartHelpId().Matches( 4321 ) && pWin->GetSmartUniqueId().Matches( 1234 ))
+ // FIXME: HELPID
+ #define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "TT_Win_is_closing_HID" ) && pWin->GetUniqueId().equals( "TT_Win_is_closing_UID" ))
-/*
-UniString GEN_RES_STR0( sal_uLong nResId ) { return ResString( nResId ); }
-UniString GEN_RES_STR1( sal_uLong nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); }
-UniString GEN_RES_STR2( sal_uLong nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); }
-UniString GEN_RES_STR3( sal_uLong nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );}
-*/
StatementList::StatementList()
: nRetryCount(MAX_RETRIES)
- , bStatementInQue(FALSE)
+ , bStatementInQue(sal_False)
{
if (!pRet)
-- pRet = new RetStream; // so Spät wie möglich, aber dennoch Zentral und auf jeden Fall rechtzeitig, da pRet private ist.
++ pRet = new RetStream; // so Sp�t wie m�glich, aber dennoch Zentral und auf jeden Fall rechtzeitig, da pRet private ist.
}
void StatementList::InitProfile()
@@@ -181,7 -192,7 +183,7 @@@ void StatementList::SendProfile( Strin
void StatementList::QueStatement(StatementList *pAfterThis)
{
-- DBG_ASSERT(!bStatementInQue,"QueStatement für bereits eingetragenes Statement -> Abgebrochen");
++ DBG_ASSERT(!bStatementInQue,"QueStatement f�r bereits eingetragenes Statement -> Abgebrochen");
if ( bStatementInQue )
return;
@@@ -199,7 -210,7 +201,7 @@@
pFirst = this;
}
}
-- else // am Ende einfügen
++ else // am Ende einf�gen
{
pNext = NULL;
if( !pFirst )
@@@ -533,7 -557,9 +535,7 @@@ Menu* StatementList::GetMatchingMenu( W
if ( pBaseMenu->GetWindow() == pWin )
return pBaseMenu;
- USHORT i;
+ sal_uInt16 i;
-// while ( pBaseMenu )
-// {
i = 0;
while ( i < pBaseMenu->GetItemCount() )
{
@@@ -594,8 -621,9 +596,8 @@@
}
- BOOL SearchActive::IsWinOK( Window *pWin )
+ sal_Bool SearchActive::IsWinOK( Window *pWin )
{
-// return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ) && (nRT == WINDOW_FILEDIALOG || nRT == WINDOW_PATHDIALOG || nRT == WINDOW_PRINTDIALOG || nRT == WINDOW_PRINTERSETUPDIALOG || nRT == WINDOW_COLORDIALOG || ((SystemWindow*)pWin)->IsActive());
// only matches ResID due to problems with UNIX Window Managers
return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT );
}
@@@ -1164,9 -1196,13 +1166,9 @@@ void ImplMouseButtonUp( Window* pWin, M
}
else
{
- // DragManager* pDragManager = DragManager::GetDragManager();
- // if ( pDragManager )
- // pDragManager->ButtonUp( aMEvnt, pWin );
- // else
if ( pWin->IsTracking() )
{
-- // siehe #64693 die Position ist für Toolboxen relevant
++ // siehe #64693 die Position ist f�r Toolboxen relevant
// #60020 Jetzt hoffentlich kein GPF mehr
// Zuerst Tracking beenden ohne Event
pWin->EndTracking( ENDTRACK_DONTCALLHDL );
diff --cc automation/source/server/statemnt.cxx
index 58b1afc,7c81638..ef91a01
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@@ -35,8 -34,13 +35,9 @@@
#include <comphelper/processfactory.hxx>
#include <comphelper/uieventslogger.hxx>
+ #include <tools/wintypes.hxx>
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/menubtn.hxx>
#include <svtools/svtreebx.hxx>
#include <svtools/brwbox.hxx>
@@@ -131,14 -157,15 +132,14 @@@ 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 )
+ StatementFlow::StatementFlow( StatementList *pAfterThis, sal_uInt16 nArtP )
: nArt(nArtP)
, nParams(0)
, nSNr1(0)
@@@ -187,13 -214,13 +188,13 @@@ void StatementFlow::SendViaSocket(
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "SendViaSocket called recursively. Aborted!!!\n" );
#endif
- DBG_ERROR("SendViaSocket called recursively. Aborted!!!");
+ OSL_FAIL("SendViaSocket called recursively. Aborted!!!");
return;
}
- bSending = TRUE;
+ bSending = sal_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
@@@ -268,37 -296,15 +269,14 @@@ sal_Bool StatementFlow::Execute(
}
delete this;
- return TRUE;
+ return sal_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;
@@@ -469,8 -476,8 +438,8 @@@ void StatementSlot::AddReferer(
nAnzahl++;
aArgs.realloc(nAnzahl);
pArg = aArgs.getArray();
- pArg[nAnzahl-1].Name = rtl::OUString::createFromAscii("SynchronMode");
+ pArg[nAnzahl-1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SynchronMode" ));
- pArg[nAnzahl-1].Value <<= sal_Bool( TRUE );
+ pArg[nAnzahl-1].Value <<= sal_Bool( sal_True );
}
class SlotStatusListener : public cppu::WeakImplHelper1< XStatusListener >
@@@ -484,13 -491,23 +453,13 @@@ public
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
// local Members
- BOOL bDisposed;
- BOOL bEnabled;
+ sal_Bool bDisposed;
+ sal_Bool bEnabled;
};
-/*
-struct FeatureStateEvent : public ::com::sun::star::lang::EventObject
- ::com::sun::star::util::URL FeatureURL;
- ::rtl::OUString FeatureDescriptor;
- sal_Bool IsEnabled;
- sal_Bool Requery;
- ::com::sun::star::uno::Any State;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Source;
-*/
SlotStatusListener::SlotStatusListener()
- : bDisposed( FALSE )
- , bEnabled( TRUE )
+ : bDisposed( sal_False )
+ , bEnabled( sal_True )
{}
// XStatusListener
@@@ -675,16 -696,17 +644,16 @@@ sal_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 ) );
delete this;
- return TRUE;
+ return sal_True;
}
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
StatementUnoSlot::StatementUnoSlot(SCmdStream *pIn)
{
@@@ -700,10 -722,10 +669,9 @@@
}
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
- StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, USHORT Params, USHORT Nr1 )
+ StatementCommand::StatementCommand( StatementList *pAfterThis, sal_uInt16 MethodId, sal_uInt16 Params, sal_uInt16 Nr1 )
: nMethodId( MethodId )
- , aSmartMethodId()
, nParams(Params)
, nNr1(Nr1)
, nNr2(0)
@@@ -788,8 -807,8 +753,8 @@@ StatementCommand::StatementCommand( SCm
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "*Deleting all Commands:\n" );
#endif
- bReadingCommands = FALSE;
- while ( StatementList::pFirst != this ) // Alles Löschen außer mich selbst
+ bReadingCommands = sal_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,9 -838,9 +784,9 @@@ void StatementCommand::WriteControlData
pBase = pBase->GetParent();
}
-- { // Klammerung, so daß der String nicht während der Rekursion bestehen bleibt
++ { // Klammerung, so da� der String nicht w�hrend der Rekursion bestehen bleibt
String aName;
- BOOL bSkip = FALSE;
+ sal_Bool bSkip = sal_False;
switch ( pBase->GetType() )
{
@@@ -1044,9 -1062,9 +1006,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() ), sal_False );
}
return; // ButtonDialog ist hier schon komplett abgehandelt.
@@@ -1217,18 -1236,19 +1179,18 @@@ public
void SetDisplayText( const String &aNewText ){ pEdit->SetText(aNewText); }
String GetDisplayText() const { return pEdit->GetText(); }
- BOOL IsDisplayTextModified() const { return pEdit->IsModified(); }
+ sal_Bool IsDisplayTextModified() const { return pEdit->IsModified(); }
void ClearDisplayTextModified() const { pEdit->ClearModifyFlag(); }
- void SetConfig( ULONG nConf );
- ULONG GetConfig();
+ void SetConfig( sal_uLong nConf );
+ sal_uLong GetConfig();
- BOOL IsConfigChanged() { return bConfigChanged; }
- void ConfigSent() { bConfigChanged = FALSE; }
+ sal_Bool IsConfigChanged() { return bConfigChanged; }
+ void ConfigSent() { bConfigChanged = sal_False; }
- BOOL IsSendData() { return GetItemState( TT_SEND_DATA ) == STATE_CHECK; }
+ sal_Bool IsSendData() { return GetItemState( TT_SEND_DATA ) == STATE_CHECK; }
-// sal_Bool IsAllWin() { return GetItemState( TT_ALLWIN ) == STATE_CHECK; }
- BOOL IsDraging() { return bIsDraging; }
+ sal_Bool IsDraging() { return bIsDraging; }
Window* LastMouseMoveWin() { return pLastMouseMoveWin; }
};
@@@ -1408,7 -1430,7 +1370,7 @@@ sal_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 -1543,23 +1482,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 -1575,7 +1509,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 );
@@@ -1699,14 -1737,16 +1662,14 @@@ IMPL_LINK( TranslateWin, DoSelect, Push
{
if ( bSelecting )
{
- bSelecting = FALSE;
-// ReleaseMouse();
+ bSelecting = sal_False;
}
else
{
if ( TestChangedDataSaved() )
{
PushButtonTT_PB_RESTORE.Disable();
- bSelecting = TRUE;
-// CaptureMouse();
+ bSelecting = sal_True;
}
}
return 0;
@@@ -1723,7 -1763,7 +1686,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
@@@ -1847,7 -1893,8 +1810,7 @@@ long TranslateWin::VCLEventHook( Notify
EditTT_E_COMMENT.Enable();
PushButtonTT_PB_ACCEPT.Enable();
}
- bSelecting = FALSE;
- // ReleaseMouse();
+ bSelecting = sal_False;
}
}
@@@ -2059,10 -2106,11 +2022,10 @@@ void StatementCommand::Translate(
if ( GetTTSettings()->bToTop )
{
GetTTSettings()->pTranslateWin->ToTop();
- GetTTSettings()->bToTop = FALSE;
+ GetTTSettings()->bToTop = sal_False;
}
- GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->EnableInput( TRUE, TRUE );
-// GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->Enable( sal_True, sal_True );
+ GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->EnableInput( sal_True, sal_True );
if ( GetTTSettings()->pTranslateWin->IsTranslationAvailable() )
{
@@@ -2076,8 -2124,8 +2039,8 @@@
if ( pTranslationWindow->GetType() == WINDOW_BORDERWINDOW && pTranslationWindow->GetWindow( WINDOW_CLIENT ) )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list