[Libreoffice-commits] .: Branch 'feature/calc-key-binding-compat' - 27 commits - accessibility/bridge accessibility/inc accessibility/source automation/inc automation/source basctl/inc basctl/source crashrep/source cui/inc cui/source embedserv/source extensions/inc extensions/source extensions/test extensions/util extensions/workben forms/inc forms/source lingucomponent/inc lingucomponent/source package/inc package/source setup_native/source UnoControls/source wizards/com xmlsecurity/inc xmlsecurity/source xmlsecurity/tools xmlsecurity/workben
Kohei Yoshida
kohei at kemper.freedesktop.org
Wed Oct 13 20:24:53 PDT 2010
UnoControls/source/base/basecontainercontrol.cxx | 3
UnoControls/source/base/basecontrol.cxx | 3
UnoControls/source/base/multiplexer.cxx | 3
UnoControls/source/base/registercontrols.cxx | 3
UnoControls/source/controls/OConnectionPointContainerHelper.cxx | 3
UnoControls/source/controls/OConnectionPointHelper.cxx | 3
UnoControls/source/controls/framecontrol.cxx | 3
UnoControls/source/controls/progressbar.cxx | 3
UnoControls/source/controls/progressmonitor.cxx | 3
UnoControls/source/controls/statusindicator.cxx | 3
accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx | 3
accessibility/inc/pch/precompiled_accessibility.cxx | 2
accessibility/source/extended/AccessibleBrowseBox.cxx | 3
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 3
accessibility/source/extended/AccessibleGridControl.cxx | 3
accessibility/source/extended/AccessibleGridControlBase.cxx | 2
accessibility/source/extended/AccessibleGridControlHeader.cxx | 2
accessibility/source/extended/AccessibleGridControlHeaderCell.cxx | 2
accessibility/source/extended/AccessibleGridControlTable.cxx | 2
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 2
accessibility/source/extended/AccessibleGridControlTableCell.cxx | 3
accessibility/source/extended/AccessibleToolPanelDeck.cxx | 3
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx | 3
accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx | 3
accessibility/source/extended/accessiblebrowseboxcell.cxx | 2
accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 3
accessibility/source/extended/accessibleiconchoicectrl.cxx | 2
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 2
accessibility/source/extended/accessiblelistbox.cxx | 2
accessibility/source/extended/accessiblelistboxentry.cxx | 2
accessibility/source/extended/accessibletabbar.cxx | 3
accessibility/source/extended/accessibletabbarbase.cxx | 2
accessibility/source/extended/accessibletabbarpage.cxx | 3
accessibility/source/extended/accessibletabbarpagelist.cxx | 3
accessibility/source/extended/accessibletablistbox.cxx | 2
accessibility/source/extended/accessibletablistboxtable.cxx | 2
accessibility/source/extended/listboxaccessible.cxx | 3
accessibility/source/extended/textwindowaccessibility.cxx | 2
accessibility/source/helper/acc_factory.cxx | 3
accessibility/source/helper/accresmgr.cxx | 3
accessibility/source/helper/characterattributeshelper.cxx | 3
accessibility/source/standard/accessiblemenubasecomponent.cxx | 3
accessibility/source/standard/accessiblemenucomponent.cxx | 3
accessibility/source/standard/accessiblemenuitemcomponent.cxx | 3
accessibility/source/standard/floatingwindowaccessible.cxx | 3
accessibility/source/standard/vclxaccessiblebox.cxx | 2
accessibility/source/standard/vclxaccessiblebutton.cxx | 3
accessibility/source/standard/vclxaccessiblecheckbox.cxx | 3
accessibility/source/standard/vclxaccessiblecombobox.cxx | 3
accessibility/source/standard/vclxaccessibledropdowncombobox.cxx | 3
accessibility/source/standard/vclxaccessibledropdownlistbox.cxx | 3
accessibility/source/standard/vclxaccessibleedit.cxx | 3
accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx | 2
accessibility/source/standard/vclxaccessiblefixedtext.cxx | 3
accessibility/source/standard/vclxaccessiblelist.cxx | 2
accessibility/source/standard/vclxaccessiblelistbox.cxx | 3
accessibility/source/standard/vclxaccessiblelistitem.cxx | 3
accessibility/source/standard/vclxaccessiblemenu.cxx | 3
accessibility/source/standard/vclxaccessiblemenubar.cxx | 3
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 3
accessibility/source/standard/vclxaccessiblemenuseparator.cxx | 3
accessibility/source/standard/vclxaccessiblepopupmenu.cxx | 3
accessibility/source/standard/vclxaccessibleradiobutton.cxx | 3
accessibility/source/standard/vclxaccessiblescrollbar.cxx | 3
accessibility/source/standard/vclxaccessiblestatusbar.cxx | 3
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 3
accessibility/source/standard/vclxaccessibletabcontrol.cxx | 3
accessibility/source/standard/vclxaccessibletabpage.cxx | 3
accessibility/source/standard/vclxaccessibletabpagewindow.cxx | 3
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 3
accessibility/source/standard/vclxaccessibletextfield.cxx | 3
accessibility/source/standard/vclxaccessibletoolbox.cxx | 3
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 2
automation/inc/pch/precompiled_automation.cxx | 2
automation/source/app/testbasi.cxx | 3
automation/source/communi/communi.cxx | 2
automation/source/miniapp/editwin.cxx | 2
automation/source/miniapp/servres.cxx | 2
automation/source/miniapp/testapp.cxx | 2
automation/source/server/XMLParser.cxx | 2
automation/source/server/cmdbasestream.cxx | 2
automation/source/server/editwin.cxx | 2
automation/source/server/prof_nul.cxx | 2
automation/source/server/prof_usl.cxx | 2
automation/source/server/profiler.cxx | 2
automation/source/server/recorder.cxx | 2
automation/source/server/retstrm.cxx | 2
automation/source/server/scmdstrm.cxx | 2
automation/source/server/server.cxx | 2
automation/source/server/sta_list.cxx | 2
automation/source/server/statemnt.cxx | 3
automation/source/server/svcommstream.cxx | 3
automation/source/simplecm/packethandler.cxx | 3
automation/source/simplecm/simplecm.cxx | 3
automation/source/simplecm/tcpio.cxx | 3
automation/source/testtool/cmdstrm.cxx | 2
automation/source/testtool/comm_bas.cxx | 2
automation/source/testtool/cretstrm.cxx | 2
automation/source/testtool/httprequest.cxx | 2
automation/source/testtool/objtest.cxx | 8
automation/source/testtool/registry_win.cxx | 2
automation/source/testtool/sysdir_win.cxx | 2
automation/source/testtool/tcommuni.cxx | 3
basctl/inc/pch/precompiled_basctl.cxx | 2
basctl/source/accessibility/accessibledialogcontrolshape.cxx | 2
basctl/source/accessibility/accessibledialogwindow.cxx | 3
basctl/source/basicide/basdoc.cxx | 2
basctl/source/basicide/basicbox.cxx | 2
basctl/source/basicide/basicrenderable.cxx | 2
basctl/source/basicide/baside2.cxx | 3
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/baside3.cxx | 22
basctl/source/basicide/basidectrlr.cxx | 3
basctl/source/basicide/basides1.cxx | 2
basctl/source/basicide/basides2.cxx | 2
basctl/source/basicide/basides3.cxx | 4
basctl/source/basicide/basidesh.cxx | 2
basctl/source/basicide/basobj2.cxx | 3
basctl/source/basicide/basobj3.cxx | 3
basctl/source/basicide/bastype2.cxx | 3
basctl/source/basicide/bastype3.cxx | 3
basctl/source/basicide/bastypes.cxx | 2
basctl/source/basicide/brkdlg.cxx | 2
basctl/source/basicide/doceventnotifier.cxx | 3
basctl/source/basicide/docsignature.cxx | 3
basctl/source/basicide/documentenumeration.cxx | 3
basctl/source/basicide/ide_pch.cxx | 2
basctl/source/basicide/iderdll.cxx | 2
basctl/source/basicide/localizationmgr.cxx | 2
basctl/source/basicide/macrodlg.cxx | 2
basctl/source/basicide/moduldl2.cxx | 2
basctl/source/basicide/moduldlg.cxx | 6
basctl/source/basicide/objdlg.cxx | 3
basctl/source/basicide/register.cxx | 2
basctl/source/basicide/scriptdocument.cxx | 13
basctl/source/basicide/tbxctl.cxx | 2
basctl/source/basicide/unomodel.cxx | 2
basctl/source/dlged/dlged.cxx | 12
basctl/source/dlged/dlgedclip.cxx | 2
basctl/source/dlged/dlgedfac.cxx | 2
basctl/source/dlged/dlgedfunc.cxx | 3
basctl/source/dlged/dlgedlist.cxx | 3
basctl/source/dlged/dlgedmod.cxx | 2
basctl/source/dlged/dlgedobj.cxx | 134 +--
basctl/source/dlged/dlgedpage.cxx | 3
basctl/source/dlged/dlgedview.cxx | 3
basctl/source/dlged/managelang.cxx | 2
basctl/source/dlged/propbrw.cxx | 3
basctl/source/inc/dlged.hxx | 5
crashrep/source/unx/main.cxx | 3
crashrep/source/win32/base64.cpp | 3
crashrep/source/win32/rcheader.txt | 22
crashrep/source/win32/soreport.cpp | 2
cui/inc/pch/precompiled_cui.cxx | 2
cui/source/customize/acccfg.cxx | 3
cui/source/customize/cfg.cxx | 7
cui/source/customize/cfgutil.cxx | 7
cui/source/customize/eventdlg.cxx | 2
cui/source/customize/macropg.cxx | 3
cui/source/customize/selector.cxx | 3
cui/source/dialogs/SpellAttrib.cxx | 2
cui/source/dialogs/SpellDialog.cxx | 3
cui/source/dialogs/commonlingui.cxx | 3
cui/source/dialogs/cuicharmap.cxx | 3
cui/source/dialogs/cuifmsearch.cxx | 2
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/dialogs/cuigrfflt.cxx | 3
cui/source/dialogs/cuihyperdlg.cxx | 3
cui/source/dialogs/cuiimapwnd.cxx | 3
cui/source/dialogs/cuitbxform.cxx | 3
cui/source/dialogs/dlgname.cxx | 2
cui/source/dialogs/hangulhanjadlg.cxx | 3
cui/source/dialogs/hldocntp.cxx | 2
cui/source/dialogs/hldoctp.cxx | 3
cui/source/dialogs/hlinettp.cxx | 3
cui/source/dialogs/hlmailtp.cxx | 2
cui/source/dialogs/hlmarkwn.cxx | 2
cui/source/dialogs/hltpbase.cxx | 3
cui/source/dialogs/hyphen.cxx | 2
cui/source/dialogs/iconcdlg.cxx | 3
cui/source/dialogs/insdlg.cxx | 2
cui/source/dialogs/insrc.cxx | 2
cui/source/dialogs/linkdlg.cxx | 2
cui/source/dialogs/multifil.cxx | 2
cui/source/dialogs/multipat.cxx | 2
cui/source/dialogs/newtabledlg.cxx | 3
cui/source/dialogs/passwdomdlg.cxx | 2
cui/source/dialogs/pastedlg.cxx | 2
cui/source/dialogs/plfilter.cxx | 2
cui/source/dialogs/postdlg.cxx | 2
cui/source/dialogs/scriptdlg.cxx | 3
cui/source/dialogs/sdrcelldlg.cxx | 3
cui/source/dialogs/showcols.cxx | 2
cui/source/dialogs/splitcelldlg.cxx | 3
cui/source/dialogs/srchxtra.cxx | 2
cui/source/dialogs/thesdlg.cxx | 2
cui/source/dialogs/winpluginlib.cpp | 3
cui/source/dialogs/zoom.cxx | 2
cui/source/factory/cuiexp.cxx | 3
cui/source/factory/cuiresmgr.cxx | 3
cui/source/factory/dlgfact.cxx | 2
cui/source/factory/init.cxx | 3
cui/source/inc/cuigaldlg.hxx | 6
cui/source/options/cfgchart.cxx | 3
cui/source/options/connpoolconfig.cxx | 2
cui/source/options/connpooloptions.cxx | 2
cui/source/options/connpoolsettings.cxx | 2
cui/source/options/cuisrchdlg.cxx | 3
cui/source/options/dbregister.cxx | 2
cui/source/options/dbregisterednamesconfig.cxx | 3
cui/source/options/dbregistersettings.cxx | 2
cui/source/options/doclinkdialog.cxx | 2
cui/source/options/fontsubs.cxx | 2
cui/source/options/internationaloptions.cxx | 2
cui/source/options/optHeaderTabListbox.cxx | 3
cui/source/options/optaccessibility.cxx | 3
cui/source/options/optasian.cxx | 3
cui/source/options/optchart.cxx | 2
cui/source/options/optcolor.cxx | 80 -
cui/source/options/optctl.cxx | 2
cui/source/options/optdict.cxx | 2
cui/source/options/optfltr.cxx | 15
cui/source/options/optfltr.hrc | 1
cui/source/options/optfltr.hxx | 2
cui/source/options/optfltr.src | 17
cui/source/options/optgdlg.cxx | 2
cui/source/options/optgenrl.cxx | 3
cui/source/options/opthtml.cxx | 2
cui/source/options/optimprove.cxx | 2
cui/source/options/optimprove.src | 10
cui/source/options/optimprove2.cxx | 2
cui/source/options/optinet2.cxx | 9
cui/source/options/optjava.cxx | 2
cui/source/options/optjsearch.cxx | 2
cui/source/options/optlingu.cxx | 4
cui/source/options/optmemory.cxx | 2
cui/source/options/optpath.cxx | 2
cui/source/options/optsave.cxx | 2
cui/source/options/optupdt.cxx | 2
cui/source/options/radiobtnbox.cxx | 2
cui/source/options/readonlyimage.cxx | 3
cui/source/options/sdbcdriverenum.cxx | 2
cui/source/options/securityoptions.cxx | 2
cui/source/options/treeopt.cxx | 4
cui/source/options/webconninfo.cxx | 2
cui/source/tabpages/align.cxx | 8
cui/source/tabpages/autocdlg.cxx | 2
cui/source/tabpages/backgrnd.cxx | 11
cui/source/tabpages/bbdlg.cxx | 2
cui/source/tabpages/border.cxx | 11
cui/source/tabpages/borderconn.cxx | 2
cui/source/tabpages/chardlg.cxx | 34
cui/source/tabpages/connect.cxx | 8
cui/source/tabpages/dstribut.cxx | 2
cui/source/tabpages/grfpage.cxx | 2
cui/source/tabpages/labdlg.cxx | 2
cui/source/tabpages/macroass.cxx | 2
cui/source/tabpages/measure.cxx | 8
cui/source/tabpages/numfmt.cxx | 11
cui/source/tabpages/numpages.cxx | 80 -
cui/source/tabpages/page.cxx | 11
cui/source/tabpages/paragrph.cxx | 75 -
cui/source/tabpages/swpossizetabpage.cxx | 2
cui/source/tabpages/tabarea.cxx | 3
cui/source/tabpages/tabline.cxx | 2
cui/source/tabpages/tabstpge.cxx | 12
cui/source/tabpages/textanim.cxx | 2
cui/source/tabpages/textattr.cxx | 36
cui/source/tabpages/tparea.cxx | 3
cui/source/tabpages/tpbitmap.cxx | 29
cui/source/tabpages/tpcolor.cxx | 2
cui/source/tabpages/tpgradnt.cxx | 24
cui/source/tabpages/tphatch.cxx | 24
cui/source/tabpages/tpline.cxx | 7
cui/source/tabpages/tplnedef.cxx | 24
cui/source/tabpages/tplneend.cxx | 12
cui/source/tabpages/tpshadow.cxx | 19
cui/source/tabpages/transfrm.cxx | 3
embedserv/source/embed/docholder.cxx | 3
embedserv/source/embed/ed_idataobj.cxx | 3
embedserv/source/embed/ed_iinplace.cxx | 3
embedserv/source/embed/ed_ioleobject.cxx | 2
embedserv/source/embed/ed_ipersiststr.cxx | 2
embedserv/source/embed/esdll.cxx | 2
embedserv/source/embed/guid.cxx | 3
embedserv/source/embed/iipaobj.cxx | 3
embedserv/source/embed/intercept.cxx | 3
embedserv/source/embed/register.cxx | 2
embedserv/source/embed/servprov.cxx | 3
embedserv/source/embed/stdafx.cpp | 2
embedserv/source/embed/syswinwrapper.cxx | 3
embedserv/source/embed/tracker.cxx | 3
embedserv/source/embed/xwin.cxx | 3
embedserv/source/inprocserv/advisesink.cxx | 2
embedserv/source/inprocserv/dllentry.cxx | 2
embedserv/source/inprocserv/inprocembobj.cxx | 2
extensions/inc/pch/precompiled_extensions.cxx | 2
extensions/inc/propctrlr.hrc | 3
extensions/source/abpilot/abpfinalpage.cxx | 2
extensions/source/abpilot/abpservices.cxx | 2
extensions/source/abpilot/abspage.cxx | 2
extensions/source/abpilot/abspilot.cxx | 9
extensions/source/abpilot/admininvokationimpl.cxx | 2
extensions/source/abpilot/admininvokationpage.cxx | 2
extensions/source/abpilot/datasourcehandling.cxx | 2
extensions/source/abpilot/fieldmappingimpl.cxx | 2
extensions/source/abpilot/fieldmappingpage.cxx | 2
extensions/source/abpilot/moduleabp.cxx | 2
extensions/source/abpilot/tableselectionpage.cxx | 2
extensions/source/abpilot/typeselectionpage.cxx | 2
extensions/source/abpilot/unodialogabp.cxx | 2
extensions/source/activex/main/SOActionsApproval.cpp | 2
extensions/source/activex/main/SOActiveX.cpp | 2
extensions/source/activex/main/SOComWindowPeer.cpp | 2
extensions/source/activex/main/SODispatchInterceptor.cpp | 2
extensions/source/activex/main/StdAfx2.cpp | 3
extensions/source/activex/main/so_activex.cpp | 2
extensions/source/bibliography/bibbeam.cxx | 3
extensions/source/bibliography/bibconfig.cxx | 2
extensions/source/bibliography/bibcont.cxx | 3
extensions/source/bibliography/bibload.cxx | 2
extensions/source/bibliography/bibmod.cxx | 3
extensions/source/bibliography/bibview.cxx | 3
extensions/source/bibliography/datman.cxx | 3
extensions/source/bibliography/formcontrolcontainer.cxx | 2
extensions/source/bibliography/framectr.cxx | 2
extensions/source/bibliography/general.cxx | 3
extensions/source/bibliography/loadlisteneradapter.cxx | 2
extensions/source/bibliography/toolbar.cxx | 3
extensions/source/config/ldap/componentdef.cxx | 3
extensions/source/config/ldap/ldapaccess.cxx | 2
extensions/source/config/ldap/ldapuserprofilebe.cxx | 2
extensions/source/dbpilots/commonpagesdbp.cxx | 2
extensions/source/dbpilots/controlwizard.cxx | 2
extensions/source/dbpilots/dbpservices.cxx | 2
extensions/source/dbpilots/dbptools.cxx | 2
extensions/source/dbpilots/gridwizard.cxx | 2
extensions/source/dbpilots/groupboxwiz.cxx | 2
extensions/source/dbpilots/listcombowizard.cxx | 2
extensions/source/dbpilots/moduledbp.cxx | 2
extensions/source/dbpilots/optiongrouplayouter.cxx | 2
extensions/source/dbpilots/wizardservices.cxx | 2
extensions/source/inc/componentmodule.cxx | 2
extensions/source/logging/consolehandler.cxx | 3
extensions/source/logging/csvformatter.cxx | 3
extensions/source/logging/filehandler.cxx | 3
extensions/source/logging/log_module.cxx | 2
extensions/source/logging/log_services.cxx | 2
extensions/source/logging/logger.cxx | 2
extensions/source/logging/loggerconfig.cxx | 3
extensions/source/logging/loghandler.cxx | 2
extensions/source/logging/logrecord.cxx | 2
extensions/source/logging/plaintextformatter.cxx | 3
extensions/source/nsplugin/source/npshell.cxx | 7
extensions/source/nsplugin/source/nsp_windows.cxx | 3
extensions/source/nsplugin/source/so_closelistener.cxx | 2
extensions/source/nsplugin/source/so_env.cxx | 2
extensions/source/nsplugin/source/so_instance.cxx | 3
extensions/source/nsplugin/source/so_main.cxx | 3
extensions/source/ole/jscriptclasses.cxx | 3
extensions/source/ole/ole2uno.cxx | 3
extensions/source/ole/oledll.cxx | 2
extensions/source/ole/oleobjw.cxx | 417 ++++++----
extensions/source/ole/oleobjw.hxx | 15
extensions/source/ole/olethread.cxx | 18
extensions/source/ole/servprov.cxx | 3
extensions/source/ole/servreg.cxx | 3
extensions/source/ole/unoobjw.cxx | 3
extensions/source/ole/unotypewrapper.cxx | 2
extensions/source/ole/windata.cxx | 2
extensions/source/oooimprovecore/core.cxx | 3
extensions/source/oooimprovecore/oooimprovecore_module.cxx | 2
extensions/source/oooimprovecore/oooimprovecore_services.cxx | 3
extensions/source/oooimprovement/config.cxx | 3
extensions/source/oooimprovement/corecontroller.cxx | 3
extensions/source/oooimprovement/errormail.cxx | 3
extensions/source/oooimprovement/invite_job.cxx | 3
extensions/source/oooimprovement/logpacker.cxx | 3
extensions/source/oooimprovement/logstorage.cxx | 3
extensions/source/oooimprovement/myconfigurationhelper.cxx | 3
extensions/source/oooimprovement/onlogrotate_job.cxx | 3
extensions/source/oooimprovement/oooimprovement_exports.cxx | 3
extensions/source/oooimprovement/soaprequest.cxx | 3
extensions/source/oooimprovement/soapsender.cxx | 3
extensions/source/plugin/aqua/macmgr.cxx | 2
extensions/source/plugin/aqua/sysplug.cxx | 2
extensions/source/plugin/base/context.cxx | 9
extensions/source/plugin/base/evtlstnr.cxx | 9
extensions/source/plugin/base/manager.cxx | 8
extensions/source/plugin/base/multiplx.cxx | 3
extensions/source/plugin/base/nfuncs.cxx | 9
extensions/source/plugin/base/plcom.cxx | 8
extensions/source/plugin/base/plctrl.cxx | 2
extensions/source/plugin/base/plmodel.cxx | 3
extensions/source/plugin/base/service.cxx | 9
extensions/source/plugin/base/xplugin.cxx | 7
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 6
extensions/source/plugin/unx/makefile.mk | 2
extensions/source/plugin/unx/mediator.cxx | 3
extensions/source/plugin/unx/npnapi.cxx | 9
extensions/source/plugin/unx/nppapi.cxx | 9
extensions/source/plugin/unx/npwrap.cxx | 7
extensions/source/plugin/unx/plugcon.cxx | 10
extensions/source/plugin/unx/sysplug.cxx | 10
extensions/source/plugin/unx/unxmgr.cxx | 10
extensions/source/plugin/win/sysplug.cxx | 3
extensions/source/plugin/win/winmgr.cxx | 2
extensions/source/preload/modulepreload.cxx | 2
extensions/source/preload/oemwiz.cxx | 2
extensions/source/preload/preloadservices.cxx | 2
extensions/source/preload/services.cxx | 2
extensions/source/propctrlr/MasterDetailLinkDialog.cxx | 3
extensions/source/propctrlr/browserline.cxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 2
extensions/source/propctrlr/browserpage.cxx | 2
extensions/source/propctrlr/browserview.cxx | 2
extensions/source/propctrlr/buttonnavigationhandler.cxx | 2
extensions/source/propctrlr/cellbindinghandler.cxx | 3
extensions/source/propctrlr/cellbindinghelper.cxx | 3
extensions/source/propctrlr/commoncontrol.cxx | 2
extensions/source/propctrlr/composeduiupdate.cxx | 2
extensions/source/propctrlr/controlfontdialog.cxx | 2
extensions/source/propctrlr/defaultforminspection.cxx | 4
extensions/source/propctrlr/defaulthelpprovider.cxx | 3
extensions/source/propctrlr/editpropertyhandler.cxx | 2
extensions/source/propctrlr/eformshelper.cxx | 2
extensions/source/propctrlr/eformspropertyhandler.cxx | 2
extensions/source/propctrlr/eventhandler.cxx | 2
extensions/source/propctrlr/fontdialog.cxx | 2
extensions/source/propctrlr/formbrowsertools.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/propctrlr/formcontroller.cxx | 3
extensions/source/propctrlr/formgeometryhandler.cxx | 3
extensions/source/propctrlr/formlinkdialog.cxx | 3
extensions/source/propctrlr/formmetadata.cxx | 3
extensions/source/propctrlr/formmetadata.hxx | 1
extensions/source/propctrlr/formres.src | 4
extensions/source/propctrlr/formresid.hrc | 1
extensions/source/propctrlr/formstrings.cxx | 2
extensions/source/propctrlr/formstrings.hxx | 1
extensions/source/propctrlr/genericpropertyhandler.cxx | 2
extensions/source/propctrlr/handlerhelper.cxx | 3
extensions/source/propctrlr/inspectorhelpwindow.cxx | 2
extensions/source/propctrlr/inspectormodelbase.cxx | 3
extensions/source/propctrlr/listselectiondlg.cxx | 3
extensions/source/propctrlr/modulepcr.cxx | 3
extensions/source/propctrlr/newdatatype.cxx | 2
extensions/source/propctrlr/objectinspectormodel.cxx | 3
extensions/source/propctrlr/pcrcommon.cxx | 2
extensions/source/propctrlr/pcrcomponentcontext.cxx | 2
extensions/source/propctrlr/pcrservices.cxx | 2
extensions/source/propctrlr/pcrstrings.cxx | 2
extensions/source/propctrlr/pcrunodialogs.cxx | 2
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/propctrlr/propertycomposer.cxx | 2
extensions/source/propctrlr/propertycontrolextender.cxx | 3
extensions/source/propctrlr/propertyeditor.cxx | 2
extensions/source/propctrlr/propertyhandler.cxx | 2
extensions/source/propctrlr/propeventtranslation.cxx | 2
extensions/source/propctrlr/pushbuttonnavigation.cxx | 3
extensions/source/propctrlr/selectlabeldialog.cxx | 2
extensions/source/propctrlr/sqlcommanddesign.cxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 2
extensions/source/propctrlr/stringrepresentation.cxx | 2
extensions/source/propctrlr/submissionhandler.cxx | 2
extensions/source/propctrlr/taborder.cxx | 3
extensions/source/propctrlr/unourl.cxx | 2
extensions/source/propctrlr/usercontrol.cxx | 2
extensions/source/propctrlr/xsddatatypes.cxx | 2
extensions/source/propctrlr/xsdvalidationhelper.cxx | 2
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 2
extensions/source/resource/oooresourceloader.cxx | 3
extensions/source/resource/res_services.cxx | 3
extensions/source/resource/resource.cxx | 2
extensions/source/scanner/grid.cxx | 3
extensions/source/scanner/sane.cxx | 3
extensions/source/scanner/sanedlg.cxx | 3
extensions/source/scanner/scanner.cxx | 3
extensions/source/scanner/scanunx.cxx | 3
extensions/source/scanner/scanwin.cxx | 3
extensions/source/scanner/scnserv.cxx | 3
extensions/source/scanner/twain.cxx | 3
extensions/source/svg/svgaction.cxx | 3
extensions/source/svg/svgprinter.cxx | 3
extensions/source/svg/svguno.cxx | 3
extensions/source/svg/svgwriter.cxx | 3
extensions/source/unoactivex/main/initwindowpeer.cxx | 2
extensions/source/update/check/download.cxx | 3
extensions/source/update/check/updatecheck.cxx | 3
extensions/source/update/check/updatecheckconfig.cxx | 2
extensions/source/update/check/updatecheckjob.cxx | 3
extensions/source/update/check/updatehdl.cxx | 3
extensions/source/update/check/updateprotocol.cxx | 3
extensions/source/update/check/updateprotocoltest.cxx | 3
extensions/source/update/feed/test/updatefeedtest.cxx | 3
extensions/source/update/feed/updatefeed.cxx | 2
extensions/source/update/tools/ztool.cxx | 3
extensions/source/update/ui/updatecheckui.cxx | 2
extensions/source/xmlextract/xmxtrct.cxx | 3
extensions/source/xmlextract/xmxuno.cxx | 3
extensions/test/ole/AxTestComponents/AxTestComponents.cpp | 3
extensions/test/ole/AxTestComponents/Basic.cpp | 3
extensions/test/ole/AxTestComponents/Foo.cpp | 3
extensions/test/ole/AxTestComponents/StdAfx.cpp | 3
extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp | 2
extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp | 2
extensions/test/ole/EventListenerSample/EventListener/StdAfx.cpp | 3
extensions/test/ole/MfcControl/MfcControl.cpp | 3
extensions/test/ole/MfcControl/MfcControlCtl.cpp | 3
extensions/test/ole/MfcControl/MfcControlPpg.cpp | 3
extensions/test/ole/MfcControl/StdAfx.cpp | 3
extensions/test/ole/OleClient/axhost.cxx | 2
extensions/test/ole/OleClient/clientTest.cxx | 2
extensions/test/ole/OleClient/funcs.cxx | 3
extensions/test/ole/OleConverterVar1/convTest.cxx | 2
extensions/test/ole/cpnt/cpnt.cxx | 3
extensions/test/ole/cppToUno/testcppuno.cxx | 3
extensions/test/ole/cpptest/cpptest.cxx | 3
extensions/test/ole/unloading/unloadTest.cxx | 3
extensions/test/ole/unoTocomCalls/Test/StdAfx.cpp | 2
extensions/test/ole/unoTocomCalls/Test/Test.cpp | 3
extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp | 2
extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp | 2
extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.cpp | 2
extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp | 2
extensions/test/sax/testsax.cxx | 2
extensions/test/sax/testwriter.cxx | 3
extensions/test/stm/datatest.cxx | 2
extensions/test/stm/marktest.cxx | 3
extensions/test/stm/pipetest.cxx | 3
extensions/test/stm/testfactreg.cxx | 2
extensions/util/hidother.src | 1
extensions/workben/pythonautotest.cxx | 2
extensions/workben/pythontest.cxx | 2
extensions/workben/testcomponent.cxx | 3
extensions/workben/testframecontrol.cxx | 3
extensions/workben/testpgp.cxx | 2
extensions/workben/testresource.cxx | 2
forms/inc/pch/precompiled_forms.cxx | 2
forms/source/component/Button.cxx | 2
forms/source/component/CheckBox.cxx | 2
forms/source/component/Columns.cxx | 2
forms/source/component/ComboBox.cxx | 2
forms/source/component/Currency.cxx | 2
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/Date.cxx | 2
forms/source/component/Edit.cxx | 2
forms/source/component/EditBase.cxx | 2
forms/source/component/EventThread.cxx | 2
forms/source/component/File.cxx | 2
forms/source/component/Filter.cxx | 3
forms/source/component/FixedText.cxx | 2
forms/source/component/FormComponent.cxx | 6
forms/source/component/FormattedField.cxx | 3
forms/source/component/FormattedFieldWrapper.cxx | 2
forms/source/component/FormsCollection.cxx | 2
forms/source/component/Grid.cxx | 2
forms/source/component/GroupBox.cxx | 2
forms/source/component/GroupManager.cxx | 52 +
forms/source/component/GroupManager.hxx | 2
forms/source/component/Hidden.cxx | 2
forms/source/component/ImageButton.cxx | 2
forms/source/component/ImageControl.cxx | 2
forms/source/component/ListBox.cxx | 6
forms/source/component/Numeric.cxx | 2
forms/source/component/Pattern.cxx | 2
forms/source/component/RadioButton.cxx | 107 +-
forms/source/component/RadioButton.hxx | 2
forms/source/component/Time.cxx | 2
forms/source/component/cachedrowset.cxx | 3
forms/source/component/clickableimage.cxx | 2
forms/source/component/cloneable.cxx | 2
forms/source/component/entrylisthelper.cxx | 3
forms/source/component/errorbroadcaster.cxx | 2
forms/source/component/findpos.cxx | 3
forms/source/component/formcontrolfont.cxx | 3
forms/source/component/imgprod.cxx | 3
forms/source/component/navigationbar.cxx | 3
forms/source/component/propertybaghelper.cxx | 2
forms/source/component/refvaluecomponent.cxx | 2
forms/source/component/scrollbar.cxx | 3
forms/source/component/spinbutton.cxx | 3
forms/source/helper/commanddescriptionprovider.cxx | 3
forms/source/helper/commandimageprovider.cxx | 3
forms/source/helper/controlfeatureinterception.cxx | 2
forms/source/helper/formnavigation.cxx | 3
forms/source/helper/resettable.cxx | 3
forms/source/helper/urltransformer.cxx | 3
forms/source/helper/windowstateguard.cxx | 2
forms/source/inc/frm_strings.hxx | 1
forms/source/inc/property.hrc | 3
forms/source/misc/InterfaceContainer.cxx | 11
forms/source/misc/componenttools.cxx | 2
forms/source/misc/frm_module.cxx | 2
forms/source/misc/frm_strings.cxx | 2
forms/source/misc/ids.cxx | 2
forms/source/misc/limitedformats.cxx | 2
forms/source/misc/listenercontainers.cxx | 2
forms/source/misc/property.cxx | 2
forms/source/misc/services.cxx | 3
forms/source/resource/frm_resource.cxx | 2
forms/source/richtext/attributedispatcher.cxx | 3
forms/source/richtext/clipboarddispatcher.cxx | 2
forms/source/richtext/featuredispatcher.cxx | 3
forms/source/richtext/parametrizedattributedispatcher.cxx | 3
forms/source/richtext/richtextcontrol.cxx | 2
forms/source/richtext/richtextengine.cxx | 2
forms/source/richtext/richtextimplcontrol.cxx | 2
forms/source/richtext/richtextmodel.cxx | 3
forms/source/richtext/richtextunowrapper.cxx | 2
forms/source/richtext/richtextvclcontrol.cxx | 2
forms/source/richtext/richtextviewport.cxx | 3
forms/source/richtext/rtattributehandler.cxx | 3
forms/source/richtext/specialdispatchers.cxx | 2
forms/source/runtime/formoperations.cxx | 3
forms/source/solar/component/navbarcontrol.cxx | 3
forms/source/solar/control/navtoolbar.cxx | 3
forms/source/xforms/binding.cxx | 3
forms/source/xforms/boolexpression.cxx | 2
forms/source/xforms/computedexpression.cxx | 3
forms/source/xforms/convert.cxx | 3
forms/source/xforms/datatyperepository.cxx | 2
forms/source/xforms/datatypes.cxx | 2
forms/source/xforms/enumeration.cxx | 3
forms/source/xforms/mip.cxx | 3
forms/source/xforms/model.cxx | 3
forms/source/xforms/model_ui.cxx | 3
forms/source/xforms/pathexpression.cxx | 3
forms/source/xforms/propertysetbase.cxx | 3
forms/source/xforms/resourcehelper.cxx | 3
forms/source/xforms/submission.cxx | 2
forms/source/xforms/submission/replace.cxx | 2
forms/source/xforms/submission/serialization_app_xml.cxx | 3
forms/source/xforms/submission/serialization_urlencoded.cxx | 2
forms/source/xforms/submission/submission_get.cxx | 2
forms/source/xforms/submission/submission_post.cxx | 2
forms/source/xforms/submission/submission_put.cxx | 2
forms/source/xforms/unohelper.cxx | 3
forms/source/xforms/xforms_services.cxx | 3
forms/source/xforms/xformsevent.cxx | 3
forms/source/xforms/xmlhelper.cxx | 2
forms/source/xforms/xpathlib/extension.cxx | 3
forms/source/xforms/xpathlib/xpathlib.cxx | 3
lingucomponent/inc/pch/precompiled_lingucomponent.cxx | 2
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx | 2
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 3
lingucomponent/source/languageguessing/altstrfunc.cxx | 2
lingucomponent/source/languageguessing/guess.cxx | 3
lingucomponent/source/languageguessing/guesslang.cxx | 2
lingucomponent/source/languageguessing/simpleguesser.cxx | 3
lingucomponent/source/lingutil/lingutil.cxx | 2
lingucomponent/source/spellcheck/macosxspell/macreg.cxx | 2
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 3
lingucomponent/source/spellcheck/spell/sreg.cxx | 2
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 6
lingucomponent/source/thesaurus/libnth/nthesdta.cxx | 2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 3
lingucomponent/source/thesaurus/libnth/ntreg.cxx | 2
package/inc/pch/precompiled_package.cxx | 2
package/source/manifest/Base64Codec.cxx | 3
package/source/manifest/ManifestExport.cxx | 3
package/source/manifest/ManifestImport.cxx | 2
package/source/manifest/ManifestReader.cxx | 3
package/source/manifest/ManifestWriter.cxx | 3
package/source/manifest/UnoRegister.cxx | 2
package/source/xstor/disposelistener.cxx | 2
package/source/xstor/ocompinstream.cxx | 2
package/source/xstor/ohierarchyholder.cxx | 2
package/source/xstor/oseekinstream.cxx | 2
package/source/xstor/owriteablestream.cxx | 2
package/source/xstor/register.cxx | 2
package/source/xstor/selfterminatefilestream.cxx | 2
package/source/xstor/switchpersistencestream.cxx | 2
package/source/xstor/xfactory.cxx | 2
package/source/xstor/xstorage.cxx | 2
package/source/zipapi/ByteChucker.cxx | 3
package/source/zipapi/ByteGrabber.cxx | 3
package/source/zipapi/CRC32.cxx | 3
package/source/zipapi/Deflater.cxx | 3
package/source/zipapi/EntryInputStream.cxx | 3
package/source/zipapi/Inflater.cxx | 2
package/source/zipapi/XFileStream.cxx | 3
package/source/zipapi/XMemoryStream.cxx | 3
package/source/zipapi/XUnbufferedStream.cxx | 3
package/source/zipapi/ZipEnumeration.cxx | 3
package/source/zipapi/ZipFile.cxx | 2
package/source/zipapi/ZipOutputStream.cxx | 2
package/source/zippackage/ZipPackage.cxx | 3
package/source/zippackage/ZipPackageBuffer.cxx | 3
package/source/zippackage/ZipPackageEntry.cxx | 3
package/source/zippackage/ZipPackageFolder.cxx | 3
package/source/zippackage/ZipPackageFolderEnumeration.cxx | 3
package/source/zippackage/ZipPackageSink.cxx | 3
package/source/zippackage/ZipPackageStream.cxx | 2
package/source/zippackage/wrapstreamforshare.cxx | 2
package/source/zippackage/zipfileaccess.cxx | 2
setup_native/source/ulfconv/ulfconv.cxx | 3
setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx | 2
setup_native/source/win32/customactions/javafilter/jfregca.cxx | 3
setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx | 2
setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx | 2
setup_native/source/win32/customactions/languagepacks/respintest.cxx | 3
setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 3
setup_native/source/win32/customactions/quickstarter/quickstarter.cxx | 2
setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx | 3
setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx | 2
setup_native/source/win32/customactions/rebase/rebase.cxx | 3
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx | 3
setup_native/source/win32/customactions/reg4msdoc/msihelper.cxx | 3
setup_native/source/win32/customactions/reg4msdoc/reg4msdocmsi.cxx | 3
setup_native/source/win32/customactions/reg4msdoc/register.cxx | 2
setup_native/source/win32/customactions/reg4msdoc/registrar.cxx | 3
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx | 2
setup_native/source/win32/customactions/reg4msdoc/registry.cxx | 3
setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx | 3
setup_native/source/win32/customactions/reg4msdoc/registryvalueimpl.cxx | 3
setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx | 2
setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx | 2
setup_native/source/win32/customactions/reg4msdoc/stringconverter.cxx | 2
setup_native/source/win32/customactions/reg4msdoc/userregistrar.cxx | 3
setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx | 3
setup_native/source/win32/customactions/reg64/reg64.cxx | 3
setup_native/source/win32/customactions/regactivex/regactivex.cxx | 3
setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx | 2
setup_native/source/win32/customactions/relnotes/relnotes.cxx | 2
setup_native/source/win32/customactions/sellang/sellang.cxx | 3
setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx | 3
setup_native/source/win32/customactions/shellextensions/checkpatches.cxx | 3
setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx | 2
setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx | 3
setup_native/source/win32/customactions/shellextensions/copyeditiondata.cxx | 3
setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx | 3
setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx | 3
setup_native/source/win32/customactions/shellextensions/iconcache.cxx | 3
setup_native/source/win32/customactions/shellextensions/layerlinks.cxx | 3
setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx | 3
setup_native/source/win32/customactions/shellextensions/postuninstall.cxx | 2
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx | 3
setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx | 3
setup_native/source/win32/customactions/shellextensions/shellextensions.cxx | 3
setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx | 3
setup_native/source/win32/customactions/shellextensions/upgrade.cxx | 3
setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx | 3
setup_native/source/win32/customactions/tools/checkversion.cxx | 2
setup_native/source/win32/customactions/tools/seterror.cxx | 2
setup_native/source/win32/stwrapper/resource.rc | 25
setup_native/source/win32/stwrapper/stwrapper.cxx | 3
wizards/com/sun/star/wizards/db/DBMetaData.java | 32
wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java | 3
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 82 +
wizards/com/sun/star/wizards/query/QueryWizard.java | 256 +++---
wizards/com/sun/star/wizards/ui/FilterComponent.java | 216 -----
xmlsecurity/inc/pch/precompiled_xmlsecurity.cxx | 2
xmlsecurity/source/component/certificatecontainer.cxx | 2
xmlsecurity/source/component/documentdigitalsignatures.cxx | 2
xmlsecurity/source/component/registerservices.cxx | 2
xmlsecurity/source/dialogs/certificatechooser.cxx | 2
xmlsecurity/source/dialogs/certificateviewer.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
xmlsecurity/source/dialogs/resourcemanager.cxx | 2
xmlsecurity/source/dialogs/stbcontrl.cxx | 2
xmlsecurity/source/dialogs/warnings.cxx | 2
xmlsecurity/source/framework/buffernode.cxx | 3
xmlsecurity/source/framework/decryptorimpl.cxx | 2
xmlsecurity/source/framework/elementcollector.cxx | 2
xmlsecurity/source/framework/elementmark.cxx | 2
xmlsecurity/source/framework/encryptionengine.cxx | 2
xmlsecurity/source/framework/encryptorimpl.cxx | 2
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 2
xmlsecurity/source/framework/securityengine.cxx | 2
xmlsecurity/source/framework/signaturecreatorimpl.cxx | 2
xmlsecurity/source/framework/signatureengine.cxx | 3
xmlsecurity/source/framework/signatureverifierimpl.cxx | 2
xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx | 2
xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx | 2
xmlsecurity/source/framework/xsec_framework.cxx | 2
xmlsecurity/source/helper/documentsignaturehelper.cxx | 3
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 3
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 2
xmlsecurity/source/helper/xsecctl.cxx | 3
xmlsecurity/source/helper/xsecparser.cxx | 3
xmlsecurity/source/helper/xsecsign.cxx | 2
xmlsecurity/source/helper/xsecverify.cxx | 2
xmlsecurity/source/xmlsec/biginteger.cxx | 2
xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx | 2
xmlsecurity/source/xmlsec/certvalidity.cxx | 2
xmlsecurity/source/xmlsec/diagnose.cxx | 3
xmlsecurity/source/xmlsec/errorcallback.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 3
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx | 3
xmlsecurity/source/xmlsec/nss/secerror.cxx | 3
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 3
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 3
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/xsec_nss.cxx | 2
xmlsecurity/source/xmlsec/saxhelper.cxx | 2
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 2
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 2
xmlsecurity/source/xmlsec/xmlstreamio.cxx | 2
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 2
xmlsecurity/tools/demo/mozprofile.cxx | 2
xmlsecurity/tools/demo/multisigdemo.cxx | 3
xmlsecurity/tools/demo/performance.cxx | 3
xmlsecurity/tools/demo/signdemo.cxx | 2
xmlsecurity/tools/demo/util.cxx | 3
xmlsecurity/tools/demo/util2.cxx | 3
xmlsecurity/tools/demo/verifydemo.cxx | 2
xmlsecurity/tools/standalone/csfit/certmngr.cxx | 2
xmlsecurity/tools/standalone/csfit/decrypter.cxx | 2
xmlsecurity/tools/standalone/csfit/encrypter.cxx | 2
xmlsecurity/tools/standalone/csfit/helper.cxx | 2
xmlsecurity/tools/standalone/csfit/signer.cxx | 2
xmlsecurity/tools/standalone/csfit/verifier.cxx | 2
xmlsecurity/tools/standalone/mscsfit/certmngr.cxx | 2
xmlsecurity/tools/standalone/mscsfit/decrypter.cxx | 2
xmlsecurity/tools/standalone/mscsfit/encrypter.cxx | 2
xmlsecurity/tools/standalone/mscsfit/helper.cxx | 2
xmlsecurity/tools/standalone/mscsfit/signer.cxx | 2
xmlsecurity/tools/standalone/mscsfit/verifier.cxx | 2
xmlsecurity/workben/signaturetest.cxx | 3
835 files changed, 3082 insertions(+), 1005 deletions(-)
New commits:
commit 07d03e0a830bc3aba604d508d38ac7d7674fb299
Merge: 2f7fec2... 45e3569...
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Oct 13 23:23:35 2010 -0400
Merge branch 'feature/calc-key-binding-compat' of ssh://git.freedesktop.org/git/libreoffice/components into feature/calc-key-binding-compat
commit 2f7fec2ae1631f4defe284f801bd18d8a6555700
Merge: d83d9d8... 8e83621...
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Oct 13 23:21:44 2010 -0400
Merge branch 'master' into feature/calc-key-binding-compat
commit 8e83621a3e9c13dedec0dab87dfa424cc5e15de3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 13:20:35 2010 +0100
fix AIX build
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index d92a06f..d19b7b6 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -79,7 +79,7 @@
//https://bugzilla.mozilla.org/show_bug.cgi?id=241262
#ifdef UNIX
# ifndef _UINT32
-# if defined(__alpha) || defined(__LP64__)
+# if defined(__alpha) || defined(__LP64__) || defined(AIX)
typedef unsigned int uint32;
# else /* __alpha */
typedef unsigned long uint32;
@@ -87,7 +87,7 @@
# define _UINT32
# endif
# ifndef _INT32
-# if defined(__alpha) || defined(__LP64__)
+# if defined(__alpha) || defined(__LP64__) || defined(AIX)
typedef int int32;
# else /* __alpha */
typedef long int32;
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index f75c54d..bf23f9c 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -29,6 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
#if STLPORT_VERSION>=321
#include <cstdarg>
#include <cstdio>
diff --git a/extensions/source/plugin/base/evtlstnr.cxx b/extensions/source/plugin/base/evtlstnr.cxx
index f420429..ffbf3c2 100644
--- a/extensions/source/plugin/base/evtlstnr.cxx
+++ b/extensions/source/plugin/base/evtlstnr.cxx
@@ -29,6 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
#if STLPORT_VERSION>=321
#include <cstdarg>
#endif
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index 4a2f24a..4e19324 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -29,6 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
#if STLPORT_VERSION>=321
#include <cstdarg>
#endif
diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index 55ccaa1..cbfc05e 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -29,6 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
#if STLPORT_VERSION>=321
#include <cstdarg>
#endif
diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx
index 0051c3c..a77145c 100644
--- a/extensions/source/plugin/base/plcom.cxx
+++ b/extensions/source/plugin/base/plcom.cxx
@@ -29,6 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
#ifdef SOLARIS
#include <limits>
#endif
diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx
index 2916160..0b5d832 100644
--- a/extensions/source/plugin/base/service.cxx
+++ b/extensions/source/plugin/base/service.cxx
@@ -29,6 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
#if STLPORT_VERSION>=321
#include <cstdarg>
#endif
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 91bf9a3..c9f355a 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -28,6 +28,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/loader/XImplementationLoader.hpp>
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index c347fed..3438dba 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -35,7 +35,7 @@
#include <plugin/unx/mediator.hxx>
#if defined SOLARIS
-#define USE_MOTIF
+# define USE_MOTIF
#endif
#define Window XLIB_Window
@@ -80,7 +80,7 @@ extern "C" {
//https://bugzilla.mozilla.org/show_bug.cgi?id=241262
#ifdef UNIX
# ifndef _UINT32
-# if defined(__alpha) || defined(__LP64__)
+# if defined(__alpha) || defined(__LP64__) || defined(AIX)
typedef unsigned int uint32;
# else /* __alpha */
typedef unsigned long uint32;
@@ -88,7 +88,7 @@ extern "C" {
# define _UINT32
# endif
# ifndef _INT32
-# if defined(__alpha) || defined(__LP64__)
+# if defined(__alpha) || defined(__LP64__) || defined(AIX)
typedef int int32;
# else /* __alpha */
typedef long int32;
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
index 669aaa5..b88acc9 100644
--- a/extensions/source/plugin/unx/makefile.mk
+++ b/extensions/source/plugin/unx/makefile.mk
@@ -80,6 +80,8 @@ APP1STDLIBS+=-lXaw
.ENDIF
.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
APP1STDLIBS+= -lXt -lXext -lX11
+.ELIF "$(OS)"=="AIX"
+APP1STDLIBS+= -lXpm -lXmu -lXt $(X11LINK_DYNAMIC) -ldl
.ELSE
APP1STDLIBS+= -lXt $(X11LINK_DYNAMIC) -ldl
.ENDIF
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index a5b6052..f1f58fc 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -28,6 +28,13 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
#include <plugin/unx/plugcon.hxx>
#include <unistd.h>
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index 06d9da5..f263238 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -29,6 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
#if STLPORT_VERSION>=321
#include <cstdarg>
#endif
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 3ce90f5..d26983c 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -28,6 +28,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
#include <errno.h>
#include <dlfcn.h>
#include <unistd.h>
diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx
index 0a66b55..512a7db 100644
--- a/extensions/source/plugin/unx/plugcon.cxx
+++ b/extensions/source/plugin/unx/plugcon.cxx
@@ -28,6 +28,13 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
#include <plugin/unx/plugcon.hxx>
#include <cstdarg>
diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx
index 77f60eb..f5221aa 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -28,6 +28,13 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
#include <cstdarg>
#include <sys/types.h>
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index c9cdf50..b042815 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -28,6 +28,13 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
+
+#ifdef AIX
+#define _LINUX_SOURCE_COMPAT
+#include <sys/timer.h>
+#undef _LINUX_SOURCE_COMPAT
+#endif
+
#include <cstdarg>
#include <sys/stat.h>
#include <sys/types.h>
commit dd03ec9de6ed05d0e1c11ce24c91f506d45f938b
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Wed Oct 13 16:38:53 2010 +0200
Add NetBSD/amd64.
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 57bca4f..7477f53 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -483,8 +483,8 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die durch den
abGP.Append( "12" );
#elif defined LINUX && defined PPC
abGP.Append( "13" );
-#elif defined NETBSD
- abGP.Append( "14" );
+#elif defined NETBSD && defined INTEL
+ abGP.Append( "14" ); // NetBSD/i386
#elif defined LINUX && defined X86_64
abGP.Append( "15" ); // Linux x86-64
#elif defined LINUX && defined SPARC
@@ -503,6 +503,8 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die durch den
abGP.Append( "22" ); // Linux PA-RISC
#elif defined LINUX && defined AXP
abGP.Append( "23" ); // Linux ALPHA
+#elif defined NETBSD && defined X86_64
+ abGP.Append( "24" ); // NetBSD/amd64
#else
#error ("unknown platform. please request an ID for your platform on qa/dev")
#endif
commit 458440d60f9b87206021d99a6dfb414260c5e9b3
Merge: b4648cb... 4d811aa...
Author: Noel Power <noel.power at novell.com>
Date: Wed Oct 13 15:16:34 2010 +0100
Merge branch 'master' of ssh://noelp@git.freedesktop.org/git/libreoffice/components
commit 4d811aa74de8e647b5c3f44058a0a1324af62dad
Merge: 8c7036a... 920a6f8...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Oct 13 14:37:44 2010 +0200
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/components
commit b4648cb5215c1b0f59c9a740d446031c03a3353b
Merge: ecf31cd... 920a6f8...
Author: Noel Power <noel.power at novell.com>
Date: Wed Oct 13 12:51:15 2010 +0100
Merge commit 'origin/master'
commit 920a6f80417cecb64028f3bfc0cda40f0e3933c0
Author: Michael Meeks <michael.meeks at novell.com>
Date: Wed Oct 13 10:43:59 2010 +0100
Default to evolution
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 7af1af4..d8de0a7 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -116,13 +116,12 @@ namespace abp
m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) );
// some initial settings
+#ifdef UNX
#ifdef MACOSX
m_aSettings.eType = AST_MACAB;
-#elif WITH_MOZILLA
-#ifdef UNX
- m_aSettings.eType = AST_MORK;
#else
- m_aSettings.eType = AST_OE;
+// FIXME: if KDE use KAB instead
+ m_aSettings.eType = AST_EVOLUTION;
#endif
#else
m_aSettings.eType = AST_OTHER;
commit 8c7036a3592b0d2906cf10653b0ce05f3001c3d8
Merge: e4ed769... 3bc9d66...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Oct 13 11:30:55 2010 +0200
Merge commit 'ooo/OOO330_m10'
commit ecf31cd7b1a8f623c644566710af1443e092e43d
Merge: ba23e2d... b3c3066...
Author: Noel Power <noel.power at novell.com>
Date: Wed Oct 13 10:17:11 2010 +0100
Merge branch 'vba' fix conflics ( below ), trailing ws and leading tabs
Conflicts:
forms/source/component/RadioButton.cxx
forms/source/inc/property.hrc
diff --cc basctl/source/basicide/baside3.cxx
index fc7038c,fe572e5..d8690a7
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@@ -110,8 -113,16 +111,16 @@@ DialogWindow::DialogWindow( Window* pPa
{
InitSettings( TRUE, TRUE, TRUE );
- pEditor = new DlgEditor();
- pEditor = new DlgEditor( rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
++ pEditor = new DlgEditor( rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
pEditor->SetWindow( this );
- // set vba mode on DialogModel ( allows it to work in 100thmm instead of MAP_APPFONT )
- if ( rDocument.isDocument() && rDocument.getDocument().is() )
- {
- uno::Reference< script::vba::XVBACompatibility > xDocVBAMode( rDocument.getLibraryContainer( E_SCRIPTS ), uno::UNO_QUERY );
- uno::Reference< script::vba::XVBACompatibility > xDialogModelVBAMode( xDialogModel, uno::UNO_QUERY );
- if ( xDocVBAMode.is() && xDialogModelVBAMode.is() )
- xDialogModelVBAMode->setVBACompatibilityMode( xDocVBAMode->getVBACompatibilityMode() );
- }
++ // set vba mode on DialogModel ( allows it to work in 100thmm instead of MAP_APPFONT )
++ if ( rDocument.isDocument() && rDocument.getDocument().is() )
++ {
++ uno::Reference< script::vba::XVBACompatibility > xDocVBAMode( rDocument.getLibraryContainer( E_SCRIPTS ), uno::UNO_QUERY );
++ uno::Reference< script::vba::XVBACompatibility > xDialogModelVBAMode( xDialogModel, uno::UNO_QUERY );
++ if ( xDocVBAMode.is() && xDialogModelVBAMode.is() )
++ xDialogModelVBAMode->setVBACompatibilityMode( xDocVBAMode->getVBACompatibilityMode() );
++ }
pEditor->SetDialog( xDialogModel );
// Undo einrichten
@@@ -726,7 -737,7 +735,7 @@@ BOOL DialogWindow::SaveDialog(
Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
++ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
Reference< XInputStream > xInput( xISP->createInputStream() );
Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
@@@ -1008,7 -1019,7 +1017,7 @@@ BOOL implImportDialog( Window* pWin, co
Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
++ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
String aXmlDlgName;
Reference< beans::XPropertySet > xDialogModelPropSet( xDialogModel, UNO_QUERY );
@@@ -1234,7 -1245,7 +1243,7 @@@
}
}
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
++ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
bool bSuccess = rDocument.insertDialog( aLibName, aNewDlgName, xISP );
if( bSuccess )
{
@@@ -1344,7 -1355,7 +1353,7 @@@ void DialogWindow::StoreData(
Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
++ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) );
}
}
diff --cc basctl/source/basicide/basides3.cxx
index 1b71e43,6ec1dcd..379e14d
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@@ -96,7 -96,7 +96,7 @@@ DialogWindow* BasicIDEShell::CreateDlgW
Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
++ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.isDocument() ? rDocument.getDocument() : Reference< frame::XModel >() );
LocalizationMgr::setStringResourceAtDialog( rDocument, rLibName, aDlgName, xDialogModel );
// new dialog window
diff --cc basctl/source/basicide/moduldlg.cxx
index 3203d86,b00acdd..ff76eb0
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@@ -308,7 -312,7 +308,7 @@@ void BasicIDEShell::CopyDialogResources
Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext );
- ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rSourceDoc.isDocument() ? rSourceDoc.getDocument() : Reference< frame::XModel >() );
++ ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rSourceDoc.isDocument() ? rSourceDoc.getDocument() : Reference< frame::XModel >() );
if( xDialogModel.is() )
{
@@@ -325,7 -329,7 +325,7 @@@
{
LocalizationMgr::setResourceIDsForDialog( xDialogModel, xDestMgr );
}
- io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
- io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDestDoc.isDocument() ? rDestDoc.getDocument() : Reference< frame::XModel >() );
++ io_xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDestDoc.isDocument() ? rDestDoc.getDocument() : Reference< frame::XModel >() );
}
}
diff --cc basctl/source/basicide/scriptdocument.cxx
index cfbd761,14d8dc8..67f2be8
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@@ -678,7 -676,7 +676,7 @@@ namespace basct
if ( !_rxExistingDialogModel.is() )
{
Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
- ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext() );
- ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
++ ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
}
// set new name as property
@@@ -686,7 -684,7 +684,7 @@@
xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rNewName ) );
// export dialog model
- xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext() );
- xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
++ xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
aElement <<= xISP;
}
diff --cc basctl/source/dlged/dlged.cxx
index 27e119a,020f934..6e4b138
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@@ -225,6 -227,7 +225,7 @@@ DlgEditor::DlgEditor( const ::com::sun:
,bCreateOK(TRUE)
,bDialogModelChanged(FALSE)
,mnPaintGuard(0)
- ,m_xDocument( xModel )
++ ,m_xDocument( xModel )
{
pDlgEdModel = new DlgEdModel();
pDlgEdModel->GetItemPool().FreezeIdRanges();
@@@ -833,7 -836,7 +834,7 @@@ void DlgEditor::Copy(
Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xClipDialogModel, xContext );
- Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument );
++ Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument );
Reference< XInputStream > xStream( xISP->createInputStream() );
Sequence< sal_Int8 > DialogModelBytes;
implCopyStreamToByteSequence( xStream, DialogModelBytes );
@@@ -866,7 -869,7 +867,7 @@@
uno::Reference< resource::XStringResourceManager >
xStringResourceManager( xStringResourcePersistence, uno::UNO_QUERY );
LocalizationMgr::resetResourceForDialog( xClipDialogModel, xStringResourceManager );
- Reference< XInputStreamProvider > xISP2 = ::xmlscript::exportDialogModel( xClipDialogModel, xContext );
- Reference< XInputStreamProvider > xISP2 = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument );
++ Reference< XInputStreamProvider > xISP2 = ::xmlscript::exportDialogModel( xClipDialogModel, xContext, m_xDocument );
Reference< XInputStream > xStream2( xISP2->createInputStream() );
Sequence< sal_Int8 > NoResourceDialogModelBytes;
implCopyStreamToByteSequence( xStream2, NoResourceDialogModelBytes );
@@@ -1012,7 -1015,7 +1013,7 @@@ void DlgEditor::Paste(
Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
- ::xmlscript::importDialogModel( ::xmlscript::createInputStream( *((::rtl::ByteSequence*)(&DialogModelBytes)) ) , xClipDialogModel, xContext );
- ::xmlscript::importDialogModel( ::xmlscript::createInputStream( *((::rtl::ByteSequence*)(&DialogModelBytes)) ) , xClipDialogModel, xContext, m_xDocument );
++ ::xmlscript::importDialogModel( ::xmlscript::createInputStream( *((::rtl::ByteSequence*)(&DialogModelBytes)) ) , xClipDialogModel, xContext, m_xDocument );
}
// get control models from clipboard dialog model
diff --cc basctl/source/dlged/dlgedobj.cxx
index 72b08fd,a56985e..248537f
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@@ -1,7 -1,7 +1,7 @@@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
++ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@@ -38,9 -38,11 +38,9 @@@
#include "dlgedview.hxx"
#include "dlgedlist.hxx"
#include <iderid.hxx>
--#include <localizationmgr.hxx>
++#include <localizationmgr.hxx>
-#ifndef _BASCTL_DLGRESID_HRC
#include <dlgresid.hrc>
-#endif
#include <tools/resmgr.hxx>
#include <tools/shl.hxx>
#include <unotools/sharedunocomponent.hxx>
@@@ -72,6 -74,22 +72,22 @@@ TYPEINIT1(DlgEdObj, SdrUnoObj)
DBG_NAME(DlgEdObj);
//----------------------------------------------------------------------------
+ MapMode lcl_getMapModeForForm( DlgEdForm* pForm )
+ {
- MapMode aMode( MAP_APPFONT ); //Default
- try
- {
- uno::Reference< beans::XPropertySet > xProps( pForm ? pForm->GetUnoControlModel() : NULL, uno::UNO_QUERY_THROW );
- sal_Bool bVBAForm = sal_False;
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VBAForm") ) ) >>= bVBAForm;
- if ( bVBAForm )
- aMode = MapMode( MAP_100TH_MM );
- }
- catch ( Exception& )
- {
- }
- return aMode;
++ MapMode aMode( MAP_APPFONT ); //Default
++ try
++ {
++ uno::Reference< beans::XPropertySet > xProps( pForm ? pForm->GetUnoControlModel() : NULL, uno::UNO_QUERY_THROW );
++ sal_Bool bVBAForm = sal_False;
++ xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("VBAForm") ) ) >>= bVBAForm;
++ if ( bVBAForm )
++ aMode = MapMode( MAP_100TH_MM );
++ }
++ catch ( Exception& )
++ {
++ }
++ return aMode;
+ }
DlgEdObj::DlgEdObj()
:SdrUnoObj(String(), sal_False)
@@@ -83,7 -101,7 +99,7 @@@
//----------------------------------------------------------------------------
--DlgEdObj::DlgEdObj(const ::rtl::OUString& rModelName,
++DlgEdObj::DlgEdObj(const ::rtl::OUString& rModelName,
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac)
:SdrUnoObj(rModelName, rxSFac, sal_False)
,bIsListening(sal_False)
@@@ -149,8 -167,8 +165,8 @@@ uno::Reference< awt::XControl > DlgEdOb
//----------------------------------------------------------------------------
--bool DlgEdObj::TransformSdrToControlCoordinates(
-- sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
++bool DlgEdObj::TransformSdrToControlCoordinates(
++ sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
{
// input position and size
@@@ -190,10 -208,11 +206,11 @@@
aPos.Width() -= aDeviceInfo.LeftInset;
aPos.Height() -= aDeviceInfo.TopInset;
}
--
++
// convert pixel to logic units
- aPos = pDevice->PixelToLogic( aPos, MapMode( MAP_APPFONT ) );
- aSize = pDevice->PixelToLogic( aSize, MapMode( MAP_APPFONT ) );
+ MapMode aConvMode = lcl_getMapModeForForm( pForm );
+ aPos = pDevice->PixelToLogic( aPos, aConvMode );
+ aSize = pDevice->PixelToLogic( aSize, aConvMode );
// set out parameters
nXOut = aPos.Width();
@@@ -206,8 -225,8 +223,8 @@@
//----------------------------------------------------------------------------
--bool DlgEdObj::TransformSdrToFormCoordinates(
-- sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
++bool DlgEdObj::TransformSdrToFormCoordinates(
++ sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
{
// input position and size
@@@ -256,8 -275,8 +273,8 @@@
//----------------------------------------------------------------------------
--bool DlgEdObj::TransformControlToSdrCoordinates(
-- sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
++bool DlgEdObj::TransformControlToSdrCoordinates(
++ sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
{
// input position and size
@@@ -318,8 -338,8 +336,8 @@@
//----------------------------------------------------------------------------
--bool DlgEdObj::TransformFormToSdrCoordinates(
-- sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
++bool DlgEdObj::TransformFormToSdrCoordinates(
++ sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
{
// input position and size
@@@ -373,7 -395,7 +393,7 @@@ void DlgEdObj::SetRectFromProps(
// get control position and size from properties
Reference< beans::XPropertySet > xPSet( GetUnoControlModel(), UNO_QUERY );
if ( xPSet.is() )
-- {
++ {
sal_Int32 nXIn = 0, nYIn = 0, nWidthIn = 0, nHeightIn = 0;
xPSet->getPropertyValue( DLGED_PROP_POSITIONX ) >>= nXIn;
xPSet->getPropertyValue( DLGED_PROP_POSITIONY ) >>= nYIn;
@@@ -448,7 -470,7 +468,7 @@@ void DlgEdObj::PositionAndSizeChange( c
{
Reference< beans::XPropertySet > xPSet( GetUnoControlModel(), UNO_QUERY );
if ( xPSet.is() )
-- {
++ {
sal_Int32 nX = 0, nY = 0, nWidth = 0, nHeight = 0;
xPSet->getPropertyValue( DLGED_PROP_POSITIONX ) >>= nX;
xPSet->getPropertyValue( DLGED_PROP_POSITIONY ) >>= nY;
@@@ -499,7 -521,7 +519,7 @@@
}
}
}
--
++
SetRectFromProps();
}
@@@ -519,10 -541,10 +539,10 @@@ void SAL_CALL DlgEdObj::NameChange( con
{
Reference< container::XNameAccess > xNameAcc((GetDlgEdForm()->GetUnoControlModel()), UNO_QUERY);
if ( xNameAcc.is() && xNameAcc->hasByName(aOldName) )
-- {
++ {
if ( !xNameAcc->hasByName(aNewName) && aNewName.getLength() != 0 )
{
-- // remove the control by the old name and insert the control by the new name in the container
++ // remove the control by the old name and insert the control by the new name in the container
Reference< container::XNameContainer > xCont(xNameAcc, UNO_QUERY );
if ( xCont.is() )
{
@@@ -538,7 -560,7 +558,7 @@@
else
pEditor = GetDlgEdForm()->GetDlgEditor();
LocalizationMgr::renameControlResourceIDsForEditorObject( pEditor, aAny, aNewName );
-- }
++ }
}
else
{
@@@ -710,9 -732,9 +730,9 @@@ sal_Bool DlgEdObj::supportsService( con
//----------------------------------------------------------------------------
::rtl::OUString DlgEdObj::GetDefaultName() const
--{
++{
sal_uInt16 nResId = 0;
-- ::rtl::OUString aDefaultName;
++ ::rtl::OUString aDefaultName;
if ( supportsService( "com.sun.star.awt.UnoControlDialogModel" ) )
{
nResId = RID_STR_CLASS_DIALOG;
@@@ -800,12 -822,12 +820,12 @@@
else
{
-- nResId = RID_STR_CLASS_CONTROL;
++ nResId = RID_STR_CLASS_CONTROL;
}
if (nResId)
{
-- aDefaultName = ::rtl::OUString( String(IDEResId(nResId)) );
++ aDefaultName = ::rtl::OUString( String(IDEResId(nResId)) );
}
return aDefaultName;
@@@ -1014,11 -1036,11 +1034,11 @@@ void DlgEdObj::operator= (const SdrObje
void DlgEdObj::NbcMove( const Size& rSize )
{
SdrUnoObj::NbcMove( rSize );
--
++
// stop listening
EndListening(sal_False);
--
-- // set geometry properties
++
++ // set geometry properties
SetPropsFromRect();
// start listening
@@@ -1036,8 -1058,8 +1056,8 @@@ void DlgEdObj::NbcResize(const Point& r
// stop listening
EndListening(sal_False);
--
-- // set geometry properties
++
++ // set geometry properties
SetPropsFromRect();
// start listening
@@@ -1082,7 -1104,7 +1102,7 @@@ void DlgEdObj::SetDefaults(
aUniqueName <<= aOUniqueName;
xPSet->setPropertyValue( DLGED_PROP_NAME, aUniqueName );
-- // set labels
++ // set labels
if ( supportsService( "com.sun.star.awt.UnoControlButtonModel" ) ||
supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) ||
supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) ||
@@@ -1142,7 -1164,7 +1162,7 @@@
}
}
-- // dialog model changed
++ // dialog model changed
pDlgEdForm->GetDlgEditor()->SetDialogModelChanged( TRUE );
}
}
@@@ -1168,13 -1190,13 +1188,13 @@@ void DlgEdObj::StartListening(
if (!isListening())
{
bIsListening = sal_True;
--
++
// XPropertyChangeListener
Reference< XPropertySet > xControlModel( GetUnoControlModel() , UNO_QUERY );
if (!m_xPropertyChangeListener.is() && xControlModel.is())
{
// create listener
-- m_xPropertyChangeListener = static_cast< ::com::sun::star::beans::XPropertyChangeListener*>( new DlgEdPropListenerImpl( (DlgEdObj*)this ) );
++ m_xPropertyChangeListener = static_cast< ::com::sun::star::beans::XPropertyChangeListener*>( new DlgEdPropListenerImpl( (DlgEdObj*)this ) );
// register listener to properties
xControlModel->addPropertyChangeListener( ::rtl::OUString() , m_xPropertyChangeListener );
@@@ -1185,9 -1207,9 +1205,9 @@@
if( !m_xContainerListener.is() && xEventsSupplier.is() )
{
// create listener
-- m_xContainerListener = static_cast< ::com::sun::star::container::XContainerListener*>( new DlgEdEvtContListenerImpl( (DlgEdObj*)this ) );
++ m_xContainerListener = static_cast< ::com::sun::star::container::XContainerListener*>( new DlgEdEvtContListenerImpl( (DlgEdObj*)this ) );
-- // register listener to script event container
++ // register listener to script event container
Reference< XNameContainer > xEventCont = xEventsSupplier->getEvents();
DBG_ASSERT(xEventCont.is(), "DlgEdObj::StartListening: control model has no script event container!");
Reference< XContainer > xCont( xEventCont , UNO_QUERY );
@@@ -1251,7 -1273,7 +1271,7 @@@ void SAL_CALL DlgEdObj::_propertyChange
// dialog model changed
pDlgEditor->SetDialogModelChanged(TRUE);
--
++
// update position and size
if ( evt.PropertyName == DLGED_PROP_POSITIONX || evt.PropertyName == DLGED_PROP_POSITIONY ||
evt.PropertyName == DLGED_PROP_WIDTH || evt.PropertyName == DLGED_PROP_HEIGHT ||
@@@ -1402,7 -1424,7 +1422,7 @@@ void DlgEdForm::SetRectFromProps(
// get form position and size from properties
Reference< beans::XPropertySet > xPSet( GetUnoControlModel(), UNO_QUERY );
if ( xPSet.is() )
-- {
++ {
sal_Int32 nXIn = 0, nYIn = 0, nWidthIn = 0, nHeightIn = 0;
xPSet->getPropertyValue( DLGED_PROP_POSITIONX ) >>= nXIn;
xPSet->getPropertyValue( DLGED_PROP_POSITIONY ) >>= nYIn;
@@@ -1473,8 -1495,8 +1493,8 @@@ void DlgEdForm::PositionAndSizeChange(
{
DlgEditor* pEditor = GetDlgEditor();
DBG_ASSERT( pEditor, "DlgEdForm::PositionAndSizeChange: no dialog editor!" );
-- if ( pEditor )
-- {
++ if ( pEditor )
++ {
DlgEdPage* pPage_ = pEditor->GetPage();
DBG_ASSERT( pPage_, "DlgEdForm::PositionAndSizeChange: no page!" );
if ( pPage_ )
@@@ -1543,7 -1565,7 +1563,7 @@@
{
Reference< beans::XPropertySet > xPSet( (*aIter)->GetUnoControlModel(), UNO_QUERY );
if ( xPSet.is() )
-- {
++ {
sal_Int32 nX = 0, nY = 0, nWidth = 0, nHeight = 0;
xPSet->getPropertyValue( DLGED_PROP_POSITIONX ) >>= nX;
xPSet->getPropertyValue( DLGED_PROP_POSITIONY ) >>= nY;
@@@ -1616,7 -1638,7 +1636,7 @@@ void DlgEdForm::UpdateStep(
//----------------------------------------------------------------------------
void DlgEdForm::UpdateTabIndices()
--{
++{
// stop listening with all children
::std::vector<DlgEdObj*>::iterator aIter;
for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
@@@ -1684,7 -1706,7 +1704,7 @@@ void DlgEdForm::UpdateTabOrder(
// #110559#
// When the tabindex of a control model changes, the dialog control is
// notified about those changes. Due to #109067# (bad performance of
-- // dialog editor) the dialog control doesn't activate the tab order
++ // dialog editor) the dialog control doesn't activate the tab order
// in design mode. When the dialog editor has reordered all
// tabindices, this method allows to activate the taborder afterwards.
@@@ -1706,10 -1728,10 +1726,10 @@@ void DlgEdForm::UpdateGroups(
// #110559#
// The grouping of radio buttons in a dialog is done by vcl.
// In the dialog editor we have two views (=controls) for one
-- // radio button model. One control is owned by the dialog control,
++ // radio button model. One control is owned by the dialog control,
// but not visible in design mode. The other control is owned by
// the drawing layer object. Whereas the grouping of the first
-- // control is done by vcl, the grouping of the control in the
++ // control is done by vcl, the grouping of the control in the
// drawing layer has to be done here.
Reference< awt::XTabControllerModel > xTabModel( GetUnoControlModel() , UNO_QUERY );
@@@ -1744,21 -1766,21 +1764,21 @@@
const Reference< awt::XControl > xCtrl( pControls[nControl] );
if ( xCtrl.is() )
{
-- Reference< awt::XControlModel > xCtrlModel( xCtrl->getModel() );
++ Reference< awt::XControlModel > xCtrlModel( xCtrl->getModel() );
if ( (awt::XControlModel*)xCtrlModel.get() == (awt::XControlModel*)pModels[nModel].get() )
{
// get the control peer and insert into the list of peers
aSeqPeers.getArray()[ nModel ] = Reference< awt::XWindow >( xCtrl->getPeer(), UNO_QUERY );
break;
}
-- }
++ }
}
}
// set the group at the dialog peer
Reference< awt::XControl > xDlg( GetControl(), UNO_QUERY );
if ( xDlg.is() )
-- {
++ {
Reference< awt::XVclContainerPeer > xDlgPeer( xDlg->getPeer(), UNO_QUERY );
if ( xDlgPeer.is() )
xDlgPeer->setGroup( aSeqPeers );
@@@ -1780,7 -1802,7 +1800,7 @@@ void DlgEdForm::UpdateTabOrderAndGroups
void DlgEdForm::NbcMove( const Size& rSize )
{
SdrUnoObj::NbcMove( rSize );
--
++
// set geometry properties of form
EndListening(sal_False);
SetPropsFromRect();
diff --cc basctl/source/inc/dlged.hxx
index a8adcda,a2ea57c..cc414d3
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@@ -128,9 -129,11 +129,11 @@@ protected
BOOL bDialogModelChanged;
Timer aMarkTimer;
long mnPaintGuard;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocument;
++ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocument;
- DlgEditor(); // not implemented
++ DlgEditor(); // not implemented
public:
- DlgEditor();
- DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
++ DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
~DlgEditor();
void SetWindow( Window* pWindow );
diff --cc cui/source/options/optfltr.cxx
index 51034c9,229ee76..34a97e0
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@@ -54,6 -54,7 +54,7 @@@ OfaMSFilterTabPage::OfaMSFilterTabPage(
: SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ),
aMSWordGB ( this, CUI_RES( GB_WORD ) ),
aWBasicCodeCB ( this, CUI_RES( CB_WBAS_CODE ) ),
- aWBasicWbctblCB ( this, CUI_RES( CB_WBAS_WBCTBL ) ),
++ aWBasicWbctblCB ( this, CUI_RES( CB_WBAS_WBCTBL ) ),
aWBasicStgCB ( this, CUI_RES( CB_WBAS_STG ) ),
aMSExcelGB ( this, CUI_RES( GB_EXCEL ) ),
aEBasicCodeCB ( this, CUI_RES( CB_EBAS_CODE ) ),
diff --cc extensions/source/ole/oleobjw.cxx
index 7a73ed7,aca6e53..8799636
mode 100644,100755..100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@@ -1,7 -1,7 +1,7 @@@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
++ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@@ -142,7 -143,7 +143,7 @@@ IUnknownWrapper_Impl::~IUnknownWrapper_
#if OSL_DEBUG_LEVEL > 0
fprintf(stderr,"[automation bridge] ComPtrToWrapperMap contains: %i \n",
ComPtrToWrapperMap.size());
--#endif
++#endif
}
Any IUnknownWrapper_Impl::queryInterface(const Type& t)
@@@ -163,7 -164,7 +164,7 @@@ Reference<XIntrospectionAccess> SAL_CAL
throw (RuntimeException )
{
Reference<XIntrospectionAccess> ret;
--
++
return ret;
}
@@@ -181,7 -237,7 +237,7 @@@ Any SAL_CALL IUnknownWrapper_Impl::invo
OUSTR("[automation bridge] The object does not have an IDispatch interface"),
Reference<XInterface>());
}
--
++
Any ret;
try
@@@ -210,9 -266,13 +266,13 @@@
throw;
}
catch (CannotConvertException &)
- {
- throw;
- }
- catch (InvocationTargetException &)
+ {
+ throw;
+ }
++ catch (InvocationTargetException &)
+ {
+ throw;
+ }
catch (BridgeRuntimeError & e)
{
throw RuntimeException(e.message, Reference<XInterface>());
@@@ -260,7 -320,7 +320,7 @@@ void SAL_CALL IUnknownWrapper_Impl::set
OUSTR("\" is not supported"));
throw UnknownPropertyException(msg, Reference<XInterface>());
}
--
++
if ( (! aDescPut && aDescGet) || aVarDesc
&& aVarDesc->wVarFlags == VARFLAG_FREADONLY )
{
@@@ -280,14 -340,14 +340,14 @@@
CComVariant varResult;
ExcepInfo excepinfo;
unsigned int uArgErr;
--
++
// converting UNO value to OLE variant
DISPID dispidPut= DISPID_PROPERTYPUT;
dispparams.rgdispidNamedArgs = &dispidPut;
dispparams.cArgs = 1;
dispparams.cNamedArgs = 1;
dispparams.rgvarg = & varArg;
--
++
OSL_ASSERT(aDescPut || aVarDesc);
VARTYPE vt = 0;
@@@ -305,7 -365,7 +365,7 @@@
{
vt = getElementTypeDesc( & aVarDesc->elemdescVar.tdesc);
dispid = aVarDesc->memid;
-- if (vt == VT_UNKNOWN || vt == VT_DISPATCH ||
++ if (vt == VT_UNKNOWN || vt == VT_DISPATCH ||
(vt & VT_ARRAY) || (vt & VT_BYREF))
{
invkind = INVOKE_PROPERTYPUTREF;
@@@ -331,8 -391,8 +391,8 @@@
// call to IDispatch
hr = m_spDispatch->Invoke(dispid, IID_NULL, LOCALE_USER_DEFAULT, ::sal::static_int_cast< WORD, INVOKEKIND >( invkind ),
&dispparams, & varResult, & excepinfo, &uArgErr);
--
-- // lookup error code
++
++ // lookup error code
switch (hr)
{
case S_OK:
@@@ -377,7 -437,7 +437,7 @@@
default:
throw RuntimeException();
break;
-- }
++ }
}
catch (CannotConvertException &)
{
@@@ -423,27 -483,27 +483,27 @@@ Any SAL_CALL IUnknownWrapper_Impl::getV
ITypeInfo * pInfo = getTypeInfo();
// I was going to implement an XServiceInfo interface to allow the type
// of the automation object to be exposed.. but it seems
-- // from looking at comments in the code that it is possible for
++ // from looking at comments in the code that it is possible for
// this object to actually wrap an UNO object ( I guess if automation is
// used from MSO to create Openoffice objects ) Therefore, those objects
// will more than likely already have their own XServiceInfo interface.
// Instead here I chose a name that should be illegal both in COM and
// UNO ( from an IDL point of view ) therefore I think this is a safe
// hack
-- if ( aPropertyName.equals( rtl::OUString::createFromAscii("$GetTypeName") ))
++ if ( aPropertyName.equals( rtl::OUString::createFromAscii("$GetTypeName") ))
{
if ( pInfo && m_sTypeName.getLength() == 0 )
{
m_sTypeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("IDispatch") );
CComBSTR sName;
--
++
if ( SUCCEEDED( pInfo->GetDocumentation( -1, &sName, NULL, NULL, NULL ) ) )
{
rtl::OUString sTmp( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName)));
if ( sTmp.indexOf('_') == 0 )
sTmp = sTmp.copy(1);
// do we own the memory for pTypeLib, msdn doco is vague
-- // I'll assume we do
++ // I'll assume we do
CComPtr< ITypeLib > pTypeLib;
unsigned int index;
if ( SUCCEEDED( pInfo->GetContainingTypeLib( &pTypeLib.p, &index )) )
@@@ -452,11 -512,11 +512,11 @@@
{
rtl::OUString sLibName( reinterpret_cast<const sal_Unicode*>(LPCOLESTR(sName)));
m_sTypeName = sLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sTmp );
--
++
}
}
}
--
++
}
ret <<= m_sTypeName;
return ret;
@@@ -474,7 -534,7 +534,7 @@@
}
// write-only should not be possible
OSL_ASSERT( aDescGet || ! aDescPut);
--
++
HRESULT hr;
DISPPARAMS dispparams = {0, 0, 0, 0};
CComVariant varResult;
@@@ -487,20 -547,20 +547,20 @@@
dispid = aVarDesc->memid;
else
dispid = aDescPut->memid;
--
-- hr = m_spDispatch->Invoke(dispid,
++
++ hr = m_spDispatch->Invoke(dispid,
IID_NULL,
-- LOCALE_USER_DEFAULT,
++ LOCALE_USER_DEFAULT,
DISPATCH_PROPERTYGET,
-- &dispparams,
-- &varResult,
++ &dispparams,
++ &varResult,
&excepinfo,
&uArgErr);
// converting return value and out parameter back to UNO
if (hr == S_OK)
{
-- // If the com object implements uno interfaces then we have
++ // If the com object implements uno interfaces then we have
// to convert the attribute into the expected type.
TypeDescription attrInfo;
getAttributeInfo(aPropertyName, attrInfo);
@@@ -509,8 -569,8 +569,8 @@@
else
variantToAny(&varResult, ret);
}
--
-- // lookup error code
++
++ // lookup error code
switch (hr)
{
case S_OK:
@@@ -607,7 -667,7 +667,7 @@@ sal_Bool SAL_CALL IUnknownWrapper_Impl:
FuncDesc aDesc(pInfo);
getFuncDesc(aName, & aDesc);
// Automation properties can have arguments. Those are treated as methods and
-- //are called through XInvocation::invoke.
++ //are called through XInvocation::invoke.
if ( ! aDesc)
{
FuncDesc aDescGet(pInfo);
@@@ -619,7 -679,7 +679,7 @@@
ret = sal_True;
}
else
-- ret = sal_True;
++ ret = sal_True;
}
catch (BridgeRuntimeError& e)
{
@@@ -658,12 -718,16 +718,16 @@@ sal_Bool SAL_CALL IUnknownWrapper_Impl:
FuncDesc aDescPut(pInfo);
VarDesc aVarDesc(pInfo);
getPropDesc(aName, & aDescGet, & aDescPut, & aVarDesc);
- // Automation properties can have parameters. If so, we access them through
- // XInvocation::invoke. Thas is, hasProperty must return false for such a
- // property
+
- // we should probably just check the funckind
++ // we should probably just check the funckind
+ // basic has been modified to handle properties ( 'get' ) props at
- // least with paramaters
- // additionally you can call invoke(Get|Set)Property on the bridge
- // you can determine if a property has parameter is hasMethod
- // returns true for the name
++ // least with paramaters
++ // additionally you can call invoke(Get|Set)Property on the bridge
++ // you can determine if a property has parameter is hasMethod
++ // returns true for the name
if (aVarDesc
- || aDescPut && aDescPut->cParams == 0
- || aDescGet && aDescGet->cParams == 0)
- || aDescPut
++ || aDescPut
+ || aDescGet )
{
ret = sal_True;
}
@@@ -678,7 -742,7 +742,7 @@@
"IUnknownWrapper_Impl::hasProperty ! Message : \n") +
e.Message, Reference<XInterface>());
-- }
++ }
catch (...)
{
throw RuntimeException(OUSTR("[automation bridge] unexpected exception in "
@@@ -769,7 -833,7 +833,7 @@@ Any IUnknownWrapper_Impl::invokeWithDi
sarParams.reset(new CComVariant[ parameterCount]);
pVarParams = sarParams.get();
}
--
++
// Create the Array for the out an in/out parameter. These values
// are referenced by the VT_BYREF VARIANTs in DISPPARAMS.
// We need to find out the number of out and in/out parameter.
@@@ -786,7 -850,7 +850,7 @@@
// build up the parameters for IDispatch::Invoke
sal_Int32 outParamIndex=0;
int i = 0;
-- try
++ try
{
for( i= 0; i < parameterCount; i++)
{
@@@ -924,7 -988,7 +988,7 @@@
outParamIndex++;
} // end else if
} // end for
-- }
++ }
catch (IllegalArgumentException & e)
{
e.ArgumentPosition = ::sal::static_int_cast< sal_Int16, int >( i );
@@@ -1020,16 -1084,16 +1084,16 @@@
// Get the DISPID
FuncDesc aDesc(getTypeInfo());
getFuncDesc(sFunctionName, & aDesc);
-- // invoking OLE method
-- hr = m_spDispatch->Invoke(aDesc->memid,
++ // invoking OLE method
++ hr = m_spDispatch->Invoke(aDesc->memid,
IID_NULL,
-- LOCALE_USER_DEFAULT,
++ LOCALE_USER_DEFAULT,
DISPATCH_METHOD,
-- &dispparams,
-- &varResult,
++ &dispparams,
++ &varResult,
&excepinfo,
&uArgErr);
--
++
// converting return value and out parameter back to UNO
if (hr == S_OK)
{
@@@ -1046,10 -1110,10 +1110,10 @@@
if( pMethod->pParams[i].bOut )
{
OutParamIndex[outIndex]= (sal_Int16) i;
-- Any outAny;
++ Any outAny;
if( !bJScriptObject)
{
-- variantToAny( &pVarParamsRef[outIndex], outAny,
++ variantToAny( &pVarParamsRef[outIndex], outAny,
Type(pMethod->pParams[i].pTypeRef), sal_False);
OutParam[outIndex++]= outAny;
}
@@@ -1063,7 -1127,7 +1127,7 @@@
CComVariant varOut;
if( SUCCEEDED( pDisp.GetPropertyByName( L"0", &varOut)))
{
-- variantToAny( &varOut, outAny,
++ variantToAny( &varOut, outAny,
Type(pMethod->pParams[parameterCount - 1 - i].pTypeRef), sal_False);
OutParam[outParameterCount - 1 - outIndex++]= outAny;
}
@@@ -1117,11 -1181,11 +1181,11 @@@
}
}
}
--
++
if( !bConvRet) // conversion of return or out parameter failed
throw CannotConvertException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Call to COM object failed. Conversion of return or out value failed")),
Reference<XInterface>( static_cast<XWeak*>(this), UNO_QUERY ), TypeClass_UNKNOWN,
-- FailReason::UNKNOWN, 0);// lookup error code
++ FailReason::UNKNOWN, 0);// lookup error code
// conversion of return or out parameter failed
switch (hr)
{
@@@ -1167,10 -1231,10 +1231,10 @@@
default:
throw RuntimeException();
break;
-- }
++ }
return ret;
--}
++}
@@@ -1180,10 -1244,10 +1244,10 @@@ void SAL_CALL IUnknownWrapper_Impl::ini
{
// 1.parameter is IUnknown
// 2.parameter is a boolean which indicates if the the COM pointer was a IUnknown or IDispatch
-- // 3.parameter is a Sequence<Type>
++ // 3.parameter is a Sequence<Type>
o2u_attachCurrentThread();
OSL_ASSERT(aArguments.getLength() == 3);
--
++
m_spUnknown= *(IUnknown**) aArguments[0].getValue();
#ifdef __MINGW32__
m_spUnknown->QueryInterface(IID_IDispatch, reinterpret_cast<LPVOID*>( & m_spDispatch.p));
@@@ -1191,7 -1255,7 +1255,7 @@@
m_spUnknown.QueryInterface( & m_spDispatch.p);
#endif
-- aArguments[1] >>= m_bOriginalDispatch;
++ aArguments[1] >>= m_bOriginalDispatch;
aArguments[2] >>= m_seqTypes;
ITypeInfo* pType = NULL;
@@@ -1226,15 -1290,15 +1290,15 @@@
{
getFuncDesc( usName, &aDescGet );
if ( !aDescGet )
-- throw BridgeRuntimeError( OUSTR("[automation bridge]IUnknownWrapper_Impl::initialize() Failed to get Function or Property desc. for " ) + usName );
++ throw BridgeRuntimeError( OUSTR("[automation bridge]IUnknownWrapper_Impl::initialize() Failed to get Function or Property desc. for " ) + usName );
}
// now for some funny heuristics to make basic understand what to do
-- // a single aDescGet ( that doesn't take any params ) would be
++ // a single aDescGet ( that doesn't take any params ) would be
// a read only ( defaultmember ) property e.g. this object
// should implement XDefaultProperty
// a single aDescGet ( that *does* ) take params is basically a
// default method e.g. implement XDefaultMethod
--
++
// a DescPut ( I guess we only really support a default param with '1' param ) as a setValue ( but I guess we can leave it through, the object will fail if we don't get it right anyway )
if ( aDescPut || ( aDescGet && aDescGet->cParams == 0 ) )
m_bHasDfltProperty = true;
@@@ -1277,7 -1341,7 +1341,7 @@@ Reference< XInterface > IUnknownWrapper
}
Reference<XInterface> IUnknownWrapper_Impl::createComWrapperInstance()
{
-- Reference<XWeak> xWeak= static_cast<XWeak*>( new IUnknownWrapper_Impl(
++ Reference<XWeak> xWeak= static_cast<XWeak*>( new IUnknownWrapper_Impl(
m_smgr, m_nUnoWrapperClass, m_nComWrapperClass));
return Reference<XInterface>( xWeak, UNO_QUERY);
}
@@@ -1326,7 -1390,7 +1390,7 @@@ TypeDescription IUnknownWrapper_Impl::g
typelib_TypeDescription* pDescMember= NULL;
TYPELIB_DANGER_GET( &pDescMember, pTypeRefMember)
-- typelib_InterfaceMemberTypeDescription* pInterfaceMember=
++ typelib_InterfaceMemberTypeDescription* pInterfaceMember=
(typelib_InterfaceMemberTypeDescription*) pDescMember;
if( OUString( pInterfaceMember->pMemberName) == sName)
{
@@@ -1378,7 -1442,7 +1442,7 @@@ sal_Bool IUnknownWrapper_Impl::isJScrip
/** @internal
The function ultimately calls IDispatch::Invoke on the wrapped COM object.
-- The COM object does not implement UNO Interfaces ( via IDispatch). This
++ The COM object does not implement UNO Interfaces ( via IDispatch). This
is the case when the OleObjectFactory service has been used to create a
component.
@exception IllegalArgumentException
@@@ -1388,9 -1452,22 +1452,22 @@@
@BridgeRuntimeError
*/
Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName,
-- const Sequence< Any >& Params,
-- Sequence< sal_Int16 >& OutParamIndex,
-- Sequence< Any >& OutParam)
++ const Sequence< Any >& Params,
++ Sequence< sal_Int16 >& OutParamIndex,
++ Sequence< Any >& OutParam)
+ {
+ // Get type info for the call. It can be a method call or property put or
+ // property get operation.
+ FuncDesc aFuncDesc(getTypeInfo());
+ getFuncDescForInvoke(sFuncName, Params, & aFuncDesc);
- return invokeWithDispIdComTlb( aFuncDesc, sFuncName, Params, OutParamIndex, OutParam );
++ return invokeWithDispIdComTlb( aFuncDesc, sFuncName, Params, OutParamIndex, OutParam );
+ }
+
-Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
++Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
+ const OUString& sFuncName,
- const Sequence< Any >& Params,
- Sequence< sal_Int16 >& OutParamIndex,
- Sequence< Any >& OutParam)
++ const Sequence< Any >& Params,
++ Sequence< sal_Int16 >& OutParamIndex,
++ Sequence< Any >& OutParam)
{
Any ret;
HRESULT result;
@@@ -1420,7 -1493,7 +1493,7 @@@
if (aFuncDesc->invkind == INVOKE_PROPERTYPUT
|| aFuncDesc->invkind == INVOKE_PROPERTYPUTREF)
dispparams.rgdispidNamedArgs = & idPropertyPut;
--
++
//Determine the number of named arguments
for (int iParam = 0; iParam < nUnoArgs; iParam ++)
{
@@@ -1435,7 -1508,7 +1508,7 @@@
if (aFuncDesc->invkind == DISPATCH_PROPERTYPUT
|| aFuncDesc->invkind == DISPATCH_PROPERTYPUTREF)
dispparams.cNamedArgs ++;
--
++
//Determine the number of all arguments and named arguments
if (aFuncDesc->cParamsOpt == -1)
{
@@@ -1445,7 -1518,7 +1518,7 @@@
}
else
{
-- //If there are namesd arguments, then the dispparams.cArgs
++ //If there are namesd arguments, then the dispparams.cArgs
//is the number of supplied args, otherwise it is the expected number.
if (dispparams.cNamedArgs)
dispparams.cArgs = nUnoArgs;
@@@ -1461,7 -1534,7 +1534,7 @@@
throw IllegalArgumentException( buf.makeStringAndClear(),
Reference<XInterface>(), (sal_Int16) dispparams.cArgs);
}
--
++
//Set up the array of DISPIDs (DISPPARAMS::rgdispidNamedArgs)
//for the named arguments.
//If there is only one named arg and if it is because of a property put
@@@ -1482,7 -1555,7 +1555,7 @@@
{
nSizeAr = dispparams.cNamedArgs; //counts the DISID_PROPERTYPUT
}
--
++
scoped_array<OLECHAR*> saNames(new OLECHAR*[nSizeAr]);
OLECHAR ** arNames = saNames.get();
arNames[0] = const_cast<OLECHAR*>(reinterpret_cast<LPCOLESTR>(sFuncName.getStr()));
@@@ -1500,12 -1573,12 +1573,12 @@@
arNames[nSizeAr - 1 - cNamedArg++] = const_cast<OLECHAR*>(reinterpret_cast<LPCOLESTR>(arg.Name.getStr()));
}
}
--
++
//Prepare the array of DISPIDs for ITypeInfo::GetIDsOfNames
//it must be big enough to contain the DISPIDs of the member + parameters
-- arDispidNamedArgs.reset(new DISPID[nSizeAr]);
++ arDispidNamedArgs.reset(new DISPID[nSizeAr]);
HRESULT hr = getTypeInfo()->GetIDsOfNames(arNames, nSizeAr,
-- arDispidNamedArgs.get());
++ arDispidNamedArgs.get());
if ( hr == E_NOTIMPL )
hr = m_spDispatch->GetIDsOfNames(IID_NULL, arNames, nSizeAr, LOCALE_USER_DEFAULT, arDispidNamedArgs.get() );
@@@ -1559,7 -1632,7 +1632,7 @@@
Any anyArg;
if ( i < nUnoArgs)
anyArg= Params.getConstArray()[i];
--
++
//Test if the current parameter is a "vararg" parameter.
if (bVarargParam || (aFuncDesc->cParamsOpt == -1 &&
aFuncDesc->cParams == (i + 1)))
@@@ -1567,7 -1640,7 +1640,7 @@@
//type info available, except that it must be a VARIANT
bVarargParam = true;
}
--
++
unsigned short paramFlags = PARAMFLAG_FOPT | PARAMFLAG_FIN;
VARTYPE varType = VT_VARIANT;
if ( ! bVarargParam)
@@@ -1591,7 -1664,7 +1664,7 @@@
throw IllegalArgumentException( buf.makeStringAndClear(),
Reference<XInterface>(), (sal_Int16) i);
}
-- //make sure we get no void any for an in parameter. In StarBasic
++ //make sure we get no void any for an in parameter. In StarBasic
//this may be caused by
// Dim arg
// obj.func(arg)
@@@ -1600,7 -1673,7 +1673,7 @@@
&& (i < nUnoArgs) && (paramFlags & PARAMFLAG_FIN) &&
Params.getConstArray()[i].getValueTypeClass() == TypeClass_VOID)
{
-- OUStringBuffer buf(256);
++ OUStringBuffer buf(256);
buf.appendAscii("ole automation bridge: The argument at position: ");
buf.append(OUString::valueOf((sal_Int32) i));
buf.appendAscii(" (index starts with 0) is uninitialized.");
@@@ -1629,7 -1702,7 +1702,7 @@@
VARTYPE type = ::sal::static_int_cast< VARTYPE, int >( varType ^ VT_BYREF );
if (i < nUnoArgs)
{
-- arRefArgs[revIndex].vt= type;
++ arRefArgs[revIndex].vt= type;
}
else
{
@@@ -1676,9 -1749,9 +1749,9 @@@
arRefArgs[revIndex].vt = VT_ERROR;
arRefArgs[revIndex].scode = DISP_E_PARAMNOTFOUND;
}
--
++
// Set the converted arguments in the array which will be
-- // DISPPARAMS::rgvarg
++ // DISPPARAMS::rgvarg
// byref arg VT_XXX |VT_BYREF
arArgs[revIndex].vt = varType;
if (revIndex == 0 && aFuncDesc->invkind == INVOKE_PROPERTYPUT)
@@@ -1727,7 -1800,7 +1800,7 @@@
}
}
}
-- }
++ }
catch (IllegalArgumentException & e)
{
e.ArgumentPosition = ::sal::static_int_cast< sal_Int16, sal_Int32 >( i );
@@@ -1741,19 -1814,19 +1814,19 @@@
dispparams.rgvarg= arArgs;
// invoking OLE method
DWORD localeId = LOCALE_USER_DEFAULT;
-- result = m_spDispatch->Invoke(aFuncDesc->memid,
++ result = m_spDispatch->Invoke(aFuncDesc->memid,
IID_NULL,
-- localeId,
++ localeId,
::sal::static_int_cast< WORD, INVOKEKIND >( aFuncDesc->invkind ),
-- &dispparams,
-- &varResult,
++ &dispparams,
++ &varResult,
&excepinfo,
&uArgErr);
// converting return value and out parameter back to UNO
if (result == S_OK)
{
--
++
// allocate space for the out param Sequence and indices Sequence
int outParamsCount= 0; // includes in/out parameter
for (int i = 0; i < aFuncDesc->cParams; i++)
@@@ -1781,14 -1854,14 +1854,14 @@@
//of named args list to index of parameter list
realParamIndex = dispparams.rgdispidNamedArgs[revParamIndex];
}
--
++
// no named arg, always come before named args
if (! (aFuncDesc->lprgelemdescParam[realParamIndex].paramdesc.wParamFlags
& PARAMFLAG_FOUT))
continue;
Any outAny;
// variantToAny is called with the "reduce range" parameter set to sal_False.
-- // That causes VT_I4 values not to be converted down to a "lower" type. That
++ // That causes VT_I4 values not to be converted down to a "lower" type. That
// feature exist for JScript only because it only uses VT_I4 for integer types.
try
{
@@@ -1807,14 -1880,14 +1880,14 @@@
OutParam[outParamIndex] = outAny;
OutParamIndex[outParamIndex] = ::sal::static_int_cast< sal_Int16, int >( paramIndex );
outParamIndex++;
-- }
++ }
OutParam.realloc(outParamIndex);
OutParamIndex.realloc(outParamIndex);
}
-- // Return value
++ // Return value
variantToAny(&varResult, ret, sal_False);
}
--
++
// map error codes to exceptions
OUString message;
switch (result)
@@@ -1832,18 -1905,31 +1905,31 @@@
"DISP_E_BADVARTYPE."), 0);
break;
case DISP_E_EXCEPTION:
- {
++ {
message = OUSTR("[automation bridge]: ");
-- message += OUString(reinterpret_cast<const sal_Unicode*>(excepinfo.bstrDescription),
++ message += OUString(reinterpret_cast<const sal_Unicode*>(excepinfo.bstrDescription),
::SysStringLen(excepinfo.bstrDescription));
- throw InvocationTargetException(message, Reference<XInterface>(), Any());
+
- // Add for VBA, to throw an exception with the correct error code and message.
- sal_Int32 nErrorCode = excepinfo.wCode;
- if ( nErrorCode == 0 )
- {
- // The low 16-bit of scode describing the error or warning.
- nErrorCode = ( excepinfo.scode & 0xFFFF );
- }
- BasicErrorException aBasicErrExp(message, Reference<XInterface>(), nErrorCode, message);
- throw InvocationTargetException(message, Reference<XInterface>(), makeAny(aBasicErrExp));
- // End add
++ // Add for VBA, to throw an exception with the correct error code and message.
++ sal_Int32 nErrorCode = excepinfo.wCode;
++ if ( nErrorCode == 0 )
++ {
++ // The low 16-bit of scode describing the error or warning.
++ nErrorCode = ( excepinfo.scode & 0xFFFF );
++ }
++ BasicErrorException aBasicErrExp(message, Reference<XInterface>(), nErrorCode, message);
++ throw InvocationTargetException(message, Reference<XInterface>(), makeAny(aBasicErrExp));
++ // End add
+
break;
- }
++ }
case DISP_E_MEMBERNOTFOUND:
message = OUSTR("[automation bridge]: A function with the name \"")
+ sFuncName + OUSTR("\" is not supported. Object returned "
-- "DISP_E_MEMBERNOTFOUND.");
++ "DISP_E_MEMBERNOTFOUND.");
throw IllegalArgumentException(message, 0, 0);
break;
-- case DISP_E_NONAMEDARGS:
++ case DISP_E_NONAMEDARGS:
throw IllegalArgumentException(OUSTR("[automation bridge] Object "
"returned DISP_E_NONAMEDARGS"),0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
break;
@@@ -1855,7 -1941,7 +1941,7 @@@
case DISP_E_PARAMNOTFOUND:
throw IllegalArgumentException(OUSTR("[automation bridge]Call failed."
"Object returned DISP_E_PARAMNOTFOUND."),
-- 0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
++ 0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
break;
case DISP_E_TYPEMISMATCH:
throw CannotConvertException(OUSTR("[automation bridge] Call failed. "
@@@ -1880,10 -1966,10 +1966,10 @@@
default:
throw RuntimeException();
break;
-- }
--
++ }
++
return ret;
--}
++}
void IUnknownWrapper_Impl::getFuncDescForInvoke(const OUString & sFuncName,
const Sequence<Any> & seqArgs,
@@@ -1913,7 -1999,7 +1999,7 @@@
OUSTR("[automation bridge] The object does not have a writeable property: ")
+ sFuncName, Reference<XInterface>(), 0);
}
-- *pFuncDesc = aDescPut.Detach();
++ *pFuncDesc = aDescPut.Detach();
}
else
{ // DISPATCH_METHOD
@@@ -1961,31 -2047,37 +2047,37 @@@ void IUnknownWrapper_Impl::getFuncDesc(
DISPID id;
if (getDispid(sFuncName, &id))
{
-- CComBSTR memberName;
++ CComBSTR memberName;
unsigned int pcNames=0;
// get the case sensitive name
if( SUCCEEDED(getTypeInfo()->GetNames( id, & memberName, 1, &pcNames)))
{
//get the associated index and add an entry to the map
-- //with the name sFuncName which differs in the casing of the letters to
++ //with the name sFuncName which differs in the casing of the letters to
//the actual name as obtained from ITypeInfo
- cit itOrg = m_mapComFunc.find(OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(memberName))));
- OUString sRealName(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(memberName)));
- cit itOrg = m_mapComFunc.find(sRealName);
++ OUString sRealName(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(memberName)));
++ cit itOrg = m_mapComFunc.find(sRealName);
OSL_ASSERT(itOrg != m_mapComFunc.end());
- // maybe this is a property, if so we need
- // to store either both id's ( put/get ) or
- // just the get. Storing both is more consistent
- pair<cit, cit> pItems = m_mapComFunc.equal_range( sRealName );
- for ( ;pItems.first != pItems.second; ++pItems.first )
- m_mapComFunc.insert( TLBFuncIndexMap::value_type ( make_pair(sFuncName, pItems.first->second ) ));
++ // maybe this is a property, if so we need
++ // to store either both id's ( put/get ) or
++ // just the get. Storing both is more consistent
++ pair<cit, cit> pItems = m_mapComFunc.equal_range( sRealName );
++ for ( ;pItems.first != pItems.second; ++pItems.first )
++ m_mapComFunc.insert( TLBFuncIndexMap::value_type ( make_pair(sFuncName, pItems.first->second ) ));
itIndex =
- m_mapComFunc.insert( TLBFuncIndexMap::value_type
- ( make_pair(sFuncName, itOrg->second ) ));
- m_mapComFunc.find( sFuncName );
++ m_mapComFunc.find( sFuncName );
}
}
}
--
--#if OSL_DEBUG_LEVEL >= 1
++
++#if OSL_DEBUG_LEVEL >= 1
// There must only be one entry if sFuncName represents a function or two
// if it is a property
pair<cit, cit> p = m_mapComFunc.equal_range(sFuncName.toAsciiLowerCase());
int numEntries = 0;
for ( ;p.first != p.second; p.first ++, numEntries ++);
OSL_ASSERT( ! (numEntries > 3) );
--#endif
++#endif
if( itIndex != m_mapComFunc.end())
{
ITypeInfo* pType= getTypeInfo();
@@@ -2023,13 -2115,13 +2115,13 @@@ void IUnknownWrapper_Impl::getPropDesc(
DISPID id;
if (getDispid(sFuncName, &id))
{
-- CComBSTR memberName;
++ CComBSTR memberName;
unsigned int pcNames=0;
// get the case sensitive name
if( SUCCEEDED(getTypeInfo()->GetNames( id, & memberName, 1, &pcNames)))
{
//As opposed to getFuncDesc, we do not add the value because we would
-- // need to find the get and set description for the property. This would
++ // need to find the get and set description for the property. This would
//mean to iterate over all FUNCDESCs again.
p = m_mapComFunc.equal_range(OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(memberName))));
}
@@@ -2043,7 -2135,7 +2135,7 @@@
ITypeInfo* pType= getTypeInfo();
FUNCDESC * pFuncDesc = NULL;
if (SUCCEEDED( pType->GetFuncDesc(p.first->second, & pFuncDesc)))
-- {
++ {
if (pFuncDesc->invkind == INVOKE_PROPERTYGET)
{
(*pFuncDescGet) = pFuncDesc;
@@@ -2077,45 -2169,32 +2169,32 @@@
if (SUCCEEDED(pType->GetVarDesc(p.first->second, & pVD)))
(*pVarDesc) = pVD;
}
-- //else no entry for sFuncName, pFuncDesc will not be filled in
++ //else no entry for sFuncName, pFuncDesc will not be filled in
}
- VARTYPE IUnknownWrapper_Impl::getElementTypeDesc(const TYPEDESC *desc)
+ VARTYPE IUnknownWrapper_Impl::getUserDefinedElementType( ITypeInfo* pTypeInfo, const DWORD nHrefType )
{
VARTYPE _type( VT_NULL );
-
- if (desc->vt == VT_PTR)
+ if ( pTypeInfo )
{
- _type = getElementTypeDesc(desc->lptdesc);
- _type |= VT_BYREF;
- }
- else if (desc->vt == VT_SAFEARRAY)
- {
- _type = getElementTypeDesc(desc->lptdesc);
- _type |= VT_ARRAY;
- }
- else if (desc->vt == VT_USERDEFINED)
- {
- ITypeInfo* thisInfo = getTypeInfo(); //kept by this instance
- CComPtr<ITypeInfo> spRefInfo;
- thisInfo->GetRefTypeInfo(desc->hreftype, & spRefInfo.p);
- if (spRefInfo)
+ CComPtr<ITypeInfo> spRefInfo;
+ pTypeInfo->GetRefTypeInfo( nHrefType, &spRefInfo.p );
+ if ( spRefInfo )
{
- TypeAttr attr(spRefInfo);
- spRefInfo->GetTypeAttr( & attr);
- if (attr->typekind == TKIND_ENUM)
+ TypeAttr attr( spRefInfo );
+ spRefInfo->GetTypeAttr( &attr );
+ if ( attr->typekind == TKIND_ENUM )
{
- //We use the type of the first enum value.
- if (attr->cVars == 0)
+ // We use the type of the first enum value.
+ if ( attr->cVars == 0 )
{
- throw BridgeRuntimeError(OUSTR("[automation bridge] Could "
- "not obtain type description"));
+ throw BridgeRuntimeError(OUSTR("[automation bridge] Could not obtain type description"));
}
- VarDesc var(spRefInfo);
- spRefInfo->GetVarDesc(0, & var);
- _type = var->lpvarValue->vt;
+ VarDesc var( spRefInfo );
+ spRefInfo->GetVarDesc( 0, &var );
+ _type = var->lpvarValue->vt;
}
- else if (attr->typekind == TKIND_INTERFACE)
+ else if ( attr->typekind == TKIND_INTERFACE )
{
_type = VT_UNKNOWN;
}
@@@ -2130,6 -2213,28 +2213,28 @@@
}
}
}
+ return _type;
+ }
+
+ VARTYPE IUnknownWrapper_Impl::getElementTypeDesc(const TYPEDESC *desc)
+ {
+ VARTYPE _type( VT_NULL );
+
+ if (desc->vt == VT_PTR)
+ {
+ _type = getElementTypeDesc(desc->lptdesc);
+ _type |= VT_BYREF;
+ }
+ else if (desc->vt == VT_SAFEARRAY)
+ {
+ _type = getElementTypeDesc(desc->lptdesc);
+ _type |= VT_ARRAY;
+ }
+ else if (desc->vt == VT_USERDEFINED)
+ {
+ ITypeInfo* thisInfo = getTypeInfo(); //kept by this instance
- _type = getUserDefinedElementType( thisInfo, desc->hreftype );
++ _type = getUserDefinedElementType( thisInfo, desc->hreftype );
+ }
else
{
_type = desc->vt;
@@@ -2155,7 -2260,7 +2260,7 @@@ void IUnknownWrapper_Impl::buildComTlbI
FuncDesc funcDesc(pType);
if( SUCCEEDED( pType->GetFuncDesc( i, &funcDesc)))
{
-- CComBSTR memberName;
++ CComBSTR memberName;
unsigned int pcNames=0;
if( SUCCEEDED(pType->GetNames( funcDesc->memid, & memberName, 1, &pcNames)))
{
@@@ -2172,15 -2277,15 +2277,15 @@@
sError = OUSTR("[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \
"ITypeInfo::GetFuncDesc failed.");
}
--
-- //If we create an Object in JScript and a a property then it
++
++ //If we create an Object in JScript and a a property then it
//has VARDESC instead of FUNCDESC
for (long i = 0; i < typeAttr->cVars; i++)
{
VarDesc varDesc(pType);
if (SUCCEEDED(pType->GetVarDesc(i, & varDesc)))
{
-- CComBSTR memberName;
++ CComBSTR memberName;
unsigned int pcNames = 0;
if (SUCCEEDED(pType->GetNames(varDesc->memid, & memberName, 1, &pcNames)))
{
@@@ -2200,7 -2305,7 +2305,7 @@@
else
sError = OUSTR("[automation bridge] IUnknownWrapper_Impl::buildComTlbIndex, " \
"ITypeInfo::GetVarDesc failed.");
--
++
}
}
else
@@@ -2211,7 -2316,7 +2316,7 @@@
{
throw BridgeRuntimeError(sError);
}
--
++
m_bComTlbIndexInit = true;
}
}
@@@ -2241,8 -2346,8 +2346,8 @@@ ITypeInfo* IUnknownWrapper_Impl::getTyp
TypeAttr typeAttr(spType.p);
if( SUCCEEDED(spType->GetTypeAttr( &typeAttr)))
{
-- if (typeAttr->typekind == TKIND_INTERFACE &&
-- typeAttr->wTypeFlags & TYPEFLAG_FDUAL)
++ if (typeAttr->typekind == TKIND_INTERFACE &&
++ typeAttr->wTypeFlags & TYPEFLAG_FDUAL)
{
HREFTYPE refDispatch;
if (SUCCEEDED(spType->GetRefTypeOfImplType(::sal::static_int_cast< UINT, int >( -1 ), &refDispatch)))
diff --cc extensions/source/ole/oleobjw.hxx
index 334fb18,31cc54b..13c8efb
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@@ -145,6 -149,12 +149,12 @@@ protected
Sequence< sal_Int16 >& OutParamIndex,
Sequence< Any >& OutParam);
+ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
- const OUString& sFuncName,
- const Sequence< Any >& Params,
- Sequence< sal_Int16 >& OutParamIndex,
- Sequence< Any >& OutParam);
++ const OUString& sFuncName,
++ const Sequence< Any >& Params,
++ Sequence< sal_Int16 >& OutParamIndex,
++ Sequence< Any >& OutParam);
+
// virtual void setValueWithDispId(DISPID dispID, const Any& Value);
// virtual Any getValueWithDispId(const OUString& sName, DISPID dispID);
@@@ -188,7 -198,10 +198,10 @@@
/** Returns the DISPID for a function or property name. If true is returned then
id contains a valid DISPID.
*/
+
bool getDispid(const OUString& sFuncName, DISPID * id);
+
- VARTYPE getUserDefinedElementType( ITypeInfo* pTypeInfo, const DWORD nHrefType );
++ VARTYPE getUserDefinedElementType( ITypeInfo* pTypeInfo, const DWORD nHrefType );
/** Gets the element type in a VARIANT like style. E.g. if desc->lptdesc contains
a VT_PTR than it is replaced by VT_BYREF and VT_SAFEARRAY is replaced by VT_ARRAY
diff --cc extensions/source/propctrlr/formmetadata.hxx
index 76ff9f5,c11797a..cc61afe
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@@ -161,6 -163,7 +161,7 @@@ namespace pc
#define PROPERTY_ID_ALLOWADDITIONS 20
#define PROPERTY_ID_ALLOWEDITS 21
#define PROPERTY_ID_ALLOWDELETIONS 22
- #define PROPERTY_ID_GROUP_NAME 23
++ #define PROPERTY_ID_GROUP_NAME 23
#define PROPERTY_ID_NAVIGATION 24
#define PROPERTY_ID_CYCLE 25
#define PROPERTY_ID_HIDDEN_VALUE 26
diff --cc extensions/source/propctrlr/formres.src
index c853723,11c08c0..1170c89
--- a/extensions/source/propctrlr/formres.src
+++ b/extensions/source/propctrlr/formres.src
@@@ -231,6 -231,10 +231,10 @@@ String RID_STR_NAM
{
Text [ en-US ] = "Name" ;
};
+ String RID_STR_GROUP_NAME
+ {
- Text [ en-US ] = "Group name" ;
++ Text [ en-US ] = "Group name" ;
+ };
String RID_STR_TABINDEX
{
Text [ en-US ] = "Tab order" ;
diff --cc extensions/source/propctrlr/formstrings.hxx
index b338653,95a57b1..04d9de1
--- a/extensions/source/propctrlr/formstrings.hxx
+++ b/extensions/source/propctrlr/formstrings.hxx
@@@ -48,6 -48,7 +48,7 @@@ namespace pc
PCR_CONSTASCII_STRING( PROPERTY_WHEEL_BEHAVIOR, "MouseWheelBehavior");
PCR_CONSTASCII_STRING( PROPERTY_TAG, "Tag");
PCR_CONSTASCII_STRING( PROPERTY_NAME, "Name");
- PCR_CONSTASCII_STRING( PROPERTY_GROUP_NAME, "GroupName");
++ PCR_CONSTASCII_STRING( PROPERTY_GROUP_NAME, "GroupName");
PCR_CONSTASCII_STRING( PROPERTY_VALUE, "Value");
PCR_CONSTASCII_STRING( PROPERTY_TEXT, "Text");
PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION, "NavigationBarMode");
diff --cc forms/source/component/GroupManager.cxx
index dfc679d,c4c8224..3ce5ad6
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@@ -318,7 -317,8 +317,8 @@@ void OGroupManager::removeFromGroupMap(
aFind->second.RemoveComponent( _xSet );
// Wenn Anzahl der Gruppenelemente == 1 ist, Gruppe deaktivieren
- if ( aFind->second.Count() == 1 )
- sal_Int32 nCount = aFind->second.Count();
- if ( nCount == 1 || nCount == 0 )
++ sal_Int32 nCount = aFind->second.Count();
++ if ( nCount == 1 || nCount == 0 )
{
OActiveGroups::iterator aActiveFind = ::std::find(
m_aActiveGroupMap.begin(),
@@@ -338,6 -338,8 +338,8 @@@
// Bei Component als PropertyChangeListener abmelden
_xSet->removePropertyChangeListener( PROPERTY_NAME, this );
- if (hasProperty(PROPERTY_GROUP_NAME, _xSet))
- _xSet->removePropertyChangeListener( PROPERTY_GROUP_NAME, this );
++ if (hasProperty(PROPERTY_GROUP_NAME, _xSet))
++ _xSet->removePropertyChangeListener( PROPERTY_GROUP_NAME, this );
if (hasProperty(PROPERTY_TABINDEX, _xSet))
_xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this );
}
@@@ -348,10 -350,23 +350,23 @@@ void SAL_CALL OGroupManager::propertyCh
// Component aus Gruppe entfernen
::rtl::OUString sGroupName;
- if (evt.PropertyName == PROPERTY_NAME)
- if (hasProperty( PROPERTY_GROUP_NAME, xSet ))
- xSet->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName;
- if (evt.PropertyName == PROPERTY_NAME) {
- if (sGroupName.getLength() > 0)
- return; // group hasn't changed; ignore this name change.
- // no GroupName; use Name as GroupNme
++ if (hasProperty( PROPERTY_GROUP_NAME, xSet ))
++ xSet->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName;
++ if (evt.PropertyName == PROPERTY_NAME) {
++ if (sGroupName.getLength() > 0)
++ return; // group hasn't changed; ignore this name change.
++ // no GroupName; use Name as GroupNme
+ evt.OldValue >>= sGroupName;
- }
- else if (evt.PropertyName == PROPERTY_GROUP_NAME) {
- evt.OldValue >>= sGroupName;
- if (sGroupName.getLength() == 0) {
- // No prior GroupName; fallback to Nme
- xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
- }
- }
++ }
++ else if (evt.PropertyName == PROPERTY_GROUP_NAME) {
+ evt.OldValue >>= sGroupName;
++ if (sGroupName.getLength() == 0) {
++ // No prior GroupName; fallback to Nme
++ xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
++ }
++ }
else
- xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
- sGroupName = GetGroupName( xSet );
++ sGroupName = GetGroupName( xSet );
removeFromGroupMap(sGroupName,xSet);
@@@ -434,8 -449,7 +449,7 @@@ void OGroupManager::InsertElement( cons
m_pCompGroup->InsertComponent( xSet );
// Component in Gruppe aufnehmen
- ::rtl::OUString sGroupName;
- xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
- ::rtl::OUString sGroupName( GetGroupName( xSet ) );
++ ::rtl::OUString sGroupName( GetGroupName( xSet ) );
OGroupArr::iterator aFind = m_aGroupArr.find(sGroupName);
@@@ -473,6 -487,8 +487,8 @@@
// Bei Component als PropertyChangeListener anmelden
xSet->addPropertyChangeListener( PROPERTY_NAME, this );
- if (hasProperty(PROPERTY_GROUP_NAME, xSet))
- xSet->addPropertyChangeListener( PROPERTY_GROUP_NAME, this );
++ if (hasProperty(PROPERTY_GROUP_NAME, xSet))
++ xSet->addPropertyChangeListener( PROPERTY_GROUP_NAME, this );
// Tabindex muss nicht jeder unterstuetzen
if (hasProperty(PROPERTY_TABINDEX, xSet))
@@@ -489,8 -505,7 +505,7 @@@ void OGroupManager::RemoveElement( cons
return;
// Component aus Gruppe entfernen
- ::rtl::OUString sGroupName;
- xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
- ::rtl::OUString sGroupName( GetGroupName( xSet ) );
++ ::rtl::OUString sGroupName( GetGroupName( xSet ) );
removeFromGroupMap(sGroupName,xSet);
}
diff --cc forms/source/component/GroupManager.hxx
index f514771f,2143c76..002f056
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@@ -217,6 -217,8 +217,8 @@@ public
void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, ::rtl::OUString& Name);
void getGroupByName(const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup);
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > getControlModels();
+
- static ::rtl::OUString GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent );
++ static ::rtl::OUString GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent );
};
diff --cc forms/source/component/RadioButton.cxx
index a3d93de,05e9bb6..2968078
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@@ -28,8 -28,11 +28,9 @@@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_forms.hxx"
#include "RadioButton.hxx"
+ #include "GroupManager.hxx"
#include "property.hxx"
-#ifndef _FRM_PROPERTY_HRC_
#include "property.hrc"
-#endif
#include "services.hxx"
#include <tools/debug.hxx>
#include <comphelper/extract.hxx>
@@@ -117,6 -120,7 +118,7 @@@ ORadioButtonModel::ORadioButtonModel(co
m_nClassId = FormComponentType::RADIOBUTTON;
m_aLabelServiceName = FRM_SUN_COMPONENT_GROUPBOX;
initValueProperty( PROPERTY_STATE, PROPERTY_ID_STATE );
- startAggregatePropertyListening( PROPERTY_GROUP_NAME );
++ startAggregatePropertyListening( PROPERTY_GROUP_NAME );
}
//------------------------------------------------------------------
@@@ -163,8 -167,12 +165,12 @@@ StringSequence SAL_CALL ORadioButtonMod
//------------------------------------------------------------------------------
void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, const Any& rValue)
{
- // mein Name
+ // my name
- ::rtl::OUString sMyName(m_aName);
+ ::rtl::OUString sMyGroup;
+ if (hasProperty(PROPERTY_GROUP_NAME, this))
+ this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sMyGroup;
+ if (sMyGroup.getLength() == 0)
+ sMyGroup = m_aName;
// meine Siblings durchiterieren
Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
@@@ -172,8 -180,9 +178,9 @@@
{
Reference<XPropertySet> xMyProps;
query_interface(static_cast<XWeak*>(this), xMyProps);
- ::rtl::OUString sCurrentName;
- for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i)
- ::rtl::OUString sCurrentGroup;
- sal_Int32 nNumSiblings = xIndexAccess->getCount();
- for (sal_Int32 i=0; i<nNumSiblings; ++i)
++ ::rtl::OUString sCurrentGroup;
++ sal_Int32 nNumSiblings = xIndexAccess->getCount();
++ for (sal_Int32 i=0; i<nNumSiblings; ++i)
{
Reference<XPropertySet> xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
if (!xSiblingProperties.is())
@@@ -190,8 -199,8 +197,8 @@@
continue;
// das 'zur selben Gruppe gehoeren' wird am Namen festgemacht
- xSiblingProperties->getPropertyValue(PROPERTY_NAME) >>= sCurrentName;
- if (sCurrentName == sMyName)
- sCurrentGroup = OGroupManager::GetGroupName( xSiblingProperties );
- if (sCurrentGroup == sMyGroup)
++ sCurrentGroup = OGroupManager::GetGroupName( xSiblingProperties );
++ if (sCurrentGroup == sMyGroup)
xSiblingProperties->setPropertyValue(rPropName, rValue);
}
}
diff --cc forms/source/inc/property.hrc
index 3eddaa3,5c44b93..c3656b8
--- a/forms/source/inc/property.hrc
+++ b/forms/source/inc/property.hrc
@@@ -60,8 -60,9 +60,11 @@@ namespace fr
#define PROPERTY_ID_INPUT_REQUIRED (PROPERTY_ID_START + 19)
#define PROPERTY_ID_WRITING_MODE (PROPERTY_ID_START + 20)
#define PROPERTY_ID_CONTEXT_WRITING_MODE (PROPERTY_ID_START + 21)
-#define PROPERTY_ID_GROUP_NAME (PROPERTY_ID_START + 22)
-#define PROPERTY_ID_VERTICAL_ALIGN (PROPERTY_ID_START + 23)
+#define PROPERTY_ID_VERTICAL_ALIGN (PROPERTY_ID_START + 22)
+#define PROPERTY_ID_GRAPHIC (PROPERTY_ID_START + 23)
++#define PROPERTY_ID_GROUP_NAME (PROPERTY_ID_START + 24)
++#define PROPERTY_ID_VERTICAL_ALIGN (PROPERTY_ID_START + 25)
+ // free
// free
// free
// free
diff --cc forms/source/misc/InterfaceContainer.cxx
index d0deb50,c2616fd..62f9001
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@@ -154,9 -154,16 +154,16 @@@ void OInterfaceContainer::impl_addVbEve
xProps->getPropertyValue( rtl::OUString::createFromAscii("DefaultControl" ) ) >>= sServiceName;
Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBAToOOEventDesc" ) ), UNO_QUERY_THROW );
- Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( m_xServiceFactory->createInstance( sServiceName ), sCodeName );
- Reference< XInterface > xInterface = m_xServiceFactory->createInstance( sServiceName );
- Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( xInterface, sCodeName );
++ Reference< XInterface > xInterface = m_xServiceFactory->createInstance( sServiceName );
++ Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( xInterface, sCodeName );
// register the vba script events
m_xEventAttacher->registerScriptEvents( i_nIndex, vbaEvents );
+
- Reference< XComponent > xComponent( xInterface, UNO_QUERY );
- if ( xComponent.is() )
- {
- xComponent->dispose();
- }
++ Reference< XComponent > xComponent( xInterface, UNO_QUERY );
++ if ( xComponent.is() )
++ {
++ xComponent->dispose();
++ }
}
while ( false );
}
commit e4ed769b795446b5a65eb5ae94ebb8db22c6bf4f
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Tue Oct 12 15:57:08 2010 +0200
Add vim/emacs modelines to all source files
Fixes #fdo30794
Based on bin/add-modelines script (originally posted in mail
1286706307.1871.1399280959 at webmail.messagingengine.com)
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 7112aaf..f85dac6 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -640,3 +641,5 @@ void BaseContainerControl::impl_cleanMemory ()
}
} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 465b916..1bc313a 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1017,3 +1018,5 @@ OMRCListenerMultiplexerHelper* BaseControl::impl_getMultiplexer()
}
} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 23e6c77..e2c3ef6 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list