[Libreoffice-commits] .: 19 commits - avmedia/source avmedia/util basic/inc basic/source basic/util basic/workben connectivity/inc connectivity/source connectivity/workben desktop/inc desktop/source desktop/unx desktop/util editeng/inc editeng/source editeng/util embeddedobj/prj embeddedobj/source eventattacher/prj fpicker/source fpicker/test framework/inc framework/source framework/test framework/util linguistic/prj linguistic/source linguistic/workben scripting/source sfx2/inc sfx2/source sfx2/util svx/inc svx/source svx/util svx/workben ucb/inc ucb/workben uui/source vbahelper/source xmlhelp/source xmloff/inc xmloff/prj xmloff/source xmloff/util
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Oct 25 19:27:19 PDT 2010
avmedia/source/framework/soundhandler.cxx | 4
avmedia/source/framework/soundhandler.hxx | 4
avmedia/source/viewer/mediaevent_impl.cxx | 18 -
avmedia/util/makefile.mk | 8
basic/inc/basic/process.hxx | 11
basic/inc/pch/precompiled_basic.hxx | 6
basic/source/app/process.cxx | 117 +++---
basic/source/classes/eventatt.cxx | 2
basic/source/classes/sb.cxx | 8
basic/source/classes/sbunoobj.cxx | 12
basic/source/classes/sbxmod.cxx | 5
basic/source/runtime/iosys.cxx | 21 -
basic/source/runtime/methods.cxx | 89 ++---
basic/source/uno/namecont.cxx | 2
basic/util/makefile.mk | 2
basic/workben/makefile.mk | 4
connectivity/inc/connectivity/FValue.hxx | 12
connectivity/inc/connectivity/PColumn.hxx | 4
connectivity/inc/connectivity/sqliterator.hxx | 26 -
connectivity/inc/pch/precompiled_connectivity.hxx | 12
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 4
connectivity/source/commontools/TSortIndex.cxx | 4
connectivity/source/cpool/ZConnectionPool.cxx | 20 -
connectivity/source/cpool/ZConnectionPool.hxx | 26 -
connectivity/source/cpool/makefile.mk | 4
connectivity/source/dbtools/makefile.mk | 2
connectivity/source/drivers/adabas/BConnection.cxx | 4
connectivity/source/drivers/adabas/BDriver.cxx | 177 ++++++----
connectivity/source/drivers/adabas/BResultSetMetaData.cxx | 6
connectivity/source/drivers/adabas/makefile.mk | 2
connectivity/source/drivers/ado/makefile.mk | 1
connectivity/source/drivers/calc/CColumns.cxx | 2
connectivity/source/drivers/calc/makefile.mk | 2
connectivity/source/drivers/dbase/DColumns.cxx | 2
connectivity/source/drivers/dbase/DIndex.cxx | 2
connectivity/source/drivers/dbase/DIndexColumns.cxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 8
connectivity/source/drivers/dbase/makefile.mk | 2
connectivity/source/drivers/evoab/LColumns.cxx | 6
connectivity/source/drivers/evoab/LConnection.cxx | 27 +
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx | 24 -
connectivity/source/drivers/evoab/LFolderList.cxx | 6
connectivity/source/drivers/evoab/LFolderList.hxx | 4
connectivity/source/drivers/evoab/LTable.cxx | 2
connectivity/source/drivers/evoab/makefile.mk | 2
connectivity/source/drivers/evoab2/NConnection.cxx | 2
connectivity/source/drivers/evoab2/NPreparedStatement.cxx | 2
connectivity/source/drivers/evoab2/NResultSetMetaData.cxx | 2
connectivity/source/drivers/evoab2/NResultSetMetaData.hxx | 4
connectivity/source/drivers/evoab2/NStatement.cxx | 2
connectivity/source/drivers/evoab2/NStatement.hxx | 2
connectivity/source/drivers/evoab2/makefile.mk | 2
connectivity/source/drivers/file/FDriver.cxx | 2
connectivity/source/drivers/file/FPreparedStatement.cxx | 24 -
connectivity/source/drivers/file/FResultSet.cxx | 58 +--
connectivity/source/drivers/file/FResultSetMetaData.cxx | 2
connectivity/source/drivers/file/FStatement.cxx | 12
connectivity/source/drivers/file/fanalyzer.cxx | 18 -
connectivity/source/drivers/file/fcode.cxx | 8
connectivity/source/drivers/file/makefile.mk | 2
connectivity/source/drivers/flat/EColumns.cxx | 2
connectivity/source/drivers/flat/ETable.cxx | 2
connectivity/source/drivers/flat/makefile.mk | 2
connectivity/source/drivers/jdbc/Object.cxx | 3
connectivity/source/drivers/jdbc/makefile.mk | 2
connectivity/source/drivers/kab/KPreparedStatement.cxx | 8
connectivity/source/drivers/kab/KResultSetMetaData.cxx | 2
connectivity/source/drivers/kab/KResultSetMetaData.hxx | 4
connectivity/source/drivers/kab/KStatement.cxx | 4
connectivity/source/drivers/kab/makefile.mk | 5
connectivity/source/drivers/macab/MacabPreparedStatement.cxx | 8
connectivity/source/drivers/macab/MacabResultSetMetaData.cxx | 2
connectivity/source/drivers/macab/MacabResultSetMetaData.hxx | 4
connectivity/source/drivers/macab/MacabStatement.cxx | 4
connectivity/source/drivers/macab/makefile.mk | 3
connectivity/source/drivers/mozab/MPreparedStatement.cxx | 4
connectivity/source/drivers/mozab/MPreparedStatement.hxx | 2
connectivity/source/drivers/mozab/MResultSet.cxx | 80 ++--
connectivity/source/drivers/mozab/MResultSet.hxx | 40 +-
connectivity/source/drivers/mozab/MResultSetMetaData.hxx | 6
connectivity/source/drivers/mozab/MStatement.cxx | 6
connectivity/source/drivers/mozab/makefile.mk | 4
connectivity/source/drivers/odbc/makefile.mk | 3
connectivity/source/drivers/odbcbase/makefile.mk | 4
connectivity/source/inc/FDatabaseMetaDataResultSet.hxx | 2
connectivity/source/inc/TSortIndex.hxx | 2
connectivity/source/inc/adabas/BConnection.hxx | 4
connectivity/source/inc/adabas/BPreparedStatement.hxx | 2
connectivity/source/inc/adabas/BResultSet.hxx | 6
connectivity/source/inc/adabas/BResultSetMetaData.hxx | 6
connectivity/source/inc/adabas/BStatement.hxx | 8
connectivity/source/inc/dbase/DIndexPage.hxx | 4
connectivity/source/inc/file/FPreparedStatement.hxx | 2
connectivity/source/inc/file/FResultSet.hxx | 10
connectivity/source/inc/file/FResultSetMetaData.hxx | 6
connectivity/source/inc/file/FTable.hxx | 4
connectivity/source/inc/file/fanalyzer.hxx | 8
connectivity/source/inc/file/fcode.hxx | 2
connectivity/source/inc/file/fcomp.hxx | 8
connectivity/source/parse/PColumn.cxx | 4
connectivity/source/parse/sqliterator.cxx | 6
connectivity/workben/iniParser/makefile.mk | 5
connectivity/workben/little/makefile.mk | 3
connectivity/workben/testmoz/makefile.mk | 12
desktop/inc/app.hxx | 7
desktop/source/app/app.cxx | 28 -
desktop/source/app/appfirststart.cxx | 2
desktop/source/app/appinit.cxx | 5
desktop/source/app/makefile.mk | 2
desktop/source/app/officeipcthread.cxx | 63 +--
desktop/source/app/officeipcthread.hxx | 15
desktop/source/app/userinstall.cxx | 8
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 32 -
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 14
desktop/source/deployment/gui/dp_gui_service.cxx | 6
desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 16
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 18 -
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 30 -
desktop/source/offacc/acceptor.cxx | 1
desktop/source/splash/makefile.mk | 1
desktop/source/splash/splash.cxx | 7
desktop/unx/splash/makefile.mk | 1
desktop/unx/splash/unxsplash.cxx | 7
desktop/util/makefile.mk | 14
editeng/inc/editeng/UnoForbiddenCharsTable.hxx | 6
editeng/inc/editeng/editeng.hxx | 6
editeng/inc/editeng/forbiddencharacterstable.hxx | 8
editeng/inc/editeng/outliner.hxx | 6
editeng/inc/editeng/unolingu.hxx | 3
editeng/inc/pch/precompiled_editeng.hxx | 7
editeng/source/accessibility/AccessibleContextBase.cxx | 2
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 76 ++--
editeng/source/accessibility/AccessibleImageBullet.cxx | 20 -
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 40 +-
editeng/source/editeng/editeng.cxx | 4
editeng/source/editeng/eeobj.cxx | 2
editeng/source/editeng/eerdll.cxx | 4
editeng/source/editeng/eerdll2.hxx | 8
editeng/source/editeng/impedit.cxx | 14
editeng/source/editeng/impedit.hxx | 8
editeng/source/editeng/impedit2.cxx | 8
editeng/source/outliner/outlin2.cxx | 4
editeng/source/uno/UnoForbiddenCharsTable.cxx | 27 -
editeng/source/uno/unoedprx.cxx | 2
editeng/source/uno/unofield.cxx | 11
editeng/source/uno/unonrule.cxx | 9
editeng/source/uno/unopracc.cxx | 2
editeng/source/uno/unotext.cxx | 59 +--
editeng/source/uno/unotext2.cxx | 31 -
editeng/util/makefile.mk | 4
embeddedobj/prj/build.lst | 2
embeddedobj/source/msole/graphconvert.cxx | 2
embeddedobj/source/msole/makefile.mk | 3
embeddedobj/source/msole/xdialogcreator.cxx | 4
eventattacher/prj/build.lst | 2
fpicker/source/aqua/ControlHelper.cxx | 14
fpicker/source/aqua/FilterHelper.cxx | 8
fpicker/source/aqua/SalAquaFilePicker.cxx | 42 +-
fpicker/source/aqua/SalAquaFolderPicker.cxx | 14
fpicker/source/aqua/SalAquaPicker.cxx | 14
fpicker/source/aqua/resourceprovider.cxx | 4
fpicker/source/office/OfficeFilePicker.cxx | 48 +-
fpicker/source/office/commonpicker.cxx | 24 -
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 2
fpicker/source/unx/gnome/SalGtkFolderPicker.cxx | 2
fpicker/source/unx/gnome/SalGtkPicker.cxx | 2
fpicker/source/unx/gnome/resourceprovider.cxx | 2
fpicker/source/unx/kde4/KDE4FilePicker.cxx | 6
fpicker/source/win32/filepicker/SolarMutex.cxx | 10
fpicker/source/win32/filepicker/asyncrequests.cxx | 4
fpicker/source/win32/misc/resourceprovider.cxx | 4
fpicker/test/makefile.mk | 1
framework/inc/classes/framecontainer.hxx | 1
framework/inc/commands.h | 1
framework/inc/helper/timerhelper.hxx | 2
framework/inc/pch/precompiled_framework.hxx | 9
framework/inc/threadhelp/lockhelper.hxx | 8
framework/inc/threadhelp/threadhelpbase.hxx | 2
framework/source/application/framework.cxx | 8
framework/source/application/login.cxx | 9
framework/source/classes/fwkresid.cxx | 4
framework/source/classes/fwlresid.cxx | 4
framework/source/classes/imagewrapper.cxx | 6
framework/source/classes/menumanager.cxx | 5
framework/source/classes/rootactiontriggercontainer.cxx | 4
framework/source/dispatch/closedispatcher.cxx | 4
framework/source/dispatch/helpagentdispatcher.cxx | 12
framework/source/dispatch/menudispatcher.cxx | 11
framework/source/dispatch/popupmenudispatcher.cxx | 3
framework/source/dispatch/startmoduledispatcher.cxx | 2
framework/source/dispatch/windowcommanddispatch.cxx | 16
framework/source/helper/actiontriggerhelper.cxx | 9
framework/source/helper/dockingareadefaultacceptor.cxx | 1
framework/source/helper/oframes.cxx | 4
framework/source/helper/persistentwindowstate.cxx | 28 -
framework/source/helper/propertysetcontainer.cxx | 1
framework/source/helper/statusindicatorfactory.cxx | 4
framework/source/helper/tagwindowasmodified.cxx | 18 -
framework/source/helper/titlebarupdate.cxx | 18 -
framework/source/helper/vclstatusindicator.cxx | 114 +++---
framework/source/inc/pattern/window.hxx | 35 -
framework/source/layoutmanager/layoutmanager.cxx | 128 +++----
framework/source/loadenv/loadenv.cxx | 14
framework/source/services/autorecovery.cxx | 2
framework/source/services/frame.cxx | 21 -
framework/source/services/substitutepathvars.cxx | 2
framework/source/services/taskcreatorsrv.cxx | 3
framework/source/tabwin/tabwindow.cxx | 2
framework/source/threadhelp/lockhelper.cxx | 35 +
framework/source/uielement/addonstoolbarwrapper.cxx | 2
framework/source/uielement/buttontoolbarcontroller.cxx | 16
framework/source/uielement/comboboxtoolbarcontroller.cxx | 4
framework/source/uielement/complextoolbarcontroller.cxx | 8
framework/source/uielement/controlmenucontroller.cxx | 8
framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 4
framework/source/uielement/edittoolbarcontroller.cxx | 4
framework/source/uielement/fontmenucontroller.cxx | 4
framework/source/uielement/fontsizemenucontroller.cxx | 6
framework/source/uielement/generictoolbarcontroller.cxx | 8
framework/source/uielement/headermenucontroller.cxx | 4
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 8
framework/source/uielement/langselectionmenucontroller.cxx | 6
framework/source/uielement/langselectionstatusbarcontroller.cxx | 6
framework/source/uielement/logoimagestatusbarcontroller.cxx | 18 -
framework/source/uielement/logotextstatusbarcontroller.cxx | 16
framework/source/uielement/macrosmenucontroller.cxx | 4
framework/source/uielement/menubarmanager.cxx | 19 -
framework/source/uielement/menubarwrapper.cxx | 2
framework/source/uielement/newmenucontroller.cxx | 8
framework/source/uielement/objectmenucontroller.cxx | 4
framework/source/uielement/popupmenucontroller.cxx | 4
framework/source/uielement/progressbarwrapper.cxx | 8
framework/source/uielement/recentfilesmenucontroller.cxx | 4
framework/source/uielement/simpletextstatusbarcontroller.cxx | 24 -
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 4
framework/source/uielement/statusbar.cxx | 2
framework/source/uielement/statusbarwrapper.cxx | 2
framework/source/uielement/statusindicatorinterfacewrapper.cxx | 2
framework/source/uielement/togglebuttontoolbarcontroller.cxx | 10
framework/source/uielement/toolbarsmenucontroller.cxx | 16
framework/source/uielement/toolbarwrapper.cxx | 2
framework/source/uifactory/addonstoolboxfactory.cxx | 2
framework/source/uifactory/menubarfactory.cxx | 2
framework/test/makefile.mk | 3
framework/test/threadtest.cxx | 9
framework/test/threadtest/makefile.mk | 11
framework/test/threadtest/threadtest.cxx | 7
framework/test/typecfg/cfgview.cxx | 9
framework/test/typecfg/makefile.mk | 1
framework/test/typecfg/typecfg.cxx | 8
framework/test/typecfg/xml2xcd.cxx | 7
framework/util/guiapps/makefile.mk | 1
framework/util/makefile.mk | 3
linguistic/prj/build.lst | 2
linguistic/source/lngopt.hxx | 1
linguistic/source/makefile.mk | 1
linguistic/source/thesdsp.hxx | 2
linguistic/workben/makefile.mk | 1
scripting/source/basprov/baslibnode.cxx | 10
scripting/source/basprov/basmethnode.cxx | 10
scripting/source/basprov/basmodnode.cxx | 10
scripting/source/basprov/basprov.cxx | 14
scripting/source/basprov/basscript.cxx | 4
sfx2/inc/pch/precompiled_sfx2.hxx | 8
sfx2/inc/sfx2/docfac.hxx | 2
sfx2/inc/sfx2/docstoragemodifylistener.hxx | 8
sfx2/inc/sfx2/sfxbasemodel.hxx | 6
sfx2/source/appl/app.cxx | 1
sfx2/source/appl/appdata.cxx | 2
sfx2/source/appl/appinit.cxx | 11
sfx2/source/appl/appmain.cxx | 1
sfx2/source/appl/appmisc.cxx | 7
sfx2/source/appl/appopen.cxx | 14
sfx2/source/appl/appserv.cxx | 1
sfx2/source/appl/appuno.cxx | 8
sfx2/source/appl/fwkhelper.cxx | 4
sfx2/source/appl/imestatuswindow.cxx | 4
sfx2/source/appl/shutdownicon.cxx | 19 -
sfx2/source/appl/shutdowniconaqua.mm | 4
sfx2/source/appl/shutdowniconunx.cxx | 8
sfx2/source/appl/workwin.cxx | 8
sfx2/source/bastyp/fltfnc.cxx | 2
sfx2/source/bastyp/fltlst.cxx | 6
sfx2/source/control/querystatus.cxx | 10
sfx2/source/control/sfxstatuslistener.cxx | 6
sfx2/source/control/unoctitm.cxx | 8
sfx2/source/dialog/about.cxx | 2
sfx2/source/dialog/dockwin.cxx | 4
sfx2/source/dialog/filedlghelper.cxx | 26 -
sfx2/source/dialog/mailmodel.cxx | 2
sfx2/source/dialog/mailmodelapi.cxx | 4
sfx2/source/doc/Metadatable.cxx | 12
sfx2/source/doc/docstoragemodifylistener.cxx | 8
sfx2/source/doc/doctempl.cxx | 2
sfx2/source/doc/doctemplates.cxx | 8
sfx2/source/doc/objmisc.cxx | 6
sfx2/source/doc/objuno.cxx | 4
sfx2/source/doc/objxtor.cxx | 8
sfx2/source/doc/printhelper.cxx | 14
sfx2/source/doc/sfxbasemodel.cxx | 14
sfx2/source/inc/eventsupplier.hxx | 2
sfx2/source/inc/sfxtypes.hxx | 2
sfx2/source/inc/workwin.hxx | 2
sfx2/source/inet/inettbc.cxx | 2
sfx2/source/statbar/stbitem.cxx | 20 -
sfx2/source/toolbox/imgmgr.cxx | 14
sfx2/source/toolbox/tbxitem.cxx | 26 -
sfx2/source/view/frmload.cxx | 4
sfx2/source/view/ipclient.cxx | 4
sfx2/source/view/sfxbasecontroller.cxx | 68 +--
sfx2/source/view/viewfrm.cxx | 2
sfx2/source/view/viewsh.cxx | 8
sfx2/util/makefile.mk | 1
svx/inc/pch/precompiled_svx.hxx | 7
svx/inc/svx/gridctrl.hxx | 2
svx/inc/svx/svdmodel.hxx | 6
svx/source/accessibility/AccessibleFrameSelector.cxx | 50 +-
svx/source/accessibility/AccessibleShape.cxx | 6
svx/source/accessibility/AccessibleTextHelper.cxx | 16
svx/source/accessibility/ChildrenManagerImpl.hxx | 2
svx/source/accessibility/DGColorNameLookUp.cxx | 6
svx/source/accessibility/DescriptionGenerator.cxx | 14
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 65 +--
svx/source/accessibility/ShapeTypeHandler.cxx | 8
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 22 -
svx/source/customshapes/tbxcustomshapes.cxx | 6
svx/source/dialog/docrecovery.cxx | 12
svx/source/dialog/graphctl.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 4
svx/source/fmcomp/fmgridif.cxx | 32 -
svx/source/fmcomp/gridcell.cxx | 4
svx/source/fmcomp/gridctrl.cxx | 6
svx/source/fmcomp/trace.cxx | 12
svx/source/form/ParseContext.cxx | 6
svx/source/form/filtnav.cxx | 6
svx/source/form/fmscriptingenv.cxx | 6
svx/source/form/fmshimp.cxx | 4
svx/source/form/fmtextcontrolshell.cxx | 4
svx/source/form/fmundo.cxx | 10
svx/source/form/fmvwimp.cxx | 4
svx/source/form/formcontroller.cxx | 4
svx/source/gengal/gengal.cxx | 1
svx/source/inc/GraphCtlAccessibleContext.hxx | 2
svx/source/inc/charmapacc.hxx | 2
svx/source/inc/svxrectctaccessiblecontext.hxx | 2
svx/source/inc/trace.hxx | 4
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 8
svx/source/smarttags/SmartTagMgr.cxx | 8
svx/source/svdraw/sdrpagewindow.cxx | 2
svx/source/svdraw/svdmodel.cxx | 6
svx/source/svdraw/svdoole2.cxx | 30 -
svx/source/table/accessiblecell.cxx | 18 -
svx/source/table/accessibletableshape.cxx | 44 +-
svx/source/table/cell.cxx | 19 -
svx/source/table/celleditsource.cxx | 5
svx/source/table/tabledesign.cxx | 33 -
svx/source/table/tablemodel.cxx | 29 -
svx/source/tbxctrls/extrusioncontrols.cxx | 2
svx/source/tbxctrls/tbunocontroller.cxx | 8
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 14
svx/source/tbxctrls/tbxalign.cxx | 10
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 16
svx/source/unodraw/UnoGraphicExporter.cxx | 7
svx/source/unodraw/UnoNameItemTable.cxx | 17
svx/source/unodraw/XPropertyTable.cxx | 17
svx/source/unodraw/recoveryui.cxx | 2
svx/source/unodraw/unomlstr.cxx | 4
svx/source/unodraw/unomod.cxx | 15
svx/source/unodraw/unomtabl.cxx | 17
svx/source/unodraw/unopage.cxx | 23 -
svx/source/unodraw/unopool.cxx | 14
svx/source/unodraw/unoprov.cxx | 4
svx/source/unodraw/unoshap2.cxx | 37 +-
svx/source/unodraw/unoshap3.cxx | 15
svx/source/unodraw/unoshap4.cxx | 3
svx/source/unodraw/unoshape.cxx | 97 ++---
svx/source/unodraw/unoshtxt.cxx | 5
svx/source/unogallery/unogalitem.cxx | 12
svx/source/unogallery/unogaltheme.cxx | 32 -
svx/source/unogallery/unogalthemeprovider.cxx | 16
svx/util/makefile.mk | 3
svx/workben/edittest.cxx | 1
svx/workben/makefile.mk | 1
svx/workben/msview/makefile.mk | 1
ucb/inc/pch/precompiled_ucb.hxx | 6
ucb/workben/ucb/makefile.mk | 1
ucb/workben/ucb/ucbdemo.cxx | 12
uui/source/fltdlg.cxx | 2
uui/source/iahndl-authentication.cxx | 8
uui/source/iahndl-cookies.cxx | 4
uui/source/iahndl-errorhandler.cxx | 8
uui/source/iahndl-filter.cxx | 4
uui/source/iahndl-locking.cxx | 8
uui/source/iahndl-ssl.cxx | 6
uui/source/iahndl.cxx | 6
vbahelper/source/vbahelper/vbashape.cxx | 5
xmlhelp/source/cxxhelp/provider/content.hxx | 1
xmlhelp/source/cxxhelp/provider/resultset.cxx | 2
xmlhelp/source/cxxhelp/provider/resultset.hxx | 6
xmlhelp/source/cxxhelp/test/makefile.mk | 4
xmloff/inc/pch/precompiled_xmloff.hxx | 6
xmloff/inc/xmloff/controlpropertyhdl.hxx | 2
xmloff/inc/xmloff/formlayerexport.hxx | 8
xmloff/inc/xmloff/formlayerimport.hxx | 8
xmloff/inc/xmloff/nmspmap.hxx | 6
xmloff/prj/build.lst | 2
xmloff/source/core/nmspmap.cxx | 8
xmloff/source/core/xmlexp.cxx | 6
xmloff/source/forms/callbacks.hxx | 4
xmloff/source/forms/formattributes.hxx | 2
xmloff/source/forms/formlayerexport.cxx | 2
xmloff/source/forms/formlayerimport.cxx | 2
xmloff/source/forms/layerexport.cxx | 8
xmloff/source/forms/layerexport.hxx | 8
xmloff/source/forms/layerimport.cxx | 6
xmloff/source/forms/layerimport.hxx | 8
xmloff/source/forms/propertyimport.hxx | 2
xmloff/source/script/xmlscripti.cxx | 1
xmloff/source/style/xmlimppr.cxx | 2
xmloff/source/style/xmlnumi.cxx | 3
xmloff/source/text/XMLTextMarkImportContext.cxx | 2
xmloff/util/makefile.mk | 2
422 files changed, 2200 insertions(+), 2255 deletions(-)
New commits:
commit 71e9e0829dbc6d1f0c8aa4ff7096bc72c44d3489
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Oct 25 18:05:13 2010 -0500
remove a vos:::Guard that crept up during rebase of the vos-removal branch
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 5ded4c6..e35e327 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -304,7 +304,7 @@ IMPL_LINK( AboutDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink )
{
uno::Any exc( ::cppu::getCaughtException() );
rtl::OUString msg( ::comphelper::anyToString( exc ) );
- const ::vos::OGuard guard( Application::GetSolarMutex() );
+ const SolarMutexGuard guard;
ErrorBox aErrorBox( NULL, WB_OK, msg );
aErrorBox.SetText( sTitle );
aErrorBox.Execute();
commit 52113b67715c77fc6a8f8416095fe67bbc99972b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Oct 25 16:39:32 2010 -0500
missing reference to salhelper in link of a mac driver due to vos removal
Thanks to Joseph Power for finding this.
diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk
index 89b2991..31ffede 100755
--- a/connectivity/source/drivers/macab/makefile.mk
+++ b/connectivity/source/drivers/macab/makefile.mk
@@ -60,6 +60,7 @@ SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(DBTOOLSLIB) \
+ $(SALHELPERLIB) \
$(SALLIB)
SHL1DEPN=
@@ -101,6 +102,7 @@ SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
+ $(SALHELPERLIB) \
$(SALLIB) \
$(DBTOOLSLIB) \
$(COMPHELPERLIB) \
commit b7cd97528304cf765b4438ffc3bb00f49d40712a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 16:02:40 2010 -0500
Finally, gut the vos module out of the build
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk
index b0d0a68..bd167e8 100644
--- a/avmedia/util/makefile.mk
+++ b/avmedia/util/makefile.mk
@@ -38,7 +38,7 @@ GEN_HID_OTHER=TRUE
# --- Resources ---------------------------------
RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
+RESLIB1IMAGES=$(PRJ)$/res
RESLIB1SRSFILES= \
$(SRS)$/viewer.srs \
$(SRS)$/framework.srs
@@ -48,13 +48,13 @@ RESLIB1SRSFILES= \
LIB1TARGET=$(SLB)$/$(TARGET).lib
LIB1FILES=\
$(SLB)$/viewer.lib \
- $(SLB)$/framework.lib
-
+ $(SLB)$/framework.lib
+
# ==========================================================================
SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
SHL1IMPLIB=i$(TARGET)
-SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) $(VOSLIB)
+SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB)
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1LIBS=$(SLB)$/$(TARGET).lib
diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk
index 629586f..7340d08 100644
--- a/basic/util/makefile.mk
+++ b/basic/util/makefile.mk
@@ -57,13 +57,11 @@ SHL1STDLIBS= \
$(SVTOOLLIB) \
$(SVLLIB) \
$(VCLLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(COMPHELPERLIB) \
$(UNOTOOLSLIB) \
$(SOTLIB) \
- $(VOSLIB) \
$(XMLSCRIPTLIB)
.IF "$(SOLAR_JAVA)" != "TRUE"
diff --git a/basic/workben/makefile.mk b/basic/workben/makefile.mk
index 6ec2a99..42b65cb 100644
--- a/basic/workben/makefile.mk
+++ b/basic/workben/makefile.mk
@@ -51,14 +51,14 @@ APP1STDLIBS= \
$(CPPULIB) \
$(SJLIB) \
$(SOTLIB) \
- $(VOSLIB)
+
#.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
#APP1STDLIBS+=$(CPPULIB)
#.ENDIF
#.IF "$(GUI)"=="UNX"
#APP1STDLIBS+= \
-# $(VOSLIB) \
+# \
# $(SALLIB)
#.ENDIF
diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk
index 5ed3341..393a797 100644
--- a/connectivity/source/cpool/makefile.mk
+++ b/connectivity/source/cpool/makefile.mk
@@ -61,7 +61,6 @@ SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(DBTOOLSLIB) \
$(SALLIB) \
$(SALHELPERLIB)
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index aab8fc5..1fb9a71 100644
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -57,7 +57,6 @@ SHL1TARGET= $(DBTOOLS_TARGET)$(DLLPOSTFIX)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(JVMACCESSLIB) \
diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index c4154cb..b5d9903 100644
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -80,7 +80,6 @@ SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(DBTOOLSLIB) \
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index 33e4706..8fdae27 100644
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -85,7 +85,6 @@ SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(OLE32LIB) \
$(OLEAUT32LIB) \
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index 04ea9e3..c42d522 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -66,7 +66,6 @@ SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SVLLIB) \
$(TOOLSLIB) \
$(UNOTOOLSLIB) \
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index 3d77af5..1aac0b0 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -98,7 +98,6 @@ SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SVLLIB) \
$(TOOLSLIB) \
$(UCBHELPERLIB) \
diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
index 81f34fc..363b08e 100644
--- a/connectivity/source/drivers/evoab/makefile.mk
+++ b/connectivity/source/drivers/evoab/makefile.mk
@@ -75,7 +75,6 @@ SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
$(SVTOOLLIB) \
$(UNOTOOLSLIB) \
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index 837ef49..126af90 100644
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -75,7 +75,6 @@ SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SVLLIB) \
$(TOOLSLIB) \
$(UNOTOOLSLIB) \
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index 16e28a3..41f061d 100644
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
@@ -75,7 +75,6 @@ SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SVLLIB) \
$(TOOLSLIB) \
$(UCBHELPERLIB) \
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index 3d134ec..da801c4 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -78,7 +78,6 @@ SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
$(SVLLIB) \
$(UNOTOOLSLIB) \
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index 84326eb..d676945 100644
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -87,7 +87,6 @@ SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(JVMACCESSLIB) \
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 2e98efe..98bedf6 100644
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -111,7 +111,6 @@ SHL2LINKFLAGS+=$(KAB_LIB)
SHL2STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(DBTOOLSLIB) \
diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk
index 35532b1..89b2991 100755
--- a/connectivity/source/drivers/macab/makefile.mk
+++ b/connectivity/source/drivers/macab/makefile.mk
@@ -101,7 +101,6 @@ SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(DBTOOLSLIB) \
$(COMPHELPERLIB) \
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index bb3878d..0a06f00 100644
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -82,7 +82,7 @@ COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
SLOFILES=\
$(SLO)$/MDriver.obj \
$(SLO)$/MServices.obj
-
+
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
@@ -152,7 +152,6 @@ SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(DBTOOLSLIB) \
diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk
index 0f83add..85e96ea 100644
--- a/connectivity/source/drivers/odbcbase/makefile.mk
+++ b/connectivity/source/drivers/odbcbase/makefile.mk
@@ -66,7 +66,6 @@ SHL1STDLIBS=\
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB)
diff --git a/connectivity/workben/iniParser/makefile.mk b/connectivity/workben/iniParser/makefile.mk
index c1caaec..68fc0f3 100644
--- a/connectivity/workben/iniParser/makefile.mk
+++ b/connectivity/workben/iniParser/makefile.mk
@@ -42,13 +42,12 @@ OBJFILES= $(OBJ)$/main.obj
APPSTDLIBS=$(SALLIB) \
- $(VOSLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(UCBHELPERLIB) \
$(DBTOOLSLIB) \
$(COMPHELPERLIB)
-
+
# ... cfgapi ..............................
@@ -57,6 +56,6 @@ APP1OBJS= $(OBJFILES)
APP1STDLIBS = $(APPSTDLIBS)
# --- Targets ------------------------------------------------------
-
+
.INCLUDE : target.mk
diff --git a/connectivity/workben/little/makefile.mk b/connectivity/workben/little/makefile.mk
index 5d3d651..220fa91 100644
--- a/connectivity/workben/little/makefile.mk
+++ b/connectivity/workben/little/makefile.mk
@@ -43,11 +43,10 @@ OBJFILES= $(OBJ)$/main.obj
APP1TARGET= $(TARGET)
APP1OBJS= $(OBJFILES)
APPSTDLIBS=$(SALLIB) \
- $(VOSLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(SLB)$/sql.lib
-
+
# ... cfgapi ..............................
APP1STDLIBS = $(APPSTDLIBS)
diff --git a/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk
index 387d2e4..f313573 100644
--- a/connectivity/workben/testmoz/makefile.mk
+++ b/connectivity/workben/testmoz/makefile.mk
@@ -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
@@ -42,13 +42,13 @@ OBJFILES= $(OBJ)$/main.obj
APPSTDLIBS=$(SALLIB) \
- $(VOSLIB) \
+ \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(UCBHELPERLIB) \
$(DBTOOLSLIB) \
$(COMPHELPERLIB)
-
+
# ... cfgapi ..............................
@@ -57,14 +57,14 @@ APP1OBJS= $(OBJFILES)
APP1STDLIBS = $(APPSTDLIBS)
-
+
APP2TARGET = mozThread
APP2OBJS = $(OBJ)$/initUNO.obj \
$(OBJ)$/mozthread.obj
-
+
APP2STDLIBS = $(APPSTDLIBS)
# --- Targets ------------------------------------------------------
-
+
.INCLUDE : target.mk
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index e69b387..e7c30a2 100644
--- a/desktop/source/app/makefile.mk
+++ b/desktop/source/app/makefile.mk
@@ -95,7 +95,7 @@ SHL1STDLIBS = \
$(UCBHELPERLIB) \
$(UNOTOOLSLIB) \
$(VCLLIB) \
- $(VOSLIB)
+
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
index b28b343..01f1287 100644
--- a/desktop/source/splash/makefile.mk
+++ b/desktop/source/splash/makefile.mk
@@ -65,7 +65,6 @@ SHL1STDLIBS= \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SFXLIB)
diff --git a/desktop/unx/splash/makefile.mk b/desktop/unx/splash/makefile.mk
index 7466a6d..d182173 100644
--- a/desktop/unx/splash/makefile.mk
+++ b/desktop/unx/splash/makefile.mk
@@ -60,7 +60,6 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
SHL1STDLIBS= \
- $(VOSLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB)
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 480fee5..3d4950c 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -57,18 +57,6 @@ RCFILES=ooverinfo2.rc
LINKFLAGSAPPGUI!:= $(LINKFLAGSAPPGUI:s/-bind_at_load//)
.ENDIF # MACOSX
-#.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "NETBSD"
-## #74158# linux needs sal/vos/tools at end of link list, solaris needs it first,
-## winXX is handled like solaris for now
-#APP1_STDPRE=
-#APP1_STDPOST=$(CPPULIB) $(CPPUHELPERLIB) $(UNOLIB) $(TOOLSLIB) \
-# $(VOSLIB) $(SALLIB)
-#.ELSE
-#APP1_STDPRE=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(UNOLIB) $(CPPULIB) \
-# $(CPPUHELPERLIB)
-#APP1_STDPOST=
-#.ENDIF
-
RESLIB1NAME= dkt
RESLIB1IMAGES= $(PRJ)$/res
RESLIB1SRSFILES= $(SRS)$/desktop.srs
@@ -218,7 +206,7 @@ ALLTAR : $(BIN)$/soffice_oo$(EXECPOST)
.IF "$(LINK_SO)"=="TRUE"
$(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN)
$(COPY) $< $@
-
+
ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST)
.ENDIF # "$(LINK_SO)"=="TRUE"
diff --git a/editeng/util/makefile.mk b/editeng/util/makefile.mk
index b1e5675..e27dac1 100644
--- a/editeng/util/makefile.mk
+++ b/editeng/util/makefile.mk
@@ -56,7 +56,7 @@ SHL1LIBS= \
$(SLB)$/accessibility.lib \
$(SLB)$/editeng.lib \
$(SLB)$/outliner.lib \
- $(SLB)$/xml.lib
+ $(SLB)$/xml.lib
SHL1STDLIBS= \
$(XMLOFFLIB) \
@@ -75,7 +75,6 @@ SHL1STDLIBS= \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(ICUUCLIB)
diff --git a/embeddedobj/prj/build.lst b/embeddedobj/prj/build.lst
index a61305e..e6b48d8 100644
--- a/embeddedobj/prj/build.lst
+++ b/embeddedobj/prj/build.lst
@@ -1,4 +1,4 @@
-eo embeddedobj : offuh sal cppu cppuhelper comphelper tools unotools vos NULL
+eo embeddedobj : offuh sal cppu cppuhelper comphelper tools unotools NULL
eo embeddedobj usr1 - all eo_mkout NULL
eo embeddedobj\inc nmake - all eo_inc NULL
eo embeddedobj\source\commonembedding nmake - all eo_commonembed eo_inc NULL
diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk
index 07b08bc..e8d4a42 100644
--- a/embeddedobj/source/msole/makefile.mk
+++ b/embeddedobj/source/msole/makefile.mk
@@ -89,12 +89,11 @@ SHL1OBJS= $(SLOFILES)
SHL1STDLIBS=\
$(UNOTOOLSLIB)\
$(SALLIB)\
- $(VOSLIB)\
$(CPPULIB)\
$(CPPUHELPERLIB)\
$(COMPHELPERLIB)\
$(TOOLSLIB)
-
+
.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
diff --git a/eventattacher/prj/build.lst b/eventattacher/prj/build.lst
index aa93170..400b5a8 100644
--- a/eventattacher/prj/build.lst
+++ b/eventattacher/prj/build.lst
@@ -1,4 +1,4 @@
-ea eventattacher : offapi cppuhelper vos NULL
+ea eventattacher : offapi cppuhelper NULL
ea eventattacher usr1 - all ea_mkout NULL
ea eventattacher\prj get - all ea_prj NULL
ea eventattacher\source nmake - all ea_source NULL
diff --git a/fpicker/test/makefile.mk b/fpicker/test/makefile.mk
index 66d9c34..9cdf1ad 100644
--- a/fpicker/test/makefile.mk
+++ b/fpicker/test/makefile.mk
@@ -58,7 +58,6 @@ APP1STDLIBS= $(CPPULIB) \
$(VCLLIB) \
$(TOOLSLIB) \
$(SALLIB) \
- $(VOSLIB) \
$(SOTLIB) \
$(SVLIB) -l$(LB)/fps_office.uno.lib
diff --git a/framework/test/makefile.mk b/framework/test/makefile.mk
index 6764af8..1059cbc 100644
--- a/framework/test/makefile.mk
+++ b/framework/test/makefile.mk
@@ -49,7 +49,7 @@ USE_DEFFILE= TRUE
#APP1STDLIBS= $(CPPULIB) \
# $(CPPUHELPERLIB) \
# $(SALLIB) \
-# $(VOSLIB) \
+# \
# $(TOOLSLIB) \
# $(SVTOOLLIB) \
# $(TKLIB) \
@@ -77,7 +77,6 @@ DEPOBJFILES+= $(APP2OBJS)
APP2STDLIBS= $(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
- $(VOSLIB) \
$(VCLLIB)
APP2DEPN= $(SLO)$/fairrwlock.obj \
diff --git a/framework/test/threadtest/makefile.mk b/framework/test/threadtest/makefile.mk
index 833c328..467f628 100644
--- a/framework/test/threadtest/makefile.mk
+++ b/framework/test/threadtest/makefile.mk
@@ -40,20 +40,19 @@ USE_DEFFILE= TRUE
APP1TARGET= threadtest
-APP1OBJS= $(SLO)$/threadtest.obj \
+APP1OBJS= $(SLO)$/threadtest.obj \
$(SLO)$/lockhelper.obj
DEPOBJFILES=$(APP1OBJS)
# [ed] 6/16/02 Add the transaction manager library on OS X
-APP1STDLIBS= $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(VOSLIB) \
+APP1STDLIBS= $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+ $(SALLIB) \
$(VCLLIB)
-APP1DEPN= $(INC)$/threadhelp$/threadhelpbase.hxx \
+APP1DEPN= $(INC)$/threadhelp$/threadhelpbase.hxx \
$(INC)$/threadhelp$/transactionbase.hxx \
$(INC)$/threadhelp$/transactionmanager.hxx \
$(INC)$/threadhelp$/transactionguard.hxx \
diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk
index 83782fd..730febe 100644
--- a/framework/test/typecfg/makefile.mk
+++ b/framework/test/typecfg/makefile.mk
@@ -53,7 +53,6 @@ DEPOBJFILES=$(APP2OBJS)
APP2STDLIBS= $(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
$(SVTOOLLIB) \
$(TKLIB) \
diff --git a/framework/util/guiapps/makefile.mk b/framework/util/guiapps/makefile.mk
index efa5fc3..c5f7771 100644
--- a/framework/util/guiapps/makefile.mk
+++ b/framework/util/guiapps/makefile.mk
@@ -52,7 +52,6 @@ DEPOBJFILES=$(APP1OBJS)
APP1STDLIBS= $(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
$(SVTOOLLIB) \
$(TKLIB) \
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 85dff0a..78c680f 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -116,7 +116,6 @@ SHL1STDLIBS= \
$(SVTOOLLIB) \
$(SVLLIB) \
$(I18NISOLANGLIB) \
- $(VOSLIB) \
$(VCLLIB) \
$(TKLIB) \
$(CPPULIB) \
@@ -156,7 +155,6 @@ SHL2STDLIBS= \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB)
SHL2DEF= $(MISC)$/$(SHL2TARGET).def
diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst
index 57c332f..8b17240 100644
--- a/linguistic/prj/build.lst
+++ b/linguistic/prj/build.lst
@@ -1,4 +1,4 @@
-lg linguistic : svl xmloff ucbhelper vos comphelper ICU:icu NULL
+lg linguistic : svl xmloff ucbhelper comphelper ICU:icu NULL
lg linguistic usr1 - all lg_mkout NULL
lg linguistic\prj get - all lg_prj NULL
lg linguistic\inc nmake - all lg_inc NULL
diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk
index 3f68afb..47c8ef3 100644
--- a/linguistic/source/makefile.mk
+++ b/linguistic/source/makefile.mk
@@ -65,7 +65,6 @@ SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(COMPHELPERLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
$(I18NISOLANGLIB) \
$(SVLLIB) \
diff --git a/linguistic/workben/makefile.mk b/linguistic/workben/makefile.mk
index 26cbb7e..6c04929 100644
--- a/linguistic/workben/makefile.mk
+++ b/linguistic/workben/makefile.mk
@@ -77,7 +77,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
$(SVTOOLLIB) \
$(SVLLIB) \
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
index 2d93e76..139cb76 100644
--- a/sfx2/util/makefile.mk
+++ b/sfx2/util/makefile.mk
@@ -91,7 +91,6 @@ SHL1STDLIBS+=\
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB) \
$(LIBXML2LIB) \
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 06e3132..2e756b5 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -96,7 +96,6 @@ SHL1STDLIBS= \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB) \
$(ICUUCLIB)
@@ -152,7 +151,6 @@ SHL2STDLIBS= \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(VOSLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(ICUUCLIB)
diff --git a/svx/workben/makefile.mk b/svx/workben/makefile.mk
index 4aa0a09..4481316 100644
--- a/svx/workben/makefile.mk
+++ b/svx/workben/makefile.mk
@@ -47,7 +47,6 @@ APP1TARGET= $(TARGET)
APP1OBJS= $(OBJFILES)
APP1LIBS= $(LB)$/svx.lib
APP1STDLIBS=$(TOOLSLIB) \
- $(VOSLIB) \
$(SO2LIB) \
$(SVTOOLLIB) \
$(SVLLIB) \
diff --git a/svx/workben/msview/makefile.mk b/svx/workben/msview/makefile.mk
index ee4d384..2ce9d57 100644
--- a/svx/workben/msview/makefile.mk
+++ b/svx/workben/msview/makefile.mk
@@ -58,7 +58,6 @@ APP1STDLIBS= $(CPPULIB) \
$(TOOLSLIB) \
$(SVTOOLLIB) \
$(SALLIB) \
- $(VOSLIB) \
$(SOTLIB) \
$(VCLLIB) \
$(SVXLIB) \
diff --git a/ucb/workben/ucb/makefile.mk b/ucb/workben/ucb/makefile.mk
index 9a9992a..54f100b 100644
--- a/ucb/workben/ucb/makefile.mk
+++ b/ucb/workben/ucb/makefile.mk
@@ -69,7 +69,6 @@ COMPHELPERLIB=icomphelp2.lib
APP1STDLIBS=\
$(SALLIB) \
- $(VOSLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(COMPHELPERLIB) \
diff --git a/xmlhelp/source/cxxhelp/test/makefile.mk b/xmlhelp/source/cxxhelp/test/makefile.mk
index c255f3f..4521f90 100644
--- a/xmlhelp/source/cxxhelp/test/makefile.mk
+++ b/xmlhelp/source/cxxhelp/test/makefile.mk
@@ -53,8 +53,8 @@ APP1OBJS=\
$(OBJ)$/searchdemo.obj
APP1STDLIBS=\
- $(SALLIB) \
- $(VOSLIB)
+ $(SALLIB)
+
APP1LIBS=\
$(SLB)/jaqe.lib \
diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst
index 7b68ed0..71a7ca4 100644
--- a/xmloff/prj/build.lst
+++ b/xmloff/prj/build.lst
@@ -1,4 +1,4 @@
-xo xmloff : offapi svl vos NULL
+xo xmloff : offapi svl NULL
xo xmloff usr1 - all xo_mkout NULL
xo xmloff\prj get - all xo_prj NULL
xo xmloff\inc nmake - all xo_inc NULL
diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
index d01fbd8..5427467 100644
--- a/xmloff/util/makefile.mk
+++ b/xmloff/util/makefile.mk
@@ -60,7 +60,6 @@ SHL1USE_EXPORTS=name
SHL1STDLIBS= \
$(TOOLSLIB) \
$(I18NISOLANGLIB) \
- $(VOSLIB) \
$(CPPULIB) \
$(CPPUHELPERLIB)\
$(COMPHELPERLIB)\
commit b898d81c39204dd020393c04aefcbd9528afff89
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 15:34:02 2010 -0500
convert vos/process.hxx and related API
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
index 2890d9a..fc55069 100644
--- a/basic/inc/basic/process.hxx
+++ b/basic/inc/basic/process.hxx
@@ -29,7 +29,7 @@
#define _PROCESS_HXX
#include <tools/string.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
#include <map>
@@ -39,9 +39,12 @@ typedef Environment::value_type EnvironmentVariable;
class Process
{
// Internal members and methods
- vos::OArgumentList *pArgumentList;
- vos::OEnvironment *pEnvList;
- vos::OProcess *pProcess;
+ sal_uInt32 m_nArgumentCount;
+ rtl_uString **m_pArgumentList;
+ sal_uInt32 m_nEnvCount;
+ rtl_uString **m_pEnvList;
+ rtl::OUString m_aProcessName;
+ oslProcess m_pProcess;
BOOL ImplIsRunning();
long ImplGetExitCode();
BOOL bWasGPF;
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index a0e4537..2aee97e 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -148,6 +148,7 @@
#include "i18npool/lang.h"
+#include "osl/diagnose.h"
#include "osl/file.hxx"
#include "osl/module.h"
#include "osl/mutex.hxx"
@@ -275,10 +276,6 @@
#include "vcl/wintypes.hxx"
#include "vcl/wrkwin.hxx"
-#include "osl/diagnose.h"
-#include "osl/mutex.hxx"
-#include "vos/process.hxx"
-
#include "xmlscript/xmldlg_imexp.hxx"
#include "xmlscript/xmllib_imexp.hxx"
#include "xmlscript/xmlmod_imexp.hxx"
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index bd06aa0..55b3369 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -36,10 +36,10 @@
#include <tools/postwin.h>
#endif
#include <tools/errcode.hxx>
-#include <vos/process.hxx>
#include <basic/sbxcore.hxx>
#include <tools/string.hxx>
#include <osl/file.hxx>
+#include <osl/process.h>
#include <basic/ttstrhlp.hxx>
@@ -51,29 +51,46 @@
#include <basic/process.hxx>
Process::Process()
-: pArgumentList( NULL )
-, pEnvList( NULL )
-, pProcess( NULL )
+: m_nArgumentCount( 0 )
+, m_pArgumentList( NULL )
+, m_nEnvCount( 0 )
+, m_pEnvList( NULL )
+, m_aProcessName()
+, m_pProcess( NULL )
, bWasGPF( FALSE )
, bHasBeenStarted( FALSE )
{
}
+#define FREE_USTRING_LIST( count, list ) \
+ if ( count && list ) \
+ { \
+ for ( unsigned int i = 0; i < count; ++i ) \
+ { \
+ rtl_uString_release( list[i] ); \
+ list[i] = NULL; \
+ } \
+ delete[] list; \
+ } \
+ count = 0; \
+ list = NULL;
+
Process::~Process()
{
-// delete pArgumentList;
-// delete pEnvList;
- delete pProcess;
+ FREE_USTRING_LIST( m_nArgumentCount, m_pArgumentList );
+ FREE_USTRING_LIST( m_nEnvCount, m_pEnvList );
+ if ( m_pProcess )
+ osl_freeProcessHandle( m_pProcess );
}
BOOL Process::ImplIsRunning()
{
- if ( pProcess && bHasBeenStarted )
+ if ( m_pProcess && bHasBeenStarted )
{
- vos::OProcess::TProcessInfo aProcessInfo;
- pProcess->getInfo( vos::OProcess::TData_ExitCode, &aProcessInfo );
- if ( !(aProcessInfo.Fields & vos::OProcess::TData_ExitCode) )
+ oslProcessInfo aProcessInfo;
+ osl_getProcessInfo(m_pProcess, osl_Process_EXITCODE, &aProcessInfo );
+ if ( !(aProcessInfo.Fields & osl_Process_EXITCODE) )
return TRUE;
else
return FALSE;
@@ -84,11 +101,11 @@ BOOL Process::ImplIsRunning()
long Process::ImplGetExitCode()
{
- if ( pProcess )
+ if ( m_pProcess )
{
- vos::OProcess::TProcessInfo aProcessInfo;
- pProcess->getInfo( vos::OProcess::TData_ExitCode, &aProcessInfo );
- if ( !(aProcessInfo.Fields & vos::OProcess::TData_ExitCode) )
+ oslProcessInfo aProcessInfo;
+ osl_getProcessInfo(m_pProcess, osl_Process_EXITCODE, &aProcessInfo );
+ if ( !(aProcessInfo.Fields & osl_Process_EXITCODE) )
SbxBase::SetError( SbxERR_NO_ACTIVE_OBJECT );
return aProcessInfo.Code;
}
@@ -102,13 +119,14 @@ long Process::ImplGetExitCode()
void Process::SetImage( const String &aAppPath, const String &aAppParams, const Environment *pEnv )
{ // Set image file of executable
- if ( pProcess && ImplIsRunning() )
+ if ( m_pProcess && ImplIsRunning() )
SbxBase::SetError( SbxERR_NO_ACTIVE_OBJECT );
else
{
- delete pArgumentList; pArgumentList = NULL;
- delete pEnvList; pEnvList = NULL;
- delete pProcess; pProcess = NULL;
+ FREE_USTRING_LIST( m_nArgumentCount, m_pArgumentList );
+ FREE_USTRING_LIST( m_nEnvCount, m_pEnvList );
+ osl_freeProcessHandle( m_pProcess );
+ m_pProcess = NULL;
xub_StrLen i, nCount = aAppParams.GetQuotedTokenCount( CUniString("\"\"" ), ' ' );
::rtl::OUString *pParamList = new ::rtl::OUString[nCount];
@@ -123,42 +141,45 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const
nParamCount++;
}
}
- pArgumentList = new vos::OArgumentList( pParamList, nCount );
-
+ m_nArgumentCount = nParamCount;
+ m_pArgumentList = new rtl_uString*[m_nArgumentCount];
+ for ( i = 0 ; i < m_nArgumentCount ; i++ )
+ {
+ m_pArgumentList[i] = NULL;
+ rtl_uString_assign( &(m_pArgumentList[i]), pParamList[i].pData );
+ }
+ delete [] pParamList;
- ::rtl::OUString *pEnvArray = NULL;
if ( pEnv )
{
- pEnvArray = new ::rtl::OUString[pEnv->size()];
+ m_pEnvList = new rtl_uString*[pEnv->size()];
- xub_StrLen nEnvCount = 0;
+ m_nEnvCount = 0;
Environment::const_iterator aIter = pEnv->begin();
while ( aIter != pEnv->end() )
{
::rtl::OUString aTemp = ::rtl::OUString( (*aIter).first );
aTemp += ::rtl::OUString::createFromAscii( "=" );
aTemp += ::rtl::OUString( (*aIter).second );
- pEnvArray[nEnvCount] = aTemp;
- nEnvCount++;
+ m_pEnvList[m_nEnvCount] = NULL;
+ rtl_uString_assign( &(m_pEnvList[m_nEnvCount]), aTemp.pData );
+ m_nEnvCount++;
aIter++;
}
- pEnvList = new vos::OEnvironment( pEnvArray, nEnvCount );
}
::rtl::OUString aNormalizedAppPath;
osl::FileBase::getFileURLFromSystemPath( ::rtl::OUString(aAppPath), aNormalizedAppPath );
- pProcess = new vos::OProcess( aNormalizedAppPath );
+ m_aProcessName = aNormalizedAppPath;;
bHasBeenStarted = FALSE;
- delete [] pParamList;
- delete [] pEnvArray;
}
}
BOOL Process::Start()
{ // Start program
BOOL bSuccess=FALSE;
- if ( pProcess && !ImplIsRunning() )
+ if ( m_pProcess && !ImplIsRunning() )
{
bWasGPF = FALSE;
#ifdef WNT
@@ -167,20 +188,22 @@ BOOL Process::Start()
try
{
#endif
- if ( pEnvList )
- {
- bSuccess = pProcess->execute( (vos::OProcess::TProcessOption)(vos::OProcess::TOption_SearchPath),
- *pArgumentList,
- *pEnvList ) == vos::OProcess::E_None;
- }
- else
- {
- bSuccess = pProcess->execute( (vos::OProcess::TProcessOption)(vos::OProcess::TOption_SearchPath),
- *pArgumentList ) == vos::OProcess::E_None;
- }
+ bSuccess = osl_executeProcess(
+ m_aProcessName.pData,
+ m_pArgumentList,
+ m_nArgumentCount,
+ osl_Process_SEARCHPATH
+ /*| osl_Process_DETACHED*/
+ /*| osl_Process_WAIT*/,
+ NULL,
+ NULL,
+ m_pEnvList,
+ m_nEnvCount,
+ &m_pProcess ) == osl_Process_E_None;
+
#ifdef WNT
}
- catch( ... )
+ catch( ... )
{
bWasGPF = TRUE;
// TODO: Output debug message !!
@@ -216,7 +239,7 @@ BOOL Process::WasGPF()
BOOL Process::Terminate()
{
if ( ImplIsRunning() )
- return pProcess->terminate() == vos::OProcess::E_None;
+ return osl_terminateProcess(m_pProcess) == osl_Process_E_None;
return TRUE;
}
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 7208cd7..525d001 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -32,7 +32,7 @@
#include <tools/date.hxx>
#include <basic/sbxvar.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/sound.hxx>
@@ -3486,8 +3486,8 @@ RTLFUNC(Shell)
}
else
{
- USHORT nOptions = vos::OProcess::TOption_SearchPath|
- vos::OProcess::TOption_Detached;
+ oslProcessOption nOptions = osl_Process_SEARCHPATH | osl_Process_DETACHED;
+
String aCmdLine = rPar.Get(1)->GetString();
// Zusaetzliche Parameter anhaengen, es muss eh alles geparsed werden
if( nArgCount >= 4 )
@@ -3564,76 +3564,75 @@ RTLFUNC(Shell)
nWinStyle = rPar.Get(2)->GetInteger();
switch( nWinStyle )
{
- case 2:
- nOptions |= vos::OProcess::TOption_Minimized;
- break;
- case 3:
- nOptions |= vos::OProcess::TOption_Maximized;
- break;
- case 10:
- nOptions |= vos::OProcess::TOption_FullScreen;
- break;
+ case 2:
+ nOptions |= osl_Process_MINIMIZED;
+ break;
+ case 3:
+ nOptions |= osl_Process_MAXIMIZED;
+ break;
+ case 10:
+ nOptions |= osl_Process_FULLSCREEN;
+ break;
}
BOOL bSync = FALSE;
if( nArgCount >= 5 )
bSync = rPar.Get(4)->GetBool();
if( bSync )
- nOptions |= vos::OProcess::TOption_Wait;
+ nOptions |= osl_Process_WAIT;
}
- vos::OProcess::TProcessOption eOptions =
- (vos::OProcess::TProcessOption)nOptions;
-
// #72471 Parameter aufbereiten
std::list<String>::const_iterator iter = aTokenList.begin();
const String& rStr = *iter;
::rtl::OUString aOUStrProg( rStr.GetBuffer(), rStr.Len() );
- String aOUStrProgUNC = getFullPathUNC( aOUStrProg );
+ ::rtl::OUString aOUStrProgUNC = getFullPathUNC( aOUStrProg );
iter++;
USHORT nParamCount = sal::static_int_cast< USHORT >(
aTokenList.size() - 1 );
- ::rtl::OUString* pArgumentList = NULL;
- //const char** pParamList = NULL;
+ rtl_uString** pParamList = NULL;
if( nParamCount )
{
- pArgumentList = new ::rtl::OUString[ nParamCount ];
- //pParamList = new const char*[ nParamCount ];
- USHORT iList = 0;
- while( iter != aTokenList.end() )
+ pParamList = new rtl_uString*[nParamCount];
+ for(int iList = 0; iter != aTokenList.end(); ++iList, ++iter)
{
const String& rParamStr = (*iter);
- pArgumentList[iList++] = ::rtl::OUString( rParamStr.GetBuffer(), rParamStr.Len() );
- //pParamList[iList++] = (*iter).GetStr();
- iter++;
+ const ::rtl::OUString aTempStr( rParamStr.GetBuffer(), rParamStr.Len());
+ pParamList[iList] = NULL;
+ rtl_uString_assign(&(pParamList[iList]), aTempStr.pData);
}
}
- //const char* pParams = aParams.Len() ? aParams.GetStr() : 0;
- vos::OProcess* pApp;
- pApp = new vos::OProcess( aOUStrProgUNC );
- BOOL bSucc;
- if( nParamCount == 0 )
- {
- bSucc = pApp->execute( eOptions ) == vos::OProcess::E_None;
- }
- else
+ oslProcess pApp;
+ BOOL bSucc = osl_executeProcess(
+ aOUStrProgUNC.pData,
+ pParamList,
+ nParamCount,
+ nOptions,
+ NULL,
+ NULL,
+ NULL, 0,
+ &pApp ) == osl_Process_E_None;
+
+ osl_freeProcessHandle( pApp );
+
+ for(int j = 0; i < nParamCount; i++)
{
- vos::OArgumentList aArgList( pArgumentList, nParamCount );
- bSucc = pApp->execute( eOptions, aArgList ) == vos::OProcess::E_None;
+ rtl_uString_release(pParamList[j]);
+ pParamList[j] = NULL;
}
+
long nResult = 0;
- vos::OProcess::TProcessInfo aInfo;
// We should return the identifier of the executing process when is running VBA, because method Shell(...) returns it in Excel.
- if ( bSucc && SbiRuntime::isVBAEnabled() && pApp->getInfo( vos::OProcess::TData_Identifier, &aInfo ) == vos::OProcess::E_None )
+ if ( bSucc && SbiRuntime::isVBAEnabled())
{
+ oslProcessInfo aInfo;
+ osl_getProcessInfo( pApp, osl_Process_IDENTIFIER, &aInfo );
nResult = aInfo.Ident;
}
- delete pApp;
- delete[] pArgumentList;
if( !bSucc )
StarBASIC::Error( SbERR_FILE_NOT_FOUND );
else
diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx
index 34bbef9..d54de3d 100644
--- a/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/connectivity/inc/pch/precompiled_connectivity.hxx
@@ -327,7 +327,7 @@
#include "unotools/sharedunocomponent.hxx"
#include "osl/mutex.hxx"
-#include "vos/process.hxx"
+#include "osl/process.h"
//---MARKER---
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 705df3d..7e603c5 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -38,7 +38,7 @@
#include "connectivity/dbexception.hxx"
#include "TConnection.hxx"
#include "diagnose_ex.h"
-#include <vos/process.hxx>
+
#include <osl/process.h>
#include <unotools/ucbhelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -64,8 +64,8 @@ const char sNewLine[] = "\015\012"; // \015\012 and not \n
#define CURRENT_DB_VERSION "13.01.00"
#define CURRENT_KERNEL_VERSION "13.01"
-#define OPROCESS_ADABAS (OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath)
-#define OPROCESS_ADABAS_DBG (OProcess::TOption_Wait | OProcess::TOption_SearchPath)
+#define OPROCESS_ADABAS (osl_Process_HIDDEN | osl_Process_WAIT | osl_Process_SEARCHPATH)
+#define OPROCESS_ADABAS_DBG (osl_Process_WAIT | osl_Process_SEARCHPATH)
using namespace connectivity;
@@ -144,7 +144,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
using namespace utl;
using namespace osl;
-using namespace vos;
using namespace ::dbtools;
sal_Bool LoadFunctions(oslModule pODBCso);
@@ -882,19 +881,23 @@ void ODriver::clearDatabase(const ::rtl::OUString& sDBName)
::rtl::OUString sCommand;
#if defined(WIN) || defined(WNT)
::rtl::OUString sStop = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stop"));
- OArgumentList aArgs(2,&sDBName,&sStop);
- sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_cons.exe"));
+ const sal_uInt32 nArgsCount = 2;
+ rtl_uString *pArgs[nArgsCount] = { sDBName.pData, sStop.pData };
#else
- OArgumentList aArgs(1,&sDBName);
sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_clear"));
+ const sal_uInt32 nArgsCount = 1;
+ rtl_uString* pArgs[nArgsCount] = { sDBName.pData };
#endif
- OProcess aApp( sCommand,m_sDbWorkURL);
+ oslProcess aApp;
+
#if OSL_DEBUG_LEVEL > 0
- OProcess::TProcessError eError =
+ oslProcessError eError =
#endif
- aApp.execute( (OProcess::TProcessOption) OPROCESS_ADABAS, aArgs );
- OSL_ENSURE( eError == OProcess::E_None, "ODriver::clearDatabase: calling the executable failed!" );
+ osl_executeProcess(sCommand.pData, pArgs, nArgsCount,
+ OPROCESS_ADABAS, NULL, m_sDbWorkURL.pData,
+ NULL, 0, &aApp);
+ OSL_ENSURE( eError == osl_Process_E_None, "ODriver::clearDatabase: calling the executable failed!" );
}
// -----------------------------------------------------------------------------
void ODriver::createDb( const TDatabaseStruct& _aInfo)
@@ -988,7 +991,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME,
const ::rtl::OUString& _CMD)
{
// %XPARAM% -u %CONUSR%,%CONPWD% BINIT
- String sCommandFile = generateInitFile();
+ ::rtl::OUString sCommandFile = generateInitFile();
{
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
pFileStream->Seek(STREAM_SEEK_TO_END);
@@ -1022,12 +1025,16 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME,
pFileStream->Flush();
}
- OProcess aApp(sCommandFile ,m_sDbWorkURL);
+ oslProcess aApp;
+
#if OSL_DEBUG_LEVEL > 0
- OProcess::TProcessError eError =
+ oslProcesError eError =
#endif
- aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait));
- OSL_ENSURE( eError == OProcess::E_None, "ODriver::X_PARAM: calling the executable failed!" );
+ osl_executeProcess(sCommandFile.pData, NULL, 0,
+ osl_Process_HIDDEN | osl_Process_WAIT,
+ NULL, m_sDbWorkURL.pData, NULL, 0, &aApp);
+ OSL_ENSURE( eError == osl_Process_E_None, "ODriver::X_PARAM: calling the executable failed!" );
+
#if OSL_DEBUG_LEVEL < 2
if(UCBContentHelper::Exists(sCommandFile))
UCBContentHelper::Kill(sCommandFile);
@@ -1052,18 +1059,25 @@ void ODriver::PutParam(const ::rtl::OUString& sDBName,
const ::rtl::OUString& rWhat,
const ::rtl::OUString& rHow)
{
- OArgumentList aArgs(3,&sDBName,&rWhat,&rHow);
+ const sal_uInt32 nArgsCount = 3;
+ rtl_uString* pArgs[nArgsCount] = { sDBName.pData, rWhat.pData, rHow.pData };
+
::rtl::OUString sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("putparam"));
#if defined(WIN) || defined(WNT)
sCommand += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe"));
#endif
- OProcess aApp(sCommand,m_sDbWorkURL);
+ oslProcess aApp;
+
+
#if OSL_DEBUG_LEVEL > 0
- OProcess::TProcessError eError =
+ oslProcesError eError =
#endif
- aApp.execute( (OProcess::TProcessOption)OPROCESS_ADABAS,aArgs );
- OSL_ENSURE( eError == OProcess::E_None, "ODriver::PutParam: calling the executable failed!" );
+ osl_executeProcess(sCommand.pData, pArgs, nArgsCount,
+ OPROCESS_ADABAS,
+ NULL, m_sDbWorkURL.pData, NULL, 0, &aApp);
+
+ OSL_ENSURE( eError == osl_Process_E_None, "ODriver::PutParam: calling the executable failed!" );
}
// -----------------------------------------------------------------------------
sal_Bool ODriver::CreateFile(const ::rtl::OUString &_FileName,
@@ -1122,17 +1136,22 @@ int ODriver::X_START(const ::rtl::OUString& sDBName)
::rtl::OUString sArg3 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
::rtl::OUString sArg4 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBWindow"));
- OArgumentList aArgs(4,&sArg1,&sDBName,&sArg3,&sArg4);
+ const sal_uInt32 nArgsCount = 4;
+ rtl_uString* pArgs[nArgsCount] = { sArg1.pData, sDBName.pData, sArg3.pData, sArg4.pData };
sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("strt.exe"));
#else
- OArgumentList aArgs(1,&sDBName);
+ const sal_uInt32 nArgsCount = 1;
+ rtl_uString* pArgs[nArgsCount] = { sDBName.pData };
sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_start"));
#endif
- OProcess aApp( sCommand ,m_sDbWorkURL);
- OProcess::TProcessError eError = aApp.execute((OProcess::TProcessOption)OPROCESS_ADABAS,aArgs);
+ oslProcess aApp;
+
+ oslProcessError eError = osl_executeProcess(sCommand.pData, pArgs, nArgsCount,
+ OPROCESS_ADABAS, NULL, m_sDbWorkURL.pData,
+ NULL, 0, &aApp);
- if(eError == OProcess::E_NotFound)
+ if(eError == osl_Process_E_NotFound)
{
::connectivity::SharedResources aResources;
const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(
@@ -1142,10 +1161,11 @@ int ODriver::X_START(const ::rtl::OUString& sDBName)
) );
::dbtools::throwGenericSQLException(sError,*this);
}
- OSL_ASSERT(eError == OProcess::E_None);
+ OSL_ASSERT(eError == osl_Process_E_None);
+
+ oslProcessInfo aInfo;
- OProcess::TProcessInfo aInfo;
- if(aApp.getInfo(OProcess::TData_ExitCode,&aInfo) == OProcess::E_None && aInfo.Code)
+ if(osl_getProcessInfo(aApp, osl_Process_EXITCODE, &aInfo) == osl_Process_E_None && aInfo.Code)
return aInfo.Code;
return 0;
@@ -1159,22 +1179,28 @@ int ODriver::X_STOP(const ::rtl::OUString& sDBName)
::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d"));
::rtl::OUString sArg2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
- OArgumentList aArgs(3,&sArg1,&sDBName,&sArg2);
+ const sal_uInt32 nArgsCount = 3;
+ rtl_uString* pArgs[nArgsCount] = { sArg1.pData, sDBName.pData, sArg3.pData };
sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stp.exe"));
#else
- OArgumentList aArgs(1,&sDBName);
+ const sal_uInt32 nArgsCount = 1;
+ rtl_uString* pArgs[nArgsCount] = { sDBName.pData };
sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_stop"));
#endif
- OProcess aApp( sCommand ,m_sDbWorkURL);
- OProcess::TProcessError eError = aApp.execute((OProcess::TProcessOption)OPROCESS_ADABAS,aArgs);
+ oslProcess aApp;
+ oslProcessError eError = osl_executeProcess(sCommand.pData, pArgs, nArgsCount,
+ OPROCESS_ADABAS, NULL, m_sDbWorkURL.pData,
+ NULL, 0, &aApp);
- OSL_ASSERT(eError == OProcess::E_None);
- if(eError != OProcess::E_None)
+ OSL_ASSERT(eError == osl_Process_E_None);
+ if(eError != osl_Process_E_None)
return 1;
- OProcess::TProcessInfo aInfo;
- if(aApp.getInfo(OProcess::TData_ExitCode,&aInfo) == OProcess::E_None && aInfo.Code)
+
+ oslProcessInfo aInfo;
+
+ if(osl_getProcessInfo(aApp, osl_Process_EXITCODE, &aInfo) == osl_Process_E_None && aInfo.Code)
return aInfo.Code;
return 0;
@@ -1193,7 +1219,7 @@ void ODriver::XUTIL(const ::rtl::OUString& _rParam,
String sPhysicalPath;
LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath);
- String sCommandFile = generateInitFile();
+ ::rtl::OUString sCommandFile = generateInitFile();
{
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
@@ -1219,12 +1245,17 @@ void ODriver::XUTIL(const ::rtl::OUString& _rParam,
pFileStream->Flush();
}
- OProcess aApp(sCommandFile ,m_sDbWorkURL);
+ oslProcess aApp;
+
+
#if OSL_DEBUG_LEVEL > 0
- OProcess::TProcessError eError =
+ oslProcesError eError =
#endif
- aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait));
- OSL_ENSURE( eError == OProcess::E_None, "ODriver::XUTIL: calling the executable failed!" );
+ osl_executeProcess(sCommandFile.pData, NULL, 0,
+ osl_Process_HIDDEN | osl_Process_WAIT,
+ NULL, m_sDbWorkURL.pData, NULL, 0, &aApp);
+ OSL_ENSURE( eError == osl_Process_E_None, "ODriver::XUTIL: calling the executable failed!" );
+
#if OSL_DEBUG_LEVEL < 2
if(UCBContentHelper::Exists(sCommandFile))
UCBContentHelper::Kill(sCommandFile);
@@ -1247,7 +1278,7 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName,
String sPhysicalPath;
LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath);
- String sCommandFile = generateInitFile();
+ ::rtl::OUString sCommandFile = generateInitFile();
{
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
pFileStream->Seek(STREAM_SEEK_TO_END);
@@ -1276,12 +1307,17 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName,
pFileStream->Flush();
}
- OProcess aApp(sCommandFile ,m_sDbWorkURL);
+ oslProcess aApp;
+
+
#if OSL_DEBUG_LEVEL > 0
- OProcess::TProcessError eError =
+ oslProcesError eError =
#endif
- aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait));
- OSL_ENSURE( eError == OProcess::E_None, "ODriver::LoadBatch: calling the executable failed!" );
+ osl_executeProcess(sCommandFile.pData, NULL, 0,
+ osl_Process_HIDDEN | osl_Process_WAIT,
+ NULL, m_sDbWorkURL.pData, NULL, 0, &aApp);
+ OSL_ENSURE( eError == osl_Process_E_None, "ODriver::LoadBatch: calling the executable failed!" );
+
#if OSL_DEBUG_LEVEL < 2
if(UCBContentHelper::Exists(sCommandFile))
UCBContentHelper::Kill(sCommandFile);
@@ -1439,7 +1475,7 @@ void ODriver::X_CONS(const ::rtl::OUString& sDBName,const ::rtl::OString& _ACTIO
String sPhysicalPath;
LocalFileHelper::ConvertURLToPhysicalName(_FILENAME,sPhysicalPath);
- String sCommandFile = generateInitFile();
+ ::rtl::OUString sCommandFile = generateInitFile();
{
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
pFileStream->Seek(STREAM_SEEK_TO_END);
@@ -1458,8 +1494,12 @@ void ODriver::X_CONS(const ::rtl::OUString& sDBName,const ::rtl::OString& _ACTIO
pFileStream->Flush();
}
- OProcess aApp(sCommandFile ,m_sDbWorkURL);
- aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait));
+ oslProcess aApp;
+
+ osl_executeProcess(sCommandFile.pData, NULL, 0,
+ osl_Process_HIDDEN | osl_Process_WAIT,
+ NULL, m_sDbWorkURL.pData, NULL, 0, &aApp);
+
#if OSL_DEBUG_LEVEL < 2
if(UCBContentHelper::Exists(sCommandFile))
UCBContentHelper::Kill(sCommandFile);
@@ -1522,7 +1562,7 @@ sal_Bool ODriver::isVersion(const ::rtl::OUString& sDBName, const char* _pVersio
String sPhysicalPath;
LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath);
- String sCommandFile = generateInitFile();
+ ::rtl::OUString sCommandFile = generateInitFile();
{
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
pFileStream->Seek(STREAM_SEEK_TO_END);
@@ -1538,8 +1578,12 @@ sal_Bool ODriver::isVersion(const ::rtl::OUString& sDBName, const char* _pVersio
<< sNewLine;
}
- OProcess aApp(sCommandFile ,m_sDbWorkURL);
- aApp.execute( (OProcess::TProcessOption)OPROCESS_ADABAS);
+ oslProcess aApp;
+
+ osl_executeProcess(sCommandFile.pData, NULL, 0,
+ OPROCESS_ADABAS,
+ NULL, m_sDbWorkURL.pData, NULL, 0, &aApp);
+
#if OSL_DEBUG_LEVEL < 2
if(UCBContentHelper::Exists(sCommandFile))
UCBContentHelper::Kill(sCommandFile);
@@ -1572,7 +1616,7 @@ void ODriver::checkAndInsertNewDevSpace(const ::rtl::OUString& sDBName,
String sPhysicalPath;
LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath);
- String sCommandFile = generateInitFile();
+ ::rtl::OUString sCommandFile = generateInitFile();
{
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
pFileStream->Seek(STREAM_SEEK_TO_END);
@@ -1588,8 +1632,11 @@ void ODriver::checkAndInsertNewDevSpace(const ::rtl::OUString& sDBName,
<< sNewLine;
}
- OProcess aApp(sCommandFile ,m_sDbWorkURL);
- aApp.execute( (OProcess::TProcessOption)OPROCESS_ADABAS);
+ oslProcess aApp;
+ osl_executeProcess(sCommandFile.pData, NULL, 0,
+ OPROCESS_ADABAS,
+ NULL, m_sDbWorkURL.pData, NULL, 0, &aApp);
+
#if OSL_DEBUG_LEVEL < 2
if(UCBContentHelper::Exists(sCommandFile))
UCBContentHelper::Kill(sCommandFile);
@@ -1622,7 +1669,7 @@ sal_Bool ODriver::isKernelVersion(const char* _pVersion)
String sPhysicalPath;
LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath);
- String sCommandFile = generateInitFile();
+ ::rtl::OUString sCommandFile = generateInitFile();
{
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
pFileStream->Seek(STREAM_SEEK_TO_END);
@@ -1633,8 +1680,11 @@ sal_Bool ODriver::isKernelVersion(const char* _pVersion)
<< sNewLine;
}
- OProcess aApp(sCommandFile ,m_sDbWorkURL);
- aApp.execute( (OProcess::TProcessOption)OPROCESS_ADABAS);
+ oslProcess aApp;
+ osl_executeProcess(sCommandFile.pData, NULL, 0,
+ OPROCESS_ADABAS,
+ NULL, m_sDbWorkURL.pData, NULL, 0, &aApp);
+
#if OSL_DEBUG_LEVEL < 2
if(UCBContentHelper::Exists(sCommandFile))
UCBContentHelper::Kill(sCommandFile);
@@ -1733,7 +1783,7 @@ void ODriver::installSystemTables( const TDatabaseStruct& _aInfo)
XUTIL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RESTART")),_aInfo.sDBName,_aInfo.sControlUser,_aInfo.sControlPassword);
#else // UNX
- String sCommandFile = generateInitFile();
+ ::rtl::OUString sCommandFile = generateInitFile();
{
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
pFileStream->Seek(STREAM_SEEK_TO_END);
@@ -1761,8 +1811,11 @@ void ODriver::installSystemTables( const TDatabaseStruct& _aInfo)
pFileStream->Flush();
}
// now execute the command
- OProcess aApp(sCommandFile ,m_sDbWorkURL);
- aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait));
+
+ oslProcess aApp;
+ osl_executeProcess(sCommandFile.pData, NULL, 0,
+ osl_Process_WAIT | osl_Process_HIDDEN,
+ NULL, m_sDbWorkURL.pData, NULL, 0, &aApp);
#if OSL_DEBUG_LEVEL < 2
if(UCBContentHelper::Exists(sCommandFile))
UCBContentHelper::Kill(sCommandFile);
diff --git a/connectivity/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx
index 05af3a3..ba047b4 100644
--- a/connectivity/source/drivers/evoab/LConnection.cxx
+++ b/connectivity/source/drivers/evoab/LConnection.cxx
@@ -39,7 +39,7 @@
#include <connectivity/dbcharset.hxx>
#include <connectivity/dbexception.hxx>
#include <comphelper/processfactory.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
#include <tools/debug.hxx>
#include "LDebug.hxx"
#include "diagnose_ex.h"
@@ -116,18 +116,30 @@ void OEvoabConnection::construct(const ::rtl::OUString& url,const Sequence< Prop
::rtl::OUString aArg2 = ::rtl::OUString::createFromAscii(OEvoabDriver::getEVOAB_CLI_ARG_OUTPUT_FILE_PREFIX());
aArg2 += aWorkingDirPath;
aArg2 += getDriver()->getEvoFolderListFileName();
- OArgumentList aArgs(2,&aArg1,&aArg2);
+
+ const sal_uInt32 nArgsCount = 2;
+ rtl_uString* pPargs[nArgsCount] = { aArg1.pData, aArgs2.pData };
EVO_TRACE_STRING("OEvoabConnection::construct()::aCLICommand = %s\n", aCLICommand );
EVO_TRACE_STRING("OEvoabConnection::construct()::aWorkingDirPath = %s\n", aWorkingDirPath );
EVO_TRACE_STRING("OEvoabConnection::construct()::aArg1 = %s\n", aArg1 );
EVO_TRACE_STRING("OEvoabConnection::construct()::aArg2 = %s\n", aArg2 );
- OProcess aApp( aCLICommand,aWorkingDirPath);
- OSL_VERIFY_EQUALS(
- aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath),aArgs),
- OProcess::E_None,
- "Error at execute evolution-addressbook-export to get VCards");
+ oslProcess aProcess;
+ if ( osl_Process_E_None != osl_executeProcess(
+ aCLICommand.pData,
+ pArgs,
+ nArgsCount,
+ osl_Process_HIDDEN | osl_Process_WAIT | osl_Process_SEARCHPATH,
+ NULL,
+ aWorkingDirPath.pData,
+ NULL, 0,
+ &aProcess ) )
+ {
+ OSL_TRACE("Error at execute evolution-addressbook-export to get VCards");
+ ::dbtools::throwGenericSQLException(
+ ::rtl::OUString::createFromAscii("Error at execute evolution-addressbook-export to get VCards"),NULL);
+ }
Sequence<PropertyValue> aDriverParam;
::std::vector<PropertyValue> aParam;
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
index fa59234..d1a1542 100644
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
@@ -46,7 +46,6 @@
#include <comphelper/types.hxx>
#include "LFolderList.hxx"
#include "connectivity/CommonTools.hxx"
-#include <vos/process.hxx>
#include <osl/process.h>
#include <tools/debug.hxx>
#include <map>
@@ -359,7 +358,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
aArg2 += ::rtl::OUString(pOEvoabConnection->getExtension());
::rtl::OUString aArg3 = ::rtl::OUString::createFromAscii(pOEvoabConnection->getDriver()->getEVOAB_CLI_ARG_OUTPUT_FORMAT());
- OArgumentList aArgs(3,&aArg1,&aArg2,&aArg3);
+ const sal_uInt32 nArgsCount = 3;
+ rtl_uString *pArgs[nArgsCount] = { aArg1.pData, aArg2.pData, aArg3.pData };
EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aCLICommand = %s\n", aCLICommand );
EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aWorkingDir = %s\n", aWorkingDir );
@@ -367,11 +367,20 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aArg2 = %s\n", aArg2 );
EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aArg3 = %s\n", aArg3 );
- OProcess aApp( aCLICommand,aWorkingDir);
- OSL_VERIFY_EQUALS(
- aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath),aArgs),
- OProcess::E_None,
- "Error at execute evolution-addressbook-exporter to get VCards" );
+ oslProcess aProcess;
+ if ( osl_Process_E_None != osl_executeProcess(
+ aCLICommand.pData,
+ pArgs,
+ nArgsCount,
+ osl_Process_HIDDEN | osl_Process_WAIT | osl_Process_SEARCHPATH,
+ NULL,
+ aWorkingDir.pData,
+ NULL, 0,
+ &aProcess ) )
+ {
+ OSL_TRACE("Error at execute evolution-addressbook-export to get VCards");
+ throw SQLException();
+ }
bMoreData = pFolderList->next();
}
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 3affa4b..caf6d11 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -39,7 +39,6 @@
#include <comphelper/extract.hxx>
#include <connectivity/dbexception.hxx>
#include <comphelper/processfactory.hxx>
-#include <vos/process.hxx>
#include <tools/debug.hxx>
#include "NDebug.hxx"
#include <comphelper/sequence.hxx>
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 0062e17..3a71843 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/uno/Exception.hpp>
#include "java/tools.hxx"
#include "java/sql/SQLException.hxx"
-#include <vos/process.hxx>
#include <osl/mutex.hxx>
#include <osl/thread.h>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 187ade7..0fa5d8a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -115,6 +115,7 @@
#include <unotools/moduleoptions.hxx>
#include <osl/module.h>
#include <osl/file.hxx>
+#include <osl/process.h>
#include <osl/signal.h>
#include <rtl/uuid.h>
#include <rtl/uri.hxx>
@@ -143,8 +144,6 @@
#include <unotools/bootstrap.hxx>
#include <cppuhelper/bootstrap.hxx>
-#include "vos/process.hxx"
-
#include <svtools/fontsubstconfig.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <svtools/apearcfg.hxx>
@@ -162,7 +161,6 @@
#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
-using namespace vos;
using rtl::OUString;
using rtl::OUStringBuffer;
@@ -313,8 +311,7 @@ void FatalError(const ::rtl::OUString& sMessage)
::rtl::OUString sProductKey = ::utl::Bootstrap::getProductKey();
if ( ! sProductKey.getLength())
{
- ::vos::OStartupInfo aInfo;
- aInfo.getExecutableFile( sProductKey );
+ osl_getExecutableFile( &sProductKey.pData );
::sal_uInt32 nLastIndex = sProductKey.lastIndexOf('/');
if ( nLastIndex > 0 )
@@ -845,9 +842,8 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat
::rtl::OUString aUserInstallURL;
::rtl::OUString aProductKey;
::rtl::OUString aTemp;
- ::vos::OStartupInfo aInfo;
- aInfo.getExecutableFile( aProductKey );
+ osl_getExecutableFile( &aProductKey.pData );
sal_uInt32 lastIndex = aProductKey.lastIndexOf('/');
if ( lastIndex > 0 )
aProductKey = aProductKey.copy( lastIndex+1 );
@@ -2646,9 +2642,8 @@ void Desktop::OpenClients()
else
{
OUString aIniName;
- ::vos::OStartupInfo aInfo;
- aInfo.getExecutableFile( aIniName );
+ osl_getExecutableFile( &aIniName.pData );
sal_uInt32 lastIndex = aIniName.lastIndexOf('/');
if ( lastIndex > 0 )
{
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 1f591cc..c33e7c0 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -53,7 +53,6 @@
#include <osl/file.hxx>
#include <osl/module.h>
#include <osl/security.hxx>
-#include <vos/process.hxx>
#include <rtl/uri.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/bootstrap.hxx>
@@ -84,7 +83,6 @@
#define DESKTOP_TEMPDIRNAME "soffice.tmp"
using namespace rtl;
-using namespace vos;
using namespace desktop;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 6315b25..c685596 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -35,7 +35,7 @@
#include "dispatchwatcher.hxx"
#include <memory>
#include <stdio.h>
-#include <vos/process.hxx>
+#include <osl/process.h>
#include <unotools/bootstrap.hxx>
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
@@ -436,7 +436,6 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
::rtl::OUString aUserInstallPath;
::rtl::OUString aDummy;
- ::vos::OStartupInfo aInfo;
OfficeIPCThread* pThread = new OfficeIPCThread;
pThread->maPipeIdent = OUString( RTL_CONSTASCII_USTRINGPARAM( "SingleOfficeIPC_" ) );
@@ -460,7 +459,8 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
OUString aIniName;
- aInfo.getExecutableFile( aIniName );
+ osl_getExecutableFile( &aIniName.pData );
+
sal_uInt32 lastIndex = aIniName.lastIndexOf('/');
if ( lastIndex > 0 )
{
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index e2c6b48..ca68ab0 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -42,7 +42,6 @@
#include <osl/diagnose.h>
#include <osl/security.hxx>
#include <rtl/ref.hxx>
-#include <vos/process.hxx>
#include <tools/resmgr.hxx>
#include <unotools/bootstrap.hxx>
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 8e3dfe9..1989937 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -31,7 +31,6 @@
#include "acceptor.hxx"
#include <unotools/bootstrap.hxx>
-#include <vos/process.hxx>
#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
#include <vcl/svapp.hxx>
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index f286b7e..57e9682 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -32,7 +32,6 @@
#include "splash.hxx"
#include <stdio.h>
#include <unotools/bootstrap.hxx>
-#include <vos/process.hxx>
#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
#include <sfx2/sfx.hrc>
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index edb3603..710d326 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -28,7 +28,7 @@
#include "unxsplash.hxx"
#include <stdio.h>
#include <unotools/bootstrap.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
#include <sfx2/sfx.hrc>
@@ -107,11 +107,10 @@ void SAL_CALL
UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments )
throw ( RuntimeException )
{
- ::vos::OStartupInfo aInfo;
- for ( sal_uInt32 i = 0; i < aInfo.getCommandArgCount(); i++ )
+ for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ )
{
rtl::OUString aArg;
- if ( aInfo.getCommandArg( i, aArg ) )
+ if ( osl_getCommandArg( i, &aArg.pData ) )
break;
if ( aArg.matchIgnoreAsciiCaseAsciiL( PIPE_ARG, sizeof( PIPE_ARG ) - 1, 0 ) )
{
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index d9c29b4..2bc0ca4 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -877,9 +877,6 @@
#include "vcl/unohelp2.hxx"
#include "vcl/wall.hxx"
#include "vcl/wintypes.hxx"
-#include "osl/mutex.hxx"
-#include "vos/thread.hxx"
-#include "vos/xception.hxx"
#include "xmloff/DashStyle.hxx"
#include "xmloff/GradientStyle.hxx"
#include "xmloff/HatchStyle.hxx"
diff --git a/framework/inc/commands.h b/framework/inc/commands.h
index 947f7b1..8c57dca 100644
--- a/framework/inc/commands.h
+++ b/framework/inc/commands.h
@@ -33,7 +33,6 @@
//_________________________________________________________________________________________________________________
#include <macros/generic.hxx>
-#include <vos/process.hxx>
#include <rtl/ustring.hxx>
//_________________________________________________________________________________________________________________
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index f5ab00f..542d658 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -487,9 +487,7 @@
#include "vcl/window.hxx"
#include "vcl/wintypes.hxx"
-#include "osl/mutex.hxx"
-#include "vos/process.hxx"
-#include "vos/thread.hxx"
+
//---MARKER---
#endif
diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx
index 2bdb3ab..f454177 100644
--- a/framework/source/application/framework.cxx
+++ b/framework/source/application/framework.cxx
@@ -36,6 +36,7 @@
#include <helper/oinstanceprovider.hxx>
#include <classes/servicemanager.hxx>
#include <macros/debug.hxx>
+#include <osl/process.h>
#include <defines.hxx>
@@ -68,14 +69,12 @@
#include <svtools/unoiface.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
-#include <vos/process.hxx>
//_________________________________________________________________________________________________________________
// namespace
//_________________________________________________________________________________________________________________
using namespace ::rtl ;
-using namespace ::vos ;
using namespace ::comphelper ;
using namespace ::framework ;
using namespace ::com::sun::star::uno ;
@@ -167,13 +166,12 @@ void FrameWork::impl_analyzeCommandArguments()
m_bUsePlugIn = sal_False; // depends from "/plugin"
// Then step over all given arguments and search for supported one.
- OStartupInfo aInfo ;
OUString sArgument ;
- sal_uInt32 nCount = aInfo.getCommandArgCount();
+ sal_uInt32 nCount = osl_getCommandArgCount();
for ( sal_uInt32 nArgument=0; nArgument<nCount; ++nArgument )
{
// If extraction of current argument successfull ...
- if ( aInfo.getCommandArg( nArgument, sArgument ) == osl_Process_E_None )
+ if ( osl_getCommandArg( nArgument, &sArgument.pData ) == osl_Process_E_None )
{
// ... search for matching with supported values.
if ( sArgument == COMMANDARGUMENT_PLUGIN )
diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx
index aa662f5..ebaae79 100644
--- a/framework/source/application/login.cxx
+++ b/framework/source/application/login.cxx
@@ -51,7 +51,7 @@
//_________________________________________________________________________________________________________________
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <vcl/event.hxx>
@@ -81,7 +81,6 @@
//_________________________________________________________________________________________________________________
using namespace ::rtl ;
-using namespace ::vos ;
using namespace ::comphelper ;
using namespace ::framework ;
using namespace ::com::sun::star::uno ;
@@ -250,12 +249,10 @@ void LoginApplication::Main()
//*****************************************************************************************************************
void LoginApplication::impl_parseCommandline()
{
- // Use vos::OStartupInfo for access to command line.
// Step over all arguments, search for supported ones and try to get his values.
// Set it on our member. Caller of this method must control setted values.
- OStartupInfo aInfo;
- sal_uInt32 nCount = aInfo.getCommandArgCount() ;
+ sal_uInt32 nCount = osl_getCommandArgCount();
sal_uInt32 nArgument = 0 ;
OUString sArgument ;
OUString sValue ;
@@ -272,7 +269,7 @@ void LoginApplication::impl_parseCommandline()
{
// .. but work with valid ones only!
// Don't check values here. Caller of this method must decide between wrong and allowed values!
- aInfo.getCommandArg( nArgument, sArgument );
+ osl_getCommandArg( nArgument, &sArgument.pData );
//_____________________________________________________________________________________________________
// Look for "-f=<temp. file name>"
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index bb67b75..a68ad38 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -54,7 +54,7 @@
#include <osl/file.hxx>
#include <osl/security.hxx>
#include <osl/socket.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
#include <i18npool/mslangid.hxx>
#include <tools/urlobj.hxx>
#include <tools/resmgr.hxx>
diff --git a/framework/source/threadhelp/lockhelper.cxx b/framework/source/threadhelp/lockhelper.cxx
index e3896fa..c18e9d5 100644
--- a/framework/source/threadhelp/lockhelper.cxx
+++ b/framework/source/threadhelp/lockhelper.cxx
@@ -46,7 +46,7 @@
//_________________________________________________________________________________________________________________
// other includes
//_________________________________________________________________________________________________________________
-#include <vos/process.hxx>
+#include <osl/process.h>
//_________________________________________________________________________________________________________________
// namespace
@@ -533,9 +533,9 @@ ELockType& LockHelper::implts_getLockType()
{
static ELockType eType = FALLBACK_LOCKTYPE;
- ::vos::OStartupInfo aEnvironment;
+ ::rtl::OUString aEnvVar( ENVVAR_LOCKTYPE );
::rtl::OUString sValue ;
- if( aEnvironment.getEnvironment( ENVVAR_LOCKTYPE, sValue ) == ::vos::OStartupInfo::E_None )
+ if( osl_getEnvironment( aEnvVar.pData, &sValue.pData ) == osl_Process_E_None )
{
eType = (ELockType)(sValue.toInt32());
}
diff --git a/framework/test/threadtest.cxx b/framework/test/threadtest.cxx
index c130c85..88d2004 100644
--- a/framework/test/threadtest.cxx
+++ b/framework/test/threadtest.cxx
@@ -51,8 +51,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <rtl/random.h>
-#include <vos/process.hxx>
-#include <vos/thread.hxx>
+#include <osl/process.h>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/time.h>
@@ -78,7 +77,6 @@
using namespace ::rtl ;
using namespace ::osl ;
-using namespace ::vos ;
using namespace ::framework ;
//_________________________________________________________________________________________________________________
@@ -693,16 +691,15 @@ void TestApplication::Main()
// Parse command line.
// Attention: All parameter are required and must exist!
// syntax: "threadtest.exe <testcount> <threadcount> <loops> <owner>"
- OStartupInfo aInfo ;
OUString sArgument ;
sal_Int32 nArgument ;
- sal_Int32 nCount = aInfo.getCommandArgCount();
+ sal_Int32 nCount = osl_getCommandArgCount();
LOG_ASSERT2( nCount!=4 ,"TestApplication::Main()" , "Wrong argument line detected!")
for( nArgument=0; nArgument<nCount; ++nArgument )
{
- aInfo.getCommandArg( nArgument, sArgument );
+ osl_getCommandArg( nArgument, &sArgument.pData );
if( nArgument== 0 ) nTestCount =sArgument.toInt32();
if( nArgument== 1 ) nThreadCount=sArgument.toInt32();
if( nArgument== 2 ) nLoops =sArgument.toInt32();
diff --git a/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx
index 58f72cc..9d86d07 100644
--- a/framework/test/threadtest/threadtest.cxx
+++ b/framework/test/threadtest/threadtest.cxx
@@ -50,7 +50,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <rtl/random.h>
-#include <vos/process.hxx>
+#include <osl/process.h>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/time.h>
@@ -691,16 +691,15 @@ void TestApplication::Main()
// Parse command line.
// Attention: All parameter are required and must exist!
// syntax: "threadtest.exe <testcount> <threadcount> <loops> <owner>"
- OStartupInfo aInfo ;
OUString sArgument ;
sal_Int32 nArgument ;
- sal_Int32 nCount = aInfo.getCommandArgCount();
+ sal_Int32 nCount = osl_getCommandArgCount();
LOG_ASSERT2( nCount!=4 ,"TestApplication::Main()" , "Wrong argument line detected!")
for( nArgument=0; nArgument<nCount; ++nArgument )
{
- aInfo.getCommandArg( nArgument, sArgument );
+ osl_getCommandArg( nArgument, &sArgument.pData );
if( nArgument== 0 ) nTestCount =sArgument.toInt32();
if( nArgument== 1 ) nThreadCount=sArgument.toInt32();
if( nArgument== 2 ) nLoops =sArgument.toInt32();
diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx
index a37a884..5aad6e1 100644
--- a/framework/test/typecfg/cfgview.cxx
+++ b/framework/test/typecfg/cfgview.cxx
@@ -51,7 +51,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <comphelper/processfactory.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
@@ -115,7 +115,6 @@
//_________________________________________________________________________________________________________________
using namespace ::std ;
-using namespace ::vos ;
using namespace ::rtl ;
using namespace ::framework ;
using namespace ::comphelper ;
@@ -249,16 +248,14 @@ void CFGView::impl_printSyntax()
*//*-*************************************************************************************************************/
void CFGView::impl_parseCommandLine( AppMember& rMember )
{
- ::vos::OStartupInfo aInfo ;
::rtl::OUString sArgument ;
sal_Int32 nArgument = 0 ;
- sal_Int32 nCount = aInfo.getCommandArgCount();
+ sal_Int32 nCount = osl_getCommandArgCount();
sal_Int32 nMinCount = 0 ;
while( nArgument<nCount )
{
- aInfo.getCommandArg( nArgument, sArgument );
-
+ osl_getCommandArg( nArgument, &sArgument.pData );
//_____________________________________________________________________________________________________
// look for "-dir="
if( sArgument.compareTo( ARGUMENT_DIRNAME, ARGUMENTLENGTH ) == ARGUMENTFOUND )
diff --git a/framework/test/typecfg/typecfg.cxx b/framework/test/typecfg/typecfg.cxx
index 84e941c..4f1c0cd 100644
--- a/framework/test/typecfg/typecfg.cxx
+++ b/framework/test/typecfg/typecfg.cxx
@@ -49,7 +49,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <comphelper/processfactory.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
@@ -73,7 +73,6 @@
//_________________________________________________________________________________________________________________
using namespace ::std ;
-using namespace ::vos ;
using namespace ::rtl ;
using namespace ::framework ;
using namespace ::comphelper ;
@@ -158,14 +157,13 @@ void TypeApplication::Main()
//*****************************************************************************************************************
void TypeApplication::impl_parseCommandLine()
{
- OStartupInfo aInfo ;
OUString sArgument ;
sal_Int32 nArgument = 0 ;
- sal_Int32 nCount = aInfo.getCommandArgCount();
+ sal_Int32 nCount = osl_getCommandArgCount();
while( nArgument<nCount )
{
- aInfo.getCommandArg( nArgument, sArgument );
+ osl_getCommandArg( nArgument, &sArgument.pData );
if( sArgument == ARGUMENT_GENERATE_CFGVIEW )
{
diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx
index 6015f73..adb4cea 100644
--- a/framework/test/typecfg/xml2xcd.cxx
+++ b/framework/test/typecfg/xml2xcd.cxx
@@ -54,7 +54,7 @@
//_________________________________________________________________________________________________________________
#include <comphelper/processfactory.hxx>
#include <unotools/processfactory.hxx>
-#include <vos/process.hxx>
+#include <osl/process.h>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
@@ -335,15 +335,14 @@ void XCDGenerator::impl_printSyntax()
*//*-*************************************************************************************************************/
void XCDGenerator::impl_parseCommandLine( AppMember& rMember )
{
- ::vos::OStartupInfo aInfo ;
::rtl::OUString sArgument ;
sal_Int32 nArgument = 0 ;
- sal_Int32 nCount = aInfo.getCommandArgCount();
+ sal_Int32 nCount = osl_getCommandArgCount();
sal_Int32 nMinCount = 0 ;
while( nArgument<nCount )
{
- aInfo.getCommandArg( nArgument, sArgument );
+ osl_getCommandArg( nArgument, &sArgument.pData );
/*OBSOLETE
//_____________________________________________________________________________________________________
// look for "-fis=..."
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index bbc5c45..74b7ec7 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -47,7 +47,6 @@
#include <svl/itemprop.hxx>
#include "misc.hxx"
#include "defs.hxx"
-#include <vos/refernce.hxx>
namespace com { namespace sun { namespace star {
namespace beans {
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index f670027..bca6af7 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -660,8 +660,7 @@
#include "osl/diagnose.h"
#include "osl/module.hxx"
#include "osl/mutex.hxx"
-#include "vos/process.hxx"
-#include "vos/xception.hxx"
+#include "osl/process.h"
//---MARKER---
#endif
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index af495b6..d284d84 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -38,7 +38,6 @@
#include <sfx2/app.hxx>
#include <sfx2/frame.hxx>
-#include <vos/process.hxx>
#include <tools/simplerm.hxx>
#include <tools/config.hxx>
#include <basic/basrdll.hxx>
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 15d5051..baa79e7 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -41,7 +41,6 @@
#include <svl/itempool.hxx>
#include <svl/urihelper.hxx>
#include <svtools/helpopt.hxx>
-#include <vos/process.hxx>
#include <framework/sfxhelperfunctions.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Exception.hpp>
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index b976915..f834558 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -30,8 +30,6 @@
#include "precompiled_sfx2.hxx"
#include <vcl/status.hxx>
#include <vcl/msgbox.hxx>
-#include <vos/process.hxx>
-#include <vos/xception.hxx>
#include <svl/whiter.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index e25910b..5cca2d5 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -83,7 +83,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/shl.hxx>
#include <unotools/bootstrap.hxx>
-#include <vos/process.hxx>
#include <rtl/bootstrap.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 57f743d..5ec078b 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -86,7 +86,6 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/ucb/XContent.hpp>
#include <rtl/ustring.hxx>
-#include <vos/process.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/moduleoptions.hxx>
#include <comphelper/mediadescriptor.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 1c40c0a..9793d4b 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -945,7 +945,6 @@
#include "vcl/wall.hxx"
#include "vcl/wintypes.hxx"
#include "osl/mutex.hxx"
-#include "vos/xception.hxx"
#include "xmloff/DashStyle.hxx"
#include "xmloff/GradientStyle.hxx"
#include "xmloff/HatchStyle.hxx"
diff --git a/ucb/inc/pch/precompiled_ucb.hxx b/ucb/inc/pch/precompiled_ucb.hxx
index 7673ca7..0aa17b5 100644
--- a/ucb/inc/pch/precompiled_ucb.hxx
+++ b/ucb/inc/pch/precompiled_ucb.hxx
@@ -175,9 +175,6 @@
#include "ucbhelper/macros.hxx"
#include "ucbhelper/proxydecider.hxx"
-#include "osl/diagnose.h"
-#include "osl/mutex.hxx"
-#include "vos/process.hxx"
//---MARKER---
#endif
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index 4dc3c92..5eec385 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -32,7 +32,6 @@
#include <stack>
#include <rtl/ustrbuf.hxx>
#include <osl/mutex.hxx>
-#include <vos/process.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/ucb/ContentAction.hpp>
@@ -80,6 +79,7 @@
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
#include <srcharg.hxx>
+#include <osl/security.hxx>
using ucbhelper::getLocalFileURL;
using ucbhelper::getSystemPathFromFileURL;
@@ -433,7 +433,7 @@ sal_Bool Ucb::init()
try
{
rtl::OUString aPipe;
- vos::OSecurity().getUserIdent(aPipe);
+ osl::Security().getUserIdent(aPipe);
uno::Sequence< uno::Any > aArgs(4);
aArgs[0] <<= m_aConfigurationKey1;
aArgs[1] <<= m_aConfigurationKey2;
commit 8b81e35ad1b9f231aa517ddff8bab1f31ec901a8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Oct 20 19:21:49 2010 -0500
remvove vos/macros.h usage
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
index 066e87a..2890d9a 100644
--- a/basic/inc/basic/process.hxx
+++ b/basic/inc/basic/process.hxx
@@ -39,9 +39,9 @@ typedef Environment::value_type EnvironmentVariable;
class Process
{
// Internal members and methods
- NAMESPACE_VOS(OArgumentList) *pArgumentList;
- NAMESPACE_VOS(OEnvironment) *pEnvList;
- NAMESPACE_VOS(OProcess) *pProcess;
+ vos::OArgumentList *pArgumentList;
+ vos::OEnvironment *pEnvList;
+ vos::OProcess *pProcess;
BOOL ImplIsRunning();
long ImplGetExitCode();
BOOL bWasGPF;
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index adb587c..a0e4537 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -276,7 +276,6 @@
#include "vcl/wrkwin.hxx"
#include "osl/diagnose.h"
-#include "vos/macros.hxx"
#include "osl/mutex.hxx"
#include "vos/process.hxx"
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index a9c0d9c..bd06aa0 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -71,9 +71,9 @@ BOOL Process::ImplIsRunning()
{
if ( pProcess && bHasBeenStarted )
{
- NAMESPACE_VOS(OProcess::TProcessInfo) aProcessInfo;
- pProcess->getInfo( NAMESPACE_VOS(OProcess::TData_ExitCode), &aProcessInfo );
- if ( !(aProcessInfo.Fields & NAMESPACE_VOS(OProcess::TData_ExitCode)) )
+ vos::OProcess::TProcessInfo aProcessInfo;
+ pProcess->getInfo( vos::OProcess::TData_ExitCode, &aProcessInfo );
+ if ( !(aProcessInfo.Fields & vos::OProcess::TData_ExitCode) )
return TRUE;
else
return FALSE;
@@ -86,9 +86,9 @@ long Process::ImplGetExitCode()
{
if ( pProcess )
{
- NAMESPACE_VOS(OProcess::TProcessInfo) aProcessInfo;
- pProcess->getInfo( NAMESPACE_VOS(OProcess::TData_ExitCode), &aProcessInfo );
- if ( !(aProcessInfo.Fields & NAMESPACE_VOS(OProcess::TData_ExitCode)) )
+ vos::OProcess::TProcessInfo aProcessInfo;
+ pProcess->getInfo( vos::OProcess::TData_ExitCode, &aProcessInfo );
+ if ( !(aProcessInfo.Fields & vos::OProcess::TData_ExitCode) )
SbxBase::SetError( SbxERR_NO_ACTIVE_OBJECT );
return aProcessInfo.Code;
}
@@ -123,7 +123,7 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const
nParamCount++;
}
}
- pArgumentList = new NAMESPACE_VOS(OArgumentList)( pParamList, nCount );
+ pArgumentList = new vos::OArgumentList( pParamList, nCount );
::rtl::OUString *pEnvArray = NULL;
@@ -142,12 +142,12 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const
nEnvCount++;
aIter++;
}
- pEnvList = new NAMESPACE_VOS(OEnvironment)( pEnvArray, nEnvCount );
+ pEnvList = new vos::OEnvironment( pEnvArray, nEnvCount );
}
::rtl::OUString aNormalizedAppPath;
osl::FileBase::getFileURLFromSystemPath( ::rtl::OUString(aAppPath), aNormalizedAppPath );
- pProcess = new NAMESPACE_VOS(OProcess)( aNormalizedAppPath );
+ pProcess = new vos::OProcess( aNormalizedAppPath );
bHasBeenStarted = FALSE;
delete [] pParamList;
@@ -169,20 +169,14 @@ BOOL Process::Start()
#endif
if ( pEnvList )
{
- bSuccess = pProcess->execute( (NAMESPACE_VOS(OProcess)::TProcessOption)
- ( NAMESPACE_VOS(OProcess)::TOption_SearchPath
- /*| NAMESPACE_VOS(OProcess)::TOption_Detached*/
- /*| NAMESPACE_VOS(OProcess)::TOption_Wait*/ ),
- *pArgumentList,
- *pEnvList ) == NAMESPACE_VOS(OProcess)::E_None;
+ bSuccess = pProcess->execute( (vos::OProcess::TProcessOption)(vos::OProcess::TOption_SearchPath),
+ *pArgumentList,
+ *pEnvList ) == vos::OProcess::E_None;
}
else
{
- bSuccess = pProcess->execute( (NAMESPACE_VOS(OProcess)::TProcessOption)
- ( NAMESPACE_VOS(OProcess)::TOption_SearchPath
- /*| NAMESPACE_VOS(OProcess)::TOption_Detached*/
- /*| NAMESPACE_VOS(OProcess)::TOption_Wait*/ ),
- *pArgumentList ) == NAMESPACE_VOS(OProcess)::E_None;
+ bSuccess = pProcess->execute( (vos::OProcess::TProcessOption)(vos::OProcess::TOption_SearchPath),
+ *pArgumentList ) == vos::OProcess::E_None;
}
#ifdef WNT
}
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 1ac08a1..4766d19 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -31,7 +31,6 @@
#include <list>
-#include <vos/macros.hxx>
#include <vcl/svapp.hxx>
#include <tools/stream.hxx>
#include <svl/brdcst.hxx>
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index c0e983d..7208cd7 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3486,8 +3486,8 @@ RTLFUNC(Shell)
}
else
{
- USHORT nOptions = NAMESPACE_VOS(OProcess)::TOption_SearchPath|
- NAMESPACE_VOS(OProcess)::TOption_Detached;
+ USHORT nOptions = vos::OProcess::TOption_SearchPath|
+ vos::OProcess::TOption_Detached;
String aCmdLine = rPar.Get(1)->GetString();
// Zusaetzliche Parameter anhaengen, es muss eh alles geparsed werden
if( nArgCount >= 4 )
@@ -3565,13 +3565,13 @@ RTLFUNC(Shell)
switch( nWinStyle )
{
case 2:
- nOptions |= NAMESPACE_VOS(OProcess)::TOption_Minimized;
+ nOptions |= vos::OProcess::TOption_Minimized;
break;
case 3:
- nOptions |= NAMESPACE_VOS(OProcess)::TOption_Maximized;
+ nOptions |= vos::OProcess::TOption_Maximized;
break;
case 10:
- nOptions |= NAMESPACE_VOS(OProcess)::TOption_FullScreen;
+ nOptions |= vos::OProcess::TOption_FullScreen;
break;
}
@@ -3579,10 +3579,10 @@ RTLFUNC(Shell)
if( nArgCount >= 5 )
bSync = rPar.Get(4)->GetBool();
if( bSync )
- nOptions |= NAMESPACE_VOS(OProcess)::TOption_Wait;
+ nOptions |= vos::OProcess::TOption_Wait;
}
- NAMESPACE_VOS(OProcess)::TProcessOption eOptions =
- (NAMESPACE_VOS(OProcess)::TProcessOption)nOptions;
+ vos::OProcess::TProcessOption eOptions =
+ (vos::OProcess::TProcessOption)nOptions;
// #72471 Parameter aufbereiten
@@ -3612,34 +3612,26 @@ RTLFUNC(Shell)
}
//const char* pParams = aParams.Len() ? aParams.GetStr() : 0;
- NAMESPACE_VOS(OProcess)* pApp;
- pApp = new NAMESPACE_VOS(OProcess)( aOUStrProgUNC );
+ vos::OProcess* pApp;
+ pApp = new vos::OProcess( aOUStrProgUNC );
BOOL bSucc;
if( nParamCount == 0 )
{
- bSucc = pApp->execute( eOptions ) == NAMESPACE_VOS(OProcess)::E_None;
+ bSucc = pApp->execute( eOptions ) == vos::OProcess::E_None;
}
else
{
- NAMESPACE_VOS(OArgumentList) aArgList( pArgumentList, nParamCount );
- bSucc = pApp->execute( eOptions, aArgList ) == NAMESPACE_VOS(OProcess)::E_None;
+ vos::OArgumentList aArgList( pArgumentList, nParamCount );
+ bSucc = pApp->execute( eOptions, aArgList ) == vos::OProcess::E_None;
}
long nResult = 0;
- NAMESPACE_VOS(OProcess)::TProcessInfo aInfo;
+ vos::OProcess::TProcessInfo aInfo;
// We should return the identifier of the executing process when is running VBA, because method Shell(...) returns it in Excel.
- if ( bSucc && SbiRuntime::isVBAEnabled() && pApp->getInfo( NAMESPACE_VOS(OProcess)::TData_Identifier, &aInfo ) == NAMESPACE_VOS(OProcess)::E_None )
+ if ( bSucc && SbiRuntime::isVBAEnabled() && pApp->getInfo( vos::OProcess::TData_Identifier, &aInfo ) == vos::OProcess::E_None )
{
nResult = aInfo.Ident;
}
- /*
- if( nParamCount == 0 )
- pApp = new NAMESPACE_VOS(OProcess)( pProg );
- else
- pApp = new NAMESPACE_VOS(OProcess)( pProg, pParamList, nParamCount );
- BOOL bSucc = pApp->execute( eOptions ) == NAMESPACE_VOS(OProcess)::E_None;
- */
-
delete pApp;
delete[] pArgumentList;
if( !bSucc )
commit 3d70c1584ffc3f76a44d48b10a1fb5c45292460f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Oct 20 06:26:32 2010 -0500
rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 314d170..e495843 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -295,7 +295,7 @@ void ShutdownIcon::FileOpen()
{
if ( getInstance() && getInstance()->m_xDesktop.is() )
{
- SolarMutexGuard aGuard;
+ ::SolarMutexGuard aGuard;
EnterModalMode();
getInstance()->StartFileDialog();
}
@@ -876,8 +876,8 @@ void ShutdownIcon::SetAutostart( bool bActivate )
osl_getThreadTextEncoding() );
OString aShortcutUnx = OUStringToOString( aShortcut,
osl_getThreadTextEncoding() );
- if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
- {
+ if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
+ {
unlink(aShortcutUnx);
int ret = symlink(aDesktopFileUnx, aShortcutUnx);
(void)ret; //deliberately ignore return value, it's non-critical if it fails
diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx
index 4f87429..1da9832 100644
--- a/sfx2/source/doc/docstoragemodifylistener.cxx
+++ b/sfx2/source/doc/docstoragemodifylistener.cxx
@@ -71,14 +71,14 @@ namespace sfx2
//--------------------------------------------------------------------
void DocumentStorageModifyListener::dispose()
{
- ::osl::SolarMutexGuard aGuard( m_rMutex );
+ ::osl::SolarGuard aGuard( m_rMutex );
m_pDocument = NULL;
}
//--------------------------------------------------------------------
void SAL_CALL DocumentStorageModifyListener::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException)
{
- ::osl::SolarMutexGuard aGuard( m_rMutex );
+ ::osl::SolarGuard aGuard( m_rMutex );
// storageIsModified must not contain any locking!
if ( m_pDocument )
m_pDocument->storageIsModified();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list