e65c0fe553
Conflicts: avmedia/inc/avmedia/mediaitem.hxx avmedia/prj/build.lst avmedia/source/framework/mediaitem.cxx avmedia/source/gstreamer/gstcommon.hxx avmedia/source/gstreamer/gstframegrabber.cxx avmedia/source/gstreamer/gstframegrabber.hxx avmedia/source/gstreamer/gstmanager.cxx avmedia/source/gstreamer/gstmanager.hxx avmedia/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.hxx avmedia/source/gstreamer/gstuno.cxx avmedia/source/gstreamer/gstwindow.cxx avmedia/source/gstreamer/gstwindow.hxx avmedia/source/gstreamer/makefile.mk avmedia/source/quicktime/quicktimeuno.cxx avmedia/source/viewer/mediawindow.cxx avmedia/source/viewer/mediawindow_impl.cxx avmedia/source/viewer/mediawindow_impl.hxx avmedia/source/viewer/mediawindowbase_impl.cxx avmedia/source/win/winuno.cxx basic/inc/basic/basmgr.hxx basic/inc/basic/mybasic.hxx basic/inc/basic/process.hxx basic/inc/basic/sbmeth.hxx basic/inc/basic/sbmod.hxx basic/inc/basic/sbxdef.hxx basic/inc/basic/sbxvar.hxx basic/source/app/app.cxx basic/source/app/app.hxx basic/source/app/appbased.cxx basic/source/app/appedit.cxx basic/source/app/appwin.cxx basic/source/app/appwin.hxx basic/source/app/brkpnts.cxx basic/source/app/brkpnts.hxx basic/source/app/dialogs.cxx basic/source/app/dialogs.hxx basic/source/app/msgedit.cxx basic/source/app/mybasic.cxx basic/source/app/process.cxx basic/source/app/processw.hxx basic/source/app/textedit.cxx basic/source/basmgr/basicmanagerrepository.cxx basic/source/basmgr/basmgr.cxx basic/source/classes/disas.cxx basic/source/classes/eventatt.cxx basic/source/classes/image.cxx basic/source/classes/sb.cxx basic/source/classes/sbunoobj.cxx basic/source/classes/sbxmod.cxx basic/source/comp/codegen.cxx basic/source/comp/dim.cxx basic/source/comp/exprgen.cxx basic/source/comp/exprnode.cxx basic/source/comp/exprtree.cxx basic/source/comp/sbcomp.cxx basic/source/inc/expr.hxx basic/source/inc/object.hxx basic/source/inc/sbunoobj.hxx basic/source/runtime/dllmgr-x86.cxx basic/source/runtime/iosys.cxx basic/source/runtime/makefile.mk basic/source/runtime/methods.cxx basic/source/runtime/methods1.cxx basic/source/runtime/runtime.cxx basic/source/runtime/stdobj.cxx basic/source/runtime/step0.cxx basic/source/runtime/step1.cxx basic/source/runtime/step2.cxx basic/source/sbx/sbxarray.cxx basic/source/sbx/sbxbase.cxx basic/source/sbx/sbxbool.cxx basic/source/sbx/sbxbyte.cxx basic/source/sbx/sbxcoll.cxx basic/source/sbx/sbxconv.hxx basic/source/sbx/sbxcurr.cxx basic/source/sbx/sbxexec.cxx basic/source/sbx/sbxint.cxx basic/source/sbx/sbxobj.cxx basic/source/sbx/sbxscan.cxx basic/source/sbx/sbxstr.cxx basic/source/sbx/sbxvals.cxx basic/source/sbx/sbxvalue.cxx basic/source/sbx/sbxvar.cxx basic/workben/mgrtest.cxx configmgr/prj/build.lst configmgr/source/access.cxx configmgr/source/configurationprovider.cxx configmgr/source/defaultprovider.cxx configmgr/source/pad.cxx configmgr/source/services.cxx configmgr/source/update.cxx configmgr/source/xmlreader.cxx configmgr/source/xmlreader.hxx connectivity/prj/build.lst connectivity/qa/complex/connectivity/TestCase.java connectivity/source/cpool/Zregistration.cxx connectivity/source/drivers/adabas/Bservices.cxx connectivity/source/drivers/ado/Aservices.cxx connectivity/source/drivers/calc/Cservices.cxx connectivity/source/drivers/calc/makefile.mk connectivity/source/drivers/dbase/DIndex.cxx connectivity/source/drivers/dbase/DIndexIter.cxx connectivity/source/drivers/dbase/DNoException.cxx connectivity/source/drivers/dbase/DTable.cxx connectivity/source/drivers/dbase/Dservices.cxx connectivity/source/drivers/dbase/dindexnode.cxx connectivity/source/drivers/evoab/LNoException.cxx connectivity/source/drivers/evoab/LServices.cxx connectivity/source/drivers/evoab2/NServices.cxx connectivity/source/drivers/file/FNoException.cxx connectivity/source/drivers/file/FPreparedStatement.cxx connectivity/source/drivers/file/FResultSet.cxx connectivity/source/drivers/file/FStatement.cxx connectivity/source/drivers/file/quotedstring.cxx connectivity/source/drivers/flat/ETable.cxx connectivity/source/drivers/flat/Eservices.cxx connectivity/source/drivers/hsqldb/Hservices.cxx connectivity/source/drivers/jdbc/jservices.cxx connectivity/source/drivers/kab/KServices.cxx connectivity/source/drivers/macab/MacabServices.cxx connectivity/source/drivers/mozab/MResultSet.cxx connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx connectivity/source/drivers/mysql/Yservices.cxx connectivity/source/drivers/odbc/OFunctions.cxx connectivity/source/drivers/odbc/oservices.cxx connectivity/source/inc/dbase/DIndexPage.hxx connectivity/source/inc/file/FTable.hxx connectivity/source/manager/mregistration.cxx connectivity/source/parse/PColumn.cxx desktop/prj/build.lst desktop/qa/deployment_misc/test_dp_version.cxx desktop/source/app/app.cxx desktop/source/app/appfirststart.cxx desktop/source/app/cmdlineargs.cxx desktop/source/app/cmdlineargs.hxx desktop/source/app/sofficemain.cxx desktop/source/deployment/gui/dp_gui.hrc desktop/source/deployment/gui/dp_gui_dialog2.cxx desktop/source/deployment/gui/dp_gui_dialog2.hxx desktop/source/deployment/gui/dp_gui_updatedialog.cxx desktop/source/deployment/gui/dp_gui_updatedialog.hxx desktop/source/deployment/manager/dp_extensionmanager.cxx desktop/source/deployment/manager/dp_extensionmanager.hxx desktop/source/deployment/misc/dp_misc.src desktop/source/deployment/registry/component/dp_component.cxx desktop/source/deployment/registry/configuration/dp_configuration.cxx desktop/source/deployment/registry/dp_backend.cxx desktop/source/deployment/registry/help/dp_help.cxx desktop/source/deployment/registry/script/dp_script.cxx desktop/source/migration/pages.cxx desktop/source/migration/pages.hxx desktop/source/migration/wizard.cxx desktop/source/migration/wizard.hrc desktop/source/migration/wizard.hxx desktop/source/migration/wizard.src desktop/source/pkgchk/unopkg/unopkg_shared.h desktop/source/so_comp/services.cxx desktop/source/splash/makefile.mk desktop/source/splash/services_spl.cxx desktop/source/splash/splash.cxx drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx editeng/inc/editeng/adjitem.hxx editeng/inc/editeng/bolnitem.hxx editeng/inc/editeng/borderline.hxx editeng/inc/editeng/boxitem.hxx editeng/inc/editeng/brkitem.hxx editeng/inc/editeng/brshitem.hxx editeng/inc/editeng/bulitem.hxx editeng/inc/editeng/charreliefitem.hxx editeng/inc/editeng/charrotateitem.hxx editeng/inc/editeng/charscaleitem.hxx editeng/inc/editeng/cmapitem.hxx editeng/inc/editeng/colritem.hxx editeng/inc/editeng/crsditem.hxx editeng/inc/editeng/editdata.hxx editeng/inc/editeng/editeng.hxx editeng/inc/editeng/editobj.hxx editeng/inc/editeng/editstat.hxx editeng/inc/editeng/editview.hxx editeng/inc/editeng/emphitem.hxx editeng/inc/editeng/escpitem.hxx editeng/inc/editeng/fhgtitem.hxx editeng/inc/editeng/flstitem.hxx editeng/inc/editeng/fontitem.hxx editeng/inc/editeng/frmdiritem.hxx editeng/inc/editeng/fwdtitem.hxx editeng/inc/editeng/hyznitem.hxx editeng/inc/editeng/kernitem.hxx editeng/inc/editeng/langitem.hxx editeng/inc/editeng/lrspitem.hxx editeng/inc/editeng/lspcitem.hxx editeng/inc/editeng/numitem.hxx editeng/inc/editeng/outliner.hxx editeng/inc/editeng/paravertalignitem.hxx editeng/inc/editeng/pmdlitem.hxx editeng/inc/editeng/postitem.hxx editeng/inc/editeng/protitem.hxx editeng/inc/editeng/shaditem.hxx editeng/inc/editeng/sizeitem.hxx editeng/inc/editeng/svxacorr.hxx editeng/inc/editeng/svxfont.hxx editeng/inc/editeng/svxrtf.hxx editeng/inc/editeng/swafopt.hxx editeng/inc/editeng/tstpitem.hxx editeng/inc/editeng/twolinesitem.hxx editeng/inc/editeng/txtrange.hxx editeng/inc/editeng/udlnitem.hxx editeng/inc/editeng/ulspitem.hxx editeng/inc/editeng/wghtitem.hxx editeng/inc/editeng/writingmodeitem.hxx editeng/inc/editeng/xmlcnitm.hxx editeng/inc/helpid.hrc editeng/inc/pch/precompiled_editeng.hxx editeng/source/editeng/editdbg.cxx editeng/source/editeng/editdoc.cxx editeng/source/editeng/editdoc.hxx editeng/source/editeng/editdoc2.cxx editeng/source/editeng/editeng.cxx editeng/source/editeng/editobj.cxx editeng/source/editeng/editobj2.hxx editeng/source/editeng/editsel.cxx editeng/source/editeng/editundo.cxx editeng/source/editeng/editundo.hxx editeng/source/editeng/editview.cxx editeng/source/editeng/edtspell.hxx editeng/source/editeng/eehtml.cxx editeng/source/editeng/eehtml.hxx editeng/source/editeng/eeobj.cxx editeng/source/editeng/eerdll.cxx editeng/source/editeng/eertfpar.cxx editeng/source/editeng/impedit.cxx editeng/source/editeng/impedit.hxx editeng/source/editeng/impedit2.cxx editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit4.cxx editeng/source/editeng/impedit5.cxx editeng/source/editeng/makefile.mk editeng/source/items/bulitem.cxx editeng/source/items/charhiddenitem.cxx editeng/source/items/flditem.cxx editeng/source/items/frmitems.cxx editeng/source/items/makefile.mk editeng/source/items/numitem.cxx editeng/source/items/paraitem.cxx editeng/source/items/svxfont.cxx editeng/source/items/textitem.cxx editeng/source/items/writingmodeitem.cxx editeng/source/items/xmlcnitm.cxx editeng/source/misc/SvXMLAutoCorrectImport.cxx editeng/source/misc/svxacorr.cxx editeng/source/misc/txtrange.cxx editeng/source/misc/unolingu.cxx editeng/source/outliner/outleeng.cxx editeng/source/outliner/outliner.cxx editeng/source/outliner/outlundo.hxx editeng/source/outliner/outlvw.cxx editeng/source/outliner/paralist.cxx editeng/source/outliner/paralist.hxx editeng/source/rtf/rtfgrf.cxx editeng/source/rtf/rtfitem.cxx editeng/source/rtf/svxrtf.cxx editeng/source/uno/unoipset.cxx editeng/util/makefile.mk embeddedobj/prj/build.lst embeddedobj/source/commonembedding/miscobj.cxx eventattacher/prj/build.lst fileaccess/source/FileAccess.cxx formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/token.hxx formula/inc/formula/tokenarray.hxx formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/token.cxx formula/source/ui/dlg/FormulaHelper.cxx formula/source/ui/dlg/formula.cxx formula/source/ui/dlg/parawin.cxx formula/source/ui/dlg/structpg.cxx fpicker/prj/d.lst fpicker/source/aqua/FPentry.cxx fpicker/source/office/OfficeControlAccess.cxx fpicker/source/office/iodlg.cxx fpicker/source/office/iodlg.hxx fpicker/source/office/iodlg.src fpicker/source/office/iodlgimp.cxx fpicker/source/unx/gnome/FPentry.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkPicker.cxx fpicker/source/unx/kde4/KDE4FPEntry.cxx fpicker/source/win32/filepicker/FPentry.cxx framework/AllLangResTarget_fwe.mk framework/inc/dispatch/interaction.hxx framework/inc/framework/addonmenu.hxx framework/inc/framework/addonsoptions.hxx framework/inc/framework/bmkmenu.hxx framework/inc/framework/imageproducer.hxx framework/inc/framework/sfxhelperfunctions.hxx framework/inc/framework/statusbarconfiguration.hxx framework/inc/framework/titlehelper.hxx framework/inc/framework/toolboxconfiguration.hxx framework/inc/threadhelp/lockhelper.hxx framework/inc/xml/eventsdocumenthandler.hxx framework/inc/xml/statusbardocumenthandler.hxx framework/inc/xml/toolboxconfiguration.hxx framework/inc/xml/toolboxconfigurationdefines.hxx framework/inc/xml/toolboxdocumenthandler.hxx framework/prj/build.lst framework/qa/complex/ModuleManager/makefile.mk framework/qa/complex/accelerators/makefile.mk framework/qa/complex/framework/recovery/makefile.mk framework/qa/complex/imageManager/_XInitialization.java framework/source/classes/menumanager.cxx framework/source/dispatch/interaction.cxx framework/source/fwe/classes/bmkmenu.cxx framework/source/fwe/helper/actiontriggerhelper.cxx framework/source/fwe/helper/imageproducer.cxx framework/source/fwe/xml/menuconfiguration.cxx framework/source/fwe/xml/toolboxdocumenthandler.cxx framework/source/helper/uiconfigelementwrapperbase.cxx framework/source/helper/uielementwrapperbase.cxx framework/source/inc/pattern/window.hxx framework/source/jobs/jobdata.cxx framework/source/layoutmanager/layoutmanager.cxx framework/source/layoutmanager/panel.hxx framework/source/loadenv/loadenv.cxx framework/source/register/registerservices.cxx framework/source/services/menudocumenthandler.cxx framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx framework/source/uiconfiguration/uiconfigurationmanager.cxx framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx framework/source/uielement/addonstoolbarmanager.cxx framework/source/uielement/controlmenucontroller.cxx framework/source/uielement/fontsizemenucontroller.cxx framework/source/uielement/imagebuttontoolbarcontroller.cxx framework/source/uielement/macrosmenucontroller.cxx framework/source/uielement/menubarmanager.cxx framework/source/uielement/newmenucontroller.cxx framework/source/uielement/togglebuttontoolbarcontroller.cxx framework/source/uielement/toolbarmanager.cxx framework/source/uielement/toolbarsmenucontroller.cxx framework/test/makefile.mk framework/test/threadtest/makefile.mk framework/test/typecfg/makefile.mk framework/util/guiapps/makefile.mk framework/util/makefile.mk idl/inc/bastype.hxx idl/inc/hash.hxx idl/inc/lex.hxx idl/inc/module.hxx idl/inc/object.hxx idl/inc/slot.hxx idl/inc/types.hxx idl/source/cmptools/hash.cxx idl/source/cmptools/lex.cxx idl/source/objects/basobj.cxx idl/source/objects/bastype.cxx idl/source/objects/module.cxx idl/source/objects/object.cxx idl/source/objects/slot.cxx idl/source/objects/types.cxx idl/source/prj/command.cxx idl/source/prj/database.cxx idl/source/prj/globals.cxx idl/source/prj/svidl.cxx linguistic/inc/linguistic/misc.hxx linguistic/prj/build.lst linguistic/source/convdic.cxx linguistic/source/convdiclist.cxx linguistic/source/dicimp.cxx linguistic/source/dlistimp.cxx linguistic/source/gciterator.cxx linguistic/source/iprcache.cxx linguistic/source/lngopt.cxx linguistic/source/lngprophelp.cxx linguistic/source/lngsvcmgr.cxx linguistic/source/lngsvcmgr.hxx linguistic/source/misc2.cxx linguistic/workben/sprophelp.cxx officecfg/registry/data/org/openoffice/VCL.xcu officecfg/util/makefile.mk oovbaapi/ooo/vba/XApplicationBase.idl oovbaapi/ooo/vba/XVBAAppService.idl oovbaapi/ooo/vba/XVBADocService.idl oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/excel/XRange.idl oovbaapi/ooo/vba/excel/XWorkbook.idl oovbaapi/ooo/vba/excel/XWorksheet.idl oovbaapi/ooo/vba/word/XApplication.idl oovbaapi/ooo/vba/word/XGlobals.idl oovbaapi/ooo/vba/word/XTableOfContents.idl readlicense_oo/prj/build.lst scripting/prj/build.lst scripting/prj/d.lst scripting/source/basprov/basprov.cxx scripting/source/basprov/basscript.cxx scripting/source/basprov/basscript.hxx scripting/source/dlgprov/dlgprov.cxx scripting/source/inc/util/util.hxx scripting/source/protocolhandler/scripthandler.cxx scripting/source/provider/ProviderCache.cxx scripting/source/pyprov/makefile.mk scripting/source/runtimemgr/ScriptNameResolverImpl.cxx scripting/source/runtimemgr/ScriptRuntimeManager.cxx scripting/source/runtimemgr/StorageBridge.cxx scripting/source/storage/ScriptMetadataImporter.cxx scripting/source/storage/ScriptSecurityManager.cxx scripting/source/storage/ScriptStorage.cxx scripting/source/storage/ScriptStorageManager.cxx sfx2/inc/about.hxx sfx2/inc/brokenpackageint.hxx sfx2/inc/docvor.hxx sfx2/inc/pch/precompiled_sfx2.hxx sfx2/inc/sfx2/app.hxx sfx2/inc/sfx2/basmgr.hxx sfx2/inc/sfx2/bindings.hxx sfx2/inc/sfx2/childwin.hxx sfx2/inc/sfx2/ctrlitem.hxx sfx2/inc/sfx2/dinfdlg.hxx sfx2/inc/sfx2/dispatch.hxx sfx2/inc/sfx2/docfilt.hxx sfx2/inc/sfx2/evntconf.hxx sfx2/inc/sfx2/fcontnr.hxx sfx2/inc/sfx2/frame.hxx sfx2/inc/sfx2/imagemgr.hxx sfx2/inc/sfx2/imgmgr.hxx sfx2/inc/sfx2/linksrc.hxx sfx2/inc/sfx2/macrconf.hxx sfx2/inc/sfx2/macropg.hxx sfx2/inc/sfx2/mnuitem.hxx sfx2/inc/sfx2/mnumgr.hxx sfx2/inc/sfx2/module.hxx sfx2/inc/sfx2/msg.hxx sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/passwd.hxx sfx2/inc/sfx2/prnmon.hxx sfx2/inc/sfx2/request.hxx sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfxbasemodel.hxx sfx2/inc/sfx2/sfxhtml.hxx sfx2/inc/sfx2/sfxresid.hxx sfx2/inc/sfx2/sfxsids.hrc sfx2/inc/sfx2/sfxuno.hxx sfx2/inc/sfx2/shell.hxx sfx2/inc/sfx2/stbitem.hxx sfx2/inc/sfx2/styfitem.hxx sfx2/inc/sfx2/tabdlg.hxx sfx2/inc/sfx2/tbxctrl.hxx sfx2/inc/sfx2/tplpitem.hxx sfx2/inc/sfx2/viewfrm.hxx sfx2/inc/sfx2/viewsh.hxx sfx2/inc/sfxbasic.hxx sfx2/inc/sorgitm.hxx sfx2/prj/build.lst sfx2/qa/complex/docinfo/makefile.mk sfx2/qa/cppunit/makefile.mk sfx2/sdi/makefile.mk sfx2/source/appl/app.cxx sfx2/source/appl/app.hrc sfx2/source/appl/app.src sfx2/source/appl/appbas.cxx sfx2/source/appl/appcfg.cxx sfx2/source/appl/appchild.cxx sfx2/source/appl/appmain.cxx sfx2/source/appl/appmisc.cxx sfx2/source/appl/appopen.cxx sfx2/source/appl/appquit.cxx sfx2/source/appl/appserv.cxx sfx2/source/appl/appuno.cxx sfx2/source/appl/childwin.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/helpinterceptor.cxx sfx2/source/appl/imagemgr.cxx sfx2/source/appl/impldde.cxx sfx2/source/appl/impldde.hxx sfx2/source/appl/linkmgr2.cxx sfx2/source/appl/lnkbase2.cxx sfx2/source/appl/makefile.mk sfx2/source/appl/module.cxx sfx2/source/appl/newhelp.cxx sfx2/source/appl/opengrf.cxx sfx2/source/appl/sfxdll.cxx sfx2/source/appl/sfxhelp.cxx sfx2/source/appl/shutdownicon.cxx sfx2/source/appl/shutdowniconunx.cxx sfx2/source/appl/workwin.cxx sfx2/source/bastyp/fltfnc.cxx sfx2/source/bastyp/frmhtml.cxx sfx2/source/bastyp/frmhtmlw.cxx sfx2/source/bastyp/helper.cxx sfx2/source/bastyp/minarray.cxx sfx2/source/bastyp/progress.cxx sfx2/source/bastyp/sfxhtml.cxx sfx2/source/config/evntconf.cxx sfx2/source/control/bindings.cxx sfx2/source/control/ctrlitem.cxx sfx2/source/control/dispatch.cxx sfx2/source/control/macrconf.cxx sfx2/source/control/macro.cxx sfx2/source/control/makefile.mk sfx2/source/control/minfitem.cxx sfx2/source/control/msg.cxx sfx2/source/control/msgpool.cxx sfx2/source/control/objface.cxx sfx2/source/control/request.cxx sfx2/source/control/shell.cxx sfx2/source/control/sorgitm.cxx sfx2/source/dialog/about.cxx sfx2/source/dialog/basedlgs.cxx sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dinfedt.cxx sfx2/source/dialog/dockwin.cxx sfx2/source/dialog/filedlghelper.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodelapi.cxx sfx2/source/dialog/makefile.mk sfx2/source/dialog/mgetempl.cxx sfx2/source/dialog/passwd.cxx sfx2/source/dialog/passwd.hrc sfx2/source/dialog/printopt.cxx sfx2/source/dialog/securitypage.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/styfitem.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/taskpane.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/dialog/versdlg.cxx sfx2/source/doc/QuerySaveDocument.cxx sfx2/source/doc/SfxDocumentMetaData.cxx sfx2/source/doc/applet.cxx sfx2/source/doc/doc.hrc sfx2/source/doc/doc.src sfx2/source/doc/docfile.cxx sfx2/source/doc/docinf.cxx sfx2/source/doc/doctempl.cxx sfx2/source/doc/doctemplates.cxx sfx2/source/doc/docvor.cxx sfx2/source/doc/guisaveas.cxx sfx2/source/doc/makefile.mk sfx2/source/doc/objcont.cxx sfx2/source/doc/objitem.cxx sfx2/source/doc/objmisc.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/printhelper.cxx sfx2/source/doc/sfxacldetect.cxx sfx2/source/doc/sfxbasemodel.cxx sfx2/source/inc/applet.hxx sfx2/source/inc/fltoptint.hxx sfx2/source/inc/sfxlocal.hrc sfx2/source/inc/virtmenu.hxx sfx2/source/inc/workwin.hxx sfx2/source/menu/mnuitem.cxx sfx2/source/menu/objmnctl.cxx sfx2/source/menu/virtmenu.cxx sfx2/source/notify/eventsupplier.cxx sfx2/source/notify/makefile.mk sfx2/source/toolbox/imgmgr.cxx sfx2/source/toolbox/tbxitem.cxx sfx2/source/view/frame.cxx sfx2/source/view/orgmgr.cxx sfx2/source/view/printer.cxx sfx2/source/view/prnmon.cxx sfx2/source/view/viewfrm.cxx sfx2/source/view/viewprn.cxx sfx2/source/view/viewsh.cxx sfx2/util/makefile.mk sfx2/workben/custompanel/makefile.mk shell/source/backends/desktopbe/desktopbackend.cxx shell/source/backends/gconfbe/gconfbackend.cxx shell/source/backends/kde4be/kde4backend.cxx shell/source/backends/kdebe/kdebackend.cxx shell/source/win32/SysShentry.cxx shell/source/win32/shlxthandler/propsheets/propsheets.cxx shell/source/win32/simplemail/smplmailentry.cxx svx/inc/float3d.hrc svx/inc/fmhelp.hrc svx/inc/globlmn_tmpl.hrc svx/inc/helpid.hrc svx/inc/pch/precompiled_svx.hxx svx/inc/sjctrl.hxx svx/inc/srchitem.hxx svx/inc/svdibrow.hxx svx/inc/svx/SmartTagItem.hxx svx/inc/svx/algitem.hxx svx/inc/svx/camera3d.hxx svx/inc/svx/chrtitem.hxx svx/inc/svx/clipfmtitem.hxx svx/inc/svx/ctredlin.hxx svx/inc/svx/dbtoolsclient.hxx svx/inc/svx/deflt3d.hxx svx/inc/svx/dialogs.hrc svx/inc/svx/drawitem.hxx svx/inc/svx/e3ditem.hxx svx/inc/svx/extrud3d.hxx svx/inc/svx/flagsdef.hxx svx/inc/svx/float3d.hxx svx/inc/svx/frmsel.hxx svx/inc/svx/gallery.hxx svx/inc/svx/gallery1.hxx svx/inc/svx/galtheme.hxx svx/inc/svx/grfcrop.hxx svx/inc/svx/hdft.hxx svx/inc/svx/hlnkitem.hxx svx/inc/svx/hyprlink.hxx svx/inc/svx/itemwin.hxx svx/inc/svx/lathe3d.hxx svx/inc/svx/linkwarn.hxx svx/inc/svx/modctrl.hxx svx/inc/svx/msdffdef.hxx svx/inc/svx/obj3d.hxx svx/inc/svx/optgenrl.hxx svx/inc/svx/optgrid.hxx svx/inc/svx/pageitem.hxx svx/inc/svx/paraprev.hxx svx/inc/svx/postattr.hxx svx/inc/svx/rotmodit.hxx svx/inc/svx/ruler.hxx svx/inc/svx/rulritem.hxx svx/inc/svx/scene3d.hxx svx/inc/svx/sdasaitm.hxx svx/inc/svx/sdasitm.hxx svx/inc/svx/sdggaitm.hxx svx/inc/svx/sdmetitm.hxx svx/inc/svx/sdtaaitm.hxx svx/inc/svx/sdtaditm.hxx svx/inc/svx/sdtaitm.hxx svx/inc/svx/sdtakitm.hxx svx/inc/svx/sdtfchim.hxx svx/inc/svx/sdtfsitm.hxx svx/inc/svx/srchdlg.hxx svx/inc/svx/svddrag.hxx svx/inc/svx/svdetc.hxx svx/inc/svx/svdglue.hxx svx/inc/svx/svdhlpln.hxx svx/inc/svx/svdlayer.hxx svx/inc/svx/svdmark.hxx svx/inc/svx/svdmodel.hxx svx/inc/svx/svdoashp.hxx svx/inc/svx/svdobj.hxx svx/inc/svx/svdocirc.hxx svx/inc/svx/svdoedge.hxx svx/inc/svx/svdogrp.hxx svx/inc/svx/svdomeas.hxx svx/inc/svx/svdoole2.hxx svx/inc/svx/svdorect.hxx svx/inc/svx/svdotable.hxx svx/inc/svx/svdotext.hxx svx/inc/svx/svdovirt.hxx svx/inc/svx/svdpage.hxx svx/inc/svx/svdsnpv.hxx svx/inc/svx/svdtrans.hxx svx/inc/svx/svdundo.hxx svx/inc/svx/svimbase.hxx svx/inc/svx/svx3ditems.hxx svx/inc/svx/svxdlg.hxx svx/inc/svx/sxcikitm.hxx svx/inc/svx/sxekitm.hxx svx/inc/svx/sxelditm.hxx svx/inc/svx/sxenditm.hxx svx/inc/svx/sxmkitm.hxx svx/inc/svx/sxmtpitm.hxx svx/inc/svx/sxmuitm.hxx svx/inc/svx/tabarea.hxx svx/inc/svx/tabline.hxx svx/inc/svx/unoprov.hxx svx/inc/svx/viewlayoutitem.hxx svx/inc/svx/xbitmap.hxx svx/inc/svx/xbtmpit.hxx svx/inc/svx/xcolit.hxx svx/inc/svx/xfillit0.hxx svx/inc/svx/xflclit.hxx svx/inc/svx/xflftrit.hxx svx/inc/svx/xflgrit.hxx svx/inc/svx/xflhtit.hxx svx/inc/svx/xftadit.hxx svx/inc/svx/xftsfit.hxx svx/inc/svx/xftshit.hxx svx/inc/svx/xlineit0.hxx svx/inc/svx/xlinjoit.hxx svx/inc/svx/xlnclit.hxx svx/inc/svx/xlndsit.hxx svx/inc/svx/xlnedcit.hxx svx/inc/svx/xlnedit.hxx svx/inc/svx/xlnedwit.hxx svx/inc/svx/xlnstcit.hxx svx/inc/svx/xlnstit.hxx svx/inc/svx/xlnstwit.hxx svx/inc/svx/xlnwtit.hxx svx/inc/svx/xtextit0.hxx svx/inc/svx/zoomitem.hxx svx/inc/svx/zoomslideritem.hxx svx/inc/xpolyimp.hxx svx/inc/zoom_def.hxx svx/prj/d.lst svx/source/accessibility/AccessibleShape.cxx svx/source/accessibility/DescriptionGenerator.cxx svx/source/customshapes/EnhancedCustomShapeEngine.cxx svx/source/customshapes/EnhancedCustomShapeFontWork.cxx svx/source/dialog/_bmpmask.cxx svx/source/dialog/_contdlg.cxx svx/source/dialog/connctrl.cxx svx/source/dialog/contwnd.cxx svx/source/dialog/ctredlin.cxx svx/source/dialog/ctredlin.hrc svx/source/dialog/ctredlin.src svx/source/dialog/dialcontrol.cxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/docrecovery.cxx svx/source/dialog/fntctrl.cxx svx/source/dialog/fontwork.cxx svx/source/dialog/frmsel.cxx svx/source/dialog/graphctl.cxx svx/source/dialog/grfflt.cxx svx/source/dialog/hdft.cxx svx/source/dialog/hyperdlg.cxx svx/source/dialog/hyprdlg.hxx svx/source/dialog/hyprlink.cxx svx/source/dialog/hyprlink.hxx svx/source/dialog/hyprlink.src svx/source/dialog/imapdlg.cxx svx/source/dialog/imapwnd.cxx svx/source/dialog/linkwarn.hrc svx/source/dialog/makefile.mk svx/source/dialog/optgrid.cxx svx/source/dialog/orienthelper.cxx svx/source/dialog/pagectrl.cxx svx/source/dialog/prtqry.cxx svx/source/dialog/rlrcitem.cxx svx/source/dialog/rubydialog.cxx svx/source/dialog/rulritem.cxx svx/source/dialog/simptabl.cxx svx/source/dialog/srchdlg.cxx svx/source/dialog/svxbmpnumvalueset.cxx svx/source/dialog/svxruler.cxx svx/source/dialog/swframeexample.cxx svx/source/engine3d/float3d.cxx svx/source/engine3d/float3d.src svx/source/engine3d/svx3ditems.cxx svx/source/fmcomp/gridctrl.cxx svx/source/fmcomp/trace.cxx svx/source/form/ParseContext.cxx svx/source/form/datanavi.cxx svx/source/form/filtnav.cxx svx/source/form/fmexch.cxx svx/source/form/fmexpl.cxx svx/source/form/fmobjfac.cxx svx/source/form/fmpage.cxx svx/source/form/fmshell.cxx svx/source/form/fmshimp.cxx svx/source/form/fmsrcimp.cxx svx/source/form/fmvwimp.cxx svx/source/form/makefile.mk svx/source/form/tabwin.cxx svx/source/form/tbxform.cxx svx/source/form/typemap.cxx svx/source/gallery2/galbrws1.cxx svx/source/gallery2/galbrws2.cxx svx/source/gallery2/galexpl.cxx svx/source/gallery2/gallery1.cxx svx/source/gallery2/galtheme.cxx svx/source/gallery2/makefile.mk svx/source/gengal/gengal.cxx svx/source/gengal/makefile.mk svx/source/inc/fmgroup.hxx svx/source/intro/about_ooo.hrc svx/source/intro/iso.src svx/source/intro/ooo.src svx/source/items/SmartTagItem.cxx svx/source/items/algitem.cxx svx/source/items/chrtitem.cxx svx/source/items/clipfmtitem.cxx svx/source/items/customshapeitem.cxx svx/source/items/drawitem.cxx svx/source/items/e3ditem.cxx svx/source/items/grfitem.cxx svx/source/items/hlnkitem.cxx svx/source/items/makefile.mk svx/source/items/pageitem.cxx svx/source/items/rotmodit.cxx svx/source/items/viewlayoutitem.cxx svx/source/items/zoomitem.cxx svx/source/items/zoomslideritem.cxx svx/source/src/app.hrc svx/source/stbctrls/makefile.mk svx/source/stbctrls/modctrl.cxx svx/source/stbctrls/xmlsecctrl.cxx svx/source/stbctrls/zoomctrl.cxx svx/source/svdraw/clonelist.cxx svx/source/svdraw/svdattr.cxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdedtv2.cxx svx/source/svdraw/svdedxv.cxx svx/source/svdraw/svdetc.cxx svx/source/svdraw/svdfmtf.cxx svx/source/svdraw/svdfmtf.hxx svx/source/svdraw/svdglue.cxx svx/source/svdraw/svdhdl.cxx svx/source/svdraw/svdhlpln.cxx svx/source/svdraw/svdibrow.cxx svx/source/svdraw/svdlayer.cxx svx/source/svdraw/svdmodel.cxx svx/source/svdraw/svdoashp.cxx svx/source/svdraw/svdobj.cxx svx/source/svdraw/svdocapt.cxx svx/source/svdraw/svdocirc.cxx svx/source/svdraw/svdoedge.cxx svx/source/svdraw/svdograf.cxx svx/source/svdraw/svdogrp.cxx svx/source/svdraw/svdomeas.cxx svx/source/svdraw/svdomedia.cxx svx/source/svdraw/svdopath.cxx svx/source/svdraw/svdotext.cxx svx/source/svdraw/svdotxdr.cxx svx/source/svdraw/svdotxed.cxx svx/source/svdraw/svdotxfl.cxx svx/source/svdraw/svdotxln.cxx svx/source/svdraw/svdotxtr.cxx svx/source/svdraw/svdoutl.cxx svx/source/svdraw/svdpage.cxx svx/source/svdraw/svdpagv.cxx svx/source/svdraw/svdpntv.cxx svx/source/svdraw/svdpoev.cxx svx/source/svdraw/svdsnpv.cxx svx/source/svdraw/svdstr.src svx/source/svdraw/svdtrans.cxx svx/source/svdraw/svdundo.cxx svx/source/svdraw/svdview.cxx svx/source/svdraw/svdxcgv.cxx svx/source/table/svdotable.cxx svx/source/tbxctrls/colorwindow.hxx svx/source/tbxctrls/extrusioncontrols.cxx svx/source/tbxctrls/fillctrl.cxx svx/source/tbxctrls/grafctrl.cxx svx/source/tbxctrls/itemwin.cxx svx/source/tbxctrls/layctrl.cxx svx/source/tbxctrls/lboxctrl.cxx svx/source/tbxctrls/linectrl.cxx svx/source/tbxctrls/tbcontrl.cxx svx/source/tbxctrls/verttexttbxctrl.cxx svx/source/unodraw/unomod.cxx svx/source/unodraw/unopage.cxx svx/source/unodraw/unoprov.cxx svx/source/unodraw/unoshape.cxx svx/source/unodraw/unoshtxt.cxx svx/source/xml/xmlxtexp.cxx svx/source/xoutdev/_xpoly.cxx svx/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr2.cxx svx/source/xoutdev/xattrbmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/util/makefile.mk svx/workben/edittest.cxx sysui/desktop/productversion.mk ucb/prj/build.lst ucb/source/cacher/cacheserv.cxx ucb/source/core/ucb1.component ucb/source/core/ucbserv.cxx ucb/source/core/ucbstore.cxx ucb/source/core/ucbstore.hxx ucb/source/sorter/sortmain.cxx ucb/source/ucp/file/prov.cxx ucb/source/ucp/file/shell.cxx ucb/source/ucp/ftp/ftpservices.cxx ucb/source/ucp/gio/gio_provider.cxx ucb/source/ucp/gvfs/gvfs_provider.cxx ucb/source/ucp/hierarchy/hierarchyservices.cxx ucb/source/ucp/odma/odma_lib.cxx ucb/source/ucp/odma/odma_services.cxx ucb/source/ucp/package/pkgservices.cxx ucb/source/ucp/tdoc/tdoc_services.cxx ucb/source/ucp/webdav/ContentProperties.cxx ucb/source/ucp/webdav/NeonHeadRequest.cxx ucb/source/ucp/webdav/webdavcontent.cxx ucb/source/ucp/webdav/webdavservices.cxx uui/source/iahndl.cxx uui/source/iahndl.hxx uui/source/loginerr.hxx uui/source/nameclashdlg.hxx uui/source/passcrtdlg.cxx uui/source/passworddlg.cxx uui/source/passworddlg.hxx uui/source/services.cxx vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/prj/build.lst vbahelper/prj/d.lst vbahelper/source/msforms/makefile.mk vbahelper/source/msforms/vbauserform.cxx vbahelper/source/vbahelper/makefile.mk vbahelper/source/vbahelper/vbaapplicationbase.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbadocumentbase.cxx vbahelper/source/vbahelper/vbadocumentsbase.cxx vbahelper/source/vbahelper/vbahelper.cxx vbahelper/util/makefile.mk xmlhelp/source/cxxhelp/provider/databases.cxx xmlhelp/source/cxxhelp/provider/services.cxx xmlhelp/source/treeview/tvfactory.cxx xmloff/JunitTest_xmloff_unoapi.mk xmloff/inc/functional.hxx xmloff/inc/xmloff/formlayerexport.hxx xmloff/inc/xmloff/formlayerimport.hxx xmloff/inc/xmloff/functional.hxx xmloff/inc/xmloff/shapeimport.hxx xmloff/inc/xmloff/xmlcnitm.hxx xmloff/inc/xmloff/xmlnumfi.hxx xmloff/prj/build.lst xmloff/source/chart/SchXMLChartContext.cxx xmloff/source/chart/SchXMLExport.cxx xmloff/source/chart/SchXMLImport.cxx xmloff/source/chart/SchXMLLegendContext.hxx xmloff/source/chart/SchXMLPlotAreaContext.cxx xmloff/source/core/xmluconv.cxx xmloff/source/draw/sdxmlexp.cxx xmloff/source/draw/shapeexport4.cxx xmloff/source/draw/ximp3dobject.cxx xmloff/source/draw/ximp3dscene.cxx xmloff/source/forms/formlayerexport.cxx xmloff/source/forms/formlayerimport.cxx xmloff/source/forms/handler/vcl_time_handler.hxx xmloff/source/forms/layerimport.cxx xmloff/source/forms/layerimport.hxx xmloff/source/forms/property_meta_data.hxx xmloff/source/style/PageHeaderFooterContext.cxx xmloff/source/style/PageMasterStyleMap.cxx xmloff/source/style/prstylei.cxx xmloff/source/style/xmlimppr.cxx xmloff/source/style/xmlnumfi.cxx xmloff/source/style/xmlstyle.cxx xmloff/source/table/tabledesignsimporter.cxx xmloff/source/text/XMLTextNumRuleInfo.cxx xmloff/source/text/XMLTextShapeStyleContext.cxx xmloff/source/text/txtstyle.cxx xmloff/source/transform/ChartOOoTContext.cxx xmloff/source/transform/EventOOoTContext.cxx xmloff/source/transform/TransformerBase.cxx xmloff/util/makefile.mk xmlscript/util/xcr.component
772 lines
24 KiB
C++
Executable file
772 lines
24 KiB
C++
Executable file
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*************************************************************************
|
|
*
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
*
|
|
************************************************************************/
|
|
|
|
#include "precompiled_basic.hxx"
|
|
#include "sal/config.h"
|
|
|
|
#include <algorithm>
|
|
#include <cstddef>
|
|
#include <list>
|
|
#include <map>
|
|
#include <vector>
|
|
|
|
#include "basic/sbx.hxx"
|
|
#include "basic/sbxvar.hxx"
|
|
#include "osl/thread.h"
|
|
#include "rtl/ref.hxx"
|
|
#include "rtl/string.hxx"
|
|
#include "rtl/ustring.hxx"
|
|
#include "salhelper/simplereferenceobject.hxx"
|
|
#include "tools/svwin.h"
|
|
|
|
#undef max
|
|
|
|
#include "dllmgr.hxx"
|
|
|
|
/* Open issues:
|
|
|
|
Missing support for functions returning structs (see TODO in call()).
|
|
|
|
Missing support for additional data types (64 bit integers, Any, ...; would
|
|
trigger OSL_ASSERT(false) in various switches).
|
|
|
|
It is assumed that the variables passed into SbiDllMgr::Call to represent
|
|
the arguments and return value have types that exactly match the Declare
|
|
statement; it would be better if this code had access to the function
|
|
signature from the Declare statement, so that it could convert the passed
|
|
variables accordingly.
|
|
*/
|
|
|
|
namespace {
|
|
|
|
char * address(std::vector< char > & blob) {
|
|
return blob.empty() ? 0 : &blob[0];
|
|
}
|
|
|
|
SbError convert(rtl::OUString const & source, rtl::OString * target) {
|
|
return
|
|
source.convertToString(
|
|
target, osl_getThreadTextEncoding(),
|
|
(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR |
|
|
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))
|
|
? ERRCODE_NONE : ERRCODE_BASIC_BAD_ARGUMENT;
|
|
//TODO: more specific errcode?
|
|
}
|
|
|
|
SbError convert(char const * source, sal_Int32 length, rtl::OUString * target) {
|
|
return
|
|
rtl_convertStringToUString(
|
|
&target->pData, source, length, osl_getThreadTextEncoding(),
|
|
(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
|
|
RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR |
|
|
RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR))
|
|
? ERRCODE_NONE : ERRCODE_BASIC_BAD_ARGUMENT;
|
|
//TODO: more specific errcode?
|
|
}
|
|
|
|
struct UnmarshalData {
|
|
UnmarshalData(SbxVariable * theVariable, void * theBuffer):
|
|
variable(theVariable), buffer(theBuffer) {}
|
|
|
|
SbxVariable * variable;
|
|
void * buffer;
|
|
};
|
|
|
|
struct StringData: public UnmarshalData {
|
|
StringData(SbxVariable * theVariable, void * theBuffer, bool theSpecial):
|
|
UnmarshalData(theVariable, theBuffer), special(theSpecial) {}
|
|
|
|
bool special;
|
|
};
|
|
|
|
class MarshalData: private boost::noncopyable {
|
|
public:
|
|
std::vector< char > * newBlob() {
|
|
blobs_.push_front(std::vector< char >());
|
|
return &blobs_.front();
|
|
}
|
|
|
|
std::vector< UnmarshalData > unmarshal;
|
|
|
|
std::vector< StringData > unmarshalStrings;
|
|
|
|
private:
|
|
std::list< std::vector< char > > blobs_;
|
|
};
|
|
|
|
std::size_t align(std::size_t address, std::size_t alignment) {
|
|
// alignment = 2^k for some k >= 0
|
|
return (address + (alignment - 1)) & ~(alignment - 1);
|
|
}
|
|
|
|
char * align(
|
|
std::vector< char > & blob, std::size_t alignment, std::size_t offset,
|
|
std::size_t add)
|
|
{
|
|
std::vector< char >::size_type n = blob.size();
|
|
n = align(n - offset, alignment) + offset; //TODO: overflow in align()
|
|
blob.resize(n + add); //TODO: overflow
|
|
return address(blob) + n;
|
|
}
|
|
|
|
template< typename T > void add(
|
|
std::vector< char > & blob, T const & data, std::size_t alignment,
|
|
std::size_t offset)
|
|
{
|
|
*reinterpret_cast< T * >(align(blob, alignment, offset, sizeof (T))) = data;
|
|
}
|
|
|
|
std::size_t alignment(SbxVariable * variable) {
|
|
OSL_ASSERT(variable != 0);
|
|
if ((variable->GetType() & SbxARRAY) == 0) {
|
|
switch (variable->GetType()) {
|
|
case SbxINTEGER:
|
|
return 2;
|
|
case SbxLONG:
|
|
case SbxSINGLE:
|
|
case SbxSTRING:
|
|
return 4;
|
|
case SbxDOUBLE:
|
|
return 8;
|
|
case SbxOBJECT:
|
|
{
|
|
std::size_t n = 1;
|
|
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
|
|
GetProperties();
|
|
for (sal_uInt16 i = 0; i < props->Count(); ++i) {
|
|
n = std::max(n, alignment(props->Get(i)));
|
|
}
|
|
return n;
|
|
}
|
|
case SbxBOOL:
|
|
case SbxBYTE:
|
|
return 1;
|
|
default:
|
|
OSL_ASSERT(false);
|
|
return 1;
|
|
}
|
|
} else {
|
|
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
|
|
int dims = arr->GetDims();
|
|
std::vector< sal_Int32 > low(dims);
|
|
for (int i = 0; i < dims; ++i) {
|
|
sal_Int32 up;
|
|
arr->GetDim32(i + 1, low[i], up);
|
|
}
|
|
return alignment(arr->Get32(&low[0]));
|
|
}
|
|
}
|
|
|
|
SbError marshal(
|
|
bool outer, SbxVariable * variable, bool special,
|
|
std::vector< char > & blob, std::size_t offset, MarshalData & data);
|
|
|
|
SbError marshalString(
|
|
SbxVariable * variable, bool special, MarshalData & data, void ** buffer)
|
|
{
|
|
OSL_ASSERT(variable != 0 && buffer != 0);
|
|
rtl::OString str;
|
|
SbError e = convert(variable->GetString(), &str);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
std::vector< char > * blob = data.newBlob();
|
|
blob->insert(blob->begin(), str.getStr(), str.getStr() + str.getLength() + 1);
|
|
*buffer = address(*blob);
|
|
data.unmarshalStrings.push_back(StringData(variable, *buffer, special));
|
|
return ERRCODE_NONE;
|
|
}
|
|
|
|
SbError marshalStruct(
|
|
SbxVariable * variable, std::vector< char > & blob, std::size_t offset,
|
|
MarshalData & data)
|
|
{
|
|
OSL_ASSERT(variable != 0);
|
|
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
|
|
GetProperties();
|
|
for (sal_uInt16 i = 0; i < props->Count(); ++i) {
|
|
SbError e = marshal(false, props->Get(i), false, blob, offset, data);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
}
|
|
return ERRCODE_NONE;
|
|
}
|
|
|
|
SbError marshalArray(
|
|
SbxVariable * variable, std::vector< char > & blob, std::size_t offset,
|
|
MarshalData & data)
|
|
{
|
|
OSL_ASSERT(variable != 0);
|
|
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
|
|
int dims = arr->GetDims();
|
|
std::vector< sal_Int32 > low(dims);
|
|
std::vector< sal_Int32 > up(dims);
|
|
for (int i = 0; i < dims; ++i) {
|
|
arr->GetDim32(i + 1, low[i], up[i]);
|
|
}
|
|
for (std::vector< sal_Int32 > idx = low;;) {
|
|
SbError e = marshal(
|
|
false, arr->Get32(&idx[0]), false, blob, offset, data);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
int i = dims - 1;
|
|
while (idx[i] == up[i]) {
|
|
idx[i] = low[i];
|
|
if (i == 0) {
|
|
return ERRCODE_NONE;
|
|
}
|
|
--i;
|
|
}
|
|
++idx[i];
|
|
}
|
|
}
|
|
|
|
// 8-aligned structs are only 4-aligned on stack, so alignment of members in
|
|
// such structs must take that into account via "offset"
|
|
SbError marshal(
|
|
bool outer, SbxVariable * variable, bool special,
|
|
std::vector< char > & blob, std::size_t offset, MarshalData & data)
|
|
{
|
|
OSL_ASSERT(variable != 0);
|
|
if ((variable->GetFlags() & SBX_REFERENCE) == 0) {
|
|
if ((variable->GetType() & SbxARRAY) == 0) {
|
|
switch (variable->GetType()) {
|
|
case SbxINTEGER:
|
|
add(blob, variable->GetInteger(), outer ? 8 : 2, offset);
|
|
break;
|
|
case SbxLONG:
|
|
add(blob, variable->GetLong(), outer ? 8 : 4, offset);
|
|
break;
|
|
case SbxSINGLE:
|
|
add(blob, variable->GetSingle(), outer ? 8 : 4, offset);
|
|
break;
|
|
case SbxDOUBLE:
|
|
add(blob, variable->GetDouble(), 8, offset);
|
|
break;
|
|
case SbxSTRING:
|
|
{
|
|
void * p;
|
|
SbError e = marshalString(variable, special, data, &p);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
add(blob, p, 8, offset);
|
|
break;
|
|
}
|
|
case SbxOBJECT:
|
|
{
|
|
align(blob, outer ? 8 : alignment(variable), offset, 0);
|
|
SbError e = marshalStruct(variable, blob, offset, data);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
break;
|
|
}
|
|
case SbxBOOL:
|
|
add(blob, variable->GetBool(), outer ? 8 : 1, offset);
|
|
break;
|
|
case SbxBYTE:
|
|
add(blob, variable->GetByte(), outer ? 8 : 1, offset);
|
|
break;
|
|
default:
|
|
OSL_ASSERT(false);
|
|
break;
|
|
}
|
|
} else {
|
|
SbError e = marshalArray(variable, blob, offset, data);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
}
|
|
} else {
|
|
if ((variable->GetType() & SbxARRAY) == 0) {
|
|
switch (variable->GetType()) {
|
|
case SbxINTEGER:
|
|
case SbxLONG:
|
|
case SbxSINGLE:
|
|
case SbxDOUBLE:
|
|
case SbxBOOL:
|
|
case SbxBYTE:
|
|
add(blob, variable->data(), 8, offset);
|
|
break;
|
|
case SbxSTRING:
|
|
{
|
|
std::vector< char > * blob2 = data.newBlob();
|
|
void * p;
|
|
SbError e = marshalString(variable, special, data, &p);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
add(*blob2, p, 8, 0);
|
|
add(blob, address(*blob2), 8, offset);
|
|
break;
|
|
}
|
|
case SbxOBJECT:
|
|
{
|
|
std::vector< char > * blob2 = data.newBlob();
|
|
SbError e = marshalStruct(variable, *blob2, 0, data);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
void * p = address(*blob2);
|
|
if (outer) {
|
|
data.unmarshal.push_back(UnmarshalData(variable, p));
|
|
}
|
|
add(blob, p, 8, offset);
|
|
break;
|
|
}
|
|
default:
|
|
OSL_ASSERT(false);
|
|
break;
|
|
}
|
|
} else {
|
|
std::vector< char > * blob2 = data.newBlob();
|
|
SbError e = marshalArray(variable, *blob2, 0, data);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
void * p = address(*blob2);
|
|
if (outer) {
|
|
data.unmarshal.push_back(UnmarshalData(variable, p));
|
|
}
|
|
add(blob, p, 8, offset);
|
|
}
|
|
}
|
|
return ERRCODE_NONE;
|
|
}
|
|
|
|
template< typename T > T read(void const ** pointer) {
|
|
T const * p = static_cast< T const * >(*pointer);
|
|
*pointer = static_cast< void const * >(p + 1);
|
|
return *p;
|
|
}
|
|
|
|
void const * unmarshal(SbxVariable * variable, void const * data) {
|
|
OSL_ASSERT(variable != 0);
|
|
if ((variable->GetType() & SbxARRAY) == 0) {
|
|
switch (variable->GetType()) {
|
|
case SbxINTEGER:
|
|
variable->PutInteger(read< sal_Int16 >(&data));
|
|
break;
|
|
case SbxLONG:
|
|
variable->PutLong(read< sal_Int32 >(&data));
|
|
break;
|
|
case SbxSINGLE:
|
|
variable->PutSingle(read< float >(&data));
|
|
break;
|
|
case SbxDOUBLE:
|
|
variable->PutDouble(read< double >(&data));
|
|
break;
|
|
case SbxSTRING:
|
|
read< char * >(&data); // handled by unmarshalString
|
|
break;
|
|
case SbxOBJECT:
|
|
{
|
|
data = reinterpret_cast< void const * >(
|
|
align(
|
|
reinterpret_cast< sal_uIntPtr >(data),
|
|
alignment(variable)));
|
|
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
|
|
GetProperties();
|
|
for (sal_uInt16 i = 0; i < props->Count(); ++i) {
|
|
data = unmarshal(props->Get(i), data);
|
|
}
|
|
break;
|
|
}
|
|
case SbxBOOL:
|
|
variable->PutBool(read< sal_Bool >(&data));
|
|
break;
|
|
case SbxBYTE:
|
|
variable->PutByte(read< sal_uInt8 >(&data));
|
|
break;
|
|
default:
|
|
OSL_ASSERT(false);
|
|
break;
|
|
}
|
|
} else {
|
|
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
|
|
int dims = arr->GetDims();
|
|
std::vector< sal_Int32 > low(dims);
|
|
std::vector< sal_Int32 > up(dims);
|
|
for (int i = 0; i < dims; ++i) {
|
|
arr->GetDim32(i + 1, low[i], up[i]);
|
|
}
|
|
for (std::vector< sal_Int32 > idx = low;;) {
|
|
data = unmarshal(arr->Get32(&idx[0]), data);
|
|
int i = dims - 1;
|
|
while (idx[i] == up[i]) {
|
|
idx[i] = low[i];
|
|
if (i == 0) {
|
|
goto done;
|
|
}
|
|
--i;
|
|
}
|
|
++idx[i];
|
|
}
|
|
done:;
|
|
}
|
|
return data;
|
|
}
|
|
|
|
SbError unmarshalString(StringData const & data, SbxVariable & result) {
|
|
rtl::OUString str;
|
|
if (data.buffer != 0) {
|
|
char const * p = static_cast< char const * >(data.buffer);
|
|
sal_Int32 len;
|
|
if (data.special) {
|
|
len = static_cast< sal_Int32 >(result.GetULong());
|
|
if (len < 0) { // i.e., DWORD result >= 2^31
|
|
return ERRCODE_BASIC_BAD_ARGUMENT;
|
|
//TODO: more specific errcode?
|
|
}
|
|
} else {
|
|
len = rtl_str_getLength(p);
|
|
}
|
|
SbError e = convert(p, len, &str);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
}
|
|
data.variable->PutString(String(str));
|
|
return ERRCODE_NONE;
|
|
}
|
|
|
|
struct ProcData {
|
|
rtl::OString name;
|
|
FARPROC proc;
|
|
};
|
|
|
|
SbError call(
|
|
rtl::OUString const & dll, ProcData const & proc, SbxArray * arguments,
|
|
SbxVariable & result)
|
|
{
|
|
if (arguments->Count() > 20)
|
|
return ERRCODE_BASIC_NOT_IMPLEMENTED;
|
|
|
|
std::vector< char > stack;
|
|
MarshalData data;
|
|
|
|
// For DWORD GetLogicalDriveStringsA(DWORD nBufferLength, LPSTR lpBuffer)
|
|
// from kernel32, upon return, filled lpBuffer length is result DWORD, which
|
|
// requires special handling in unmarshalString; other functions might
|
|
// require similar treatment, too:
|
|
bool special =
|
|
dll.equalsIgnoreAsciiCaseAsciiL(
|
|
RTL_CONSTASCII_STRINGPARAM("KERNEL32.DLL")) &&
|
|
(proc.name ==
|
|
rtl::OString(RTL_CONSTASCII_STRINGPARAM("GetLogicalDriveStringsA")));
|
|
for (int i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
|
|
SbError e = marshal(
|
|
true, arguments->Get(i), special && i == 2, stack, stack.size(),
|
|
data);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
align(stack, 8, 0, 0);
|
|
}
|
|
|
|
stack.resize(20*8);
|
|
|
|
// We fake all calls as being to a varargs function,
|
|
// as this means any floating-point argument among the first four
|
|
// ones will end up in a XMM register where the callee expects it.
|
|
sal_Int32 (*proc_i)(double d, ...) = (sal_Int32 (*)(double, ...)) proc.proc;
|
|
double (*proc_d)(double d, ...) = (double (*)(double, ...)) proc.proc;
|
|
|
|
sal_Int64 iRetVal;
|
|
double dRetVal;
|
|
|
|
switch (result.GetType()) {
|
|
case SbxEMPTY:
|
|
case SbxINTEGER:
|
|
case SbxLONG:
|
|
case SbxSTRING:
|
|
case SbxOBJECT:
|
|
case SbxBOOL:
|
|
case SbxBYTE:
|
|
iRetVal =
|
|
proc_i(*(double *)&stack[0*8],
|
|
*(double *)&stack[1*8],
|
|
*(double *)&stack[2*8],
|
|
*(double *)&stack[3*8],
|
|
*(sal_uInt64 *)&stack[4*8],
|
|
*(sal_uInt64 *)&stack[5*8],
|
|
*(sal_uInt64 *)&stack[6*8],
|
|
*(sal_uInt64 *)&stack[7*8],
|
|
*(sal_uInt64 *)&stack[8*8],
|
|
*(sal_uInt64 *)&stack[9*8],
|
|
*(sal_uInt64 *)&stack[10*8],
|
|
*(sal_uInt64 *)&stack[11*8],
|
|
*(sal_uInt64 *)&stack[12*8],
|
|
*(sal_uInt64 *)&stack[13*8],
|
|
*(sal_uInt64 *)&stack[14*8],
|
|
*(sal_uInt64 *)&stack[15*8],
|
|
*(sal_uInt64 *)&stack[16*8],
|
|
*(sal_uInt64 *)&stack[17*8],
|
|
*(sal_uInt64 *)&stack[18*8],
|
|
*(sal_uInt64 *)&stack[19*8]);
|
|
break;
|
|
case SbxSINGLE:
|
|
case SbxDOUBLE:
|
|
dRetVal =
|
|
proc_d(*(double *)&stack[0*8],
|
|
*(double *)&stack[1*8],
|
|
*(double *)&stack[2*8],
|
|
*(double *)&stack[3*8],
|
|
*(sal_uInt64 *)&stack[4*8],
|
|
*(sal_uInt64 *)&stack[5*8],
|
|
*(sal_uInt64 *)&stack[6*8],
|
|
*(sal_uInt64 *)&stack[7*8],
|
|
*(sal_uInt64 *)&stack[8*8],
|
|
*(sal_uInt64 *)&stack[9*8],
|
|
*(sal_uInt64 *)&stack[10*8],
|
|
*(sal_uInt64 *)&stack[11*8],
|
|
*(sal_uInt64 *)&stack[12*8],
|
|
*(sal_uInt64 *)&stack[13*8],
|
|
*(sal_uInt64 *)&stack[14*8],
|
|
*(sal_uInt64 *)&stack[15*8],
|
|
*(sal_uInt64 *)&stack[16*8],
|
|
*(sal_uInt64 *)&stack[17*8],
|
|
*(sal_uInt64 *)&stack[18*8],
|
|
*(sal_uInt64 *)&stack[19*8]);
|
|
}
|
|
|
|
switch (result.GetType()) {
|
|
case SbxEMPTY:
|
|
break;
|
|
case SbxINTEGER:
|
|
result.PutInteger(static_cast< sal_Int16 >(iRetVal));
|
|
break;
|
|
case SbxLONG:
|
|
result.PutLong(static_cast< sal_Int32 >(iRetVal));
|
|
break;
|
|
case SbxSINGLE:
|
|
result.PutSingle(static_cast< float >(dRetVal));
|
|
break;
|
|
case SbxDOUBLE:
|
|
result.PutDouble(dRetVal);
|
|
break;
|
|
case SbxSTRING:
|
|
{
|
|
char const * s1 = reinterpret_cast< char const * >(iRetVal);
|
|
rtl::OUString s2;
|
|
SbError e = convert(s1, rtl_str_getLength(s1), &s2);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
result.PutString(String(s2));
|
|
break;
|
|
}
|
|
case SbxOBJECT:
|
|
//TODO
|
|
break;
|
|
case SbxBOOL:
|
|
result.PutBool(static_cast< sal_Bool >(iRetVal));
|
|
break;
|
|
case SbxBYTE:
|
|
result.PutByte(static_cast< sal_uInt8 >(iRetVal));
|
|
break;
|
|
default:
|
|
OSL_ASSERT(false);
|
|
break;
|
|
}
|
|
for (int i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
|
|
arguments->Get(i)->ResetFlag(SBX_REFERENCE);
|
|
//TODO: skipped for errors?!?
|
|
}
|
|
for (std::vector< UnmarshalData >::iterator i(data.unmarshal.begin());
|
|
i != data.unmarshal.end(); ++i)
|
|
{
|
|
unmarshal(i->variable, i->buffer);
|
|
}
|
|
for (std::vector< StringData >::iterator i(data.unmarshalStrings.begin());
|
|
i != data.unmarshalStrings.end(); ++i)
|
|
{
|
|
SbError e = unmarshalString(*i, result);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
}
|
|
return ERRCODE_NONE;
|
|
}
|
|
|
|
SbError getProcData(HMODULE handle, rtl::OUString const & name, ProcData * proc)
|
|
{
|
|
OSL_ASSERT(proc != 0);
|
|
if (name.getLength() != 0 && name[0] == '@') { //TODO: "@" vs. "#"???
|
|
sal_Int32 n = name.copy(1).toInt32(); //TODO: handle bad input
|
|
if (n <= 0 || n > 0xFFFF) {
|
|
return ERRCODE_BASIC_BAD_ARGUMENT; //TODO: more specific errcode?
|
|
}
|
|
FARPROC p = GetProcAddress(handle, reinterpret_cast< LPCSTR >(n));
|
|
if (p != 0) {
|
|
proc->name = rtl::OString(RTL_CONSTASCII_STRINGPARAM("#")) +
|
|
rtl::OString::valueOf(n);
|
|
proc->proc = p;
|
|
return ERRCODE_NONE;
|
|
}
|
|
} else {
|
|
rtl::OString name8;
|
|
SbError e = convert(name, &name8);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
FARPROC p = GetProcAddress(handle, name8.getStr());
|
|
if (p != 0) {
|
|
proc->name = name8;
|
|
proc->proc = p;
|
|
return ERRCODE_NONE;
|
|
}
|
|
sal_Int32 i = name8.indexOf('#');
|
|
if (i != -1) {
|
|
name8 = name8.copy(0, i);
|
|
p = GetProcAddress(handle, name8.getStr());
|
|
if (p != 0) {
|
|
proc->name = name8;
|
|
proc->proc = p;
|
|
return ERRCODE_NONE;
|
|
}
|
|
}
|
|
rtl::OString real(
|
|
rtl::OString(RTL_CONSTASCII_STRINGPARAM("_")) + name8);
|
|
p = GetProcAddress(handle, real.getStr());
|
|
if (p != 0) {
|
|
proc->name = real;
|
|
proc->proc = p;
|
|
return ERRCODE_NONE;
|
|
}
|
|
real = name8 + rtl::OString(RTL_CONSTASCII_STRINGPARAM("A"));
|
|
p = GetProcAddress(handle, real.getStr());
|
|
if (p != 0) {
|
|
proc->name = real;
|
|
proc->proc = p;
|
|
return ERRCODE_NONE;
|
|
}
|
|
}
|
|
return ERRCODE_BASIC_PROC_UNDEFINED;
|
|
}
|
|
|
|
struct Dll: public salhelper::SimpleReferenceObject {
|
|
private:
|
|
typedef std::map< rtl::OUString, ProcData > Procs;
|
|
|
|
virtual ~Dll();
|
|
|
|
public:
|
|
Dll(): handle(0) {}
|
|
|
|
SbError getProc(rtl::OUString const & name, ProcData * proc);
|
|
|
|
HMODULE handle;
|
|
Procs procs;
|
|
};
|
|
|
|
Dll::~Dll() {
|
|
if (handle != 0 && !FreeLibrary(handle)) {
|
|
OSL_TRACE("FreeLibrary(%p) failed with %u", handle, GetLastError());
|
|
}
|
|
}
|
|
|
|
SbError Dll::getProc(rtl::OUString const & name, ProcData * proc) {
|
|
Procs::iterator i(procs.find(name));
|
|
if (i != procs.end()) {
|
|
*proc = i->second;
|
|
return ERRCODE_NONE;
|
|
}
|
|
SbError e = getProcData(handle, name, proc);
|
|
if (e == ERRCODE_NONE) {
|
|
procs.insert(Procs::value_type(name, *proc));
|
|
}
|
|
return e;
|
|
}
|
|
|
|
rtl::OUString fullDllName(rtl::OUString const & name) {
|
|
rtl::OUString full(name);
|
|
if (full.indexOf('.') == -1) {
|
|
full += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".DLL"));
|
|
}
|
|
return full;
|
|
}
|
|
|
|
}
|
|
|
|
struct SbiDllMgr::Impl: private boost::noncopyable {
|
|
private:
|
|
typedef std::map< rtl::OUString, rtl::Reference< Dll > > Dlls;
|
|
|
|
public:
|
|
Dll * getDll(rtl::OUString const & name);
|
|
|
|
Dlls dlls;
|
|
};
|
|
|
|
Dll * SbiDllMgr::Impl::getDll(rtl::OUString const & name) {
|
|
Dlls::iterator i(dlls.find(name));
|
|
if (i == dlls.end()) {
|
|
i = dlls.insert(Dlls::value_type(name, new Dll)).first;
|
|
HMODULE h = LoadLibraryW(reinterpret_cast<LPCWSTR>(name.getStr()));
|
|
if (h == 0) {
|
|
dlls.erase(i);
|
|
return 0;
|
|
}
|
|
i->second->handle = h;
|
|
}
|
|
return i->second.get();
|
|
}
|
|
|
|
SbError SbiDllMgr::Call(
|
|
rtl::OUString const & function, rtl::OUString const & library,
|
|
SbxArray * arguments, SbxVariable & result, bool cdeclConvention)
|
|
{
|
|
if (cdeclConvention) {
|
|
return ERRCODE_BASIC_NOT_IMPLEMENTED;
|
|
}
|
|
rtl::OUString dllName(fullDllName(library));
|
|
Dll * dll = impl_->getDll(dllName);
|
|
if (dll == 0) {
|
|
return ERRCODE_BASIC_BAD_DLL_LOAD;
|
|
}
|
|
ProcData proc;
|
|
SbError e = dll->getProc(function, &proc);
|
|
if (e != ERRCODE_NONE) {
|
|
return e;
|
|
}
|
|
return call(dllName, proc, arguments, result);
|
|
}
|
|
|
|
void SbiDllMgr::FreeDll(rtl::OUString const & library) {
|
|
impl_->dlls.erase(library);
|
|
}
|
|
|
|
SbiDllMgr::SbiDllMgr(): impl_(new Impl) {}
|
|
|
|
SbiDllMgr::~SbiDllMgr() {}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|