summaryrefslogtreecommitdiff
path: root/firefoxos/sdremote
ModeNameSize
-rw-r--r--index.html1629logplain
d---------js191logplain
-rw-r--r--manifest.webapp742logplain
core/tree/?h=libreoffice-5-4-branch-point&id=7d081c94c26ca430c51b5e88dcbd8b1884a52fc3'>bfc0de277306b8acd50a19558e5ed05b46eb6957 /dictionaries parent0657fcc8c918aac0e99b5c2406328c175be606e7 (diff)
Updated core d>4
-rwxr-xr-x[-rw-r--r--]avmedia/inc/avmedia/mediawindow.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/inc/helpids.hrc26
-rwxr-xr-x[-rw-r--r--]avmedia/inc/mediacontrol.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/prj/build.lst4
-rwxr-xr-x[-rw-r--r--]avmedia/prj/d.lst5
-rwxr-xr-x[-rw-r--r--]avmedia/source/framework/makefile.mk0
-rwxr-xr-x[-rw-r--r--]avmedia/source/framework/mediacontrol.cxx16
-rwxr-xr-x[-rw-r--r--]avmedia/source/framework/mediacontrol.hrc0
-rwxr-xr-x[-rw-r--r--]avmedia/source/framework/mediacontrol.src0
-rwxr-xr-x[-rw-r--r--]avmedia/source/framework/mediaitem.cxx2
-rwxr-xr-x[-rw-r--r--]avmedia/source/framework/mediamisc.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/framework/mediaplayer.cxx2
-rwxr-xr-x[-rw-r--r--]avmedia/source/framework/mediatoolbox.cxx4
-rwxr-xr-x[-rw-r--r--]avmedia/source/framework/soundhandler.cxx38
-rwxr-xr-x[-rw-r--r--]avmedia/source/framework/soundhandler.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/framework/soundhandler.xml0
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/ChangeLog0
-rwxr-xr-xavmedia/source/gstreamer/avmediagst.component34
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/exports.dxp1
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/gstcommon.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/gstframegrabber.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/gstframegrabber.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/gstmanager.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/gstmanager.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/gstplayer.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/gstplayer.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/gstuno.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/gstwindow.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/gstwindow.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/gstreamer/makefile.mk0
-rwxr-xr-x[-rw-r--r--]avmedia/source/inc/mediamisc.hxx24
-rwxr-xr-x[-rw-r--r--]avmedia/source/java/FrameGrabber.java0
-rwxr-xr-x[-rw-r--r--]avmedia/source/java/Manager.java0
-rwxr-xr-x[-rw-r--r--]avmedia/source/java/MediaUno.java9
-rwxr-xr-x[-rw-r--r--]avmedia/source/java/Player.java0
-rwxr-xr-x[-rw-r--r--]avmedia/source/java/PlayerWindow.java4
-rwxr-xr-x[-rw-r--r--]avmedia/source/java/WindowAdapter.java0
-rwxr-xr-x[-rw-r--r--]avmedia/source/java/avmedia.jarbin16420 -> 15776 bytes-rwxr-xr-xavmedia/source/java/avmedia.jar.component34
-rwxr-xr-x[-rw-r--r--]avmedia/source/java/makefile.mk8
-rwxr-xr-x[-rw-r--r--]avmedia/source/java/manifest0
-rwxr-xr-x[-rw-r--r--]avmedia/source/java/win/SystemWindowAdapter.java0
-rwxr-xr-x[-rw-r--r--]avmedia/source/java/x11/SystemWindowAdapter.java0
-rwxr-xr-xavmedia/source/quicktime/avmediaQuickTime.component34
-rwxr-xr-x[-rw-r--r--]avmedia/source/quicktime/framegrabber.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/quicktime/framegrabber.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/quicktime/makefile.mk8
-rwxr-xr-x[-rw-r--r--]avmedia/source/quicktime/manager.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/quicktime/manager.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/quicktime/player.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/quicktime/player.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/quicktime/quicktimecommon.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/quicktime/quicktimeuno.cxx29
-rwxr-xr-x[-rw-r--r--]avmedia/source/quicktime/window.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/quicktime/window.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/viewer/makefile.mk0
-rwxr-xr-x[-rw-r--r--]avmedia/source/viewer/mediaevent_impl.cxx4
-rwxr-xr-x[-rw-r--r--]avmedia/source/viewer/mediaevent_impl.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/viewer/mediawindow.cxx42
-rwxr-xr-x[-rw-r--r--]avmedia/source/viewer/mediawindow.hrc0
-rwxr-xr-x[-rw-r--r--]avmedia/source/viewer/mediawindow.src0
-rwxr-xr-x[-rw-r--r--]avmedia/source/viewer/mediawindow_impl.cxx57
-rwxr-xr-x[-rw-r--r--]avmedia/source/viewer/mediawindow_impl.hxx13
-rwxr-xr-x[-rw-r--r--]avmedia/source/viewer/mediawindowbase_impl.cxx7
-rwxr-xr-x[-rw-r--r--]avmedia/source/viewer/mediawindowbase_impl.hxx5
-rwxr-xr-xavmedia/source/win/avmediawin.component34
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/exports.dxp1
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/framegrabber.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/framegrabber.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/interface.hxx6
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/makefile.mk8
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/manager.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/manager.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/player.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/player.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/wincommon.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/window.cxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/window.hxx0
-rwxr-xr-x[-rw-r--r--]avmedia/source/win/winuno.cxx31
-rwxr-xr-xavmedia/util/avmedia.component34
-rwxr-xr-x[-rw-r--r--]avmedia/util/makefile.mk8
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/basicmanagerrepository.hxx0
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/basicrt.hxx12
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/basmgr.hxx71
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/basrdll.hxx8
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/dispdefs.hxx0
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/modsizeexceeded.hxx (renamed from basic/inc/modsizeexceeded.hxx)0
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/mybasic.hxx14
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/process.hxx16
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbdef.hxx0
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sberrors.hxx2
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbmeth.hxx22
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbmod.hxx73
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbobjmod.hxx17
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbprop.hxx2
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbstar.hxx91
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbstdobj.hxx60
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbuno.hxx0
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbx.hxx102
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbxbase.hxx0
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbxcore.hxx104
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbxdef.hxx33
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbxfac.hxx8
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbxform.hxx28
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbxmeth.hxx2
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbxmstrm.hxx2
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbxobj.hxx22
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbxprop.hxx0
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/sbxvar.hxx203
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/svtmsg.hrc (renamed from basic/inc/svtmsg.hrc)0
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/testtool.hrc (renamed from basic/inc/testtool.hrc)0
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/testtool.hxx14
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/ttglobal.hrc0
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/ttmsg.hrc (renamed from basic/inc/ttmsg.hrc)0
-rwxr-xr-x[-rw-r--r--]basic/inc/basic/ttstrhlp.hxx20
-rwxr-xr-xbasic/inc/basic/vbahelper.hxx86
-rwxr-xr-x[-rw-r--r--]basic/inc/basrid.hxx0
-rwxr-xr-x[-rw-r--r--]basic/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]basic/inc/pch/precompiled_basic.cxx0
-rwxr-xr-x[-rw-r--r--]basic/inc/pch/precompiled_basic.hxx2
-rwxr-xr-x[-rw-r--r--]basic/inc/sb.hrc0
-rwxr-xr-x[-rw-r--r--]basic/inc/sb.hxx0
-rwxr-xr-xbasic/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]basic/prj/d.lst40
-rwxr-xr-x[-rw-r--r--]basic/source/app/app.cxx228
-rwxr-xr-x[-rw-r--r--]basic/source/app/app.hxx44
-rwxr-xr-x[-rw-r--r--]basic/source/app/appbased.cxx36
-rwxr-xr-x[-rw-r--r--]basic/source/app/appbased.hxx6
-rwxr-xr-x[-rw-r--r--]basic/source/app/appedit.cxx24
-rwxr-xr-x[-rw-r--r--]basic/source/app/appedit.hxx8
-rwxr-xr-x[-rw-r--r--]basic/source/app/apperror.cxx16
-rwxr-xr-x[-rw-r--r--]basic/source/app/apperror.hxx4
-rwxr-xr-x[-rw-r--r--]basic/source/app/appwin.cxx118
-rwxr-xr-x[-rw-r--r--]basic/source/app/appwin.hxx54
-rwxr-xr-x[-rw-r--r--]basic/source/app/basic.hrc0
-rwxr-xr-x[-rw-r--r--]basic/source/app/basic.src64
-rwxr-xr-x[-rw-r--r--]basic/source/app/basicrt.cxx10
-rwxr-xr-x[-rw-r--r--]basic/source/app/basmsg.hrc0
-rwxr-xr-x[-rw-r--r--]basic/source/app/basmsg.src0
-rwxr-xr-x[-rw-r--r--]basic/source/app/brkpnts.cxx23
-rwxr-xr-x[-rw-r--r--]basic/source/app/brkpnts.hxx2
-rwxr-xr-x[-rw-r--r--]basic/source/app/dataedit.hxx24
-rwxr-xr-x[-rw-r--r--]basic/source/app/dialogs.cxx104
-rwxr-xr-x[-rw-r--r--]basic/source/app/dialogs.hxx12
-rwxr-xr-x[-rw-r--r--]basic/source/app/makefile.mk0
-rwxr-xr-x[-rw-r--r--]basic/source/app/msgedit.cxx186
-rwxr-xr-x[-rw-r--r--]basic/source/app/msgedit.hxx26
-rwxr-xr-x[-rw-r--r--]basic/source/app/mybasic.cxx20
-rwxr-xr-x[-rw-r--r--]basic/source/app/printer.cxx4
-rwxr-xr-x[-rw-r--r--]basic/source/app/printer.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/app/process.cxx32
-rwxr-xr-x[-rw-r--r--]basic/source/app/processw.cxx40
-rwxr-xr-x[-rw-r--r--]basic/source/app/processw.hxx12
-rwxr-xr-x[-rw-r--r--]basic/source/app/resids.hrc0
-rwxr-xr-x[-rw-r--r--]basic/source/app/status.cxx8
-rwxr-xr-x[-rw-r--r--]basic/source/app/status.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/app/svtmsg.src2
-rwxr-xr-x[-rw-r--r--]basic/source/app/testbasi.cxx0
-rwxr-xr-x[-rw-r--r--]basic/source/app/testtool.idl0
-rwxr-xr-x[-rw-r--r--]basic/source/app/testtool.src2
-rwxr-xr-x[-rw-r--r--]basic/source/app/textedit.cxx146
-rwxr-xr-x[-rw-r--r--]basic/source/app/textedit.hxx32
-rwxr-xr-x[-rw-r--r--]basic/source/app/ttbasic.cxx0
-rwxr-xr-x[-rw-r--r--]basic/source/app/ttbasic.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/app/ttmsg.src2
-rwxr-xr-x[-rw-r--r--]basic/source/basmgr/basicmanagerrepository.cxx63
-rwxr-xr-x[-rw-r--r--]basic/source/basmgr/basmgr.cxx406
-rwxr-xr-x[-rw-r--r--]basic/source/basmgr/makefile.mk3
-rwxr-xr-xbasic/source/basmgr/vbahelper.cxx212
-rwxr-xr-x[-rw-r--r--]basic/source/classes/disas.cxx72
-rwxr-xr-x[-rw-r--r--]basic/source/classes/errobject.cxx0
-rwxr-xr-x[-rw-r--r--]basic/source/classes/eventatt.cxx56
-rwxr-xr-x[-rw-r--r--]basic/source/classes/image.cxx150
-rwxr-xr-x[-rw-r--r--]basic/source/classes/makefile.mk0
-rwxr-xr-x[-rw-r--r--]basic/source/classes/propacc.cxx28
-rwxr-xr-x[-rw-r--r--]basic/source/classes/sb.cxx590
-rwxr-xr-x[-rw-r--r--]basic/source/classes/sb.src0
-rwxr-xr-x[-rw-r--r--]basic/source/classes/sbintern.cxx8
-rwxr-xr-x[-rw-r--r--]basic/source/classes/sbunoobj.cxx663
-rwxr-xr-x[-rw-r--r--]basic/source/classes/sbxmod.cxx603
-rwxr-xr-x[-rw-r--r--]basic/source/comp/buffer.cxx102
-rwxr-xr-x[-rw-r--r--]basic/source/comp/codegen.cxx88
-rwxr-xr-x[-rw-r--r--]basic/source/comp/dim.cxx185
-rwxr-xr-x[-rw-r--r--]basic/source/comp/exprgen.cxx16
-rwxr-xr-x[-rw-r--r--]basic/source/comp/exprnode.cxx76
-rwxr-xr-x[-rw-r--r--]basic/source/comp/exprtree.cxx112
-rwxr-xr-x[-rw-r--r--]basic/source/comp/io.cxx18
-rwxr-xr-x[-rw-r--r--]basic/source/comp/loops.cxx62
-rwxr-xr-x[-rw-r--r--]basic/source/comp/makefile.mk0
-rwxr-xr-x[-rw-r--r--]basic/source/comp/parser.cxx72
-rwxr-xr-x[-rw-r--r--]basic/source/comp/sbcomp.cxx212
-rwxr-xr-x[-rw-r--r--]basic/source/comp/scanner.cxx118
-rwxr-xr-x[-rw-r--r--]basic/source/comp/symtbl.cxx49
-rwxr-xr-x[-rw-r--r--]basic/source/comp/token.cxx40
-rwxr-xr-x[-rw-r--r--]basic/source/inc/buffer.hxx30
-rwxr-xr-x[-rw-r--r--]basic/source/inc/codegen.hxx28
-rwxr-xr-x[-rw-r--r--]basic/source/inc/collelem.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/inc/disas.hxx14
-rwxr-xr-x[-rw-r--r--]basic/source/inc/dlgcont.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/inc/errobject.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/inc/expr.hxx84
-rwxr-xr-x[-rw-r--r--]basic/source/inc/filefmt.hxx108
-rwxr-xr-x[-rw-r--r--]basic/source/inc/image.hxx44
-rwxr-xr-x[-rw-r--r--]basic/source/inc/iosys.hxx12
-rwxr-xr-x[-rw-r--r--]basic/source/inc/namecont.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/inc/object.hxx10
-rwxr-xr-x[-rw-r--r--]basic/source/inc/opcodes.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/inc/parser.hxx46
-rwxr-xr-x[-rw-r--r--]basic/source/inc/propacc.hxx6
-rwxr-xr-x[-rw-r--r--]basic/source/inc/runtime.hxx158
-rwxr-xr-x[-rw-r--r--]basic/source/inc/sbcomp.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/inc/sbintern.hxx12
-rwxr-xr-x[-rw-r--r--]basic/source/inc/sbjsmeth.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/inc/sbjsmod.hxx4
-rwxr-xr-xbasic/source/inc/sbtrace.hxx44
-rwxr-xr-x[-rw-r--r--]basic/source/inc/sbunoobj.hxx48
-rwxr-xr-x[-rw-r--r--]basic/source/inc/scanner.hxx54
-rwxr-xr-x[-rw-r--r--]basic/source/inc/scriptcont.hxx1
-rwxr-xr-x[-rw-r--r--]basic/source/inc/stdobj.hxx2
-rwxr-xr-x[-rw-r--r--]basic/source/inc/symtbl.hxx136
-rwxr-xr-x[-rw-r--r--]basic/source/inc/token.hxx32
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/basrdll.cxx14
-rwxr-xr-xbasic/source/runtime/comenumwrapper.cxx81
-rwxr-xr-xbasic/source/runtime/comenumwrapper.hxx54
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/ddectrl.cxx32
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/ddectrl.hxx12
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/dllmgr-none.cxx0
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/dllmgr-x64.cxx22
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/dllmgr-x86.cxx29
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/dllmgr.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/inputbox.cxx4
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/iosys.cxx98
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/makefile.mk1
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/methods.cxx485
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/methods1.cxx518
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/props.cxx12
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/rtlproto.hxx10
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/runtime.cxx108
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/stdobj.cxx36
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/stdobj1.cxx60
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/step0.cxx186
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/step1.cxx88
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/step2.cxx252
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/wnt-mingw.s0
-rwxr-xr-x[-rw-r--r--]basic/source/runtime/wnt-x86.asm0
-rwxr-xr-x[-rw-r--r--]basic/source/sample/collelem.cxx2
-rwxr-xr-x[-rw-r--r--]basic/source/sample/makefile.mk0
-rwxr-xr-x[-rw-r--r--]basic/source/sample/object.cxx30
-rwxr-xr-x[-rw-r--r--]basic/source/sample/sample.bas0
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/format.src0
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/makefile.mk0
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxarray.cxx172
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxbase.cxx114
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxbool.cxx26
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxbyte.cxx30
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxchar.cxx10
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxcoll.cxx30
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxconv.hxx32
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxcurr.cxx10
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxdate.cxx14
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxdbl.cxx12
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxdec.cxx56
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxdec.hxx22
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxexec.cxx28
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxform.cxx144
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxint.cxx54
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxlng.cxx24
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxmstrm.cxx0
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxobj.cxx179
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxres.cxx4
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxres.hxx4
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxscan.cxx106
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxsng.cxx14
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxstr.cxx14
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxuint.cxx26
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxulng.cxx20
-rwxr-xr-xbasic/source/sbx/sbxvals.cxx109
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxvalue.cxx318
-rwxr-xr-x[-rw-r--r--]basic/source/sbx/sbxvar.cxx121
-rwxr-xr-x[-rw-r--r--]basic/source/uno/dlgcont.cxx14
-rwxr-xr-x[-rw-r--r--]basic/source/uno/makefile.mk0
-rwxr-xr-x[-rw-r--r--]basic/source/uno/modsizeexceeded.cxx16
-rwxr-xr-x[-rw-r--r--]basic/source/uno/namecont.cxx52
-rwxr-xr-x[-rw-r--r--]basic/source/uno/sbmodule.cxx0
-rwxr-xr-x[-rw-r--r--]basic/source/uno/sbmodule.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/uno/sbservices.cxx0
-rwxr-xr-x[-rw-r--r--]basic/source/uno/scriptcont.cxx73
-rwxr-xr-x[-rw-r--r--]basic/util/makefile.mk6
-rwxr-xr-xbasic/util/sb.component39
-rwxr-xr-x[-rw-r--r--]basic/win/res/basic.icobin766 -> 766 bytes-rwxr-xr-x[-rw-r--r--]basic/win/res/testtool.icobin766 -> 766 bytes-rwxr-xr-x[-rw-r--r--]basic/win/res/work.icobin766 -> 766 bytes-rwxr-xr-xbasic/workben/mgrtest.cxx591
-rwxr-xr-x[-rw-r--r--]configmgr/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]configmgr/inc/pch/precompiled_configmgr.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/inc/pch/precompiled_configmgr.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]configmgr/prj/d.lst1
-rwxr-xr-x[-rw-r--r--]configmgr/qa/unit/data.xcd0
-rwxr-xr-x[-rw-r--r--]configmgr/qa/unit/makefile.mk0
-rwxr-xr-x[-rw-r--r--]configmgr/qa/unit/no_localization0
-rwxr-xr-x[-rw-r--r--]configmgr/qa/unit/test.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/qa/unit/urebootstrap.ini0
-rwxr-xr-x[-rw-r--r--]configmgr/qa/unit/version.map0
-rwxr-xr-x[-rw-r--r--]configmgr/qa/unoapi/Test.java0
-rwxr-xr-x[-rw-r--r--]configmgr/qa/unoapi/makefile.mk0
-rwxr-xr-x[-rw-r--r--]configmgr/qa/unoapi/module.sce0
-rwxr-xr-x[-rw-r--r--]configmgr/source/README3
-rwxr-xr-x[-rw-r--r--]configmgr/source/access.cxx108
-rwxr-xr-x[-rw-r--r--]configmgr/source/access.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/additions.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/broadcaster.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/broadcaster.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/childaccess.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/childaccess.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/components.cxx8
-rwxr-xr-x[-rw-r--r--]configmgr/source/components.hxx4
-rwxr-xr-xconfigmgr/source/configmgr.component45
-rwxr-xr-x[-rw-r--r--]configmgr/source/configurationprovider.cxx24
-rwxr-xr-x[-rw-r--r--]configmgr/source/configurationprovider.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/configurationregistry.cxx58
-rwxr-xr-x[-rw-r--r--]configmgr/source/configurationregistry.hxx22
-rwxr-xr-x[-rw-r--r--]configmgr/source/data.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/data.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/defaultprovider.cxx76
-rwxr-xr-x[-rw-r--r--]configmgr/source/defaultprovider.hxx22
-rwxr-xr-x[-rw-r--r--]configmgr/source/groupnode.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/groupnode.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/localizedpropertynode.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/localizedpropertynode.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/localizedvaluenode.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/localizedvaluenode.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/lock.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/lock.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/makefile.mk15
-rwxr-xr-x[-rw-r--r--]configmgr/source/modifications.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/modifications.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/node.cxx4
-rwxr-xr-x[-rw-r--r--]configmgr/source/node.hxx5
-rwxr-xr-x[-rw-r--r--]configmgr/source/nodemap.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/nodemap.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/pad.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/parsemanager.cxx31
-rwxr-xr-x[-rw-r--r--]configmgr/source/parsemanager.hxx13
-rwxr-xr-x[-rw-r--r--]configmgr/source/parser.hxx14
-rwxr-xr-x[-rw-r--r--]configmgr/source/partial.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/partial.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/path.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/propertynode.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/propertynode.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/rootaccess.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/rootaccess.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/services.cxx63
-rwxr-xr-x[-rw-r--r--]configmgr/source/setnode.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/setnode.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/type.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/type.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/update.cxx83
-rwxr-xr-x[-rw-r--r--]configmgr/source/update.hxx22
-rwxr-xr-x[-rw-r--r--]configmgr/source/valueparser.cxx68
-rwxr-xr-x[-rw-r--r--]configmgr/source/valueparser.hxx14
-rwxr-xr-x[-rw-r--r--]configmgr/source/writemodfile.cxx35
-rwxr-xr-x[-rw-r--r--]configmgr/source/writemodfile.hxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/xcdparser.cxx44
-rwxr-xr-x[-rw-r--r--]configmgr/source/xcdparser.hxx13
-rwxr-xr-x[-rw-r--r--]configmgr/source/xcsparser.cxx167
-rwxr-xr-x[-rw-r--r--]configmgr/source/xcsparser.hxx27
-rwxr-xr-x[-rw-r--r--]configmgr/source/xcuparser.cxx231
-rwxr-xr-x[-rw-r--r--]configmgr/source/xcuparser.hxx38
-rwxr-xr-x[-rw-r--r--]configmgr/source/xmldata.cxx112
-rwxr-xr-x[-rw-r--r--]configmgr/source/xmldata.hxx14
-rwxr-xr-x[-rw-r--r--]configmgr/source/xmlreader.cxx0
-rwxr-xr-x[-rw-r--r--]configmgr/source/xmlreader.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java0
-rwxr-xr-x[-rw-r--r--]connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java0
-rwxr-xr-x[-rw-r--r--]connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java0
-rwxr-xr-x[-rw-r--r--]connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java0
-rwxr-xr-x[-rw-r--r--]connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java0
-rwxr-xr-x[-rw-r--r--]connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java0
-rwxr-xr-x[-rw-r--r--]connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java0
-rwxr-xr-x[-rw-r--r--]connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java0
-rwxr-xr-x[-rw-r--r--]connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java0
-rwxr-xr-x[-rw-r--r--]connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/dbtools.pmk0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/BlobHelper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/CommonTools.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/ConnectionWrapper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/DateConversion.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/DriversConfig.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/FValue.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/IParseContext.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/PColumn.hxx18
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/ParameterCont.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/SQLStatementHelper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/StdTypeDefs.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/TColumnsHelper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/TIndex.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/TIndexColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/TIndexes.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/TKey.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/TKeyColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/TKeys.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/TTableHelper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/conncleanup.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/dbcharset.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/dbconversion.hxx9
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/dbexception.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/dbmetadata.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/dbtools.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/dbtoolsdllapi.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/filtermanager.hxx7
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/formattedcolumnvalue.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/parameters.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/paramwrapper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/predicateinput.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/IRefreshable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VCollection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VColumn.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VDescriptor.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VGroup.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VIndex.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VKey.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VTypeDef.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VUser.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sdbcx/VView.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sqlerror.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sqliterator.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sqlnode.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/sqlparse.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/standardsqlstate.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/statementcomposer.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/virtualdbtools.hxx7
-rwxr-xr-x[-rw-r--r--]connectivity/inc/connectivity/warningscontainer.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/pch/precompiled_connectivity.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/inc/pch/precompiled_connectivity.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/prj/build.lst4
-rwxr-xr-x[-rw-r--r--]connectivity/prj/d.lst18
-rwxr-xr-x[-rw-r--r--]connectivity/qa/complex/connectivity/DBaseDriverTest.java (renamed from connectivity/qa/drivers/dbase/DBaseDriverTest.java)38
-rwxr-xr-xconnectivity/qa/complex/connectivity/FlatFileAccess.java237
-rwxr-xr-x[-rw-r--r--]connectivity/qa/complex/connectivity/HsqlDriverTest.java (renamed from connectivity/qa/drivers/hsqldb/DriverTest.java)38
-rwxr-xr-x[-rw-r--r--]connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java (renamed from connectivity/qa/drivers/jdbc/LongVarCharTest.java)3
-rwxr-xr-xconnectivity/qa/complex/connectivity/SubTestCase.java23
-rwxr-xr-x[-rw-r--r--]connectivity/qa/complex/connectivity/TestCase.java (renamed from sfx2/source/config/config.src)10
-rwxr-xr-x[-rw-r--r--]connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java (renamed from connectivity/qa/drivers/dbase/DBaseDateFunctions.java)26
-rwxr-xr-x[-rw-r--r--]connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java (renamed from connectivity/qa/drivers/dbase/DBaseNumericFunctions.java)19
-rwxr-xr-xconnectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java (renamed from connectivity/qa/drivers/dbase/DBaseSqlTests.java)20
-rwxr-xr-x[-rw-r--r--]connectivity/qa/complex/connectivity/dbase/DBaseStringFunctions.java (renamed from connectivity/qa/drivers/dbase/DBaseStringFunctions.java)18
-rwxr-xr-x[-rw-r--r--]connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java (renamed from connectivity/qa/drivers/hsqldb/DatabaseMetaData.java)10
-rwxr-xr-x[-rw-r--r--]connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java (renamed from connectivity/qa/drivers/hsqldb/TestCacheSize.java)20
-rw-r--r--connectivity/qa/connectivity/makefile.mk65
-rwxr-xr-xconnectivity/qa/connectivity/tools/AbstractDatabase.java24
-rwxr-xr-x[-rw-r--r--]connectivity/qa/connectivity/tools/CRMDatabase.java0
-rwxr-xr-xconnectivity/qa/connectivity/tools/CsvDatabase.java18
-rwxr-xr-x[-rw-r--r--]connectivity/qa/connectivity/tools/DataSource.java38
-rwxr-xr-xconnectivity/qa/connectivity/tools/DbaseDatabase.java90
-rwxr-xr-xconnectivity/qa/connectivity/tools/FlatFileDatabase.java116
-rwxr-xr-x[-rw-r--r--]connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java0
-rwxr-xr-x[-rw-r--r--]connectivity/qa/connectivity/tools/HsqlDatabase.java0
-rwxr-xr-x[-rw-r--r--]connectivity/qa/connectivity/tools/HsqlTableDescriptor.java0
-rwxr-xr-x[-rw-r--r--]connectivity/qa/connectivity/tools/QueryDefinition.java0
-rwxr-xr-x[-rw-r--r--]connectivity/qa/connectivity/tools/RowSet.java17
-rwxr-xr-x[-rw-r--r--]connectivity/qa/connectivity/tools/makefile.mk8
-rwxr-xr-x[-rw-r--r--]connectivity/qa/connectivity/tools/sdb/Connection.java0
-rw-r--r--connectivity/qa/drivers/dbase/.nbattrs10
-rw-r--r--connectivity/qa/drivers/dbase/makefile.mk64
-rw-r--r--connectivity/qa/drivers/dbase/test.properties5
-rwxr-xr-x[-rw-r--r--]connectivity/qa/makefile.mk (renamed from connectivity/qa/drivers/jdbc/makefile.mk)36
-rwxr-xr-xconnectivity/qa/scenarios.sce4
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/AutoRetrievingBase.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/BlobHelper.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/CommonTools.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/ConnectionWrapper.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/DateConversion.cxx73
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/DriversConfig.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx5
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/FValue.cxx32
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/ParamterSubstitution.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/RowFunctionParser.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TColumnsHelper.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TDatabaseMetaDataBase.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TIndex.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TIndexColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TIndexes.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TKey.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TKeyColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TKeys.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TPrivilegesResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TSkipDeletedSet.cxx9
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TSortIndex.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/TTableHelper.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/conncleanup.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/dbcharset.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/dbconversion.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/dbexception.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/dbmetadata.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/dbtools.cxx5
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/dbtools2.cxx1
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/filtermanager.cxx60
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/formattedcolumnvalue.cxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/parameters.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/paramwrapper.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/predicateinput.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/propertyids.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/sqlerror.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/statementcomposer.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/commontools/warningscontainer.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/ZConnectionPool.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/ZConnectionPool.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/ZConnectionWrapper.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/ZConnectionWrapper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/ZDriverWrapper.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/ZDriverWrapper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/ZPoolCollection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/ZPoolCollection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/ZPooledConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/ZPooledConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/Zregistration.cxx29
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/dbpool.xml0
-rwxr-xr-xconnectivity/source/cpool/dbpool2.component34
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/cpool/makefile.mk6
-rwxr-xr-x[-rw-r--r--]connectivity/source/dbtools/dbt.xml0
-rwxr-xr-xconnectivity/source/dbtools/dbtools.component37
-rwxr-xr-x[-rw-r--r--]connectivity/source/dbtools/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/dbtools/makefile.mk8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BDatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BDriver.cxx38
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BFunctions.cxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BGroup.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BGroups.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BIndex.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BIndexColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BIndexes.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BKeys.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BPreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BResultSetMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BTable.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BUser.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BUsers.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/BViews.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/Bservices.cxx48
-rwxr-xr-xconnectivity/source/drivers/adabas/adabas.component35
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/adabas.mxp.map1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/adabas.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/adabas/makefile.mk8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ACallableStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ACatalog.cxx8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AColumn.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AColumns.cxx8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ADatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ADriver.cxx31
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AGroup.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AGroups.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AIndex.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AIndexes.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AKey.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AKeyColumn.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AKeyColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AKeys.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/APreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AResultSetMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ATable.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ATables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AUser.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AUsers.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AView.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/AViews.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/Aolevariant.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/Aservices.cxx47
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/Awrapado.cxx0
-rwxr-xr-xconnectivity/source/drivers/ado/ado.component35
-rwxr-xr-xconnectivity/source/drivers/ado/ado.xcu5
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ado.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ado_post_sys_include.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/ado_pre_sys_include.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/adoimp.cxx3
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/ado/makefile.mk8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CDatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CPreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CTable.cxx8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/CalcDriver.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/Cservices.cxx48
-rwxr-xr-xconnectivity/source/drivers/calc/calc.component35
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/calc/makefile.mk10
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DCode.cxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DDatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DIndex.cxx62
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DIndexColumns.cxx4
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DIndexIter.cxx28
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DIndexes.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DNoException.cxx80
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DPreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DTable.cxx216
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/DTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/Dservices.cxx48
-rwxr-xr-xconnectivity/source/drivers/dbase/dbase.component35
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/dbase.mxp.map1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/dbase.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/dindexnode.cxx161
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/dbase/makefile.mk8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LColumnAlias.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LColumnAlias.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LConfigAccess.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LConfigAccess.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDebug.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDebug.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LFolderList.cxx24
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LFolderList.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LNoException.cxx20
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LPreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LPreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LServices.cxx48
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LTable.cxx30
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LTables.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/evoab.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/EApi.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/EApi.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NDebug.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NDebug.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NPreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NPreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NResultSetMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NServices.cxx47
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NTable.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/NTables.hxx0
-rwxr-xr-xconnectivity/source/drivers/evoab2/evoab.component34
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/evoab.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab2/makefile.mk8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FColumns.cxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FDatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FDateFunctions.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FNoException.cxx6
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FNumericFunctions.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FPreparedStatement.cxx10
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FResultSet.cxx110
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FResultSetMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FStatement.cxx25
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FStringFunctions.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FTable.cxx10
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/FTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/fanalyzer.cxx32
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/fcode.cxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/fcomp.cxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/file.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/file/quotedstring.cxx16
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/ECatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/EColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/EConnection.cxx6
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/EDatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/EDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/EPreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/EResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/EStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/ETable.cxx322
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/ETables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/Eservices.cxx48
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/exports.dxp1
-rwxr-xr-xconnectivity/source/drivers/flat/flat.component35
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/flat.mxp.map1
-rwxr-xr-xconnectivity/source/drivers/flat/flat.xcu10
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/flat.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/flat/makefile.mk8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HDriver.cxx38
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HStorage.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HStorageAccess.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HStorageMap.cxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HTable.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HTerminateListener.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HTerminateListener.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HTools.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HUser.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HUsers.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HView.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/HViews.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/Hservices.cxx48
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/StorageFileAccess.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/accesslog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/accesslog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/exports.dxp1
-rwxr-xr-xconnectivity/source/drivers/hsqldb/hsqldb.component35
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/hsqldb.map1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/hsqldb.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/hsqlui.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/hsqlui.src0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/hsqldb/makefile.mk9
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Array.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Blob.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Boolean.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/CallableStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Class.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Clob.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/ConnectionLog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/ContextClassLoader.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/DatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Date.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Exception.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/InputStream.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/JBigDecimal.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/JConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/JDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/JStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Object.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/PreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Reader.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Ref.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/ResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/ResultSetMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/SQLException.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/SQLWarning.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/String.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Throwable.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/Timestamp.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/exports.dxp1
-rwxr-xr-xconnectivity/source/drivers/jdbc/jdbc.component34
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/jdbc.mxp.map1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/jdbc.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/jservices.cxx51
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/makefile.mk8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/jdbc/tools.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KDEInit.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KDEInit.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KDatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KDatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KPreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KPreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KResultSetMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KServices.cxx52
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KTable.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/KTables.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/kab.xml0
-rwxr-xr-xconnectivity/source/drivers/kab/kab1.component34
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/kabdrv.map0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/kcondition.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/kcondition.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/kfields.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/kfields.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/korder.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/korder.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/kab/makefile.mk11
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabAddressBook.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabAddressBook.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabGroup.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabGroup.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabHeader.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabHeader.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabPreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabPreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabRecord.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabRecord.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabRecords.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabRecords.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabResultSetMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabServices.cxx52
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabTable.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/MacabTables.hxx0
-rwxr-xr-xconnectivity/source/drivers/macab/exports.dxp1
-rwxr-xr-xconnectivity/source/drivers/macab/macab1.component34
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/macabcondition.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/macabcondition.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/macaborder.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/macaborder.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/macab/macabutilities.hxx0
-rwxr-xr-xconnectivity/source/drivers/macab/makefile.mk8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MColumnAlias.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MColumnAlias.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MConfigAccess.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MConfigAccess.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MDatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MDatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MDriver.cxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MExtConfigAccess.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MPreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MPreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MResultSet.cxx6
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MResultSetMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MServices.cxx57
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MTable.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/MTables.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx45
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/makefile.mk9
-rwxr-xr-xconnectivity/source/drivers/mozab/bootstrap/mozbootstrap.component34
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/post_include_windows.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/makefile.mk8
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/makefile_mozab.mk0
-rwxr-xr-xconnectivity/source/drivers/mozab/mozab.component37
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozab.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozabdrv.map0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/post_include_mozilla.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mozab/pre_include_mozilla.h7
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/YCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/YColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/YDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/YTable.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/YTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/YUser.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/YUsers.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/YViews.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/Yservices.cxx52
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/makefile.mk8
-rwxr-xr-xconnectivity/source/drivers/mysql/mysql.component35
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/mysql/mysql.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbc/OFunctions.cxx4
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbc/ORealDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbc/ORealDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbc/makefile.mk8
-rwxr-xr-xconnectivity/source/drivers/odbc/odbc.component34
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbc/odbc.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbc/oservices.cxx52
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbcbase/OConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbcbase/ODriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbcbase/OPreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbcbase/OResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbcbase/OStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbcbase/OTools.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/odbcbase/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/AutoRetrievingBase.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/FDatabaseMetaDataResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/OColumn.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/OSubComponent.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/OTypeInfo.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ParameterSubstitution.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/RowFunctionParser.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/TConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/TDatabaseMetaDataBase.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/TKeyValue.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/TPrivilegesResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/TResultSetHelper.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/TSkipDeletedSet.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/TSortIndex.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/UStringDescription_Impl.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BColumn.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BDatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BGroup.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BGroups.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BIndex.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BIndexColumn.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BIndexColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BIndexes.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BKeys.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BPreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BTables.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BUser.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BUsers.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/adabas/BViews.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/ACallableStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/ACatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/ACollection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AColumn.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/ADatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/ADriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AGroup.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AGroups.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AIndex.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AIndexColumn.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AIndexColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AIndexes.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AKey.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AKeyColumn.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AKeyColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AKeys.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/APreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/ATable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/ATables.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AUser.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AUsers.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AView.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/AViews.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/Aolevariant.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/Aolewrap.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/Awrapado.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/Awrapadox.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/WrapCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/WrapColumn.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/WrapIndex.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/WrapKey.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/WrapTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/WrapTypeDefs.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/ado/adoimp.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/calc/CCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/calc/CColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/calc/CConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/calc/CDatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/calc/CDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/calc/CPreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/calc/CResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/calc/CStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/calc/CTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/calc/CTables.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DCode.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DDatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DIndex.hxx28
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DIndexColumns.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DIndexIter.hxx16
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DIndexPage.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DIndexes.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DPreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DTable.hxx54
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/DTables.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/dbase/dindexnode.hxx126
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/diagnose_ex.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FColumns.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FDatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FDateFunctions.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FNumericFunctions.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FPreparedStatement.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FResultSet.hxx14
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FStatement.hxx4
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FStringFunctions.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FTable.hxx6
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/FTables.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/fanalyzer.hxx6
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/fcode.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/fcomp.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/filedllapi.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/file/quotedstring.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/flat/ECatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/flat/EColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/flat/EConnection.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/flat/EDatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/flat/EDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/flat/EPreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/flat/EResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/flat/EStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/flat/ETable.hxx6
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/flat/ETables.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HStorageAccess.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HStorageAccess.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HStorageMap.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HTables.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HTools.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HUser.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HUsers.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HView.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/HViews.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/StorageFileAccess.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/hsqldb/StorageNativeInputStream.h0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/internalnode.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/ContextClassLoader.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/GlobalRef.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/LocalRef.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/io/InputStream.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/io/Reader.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/lang/Boolean.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/lang/Class.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/lang/Exception.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/lang/Object.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/lang/String.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/lang/Throwable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/math/BigDecimal.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/Array.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/Blob.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/CallableStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/Clob.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/Connection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/ConnectionLog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/DatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/Driver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/DriverPropertyInfo.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/JStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/PreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/Ref.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/ResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/ResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/SQLException.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/SQLWarning.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/sql/Timestamp.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/tools.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/util/Date.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/java/util/Property.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/mysql/YCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/mysql/YColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/mysql/YDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/mysql/YTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/mysql/YTables.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/mysql/YUser.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/mysql/YUsers.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/mysql/YViews.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/OBoundParam.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/OConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/ODatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/ODefs3.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/ODriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/OFunctiondefs.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/OFunctions.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/OPreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/OResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/OResultSetMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/OStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/OTools.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/odbc/odbcbasedllapi.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/propertyids.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/adabas_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/ado_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/calc_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/common_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/conn_shared_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/dbase_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/evoab2_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/file_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/hsqldb_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/jdbc_log.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/kab_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/macab_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/mozab_res.hrc0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/resource/sharedresources.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/inc/sqlscan.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/manager/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/manager/makefile.mk6
-rwxr-xr-x[-rw-r--r--]connectivity/source/manager/mdrivermanager.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/manager/mdrivermanager.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/manager/mregistration.cxx33
-rwxr-xr-x[-rw-r--r--]connectivity/source/manager/sdbc.mxp.map1
-rwxr-xr-xconnectivity/source/manager/sdbc2.component34
-rwxr-xr-x[-rw-r--r--]connectivity/source/parse/PColumn.cxx96
-rwxr-xr-x[-rw-r--r--]connectivity/source/parse/internalnode.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/parse/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/source/parse/sqlbison.y0
-rwxr-xr-x[-rw-r--r--]connectivity/source/parse/sqlflex.l0
-rwxr-xr-x[-rw-r--r--]connectivity/source/parse/sqliterator.cxx6
-rwxr-xr-x[-rw-r--r--]connectivity/source/parse/sqlnode.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/parse/wrap_sqlbison.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/parse/wrap_sqlflex.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/resource/conn_error_message.src0
-rwxr-xr-x[-rw-r--r--]connectivity/source/resource/conn_log_res.src0
-rwxr-xr-x[-rw-r--r--]connectivity/source/resource/conn_shared_res.src0
-rwxr-xr-x[-rw-r--r--]connectivity/source/resource/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/source/resource/sharedresources.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VCollection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VColumn.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VDescriptor.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VGroup.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VIndex.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VIndexColumn.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VKey.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VKeyColumn.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VTable.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VUser.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/VView.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/sdbcx/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/charset_s.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/charset_s.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/dbtfactory.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/dbtfactory.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/parsenode_s.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/parsenode_s.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/parser_s.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/parser_s.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/refbase.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/refbase.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/staticdbtools_s.cxx14
-rwxr-xr-x[-rw-r--r--]connectivity/source/simpledbt/staticdbtools_s.hxx7
-rwxr-xr-x[-rw-r--r--]connectivity/version.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/workben/TT/StartTest.classbin183 -> 183 bytes-rwxr-xr-x[-rw-r--r--]connectivity/workben/TT/StartTest.java0
-rwxr-xr-x[-rw-r--r--]connectivity/workben/iniParser/main.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/workben/iniParser/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/workben/little/main.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/workben/little/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/workben/skeleton/SResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/workben/skeleton/how_to_write_a_driver.txt0
-rwxr-xr-x[-rw-r--r--]connectivity/workben/testmoz/initUNO.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/workben/testmoz/main.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/workben/testmoz/makefile.mk0
-rwxr-xr-x[-rw-r--r--]connectivity/workben/testmoz/mozthread.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/inc/app.hxx10
-rwxr-xr-x[-rw-r--r--]desktop/inc/deployment.hrc0
-rwxr-xr-x[-rw-r--r--]desktop/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/inc/migration.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/inc/pch/precompiled_desktop.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/inc/pch/precompiled_desktop.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/os2/source/applauncher/launcher.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/os2/source/applauncher/launcher.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/os2/source/applauncher/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/os2/source/applauncher/officeloader.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/os2/source/applauncher/quickstart.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/os2/source/applauncher/sbase.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/os2/source/applauncher/scalc.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/os2/source/applauncher/sdraw.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/os2/source/applauncher/simpress.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/os2/source/applauncher/smath.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/os2/source/applauncher/swriter.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/prj/build.lst6
-rwxr-xr-x[-rw-r--r--]desktop/prj/d.lst8
-rwxr-xr-x[-rw-r--r--]desktop/qa/deployment_misc/makefile.mk14
-rwxr-xr-x[-rw-r--r--]desktop/qa/deployment_misc/test_dp_version.cxx9
-rwxr-xr-x[-rw-r--r--]desktop/qa/deployment_misc/version.map2
-rwxr-xr-x[-rw-r--r--]desktop/registry/data/org/openoffice/Office/Jobs.xcu0
-rwxr-xr-x[-rw-r--r--]desktop/registry/data/org/openoffice/Office/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/basis-link0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/mozwrapper.sh0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/odf-basis-link0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/sbase.sh0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/scalc.sh0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/sdraw.sh0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/simpress.sh0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/smaster.sh0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/smath.sh0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/so-basis-link0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/soffice.sh17
-rwxr-xr-x[-rw-r--r--]desktop/scripts/sweb.sh0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/swriter.sh0
-rwxr-xr-x[-rw-r--r--]desktop/scripts/unoinfo.sh15
-rwxr-xr-x[-rw-r--r--]desktop/scripts/unopkg.sh32
-rwxr-xr-x[-rw-r--r--]desktop/scripts/ure-link0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/app.cxx235
-rwxr-xr-x[-rw-r--r--]desktop/source/app/appfirststart.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/appinit.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/appinit.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/appsys.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/appsys.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/check_ext_deps.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/checkinstall.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/checkinstall.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/cmdlineargs.cxx260
-rwxr-xr-x[-rw-r--r--]desktop/source/app/cmdlineargs.hxx35
-rwxr-xr-x[-rw-r--r--]desktop/source/app/cmdlinehelp.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/cmdlinehelp.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/configinit.cxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/app/configinit.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/copyright_ascii_ooo.c0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/copyright_ascii_sun.c0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/desktop.hrc0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/desktop.src1
-rwxr-xr-x[-rw-r--r--]desktop/source/app/desktopcontext.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/desktopcontext.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/desktopresid.cxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/app/desktopresid.hxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/app/dispatchwatcher.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/dispatchwatcher.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/exports.dxp1
-rwxr-xr-x[-rw-r--r--]desktop/source/app/langselect.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/langselect.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/lockfile.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/lockfile.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/lockfile2.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/main.c0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/officeipcthread.cxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/app/officeipcthread.hxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/app/omutexmember.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/sofficemain.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/sofficemain.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/userinstall.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/userinstall.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/app/version.map0
-rwxr-xr-xdesktop/source/deployment/deployment.component64
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/dp_log.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/dp_persmap.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/dp_services.cxx21
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/dp_xml.cxx0
-rwxr-xr-xdesktop/source/deployment/gui/deploymentgui.component40
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/descedit.cxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/descedit.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui.hrc7
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_backend.src0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_dependencydialog.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_dependencydialog.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_dependencydialog.src2
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_dialog.src37
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_dialog2.cxx116
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_dialog2.hxx27
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_dialog2.src4
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_extlistbox.cxx5
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_extlistbox.hxx3
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_service.cxx8
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_shared.hxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_theextmgr.cxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_theextmgr.hxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_thread.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_thread.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_updatedata.hxx5
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_updatedialog.cxx820
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_updatedialog.hxx60
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_updatedialog.src27
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx4
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_updateinstalldialog.src1
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/dp_gui_versionboxes.src0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/license_dialog.cxx24
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/license_dialog.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/gui/makefile.mk8
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/db.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_dependencies.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_descriptioninfoset.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_identifier.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_interact.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_misc.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_misc.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_misc_api.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_persmap.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_platform.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_resource.h6
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_ucb.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_update.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_version.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/inc/dp_xml.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/makefile.mk8
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_activepackages.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_activepackages.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_commandenvironments.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_commandenvironments.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_extensionmanager.cxx125
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_extensionmanager.hxx17
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_informationprovider.cxx33
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_manager.cxx33
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_manager.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_manager.hrc0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_manager.src0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_managerfac.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_properties.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/dp_properties.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/manager/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/db.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_dependencies.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_descriptioninfoset.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_identifier.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_interact.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_misc.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_misc.hrc0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_misc.src2
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_platform.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_resource.cxx4
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_ucb.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_update.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/dp_version.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/misc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/component/dp_compbackenddb.cxx43
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/component/dp_compbackenddb.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/component/dp_component.cxx845
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/component/dp_component.hrc1
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/component/dp_component.src5
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/component/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/configuration/dp_configuration.cxx130
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/configuration/dp_configuration.hrc0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/configuration/dp_configuration.src0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx13
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/configuration/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/dp_backend.cxx12
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/dp_backenddb.cxx108
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/dp_registry.cxx18
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/dp_registry.src0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/executable/dp_executable.cxx38
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/executable/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/help/dp_help.cxx420
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/help/dp_help.hrc0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/help/dp_help.src0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/help/dp_helpbackenddb.cxx11
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/help/dp_helpbackenddb.hxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/help/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/inc/dp_backend.h25
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/inc/dp_backenddb.hxx12
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/inc/dp_registry.hrc0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/package/dp_extbackenddb.cxx22
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/package/dp_extbackenddb.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/package/dp_package.cxx54
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/package/dp_package.hrc0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/package/dp_package.src0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/package/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/script/dp_lib_container.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/script/dp_lib_container.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/script/dp_script.cxx40
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/script/dp_script.hrc0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/script/dp_script.src0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/script/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/sfwk/dp_sfwk.cxx24
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/sfwk/dp_sfwk.hrc0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/sfwk/dp_sfwk.src0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/registry/sfwk/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/target.pmk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/unopkg/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/deployment/unopkg/unopkg.src0
-rwxr-xr-x[-rw-r--r--]desktop/source/inc/exithelper.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/inc/helpid.hrc71
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/migration.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/migration_impl.hxx0
-rwxr-xr-xdesktop/source/migration/pages.cxx671
-rwxr-xr-xdesktop/source/migration/pages.hxx212
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/autocorrmigration.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/autocorrmigration.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/basicmigration.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/basicmigration.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/cexports.cxx7
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/cexportsoo3.cxx7
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/cppumaker.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/jvmfwk.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/jvmfwk.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/makefile.mk17
-rwxr-xr-xdesktop/source/migration/services/migrationoo2.component37
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/migrationoo2.xml0
-rwxr-xr-xdesktop/source/migration/services/migrationoo3.component34
-rw-r--r--desktop/source/migration/services/migrationoo3.map8
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/misc.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/oo3extensionmigration.cxx4
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/oo3extensionmigration.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/wordbookmigration.cxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/wordbookmigration.hxx0
-rwxr-xr-xdesktop/source/migration/wizard.cxx603
-rwxr-xr-xdesktop/source/migration/wizard.hrc100
-rwxr-xr-xdesktop/source/migration/wizard.hxx105
-rwxr-xr-xdesktop/source/migration/wizard.src442
-rwxr-xr-x[-rw-r--r--]desktop/source/offacc/acceptor.cxx17
-rwxr-xr-x[-rw-r--r--]desktop/source/offacc/acceptor.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/offacc/makefile.mk8
-rwxr-xr-xdesktop/source/offacc/offacc.component34
-rwxr-xr-x[-rw-r--r--]desktop/source/pagein/file_image.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/pagein/file_image_unx.c0
-rwxr-xr-x[-rw-r--r--]desktop/source/pagein/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/pagein/pagein.c0
-rwxr-xr-x[-rw-r--r--]desktop/source/pkgchk/unopkg/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/pkgchk/unopkg/unopkg_app.cxx36
-rwxr-xr-x[-rw-r--r--]desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/pkgchk/unopkg/unopkg_main.c0
-rwxr-xr-x[-rw-r--r--]desktop/source/pkgchk/unopkg/unopkg_main.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/pkgchk/unopkg/unopkg_misc.cxx2
-rwxr-xr-x[-rw-r--r--]desktop/source/pkgchk/unopkg/unopkg_shared.h0
-rwxr-xr-x[-rw-r--r--]desktop/source/pkgchk/unopkg/version.map0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/registration/Registration.java4
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/registration/makefile.mk7
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/registration/manifest0
-rwxr-xr-xdesktop/source/registration/com/sun/star/registration/productregistration.jar.component34
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/Installer.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/RegistrationData.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/Registry.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/ServiceTag.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/SunConnection.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/Util.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd0
-rwxr-xr-x[-rw-r--r--]desktop/source/so_comp/evaluation.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/so_comp/evaluation.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/so_comp/makefile.mk7
-rwxr-xr-x[-rw-r--r--]desktop/source/so_comp/oemjob.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/so_comp/oemjob.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/source/so_comp/services.cxx26
-rwxr-xr-xdesktop/source/so_comp/socomp.component37
-rwxr-xr-x[-rw-r--r--]desktop/source/splash/makefile.mk8
-rwxr-xr-x[-rw-r--r--]desktop/source/splash/services_spl.cxx26
-rwxr-xr-xdesktop/source/splash/spl.component37
-rwxr-xr-x[-rw-r--r--]desktop/source/splash/splash.cxx28
-rwxr-xr-x[-rw-r--r--]desktop/source/splash/splash.hxx0
-rwxr-xr-xdesktop/test/deployment/active/Addons.xcu67
-rwxr-xr-xdesktop/test/deployment/active/Dispatch.java101
-rwxr-xr-xdesktop/test/deployment/active/MANIFEST.MF3
-rwxr-xr-xdesktop/test/deployment/active/ProtocolHandler.xcu48
-rwxr-xr-xdesktop/test/deployment/active/Provider.java81
-rwxr-xr-xdesktop/test/deployment/active/Services.java72
-rwxr-xr-xdesktop/test/deployment/active/active_native.cxx320
-rwxr-xr-xdesktop/test/deployment/active/active_python.py120
-rwxr-xr-xdesktop/test/deployment/active/description.xml36
-rwxr-xr-xdesktop/test/deployment/active/makefile.mk83
-rwxr-xr-xdesktop/test/deployment/active/manifest.xml43
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/boxt/Addons.xcu0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/boxt/ProtocolHandler.xcu0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/boxt/boxt.cxx102
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/boxt/description.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/boxt/makefile.mk2
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/boxt/manifest.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/broken-dependency.oxtbin1655 -> 1655 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/double-dependencies.oxtbin1651 -> 1651 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/empty-dependencies.oxtbin1624 -> 1624 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/funny-dependency.oxtbin1730 -> 1730 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/license-dependency.oxtbin1891 -> 1891 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/many-dependencies.oxtbin1702 -> 1702 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/minattr22.oxtbin1690 -> 1690 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/minattr23.oxtbin1690 -> 1690 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/minattr24.oxtbin1690 -> 1690 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/no-dependencies.oxtbin1611 -> 1611 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/no-description.oxtbin1360 -> 1360 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/unknown-dependency.oxtbin1633 -> 1633 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/version10000.oxtbin1668 -> 1668 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/version21.oxtbin1666 -> 1666 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/version21ns.oxtbin1661 -> 1661 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/version21other.oxtbin1679 -> 1679 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/version22.oxtbin1666 -> 1666 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/version23.oxtbin1666 -> 1666 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/versionempty.oxtbin1675 -> 1675 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/dependencies/versionnone.oxtbin1674 -> 1674 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/description/desc1.oxtbin2096 -> 2096 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/description/desc2.oxtbin2091 -> 2091 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/description/desc3.oxtbin2070 -> 2070 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/description/desc4.oxtbin2061 -> 2061 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/description/desc5.oxtbin2041 -> 2041 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/display_name/name1.oxtbin704 -> 704 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/display_name/name2.oxtbin699 -> 699 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/display_name/name3.oxtbin681 -> 681 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/display_name/name4.oxtbin675 -> 675 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/display_name/name5.oxtbin654 -> 654 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/display_name/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/executable_content/build/hello.c0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/executable_content/build/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/executable_content/build/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/executable_content/hello.oxtbin35048 -> 35048 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/executable_content/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/identifier/explicit/identifier.oxtbin1660 -> 1660 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/identifier/legacy/identifier.oxtbin1634 -> 1634 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/identifier/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/locationtest/LocationTest.idl0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/locationtest/LocationTest.java0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/locationtest/LocationTest.odtbin7681 -> 7681 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/locationtest/MANIFEST.MF0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/locationtest/delzip0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/locationtest/description.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/locationtest/makefile.mk3
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/locationtest/manifest.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/MANIFEST.MF0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/leaf1.oxtbin8308 -> 8308 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/leaf1mod.oxtbin8310 -> 8310 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/leaf2.oxtbin8338 -> 8338 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/leaves1.oxtbin21158 -> 21158 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/leaves2.oxtbin21153 -> 21153 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/leaves3.oxtbin21080 -> 21080 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/modules1.oxtbin24317 -> 24317 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/modules2.oxtbin24196 -> 24196 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/nodes1.oxtbin1882 -> 1882 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/nodes2.oxtbin24287 -> 24287 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/nodes3.oxtbin24315 -> 24315 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/nodes4.oxtbin24318 -> 24318 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/nodes5.oxtbin12616 -> 12616 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/options/readme.txt0
-rwxr-xr-xdesktop/test/deployment/passive/Addons.xcu67
-rwxr-xr-xdesktop/test/deployment/passive/Dispatch.java101
-rwxr-xr-xdesktop/test/deployment/passive/MANIFEST.MF3
-rwxr-xr-xdesktop/test/deployment/passive/ProtocolHandler.xcu48
-rwxr-xr-xdesktop/test/deployment/passive/Provider.java81
-rwxr-xr-xdesktop/test/deployment/passive/Services.java49
-rwxr-xr-xdesktop/test/deployment/passive/description.xml36
-rwxr-xr-xdesktop/test/deployment/passive/makefile.mk136
-rwxr-xr-xdesktop/test/deployment/passive/manifest.xml40
-rwxr-xr-xdesktop/test/deployment/passive/passive_java.component38
-rwxr-xr-xdesktop/test/deployment/passive/passive_native.component38
-rwxr-xr-xdesktop/test/deployment/passive/passive_native.cxx289
-rwxr-xr-xdesktop/test/deployment/passive/passive_python.component38
-rwxr-xr-xdesktop/test/deployment/passive/passive_python.py101
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/BadDesc.oxtbin9663 -> 9663 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/BadNamespace.oxtbin9736 -> 9736 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/BadRoot.oxtbin9073 -> 9073 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/Locale1.oxtbin2126 -> 2126 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/Locale2.oxtbin2121 -> 2121 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/Locale3.oxtbin2101 -> 2101 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/Locale4.oxtbin2094 -> 2094 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/Locale5.oxtbin2072 -> 2072 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/Locale6.oxtbin1397 -> 1397 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/LongLic.oxtbin9521 -> 9521 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/MissingLic.oxtbin9214 -> 9214 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/MissingLicRef.oxtbin9332 -> 9332 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/NoDefLang.oxtbin9360 -> 9360 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/NoDesc.oxtbin8722 -> 8722 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/NoLang.oxtbin9217 -> 9217 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/Prefix.oxtbin1112 -> 1112 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/ShortLicense.oxtbin9381 -> 9381 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/ShortLicenseShared.oxtbin9382 -> 9382 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/simple_license/tests_simple_license.odtbin16629 -> 16629 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/changing_display_name/change1.oxtbin1650 -> 1650 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/changing_display_name/change1_mod.oxtbin1673 -> 1673 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/changing_display_name/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/changing_display_name/update1/change1.oxtbin1675 -> 1675 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/changing_display_name/update1/change1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/changing_display_name/update2/change1.oxtbin1687 -> 1687 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/changing_display_name/update2/change1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/default_url/default1.oxtbin1544 -> 1544 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/default_url/default2.oxtbin1544 -> 1544 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/default_url/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/default_url/update/default1.oxtbin1546 -> 1546 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/default_url/update/default1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/default_url/update/default2.oxtbin1546 -> 1546 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/default_url/update/default2.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/default_url/update/feed1.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/fail1.oxtbin2189 -> 2189 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/fail2.oxtbin2188 -> 2188 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/fail3.oxtbin2188 -> 2188 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/fail4.oxtbin2189 -> 2189 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/info1.oxtbin2188 -> 2188 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/info2.oxtbin2187 -> 2187 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/info3.oxtbin2187 -> 2187 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/fail1.oxtbin2193 -> 2193 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/fail1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/fail2.oxtbin2436 -> 2436 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/fail2.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/fail3.oxtbin2396 -> 2396 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/fail3.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/fail4.oxt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/fail4.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/info1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/info2.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/info3.oxtbin2189 -> 2189 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/defect/update/info3.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/dependencies/publisher_en.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/dependencies/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/dependencies/release-notes_en.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/dependencies/update-dependencies.oxtbin1751 -> 1751 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/dependencies/update/update-dependencies.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/license/lic1.oxtbin3608 -> 3608 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/license/lic2.oxtbin3625 -> 3625 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/license/lic3.oxtbin3624 -> 3624 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/license/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/license/update/lic1.oxtbin3610 -> 3610 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/license/update/lic1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/license/update/lic2.oxtbin3627 -> 3627 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/license/update/lic2.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/license/update/lic3.oxtbin3626 -> 3626 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/license/update/lic3.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/all1.oxtbin692 -> 692 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/all2.oxtbin702 -> 702 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/all3.oxtbin297 -> 297 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/freebsd_x86.oxtbin706 -> 706 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/freebsd_x86_64.oxtbin711 -> 711 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/invalid1.oxtbin653 -> 653 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/invalid2.oxtbin653 -> 653 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/invalid3.oxtbin655 -> 655 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_arm_eabi.oxtbin709 -> 709 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_arm_oabi.oxtbin710 -> 710 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_ia64.oxtbin706 -> 706 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_mips_eb.oxtbin709 -> 709 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_mips_el.oxtbin708 -> 708 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_powerpc.oxtbin708 -> 708 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_powerpc64.oxtbin710 -> 710 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_s390.oxtbin705 -> 705 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_s390x.oxtbin706 -> 706 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_sparc.oxtbin706 -> 706 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_x86.oxtbin705 -> 705 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/linux_x86_64.oxtbin708 -> 708 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/macosx_powerpc.oxtbin710 -> 710 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/macosx_x86.oxtbin707 -> 707 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/mul1.oxtbin952 -> 952 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/os2_x86.oxtbin706 -> 706 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/solaris_sparc.oxtbin709 -> 709 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/solaris_x86.oxtbin706 -> 706 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/platform/windows_x86.oxtbin707 -> 707 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/pub1.oxtbin1882 -> 1882 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/pub10.oxtbin1742 -> 1742 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/pub11.oxtbin1601 -> 1601 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/pub2.oxtbin1866 -> 1866 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/pub3.oxtbin1829 -> 1829 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/pub4.oxtbin1812 -> 1812 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/pub5.oxtbin1769 -> 1769 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/pub6.oxtbin1814 -> 1814 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/pub7.oxtbin1769 -> 1769 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/pub8.oxtbin1853 -> 1853 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/pub9.oxtbin1779 -> 1779 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/publisher_de-DE-altmark.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/publisher_de-DE.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/publisher_de.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/publisher_en-GB.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/publisher_en-US-region1.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/publisher_en-US-region2.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/publisher_en-US.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/publisher_en-region3.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/publisher_en.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/release-notes_de-DE-altmark.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/release-notes_de-DE.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/release-notes_de.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/release-notes_en-GB.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/release-notes_en-US-region1.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/release-notes_en-US-region2.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/release-notes_en-US.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/release-notes_en-region3.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/release-notes_en.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub1.oxtbin1885 -> 1885 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub10.oxtbin1744 -> 1744 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub11.oxtbin1603 -> 1603 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub2.oxtbin1871 -> 1871 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub2.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub3.oxtbin1833 -> 1833 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub3.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub4.oxtbin1815 -> 1815 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub4.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub5.oxtbin1774 -> 1774 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub5.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub6.oxtbin1816 -> 1816 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub6.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub7.oxtbin1771 -> 1771 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub7.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub8.oxtbin1855 -> 1855 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/publisher/update/pub9.oxtbin1781 -> 1781 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/simple/plain1.oxtbin1642 -> 1642 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/simple/plain2.oxtbin1643 -> 1643 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/simple/plain3.oxtbin1643 -> 1643 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/simple/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/simple/update/plain1.oxtbin1645 -> 1645 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/simple/update/plain1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/simple/update/plain2.oxtbin1645 -> 1645 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/simple/update/plain2.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/simple/update/plain3.oxtbin1645 -> 1645 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/simple/update/plain3.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/updatefeed/feed1.oxtbin2184 -> 2184 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/updatefeed/feed2.oxtbin2184 -> 2184 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/updatefeed/update/feed1.oxtbin2184 -> 2184 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/updatefeed/update/feed1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/updatefeed/update/feed1.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/updatefeed/update/feed2.oxtbin2184 -> 2184 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/updatefeed/update/feed2.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/updateinfocreation/build/description.xml0
-rwxr-xr-xdesktop/test/deployment/update/updateinfocreation/build/makefile.mk3
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/updateinfocreation/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/updateinfocreation/update/updateinfo.oxtbin4295 -> 4295 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/updateinfocreation/updateinfo.oxtbin4295 -> 4295 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web1.oxtbin1695 -> 1695 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web1_de-DE-altmark.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web1_de-DE.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web1_de.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web1_en-GB.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web1_en-US-region1.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web1_en-US-region2.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web1_en-US.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web1_en-region3.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web1_en.html0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web2.oxtbin1695 -> 1695 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web2.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web3.oxtbin1695 -> 1695 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web3.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web4.oxtbin1695 -> 1695 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web4.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web5.oxtbin1695 -> 1695 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web5.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web6.oxtbin1640 -> 1640 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web6/description.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web6/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web7.oxtbin1897 -> 1897 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web7/description.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/update/web7/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/web1.oxtbin1693 -> 1693 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/web2.oxtbin1693 -> 1693 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/web3.oxtbin1693 -> 1693 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/web4.oxtbin1693 -> 1693 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/web5.oxtbin1693 -> 1693 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/web6.oxtbin1638 -> 1638 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/website_update/web7.oxtbin1894 -> 1894 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/update/url1.oxtbin2192 -> 2192 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/update/url1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/update/url2.oxtbin2206 -> 2206 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/update/url2.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/update/wrongdownload1.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/update/wrongdownload2.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/update/wrongdownload3.update.xml0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/url1.oxtbin2190 -> 2190 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/url2.oxtbin2205 -> 2205 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/url3.oxtbin2204 -> 2204 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/wrongdownload1.oxtbin2194 -> 2194 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/wrongdownload2.oxtbin2194 -> 2194 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/update/wrong_url/wrongdownload3.oxtbin2194 -> 2194 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/readme.txt0
-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_0.0/dependency.oxtbin1657 -> 1657 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_0.0/license.oxtbin1733 -> 1733 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_0.0/plain.oxtbin1618 -> 1618 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.02.4.7.0/dependency.oxtbin1662 -> 1662 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.02.4.7.0/license.oxtbin1738 -> 1738 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.02.4.7.0/plain.oxtbin1624 -> 1624 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.2.15.3/dependency.oxtbin1662 -> 1662 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.2.15.3/license.oxtbin1738 -> 1738 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.2.15.3/plain.oxtbin1624 -> 1624 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.2.3/dependency.oxtbin1659 -> 1659 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.2.3/license.oxtbin1735 -> 1735 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.2.3/plain.oxtbin1620 -> 1620 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.2.4.7/dependency.oxtbin1661 -> 1661 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.2.4.7/license.oxtbin1737 -> 1737 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_1.2.4.7/plain.oxtbin1623 -> 1623 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_badelement/dependency.oxtbin1654 -> 1654 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_badelement/license.oxtbin1731 -> 1731 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_badelement/plain.oxtbin1616 -> 1616 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_badvalue/dependency.oxtbin1657 -> 1657 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_badvalue/license.oxtbin1733 -> 1733 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_badvalue/plain.oxtbin1618 -> 1618 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_nodependencies_0.0/dependency.oxtbin1618 -> 1618 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_nodependencies_1.02.4.7.0/dependency.oxtbin1624 -> 1624 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_nodependencies_1.2.15.3/dependency.oxtbin1624 -> 1624 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_nodependencies_1.2.3/dependency.oxtbin1620 -> 1620 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_nodependencies_1.2.4.7/dependency.oxtbin1623 -> 1623 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_nodependencies_badelement/dependency.oxtbin1616 -> 1616 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_nodependencies_badvalue/dependency.oxtbin1618 -> 1618 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_nodependencies_none/dependency.oxtbin1598 -> 1598 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_none/dependency.oxtbin1645 -> 1645 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_none/license.oxtbin1722 -> 1722 bytes-rwxr-xr-x[-rw-r--r--]desktop/test/deployment/version/version_none/plain.oxtbin1598 -> 1598 bytes-rwxr-xr-x[-rw-r--r--]desktop/unx/source/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/unx/source/officeloader/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/unx/source/officeloader/officeloader.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/unx/source/splashx.c0
-rwxr-xr-x[-rw-r--r--]desktop/unx/source/splashx.h0
-rwxr-xr-x[-rw-r--r--]desktop/unx/source/start.c0
-rwxr-xr-x[-rw-r--r--]desktop/unx/splash/exports.map0
-rwxr-xr-x[-rw-r--r--]desktop/unx/splash/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/unx/splash/services_unxsplash.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/unx/splash/unxsplash.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/unx/splash/unxsplash.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/util/hidother.src0
-rwxr-xr-x[-rw-r--r--]desktop/util/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/util/ooverinfo.rc0
-rwxr-xr-x[-rw-r--r--]desktop/util/ooverinfo2.rc16
-rwxr-xr-x[-rw-r--r--]desktop/util/soffice.icobin4990 -> 4990 bytes-rwxr-xr-x[-rw-r--r--]desktop/util/template.manifest0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/launcher.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/launcher.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/ooo/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/sbase.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/scalc.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/sdraw.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/simpress.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/smath.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/sweb.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/swriter.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/applauncher/verinfo.rc0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/extendloaderenvironment.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/extendloaderenvironment.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/guiloader/genericloader.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/guiloader/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/guistdio/guistdio.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/guistdio/guistdio.inc0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/guistdio/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/guistdio/unopkgio.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/lwrapa.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/lwrapw.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/main.h0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/officeloader/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/officeloader/officeloader.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/rebase/Resource.h0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/rebase/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/rebase/rcfooter.txt0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/rebase/rcheader.txt0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/rebase/rctmpl.txt0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/rebase/rebase.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/rebase/rebasegui.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/rebase/rebasegui.ulf0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/rwrapa.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/rwrapw.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/Resource.h0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/makefile.mk0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/rcfooter.txt0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/rcheader.txt0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/rctmpl.txt0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/setup.cpp0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/setup.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/setup.icobin4710 -> 4710 bytes-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/setup.ulf0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/setup_a.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/setup_help.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/setup_main.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/setup_main.hxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/setup/setup_w.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/sowrapper.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/unoinfo.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/wrapper.h0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/wrappera.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/win32/source/wrapperw.cxx0
-rwxr-xr-x[-rw-r--r--]desktop/zipintro/delzip0
-rwxr-xr-x[-rw-r--r--]desktop/zipintro/makefile.mk0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/animation/animationtiming.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx0
-rwxr-xr-xdrawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx128
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx18
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/texture/texture.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/drawinglayer/texture/texture3d.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/pch/precompiled_drawinglayer.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/inc/pch/precompiled_drawinglayer.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/prj/build.lst0
-rwxr-xr-x[-rw-r--r--]drawinglayer/prj/d.lst2
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/animation/animationtiming.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/animation/makefile.mk0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/fillbitmapattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/fillgradientattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/fillhatchattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/fontattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/lineattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/linestartendattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/makefile.mk0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/materialattribute3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/sdrallattribute3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/sdrfillattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/sdrfillbitmapattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/sdrlightattribute3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/sdrlightingattribute3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/sdrlineattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/sdrlinestartendattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/sdrobjectattribute3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/sdrsceneattribute3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/sdrshadowattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/attribute/strokeattribute.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/geometry/makefile.mk0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/geometry/viewinformation2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/geometry/viewinformation3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/animatedprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/baseprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/bitmapprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/borderlineprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/chartprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/controlprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx0
-rwxr-xr-xdrawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx339
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/epsprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/graphicprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/gridprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/groupprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/helplineprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/invertprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/makefile.mk1
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/maskprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/mediaprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/metafileprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/polygonprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/primitivetools2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/sceneprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/shadowprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/structuretagprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/texteffectprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/textenumsprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/textlayoutdevice.cxx2
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/textlineprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/textprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/transformprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/transparenceprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/baseprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/groupprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/makefile.mk0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/polygonprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/sdrprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/shadowprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/textureprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/primitive3d/transformprimitive3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/baseprocessor2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/canvasprocessor.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/contourextractor2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/helperchartrenderer.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/helperchartrenderer.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/helperwrongspellrenderer.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/helperwrongspellrenderer.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/hittestprocessor2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/linegeometryextractor2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/makefile.mk0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/textaspolygonextractor2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/vclhelperbitmaprender.cxx43
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/vclhelperbitmaprender.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/vclhelperbufferdevice.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/vclhelperbufferdevice.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/vclhelpergradient.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/vclhelpergradient.hxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx6
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/vclpixelprocessor2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor2d/vclprocessor2d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor3d/baseprocessor3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor3d/cutfindprocessor3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor3d/defaultprocessor3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor3d/geometry2dextractor.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor3d/makefile.mk0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor3d/shadow3dextractor.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/processor3d/zbufferprocessor3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/texture/makefile.mk0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/texture/texture.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/source/texture/texture3d.cxx0
-rwxr-xr-x[-rw-r--r--]drawinglayer/util/drawinglayer.flt0
-rwxr-xr-x[-rw-r--r--]drawinglayer/util/makefile.mk0
-rwxr-xr-x[-rw-r--r--]editeng/AllLangResTarget_editeng.mk (renamed from framework/qa/complex/dispatches/helper/makefile.mk)36
-rwxr-xr-xediteng/Library_editeng.mk167
-rwxr-xr-x[-rw-r--r--]editeng/Makefile (renamed from svx/util/makefile.pmk)21
-rwxr-xr-x[-rw-r--r--]editeng/Module_editeng.mk (renamed from editeng/inc/makefile.mk)33
-rwxr-xr-xediteng/Package_inc.mk154
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng.hrc0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/AccessibleComponentBase.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/AccessibleContextBase.hxx4
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/AccessibleEditableTextPara.hxx6
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/AccessibleImageBullet.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/AccessibleParaManager.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/AccessibleSelectionBase.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/AccessibleStaticTextBase.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/AccessibleStringWrap.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/SpellPortions.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/UnoForbiddenCharsTable.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/acorrcfg.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/adjitem.hxx36
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/akrnitem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/blnkitem.hxx6
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/bolnitem.hxx6
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/borderline.hxx26
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/boxitem.hxx106
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/brkitem.hxx26
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/brshitem.hxx28
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/bulitem.hxx54
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/charhiddenitem.hxx2
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/charreliefitem.hxx16
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/charrotateitem.hxx12
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/charscaleitem.hxx12
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/cmapitem.hxx18
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/cntritem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/colritem.hxx16
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/crsditem.hxx22
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/cscoitem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/editdata.hxx64
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/editeng.hxx268
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/editengdllapi.h0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/editerr.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/editids.hrc0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/editobj.hxx64
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/editrids.hrc39
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/editstat.hxx28
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/editund2.hxx14
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/editview.hxx80
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/edtdlg.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/eedata.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/eeitem.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/eeitemid.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/eerdll.hxx2
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/emphitem.hxx16
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/escpitem.hxx30
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/fhgtitem.hxx38
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/flditem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/flstitem.hxx4
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/fontitem.hxx16
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/forbiddencharacterstable.hxx10
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/forbiddenruleitem.hxx4
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/frmdir.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/frmdiritem.hxx16
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/fwdtitem.hxx30
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/hangulhanja.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/hngpnctitem.hxx4
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/hyznitem.hxx42
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/itemtype.hxx6
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/justifyitem.hxx12
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/keepitem.hxx10
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/kernitem.hxx10
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/langitem.hxx14
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/lcolitem.hxx6
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/lrspitem.hxx64
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/lspcitem.hxx30
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/measfld.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/memberids.hrc0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/mutxhelp.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/nhypitem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/nlbkitem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/numdef.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/numitem.hxx112
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/opaqitem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/optitems.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/orphitem.hxx6
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/outliner.hxx442
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/outlobj.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/paperinf.hxx2
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/paragraphdata.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/paravertalignitem.hxx12
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/pbinitem.hxx12
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/pgrditem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/pmdlitem.hxx22
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/postitem.hxx20
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/prntitem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/protitem.hxx36
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/prszitem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/scriptspaceitem.hxx4
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/scripttypeitem.hxx32
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/shaditem.hxx36
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/shdditem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/sizeitem.hxx12
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/spltitem.hxx10
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/splwrap.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/svxacorr.hxx100
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/svxenum.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/svxfont.hxx38
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/svxrtf.hxx101
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/swafopt.hxx68
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/tstpitem.hxx38
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/twolinesitem.hxx14
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/txtrange.hxx76
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/udlnitem.hxx36
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/ulspitem.hxx62
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unoedhlp.hxx24
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unoedprx.hxx66
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unoedsrc.hxx60
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unofdesc.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unofield.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unofored.hxx56
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unoforou.hxx62
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unoipset.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unolingu.hxx14
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unonrule.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unopracc.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unoprnms.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unotext.hxx38
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unoviwed.hxx2
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/unoviwou.hxx2
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/wghtitem.hxx20
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/widwitem.hxx6
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/writingmodeitem.hxx14
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/wrlmitem.hxx8
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/xmlcnitm.hxx4
-rwxr-xr-x[-rw-r--r--]editeng/inc/editxml.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/helpid.hrc71
-rwxr-xr-x[-rw-r--r--]editeng/inc/pch/precompiled_editeng.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/pch/precompiled_editeng.hxx5
-rwxr-xr-x[-rw-r--r--]editeng/prj/build.lst14
-rwxr-xr-x[-rw-r--r--]editeng/prj/d.lst14
-rwxr-xr-x[-rw-r--r--]editeng/prj/makefile.mk (renamed from framework/util/makefile.pmk)14
-rwxr-xr-x[-rw-r--r--]editeng/source/accessibility/AccessibleComponentBase.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/accessibility/AccessibleContextBase.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/accessibility/AccessibleEditableTextPara.cxx100
-rwxr-xr-x[-rw-r--r--]editeng/source/accessibility/AccessibleHyperlink.cxx2
-rwxr-xr-x[-rw-r--r--]editeng/source/accessibility/AccessibleHyperlink.hxx4
-rwxr-xr-x[-rw-r--r--]editeng/source/accessibility/AccessibleImageBullet.cxx8
-rwxr-xr-x[-rw-r--r--]editeng/source/accessibility/AccessibleParaManager.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/accessibility/AccessibleSelectionBase.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/accessibility/AccessibleStaticTextBase.cxx14
-rwxr-xr-x[-rw-r--r--]editeng/source/accessibility/AccessibleStringWrap.cxx2
-rwxr-xr-x[-rw-r--r--]editeng/source/accessibility/accessibility.src0
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editattr.cxx87
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editattr.hxx102
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editdbg.cxx104
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editdbg.hxx4
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editdoc.cxx434
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editdoc.hxx387
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editdoc2.cxx122
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editeng.cxx126
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editeng.src0
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editobj.cxx386
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editobj2.hxx129
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editsel.cxx10
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editsel.hxx4
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editstt2.hxx60
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editundo.cxx98
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editundo.hxx52
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/editview.cxx46
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/edtspell.cxx8
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/edtspell.hxx92
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/eehtml.cxx97
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/eehtml.hxx32
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/eeng_pch.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/eeng_pch.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/eeobj.cxx6
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/eeobj.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/eerdll.cxx86
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/eerdll2.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/eertfpar.cxx62
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/eertfpar.hxx22
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/impedit.cxx138
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/impedit.hxx162
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/impedit2.cxx792
-rw-r--r--editeng/source/editeng/impedit3.cxx204
-rw-r--r--editeng/source/editeng/impedit4.cxx168
-rw-r--r--editeng/source/editeng/impedit5.cxx174
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/textconv.cxx20
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/textconv.hxx12
-rw-r--r--editeng/source/items/bulitem.cxx60
-rw-r--r--editeng/source/items/charhiddenitem.cxx4
-rw-r--r--editeng/source/items/flditem.cxx163
-rw-r--r--editeng/source/items/frmitems.cxx99
-rwxr-xr-x[-rw-r--r--]editeng/source/items/itemtype.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/items/justifyitem.cxx12
-rw-r--r--editeng/source/items/numitem.cxx155
-rwxr-xr-x[-rw-r--r--]editeng/source/items/optitems.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/items/page.src148
-rwxr-xr-x[-rw-r--r--]editeng/source/items/paperinf.cxx50
-rw-r--r--editeng/source/items/paraitem.cxx64
-rwxr-xr-x[-rw-r--r--]editeng/source/items/svdfield.cxx4
-rw-r--r--editeng/source/items/svxfont.cxx68
-rwxr-xr-x[-rw-r--r--]editeng/source/items/svxitems.src0
-rw-r--r--editeng/source/items/textitem.cxx516
-rw-r--r--editeng/source/items/writingmodeitem.cxx12
-rw-r--r--editeng/source/items/xmlcnitm.cxx42
-rwxr-xr-x[-rw-r--r--]editeng/source/misc/SvXMLAutoCorrectExport.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/misc/SvXMLAutoCorrectExport.hxx0
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectImport.cxx4
-rwxr-xr-x[-rw-r--r--]editeng/source/misc/SvXMLAutoCorrectImport.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/misc/acorrcfg.cxx30
-rwxr-xr-x[-rw-r--r--]editeng/source/misc/edtdlg.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/misc/forbiddencharacterstable.cxx14
-rwxr-xr-x[-rw-r--r--]editeng/source/misc/hangulhanja.cxx2
-rwxr-xr-x[-rw-r--r--]editeng/source/misc/lingu.src0
-rwxr-xr-x[-rw-r--r--]editeng/source/misc/splwrap.cxx2
-rw-r--r--editeng/source/misc/svxacorr.cxx482
-rwxr-xr-x[-rw-r--r--]editeng/source/misc/swafopt.cxx10
-rw-r--r--editeng/source/misc/txtrange.cxx131
-rw-r--r--editeng/source/misc/unolingu.cxx90
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outl_pch.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outl_pch.hxx0
-rw-r--r--editeng/source/outliner/outleeng.cxx42
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outleeng.hxx32
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outlin2.cxx156
-rw-r--r--editeng/source/outliner/outliner.cxx450
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outliner.src0
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outlobj.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outlundo.cxx34
-rw-r--r--editeng/source/outliner/outlundo.hxx18
-rw-r--r--editeng/source/outliner/outlvw.cxx385
-rw-r--r--editeng/source/outliner/paralist.cxx62
-rw-r--r--editeng/source/outliner/paralist.hxx16
-rw-r--r--editeng/source/rtf/rtfgrf.cxx42
-rw-r--r--editeng/source/rtf/rtfitem.cxx424
-rwxr-xr-x[-rw-r--r--]editeng/source/rtf/segincr.asm0
-rw-r--r--editeng/source/rtf/svxrtf.cxx308
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/UnoForbiddenCharsTable.cxx6
-rw-r--r--editeng/source/uno/makefile.mk61
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unoedhlp.cxx24
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unoedprx.cxx150
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unoedsrc.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unofdesc.cxx28
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unofield.cxx2
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unofored.cxx94
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unoforou.cxx76
-rw-r--r--editeng/source/uno/unoipset.cxx12
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unonrule.cxx8
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unopracc.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unotext.cxx74
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unotext2.cxx2
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unoviwed.cxx2
-rwxr-xr-x[-rw-r--r--]editeng/source/uno/unoviwou.cxx2
-rwxr-xr-x[-rw-r--r--]editeng/source/xml/editsource.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/xml/xmltxtexp.cxx2
-rwxr-xr-x[-rw-r--r--]editeng/source/xml/xmltxtimp.cxx14
-rwxr-xr-x[-rw-r--r--]editeng/util/editeng.dxp1
-rwxr-xr-x[-rw-r--r--]editeng/util/hidother.src0
-rwxr-xr-x[-rw-r--r--]embeddedobj/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/inc/pch/precompiled_embeddedobj.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/inc/pch/precompiled_embeddedobj.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]embeddedobj/prj/d.lst2
-rwxr-xr-x[-rw-r--r--]embeddedobj/prj/l10n0
-rwxr-xr-x[-rw-r--r--]embeddedobj/qa/embedding/EmbeddingTest.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/qa/embedding/EmbeddingUnitTest.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/qa/embedding/Test01.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/qa/embedding/TestHelper.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/qa/embedding/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/commonembedding/embedobj.cxx26
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/commonembedding/inplaceobj.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/commonembedding/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/commonembedding/miscobj.cxx17
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/commonembedding/persistence.cxx22
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/commonembedding/register.cxx42
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/commonembedding/specialobject.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/commonembedding/visobj.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/commonembedding/xfactory.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/commonembedding/xfactory.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/general/docholder.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/general/dummyobject.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/general/intercept.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/general/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/general/xcreator.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/inc/closepreventer.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/inc/commonembobj.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/inc/docholder.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/inc/dummyobject.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/inc/intercept.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/inc/oleembobj.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/inc/specialobject.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/inc/targetstatecontrol.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/inc/xcreator.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/advisesink.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/advisesink.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/closepreventer.cxx0
-rwxr-xr-xembeddedobj/source/msole/emboleobj.component35
-rwxr-xr-xembeddedobj/source/msole/emboleobj.windows.component39
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/exports.dxp1
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/graphconvert.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/makefile.mk11
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/mtnotification.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/olecomponent.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/olecomponent.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/oleembed.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/olemisc.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/olepersist.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/oleregister.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/olevisual.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/olewrapclient.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/olewrapclient.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/ownview.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/ownview.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/platform.h0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/xdialogcreator.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/xdialogcreator.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/xolefactory.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/source/msole/xolefactory.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/BitmapPainter.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/EmbedContApp.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/EmbedContFrame.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/JavaWindowPeerFake.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/NativeView.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/PaintThread.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/WindowHelper.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/nativelib/exports.dxp0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/nativelib/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/nativelib/nativeview.c0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/nativelib/nativeview.h0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/MainThreadExecutor/exports.dxp0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/MainThreadExecutor/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/MainThreadExecutor/register.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/MainThreadExecutor/xexecutor.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/MainThreadExecutor/xexecutor.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/bitmapcreator.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/bitmapcreator.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/exports.dxp0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/mainthreadexecutor.cxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/mainthreadexecutor.hxx0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/mteregister.cxx0
-rwxr-xr-xembeddedobj/util/embobj.component43
-rwxr-xr-x[-rw-r--r--]embeddedobj/util/exports.dxp1
-rwxr-xr-x[-rw-r--r--]embeddedobj/util/makefile.mk8
-rwxr-xr-x[-rw-r--r--]eventattacher/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]eventattacher/prj/d.lst1
-rwxr-xr-x[-rw-r--r--]eventattacher/source/eventattacher.cxx28
-rwxr-xr-xeventattacher/source/evtatt.component34
-rwxr-xr-x[-rw-r--r--]eventattacher/source/makefile.mk8
-rwxr-xr-x[-rw-r--r--]fileaccess/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]fileaccess/prj/d.lst1
-rwxr-xr-x[-rw-r--r--]fileaccess/source/FileAccess.cxx26
-rwxr-xr-xfileaccess/source/fileacc.component34
-rwxr-xr-x[-rw-r--r--]fileaccess/source/fileacc.xml0
-rwxr-xr-x[-rw-r--r--]fileaccess/source/makefile.mk8
-rwxr-xr-x[-rw-r--r--]formula/inc/AddressConvention.hxx0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/ExternalReferenceHelper.hxx0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/FormulaCompiler.hxx57
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/FormulaOpCodeMapperObj.hxx0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/IControlReferenceHandler.hxx2
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/IFunctionDescription.hxx12
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/compiler.hrc0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/errorcodes.hxx78
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/formdata.hxx44
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/formula.hxx32
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/formuladllapi.h0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/formulahelper.hxx12
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/funcutl.hxx2
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/grammar.hxx0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/opcode.hxx2
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/token.hxx92
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/tokenarray.hxx48
-rwxr-xr-x[-rw-r--r--]formula/inc/helpids.hrc50
-rwxr-xr-x[-rw-r--r--]formula/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]formula/inc/pch/precompiled_formula.cxx0
-rwxr-xr-x[-rw-r--r--]formula/inc/pch/precompiled_formula.hxx0
-rwxr-xr-x[-rw-r--r--]formula/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]formula/prj/d.lst1
-rwxr-xr-x[-rw-r--r--]formula/prj/for.xml0
-rwxr-xr-x[-rw-r--r--]formula/source/core/api/FormulaCompiler.cxx178
-rwxr-xr-x[-rw-r--r--]formula/source/core/api/FormulaOpCodeMapperObj.cxx0
-rwxr-xr-x[-rw-r--r--]formula/source/core/api/makefile.mk0
-rwxr-xr-x[-rw-r--r--]formula/source/core/api/services.cxx6
-rwxr-xr-x[-rw-r--r--]formula/source/core/api/token.cxx156
-rwxr-xr-x[-rw-r--r--]formula/source/core/inc/core_resource.hrc0
-rwxr-xr-x[-rw-r--r--]formula/source/core/inc/core_resource.hxx0
-rwxr-xr-x[-rw-r--r--]formula/source/core/resource/core_resource.cxx0
-rwxr-xr-x[-rw-r--r--]formula/source/core/resource/core_resource.src0
-rwxr-xr-x[-rw-r--r--]formula/source/core/resource/makefile.mk0
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/ControlHelper.hxx6
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/FormulaHelper.cxx54
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/formdlgs.hrc0
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/formdlgs.src12
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/formula.cxx344
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/funcpage.cxx38
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/funcpage.hxx16
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/funcutl.cxx42
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/makefile.mk0
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/parawin.cxx126
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/parawin.hrc0
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/parawin.hxx72
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/parawin.src17
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/structpg.cxx26
-rwxr-xr-x[-rw-r--r--]formula/source/ui/dlg/structpg.hxx10
-rwxr-xr-x[-rw-r--r--]formula/source/ui/inc/ForResId.hrc0
-rwxr-xr-x[-rw-r--r--]formula/source/ui/inc/ModuleHelper.hxx2
-rwxr-xr-x[-rw-r--r--]formula/source/ui/resource/ModuleHelper.cxx0
-rwxr-xr-x[-rw-r--r--]formula/source/ui/resource/makefile.mk0
-rwxr-xr-xformula/util/for.component34
-rwxr-xr-x[-rw-r--r--]formula/util/hh.html0
-rwxr-xr-x[-rw-r--r--]formula/util/hidother.src4
-rwxr-xr-x[-rw-r--r--]formula/util/makefile.mk8
-rwxr-xr-x[-rw-r--r--]formula/util/makefile.pmk0
-rwxr-xr-x[-rw-r--r--]fpicker/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]fpicker/inc/pch/precompiled_fpicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/inc/pch/precompiled_fpicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]fpicker/prj/d.lst11
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/AquaFilePickerDelegate.hxx2
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/AquaFilePickerDelegate.mm2
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/CFStringUtilities.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/CFStringUtilities.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/ControlHelper.cxx4
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/ControlHelper.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/FPServiceInfo.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/FPentry.cxx26
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/FilterHelper.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/FilterHelper.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/NSString_OOoAdditions.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/NSString_OOoAdditions.mm0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/NSURL_OOoAdditions.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/NSURL_OOoAdditions.mm4
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/SalAquaConstants.h0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/SalAquaFilePicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/SalAquaFilePicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/SalAquaFolderPicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/SalAquaFolderPicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/SalAquaPicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/SalAquaPicker.hxx0
-rw-r--r--fpicker/source/aqua/fps-aqua-ucd.txt13
-rwxr-xr-xfpicker/source/aqua/fps_aqua.component37
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/fps_aqua.xml0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/makefile.mk8
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/resourceprovider.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/aqua/resourceprovider.hxx0
-rwxr-xr-xfpicker/source/generic/fpicker.component37
-rwxr-xr-x[-rw-r--r--]fpicker/source/generic/fpicker.cxx7
-rwxr-xr-x[-rw-r--r--]fpicker/source/generic/makefile.mk8
-rwxr-xr-x[-rw-r--r--]fpicker/source/odma/ODMAFilePicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/odma/ODMAFilePicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/odma/ODMAFolderPicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/odma/ODMAFolderPicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/odma/exports.map0
-rwxr-xr-x[-rw-r--r--]fpicker/source/odma/fps_odma.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/odma/makefile.mk0
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/OfficeControlAccess.cxx52
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/OfficeControlAccess.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/OfficeFilePicker.cxx8
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/OfficeFilePicker.hxx2
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/OfficeFilePicker.src0
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/OfficeFolderPicker.cxx4
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/OfficeFolderPicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/asyncfilepicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/asyncfilepicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/commonpicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/commonpicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/fpinteraction.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/fpinteraction.hxx0
-rwxr-xr-xfpicker/source/office/fps_office.component37
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/fps_office.cxx7
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/fpsmartcontent.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/fpsmartcontent.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/iodlg.cxx133
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/iodlg.hrc21
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/iodlg.hxx18
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/iodlg.src19
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/iodlgimp.cxx8
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/iodlgimp.hxx2
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/makefile.mk8
-rwxr-xr-x[-rw-r--r--]fpicker/source/office/pickercallbacks.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/FPServiceInfo.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/FPentry.cxx26
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/SalGtkFilePicker.cxx59
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/SalGtkFilePicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/SalGtkFolderPicker.cxx4
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/SalGtkFolderPicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/SalGtkPicker.cxx40
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/SalGtkPicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/eventnotification.hxx0
-rw-r--r--fpicker/source/unx/gnome/fps-gnome-ucd.txt13
-rwxr-xr-xfpicker/source/unx/gnome/fps_gnome.component37
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/fps_gnome.xml0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/makefile.mk8
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/resourceprovider.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/gnome/resourceprovider.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde/kdecommandthread.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde/kdecommandthread.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde/kdefilepicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde/kdefilepicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde/kdefpmain.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde/kdemodalityfilter.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde/kdemodalityfilter.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde/makefile.mk0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde4/FPServiceInfo.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde4/KDE4FPEntry.cxx21
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde4/KDE4FilePicker.cxx6
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde4/KDE4FilePicker.hxx0
-rw-r--r--fpicker/source/unx/kde4/fps-kde4-ucd.txt6
-rwxr-xr-xfpicker/source/unx/kde4/fps_kde4.component34
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde4/fps_kde4.xml0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde4/makefile.mk8
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde_unx/FPServiceInfo.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde_unx/UnxCommandThread.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde_unx/UnxCommandThread.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde_unx/UnxFPentry.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde_unx/UnxFilePicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde_unx/UnxFilePicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde_unx/UnxNotifyThread.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde_unx/UnxNotifyThread.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde_unx/fps-kde-ucd.txt0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde_unx/fps_kde.xml0
-rwxr-xr-x[-rw-r--r--]fpicker/source/unx/kde_unx/makefile.mk0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/FPServiceInfo.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/FPentry.cxx25
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/FileOpenDlg.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/FileOpenDlg.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/FilePicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/FilePicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/FilterContainer.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/FilterContainer.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/Fps.rc0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/PreviewCtrl.cxx10
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/PreviewCtrl.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/SolarMutex.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/SolarMutex.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/VistaFilePicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/VistaFilePicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx2
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/WinFileOpenImpl.cxx6
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/WinFileOpenImpl.hxx2
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/afxres.h0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/asynceventnotifier.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/asynceventnotifier.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/asyncrequests.cxx2
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/asyncrequests.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/comptr.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/controlaccess.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/controlaccess.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/controlcommand.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/controlcommand.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/controlcommandrequest.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/controlcommandresult.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/customcontrol.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/customcontrol.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/customcontrolcontainer.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/customcontrolcontainer.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/customcontrolfactory.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/customcontrolfactory.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/dialogcustomcontrols.cxx2
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/dialogcustomcontrols.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/dibpreview.cxx6
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/dibpreview.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/eventnotification.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/filepickereventnotification.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/filepickereventnotification.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/filepickerstate.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/filepickerstate.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/fps.xml0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/getfilenamewrapper.cxx6
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/getfilenamewrapper.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/helppopupwindow.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/helppopupwindow.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/makefile.mk0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/platform_vista.h0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/platform_xp.h0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/previewadapter.cxx4
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/previewadapter.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/previewbase.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/previewbase.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/propmap.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/resource.h0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/shared.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/vistatypes.h0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/workbench/Test_fps.cxx2
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/filepicker/workbench/makefile.mk0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/FOPServiceInfo.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/FolderPicker.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/FolderPicker.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/FopEvtDisp.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/Fopentry.cxx25
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/MtaFop.cxx4
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/MtaFop.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/WinFOPImpl.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/WinFOPImpl.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/fop.xml0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/makefile.mk0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/workbench/Test_fops.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/folderpicker/workbench/makefile.mk0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/misc/AutoBuffer.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/misc/AutoBuffer.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/misc/WinImplHelper.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/misc/WinImplHelper.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/misc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/misc/resourceprovider.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/source/win32/misc/resourceprovider.hxx0
-rwxr-xr-x[-rw-r--r--]fpicker/test/makefile.mk0
-rwxr-xr-x[-rw-r--r--]fpicker/test/svdem.cxx0
-rwxr-xr-x[-rw-r--r--]fpicker/util/exports.dxp1
-rwxr-xr-xfpicker/util/fop.component34
-rwxr-xr-xfpicker/util/fps.component34
-rwxr-xr-x[-rw-r--r--]fpicker/util/makefile.mk13
-rwxr-xr-xframework/AllLangResTarget_fwe.mk (renamed from framework/qa/complex/imageManager/interfaces/makefile.mk)50
-rwxr-xr-xframework/JunitTest_framework_complex.mk102
-rwxr-xr-x[-rw-r--r--]framework/JunitTest_framework_unoapi.mk (renamed from editeng/source/accessibility/makefile.mk)46
-rwxr-xr-xframework/Library_fwe.mk103
-rwxr-xr-xframework/Library_fwi.mk86
-rwxr-xr-xframework/Library_fwk.mk188
-rwxr-xr-xframework/Library_fwl.mk87
-rwxr-xr-xframework/Library_fwm.mk68
-rwxr-xr-xframework/Makefile38
-rwxr-xr-xframework/Module_framework.mk47
-rwxr-xr-xframework/Package_dtd.mk35
-rwxr-xr-xframework/Package_inc.mk52
-rwxr-xr-xframework/Package_uiconfig.mk31
-rwxr-xr-xframework/Package_unotypes.mk30
-rwxr-xr-x[-rw-r--r--]framework/dtd/accelerator.dtd0
-rwxr-xr-x[-rw-r--r--]framework/dtd/event.dtd0
-rwxr-xr-x[-rw-r--r--]framework/dtd/groupuinames.dtd0
-rwxr-xr-x[-rw-r--r--]framework/dtd/image.dtd0
-rwxr-xr-x[-rw-r--r--]framework/dtd/menubar.dtd0
-rwxr-xr-x[-rw-r--r--]framework/dtd/statusbar.dtd0
-rwxr-xr-x[-rw-r--r--]framework/dtd/toolbar.dtd0
-rwxr-xr-x[-rw-r--r--]framework/inc/acceleratorconst.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/arguments.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/actiontriggercontainer.hxx4
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/actiontriggerpropertyset.hxx23
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/actiontriggerseparatorpropertyset.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/checkediterator.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/converter.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/droptargetlistener.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/filtercache.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/filtercachedata.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/framecontainer.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/fwkresid.hxx5
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/fwktabwindow.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/fwlresid.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/imagewrapper.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/menumanager.hxx10
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/propertysethelper.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/protocolhandlercache.hxx9
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/resource.hrc0
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/rootactiontriggercontainer.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/servicemanager.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/taskcreator.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/classes/wildcard.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/commands.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/basedispatcher.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/blankdispatcher.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/closedispatcher.hxx8
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/createdispatcher.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/dispatchinformationprovider.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/dispatchprovider.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/helpagentdispatcher.hxx4
-rw-r--r--framework/inc/dispatch/interaction.hxx328
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/interceptionhelper.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/mailtodispatcher.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/menudispatcher.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/oxt_handler.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/popupmenudispatcher.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/selfdispatcher.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/servicehandler.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/startmoduledispatcher.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatch/systemexec.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/dispatchcommands.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/framework.hrc0
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/acceleratorinfo.hxx (renamed from framework/inc/helper/acceleratorinfo.hxx)1
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/actiontriggerhelper.hxx (renamed from framework/inc/helper/actiontriggerhelper.hxx)3
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/addonmenu.hxx (renamed from framework/inc/classes/addonmenu.hxx)17
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/addonsoptions.hxx (renamed from framework/inc/classes/addonsoptions.hxx)8
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/bmkmenu.hxx (renamed from framework/inc/classes/bmkmenu.hxx)12
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/configimporter.hxx (renamed from framework/inc/helper/configimporter.hxx)3
-rwxr-xr-xframework/inc/framework/documentundoguard.hxx70
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/eventsconfiguration.hxx (renamed from framework/inc/xml/eventsconfiguration.hxx)8
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/framelistanalyzer.hxx (renamed from framework/inc/classes/framelistanalyzer.hxx)11
-rwxr-xr-xframework/inc/framework/fwedllapi.h13
-rwxr-xr-xframework/inc/framework/iguard.hxx69
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/imageproducer.hxx (renamed from framework/inc/helper/imageproducer.hxx)7
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/imagesconfiguration.hxx (renamed from framework/inc/xml/imagesconfiguration.hxx)11
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/imutex.hxx (renamed from framework/inc/threadhelp/imutex.h)7
-rwxr-xr-xframework/inc/framework/interaction.hxx142
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/menuconfiguration.hxx (renamed from framework/inc/xml/menuconfiguration.hxx)21
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/menuextensionsupplier.hxx (renamed from framework/inc/classes/menuextensionsupplier.hxx)10
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/preventduplicateinteraction.hxx (renamed from framework/inc/interaction/preventduplicateinteraction.hxx)7
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/sfxhelperfunctions.hxx (renamed from framework/inc/classes/sfxhelperfunctions.hxx)25
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/statusbarconfiguration.hxx (renamed from framework/inc/xml/statusbarconfiguration.hxx)31
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/titlehelper.hxx (renamed from framework/inc/helper/titlehelper.hxx)5
-rwxr-xr-x[-rw-r--r--]framework/inc/framework/toolboxconfiguration.hxx (renamed from framework/inc/xml/toolboxconfiguration.hxx)31
-rwxr-xr-xframework/inc/framework/undomanagerhelper.hxx160
-rwxr-xr-xframework/inc/fwidllapi.h13
-rwxr-xr-xframework/inc/fwkdllapi.h8
-rwxr-xr-x[-rw-r--r--]framework/inc/general.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/dockingareadefaultacceptor.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/fixeddocumentproperties.hxx0
-rwxr-xr-xframework/inc/helper/ilayoutnotifications.hxx52
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/mischelper.hxx7
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/networkdomain.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/ocomponentaccess.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/ocomponentenumeration.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/oframes.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/otasksaccess.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/otasksenumeration.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/persistentwindowstate.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/propertysetcontainer.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/shareablemutex.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/statusindicator.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/statusindicatorfactory.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/tagwindowasmodified.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/timerhelper.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/titlebarupdate.hxx4
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/uiconfigelementwrapperbase.hxx63
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/uielementwrapperbase.hxx47
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/vclstatusindicator.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helper/wakeupthread.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/helpid.hrc22
-rwxr-xr-x[-rw-r--r--]framework/inc/interaction/quietinteraction.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/jobs/configaccess.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/jobs/helponstartup.hxx4
-rwxr-xr-x[-rw-r--r--]framework/inc/jobs/job.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/jobs/jobconst.hxx4
-rwxr-xr-x[-rw-r--r--]framework/inc/jobs/jobdata.hxx10
-rwxr-xr-x[-rw-r--r--]framework/inc/jobs/jobdispatch.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/jobs/jobexecutor.hxx4
-rwxr-xr-x[-rw-r--r--]framework/inc/jobs/jobresult.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/jobs/joburl.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/jobs/shelljob.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/loadstate.h8
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/debug.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/debug/assertion.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/debug/event.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/debug/filterdbg.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/debug/logmechanism.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/debug/memorymeasure.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/debug/mutex.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/debug/plugin.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/debug/registration.hxx21
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/debug/targeting.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/debug/timemeasure.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/generic.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/registration.hxx96
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/xinterface.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/xserviceinfo.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/macros/xtypeprovider.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/pch/precompiled_framework.cxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/pch/precompiled_framework.hxx4
-rwxr-xr-x[-rw-r--r--]framework/inc/properties.h2
-rwxr-xr-x[-rw-r--r--]framework/inc/protocols.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/queries.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/recording/dispatchrecorder.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/recording/dispatchrecordersupplier.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services.h4
-rwxr-xr-x[-rw-r--r--]framework/inc/services/autorecovery.hxx8
-rwxr-xr-x[-rw-r--r--]framework/inc/services/backingcomp.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/contenthandlerfactory.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/desktop.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/detectorfactory.hxx4
-rwxr-xr-x[-rw-r--r--]framework/inc/services/dispatchhelper.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/frame.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/frameloaderfactory.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/services/layoutmanager.hxx220
-rwxr-xr-x[-rw-r--r--]framework/inc/services/license.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/licensedlg.hxx10
-rwxr-xr-x[-rw-r--r--]framework/inc/services/logindialog.hrc0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/logindialog.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/services/mediatypedetectionhelper.hxx0
-rwxr-xr-xframework/inc/services/modelwinservice.hxx122
-rwxr-xr-x[-rw-r--r--]framework/inc/services/modulemanager.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/pathsettings.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/pluginframe.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/sessionlistener.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/substitutepathvars.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/tabwindowservice.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/task.hxx4
-rwxr-xr-x[-rw-r--r--]framework/inc/services/taskcreatorsrv.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/services/uriabbreviation.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/services/urltransformer.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/stdtypes.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/tabwin/tabwindow.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/tabwin/tabwinfactory.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/targets.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/fairrwlock.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/gate.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/igate.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/inoncopyable.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/irwlock.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/itransactionmanager.h0
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/lockhelper.hxx5
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/readguard.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/resetableguard.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/threadhelpbase.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/transactionbase.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/transactionguard.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/transactionmanager.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/threadhelp/writeguard.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uiconfiguration/globalsettings.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uiconfiguration/graphicnameaccess.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uiconfiguration/imagemanager.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uiconfiguration/imagetype.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uiconfiguration/moduleimagemanager.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uiconfiguration/moduleuicfgsupplier.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uiconfiguration/uicategorydescription.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uiconfiguration/uiconfigurationmanager.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uiconfiguration/windowstateconfiguration.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/addonstoolbarmanager.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/addonstoolbarwrapper.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/buttontoolbarcontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/comboboxtoolbarcontroller.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/commandinfo.hxx6
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/complextoolbarcontroller.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/constitemcontainer.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/controlmenucontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/dropdownboxtoolbarcontroller.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/edittoolbarcontroller.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/fontmenucontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/fontsizemenucontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/footermenucontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/generictoolbarcontroller.hxx4
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/headermenucontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/imagebuttontoolbarcontroller.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/itemcontainer.hxx4
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/langselectionmenucontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/langselectionstatusbarcontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/logoimagestatusbarcontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/logotextstatusbarcontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/macrosmenucontroller.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/menubarmanager.hxx16
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/menubarmerger.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/menubarwrapper.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/newmenucontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/objectmenucontroller.hxx0
-rwxr-xr-xframework/inc/uielement/panelwindow.hxx81
-rwxr-xr-xframework/inc/uielement/panelwrapper.hxx68
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/popupmenucontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/progressbarwrapper.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/recentfilesmenucontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/rootitemcontainer.hxx17
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/simpletextstatusbarcontroller.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/spinfieldtoolbarcontroller.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/statusbar.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/statusbarmanager.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/statusbarwrapper.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/statusindicatorinterfacewrapper.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/togglebuttontoolbarcontroller.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/toolbar.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/toolbarmanager.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/toolbarmerger.hxx1
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/toolbarsmenucontroller.hxx2
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/toolbarwrapper.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/uicommanddescription.hxx0
-rwxr-xr-xframework/inc/uielement/uielement.hxx146
-rwxr-xr-x[-rw-r--r--]framework/inc/uielement/uielementtypenames.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uifactory/addonstoolboxfactory.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uifactory/factoryconfiguration.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uifactory/menubarfactory.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uifactory/popupmenucontrollerfactory.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uifactory/statusbarcontrollerfactory.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uifactory/statusbarfactory.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uifactory/toolbarcontrollerfactory.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uifactory/toolboxfactory.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uifactory/uielementfactorymanager.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/uifactory/windowcontentfactorymanager.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/xml/acceleratorconfigurationreader.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/xml/acceleratorconfigurationwriter.hxx0
-rwxr-xr-x[-rw-r--r--]framework/inc/xml/eventsdocumenthandler.hxx7
-rwxr-xr-x[-rw-r--r--]framework/inc/xml/imagesdocumenthandler.hxx9
-rwxr-xr-x[-rw-r--r--]framework/inc/xml/menudocumenthandler.hxx13
-rwxr-xr-x[-rw-r--r--]framework/inc/xml/saxnamespacefilter.hxx3
-rwxr-xr-x[-rw-r--r--]framework/inc/xml/statusbardocumenthandler.hxx7
-rwxr-xr-x[-rw-r--r--]framework/inc/xml/toolboxconfigurationdefines.hxx26
-rwxr-xr-x[-rw-r--r--]framework/inc/xml/toolboxdocumenthandler.hxx7
-rwxr-xr-x[-rw-r--r--]framework/inc/xml/xmlnamespaces.hxx3
-rwxr-xr-x[-rw-r--r--]framework/prj/build.lst25
-rwxr-xr-x[-rw-r--r--]framework/prj/d.lst52
-rwxr-xr-x[-rw-r--r--]framework/prj/makefile.mk (renamed from framework/util/target.pmk)18
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/ModuleManager/CheckXModuleManager.java137
-rw-r--r--framework/qa/complex/ModuleManager/makefile.mk84
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/XUserInputInterception/EventTest.java167
-rw-r--r--framework/qa/complex/XUserInputInterception/makefile.mk89
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java583
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/accelerators/KeyMapping.java (renamed from framework/qa/complex/accelerators/helper/KeyMapping.java)2
-rw-r--r--framework/qa/complex/accelerators/helper/makefile.mk46
-rw-r--r--framework/qa/complex/accelerators/makefile.mk87
-rwxr-xr-xframework/qa/complex/api_internal/CheckAPI.java103
-rwxr-xr-xframework/qa/complex/api_internal/makefile.mk88
-rwxr-xr-xframework/qa/complex/broken_document/LoadDocument.java75
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/broken_document/TestDocument.java (renamed from configmgr/source/pad.hxx)44
-rwxr-xr-xframework/qa/complex/broken_document/makefile.mk80
-rwxr-xr-xframework/qa/complex/broken_document/test_documents/dbf.dbf.emf (renamed from framework/qa/complex/broken_document/dbf.dbf.emf)0
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java291
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java106
-rw-r--r--framework/qa/complex/contextMenuInterceptor/makefile.mk77
-rwxr-xr-xframework/qa/complex/contextMenuInterceptor/space-metal.jpgbin0 -> 4313 bytes-rwxr-xr-xframework/qa/complex/desktop/DesktopTerminate.java153
-rwxr-xr-xframework/qa/complex/desktop/makefile.mk79
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/dispatches/Interceptor.java (renamed from framework/qa/complex/dispatches/helper/Interceptor.java)83
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/dispatches/checkdispatchapi.java314
-rw-r--r--framework/qa/complex/dispatches/makefile.mk92
-rwxr-xr-xframework/qa/complex/disposing/GetServiceWhileDisposingOffice.java86
-rwxr-xr-xframework/qa/complex/disposing/makefile.mk76
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/framework/autosave/AutoSave.java123
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/framework/autosave/ConfigHelper.java37
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/framework/autosave/Protocol.java0
-rw-r--r--framework/qa/complex/framework/autosave/makefile.mk89
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/framework/recovery/CrashThread.java0
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/framework/recovery/KlickButtonThread.java0
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/framework/recovery/RecoveryTest.java10
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/framework/recovery/RecoveryTools.java0
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/framework/recovery/TimeoutThread.java0
-rwxr-xr-xframework/qa/complex/framework/recovery/makefile.mk96
-rwxr-xr-xframework/qa/complex/imageManager/CheckImageManager.java182
-rwxr-xr-xframework/qa/complex/imageManager/_XComponent.java (renamed from framework/qa/complex/imageManager/interfaces/_XComponent.java)32
-rwxr-xr-xframework/qa/complex/imageManager/_XImageManager.java (renamed from framework/qa/complex/imageManager/interfaces/_XImageManager.java)15
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/imageManager/_XInitialization.java (renamed from framework/qa/complex/imageManager/interfaces/_XInitialization.java)13
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/imageManager/_XTypeProvider.java (renamed from framework/qa/complex/imageManager/interfaces/_XTypeProvider.java)21
-rwxr-xr-xframework/qa/complex/imageManager/_XUIConfiguration.java (renamed from framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java)13
-rwxr-xr-xframework/qa/complex/imageManager/_XUIConfigurationPersistence.java (renamed from framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java)19
-rwxr-xr-xframework/qa/complex/imageManager/makefile.mk79
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java449
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/CheckXComponentLoader.props0
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/InteractionHandler.java (renamed from framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java)2
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/StatusIndicator.java (renamed from framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java)2
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/StreamSimulator.java (renamed from framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java)2
-rwxr-xr-xframework/qa/complex/loadAllDocuments/TestDocument.java41
-rw-r--r--framework/qa/complex/loadAllDocuments/helper/makefile.mk48
-rw-r--r--framework/qa/complex/loadAllDocuments/makefile.mk91
-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/testdocuments/Calc_6.sxcbin9547 -> 9547 bytes-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/testdocuments/Writer6.sxwbin5754 -> 5754 bytes-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/testdocuments/draw1.sxdbin11821 -> 11821 bytes-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/testdocuments/imp1.sxibin35135 -> 35135 bytes-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/testdocuments/password_check.sxw (renamed from framework/qa/complex/loadAllDocuments/password_check.sxw)bin5128 -> 5128 bytes-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/testdocuments/pic.gifbin1433 -> 1433 bytes-rwxr-xr-x[-rw-r--r--]framework/qa/complex/loadAllDocuments/testdocuments/pic.jpgbin2651 -> 2651 bytes-rwxr-xr-xframework/qa/complex/path_settings/PathSettingsTest.java1236
-rwxr-xr-xframework/qa/complex/path_substitution/PathSubstitutionTest.java229
-rwxr-xr-xframework/qa/complex/path_substitution/makefile.mk83
-rwxr-xr-xframework/qa/complex/sequence/CheckSequenceOfEnum.java95
-rwxr-xr-xframework/qa/complex/sequence/makefile.mk98
-rwxr-xr-x[-rw-r--r--]framework/qa/unoapi/Test.java5
-rwxr-xr-xframework/qa/unoapi/framework.sce4
-rwxr-xr-xframework/qa/unoapi/makefile.mk48
-rwxr-xr-x[-rw-r--r--]framework/qa/unoapi/testdocuments/Calc_Link.sxcbin5410 -> 5410 bytes-rwxr-xr-x[-rw-r--r--]framework/qa/unoapi/testdocuments/Writer_link.sxwbin5188 -> 5188 bytes-rwxr-xr-x[-rw-r--r--]framework/qa/unoapi/testdocuments/XTypeDetection.sxwbin4995 -> 4995 bytes-rwxr-xr-x[-rw-r--r--]framework/source/accelerators/acceleratorcache.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/accelerators/acceleratorconfiguration.cxx14
-rwxr-xr-x[-rw-r--r--]framework/source/accelerators/acceleratorexecute.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/accelerators/acceleratorexecute.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/accelerators/documentacceleratorconfiguration.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/accelerators/globalacceleratorconfiguration.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/accelerators/keymapping.cxx0
-rw-r--r--framework/source/accelerators/makefile.mk52
-rwxr-xr-x[-rw-r--r--]framework/source/accelerators/moduleacceleratorconfiguration.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/accelerators/presethandler.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/accelerators/storageholder.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/application/framework.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/application/login.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/classes/droptargetlistener.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/classes/framecontainer.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/classes/fwktabwindow.cxx21
-rwxr-xr-x[-rw-r--r--]framework/source/classes/fwlresid.cxx2
-rw-r--r--framework/source/classes/makefile.mk69
-rwxr-xr-x[-rw-r--r--]framework/source/classes/menumanager.cxx62
-rwxr-xr-x[-rw-r--r--]framework/source/classes/resource.src4
-rwxr-xr-x[-rw-r--r--]framework/source/classes/taskcreator.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/constant/containerquery.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/constant/contenthandler.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/constant/frameloader.cxx0
-rw-r--r--framework/source/constant/makefile.mk45
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/closedispatcher.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/dispatchinformationprovider.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/dispatchprovider.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/helpagentdispatcher.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/interceptionhelper.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/loaddispatcher.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/mailtodispatcher.cxx0
-rw-r--r--framework/source/dispatch/makefile.mk63
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/menudispatcher.cxx12
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/oxt_handler.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/popupmenudispatcher.cxx4
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/servicehandler.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/startmoduledispatcher.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/systemexec.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/dispatch/windowcommanddispatch.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/actiontriggercontainer.cxx (renamed from framework/source/classes/actiontriggercontainer.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/actiontriggerpropertyset.cxx (renamed from framework/source/classes/actiontriggerpropertyset.cxx)6
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx (renamed from framework/source/classes/actiontriggerseparatorpropertyset.cxx)4
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/addonmenu.cxx (renamed from framework/source/classes/addonmenu.cxx)70
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/addonsoptions.cxx (renamed from framework/source/classes/addonsoptions.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/bmkmenu.cxx (renamed from framework/source/classes/bmkmenu.cxx)36
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/framelistanalyzer.cxx (renamed from framework/source/classes/framelistanalyzer.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/fwkresid.cxx (renamed from framework/source/classes/fwkresid.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/imagewrapper.cxx (renamed from framework/source/classes/imagewrapper.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/menuextensionsupplier.cxx (renamed from framework/source/classes/menuextensionsupplier.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/rootactiontriggercontainer.cxx (renamed from framework/source/classes/rootactiontriggercontainer.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/classes/sfxhelperfunctions.cxx (renamed from framework/source/classes/sfxhelperfunctions.cxx)4
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/dispatch/interaction.cxx (renamed from framework/source/dispatch/interaction.cxx)224
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/helper/acceleratorinfo.cxx (renamed from framework/source/helper/acceleratorinfo.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/helper/actiontriggerhelper.cxx (renamed from framework/source/helper/actiontriggerhelper.cxx)20
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/helper/configimporter.cxx (renamed from framework/source/helper/configimporter.cxx)4
-rwxr-xr-xframework/source/fwe/helper/documentundoguard.cxx271
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/helper/imageproducer.cxx (renamed from framework/source/helper/imageproducer.cxx)4
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/helper/propertysetcontainer.cxx (renamed from framework/source/helper/propertysetcontainer.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/helper/titlehelper.cxx (renamed from framework/source/helper/titlehelper.cxx)2
-rwxr-xr-xframework/source/fwe/helper/undomanagerhelper.cxx1165
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/interaction/preventduplicateinteraction.cxx (renamed from framework/source/interaction/preventduplicateinteraction.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/eventsconfiguration.cxx (renamed from framework/source/xml/eventsconfiguration.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/eventsdocumenthandler.cxx (renamed from framework/source/xml/eventsdocumenthandler.cxx)1
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/imagesconfiguration.cxx (renamed from framework/source/xml/imagesconfiguration.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/imagesdocumenthandler.cxx (renamed from framework/source/xml/imagesdocumenthandler.cxx)6
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/menuconfiguration.cxx (renamed from framework/source/xml/menuconfiguration.cxx)10
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/menudocumenthandler.cxx (renamed from framework/source/xml/menudocumenthandler.cxx)10
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/saxnamespacefilter.cxx (renamed from framework/source/xml/saxnamespacefilter.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/statusbarconfiguration.cxx (renamed from framework/source/xml/statusbarconfiguration.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/statusbardocumenthandler.cxx (renamed from framework/source/xml/statusbardocumenthandler.cxx)4
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/toolboxconfiguration.cxx (renamed from framework/source/xml/toolboxconfiguration.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/toolboxdocumenthandler.cxx (renamed from framework/source/xml/toolboxdocumenthandler.cxx)2
-rwxr-xr-xframework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx58
-rwxr-xr-x[-rw-r--r--]framework/source/fwe/xml/xmlnamespaces.cxx (renamed from framework/source/xml/xmlnamespaces.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/classes/converter.cxx (renamed from framework/source/classes/converter.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/classes/propertysethelper.cxx (renamed from framework/source/classes/propertysethelper.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/classes/protocolhandlercache.cxx (renamed from framework/source/classes/protocolhandlercache.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/helper/mischelper.cxx (renamed from framework/source/helper/mischelper.cxx)15
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/helper/networkdomain.cxx (renamed from framework/source/helper/networkdomain.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/helper/shareablemutex.cxx (renamed from framework/source/helper/shareablemutex.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/jobs/configaccess.cxx (renamed from framework/source/jobs/configaccess.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/jobs/jobconst.cxx (renamed from framework/source/jobs/jobconst.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/threadhelp/lockhelper.cxx (renamed from framework/source/threadhelp/lockhelper.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/threadhelp/transactionmanager.cxx (renamed from framework/source/threadhelp/transactionmanager.cxx)3
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/uielement/constitemcontainer.cxx (renamed from framework/source/uielement/constitemcontainer.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/uielement/itemcontainer.cxx (renamed from framework/source/uielement/itemcontainer.cxx)0
-rwxr-xr-x[-rw-r--r--]framework/source/fwi/uielement/rootitemcontainer.cxx (renamed from framework/source/uielement/rootitemcontainer.cxx)2
-rwxr-xr-x[-rw-r--r--]framework/source/helper/dockingareadefaultacceptor.cxx18
-rw-r--r--framework/source/helper/makefile.mk69
-rwxr-xr-x[-rw-r--r--]framework/source/helper/ocomponentaccess.cxx44
-rwxr-xr-x[-rw-r--r--]framework/source/helper/ocomponentenumeration.cxx4
-rwxr-xr-x[-rw-r--r--]framework/source/helper/oframes.cxx56
-rwxr-xr-x[-rw-r--r--]framework/source/helper/persistentwindowstate.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/helper/statusindicator.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/helper/statusindicatorfactory.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/helper/tagwindowasmodified.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/helper/titlebarupdate.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/helper/uiconfigelementwrapperbase.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/helper/uielementwrapperbase.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/helper/vclstatusindicator.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/helper/wakeupthread.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/accelerators/acceleratorcache.hxx2
-rwxr-xr-x[-rw-r--r--]framework/source/inc/accelerators/acceleratorconfiguration.hxx2
-rwxr-xr-x[-rw-r--r--]framework/source/inc/accelerators/documentacceleratorconfiguration.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/accelerators/globalacceleratorconfiguration.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/accelerators/istoragelistener.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/accelerators/keymapping.hxx4
-rwxr-xr-x[-rw-r--r--]framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/accelerators/presethandler.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/accelerators/storageholder.hxx2
-rwxr-xr-x[-rw-r--r--]framework/source/inc/constant/containerquery.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/constant/contenthandler.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/constant/frameloader.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/dispatch/loaddispatcher.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/dispatch/uieventloghelper.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/dispatch/windowcommanddispatch.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/loadenv/actionlockguard.hxx8
-rwxr-xr-x[-rw-r--r--]framework/source/inc/loadenv/loadenv.hxx16
-rwxr-xr-x[-rw-r--r--]framework/source/inc/loadenv/loadenvexception.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/loadenv/targethelper.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/pattern/configuration.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/pattern/frame.hxx2
-rwxr-xr-x[-rw-r--r--]framework/source/inc/pattern/storages.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/inc/pattern/window.hxx2
-rw-r--r--framework/source/interaction/makefile.mk49
-rwxr-xr-x[-rw-r--r--]framework/source/interaction/quietinteraction.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/jobs/helponstartup.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/jobs/job.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/jobs/jobdata.cxx42
-rwxr-xr-x[-rw-r--r--]framework/source/jobs/jobdispatch.cxx37
-rwxr-xr-x[-rw-r--r--]framework/source/jobs/jobexecutor.cxx18
-rwxr-xr-x[-rw-r--r--]framework/source/jobs/jobresult.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/jobs/joburl.cxx4
-rw-r--r--framework/source/jobs/makefile.mk53
-rwxr-xr-x[-rw-r--r--]framework/source/jobs/shelljob.cxx0
-rwxr-xr-xframework/source/layoutmanager/helpers.cxx415
-rwxr-xr-xframework/source/layoutmanager/helpers.hxx95
-rwxr-xr-x[-rw-r--r--]framework/source/layoutmanager/layoutmanager.cxx6505
-rw-r--r--framework/source/layoutmanager/makefile.mk47
-rwxr-xr-xframework/source/layoutmanager/panel.cxx88
-rwxr-xr-xframework/source/layoutmanager/panel.hxx91
-rwxr-xr-xframework/source/layoutmanager/panelmanager.cxx183
-rwxr-xr-xframework/source/layoutmanager/panelmanager.hxx109
-rwxr-xr-xframework/source/layoutmanager/toolbarlayoutmanager.cxx4305
-rwxr-xr-xframework/source/layoutmanager/toolbarlayoutmanager.hxx344
-rwxr-xr-xframework/source/layoutmanager/uielement.cxx159
-rwxr-xr-x[-rw-r--r--]framework/source/loadenv/loadenv.cxx23
-rw-r--r--framework/source/loadenv/makefile.mk46
-rwxr-xr-x[-rw-r--r--]framework/source/loadenv/targethelper.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/recording/dispatchrecorder.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/recording/dispatchrecordersupplier.cxx0
-rw-r--r--framework/source/recording/makefile.mk47
-rw-r--r--framework/source/register/makefile.mk50
-rwxr-xr-x[-rw-r--r--]framework/source/register/register3rdcomponents.cxx10
-rwxr-xr-x[-rw-r--r--]framework/source/register/registerlogindialog.cxx7
-rwxr-xr-x[-rw-r--r--]framework/source/register/registerservices.cxx45
-rwxr-xr-x[-rw-r--r--]framework/source/register/registertemp.cxx31
-rwxr-xr-x[-rw-r--r--]framework/source/services/autorecovery.cxx20
-rwxr-xr-x[-rw-r--r--]framework/source/services/backingcomp.cxx10
-rwxr-xr-x[-rw-r--r--]framework/source/services/backingwindow.cxx44
-rwxr-xr-x[-rw-r--r--]framework/source/services/backingwindow.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/services/desktop.cxx4
-rwxr-xr-x[-rw-r--r--]framework/source/services/dispatchhelper.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/services/frame.cxx6
-rwxr-xr-x[-rw-r--r--]framework/source/services/fwk_services.src0
-rwxr-xr-x[-rw-r--r--]framework/source/services/license.cxx24
-rw-r--r--framework/source/services/makefile.mk64
-rwxr-xr-x[-rw-r--r--]framework/source/services/mediatypedetectionhelper.cxx0
-rw-r--r--framework/source/services/menudocumenthandler.cxx902
-rwxr-xr-xframework/source/services/modelwinservice.cxx279
-rwxr-xr-x[-rw-r--r--]framework/source/services/modulemanager.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/services/pathsettings.cxx38
-rwxr-xr-x[-rw-r--r--]framework/source/services/sessionlistener.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/services/substitutepathvars.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/services/tabwindowservice.cxx12
-rwxr-xr-x[-rw-r--r--]framework/source/services/taskcreatorsrv.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/services/uriabbreviation.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/services/urltransformer.cxx0
-rw-r--r--framework/source/tabwin/makefile.mk48
-rwxr-xr-x[-rw-r--r--]framework/source/tabwin/tabwindow.cxx8
-rwxr-xr-x[-rw-r--r--]framework/source/tabwin/tabwinfactory.cxx0
-rw-r--r--framework/source/threadhelp/makefile.mk45
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/globalsettings.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/graphicnameaccess.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/imagemanager.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/imagemanagerimpl.cxx12
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/imagemanagerimpl.hxx0
-rw-r--r--framework/source/uiconfiguration/makefile.mk54
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/moduleimagemanager.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/moduleuicfgsupplier.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx11
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/uicategorydescription.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/uiconfigurationmanager.cxx6
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx6
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uiconfiguration/windowstateconfiguration.cxx27
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/addonstoolbarmanager.cxx32
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/addonstoolbarwrapper.cxx6
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/buttontoolbarcontroller.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/comboboxtoolbarcontroller.cxx6
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/complextoolbarcontroller.cxx14
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/controlmenucontroller.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/dropdownboxtoolbarcontroller.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/edittoolbarcontroller.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/fontmenucontroller.cxx10
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/fontsizemenucontroller.cxx26
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/footermenucontroller.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/generictoolbarcontroller.cxx16
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/headermenucontroller.cxx8
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/imagebuttontoolbarcontroller.cxx4
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/langselectionmenucontroller.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/langselectionstatusbarcontroller.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/logoimagestatusbarcontroller.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/logotextstatusbarcontroller.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/macrosmenucontroller.cxx11
-rw-r--r--framework/source/uielement/makefile.mk87
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/menubarmanager.cxx81
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/menubarmerger.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/menubarwrapper.cxx4
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/newmenucontroller.cxx32
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/objectmenucontroller.cxx2
-rwxr-xr-xframework/source/uielement/panelwindow.cxx77
-rwxr-xr-xframework/source/uielement/panelwrapper.cxx226
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/popupmenucontroller.cxx6
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/progressbarwrapper.cxx16
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/recentfilesmenucontroller.cxx8
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/simpletextstatusbarcontroller.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/spinfieldtoolbarcontroller.cxx2
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/statusbar.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/statusbarmanager.cxx34
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/statusbarwrapper.cxx4
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/statusindicatorinterfacewrapper.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/togglebuttontoolbarcontroller.cxx8
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/toolbar.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/toolbarmanager.cxx66
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/toolbarmerger.cxx14
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/toolbarsmenucontroller.cxx33
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/toolbarwrapper.cxx8
-rwxr-xr-x[-rw-r--r--]framework/source/uielement/uicommanddescription.cxx27
-rwxr-xr-x[-rw-r--r--]framework/source/uifactory/addonstoolboxfactory.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uifactory/factoryconfiguration.cxx0
-rw-r--r--framework/source/uifactory/makefile.mk54
-rwxr-xr-x[-rw-r--r--]framework/source/uifactory/menubarfactory.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uifactory/popupmenucontrollerfactory.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uifactory/statusbarcontrollerfactory.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uifactory/statusbarfactory.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uifactory/toolbarcontrollerfactory.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uifactory/toolboxfactory.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uifactory/uielementfactorymanager.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/uifactory/windowcontentfactorymanager.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/unotypes/fwk.xml0
-rwxr-xr-x[-rw-r--r--]framework/source/unotypes/fwl.xml0
-rwxr-xr-x[-rw-r--r--]framework/source/unotypes/lgd.xml0
-rwxr-xr-x[-rw-r--r--]framework/source/xml/acceleratorconfigurationreader.cxx0
-rwxr-xr-x[-rw-r--r--]framework/source/xml/acceleratorconfigurationwriter.cxx0
-rw-r--r--framework/source/xml/makefile.mk58
-rw-r--r--framework/test/makefile.mk70
-rwxr-xr-x[-rw-r--r--]framework/test/test.cxx0
-rwxr-xr-x[-rw-r--r--]framework/test/test_componentenumeration.bas0
-rwxr-xr-x[-rw-r--r--]framework/test/test_documentproperties.bas0
-rwxr-xr-x[-rw-r--r--]framework/test/test_filterregistration.bas0
-rwxr-xr-x[-rw-r--r--]framework/test/test_statusindicatorfactory.bas0
-rwxr-xr-x[-rw-r--r--]framework/test/threadtest.cxx0
-rw-r--r--framework/test/threadtest/makefile.mk66
-rwxr-xr-x[-rw-r--r--]framework/test/threadtest/test.btm0
-rwxr-xr-x[-rw-r--r--]framework/test/threadtest/threadtest.cxx0
-rwxr-xr-x[-rw-r--r--]framework/test/typecfg/build.btm0
-rwxr-xr-x[-rw-r--r--]framework/test/typecfg/cfgview.cxx0
-rw-r--r--framework/test/typecfg/makefile.mk72
-rwxr-xr-x[-rw-r--r--]framework/test/typecfg/typecfg.cxx0
-rwxr-xr-x[-rw-r--r--]framework/test/typecfg/xml2xcd.cxx0
-rwxr-xr-x[-rw-r--r--]framework/uiconfig/startmodule/menubar/menubar.xml0
-rwxr-xr-x[-rw-r--r--]framework/uiconfig/startmodule/statusbar/statusbar.xml0
-rwxr-xr-x[-rw-r--r--]framework/uiconfig/startmodule/toolbar/standardbar.xml0
-rwxr-xr-xframework/util/fwk.component145
-rwxr-xr-xframework/util/fwl.component97
-rwxr-xr-xframework/util/fwm.component43
-rw-r--r--framework/util/guiapps/makefile.mk66
-rwxr-xr-x[-rw-r--r--]framework/util/hidother.src0
-rwxr-xr-x[-rw-r--r--]framework/util/lgd.xml0
-rwxr-xr-xframework/util/makefile.mk424
-rwxr-xr-x[-rw-r--r--]idl/inc/basobj.hxx50
-rwxr-xr-x[-rw-r--r--]idl/inc/bastype.hxx126
-rwxr-xr-x[-rw-r--r--]idl/inc/char.hxx0
-rwxr-xr-x[-rw-r--r--]idl/inc/command.hxx6
-rwxr-xr-x[-rw-r--r--]idl/inc/database.hxx38
-rwxr-xr-x[-rw-r--r--]idl/inc/globals.hxx0
-rwxr-xr-x[-rw-r--r--]idl/inc/hash.hxx60
-rwxr-xr-x[-rw-r--r--]idl/inc/lex.hxx84
-rwxr-xr-x[-rw-r--r--]idl/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]idl/inc/module.hxx32
-rwxr-xr-x[-rw-r--r--]idl/inc/object.hxx32
-rwxr-xr-x[-rw-r--r--]idl/inc/pch/precompiled_idl.cxx0
-rwxr-xr-x[-rw-r--r--]idl/inc/pch/precompiled_idl.hxx0
-rwxr-xr-x[-rw-r--r--]idl/inc/slot.hxx132
-rwxr-xr-x[-rw-r--r--]idl/inc/types.hxx132
-rwxr-xr-x[-rw-r--r--]idl/prj/build.lst0
-rwxr-xr-x[-rw-r--r--]idl/prj/d.lst0
-rwxr-xr-x[-rw-r--r--]idl/source/cmptools/char.cxx12
-rwxr-xr-x[-rw-r--r--]idl/source/cmptools/hash.cxx60
-rwxr-xr-x[-rw-r--r--]idl/source/cmptools/lex.cxx30
-rwxr-xr-x[-rw-r--r--]idl/source/cmptools/makefile.mk0
-rwxr-xr-x[-rw-r--r--]idl/source/objects/basobj.cxx114
-rwxr-xr-x[-rw-r--r--]idl/source/objects/bastype.cxx146
-rwxr-xr-x[-rw-r--r--]idl/source/objects/makefile.mk0
-rwxr-xr-x[-rw-r--r--]idl/source/objects/module.cxx86
-rwxr-xr-x[-rw-r--r--]idl/source/objects/object.cxx120
-rwxr-xr-x[-rw-r--r--]idl/source/objects/slot.cxx214
-rwxr-xr-x[-rw-r--r--]idl/source/objects/types.cxx272
-rwxr-xr-x[-rw-r--r--]idl/source/prj/command.cxx26
-rwxr-xr-x[-rw-r--r--]idl/source/prj/database.cxx196
-rwxr-xr-x[-rw-r--r--]idl/source/prj/globals.cxx2
-rwxr-xr-x[-rw-r--r--]idl/source/prj/makefile.mk0
-rwxr-xr-x[-rw-r--r--]idl/source/prj/svidl.cxx18
-rwxr-xr-x[-rw-r--r--]idl/source/svidl.datbin204 -> 204 bytes-rwxr-xr-x[-rw-r--r--]idl/util/idlpch.cxx0
-rwxr-xr-x[-rw-r--r--]idl/util/makefile.mk0
-rwxr-xr-x[-rw-r--r--]linguistic/inc/iprcache.hxx0
-rwxr-xr-x[-rw-r--r--]linguistic/inc/linguistic/hyphdta.hxx (renamed from linguistic/inc/hyphdta.hxx)28
-rwxr-xr-x[-rw-r--r--]linguistic/inc/linguistic/lngprophelp.hxx (renamed from linguistic/inc/lngprophelp.hxx)54
-rwxr-xr-x[-rw-r--r--]linguistic/inc/linguistic/lngprops.hxx (renamed from linguistic/inc/lngprops.hxx)0
-rwxr-xr-x[-rw-r--r--]linguistic/inc/linguistic/misc.hxx (renamed from linguistic/inc/misc.hxx)44
-rwxr-xr-x[-rw-r--r--]linguistic/inc/linguistic/spelldta.hxx (renamed from linguistic/inc/spelldta.hxx)20
-rwxr-xr-x[-rw-r--r--]linguistic/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]linguistic/inc/pch/precompiled_linguistic.cxx0
-rwxr-xr-x[-rw-r--r--]linguistic/inc/pch/precompiled_linguistic.hxx0
-rwxr-xr-x[-rw-r--r--]linguistic/inc/thesdta.hxx4
-rwxr-xr-x[-rw-r--r--]linguistic/prj/build.lst6
-rwxr-xr-x[-rw-r--r--]linguistic/prj/d.lst5
-rwxr-xr-x[-rw-r--r--]linguistic/qa/complex/linguistic/HangulHanjaConversion.java122
-rwxr-xr-xlinguistic/qa/complex/linguistic/TestDocument.java41
-rwxr-xr-x[-rw-r--r--]linguistic/qa/complex/linguistic/makefile.mk60
-rwxr-xr-x[-rw-r--r--]linguistic/qa/complex/linguistic/testdocuments/hangulhanja.sxcbin6366 -> 6366 bytes-rwxr-xr-x[-rw-r--r--]linguistic/qa/unoapi/Test.java0
-rwxr-xr-x[-rw-r--r--]linguistic/qa/unoapi/knownissues.xcl0
-rwxr-xr-x[-rw-r--r--]linguistic/qa/unoapi/lng.sce0
-rwxr-xr-x[-rw-r--r--]linguistic/qa/unoapi/makefile.mk0
-rwxr-xr-x[-rw-r--r--]linguistic/source/convdic.cxx62
-rwxr-xr-x[-rw-r--r--]linguistic/source/convdic.hxx22
-rwxr-xr-x[-rw-r--r--]linguistic/source/convdiclist.cxx97
-rwxr-xr-x[-rw-r--r--]linguistic/source/convdiclist.hxx4
-rwxr-xr-x[-rw-r--r--]linguistic/source/convdicxml.cxx6
-rwxr-xr-x[-rw-r--r--]linguistic/source/convdicxml.hxx8
-rwxr-xr-x[-rw-r--r--]linguistic/source/defs.hxx0
-rwxr-xr-x[-rw-r--r--]linguistic/source/dicimp.cxx297
-rwxr-xr-x[-rw-r--r--]linguistic/source/dicimp.hxx46
-rwxr-xr-x[-rw-r--r--]linguistic/source/dlistimp.cxx155
-rwxr-xr-x[-rw-r--r--]linguistic/source/dlistimp.hxx12
-rwxr-xr-x[-rw-r--r--]linguistic/source/gciterator.cxx35
-rwxr-xr-x[-rw-r--r--]linguistic/source/gciterator.hxx0
-rwxr-xr-x[-rw-r--r--]linguistic/source/grammarchecker.cxx31
-rwxr-xr-x[-rw-r--r--]linguistic/source/grammarchecker.hxx0
-rwxr-xr-x[-rw-r--r--]linguistic/source/hhconvdic.cxx12
-rwxr-xr-x[-rw-r--r--]linguistic/source/hhconvdic.hxx2
-rwxr-xr-x[-rw-r--r--]linguistic/source/hyphdsp.cxx94
-rwxr-xr-x[-rw-r--r--]linguistic/source/hyphdsp.hxx6
-rwxr-xr-x[-rw-r--r--]linguistic/source/hyphdta.cxx14
-rwxr-xr-x[-rw-r--r--]linguistic/source/iprcache.cxx18
-rwxr-xr-xlinguistic/source/lng.component46
-rwxr-xr-x[-rw-r--r--]linguistic/source/lngopt.cxx89
-rwxr-xr-x[-rw-r--r--]linguistic/source/lngopt.hxx20
-rwxr-xr-x[-rw-r--r--]linguistic/source/lngprophelp.cxx128
-rwxr-xr-x[-rw-r--r--]linguistic/source/lngreg.cxx58
-rwxr-xr-x[-rw-r--r--]linguistic/source/lngsvcmgr.cxx253
-rwxr-xr-x[-rw-r--r--]linguistic/source/lngsvcmgr.hxx12
-rwxr-xr-x[-rw-r--r--]linguistic/source/makefile.mk15
-rwxr-xr-x[-rw-r--r--]linguistic/source/misc.cxx150
-rwxr-xr-x[-rw-r--r--]linguistic/source/misc2.cxx15
-rwxr-xr-x[-rw-r--r--]linguistic/source/spelldsp.cxx102
-rwxr-xr-x[-rw-r--r--]linguistic/source/spelldsp.hxx8
-rwxr-xr-x[-rw-r--r--]linguistic/source/spelldta.cxx76
-rwxr-xr-x[-rw-r--r--]linguistic/source/thesdsp.cxx24
-rwxr-xr-x[-rw-r--r--]linguistic/source/thesdsp.hxx0
-rwxr-xr-x[-rw-r--r--]linguistic/source/thesdta.cxx4
-rwxr-xr-x[-rw-r--r--]linguistic/workben/exports.dxp0
-rwxr-xr-x[-rw-r--r--]linguistic/workben/makefile.mk0
-rwxr-xr-x[-rw-r--r--]linguistic/workben/sprophelp.cxx4
-rwxr-xr-x[-rw-r--r--]linguistic/workben/sprophelp.hxx0
-rwxr-xr-x[-rw-r--r--]linguistic/workben/sreg.cxx0
-rwxr-xr-x[-rw-r--r--]linguistic/workben/sspellimp.cxx4
-rwxr-xr-x[-rw-r--r--]linguistic/workben/sspellimp.hxx2
-rwxr-xr-x[-rw-r--r--]linguistic/xml/linguistic.xml0
-rwxr-xr-x[-rw-r--r--]officecfg/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]officecfg/prj/d.lst0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/component-schema.dtd0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/component-update.dtd0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data.dtd0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/FirstStartWizard.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Inet.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Interaction.xcu12
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Langpack.xcu.tmpl0
-rwxr-xr-xofficecfg/registry/data/org/openoffice/Office/Accelerators.xcu16
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Calc.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Common.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Compatibility.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/DataAccess.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Embedding.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Histories.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Impress.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Jobs.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Labels.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Linguistic.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Logging.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Paths.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Recovery.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/SFX.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Scripting.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Security.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/TableWizard.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu12
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/DbTableDataWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/GenericCategories.xcu0
-rwxr-xr-xofficecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu111
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu9
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/MathWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu10
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/UI/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Views.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/WebWizard.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Writer.xcu3
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Setup.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/System.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/UserProfile.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/VCL.xcu119
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/ucb/Configuration.xcu0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/ucb/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/oo-ad-ldap.xcd.sample0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/oo-common-ad.ldf0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/oo-common.conf0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/oo-common.ldif0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/oo-ldap-attr-map.properties0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/oo-ldap.xcd.sample0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/oo-org-map.properties0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Inet.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Interaction.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/LDAP.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Accelerators.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Addons.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Calc.xcs2
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/CalcAddIns.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Chart.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Commands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Common.xcs411
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Draw.xcs8
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Embedding.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Events.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs70
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Histories.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Impress.xcs47
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Java.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Jobs.xcs5
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Labels.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Logging.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Math.xcs14
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Paths.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/ProtocolHandler.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Recovery.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/SFX.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Scripting.xcs23
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Security.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Substitution.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/Category.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/Controller.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/Effects.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/Factories.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/MathCommands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Views.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/Writer.xcs9
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs9
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Office/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/Setup.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/System.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/TypeDetection/Misc.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/TypeDetection/UISort.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/UserProfile.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/VCL.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/ucb/Configuration.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/ucb/Hierarchy.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/ucb/Store.xcs0
-rwxr-xr-x[-rw-r--r--]officecfg/registry/schema/org/openoffice/ucb/makefile.mk0
-rwxr-xr-x[-rw-r--r--]officecfg/util/alllang.xsl0
-rwxr-xr-x[-rw-r--r--]officecfg/util/component-conf.gen0
-rwxr-xr-x[-rw-r--r--]officecfg/util/component-ldif.gen0
-rwxr-xr-x[-rw-r--r--]officecfg/util/component-map.gen0
-rwxr-xr-x[-rw-r--r--]officecfg/util/data_val.xsl0
-rwxr-xr-x[-rw-r--r--]officecfg/util/delcomment.sed0
-rwxr-xr-x[-rw-r--r--]officecfg/util/makefile.mk1
-rwxr-xr-x[-rw-r--r--]officecfg/util/makefile.pmk0
-rwxr-xr-x[-rw-r--r--]officecfg/util/resource.xsl0
-rwxr-xr-x[-rw-r--r--]officecfg/util/sanity.xsl0
-rwxr-xr-x[-rw-r--r--]officecfg/util/schema_trim.xsl0
-rwxr-xr-x[-rw-r--r--]officecfg/util/schema_val.xsl0
-rwxr-xr-x[-rw-r--r--]officecfg/util/template.gen0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/ApiSymbols.dtd0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/access.api0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/adodb.api0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/api-to-idl.pl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/dao.api0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/excel.api0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/makefile.mk0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/msforms.api0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/oovbaconsts.xsl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/powerpoint.api0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/stdole.api0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/vba.api0
-rwxr-xr-x[-rw-r--r--]oovbaapi/genconstidl/word.api0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/ControlProvider.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XApplicationBase.idl4
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XAssistant.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XCollection.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XCommandBar.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XCommandBarButton.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XCommandBarControl.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XCommandBarControls.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XCommandBarPopup.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XCommandBars.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XControlProvider.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XDialogBase.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XDialogsBase.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XDocumentBase.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XDocumentProperties.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XDocumentProperty.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XDocumentsBase.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XErrObject.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XFileDialog.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XFileDialogSelectedItems.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XFileSearch.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XFontBase.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XFoundFiles.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XGlobalsBase.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XHelperInterface.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XPageSetupBase.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XPropValue.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/XWindowBase.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/constants/makefile.mk0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/Globals.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/Hyperlink.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/Range.idl0
-rwxr-xr-xoovbaapi/ooo/vba/excel/SheetObject.idl2
-rwxr-xr-xoovbaapi/ooo/vba/excel/SheetObjects.idl6
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/TextFrame.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/Window.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/Workbook.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/Worksheet.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XApplication.idl10
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XAxes.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XAxis.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XAxisTitle.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XBorder.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XBorders.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XCharacters.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XChart.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XChartObject.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XChartObjects.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XChartTitle.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XCharts.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XComment.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XComments.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XDataLabel.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XDataLabels.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XDialog.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XDialogs.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XFont.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XFormat.idl2
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XFormatCondition.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XFormatConditions.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XGlobals.idl14
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XHPageBreak.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XHPageBreaks.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XHyperlink.idl0
-rwxr-xr-xoovbaapi/ooo/vba/excel/XHyperlinks.idl10
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XInterior.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XMenu.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XMenuBar.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XMenuBars.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XMenuItem.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XMenuItems.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XMenus.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XName.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XNames.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XOLEObject.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XOLEObjects.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XOutline.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XPageBreak.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XPageSetup.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XPane.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XPivotCache.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XPivotTable.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XPivotTables.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XQueryTable.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XRange.idl6
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XSeries.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XSeriesCollection.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XStyle.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XStyles.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XTextFrame.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XTitle.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XVPageBreak.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XVPageBreaks.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XValidation.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XWindow.idl2
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XWindows.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XWorkbook.idl10
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XWorkbooks.idl2
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XWorksheet.idl30
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XWorksheetFunction.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XWorksheets.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/XlBuildInDialog.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/excel/makefile.mk0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/makefile.mk0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XButton.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XCheckBox.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XColorFormat.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XComboBox.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XControl.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XControls.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XFillFormat.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XGroupBox.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XImage.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XLabel.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XLineFormat.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XListBox.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XMultiPage.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XPages.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XPictureFormat.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XProgressBar.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XRadioButton.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XReturnBoolean.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XReturnInteger.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XScrollBar.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XShape.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XShapeRange.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XShapes.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XSpinButton.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XTextBox.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XTextBoxShape.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XTextFrame.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XToggleButton.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/XUserForm.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/msforms/makefile.mk0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XAddin.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XAddins.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XApplication.idl8
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XAutoTextEntries.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XAutoTextEntry.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XBookmark.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XBookmarks.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XBorder.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XBorders.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XCell.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XCells.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XCheckBox.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XColumn.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XColumns.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XDialog.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XDialogs.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XDocument.idl20
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XDocuments.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XField.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XFields.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XFind.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XFont.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XFormField.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XFormFields.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XFrame.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XFrames.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XGlobals.idl8
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XHeaderFooter.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XHeadersFooters.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XListFormat.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XListGalleries.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XListGallery.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XListLevel.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XListLevels.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XListTemplate.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XListTemplates.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XOptions.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XPageSetup.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XPane.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XPanes.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XParagraph.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XParagraphFormat.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XParagraphs.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XRange.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XReplacement.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XRevision.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XRevisions.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XRow.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XRows.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XSection.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XSections.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XSelection.idl4
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XStyle.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XStyles.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XSystem.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XTabStop.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XTabStops.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XTable.idl2
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XTableOfContents.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XTables.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XTablesOfContents.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XTemplate.idl2
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XVariable.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XVariables.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XView.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XWindow.idl2
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/XWrapFormat.idl0
-rwxr-xr-x[-rw-r--r--]oovbaapi/ooo/vba/word/makefile.mk0
-rwxr-xr-x[-rw-r--r--]oovbaapi/prj/build.lst0
-rwxr-xr-x[-rw-r--r--]oovbaapi/prj/d.lst0
-rwxr-xr-x[-rw-r--r--]oovbaapi/util/makefile.mk0
-rwxr-xr-x[-rw-r--r--]oovbaapi/util/makefile.pmk0
-rwxr-xr-x[-rw-r--r--]readlicense_oo/docs/readme.xsl0
-rwxr-xr-x[-rw-r--r--]readlicense_oo/docs/readme/eval.xsl0
-rwxr-xr-x[-rw-r--r--]readlicense_oo/html/THIRDPARTYLICENSEREADME.html0
-rwxr-xr-x[-rw-r--r--]readlicense_oo/odt/CREDITS.odtbin43415 -> 43415 bytes-rwxr-xr-x[-rw-r--r--]readlicense_oo/odt/LICENSE.odtbin154001 -> 154001 bytes-rwxr-xr-x[-rw-r--r--]readlicense_oo/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]readlicense_oo/prj/d.lst0
-rwxr-xr-x[-rw-r--r--]readlicense_oo/txt/license.txt0
-rwxr-xr-x[-rw-r--r--]scripting/README0
-rwxr-xr-x[-rw-r--r--]scripting/examples/basic/InsertColouredText.xba0
-rwxr-xr-x[-rw-r--r--]scripting/examples/basic/InsertColouredTextDialog.xdl0
-rwxr-xr-x[-rw-r--r--]scripting/examples/basic/SearchAndReplace.xba0
-rwxr-xr-x[-rw-r--r--]scripting/examples/basic/SearchAndReplaceDialog.xdl0
-rwxr-xr-x[-rw-r--r--]scripting/examples/basic/dialog.xlb0
-rwxr-xr-x[-rw-r--r--]scripting/examples/basic/script.xlb0
-rwxr-xr-x[-rw-r--r--]scripting/examples/beanshell/Capitalise/capitalise.bsh0
-rwxr-xr-x[-rw-r--r--]scripting/examples/beanshell/HelloWorld/helloworld.bsh0
-rwxr-xr-x[-rw-r--r--]scripting/examples/beanshell/Highlight/ButtonPressHandler.bsh0
-rwxr-xr-x[-rw-r--r--]scripting/examples/beanshell/Highlight/ShowDialog.bsh0
-rwxr-xr-x[-rw-r--r--]scripting/examples/beanshell/Highlight/highlighter.bsh0
-rwxr-xr-x[-rw-r--r--]scripting/examples/beanshell/InteractiveBeanShell/parcel-descriptor.xml0
-rwxr-xr-x[-rw-r--r--]scripting/examples/beanshell/MemoryUsage/memusage.bsh0
-rwxr-xr-x[-rw-r--r--]scripting/examples/beanshell/MemoryUsage/parcel-descriptor.xml0
-rwxr-xr-x[-rw-r--r--]scripting/examples/beanshell/WordCount/wordcount.bsh0
-rwxr-xr-x[-rw-r--r--]scripting/examples/delzip0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/HelloWorld/HelloWorld.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/HelloWorld/parcel-descriptor.xml0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/Highlight/HighlightText.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/MemoryUsage/MemoryUsage.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/MemoryUsage/parcel-descriptor.xml0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/Newsgroup/MimeConfiguration.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/Newsgroup/NewsGroup.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/Newsgroup/OfficeAttachment.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/Newsgroup/PostNewsgroup.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/Newsgroup/Sender.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/Newsgroup/StatusWindow.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/Newsgroup/SubscribedNewsgroups.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/debugger/DebugRunner.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/debugger/OOBeanShellDebugger.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/debugger/OORhinoDebugger.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/debugger/OOScriptDebugger.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/debugger/parcel-descriptor.xml0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/selector/ScriptSelector.java0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/selector/container.gifbin164 -> 164 bytes-rwxr-xr-x[-rw-r--r--]scripting/examples/java/selector/parcel-descriptor.xml0
-rwxr-xr-x[-rw-r--r--]scripting/examples/java/selector/script.gifbin187 -> 187 bytes-rwxr-xr-x[-rw-r--r--]scripting/examples/java/selector/soffice.gifbin136 -> 136 bytes-rwxr-xr-x[-rw-r--r--]scripting/examples/javascript/ExportSheetsToHTML/exportsheetstohtml.js0
-rwxr-xr-x[-rw-r--r--]scripting/examples/javascript/HelloWorld/helloworld.js0
-rwxr-xr-x[-rw-r--r--]scripting/examples/javascript/Highlight/ButtonPressHandler.js0
-rwxr-xr-x[-rw-r--r--]scripting/examples/javascript/Highlight/ShowDialog.js0
-rwxr-xr-x[-rw-r--r--]scripting/examples/javascript/Highlight/parcel-descriptor.xml0
-rwxr-xr-x[-rw-r--r--]scripting/examples/python/Capitalise.py0
-rwxr-xr-x[-rw-r--r--]scripting/examples/python/HelloWorld.py0
-rwxr-xr-x[-rw-r--r--]scripting/examples/python/pythonSamples/TableSample.py0
-rwxr-xr-x[-rw-r--r--]scripting/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]scripting/inc/pch/precompiled_scripting.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/inc/pch/precompiled_scripting.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java5
-rwxr-xr-xscripting/java/ScriptFramework.component34
-rwxr-xr-xscripting/java/ScriptProviderForBeanShell.component37
-rwxr-xr-xscripting/java/ScriptProviderForJava.component37
-rwxr-xr-xscripting/java/ScriptProviderForJavaScript.component37
-rwxr-xr-x[-rw-r--r--]scripting/java/build.env0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/browse/DialogFactory.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/container/Parcel.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/container/ParcelContainer.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/container/ScriptEntry.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/container/XMLParser.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/io/XStorageHelper.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/log/LogUtils.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/provider/PathUtils.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/provider/ScriptContext.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java0
-rwxr-xr-xscripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java35
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh0
-rwxr-xr-xscripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java35
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java0
-rwxr-xr-xscripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java34
-rwxr-xr-x[-rw-r--r--]scripting/java/com/sun/star/script/framework/provider/javascript/template.js0
-rwxr-xr-xscripting/java/makefile.mk34
-rwxr-xr-x[-rw-r--r--]scripting/java/manifest.mf0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/CommandLineTools.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/ExtensionFinder.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/JavaFinder.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/LocalOffice.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/MethodFinder.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/OfficeDocument.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/OfficeInstallation.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/SVersionRCFile.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/filter/AllFilesFilter.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/filter/BinaryOnlyFilter.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/filter/FileFilter.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/ui/MethodPanel.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/ui/add.gifbin103 -> 103 bytes-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/xml/Manifest.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/idesupport/zip/ParcelZipper.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/editor/JavaKit.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/editor/NetBeansSourceView.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/editor/OOo.jcb0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/editor/OOo.jcs0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/Bundle.properties0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/Bundle_en_US.properties0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/BuildParcelAction.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/CompileParcelAction.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/ConfigureParcelAction.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/MountDocumentAction.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/MountParcelAction.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentSupport.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorEditorSupport.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserSupport.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle.properties0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/filesystem/Bundle_en_US.properties0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystemBeanInfo.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/Bundle.properties0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoaderBeanInfo.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataNode.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataObject.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolder.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoaderBeanInfo.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoader.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataLoaderBeanInfo.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataObject.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoader.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataLoaderBeanInfo.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataNode.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolder.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoaderBeanInfo.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/nodes/ParcelDescriptorChildren.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/nodes/ScriptNode.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/options/Bundle.properties0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettings.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsBeanInfo.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsIcon.gifbin145 -> 145 bytes-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/options/OfficeSettingsIcon32.gifbin253 -> 253 bytes-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/AppStorage.html0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/AppStorage.settings0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/Bundle.properties0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/EmptyParcel.html0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeIcon.gifbin588 -> 588 bytes-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeIcon32.gifbin759 -> 759 bytes-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/OfficeSettings.settings0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystem.html0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystem.settings0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystemIcon.pngbin702 -> 702 bytes-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/OpenOfficeDocFileSystemIcon32.pngbin1533 -> 1533 bytes-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/ParcelIcon.gifbin576 -> 576 bytes-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcel.html0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/ScriptParcelDescriptor.html0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/layer.xml0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/mime-resolver.xml0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/office-scripting.url0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.bsh_0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/templates/Empty.java_0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/templates/EmptyParcelDescriptor.xml_0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/templates/HelloWorld.java_0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/resources/templates/ParcelDescriptor.xml_0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/utils/ManifestParser.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/utils/NagDialog.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/utils/OfficeModule.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/utils/ZipMounter.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/Bundle.properties0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/Bundle_en_US.properties0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathDescriptor.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathIterator.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesPanel.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.form0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelPropertiesVisualPanel.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathPanel.java0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.form0
-rwxr-xr-x[-rw-r--r--]scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java0
-rwxr-xr-xscripting/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]scripting/prj/d.lst12
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/baslibnode.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/baslibnode.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/basmethnode.cxx2
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/basmethnode.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/basmodnode.cxx4
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/basmodnode.hxx0
-rwxr-xr-xscripting/source/basprov/basprov.component37
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/basprov.cxx9
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/basprov.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/basprov.xml0
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/basscript.cxx29
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/basscript.hxx6
-rwxr-xr-x[-rw-r--r--]scripting/source/basprov/makefile.mk9
-rwxr-xr-xscripting/source/dlgprov/DialogModelProvider.cxx196
-rwxr-xr-xscripting/source/dlgprov/DialogModelProvider.hxx92
-rwxr-xr-x[-rw-r--r--]scripting/source/dlgprov/dlgevtatt.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/dlgprov/dlgevtatt.hxx0
-rwxr-xr-xscripting/source/dlgprov/dlgprov.component36
-rwxr-xr-x[-rw-r--r--]scripting/source/dlgprov/dlgprov.cxx165
-rwxr-xr-x[-rw-r--r--]scripting/source/dlgprov/dlgprov.hxx7
-rwxr-xr-x[-rw-r--r--]scripting/source/dlgprov/dlgprov.xml0
-rwxr-xr-x[-rw-r--r--]scripting/source/dlgprov/makefile.mk10
-rwxr-xr-x[-rw-r--r--]scripting/source/inc/bcholder.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/inc/util/MiscUtils.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/inc/util/scriptingconstants.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/inc/util/util.hxx15
-rwxr-xr-x[-rw-r--r--]scripting/source/protocolhandler/exports.dxp1
-rwxr-xr-x[-rw-r--r--]scripting/source/protocolhandler/makefile.mk9
-rwxr-xr-xscripting/source/protocolhandler/protocolhandler.component34
-rwxr-xr-x[-rw-r--r--]scripting/source/protocolhandler/scripthandler.cxx66
-rwxr-xr-x[-rw-r--r--]scripting/source/protocolhandler/scripthandler.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/ActiveMSPList.cxx1
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/ActiveMSPList.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/BrowseNodeFactoryImpl.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/BrowseNodeFactoryImpl.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/MasterScriptProvider.cxx44
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/MasterScriptProvider.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/MasterScriptProviderFactory.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/MasterScriptProviderFactory.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/ProviderCache.cxx17
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/ProviderCache.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/ScriptImpl.cxx8
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/ScriptImpl.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/ScriptingContext.cxx5
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/ScriptingContext.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/URIHelper.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/URIHelper.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/exports.dxp1
-rwxr-xr-x[-rw-r--r--]scripting/source/provider/makefile.mk0
-rwxr-xr-x[-rw-r--r--]scripting/source/pyprov/delzip0
-rwxr-xr-x[-rw-r--r--]scripting/source/pyprov/description.xml0
-rwxr-xr-xscripting/source/pyprov/mailmerge.component37
-rwxr-xr-x[-rw-r--r--]scripting/source/pyprov/mailmerge.py0
-rwxr-xr-x[-rw-r--r--]scripting/source/pyprov/makefile.mk14
-rwxr-xr-x[-rw-r--r--]scripting/source/pyprov/manifest.xml0
-rwxr-xr-x[-rw-r--r--]scripting/source/pyprov/officehelper.py0
-rwxr-xr-xscripting/source/pyprov/pythonscript.component35
-rwxr-xr-x[-rw-r--r--]scripting/source/pyprov/pythonscript.py0
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/ScriptExecDialog.hrc0
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/ScriptExecDialog.src0
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/ScriptNameResolverImpl.cxx72
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/ScriptNameResolverImpl.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/ScriptRuntimeManager.cxx124
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/ScriptRuntimeManager.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/StorageBridge.cxx32
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/StorageBridge.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/StorageBridgeFactory.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/StorageBridgeFactory.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/exports.dxp1
-rwxr-xr-x[-rw-r--r--]scripting/source/runtimemgr/makefile.mk0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptData.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptElement.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptElement.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptInfo.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptInfo.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptInfoImpl.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptMetadataImporter.cxx29
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptMetadataImporter.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptSecurityManager.cxx133
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptSecurityManager.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptStorage.cxx64
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptStorage.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptStorageManager.cxx50
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptStorageManager.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptURI.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/ScriptURI.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/XMLElement.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/XMLElement.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/exports.dxp1
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/makefile.mk0
-rwxr-xr-x[-rw-r--r--]scripting/source/storage/storage.xml0
-rwxr-xr-x[-rw-r--r--]scripting/source/stringresource/makefile.mk8
-rwxr-xr-xscripting/source/stringresource/stringresource.component40
-rwxr-xr-x[-rw-r--r--]scripting/source/stringresource/stringresource.cxx7
-rwxr-xr-x[-rw-r--r--]scripting/source/stringresource/stringresource.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/stringresource/stringresource.xml0
-rwxr-xr-x[-rw-r--r--]scripting/source/vbaevents/eventhelper.cxx0
-rwxr-xr-x[-rw-r--r--]scripting/source/vbaevents/makefile.mk13
-rwxr-xr-x[-rw-r--r--]scripting/source/vbaevents/service.cxx10
-rwxr-xr-xscripting/source/vbaevents/vbaevents.component37
-rwxr-xr-x[-rw-r--r--]scripting/source/vbaevents/vbamsformreturntypes.hxx0
-rwxr-xr-x[-rw-r--r--]scripting/util/exports.dxp1
-rwxr-xr-x[-rw-r--r--]scripting/util/makefile.mk8
-rwxr-xr-x[-rw-r--r--]scripting/util/provider/beanshell/delzip0
-rwxr-xr-x[-rw-r--r--]scripting/util/provider/beanshell/description.xml0
-rwxr-xr-x[-rw-r--r--]scripting/util/provider/beanshell/makefile.mk0
-rwxr-xr-x[-rw-r--r--]scripting/util/provider/beanshell/manifest.xml0
-rwxr-xr-x[-rw-r--r--]scripting/util/provider/javascript/delzip0
-rwxr-xr-x[-rw-r--r--]scripting/util/provider/javascript/description.xml0
-rwxr-xr-x[-rw-r--r--]scripting/util/provider/javascript/makefile.mk0
-rwxr-xr-x[-rw-r--r--]scripting/util/provider/javascript/manifest.xml0
-rwxr-xr-xscripting/util/scriptframe.component49
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/EditDebug.xdl0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/EventsBinding.xdl0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/HelpBinding.xdl0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/Highlight.xdl0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/KeyBinding.xdl0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/MacroEditor.xdl0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/MenuBinding.xdl0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/ScriptBinding.xba0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/calckeybinding.xml0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/calcmenubar.xml0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/dialog.xlb0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/drawkeybinding.xml0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/drawmenubar.xml0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/eventbindings.xml0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/impresskeybinding.xml0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/impressmenubar.xml0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/manifest.xml0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/script.xlb0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/writerkeybinding.xml0
-rwxr-xr-x[-rw-r--r--]scripting/workben/bindings/writermenubar.xml0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/ExampleSpreadSheetLatest.sxcbin14635 -> 14635 bytes-rwxr-xr-x[-rw-r--r--]scripting/workben/data/doc_with_beanshell_scripts.sxwbin7044 -> 7044 bytes-rwxr-xr-x[-rw-r--r--]scripting/workben/data/doc_with_one_script.sxwbin6286 -> 6286 bytes-rwxr-xr-x[-rw-r--r--]scripting/workben/data/doc_with_two_scripts.sxwbin6308 -> 6308 bytes-rwxr-xr-x[-rw-r--r--]scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.protocolhandler.Dispatch.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.provider.Function.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.provider.FunctionProvider.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptInfo.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptStorage.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/objdsc/drafts.com.sun.star.script.framework.storage.ScriptStorageManager.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/script_in_class_file.sxwbin6976 -> 6976 bytes-rwxr-xr-x[-rw-r--r--]scripting/workben/data/script_in_jar_file.sxwbin8081 -> 8081 bytes-rwxr-xr-x[-rw-r--r--]scripting/workben/data/share_scripts.zipbin2248 -> 2248 bytes-rwxr-xr-x[-rw-r--r--]scripting/workben/data/testdata/Function.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/testdata/FunctionProvider.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/testdata/ScriptInfo.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/testdata/ScriptRuntimeManager.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/testdata/ScriptStorage.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/testdata/ScriptStorageManager.csv0
-rwxr-xr-x[-rw-r--r--]scripting/workben/data/user_scripts.zipbin6890 -> 6890 bytes-rwxr-xr-x[-rw-r--r--]scripting/workben/data/xscriptcontext_test_document.sxwbin6580 -> 6580 bytes-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/ScriptingUtils.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/SecurityDialogUtil.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/_XFunction.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/_XFunctionProvider.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/_XScriptInfo.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/_XScriptInfoAccess.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/_XScriptInvocation.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/_XScriptNameResolver.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/_XScriptSecurity.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/_XScriptStorageManager.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/_XScriptStorageRefresh.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/ifc/scripting/makefile.mk0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/Banner.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/ExceptionTraceHelper.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/ExecCmd.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/FileUpdater.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/Final.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/IdeFinal.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/IdeUpdater.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/IdeVersion.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/IdeWelcome.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/InstUtil.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/InstallListener.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/InstallWizard.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/InstallationEvent.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/LogStream.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/NavPanel.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/Navigation.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/ProtocolHandler.xcu0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/Register.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/Scripting.BeanShell.xcu0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/Scripting.xcs0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/Version.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/Welcome.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/XmlUpdater.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/ZipData.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/installer/sidebar.jpgbin8393 -> 8393 bytes-rwxr-xr-x[-rw-r--r--]scripting/workben/mod/_scripting/Dispatch.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/mod/_scripting/Function.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/mod/_scripting/FunctionProvider.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/mod/_scripting/ScriptInfo.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/mod/_scripting/ScriptRuntimeManager.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/mod/_scripting/ScriptStorage.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/mod/_scripting/ScriptStorageManager.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/mod/_scripting/TestDataLoader.java0
-rwxr-xr-x[-rw-r--r--]scripting/workben/mod/_scripting/makefile.mk0
-rwxr-xr-xsfx2/AllLangResTarget_sfx2.mk82
-rwxr-xr-x[-rw-r--r--]sfx2/CppunitTest_sfx2_metadatable.mk (renamed from editeng/source/xml/makefile.mk)33
-rwxr-xr-xsfx2/JunitTest_sfx2_complex.mk78
-rwxr-xr-xsfx2/JunitTest_sfx2_unoapi.mk53
-rwxr-xr-xsfx2/Library_qstart.mk85
-rwxr-xr-xsfx2/Library_sfx.mk301
-rwxr-xr-xsfx2/Makefile38
-rwxr-xr-xsfx2/Module_sfx2.mk60
-rwxr-xr-xsfx2/Package_inc.mk137
-rwxr-xr-xsfx2/Package_sdi.mk30
-rwxr-xr-x[-rw-r--r--]sfx2/README0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/about.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/arrdecl.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/bitset.hxx92
-rwxr-xr-x[-rw-r--r--]sfx2/inc/brokenpackageint.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/configmgr.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/docvor.hxx46
-rwxr-xr-x[-rw-r--r--]sfx2/inc/filedlghelper.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/frmload.hxx6
-rwxr-xr-x[-rw-r--r--]sfx2/inc/fwkhelper.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/guisaveas.hxx6
-rwxr-xr-x[-rw-r--r--]sfx2/inc/idpool.hxx24
-rwxr-xr-x[-rw-r--r--]sfx2/inc/inettbc.hxx6
-rwxr-xr-x[-rw-r--r--]sfx2/inc/macro.hxx20
-rw-r--r--sfx2/inc/makefile.mk48
-rwxr-xr-x[-rw-r--r--]sfx2/inc/msgnodei.hxx56
-rwxr-xr-x[-rw-r--r--]sfx2/inc/orgmgr.hxx36
-rwxr-xr-x[-rw-r--r--]sfx2/inc/pch/precompiled_sfx2.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/pch/precompiled_sfx2.hxx3
-rwxr-xr-x[-rw-r--r--]sfx2/inc/progind.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/resmgr.hxx18
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/DocumentMetadataAccess.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/Metadatable.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/QuerySaveDocument.hxx (renamed from sfx2/inc/QuerySaveDocument.hxx)0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/XmlIdRegistry.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/app.hxx59
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/appuno.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/basedlgs.hxx19
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/basmgr.hxx (renamed from sfx2/inc/basmgr.hxx)1
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/bindings.hxx10
-rwxr-xr-xsfx2/inc/sfx2/brokenpackageint.hxx55
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/chalign.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/childwin.hxx8
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/cntids.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/controlwrapper.hxx62
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/ctrlitem.hxx24
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/dialogs.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/dinfdlg.hxx28
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/dinfedt.hxx (renamed from sfx2/inc/dinfedt.hxx)0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/dispatch.hxx153
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/dllapi.h0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/docfac.hxx6
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/docfile.hxx12
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/docfilt.hxx57
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/docinf.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/docinsert.hxx (renamed from sfx2/inc/docinsert.hxx)0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/dockwin.hxx26
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/docmacromode.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/docstoragemodifylistener.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/doctdlg.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/doctempl.hxx74
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/event.hxx31
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/evntconf.hxx20
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/fcontnr.hxx16
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/filedlghelper.hxx3
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/frame.hxx22
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/frmdescr.hxx90
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/frmhtml.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/frmhtmlw.hxx6
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/genlink.hxx4
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/hintpost.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/htmlmode.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/imagemgr.hxx (renamed from sfx2/inc/imagemgr.hxx)2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/imgdef.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/imgmgr.hxx (renamed from sfx2/inc/imgmgr.hxx)14
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/ipclient.hxx5
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/itemconnect.hxx30
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/itemwrapper.hxx30
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/layout-post.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/layout-pre.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/layout-tabdlg.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/layout.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/linkmgr.hxx32
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/linksrc.hxx22
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/lnkbase.hxx44
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/macrconf.hxx0
-rwxr-xr-xsfx2/inc/sfx2/macropg.hxx150
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/mailmodelapi.hxx (renamed from sfx2/inc/mailmodelapi.hxx)2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/mgetempl.hxx13
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/mieclip.hxx (renamed from sfx2/inc/mieclip.hxx)4
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/minarray.hxx226
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/minfitem.hxx (renamed from sfx2/inc/minfitem.hxx)2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/minstack.hxx18
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/mnuitem.hxx50
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/mnumgr.hxx28
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/module.hxx10
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/msg.hxx59
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/msgpool.hxx18
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/navigat.hxx4
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/new.hxx12
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/newstyle.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/objface.hxx54
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/objitem.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/objsh.hxx83
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/objuno.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/opengrf.hxx5
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/passwd.hxx37
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/printer.hxx66
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/printopt.hxx4
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/prnmon.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/progress.hxx20
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/querystatus.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/request.hxx44
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/securitypage.hxx2
-rwxr-xr-xsfx2/inc/sfx2/sfx.hrc48
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxbasecontroller.hxx9
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxbasemodel.hxx135
-rwxr-xr-xsfx2/inc/sfx2/sfxcommands.h342
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxdefs.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxdlg.hxx22
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxhelp.hxx (renamed from sfx2/inc/sfxhelp.hxx)14
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxhtml.hxx38
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxmodelfactory.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxresid.hxx (renamed from sfx2/inc/sfxresid.hxx)8
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxsids.hrc77
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxstatuslistener.hxx12
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/sfxuno.hxx50
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/shell.hxx59
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/signaturestate.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/stbitem.hxx (renamed from sfx2/inc/stbitem.hxx)36
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/styfitem.hxx4
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/styledlg.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/tabdlg.hxx108
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/taskpane.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/tbxctrl.hxx84
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/templdlg.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/titledockwin.hxx16
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/tplpitem.hxx (renamed from sfx2/inc/tplpitem.hxx)10
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/unoctitm.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/userinputinterception.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/viewfac.hxx (renamed from sfx2/inc/viewfac.hxx)7
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/viewfrm.hxx100
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfx2/viewsh.hxx72
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sfxbasic.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/inc/sorgitm.hxx4
-rwxr-xr-x[-rw-r--r--]sfx2/inc/srchdlg.hxx10
-rwxr-xr-x[-rw-r--r--]sfx2/prj/build.lst28
-rwxr-xr-x[-rw-r--r--]sfx2/prj/d.lst46
-rwxr-xr-x[-rw-r--r--]sfx2/prj/makefile.mk (renamed from sfx2/util/makefile.pmk)16
-rw-r--r--sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java243
-rw-r--r--sfx2/qa/complex/DocHelper/makefile.mk46
-rw-r--r--sfx2/qa/complex/docinfo/DocumentProperties.java269
-rw-r--r--sfx2/qa/complex/docinfo/makefile.mk56
-rw-r--r--sfx2/qa/complex/makefile.mk61
-rwxr-xr-xsfx2/qa/complex/sfx2/DocumentInfo.java362
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/DocumentMetadataAccess.java (renamed from sfx2/qa/complex/DocumentMetadataAccessTest.java)736
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/DocumentProperties.java (renamed from sfx2/qa/complex/DocumentMetaData.java)311
-rwxr-xr-xsfx2/qa/complex/sfx2/GlobalEventBroadcaster.java273
-rwxr-xr-xsfx2/qa/complex/sfx2/StandaloneDocumentInfo.java99
-rwxr-xr-xsfx2/qa/complex/sfx2/UndoManager.java1464
-rwxr-xr-xsfx2/qa/complex/sfx2/makefile.mk (renamed from framework/qa/complex/path_settings/makefile.mk)74
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java (renamed from sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java)2
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java (renamed from sfx2/qa/complex/standalonedocumentinfo/Test01.java)41
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java (renamed from sfx2/qa/complex/standalonedocumentinfo/TestHelper.java)16
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt (renamed from sfx2/qa/complex/testdocuments/CUSTOM.odt)bin1021 -> 1021 bytes-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/testdocuments/TEST.odt (renamed from sfx2/qa/complex/testdocuments/TEST.odt)bin13803 -> 13803 bytes-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt (renamed from sfx2/qa/complex/testdocuments/TESTRDFA.odt)bin7540 -> 7540 bytes-rwxr-xr-xsfx2/qa/complex/sfx2/testdocuments/empty.rdf13
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/tools/DialogThread.java (renamed from sfx2/qa/complex/DocHelper/DialogThread.java)19
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/tools/TestDocument.java (renamed from configmgr/source/span.hxx)43
-rwxr-xr-x[-rw-r--r--]sfx2/qa/complex/sfx2/tools/WriterHelper.java (renamed from sfx2/qa/complex/DocHelper/WriterHelper.java)101
-rwxr-xr-xsfx2/qa/complex/sfx2/undo/CalcDocumentTest.java96
-rwxr-xr-xsfx2/qa/complex/sfx2/undo/ChartDocumentTest.java277
-rwxr-xr-xsfx2/qa/complex/sfx2/undo/DocumentTest.java61
-rwxr-xr-xsfx2/qa/complex/sfx2/undo/DocumentTestBase.java29
-rwxr-xr-xsfx2/qa/complex/sfx2/undo/DrawDocumentTest.java46
-rwxr-xr-xsfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java196
-rwxr-xr-xsfx2/qa/complex/sfx2/undo/ImpressDocumentTest.java46
-rwxr-xr-xsfx2/qa/complex/sfx2/undo/WriterDocumentTest.java104
-rw-r--r--sfx2/qa/complex/standalonedocumentinfo/makefile.mk85
-rw-r--r--sfx2/qa/complex/tests.sce3
-rwxr-xr-x[-rw-r--r--]sfx2/qa/cppunit/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/cppunit/test_metadatable.cxx8
-rwxr-xr-x[-rw-r--r--]sfx2/qa/cppunit/version.map0
-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/Test.java5
-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/knownissues.xcl0
-rw-r--r--sfx2/qa/unoapi/makefile.mk48
-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/sfx.sce2
-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/testdocuments/SfxStandaloneDocInfoObject.sdwbin8192 -> 8192 bytes-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/testdocuments/report.stwbin11186 -> 11186 bytes-rwxr-xr-x[-rw-r--r--]sfx2/qa/unoapi/testdocuments/report2.stwbin11000 -> 11000 bytes-rwxr-xr-x[-rw-r--r--]sfx2/sdi/appslots.sdi0
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/docslots.sdi5
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/frmslots.sdi0
-rw-r--r--sfx2/sdi/makefile.mk59
-rwxr-xr-xsfx2/sdi/sfx.sdi79
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/sfxitems.sdi0
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/sfxslots.sdi0
-rwxr-xr-x[-rw-r--r--]sfx2/sdi/viwslots.sdi0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/app.cxx71
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/app.hrc85
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/app.src649
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appbas.cxx127
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appbaslib.cxx3
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appcfg.cxx260
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appchild.cxx12
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appdata.cxx5
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appdde.cxx81
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appinit.cxx11
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appmain.cxx46
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appmisc.cxx114
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appopen.cxx187
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appquit.cxx27
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appreg.cxx14
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appserv.cxx172
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/appuno.cxx551
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/childwin.cxx16
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/dde.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/dde.src4
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/fileobj.cxx96
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/fileobj.hxx42
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/fwkhelper.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/helpdispatch.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/helpdispatch.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/helpinterceptor.cxx4
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/helpinterceptor.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/imagemgr.cxx8
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/imestatuswindow.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/imestatuswindow.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/impldde.cxx68
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/impldde.hxx16
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/linkmgr2.cxx114
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/linksrc.cxx64
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/lnkbase2.cxx102
-rw-r--r--sfx2/source/appl/makefile.mk163
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/module.cxx42
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/newhelp.cxx194
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/newhelp.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/newhelp.hxx8
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/newhelp.src12
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/opengrf.cxx27
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/panelist.hxx6
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/sfx.src90
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/sfxhelp.cxx373
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/sfxpicklist.cxx12
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/shutdownicon.cxx14
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/shutdownicon.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/shutdowniconOs2.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/shutdowniconaqua.mm0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/shutdowniconunx.cxx12
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/shutdowniconw32.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/workwin.cxx416
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/xpackcreator.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/appl/xpackcreator.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/bastyp.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/bastyp.src0
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/bitset.cxx86
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/fltfnc.cxx34
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/fltfnc.src0
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/fltlst.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/fltlst.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/frmhtml.cxx24
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/frmhtmlw.cxx28
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/helper.cxx6
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/mieclip.cxx14
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/minarray.cxx156
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/misc.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/progress.cxx84
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/sfxhtml.cxx48
-rwxr-xr-x[-rw-r--r--]sfx2/source/bastyp/sfxresid.cxx6
-rwxr-xr-x[-rw-r--r--]sfx2/source/config/evntconf.cxx26
-rw-r--r--sfx2/source/config/makefile.mk47
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/bindings.cxx55
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/ctrlitem.cxx24
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/dispatch.cxx137
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/macrconf.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/macro.cxx30
-rw-r--r--sfx2/source/control/makefile.mk73
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/minfitem.cxx4
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/msg.cxx15
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/msgpool.cxx45
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/objface.cxx112
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/querystatus.cxx10
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/request.cxx132
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/sfxstatuslistener.cxx8
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/shell.cxx156
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/sorgitm.cxx8
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/statcach.cxx10
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/unoctitm.cxx18
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/about.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/alienwarn.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/alienwarn.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/alienwarn.src1
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/basedlgs.cxx73
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dialog.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dialog.src0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dinfdlg.cxx228
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dinfdlg.hrc4
-rwxr-xr-xsfx2/source/dialog/dinfdlg.src45
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dinfedt.cxx4
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dinfedt.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dinfedt.src4
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/dockwin.cxx257
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/filedlghelper.cxx112
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/filedlghelper.src0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/filedlgimpl.hxx5
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/filtergrouping.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/filtergrouping.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/intro.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/itemconnect.cxx26
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/mailmodel.cxx145
-rw-r--r--sfx2/source/dialog/mailmodelapi.cxx673
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/mailwindow.src0
-rwxr-xr-xsfx2/source/dialog/makefile.mk115
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/mgetempl.cxx54
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/mgetempl.hrc1
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/mgetempl.src14
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/navigat.cxx10
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/newstyle.cxx3
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/newstyle.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/newstyle.src4
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/partwnd.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/passwd.cxx132
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/passwd.hrc15
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/passwd.src66
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/printopt.cxx52
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/printopt.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/printopt.src22
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/recfloat.cxx18
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/recfloat.src1
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/securitypage.cxx18
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/securitypage.src0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/sfxdlg.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/splitwin.cxx310
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/srchdlg.cxx16
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/srchdlg.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/srchdlg.src6
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/styfitem.cxx16
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/styledlg.cxx12
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/tabdlg.cxx269
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/taskpane.cxx31
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/taskpane.src0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/templdlg.cxx467
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/templdlg.hrc3
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/templdlg.src14
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/titledockwin.cxx36
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/titledockwin.src0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/tplcitem.cxx12
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/tplpitem.cxx16
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/versdlg.cxx46
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/versdlg.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/versdlg.src10
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/DocumentMetadataAccess.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/Metadatable.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/QuerySaveDocument.cxx4
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/SfxDocumentMetaData.cxx0
-rw-r--r--sfx2/source/doc/applet.cxx377
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doc.hrc2
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doc.src13
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/docfac.cxx10
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/docfile.cxx91
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/docfilt.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/docinf.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/docinsert.cxx18
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/docmacromode.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/docstoragemodifylistener.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doctdlg.cxx20
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doctdlg.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doctdlg.src8
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doctempl.cxx142
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doctempl.src0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doctemplates.cxx46
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doctemplateslocal.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/doctemplateslocal.hxx0
-rwxr-xr-xsfx2/source/doc/docundomanager.cxx457
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/docvor.cxx380
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/docvor.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/docvor.src7
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/frmdescr.cxx50
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/graphhelp.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/graphhelp.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/graphhelp.src0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/guisaveas.cxx60
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/iframe.cxx8
-rw-r--r--sfx2/source/doc/makefile.mk103
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/new.cxx92
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/new.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/new.src18
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/objcont.cxx150
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/objembed.cxx12
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/objitem.cxx6
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/objmisc.cxx204
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/objserv.cxx94
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/objstor.cxx92
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/objuno.cxx8
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/objxtor.cxx49
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/oleprops.cxx14
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/oleprops.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/ownsubfilterservice.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/plugin.cxx12
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/printhelper.cxx13
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/printhelper.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/querytemplate.cxx6
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/querytemplate.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/sfxacldetect.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/sfxacldetect.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/sfxbasemodel.cxx363
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/sfxmodelfactory.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/syspath.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/syspath.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/syspathw32.cxx4
-rw-r--r--sfx2/source/explorer/makefile.mk47
-rwxr-xr-x[-rw-r--r--]sfx2/source/explorer/nochaos.cxx6
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/SfxDocumentMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/alienwarn.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/appbas.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/appbaslib.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/appdata.hxx28
-rw-r--r--sfx2/source/inc/applet.hxx125
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/doctemplates.hxx0
-rwxr-xr-xsfx2/source/inc/docundomanager.hxx116
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/eventsupplier.hxx13
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/fltfnc.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/fltoptint.hxx13
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/helper.hxx2
-rwxr-xr-xsfx2/source/inc/helpid.hrc619
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/hexplwnd.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/iframe.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/intro.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/mailmodel.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/mnucfga.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/nfltdlg.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/nochaos.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/objmnctl.hxx4
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/objshimp.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/openflag.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/ownsubfilterservice.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/partwnd.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/plugin.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/preview.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/recfloat.hxx4
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/referers.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/sfxlocal.hrc8
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/sfxpicklist.hxx4
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/sfxtypes.hxx18
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/sfxurlrelocator.hxx5
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/slotserv.hxx12
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/splitwin.hxx66
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/statcach.hxx8
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/templdgi.hxx96
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/tplcitem.hxx6
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/tplcomp.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/versdlg.hxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/virtmenu.hxx58
-rwxr-xr-x[-rw-r--r--]sfx2/source/inc/workwin.hxx168
-rwxr-xr-x[-rw-r--r--]sfx2/source/inet/inettbc.cxx8
-rw-r--r--sfx2/source/inet/makefile.mk48
-rwxr-xr-x[-rw-r--r--]sfx2/source/layout/factory.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/layout/sfxdialog.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/layout/sfxtabdialog.cxx4
-rwxr-xr-x[-rw-r--r--]sfx2/source/layout/sfxtabpage.cxx0
-rw-r--r--sfx2/source/menu/makefile.mk55
-rwxr-xr-x[-rw-r--r--]sfx2/source/menu/menu.hrc0
-rwxr-xr-x[-rw-r--r--]sfx2/source/menu/menu.src7
-rwxr-xr-x[-rw-r--r--]sfx2/source/menu/mnuitem.cxx87
-rwxr-xr-x[-rw-r--r--]sfx2/source/menu/mnumgr.cxx79
-rwxr-xr-x[-rw-r--r--]sfx2/source/menu/objmnctl.cxx12
-rwxr-xr-x[-rw-r--r--]sfx2/source/menu/thessubmenu.cxx41
-rwxr-xr-x[-rw-r--r--]sfx2/source/menu/thessubmenu.hxx8
-rwxr-xr-x[-rw-r--r--]sfx2/source/menu/virtmenu.cxx230
-rwxr-xr-x[-rw-r--r--]sfx2/source/notify/eventsupplier.cxx134
-rwxr-xr-x[-rw-r--r--]sfx2/source/notify/hintpost.cxx0
-rw-r--r--sfx2/source/notify/makefile.mk50
-rw-r--r--sfx2/source/statbar/makefile.mk47
-rwxr-xr-x[-rw-r--r--]sfx2/source/statbar/stbitem.cxx57
-rwxr-xr-x[-rw-r--r--]sfx2/source/toolbox/imgmgr.cxx50
-rw-r--r--sfx2/source/toolbox/makefile.mk48
-rwxr-xr-x[-rw-r--r--]sfx2/source/toolbox/tbxitem.cxx159
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/frame.cxx32
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/frame2.cxx38
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/frmload.cxx63
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/impframe.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/impviewframe.hxx4
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/ipclient.cxx34
-rw-r--r--sfx2/source/view/makefile.mk65
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/orgmgr.cxx218
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/printer.cxx332
-rw-r--r--sfx2/source/view/prnmon.cxx488
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/sfxbasecontroller.cxx58
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/userinputinterception.cxx2
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/view.hrc6
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/view.src0
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/viewfac.cxx4
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/viewfrm.cxx188
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/viewfrm2.cxx24
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/viewimp.hxx33
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/viewprn.cxx183
-rwxr-xr-x[-rw-r--r--]sfx2/source/view/viewsh.cxx1142
-rwxr-xr-x[-rw-r--r--]sfx2/util/hidother.src62
-rwxr-xr-x[-rw-r--r--]sfx2/util/make_tco.btm0
-rw-r--r--sfx2/util/makefile.mk160
-rwxr-xr-x[-rw-r--r--]sfx2/util/mkdemo.pl0
-rwxr-xr-xsfx2/util/sfx.component75
-rwxr-xr-x[-rw-r--r--]sfx2/util/sfx.xml0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/CalcWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/DrawWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/Factories.xcu0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/ImpressWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/WriterWindowState.xcu0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/ctp_factory.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/ctp_factory.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/ctp_panel.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/ctp_panel.hxx0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/ctp_services.cxx0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/delzip0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/description.xml0
-rw-r--r--sfx2/workben/custompanel/makefile.mk120
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/manifest.xml0
-rwxr-xr-x[-rw-r--r--]sfx2/workben/custompanel/panel.pngbin202 -> 202 bytes-rwxr-xr-x[-rw-r--r--]shell/inc/internal/basereader.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/columninfo.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/config.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/contentreader.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/dbgmacros.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/fileextensions.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/global.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/i_xml_parser_event_handler.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/infotips.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/iso8601_converter.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/metainforeader.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/propertyhdl.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/propsheets.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/registry.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/resource.h0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/shlxthdl.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/stream_helper.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/thumbviewer.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/types.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/utilities.hxx6
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/xml_parser.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/internal/zipfile.hxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/kde_headers.h0
-rwxr-xr-x[-rw-r--r--]shell/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/inc/pch/precompiled_shell.cxx0
-rwxr-xr-x[-rw-r--r--]shell/inc/pch/precompiled_shell.hxx0
-rwxr-xr-xshell/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]shell/prj/d.lst11
-rwxr-xr-x[-rw-r--r--]shell/qa/i_xml_parser_event_handler.hxx0
-rwxr-xr-xshell/qa/makefile.mk2
-rwxr-xr-x[-rw-r--r--]shell/qa/recent_docs.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/autostyletag.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/autostyletag.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/basereader.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/contentreader.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/dummytag.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/itag.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/keywordstag.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/keywordstag.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/metainforeader.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/simpletag.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/ooofilereader/simpletag.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/xml_parser.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/zipfile/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/all/zipfile/zipexcptn.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/zipfile/zipexcptn.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/all/zipfile/zipfile.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/desktopbe/desktopbackend.cxx7
-rw-r--r--shell/source/backends/desktopbe/desktopbe1-ucd.txt6
-rwxr-xr-xshell/source/backends/desktopbe/desktopbe1.component34
-rwxr-xr-x[-rw-r--r--]shell/source/backends/desktopbe/makefile.mk10
-rwxr-xr-x[-rw-r--r--]shell/source/backends/gconfbe/gconfaccess.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/gconfbe/gconfaccess.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/gconfbe/gconfbackend.cxx7
-rw-r--r--shell/source/backends/gconfbe/gconfbe1-ucd.txt6
-rwxr-xr-xshell/source/backends/gconfbe/gconfbe1.component34
-rwxr-xr-x[-rw-r--r--]shell/source/backends/gconfbe/makefile.mk11
-rwxr-xr-x[-rw-r--r--]shell/source/backends/gconfbe/orbit.h0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kde4be/kde4access.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kde4be/kde4access.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kde4be/kde4backend.cxx7
-rw-r--r--shell/source/backends/kde4be/kde4be1-ucd.txt6
-rwxr-xr-xshell/source/backends/kde4be/kde4be1.component34
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kde4be/makefile.mk10
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/kdeaccess.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/kdeaccess.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/kdebackend.cxx7
-rw-r--r--shell/source/backends/kdebe/kdebe1-ucd.txt6
-rwxr-xr-xshell/source/backends/kdebe/kdebe1.component34
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/makefile.mk10
-rwxr-xr-x[-rw-r--r--]shell/source/backends/localebe/localebackend.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/localebe/localebackend.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/localebe/localebe.xml0
-rwxr-xr-xshell/source/backends/localebe/localebe1.component34
-rwxr-xr-x[-rw-r--r--]shell/source/backends/localebe/localebecdef.cxx7
-rwxr-xr-x[-rw-r--r--]shell/source/backends/localebe/makefile.mk8
-rwxr-xr-x[-rw-r--r--]shell/source/backends/macbe/macbackend.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/macbe/macbackend.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/macbe/macbe.xml0
-rwxr-xr-xshell/source/backends/macbe/macbe1.component34
-rwxr-xr-x[-rw-r--r--]shell/source/backends/macbe/macbecdef.cxx7
-rwxr-xr-x[-rw-r--r--]shell/source/backends/macbe/makefile.mk8
-rwxr-xr-x[-rw-r--r--]shell/source/backends/wininetbe/makefile.mk8
-rwxr-xr-x[-rw-r--r--]shell/source/backends/wininetbe/wininetbackend.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/wininetbe/wininetbackend.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/backends/wininetbe/wininetbe.xml0
-rwxr-xr-xshell/source/backends/wininetbe/wininetbe1.component34
-rwxr-xr-x[-rw-r--r--]shell/source/backends/wininetbe/wininetbecdef.cxx7
-rwxr-xr-xshell/source/cmdmail/cmdmail.component34
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/cmdmail.xml0
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/cmdmailentry.cxx24
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/cmdmailmsg.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/cmdmailmsg.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/cmdmailsuppl.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/cmdmailsuppl.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/exports.dxp1
-rwxr-xr-x[-rw-r--r--]shell/source/cmdmail/makefile.mk7
-rwxr-xr-x[-rw-r--r--]shell/source/mingw_intel.map0
-rwxr-xr-x[-rw-r--r--]shell/source/tools/lngconvex/cmdline.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/tools/lngconvex/cmdline.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/tools/lngconvex/defs.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/tools/lngconvex/lngconvex.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/tools/lngconvex/makefile.mk4
-rwxr-xr-x[-rw-r--r--]shell/source/tools/regsvrex/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/tools/regsvrex/regsvrex.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/makefile.mk8
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/shellexec.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/shellexec.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/shellexecentry.cxx23
-rwxr-xr-xshell/source/unix/exec/syssh.component34
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/syssh.xml0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/urltest.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/urltest.sh0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/exec/urltest.txt0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/gnome-open-url.c0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/gnome-open-url.sh0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/open-url.c0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/open-url.def0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/senddoc.c0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/senddoc.def0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/senddoc.sh0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/misc/uri-encode.c0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/sysshell/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/sysshell/recently_used_file.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/sysshell/recently_used_file.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/unix/sysshell/recently_used_file_handler.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/SysShExec.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/SysShExec.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/SysShentry.cxx26
-rwxr-xr-x[-rw-r--r--]shell/source/win32/exports.dxp1
-rwxr-xr-x[-rw-r--r--]shell/source/win32/makefile.mk8
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/classfactory.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/classfactory.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/columninfo/columninfo.cxx5
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/columninfo/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/exports.dxp0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/infotips/infotips.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/infotips/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/exports.dxp0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/propspec.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/propspec.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/prophdl/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx4
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/document_statistic.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/document_statistic.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/propsheets/propsheets.cxx93
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/ctrylnglist.txt0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/prop_img.bmpbin958 -> 958 bytes-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/rcfooter.txt0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/rcheader.txt0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/rctmpl.txt0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/shlxthdl.manifest0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/shlxthdl.ulf0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/res/signet.pngbin4836 -> 4836 bytes-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/shlxthdl.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/thumbviewer/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx3
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/util/dbgmacros.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/util/fileextensions.cxx9
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/util/iso8601_converter.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/util/makefile.mk0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/util/registry.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/shlxthandler/util/utilities.cxx22
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/exports.dxp1
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/makefile.mk8
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/senddoc.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/simplemapi.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/simplemapi.hxx0
-rwxr-xr-xshell/source/win32/simplemail/smplmail.component34
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmail.xml0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailclient.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailclient.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailentry.cxx26
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailmsg.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailmsg.hxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailsuppl.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/simplemail/smplmailsuppl.hxx0
-rwxr-xr-xshell/source/win32/syssh.component34
-rwxr-xr-x[-rw-r--r--]shell/source/win32/syssh.xml0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/workbench/TestProxySet.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/workbench/TestSmplMail.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/workbench/TestSysShExec.cxx0
-rwxr-xr-x[-rw-r--r--]shell/source/win32/workbench/makefile.mk0
-rwxr-xr-x[-rw-r--r--]svx/AllLangResTarget_about.mk (renamed from framework/inc/makefile.mk)28
-rwxr-xr-xsvx/AllLangResTarget_gal.mk48
-rwxr-xr-x[-rw-r--r--]svx/AllLangResTarget_ofa.mk (renamed from framework/source/application/makefile.mk)27
-rwxr-xr-xsvx/AllLangResTarget_svx.mk136
-rwxr-xr-xsvx/AllLangResTarget_textconversiondlgs.mk47
-rwxr-xr-x[-rw-r--r--]svx/JunitTest_svx_unoapi.mk (renamed from sfx2/source/layout/makefile.mk)49
-rwxr-xr-xsvx/Library_svx.mk236
-rwxr-xr-xsvx/Library_svxcore.mk455
-rwxr-xr-x[-rw-r--r--]svx/Library_textconversiondlgs.mk (renamed from sfx2/source/bastyp/makefile.mk)68
-rwxr-xr-xsvx/Makefile38
-rwxr-xr-x[-rw-r--r--]svx/Module_svx.mk (renamed from editeng/source/outliner/makefile.mk)60
-rwxr-xr-xsvx/Package_inc.mk560
-rwxr-xr-x[-rw-r--r--]svx/Package_sdi.mk (renamed from editeng/util/makefile.pmk)20
-rwxr-xr-x[-rw-r--r--]svx/doc/UML/edit_engine_UNO_implementation.zuml0
-rwxr-xr-x[-rw-r--r--]svx/doc/UML/grid_control_implementation.zumlbin36412 -> 36412 bytes-rwxr-xr-x[-rw-r--r--]svx/doc/UML/readme.txt0
-rwxr-xr-x[-rw-r--r--]svx/doc/drawing_layer_UNO_objects.odgbin13284 -> 13284 bytes-rwxr-xr-x[-rw-r--r--]svx/inc/accessibility.hrc0
-rwxr-xr-x[-rw-r--r--]svx/inc/dgdefs_.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/dialdll.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/dragmt3d.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/drawuiks.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/extrusiondepthdialog.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/float3d.hrc3
-rwxr-xr-x[-rw-r--r--]svx/inc/fmhelp.hrc164
-rwxr-xr-x[-rw-r--r--]svx/inc/fontworkgallery.hrc0
-rwxr-xr-x[-rw-r--r--]svx/inc/galbrws2.hxx22
-rwxr-xr-x[-rw-r--r--]svx/inc/gallery.hrc0
-rwxr-xr-x[-rw-r--r--]svx/inc/galobj.hxx30
-rwxr-xr-x[-rw-r--r--]svx/inc/galtheme.hrc0
-rw-r--r--svx/inc/globlac.hrc223
-rwxr-xr-x[-rw-r--r--]svx/inc/globlmn_tmpl.hrc201
-rwxr-xr-x[-rw-r--r--]svx/inc/helpid.hrc500
-rwxr-xr-x[-rw-r--r--]svx/inc/lightdlg.hxx0
-rw-r--r--svx/inc/makefile.mk50
-rwxr-xr-x[-rw-r--r--]svx/inc/pch/precompiled_svx.cxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/pch/precompiled_svx.hxx5
-rwxr-xr-x[-rw-r--r--]svx/inc/sjctrl.hxx72
-rwxr-xr-x[-rw-r--r--]svx/inc/svdibrow.hxx20
-rwxr-xr-x[-rw-r--r--]svx/inc/svdpomv.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/AccessibleControlShape.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/AccessibleGraphicShape.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/AccessibleOLEShape.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/AccessibleShape.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/AccessibleShapeInfo.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/AccessibleShapeTreeInfo.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/AccessibleTableShape.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/AccessibleTextHelper.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/ActionDescriptionProvider.hxx (renamed from svx/inc/ActionDescriptionProvider.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/ChildrenManager.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/DescriptionGenerator.hxx (renamed from svx/inc/DescriptionGenerator.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/EnhancedCustomShape2d.hxx (renamed from svx/source/customshapes/EnhancedCustomShape2d.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/EnhancedCustomShapeGeometry.hxx (renamed from svx/source/customshapes/EnhancedCustomShapeGeometry.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/EnhancedCustomShapeTypeNames.hxx (renamed from svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/IAccessibleParent.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/IAccessibleViewForwarder.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/IAccessibleViewForwarderListener.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/ParseContext.hxx (renamed from svx/inc/ParseContext.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/ShapeTypeHandler.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/SmartTagCtl.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/SmartTagItem.hxx10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/SmartTagMgr.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/SpellDialogChildWindow.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/SvxShapeTypes.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/UnoNamespaceMap.hxx (renamed from svx/inc/UnoNamespaceMap.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/XPropertyTable.hxx (renamed from svx/inc/XPropertyTable.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/algitem.hxx68
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/anchorid.hxx (renamed from svx/inc/anchorid.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/bmpmask.hxx25
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/camera3d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/charmap.hxx16
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/checklbx.hxx24
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/chrtitem.hxx (renamed from svx/inc/chrtitem.hxx)112
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/clipboardctl.hxx (renamed from svx/inc/clipboardctl.hxx)8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/clipfmtitem.hxx (renamed from svx/inc/clipfmtitem.hxx)18
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/colrctrl.hxx18
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/connctrl.hxx (renamed from svx/inc/connctrl.hxx)2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/contdlg.hxx18
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/ctredlin.hxx122
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/cube3d.hxx14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dataaccessdescriptor.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/databaselocationinput.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/databaseregistrationui.hxx (renamed from svx/inc/databaseregistrationui.hxx)5
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dbaexchange.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dbaobjectex.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dbcharsethelper.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dbexch.hrc (renamed from svx/inc/dbexch.hrc)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dbtoolsclient.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/def3d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/deflt3d.hxx84
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dialcontrol.hxx (renamed from svx/inc/dialcontrol.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dialmgr.hxx0
-rwxr-xr-xsvx/inc/svx/dialogs.hrc21
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dlgctl3d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dlgctrl.hxx82
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dlgutil.hxx (renamed from svx/inc/dlgutil.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/drawitem.hxx (renamed from svx/inc/drawitem.hxx)36
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/dstribut_enum.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/e3ditem.hxx14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/e3dsceneupdater.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/e3dundo.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/exthelpid.hrc17
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/extrud3d.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/extrusionbar.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/extrusioncolorcontrol.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/f3dchild.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fillctrl.hxx10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/flagsdef.hxx (renamed from svx/inc/flagsdef.hxx)12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/float3d.hxx50
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmdmod.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmdpage.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmglob.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmgridcl.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmgridif.hxx (renamed from svx/inc/fmgridif.hxx)2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmmodel.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmobjfac.hxx (renamed from svx/inc/fmobjfac.hxx)2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmpage.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmresids.hrc (renamed from svx/source/inc/fmresids.hrc)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmsearch.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmshell.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmsrccfg.hxx (renamed from svx/source/inc/fmsrccfg.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmsrcimp.hxx (renamed from svx/source/inc/fmsrcimp.hxx)14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmtools.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fmview.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fntctl.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fntctrl.hxx10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fntszctl.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fontlb.hxx (renamed from svx/inc/fontlb.hxx)2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fontwork.hxx18
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fontworkbar.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/fontworkgallery.hxx (renamed from svx/inc/fontworkgallery.hxx)6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/formatpaintbrushctrl.hxx (renamed from svx/inc/formatpaintbrushctrl.hxx)6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/framebordertype.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/framelink.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/framelinkarray.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/frmdirlbox.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/frmsel.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/galbrws.hxx (renamed from svx/inc/galbrws.hxx)10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/galctrl.hxx (renamed from svx/inc/galctrl.hxx)12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/gallery.hxx (renamed from svx/inc/gallery.hxx)58
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/gallery1.hxx56
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/galmisc.hxx38
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/galtheme.hxx (renamed from svx/inc/galtheme.hxx)84
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/globl3d.hxx (renamed from svx/inc/globl3d.hxx)28
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/grafctrl.hxx (renamed from svx/inc/grafctrl.hxx)28
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/graphctl.hxx20
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/grfcrop.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/grfflt.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/gridctrl.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/hdft.hxx22
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/helperhittest3d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/hlnkitem.hxx (renamed from svx/inc/hlnkitem.hxx)22
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/htmlmode.hxx (renamed from svx/inc/htmlmode.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/hyperdlg.hxx (renamed from svx/inc/hyperdlg.hxx)2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/hyprlink.hxx (renamed from uui/source/passcrtdlg.hrc)28
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/ifaceids.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/imapdlg.hxx (renamed from svx/inc/imapdlg.hxx)12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/insctrl.hxx (renamed from svx/inc/insctrl.hxx)8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/ipolypolygoneditorcontroller.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/itemwin.hxx26
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/langbox.hxx40
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/lathe3d.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/layctrl.hxx (renamed from svx/inc/layctrl.hxx)8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/lboxctrl.hxx (renamed from svx/inc/lboxctrl.hxx)10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/linectrl.hxx (renamed from svx/inc/linectrl.hxx)34
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/measctrl.hxx (renamed from svx/inc/measctrl.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/modctrl.hxx (renamed from svx/inc/modctrl.hxx)6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/msdffdef.hxx168
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/numfmtsh.hxx78
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/numinf.hxx14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/numvset.hxx (renamed from svx/inc/numvset.hxx)26
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/obj3d.hxx52
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/objfac3d.hxx (renamed from svx/inc/objfac3d.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/ofaitem.hxx (renamed from svx/inc/ofaitem.hxx)2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/optgenrl.hxx (renamed from svx/inc/optgenrl.hxx)32
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/optgrid.hxx (renamed from svx/inc/optgrid.hxx)68
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/orienthelper.hxx (renamed from svx/inc/orienthelper.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/pagectrl.hxx40
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/pageitem.hxx30
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/paraprev.hxx22
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/passwd.hxx (renamed from svx/inc/passwd.hxx)4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/pfiledlg.hxx (renamed from svx/inc/pfiledlg.hxx)6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/polygn3d.hxx16
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/polypolygoneditor.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/polysc3d.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/postattr.hxx (renamed from svx/inc/postattr.hxx)12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/prtqry.hxx (renamed from svx/inc/prtqry.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/pszctrl.hxx (renamed from svx/inc/pszctrl.hxx)6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/rectenum.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/relfld.hxx (renamed from svx/inc/relfld.hxx)24
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/rotmodit.hxx (renamed from svx/inc/rotmodit.hxx)14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/rubydialog.hxx (renamed from svx/inc/rubydialog.hxx)10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/ruler.hxx62
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/rulritem.hxx (renamed from svx/inc/rulritem.hxx)76
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/scene3d.hxx24
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdangitm.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdasaitm.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdasitm.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sderitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdgcoitm.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdgcpitm.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdggaitm.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdginitm.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdgluitm.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdgmoitm.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdgtritm.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdmetitm.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdooitm.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdprcitm.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/animation/animationstate.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/animation/objectanimator.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/animation/scheduler.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/attribute/sdrtextattribute.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/displayinfo.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/objectcontact.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx9
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/objectcontactofpageview.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/objectcontacttools.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontact.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofe3d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofgroup.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontact.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/event/eventhandler.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlaybitmapex.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlaycrosshair.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlayhatchrect.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlayhelpline.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlayline.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlaymanager.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlayobject.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlayobjectcell.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlayobjectlist.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlayselection.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlaytools.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/overlay/overlaytriangle.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/attributeproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/captionproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/circleproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/connectorproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/customshapeproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/defaultproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/e3dlatheproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/e3dproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/e3dsceneproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/e3dsphereproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/emptyproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/graphicproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/groupproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/itemsettools.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/measureproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/oleproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/pageproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/properties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/rectangleproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/properties/textproperties.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdr/table/tabledesign.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdrcomment.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdrhittesthelper.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdrmasterpagedescriptor.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdrobjectfilter.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdrobjectuser.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdrpageuser.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdrpagewindow.hxx1
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdrpaintwindow.hxx (renamed from svx/inc/sdrpaintwindow.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdshcitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdshitm.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdshtitm.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdsxyitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtaaitm.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtacitm.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtaditm.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtagitm.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtaiitm.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtaitm.hxx24
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtakitm.hxx28
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtayitm.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtcfitm.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtditm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtfchim.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtfsitm.hxx16
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdtmfitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sdynitm.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/selctrl.hxx (renamed from svx/inc/selctrl.hxx)8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/selectioncontroller.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/shapeproperty.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/shapepropertynotifier.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/simptabl.hxx28
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sphere3d.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/splitcelldlg.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/srchdlg.hxx (renamed from svx/inc/srchdlg.hxx)46
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/stddlg.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/strarray.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/subtoolboxcontrol.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdattr.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdattrx.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdcrtv.hxx84
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svddef.hxx22
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svddrag.hxx20
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svddrgmt.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svddrgv.hxx132
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdedtv.hxx150
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdedxv.hxx72
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdetc.hxx100
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdfield.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdglev.hxx34
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdglob.hxx (renamed from svx/inc/svdglob.hxx)2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdglue.hxx52
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdhdl.hxx78
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdhlpln.hxx18
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svditer.hxx (renamed from svx/inc/svditer.hxx)16
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svditext.hxx (renamed from svx/source/svdraw/svditext.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdlayer.hxx28
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdmark.hxx32
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdmodel.hxx139
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdmrkv.hxx228
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdoashp.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdoattr.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdobj.hxx198
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdocapt.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdocirc.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdoedge.hxx68
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdograf.hxx11
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdogrp.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdomeas.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdomedia.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdoole2.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdopage.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdopath.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdorect.hxx14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdotable.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdotext.hxx58
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdouno.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdoutl.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdovirt.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdpage.hxx78
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdpagv.hxx21
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdpntv.hxx139
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdpoev.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdpool.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdsnpv.hxx96
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdsob.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdstr.hrc (renamed from svx/inc/svdstr.hrc)9
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdtext.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdtrans.hxx18
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdtypes.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdundo.hxx52
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdview.hxx90
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdviter.hxx (renamed from svx/inc/svdviter.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svdxcgv.hxx56
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svimbase.hxx (renamed from svx/inc/svimbase.hxx)100
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svx3ditems.hxx66
-rwxr-xr-xsvx/inc/svx/svxcommands.h604
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svxdlg.hxx82
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svxdllapi.h0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svxerr.hxx (renamed from svx/inc/svxerr.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svxgrahicitem.hxx (renamed from svx/inc/svxgrahicitem.hxx)2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/svxitems.hrc0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/swframeexample.hxx (renamed from svx/inc/swframeexample.hxx)6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/swframeposstrings.hxx (renamed from svx/inc/swframeposstrings.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/swframevalidation.hxx (renamed from svx/inc/swframevalidation.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxallitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxcaitm.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxcecitm.hxx14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxcgitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxciaitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxcikitm.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxcllitm.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxctitm.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxekitm.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxelditm.hxx14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxenditm.hxx16
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxfiitm.hxx10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxlayitm.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxlogitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmbritm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmfsitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmkitm.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmlhitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmoitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmovitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmsitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmspitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmsuitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmtaitm.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmtfitm.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmtpitm.hxx24
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmtritm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxmuitm.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxoneitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxonitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxopitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxraitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxreaitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxreoitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxroaitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxrooitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxsaitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxsalitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxsiitm.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxsoitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/sxtraitm.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/tabarea.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/tabline.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/tbcontrl.hxx58
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/tbxalign.hxx (renamed from svx/inc/tbxalign.hxx)2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/tbxcolor.hxx (renamed from svx/inc/tbxcolor.hxx)2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/tbxcolorupdate.hxx14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/tbxctl.hxx (renamed from svx/inc/tbxctl.hxx)6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/tbxcustomshapes.hxx (renamed from svx/inc/tbxcustomshapes.hxx)6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/tbxdraw.hxx (renamed from svx/inc/tbxdraw.hxx)8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/txencbox.hxx (renamed from svx/inc/txencbox.hxx)14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/txenctab.hxx (renamed from svx/inc/txenctab.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/ucsubset.hrc0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/ucsubset.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unoapi.hxx (renamed from svx/inc/unoapi.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unofill.hxx (renamed from svx/inc/unofill.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unomaster.hxx (renamed from svx/inc/unomaster.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unomid.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unomod.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unomodel.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unopage.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unopool.hxx (renamed from svx/inc/unopool.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unoprov.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unoshape.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unoshcol.hxx (renamed from svx/inc/unoshcol.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unoshprp.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/unoshtxt.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/verttexttbxctrl.hxx (renamed from svx/inc/verttexttbxctrl.hxx)8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/view3d.hxx34
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/viewlayoutitem.hxx10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/viewpt3d.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/volume3d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/wrapfield.hxx (renamed from svx/inc/wrapfield.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xattr.hxx (renamed from svx/inc/xattr.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xbitmap.hxx20
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xbtmpit.hxx14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xcolit.hxx14
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xdash.hxx34
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xdef.hxx3
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xenum.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xexch.hxx (renamed from svx/inc/xexch.hxx)2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xfillit.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xfillit0.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflasit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflbckit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflbmpit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflbmsli.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflbmsxy.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflbmtit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflboxy.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflbstit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflbtoxy.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflclit.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflftrit.hxx20
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflgrit.hxx16
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xflhtit.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xfltrit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xftadit.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xftdiit.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xftmrit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xftouit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xftsfit.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xftshcit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xftshit.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xftshtit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xftshxy.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xftstit.hxx2
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xgrad.hxx42
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xgrscit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xhatch.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xit.hxx22
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlineit.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlineit0.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlinjoit.hxx10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlnasit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlnclit.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlndsit.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlnedcit.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlnedit.hxx10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlnedwit.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlnstcit.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlnstit.hxx10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlnstwit.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlntrit.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xlnwtit.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xmleohlp.hxx (renamed from svx/inc/xmleohlp.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xmlexchg.hxx (renamed from svx/inc/xmlexchg.hxx)0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xmlgrhlp.hxx (renamed from svx/inc/xmlgrhlp.hxx)10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xmlsecctrl.hxx (renamed from svx/inc/xmlsecctrl.hxx)4
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xoutbmp.hxx (renamed from svx/inc/xoutbmp.hxx)20
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xpoly.hxx84
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xpool.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xsetit.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xsflclit.hxx6
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xtable.hxx210
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xtextit.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/xtextit0.hxx12
-rwxr-xr-xsvx/inc/svx/zoom_def.hxx8
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/zoomctrl.hxx (renamed from svx/inc/zoomctrl.hxx)10
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/zoomitem.hxx18
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/zoomsliderctrl.hxx12
-rwxr-xr-x[-rw-r--r--]svx/inc/svx/zoomslideritem.hxx18
-rwxr-xr-x[-rw-r--r--]svx/inc/svxempty.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/tbunocontroller.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/tbunosearchcontrollers.hxx4
-rwxr-xr-x[-rw-r--r--]svx/inc/uiks.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/unomlstr.hxx0
-rwxr-xr-x[-rw-r--r--]svx/inc/xpolyimp.hxx24
-rw-r--r--svx/inc/zoom_def.hxx11
-rwxr-xr-x[-rw-r--r--]svx/prj/build.lst41
-rwxr-xr-x[-rw-r--r--]svx/prj/d.lst553
-rwxr-xr-x[-rw-r--r--]svx/prj/makefile.mk (renamed from xmloff/util/makefile.pmk)16
-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/Test.java5
-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/knownissues.xcl3
-rw-r--r--svx/qa/unoapi/makefile.mk48
-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/svx.sce0
-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/testdocuments/SvxShape.sxdbin6344 -> 6344 bytes-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/testdocuments/crazy-blue.jpgbin4451 -> 4451 bytes-rwxr-xr-x[-rw-r--r--]svx/qa/unoapi/testdocuments/space-metal.jpgbin4313 -> 4313 bytes-rwxr-xr-x[-rw-r--r--]svx/sdi/fmslots.sdi0
-rw-r--r--svx/sdi/makefile.mk57
-rwxr-xr-x[-rw-r--r--]svx/sdi/svx.sdi55
-rwxr-xr-x[-rw-r--r--]svx/sdi/svxitems.sdi0
-rwxr-xr-x[-rw-r--r--]svx/sdi/svxslots.hrc0
-rwxr-xr-x[-rw-r--r--]svx/sdi/svxslots.sdi0
-rwxr-xr-x[-rw-r--r--]svx/sdi/xoitems.sdi0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleControlShape.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleEmptyEditSource.cxx56
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleEmptyEditSource.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleFrameSelector.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleGraphicShape.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleOLEShape.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleShape.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleShapeInfo.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleShapeTreeInfo.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleTextEventQueue.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleTextEventQueue.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/AccessibleTextHelper.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/ChildrenManager.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/ChildrenManagerImpl.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/ChildrenManagerImpl.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/DGColorNameLookUp.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/DescriptionGenerator.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/GraphCtlAccessibleContext.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/ShapeTypeHandler.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/SvxShapeTypes.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/accessibility.src0
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/charmapacc.cxx20
-rwxr-xr-xsvx/source/accessibility/makefile.mk68
-rwxr-xr-x[-rw-r--r--]svx/source/accessibility/svxrectctaccessiblecontext.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/core/coreservices.cxx38
-rw-r--r--svx/source/core/makefile.mk47
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShape2d.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShape3d.cxx12
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShape3d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeEngine.cxx14
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeEngine.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeFontWork.cxx12
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeFontWork.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeGeometry.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeHandle.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeHandle.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx2
-rw-r--r--svx/source/customshapes/makefile.mk71
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/tbxcustomshapes.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/SpellDialogChildWindow.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/_bmpmask.cxx141
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/_contdlg.cxx148
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/bmpmask.hrc6
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/bmpmask.src76
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/charmap.cxx42
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/checklbx.cxx40
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/connctrl.cxx40
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/contdlg.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/contdlg.src4
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/contimp.hxx28
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/contwnd.cxx24
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/contwnd.hxx18
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/ctredlin.cxx228
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/ctredlin.hrc8
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/ctredlin.src36
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/databaseregistrationui.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/dialcontrol.cxx12
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/dialmgr.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/dlgctl3d.cxx20
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/dlgctrl.cxx196
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/dlgctrl.src7
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/dlgutil.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/docrecovery.cxx47
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/docrecovery.hrc4
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/docrecovery.src19
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/fntctrl.cxx94
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/fontlb.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/fontwork.cxx78
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/fontwork.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/fontwork.src7
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/framelink.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/framelinkarray.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/frmdirlbox.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/frmsel.cxx20
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/frmsel.src0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/graphctl.cxx58
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/grfflt.cxx32
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/hdft.cxx134
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/hdft.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/hdft.src18
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/hyperdlg.cxx8
-rwxr-xr-xsvx/source/dialog/hyprdlg.hxx143
-rwxr-xr-xsvx/source/dialog/hyprlink.cxx999
-rwxr-xr-xsvx/source/dialog/hyprlink.src167
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/imapdlg.cxx94
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/imapdlg.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/imapdlg.src4
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/imapimp.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/imapwnd.cxx122
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/imapwnd.hxx26
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/langbox.cxx106
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/langbox.src0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/language.src0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/linkwarn.cxx0
-rw-r--r--svx/source/dialog/linkwarn.hrc60
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/linkwarn.src0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/makefile.mk0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/measctrl.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/optgrid.cxx53
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/optgrid.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/optgrid.src21
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/orienthelper.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/pagectrl.cxx36
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/paraprev.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/passwd.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/passwd.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/passwd.src3
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/pfiledlg.cxx7
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/prtqry.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/prtqry.src0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/relfld.cxx32
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/rlrcitem.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/rlrcitem.hxx4
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/rubydialog.cxx54
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/rubydialog.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/rubydialog.src14
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/ruler.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/ruler.src0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/rulritem.cxx86
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/sdstring.src121
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/sendreportgen.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/sendreportunx.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/sendreportw32.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/simptabl.cxx71
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/srchctrl.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/srchctrl.hxx4
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/srchdlg.cxx256
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/srchdlg.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/srchdlg.src33
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/stddlg.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/strarray.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/svxbmpnumvalueset.cxx48
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/svxbmpnumvalueset.src0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/svxdlg.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/svxgrahicitem.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/svxruler.cxx385
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/swframeexample.cxx50
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/swframeposstrings.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/swframeposstrings.src2
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/txencbox.cxx58
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/txenctab.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/txenctab.src0
-rwxr-xr-x[-rw-r--r--]svx/source/dialog/wrapfield.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/camera3d.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/cube3d.cxx14
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/deflt3d.cxx26
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/dragmt3d.cxx14
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/e3dsceneupdater.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/e3dundo.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/extrud3d.cxx12
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/float3d.cxx664
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/float3d.src77
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/helperhittest3d.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/helperminimaldepth3d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/helperminimaldepth3d.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/lathe3d.cxx14
-rw-r--r--svx/source/engine3d/makefile.mk76
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/obj3d.cxx64
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/objfac3d.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/polygn3d.cxx16
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/polysc3d.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/scene3d.cxx32
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/sphere3d.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/string3d.src0
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/svx3ditems.cxx66
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/view3d.cxx166
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/view3d1.cxx14
-rwxr-xr-x[-rw-r--r--]svx/source/engine3d/viewpt3d2.cxx16
-rwxr-xr-x[-rw-r--r--]svx/source/fmcomp/dbaexchange.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/fmcomp/dbaobjectex.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/fmcomp/fmgridcl.cxx14
-rwxr-xr-x[-rw-r--r--]svx/source/fmcomp/fmgridif.cxx51
-rwxr-xr-x[-rw-r--r--]svx/source/fmcomp/gridcell.cxx53
-rwxr-xr-x[-rw-r--r--]svx/source/fmcomp/gridcols.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/fmcomp/gridctrl.cxx18
-rwxr-xr-x[-rw-r--r--]svx/source/fmcomp/gridctrl.src46
-rw-r--r--svx/source/fmcomp/makefile.mk63
-rwxr-xr-x[-rw-r--r--]svx/source/fmcomp/trace.cxx18
-rwxr-xr-x[-rw-r--r--]svx/source/fmcomp/xmlexchg.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/ParseContext.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/form/dataaccessdescriptor.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/databaselocationinput.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/datalistener.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/datanavi.cxx118
-rwxr-xr-x[-rw-r--r--]svx/source/form/datanavi.src37
-rwxr-xr-x[-rw-r--r--]svx/source/form/dbcharsethelper.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/dbtoolsclient.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/delayedevent.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/filtnav.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/form/filtnav.src39
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmPropBrw.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmcontrolbordermanager.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmcontrollayout.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmdmod.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmdocumentclassification.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmdpage.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmexch.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmexpl.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmexpl.src67
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmitems.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmmodel.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmobj.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmobjfac.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmpage.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmpgeimp.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmscriptingenv.cxx84
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmservs.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmshell.cxx12
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmshimp.cxx129
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmsrccfg.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmsrcimp.cxx28
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmstring.src2
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmtextcontroldialogs.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmtextcontrolfeature.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmtextcontrolshell.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmtools.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmundo.cxx17
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmview.cxx25
-rwxr-xr-x[-rw-r--r--]svx/source/form/fmvwimp.cxx284
-rwxr-xr-x[-rw-r--r--]svx/source/form/formcontrolfactory.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/formcontroller.cxx116
-rwxr-xr-x[-rw-r--r--]svx/source/form/formcontrolling.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/formdispatchinterceptor.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/formfeaturedispatcher.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/formshell.src9
-rwxr-xr-x[-rw-r--r--]svx/source/form/formtoolbars.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/form/legacyformcontroller.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/makefile.mk0
-rwxr-xr-x[-rw-r--r--]svx/source/form/navigatortree.cxx20
-rwxr-xr-x[-rw-r--r--]svx/source/form/navigatortreemodel.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/form/sdbdatacolumn.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/sqlparserclient.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/stringlistresource.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/tabwin.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/form/tbxform.cxx46
-rwxr-xr-x[-rw-r--r--]svx/source/form/typeconversionclient.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/form/typemap.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/form/xfm_addcondition.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/codec.cxx38
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/codec.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/galbrws.cxx26
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/galbrws1.cxx69
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/galbrws1.hxx12
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/galbrws2.cxx191
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/galctrl.cxx30
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/galexpl.cxx116
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/gallery.src84
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/gallery1.cxx84
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/gallerydrawmodel.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/galmisc.cxx64
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/galobj.cxx66
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/galtheme.cxx190
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/galtheme.src0
-rwxr-xr-x[-rw-r--r--]svx/source/gallery2/makefile.mk0
-rwxr-xr-x[-rw-r--r--]svx/source/gengal/gengal.cxx0
-rw-r--r--svx/source/gengal/gengal.sh101
-rw-r--r--svx/source/gengal/gengalrc.in12
-rwxr-xr-x[-rw-r--r--]svx/source/gengal/makefile.mk0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/AccessibleFrameSelector.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/DGColorNameLookUp.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/GraphCtlAccessibleContext.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/inc/charmapacc.hxx4
-rwxr-xr-x[-rw-r--r--]svx/source/inc/clonelist.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/datalistener.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/datanavi.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/datanavi.hxx16
-rwxr-xr-x[-rw-r--r--]svx/source/inc/delayedevent.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/inc/docrecovery.hxx4
-rwxr-xr-x[-rw-r--r--]svx/source/inc/filtnav.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmPropBrw.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmcontrolbordermanager.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmcontrollayout.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmdocumentclassification.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmexch.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmexpl.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmexpl.hxx6
-rwxr-xr-xsvx/source/inc/fmgroup.hxx120
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmhlpids.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmitems.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmobj.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmpgeimp.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmprop.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmscriptingenv.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmservs.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmshimp.hxx10
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmslotinvalidator.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmtextcontroldialogs.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmtextcontrolfeature.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmtextcontrolshell.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmundo.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmurl.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/fmvwimp.hxx29
-rwxr-xr-x[-rw-r--r--]svx/source/inc/formcontrolfactory.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/formcontroller.hxx3
-rwxr-xr-x[-rw-r--r--]svx/source/inc/formcontrolling.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/formdispatchinterceptor.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/formfeaturedispatcher.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/formtoolbars.hxx8
-rwxr-xr-x[-rw-r--r--]svx/source/inc/frmsel.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/frmselimpl.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/inc/gridcell.hxx10
-rwxr-xr-x[-rw-r--r--]svx/source/inc/gridcols.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/linectrl.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/recoveryui.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/sdbdatacolumn.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/sqlparserclient.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/inc/stringlistresource.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/inc/svdoimp.hxx6
-rwxr-xr-x[-rw-r--r--]svx/source/inc/svdoutlinercache.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/svxrectctaccessiblecontext.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/tabwin.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/inc/tbxform.hxx26
-rwxr-xr-x[-rw-r--r--]svx/source/inc/trace.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/treevisitor.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/typeconversionclient.hxx9
-rwxr-xr-x[-rw-r--r--]svx/source/inc/unogalthemeprovider.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/unopolyhelper.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/xfm_addcondition.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/xmlxtexp.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/inc/xmlxtimp.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/intro/about_ooo.hrc (renamed from svx/source/intro/intro_tmpl.hrc)243
-rwxr-xr-xsvx/source/intro/about_ooo.src40
-rwxr-xr-x[-rw-r--r--]svx/source/intro/iso.src0
-rw-r--r--svx/source/intro/makefile.mk66
-rwxr-xr-x[-rw-r--r--]svx/source/intro/ooo.src0
-rwxr-xr-x[-rw-r--r--]svx/source/items/SmartTagItem.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/items/algitem.cxx40
-rwxr-xr-x[-rw-r--r--]svx/source/items/chrtitem.cxx116
-rwxr-xr-x[-rw-r--r--]svx/source/items/clipfmtitem.cxx34
-rwxr-xr-x[-rw-r--r--]svx/source/items/customshapeitem.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/items/drawitem.cxx50
-rwxr-xr-x[-rw-r--r--]svx/source/items/e3ditem.cxx14
-rwxr-xr-x[-rw-r--r--]svx/source/items/grfitem.cxx18
-rwxr-xr-x[-rw-r--r--]svx/source/items/hlnkitem.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/items/makefile.mk0
-rwxr-xr-x[-rw-r--r--]svx/source/items/numfmtsh.cxx12
-rwxr-xr-x[-rw-r--r--]svx/source/items/numinf.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/items/ofaitem.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/items/pageitem.cxx26
-rwxr-xr-x[-rw-r--r--]svx/source/items/postattr.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/items/rotmodit.cxx22
-rwxr-xr-x[-rw-r--r--]svx/source/items/svxempty.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/items/svxerr.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/items/svxerr.src2
-rwxr-xr-x[-rw-r--r--]svx/source/items/svxitems.src0
-rwxr-xr-x[-rw-r--r--]svx/source/items/viewlayoutitem.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/items/zoomitem.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/items/zoomslideritem.cxx18
-rwxr-xr-x[-rw-r--r--]svx/source/mnuctrls/SmartTagCtl.cxx20
-rwxr-xr-x[-rw-r--r--]svx/source/mnuctrls/clipboardctl.cxx24
-rwxr-xr-x[-rw-r--r--]svx/source/mnuctrls/fntctl.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/mnuctrls/fntszctl.cxx10
-rw-r--r--svx/source/mnuctrls/makefile.mk71
-rwxr-xr-x[-rw-r--r--]svx/source/mnuctrls/mnuctrls.src0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/animation/animationstate.cxx0
-rw-r--r--svx/source/sdr/animation/makefile.mk46
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/animation/objectanimator.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/animation/scheduler.cxx0
-rw-r--r--svx/source/sdr/attribute/makefile.mk50
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/attribute/sdrfilltextattribute.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/attribute/sdrformtextattribute.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/attribute/sdrshadowtextattribute.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/attribute/sdrtextattribute.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/displayinfo.cxx0
-rw-r--r--svx/source/sdr/contact/makefile.mk92
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/objectcontact.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/objectcontactofobjlistpainter.cxx23
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/objectcontactofpageview.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/objectcontacttools.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/sdrmediawindow.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/sdrmediawindow.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontact.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofe3d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofe3dcube.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofe3dextrude.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofe3dlathe.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofe3dpolygon.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofe3dscene.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofe3dsphere.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofgraphic.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofgroup.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofpageobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofsdrcircobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofsdredgeobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofsdrobj.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofsdrole2obj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofsdrpage.cxx81
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofsdrpathobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofsdrrectobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactoftextobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofunocontrol.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewcontactofvirtobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontact.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofe3d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofgraphic.cxx36
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofgroup.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofpageobj.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx14
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/contact/viewobjectcontactredirector.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/event/eventhandler.cxx0
-rw-r--r--svx/source/sdr/event/makefile.mk44
-rw-r--r--svx/source/sdr/overlay/makefile.mk59
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlayanimatedbitmapex.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlaybitmapex.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlaycrosshair.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlayhatchrect.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlayhelpline.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlayline.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlaymanager.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlaymanagerbuffered.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlayobject.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlayobjectcell.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlayobjectlist.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlaypolypolygon.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlayrollingrectangle.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlayselection.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlaytools.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/overlay/overlaytriangle.cxx0
-rw-r--r--svx/source/sdr/primitive2d/makefile.mk57
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/primitivefactory2d.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrattributecreator.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrdecompositiontools.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrole2primitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrprimitivetools.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/primitive3d/sdrattributecreator3d.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/attributeproperties.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/captionproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/circleproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/connectorproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/customshapeproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/defaultproperties.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/e3dcompoundproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/e3dextrudeproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/e3dlatheproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/e3dproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/e3dsceneproperties.cxx14
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/e3dsphereproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/emptyproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/graphicproperties.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/groupproperties.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/itemsettools.cxx4
-rw-r--r--svx/source/sdr/properties/makefile.mk65
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/measureproperties.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/oleproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/pageproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/properties.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/rectangleproperties.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/sdr/properties/textproperties.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/smarttags/SmartTagMgr.cxx4
-rw-r--r--svx/source/smarttags/makefile.mk48
-rwxr-xr-x[-rw-r--r--]svx/source/src/app.hrc8
-rwxr-xr-x[-rw-r--r--]svx/source/src/app.src4
-rwxr-xr-xsvx/source/src/errtxt.src515
-rwxr-xr-x[-rw-r--r--]svx/source/src/hidgen.hrc0
-rw-r--r--svx/source/src/makefile.mk57
-rwxr-xr-x[-rw-r--r--]svx/source/stbctrls/insctrl.cxx15
-rwxr-xr-x[-rw-r--r--]svx/source/stbctrls/makefile.mk0
-rwxr-xr-x[-rw-r--r--]svx/source/stbctrls/modctrl.cxx9
-rwxr-xr-x[-rw-r--r--]svx/source/stbctrls/pszctrl.cxx97
-rwxr-xr-x[-rw-r--r--]svx/source/stbctrls/selctrl.cxx12
-rwxr-xr-x[-rw-r--r--]svx/source/stbctrls/stbctrls.h0
-rwxr-xr-x[-rw-r--r--]svx/source/stbctrls/stbctrls.src0
-rwxr-xr-x[-rw-r--r--]svx/source/stbctrls/xmlsecctrl.cxx20
-rwxr-xr-x[-rw-r--r--]svx/source/stbctrls/zoomctrl.cxx28
-rwxr-xr-x[-rw-r--r--]svx/source/stbctrls/zoomsliderctrl.cxx52
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/ActionDescriptionProvider.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/clonelist.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/gradtrns.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/gradtrns.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/impgrfll.cxx16
-rw-r--r--svx/source/svdraw/makefile.mk124
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/polypolygoneditor.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/sdrcomment.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/sdrhittesthelper.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/sdrmasterpagedescriptor.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/sdrpagewindow.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/sdrpaintwindow.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/selectioncontroller.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdattr.cxx324
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdcrtv.cxx110
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svddrag.cxx24
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svddrgm1.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svddrgmt.cxx70
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svddrgv.cxx218
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdedtv.cxx330
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdedtv1.cxx358
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdedtv2.cxx282
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdedxv.cxx288
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdetc.cxx134
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdfmtf.cxx44
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdfmtf.hxx20
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdglev.cxx140
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdglue.cxx76
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdhdl.cxx180
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdhlpln.cxx22
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdibrow.cxx264
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svditer.cxx24
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdlayer.cxx54
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdmark.cxx76
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdmodel.cxx233
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdmrkv.cxx384
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdmrkv1.cxx240
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdoashp.cxx98
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdoattr.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdobj.cxx326
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdocapt.cxx64
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdocirc.cxx34
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdoedge.cxx348
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdograf.cxx266
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdogrp.cxx166
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdomeas.cxx105
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdomedia.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdoole2.cxx78
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdopage.cxx36
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdopath.cxx275
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdorect.cxx50
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdotext.cxx206
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdotextdecomposition.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdotextpathdecomposition.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdotxat.cxx42
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdotxdr.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdotxed.cxx36
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdotxfl.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdotxln.cxx28
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdotxtr.cxx28
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdouno.cxx50
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdoutl.cxx12
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdoutlinercache.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdovirt.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdpage.cxx174
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdpagv.cxx81
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdpntv.cxx158
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdpoev.cxx54
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdsnpv.cxx82
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdstr.src17
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdtext.cxx18
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdtrans.cxx104
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdundo.cxx188
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdview.cxx320
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdviter.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdxcgv.cxx140
-rwxr-xr-x[-rw-r--r--]svx/source/table/accessiblecell.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/table/accessiblecell.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/accessibletableshape.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/cell.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/table/cell.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/cellcursor.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/table/cellcursor.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/celleditsource.cxx16
-rwxr-xr-x[-rw-r--r--]svx/source/table/celleditsource.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/table/cellrange.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/cellrange.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/celltypes.hxx0
-rw-r--r--svx/source/table/makefile.mk80
-rwxr-xr-x[-rw-r--r--]svx/source/table/propertyset.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/propertyset.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/svdotable.cxx80
-rwxr-xr-x[-rw-r--r--]svx/source/table/table.src0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablecolumn.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablecolumn.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablecolumns.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablecolumns.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablecontroller.cxx78
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablecontroller.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/table/tabledesign.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablehandles.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablehandles.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablelayouter.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablelayouter.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablemodel.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablemodel.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablerow.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablerow.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablerows.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablerows.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablertfexporter.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/table/tablertfimporter.cxx20
-rwxr-xr-x[-rw-r--r--]svx/source/table/tableundo.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/table/tableundo.hxx6
-rwxr-xr-x[-rw-r--r--]svx/source/table/viewcontactoftableobj.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/table/viewcontactoftableobj.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/colorwindow.hxx8
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/colrctrl.cxx58
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/colrctrl.src33
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/extrusioncontrols.cxx25
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/extrusioncontrols.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/extrusioncontrols.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/extrusioncontrols.src5
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/fillctrl.cxx56
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/fontworkgallery.cxx22
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/fontworkgallery.src5
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/formatpaintbrushctrl.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/grafctrl.cxx69
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/grafctrl.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/grafctrl.src0
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/itemwin.cxx52
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/layctrl.cxx68
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/lboxctrl.cxx42
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/lboxctrl.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/lboxctrl.src1
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/linectrl.cxx74
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/linectrl.src0
-rw-r--r--svx/source/tbxctrls/makefile.mk84
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/subtoolboxcontrol.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/tbcontrl.cxx338
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/tbcontrl.src6
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/tbunocontroller.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/tbunosearchcontrollers.cxx22
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/tbunosearchcontrollers.src0
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/tbxalign.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/tbxcolor.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/tbxcolorupdate.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/tbxdraw.hrc0
-rw-r--r--svx/source/tbxctrls/tbxdraw.src265
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/tbxdrctl.cxx16
-rwxr-xr-x[-rw-r--r--]svx/source/tbxctrls/verttexttbxctrl.cxx20
-rwxr-xr-x[-rw-r--r--]svx/source/toolbars/extrusionbar.cxx26
-rwxr-xr-x[-rw-r--r--]svx/source/toolbars/extrusionbar.src59
-rwxr-xr-x[-rw-r--r--]svx/source/toolbars/fontworkbar.cxx22
-rwxr-xr-x[-rw-r--r--]svx/source/toolbars/fontworkbar.src34
-rw-r--r--svx/source/toolbars/makefile.mk56
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/buttongroup.hrc (renamed from svx/source/unodialogs/inc/buttongroup.hrc)0
-rwxr-xr-xsvx/source/unodialogs/textconversiondlgs/chinese_dialogs.src293
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx28
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx12
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src8
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc3
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src4
-rw-r--r--svx/source/unodialogs/textconversiondlgs/makefile.mk90
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/resid.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/resid.hxx2
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/resids.hrc0
-rwxr-xr-x[-rw-r--r--]svx/source/unodialogs/textconversiondlgs/services.cxx11
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/UnoGraphicExporter.cxx53
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/UnoGraphicExporter.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/UnoNameItemTable.cxx40
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/UnoNameItemTable.hxx6
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/UnoNamespaceMap.cxx14
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/XPropertyTable.cxx12
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/gluepts.cxx36
-rw-r--r--svx/source/unodraw/makefile.mk83
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/recoveryui.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/shapeimpl.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/shapepropertynotifier.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/tableshape.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unobtabl.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unoctabl.cxx68
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unodraw.src0
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unodtabl.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unogtabl.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unohtabl.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unomlstr.cxx0
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unomod.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unomtabl.cxx58
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unopage.cxx23
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unopool.cxx26
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unoprov.cxx45
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unoshap2.cxx21
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unoshap3.cxx6
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unoshap4.cxx10
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unoshape.cxx49
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unoshcol.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unoshtxt.cxx78
-rwxr-xr-x[-rw-r--r--]svx/source/unodraw/unottabl.cxx4
-rwxr-xr-xsvx/source/unogallery/makefile.mk48
-rwxr-xr-x[-rw-r--r--]svx/source/unogallery/unogalitem.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/unogallery/unogalitem.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/unogallery/unogaltheme.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/unogallery/unogaltheme.hxx0
-rwxr-xr-x[-rw-r--r--]svx/source/unogallery/unogalthemeprovider.cxx0
-rw-r--r--svx/source/xml/makefile.mk49
-rwxr-xr-x[-rw-r--r--]svx/source/xml/xmleohlp.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/xml/xmlexport.cxx4
-rwxr-xr-x[-rw-r--r--]svx/source/xml/xmlgrhlp.cxx39
-rwxr-xr-x[-rw-r--r--]svx/source/xml/xmlxtexp.cxx8
-rwxr-xr-x[-rw-r--r--]svx/source/xml/xmlxtimp.cxx36
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/_xoutbmp.cxx80
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/_xpoly.cxx216
-rw-r--r--svx/source/xoutdev/makefile.mk59
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xattr.cxx536
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xattr2.cxx102
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xattrbmp.cxx108
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xexch.cxx14
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xpool.cxx12
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtabbtmp.cxx48
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtabcolr.cxx48
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtabdash.cxx46
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtabgrdt.cxx46
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtabhtch.cxx48
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtable.cxx98
-rwxr-xr-x[-rw-r--r--]svx/source/xoutdev/xtablend.cxx46
-rwxr-xr-x[-rw-r--r--]svx/uiconfig/layout/delzip0
-rwxr-xr-x[-rw-r--r--]svx/uiconfig/layout/layout.mk0
-rwxr-xr-x[-rw-r--r--]svx/uiconfig/layout/makefile.mk0
-rwxr-xr-x[-rw-r--r--]svx/uiconfig/layout/zoom.xml0
-rw-r--r--svx/util/cui.dxp1
-rw-r--r--svx/util/cui.flt139
-rw-r--r--svx/util/dl.flt139
-rwxr-xr-x[-rw-r--r--]svx/util/gal.dxp1
-rwxr-xr-x[-rw-r--r--]svx/util/hidother.hrc0
-rwxr-xr-x[-rw-r--r--]svx/util/hidother.src5
-rwxr-xr-x[-rw-r--r--]svx/util/makefile.mk0
-rwxr-xr-xsvx/util/svx.component76
-rwxr-xr-x[-rw-r--r--]svx/util/svx.dxp1
-rw-r--r--svx/util/svx.flt134
-rwxr-xr-xsvx/util/svxcore.component49
-rwxr-xr-x[-rw-r--r--]svx/util/svxpch.cxx2
-rwxr-xr-xsvx/util/textconversiondlgs.component34
-rwxr-xr-xsvx/workben/edittest.cxx1795
-rwxr-xr-x[-rw-r--r--]svx/workben/msview/makefile.mk0
-rwxr-xr-x[-rw-r--r--]svx/workben/msview/msview.cxx0
-rwxr-xr-x[-rw-r--r--]svx/workben/msview/msview.xml0
-rwxr-xr-x[-rw-r--r--]svx/workben/msview/xmlconfig.cxx0
-rwxr-xr-x[-rw-r--r--]svx/workben/msview/xmlconfig.hxx0
-rwxr-xr-x[-rw-r--r--]svx/xml/AccessibleControlShape.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/AccessibleEditableTextPara.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/AccessibleGraphicShape.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/AccessibleImageBullet.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/AccessibleOLEShape.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/AccessibleShape.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxDrawPage.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxGraphCtrlAccessibleContext.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxGraphicExporter.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxGraphicObject.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxShape.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxShapeCircle.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxShapeCollection.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxShapeConnector.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxShapeControl.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxShapeDimensioning.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxShapeGroup.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxShapePolyPolygon.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxShapePolyPolygonBezier.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxUnoNumberingRules.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxUnoText.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxUnoTextContent.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxUnoTextContentEnum.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxUnoTextCursor.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxUnoTextField.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxUnoTextRange.xml0
-rwxr-xr-x[-rw-r--r--]svx/xml/SvxUnoTextRangeEnumeration.xml0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/cleanversion/makefile.mk2
-rwxr-xr-x[-rw-r--r--]sysui/desktop/debian/control0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/debian/makefile.mk20
-rwxr-xr-x[-rw-r--r--]sysui/desktop/debian/openoffice.org-debian-menus0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/debian/postinst0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/debian/postrm0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/debian/prerm0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/freedesktop/freedesktop-menus.spec0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/freedesktop/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/base.icnsbin56259 -> 56259 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/calc.icnsbin51959 -> 51959 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/configuration.icnsbin50975 -> 50975 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/database.icnsbin45789 -> 45789 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/draw.icnsbin54777 -> 54777 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/drawing-template.icnsbin46225 -> 46225 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/drawing.icnsbin43334 -> 43334 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/empty-document.icnsbin35005 -> 35005 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/empty-document.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/empty-template.icnsbin35005 -> 35005 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/empty-template.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/formula.icnsbin43893 -> 43893 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/128x128/apps/calc.pngbin7002 -> 7002 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/128x128/apps/startcenter.pngbin2271 -> 2271 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.pngbin11620 -> 11620 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.pngbin7002 -> 7002 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/apps/base.pngbin632 -> 632 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/apps/calc.pngbin539 -> 539 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/apps/draw.pngbin653 -> 653 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/apps/impress.pngbin577 -> 577 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/apps/main.pngbin434 -> 434 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/apps/math.pngbin395 -> 395 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/apps/printeradmin.pngbin963 -> 963 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/apps/startcenter.pngbin434 -> 434 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/apps/writer.pngbin532 -> 532 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/database.pngbin291 -> 291 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.pngbin348 -> 348 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.pngbin354 -> 354 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/formula.pngbin252 -> 252 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.pngbin310 -> 310 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.pngbin632 -> 632 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.pngbin707 -> 707 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.pngbin653 -> 653 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.pngbin395 -> 395 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.pngbin487 -> 487 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.pngbin626 -> 626 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.pngbin577 -> 577 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.pngbin567 -> 567 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.pngbin539 -> 539 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.pngbin562 -> 562 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.pngbin532 -> 532 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.pngbin593 -> 593 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.pngbin303 -> 303 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.pngbin302 -> 302 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.pngbin287 -> 287 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.pngbin271 -> 271 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.pngbin240 -> 240 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/16x16/mimetypes/text.pngbin245 -> 245 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/apps/base.pngbin1329 -> 1329 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/apps/calc.pngbin1015 -> 1015 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/apps/draw.pngbin1271 -> 1271 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/apps/impress.pngbin1042 -> 1042 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/apps/main.pngbin698 -> 698 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/apps/math.pngbin1128 -> 1128 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/apps/printeradmin.pngbin2534 -> 2534 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/apps/startcenter.pngbin698 -> 698 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/apps/writer.pngbin987 -> 987 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/database.pngbin529 -> 529 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.pngbin1344 -> 1344 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.pngbin1483 -> 1483 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/formula.pngbin1349 -> 1349 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.pngbin1559 -> 1559 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.pngbin1329 -> 1329 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.pngbin1352 -> 1352 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.pngbin1271 -> 1271 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.pngbin1128 -> 1128 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.pngbin867 -> 867 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.pngbin1390 -> 1390 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.pngbin1042 -> 1042 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.pngbin1281 -> 1281 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.pngbin1015 -> 1015 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.pngbin1328 -> 1328 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.pngbin987 -> 987 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.pngbin1127 -> 1127 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.pngbin1403 -> 1403 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.pngbin1515 -> 1515 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.pngbin1211 -> 1211 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.pngbin1301 -> 1301 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.pngbin1211 -> 1211 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/32x32/mimetypes/text.pngbin1406 -> 1406 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/apps/base.pngbin2135 -> 2135 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/apps/calc.pngbin1465 -> 1465 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/apps/draw.pngbin1690 -> 1690 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/apps/impress.pngbin1560 -> 1560 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/apps/main.pngbin990 -> 990 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/apps/math.pngbin1588 -> 1588 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/apps/printeradmin.pngbin4058 -> 4058 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/apps/startcenter.pngbin990 -> 990 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/apps/writer.pngbin1332 -> 1332 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/database.pngbin652 -> 652 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.pngbin1819 -> 1819 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.pngbin1913 -> 1913 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/formula.pngbin1803 -> 1803 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.pngbin2003 -> 2003 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.pngbin2135 -> 2135 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.pngbin2087 -> 2087 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.pngbin1690 -> 1690 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.pngbin1588 -> 1588 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.pngbin1399 -> 1399 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.pngbin1979 -> 1979 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.pngbin1560 -> 1560 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.pngbin1644 -> 1644 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.pngbin1465 -> 1465 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.pngbin1653 -> 1653 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.pngbin1332 -> 1332 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.pngbin1577 -> 1577 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.pngbin2044 -> 2044 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.pngbin2043 -> 2043 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.pngbin1599 -> 1599 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.pngbin1684 -> 1684 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.pngbin1687 -> 1687 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/hicolor/48x48/mimetypes/text.pngbin1764 -> 1764 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/impress.icnsbin53113 -> 53113 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/apps/base.pngbin361 -> 361 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/apps/calc.pngbin383 -> 383 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/apps/draw.pngbin378 -> 378 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/apps/impress.pngbin373 -> 373 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/apps/math.pngbin392 -> 392 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/apps/printeradmin.pngbin395 -> 395 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/apps/startcenter.pngbin361 -> 361 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/apps/writer.pngbin380 -> 380 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/database.pngbin291 -> 291 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/drawing-template.pngbin348 -> 348 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/drawing.pngbin354 -> 354 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/formula.pngbin252 -> 252 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/master-document.pngbin310 -> 310 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-database.pngbin414 -> 414 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing-template.pngbin394 -> 394 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing.pngbin419 -> 419 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-formula.pngbin423 -> 423 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-master-document.pngbin416 -> 416 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation-template.pngbin417 -> 417 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation.pngbin416 -> 416 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet-template.pngbin396 -> 396 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet.pngbin395 -> 395 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text-template.pngbin393 -> 393 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text.pngbin397 -> 397 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/oasis-web-template.pngbin437 -> 437 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/presentation-template.pngbin303 -> 303 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/presentation.pngbin302 -> 302 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet-template.pngbin287 -> 287 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet.pngbin271 -> 271 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/text-template.pngbin240 -> 240 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/16x16/mimetypes/text.pngbin245 -> 245 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/apps/base.pngbin611 -> 611 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/apps/calc.pngbin629 -> 629 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/apps/draw.pngbin639 -> 639 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/apps/impress.pngbin606 -> 606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/apps/math.pngbin616 -> 616 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/apps/printeradmin.pngbin618 -> 618 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/apps/startcenter.pngbin611 -> 611 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/apps/writer.pngbin541 -> 541 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/database.pngbin529 -> 529 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/drawing-template.pngbin1344 -> 1344 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/drawing.pngbin1483 -> 1483 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/formula.pngbin1349 -> 1349 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/master-document.pngbin1559 -> 1559 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-database.pngbin780 -> 780 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing-template.pngbin667 -> 667 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing.pngbin779 -> 779 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-formula.pngbin742 -> 742 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-master-document.pngbin758 -> 758 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation-template.pngbin678 -> 678 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation.pngbin752 -> 752 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet-template.pngbin653 -> 653 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet.pngbin774 -> 774 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text-template.pngbin624 -> 624 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text.pngbin702 -> 702 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/oasis-web-template.pngbin801 -> 801 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/presentation-template.pngbin1403 -> 1403 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/presentation.pngbin1515 -> 1515 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet-template.pngbin1211 -> 1211 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet.pngbin1301 -> 1301 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/text-template.pngbin1211 -> 1211 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/locolor/32x32/mimetypes/text.pngbin1406 -> 1406 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/macro.icnsbin53951 -> 53951 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/main.icnsbin35005 -> 35005 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/main.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/master-document.icnsbin40262 -> 40262 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/math.icnsbin52282 -> 52282 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-chart.icnsbin60133 -> 60133 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-database.icnsbin45789 -> 45789 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-database.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-drawing-template.icnsbin46225 -> 46225 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-drawing-template.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-drawing.icnsbin43334 -> 43334 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-drawing.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-empty-document.icnsbin35005 -> 35005 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-empty-document.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-empty-template.icnsbin35005 -> 35005 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-empty-template.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-formula.icnsbin43893 -> 43893 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-formula.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-master-document.icnsbin40262 -> 40262 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-master-document.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-presentation-template.icnsbin44901 -> 44901 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-presentation-template.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-presentation.icnsbin41919 -> 41919 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-presentation.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-spreadsheet-template.icnsbin46239 -> 46239 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-spreadsheet-template.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-spreadsheet.icnsbin43146 -> 43146 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-spreadsheet.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-text-template.icnsbin43403 -> 43403 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-text-template.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-text.icnsbin40399 -> 40399 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-text.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-web-template.icnsbin42359 -> 42359 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oasis-web-template.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-base-app.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-base-doc.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-calc-app.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-calc-doc.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-calc-tem.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-chart-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-configuration.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-draw-app.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-draw-doc.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-draw-tem.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-empty-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-empty-tem.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-image-doc.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-impress-app.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-impress-doc.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-impress-tem.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-macro-doc.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-main-app.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-master-doc.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-math-app.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-math-doc.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-open.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-printer.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-web-doc.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-writer-app.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-writer-doc.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo-writer-tem.icobin92854 -> 92854 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_base_app.icnsbin45789 -> 45789 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_base_app.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_base_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_calc_app.icnsbin43146 -> 43146 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_calc_app.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_calc_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_calc_tem.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_chart_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_draw_app.icnsbin43334 -> 43334 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_draw_app.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_draw_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_draw_tem.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_empty_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_empty_tem.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_global_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_html_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_impress_app.icnsbin41919 -> 41919 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_impress_app.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_impress_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_impress_tem.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_macro_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_main_app.icnsbin35005 -> 35005 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_main_app.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_math_app.icnsbin43893 -> 43893 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_math_app.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_math_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_open.icnsbin35005 -> 35005 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_open.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_writer_app.icnsbin40399 -> 40399 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_writer_app.icobin26918 -> 26918 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_writer_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_writer_tem.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/open.icnsbin50105 -> 50105 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/oxt-extension.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/presentation-template.icnsbin44901 -> 44901 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/presentation.icnsbin41919 -> 41919 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/printer.icnsbin50434 -> 50434 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-base-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-calc-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-calc-tem.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-chart-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-draw-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-draw-tem.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-impress-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-impress-tem.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-master-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-math-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-writer-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-writer-tem.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-base-app.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-base-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-calc-app.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-calc-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-calc-tem.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-chart-doc.icobin10134 -> 10134 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-configuration.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-draw-app.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-draw-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-draw-tem.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-empty-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-empty-tem.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-image-doc.icobin10134 -> 10134 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-impress-app.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-impress-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-impress-tem.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-macro-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-main-app.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-master-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-math-app.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-math-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-open.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-printer.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-web-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-writer-app.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-writer-doc.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-writer-tem.icobin25214 -> 25214 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_base_app.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_base_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_calc_app.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_calc_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_calc_tem.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_chart_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_draw_app.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_draw_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_draw_tem.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_empty_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_empty_tem.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_global_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_html_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_impress_app.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_impress_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_impress_tem.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_macro_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_main_app.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_math_app.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_math_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_writer_app.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_writer_doc.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_writer_tem.icobin295606 -> 295606 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/spreadsheet-template.icnsbin46239 -> 46239 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/spreadsheet.icnsbin43146 -> 43146 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/text-template.icnsbin43403 -> 43403 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/text.icnsbin40399 -> 40399 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/writer.icnsbin49850 -> 49850 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/macosx/Info.plist0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/macosx/delzip0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/macosx/gen_strings.pl0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/macosx/list_icons.pl0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/macosx/makefile.mk3
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mandriva/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mandriva/mandriva-menus.spec0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/menus/base.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/menus/calc.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/menus/draw.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/menus/impress.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/menus/javafilter.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/menus/math.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/menus/printeradmin.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/menus/qstart.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/menus/startcenter.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/menus/writer.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/drawing-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/drawing-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/drawing.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/drawing.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/extension.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/extension.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/formula.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/formula.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/master-document.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/master-document.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-excel-sheet-12.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-excel-sheet-12.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-excel-sheet.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-excel-sheet.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-excel-template-12.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-excel-template-12.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-powerpoint-presentation.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-powerpoint-template-12.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-word-document-12.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-word-document-12.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-word-document.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-word-document.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-word-document2.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-word-document2.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-word-template-12.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/ms-word-template-12.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-database.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-database.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-drawing-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-drawing-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-drawing.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-drawing.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-formula.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-formula.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-master-document.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-master-document.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-presentation-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-presentation-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-presentation.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-presentation.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-spreadsheet-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-spreadsheet-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-spreadsheet.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-spreadsheet.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-text-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-text-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-text.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-text.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-web-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/oasis-web-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openoffice.applications0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openoffice.mime0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/presentation-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/presentation-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/presentation.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/presentation.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/spreadsheet-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/spreadsheet-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/spreadsheet.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/spreadsheet.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/text-template.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/text-template.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/text.desktop0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/mimetypes/text.keys0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-base-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-base-doc.icobin11644 -> 11644 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-calc-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-calc-doc.icobin11644 -> 11644 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-calc-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-chart-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-configuration.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-draw-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-draw-doc.icobin11644 -> 11644 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-draw-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-empty-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-empty-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-image-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-impress-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-impress-doc.icobin11644 -> 11644 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-impress-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-macro-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-main-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-master-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-math-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-math-doc.icobin11644 -> 11644 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-open.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-printer.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-web-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-writer-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-writer-doc.icobin11644 -> 11644 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo-writer-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-base-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-calc-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-calc-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-chart-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-draw-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-draw-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-impress-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-impress-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-master-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-math-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-writer-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/ooo11-writer-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-base-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-calc-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-calc-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-chart-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-draw-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-draw-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-impress-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-impress-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-master-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-math-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-writer-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so7-writer-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-base-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-base-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-calc-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-calc-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-calc-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-chart-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-configuration.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-draw-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-draw-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-draw-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-empty-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-empty-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-image-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-impress-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-impress-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-impress-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-macro-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-main-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-master-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-math-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-math-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-open.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-printer.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-web-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-writer-app.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-writer-doc.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/os2/so8-writer-tem.icobin5604 -> 5604 bytes-rwxr-xr-x[-rw-r--r--]sysui/desktop/productversion.mk0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/redhat/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/redhat/redhat-menus.spec0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/add_specfile_triggers.sed0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/brand.pl0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/create_mime_xml.pl0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/create_tree.sh0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/documents.ulf0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/launcher_comment.ulf0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/launcher_genericname.ulf0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/launcher_name.ulf0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/openoffice.sh0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/printeradmin.sh0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/share/translate.pl0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/slackware/makefile.mk20
-rwxr-xr-x[-rw-r--r--]sysui/desktop/slackware/slack-desc0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/slackware/update-script0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/solaris/copyright0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/solaris/depend0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/solaris/mailcap0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/solaris/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/solaris/mime.types0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/solaris/pkginfo0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/solaris/postinstall0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/solaris/postremove0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/solaris/prototype0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/suse/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/suse/suse-menus.spec0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/tg_rpm.mk0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/util/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/desktop/util/pkgdiff.pl0
-rwxr-xr-x[-rw-r--r--]sysui/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]sysui/prj/d.lst0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/QuickStart/OOQuickStart.rc0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/QuickStart/QuickStart.cpp0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/QuickStart/QuickStart.h0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/QuickStart/StdAfx.h0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/QuickStart/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/QuickStart/resource.h0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/QuickStart/so/QuickStart.rc0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/QuickStart/so/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/misc/AutoBuffer.cxx0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/misc/AutoBuffer.hxx0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/misc/WinImplHelper.cxx0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/misc/WinImplHelper.hxx0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/misc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/misc/resourceprovider.cxx0
-rwxr-xr-x[-rw-r--r--]sysui/source/win32/misc/resourceprovider.hxx0
-rwxr-xr-x[-rw-r--r--]sysui/util/checksize.pl0
-rwxr-xr-x[-rw-r--r--]sysui/util/exports.dxp1
-rwxr-xr-x[-rw-r--r--]sysui/util/makefile.mk0
-rwxr-xr-x[-rw-r--r--]ucb/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]ucb/inc/pch/precompiled_ucb.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/inc/pch/precompiled_ucb.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/prj/build.lst5
-rwxr-xr-x[-rw-r--r--]ucb/prj/d.lst15
-rwxr-xr-xucb/qa/complex/tdoc/CheckContentProvider.java247
-rwxr-xr-xucb/qa/complex/tdoc/CheckTransientDocumentsContent.java81
-rwxr-xr-xucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java83
-rwxr-xr-xucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java94
-rwxr-xr-xucb/qa/complex/tdoc/TestDocument.java39
-rwxr-xr-x[-rw-r--r--]ucb/qa/complex/tdoc/_XChild.java (renamed from ucb/qa/complex/tdoc/interfaces/_XChild.java)2
-rwxr-xr-xucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java (renamed from ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java)2
-rwxr-xr-xucb/qa/complex/tdoc/_XCommandProcessor.java (renamed from ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java)2
-rwxr-xr-xucb/qa/complex/tdoc/_XComponent.java (renamed from ucb/qa/complex/tdoc/interfaces/_XComponent.java)2
-rwxr-xr-xucb/qa/complex/tdoc/_XContent.java (renamed from ucb/qa/complex/tdoc/interfaces/_XContent.java)2
-rwxr-xr-xucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java (renamed from ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java)2
-rwxr-xr-xucb/qa/complex/tdoc/_XPropertyContainer.java (renamed from ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java)2
-rwxr-xr-xucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java (renamed from ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java)2
-rwxr-xr-x[-rw-r--r--]ucb/qa/complex/tdoc/_XServiceInfo.java (renamed from ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java)2
-rwxr-xr-x[-rw-r--r--]ucb/qa/complex/tdoc/_XTypeProvider.java (renamed from ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java)2
-rwxr-xr-xucb/qa/complex/tdoc/interfaces/makefile.mk4
-rwxr-xr-xucb/qa/complex/tdoc/makefile.mk83
-rwxr-xr-x[-rw-r--r--]ucb/qa/complex/tdoc/test_documents/Iterator.sxw (renamed from ucb/qa/complex/test_documents/Iterator.sxw)bin5627 -> 5627 bytes-rwxr-xr-x[-rw-r--r--]ucb/qa/complex/tdoc/test_documents/chinese.sxw (renamed from ucb/qa/complex/test_documents/chinese.sxw)bin5757 -> 5757 bytes-rwxr-xr-x[-rw-r--r--]ucb/qa/complex/tdoc/test_documents/filter.sxw (renamed from ucb/qa/complex/test_documents/filter.sxw)bin14359 -> 14359 bytes-rwxr-xr-xucb/qa/complex/ucb/UCB.java171
-rwxr-xr-xucb/qa/complex/ucb/makefile.mk58
-rwxr-xr-x[-rw-r--r--]ucb/qa/unoapi/Test.java0
-rwxr-xr-x[-rw-r--r--]ucb/qa/unoapi/knownissues.xcl0
-rwxr-xr-x[-rw-r--r--]ucb/qa/unoapi/makefile.mk0
-rwxr-xr-x[-rw-r--r--]ucb/qa/unoapi/ucb.sce0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/cached.xml0
-rwxr-xr-xucb/source/cacher/cached1.component43
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/cachedcontentresultset.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/cachedcontentresultset.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/cachedcontentresultsetstub.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/cachedcontentresultsetstub.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/cacheddynamicresultset.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/cacheddynamicresultset.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/cacheddynamicresultsetstub.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/cacheddynamicresultsetstub.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/cacheserv.cxx77
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/contentresultsetwrapper.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/contentresultsetwrapper.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/dynamicresultsetwrapper.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/dynamicresultsetwrapper.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/cacher/makefile.mk8
-rwxr-xr-x[-rw-r--r--]ucb/source/core/cmdenv.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/cmdenv.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/exports2.dxp1
-rwxr-xr-x[-rw-r--r--]ucb/source/core/identify.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/identify.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/makefile.mk8
-rwxr-xr-x[-rw-r--r--]ucb/source/core/providermap.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/provprox.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/provprox.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/ucb.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/ucb.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/ucb.xml0
-rwxr-xr-xucb/source/core/ucb1.component46
-rwxr-xr-x[-rw-r--r--]ucb/source/core/ucbcmds.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/ucbcmds.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/ucbprops.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/ucbprops.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/core/ucbserv.cxx87
-rwxr-xr-x[-rw-r--r--]ucb/source/core/ucbstore.cxx2
-rwxr-xr-x[-rw-r--r--]ucb/source/core/ucbstore.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/inc/regexp.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/inc/regexpmap.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/inc/regexpmap.tpt0
-rwxr-xr-x[-rw-r--r--]ucb/source/regexp/makefile.mk0
-rwxr-xr-x[-rw-r--r--]ucb/source/regexp/regexp.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/sorter/makefile.mk8
-rwxr-xr-x[-rw-r--r--]ucb/source/sorter/sortdynres.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/sorter/sortdynres.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/sorter/sortmain.cxx55
-rwxr-xr-x[-rw-r--r--]ucb/source/sorter/sortresult.cxx6
-rwxr-xr-x[-rw-r--r--]ucb/source/sorter/sortresult.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/sorter/srtrs.xml0
-rwxr-xr-xucb/source/sorter/srtrs1.component34
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/expand/makefile.mk8
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/expand/ucpexpand.cxx8
-rwxr-xr-xucb/source/ucp/expand/ucpexpand1.component34
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ext/makefile.mk8
-rwxr-xr-xucb/source/ucp/ext/ucpext.component34
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ext/ucpext_content.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ext/ucpext_content.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ext/ucpext_datasupplier.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ext/ucpext_datasupplier.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ext/ucpext_provider.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ext/ucpext_provider.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ext/ucpext_resultset.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ext/ucpext_resultset.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ext/ucpext_services.cxx6
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/bc.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/bc.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/exports2.dxp1
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filcmd.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filcmd.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filerror.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filglob.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filglob.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filid.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filid.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filinl.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filinpstr.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filinpstr.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filinsreq.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filinsreq.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filnot.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filnot.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filprp.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filprp.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filrec.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filrec.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filrow.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filrow.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filrset.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filrset.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filstr.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filstr.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filtask.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/filtask.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/makefile.mk8
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/prov.cxx54
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/prov.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/shell.cxx38
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/shell.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/file/ucpfile.xml0
-rwxr-xr-xucb/source/ucp/file/ucpfile1.component34
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/curl.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpcfunc.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpcfunc.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpcontainer.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpcontent.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpcontent.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpcontentcaps.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpcontentidentifier.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpcontentidentifier.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpcontentprovider.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpcontentprovider.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpdirp.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpdirp.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpdynresultset.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpdynresultset.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftphandleprovider.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpinpstr.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpinpstr.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpintreq.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpintreq.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftploaderthread.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftploaderthread.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpresultsetI.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpresultsetI.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpresultsetbase.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpresultsetbase.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpresultsetfactory.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpservices.cxx54
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpstrcont.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpurl.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ftpurl.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/makefile.mk17
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/test.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/test.py0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/test_activedatasink.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/test_activedatasink.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/test_ftpurl.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/test_ftpurl.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/test_interactionhandler.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/test_multiservicefac.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/test_multiservicefac.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/ftp/ucpftp.xml0
-rwxr-xr-xucb/source/ucp/ftp/ucpftp1.component34
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_content.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_content.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_datasupplier.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_datasupplier.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_inputstream.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_inputstream.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_mount.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_mount.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_outputstream.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_outputstream.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_provider.cxx43
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_provider.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_resultset.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_resultset.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_seekable.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/gio_seekable.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/makefile.mk10
-rw-r--r--ucb/source/ucp/gio/ucpgio-ucd.txt6
-rwxr-xr-xucb/source/ucp/gio/ucpgio.component34
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gio/ucpgio.xml0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gvfs/gvfs_content.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gvfs/gvfs_content.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gvfs/gvfs_directory.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gvfs/gvfs_directory.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gvfs/gvfs_provider.cxx45
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gvfs/gvfs_provider.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gvfs/gvfs_stream.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gvfs/gvfs_stream.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gvfs/makefile.mk9
-rw-r--r--ucb/source/ucp/gvfs/ucpgvfs-ucd.txt6
-rwxr-xr-xucb/source/ucp/gvfs/ucpgvfs.component34
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/gvfs/ucpgvfs.xml0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/dynamicresultset.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/dynamicresultset.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchycontent.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchycontent.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchydata.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchydata.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchydatasource.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchydatasource.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchyprovider.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchyprovider.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchyservices.cxx63
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchyuri.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/hierarchyuri.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/makefile.mk8
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/hierarchy/ucphier.xml0
-rwxr-xr-xucb/source/ucp/hierarchy/ucphier1.component38
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/inc/urihelper.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/makefile.mk0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma.h0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_content.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_content.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_contentcaps.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_contentprops.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_datasupplier.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_datasupplier.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_inputstream.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_inputstream.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_lib.cxx3
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_lib.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_main.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_provider.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_provider.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_resultset.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_resultset.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_services.cxx39
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/ucpodma.xml0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/makefile.mk8
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkgcontent.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkgcontent.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkgcontentcaps.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkgdatasupplier.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkgdatasupplier.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkgprovider.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkgprovider.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkgresultset.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkgresultset.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkgservices.cxx59
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkguri.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/pkguri.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/package/ucppkg.xml0
-rwxr-xr-xucb/source/ucp/package/ucppkg1.component34
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/makefile.mk8
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_content.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_content.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_contentcaps.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_datasupplier.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_datasupplier.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_docmgr.cxx105
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_docmgr.hxx34
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_provider.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_provider.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_resultset.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_resultset.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_services.cxx62
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_stgelems.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_stgelems.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_storage.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_storage.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_uri.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/tdoc_uri.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/tdoc/ucptdoc.xml0
-rwxr-xr-xucb/source/ucp/tdoc/ucptdoc1.component37
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/ContentProperties.cxx120
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/ContentProperties.hxx38
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVAuthListener.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVException.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVProperties.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVProperties.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVRequestEnvironment.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVResource.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVResourceAccess.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVResourceAccess.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVSession.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVSessionFactory.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVSessionFactory.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DAVTypes.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DateTimeHelper.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/DateTimeHelper.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/LinkSequence.cxx4
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/LinkSequence.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/LockEntrySequence.cxx4
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/LockEntrySequence.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/LockSequence.cxx26
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/LockSequence.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonHeadRequest.cxx89
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonHeadRequest.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonInputStream.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonInputStream.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonLockStore.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonLockStore.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonPropFindRequest.cxx18
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonPropFindRequest.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonSession.cxx20
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonSession.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonTypes.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonUri.cxx18
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/NeonUri.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/PropertyMap.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx4
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/makefile.mk8
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/ucpdav.xml0
-rwxr-xr-xucb/source/ucp/webdav/ucpdav1.component34
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/webdavcontent.cxx65
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/webdavcontent.hxx4
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/webdavcontentcaps.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/webdavdatasupplier.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/webdavdatasupplier.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/webdavprovider.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/webdavprovider.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/webdavresultset.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/webdavresultset.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/webdav/webdavservices.cxx54
-rwxr-xr-x[-rw-r--r--]ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java0
-rwxr-xr-x[-rw-r--r--]ucb/test/com/sun/star/comp/ucb/makefile.mk0
-rwxr-xr-x[-rw-r--r--]ucb/workben/cachemap/cachemapobject1.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/workben/cachemap/cachemapobject1.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/workben/cachemap/cachemapobject2.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/workben/cachemap/cachemapobject3.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/workben/cachemap/cachemapobject3.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/workben/cachemap/cachemapobjectcontainer2.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/workben/cachemap/cachemapobjectcontainer2.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/workben/cachemap/cachemaptest.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/workben/cachemap/makefile.mk0
-rwxr-xr-x[-rw-r--r--]ucb/workben/ucb/makefile.mk0
-rwxr-xr-x[-rw-r--r--]ucb/workben/ucb/srcharg.cxx0
-rwxr-xr-x[-rw-r--r--]ucb/workben/ucb/srcharg.hxx0
-rwxr-xr-x[-rw-r--r--]ucb/workben/ucb/ucbdemo.cxx0
-rwxr-xr-x[-rw-r--r--]uui/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]uui/prj/d.lst1
-rwxr-xr-x[-rw-r--r--]uui/source/alreadyopen.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/alreadyopen.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/alreadyopen.src0
-rwxr-xr-x[-rw-r--r--]uui/source/cookiedg.cxx12
-rwxr-xr-x[-rw-r--r--]uui/source/cookiedg.hrc0
-rwxr-xr-x[-rw-r--r--]uui/source/cookiedg.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/cookiedg.src5
-rwxr-xr-x[-rw-r--r--]uui/source/filechanged.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/filechanged.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/filechanged.src2
-rwxr-xr-x[-rw-r--r--]uui/source/fltdlg.cxx6
-rwxr-xr-x[-rw-r--r--]uui/source/fltdlg.hrc0
-rwxr-xr-x[-rw-r--r--]uui/source/fltdlg.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/fltdlg.src1
-rwxr-xr-x[-rw-r--r--]uui/source/getcontinuations.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/iahndl-authentication.cxx47
-rwxr-xr-x[-rw-r--r--]uui/source/iahndl-cookies.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/iahndl-errorhandler.cxx8
-rwxr-xr-x[-rw-r--r--]uui/source/iahndl-filter.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/iahndl-ioexceptions.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/iahndl-locking.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/iahndl-ssl.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/iahndl.cxx94
-rwxr-xr-x[-rw-r--r--]uui/source/iahndl.hxx4
-rwxr-xr-xuui/source/ids.hrc46
-rwxr-xr-x[-rw-r--r--]uui/source/ids.src0
-rwxr-xr-x[-rw-r--r--]uui/source/interactionhandler.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/interactionhandler.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/lockfailed.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/lockfailed.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/lockfailed.src0
-rwxr-xr-x[-rw-r--r--]uui/source/logindlg.cxx30
-rwxr-xr-x[-rw-r--r--]uui/source/logindlg.hxx14
-rwxr-xr-xuui/source/logindlg.src8
-rwxr-xr-x[-rw-r--r--]uui/source/loginerr.hxx50
-rwxr-xr-x[-rw-r--r--]uui/source/makefile.mk4
-rwxr-xr-x[-rw-r--r--]uui/source/masterpasscrtdlg.cxx2
-rwxr-xr-x[-rw-r--r--]uui/source/masterpasscrtdlg.hrc0
-rwxr-xr-x[-rw-r--r--]uui/source/masterpasscrtdlg.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/masterpasscrtdlg.src4
-rwxr-xr-x[-rw-r--r--]uui/source/masterpassworddlg.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/masterpassworddlg.hrc0
-rwxr-xr-x[-rw-r--r--]uui/source/masterpassworddlg.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/masterpassworddlg.src1
-rwxr-xr-x[-rw-r--r--]uui/source/mphndl.hxx0
-rwxr-xr-xuui/source/nameclashdlg.cxx107
-rwxr-xr-x[-rw-r--r--]uui/source/nameclashdlg.hrc (renamed from svx/inc/srchitem.hxx)17
-rwxr-xr-x[-rw-r--r--]uui/source/nameclashdlg.hxx (renamed from uui/source/passcrtdlg.hxx)53
-rwxr-xr-xuui/source/nameclashdlg.src116
-rwxr-xr-x[-rw-r--r--]uui/source/newerverwarn.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/newerverwarn.hrc0
-rwxr-xr-x[-rw-r--r--]uui/source/newerverwarn.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/newerverwarn.src1
-rwxr-xr-x[-rw-r--r--]uui/source/openlocked.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/openlocked.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/openlocked.src0
-rw-r--r--uui/source/passcrtdlg.cxx128
-rw-r--r--uui/source/passcrtdlg.src108
-rwxr-xr-x[-rw-r--r--]uui/source/passwordcontainer.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/passwordcontainer.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/passworddlg.cxx125
-rwxr-xr-x[-rw-r--r--]uui/source/passworddlg.hrc18
-rwxr-xr-x[-rw-r--r--]uui/source/passworddlg.hxx9
-rwxr-xr-xuui/source/passworddlg.src78
-rwxr-xr-xuui/source/passworderrs.src7
-rwxr-xr-x[-rw-r--r--]uui/source/requeststringresolver.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/requeststringresolver.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/secmacrowarnings.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/secmacrowarnings.hrc0
-rwxr-xr-x[-rw-r--r--]uui/source/secmacrowarnings.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/secmacrowarnings.src2
-rwxr-xr-x[-rw-r--r--]uui/source/services.cxx80
-rwxr-xr-x[-rw-r--r--]uui/source/sslwarndlg.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/sslwarndlg.hrc0
-rwxr-xr-x[-rw-r--r--]uui/source/sslwarndlg.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/sslwarndlg.src3
-rwxr-xr-x[-rw-r--r--]uui/source/trylater.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/trylater.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/trylater.src0
-rwxr-xr-x[-rw-r--r--]uui/source/unknownauthdlg.cxx0
-rwxr-xr-x[-rw-r--r--]uui/source/unknownauthdlg.hrc0
-rwxr-xr-x[-rw-r--r--]uui/source/unknownauthdlg.hxx0
-rwxr-xr-x[-rw-r--r--]uui/source/unknownauthdlg.src4
-rwxr-xr-x[-rw-r--r--]uui/util/makefile.mk8
-rwxr-xr-xuui/util/uui.component44
-rwxr-xr-x[-rw-r--r--]uui/util/uui.xml0
-rwxr-xr-xvbahelper/Library_msforms.mk94
-rwxr-xr-xvbahelper/Library_vbahelper.mk100
-rwxr-xr-xvbahelper/Makefile38
-rwxr-xr-x[-rw-r--r--]vbahelper/Module_vbahelper.mk (renamed from editeng/source/rtf/makefile.mk)33
-rwxr-xr-xvbahelper/Package_inc.mk51
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/helperdecl.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbaaccesshelper.hxx2
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbaapplicationbase.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbacollectionimpl.hxx4
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbadialogbase.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbadialogsbase.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbadllapi.h0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbadocumentbase.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbadocumentsbase.hxx8
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbaeventshelperbase.hxx26
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbafontbase.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbaglobalbase.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbahelper.hxx10
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbahelperinterface.hxx8
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbapagesetupbase.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbapropvalue.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbashape.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbashaperange.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbashapes.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbatextframe.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/inc/vbahelper/vbawindowbase.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/prj/build.lst7
-rwxr-xr-x[-rw-r--r--]vbahelper/prj/d.lst29
-rwxr-xr-xvbahelper/prj/makefile.mk40
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/makefile.mk0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/service.cxx10
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbabutton.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbabutton.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbacheckbox.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbacheckbox.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbacombobox.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbacombobox.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbacontrol.cxx1
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbacontrol.hxx1
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbacontrols.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbacontrols.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbaframe.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbaframe.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbaimage.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbaimage.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbalabel.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbalabel.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbalistbox.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbalistbox.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbalistcontrolhelper.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbalistcontrolhelper.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbamultipage.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbamultipage.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbapages.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbapages.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbaprogressbar.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbaprogressbar.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbaradiobutton.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbaradiobutton.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbascrollbar.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbascrollbar.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbaspinbutton.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbaspinbutton.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbasystemaxcontrol.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbasystemaxcontrol.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbatextbox.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbatextbox.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbatogglebutton.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbatogglebutton.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbauserform.cxx40
-rwxr-xr-x[-rw-r--r--]vbahelper/source/msforms/vbauserform.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/makefile.mk0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbaapplicationbase.cxx73
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacolorformat.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacolorformat.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacommandbar.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacommandbar.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacommandbarcontrol.cxx42
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacommandbarcontrol.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacommandbarcontrols.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacommandbarcontrols.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacommandbarhelper.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacommandbarhelper.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacommandbars.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbacommandbars.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbadialogbase.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbadialogsbase.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbadocumentbase.cxx120
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbadocumentsbase.cxx82
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbaeventshelperbase.cxx29
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbafillformat.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbafillformat.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbafontbase.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbaglobalbase.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbahelper.cxx293
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbalineformat.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbalineformat.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbapagesetupbase.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbapictureformat.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbapictureformat.hxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbapropvalue.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbashape.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbashaperange.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbashapes.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbatextframe.cxx0
-rwxr-xr-x[-rw-r--r--]vbahelper/source/vbahelper/vbawindowbase.cxx2
-rwxr-xr-x[-rw-r--r--]vbahelper/util/makefile.mk0
-rwxr-xr-xvbahelper/util/msforms.component37
-rwxr-xr-x[-rw-r--r--]xmlhelp/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlhelp/inc/pch/precompiled_xmlhelp.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/inc/pch/precompiled_xmlhelp.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/prj/build.lst0
-rwxr-xr-x[-rw-r--r--]xmlhelp/prj/d.lst4
-rwxr-xr-xxmlhelp/source/com/sun/star/help/HelpComponent.java25
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/com/sun/star/help/HelpIndexer.java0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/com/sun/star/help/HelpSearch.java19
-rwxr-xr-xxmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component37
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/com/sun/star/help/MANIFEST.MF0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/com/sun/star/help/helplinker.pmk0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/com/sun/star/help/makefile.mk8
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/inc/qe/Query.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/inc/util/CompressorIterator.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/inc/util/ConceptList.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/inc/util/RandomAccessStream.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/content.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/content.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/contentcaps.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/databases.cxx22
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/databases.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/db.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/db.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/inputstream.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/inputstream.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/provider.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/provider.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/resultset.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/resultset.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/resultsetbase.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/resultsetbase.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/services.cxx55
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/urlparameter.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/provider/urlparameter.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/qe/DocGenerator.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/qe/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/test/abidebug.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/test/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/test/searchdemo.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/util/Decompressor.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/cxxhelp/util/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/treeview/makefile.mk8
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/treeview/tvfactory.cxx57
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/treeview/tvfactory.hxx0
-rwxr-xr-xxmlhelp/source/treeview/tvhlp1.component35
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/treeview/tvread.cxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/source/treeview/tvread.hxx0
-rwxr-xr-x[-rw-r--r--]xmlhelp/util/delzip0
-rwxr-xr-x[-rw-r--r--]xmlhelp/util/embed.xsl0
-rwxr-xr-x[-rw-r--r--]xmlhelp/util/idxcaption.xsl0
-rwxr-xr-x[-rw-r--r--]xmlhelp/util/idxcontent.xsl0
-rwxr-xr-x[-rw-r--r--]xmlhelp/util/main_transform.xsl0
-rwxr-xr-x[-rw-r--r--]xmlhelp/util/makefile.mk8
-rwxr-xr-x[-rw-r--r--]xmlhelp/util/ucpchelp.xml0
-rwxr-xr-xxmlhelp/util/ucpchelp1.component35
-rwxr-xr-x[-rw-r--r--]xmloff/JunitTest_xmloff_unoapi.mk (renamed from editeng/source/misc/makefile.mk)54
-rwxr-xr-xxmloff/Library_xo.mk385
-rwxr-xr-xxmloff/Library_xof.mk93
-rwxr-xr-xxmloff/Makefile38
-rwxr-xr-x[-rw-r--r--]xmloff/Module_xmloff.mk (renamed from svx/source/sdr/primitive3d/makefile.mk)26
-rwxr-xr-xxmloff/Package_dtd.mk45
-rwxr-xr-xxmloff/Package_inc.mk131
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/Blocklist.dtd0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/chart.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/datastyl.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/defs.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/drawing.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/dtypes.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/form.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/meta.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/nmspace.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/office.dtd0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/office.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/openoffice-2.0-schema.rng0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/script.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/settings.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/style.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/table.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/dtd/text.mod0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/AttributeContainerHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/DomBuilderContext.hxx6
-rwxr-xr-x[-rw-r--r--]xmloff/inc/DomExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/EnhancedCustomShapeToken.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/MetaExportComponent.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/MetaImportComponent.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/MultiPropertySetHelper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/PageMasterImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/PropertySetMerger.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/RDFaExportHelper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/RDFaImportHelper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/SchXMLExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/SchXMLImport.hxx22
-rwxr-xr-x[-rw-r--r--]xmloff/inc/StyleMap.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/TransGradientStyle.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLBackgroundImageContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLBackgroundImageExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLBase64Export.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLBasicExportFilter.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLChartPropertySetMapper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLChartStyleContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLClipPropertyHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLElementPropertyContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLEmbeddedObjectImportContext.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLEventImportHelper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLFootnoteConfigurationImportContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLImageMapContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLImageMapExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLIsPercentagePropertyHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLLineNumberingImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLNumberStylesImport.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLRectangleMembersHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLReplacementImageContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLScriptContextFactory.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLScriptExportHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLShapePropertySetContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLStarBasicContextFactory.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLStarBasicExportHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLStringBufferImportContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLTextColumnsContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLTextColumnsExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLTextColumnsPropertyHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/XMLTextHeaderFooterContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/anim.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/animationexport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/animationimport.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/inc/animations.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/animimp.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/inc/forms/form_handler_factory.hxx (renamed from sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java)57
-rwxr-xr-xxmloff/inc/forms/property_handler.hxx84
-rwxr-xr-x[-rw-r--r--]xmloff/inc/forms/property_ids.hxx (renamed from connectivity/qa/connectivity/GeneralTest.java)66
-rwxr-xr-x[-rw-r--r--]xmloff/inc/functional.hxx0
-rw-r--r--xmloff/inc/makefile.mk48
-rwxr-xr-x[-rw-r--r--]xmloff/inc/pch/precompiled_xmloff.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/pch/precompiled_xmloff.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/txtflde.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/inc/txtfldi.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/inc/txtlists.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/txtvfldi.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/unointerfacetouniqueidentifiermapper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xexptran.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmlehelp.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/DashStyle.hxx (renamed from xmloff/inc/DashStyle.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/DocumentSettingsContext.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/EnumPropertyHdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/GradientStyle.hxx (renamed from xmloff/inc/GradientStyle.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/HatchStyle.hxx (renamed from xmloff/inc/HatchStyle.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/ImageStyle.hxx (renamed from xmloff/inc/ImageStyle.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/MarkerStyle.hxx (renamed from xmloff/inc/MarkerStyle.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/NamedBoolPropertyHdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/PageMasterStyleMap.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/ProgressBarHelper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/PropertySetInfoHash.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/PropertySetInfoKey.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/SchXMLExportHelper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/SchXMLImportHelper.hxx10
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/SettingsExportHelper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/SinglePropertySetInfoCache.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/VisAreaContext.hxx (renamed from xmloff/inc/VisAreaContext.hxx)6
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/VisAreaExport.hxx (renamed from xmloff/inc/VisAreaExport.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/WordWrapPropertyHdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLBase64ImportContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLCharContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLConstantsPropertyHandler.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLEmbeddedObjectExportFilter.hxx (renamed from xmloff/inc/XMLEmbeddedObjectExportFilter.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLEventExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLEventsImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLFilterServiceNames.h (renamed from xmloff/inc/XMLFilterServiceNames.h)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLFontAutoStylePool.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLFontStylesContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLGraphicsDefaultStyle.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLPageExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLSettingsExportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLShapeStyleContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLStringVector.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLTextListAutoStylePool.hxx (renamed from xmloff/inc/XMLTextListAutoStylePool.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLTextMasterPageContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLTextMasterPageExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLTextMasterStylesContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLTextShapeImportHelper.hxx (renamed from xmloff/source/text/XMLTextShapeImportHelper.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLTextShapeStyleContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/XMLTextTableContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/animexp.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/attrlist.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/contextid.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/controlpropertyhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/dllapi.h0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/families.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/formlayerexport.hxx3
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/formlayerimport.hxx5
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/formsimp.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/functional.hxx (renamed from sfx2/source/appl/sfxdll.cxx)47
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/i18nmap.hxx (renamed from xmloff/inc/i18nmap.hxx)6
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/maptype.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/nmspmap.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/numehelp.hxx (renamed from xmloff/inc/numehelp.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/odffields.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/prhdlfac.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/prstylei.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/shapeexport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/shapeimport.hxx16
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/styleexp.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/table/XMLTableExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/table/XMLTableImport.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/txtimp.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/txtimppr.hxx (renamed from xmloff/inc/txtimppr.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/txtparae.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/txtprmap.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/txtstyle.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/txtstyli.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/uniref.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/unoatrcn.hxx (renamed from xmloff/inc/unoatrcn.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xformsexport.hxx (renamed from xmloff/inc/xformsexport.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xformsimport.hxx (renamed from xmloff/inc/xformsimport.hxx)4
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlaustp.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlcnimp.hxx12
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlcnitm.hxx (renamed from xmloff/inc/xmlcnitm.hxx)4
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlement.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlerror.hxx (renamed from xmloff/inc/xmlerror.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlevent.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlexp.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlexppr.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlictxt.hxx8
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlimp.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlimppr.hxx0
-rwxr-xr-xxmloff/inc/xmloff/xmlkywd.hxx1998
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlmetae.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlmetai.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlnmspe.hxx (renamed from xmloff/inc/xmlnmspe.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlnume.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlnumfe.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlnumfi.hxx8
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlnumi.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlprcon.hxx6
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlprhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlprmap.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlreg.hxx (renamed from xmloff/inc/xmlreg.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlscripti.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmlstyle.hxx6
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmltabe.hxx (renamed from xmloff/inc/xmltabe.hxx)0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmltkmap.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmltoken.hxx17
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmltypes.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmloff/xmluconv.hxx8
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmltabi.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/inc/xmlversion.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/prj/build.lst19
-rwxr-xr-x[-rw-r--r--]xmloff/prj/d.lst118
-rwxr-xr-xxmloff/prj/makefile.mk40
-rwxr-xr-x[-rw-r--r--]xmloff/qa/unoapi/Test.java5
-rwxr-xr-x[-rw-r--r--]xmloff/qa/unoapi/knownissues.xcl9
-rw-r--r--xmloff/qa/unoapi/makefile.mk48
-rwxr-xr-x[-rw-r--r--]xmloff/qa/unoapi/testdocuments/emptyChart.sdsbin44544 -> 44544 bytes-rwxr-xr-x[-rw-r--r--]xmloff/qa/unoapi/xmloff.sce0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/ColorPropertySet.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/ColorPropertySet.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/MultiPropertySetHandler.hxx30
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/PropertyMap.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/PropertyMaps.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLAutoStylePoolP.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLAutoStylePoolP.hxx0
-rwxr-xr-xxmloff/source/chart/SchXMLAxisContext.cxx1053
-rwxr-xr-xxmloff/source/chart/SchXMLAxisContext.hxx83
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLCalculationSettingsContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLCalculationSettingsContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLChartContext.cxx200
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLChartContext.hxx19
-rwxr-xr-xxmloff/source/chart/SchXMLEnumConverter.cxx104
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLEnumConverter.hxx (renamed from sfx2/source/config/config.hrc)22
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLExport.cxx1111
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLImport.cxx68
-rwxr-xr-xxmloff/source/chart/SchXMLLegendContext.cxx229
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLLegendContext.hxx (renamed from svx/inc/svx/linkwarn.hxx)32
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLParagraphContext.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLParagraphContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLPlotAreaContext.cxx1002
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLPlotAreaContext.hxx65
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLSeries2Context.cxx12
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLSeries2Context.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLSeriesHelper.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLSeriesHelper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLTableContext.cxx86
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLTableContext.hxx10
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLTextListContext.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLTextListContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLTools.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/SchXMLTools.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLChartPropertyContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLChartPropertyContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLChartStyleContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLLabelSeparatorContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLLabelSeparatorContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLSymbolImageContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLSymbolImageContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLTextOrientationHdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/XMLTextOrientationHdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/contexts.cxx10
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/contexts.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/makefile.mk3
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/transporttypes.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/chart/transporttypes.hxx13
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/DocumentSettingsContext.cxx50
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/DomBuilderContext.cxx12
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/DomExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/ProgressBarHelper.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/PropertySetMerger.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/RDFaExportHelper.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/RDFaImportHelper.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/SettingsExportHelper.cxx10
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/XMLBase64Export.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/XMLBase64ImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/XMLBasicExportFilter.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/XMLEmbeddedObjectImportContext.cxx18
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/attrlist.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/facreg.cxx113
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/i18nmap.cxx20
-rw-r--r--xmloff/source/core/makefile.mk76
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/nmspmap.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/unoatrcn.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/xmlcnitm.cxx58
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/xmlehelp.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/xmlenums.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/xmlerror.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/xmlexp.cxx20
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/xmlictxt.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/xmlimp.cxx20
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/xmltkmap.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/xmltoken.cxx17
-rwxr-xr-x[-rw-r--r--]xmloff/source/core/xmluconv.cxx108
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/EnhancedCustomShapeToken.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/XMLGraphicsDefaultStyle.cxx20
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/XMLImageMapContext.cxx10
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/XMLImageMapExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/XMLNumberStyles.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/XMLNumberStylesExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/XMLReplacementImageContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/XMLShapePropertySetContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/XMLShapeStyleContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/animationexport.cxx40
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/animationimport.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/animexp.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/animimp.cxx14
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/descriptionimp.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/descriptionimp.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/eventimp.cxx16
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/eventimp.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/layerexp.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/layerexp.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/layerimp.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/layerimp.hxx2
-rw-r--r--xmloff/source/draw/makefile.mk85
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/numithdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/numithdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/propimp0.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/propimp0.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/sdpropls.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/sdpropls.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/sdxmlexp.cxx54
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/sdxmlexp_impl.hxx16
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/sdxmlimp.cxx30
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/sdxmlimp_impl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/shapeexport.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/shapeexport2.cxx32
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/shapeexport3.cxx12
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/shapeexport4.cxx50
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/shapeimport.cxx14
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/viewcontext.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/viewcontext.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/xexptran.cxx48
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximp3dobject.cxx18
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximp3dobject.hxx10
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximp3dscene.cxx20
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximp3dscene.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpbody.cxx14
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpbody.hxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpcustomshape.cxx11
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpcustomshape.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpgrp.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpgrp.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximplink.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximplink.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpnote.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpnote.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximppage.cxx16
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximppage.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpshap.cxx44
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpshap.hxx22
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpshow.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpshow.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpstyl.cxx10
-rwxr-xr-x[-rw-r--r--]xmloff/source/draw/ximpstyl.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/attriblistmerge.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/attriblistmerge.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/callbacks.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/controlelement.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/controlelement.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/controlpropertyhdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/controlpropertymap.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/controlpropertymap.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/elementexport.cxx129
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/elementexport.hxx7
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/elementimport.cxx515
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/elementimport.hxx65
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/elementimport_impl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/eventexport.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/eventexport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/eventimport.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/eventimport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formattributes.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formattributes.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formcellbinding.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formcellbinding.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formenums.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formenums.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formevents.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formevents.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formlayerexport.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formlayerimport.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formsimp.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formstyles.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/formstyles.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/gridcolumnproptranslator.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/gridcolumnproptranslator.hxx0
-rwxr-xr-xxmloff/source/forms/handler/form_handler_factory.cxx90
-rwxr-xr-xxmloff/source/forms/handler/property_handler_base.cxx61
-rwxr-xr-xxmloff/source/forms/handler/property_handler_base.hxx64
-rwxr-xr-xxmloff/source/forms/handler/vcl_date_handler.cxx114
-rwxr-xr-xxmloff/source/forms/handler/vcl_date_handler.hxx55
-rwxr-xr-xxmloff/source/forms/handler/vcl_time_handler.cxx115
-rwxr-xr-xxmloff/source/forms/handler/vcl_time_handler.hxx58
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/ifacecompare.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/layerexport.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/layerexport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/layerimport.cxx15
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/layerimport.hxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/logging.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/logging.hxx0
-rw-r--r--xmloff/source/forms/makefile.mk70
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/officeforms.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/officeforms.hxx2
-rwxr-xr-xxmloff/source/forms/property_description.hxx140
-rwxr-xr-xxmloff/source/forms/property_group.hxx47
-rwxr-xr-xxmloff/source/forms/property_meta_data.cxx270
-rwxr-xr-xxmloff/source/forms/property_meta_data.hxx68
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/propertyexport.cxx29
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/propertyexport.hxx19
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/propertyimport.cxx13
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/propertyimport.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/strings.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/strings.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/valueproperties.cxx36
-rwxr-xr-x[-rw-r--r--]xmloff/source/forms/valueproperties.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/meta/MetaExportComponent.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/meta/MetaImportComponent.cxx2
-rw-r--r--xmloff/source/meta/makefile.mk53
-rwxr-xr-x[-rw-r--r--]xmloff/source/meta/xmlmetae.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/meta/xmlmetai.cxx14
-rwxr-xr-x[-rw-r--r--]xmloff/source/meta/xmlversion.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/script/XMLEventExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/script/XMLEventImportHelper.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/script/XMLEventsImportContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/script/XMLScriptContextFactory.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/script/XMLScriptExportHandler.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/script/XMLStarBasicContextFactory.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/script/XMLStarBasicExportHandler.cxx2
-rw-r--r--xmloff/source/script/makefile.mk56
-rwxr-xr-x[-rw-r--r--]xmloff/source/script/xmlbasici.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/script/xmlbasici.hxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/script/xmlscripti.cxx10
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/AttributeContainerHandler.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/DashStyle.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/DrawAspectHdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/DrawAspectHdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/EnumPropertyHdl.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/FillStyleContext.cxx24
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/FillStyleContext.hxx12
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/GradientStyle.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/HatchStyle.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/ImageStyle.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/MarkerStyle.cxx10
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/MultiPropertySetHelper.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/NamedBoolPropertyHdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageHeaderFooterContext.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageHeaderFooterContext.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterExportPropMapper.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterExportPropMapper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterImportPropMapper.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterImportPropMapper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterPropHdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterPropHdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterPropHdlFactory.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterPropHdlFactory.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterPropMapper.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterPropMapper.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PageMasterStyleMap.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PagePropertySetContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/PagePropertySetContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/SinglePropertySetInfoCache.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/StyleMap.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/TransGradientStyle.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/VisAreaContext.cxx12
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/VisAreaExport.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/WordWrapPropertyHdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLBackgroundImageContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLBackgroundImageExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLClipPropertyHandler.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLConstantsPropertyHandler.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLElementPropertyContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLFontAutoStylePool.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLFontStylesContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLFootnoteSeparatorExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLFootnoteSeparatorExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLFootnoteSeparatorImport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLFootnoteSeparatorImport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLIsPercentagePropertyHandler.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLPageExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/XMLRectangleMembersHandler.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/adjushdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/adjushdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/backhdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/backhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/bordrhdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/bordrhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/breakhdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/breakhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/cdouthdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/cdouthdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/chrhghdl.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/chrhghdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/chrlohdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/chrlohdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/csmaphdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/csmaphdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/durationhdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/durationhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/escphdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/escphdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/fonthdl.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/fonthdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/impastp1.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/impastp2.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/impastp3.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/impastp4.cxx20
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/impastpl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/kernihdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/kernihdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/lspachdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/lspachdl.hxx0
-rw-r--r--xmloff/source/style/makefile.mk219
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/numehelp.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/opaquhdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/opaquhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/postuhdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/postuhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/prhdlfac.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/prstylei.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/shadwhdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/shadwhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/shdwdhdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/shdwdhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/styleexp.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/tabsthdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/tabsthdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/undlihdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/undlihdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/uniref.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/weighhdl.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/weighhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlaustp.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlbahdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlbahdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlexppr.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlimppr.cxx14
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlnume.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlnumfe.cxx22
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlnumfi.cxx112
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlnumi.cxx14
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlprcon.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlprhdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlprmap.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmlstyle.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmltabe.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/style/xmltabi.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/table/XMLTableExport.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/table/XMLTableImport.cxx54
-rw-r--r--xmloff/source/table/makefile.mk48
-rwxr-xr-x[-rw-r--r--]xmloff/source/table/table.hxx0
-rw-r--r--xmloff/source/table/tabledesignsimporter.cxx106
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLAnchorTypePropHdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLAutoMarkFileContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLAutoMarkFileContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLAutoTextContainerEventImport.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLAutoTextContainerEventImport.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLAutoTextEventExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLAutoTextEventExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLAutoTextEventImport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLAutoTextEventImport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLCalculationSettingsContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLCalculationSettingsContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLChangeElementImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLChangeElementImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLChangeImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLChangeImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLChangeInfoContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLChangeInfoContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLChangedRegionImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLChangedRegionImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLFootnoteBodyImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLFootnoteBodyImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLFootnoteImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLFootnoteImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexBibliographyEntryContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexBibliographyEntryContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexBibliographySourceContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexBibliographySourceContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexBodyContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexBodyContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexIllustrationSourceContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexIllustrationSourceContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexMarkExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexMarkExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexObjectSourceContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexObjectSourceContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexSimpleEntryContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexSimpleEntryContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexSourceBaseContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexSourceBaseContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexSpanEntryContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexSpanEntryContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTOCContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTOCContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTOCSourceContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTOCSourceContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTOCStylesContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTOCStylesContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTabStopEntryContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTabStopEntryContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTableSourceContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTableSourceContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTemplateContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTemplateContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTitleTemplateContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexTitleTemplateContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexUserSourceContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLIndexUserSourceContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLLineNumberingExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLLineNumberingExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLLineNumberingImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLPropertyBackpatcher.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLPropertyBackpatcher.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLRedlineExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLRedlineExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionFootnoteConfigExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionFootnoteConfigExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionFootnoteConfigImport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionFootnoteConfigImport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionSourceDDEImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionSourceDDEImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionSourceImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLSectionSourceImportContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLStringBufferImportContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextColumnsContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextColumnsExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextFrameContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextFrameContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextFrameHyperlinkContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextFrameHyperlinkContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextHeaderFooterContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextListAutoStylePool.cxx12
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextListBlockContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextListBlockContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextListItemContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextListItemContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextMarkImportContext.cxx9
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextMarkImportContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextMasterPageContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextMasterPageExport.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextMasterStylesContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextNumRuleInfo.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextNumRuleInfo.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextPropertySetContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextPropertySetContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextShapeImportHelper.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextShapeStyleContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTextTableContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTrackedChangesImportContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/XMLTrackedChangesImportContext.hxx0
-rw-r--r--xmloff/source/text/makefile.mk127
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtdrope.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtdrope.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtdropi.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtdropi.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtexppr.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtexppr.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtflde.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtfldi.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtftne.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtimp.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtimppr.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtlists.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtparae.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtparai.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtparai.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtparaimphint.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtprhdl.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtprhdl.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtprmap.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtsecte.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtstyle.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtstyli.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/text/txtvfldi.cxx10
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ActionMapTypesOASIS.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ActionMapTypesOOo.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/AttrTransformerAction.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ChartOASISTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ChartOASISTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ChartOOoTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ChartOOoTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ChartPlotAreaOASISTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ChartPlotAreaOASISTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ChartPlotAreaOOoTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ChartPlotAreaOOoTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ControlOASISTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ControlOASISTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ControlOOoTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ControlOOoTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/CreateElemTContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/CreateElemTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/DeepTContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/DeepTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/DlgOASISTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/DlgOASISTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/DocumentTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/DocumentTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ElemTransformerAction.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/EventMap.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/EventMap.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/EventOASISTContext.cxx12
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/EventOASISTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/EventOOoTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/EventOOoTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/FamilyType.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/FlatTContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/FlatTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/FormPropOASISTContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/FormPropOASISTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/FormPropOOoTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/FormPropOOoTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/FrameOASISTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/FrameOASISTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/FrameOOoTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/FrameOOoTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/IgnoreTContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/IgnoreTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/MergeElemTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/MergeElemTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/MetaTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/MetaTContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/MutableAttrList.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/MutableAttrList.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/NotesTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/NotesTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/OOo2Oasis.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/OOo2Oasis.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/Oasis2OOo.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/Oasis2OOo.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/PersAttrListTContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/PersAttrListTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/PersMixedContentTContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/PersMixedContentTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ProcAddAttrTContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ProcAddAttrTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ProcAttrTContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/ProcAttrTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/PropType.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/PropertyActionsOASIS.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/PropertyActionsOASIS.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/PropertyActionsOOo.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/PropertyActionsOOo.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/RenameElemTContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/RenameElemTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/StyleOASISTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/StyleOASISTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/StyleOOoTContext.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/StyleOOoTContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/TContextVector.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/Transformer.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/TransformerAction.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/TransformerActionInit.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/TransformerActions.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/TransformerActions.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/TransformerBase.cxx14
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/TransformerBase.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/TransformerContext.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/TransformerContext.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/TransformerTokenMap.cxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/TransformerTokenMap.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/transform/XMLFilterRegistration.cxx37
-rw-r--r--xmloff/source/transform/makefile.mk95
-rwxr-xr-xxmloff/source/transform/xof.component118
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/SchemaContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/SchemaContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/SchemaRestrictionContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/SchemaRestrictionContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/SchemaSimpleTypeContext.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/SchemaSimpleTypeContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/TokenContext.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/TokenContext.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/XFormsBindContext.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/XFormsBindContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/XFormsInstanceContext.cxx8
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/XFormsInstanceContext.hxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/XFormsModelContext.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/XFormsModelContext.hxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/XFormsModelExport.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/XFormsSubmissionContext.cxx6
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/XFormsSubmissionContext.hxx2
-rw-r--r--xmloff/source/xforms/makefile.mk58
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/xformsapi.cxx2
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/xformsapi.hxx0
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/xformsexport.cxx4
-rwxr-xr-x[-rw-r--r--]xmloff/source/xforms/xformsimport.cxx4
-rw-r--r--xmloff/util/makefile.mk83
-rwxr-xr-xxmloff/util/xo.component178
-rwxr-xr-x[-rw-r--r--]xmloff/xml/components.xml0
-rwxr-xr-x[-rw-r--r--]xmlscript/dtd/dialog.dtd0
-rwxr-xr-x[-rw-r--r--]xmlscript/dtd/libraries.dtd0
-rwxr-xr-x[-rw-r--r--]xmlscript/dtd/library.dtd0
-rwxr-xr-x[-rw-r--r--]xmlscript/dtd/module.dtd0
-rwxr-xr-x[-rw-r--r--]xmlscript/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlscript/inc/pch/precompiled_xmlscript.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/inc/pch/precompiled_xmlscript.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/inc/xmlscript/xml_helper.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/inc/xmlscript/xml_import.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/inc/xmlscript/xmldlg_imexp.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/inc/xmlscript/xmllib_imexp.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/inc/xmlscript/xmlmod_imexp.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/inc/xmlscript/xmlns.h0
-rwxr-xr-x[-rw-r--r--]xmlscript/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]xmlscript/prj/d.lst1
-rwxr-xr-x[-rw-r--r--]xmlscript/source/inc/misc.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/misc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/misc/unoservices.cxx9
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xml_helper/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xml_helper/xml_byteseq.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xml_helper/xml_element.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xml_helper/xml_impctx.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmldlg_imexp/common.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmldlg_imexp/exp_share.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmldlg_imexp/imp_share.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmldlg_imexp/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmldlg_imexp/xmldlg_export.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmldlg_imexp/xmldlg_import.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmlflat_imexp/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmlflat_imexp/xmlbas_export.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmlflat_imexp/xmlbas_export.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmlflat_imexp/xmlbas_import.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmlflat_imexp/xmlbas_import.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmllib_imexp/imp_share.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmllib_imexp/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmllib_imexp/xmllib_export.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmllib_imexp/xmllib_import.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmlmod_imexp/imp_share.hxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmlmod_imexp/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmlmod_imexp/xmlmod_export.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/source/xmlmod_imexp/xmlmod_import.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/test/imexp.cxx0
-rwxr-xr-x[-rw-r--r--]xmlscript/test/makefile.mk0
-rwxr-xr-x[-rw-r--r--]xmlscript/test/test.xml0
-rwxr-xr-x[-rw-r--r--]xmlscript/test/w3c.jpgbin2028 -> 2028 bytes-rwxr-xr-x[-rw-r--r--]xmlscript/util/makefile.mk8
-rwxr-xr-x[-rw-r--r--]xmlscript/util/target.pmk0
-rwxr-xr-xxmlscript/util/xcr.component46
-rwxr-xr-x[-rw-r--r--]xmlscript/util/xcr.flt0
8533 files changed, 90954 insertions, 72192 deletions
diff --git a/.gitignore b/.gitignore
index 25df1065c1ec..25df1065c1ec 100644..100755
--- a/.gitignore
+++ b/.gitignore
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index 753deeec6d52..4ae504fc58c9 100644..100755
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -70,7 +70,7 @@ class MediaItem : public SfxPoolItem
public:
TYPEINFO();
- MediaItem( USHORT nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE );
+ MediaItem( sal_uInt16 nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE );
MediaItem( const MediaItem& rMediaItem );
virtual ~MediaItem();
@@ -81,8 +81,8 @@ public:
SfxMapUnit ePresUnit,
XubString& rText,
const IntlWrapper *pIntl ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
void merge( const MediaItem& rMediaItem );
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index 2c2704a5e657..2d49f80e2af7 100644..100755
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -53,7 +53,7 @@ namespace avmedia
class MediaPlayer : public SfxChildWindow
{
public:
- MediaPlayer( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+ MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
~MediaPlayer();
SFX_DECL_CHILDWINDOW( MediaPlayer );
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index 1f0fd47b18bd..3b5023a4c908 100644..100755
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -49,10 +49,10 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
- MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbX );
+ MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX );
~MediaToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window* pParent );
private:
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index fd56282d284c..fd56282d284c 100644..100755
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index 2d7ccd764762..4b1d2e04d628 100644..100755
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -28,19 +28,17 @@
#ifndef _AVMEDIA_HELPIDS_HRC
#define _AVMEDIA_HELPIDS_HRC
-#include <svl/solar.hrc>
-
-#define HID_AVMEDIA_TOOLBOXITEM_PLAY (HID_AVMEDIA_START+0)
-#define HID_AVMEDIA_TOOLBOXITEM_PAUSE (HID_AVMEDIA_START+1)
-#define HID_AVMEDIA_TOOLBOXITEM_STOP (HID_AVMEDIA_START+2)
-#define HID_AVMEDIA_TOOLBOXITEM_MUTE (HID_AVMEDIA_START+3)
-#define HID_AVMEDIA_TOOLBOXITEM_LOOP (HID_AVMEDIA_START+4)
-#define HID_AVMEDIA_TOOLBOXITEM_OPEN (HID_AVMEDIA_START+5)
-#define HID_AVMEDIA_TOOLBOXITEM_INSERT (HID_AVMEDIA_START+6)
-#define HID_AVMEDIA_ZOOMLISTBOX (HID_AVMEDIA_START+7)
-#define HID_AVMEDIA_TIMESLIDER (HID_AVMEDIA_START+8)
-#define HID_AVMEDIA_TIMEEDIT (HID_AVMEDIA_START+9)
-#define HID_AVMEDIA_VOLUMESLIDER (HID_AVMEDIA_START+10)
-#define HID_AVMEDIA_PLAYERWINDOW (HID_AVMEDIA_START+11)
+#define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"
+#define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"
+#define HID_AVMEDIA_TOOLBOXITEM_STOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP"
+#define HID_AVMEDIA_TOOLBOXITEM_MUTE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE"
+#define HID_AVMEDIA_TOOLBOXITEM_LOOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP"
+#define HID_AVMEDIA_TOOLBOXITEM_OPEN "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN"
+#define HID_AVMEDIA_TOOLBOXITEM_INSERT "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT"
+#define HID_AVMEDIA_ZOOMLISTBOX "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX"
+#define HID_AVMEDIA_TIMESLIDER "AVMEDIA_HID_AVMEDIA_TIMESLIDER"
+#define HID_AVMEDIA_TIMEEDIT "AVMEDIA_HID_AVMEDIA_TIMEEDIT"
+#define HID_AVMEDIA_VOLUMESLIDER "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"
+#define HID_AVMEDIA_PLAYERWINDOW "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"
#endif // _AVMEDIA_HELPIDS_HRC
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 022a32eb9586..022a32eb9586 100644..100755
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
diff --git a/avmedia/prj/build.lst b/avmedia/prj/build.lst
index 025e85097323..7d9343b916fd 100644..100755
--- a/avmedia/prj/build.lst
+++ b/avmedia/prj/build.lst
@@ -1,4 +1,4 @@
-av avmedia : l10n tools sfx2 NULL
+av avmedia : L10N:l10n tools sfx2 LIBXSLT:libxslt NULL
av avmedia usr1 - all av_mkout NULL
av avmedia\prj get - all av_prj NULL
av avmedia\inc get - all av_inv NULL
@@ -7,5 +7,5 @@ av avmedia\source\framework nmake - all av_framework NULL
av avmedia\source\win nmake - all av_win NULL
av avmedia\source\java nmake - all av_java NULL
av avmedia\source\quicktime nmake - all av_quicktime NULL
-av avmedia\source\gstreamer nmake - all av_gstreamer NULL
+av avmedia\source\gstreamer nmake - all av_gstreamer NULL
av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_quicktime av_gstreamer NULL
diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst
index c82db252aab8..eb140ed45770 100644..100755
--- a/avmedia/prj/d.lst
+++ b/avmedia/prj/d.lst
@@ -16,3 +16,8 @@ mkdir: %_DEST%\inc%_EXT%\avmedia
..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc%_EXT%\avmedia\mediatoolbox.hxx
..\%__SRC%\class\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
+..\%__SRC%\misc\avmedia.component %_DEST%\xml%_EXT%\avmedia.component
+..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml%_EXT%\avmedia.jar.component
+..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml%_EXT%\avmediaQuickTime.component
+..\%__SRC%\misc\avmediagst.component %_DEST%\xml%_EXT%\avmediagst.component
+..\%__SRC%\misc\avmediawin.component %_DEST%\xml%_EXT%\avmediawin.component
diff --git a/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
index 4c814c534844..4c814c534844 100644..100755
--- a/avmedia/source/framework/makefile.mk
+++ b/avmedia/source/framework/makefile.mk
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 110900071d3b..e69d4d3b93a0 100644..100755
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -87,13 +87,11 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) );
SetBackground();
- SetPaintTransparent( TRUE );
+ SetPaintTransparent( sal_True );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
{
-
-
maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN );
@@ -104,16 +102,14 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
}
else
{
- maTimeSlider.SetBackground();
- maVolumeSlider.SetBackground();
mpZoomListBox->SetBackground();
maZoomToolBox.SetBackground();
- maZoomToolBox.SetPaintTransparent( TRUE );
+ maZoomToolBox.SetPaintTransparent( sal_True );
maPlayToolBox.SetBackground();
- maPlayToolBox.SetPaintTransparent( TRUE );
+ maPlayToolBox.SetPaintTransparent( sal_True );
maMuteToolBox.SetBackground();
- maMuteToolBox.SetPaintTransparent( TRUE );
+ maMuteToolBox.SetPaintTransparent( sal_True );
}
@@ -367,7 +363,7 @@ void MediaControl::implUpdateToolboxes()
if( !mpZoomListBox->IsTravelSelect() && !mpZoomListBox->IsInDropDown() )
{
- USHORT nSelectEntryPos ;
+ sal_uInt16 nSelectEntryPos ;
switch( maItem.getZoom() )
{
@@ -459,7 +455,7 @@ void MediaControl::implUpdateTimeField( double fCurTime )
Image MediaControl::implGetImage( sal_Int32 nImageId ) const
{
- return maImageList.GetImage( static_cast< USHORT >( nImageId ) );
+ return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
}
// ------------------------------------------------------------------------------
diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc
index f69ab937f5f5..f69ab937f5f5 100644..100755
--- a/avmedia/source/framework/mediacontrol.hrc
+++ b/avmedia/source/framework/mediacontrol.hrc
diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
index 22ddc29b3550..22ddc29b3550 100644..100755
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 5ed6c0d4ea69..d89d2db77e4e 100644..100755
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -51,7 +51,7 @@ TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem );
// ------------------------------------------------------------------------------
-MediaItem::MediaItem( USHORT _nWhich, sal_uInt32 nMaskSet ) :
+MediaItem::MediaItem( sal_uInt16 _nWhich, sal_uInt32 nMaskSet ) :
SfxPoolItem( _nWhich ),
mnMaskSet( nMaskSet ),
meState( MEDIASTATE_STOP ),
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 882f5db55d9c..882f5db55d9c 100644..100755
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index af6fde31d984..350e4e92bbe2 100644..100755
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -46,7 +46,7 @@ namespace avmedia
// - MediaPlayer -
// ---------------
-MediaPlayer::MediaPlayer( Window* _pParent, USHORT nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
+MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
{
pWindow = new MediaFloater( _pBindings, this, _pParent );
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index e6c7750b37a4..cb795692011b 100644..100755
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -96,7 +96,7 @@ SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem )
// -----------------------------------------------------------------------------
-MediaToolBoxControl::MediaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.Invalidate();
@@ -110,7 +110,7 @@ MediaToolBoxControl::~MediaToolBoxControl()
// -----------------------------------------------------------------------------
-void MediaToolBoxControl::StateChanged( USHORT /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
+void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
{
MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index aba551d8f928..872106443732 100644..100755
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -494,44 +494,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
- sal_Bool bRet = sal_False;
-
- if( pRegistryKey )
- {
- try
- {
- rtl::OUString sKeyName = DECLARE_ASCII( "/" );
- sKeyName += avmedia::SoundHandler::impl_getStaticImplementationName();
- sKeyName += DECLARE_ASCII( "/UNO/SERVICES" );
- css::uno::Reference< css::registry::XRegistryKey > xNewKey(
- static_cast< css::registry::XRegistryKey* >( pRegistryKey )->createKey(sKeyName));
-
- if ( xNewKey.is() == sal_True )
- {
- css::uno::Sequence< ::rtl::OUString > seqServiceNames = avmedia::SoundHandler::impl_getStaticSupportedServiceNames();
- const ::rtl::OUString* pArray = seqServiceNames.getArray();
- sal_Int32 nLength = seqServiceNames.getLength();
- for ( sal_Int32 nCounter = 0; nCounter < nLength; ++nCounter )
- xNewKey->createKey( pArray[nCounter] );
- }
-
- bRet = sal_True;
- }
- catch( css::registry::InvalidRegistryException& )
- {
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
- }
- }
-
- return bRet;
-}
-
// ------------------------
// - component_getFactory -
// ------------------------
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index 0544ee41071b..0544ee41071b 100644..100755
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
diff --git a/avmedia/source/framework/soundhandler.xml b/avmedia/source/framework/soundhandler.xml
index 065b31a2c402..065b31a2c402 100644..100755
--- a/avmedia/source/framework/soundhandler.xml
+++ b/avmedia/source/framework/soundhandler.xml
diff --git a/avmedia/source/gstreamer/ChangeLog b/avmedia/source/gstreamer/ChangeLog
index 8671b11a9720..8671b11a9720 100644..100755
--- a/avmedia/source/gstreamer/ChangeLog
+++ b/avmedia/source/gstreamer/ChangeLog
diff --git a/avmedia/source/gstreamer/avmediagst.component b/avmedia/source/gstreamer/avmediagst.component
new file mode 100755
index 000000000000..75d39d275f5c
--- /dev/null
+++ b/avmedia/source/gstreamer/avmediagst.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.avmedia.Manager_GStreamer">
+ <service name="com.sun.star.media.Manager_GStreamer"/>
+ </implementation>
+</component>
diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/avmedia/source/gstreamer/exports.dxp
+++ b/avmedia/source/gstreamer/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
index 1d9b5caaff96..1d9b5caaff96 100644..100755
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index e0b161c483fc..e0b161c483fc 100644..100755
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index fc0795221a88..fc0795221a88 100644..100755
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
index 558b94956304..558b94956304 100644..100755
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index 2d83215402df..2d83215402df 100644..100755
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index f6ea7295a540..f6ea7295a540 100644..100755
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 02839dc9b2bd..02839dc9b2bd 100644..100755
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 36ac2182fa00..36ac2182fa00 100644..100755
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 4e0f6f3c3dfb..4e0f6f3c3dfb 100644..100755
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index b63e769e3fc1..b63e769e3fc1 100644..100755
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk
index 2f52b9cc4732..2f52b9cc4732 100644..100755
--- a/avmedia/source/gstreamer/makefile.mk
+++ b/avmedia/source/gstreamer/makefile.mk
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index c09e6e098e83..85e14abf9fb2 100644..100755
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -34,12 +34,30 @@ class ResMgr;
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
#else
#ifdef WNT
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1 ""
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 sal_False
+
#else
#ifdef QUARTZ
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_QuickTime"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_QuickTime"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1 ""
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 sal_False
+
#else
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
+
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED sal_False
+
+#define AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1 "com.sun.star.comp.avmedia.Manager_Java"
+#define AVMEDIA_MANAGER_SERVICE_IS_JAVABASED_FALLBACK1 sal_True
+
#endif
#endif
#endif
diff --git a/avmedia/source/java/FrameGrabber.java b/avmedia/source/java/FrameGrabber.java
index 1a0deda4ce57..1a0deda4ce57 100644..100755
--- a/avmedia/source/java/FrameGrabber.java
+++ b/avmedia/source/java/FrameGrabber.java
diff --git a/avmedia/source/java/Manager.java b/avmedia/source/java/Manager.java
index 47707478fd5b..47707478fd5b 100644..100755
--- a/avmedia/source/java/Manager.java
+++ b/avmedia/source/java/Manager.java
diff --git a/avmedia/source/java/MediaUno.java b/avmedia/source/java/MediaUno.java
index ca7a164586d8..3e4387840741 100644..100755
--- a/avmedia/source/java/MediaUno.java
+++ b/avmedia/source/java/MediaUno.java
@@ -64,13 +64,4 @@ public class MediaUno
return null;
}
-
- // -------------------------------------------------------------------------
-
- public static boolean __writeRegistryServiceInfo(
- com.sun.star.registry.XRegistryKey regKey )
- {
- return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(
- s_implName, s_serviceName, regKey );
- }
}
diff --git a/avmedia/source/java/Player.java b/avmedia/source/java/Player.java
index be3b3d62d367..be3b3d62d367 100644..100755
--- a/avmedia/source/java/Player.java
+++ b/avmedia/source/java/Player.java
diff --git a/avmedia/source/java/PlayerWindow.java b/avmedia/source/java/PlayerWindow.java
index 229c651d9f54..2229e4f1644b 100644..100755
--- a/avmedia/source/java/PlayerWindow.java
+++ b/avmedia/source/java/PlayerWindow.java
@@ -67,9 +67,7 @@ public class PlayerWindow implements java.awt.event.KeyListener,
maFrame = new WindowAdapter( AnyConverter.toInt( aArgs[ 0 ] ) );
maFrame.setPosSize( aBoundRect.X, aBoundRect.Y, aBoundRect.Width, aBoundRect.Height, (short) 0 );
-
- if( aArgs.length > 2 )
- mbShowControls = AnyConverter.toBoolean( aArgs[ 2 ] );
+ mbShowControls = false;
java.awt.Panel aPanel = new java.awt.Panel( new java.awt.BorderLayout() );
diff --git a/avmedia/source/java/WindowAdapter.java b/avmedia/source/java/WindowAdapter.java
index bd11aec5e738..bd11aec5e738 100644..100755
--- a/avmedia/source/java/WindowAdapter.java
+++ b/avmedia/source/java/WindowAdapter.java
diff --git a/avmedia/source/java/avmedia.jar b/avmedia/source/java/avmedia.jar
index 55576baa5b34..85a98bbcf33c 100644..100755
--- a/avmedia/source/java/avmedia.jar
+++ b/avmedia/source/java/avmedia.jar
Binary files differ
diff --git a/avmedia/source/java/avmedia.jar.component b/avmedia/source/java/avmedia.jar.component
new file mode 100755
index 000000000000..d7cc160bd7d0
--- /dev/null
+++ b/avmedia/source/java/avmedia.jar.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.media.Manager_Java">
+ <service name="com.sun.star.media.Manager_Java"/>
+ </implementation>
+</component>
diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
index 37c53a721164..1fe771c117f2 100644..100755
--- a/avmedia/source/java/makefile.mk
+++ b/avmedia/source/java/makefile.mk
@@ -59,3 +59,11 @@ CUSTOMMANIFESTFILE = manifest
# --- Targets ------------------------------------------------------
.INCLUDE: target.mk
+
+ALLTAR : $(MISC)/avmedia.jar.component
+
+$(MISC)/avmedia.jar.component .ERRREMOVE : \
+ $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_JAVA)avmedia.jar' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component
diff --git a/avmedia/source/java/manifest b/avmedia/source/java/manifest
index fa9c2500d385..fa9c2500d385 100644..100755
--- a/avmedia/source/java/manifest
+++ b/avmedia/source/java/manifest
diff --git a/avmedia/source/java/win/SystemWindowAdapter.java b/avmedia/source/java/win/SystemWindowAdapter.java
index ebf3cac99307..ebf3cac99307 100644..100755
--- a/avmedia/source/java/win/SystemWindowAdapter.java
+++ b/avmedia/source/java/win/SystemWindowAdapter.java
diff --git a/avmedia/source/java/x11/SystemWindowAdapter.java b/avmedia/source/java/x11/SystemWindowAdapter.java
index 4292dabe6775..4292dabe6775 100644..100755
--- a/avmedia/source/java/x11/SystemWindowAdapter.java
+++ b/avmedia/source/java/x11/SystemWindowAdapter.java
diff --git a/avmedia/source/quicktime/avmediaQuickTime.component b/avmedia/source/quicktime/avmediaQuickTime.component
new file mode 100755
index 000000000000..aa0251d74c9d
--- /dev/null
+++ b/avmedia/source/quicktime/avmediaQuickTime.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.avmedia.Manager_QuickTime">
+ <service name="com.sun.star.media.Manager_QuickTime"/>
+ </implementation>
+</component>
diff --git a/avmedia/source/quicktime/framegrabber.cxx b/avmedia/source/quicktime/framegrabber.cxx
index 5da2aa2f2836..5da2aa2f2836 100644..100755
--- a/avmedia/source/quicktime/framegrabber.cxx
+++ b/avmedia/source/quicktime/framegrabber.cxx
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 8fa2b5b5fc95..8fa2b5b5fc95 100644..100755
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
index f3c9f244f357..358fce491847 100644..100755
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -83,3 +83,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
dummy:
@echo " Nothing to build for GUIBASE=$(GUIBASE)"
.ENDIF
+
+ALLTAR : $(MISC)/avmediaQuickTime.component
+
+$(MISC)/avmediaQuickTime.component .ERRREMOVE : \
+ $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
diff --git a/avmedia/source/quicktime/manager.cxx b/avmedia/source/quicktime/manager.cxx
index ca8da8e5d8b4..ca8da8e5d8b4 100644..100755
--- a/avmedia/source/quicktime/manager.cxx
+++ b/avmedia/source/quicktime/manager.cxx
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 8c8749683ce7..8c8749683ce7 100644..100755
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
index d2ca846f053a..d2ca846f053a 100644..100755
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index e7b35c9d5017..e7b35c9d5017 100644..100755
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index f0d9996c193f..f0d9996c193f 100644..100755
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx
index 6301fd655ed3..275c9446e23b 100644..100755
--- a/avmedia/source/quicktime/quicktimeuno.cxx
+++ b/avmedia/source/quicktime/quicktimeuno.cxx
@@ -49,35 +49,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey )
-{
- sal_Bool bRet = sal_False;
-
- if( pRegistryKey )
- {
- try
- {
- uno::Reference< registry::XRegistryKey > xNewKey1(
- static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "/" AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/"
- AVMEDIA_QUICKTIME_MANAGER_SERVICENAME )) ) );
-
- bRet = sal_True;
- }
- catch( registry::InvalidRegistryException& )
- {
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
- }
- }
-
- return bRet;
-}
-
// ------------------------
// - component_getFactory -
// ------------------------
diff --git a/avmedia/source/quicktime/window.cxx b/avmedia/source/quicktime/window.cxx
index 3f5aa3dc54d5..3f5aa3dc54d5 100644..100755
--- a/avmedia/source/quicktime/window.cxx
+++ b/avmedia/source/quicktime/window.cxx
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index e782e6367af9..e782e6367af9 100644..100755
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
diff --git a/avmedia/source/viewer/makefile.mk b/avmedia/source/viewer/makefile.mk
index 7771d1eb0528..7771d1eb0528 100644..100755
--- a/avmedia/source/viewer/makefile.mk
+++ b/avmedia/source/viewer/makefile.mk
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 0e8dfe0ca295..f7cd33409cea 100644..100755
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -118,7 +118,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt
if( mpNotifyWindow )
{
MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
- sal::static_int_cast< USHORT >(e.ClickCount),
+ sal::static_int_cast< sal_uInt16 >(e.ClickCount),
0,
( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
@@ -139,7 +139,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
if( mpNotifyWindow )
{
MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
- sal::static_int_cast< USHORT >(e.ClickCount),
+ sal::static_int_cast< sal_uInt16 >(e.ClickCount),
0,
( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 9f282a90688f..9f282a90688f 100644..100755
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 3b6c28ef93dd..9e784ca6e19a 100644..100755
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -163,7 +163,9 @@ Size MediaWindow::getPreferredSize() const
void MediaWindow::setPosSize( const Rectangle& rNewRect )
{
if( mpImpl )
+ {
mpImpl->setPosSize( rNewRect );
+ }
}
// -------------------------------------------------------------------------
@@ -370,6 +372,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
"AVI", "avi",
"CD Audio", "cda",
"FLAC Audio", "flac",
+ "Matroska Media", "mkv",
"MIDI Audio", "mid;midi",
"MPEG Audio", "mp2;mp3;mpa",
"MPEG Video", "mpg;mpeg;mpv;mp4",
@@ -466,39 +469,26 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
{
if( bDeep || pPreferredSizePixel )
{
- uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-
- if( xFactory.is() )
+ try
{
- try
- {
- fprintf(stderr, "-->%s uno reference \n\n",AVMEDIA_MANAGER_SERVICE_NAME);
+ uno::Reference< media::XPlayer > xPlayer( priv::MediaWindowImpl::createPlayer(
+ aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) );
- uno::Reference< ::com::sun::star::media::XManager > xManager(
- xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MANAGER_SERVICE_NAME )) ),
- uno::UNO_QUERY );
+ if( xPlayer.is() )
+ {
+ bRet = true;
- if( xManager.is() )
+ if( pPreferredSizePixel )
{
- uno::Reference< media::XPlayer > xPlayer( xManager->createPlayer( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) );
-
- if( xPlayer.is() )
- {
- bRet = true;
+ const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
- if( pPreferredSizePixel )
- {
- const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
-
- pPreferredSizePixel->Width() = aAwtSize.Width;
- pPreferredSizePixel->Height() = aAwtSize.Height;
- }
- }
+ pPreferredSizePixel->Width() = aAwtSize.Width;
+ pPreferredSizePixel->Height() = aAwtSize.Height;
}
}
- catch( ... )
- {
- }
+ }
+ catch( ... )
+ {
}
}
else
diff --git a/avmedia/source/viewer/mediawindow.hrc b/avmedia/source/viewer/mediawindow.hrc
index 67036e300c13..67036e300c13 100644..100755
--- a/avmedia/source/viewer/mediawindow.hrc
+++ b/avmedia/source/viewer/mediawindow.hrc
diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
index 1c92b4d913af..1c92b4d913af 100644..100755
--- a/avmedia/source/viewer/mediawindow.src
+++ b/avmedia/source/viewer/mediawindow.src
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 787a5087129b..2d4578639110 100644..100755
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -94,11 +94,7 @@ void MediaWindowControl::execute( const MediaItem& rItem )
// --------------------
MediaChildWindow::MediaChildWindow( Window* pParent ) :
-#ifdef GSTREAMER
SystemChildWindow( pParent, WB_CLIPCHILDREN )
-#else
- JavaChildWindow( pParent, WB_CLIPCHILDREN )
-#endif
{
}
@@ -115,11 +111,7 @@ void MediaChildWindow::MouseMove( const MouseEvent& rMEvt )
const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
-#ifdef GSTREAMER
SystemChildWindow::MouseMove( rMEvt );
-#else
- JavaChildWindow::MouseMove( rMEvt );
-#endif
GetParent()->MouseMove( aTransformedEvent );
}
@@ -130,11 +122,7 @@ void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt )
const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
-#ifdef GSTREAMER
SystemChildWindow::MouseButtonDown( rMEvt );
-#else
- JavaChildWindow::MouseButtonDown( rMEvt );
-#endif
GetParent()->MouseButtonDown( aTransformedEvent );
}
@@ -145,11 +133,7 @@ void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
-#ifdef GSTREAMER
SystemChildWindow::MouseButtonUp( rMEvt );
-#else
- JavaChildWindow::MouseButtonUp( rMEvt );
-#endif
GetParent()->MouseButtonUp( aTransformedEvent );
}
@@ -157,11 +141,7 @@ void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
{
-#ifdef GSTREAMER
SystemChildWindow::KeyInput( rKEvt );
-#else
- JavaChildWindow::KeyInput( rKEvt );
-#endif
GetParent()->KeyInput( rKEvt );
}
@@ -169,11 +149,7 @@ void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
{
-#ifdef GSTREAMER
SystemChildWindow::KeyUp( rKEvt );
-#else
- JavaChildWindow::KeyUp( rKEvt );
-#endif
GetParent()->KeyUp( rKEvt );
}
@@ -184,11 +160,7 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt )
const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ),
rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() );
-#ifdef GSTREAMER
SystemChildWindow::Command( rCEvt );
-#else
- JavaChildWindow::Command( rCEvt );
-#endif
GetParent()->Command( aTransformedEvent );
}
@@ -207,6 +179,7 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo
mpEmptyBmpEx( NULL ),
mpAudioBmpEx( NULL )
{
+ maChildWindow.SetBackground( Color( COL_BLACK ) );
maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
maChildWindow.Hide();
@@ -255,33 +228,24 @@ void MediaWindowImpl::cleanUp()
void MediaWindowImpl::onURLChanged()
{
+{
if( getPlayer().is() )
{
uno::Sequence< uno::Any > aArgs( 3 );
uno::Reference< media::XPlayerWindow > xPlayerWindow;
const Point aPoint;
const Size aSize( maChildWindow.GetSizePixel() );
-#ifndef GSTREAMER
- const sal_IntPtr nWndHandle = static_cast< sal_IntPtr >( maChildWindow.getParentWindowHandleForJava() );
-#else
const sal_Int32 nWndHandle = 0;
-#endif
aArgs[ 0 ] = uno::makeAny( nWndHandle );
aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) );
-#ifdef GSTREAMER
- const SystemEnvData *pSystemData = maChildWindow.GetSystemData();
- OSL_TRACE( "MediaWindowImpl::onURLChanged xwindow id: %ld", pSystemData->aWindow );
- aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
-#endif
+ const SystemEnvData *pSystemData = maChildWindow.GetSystemData();
+ OSL_TRACE( "MediaWindowImpl::onURLChanged xwindow id: %ld", pSystemData->aWindow );
+ aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
try
{
-#ifdef GSTREAMER
if( pSystemData->aWindow != 0 )
-#else
- if( nWndHandle != 0 )
-#endif
xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
}
catch( uno::RuntimeException )
@@ -332,7 +296,7 @@ void MediaWindowImpl::update()
void MediaWindowImpl::setPosSize( const Rectangle& rRect )
{
- SetPosSizePixel( rRect.Left(), rRect.Top(), rRect.GetWidth(), rRect.GetHeight() );
+ SetPosSizePixel( rRect.TopLeft(), rRect.GetSize() );
}
// ---------------------------------------------------------------------
@@ -346,7 +310,6 @@ void MediaWindowImpl::setPointer( const Pointer& rPointer )
if( xPlayerWindow.is() )
{
-
long nPointer;
switch( rPointer.GetStyle() )
@@ -396,10 +359,10 @@ void MediaWindowImpl::Resize()
mpMediaWindowControl->SetPosSizePixel( Point( nOffset, nControlY ), Size( aCurSize.Width() - ( nOffset << 1 ), nControlHeight ) );
}
- maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize );
-
if( xPlayerWindow.is() )
xPlayerWindow->setPosSize( 0, 0, aPlayerWindowSize.Width(), aPlayerWindowSize.Height(), 0 );
+
+ maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize );
}
// ---------------------------------------------------------------------
@@ -446,7 +409,7 @@ void MediaWindowImpl::Paint( const Rectangle& )
pLogo = mpEmptyBmpEx;
}
- else if ( !getPlayerWindow().is() )
+ else if( !getPlayerWindow().is() )
{
if( !mpAudioBmpEx )
mpAudioBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) );
@@ -487,8 +450,6 @@ void MediaWindowImpl::Paint( const Rectangle& )
aBasePos.Y() + ( ( aVideoRect.GetHeight() - aLogoSize.Height() ) >> 1 ) ),
aLogoSize, *pLogo );
}
-
- update();
}
// ---------------------------------------------------------------------
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index f7cbbd8a02e9..fa44d2158863 100644..100755
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -3,10 +3,13 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
+ * $RCSfile: mediawindow_impl.hxx,v $
+ * $Revision: 1.3 $
+ *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,11 +33,7 @@
#define _AVMEDIA_MEDIAWINDOW_IMPL_HXX
#include <svtools/transfer.hxx>
-#ifdef GSTREAMER
#include <vcl/syschild.hxx>
-#else
-#include <vcl/javachild.hxx>
-#endif
#include "mediawindowbase_impl.hxx"
#include "mediacontrol.hxx"
@@ -66,11 +65,7 @@ namespace avmedia
// - MediaChildWindow -
// --------------------
-#ifdef GSTREAMER
class MediaChildWindow : public SystemChildWindow
-#else
- class MediaChildWindow : public JavaChildWindow
-#endif
{
public:
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index 959b89e47cb8..08c4ac7eac23 100644..100755
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -46,6 +46,7 @@ namespace avmedia { namespace priv {
// - MediaWindowBaseImpl -
// -----------------------
+
MediaWindowBaseImpl::MediaWindowBaseImpl( MediaWindow* pMediaWindow ) :
mpMediaWindow( pMediaWindow )
{
@@ -88,7 +89,6 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl:
return xPlayer;
}
-
// ---------------------------------------------------------------------
void MediaWindowBaseImpl::setURL( const ::rtl::OUString& rURL )
@@ -142,10 +142,7 @@ void MediaWindowBaseImpl::stopPlayingInternal( bool bStop )
{
if( isPlaying() )
{
- if( bStop )
- mxPlayer->stop();
- else
- mxPlayer->start();
+ bStop ? mxPlayer->stop() : mxPlayer->start();
}
}
diff --git a/avmedia/source/viewer/mediawindowbase_impl.hxx b/avmedia/source/viewer/mediawindowbase_impl.hxx
index 0e4b48f0e022..040bd18bc148 100644..100755
--- a/avmedia/source/viewer/mediawindowbase_impl.hxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.hxx
@@ -62,7 +62,8 @@ namespace avmedia
virtual void cleanUp();
virtual void onURLChanged();
- static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL );
+ static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL,
+ sal_Bool& rbJavaBased );
public:
@@ -113,6 +114,7 @@ namespace avmedia
void stopPlayingInternal( bool );
MediaWindow* getMediaWindow() const;
+ inline sal_Bool isMediaWindowJavaBased() const { return( mbIsMediaWindowJavaBased ); }
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > getPlayer() const;
@@ -125,6 +127,7 @@ namespace avmedia
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > mxPlayerWindow;
MediaWindow* mpMediaWindow;
+ sal_Bool mbIsMediaWindowJavaBased;
};
}
}
diff --git a/avmedia/source/win/avmediawin.component b/avmedia/source/win/avmediawin.component
new file mode 100755
index 000000000000..c80c19bff0d9
--- /dev/null
+++ b/avmedia/source/win/avmediawin.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.avmedia.Manager_DirectX">
+ <service name="com.sun.star.media.Manager_DirectX"/>
+ </implementation>
+</component>
diff --git a/avmedia/source/win/exports.dxp b/avmedia/source/win/exports.dxp
index db9c0a52f288..926e49f5f1a5 100644..100755
--- a/avmedia/source/win/exports.dxp
+++ b/avmedia/source/win/exports.dxp
@@ -1,4 +1,3 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 4f8a20475d79..4f8a20475d79 100644..100755
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 0499a5086e49..0499a5086e49 100644..100755
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx
index 0e1944c4923e..314a9356c9f0 100644..100755
--- a/avmedia/source/win/interface.hxx
+++ b/avmedia/source/win/interface.hxx
@@ -91,7 +91,7 @@ public:
IMediaSample *pSample) = 0;
virtual HRESULT __stdcall BufferCB(
double SampleTime,
- WIN_BYTE *pBuffer,
+ BYTE *pBuffer,
long BufferLen) = 0;
};
@@ -104,13 +104,13 @@ ISampleGrabber : public IUnknown
{
public:
virtual HRESULT __stdcall SetOneShot(
- WIN_BOOL OneShot) = 0;
+ BOOL OneShot) = 0;
virtual HRESULT __stdcall SetMediaType(
const AM_MEDIA_TYPE *pType) = 0;
virtual HRESULT __stdcall GetConnectedMediaType(
AM_MEDIA_TYPE *pType) = 0;
virtual HRESULT __stdcall SetBufferSamples(
- WIN_BOOL BufferThem) = 0;
+ BOOL BufferThem) = 0;
virtual HRESULT __stdcall GetCurrentBuffer(
long *pBufferSize,
long *pBuffer) = 0;
diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk
index 7fdb92378da4..7c6c9e14da6e 100644..100755
--- a/avmedia/source/win/makefile.mk
+++ b/avmedia/source/win/makefile.mk
@@ -78,3 +78,11 @@ SHL1STDLIBS += dxguid.lib
.ENDIF
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/avmediawin.component
+
+$(MISC)/avmediawin.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ avmediawin.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt avmediawin.component
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index c10a96233766..c10a96233766 100644..100755
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 0dd52627641b..0dd52627641b 100644..100755
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index d80472049bf2..d80472049bf2 100644..100755
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 7f87511209bd..7f87511209bd 100644..100755
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index 0dd7cae023d3..0dd7cae023d3 100644..100755
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index f8ddd7866098..f8ddd7866098 100644..100755
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 22a6c295f8d3..22a6c295f8d3 100644..100755
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index 85a3795c4d6e..90fc361b24de 100644..100755
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -49,33 +49,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
-{
- sal_Bool bRet = sal_False;
-
- if( pRegistryKey )
- {
- try
- {
- uno::Reference< registry::XRegistryKey > xNewKey1(
- static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/com.sun.star.comp.media.Manager_DirectX/UNO/SERVICES/com.sun.star.media.Manager_DirectX" )) ) );
-
- bRet = sal_True;
- }
- catch( registry::InvalidRegistryException& )
- {
- OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
- }
- }
-
- return bRet;
-}
-
// ------------------------
// - component_getFactory -
// ------------------------
@@ -85,13 +58,13 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
- if( rtl_str_compare( pImplName, "com.sun.star.comp.media.Manager_DirectX" ) == 0 )
+ if( rtl_str_compare( pImplName, "com.sun.star.comp.avmedia.Manager_DirectX" ) == 0 )
{
const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.media.Manager_DirectX" )) );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.media.Manager_DirectX" )),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.avmedia.Manager_DirectX" )),
create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
}
diff --git a/avmedia/util/avmedia.component b/avmedia/util/avmedia.component
new file mode 100755
index 000000000000..fa01dc03eb9c
--- /dev/null
+++ b/avmedia/util/avmedia.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.framework.SoundHandler">
+ <service name="com.sun.star.frame.ContentHandler"/>
+ </implementation>
+</component>
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk
index bd167e8744cf..6d12706a265d 100644..100755
--- a/avmedia/util/makefile.mk
+++ b/avmedia/util/makefile.mk
@@ -77,3 +77,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
@echo LibMain>>$@
@echo CT>>$@
.ENDIF
+
+ALLTAR : $(MISC)/avmedia.component
+
+$(MISC)/avmedia.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ avmedia.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt avmedia.component
diff --git a/basic/inc/basic/basicmanagerrepository.hxx b/basic/inc/basic/basicmanagerrepository.hxx
index e486c3880f41..e486c3880f41 100644..100755
--- a/basic/inc/basic/basicmanagerrepository.hxx
+++ b/basic/inc/basic/basicmanagerrepository.hxx
diff --git a/basic/inc/basic/basicrt.hxx b/basic/inc/basic/basicrt.hxx
index 8f55b4f8f247..2d39eb79ca02 100644..100755
--- a/basic/inc/basic/basicrt.hxx
+++ b/basic/inc/basic/basicrt.hxx
@@ -45,8 +45,8 @@ public:
xub_StrLen GetLine();
xub_StrLen GetCol1();
xub_StrLen GetCol2();
- BOOL IsRun();
- BOOL IsValid() { return pRun != NULL; }
+ sal_Bool IsRun();
+ sal_Bool IsValid() { return pRun != NULL; }
BasicRuntime GetNextRuntime();
};
@@ -68,12 +68,12 @@ class BasicRuntimeAccess
public:
static BasicRuntime GetRuntime();
static bool HasRuntime();
- static USHORT GetStackEntryCount();
- static BasicErrorStackEntry GetStackEntry( USHORT nIndex );
- static BOOL HasStack();
+ static sal_uInt16 GetStackEntryCount();
+ static BasicErrorStackEntry GetStackEntry( sal_uInt16 nIndex );
+ static sal_Bool HasStack();
static void DeleteStack();
- static BOOL IsRunInit();
+ static sal_Bool IsRunInit();
};
#endif
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 360063bbface..51550eab5700 100644..100755
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -69,21 +69,21 @@ class SotStorage;
class BasicError
{
private:
- ULONG nErrorId;
- USHORT nReason;
+ sal_uIntPtr nErrorId;
+ sal_uInt16 nReason;
String aErrStr;
public:
BasicError();
BasicError( const BasicError& rErr );
- BasicError( ULONG nId, USHORT nR, const String& rErrStr );
+ BasicError( sal_uIntPtr nId, sal_uInt16 nR, const String& rErrStr );
- ULONG GetErrorId() const { return nErrorId; }
- USHORT GetReason() const { return nReason; }
+ sal_uIntPtr GetErrorId() const { return nErrorId; }
+ sal_uInt16 GetReason() const { return nReason; }
String GetErrorStr() { return aErrStr; }
- void SetErrorId( ULONG n ) { nErrorId = n; }
- void SetReason( USHORT n ) { nReason = n; }
+ void SetErrorId( sal_uIntPtr n ) { nErrorId = n; }
+ void SetReason( sal_uInt16 n ) { nReason = n; }
void SetErrorStr( const String& rStr) { aErrStr = rStr; }
};
@@ -147,33 +147,33 @@ private:
String aName;
String maStorageName;
- BOOL bBasMgrModified;
- BOOL mbDocMgr;
+ sal_Bool bBasMgrModified;
+ sal_Bool mbDocMgr;
BasicManagerImpl* mpImpl;
void Init();
protected:
- BOOL ImpLoadLibary( BasicLibInfo* pLibInfo ) const;
- BOOL ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly = FALSE ) const;
+ sal_Bool ImpLoadLibary( BasicLibInfo* pLibInfo ) const;
+ sal_Bool ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly = sal_False ) const;
void ImpCreateStdLib( StarBASIC* pParentFromStdLib );
void ImpMgrNotLoaded( const String& rStorageName );
BasicLibInfo* CreateLibInfo();
- void LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, BOOL bLoadBasics = TRUE );
+ void LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, sal_Bool bLoadBasics = sal_True );
void LoadOldBasicManager( SotStorage& rStorage );
- BOOL ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
- BOOL ImplEncryptStream( SvStream& rStream ) const;
+ sal_Bool ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
+ sal_Bool ImplEncryptStream( SvStream& rStream ) const;
BasicLibInfo* FindLibInfo( StarBASIC* pBasic ) const;
- void CheckModules( StarBASIC* pBasic, BOOL bReference ) const;
- void SetFlagToAllLibs( short nFlag, BOOL bSet ) const;
+ void CheckModules( StarBASIC* pBasic, sal_Bool bReference ) const;
+ void SetFlagToAllLibs( short nFlag, sal_Bool bSet ) const;
BasicManager(); // This is used only to customize the paths for 'Save as'.
~BasicManager();
public:
TYPEINFO();
- BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib = NULL, String* pLibPath = NULL, BOOL bDocMgr = FALSE );
- BasicManager( StarBASIC* pStdLib, String* pLibPath = NULL, BOOL bDocMgr = FALSE );
+ BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib = NULL, String* pLibPath = NULL, sal_Bool bDocMgr = sal_False );
+ BasicManager( StarBASIC* pStdLib, String* pLibPath = NULL, sal_Bool bDocMgr = sal_False );
/** deletes the given BasicManager instance
@@ -190,12 +190,12 @@ public:
String GetName() const { return aName; }
- USHORT GetLibCount() const;
- StarBASIC* GetLib( USHORT nLib ) const;
+ sal_uInt16 GetLibCount() const;
+ StarBASIC* GetLib( sal_uInt16 nLib ) const;
StarBASIC* GetLib( const String& rName ) const;
- USHORT GetLibId( const String& rName ) const;
+ sal_uInt16 GetLibId( const String& rName ) const;
- String GetLibName( USHORT nLib );
+ String GetLibName( sal_uInt16 nLib );
/** announces the library containers which belong to this BasicManager
@@ -209,14 +209,14 @@ public:
const ::com::sun::star::uno::Reference< com::sun::star::script::XPersistentLibraryContainer >&
GetScriptLibraryContainer() const;
- BOOL LoadLib( USHORT nLib );
- BOOL RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage );
+ sal_Bool LoadLib( sal_uInt16 nLib );
+ sal_Bool RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage );
// Modify-Flag will be reset only during save.
- BOOL IsModified() const;
- BOOL IsBasicModified() const;
+ sal_Bool IsModified() const;
+ sal_Bool IsBasicModified() const;
- BOOL HasErrors();
+ sal_Bool HasErrors();
void ClearErrors();
BasicError* GetFirstError();
BasicError* GetNextError();
@@ -238,15 +238,22 @@ public:
*/
bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< rtl::OUString >& _out_rModuleNames );
bool HasExeCode( const String& );
+ /// determines whether the Basic Manager has a given macro, given by fully qualified name
+ bool HasMacro( String const& i_fullyQualifiedName ) const;
+ /// executes a given macro
+ ErrCode ExecuteMacro( String const& i_fullyQualifiedName, SbxArray* i_arguments, SbxValue* i_retValue );
+ /// executes a given macro
+ ErrCode ExecuteMacro( String const& i_fullyQualifiedName, String const& i_commaSeparatedArgs, SbxValue* i_retValue );
+
private:
- BOOL IsReference( USHORT nLib );
+ sal_Bool IsReference( sal_uInt16 nLib );
- BOOL SetLibName( USHORT nLib, const String& rName );
+ sal_Bool SetLibName( sal_uInt16 nLib, const String& rName );
StarBASIC* GetStdLib() const;
- StarBASIC* AddLib( SotStorage& rStorage, const String& rLibName, BOOL bReference );
- BOOL RemoveLib( USHORT nLib );
- BOOL HasLib( const String& rName ) const;
+ StarBASIC* AddLib( SotStorage& rStorage, const String& rLibName, sal_Bool bReference );
+ sal_Bool RemoveLib( sal_uInt16 nLib );
+ sal_Bool HasLib( const String& rName ) const;
StarBASIC* CreateLibForLibContainer( const String& rLibName,
const com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >&
diff --git a/basic/inc/basic/basrdll.hxx b/basic/inc/basic/basrdll.hxx
index 2434dd40ea10..b11607201bb5 100644..100755
--- a/basic/inc/basic/basrdll.hxx
+++ b/basic/inc/basic/basrdll.hxx
@@ -39,8 +39,8 @@ private:
ResMgr* pSttResMgr;
ResMgr* pBasResMgr;
- BOOL bDebugMode;
- BOOL bBreakEnabled;
+ sal_Bool bDebugMode;
+ sal_Bool bBreakEnabled;
public:
BasicDLL();
@@ -51,8 +51,8 @@ public:
static void BasicBreak();
- static void EnableBreak( BOOL bEnable );
- static void SetDebugMode( BOOL bDebugMode );
+ static void EnableBreak( sal_Bool bEnable );
+ static void SetDebugMode( sal_Bool bDebugMode );
};
#define BASIC_DLL() (*(BasicDLL**)GetAppData( SHL_BASIC ) )
diff --git a/basic/inc/basic/dispdefs.hxx b/basic/inc/basic/dispdefs.hxx
index 9feb0edbef98..9feb0edbef98 100644..100755
--- a/basic/inc/basic/dispdefs.hxx
+++ b/basic/inc/basic/dispdefs.hxx
diff --git a/basic/inc/modsizeexceeded.hxx b/basic/inc/basic/modsizeexceeded.hxx
index 414b7aff72e0..414b7aff72e0 100644..100755
--- a/basic/inc/modsizeexceeded.hxx
+++ b/basic/inc/basic/modsizeexceeded.hxx
diff --git a/basic/inc/basic/mybasic.hxx b/basic/inc/basic/mybasic.hxx
index 2f87fb69c5a6..3a2ab068d4c4 100644..100755
--- a/basic/inc/basic/mybasic.hxx
+++ b/basic/inc/basic/mybasic.hxx
@@ -42,10 +42,10 @@ class ErrorEntry;
//-----------------------------------------------------------------------------
class BasicError {
AppBasEd* pWin;
- USHORT nLine, nCol1, nCol2;
+ sal_uInt16 nLine, nCol1, nCol2;
String aText;
public:
- BasicError( AppBasEd*, USHORT, const String&, USHORT, USHORT, USHORT );
+ BasicError( AppBasEd*, sal_uInt16, const String&, sal_uInt16, sal_uInt16, sal_uInt16 );
void Show();
};
@@ -53,8 +53,8 @@ public:
class MyBasic : public StarBASIC
{
SbError nError;
- virtual BOOL ErrorHdl();
- virtual USHORT BreakHdl();
+ virtual sal_Bool ErrorHdl();
+ virtual sal_uInt16 BreakHdl();
protected:
::std::vector< BasicError* > aErrors;
@@ -73,7 +73,7 @@ public:
TYPEINFO();
MyBasic();
virtual ~MyBasic();
- virtual BOOL Compile( SbModule* );
+ virtual sal_Bool Compile( SbModule* );
void Reset();
SbError GetErrors() { return nError; }
size_t GetCurrentError() { return CurrentError; }
@@ -87,10 +87,10 @@ public:
virtual void LoadIniFile();
// Determines the extended symbol type for syntax highlighting
- virtual SbTextType GetSymbolType( const String &Symbol, BOOL bWasTTControl );
+ virtual SbTextType GetSymbolType( const String &Symbol, sal_Bool bWasTTControl );
virtual const String GetSpechialErrorText();
virtual void ReportRuntimeError( AppBasEd *pEditWin );
- virtual void DebugFindNoErrors( BOOL bDebugFindNoErrors );
+ virtual void DebugFindNoErrors( sal_Bool bDebugFindNoErrors );
static void SetCompileModule( SbModule *pMod );
static SbModule *GetCompileModule();
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
index d804ae4c722d..b88391b412ca 100644..100755
--- a/basic/inc/basic/process.hxx
+++ b/basic/inc/basic/process.hxx
@@ -46,22 +46,22 @@ class Process
rtl_uString **m_pEnvList;
rtl::OUString m_aProcessName;
oslProcess m_pProcess;
- BOOL ImplIsRunning();
+ sal_Bool ImplIsRunning();
long ImplGetExitCode();
- BOOL bWasGPF;
- BOOL bHasBeenStarted;
+ sal_Bool bWasGPF;
+ sal_Bool bHasBeenStarted;
public:
Process();
~Process();
// Methoden
void SetImage( const String &aAppPath, const String &aAppParams, const Environment *pEnv = NULL );
- BOOL Start();
- ULONG GetExitCode();
- BOOL IsRunning();
- BOOL WasGPF();
+ sal_Bool Start();
+ sal_uIntPtr GetExitCode();
+ sal_Bool IsRunning();
+ sal_Bool WasGPF();
- BOOL Terminate();
+ sal_Bool Terminate();
};
#endif
diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx
index 1b0b6a3f65b4..1b0b6a3f65b4 100644..100755
--- a/basic/inc/basic/sbdef.hxx
+++ b/basic/inc/basic/sbdef.hxx
diff --git a/basic/inc/basic/sberrors.hxx b/basic/inc/basic/sberrors.hxx
index db072193d852..f2e40ac2e05c 100644..100755
--- a/basic/inc/basic/sberrors.hxx
+++ b/basic/inc/basic/sberrors.hxx
@@ -32,7 +32,7 @@
#include <basic/sbxdef.hxx>
#ifndef __RSC
-typedef ULONG SbError;
+typedef sal_uIntPtr SbError;
#endif
// Mapping to SbxError
diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx
index 8b1c9a9ce77f..4c8deafef29c 100644..100755
--- a/basic/inc/basic/sbmeth.hxx
+++ b/basic/inc/basic/sbmeth.hxx
@@ -49,15 +49,15 @@ class SbMethod : public SbxMethod
SbMethodImpl* mpSbMethodImpl; // Impl data
SbxVariable* mCaller; // caller
SbModule* pMod;
- USHORT nDebugFlags;
- USHORT nLine1, nLine2;
- UINT32 nStart;
- BOOL bInvalid;
+ sal_uInt16 nDebugFlags;
+ sal_uInt16 nLine1, nLine2;
+ sal_uInt32 nStart;
+ sal_Bool bInvalid;
SbxArrayRef refStatics;
SbMethod( const String&, SbxDataType, SbModule* );
SbMethod( const SbMethod& );
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
virtual ~SbMethod();
public:
@@ -68,14 +68,14 @@ public:
SbxArray* GetStatics();
void ClearStatics();
SbModule* GetModule() { return pMod; }
- UINT32 GetId() const { return nStart; }
- USHORT GetDebugFlags() { return nDebugFlags; }
- void SetDebugFlags( USHORT n ) { nDebugFlags = n; }
- void GetLineRange( USHORT&, USHORT& );
+ sal_uInt32 GetId() const { return nStart; }
+ sal_uInt16 GetDebugFlags() { return nDebugFlags; }
+ void SetDebugFlags( sal_uInt16 n ) { nDebugFlags = n; }
+ void GetLineRange( sal_uInt16&, sal_uInt16& );
// Interface to execute a method from the applications
virtual ErrCode Call( SbxValue* pRet = NULL, SbxVariable* pCaller = NULL );
- virtual void Broadcast( ULONG nHintId );
+ virtual void Broadcast( sal_uIntPtr nHintId );
};
#ifndef __SB_SBMETHODREF_HXX
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index 94fd9d845e12..cba5714b9c36 100644..100755
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -36,15 +36,18 @@
#include <rtl/ustring.hxx>
#include <vector>
+#include <deque>
+
class SbMethod;
class SbProperty;
class SbiRuntime;
-class SbiBreakpoints;
+typedef std::deque< sal_uInt16 > SbiBreakpoints;
class SbiImage;
class SbProcedureProperty;
class SbIfaceMapperMethod;
class SbClassModuleObject;
+class ModuleInitDependencyMap;
struct ClassModuleRunInitItem;
struct SbClassData;
class SbModuleImpl;
@@ -63,6 +66,8 @@ class SbModule : public SbxObject
SbModule();
SbModule(const SbModule&);
+ void implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic );
+
protected:
com::sun::star::uno::Reference< com::sun::star::script::XInvocation > mxWrapper;
::rtl::OUString aOUSource;
@@ -70,36 +75,38 @@ protected:
SbiImage* pImage; // the Image
SbiBreakpoints* pBreaks; // Breakpoints
SbClassData* pClassData;
- BOOL mbVBACompat;
- INT32 mnType;
+ sal_Bool mbVBACompat;
+ sal_Int32 mnType;
SbxObjectRef pDocObject; // an impl object ( used by Document Modules )
bool bIsProxyModule;
- static void implProcessModuleRunInit( ClassModuleRunInitItem& rItem );
+ static void implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassModuleRunInitItem& rItem );
void StartDefinitions();
SbMethod* GetMethod( const String&, SbxDataType );
SbProperty* GetProperty( const String&, SbxDataType );
SbProcedureProperty* GetProcedureProperty( const String&, SbxDataType );
SbIfaceMapperMethod* GetIfaceMapperMethod( const String&, SbMethod* );
- void EndDefinitions( BOOL=FALSE );
- USHORT Run( SbMethod* );
+ void EndDefinitions( sal_Bool=sal_False );
+ sal_uInt16 Run( SbMethod* );
void RunInit();
void ClearPrivateVars();
- void GlobalRunInit( BOOL bBasicStart ); // for all modules
+ void ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic );
+ void GlobalRunInit( sal_Bool bBasicStart ); // for all modules
void GlobalRunDeInit( void );
- const BYTE* FindNextStmnt( const BYTE*, USHORT&, USHORT& ) const;
- const BYTE* FindNextStmnt( const BYTE*, USHORT&, USHORT&,
- BOOL bFollowJumps, const SbiImage* pImg=NULL ) const;
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
- virtual BOOL LoadCompleted();
+ const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16& ) const;
+ const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16&,
+ sal_Bool bFollowJumps, const SbiImage* pImg=NULL ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
+ virtual sal_Bool LoadCompleted();
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
+ void handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual ~SbModule();
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2);
TYPEINFO();
- SbModule( const String&, BOOL bCompat = FALSE );
+ SbModule( const String&, sal_Bool bCompat = sal_False );
virtual void SetParent( SbxObject* );
virtual void Clear();
@@ -112,34 +119,34 @@ public:
void SetSource32( const ::rtl::OUString& r );
void SetComment( const String& r );
- virtual BOOL Compile();
- BOOL Disassemble( String& rText );
- virtual BOOL IsCompiled() const;
+ virtual sal_Bool Compile();
+ sal_Bool Disassemble( String& rText );
+ virtual sal_Bool IsCompiled() const;
const SbxObject* FindType( String aTypeName ) const;
- virtual BOOL IsBreakable( USHORT nLine ) const;
- virtual USHORT GetBPCount() const;
- virtual USHORT GetBP( USHORT n ) const;
- virtual BOOL IsBP( USHORT nLine ) const;
- virtual BOOL SetBP( USHORT nLine );
- virtual BOOL ClearBP( USHORT nLine );
+ virtual sal_Bool IsBreakable( sal_uInt16 nLine ) const;
+ virtual size_t GetBPCount() const;
+ virtual sal_uInt16 GetBP( size_t n ) const;
+ virtual sal_Bool IsBP( sal_uInt16 nLine ) const;
+ virtual sal_Bool SetBP( sal_uInt16 nLine );
+ virtual sal_Bool ClearBP( sal_uInt16 nLine );
virtual void ClearAllBP();
// Lines of Subs
- virtual SbMethod* GetFunctionForLine( USHORT );
+ virtual SbMethod* GetFunctionForLine( sal_uInt16 );
// Store only image, no source (needed for new password protection)
- BOOL StoreBinaryData( SvStream& );
- BOOL StoreBinaryData( SvStream&, USHORT nVer );
- BOOL LoadBinaryData( SvStream&, USHORT nVer );
- BOOL LoadBinaryData( SvStream& );
- BOOL ExceedsLegacyModuleSize();
+ sal_Bool StoreBinaryData( SvStream& );
+ sal_Bool StoreBinaryData( SvStream&, sal_uInt16 nVer );
+ sal_Bool LoadBinaryData( SvStream&, sal_uInt16 nVer );
+ sal_Bool LoadBinaryData( SvStream& );
+ sal_Bool ExceedsLegacyModuleSize();
void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
bool HasExeCode();
- BOOL IsVBACompat() const;
- void SetVBACompat( BOOL bCompat );
- INT32 GetModuleType() { return mnType; }
- void SetModuleType( INT32 nType ) { mnType = nType; }
+ sal_Bool IsVBACompat() const;
+ void SetVBACompat( sal_Bool bCompat );
+ sal_Int32 GetModuleType() { return mnType; }
+ void SetModuleType( sal_Int32 nType ) { mnType = nType; }
bool isProxyModule() { return bIsProxyModule; }
void AddVarName( const String& aName );
void RemoveVars();
diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx
index 5db50103ae14..af602191cdd5 100644..100755
--- a/basic/inc/basic/sbobjmod.hxx
+++ b/basic/inc/basic/sbobjmod.hxx
@@ -47,10 +47,18 @@ class SbObjModule : public SbModule
{
SbObjModule( const SbObjModule& );
SbObjModule();
+
+protected:
+ virtual ~SbObjModule();
+
public:
TYPEINFO();
SbObjModule( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
+
+ virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+ const SfxHint& rHint, const TypeId& rHintType );
+
using SbxValue::GetObject;
SbxVariable* GetObject();
void SetUnoObject( const com::sun::star::uno::Any& aObj )throw ( com::sun::star::uno::RuntimeException ) ;
@@ -76,7 +84,7 @@ public:
SbUserFormModule( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
virtual ~SbUserFormModule();
virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
- void ResetApiObj();
+ void ResetApiObj( bool bTriggerTerminateEvent = true );
void Unload();
void Load();
void triggerMethod( const String& );
@@ -88,6 +96,11 @@ public:
void triggerLayoutEvent();
void triggerResizeEvent();
+ bool getInitState( void )
+ { return mbInit; }
+ void setInitState( bool bInit )
+ { mbInit = bInit; }
+
class SbUserFormModuleInstance* CreateInstance();
};
@@ -99,7 +112,7 @@ public:
SbUserFormModuleInstance( SbUserFormModule* pParentModule, const String& rName,
const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat );
- virtual BOOL IsClass( const String& ) const;
+ virtual sal_Bool IsClass( const String& ) const;
virtual SbxVariable* Find( const XubString& rName, SbxClassType t );
};
diff --git a/basic/inc/basic/sbprop.hxx b/basic/inc/basic/sbprop.hxx
index fc39c2e5f936..730ee6fa0aa7 100644..100755
--- a/basic/inc/basic/sbprop.hxx
+++ b/basic/inc/basic/sbprop.hxx
@@ -40,7 +40,7 @@ class SbProperty : public SbxProperty
friend class SbModule;
friend class SbProcedureProperty;
SbModule* pMod;
- BOOL bInvalid;
+ sal_Bool bInvalid;
SbProperty( const String&, SbxDataType, SbModule* );
virtual ~SbProperty();
public:
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index f25ddcf02c09..73d80a4345b7 100644..100755
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -37,16 +37,17 @@
#include <basic/sbdef.hxx>
#include <basic/sberrors.hxx>
#include <com/sun/star/script/ModuleInfo.hpp>
+#include <com/sun/star/frame/XModel.hpp>
class SbModule; // completed module
class SbiInstance; // runtime instance
class SbiRuntime; // currently running procedure
class SbiImage; // compiled image
class BasicLibInfo; // info block for basic manager
-class SbiBreakpoints;
class SbTextPortions;
class SbMethod;
class BasicManager;
+class DocBasicItem;
class StarBASICImpl;
@@ -56,6 +57,7 @@ class StarBASIC : public SbxObject
friend class SbiExpression; // Access to RTL
friend class SbiInstance;
friend class SbiRuntime;
+ friend class DocBasicItem;
StarBASICImpl* mpStarBASICImpl;
@@ -66,31 +68,33 @@ class StarBASIC : public SbxObject
// Handler-Support:
Link aErrorHdl; // Error handler
Link aBreakHdl; // Breakpoint handler
- BOOL bNoRtl; // if TRUE: do not search RTL
- BOOL bBreak; // if TRUE: Break, otherwise Step
- BOOL bDocBasic;
- BOOL bVBAEnabled;
+ sal_Bool bNoRtl; // if sal_True: do not search RTL
+ sal_Bool bBreak; // if sal_True: Break, otherwise Step
+ sal_Bool bDocBasic;
+ sal_Bool bVBAEnabled;
BasicLibInfo* pLibInfo; // Info block for basic manager
SbLanguageMode eLanguageMode; // LanguageMode of the basic object
- BOOL bQuit;
+ sal_Bool bQuit;
SbxObjectRef pVBAGlobals;
SbxObject* getVBAGlobals( );
+ void implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic );
+
protected:
- BOOL CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
+ sal_Bool CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
private:
- BOOL RTError( SbError, xub_StrLen, xub_StrLen, xub_StrLen );
- BOOL RTError( SbError, const String& rMsg, xub_StrLen, xub_StrLen, xub_StrLen );
- USHORT BreakPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
- USHORT StepPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ sal_Bool RTError( SbError, xub_StrLen, xub_StrLen, xub_StrLen );
+ sal_Bool RTError( SbError, const String& rMsg, xub_StrLen, xub_StrLen, xub_StrLen );
+ sal_uInt16 BreakPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+ sal_uInt16 StepPoint( xub_StrLen nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
protected:
- virtual BOOL ErrorHdl();
- virtual USHORT BreakHdl();
+ virtual sal_Bool ErrorHdl();
+ virtual sal_uInt16 BreakHdl();
virtual ~StarBASIC();
public:
@@ -98,11 +102,11 @@ public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASIC,1);
TYPEINFO();
- StarBASIC( StarBASIC* pParent = NULL, BOOL bIsDocBasic = FALSE );
+ StarBASIC( StarBASIC* pParent = NULL, sal_Bool bIsDocBasic = sal_False );
// #51727 SetModified overridden so that the Modfied-State is
// not delivered to Parent.
- virtual void SetModified( BOOL );
+ virtual void SetModified( sal_Bool );
void* operator new( size_t );
void operator delete( void* );
@@ -119,14 +123,14 @@ public:
SbModule* MakeModule( const String& rName, const String& rSrc );
SbModule* MakeModule32( const String& rName, const ::rtl::OUString& rSrc );
SbModule* MakeModule32( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, const ::rtl::OUString& rSrc );
- BOOL Compile( SbModule* );
- BOOL Disassemble( SbModule*, String& rText );
+ sal_Bool Compile( SbModule* );
+ sal_Bool Disassemble( SbModule*, String& rText );
static void Stop();
static void Error( SbError );
static void Error( SbError, const String& rMsg );
static void FatalError( SbError );
static void FatalError( SbError, const String& rMsg );
- static BOOL IsRunning();
+ static sal_Bool IsRunning();
static SbError GetErrBasic();
// #66536 make additional message accessible by RTL function Error
static String GetErrorMsg();
@@ -135,7 +139,7 @@ public:
void Highlight( const String& rSrc, SbTextPortions& rList );
virtual SbxVariable* Find( const String&, SbxClassType );
- virtual BOOL Call( const String&, SbxArray* = NULL );
+ virtual sal_Bool Call( const String&, SbxArray* = NULL );
SbxArray* GetModules() { return pModules; }
SbxObject* GetRtl() { return pRtl; }
@@ -144,26 +148,26 @@ public:
void InitAllModules( StarBASIC* pBasicNotToInit = NULL );
void DeInitAllModules( void );
void ClearAllModuleVars( void );
- void ActivateObject( const String*, BOOL );
- BOOL LoadOldModules( SvStream& );
+ void ActivateObject( const String*, sal_Bool );
+ sal_Bool LoadOldModules( SvStream& );
// #43011 For TestTool; deletes global vars
void ClearGlobalVars( void );
// Calls for error and break handler
- static USHORT GetLine();
- static USHORT GetCol1();
- static USHORT GetCol2();
- static void SetErrorData( SbError nCode, USHORT nLine,
- USHORT nCol1, USHORT nCol2 );
+ static sal_uInt16 GetLine();
+ static sal_uInt16 GetCol1();
+ static sal_uInt16 GetCol2();
+ static void SetErrorData( SbError nCode, sal_uInt16 nLine,
+ sal_uInt16 nCol1, sal_uInt16 nCol2 );
// Specific to error handler
static void MakeErrorText( SbError, const String& aMsg );
static const String& GetErrorText();
static SbError GetErrorCode();
- static BOOL IsCompilerError();
- static USHORT GetVBErrorCode( SbError nError );
- static SbError GetSfxFromVBError( USHORT nError );
+ static sal_Bool IsCompilerError();
+ static sal_uInt16 GetVBErrorCode( SbError nError );
+ static SbError GetSfxFromVBError( sal_uInt16 nError );
static void SetGlobalLanguageMode( SbLanguageMode eLangMode );
static SbLanguageMode GetGlobalLanguageMode();
// Local settings
@@ -172,7 +176,7 @@ public:
SbLanguageMode GetLanguageMode();
// Specific for break handler
- BOOL IsBreak() const { return bBreak; }
+ sal_Bool IsBreak() const { return bBreak; }
static Link GetGlobalErrorHdl();
static void SetGlobalErrorHdl( const Link& rNewHdl );
@@ -188,24 +192,27 @@ public:
static SbxBase* FindSBXInCurrentScope( const String& rName );
static SbxVariable* FindVarInCurrentScopy
- ( const String& rName, USHORT& rStatus );
- static SbMethod* GetActiveMethod( USHORT nLevel = 0 );
+ ( const String& rName, sal_uInt16& rStatus );
+ static SbMethod* GetActiveMethod( sal_uInt16 nLevel = 0 );
static SbModule* GetActiveModule();
- void SetVBAEnabled( BOOL bEnabled );
- BOOL isVBAEnabled();
+ void SetVBAEnabled( sal_Bool bEnabled );
+ sal_Bool isVBAEnabled();
- // #60175 TRUE: SFX-Resource is not displayed on basic errors
- static void StaticSuppressSfxResource( BOOL bSuppress );
+ // #60175 sal_True: SFX-Resource is not displayed on basic errors
+ static void StaticSuppressSfxResource( sal_Bool bSuppress );
- // #91147 TRUE: Reschedule is enabled (default>, FALSE: No reschedule
- static void StaticEnableReschedule( BOOL bReschedule );
+ // #91147 sal_True: Reschedule is enabled (default>, sal_False: No reschedule
+ static void StaticEnableReschedule( sal_Bool bReschedule );
SbxObjectRef getRTL( void ) { return pRtl; }
- BOOL IsDocBasic() { return bDocBasic; }
+ sal_Bool IsDocBasic() { return bDocBasic; }
SbxVariable* VBAFind( const String& rName, SbxClassType t );
bool GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
void QuitAndExitApplication();
- BOOL IsQuitApplication() { return bQuit; };
+ sal_Bool IsQuitApplication() { return bQuit; };
+
+ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+ GetModelFromBasic( SbxObject* pBasic );
};
#ifndef __SB_SBSTARBASICREF_HXX
diff --git a/basic/inc/basic/sbstdobj.hxx b/basic/inc/basic/sbstdobj.hxx
index a33b1c343bdc..8120e6d25631 100644..100755
--- a/basic/inc/basic/sbstdobj.hxx
+++ b/basic/inc/basic/sbstdobj.hxx
@@ -58,9 +58,9 @@ protected:
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
- void PropType( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropWidth( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropHeight( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+ void PropType( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropWidth( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropHeight( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
public:
TYPEINFO();
@@ -78,23 +78,23 @@ public:
class SbStdFont : public SbxObject
{
protected:
- BOOL bBold;
- BOOL bItalic;
- BOOL bStrikeThrough;
- BOOL bUnderline;
- USHORT nSize;
+ sal_Bool bBold;
+ sal_Bool bItalic;
+ sal_Bool bStrikeThrough;
+ sal_Bool bUnderline;
+ sal_uInt16 nSize;
String aName;
~SbStdFont();
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
- void PropBold( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropItalic( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropStrikeThrough( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropUnderline( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropSize( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PropName( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+ void PropBold( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropItalic( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropStrikeThrough( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropUnderline( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropSize( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PropName( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
public:
TYPEINFO();
@@ -102,16 +102,16 @@ public:
SbStdFont();
virtual SbxVariable* Find( const String&, SbxClassType );
- void SetBold( BOOL bB ) { bBold = bB; }
- BOOL IsBold() const { return bBold; }
- void SetItalic( BOOL bI ) { bItalic = bI; }
- BOOL IsItalic() const { return bItalic; }
- void SetStrikeThrough( BOOL bS ) { bStrikeThrough = bS; }
- BOOL IsStrikeThrough() const { return bStrikeThrough; }
- void SetUnderline( BOOL bU ) { bUnderline = bU; }
- BOOL IsUnderline() const { return bUnderline; }
- void SetSize( USHORT nS ) { nSize = nS; }
- USHORT GetSize() const { return nSize; }
+ void SetBold( sal_Bool bB ) { bBold = bB; }
+ sal_Bool IsBold() const { return bBold; }
+ void SetItalic( sal_Bool bI ) { bItalic = bI; }
+ sal_Bool IsItalic() const { return bItalic; }
+ void SetStrikeThrough( sal_Bool bS ) { bStrikeThrough = bS; }
+ sal_Bool IsStrikeThrough() const { return bStrikeThrough; }
+ void SetUnderline( sal_Bool bU ) { bUnderline = bU; }
+ sal_Bool IsUnderline() const { return bUnderline; }
+ void SetSize( sal_uInt16 nS ) { nSize = nS; }
+ sal_uInt16 GetSize() const { return nSize; }
void SetFontName( const String& rName ) { aName = rName; }
String GetFontName() const { return aName; }
};
@@ -127,12 +127,12 @@ protected:
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
- void MethClear( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
- void MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
- void MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
- void MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
- void MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
- void MethSetText( SbxVariable* pVar, SbxArray* pPar_, BOOL bWrite );
+ void MethClear( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+ void MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+ void MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+ void MethGetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+ void MethSetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
+ void MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite );
public:
TYPEINFO();
diff --git a/basic/inc/basic/sbuno.hxx b/basic/inc/basic/sbuno.hxx
index 0539246e071b..0539246e071b 100644..100755
--- a/basic/inc/basic/sbuno.hxx
+++ b/basic/inc/basic/sbuno.hxx
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index b3c28ada8989..ec2f9a1b3335 100644..100755
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -68,9 +68,9 @@ struct SbxParamInfo
const String aName; // Name of the parameter
SbxBaseRef aTypeRef; // Object, if object type
SbxDataType eType; // Data type
- UINT16 nFlags; // Flag-Bits
- UINT32 nUserData; // IDs etc.
- SbxParamInfo( const String& s, SbxDataType t, USHORT n, SbxBase* b = NULL )
+ sal_uInt16 nFlags; // Flag-Bits
+ sal_uInt32 nUserData; // IDs etc.
+ SbxParamInfo( const String& s, SbxDataType t, sal_uInt16 n, SbxBase* b = NULL )
: aName( s ), aTypeRef( b ), eType( t ), nFlags( n ), nUserData( 0 ) {}
~SbxParamInfo() {}
};
@@ -89,27 +89,27 @@ class SbxInfo : public SvRefBase
String aComment;
String aHelpFile;
- UINT32 nHelpId;
+ sal_uInt32 nHelpId;
SbxParams aParams;
protected:
- BOOL LoadData( SvStream&, USHORT );
- BOOL StoreData( SvStream& ) const;
+ sal_Bool LoadData( SvStream&, sal_uInt16 );
+ sal_Bool StoreData( SvStream& ) const;
virtual ~SbxInfo();
public:
SbxInfo();
- SbxInfo( const String&, UINT32 );
+ SbxInfo( const String&, sal_uInt32 );
- void AddParam( const String&, SbxDataType, USHORT=SBX_READ );
+ void AddParam( const String&, SbxDataType, sal_uInt16=SBX_READ );
void AddParam( const SbxParamInfo& );
- const SbxParamInfo* GetParam( USHORT n ) const; // index starts with 1!
+ const SbxParamInfo* GetParam( sal_uInt16 n ) const; // index starts with 1!
const String& GetComment() const { return aComment; }
const String& GetHelpFile() const { return aHelpFile; }
- UINT32 GetHelpId() const { return nHelpId; }
+ sal_uInt32 GetHelpId() const { return nHelpId; }
void SetComment( const String& r ) { aComment = r; }
void SetHelpFile( const String& r ) { aHelpFile = r; }
- void SetHelpId( UINT32 nId ) { nHelpId = nId; }
+ void SetHelpId( sal_uInt32 nId ) { nHelpId = nId; }
};
#endif
@@ -122,7 +122,7 @@ class SbxHint : public SfxSimpleHint
SbxVariable* pVar;
public:
TYPEINFO();
- SbxHint( ULONG n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {}
+ SbxHint( sal_uIntPtr n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {}
SbxVariable* GetVar() const { return pVar; }
};
@@ -136,7 +136,7 @@ class SbxAlias : public SbxVariable, public SfxListener
{
SbxVariableRef xAlias;
virtual ~SbxAlias();
- virtual void Broadcast( ULONG );
+ virtual void Broadcast( sal_uIntPtr );
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
public:
@@ -165,7 +165,7 @@ class SbxArray : public SbxBase
friend class SbMethod;
friend class SbClassModuleObject;
friend SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
- void PutDirect( SbxVariable* pVar, UINT32 nIdx );
+ void PutDirect( SbxVariable* pVar, sal_uInt32 nIdx );
SbxArrayImpl* mpSbxArrayImpl; // Impl data
SbxVarRefs* pData; // The variables
@@ -173,8 +173,8 @@ class SbxArray : public SbxBase
protected:
SbxDataType eType; // Data type of the array
virtual ~SbxArray();
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_ARRAY,1);
@@ -183,28 +183,28 @@ public:
SbxArray( const SbxArray& );
SbxArray& operator=( const SbxArray& );
virtual void Clear();
- USHORT Count() const;
+ sal_uInt16 Count() const;
virtual SbxDataType GetType() const;
virtual SbxClassType GetClass() const;
- SbxVariableRef& GetRef( USHORT );
- SbxVariable* Get( USHORT );
- void Put( SbxVariable*, USHORT );
- void Insert( SbxVariable*, USHORT );
- void Remove( USHORT );
+ SbxVariableRef& GetRef( sal_uInt16 );
+ SbxVariable* Get( sal_uInt16 );
+ void Put( SbxVariable*, sal_uInt16 );
+ void Insert( SbxVariable*, sal_uInt16 );
+ void Remove( sal_uInt16 );
void Remove( SbxVariable* );
void Merge( SbxArray* );
- const String& GetAlias( USHORT );
- void PutAlias( const String&, USHORT );
- SbxVariable* FindUserData( UINT32 nUserData );
+ const String& GetAlias( sal_uInt16 );
+ void PutAlias( const String&, sal_uInt16 );
+ SbxVariable* FindUserData( sal_uInt32 nUserData );
virtual SbxVariable* Find( const String&, SbxClassType );
// Additional methods for 32-bit indices
- UINT32 Count32() const;
- SbxVariableRef& GetRef32( UINT32 );
- SbxVariable* Get32( UINT32 );
- void Put32( SbxVariable*, UINT32 );
- void Insert32( SbxVariable*, UINT32 );
- void Remove32( UINT32 );
+ sal_uInt32 Count32() const;
+ SbxVariableRef& GetRef32( sal_uInt32 );
+ SbxVariable* Get32( sal_uInt32 );
+ void Put32( SbxVariable*, sal_uInt32 );
+ void Insert32( SbxVariable*, sal_uInt32 );
+ void Remove32( sal_uInt32 );
};
#endif
@@ -223,15 +223,15 @@ class SbxDimArray : public SbxArray
SbxDim* pFirst, *pLast; // Links to Dimension table
short nDim; // Number of dimensions
- void AddDimImpl32( INT32, INT32, BOOL bAllowSize0 );
+ void AddDimImpl32( sal_Int32, sal_Int32, sal_Bool bAllowSize0 );
bool mbHasFixedSize;
protected:
- USHORT Offset( const short* );
- UINT32 Offset32( const INT32* );
- USHORT Offset( SbxArray* );
- UINT32 Offset32( SbxArray* );
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ sal_uInt16 Offset( const short* );
+ sal_uInt32 Offset32( const sal_Int32* );
+ sal_uInt16 Offset( SbxArray* );
+ sal_uInt32 Offset32( SbxArray* );
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
virtual ~SbxDimArray();
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_DIMARRAY,1);
@@ -253,17 +253,17 @@ public:
short GetDims() const { return nDim; }
void AddDim( short, short );
void unoAddDim( short, short );
- BOOL GetDim( short, short&, short& ) const;
+ sal_Bool GetDim( short, short&, short& ) const;
using SbxArray::GetRef32;
- SbxVariableRef& GetRef32( const INT32* );
+ SbxVariableRef& GetRef32( const sal_Int32* );
using SbxArray::Get32;
- SbxVariable* Get32( const INT32* );
+ SbxVariable* Get32( const sal_Int32* );
using SbxArray::Put32;
- void Put32( SbxVariable*, const INT32* );
- void AddDim32( INT32, INT32 );
- void unoAddDim32( INT32, INT32 );
- BOOL GetDim32( INT32, INT32&, INT32& ) const;
+ void Put32( SbxVariable*, const sal_Int32* );
+ void AddDim32( sal_Int32, sal_Int32 );
+ void unoAddDim32( sal_Int32, sal_Int32 );
+ sal_Bool GetDim32( sal_Int32, sal_Int32&, sal_Int32& ) const;
bool hasFixedSize() { return mbHasFixedSize; };
void setHasFixedSize( bool bHasFixedSize ) {mbHasFixedSize = bHasFixedSize; };
};
@@ -278,7 +278,7 @@ class SbxCollection : public SbxObject
void Initialize();
protected:
virtual ~SbxCollection();
- virtual BOOL LoadData( SvStream&, USHORT );
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
// Overridable methods (why not pure virtual?):
@@ -292,7 +292,7 @@ public:
SbxCollection( const String& rClassname );
SbxCollection( const SbxCollection& );
SbxCollection& operator=( const SbxCollection& );
- virtual SbxVariable* FindUserData( UINT32 nUserData );
+ virtual SbxVariable* FindUserData( sal_uInt32 nUserData );
virtual SbxVariable* Find( const String&, SbxClassType );
virtual void Clear();
};
@@ -306,17 +306,17 @@ class SbxStdCollection : public SbxCollection
{
protected:
String aElemClass;
- BOOL bAddRemoveOk;
+ sal_Bool bAddRemoveOk;
virtual ~SbxStdCollection();
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
virtual void CollAdd( SbxArray* pPar );
virtual void CollRemove( SbxArray* pPar );
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_FIXCOLLECTION,1);
TYPEINFO();
SbxStdCollection
- ( const String& rClassname, const String& rElemClass, BOOL=TRUE );
+ ( const String& rClassname, const String& rElemClass, sal_Bool=sal_True );
SbxStdCollection( const SbxStdCollection& );
SbxStdCollection& operator=( const SbxStdCollection& );
virtual void Insert( SbxVariable* );
diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx
index 057b4e0a261b..057b4e0a261b 100644..100755
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 786a5213f646..f16bcde9449d 100644..100755
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -46,30 +46,30 @@ class UniString;
// This version of the Macros does not define Load/StorePrivateData()-methods
#define SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer ) \
- virtual UINT32 GetCreator() const { return nCre; } \
- virtual UINT16 GetVersion() const { return nVer; } \
- virtual UINT16 GetSbxId() const { return nSbxId; }
+ virtual sal_uInt32 GetCreator() const { return nCre; } \
+ virtual sal_uInt16 GetVersion() const { return nVer; } \
+ virtual sal_uInt16 GetSbxId() const { return nSbxId; }
#define SBX_DECL_PERSIST_NODATA_() \
- virtual UINT32 GetCreator() const; \
- virtual UINT16 GetVersion() const; \
- virtual UINT16 GetSbxId() const;
+ virtual sal_uInt32 GetCreator() const; \
+ virtual sal_uInt16 GetVersion() const; \
+ virtual sal_uInt16 GetSbxId() const;
// This version of the macro defines Load/StorePrivateData()-methods
#define SBX_DECL_PERSIST( nCre, nSbxId, nVer ) \
- virtual BOOL LoadPrivateData( SvStream&, USHORT ); \
- virtual BOOL StorePrivateData( SvStream& ) const; \
+ virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 ); \
+ virtual sal_Bool StorePrivateData( SvStream& ) const; \
SBX_DECL_PERSIST_NODATA( nCre, nSbxId, nVer )
#define SBX_DECL_PERSIST_() \
- virtual BOOL LoadPrivateData( SvStream&, USHORT ); \
- virtual BOOL StorePrivateData( SvStream& ) const; \
+ virtual sal_Bool LoadPrivateData( SvStream&, sal_uInt16 ); \
+ virtual sal_Bool StorePrivateData( SvStream& ) const; \
SBX_DECL_PERSIST_NODATA_()
#define SBX_IMPL_PERSIST( C, nCre, nSbxId, nVer ) \
- UINT32 C::GetCreator() const { return nCre; } \
- UINT16 C::GetVersion() const { return nVer; } \
- UINT16 C::GetSbxId() const { return nSbxId; }
+ sal_uInt32 C::GetCreator() const { return nCre; } \
+ sal_uInt16 C::GetVersion() const { return nVer; } \
+ sal_uInt16 C::GetSbxId() const { return nSbxId; }
class SbxBase;
class SbxFactory;
@@ -83,10 +83,10 @@ class SbxBase : virtual public SvRefBase
{
SbxBaseImpl* mpSbxBaseImpl; // Impl data
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
protected:
- USHORT nFlags; // Flag-Bits
+ sal_uInt16 nFlags; // Flag-Bits
SbxBase();
SbxBase( const SbxBase& );
@@ -95,21 +95,21 @@ protected:
SBX_DECL_PERSIST(0,0,0);
public:
TYPEINFO();
- inline void SetFlags( USHORT n );
- inline USHORT GetFlags() const;
- inline void SetFlag( USHORT n );
- inline void ResetFlag( USHORT n );
- inline BOOL IsSet( USHORT n ) const;
- inline BOOL IsReset( USHORT n ) const;
- inline BOOL CanRead() const;
- inline BOOL CanWrite() const;
- inline BOOL IsModified() const;
- inline BOOL IsConst() const;
- inline BOOL IsHidden() const;
- inline BOOL IsVisible() const;
-
- virtual BOOL IsFixed() const;
- virtual void SetModified( BOOL );
+ inline void SetFlags( sal_uInt16 n );
+ inline sal_uInt16 GetFlags() const;
+ inline void SetFlag( sal_uInt16 n );
+ inline void ResetFlag( sal_uInt16 n );
+ inline sal_Bool IsSet( sal_uInt16 n ) const;
+ inline sal_Bool IsReset( sal_uInt16 n ) const;
+ inline sal_Bool CanRead() const;
+ inline sal_Bool CanWrite() const;
+ inline sal_Bool IsModified() const;
+ inline sal_Bool IsConst() const;
+ inline sal_Bool IsHidden() const;
+ inline sal_Bool IsVisible() const;
+
+ virtual sal_Bool IsFixed() const;
+ virtual void SetModified( sal_Bool );
virtual SbxDataType GetType() const;
virtual SbxClassType GetClass() const;
@@ -118,24 +118,24 @@ public:
static SbxBase* Load( SvStream& );
static void Skip( SvStream& );
- BOOL Store( SvStream& );
- virtual BOOL LoadCompleted();
- virtual BOOL StoreCompleted();
+ sal_Bool Store( SvStream& );
+ virtual sal_Bool LoadCompleted();
+ virtual sal_Bool StoreCompleted();
static SbxError GetError();
static void SetError( SbxError );
- static BOOL IsError();
+ static sal_Bool IsError();
static void ResetError();
// Set the factory for Load/Store/Create
static void AddFactory( SbxFactory* );
static void RemoveFactory( SbxFactory* );
- static SbxBase* Create( UINT16, UINT32=SBXCR_SBX );
+ static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX );
static SbxObject* CreateObject( const String& );
// Sbx solution as replacement for SfxBroadcaster::Enable()
- static void StaticEnableBroadcasting( BOOL bEnable );
- static BOOL StaticIsEnabledBroadcasting( void );
+ static void StaticEnableBroadcasting( sal_Bool bEnable );
+ static sal_Bool StaticIsEnabledBroadcasting( void );
};
#ifndef SBX_BASE_DECL_DEFINED
@@ -143,40 +143,40 @@ public:
SV_DECL_REF(SbxBase)
#endif
-inline void SbxBase::SetFlags( USHORT n )
+inline void SbxBase::SetFlags( sal_uInt16 n )
{ DBG_CHKTHIS( SbxBase, 0 ); nFlags = n; }
-inline USHORT SbxBase::GetFlags() const
+inline sal_uInt16 SbxBase::GetFlags() const
{ DBG_CHKTHIS( SbxBase, 0 ); return nFlags; }
-inline void SbxBase::SetFlag( USHORT n )
+inline void SbxBase::SetFlag( sal_uInt16 n )
{ DBG_CHKTHIS( SbxBase, 0 ); nFlags |= n; }
-inline void SbxBase::ResetFlag( USHORT n )
+inline void SbxBase::ResetFlag( sal_uInt16 n )
{ DBG_CHKTHIS( SbxBase, 0 ); nFlags &= ~n; }
-inline BOOL SbxBase::IsSet( USHORT n ) const
-{ DBG_CHKTHIS( SbxBase, 0 ); return BOOL( ( nFlags & n ) != 0 ); }
+inline sal_Bool SbxBase::IsSet( sal_uInt16 n ) const
+{ DBG_CHKTHIS( SbxBase, 0 ); return sal_Bool( ( nFlags & n ) != 0 ); }
-inline BOOL SbxBase::IsReset( USHORT n ) const
-{ DBG_CHKTHIS( SbxBase, 0 ); return BOOL( ( nFlags & n ) == 0 ); }
+inline sal_Bool SbxBase::IsReset( sal_uInt16 n ) const
+{ DBG_CHKTHIS( SbxBase, 0 ); return sal_Bool( ( nFlags & n ) == 0 ); }
-inline BOOL SbxBase::CanRead() const
+inline sal_Bool SbxBase::CanRead() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_READ ); }
-inline BOOL SbxBase::CanWrite() const
+inline sal_Bool SbxBase::CanWrite() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_WRITE ); }
-inline BOOL SbxBase::IsModified() const
+inline sal_Bool SbxBase::IsModified() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_MODIFIED ); }
-inline BOOL SbxBase::IsConst() const
+inline sal_Bool SbxBase::IsConst() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_CONST ); }
-inline BOOL SbxBase::IsHidden() const
+inline sal_Bool SbxBase::IsHidden() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsSet( SBX_HIDDEN ); }
-inline BOOL SbxBase::IsVisible() const
+inline sal_Bool SbxBase::IsVisible() const
{ DBG_CHKTHIS( SbxBase, 0 ); return IsReset( SBX_INVISIBLE ); }
#endif
diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx
index 0b6ea77c70a2..cc05e3dc1ff3 100644..100755
--- a/basic/inc/basic/sbxdef.hxx
+++ b/basic/inc/basic/sbxdef.hxx
@@ -56,15 +56,15 @@ enum SbxClassType { // SBX-class-IDs (order is important!)
enum SbxDataType {
SbxEMPTY = 0, // * Uninitialized
SbxNULL = 1, // * Contains no valid data
- SbxINTEGER = 2, // * Integer (INT16)
- SbxLONG = 3, // * Long integer (INT32)
+ SbxINTEGER = 2, // * Integer (sal_Int16)
+ SbxLONG = 3, // * Long integer (sal_Int32)
SbxSINGLE = 4, // * Single-precision floating point number (float)
SbxDOUBLE = 5, // * Double-precision floating point number (double)
- SbxCURRENCY = 6, // Currency (INT64)
+ SbxCURRENCY = 6, // Currency (sal_Int64)
SbxDATE = 7, // * Date (double)
SbxSTRING = 8, // * String (StarView)
SbxOBJECT = 9, // * SbxBase object pointer
- SbxERROR = 10, // * Error (UINT16)
+ SbxERROR = 10, // * Error (sal_uInt16)
SbxBOOL = 11, // * Boolean (0 or -1)
SbxVARIANT = 12, // * Display for variant datatype
@@ -72,8 +72,8 @@ enum SbxDataType {
SbxCHAR = 16, // * signed char
SbxBYTE = 17, // * unsigned char
- SbxUSHORT = 18, // * unsigned short (UINT16)
- SbxULONG = 19, // * unsigned long (UINT32)
+ SbxUSHORT = 18, // * unsigned short (sal_uInt16)
+ SbxULONG = 19, // * unsigned long (sal_uInt32)
//deprecated: // old 64bit types kept for backward compatibility in file I/O
SbxLONG64 = 20, // moved to SbxSALINT64 as 64bit int
@@ -111,8 +111,9 @@ enum SbxDataType {
SbxUSERn = 2047 // last user defined data type
};
-const UINT32 SBX_TYPE_WITH_EVENTS_FLAG = 0x10000;
-const UINT32 SBX_FIXED_LEN_STRING_FLAG = 0x10000; // same value as above as no conflict possible
+const sal_uInt32 SBX_TYPE_WITH_EVENTS_FLAG = 0x10000;
+const sal_uInt32 SBX_TYPE_DIM_AS_NEW_FLAG = 0x20000;
+const sal_uInt32 SBX_FIXED_LEN_STRING_FLAG = 0x10000; // same value as above as no conflict possible
#endif
#ifndef _SBX_OPERATOR
@@ -127,8 +128,8 @@ enum SbxOperator {
SbxPLUS, // this + var
SbxMINUS, // this - var
SbxNEG, // -this (var is ignored)
- SbxIDIV, // this / var (max INT32!)
-
+ SbxIDIV, // this / var (both operands max. sal_Int32!)
+ // Boolean operators (max sal_Int32!):
// Boolean operators (TODO deprecate this limit: max INT32!)
SbxAND, // this & var
SbxOR, // this | var
@@ -164,7 +165,7 @@ enum SbxNameType { // Type of the questioned name of a variable
#endif
// from 1996/3/20: New error messages
-typedef ULONG SbxError; // Preserve old type
+typedef sal_uIntPtr SbxError; // Preserve old type
#endif
@@ -258,6 +259,8 @@ typedef ULONG SbxError; // Preserve old type
#define SBX_REFERENCE 0x4000 // Parameter is Reference (DLL-call)
#define SBX_NO_MODIFY 0x8000 // SetModified is suppressed
#define SBX_WITH_EVENTS 0x0080 // Same value as unused SBX_HIDDEN
+#define SBX_DIM_AS_NEW 0x0800 // Same value as SBX_GBLSEARCH, cannot conflict as one
+ // is used for objects, the other for variables only
// Broadcaster-IDs:
#define SBX_HINT_DYING SFX_HINT_DYING
@@ -294,10 +297,10 @@ typedef ULONG SbxError; // Preserve old type
#define SbxMAXBYTE ( 255)
#define SbxMAXINT ( 32767)
#define SbxMININT (-32768)
-#define SbxMAXUINT ((UINT16) 65535)
+#define SbxMAXUINT ((sal_uInt16) 65535)
#define SbxMAXLNG ( 2147483647)
-#define SbxMINLNG ((INT32)(-2147483647-1))
-#define SbxMAXULNG ((UINT32) 0xffffffff)
+#define SbxMINLNG ((sal_Int32)(-2147483647-1))
+#define SbxMAXULNG ((sal_uInt32) 0xffffffff)
#define SbxMAXSALUINT64 SAL_MAX_UINT64
#define SbxMAXSALINT64 SAL_MAX_INT64
@@ -323,7 +326,7 @@ typedef ULONG SbxError; // Preserve old type
#define SBX_MAXINDEX 0x3FF0
#define SBX_MAXINDEX32 SbxMAXLNG
-
+// The numeric values of sal_True and FALSE
enum SbxBOOL { SbxFALSE = 0, SbxTRUE = -1 };
#endif //ifndef __RSC
diff --git a/basic/inc/basic/sbxfac.hxx b/basic/inc/basic/sbxfac.hxx
index 986339d48aac..8597458c5ec2 100644..100755
--- a/basic/inc/basic/sbxfac.hxx
+++ b/basic/inc/basic/sbxfac.hxx
@@ -38,11 +38,11 @@ class UniString;
class SbxFactory
{
- BOOL bHandleLast; // TRUE: Factory is asked at last because of its expensiveness
+ sal_Bool bHandleLast; // sal_True: Factory is asked at last because of its expensiveness
public:
- SbxFactory( BOOL bLast=FALSE ) { bHandleLast = bLast; }
- BOOL IsHandleLast( void ) { return bHandleLast; }
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ SbxFactory( sal_Bool bLast=sal_False ) { bHandleLast = bLast; }
+ sal_Bool IsHandleLast( void ) { return bHandleLast; }
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
};
diff --git a/basic/inc/basic/sbxform.hxx b/basic/inc/basic/sbxform.hxx
index 0e20dbfd0279..77921a0ce77e 100644..100755
--- a/basic/inc/basic/sbxform.hxx
+++ b/basic/inc/basic/sbxform.hxx
@@ -112,16 +112,16 @@ class SbxBasicFormater {
String BasicFormat( double dNumber, String sFormatStrg );
String BasicFormatNull( String sFormatStrg );
- static BOOL isBasicFormat( String sFormatStrg );
+ static sal_Bool isBasicFormat( String sFormatStrg );
private:
//*** some helper methods ***
//void ShowError( char *sErrMsg );
- inline void ShiftString( String& sStrg, USHORT nStartPos );
+ inline void ShiftString( String& sStrg, sal_uInt16 nStartPos );
inline void StrAppendChar( String& sStrg, sal_Unicode ch );
void AppendDigit( String& sStrg, short nDigit );
void LeftShiftDecimalPoint( String& sStrg );
- void StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow );
+ void StrRoundDigit( String& sStrg, short nPos, sal_Bool& bOverflow );
void StrRoundDigit( String& sStrg, short nPos );
void ParseBack( String& sStrg, const String& sFormatStrg,
short nFormatPos );
@@ -129,30 +129,30 @@ class SbxBasicFormater {
// Methods for string conversion with sprintf():
void InitScan( double _dNum );
void InitExp( double _dNewExp );
- short GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit );
+ short GetDigitAtPosScan( short nPos, sal_Bool& bFoundFirstDigit );
short GetDigitAtPosExpScan( double dNewExponent, short nPos,
- BOOL& bFoundFirstDigit );
- short GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit );
+ sal_Bool& bFoundFirstDigit );
+ short GetDigitAtPosExpScan( short nPos, sal_Bool& bFoundFirstDigit );
#else
// Methods for direct 'calculation' with log10() and pow():
short GetDigitAtPos( double dNumber, short nPos, double& dNextNumber,
- BOOL& bFoundFirstDigit );
+ sal_Bool& bFoundFirstDigit );
short RoundDigit( double dNumber );
#endif
- String GetPosFormatString( const String& sFormatStrg, BOOL & bFound );
- String GetNegFormatString( const String& sFormatStrg, BOOL & bFound );
- String Get0FormatString( const String& sFormatStrg, BOOL & bFound );
- String GetNullFormatString( const String& sFormatStrg, BOOL & bFound );
+ String GetPosFormatString( const String& sFormatStrg, sal_Bool & bFound );
+ String GetNegFormatString( const String& sFormatStrg, sal_Bool & bFound );
+ String Get0FormatString( const String& sFormatStrg, sal_Bool & bFound );
+ String GetNullFormatString( const String& sFormatStrg, sal_Bool & bFound );
short AnalyseFormatString( const String& sFormatStrg,
short& nNoOfDigitsLeft, short& nNoOfDigitsRight,
short& nNoOfOptionalDigitsLeft,
short& nNoOfExponentDigits,
short& nNoOfOptionalExponentDigits,
- BOOL& bPercent, BOOL& bCurrency, BOOL& bScientific,
- BOOL& bGenerateThousandSeparator,
+ sal_Bool& bPercent, sal_Bool& bCurrency, sal_Bool& bScientific,
+ sal_Bool& bGenerateThousandSeparator,
short& nMultipleThousandSeparators );
void ScanFormatString( double dNumber, const String& sFormatStrg,
- String& sReturnStrg, BOOL bCreateSign );
+ String& sReturnStrg, sal_Bool bCreateSign );
//*** Data ***
sal_Unicode cDecPoint; // sign for the decimal point
diff --git a/basic/inc/basic/sbxmeth.hxx b/basic/inc/basic/sbxmeth.hxx
index d508d1c3e11e..31b07fdca18d 100644..100755
--- a/basic/inc/basic/sbxmeth.hxx
+++ b/basic/inc/basic/sbxmeth.hxx
@@ -45,7 +45,7 @@ public:
SbxMethod( const SbxMethod& r ) : SvRefBase( r ), SbxVariable( r ) {}
SbxMethod& operator=( const SbxMethod& r )
{ SbxVariable::operator=( r ); return *this; }
- BOOL Run( SbxValues* pValues = NULL );
+ sal_Bool Run( SbxValues* pValues = NULL );
virtual SbxClassType GetClass() const;
};
diff --git a/basic/inc/basic/sbxmstrm.hxx b/basic/inc/basic/sbxmstrm.hxx
index f4c6fd7c5ad5..d3197bff883d 100644..100755
--- a/basic/inc/basic/sbxmstrm.hxx
+++ b/basic/inc/basic/sbxmstrm.hxx
@@ -38,7 +38,7 @@ SV_DECL_REF(SbxMemoryStream)
class SbxMemoryStream : public SbxBase, public SvMemoryStream
{
public:
- SbxMemoryStream(ULONG nInitSize_=512, ULONG nResize_=64) :
+ SbxMemoryStream(sal_uIntPtr nInitSize_=512, sal_uIntPtr nResize_=64) :
SvMemoryStream(nInitSize_,nResize_) {}
~SbxMemoryStream();
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index 387dc4c7caa5..867cf6e2bd07 100644..100755
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -43,9 +43,9 @@ class SbxObject : public SbxVariable, public SfxListener
{
SbxObjectImpl* mpSbxObjectImpl; // Impl data
- SbxArray* FindVar( SbxVariable*, USHORT& );
+ SbxArray* FindVar( SbxVariable*, sal_uInt16& );
// AB 23.3.1997, special method for VCPtrRemove (see below)
- SbxArray* VCPtrFindVar( SbxVariable*, USHORT& );
+ SbxArray* VCPtrFindVar( SbxVariable*, sal_uInt16& );
protected:
SbxArrayRef pMethods; // Methods
SbxArrayRef pProps; // Properties
@@ -53,8 +53,8 @@ protected:
SbxProperty* pDfltProp; // Default-Property
String aClassName; // Classname
String aDfltPropName;
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
virtual ~SbxObject();
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
@@ -68,7 +68,7 @@ public:
virtual SbxClassType GetClass() const;
virtual void Clear();
- virtual BOOL IsClass( const String& ) const;
+ virtual sal_Bool IsClass( const String& ) const;
const String& GetClassName() const { return aClassName; }
void SetClassName( const String &rNew ) { aClassName = rNew; }
// Default-Property
@@ -76,15 +76,15 @@ public:
void SetDfltProperty( const String& r );
void SetDfltProperty( SbxProperty* );
// Search for an element
- virtual SbxVariable* FindUserData( UINT32 nUserData );
+ virtual SbxVariable* FindUserData( sal_uInt32 nUserData );
virtual SbxVariable* Find( const String&, SbxClassType );
SbxVariable* FindQualified( const String&, SbxClassType );
// Quick-Call-Interface for Methods
- virtual BOOL Call( const String&, SbxArray* = NULL );
+ virtual sal_Bool Call( const String&, SbxArray* = NULL );
// Execution of DDE-Commands
SbxVariable* Execute( const String& );
// Manage elements
- virtual BOOL GetAll( SbxClassType ) { return TRUE; }
+ virtual sal_Bool GetAll( SbxClassType ) { return sal_True; }
SbxVariable* Make( const String&, SbxClassType, SbxDataType );
virtual SbxObject* MakeObject( const String&, const String& );
virtual void Insert( SbxVariable* );
@@ -97,7 +97,7 @@ public:
virtual void Remove( SbxVariable* );
// AB 23.3.1997, deletion per pointer for controls (duplicate names!)
void VCPtrRemove( SbxVariable* );
- void SetPos( SbxVariable*, USHORT );
+ void SetPos( SbxVariable*, sal_uInt16 );
// Macro-Recording
virtual String GenerateSource( const String &rLinePrefix,
@@ -109,9 +109,9 @@ public:
// Hooks
virtual SvDispatch* GetSvDispatch();
// Debugging
- void Dump( SvStream&, BOOL bDumpAll=FALSE );
+ void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
- static void GarbageCollection( ULONG nObjects = 0 /* ::= all */ );
+ static void GarbageCollection( sal_uIntPtr nObjects = 0 /* ::= all */ );
};
#ifndef __SBX_SBXOBJECTREF_HXX
diff --git a/basic/inc/basic/sbxprop.hxx b/basic/inc/basic/sbxprop.hxx
index 25c875df9222..25c875df9222 100644..100755
--- a/basic/inc/basic/sbxprop.hxx
+++ b/basic/inc/basic/sbxprop.hxx
diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 1e7840950fd7..7f0e5d878225 100644..100755
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -42,12 +42,12 @@ class SbxDecimal;
struct SbxValues
{
union {
- BYTE nByte;
- UINT16 nUShort;
+ sal_uInt8 nByte;
+ sal_uInt16 nUShort;
sal_Unicode nChar;
- INT16 nInteger;
- UINT32 nULong;
- INT32 nLong;
+ sal_Int16 nInteger;
+ sal_uInt32 nULong;
+ sal_Int32 nLong;
unsigned int nUInt;
int nInt;
sal_uInt64 uInt64;
@@ -61,12 +61,12 @@ struct SbxValues
SbxBase* pObj;
- BYTE* pByte;
- UINT16* pUShort;
+ sal_uInt8* pByte;
+ sal_uInt16* pUShort;
sal_Unicode* pChar;
- INT16* pInteger;
- UINT32* pULong;
- INT32* pLong;
+ sal_Int16* pInteger;
+ sal_uInt32* pULong;
+ sal_Int32* pLong;
unsigned int* pUInt;
int* pInt;
sal_uInt64* puInt64;
@@ -82,11 +82,11 @@ struct SbxValues
SbxValues(): pData( NULL ), eType(SbxEMPTY) {}
SbxValues( SbxDataType e ): eType(e) {}
SbxValues( char _nChar ): nChar( _nChar ), eType(SbxCHAR) {}
- SbxValues( BYTE _nByte ): nByte( _nByte ), eType(SbxBYTE) {}
+ SbxValues( sal_uInt8 _nByte ): nByte( _nByte ), eType(SbxBYTE) {}
SbxValues( short _nInteger ): nInteger( _nInteger ), eType(SbxINTEGER ) {}
SbxValues( long _nLong ): nLong( _nLong ), eType(SbxLONG) {}
- SbxValues( USHORT _nUShort ): nUShort( _nUShort ), eType(SbxUSHORT) {}
- SbxValues( ULONG _nULong ): nULong( _nULong ), eType(SbxULONG) {}
+ SbxValues( sal_uInt16 _nUShort ): nUShort( _nUShort ), eType(SbxUSHORT) {}
+ SbxValues( sal_uIntPtr _nULong ): nULong( _nULong ), eType(SbxULONG) {}
SbxValues( int _nInt ): nInt( _nInt ), eType(SbxINT) {}
SbxValues( unsigned int _nUInt ): nUInt( _nUInt ), eType(SbxUINT) {}
SbxValues( float _nSingle ): nSingle( _nSingle ), eType(SbxSINGLE) {}
@@ -112,17 +112,17 @@ class SbxValue : public SbxBase
SbxValueImpl* mpSbxValueImplImpl; // Impl data
// #55226 Transport additional infos
- SbxValue* TheRealValue( BOOL bObjInObjError ) const;
+ SbxValue* TheRealValue( sal_Bool bObjInObjError ) const;
SbxValue* TheRealValue() const;
protected:
SbxValues aData; // Data
::rtl::OUString aPic; // Picture-String
String aToolString; // tool string copy
- virtual void Broadcast( ULONG ); // Broadcast-Call
+ virtual void Broadcast( sal_uIntPtr ); // Broadcast-Call
virtual ~SbxValue();
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VALUE,1);
TYPEINFO();
@@ -131,54 +131,47 @@ public:
SbxValue( const SbxValue& );
SbxValue& operator=( const SbxValue& );
virtual void Clear();
- virtual BOOL IsFixed() const;
-
- BOOL IsInteger() const { return BOOL( GetType() == SbxINTEGER ); }
- BOOL IsLong() const { return BOOL( GetType() == SbxLONG ); }
- BOOL IsSingle() const { return BOOL( GetType() == SbxSINGLE ); }
- BOOL IsDouble() const { return BOOL( GetType() == SbxDOUBLE ); }
- BOOL IsString() const { return BOOL( GetType() == SbxSTRING ); }
- BOOL IsDate() const { return BOOL( GetType() == SbxDATE ); }
- BOOL IsCurrency() const { return BOOL( GetType() == SbxCURRENCY ); }
- BOOL IsObject() const { return BOOL( GetType() == SbxOBJECT ); }
- BOOL IsDataObject() const { return BOOL( GetType() == SbxDATAOBJECT);}
- BOOL IsBool() const { return BOOL( GetType() == SbxBOOL ); }
- BOOL IsErr() const { return BOOL( GetType() == SbxERROR ); }
- BOOL IsEmpty() const { return BOOL( GetType() == SbxEMPTY ); }
- BOOL IsNull() const { return BOOL( GetType() == SbxNULL ); }
- BOOL IsChar() const { return BOOL( GetType() == SbxCHAR ); }
- BOOL IsByte() const { return BOOL( GetType() == SbxBYTE ); }
- BOOL IsUShort() const { return BOOL( GetType() == SbxUSHORT ); }
- BOOL IsULong() const { return BOOL( GetType() == SbxULONG ); }
- BOOL IsInt() const { return BOOL( GetType() == SbxINT ); }
- BOOL IsUInt() const { return BOOL( GetType() == SbxUINT ); }
- BOOL IspChar() const { return BOOL( GetType() == SbxLPSTR ); }
- BOOL IsNumeric() const;
- BOOL IsNumericRTL() const; // #41692 Interface for Basic
- BOOL ImpIsNumeric( BOOL bOnlyIntntl ) const; // Implementation
+ virtual sal_Bool IsFixed() const;
+
+ sal_Bool IsInteger() const { return sal_Bool( GetType() == SbxINTEGER ); }
+ sal_Bool IsLong() const { return sal_Bool( GetType() == SbxLONG ); }
+ sal_Bool IsSingle() const { return sal_Bool( GetType() == SbxSINGLE ); }
+ sal_Bool IsDouble() const { return sal_Bool( GetType() == SbxDOUBLE ); }
+ sal_Bool IsString() const { return sal_Bool( GetType() == SbxSTRING ); }
+ sal_Bool IsDate() const { return sal_Bool( GetType() == SbxDATE ); }
+ sal_Bool IsCurrency()const { return sal_Bool( GetType() == SbxCURRENCY ); }
+ sal_Bool IsObject() const { return sal_Bool( GetType() == SbxOBJECT ); }
+ sal_Bool IsDataObject()const{return sal_Bool( GetType() == SbxDATAOBJECT);}
+ sal_Bool IsBool() const { return sal_Bool( GetType() == SbxBOOL ); }
+ sal_Bool IsErr() const { return sal_Bool( GetType() == SbxERROR ); }
+ sal_Bool IsEmpty() const { return sal_Bool( GetType() == SbxEMPTY ); }
+ sal_Bool IsNull() const { return sal_Bool( GetType() == SbxNULL ); }
+ sal_Bool IsChar() const { return sal_Bool( GetType() == SbxCHAR ); }
+ sal_Bool IsByte() const { return sal_Bool( GetType() == SbxBYTE ); }
+ sal_Bool IsUShort() const { return sal_Bool( GetType() == SbxUSHORT ); }
+ sal_Bool IsULong() const { return sal_Bool( GetType() == SbxULONG ); }
+ sal_Bool IsInt() const { return sal_Bool( GetType() == SbxINT ); }
+ sal_Bool IsUInt() const { return sal_Bool( GetType() == SbxUINT ); }
+ sal_Bool IspChar() const { return sal_Bool( GetType() == SbxLPSTR ); }
+ sal_Bool IsNumeric() const;
+ sal_Bool IsNumericRTL() const; // #41692 Interface for Basic
+ sal_Bool ImpIsNumeric( sal_Bool bOnlyIntntl ) const; // Implementation
virtual SbxClassType GetClass() const;
virtual SbxDataType GetType() const;
SbxDataType GetFullType() const;
- BOOL SetType( SbxDataType );
+ sal_Bool SetType( SbxDataType );
- virtual BOOL Get( SbxValues& ) const;
- BOOL GetNoBroadcast( SbxValues& );
+ virtual sal_Bool Get( SbxValues& ) const;
+ sal_Bool GetNoBroadcast( SbxValues& );
const SbxValues& GetValues_Impl() const { return aData; }
- virtual BOOL Put( const SbxValues& );
+ virtual sal_Bool Put( const SbxValues& );
inline SbxValues * data() { return &aData; }
- UINT16 GetErr() const;
-
- BOOL GetBool() const;
- BYTE GetByte() const;
sal_Unicode GetChar() const;
- UINT16 GetUShort() const;
- UINT32 GetULong() const;
- int GetInt() const;
- INT16 GetInteger() const;
- INT32 GetLong() const;
+ sal_Int16 GetInteger() const;
+ sal_Int32 GetLong() const;
sal_Int64 GetInt64() const;
sal_uInt64 GetUInt64() const;
@@ -189,55 +182,56 @@ public:
double GetDouble() const;
double GetDate() const;
+ sal_Bool GetBool() const;
+ sal_uInt16 GetErr() const;
const String& GetString() const;
const String& GetCoreString() const;
rtl::OUString GetOUString() const;
SbxBase* GetObject() const;
- BOOL HasObject() const;
+ sal_Bool HasObject() const;
void* GetData() const;
-
-
- BOOL PutEmpty();
- BOOL PutNull();
- BOOL PutErr( USHORT );
-
- BOOL PutBool( BOOL );
- BOOL PutByte( BYTE );
- BOOL PutChar( sal_Unicode );
- BOOL PutUShort( UINT16 );
- BOOL PutULong( UINT32 );
- BOOL PutInt( int );
- BOOL PutInteger( INT16 );
- BOOL PutLong( INT32 );
- BOOL PutInt64( sal_Int64 );
- BOOL PutUInt64( sal_uInt64 );
-
- BOOL PutSingle( float );
- BOOL PutDouble( double );
- BOOL PutDate( double );
-
- // with extended analysis (International, "TRUE"/"FALSE")
- BOOL PutStringExt( const ::rtl::OUString& );
- BOOL PutString( const ::rtl::OUString& );
- BOOL PutString( const sal_Unicode* ); // Type = SbxSTRING
- BOOL PutpChar( const sal_Unicode* ); // Type = SbxLPSTR
+ sal_uInt8 GetByte() const;
+ sal_uInt16 GetUShort() const;
+ sal_uInt32 GetULong() const;
+ int GetInt() const;
+
+ sal_Bool PutInteger( sal_Int16 );
+ sal_Bool PutLong( sal_Int32 );
+ sal_Bool PutSingle( float );
+ sal_Bool PutDouble( double );
+ sal_Bool PutDate( double );
+ sal_Bool PutBool( sal_Bool );
+ sal_Bool PutErr( sal_uInt16 );
+ sal_Bool PutStringExt( const ::rtl::OUString& ); // with extended analysis (International, "sal_True"/"sal_False")
+ sal_Bool PutInt64( sal_Int64 );
+ sal_Bool PutUInt64( sal_uInt64 );
+ sal_Bool PutString( const ::rtl::OUString& );
+ sal_Bool PutString( const sal_Unicode* ); // Type = SbxSTRING
+ sal_Bool PutpChar( const sal_Unicode* ); // Type = SbxLPSTR
+ sal_Bool PutChar( sal_Unicode );
+ sal_Bool PutByte( sal_uInt8 );
+ sal_Bool PutUShort( sal_uInt16 );
+ sal_Bool PutULong( sal_uInt32 );
+ sal_Bool PutInt( int );
+ sal_Bool PutEmpty();
+ sal_Bool PutNull();
// Special methods
- BOOL PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
- BOOL fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
- BOOL PutDecimal( SbxDecimal* pDecimal );
- BOOL PutCurrency( const sal_Int64& );
+ sal_Bool PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
+ sal_Bool fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
+ sal_Bool PutDecimal( SbxDecimal* pDecimal );
+ sal_Bool PutCurrency( const sal_Int64& );
// Interface for CDbl in Basic
- static SbxError ScanNumIntnl( const String& rSrc, double& nVal, BOOL bSingle=FALSE );
+ static SbxError ScanNumIntnl( const String& rSrc, double& nVal, sal_Bool bSingle = sal_False );
- BOOL PutObject( SbxBase* );
- BOOL PutData( void* );
+ sal_Bool PutObject( SbxBase* );
+ sal_Bool PutData( void* );
- virtual BOOL Convert( SbxDataType );
- virtual BOOL Compute( SbxOperator, const SbxValue& );
- virtual BOOL Compare( SbxOperator, const SbxValue& ) const;
- BOOL Scan( const String&, USHORT* = NULL );
+ virtual sal_Bool Convert( SbxDataType );
+ virtual sal_Bool Compute( SbxOperator, const SbxValue& );
+ virtual sal_Bool Compare( SbxOperator, const SbxValue& ) const;
+ sal_Bool Scan( const String&, sal_uInt16* = NULL );
void Format( String&, const String* = NULL ) const;
// The following operators are definied for easier handling.
@@ -324,6 +318,7 @@ SV_DECL_REF(SbxInfo)
class SfxBroadcaster;
class SbxVariableImpl;
+class StarBASIC;
class SbxVariable : public SbxValue
{
@@ -333,7 +328,7 @@ class SbxVariable : public SbxValue
SfxBroadcaster* pCst; // Broadcaster, if needed
String maName; // Name, if available
SbxArrayRef mpPar; // Parameter-Array, if set
- USHORT nHash; // Hash-ID for search
+ sal_uInt16 nHash; // Hash-ID for search
SbxVariableImpl* getImpl( void );
@@ -342,8 +337,8 @@ protected:
sal_uIntPtr nUserData; // User data for Call()
SbxObject* pParent; // Currently attached object
virtual ~SbxVariable();
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VARIABLE,2);
TYPEINFO();
@@ -352,13 +347,13 @@ public:
SbxVariable( const SbxVariable& );
SbxVariable& operator=( const SbxVariable& );
- void Dump( SvStream&, BOOL bDumpAll=FALSE );
+ void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
virtual void SetName( const String& );
virtual const String& GetName( SbxNameType = SbxNAME_NONE ) const;
- USHORT GetHashCode() const { return nHash; }
+ sal_uInt16 GetHashCode() const { return nHash; }
- virtual void SetModified( BOOL );
+ virtual void SetModified( sal_Bool );
sal_uIntPtr GetUserData() const { return nUserData; }
void SetUserData( sal_uIntPtr n ) { nUserData = n; }
@@ -375,8 +370,8 @@ public:
// Sfx-Broadcasting-Support:
// Due to data reduction and better DLL-hierarchie currently via casting
SfxBroadcaster& GetBroadcaster();
- BOOL IsBroadcaster() const { return BOOL( pCst != NULL ); }
- virtual void Broadcast( ULONG nHintId );
+ sal_Bool IsBroadcaster() const { return sal_Bool( pCst != NULL ); }
+ virtual void Broadcast( sal_uIntPtr nHintId );
inline const SbxObject* GetParent() const { return pParent; }
inline SbxObject* GetParent() { return pParent; }
@@ -384,9 +379,11 @@ public:
const String& GetDeclareClassName( void );
void SetDeclareClassName( const String& );
- void SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener );
+ void SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener,
+ StarBASIC* pParentBasic );
+ void ClearComListener( void );
- static USHORT MakeHashCode( const String& rName );
+ static sal_uInt16 MakeHashCode( const String& rName );
};
#ifndef SBX_VARIABLE_DECL_DEFINED
diff --git a/basic/inc/svtmsg.hrc b/basic/inc/basic/svtmsg.hrc
index ff215d3fc9cb..ff215d3fc9cb 100644..100755
--- a/basic/inc/svtmsg.hrc
+++ b/basic/inc/basic/svtmsg.hrc
diff --git a/basic/inc/testtool.hrc b/basic/inc/basic/testtool.hrc
index 075b462944c9..075b462944c9 100644..100755
--- a/basic/inc/testtool.hrc
+++ b/basic/inc/basic/testtool.hrc
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index 81570d3f60c8..ee0bd25f8ab4 100644..100755
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -41,7 +41,7 @@
// #94145# Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
// this routine became necessary
-BOOL IsTTSignatureForUnicodeTextfile( String aLine );
+sal_Bool IsTTSignatureForUnicodeTextfile( String aLine );
#define ADD_ERROR_QUIET(nNr, aStr) \
{ \
@@ -101,9 +101,9 @@ public:
String aKurzname;
String aSlotname;
String aLangname;
- USHORT nRType;
+ sal_uInt16 nRType;
String aRName;
- BOOL bIsReset;
+ sal_Bool bIsReset;
};
// Defines for syntax Highlighting
@@ -132,20 +132,20 @@ public:
class TTExecutionStatusHint : public SfxSimpleHint
{
private:
- USHORT mnType;
+ sal_uInt16 mnType;
String maExecutionStatus;
String maAdditionalExecutionStatus;
public:
TYPEINFO();
- TTExecutionStatusHint( USHORT nType, sal_Char *pExecutionStatus, const sal_Char *pAdditionalExecutionStatus = "" )
+ TTExecutionStatusHint( sal_uInt16 nType, sal_Char *pExecutionStatus, const sal_Char *pAdditionalExecutionStatus = "" )
: SfxSimpleHint(SBX_HINT_EXECUTION_STATUS_INFORMATION)
, mnType( nType )
, maExecutionStatus( pExecutionStatus, RTL_TEXTENCODING_ASCII_US )
, maAdditionalExecutionStatus( pAdditionalExecutionStatus, RTL_TEXTENCODING_ASCII_US )
{;}
- TTExecutionStatusHint( USHORT nType, const String &aExecutionStatus = String(), const String &aAdditionalExecutionStatus = String() )
+ TTExecutionStatusHint( sal_uInt16 nType, const String &aExecutionStatus = String(), const String &aAdditionalExecutionStatus = String() )
: SfxSimpleHint(SBX_HINT_EXECUTION_STATUS_INFORMATION)
, mnType( nType )
, maExecutionStatus( aExecutionStatus )
@@ -154,7 +154,7 @@ public:
const String& GetExecutionStatus() const { return maExecutionStatus; }
const String& GetAdditionalExecutionStatus() const { return maAdditionalExecutionStatus; }
- USHORT GetType(){ return mnType; }
+ sal_uInt16 GetType(){ return mnType; }
};
#endif // _BASIC_TESTTOOL_HXX_
diff --git a/basic/inc/basic/ttglobal.hrc b/basic/inc/basic/ttglobal.hrc
index 0248a06c7247..0248a06c7247 100644..100755
--- a/basic/inc/basic/ttglobal.hrc
+++ b/basic/inc/basic/ttglobal.hrc
diff --git a/basic/inc/ttmsg.hrc b/basic/inc/basic/ttmsg.hrc
index 26f250bc6a6a..26f250bc6a6a 100644..100755
--- a/basic/inc/ttmsg.hrc
+++ b/basic/inc/basic/ttmsg.hrc
diff --git a/basic/inc/basic/ttstrhlp.hxx b/basic/inc/basic/ttstrhlp.hxx
index be65e0ed3092..adf9068fbdf7 100644..100755
--- a/basic/inc/basic/ttstrhlp.hxx
+++ b/basic/inc/basic/ttstrhlp.hxx
@@ -32,6 +32,8 @@
#define CByteString( constAsciiStr ) ByteString( RTL_CONSTASCII_STRINGPARAM ( constAsciiStr ) )
#define CUniString( constAsciiStr ) UniString( RTL_CONSTASCII_USTRINGPARAM ( constAsciiStr ) )
+#define Str2Id( Str ) rtl::OUStringToOString( Str, RTL_TEXTENCODING_ASCII_US )
+#define Id2Str( Id ) String( rtl::OStringToOUString( Id, RTL_TEXTENCODING_ASCII_US ) )
#define StartKenn CUniString("%")
#define EndKenn CUniString("%")
@@ -43,7 +45,7 @@
#define TabKenn ( StartKenn.AppendAscii("Tab") )
#define MakeStringParam(Type,aText) ( Type.AppendAscii("=").Append( aText ).Append( EndKenn ) )
#define MakeStringNumber(Type,nNumber) MakeStringParam (Type, UniString::CreateFromInt32(nNumber))
-#define UIdString(aID) MakeStringParam(UIdKenn,aID.GetText())
+#define UIdString(aID) MakeStringParam(UIdKenn,String(rtl::OStringToOUString( aID, RTL_TEXTENCODING_ASCII_US )))
#define MethodString(nNumber) MakeStringNumber(MethodKenn,nNumber)
#define TypeString(nNumber) MakeStringNumber(TypeKenn,nNumber)
#define SlotString(nNumber) MakeStringNumber(SlotKenn,nNumber)
@@ -56,20 +58,20 @@
#define ResString(nNumber) MakeStringNumber(ResKenn,nNumber)
#define ArgString(nNumber, aText) MakeStringParam(ArgKenn(nNumber),aText)
-UniString GEN_RES_STR0( ULONG nResId );
-UniString GEN_RES_STR1( ULONG nResId, const String &Text1 );
-UniString GEN_RES_STR2( ULONG nResId, const String &Text1, const String &Text2 );
-UniString GEN_RES_STR3( ULONG nResId, const String &Text1, const String &Text2, const String &Text3 );
+UniString GEN_RES_STR0( sal_uIntPtr nResId );
+UniString GEN_RES_STR1( sal_uIntPtr nResId, const String &Text1 );
+UniString GEN_RES_STR2( sal_uIntPtr nResId, const String &Text1, const String &Text2 );
+UniString GEN_RES_STR3( sal_uIntPtr nResId, const String &Text1, const String &Text2, const String &Text3 );
#define GEN_RES_STR1c( nResId, Text1 ) GEN_RES_STR1( nResId, CUniString(Text1) )
#define GEN_RES_STR2c2( nResId, Text1, Text2 ) GEN_RES_STR2( nResId, Text1, CUniString(Text2) )
#define GEN_RES_STR3c3( nResId, Text1, Text2, Text3 ) GEN_RES_STR3( nResId, Text1, Text2, CUniString(Text3) )
#define IMPL_GEN_RES_STR \
-UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); } \
-UniString GEN_RES_STR1( ULONG nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } \
-UniString GEN_RES_STR2( ULONG nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } \
-UniString GEN_RES_STR3( ULONG nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );}
+UniString GEN_RES_STR0( sal_uIntPtr nResId ) { return ResString( nResId ); } \
+UniString GEN_RES_STR1( sal_uIntPtr nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); } \
+UniString GEN_RES_STR2( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); } \
+UniString GEN_RES_STR3( sal_uIntPtr nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );}
#endif
diff --git a/basic/inc/basic/vbahelper.hxx b/basic/inc/basic/vbahelper.hxx
new file mode 100755
index 000000000000..0d99387965fe
--- /dev/null
+++ b/basic/inc/basic/vbahelper.hxx
@@ -0,0 +1,86 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef BASIC_VBAHELPR_HXX
+#define BASIC_VBAHELPR_HXX
+
+#include <com/sun/star/frame/XModel.hpp>
+
+namespace basic {
+namespace vba {
+
+/* This header contains public helper functions for VBA used from this module
+ and from other VBA implementation modules such as vbahelper.
+ */
+
+// ============================================================================
+
+/** Locks or unlocks the controllers of all documents that have the same type
+ as the specified document.
+
+ First, the global module manager (com.sun.star.frame.ModuleManager) is
+ asked for the type of the passed model, and all open documents with the
+ same type will be locked or unlocked.
+
+ @param rxModel
+ A document model determining the type of the documents to be locked or
+ unlocked.
+
+ @param bLockControllers
+ Passing true will lock all controllers, passing false will unlock them.
+ */
+void lockControllersOfAllDocuments(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel,
+ sal_Bool bLockControllers );
+
+// ============================================================================
+
+/** Enables or disables the container windows of all controllers of all
+ documents that have the same type as the specified document.
+
+ First, the global module manager (com.sun.star.frame.ModuleManager) is
+ asked for the type of the passed model, and the container windows of all
+ open documents with the same type will be enabled or disabled.
+
+ @param rxModel
+ A document model determining the type of the documents to be enabled or
+ disabled.
+
+ @param bEnableWindows
+ Passing true will enable all container windows of all controllers,
+ passing false will disable them.
+ */
+void enableContainerWindowsOfAllDocuments(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel,
+ sal_Bool bEnableWindows );
+
+// ============================================================================
+
+} // namespace vba
+} // namespace basic
+
+#endif
diff --git a/basic/inc/basrid.hxx b/basic/inc/basrid.hxx
index f79778c61ee0..f79778c61ee0 100644..100755
--- a/basic/inc/basrid.hxx
+++ b/basic/inc/basrid.hxx
diff --git a/basic/inc/makefile.mk b/basic/inc/makefile.mk
index 1b56b6774806..1b56b6774806 100644..100755
--- a/basic/inc/makefile.mk
+++ b/basic/inc/makefile.mk
diff --git a/basic/inc/pch/precompiled_basic.cxx b/basic/inc/pch/precompiled_basic.cxx
index 29280bf5059a..29280bf5059a 100644..100755
--- a/basic/inc/pch/precompiled_basic.cxx
+++ b/basic/inc/pch/precompiled_basic.cxx
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index 6538399a28ea..1b7a57032830 100644..100755
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -273,7 +273,7 @@
#include "vcl/timer.hxx"
#include "vcl/toolbox.hxx"
#include "vcl/window.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
#include "vcl/wrkwin.hxx"
#include "xmlscript/xmldlg_imexp.hxx"
diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc
index c371d2abc046..c371d2abc046 100644..100755
--- a/basic/inc/sb.hrc
+++ b/basic/inc/sb.hrc
diff --git a/basic/inc/sb.hxx b/basic/inc/sb.hxx
index b54d77974fef..b54d77974fef 100644..100755
--- a/basic/inc/sb.hxx
+++ b/basic/inc/sb.hxx
diff --git a/basic/prj/build.lst b/basic/prj/build.lst
index c00a3d8412d3..17a34fa5bd9f 100755
--- a/basic/prj/build.lst
+++ b/basic/prj/build.lst
@@ -1,4 +1,4 @@
-sb basic : l10n offuh oovbaapi svtools xmlscript framework salhelper NULL
+sb basic : L10N:l10n offuh oovbaapi svtools xmlscript framework salhelper LIBXSLT:libxslt NULL
sb basic usr1 - all sb_mkout NULL
sb basic\inc nmake - all sb_inc NULL
sb basic\source\app nmake - all sb_app sb_class sb_inc NULL
diff --git a/basic/prj/d.lst b/basic/prj/d.lst
index d2a083ebcb1e..41d1a59550f0 100644..100755
--- a/basic/prj/d.lst
+++ b/basic/prj/d.lst
@@ -20,40 +20,10 @@ mkdir: %COMMON_DEST%\res%_EXT%
..\%__SRC%\lib\libsample.a %_DEST%\lib%_EXT%\libsample.a
mkdir: %_DEST%\inc%_EXT%\basic
-..\inc\testtool.hrc %_DEST%\inc%_EXT%\basic\testtool.hrc
-..\inc\ttmsg.hrc %_DEST%\inc%_EXT%\basic\ttmsg.hrc
-..\inc\basic\ttglobal.hrc %_DEST%\inc%_EXT%\basic\ttglobal.hrc
-..\inc\svtmsg.hrc %_DEST%\inc%_EXT%\basic\svtmsg.hrc
+..\inc\basic\*.hxx %_DEST%\inc%_EXT%\basic\*.hxx
+..\inc\basic\*.hrc %_DEST%\inc%_EXT%\basic\*.hrc
+..\inc\basic\*.h %_DEST%\inc%_EXT%\basic\*.h
-..\inc\basic\sbdef.hxx %_DEST%\inc%_EXT%\basic\sbdef.hxx
-..\inc\basic\sbmod.hxx %_DEST%\inc%_EXT%\basic\sbmod.hxx
-..\inc\basic\sbjsmod.hxx %_DEST%\inc%_EXT%\basic\sbjsmod.hxx
-..\inc\basic\sbmeth.hxx %_DEST%\inc%_EXT%\basic\sbmeth.hxx
-..\inc\basic\sbprop.hxx %_DEST%\inc%_EXT%\basic\sbprop.hxx
-..\inc\basic\sbstar.hxx %_DEST%\inc%_EXT%\basic\sbstar.hxx
-..\inc\basic\sbuno.hxx %_DEST%\inc%_EXT%\basic\sbuno.hxx
-..\inc\basic\basmgr.hxx %_DEST%\inc%_EXT%\basic\basmgr.hxx
-..\inc\basic\sberrors.hxx %_DEST%\inc%_EXT%\basic\sberrors.hxx
-..\inc\basic\basrdll.hxx %_DEST%\inc%_EXT%\basic\basrdll.hxx
-..\inc\basic\sbstdobj.hxx %_DEST%\inc%_EXT%\basic\sbstdobj.hxx
-..\inc\basic\process.hxx %_DEST%\inc%_EXT%\basic\process.hxx
-..\inc\basic\mybasic.hxx %_DEST%\inc%_EXT%\basic\mybasic.hxx
-..\inc\basic\testtool.hxx %_DEST%\inc%_EXT%\basic\testtool.hxx
-..\inc\basic\basicrt.hxx %_DEST%\inc%_EXT%\basic\basicrt.hxx
-..\inc\basic\dispdefs.hxx %_DEST%\inc%_EXT%\basic\dispdefs.hxx
-..\inc\basic\ttstrhlp.hxx %_DEST%\inc%_EXT%\basic\ttstrhlp.hxx
-
-..\inc\basic\sbx.hxx %_DEST%\inc%_EXT%\basic\sbx.hxx
-..\inc\basic\sbxcore.hxx %_DEST%\inc%_EXT%\basic\sbxcore.hxx
-..\inc\basic\sbxdef.hxx %_DEST%\inc%_EXT%\basic\sbxdef.hxx
-..\inc\basic\sbxform.hxx %_DEST%\inc%_EXT%\basic\sbxform.hxx
-..\inc\basic\sbxmeth.hxx %_DEST%\inc%_EXT%\basic\sbxmeth.hxx
-..\inc\basic\sbxobj.hxx %_DEST%\inc%_EXT%\basic\sbxobj.hxx
-..\inc\basic\sbxprop.hxx %_DEST%\inc%_EXT%\basic\sbxprop.hxx
-..\inc\basic\sbxvar.hxx %_DEST%\inc%_EXT%\basic\sbxvar.hxx
-..\inc\basic\sbxbase.hxx %_DEST%\inc%_EXT%\basic\sbxbase.hxx
-..\inc\basic\sbxfac.hxx %_DEST%\inc%_EXT%\basic\sbxfac.hxx
-..\inc\basic\sbxmstrm.hxx %_DEST%\inc%_EXT%\basic\sbxmstrm.hxx
-
-..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx
..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx
+..\%__SRC%\misc\sb.component %_DEST%\xml%_EXT%\sb.component
+
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index e82261084a70..7786914f85df 100644..100755
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -89,52 +89,52 @@ IMPL_GEN_RES_STR;
#ifdef DBG_UTIL
// filter Messages generated due to missing configuration Bug:#83887#
-void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl )
+void TestToolDebugMessageFilter( const sal_Char *pString, sal_Bool bIsOsl )
{
- static BOOL static_bInsideFilter = FALSE;
+ static sal_Bool static_bInsideFilter = sal_False;
// Ignore messages during filtering to avoid endless recursions
if ( static_bInsideFilter )
return;
- static_bInsideFilter = TRUE;
+ static_bInsideFilter = sal_True;
ByteString aMessage( pString );
- BOOL bIgnore = FALSE;
+ sal_Bool bIgnore = sal_False;
if ( bIsOsl )
{
// OSL
if ( aMessage.Search( CByteString("Cannot open Configuration: Connector: unknown delegatee com.sun.star.connection.Connector.portal") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
}
else
{
// DBG
#if ! (OSL_DEBUG_LEVEL > 1)
if ( aMessage.Search( CByteString("SelectAppIconPixmap") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
#endif
if ( aMessage.Search( CByteString("PropertySetRegistry::") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
if ( aMessage.Search( CByteString("property value missing") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
if ( aMessage.Search( CByteString("getDateFormatsImpl") ) != STRING_NOTFOUND
&& aMessage.Search( CByteString("no date formats") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
if ( aMessage.Search( CByteString("ucb::configureUcb(): Bad arguments") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
if ( aMessage.Search( CByteString("CreateInstance with arguments exception") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
if ( aMessage.Search( CByteString("AcquireTree failed") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
}
if ( bIgnore )
{
- static_bInsideFilter = FALSE;
+ static_bInsideFilter = sal_False;
return;
}
@@ -156,25 +156,25 @@ void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl )
printf("DbgPrintMsgBox failed: %s\n", pString );
}
}
- static_bInsideFilter = FALSE;
+ static_bInsideFilter = sal_False;
}
void SAL_CALL DBG_TestToolDebugMessageFilter( const sal_Char *pString )
{
- TestToolDebugMessageFilter( pString, FALSE );
+ TestToolDebugMessageFilter( pString, sal_False );
}
extern "C" void SAL_CALL osl_TestToolDebugMessageFilter( const sal_Char *pString )
{
if ( !getenv( "DISABLE_SAL_DBGBOX" ) )
- TestToolDebugMessageFilter( pString, TRUE );
+ TestToolDebugMessageFilter( pString, sal_True );
}
#endif
// #94145# Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
// this routine became necessary
-BOOL IsTTSignatureForUnicodeTextfile( String aLine )
+sal_Bool IsTTSignatureForUnicodeTextfile( String aLine )
{
aLine.SearchAndReplace( '\t', ' ' );
String ThreeBlanks = CUniString(" ");
@@ -272,7 +272,7 @@ int BasicApp::Main( )
if ( aDefIniPath.Exists() )
{
aDefIniPath.CopyTo( aIniPath, FSYS_ACTION_COPYFILE );
- FileStat::SetReadOnlyFlag( aIniPath, FALSE );
+ FileStat::SetReadOnlyFlag( aIniPath, sal_False );
}
}
}
@@ -355,7 +355,7 @@ void BasicApp::SetFocus()
IMPL_LINK( BasicApp, LateInit, void *, pDummy )
{
(void) pDummy; /* avoid warning about unused parameter */
- USHORT i;
+ sal_uInt16 i;
for ( i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
{
if ( Application::GetCommandLineParam( i ).Copy(0,4).CompareIgnoreCaseToAscii("-run") == COMPARE_EQUAL
@@ -363,7 +363,7 @@ IMPL_LINK( BasicApp, LateInit, void *, pDummy )
|| Application::GetCommandLineParam( i ).Copy(0,4).CompareIgnoreCaseToAscii("/run") == COMPARE_EQUAL
#endif
)
- pFrame->SetAutoRun( TRUE );
+ pFrame->SetAutoRun( sal_True );
else if ( Application::GetCommandLineParam( i ).Copy(0,7).CompareIgnoreCaseToAscii("-result") == COMPARE_EQUAL
#ifndef UNX
|| Application::GetCommandLineParam( i ).Copy(0,7).CompareIgnoreCaseToAscii("/result") == COMPARE_EQUAL
@@ -374,7 +374,7 @@ IMPL_LINK( BasicApp, LateInit, void *, pDummy )
{
if ( ByteString( Application::GetCommandLineParam( i+1 ), osl_getThreadTextEncoding() ).IsNumericAscii() )
{
- MsgEdit::SetMaxLogLen( sal::static_int_cast< USHORT >( Application::GetCommandLineParam( i+1 ).ToInt32() ) );
+ MsgEdit::SetMaxLogLen( sal::static_int_cast< sal_uInt16 >( Application::GetCommandLineParam( i+1 ).ToInt32() ) );
}
i++;
}
@@ -446,7 +446,7 @@ FloatingExecutionStatus::FloatingExecutionStatus( Window * pParent )
void FloatingExecutionStatus::SetStatus( String aW )
{
- Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
ToTop( TOTOP_NOGRABFOCUS );
aAusblend.Start();
aStatus.SetText( aW );
@@ -454,7 +454,7 @@ void FloatingExecutionStatus::SetStatus( String aW )
void FloatingExecutionStatus::SetAdditionalInfo( String aF )
{
- Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
ToTop( TOTOP_NOGRABFOCUS );
aAusblend.Start();
aAdditionalInfo.SetText( aF );
@@ -473,11 +473,11 @@ TYPEINIT1(TTExecutionStatusHint, SfxSimpleHint);
BasicFrame::BasicFrame() : WorkWindow( NULL,
WinBits( WB_APP | WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE ) )
-, bIsAutoRun( FALSE )
+, bIsAutoRun( sal_False )
, pDisplayHidDlg( NULL )
, pEditVar ( 0 )
-, bAutoReload( FALSE )
-, bAutoSave( TRUE )
+, bAutoReload( sal_False )
+, bAutoSave( sal_True )
, pBasic( NULL )
, pExecutionStatus( NULL )
, pStatus( NULL )
@@ -487,10 +487,10 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
{
Application::SetDefDialogParent( this );
- AlwaysEnableInput( TRUE );
+ AlwaysEnableInput( sal_True );
pBasic = TTBasic::CreateMyBasic(); // depending on what was linked to the executable
- bInBreak = FALSE;
- bDisas = FALSE;
+ bInBreak = sal_False;
+ bDisas = sal_False;
nFlags = 0;
// Icon aAppIcon;
@@ -594,11 +594,11 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
}
const ByteString ProfilePrefix("_profile_");
-const USHORT ProfilePrefixLen = ProfilePrefix.Len();
+const sal_uInt16 ProfilePrefixLen = ProfilePrefix.Len();
void BasicFrame::LoadIniFile()
{
- USHORT i;
+ sal_uInt16 i;
Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
for ( i = 0 ; i < aConf.GetGroupCount() ; i++ )
@@ -714,12 +714,12 @@ IMPL_LINK( BasicFrame, CheckAllFiles, Timer*, pTimer )
return 0;
}
-BOOL BasicFrame::IsAutoRun()
+sal_Bool BasicFrame::IsAutoRun()
{
return bIsAutoRun;
}
-void BasicFrame::SetAutoRun( BOOL bAuto )
+void BasicFrame::SetAutoRun( sal_Bool bAuto )
{
bIsAutoRun = bAuto;
}
@@ -809,7 +809,7 @@ IMPL_LINK( BasicFrame, CloseButtonClick, void*, EMPTYARG )
break;
}
}
- return Command( RID_FILECLOSE, FALSE );
+ return Command( RID_FILECLOSE, sal_False );
}
IMPL_LINK( BasicFrame, FloatButtonClick, void*, EMPTYARG )
@@ -848,7 +848,7 @@ void BasicFrame::WinShow_Hide()
return;
AppWin* p;
- BOOL bWasFullscreen = FALSE;
+ sal_Bool bWasFullscreen = sal_False;
for ( size_t i = pList->size(); i > 0; --i )
{
p = pList->at( i - 1 );
@@ -859,7 +859,7 @@ void BasicFrame::WinShow_Hide()
)
p->Hide( SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
else
- p->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ p->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
}
bWasFullscreen |= p->GetWinState() == TT_WIN_STATE_MAX;
}
@@ -869,13 +869,13 @@ void BasicFrame::WinMax_Restore()
{
// The application buttons
AppWin* p;
- BOOL bHasFullscreenWin = FALSE;
+ sal_Bool bHasFullscreenWin = sal_False;
for ( size_t i = 0, n = pList->size(); i < n && !bHasFullscreenWin; ++i )
{
p = pList->at( i );
bHasFullscreenWin = ( p->GetWinState() == TT_WIN_STATE_MAX );
}
- GetMenuBar()->ShowButtons( bHasFullscreenWin, FALSE, FALSE );
+ GetMenuBar()->ShowButtons( bHasFullscreenWin, sal_False, sal_False );
WinShow_Hide();
}
@@ -901,9 +901,9 @@ void BasicFrame::RemoveWindow( AppWin *pWin )
Menu* pMenu = GetMenuBar();
if( pList->empty() )
{
- pMenu->EnableItem( RID_APPEDIT, FALSE );
- pMenu->EnableItem( RID_APPRUN, FALSE );
- pMenu->EnableItem( RID_APPWINDOW, FALSE );
+ pMenu->EnableItem( RID_APPEDIT, sal_False );
+ pMenu->EnableItem( RID_APPRUN, sal_False );
+ pMenu->EnableItem( RID_APPWINDOW, sal_False );
}
PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
@@ -928,20 +928,20 @@ void BasicFrame::AddWindow( AppWin *pWin )
MenuBar* pMenu = GetMenuBar();
if( !pList->empty() )
{
- pMenu->EnableItem( RID_APPEDIT, TRUE );
- pMenu->EnableItem( RID_APPRUN, TRUE );
- pMenu->EnableItem( RID_APPWINDOW, TRUE );
+ pMenu->EnableItem( RID_APPEDIT, sal_True );
+ pMenu->EnableItem( RID_APPRUN, sal_True );
+ pMenu->EnableItem( RID_APPWINDOW, sal_True );
}
PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
- USHORT nLastID = pWinMenu->GetItemId( pWinMenu->GetItemCount() - 1 );
+ sal_uInt16 nLastID = pWinMenu->GetItemId( pWinMenu->GetItemCount() - 1 );
// Separator necessary
if ( nLastID < RID_WIN_FILE1 && pWinMenu->GetItemType( pWinMenu->GetItemCount() - 1 ) != MENUITEM_SEPARATOR )
pWinMenu->InsertSeparator();
// Find free ID
- USHORT nFreeID = RID_WIN_FILE1;
+ sal_uInt16 nFreeID = RID_WIN_FILE1;
while ( pWinMenu->GetItemPos( nFreeID ) != MENU_ITEM_NOTFOUND && nFreeID < RID_WIN_FILEn )
nFreeID++;
@@ -974,7 +974,7 @@ void BasicFrame::FocusWindow( AppWin *pWin )
}
}
pList->push_back( pWin );
- pWin->Minimize( FALSE );
+ pWin->Minimize( sal_False );
aAppFile = pWin->GetText();
UpdateTitle();
@@ -983,14 +983,14 @@ void BasicFrame::FocusWindow( AppWin *pWin )
pStatus->LoadTaskToolBox();
}
-BOOL BasicFrame::Close()
+sal_Bool BasicFrame::Close()
{
if( bInBreak || Basic().IsRunning() )
if( RET_NO == QueryBox( this, SttResId( IDS_RUNNING ) ).Execute() )
- return FALSE;
+ return sal_False;
StarBASIC::Stop();
- bInBreak = FALSE;
+ bInBreak = sal_False;
if( CloseAll() )
{
aLineNum.Stop();
@@ -1004,33 +1004,33 @@ BOOL BasicFrame::Close()
Application::SetDefDialogParent( NULL );
WorkWindow::Close();
- return TRUE;
- } else return FALSE;
+ return sal_True;
+ } else return sal_False;
}
-BOOL BasicFrame::CloseAll()
+sal_Bool BasicFrame::CloseAll()
{
while ( !pList->empty() )
if ( !pList->back()->Close() )
- return FALSE;
- return TRUE;
+ return sal_False;
+ return sal_True;
}
-BOOL BasicFrame::CompileAll()
+sal_Bool BasicFrame::CompileAll()
{
AppWin* p;
for ( size_t i = 0, n = pList->size(); i < n; ++i )
{
p = pList->at( i );
- if ( p->ISA(AppBasEd) && !((AppBasEd*)p)->Compile() ) return FALSE;
+ if ( p->ISA(AppBasEd) && !((AppBasEd*)p)->Compile() ) return sal_False;
}
- return TRUE;
+ return sal_True;
}
// Setup menu
#define MENU2FILENAME( Name ) Name.Copy( Name.SearchAscii(" ") +1).EraseAllChars( '~' )
#define LRUNr( nNr ) CByteString("LRU").Append( ByteString::CreateFromInt32( nNr ) )
-String FILENAME2MENU( USHORT nNr, String aName )
+String FILENAME2MENU( sal_uInt16 nNr, String aName )
{
String aRet;
if ( nNr <= 9 )
@@ -1049,9 +1049,9 @@ void BasicFrame::AddToLRU(String const& aFile)
PopupMenu *pPopup = GetMenuBar()->GetPopupMenu(RID_APPFILE);
aConfig.SetGroup("LRU");
- USHORT nMaxLRU = (USHORT)aConfig.ReadKey("MaxLRU","4").ToInt32();
+ sal_uInt16 nMaxLRU = (sal_uInt16)aConfig.ReadKey("MaxLRU","4").ToInt32();
DirEntry aFileEntry( aFile );
- USHORT i,nLastMove = nMaxLRU;
+ sal_uInt16 i,nLastMove = nMaxLRU;
for ( i = 1 ; i<nMaxLRU && nLastMove == nMaxLRU ; i++ )
{
@@ -1083,15 +1083,15 @@ void BasicFrame::LoadLRU()
{
Config aConfig(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
PopupMenu *pPopup = GetMenuBar()->GetPopupMenu(RID_APPFILE);
- BOOL bAddSep = TRUE;
+ sal_Bool bAddSep = sal_True;
aConfig.SetGroup("LRU");
- USHORT nMaxLRU = (USHORT)aConfig.ReadKey("MaxLRU","4").ToInt32();
+ sal_uInt16 nMaxLRU = (sal_uInt16)aConfig.ReadKey("MaxLRU","4").ToInt32();
if ( pPopup )
bAddSep = pPopup->GetItemPos( IDM_FILE_LRU1 ) == MENU_ITEM_NOTFOUND;
- USHORT i;
+ sal_uInt16 i;
for ( i = 1; i <= nMaxLRU && pPopup != NULL; i++)
{
String aFile = UniString( aConfig.ReadKey(LRUNr(i)), RTL_TEXTENCODING_UTF8 );
@@ -1101,7 +1101,7 @@ void BasicFrame::LoadLRU()
if (bAddSep)
{
pPopup->InsertSeparator();
- bAddSep = FALSE;
+ bAddSep = sal_False;
}
if ( pPopup->GetItemPos( IDM_FILE_LRU1 + i-1 ) == MENU_ITEM_NOTFOUND )
@@ -1120,10 +1120,10 @@ void BasicFrame::LoadLRU()
IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
{
- BOOL bNormal = BOOL( !bInBreak );
+ sal_Bool bNormal = sal_Bool( !bInBreak );
pMenu->EnableItem( RID_RUNCOMPILE, bNormal );
- BOOL bHasEdit = BOOL( pWork != NULL );
+ sal_Bool bHasEdit = sal_Bool( pWork != NULL );
pMenu->EnableItem( RID_FILECLOSE, bHasEdit );
pMenu->EnableItem( RID_FILESAVE, bHasEdit );
@@ -1133,16 +1133,16 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
pMenu->EnableItem( RID_FILELOADLIB, bNormal );
pMenu->EnableItem( RID_FILESAVELIB, bHasEdit );
- BOOL bHasErr = BOOL( bNormal && pBasic->GetErrors() != 0 );
- BOOL bNext = bHasErr & bNormal;
- BOOL bPrev = bHasErr & bNormal;
+ sal_Bool bHasErr = sal_Bool( bNormal && pBasic->GetErrors() != 0 );
+ sal_Bool bNext = bHasErr & bNormal;
+ sal_Bool bPrev = bHasErr & bNormal;
if( bHasErr )
{
size_t n = pBasic->GetCurrentError();
if( n == 0 )
- bPrev = FALSE;
+ bPrev = sal_False;
if( SbError(n+1) == pBasic->GetErrors() )
- bNext = FALSE;
+ bNext = sal_False;
}
pMenu->EnableItem( RID_RUNNEXTERR, bNext );
pMenu->EnableItem( RID_RUNPREVERR, bPrev );
@@ -1150,14 +1150,14 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
if( pWork )
pWork->InitMenu( pMenu );
- return TRUE;
+ return sal_True;
}
IMPL_LINK_INLINE_START( BasicFrame, DeInitMenu, Menu *, pMenu )
{
(void) pMenu; /* avoid warning about unused parameter */
- SetAutoRun( FALSE );
+ SetAutoRun( sal_False );
String aString;
pStatus->Message( aString );
return 0L;
@@ -1174,15 +1174,15 @@ IMPL_LINK_INLINE_END( BasicFrame, HighlightMenu, Menu *, pMenu )
IMPL_LINK_INLINE_START( BasicFrame, MenuCommand, Menu *, pMenu )
{
- USHORT nId = pMenu->GetCurItemId();
- BOOL bChecked = pMenu->IsItemChecked( nId );
+ sal_uInt16 nId = pMenu->GetCurItemId();
+ sal_Bool bChecked = pMenu->IsItemChecked( nId );
return Command( nId, bChecked );
}
IMPL_LINK_INLINE_END( BasicFrame, MenuCommand, Menu *, pMenu )
IMPL_LINK_INLINE_START( BasicFrame, Accel, Accelerator*, pAcc )
{
- SetAutoRun( FALSE );
+ SetAutoRun( sal_False );
return Command( pAcc->GetCurItemId() );
}
IMPL_LINK_INLINE_END( BasicFrame, Accel, Accelerator*, pAcc )
@@ -1247,14 +1247,14 @@ AppBasEd* BasicFrame::CreateModuleWin( SbModule* pMod )
return p;
}
-BOOL BasicFrame::LoadFile( String aFilename )
+sal_Bool BasicFrame::LoadFile( String aFilename )
{
- BOOL bIsResult = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("RES") == COMPARE_EQUAL;
- BOOL bIsBasic = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("BAS") == COMPARE_EQUAL;
+ sal_Bool bIsResult = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("RES") == COMPARE_EQUAL;
+ sal_Bool bIsBasic = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("BAS") == COMPARE_EQUAL;
bIsBasic |= DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("INC") == COMPARE_EQUAL;
AppWin* p;
- BOOL bSuccess = TRUE;
+ sal_Bool bSuccess = sal_True;
if ( bIsResult )
{
p = new AppError( this, aFilename );
@@ -1281,7 +1281,7 @@ BOOL BasicFrame::LoadFile( String aFilename )
}
// Execute command
-long BasicFrame::Command( short nID, BOOL bChecked )
+long BasicFrame::Command( short nID, sal_Bool bChecked )
{
BasicError* pErr;
@@ -1294,7 +1294,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
case RID_FILEOPEN:
{
String s;
- if( QueryFileName( s, FT_BASIC_SOURCE | FT_RESULT_FILE, FALSE ) ) {
+ if( QueryFileName( s, FT_BASIC_SOURCE | FT_RESULT_FILE, sal_False ) ) {
AddToLRU( s );
LoadFile( s );
}
@@ -1333,7 +1333,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
{
SbModule *pModule = ((AppBasEd*)pWork)->GetModule();
#if OSL_DEBUG_LEVEL > 1
- USHORT x;
+ sal_uInt16 x;
x = pWork->GetLineNr();
x = ((AppBasEd*)pWork)->GetModule()->GetBPCount();
if ( !x )
@@ -1341,7 +1341,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
x = pModule->GetBPCount();
#endif
- for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+ for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
{
SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -1382,7 +1382,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
if( bInBreak )
// Reset the flag
- bInBreak = FALSE;
+ bInBreak = sal_False;
else
{
if( IsAutoSave() && !SaveAll() ) break;
@@ -1391,10 +1391,10 @@ long BasicFrame::Command( short nID, BOOL bChecked )
pStatus->Message( aString );
if( p )
{
- BasicDLL::SetDebugMode( TRUE );
+ BasicDLL::SetDebugMode( sal_True );
Basic().ClearGlobalVars();
p->Run();
- BasicDLL::SetDebugMode( FALSE );
+ BasicDLL::SetDebugMode( sal_False );
// If cancelled during Interactive=FALSE
}
}}
@@ -1409,7 +1409,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
}
break;
case RID_RUNDISAS:
- bDisas = BOOL( !bChecked );
+ bDisas = sal_Bool( !bChecked );
break;
case RID_RUNBREAK:
if ( Basic().IsRunning() && !bInBreak )
@@ -1419,7 +1419,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
break;
case RID_RUNSTOP:
Basic().Stop();
- bInBreak = FALSE;
+ bInBreak = sal_False;
break;
case RID_RUNNEXTERR:
pErr = pBasic->NextError();
@@ -1560,23 +1560,23 @@ long BasicFrame::Command( short nID, BOOL bChecked )
pWork->Command( CommandEvent( Point(), nID ) );
}
}
- return TRUE;
+ return sal_True;
}
-BOOL BasicFrame::SaveAll()
+sal_Bool BasicFrame::SaveAll()
{
AppWin* p, *q = pWork;
for ( size_t i = 0, n = pList->size(); i < n ; i++ )
{
p = pList->at( i );
- USHORT nRes = p->QuerySave( QUERY_DISK_CHANGED );
+ sal_uInt16 nRes = p->QuerySave( QUERY_DISK_CHANGED );
if( (( nRes == SAVE_RES_ERROR ) && QueryBox(this,SttResId(IDS_ASKSAVEERROR)).Execute() == RET_NO )
|| ( nRes == SAVE_RES_CANCEL ) )
- return FALSE;
+ return sal_False;
}
if ( q )
q->ToTop();
- return TRUE;
+ return sal_True;
}
IMPL_LINK( BasicFrame, ModuleWinExists, String*, pFilename )
@@ -1620,7 +1620,7 @@ AppWin* BasicFrame::FindWin( const String& rName )
return NULL;
}
-AppWin* BasicFrame::FindWin( USHORT nWinId )
+AppWin* BasicFrame::FindWin( sal_uInt16 nWinId )
{
AppWin* p;
for ( size_t i = 0, n = pList->size(); i < n ; i++ )
@@ -1649,10 +1649,10 @@ IMPL_LINK( BasicFrame, WriteString, String*, pString )
if ( !pList->empty() )
{
pList->back()->pDataEdit->ReplaceSelected( *pString );
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
class NewFileDialog : public FileDialog
@@ -1675,7 +1675,7 @@ void NewFileDialog::FilterSelect()
return; // User decides after he has changed the path
String aCurFilter = GetCurFilter();
- USHORT nFilterNr = 0;
+ sal_uInt16 nFilterNr = 0;
while ( nFilterNr < GetFilterCount() && aCurFilter != GetFilterName( nFilterNr ) )
{
nFilterNr++;
@@ -1692,7 +1692,7 @@ void NewFileDialog::FilterSelect()
short NewFileDialog::Execute()
{
- BOOL bRet = (BOOL)FileDialog::Execute();
+ sal_Bool bRet = (sal_Bool)FileDialog::Execute();
if ( bRet )
{
Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
@@ -1705,8 +1705,8 @@ short NewFileDialog::Execute()
return bRet;
}
-BOOL BasicFrame::QueryFileName
- (String& rName, FileType nFileType, BOOL bSave )
+sal_Bool BasicFrame::QueryFileName
+ (String& rName, FileType nFileType, sal_Bool bSave )
{
NewFileDialog aDlg( this, bSave ? WinBits( WB_SAVEAS ) :
WinBits( WB_OPEN ) );
@@ -1752,13 +1752,13 @@ BOOL BasicFrame::QueryFileName
if( aDlg.Execute() )
{
rName = aDlg.GetPath();
- return TRUE;
- } else return FALSE;
+ return sal_True;
+ } else return sal_False;
}
-USHORT BasicFrame::BreakHandler()
+sal_uInt16 BasicFrame::BreakHandler()
{
- bInBreak = TRUE;
+ bInBreak = sal_True;
SetAppMode( String( SttResId ( IDS_APPMODE_BREAK ) ) );
while( bInBreak ) {
@@ -1773,7 +1773,7 @@ USHORT BasicFrame::BreakHandler()
void BasicFrame::LoadLibrary()
{
String s;
- if( QueryFileName( s, FT_BASIC_LIBRARY, FALSE ) )
+ if( QueryFileName( s, FT_BASIC_LIBRARY, sal_False ) )
{
CloseAll();
SvFileStream aStrm( s, STREAM_STD_READ );
@@ -1783,7 +1783,7 @@ void BasicFrame::LoadLibrary()
pBasic = pNew;
// Show all contents if existing
SbxArray* pMods = pBasic->GetModules();
- for( USHORT i = 0; i < pMods->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pMods->Count(); i++ )
{
SbModule* pMod = (SbModule*) pMods->Get( i );
AppWin* p = new AppBasEd( this, pMod );
@@ -1801,7 +1801,7 @@ void BasicFrame::LoadLibrary()
void BasicFrame::SaveLibrary()
{
String s;
- if( QueryFileName( s, FT_BASIC_LIBRARY, TRUE ) )
+ if( QueryFileName( s, FT_BASIC_LIBRARY, sal_True ) )
{
SvFileStream aStrm( s, STREAM_STD_WRITE );
if( !Basic().Store( aStrm ) )
@@ -1815,8 +1815,8 @@ String BasicFrame::GenRealString( const String &aResString )
String aType,aValue,aResult(aResString);
String aString;
xub_StrLen nInsertPos = 0;
- BOOL bFound;
- bFound = FALSE;
+ sal_Bool bFound;
+ bFound = sal_False;
while ( (nStart = aResult.Search(StartKenn,nStartPos)) != STRING_NOTFOUND &&
(nGleich = aResult.SearchAscii("=",nStart+StartKenn.Len())) != STRING_NOTFOUND &&
@@ -1836,16 +1836,16 @@ String BasicFrame::GenRealString( const String &aResString )
aString.Erase();
}
- aString = String( SttResId( (USHORT)(aValue.ToInt32()) ) );
+ aString = String( SttResId( (sal_uInt16)(aValue.ToInt32()) ) );
nInsertPos = nStart;
nStartPos = nStart;
aResult.Erase( nStart, nEnd-nStart+1 );
- bFound = TRUE;
+ bFound = sal_True;
}
else if ( aType.Search(BaseArgKenn) == 0 ) // Starts with BaseArgKenn
{
// TODO: What the hell is that for??
- USHORT nArgNr = USHORT( aType.Copy( BaseArgKenn.Len() ).ToInt32() );
+ sal_uInt16 nArgNr = sal_uInt16( aType.Copy( BaseArgKenn.Len() ).ToInt32() );
DBG_ASSERT( aString.Search( CUniString("($Arg").Append( String::CreateFromInt32(nArgNr) ).AppendAscii(")") ) != STRING_NOTFOUND, "Extra Argument given in String");
aString.SearchAndReplace( CUniString("($Arg").Append( String::CreateFromInt32(nArgNr) ).AppendAscii(")"), aValue );
nStartPos = nStart;
diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index 8f3c8e6f9f9b..983e979c5021 100644..100755
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -62,7 +62,7 @@ public:
void LoadIniFile();
void SetFocus();
- void Wait( BOOL );
+ void Wait( sal_Bool );
DECL_LINK( LateInit, void * );
#ifdef DBG_UTIL
@@ -71,7 +71,7 @@ public:
};
-typedef USHORT FileType;
+typedef sal_uInt16 FileType;
#define FT_NO_FILE (FileType)0x00 // An error has occurred ...
#define FT_BASIC_SOURCE (FileType)0x01
@@ -90,16 +90,16 @@ class BasicFrame : public WorkWindow, public SfxBroadcaster, public SfxListener
using SystemWindow::Notify;
using Window::Command;
- virtual BOOL Close();
- BOOL CloseAll(); // Close all windows
- BOOL CompileAll(); // Compile all texts
+ virtual sal_Bool Close();
+ sal_Bool CloseAll(); // Close all windows
+ sal_Bool CompileAll(); // Compile all texts
AutoTimer aLineNum; // Show the line numbers
virtual void Resize();
virtual void Move();
virtual void GetFocus();
void LoadLibrary();
void SaveLibrary();
- BOOL bIsAutoRun;
+ sal_Bool bIsAutoRun;
DisplayHidDlg* pDisplayHidDlg;
// BreakPoint *pRunToCursorBP;
@@ -109,8 +109,8 @@ using Window::Command;
Timer aCheckFiles; // Checks the files for changes
- BOOL bAutoReload;
- BOOL bAutoSave;
+ sal_Bool bAutoReload;
+ sal_Bool bAutoSave;
DECL_LINK( CheckAllFiles, Timer* );
MyBasicRef pBasic; // BASIC-Engine
@@ -126,16 +126,16 @@ using Window::Command;
FloatingExecutionStatus *pExecutionStatus;
public:
- BOOL IsAutoRun();
- void SetAutoRun( BOOL bAuto );
- BOOL bInBreak; // TRUE if in Break-Handler
+ sal_Bool IsAutoRun();
+ void SetAutoRun( sal_Bool bAuto );
+ sal_Bool bInBreak; // sal_True if in Break-Handler
StatusLine* pStatus; // Status line
EditList* pList; // List of edit windows
AppWin* pWork; // Current edit window
BasicPrinter* pPrn; // Printer
- BOOL bDisas; // TRUE: disassemble
- USHORT nFlags; // Debugging-Flags
- USHORT nMaximizedWindows; // Number of maximized windows
+ sal_Bool bDisas; // sal_True: disassemble
+ sal_uInt16 nFlags; // Debugging-Flags
+ sal_uInt16 nMaximizedWindows; // Number of maximized windows
void FocusWindow( AppWin *pWin );
void WinMax_Restore();
void WinShow_Hide();
@@ -157,25 +157,25 @@ public:
MsgEdit* GetMsgTree( String aLogFileName );
DECL_LINK( Log, TTLogMsg * );
DECL_LINK( WinInfo, WinInfoRec * );
- BOOL LoadFile( String aFilename );
- long Command( short,BOOL=FALSE ); // Command handler
+ sal_Bool LoadFile( String aFilename );
+ long Command( short,sal_Bool=sal_False ); // Command handler
virtual void Command( const CommandEvent& rCEvt ); // Command handler
- BOOL SaveAll(); // Save all windows
- BOOL QueryFileName( String& rName, FileType nFileType, BOOL bSave ); // Query for filename
+ sal_Bool SaveAll(); // Save all windows
+ sal_Bool QueryFileName( String& rName, FileType nFileType, sal_Bool bSave ); // Query for filename
DECL_LINK( ModuleWinExists, String* );
DECL_LINK( WriteString, String* );
AppBasEd* CreateModuleWin( SbModule* pMod );
AppBasEd* FindModuleWin( const String& );
AppError* FindErrorWin( const String& );
AppWin* FindWin( const String& );
- AppWin* FindWin( USHORT nWinId );
+ AppWin* FindWin( sal_uInt16 nWinId );
AppWin* IsWinValid( AppWin* pMaybeWin );
- USHORT BreakHandler(); // Break-Handler-Callback
+ sal_uInt16 BreakHandler(); // Break-Handler-Callback
void SetEditVar( SbxVariable *pVar ){ pEditVar = pVar;}
SbxVariable* GetEditVar(){ return pEditVar;}
- BOOL IsAutoReload() { return bAutoReload; }
- BOOL IsAutoSave() { return bAutoSave; }
+ sal_Bool IsAutoReload() { return bAutoReload; }
+ sal_Bool IsAutoSave() { return bAutoSave; }
void LoadIniFile();
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/basic/source/app/appbased.cxx b/basic/source/app/appbased.cxx
index 3a3422e16107..4a3b94d057ec 100644..100755
--- a/basic/source/app/appbased.cxx
+++ b/basic/source/app/appbased.cxx
@@ -56,10 +56,10 @@ AppBasEd::AppBasEd( BasicFrame* pParent, SbModule* p )
pBreakpoints->Show();
- ((TextEdit*)pDataEdit)->GetTextEditImp().pTextView->SetAutoIndentMode( TRUE );
+ ((TextEdit*)pDataEdit)->GetTextEditImp().pTextView->SetAutoIndentMode( sal_True );
((TextEdit*)pDataEdit)->GetTextEditImp().pTextEngine->SetMaxTextLen( STRING_MAXLEN );
- ((TextEdit*)pDataEdit)->GetTextEditImp().SyntaxHighlight( TRUE );
- ((TextEdit*)pDataEdit)->SaveAsUTF8( TRUE );
+ ((TextEdit*)pDataEdit)->GetTextEditImp().SyntaxHighlight( sal_True );
+ ((TextEdit*)pDataEdit)->SaveAsUTF8( sal_True );
String aEmpty;
@@ -101,7 +101,7 @@ void AppBasEd::Notify( SfxBroadcaster&, const SfxHint& rHint )
const SfxSimpleHint* p = PTR_CAST(SfxSimpleHint,&rHint);
if( p )
{
- ULONG nHintId = p->GetId();
+ sal_uIntPtr nHintId = p->GetId();
if( nHintId == SBX_HINT_LANGUAGE_EXTENSION_LOADED )
{
((TextEdit*)pDataEdit)->GetTextEditImp().InvalidateSyntaxHighlight();
@@ -117,8 +117,8 @@ FileType AppBasEd::GetFileType()
IMPL_LINK_INLINE_START( AppBasEd, EditChange, void *, p )
{
(void) p; /* avoid warning about unused parameter */
- bCompiled = FALSE;
- return TRUE;
+ bCompiled = sal_False;
+ return sal_True;
}
IMPL_LINK_INLINE_END( AppBasEd, EditChange, void *, p )
@@ -126,16 +126,16 @@ IMPL_LINK_INLINE_END( AppBasEd, EditChange, void *, p )
long AppBasEd::InitMenu( Menu* pMenu )
{
AppEdit::InitMenu (pMenu );
- BOOL bRunning = pFrame->Basic().IsRunning();
+ sal_Bool bRunning = pFrame->Basic().IsRunning();
pMenu->EnableItem( RID_RUNCOMPILE, !bCompiled && !bRunning );
- return TRUE;
+ return sal_True;
}
long AppBasEd::DeInitMenu( Menu* pMenu )
{
AppEdit::DeInitMenu (pMenu );
pMenu->EnableItem( RID_RUNCOMPILE );
- return TRUE;
+ return sal_True;
}
// Menu Handler
@@ -177,13 +177,13 @@ void AppBasEd::PostLoad()
pMod->SetName( GetText() );
pMod->Clear();
pMod->SetSource( pDataEdit->GetText() );
- bCompiled = FALSE; // because the code might have changed in the meantime
+ bCompiled = sal_False; // because the code might have changed in the meantime
AppEdit::PostLoad();
pBreakpoints->LoadBreakpoints( GetText() );
}
-USHORT AppBasEd::ImplSave()
+sal_uInt16 AppBasEd::ImplSave()
{
pBreakpoints->SaveBreakpoints( GetText() );
return AppEdit::ImplSave();
@@ -199,7 +199,7 @@ void AppBasEd::Reload()
// Reload source code file after change
void AppBasEd::LoadSource()
{
- BOOL bErr;
+ sal_Bool bErr;
String aName = pMod->GetName();
bErr = !pDataEdit->Load( aName );
@@ -208,7 +208,7 @@ void AppBasEd::LoadSource()
ErrorBox( this, SttResId( IDS_READERROR ) ).Execute();
else
UpdateFileInfo( HAS_BEEN_LOADED );
- bCompiled = FALSE; // because the code might have changed in the meantime
+ bCompiled = sal_False; // because the code might have changed in the meantime
}
// Save as (new name)
@@ -219,15 +219,15 @@ void AppBasEd::PostSaveAs()
}
// Compile
-BOOL AppBasEd::Compile()
+sal_Bool AppBasEd::Compile()
{
if( !pDataEdit->HasText() || bCompiled )
- return TRUE;
+ return sal_True;
pMod->SetSource( pDataEdit->GetText() );
- BOOL bRes = FALSE;
+ sal_Bool bRes = sal_False;
if( pFrame->Basic().Compile( pMod ) )
{
- bRes = TRUE;
+ bRes = sal_True;
if( pFrame->bDisas )
Disassemble();
TextSelection aSel( pDataEdit->GetSelection() );
@@ -257,7 +257,7 @@ void AppBasEd::Run()
{
pFrame->Basic().Reset();
SbxArray* pAllModules = pFrame->Basic().GetModules();
- for (USHORT i = 0; i < pAllModules->Count(); i++)
+ for (sal_uInt16 i = 0; i < pAllModules->Count(); i++)
{
if ( (pAllModules->Get(i)->GetName()).Copy(0,2).CompareToAscii( "--" ) == COMPARE_EQUAL )
{
diff --git a/basic/source/app/appbased.hxx b/basic/source/app/appbased.hxx
index a7796fb3854b..22e9afa37bc1 100644..100755
--- a/basic/source/app/appbased.hxx
+++ b/basic/source/app/appbased.hxx
@@ -40,12 +40,12 @@ class AppBasEd : public AppEdit { // Editor-Window:
using DockingWindow::Notify;
SbModuleRef pMod; // compile module
- BOOL bCompiled; // TRUE if compiled
+ sal_Bool bCompiled; // sal_True if compiled
protected:
DECL_LINK( EditChange, void * );
#define BREAKPOINTSWIDTH 15
BreakpointWindow *pBreakpoints;
- virtual USHORT ImplSave(); // Save file
+ virtual sal_uInt16 ImplSave(); // Save file
public:
TYPEINFO();
@@ -61,7 +61,7 @@ public:
virtual void PostSaveAs(); // Postprocess of module...
void Reload();
void LoadSource(); // Load source for object
- BOOL Compile(); // Compile text
+ sal_Bool Compile(); // Compile text
void Run(); // Run image
void Disassemble(); // Disassemble image
const String& GetModName() const { return pMod->GetName(); }
diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx
index 7d6ab8669dea..1cf75d13c58a 100644..100755
--- a/basic/source/app/appedit.cxx
+++ b/basic/source/app/appedit.cxx
@@ -79,8 +79,8 @@ AppEdit::~AppEdit()
void AppEdit::LoadIniFile()
{
TextView *pTextView = ((TextEdit*)pDataEdit)->aEdit.pTextView;
- BOOL bWasModified = pTextView->GetTextEngine()->IsModified();
- pTextView->GetTextEngine()->SetModified( FALSE );
+ sal_Bool bWasModified = pTextView->GetTextEngine()->IsModified();
+ pTextView->GetTextEngine()->SetModified( sal_False );
FontList aFontList( pFrame ); // Just some Window is needed
Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
@@ -89,7 +89,7 @@ void AppEdit::LoadIniFile()
String aFontStyle = String( aConf.ReadKey( "ScriptFontStyle", "normal" ), RTL_TEXTENCODING_UTF8 );
String aFontSize = String( aConf.ReadKey( "ScriptFontSize", "12" ), RTL_TEXTENCODING_UTF8 );
Font aFont = aFontList.Get( aFontName, aFontStyle );
- ULONG nFontSize = aFontSize.ToInt32();
+ sal_uIntPtr nFontSize = aFontSize.ToInt32();
aFont.SetHeight( nFontSize );
#if OSL_DEBUG_LEVEL > 1
@@ -97,7 +97,7 @@ void AppEdit::LoadIniFile()
Font aFont2( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguage(), 0, pFrame ));
}
#endif
- aFont.SetTransparent( FALSE );
+ aFont.SetTransparent( sal_False );
pDataEdit->SetFont( aFont );
if ( ((TextEdit*)pDataEdit)->GetBreakpointWindow() )
@@ -176,7 +176,7 @@ void AppEdit::SetScrollBarRanges()
-USHORT AppEdit::GetLineNr()
+sal_uInt16 AppEdit::GetLineNr()
{
return pDataEdit->GetLineNr();
}
@@ -193,14 +193,14 @@ long AppEdit::InitMenu( Menu* pMenu )
if( pDataEdit )
{
- USHORT UndoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetUndoActionCount();
- USHORT RedoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetRedoActionCount();
+ size_t UndoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetUndoActionCount();
+ size_t RedoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetRedoActionCount();
pMenu->EnableItem( RID_EDITUNDO, UndoCount > 0 );
pMenu->EnableItem( RID_EDITREDO, RedoCount > 0 );
}
- return TRUE;
+ return sal_True;
}
long AppEdit::DeInitMenu( Menu* pMenu )
@@ -210,7 +210,7 @@ long AppEdit::DeInitMenu( Menu* pMenu )
pMenu->EnableItem( RID_EDITUNDO );
pMenu->EnableItem( RID_EDITREDO );
- return TRUE;
+ return sal_True;
}
void AppEdit::Resize()
@@ -225,7 +225,7 @@ void AppEdit::Resize()
if ( pHScroll )
{
rHSize = pHScroll->GetSizePixel();
- ULONG nHieght = rHSize.Height();
+ sal_uIntPtr nHieght = rHSize.Height();
rNewSize.Height() -= nHieght;
rHStart.Y() = rNewSize.Height();
}
@@ -233,7 +233,7 @@ void AppEdit::Resize()
if ( pVScroll )
{
rVSize = pVScroll->GetSizePixel();
- ULONG nWidth = rVSize.Width();
+ sal_uIntPtr nWidth = rVSize.Width();
rNewSize.Width() -= nWidth;
rVStart.X() = rNewSize.Width();
}
@@ -284,7 +284,7 @@ void AppEdit::PostSaveAs()
{
}
-void AppEdit::Highlight( USHORT nLine, USHORT nCol1, USHORT nCol2 )
+void AppEdit::Highlight( sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 )
{
((TextEdit*)pDataEdit)->Highlight( nLine, nCol1, nCol2 );
ToTop();
diff --git a/basic/source/app/appedit.hxx b/basic/source/app/appedit.hxx
index 2399d42a54ed..67cb4337c6b0 100644..100755
--- a/basic/source/app/appedit.hxx
+++ b/basic/source/app/appedit.hxx
@@ -43,7 +43,7 @@ public:
ScrollBar *pVScroll;
ScrollBar *pHScroll;
void SetScrollBarRanges();
- ULONG nCurTextWidth;
+ sal_uIntPtr nCurTextWidth;
private:
void InitScrollBars();
protected:
@@ -52,7 +52,7 @@ public:
TYPEINFO();
AppEdit( BasicFrame* );
~AppEdit();
- USHORT GetLineNr(); // Current line number
+ sal_uInt16 GetLineNr(); // Current line number
FileType GetFileType(); // Returns the file type
virtual long InitMenu( Menu* ); // Inits the menu
virtual long DeInitMenu( Menu* ); // Reset to enable all Shortcuts
@@ -61,8 +61,8 @@ public:
void PostLoad();
void PostSaveAs();
void Mark( short, short, short ); // Select text
- void Highlight( USHORT nLine, USHORT nCol1, USHORT nCol2 );
- virtual BOOL ReloadAllowed(){ return !StarBASIC::IsRunning(); }
+ void Highlight( sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 );
+ virtual sal_Bool ReloadAllowed(){ return !StarBASIC::IsRunning(); }
virtual void LoadIniFile(); // (re)load ini file after change
};
diff --git a/basic/source/app/apperror.cxx b/basic/source/app/apperror.cxx
index cd5bc34b39a8..48781eab1767 100644..100755
--- a/basic/source/app/apperror.cxx
+++ b/basic/source/app/apperror.cxx
@@ -64,10 +64,10 @@ long AppError::InitMenu( Menu* pMenu )
{
AppWin::InitMenu (pMenu );
- pMenu->EnableItem( RID_EDITUNDO, FALSE );
- pMenu->EnableItem( RID_EDITREDO, FALSE );
+ pMenu->EnableItem( RID_EDITUNDO, sal_False );
+ pMenu->EnableItem( RID_EDITREDO, sal_False );
- return TRUE;
+ return sal_True;
}
long AppError::DeInitMenu( Menu* pMenu )
@@ -77,10 +77,10 @@ long AppError::DeInitMenu( Menu* pMenu )
pMenu->EnableItem( RID_EDITUNDO );
pMenu->EnableItem( RID_EDITREDO );
- return TRUE;
+ return sal_True;
}
-USHORT AppError::GetLineNr(){ return pDataEdit->GetLineNr(); }
+sal_uInt16 AppError::GetLineNr(){ return pDataEdit->GetLineNr(); }
FileType AppError::GetFileType()
{
@@ -102,12 +102,12 @@ void AppError::LoadIniFile()
String aFontStyle = String( aConf.ReadKey( "ScriptFontStyle", "normal" ), RTL_TEXTENCODING_UTF8 );
String aFontSize = String( aConf.ReadKey( "ScriptFontSize", "12" ), RTL_TEXTENCODING_UTF8 );
Font aFont = aFontList.Get( aFontName, aFontStyle );
-// ULONG nFontSize = aFontSize.GetValue( FUNIT_POINT );
- ULONG nFontSize = aFontSize.ToInt32();
+// sal_uIntPtr nFontSize = aFontSize.GetValue( FUNIT_POINT );
+ sal_uIntPtr nFontSize = aFontSize.ToInt32();
// aFont.SetSize( Size( nFontSize, nFontSize ) );
aFont.SetHeight( nFontSize );
- aFont.SetTransparent( FALSE );
+ aFont.SetTransparent( sal_False );
// aFont.SetAlign( ALIGN_BOTTOM );
// aFont.SetHeight( aFont.GetHeight()+2 );
pDataEdit->SetFont( aFont );
diff --git a/basic/source/app/apperror.hxx b/basic/source/app/apperror.hxx
index 9dedf5c428aa..c55015a1964d 100644..100755
--- a/basic/source/app/apperror.hxx
+++ b/basic/source/app/apperror.hxx
@@ -40,10 +40,10 @@ public:
// long Command( short nID );
virtual long InitMenu( Menu* );
virtual long DeInitMenu( Menu* );
- USHORT GetLineNr();
+ sal_uInt16 GetLineNr();
FileType GetFileType();
MsgEdit* GetMsgTree() { return ((MsgEdit*)pDataEdit); }
- virtual BOOL ReloadAllowed(){ return !StarBASIC::IsRunning(); }
+ virtual sal_Bool ReloadAllowed(){ return !StarBASIC::IsRunning(); }
virtual void LoadIniFile(); // (re)load ini file after change
DirEntry aBaseDir;
};
diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx
index e39d6c8e95b3..984637af5178 100644..100755
--- a/basic/source/app/appwin.cxx
+++ b/basic/source/app/appwin.cxx
@@ -51,10 +51,10 @@ TYPEINIT0(AppWin);
AppWin::AppWin( BasicFrame* pParent )
: DockingWindow( pParent, WB_SIZEMOVE | WB_CLOSEABLE | WB_PINABLE )
, nSkipReload(0)
-, bHasFile( FALSE )
-, bReloadAborted( FALSE )
+, bHasFile( sal_False )
+, bReloadAborted( sal_False )
, pFrame( pParent )
-, bFind( TRUE )
+, bFind( sal_True )
, pDataEdit(NULL)
{
// Load the Untitled string if not yet loaded
@@ -63,7 +63,7 @@ AppWin::AppWin( BasicFrame* pParent )
nCount++;
// Get maximized state from current window
- USHORT nInitialWinState;
+ sal_uInt16 nInitialWinState;
if ( pFrame->pWork )
{
nInitialWinState = pFrame->pWork->GetWinState();
@@ -97,7 +97,7 @@ void AppWin::SetText( const XubString& rStr )
pFrame->WindowRenamed( this );
}
-void AppWin::TitleButtonClick( USHORT nButton )
+void AppWin::TitleButtonClick( sal_uInt16 nButton )
{
if ( TITLE_BUTTON_DOCKING == nButton )
if ( TT_WIN_STATE_MAX != nWinState )
@@ -105,7 +105,7 @@ void AppWin::TitleButtonClick( USHORT nButton )
else
Restore();
else // if ( TITLE_BUTTON_HIDE == nButton )
- Minimize( TRUE );
+ Minimize( sal_True );
}
void AppWin::Maximize()
@@ -115,7 +115,7 @@ void AppWin::Maximize()
nNormalPos = GetPosPixel();
nNormalSize = GetSizePixel();
- SetFloatingMode( FALSE );
+ SetFloatingMode( sal_False );
pFrame->nMaximizedWindows++;
nWinState = TT_WIN_STATE_MAX;
@@ -137,7 +137,7 @@ void AppWin::Maximize()
void AppWin::Restore()
{
- SetFloatingMode( TRUE );
+ SetFloatingMode( sal_True );
SetPosSizePixel( nNormalPos, nNormalSize );
if ( TT_WIN_STATE_MAX == nWinState )
@@ -147,7 +147,7 @@ void AppWin::Restore()
pFrame->WinMax_Restore();
}
-void AppWin::Minimize( BOOL bMinimize )
+void AppWin::Minimize( sal_Bool bMinimize )
{
if ( bMinimize )
nWinState |= TT_WIN_STATE_HIDE;
@@ -156,7 +156,7 @@ void AppWin::Minimize( BOOL bMinimize )
pFrame->WinMax_Restore();
}
-void AppWin::Cascade( USHORT nNr )
+void AppWin::Cascade( sal_uInt16 nNr )
{
Restore();
@@ -228,7 +228,7 @@ long AppWin::PreNotify( NotifyEvent& rNEvt )
if ( rNEvt.GetType() == EVENT_GETFOCUS )
if ( pFrame->pList->back() != this )
Activate();
- return FALSE; // Der event soll weiter verarbeitet werden
+ return sal_False; // Der event soll weiter verarbeitet werden
}
void AppWin::Activate()
@@ -241,14 +241,14 @@ long AppWin::InitMenu( Menu* pMenu )
{
::rtl::OUString aTemp;
- BOOL bMarked;
+ sal_Bool bMarked;
if( pDataEdit )
{
TextSelection r = pDataEdit->GetSelection();
bMarked = r.HasRange();
}
else
- bMarked = FALSE;
+ bMarked = sal_False;
pMenu->EnableItem( RID_EDITREPEAT, (aFind.Len() != 0 ) );
pMenu->EnableItem( RID_EDITCUT, bMarked );
pMenu->EnableItem( RID_EDITCOPY, bMarked );
@@ -256,20 +256,20 @@ long AppWin::InitMenu( Menu* pMenu )
pMenu->EnableItem( RID_EDITDEL, bMarked );
// pMenu->EnableItem( RID_HELPTOPIC, bMarked );
- BOOL bHasText;
+ sal_Bool bHasText;
if( pDataEdit )
bHasText = pDataEdit->HasText();
else
- bHasText = FALSE;
- BOOL bRunning = pFrame->Basic().IsRunning();
- BOOL bCanExecute = BOOL( (!bRunning && bHasText) || pFrame->bInBreak );
+ bHasText = sal_False;
+ sal_Bool bRunning = pFrame->Basic().IsRunning();
+ sal_Bool bCanExecute = sal_Bool( (!bRunning && bHasText) || pFrame->bInBreak );
pMenu->EnableItem( RID_RUNSTART, bCanExecute );
pMenu->EnableItem( RID_RUNBREAK, bRunning && !pFrame->bInBreak);
pMenu->EnableItem( RID_RUNSTOP, bRunning );
pMenu->EnableItem( RID_RUNTOCURSOR, bCanExecute );
pMenu->EnableItem( RID_RUNSTEPINTO, bCanExecute );
pMenu->EnableItem( RID_RUNSTEPOVER, bCanExecute );
- return TRUE;
+ return sal_True;
}
long AppWin::DeInitMenu( Menu* pMenu )
@@ -286,7 +286,7 @@ long AppWin::DeInitMenu( Menu* pMenu )
pMenu->EnableItem( RID_RUNTOCURSOR );
pMenu->EnableItem( RID_RUNSTEPINTO );
pMenu->EnableItem( RID_RUNSTEPOVER );
- return TRUE;
+ return sal_True;
}
// Menu Handler
@@ -294,7 +294,7 @@ long AppWin::DeInitMenu( Menu* pMenu )
void AppWin::Command( const CommandEvent& rCEvt )
{
TextSelection r = pDataEdit->GetSelection();
- BOOL bHasMark = r.HasRange();
+ sal_Bool bHasMark = r.HasRange();
switch( rCEvt.GetCommand() ) {
case RID_FILESAVE:
QuerySave( QUERY_DISK_CHANGED | SAVE_NOT_DIRTY ); break;
@@ -336,7 +336,7 @@ void AppWin::Command( const CommandEvent& rCEvt )
pDataEdit->BuildKontextMenu( pKontext );
if ( pKontext )
{
- USHORT nRes = pKontext->Execute( this, GetPointerPosPixel() );
+ sal_uInt16 nRes = pKontext->Execute( this, GetPointerPosPixel() );
if ( nRes )
pFrame->Command( nRes );
delete pKontext;
@@ -347,12 +347,12 @@ void AppWin::Command( const CommandEvent& rCEvt )
}
-BOOL AppWin::IsSkipReload()
+sal_Bool AppWin::IsSkipReload()
{
return nSkipReload != 0;
}
-void AppWin::SkipReload( BOOL bSkip )
+void AppWin::SkipReload( sal_Bool bSkip )
{
DBG_ASSERT( bSkip || nSkipReload, "SkipReload aufgehoben ohne es zu aktivieren");
if ( bSkip )
@@ -361,17 +361,17 @@ void AppWin::SkipReload( BOOL bSkip )
nSkipReload--;
}
-BOOL AppWin::DiskFileChanged( USHORT nWhat )
+sal_Bool AppWin::DiskFileChanged( sal_uInt16 nWhat )
{
if ( !bHasFile )
- return FALSE;
+ return sal_False;
switch ( nWhat )
{
case SINCE_LAST_LOAD:
{
if ( bReloadAborted )
- return TRUE;
+ return sal_True;
else
return DiskFileChanged( SINCE_LAST_ASK_RELOAD );
}
@@ -392,16 +392,16 @@ BOOL AppWin::DiskFileChanged( USHORT nWhat )
default:
OSL_FAIL("Not Implemented in AppWin::DiskFileChanged");
}
- return TRUE;
+ return sal_True;
}
-void AppWin::UpdateFileInfo( USHORT nWhat )
+void AppWin::UpdateFileInfo( sal_uInt16 nWhat )
{
switch ( nWhat )
{
case HAS_BEEN_LOADED:
{
- bReloadAborted = FALSE;
+ bReloadAborted = sal_False;
UpdateFileInfo( ASKED_RELOAD );
}
@@ -446,7 +446,7 @@ void AppWin::CheckReload()
}
else
{
- bReloadAborted = TRUE;
+ bReloadAborted = sal_True;
}
}
}
@@ -457,14 +457,14 @@ void AppWin::Reload()
TextSelection aSelMemo = pDataEdit->GetSelection();
Load( GetText() );
pDataEdit->SetSelection( aSelMemo );
- SkipReload( FALSE );
+ SkipReload( sal_False );
}
// Load file
-BOOL AppWin::Load( const String& aName )
+sal_Bool AppWin::Load( const String& aName )
{
SkipReload();
- BOOL bErr;
+ sal_Bool bErr;
// if( !QuerySave() )
// return;
@@ -493,17 +493,17 @@ BOOL AppWin::Load( const String& aName )
SetText( aModName );
UpdateFileInfo( HAS_BEEN_LOADED );
PostLoad();
- bHasFile = TRUE;
+ bHasFile = sal_True;
}
- SkipReload( FALSE );
+ SkipReload( sal_False );
return !bErr;
}
// Save file
-USHORT AppWin::ImplSave()
+sal_uInt16 AppWin::ImplSave()
{
SkipReload();
- USHORT nResult = SAVE_RES_NOT_SAVED;
+ sal_uInt16 nResult = SAVE_RES_NOT_SAVED;
String s1 = *pNoName;
String s2 = GetText().Copy( 0, s1.Len() );
if( s1 == s2 )
@@ -513,7 +513,7 @@ USHORT AppWin::ImplSave()
if ( pDataEdit->Save( aName ) )
{
nResult = SAVE_RES_SAVED;
- bHasFile = TRUE;
+ bHasFile = sal_True;
}
else
{
@@ -522,38 +522,38 @@ USHORT AppWin::ImplSave()
}
UpdateFileInfo( HAS_BEEN_LOADED );
}
- SkipReload( FALSE );
+ SkipReload( sal_False );
return nResult;
}
// Save to new file name
-USHORT AppWin::SaveAs()
+sal_uInt16 AppWin::SaveAs()
{
SkipReload();
String s1 = *pNoName;
String s2 = GetText().Copy( 0, s1.Len() );
if( s1 == s2 ) s2.Erase();
else s2 = GetText();
- if( pFrame->QueryFileName( s2, GetFileType(), TRUE ) )
+ if( pFrame->QueryFileName( s2, GetFileType(), sal_True ) )
{
SetText( s2 );
PostSaveAs();
- SkipReload( FALSE );
+ SkipReload( sal_False );
return ImplSave();
}
else
{
- SkipReload( FALSE );
+ SkipReload( sal_False );
return SAVE_RES_CANCEL;
}
}
// Should we save the file?
-USHORT AppWin::QuerySave( QueryBits nBits )
+sal_uInt16 AppWin::QuerySave( QueryBits nBits )
{
- BOOL bQueryDirty = ( nBits & QUERY_DIRTY ) != 0;
- BOOL bQueryDiskChanged = ( nBits & QUERY_DISK_CHANGED ) != 0;
- BOOL bSaveNotDirty = ( nBits & SAVE_NOT_DIRTY ) != 0;
+ sal_Bool bQueryDirty = ( nBits & QUERY_DIRTY ) != 0;
+ sal_Bool bQueryDiskChanged = ( nBits & QUERY_DISK_CHANGED ) != 0;
+ sal_Bool bSaveNotDirty = ( nBits & SAVE_NOT_DIRTY ) != 0;
SkipReload();
short nResult;
@@ -562,8 +562,8 @@ USHORT AppWin::QuerySave( QueryBits nBits )
else
nResult = RET_NO;
- BOOL bAlwaysEnableInput = pFrame->IsAlwaysEnableInput();
- pFrame->AlwaysEnableInput( FALSE );
+ sal_Bool bAlwaysEnableInput = pFrame->IsAlwaysEnableInput();
+ pFrame->AlwaysEnableInput( sal_False );
if( ( ( IsModified() || bSaveNotDirty ) && bQueryDirty ) || ( DiskFileChanged( SINCE_LAST_LOAD ) && bQueryDiskChanged ) )
{
ToTop();
@@ -577,7 +577,7 @@ USHORT AppWin::QuerySave( QueryBits nBits )
}
pFrame->AlwaysEnableInput( bAlwaysEnableInput );
- USHORT nReturn;
+ sal_uInt16 nReturn;
switch( nResult )
{
case RET_YES:
@@ -593,11 +593,11 @@ USHORT AppWin::QuerySave( QueryBits nBits )
OSL_FAIL("switch default where no default should be: Internal error");
nReturn = SAVE_RES_CANCEL;
}
- SkipReload( FALSE );
+ SkipReload( sal_False );
return nReturn;
}
-BOOL AppWin::Close()
+sal_Bool AppWin::Close()
{
switch ( QuerySave( QUERY_DIRTY ) )
{
@@ -606,21 +606,21 @@ BOOL AppWin::Close()
{
DockingWindow::Close();
delete this;
- return TRUE;
+ return sal_True;
}
// uncomment to avoid compiler warning
// break;
case SAVE_RES_ERROR:
- return FALSE;
+ return sal_False;
// uncomment to avoid compiler warning
// break;
case SAVE_RES_CANCEL:
- return FALSE;
+ return sal_False;
// uncomment to avoid compiler warning
// break;
default:
OSL_FAIL("Not Implemented in AppWin::Close");
- return FALSE;
+ return sal_False;
}
}
@@ -630,7 +630,7 @@ void AppWin::Find()
SttResId aResId( IDD_FIND_DIALOG );
FindDialog aDlg( this, aResId, aFind );
if( aDlg.Execute() ) {
- bFind = TRUE;
+ bFind = sal_True;
Repeat();
}
}
@@ -642,7 +642,7 @@ void AppWin::Replace()
ReplaceDialog* pDlg = new ReplaceDialog
(this, aResId, aFind, aReplace );
if( pDlg->Execute() ) {
- bFind = FALSE;
+ bFind = sal_False;
Repeat();
}
}
@@ -650,7 +650,7 @@ void AppWin::Replace()
// Repeat search/replace operation
void AppWin::Repeat()
{
- if( (aFind.Len() != 0 ) && ( pDataEdit->Find( aFind ) || (ErrorBox(this,SttResId(IDS_PATTERNNOTFOUND)).Execute() && FALSE) ) && !bFind )
+ if( (aFind.Len() != 0 ) && ( pDataEdit->Find( aFind ) || (ErrorBox(this,SttResId(IDS_PATTERNNOTFOUND)).Execute() && sal_False) ) && !bFind )
pDataEdit->ReplaceSelected( aReplace );
}
diff --git a/basic/source/app/appwin.hxx b/basic/source/app/appwin.hxx
index 2add5e275d4e..e5a79e042d8b 100644..100755
--- a/basic/source/app/appwin.hxx
+++ b/basic/source/app/appwin.hxx
@@ -36,16 +36,16 @@
#include "dataedit.hxx"
#include <vector>
+typedef sal_uInt16 QueryBits;
-typedef USHORT QueryBits;
#define QUERY_NONE ( QueryBits ( 0x00 ) )
#define QUERY_DIRTY ( QueryBits ( 0x01 ) )
#define QUERY_DISK_CHANGED ( QueryBits ( 0x02 ) )
#define QUERY_ALL ( QUERY_DIRTY | QUERY_DISK_CHANGED )
#define SAVE_NOT_DIRTY ( QueryBits ( 0x04 ) )
-#define SAVE_RES_SAVED TRUE
-#define SAVE_RES_NOT_SAVED FALSE
+#define SAVE_RES_SAVED sal_True
+#define SAVE_RES_NOT_SAVED sal_False
#define SAVE_RES_ERROR 3
#define SAVE_RES_CANCEL 4
@@ -71,67 +71,67 @@ protected:
static short nCount; // number of edit windows
static String *pNoName; // "Untitled"
FileStat aLastAccess; // Last access time of loaded file
- USHORT nSkipReload; // Sometimes there must not be a reload
- BOOL bHasFile; // Otherwise reload does not make sense
- BOOL bReloadAborted; // Is set if reload was cancelled so that we can ask again wehn closing
+ sal_uInt16 nSkipReload; // Sometimes there must not be a reload
+ sal_Bool bHasFile; // Otherwise reload does not make sense
+ sal_Bool bReloadAborted; // Is set if reload was cancelled so that we can ask again wehn closing
short nId; // ID-Nummer( "Unnamed n" )
BasicFrame* pFrame; // Parent-Window
String aFind; // Search string
String aReplace; // Replace string
- BOOL bFind; // TRUE if search not replace
+ sal_Bool bFind; // sal_True if search not replace
void RequestHelp( const HelpEvent& ); // Help handler
void GetFocus(); // activate
- virtual USHORT ImplSave(); // Save file
- USHORT nWinState; // Maximized, Iconized or Normal
+ virtual sal_uInt16 ImplSave(); // Save file
+ sal_uInt16 nWinState; // Maximized, Iconized or Normal
Point nNormalPos; // Position if normal
Size nNormalSize; // Size if Normal
virtual long PreNotify( NotifyEvent& rNEvt );
- USHORT nWinId;
+ sal_uInt16 nWinId;
public:
TYPEINFO();
AppWin( BasicFrame* );
~AppWin();
DataEdit* pDataEdit; // Data area
- virtual USHORT GetLineNr()=0; // Current line number
+ virtual sal_uInt16 GetLineNr()=0; // Current line number
virtual long InitMenu( Menu* ); // Init of the menu
virtual long DeInitMenu( Menu* ); // reset to enable all shortcuts
virtual void Command( const CommandEvent& rCEvt ); // Command handler
virtual void Resize();
virtual void Help();
- virtual BOOL Load( const String& ); // Load file
+ virtual sal_Bool Load( const String& ); // Load file
virtual void PostLoad(){} // Set source at module
- virtual USHORT SaveAs(); // Save file as
+ virtual sal_uInt16 SaveAs(); // Save file as
virtual void PostSaveAs(){}
virtual void Find(); // find text
virtual void Replace(); // replace text
virtual void Repeat(); // repeat find/replace
- virtual BOOL Close(); // close window
+ virtual sal_Bool Close(); // close window
virtual void Activate(); // window was activated
virtual FileType GetFileType()=0; // returns the filetype
- virtual BOOL ReloadAllowed(){ return TRUE; }
+ virtual sal_Bool ReloadAllowed(){ return sal_True; }
virtual void Reload(); // Reload after change on disk
virtual void LoadIniFile(){;} // (re)load ini file after change
void CheckReload(); // Checks and asks if reload should performed
- BOOL DiskFileChanged( USHORT nWhat ); // Checks file for changes
- void UpdateFileInfo( USHORT nWhat ); // Remembers last file state
- BOOL IsSkipReload(); // Should we test reload?
- void SkipReload( BOOL bSkip = TRUE );
- USHORT GetWinState(){ return nWinState; }
+ sal_Bool DiskFileChanged( sal_uInt16 nWhat ); // Checks file for changes
+ void UpdateFileInfo( sal_uInt16 nWhat ); // Remembers last file state
+ sal_Bool IsSkipReload(); // Should we test reload?
+ void SkipReload( sal_Bool bSkip = sal_True );
+ sal_uInt16 GetWinState(){ return nWinState; }
void Maximize();
void Restore();
- void Minimize( BOOL bMinimize );
- void Cascade( USHORT nNr );
+ void Minimize( sal_Bool bMinimize );
+ void Cascade( sal_uInt16 nNr );
- USHORT QuerySave( QueryBits nBits = QUERY_ALL );
- BOOL IsModified() { return pDataEdit->IsModified(); }
+ sal_uInt16 QuerySave( QueryBits nBits = QUERY_ALL );
+ sal_Bool IsModified() { return pDataEdit->IsModified(); }
BasicFrame* GetBasicFrame() { return pFrame; }
- virtual void TitleButtonClick( USHORT nButton );
+ virtual void TitleButtonClick( sal_uInt16 nButton );
virtual void SetText( const XubString& rStr );
- USHORT GetWinId() { return nWinId; }
- void SetWinId( USHORT nWId ) { nWinId = nWId; }
+ sal_uInt16 GetWinId() { return nWinId; }
+ void SetWinId( sal_uInt16 nWId ) { nWinId = nWId; }
};
typedef ::std::vector< AppWin* > EditList;
diff --git a/basic/source/app/basic.hrc b/basic/source/app/basic.hrc
index e4a69d9d2942..e4a69d9d2942 100644..100755
--- a/basic/source/app/basic.hrc
+++ b/basic/source/app/basic.hrc
diff --git a/basic/source/app/basic.src b/basic/source/app/basic.src
index a879780e90ff..28cffcbae5b7 100644..100755
--- a/basic/source/app/basic.src
+++ b/basic/source/app/basic.src
@@ -29,6 +29,7 @@
#include "resids.hrc"
ModalDialog RID_CALLDLG {
+ HelpID = "basic:ModalDialog:RID_CALLDLG";
PosSize = MAP_SYSFONT (18,18,142,142);
SVLook = TRUE;
MOVEABLE = TRUE;
@@ -43,11 +44,13 @@ ModalDialog RID_CALLDLG {
PosSize = MAP_SYSFONT (10,70,120,8);
};
Edit RID_RETVAL {
+ HelpID = "basic:Edit:RID_CALLDLG:RID_RETVAL";
PosSize = MAP_SYSFONT (10,85,120,12);
Border = TRUE;
TabStop = TRUE;
};
ListBox RID_PARAMS {
+ HelpID = "basic:ListBox:RID_CALLDLG:RID_PARAMS";
PosSize = MAP_SYSFONT (10,25,120,40);
TabStop = TRUE;
Border = TRUE;
@@ -61,6 +64,7 @@ ModalDialog RID_CALLDLG {
};
ModalDialog IDD_ABOUT_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_ABOUT_DIALOG";
Pos = MAP_APPFONT( 58, 17 );
Size = MAP_APPFONT( 155, 106 );
SVLook = TRUE;
@@ -107,6 +111,7 @@ ModalDialog IDD_ABOUT_DIALOG {
};
ModalDialog IDD_TT_ABOUT_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_TT_ABOUT_DIALOG";
Pos = MAP_APPFONT( 58, 17 );
Size = MAP_APPFONT( 120, 81 );
SVLook = TRUE;
@@ -138,6 +143,7 @@ ModalDialog IDD_TT_ABOUT_DIALOG {
};
ModalDialog IDD_FIND_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_FIND_DIALOG";
Pos = MAP_APPFONT( 69, 30 );
Size = MAP_APPFONT( 185, 70 );
SVLook = TRUE;
@@ -150,6 +156,7 @@ ModalDialog IDD_FIND_DIALOG {
TEXT[ en-US ] = "~Text";
};
Edit RID_FIND {
+ HelpID = "basic:Edit:IDD_FIND_DIALOG:RID_FIND";
BORDER = TRUE;
Pos = MAP_APPFONT( 40, 8 );
Size = MAP_APPFONT( 135, 12 );
@@ -172,6 +179,7 @@ ModalDialog IDD_FIND_DIALOG {
};
ModalDialog IDD_REPLACE_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_REPLACE_DIALOG";
Pos = MAP_APPFONT( 69, 30 );
Size = MAP_APPFONT( 185, 88 );
SVLook = TRUE;
@@ -188,12 +196,14 @@ ModalDialog IDD_REPLACE_DIALOG {
TEXT[ en-US ] = "~Replace by";
};
Edit RID_FIND {
+ HelpID = "basic:Edit:IDD_REPLACE_DIALOG:RID_FIND";
BORDER = TRUE;
Pos = MAP_APPFONT( 65, 8 );
Size = MAP_APPFONT( 110, 12 );
TABSTOP = TRUE;
};
Edit RID_REPLACE {
+ HelpID = "basic:Edit:IDD_REPLACE_DIALOG:RID_REPLACE";
BORDER = TRUE;
Pos = MAP_APPFONT( 65, 28 );
Size = MAP_APPFONT( 110, 12 );
@@ -718,6 +728,7 @@ Menu RID_HELP {
};
};
ModelessDialog IDD_PRINT_DIALOG {
+ HelpID = "basic:ModelessDialog:IDD_PRINT_DIALOG";
Pos = MAP_APPFONT( 83, 42 );
Size = MAP_APPFONT( 171, 94 );
MOVEABLE = TRUE;
@@ -784,6 +795,7 @@ TabDialog IDD_OPTIONS_DLG
TabPage RID_TP_GENERIC {
+ HelpID = "basic:TabPage:RID_TP_GENERIC";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -793,6 +805,7 @@ TabPage RID_TP_GENERIC {
Text[ en-US ] = "Area";
};
ComboBox RID_CB_AREA {
+ HelpID = "basic:ComboBox:RID_TP_GENERIC:RID_CB_AREA";
HScroll = TRUE;
VScroll = TRUE;
AutoHScroll = TRUE;
@@ -803,12 +816,14 @@ TabPage RID_TP_GENERIC {
DropDown = TRUE;
};
PushButton RID_PB_NEW_AREA {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_NEW_AREA";
Pos = MAP_APPFONT( 144, 12 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "New";
};
PushButton RID_PD_DEL_AREA {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PD_DEL_AREA";
Pos = MAP_APPFONT( 188, 12 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -820,6 +835,7 @@ TabPage RID_TP_GENERIC {
Text[ en-US ] = "Setting";
};
ComboBox RID_CB_VALUE {
+ HelpID = "basic:ComboBox:RID_TP_GENERIC:RID_CB_VALUE";
HScroll = TRUE;
VScroll = TRUE;
AutoHScroll = TRUE;
@@ -829,6 +845,7 @@ TabPage RID_TP_GENERIC {
TabStop = TRUE;
};
PushButton RID_PB_SELECT_FILE {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_SELECT_FILE";
Pos = MAP_APPFONT( 188, 48 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -837,12 +854,14 @@ TabPage RID_TP_GENERIC {
Hide = TRUE;
};
PushButton RID_PB_NEW_VALUE {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_NEW_VALUE";
Pos = MAP_APPFONT( 188, 48 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "New";
};
PushButton RID_PB_DEL_VALUE {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_DEL_VALUE";
Pos = MAP_APPFONT( 188, 64 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -852,6 +871,7 @@ TabPage RID_TP_GENERIC {
TabPage RID_TP_PROFILE {
+ HelpID = "basic:TabPage:RID_TP_PROFILE";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -861,6 +881,7 @@ TabPage RID_TP_PROFILE {
Text[ en-US ] = "Profile";
};
ComboBox RID_CB_PROFILE {
+ HelpID = "basic:ComboBox:RID_TP_PROFILE:RID_CB_PROFILE";
HScroll = TRUE;
VScroll = TRUE;
AutoHScroll = TRUE;
@@ -871,12 +892,14 @@ TabPage RID_TP_PROFILE {
DropDown = TRUE;
};
PushButton RID_PB_NEW_PROFILE {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:RID_PB_NEW_PROFILE";
Pos = MAP_APPFONT( 144, 2 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "New";
};
PushButton RID_PD_DEL_PROFILE {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:RID_PD_DEL_PROFILE";
Pos = MAP_APPFONT( 188, 2 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -898,6 +921,7 @@ TabPage RID_TP_PROFILE {
Text[ en-US ] = "Base directory";
};
CheckBox HID_CHECK {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:HID_CHECK";
Pos = MAP_APPFONT( 7, 58 );
Size = MAP_APPFONT( 86, 12 );
Text[ en-US ] = "Default HID directory";
@@ -905,52 +929,61 @@ TabPage RID_TP_PROFILE {
Hide = FALSE;
};
Edit LOG_NAME {
+ HelpID = "basic:Edit:RID_TP_PROFILE:LOG_NAME";
Border = TRUE;
Pos = MAP_APPFONT( 97, 26 );
Size = MAP_APPFONT( 116, 12 );
TabStop = TRUE;
};
Edit BASIS_NAME {
+ HelpID = "basic:Edit:RID_TP_PROFILE:BASIS_NAME";
Border = TRUE;
Pos = MAP_APPFONT( 97, 42 );
Size = MAP_APPFONT( 116, 12 );
TabStop = TRUE;
};
Edit HID_NAME {
+ HelpID = "basic:Edit:RID_TP_PROFILE:HID_NAME";
Border = TRUE;
Pos = MAP_APPFONT( 97, 58 );
Size = MAP_APPFONT( 116, 12 );
TabStop = TRUE;
};
PushButton LOG_SET {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:LOG_SET";
Pos = MAP_APPFONT( 217, 26 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
Text[ en-US ] = "...";
};
PushButton BASIS_SET {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:BASIS_SET";
Pos = MAP_APPFONT( 217, 42 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
Text[ en-US ] = "...";
};
PushButton HID_SET {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:HID_SET";
Pos = MAP_APPFONT( 217, 58 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
Text[ en-US ] = "...";
};
CheckBox CB_AUTORELOAD {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_AUTORELOAD";
Pos = MAP_APPFONT( 7, 74 );
Size = MAP_APPFONT( 115, 12 );
Text[ en-US ] = "AutoReload";
};
CheckBox CB_AUTOSAVE {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_AUTOSAVE";
Pos = MAP_APPFONT( 7, 87 );
Size = MAP_APPFONT( 115, 12 );
Text[ en-US ] = "Save before execute";
};
CheckBox CB_STOPONSYNTAXERRORS {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_STOPONSYNTAXERRORS";
Pos = MAP_APPFONT( 132, 74 );
Size = MAP_APPFONT( 115, 12 );
Text[ en-US ] = "Stop on Syntax Errors";
@@ -958,6 +991,7 @@ TabPage RID_TP_PROFILE {
};
TabPage RID_TP_CRASH {
+ HelpID = "basic:TabPage:RID_TP_CRASH";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -967,6 +1001,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "Crashreport";
};
CheckBox CB_USEPROXY {
+ HelpID = "basic:CheckBox:RID_TP_CRASH:CB_USEPROXY";
Pos = MAP_APPFONT( 8, 12 );
Size = MAP_APPFONT( 120, 12 );
Text[ en-US ] = "Use Proxy";
@@ -977,6 +1012,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "Host";
};
Edit ED_CRHOST {
+ HelpID = "basic:Edit:RID_TP_CRASH:ED_CRHOST";
Border = TRUE;
Pos = MAP_APPFONT( 43+12, 12+13 );
Size = MAP_APPFONT( 80, 12 );
@@ -988,6 +1024,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "Port";
};
NumericField NF_CRPORT {
+ HelpID = "basic:NumericField:RID_TP_CRASH:NF_CRPORT";
Border = TRUE;
Pos = MAP_APPFONT( 43+12, 12+13+16 );
Size = MAP_APPFONT( 40, 12 );
@@ -1001,6 +1038,7 @@ TabPage RID_TP_CRASH {
Last = 0xffff;
};
CheckBox CB_ALLOWCONTACT {
+ HelpID = "basic:CheckBox:RID_TP_CRASH:CB_ALLOWCONTACT";
Pos = MAP_APPFONT( 8, 12+13+16+16 );
Size = MAP_APPFONT( 120, 12 );
Text[ en-US ] = "Allow Contact";
@@ -1011,6 +1049,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "EMail";
};
Edit ED_EMAIL {
+ HelpID = "basic:Edit:RID_TP_CRASH:ED_EMAIL";
Border = TRUE;
Pos = MAP_APPFONT( 43+12, 12+13+16+16+13 );
Size = MAP_APPFONT( 80, 12 );
@@ -1020,6 +1059,7 @@ TabPage RID_TP_CRASH {
TabPage RID_TP_MISC {
+ HelpID = "basic:TabPage:RID_TP_MISC";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -1034,6 +1074,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Host";
};
Edit ED_HOST {
+ HelpID = "basic:Edit:RID_TP_MISC:ED_HOST";
Border = TRUE;
Pos = MAP_APPFONT( 43, 12);
Size = MAP_APPFONT( 80, 12 );
@@ -1045,6 +1086,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Testtool Port";
};
NumericField NF_TTPORT {
+ HelpID = "basic:NumericField:RID_TP_MISC:NF_TTPORT";
Border = TRUE;
Pos = MAP_APPFONT( 191, 12);
Size = MAP_APPFONT( 40, 12 );
@@ -1063,6 +1105,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Remote UNO Port";
};
NumericField NF_UNOPORT {
+ HelpID = "basic:NumericField:RID_TP_MISC:NF_UNOPORT";
Border = TRUE;
Pos = MAP_APPFONT( 191, 12+15);
Size = MAP_APPFONT( 40, 12 );
@@ -1087,6 +1130,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Server Timeout";
};
TimeField SERVER_TIMEOUT {
+ HelpID = "basic:TimeField:RID_TP_MISC:SERVER_TIMEOUT";
Border = TRUE;
Pos = MAP_APPFONT( 83, 50 );
Size = MAP_APPFONT( 40, 12 );
@@ -1102,6 +1146,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Max LRU Files";
};
NumericField TF_MAX_LRU {
+ HelpID = "basic:NumericField:RID_TP_MISC:TF_MAX_LRU";
Border = TRUE;
Pos = MAP_APPFONT( 191, 50);
Size = MAP_APPFONT( 40, 12 );
@@ -1118,12 +1163,14 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "OOo Program Dir";
};
Edit ED_PROGDIR {
+ HelpID = "basic:Edit:RID_TP_MISC:ED_PROGDIR";
Border = TRUE;
Pos = MAP_APPFONT( 83, 50+15 );
Size = MAP_APPFONT( 219-83-4, 12 );
TabStop = TRUE;
};
PushButton PB_PROGDIR {
+ HelpID = "basic:PushButton:RID_TP_MISC:PB_PROGDIR";
Pos = MAP_APPFONT( 219, 50+15 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
@@ -1133,6 +1180,7 @@ TabPage RID_TP_MISC {
TabPage RID_TP_FONT {
+ HelpID = "basic:TabPage:RID_TP_FONT";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -1142,6 +1190,7 @@ TabPage RID_TP_FONT {
Text[ en-US ] = "Type";
};
ComboBox CB_FONTNAME {
+ HelpID = "basic:ComboBox:RID_TP_FONT:CB_FONTNAME";
Pos = MAP_APPFONT( 4, 12 );
Size = MAP_APPFONT( 123, 12*4 );
Sort = TRUE;
@@ -1153,6 +1202,7 @@ TabPage RID_TP_FONT {
Text[ en-US ] = "Typeface";
};
ComboBox CB_FONTSTYLE {
+ HelpID = "basic:ComboBox:RID_TP_FONT:CB_FONTSTYLE";
Pos = MAP_APPFONT( 131, 12 );
Size = MAP_APPFONT( 65, 12*4 );
AutoHScroll = TRUE;
@@ -1163,6 +1213,7 @@ TabPage RID_TP_FONT {
Text[ en-US ] = "Size";
};
MetricBox MB_FONTSIZE {
+ HelpID = "basic:MetricBox:RID_TP_FONT:MB_FONTSIZE";
Pos = MAP_APPFONT( 200, 12 );
Size = MAP_APPFONT( 29, 12*4 );
AutoHScroll = TRUE;
@@ -1178,6 +1229,7 @@ TabPage RID_TP_FONT {
FloatingWindow IDD_DISPLAY_HID {
+ HelpID = "basic:FloatingWindow:IDD_DISPLAY_HID";
OutputSize = TRUE;
SVLook = TRUE;
Size = MAP_APPFONT( 261, 160 );
@@ -1204,6 +1256,7 @@ FloatingWindow IDD_DISPLAY_HID {
Text[ en-US ] = "Controls";
};
MultiListBox RID_MLB_CONTROLS {
+ HelpID = "basic:MultiListBox:IDD_DISPLAY_HID:RID_MLB_CONTROLS";
Border = TRUE;
AutoHScroll = TRUE;
Pos = MAP_APPFONT( 4, 28 );
@@ -1216,6 +1269,7 @@ FloatingWindow IDD_DISPLAY_HID {
Text[ en-US ] = "Slots";
};
MultiListBox RID_MLB_SLOTS {
+ HelpID = "basic:MultiListBox:IDD_DISPLAY_HID:RID_MLB_SLOTS";
Border = TRUE;
AutoHScroll = TRUE;
Pos = MAP_APPFONT( 4, 132 );
@@ -1223,12 +1277,14 @@ FloatingWindow IDD_DISPLAY_HID {
TabStop = TRUE;
};
PushButton RID_PB_KOPIEREN {
+ HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_KOPIEREN";
Pos = MAP_APPFONT( 216, 28 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "Copy";
};
PushButton RID_PB_BENENNEN {
+ HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_BENENNEN";
Pos = MAP_APPFONT( 216, 44 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -1236,6 +1292,7 @@ FloatingWindow IDD_DISPLAY_HID {
Text[ en-US ] = "Name";
};
PushButton RID_PB_SELECTALL {
+ HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_SELECTALL";
Pos = MAP_APPFONT( 216, 44 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -1356,6 +1413,7 @@ ImageList RID_IMGLST_LAYOUT
};
ModelessDialog IDD_EDIT_VAR {
+ HelpID = "basic:ModelessDialog:IDD_EDIT_VAR";
Pos = MAP_APPFONT( 0, 0 );
Size = MAP_APPFONT( 171, 87 );
Moveable = TRUE;
@@ -1386,6 +1444,7 @@ ModelessDialog IDD_EDIT_VAR {
Text[ en-US ] = "Previous contents";
};
RadioButton RID_RB_NEW_BOOL_T {
+ HelpID = "basic:RadioButton:IDD_EDIT_VAR:RID_RB_NEW_BOOL_T";
Hide = TRUE;
Pos = MAP_APPFONT( 53, 37 );
Size = MAP_APPFONT( 40, 12 );
@@ -1393,6 +1452,7 @@ ModelessDialog IDD_EDIT_VAR {
Text[ en-US ] = "True";
};
RadioButton RID_RB_NEW_BOOL_F {
+ HelpID = "basic:RadioButton:IDD_EDIT_VAR:RID_RB_NEW_BOOL_F";
Hide = TRUE;
Pos = MAP_APPFONT( 98, 37 );
Size = MAP_APPFONT( 40, 12 );
@@ -1400,6 +1460,7 @@ ModelessDialog IDD_EDIT_VAR {
Text[ en-US ] = "False";
};
NumericField RID_NF_NEW_INTEGER {
+ HelpID = "basic:NumericField:IDD_EDIT_VAR:RID_NF_NEW_INTEGER";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 53, 37 );
@@ -1414,6 +1475,7 @@ ModelessDialog IDD_EDIT_VAR {
SpinSize = 10;
};
NumericField RID_NF_NEW_LONG {
+ HelpID = "basic:NumericField:IDD_EDIT_VAR:RID_NF_NEW_LONG";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 53, 37 );
@@ -1428,6 +1490,7 @@ ModelessDialog IDD_EDIT_VAR {
SpinSize = 10;
};
Edit RID_ED_NEW_STRING {
+ HelpID = "basic:Edit:IDD_EDIT_VAR:RID_ED_NEW_STRING";
Hide = TRUE;
Border = TRUE;
Pos = MAP_APPFONT( 53, 37 );
@@ -1449,6 +1512,7 @@ ModelessDialog IDD_EDIT_VAR {
};
FloatingWindow LOAD_CONF {
+ HelpID = "basic:FloatingWindow:LOAD_CONF";
SVLook = TRUE;
Pos = MAP_APPFONT( 66, 23 );
Size = MAP_APPFONT( 156, 51 );
diff --git a/basic/source/app/basicrt.cxx b/basic/source/app/basicrt.cxx
index 1c540e48f825..bd1638587c13 100644..100755
--- a/basic/source/app/basicrt.cxx
+++ b/basic/source/app/basicrt.cxx
@@ -64,7 +64,7 @@ xub_StrLen BasicRuntime::GetCol2()
return pRun->nCol2;
}
-BOOL BasicRuntime::IsRun()
+sal_Bool BasicRuntime::IsRun()
{
return pRun->IsRun();
}
@@ -118,17 +118,17 @@ bool BasicRuntimeAccess::HasRuntime()
return pINST && pINST->pRun != NULL;
}
-USHORT BasicRuntimeAccess::GetStackEntryCount()
+sal_uInt16 BasicRuntimeAccess::GetStackEntryCount()
{
return GetSbData()->pErrStack->Count();
}
-BasicErrorStackEntry BasicRuntimeAccess::GetStackEntry( USHORT nIndex )
+BasicErrorStackEntry BasicRuntimeAccess::GetStackEntry( sal_uInt16 nIndex )
{
return BasicErrorStackEntry( GetSbData()->pErrStack->GetObject( nIndex ) );
}
-BOOL BasicRuntimeAccess::HasStack()
+sal_Bool BasicRuntimeAccess::HasStack()
{
return GetSbData()->pErrStack != NULL;
}
@@ -139,7 +139,7 @@ void BasicRuntimeAccess::DeleteStack()
GetSbData()->pErrStack = NULL;
}
-BOOL BasicRuntimeAccess::IsRunInit()
+sal_Bool BasicRuntimeAccess::IsRunInit()
{
return GetSbData()->bRunInit;
}
diff --git a/basic/source/app/basmsg.hrc b/basic/source/app/basmsg.hrc
index bfabe2c9759e..bfabe2c9759e 100644..100755
--- a/basic/source/app/basmsg.hrc
+++ b/basic/source/app/basmsg.hrc
diff --git a/basic/source/app/basmsg.src b/basic/source/app/basmsg.src
index e2179afd4c34..e2179afd4c34 100644..100755
--- a/basic/source/app/basmsg.src
+++ b/basic/source/app/basmsg.src
diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx
index a09480c80dc3..134c5194b7aa 100644..100755
--- a/basic/source/app/brkpnts.cxx
+++ b/basic/source/app/brkpnts.cxx
@@ -57,7 +57,7 @@ BreakpointWindow::BreakpointWindow( Window *pParent )
, nCurYOffset( 0 )
, nMarkerPos( MARKER_NOMARKER )
, pModule( NULL )
-, bErrorMarker( FALSE )
+, bErrorMarker( sal_False )
{
if ( !pImages )
pImages = new ImageList( SttResId( RID_IMGLST_LAYOUT ) );
@@ -81,7 +81,7 @@ void BreakpointWindow::Reset()
void BreakpointWindow::SetModule( SbModule *pMod )
{
pModule = pMod;
- USHORT i;
+ sal_uInt16 i;
for ( i=0 ; i < pModule->GetBPCount() ; i++ )
{
InsertBreakpoint( pModule->GetBP( i ) );
@@ -97,13 +97,12 @@ void BreakpointWindow::SetBPsInModule()
for ( size_t i = 0, n = BreakpointList.size(); i < n; ++i )
{
Breakpoint* pBrk = BreakpointList[ i ];
- pModule->SetBP( (USHORT)pBrk->nLine );
+ pModule->SetBP( (sal_uInt16)pBrk->nLine );
#if OSL_DEBUG_LEVEL > 1
- DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( (USHORT)pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" );
+ DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( (sal_uInt16)pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" );
#endif
}
-
- for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+ for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
{
SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -146,7 +145,7 @@ void BreakpointWindow::InsertBreakpoint( sal_uInt32 nLine )
#endif
if ( StarBASIC::IsRunning() )
{
- for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+ for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
{
SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -226,7 +225,7 @@ void BreakpointWindow::LoadBreakpoints( String aFilename )
for ( i = 0 ; i < aBreakpoints.GetTokenCount( ';' ) ; i++ )
{
- InsertBreakpoint( (USHORT)aBreakpoints.GetToken( i, ';' ).ToInt32() );
+ InsertBreakpoint( (sal_uInt16)aBreakpoints.GetToken( i, ';' ).ToInt32() );
}
}
@@ -276,7 +275,7 @@ void BreakpointWindow::Paint( const Rectangle& )
sal_Int32 nY = nLine*nLineHeight - nCurYOffset;
DrawImage( Point( 0, nY ) + aBmpOff, aBrk );
}
- ShowMarker( TRUE );
+ ShowMarker( sal_True );
}
@@ -341,7 +340,7 @@ void BreakpointWindow::ShowMarker( bool bShow )
aMarkerOff.X() = ( aOutSz.Width() - aMarkerSz.Width() ) / 2;
aMarkerOff.Y() = ( nLineHeight - aMarkerSz.Height() ) / 2;
- ULONG nY = nMarkerPos*nLineHeight - nCurYOffset;
+ sal_uIntPtr nY = nMarkerPos*nLineHeight - nCurYOffset;
Point aPos( 0, nY );
aPos += aMarkerOff;
if ( bShow )
@@ -359,7 +358,7 @@ void BreakpointWindow::MouseButtonDown( const MouseEvent& rMEvt )
long nLineHeight = GetTextHeight();
long nYPos = aMousePos.Y() + nCurYOffset;
long nLine = nYPos / nLineHeight + 1;
- ToggleBreakpoint( sal::static_int_cast< USHORT >(nLine) );
+ ToggleBreakpoint( sal::static_int_cast< sal_uInt16 >(nLine) );
Invalidate();
}
}
@@ -375,7 +374,7 @@ void BreakpointWindow::SetMarkerPos( sal_uInt32 nLine, bool bError )
}
-void BreakpointWindow::Scroll( long nHorzScroll, long nVertScroll, USHORT nFlags )
+void BreakpointWindow::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
{
(void) nFlags; /* avoid warning about unused parameter */
nCurYOffset -= nVertScroll;
diff --git a/basic/source/app/brkpnts.hxx b/basic/source/app/brkpnts.hxx
index 55abaf9b9bd9..0ea0fc9b45ad 100644..100755
--- a/basic/source/app/brkpnts.hxx
+++ b/basic/source/app/brkpnts.hxx
@@ -72,7 +72,7 @@ protected:
public:
void SetMarkerPos( sal_uInt32 nLine, bool bErrorMarker = false );
- virtual void Scroll( long nHorzScroll, long nVertScroll, USHORT nFlags = 0 );
+ virtual void Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags = 0 );
long& GetCurYOffset() { return nCurYOffset; }
};
diff --git a/basic/source/app/dataedit.hxx b/basic/source/app/dataedit.hxx
index 7f588b8a2619..60ab6626a85f 100644..100755
--- a/basic/source/app/dataedit.hxx
+++ b/basic/source/app/dataedit.hxx
@@ -42,9 +42,9 @@ class Font;
#define DATA_FUNC_DEF( MemberName, MemberType ) \
public: \
MemberType MemberName; \
- BOOL Find( const String& rStr ); \
- BOOL Load( const String& rStr ); \
- BOOL Save( const String& rStr ); \
+ sal_Bool Find( const String& rStr ); \
+ sal_Bool Load( const String& rStr ); \
+ sal_Bool Save( const String& rStr ); \
\
void GrabFocus(){ MemberName.GrabFocus(); } \
void Show(){ MemberName.Show(); } \
@@ -63,13 +63,13 @@ public:
void Redo(); \
String GetText() const; \
void SetText( const String& rStr ); \
- BOOL HasText() const; \
+ sal_Bool HasText() const; \
String GetSelected(); \
TextSelection GetSelection() const; \
void SetSelection( const TextSelection& rSelection ); \
- USHORT GetLineNr() const; \
+ sal_uInt16 GetLineNr() const; \
void ReplaceSelected( const String& rStr ); \
- BOOL IsModified(); \
+ sal_Bool IsModified(); \
void SetModifyHdl( Link l );
@@ -86,19 +86,19 @@ public:
virtual void Undo()=0;
virtual void Redo()=0;
- virtual BOOL Find( const String& )=0; // Find and select text
- virtual BOOL Load( const String& )=0; // Load text from file
- virtual BOOL Save( const String& )=0; // Save text to file
+ virtual sal_Bool Find( const String& )=0; // Find and select text
+ virtual sal_Bool Load( const String& )=0; // Load text from file
+ virtual sal_Bool Save( const String& )=0; // Save text to file
virtual String GetSelected()=0;
virtual void GrabFocus()=0;
virtual TextSelection GetSelection() const=0;
virtual void SetSelection( const TextSelection& rSelection )=0;
- virtual USHORT GetLineNr() const=0;
+ virtual sal_uInt16 GetLineNr() const=0;
virtual String GetText() const=0;
virtual void SetText( const String& rStr )=0;
- virtual BOOL HasText() const=0; // to avoid GetText.Len()
+ virtual sal_Bool HasText() const=0; // to avoid GetText.Len()
virtual void ReplaceSelected( const String& rStr )=0;
- virtual BOOL IsModified()=0;
+ virtual sal_Bool IsModified()=0;
virtual void SetModifyHdl( Link )=0;
virtual void Show()=0;
virtual void SetPosPixel( const Point& rNewPos )=0;
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index 178455cb9e77..dc8a57516b20 100644..100755
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -95,9 +95,9 @@ IMPL_LINK_INLINE_START( FindDialog, ButtonClick, Button *, pB )
{
if( pB == &aOk ) {
*pFind = aFind.GetText();
- EndDialog( TRUE );
- } else EndDialog( FALSE );
- return TRUE;
+ EndDialog( sal_True );
+ } else EndDialog( sal_False );
+ return sal_True;
}
IMPL_LINK_INLINE_END( FindDialog, ButtonClick, Button *, pB )
@@ -125,9 +125,9 @@ IMPL_LINK( ReplaceDialog, ButtonClick, Button *, pB )
if( pB == &aOk ) {
*pFind = aFind.GetText();
*pReplace = aReplace.GetText();
- EndDialog( TRUE );
- } else EndDialog( FALSE );
- return TRUE;
+ EndDialog( sal_True );
+ } else EndDialog( sal_False );
+ return sal_True;
}
////////////////////////////////////////////////////////////////////
@@ -150,7 +150,7 @@ void ConfEdit::Init( Config &aConf )
aEdit.SetText( aTemp );
}
-ConfEdit::ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf )
+ConfEdit::ConfEdit( Window* pParent, sal_uInt16 nResText, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf )
: PushButton( pParent, SttResId(nResButton) )
, aText( pParent, SttResId(nResText) )
, aEdit( pParent, SttResId(nResEdit) )
@@ -159,7 +159,7 @@ ConfEdit::ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nR
Init( aConf );
}
-ConfEdit::ConfEdit( Window* pParent, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf )
+ConfEdit::ConfEdit( Window* pParent, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf )
: PushButton( pParent, SttResId(nResButton) )
, aText( pParent )
, aEdit( pParent, SttResId(nResEdit) )
@@ -197,7 +197,7 @@ void ConfEdit::Click()
}
}
-OptConfEdit::OptConfEdit( Window* pParent, USHORT nResCheck, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf )
+OptConfEdit::OptConfEdit( Window* pParent, sal_uInt16 nResCheck, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf )
: ConfEdit( pParent, nResEdit, nResButton, aKN, aConf )
, aCheck( pParent, SttResId( nResCheck ) )
, rBase( rBaseEdit )
@@ -247,7 +247,7 @@ OptionsDialog::OptionsDialog( Window* pParent, const ResId& aResId )
, aCancel( this )
, aConfig( Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ) )
{
- aConfig.EnablePersistence( FALSE );
+ aConfig.EnablePersistence( sal_False );
FreeResource();
aTabCtrl.SetActivatePageHdl( LINK( this, OptionsDialog, ActivatePageHdl ) );
aTabCtrl.SetCurPageId( RID_TP_PRO );
@@ -261,25 +261,25 @@ OptionsDialog::OptionsDialog( Window* pParent, const ResId& aResId )
OptionsDialog::~OptionsDialog()
{
- for ( USHORT i = 0; i < aTabCtrl.GetPageCount(); i++ )
+ for ( sal_uInt16 i = 0; i < aTabCtrl.GetPageCount(); i++ )
delete aTabCtrl.GetTabPage( aTabCtrl.GetPageId( i ) );
};
-BOOL OptionsDialog::Close()
+sal_Bool OptionsDialog::Close()
{
if ( TabDialog::Close() )
{
delete this;
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
IMPL_LINK( OptionsDialog, ActivatePageHdl, TabControl *, pTabCtrl )
{
- USHORT nId = pTabCtrl->GetCurPageId();
+ sal_uInt16 nId = pTabCtrl->GetCurPageId();
// If TabPage was not yet created, do it
if ( !pTabCtrl->GetTabPage( nId ) )
{
@@ -349,7 +349,7 @@ IMPL_LINK( OptionsDialog, OKClick, Button *, pButton )
}
const ByteString ProfilePrefix("_profile_");
-const USHORT ProfilePrefixLen = ProfilePrefix.Len();
+const sal_uInt16 ProfilePrefixLen = ProfilePrefix.Len();
ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
: TabPage( pParent, SttResId( RID_TP_PROFILE ) )
@@ -371,7 +371,7 @@ ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
{
FreeResource();
- aCbProfile.EnableAutocomplete( TRUE );
+ aCbProfile.EnableAutocomplete( sal_True );
aCbProfile.SetSelectHdl( LINK( this, ProfileOptions, Select ) );
@@ -386,7 +386,7 @@ ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
void ProfileOptions::LoadData()
{
// collect all profiles (all groups starting with the ProfilePrefix)
- for ( USHORT i = 0 ; i < rConf.GetGroupCount() ; i++ )
+ for ( sal_uInt16 i = 0 ; i < rConf.GetGroupCount() ; i++ )
{
ByteString aProfile = rConf.GetGroupName( i );
if ( aProfile.Match( ProfilePrefix ) )
@@ -507,7 +507,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
{
FreeResource();
- aNFCRPort.SetUseThousandSep( FALSE );
+ aNFCRPort.SetUseThousandSep( sal_False );
ByteString aTemp;
@@ -517,7 +517,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
if ( aTemp.EqualsIgnoreCaseAscii( "true" ) || aTemp.Equals( "1" ) )
aCBUseProxy.Check();
else
- aCBUseProxy.Check( FALSE );
+ aCBUseProxy.Check( sal_False );
aCBUseProxy.SetToggleHdl( LINK( this, CrashreportOptions, CheckProxy ) );
LINK( this, CrashreportOptions, CheckProxy ).Call( NULL ); // call once to initialize
@@ -532,7 +532,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
if ( aTemp.EqualsIgnoreCaseAscii( "true" ) || aTemp.Equals( "1" ) )
aCBAllowContact.Check();
else
- aCBAllowContact.Check( FALSE );
+ aCBAllowContact.Check( sal_False );
aCBAllowContact.SetToggleHdl( LINK( this, CrashreportOptions, CheckResponse ) );
LINK( this, CrashreportOptions, CheckResponse ).Call( NULL ); // call once to initialize
@@ -598,9 +598,9 @@ MiscOptions::MiscOptions( Window* pParent, Config &aConfig )
{
FreeResource();
- aNFTTPort.SetUseThousandSep( FALSE );
- aNFUNOPort.SetUseThousandSep( FALSE );
- aTFMaxLRU.SetUseThousandSep( FALSE );
+ aNFTTPort.SetUseThousandSep( sal_False );
+ aNFUNOPort.SetUseThousandSep( sal_False );
+ aTFMaxLRU.SetUseThousandSep( sal_False );
ByteString aTemp;
@@ -648,8 +648,8 @@ void MiscOptions::Save( Config &aConfig )
aConfig.SetGroup("LRU");
ByteString aTemp = aConfig.ReadKey( "MaxLRU", "4" );
- USHORT nOldMaxLRU = (USHORT)aTemp.ToInt32();
- USHORT n;
+ sal_uInt16 nOldMaxLRU = (sal_uInt16)aTemp.ToInt32();
+ sal_uInt16 n;
for ( n = nOldMaxLRU ; n > aTFMaxLRU.GetValue() ; n-- )
aConfig.DeleteKey( ByteString("LRU").Append( ByteString::CreateFromInt32( n ) ) );
aConfig.WriteKey( "MaxLRU", ByteString::CreateFromInt64( aTFMaxLRU.GetValue() ) );
@@ -722,8 +722,8 @@ IMPL_LINK( FontOptions, FontSizeChanged, void*, EMPTYARG )
void FontOptions::UpdatePreview()
{
Font aFont = aFontList.Get( aFontName.GetText(), aFontStyle.GetText() );
-// ULONG nFontSize = aFontSize.GetValue( FUNIT_POINT );
- ULONG nFontSize = static_cast<ULONG>((aFontSize.GetValue() + 5) / 10);
+// sal_uIntPtr nFontSize = aFontSize.GetValue( FUNIT_POINT );
+ sal_uIntPtr nFontSize = static_cast<sal_uIntPtr>((aFontSize.GetValue() + 5) / 10);
aFont.SetHeight( nFontSize );
aFTPreview.SetFont( aFont );
aFTPreview.SetText( aFontName.GetText() );
@@ -757,13 +757,13 @@ GenericOptions::GenericOptions( Window* pParent, Config &aConfig )
, aPbDelValue( this, SttResId( RID_PB_DEL_VALUE ) )
, nMoveButtons( 0 )
-, bShowSelectPath( FALSE )
+, bShowSelectPath( sal_False )
{
FreeResource();
LoadData();
- aCbArea.EnableAutocomplete( TRUE );
- aCbValue.EnableAutocomplete( TRUE );
+ aCbArea.EnableAutocomplete( sal_True );
+ aCbValue.EnableAutocomplete( sal_True );
aCbArea.SetSelectHdl( LINK( this, GenericOptions, LoadGroup ) );
@@ -789,7 +789,7 @@ GenericOptions::~GenericOptions()
StringList* GenericOptions::GetAllGroups()
{
StringList* pGroups = new StringList();
- for ( USHORT i = 0 ; i < aConf.GetGroupCount() ; i++ )
+ for ( sal_uInt16 i = 0 ; i < aConf.GetGroupCount() ; i++ )
{
String *pGroup = new String( aConf.GetGroupName( i ), RTL_TEXTENCODING_UTF8 );
pGroups->push_back( pGroup );
@@ -826,16 +826,16 @@ void GenericOptions::ShowSelectPath( const String &rType )
{ // Show Path button
nMoveButtons += nDelta;
aMoveTimer.Start();
- bShowSelectPath = TRUE;
- aPbSelectPath.Show( TRUE );
- aPbSelectPath.Enable( TRUE );
+ bShowSelectPath = sal_True;
+ aPbSelectPath.Show( sal_True );
+ aPbSelectPath.Enable( sal_True );
}
else if ( !rType.EqualsIgnoreCaseAscii( "PATH" ) && bShowSelectPath )
{ // Hide Path button
nMoveButtons -= nDelta;
aMoveTimer.Start();
- bShowSelectPath = FALSE;
- aPbSelectPath.Enable( FALSE );
+ bShowSelectPath = sal_False;
+ aPbSelectPath.Enable( sal_False );
}
}
@@ -888,7 +888,7 @@ IMPL_LINK( GenericOptions, LoadGroup, ComboBox*, EMPTYARG )
aConf.SetGroup( aLastGroupName );
aConf.WriteKey( C_KEY_AKTUELL, ByteString( aCurrentValue, RTL_TEXTENCODING_UTF8 ) );
- USHORT i;
+ sal_uInt16 i;
for ( i=0 ; i < aCbValue.GetEntryCount() ; i++ )
{
if ( i > 0 )
@@ -1006,16 +1006,16 @@ class TextAndWin : public DockingWindow
Window* pFtOriginalParent;
Window* pWinOriginalParent;
long nSpace; // default space
- BOOL bAlignTop;
+ sal_Bool bAlignTop;
public:
- TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, BOOL bAlignTopP );
+ TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, sal_Bool bAlignTopP );
~TextAndWin();
virtual void Resize();
};
-TextAndWin::TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, BOOL bAlignTopP )
+TextAndWin::TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, sal_Bool bAlignTopP )
: DockingWindow( pParent )
, pFt( pFtP )
, pWin( pWinP )
@@ -1097,8 +1097,8 @@ DisplayHidDlg::DisplayHidDlg( Window * pParent )
#endif
pSplit = new SplitWindow( this );
- pControls = new TextAndWin( pSplit, &aFtControls, &aMlbControls, aMlbControls.GetPosPixel().X(), TRUE );
- pSlots = new TextAndWin( pSplit, &aFtSlots, &aMlbSlots, aMlbControls.GetPosPixel().X(), FALSE );
+ pControls = new TextAndWin( pSplit, &aFtControls, &aMlbControls, aMlbControls.GetPosPixel().X(), sal_True );
+ pSlots = new TextAndWin( pSplit, &aFtSlots, &aMlbSlots, aMlbControls.GetPosPixel().X(), sal_False );
pSplit->SetPosPixel( aFtControls.GetPosPixel() );
pSplit->InsertItem( 1, pControls, 70, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE );
@@ -1124,7 +1124,7 @@ DisplayHidDlg::~DisplayHidDlg()
IMPL_LINK( DisplayHidDlg, CopyToClipboard, void*, EMPTYARG )
{
String aSammel;
- USHORT i;
+ sal_uInt16 i;
for ( i=0 ; i < aMlbControls.GetSelectEntryCount() ; i++ )
{
@@ -1146,7 +1146,7 @@ IMPL_LINK( DisplayHidDlg, SelectAll, PushButton*, pButton )
{
if ( pButton->GetState() != STATE_CHECK )
{
- USHORT i;
+ sal_uInt16 i;
for ( i=0 ; i < aMlbControls.GetEntryCount() ; i++ )
aMlbControls.SelectEntryPos( i );
for ( i=0 ; i < aMlbSlots.GetEntryCount() ; i++ )
@@ -1249,7 +1249,7 @@ void DisplayHidDlg::Resize()
}
else
{
-// SetUpdateMode( FALSE );
+// SetUpdateMode( sal_False );
// Minimum size
Size aSize( GetOutputSizePixel() );
@@ -1305,7 +1305,7 @@ void DisplayHidDlg::Resize()
aPos.Move( pSplit->GetSizePixel().Width(), pSplit->GetSizePixel().Height() );
aOKClose.SetPosPixel( aPos );
-// SetUpdateMode( TRUE );
+// SetUpdateMode( sal_True );
// Invalidate();
}
FloatingWindow::Resize();
@@ -1385,7 +1385,7 @@ VarEditDialog::VarEditDialog( Window * pParent, SbxVariable *pPVar )
IMPL_LINK( VarEditDialog, OKClick, Button *, pButton )
{
(void) pButton; /* avoid warning about unused parameter */
- BOOL bWasError = SbxBase::IsError(); // Probably an error is thrown
+ sal_Bool bWasError = SbxBase::IsError(); // Probably an error is thrown
SbxDataType eType = pVar->GetType();
@@ -1428,7 +1428,7 @@ SvNumberformat::
String aContent( aEditRID_ED_NEW_STRING.GetText() );
- BOOL bError = FALSE;
+ sal_Bool bError = sal_False;
switch ( eType )
{
case SbxBOOL:
@@ -1441,10 +1441,10 @@ SvNumberformat::
// pVar->PutDate( aContent );
// break;
case SbxINTEGER:
- pVar->PutInteger( (INT16)aNumericFieldRID_NF_NEW_INTEGER.GetValue() );
+ pVar->PutInteger( (sal_Int16)aNumericFieldRID_NF_NEW_INTEGER.GetValue() );
break;
case SbxLONG:
- pVar->PutLong( static_cast<INT32>(aNumericFieldRID_NF_NEW_LONG.GetValue()) );
+ pVar->PutLong( static_cast<sal_Int32>(aNumericFieldRID_NF_NEW_LONG.GetValue()) );
break;
case SbxDOUBLE:
case SbxSINGLE:
@@ -1465,7 +1465,7 @@ SvNumberformat::
// pVar->PutStringExt( aEditRID_ED_NEW_STRING.GetText() );
if ( !bWasError && SbxBase::IsError() )
{
- bError = TRUE;
+ bError = sal_True;
SbxBase::ResetError();
}
diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx
index 677bef1962be..108aaa5de062 100644..100755
--- a/basic/source/app/dialogs.hxx
+++ b/basic/source/app/dialogs.hxx
@@ -93,8 +93,8 @@ protected:
void Init( Config &aConf );
public:
- ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf );
- ConfEdit( Window* pParent, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf );
+ ConfEdit( Window* pParent, sal_uInt16 nResText, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf );
+ ConfEdit( Window* pParent, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf );
void Save( Config &aConf );
void Reload( Config &aConf );
void Click();
@@ -110,7 +110,7 @@ protected:
ConfEdit& rBase;
DECL_LINK( ToggleHdl, CheckBox* );
public:
- OptConfEdit( Window* pParent, USHORT nResCheck, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf );
+ OptConfEdit( Window* pParent, sal_uInt16 nResCheck, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf );
void Reload( Config &aConf );
DECL_LINK( BaseModifyHdl, Edit* );
};
@@ -130,7 +130,7 @@ private:
public:
OptionsDialog( Window* pParent, const ResId& );
~OptionsDialog();
- virtual BOOL Close();
+ virtual sal_Bool Close();
DECL_LINK( ActivatePageHdl, TabControl * );
@@ -261,7 +261,7 @@ class GenericOptions : public TabPage
PushButton aPbDelValue;
int nMoveButtons;
- BOOL bShowSelectPath;
+ sal_Bool bShowSelectPath;
AutoTimer aMoveTimer;
DECL_LINK( MoveButtons, AutoTimer* );
@@ -309,7 +309,7 @@ protected:
DockingWindow* pSlots;
SplitWindow *pSplit;
- ULONG nDisplayMode;
+ sal_uIntPtr nDisplayMode;
DECL_LINK( Select, void* );
DECL_LINK( SelectAll, PushButton* );
diff --git a/basic/source/app/makefile.mk b/basic/source/app/makefile.mk
index e62b11c0beb4..e62b11c0beb4 100644..100755
--- a/basic/source/app/makefile.mk
+++ b/basic/source/app/makefile.mk
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index 34b59d50ed9b..1ebc24d560a0 100644..100755
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -52,10 +52,10 @@ Version 3 Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8
#include "basmsg.hrc"
#include "basrid.hxx"
-USHORT MsgEdit::nMaxLogLen = 0;
-BOOL MsgEdit::bLimitLogLen = FALSE;
-BOOL MsgEdit::bPrintLogToStdout = FALSE;
-BOOL MsgEdit::bPrintLogToStdoutSet = FALSE;
+sal_uInt16 MsgEdit::nMaxLogLen = 0;
+sal_Bool MsgEdit::bLimitLogLen = sal_False;
+sal_Bool MsgEdit::bPrintLogToStdout = sal_False;
+sal_Bool MsgEdit::bPrintLogToStdoutSet = sal_False;
#define WARNING_PREFIX String( SttResId( S_WARNING_PREFIX ) )
#define VERSION_STRING CUniString("File Format Version: ")
@@ -69,8 +69,8 @@ MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits )
, pCurrentTestCase(NULL)
, pCurrentAssertion( NULL )
, pCurrentError(NULL)
-, bModified(FALSE)
-, bFileLoading(FALSE)
+, bModified(sal_False)
+, bFileLoading(sal_False)
, nVersion(0)
, pAppError( pParent )
, aEditTree( pParent, pBF, aBits | WB_HASBUTTONS | WB_HASLINES | WB_HASBUTTONSATROOT )
@@ -83,15 +83,15 @@ MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits )
if ( !bPrintLogToStdoutSet )
{
- bPrintLogToStdoutSet = TRUE;
- for ( USHORT i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
+ bPrintLogToStdoutSet = sal_True;
+ for ( sal_uInt16 i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
{
if ( Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("-printlog") == COMPARE_EQUAL
#ifndef UNX
|| Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("/printlog") == COMPARE_EQUAL
#endif
)
- bPrintLogToStdout = TRUE;
+ bPrintLogToStdout = sal_True;
}
}
}
@@ -172,11 +172,11 @@ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg )
if ( !bFileLoading )
{ // Comes from Testtool and must be written immediately
- BOOL bFileWasChanged = pAppError->DiskFileChanged( SINCE_LAST_LOAD );
+ sal_Bool bFileWasChanged = pAppError->DiskFileChanged( SINCE_LAST_LOAD );
DBG_ASSERT( aLogFileName == LogMsg->aLogFileName, "Logging to different logfile as before" );
DirEntry aEntry( LogMsg->aLogFileName );
- BOOL bNewFile = !aEntry.Exists();
+ sal_Bool bNewFile = !aEntry.Exists();
SvFileStream aStrm( LogMsg->aLogFileName, STREAM_STD_WRITE );
if ( bNewFile )
{
@@ -224,7 +224,7 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
{
if ( !bFileLoading && bLimitLogLen )
{
- USHORT nSkip = nMaxLogLen;
+ sal_uInt16 nSkip = nMaxLogLen;
SvLBoxEntry *pRun = aEditTree.First();
while ( nSkip-- && pRun )
pRun = aEditTree.NextSibling( pRun );
@@ -235,7 +235,7 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
aEditTree.GetModel()->Remove( aEditTree.NextSibling( pRun ) );
aEditTree.GetModel()->Remove( pRun );
- bModified = TRUE;
+ bModified = sal_True;
lModify.Call( NULL );
Save( aLogFileName );
pAppError->UpdateFileInfo( HAS_BEEN_LOADED );
@@ -244,9 +244,9 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
COPY_TTDEBUGDATA( LOG_RUN );
if ( !bFileLoading || ( bFileLoading && nVersion >= 2 ) )
- pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, FALSE, 0, pTTDebugData );
+ pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, sal_False, 0, pTTDebugData );
else // First file format
- pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, FALSE, LIST_APPEND, pTTDebugData ); // and therefor at the end
+ pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, sal_False, LIST_APPEND, pTTDebugData ); // and therefor at the end
aEditTree.ShowEntry( pCurrentRun );
pCurrentTestCase = NULL;
@@ -265,7 +265,7 @@ void MsgEdit::AddTestCase( String aMsg, TTDebugData aDebugData )
else
{
COPY_TTDEBUGDATA( LOG_TEST_CASE );
- pCurrentTestCase = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pCurrentTestCase = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pCurrentTestCase );
}
}
@@ -287,7 +287,7 @@ void MsgEdit::AddError( String aMsg, TTDebugData aDebugData )
if ( pCurrentTestCase )
{
COPY_TTDEBUGDATA( LOG_ERROR );
- pCurrentError = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pCurrentError = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pCurrentError );
}
}
@@ -298,7 +298,7 @@ void MsgEdit::AddCallStack( String aMsg, TTDebugData aDebugData )
if ( pCurrentError )
{
COPY_TTDEBUGDATA( LOG_CALL_STACK );
- aEditTree.InsertEntry( aMsg, pCurrentError, FALSE, LIST_APPEND, pTTDebugData );
+ aEditTree.InsertEntry( aMsg, pCurrentError, sal_False, LIST_APPEND, pTTDebugData );
}
}
@@ -307,16 +307,16 @@ void MsgEdit::AddMessage( String aMsg, TTDebugData aDebugData )
SvLBoxEntry *pThisEntry = NULL;
COPY_TTDEBUGDATA( LOG_MESSAGE );
if ( pCurrentTestCase )
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentRun )
{
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
else
{
AddRun( aMsg, aDebugData );
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
}
@@ -329,16 +329,16 @@ void MsgEdit::AddWarning( String aMsg, TTDebugData aDebugData )
COPY_TTDEBUGDATA( LOG_WARNING );
if ( pCurrentTestCase )
- pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentRun )
{
- pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
else
{
AddRun( aMsg, aDebugData );
- pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
@@ -357,16 +357,16 @@ void MsgEdit::AddAssertion( String aMsg, TTDebugData aDebugData )
SvLBoxEntry *pThisEntry = NULL;
COPY_TTDEBUGDATA( LOG_ASSERTION );
if ( pCurrentTestCase )
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentRun )
{
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
else
{
AddRun( aMsg, aDebugData );
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
@@ -381,18 +381,18 @@ void MsgEdit::AddAssertionStack( String aMsg, TTDebugData aDebugData )
SvLBoxEntry *pThisEntry = NULL;
COPY_TTDEBUGDATA( LOG_ASSERTION_STACK );
if ( pCurrentAssertion )
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentAssertion, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentAssertion, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentTestCase )
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentRun )
{
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
else
{
AddRun( aMsg, aDebugData );
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
@@ -405,16 +405,16 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
SvLBoxEntry *pThisEntry = NULL;
COPY_TTDEBUGDATA( LOG_QA_ERROR );
if ( pCurrentTestCase )
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentRun )
{
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
else
{
AddRun( aMsg, aDebugData );
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
@@ -423,8 +423,8 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
}
/*
- SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
- SvLBoxEntry* GetEntry( ULONG nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
+ SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
+ SvLBoxEntry* GetEntry( sal_uIntPtr nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
@@ -437,16 +437,16 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
SvLBoxEntry* PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); }
SvLBoxEntry* LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); }
- SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
- SvLBoxEntry* GetEntry( ULONG nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
+ SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
+ SvLBoxEntry* GetEntry( sal_uIntPtr nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
SvLBoxEntry* GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); }
SvLBoxEntry* GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));}
- BOOL IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
- SvListEntry* GetEntry( SvListEntry* pParent, ULONG nPos ) const;
- SvListEntry* GetEntry( ULONG nRootPos ) const;
- SvListEntry* GetEntryAtAbsPos( ULONG nAbsPos ) const;
+ sal_Bool IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
+ SvListEntry* GetEntry( SvListEntry* pParent, sal_uIntPtr nPos ) const;
+ SvListEntry* GetEntry( sal_uIntPtr nRootPos ) const;
+ SvListEntry* GetEntryAtAbsPos( sal_uIntPtr nAbsPos ) const;
SvListEntry* GetParent( SvListEntry* pEntry ) const;
SvListEntry* GetRootLevelParent( SvListEntry* pEntry ) const;
*/
@@ -460,11 +460,11 @@ void MsgEdit::Delete()
CHECK( pCurrentTestCase );
CHECK( pCurrentAssertion );
CHECK( pCurrentError );
- bModified = TRUE;
+ bModified = sal_True;
lModify.Call( NULL );
}
-void MsgEdit::Cut(){ Copy(); Delete(); bModified = TRUE; lModify.Call( NULL ); }
+void MsgEdit::Cut(){ Copy(); Delete(); bModified = sal_True; lModify.Call( NULL ); }
void MsgEdit::Copy(){ ::svt::OStringTransfer::CopyString( GetSelected(), &aEditTree ); }
/**/void MsgEdit::Paste(){ Sound::Beep(); }
void MsgEdit::Undo(){ Sound::Beep(); }
@@ -545,7 +545,7 @@ TextSelection MsgEdit::GetSelection() const
{
if ( aEditTree.FirstSelected() )
{
- ULONG nStart=0,nEnd=0;
+ sal_uIntPtr nStart=0,nEnd=0;
nStart = aEditTree.GetModel()->GetAbsPos(aEditTree.FirstSelected() );
if ( aEditTree.LastSelected() )
nEnd = aEditTree.GetModel()->GetAbsPos(aEditTree.LastSelected() );
@@ -557,25 +557,25 @@ TextSelection MsgEdit::GetSelection() const
void MsgEdit::SetSelection( const TextSelection& rSelection )
{
- ULONG nStart,nEnd;
+ sal_uIntPtr nStart,nEnd;
while ( aEditTree.GetSelectionCount() )
- aEditTree.Select( aEditTree.FirstSelected(), FALSE );
+ aEditTree.Select( aEditTree.FirstSelected(), sal_False );
if ( rSelection.HasRange() )
{
nStart = rSelection.GetStart().GetPara();
nEnd = rSelection.GetEnd().GetPara();
- for ( ULONG i = nStart ; i <= nEnd ; i++ )
- aEditTree.Select( aEditTree.GetModel()->GetEntryAtAbsPos( i ), TRUE );
+ for ( sal_uIntPtr i = nStart ; i <= nEnd ; i++ )
+ aEditTree.Select( aEditTree.GetModel()->GetEntryAtAbsPos( i ), sal_True );
}
}
-USHORT MsgEdit::GetLineNr() const
+sal_uInt16 MsgEdit::GetLineNr() const
{
if ( aEditTree.GetCurEntry() )
- return (USHORT)aEditTree.GetModel()->GetAbsPos(aEditTree.GetCurEntry() ) + 1;
+ return (sal_uInt16)aEditTree.GetModel()->GetAbsPos(aEditTree.GetCurEntry() ) + 1;
else
return 0;
}
@@ -587,7 +587,7 @@ void MsgEdit::ReplaceSelected( const String& rStr )
OSL_FAIL("Not Implemented");
}
-BOOL MsgEdit::IsModified(){ return bModified; }
+sal_Bool MsgEdit::IsModified(){ return bModified; }
void MsgEdit::SetModifyHdl( Link l ){ lModify = l; }
String MsgEdit::GetText() const
@@ -611,16 +611,16 @@ void MsgEdit::SetText( const String& rStr )
OSL_FAIL("Not Implemented");
}
-BOOL MsgEdit::HasText() const
+sal_Bool MsgEdit::HasText() const
{
return aEditTree.First() != NULL;
}
// Search from the beginning or mark start + 1
-BOOL MsgEdit::Find( const String& s )
+sal_Bool MsgEdit::Find( const String& s )
{
TextSelection r = GetSelection();
- USHORT bgn = (USHORT) r.GetStart().GetPara() + 1;
+ sal_uInt16 bgn = (sal_uInt16) r.GetStart().GetPara() + 1;
if ( r.GetStart().GetPara() == 0 )
bgn = 0; // Search from the beginning
@@ -630,11 +630,11 @@ BOOL MsgEdit::Find( const String& s )
if( aEditTree.GetEntryText( pEntry ).Search( s, 0 ) != STRING_NOTFOUND )
{
aEditTree.SetCurEntry( pEntry );
- return TRUE;
+ return sal_True;
}
pEntry = aEditTree.Next( pEntry );
}
- return FALSE;
+ return sal_False;
}
/******************************************************************
@@ -647,17 +647,17 @@ BOOL MsgEdit::Find( const String& s )
******************************************************************/
-BOOL MsgEdit::Load( const String& aName )
+sal_Bool MsgEdit::Load( const String& aName )
{
aLogFileName = aName;
- BOOL bOk = TRUE, bFirstLine = TRUE;
- BOOL bLoadError = FALSE;
+ sal_Bool bOk = sal_True, bFirstLine = sal_True;
+ sal_Bool bLoadError = sal_False;
SvFileStream aStrm( aName, STREAM_STD_READ );
if( aStrm.IsOpen() )
{
aEditTree.Clear();
String aLine;
- bFileLoading = TRUE; // To avoid logging to disk
+ bFileLoading = sal_True; // To avoid logging to disk
TTLogMsg *pLogMsg = new TTLogMsg;
while( !aStrm.IsEof() && bOk )
{
@@ -667,7 +667,7 @@ BOOL MsgEdit::Load( const String& aName )
aStrm.ReadByteStringLine( aLine, RTL_TEXTENCODING_IBM_850 );
if( aStrm.GetError() != SVSTREAM_OK )
- bOk = FALSE;
+ bOk = sal_False;
#define TOKEN( n ) aLine.GetToken( n )
@@ -677,9 +677,9 @@ BOOL MsgEdit::Load( const String& aName )
TTDebugData aDebugData;
aDebugData.aLogType = TTLogType( TOKEN(0).ToInt32() );
aDebugData.aFilename = TOKEN(1);
- aDebugData.nLine = USHORT( TOKEN(2).ToInt32() );
- aDebugData.nCol1 = USHORT( TOKEN(3).ToInt32() );
- aDebugData.nCol2 = USHORT( TOKEN(4).ToInt32() );
+ aDebugData.nLine = sal_uInt16( TOKEN(2).ToInt32() );
+ aDebugData.nCol1 = sal_uInt16( TOKEN(3).ToInt32() );
+ aDebugData.nCol2 = sal_uInt16( TOKEN(4).ToInt32() );
aDebugData.aMsg = aLine.GetQuotedToken( 5, CUniString("\"\"") );
// Remove leading and trailing quotes
@@ -692,13 +692,13 @@ BOOL MsgEdit::Load( const String& aName )
AddAnyMsg( pLogMsg );
}
else if ( bFirstLine && (aLine.Search( VERSION_STRING ) == 0) )
- nVersion = USHORT( aLine.Copy( VERSION_STRING.Len() ).ToInt32() );
+ nVersion = sal_uInt16( aLine.Copy( VERSION_STRING.Len() ).ToInt32() );
else if ( aLine.Len() )
- bLoadError = TRUE;
+ bLoadError = sal_True;
- bFirstLine = FALSE;
+ bFirstLine = sal_False;
}
- bFileLoading = FALSE;
+ bFileLoading = sal_False;
delete pLogMsg;
aStrm.Close();
if ( nVersion < 2 && !bLoadError )
@@ -706,16 +706,16 @@ BOOL MsgEdit::Load( const String& aName )
}
else
- bOk = FALSE;
+ bOk = sal_False;
return bOk;
}
-BOOL MsgEdit::Save( const String& aName )
+sal_Bool MsgEdit::Save( const String& aName )
{
- BOOL bOk = TRUE;
- BOOL bIsText = DirEntry( aName ).GetExtension().CompareIgnoreCaseToAscii("TXT") == COMPARE_EQUAL;
+ sal_Bool bOk = sal_True;
+ sal_Bool bIsText = DirEntry( aName ).GetExtension().CompareIgnoreCaseToAscii("TXT") == COMPARE_EQUAL;
if ( bIsText && !QueryBox( NULL, SttResId( IDS_LOSS_OF_INFORMATION ) ).Execute() )
- return FALSE;
+ return sal_False;
SvFileStream aStrm( aName, STREAM_STD_WRITE | STREAM_TRUNC );
if( aStrm.IsOpen() )
{
@@ -753,16 +753,16 @@ BOOL MsgEdit::Save( const String& aName )
}
}
if( aStrm.GetError() != SVSTREAM_OK )
- bOk = FALSE;
+ bOk = sal_False;
else
{
- bModified = FALSE;
+ bModified = sal_False;
lModify.Call( NULL );
}
}
else
- bOk = FALSE;
+ bOk = sal_False;
return bOk;
}
@@ -774,7 +774,7 @@ TTTreeListBox::TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinSt
//, nDeselectParent(0)
{}
-BOOL TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
+sal_Bool TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
{
if ( pThisEntry && pThisEntry->GetUserData() && ((TTDebugData*)pThisEntry->GetUserData())->aFilename.Len() > 0 )
{
@@ -810,20 +810,20 @@ BOOL TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
if ( pBasicFrame->pWork && pBasicFrame->pWork->ISA(AppEdit) )
((AppEdit*)pBasicFrame->pWork)->Highlight( aData->nLine, aData->nCol1, aData->nCol2 );
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
-BOOL TTTreeListBox::DoubleClickHdl()
+sal_Bool TTTreeListBox::DoubleClickHdl()
{
return JumpToSourcecode( GetHdlEntry() );
}
-/*ULONG TTTreeListBox::SelectChildren( SvLBoxEntry* pParent, BOOL bSelect )
+/*sal_uIntPtr TTTreeListBox::SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect )
{
SvLBoxEntry *pEntry = FirstChild( pParent );
- ULONG nRet = 0;
+ sal_uIntPtr nRet = 0;
while ( pEntry )
{
nRet++;
@@ -838,8 +838,8 @@ void TTTreeListBox::SelectHdl()
{
SvLBoxEntry* pHdlEntry = GetHdlEntry();
- SelectChildren( pHdlEntry, TRUE );
- Select( pHdlEntry, TRUE );
+ SelectChildren( pHdlEntry, sal_True );
+ Select( pHdlEntry, sal_True );
// InitMenu(pApp->GetAppMenu()->GetPopupMenu( RID_APPEDIT )); // so that delete works correct
}
@@ -849,13 +849,13 @@ void TTTreeListBox::DeselectHdl()
if ( GetParent( pHdlEntry ) )
{
nDeselectParent++;
- Select( GetParent( pHdlEntry ), FALSE );
+ Select( GetParent( pHdlEntry ), sal_False );
nDeselectParent--;
}
if ( !nDeselectParent )
{
- SelectChildren( pHdlEntry, FALSE );
- Select( pHdlEntry, FALSE );
+ SelectChildren( pHdlEntry, sal_False );
+ Select( pHdlEntry, sal_False );
}
Invalidate();
} */
@@ -926,15 +926,15 @@ class TTLBoxString : public SvLBoxString
{
public:
- TTLBoxString( SvLBoxEntry* pEntry, USHORT nFlags,
+ TTLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags,
const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {}
- virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
+ virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
SvLBoxEntry* pEntry);
};
-void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
+void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
SvLBoxEntry* pEntry )
{
TTFeatures aFeatures = ((TTTreeListBox*)&rDev)->GetFeatures( pEntry );
@@ -958,7 +958,7 @@ void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
else
{
aFont.SetFillColor( aCol );
- aFont.SetTransparent( FALSE );
+ aFont.SetTransparent( sal_False );
Color aCol2( COL_BLACK );
aFont.SetColor( aCol2 );
}
@@ -984,7 +984,7 @@ void TTTreeListBox::InitEntry(SvLBoxEntry* pEntry,
const String& rStr ,const Image& rImg1, const Image& rImg2,
SvLBoxButtonKind eButtonKind )
{
- USHORT nColToHilite = 1; //0==Bitmap;1=="Column1";2=="Column2"
+ sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Column1";2=="Column2"
SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
SvLBoxString* pCol = (SvLBoxString*)pEntry->GetItem( nColToHilite );
TTLBoxString* pStr = new TTLBoxString( pEntry, 0, pCol->GetText() );
diff --git a/basic/source/app/msgedit.hxx b/basic/source/app/msgedit.hxx
index 02355eb21a15..442ff3034c19 100644..100755
--- a/basic/source/app/msgedit.hxx
+++ b/basic/source/app/msgedit.hxx
@@ -38,7 +38,7 @@ class AppError;
#define SelectChildren SelectChilds
-typedef USHORT TTFeatures; // Bitfield for features of the entries
+typedef sal_uInt16 TTFeatures; // Bitfield for features of the entries
#define HasNothing TTFeatures(0x00)
#define HasError TTFeatures(0x01)
#define HasWarning TTFeatures(0x02)
@@ -50,13 +50,13 @@ class TTTreeListBox : public SvTreeListBox
{
protected:
// virtual void Command( const CommandEvent& rCEvt );
-// USHORT nDeselectParent;
+// sal_uInt16 nDeselectParent;
BasicFrame *pBasicFrame;
void InitEntry( SvLBoxEntry*, const String&, const Image&,
const Image&, SvLBoxButtonKind eButtonKind );
AppError *pAppError;
- BOOL JumpToSourcecode( SvLBoxEntry *pThisEntry );
+ sal_Bool JumpToSourcecode( SvLBoxEntry *pThisEntry );
public:
TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinStyle=0 );
@@ -64,11 +64,11 @@ public:
// virtual void SelectHdl();
// virtual void DeselectHdl();
- virtual BOOL DoubleClickHdl();
+ virtual sal_Bool DoubleClickHdl();
virtual void KeyInput( const KeyEvent& rKEvt );
-// ULONG SelectChildren( SvLBoxEntry* pParent, BOOL bSelect );
+// sal_uIntPtr SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect );
TTFeatures GetFeatures( SvLBoxEntry* );
};
@@ -80,20 +80,20 @@ class MsgEdit : public DataEdit
SvLBoxEntry *pCurrentTestCase;
SvLBoxEntry *pCurrentAssertion;
SvLBoxEntry *pCurrentError;
- BOOL bModified;
+ sal_Bool bModified;
Link lModify;
- BOOL bFileLoading; // TRUE while loading a file
+ sal_Bool bFileLoading; // sal_True while loading a file
String Impl_MakeText( SvLBoxEntry *pEntry ) const;
String Impl_MakeSaveText( SvLBoxEntry *pEntry ) const;
String Impl_MakeSaveText( TTDebugData aData ) const;
- USHORT nVersion; // Stores file version
+ sal_uInt16 nVersion; // Stores file version
AppError* pAppError;
String aLogFileName;
- static USHORT nMaxLogLen;
- static BOOL bLimitLogLen;
- static BOOL bPrintLogToStdout;
- static BOOL bPrintLogToStdoutSet; // has it been initialized yet
+ static sal_uInt16 nMaxLogLen;
+ static sal_Bool bLimitLogLen;
+ static sal_Bool bPrintLogToStdout;
+ static sal_Bool bPrintLogToStdoutSet; // has it been initialized yet
public:
MsgEdit( AppError*, BasicFrame *pBF, const WinBits& );
~MsgEdit();
@@ -108,7 +108,7 @@ public:
void AddAssertionStack( String aMsg, TTDebugData aDebugData );
void AddQAError( String aMsg, TTDebugData aDebugData );
- static void SetMaxLogLen( USHORT nLen ) { nMaxLogLen = nLen; bLimitLogLen = TRUE; }
+ static void SetMaxLogLen( sal_uInt16 nLen ) { nMaxLogLen = nLen; bLimitLogLen = sal_True; }
DATA_FUNC_DEF( aEditTree, TTTreeListBox )
};
diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx
index 5c165f441058..9e2a32fe751f 100644..100755
--- a/basic/source/app/mybasic.cxx
+++ b/basic/source/app/mybasic.cxx
@@ -60,7 +60,7 @@ TYPEINIT1(MyBasic,StarBASIC)
class MyFactory : public SbxFactory
{
public:
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
};
static SampleObjectFac aFac1;
@@ -68,7 +68,7 @@ static MyFactory aFac2;
static ProcessFactory aProcessFac;
static short nInst = 0;
-SbxBase* MyFactory::Create( UINT16 nSbxId, UINT32 nCr )
+SbxBase* MyFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCr )
{
if( nCr == SBXCR_TEST && nSbxId == SBXID_MYBASIC )
return new MyBasic;
@@ -152,7 +152,7 @@ void MyBasic::LoadIniFile()
{
}
-SbTextType MyBasic::GetSymbolType( const String &rSymbol, BOOL bWasTTControl )
+SbTextType MyBasic::GetSymbolType( const String &rSymbol, sal_Bool bWasTTControl )
{
(void) rSymbol; /* avoid warning about unused parameter */
(void) bWasTTControl; /* avoid warning about unused parameter */
@@ -179,7 +179,7 @@ void MyBasic::Reset()
CurrentError = 0;
}
-BOOL MyBasic::Compile( SbModule* p )
+sal_Bool MyBasic::Compile( SbModule* p )
{
Reset();
return StarBASIC::Compile( p );
@@ -215,7 +215,7 @@ BasicError* MyBasic::FirstError()
return NULL;
}
-BOOL MyBasic::ErrorHdl()
+sal_Bool MyBasic::ErrorHdl()
{
AppBasEd* pWin = aBasicApp.pFrame->FindModuleWin( GetActiveModule()->GetName() );
if( !pWin )
@@ -233,12 +233,12 @@ BOOL MyBasic::ErrorHdl()
);
nError++;
CurrentError = aErrors.size() - 1;
- return BOOL( nError < 20 ); // Cancel after 20 errors
+ return sal_Bool( nError < 20 ); // Cancel after 20 errors
}
else
{
ReportRuntimeError( pWin );
- return FALSE;
+ return sal_False;
}
}
@@ -255,7 +255,7 @@ void MyBasic::ReportRuntimeError( AppBasEd *pEditWin )
GetCol1(), GetCol2() ).Show();
}
-void MyBasic::DebugFindNoErrors( BOOL bDebugFindNoErrors )
+void MyBasic::DebugFindNoErrors( sal_Bool bDebugFindNoErrors )
{
(void) bDebugFindNoErrors; /* avoid warning about unused parameter */
}
@@ -265,7 +265,7 @@ const String MyBasic::GetSpechialErrorText()
return GetErrorText();
}
-USHORT MyBasic::BreakHdl()
+sal_uInt16 MyBasic::BreakHdl()
{
SbModule* pMod = GetActiveModule();
if( pMod )
@@ -299,7 +299,7 @@ USHORT MyBasic::BreakHdl()
***************************************************************************/
BasicError::BasicError
- ( AppBasEd* w, USHORT nE, const String& r, USHORT nL, USHORT nC1, USHORT nC2 )
+ ( AppBasEd* w, sal_uInt16 nE, const String& r, sal_uInt16 nL, sal_uInt16 nC1, sal_uInt16 nC2 )
: aText( SttResId( IDS_ERROR1 ) )
{
pWin = w;
diff --git a/basic/source/app/printer.cxx b/basic/source/app/printer.cxx
index 84cddf422759..675aeed2c7e0 100644..100755
--- a/basic/source/app/printer.cxx
+++ b/basic/source/app/printer.cxx
@@ -88,7 +88,7 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame *
// Disable PRINT-Menu
MenuBar* pBar = pFrame->GetMenuBar();
Menu* pFileMenu = pBar->GetPopupMenu( RID_APPFILE );
- pFileMenu->EnableItem( RID_FILEPRINT, FALSE );
+ pFileMenu->EnableItem( RID_FILEPRINT, sal_False );
mpListener.reset( new vcl::OldStylePrintAdaptor( mpPrinter ) );
mpListener->StartPage();
@@ -107,7 +107,7 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame *
Printer::PrintJob( mpListener, mpPrinter->GetJobSetup() );
nPage = 1;
- pFileMenu->EnableItem( RID_FILEPRINT, TRUE );
+ pFileMenu->EnableItem( RID_FILEPRINT, sal_True );
}
diff --git a/basic/source/app/printer.hxx b/basic/source/app/printer.hxx
index b884a642e76f..b884a642e76f 100644..100755
--- a/basic/source/app/printer.hxx
+++ b/basic/source/app/printer.hxx
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 91e28de22a6a..02d27e3a7ba6 100644..100755
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -49,9 +49,9 @@ Process::Process()
, m_nEnvCount( 0 )
, m_pEnvList( NULL )
, m_aProcessName()
+, bWasGPF( sal_False )
+, bHasBeenStarted( sal_False )
, m_pProcess( NULL )
-, bWasGPF( FALSE )
-, bHasBeenStarted( FALSE )
{
}
@@ -77,7 +77,7 @@ Process::~Process()
}
-BOOL Process::ImplIsRunning()
+sal_Bool Process::ImplIsRunning()
{
if ( m_pProcess && bHasBeenStarted )
{
@@ -85,12 +85,12 @@ BOOL Process::ImplIsRunning()
aProcessInfo.Size = sizeof(oslProcessInfo);
osl_getProcessInfo(m_pProcess, osl_Process_EXITCODE, &aProcessInfo );
if ( !(aProcessInfo.Fields & osl_Process_EXITCODE) )
- return TRUE;
+ return sal_True;
else
- return FALSE;
+ return sal_False;
}
else
- return FALSE;
+ return sal_False;
}
long Process::ImplGetExitCode()
@@ -166,17 +166,17 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const
::rtl::OUString aNormalizedAppPath;
osl::FileBase::getFileURLFromSystemPath( ::rtl::OUString(aAppPath), aNormalizedAppPath );
m_aProcessName = aNormalizedAppPath;;
- bHasBeenStarted = FALSE;
+ bHasBeenStarted = sal_False;
}
}
-BOOL Process::Start()
+sal_Bool Process::Start()
{ // Start program
- BOOL bSuccess=FALSE;
+ sal_Bool bSuccess=sal_False;
if ( m_aProcessName.getLength() && !ImplIsRunning() )
{
- bWasGPF = FALSE;
+ bWasGPF = sal_False;
#ifdef WNT
sal_uInt32 nErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_NOALIGNMENTFAULTEXCEPT | SEM_NOGPFAULTERRORBOX);
try
@@ -199,7 +199,7 @@ BOOL Process::Start()
}
catch( ... )
{
- bWasGPF = TRUE;
+ bWasGPF = sal_True;
// TODO: Output debug message !!
}
nErrorMode = SetErrorMode(nErrorMode);
@@ -211,17 +211,17 @@ BOOL Process::Start()
return bSuccess;
}
-ULONG Process::GetExitCode()
+sal_uIntPtr Process::GetExitCode()
{ // ExitCode of program after execution
return ImplGetExitCode();
}
-BOOL Process::IsRunning()
+sal_Bool Process::IsRunning()
{
return ImplIsRunning();
}
-BOOL Process::WasGPF()
+sal_Bool Process::WasGPF()
{ // Did the process fail?
#ifdef WNT
return ImplGetExitCode() == 3221225477;
@@ -230,11 +230,11 @@ BOOL Process::WasGPF()
#endif
}
-BOOL Process::Terminate()
+sal_Bool Process::Terminate()
{
if ( ImplIsRunning() )
return osl_terminateProcess(m_pProcess) == osl_Process_E_None;
- return TRUE;
+ return sal_True;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/app/processw.cxx b/basic/source/app/processw.cxx
index accd727df62f..4bf428b6a0ac 100644..100755
--- a/basic/source/app/processw.cxx
+++ b/basic/source/app/processw.cxx
@@ -44,10 +44,10 @@
// none
// 2) Methods:
// SetImage( Filename )
-// BOOL Start
-// USHORT GetExitCode
-// BOOL IsRunning
-// BOOL WasGPF
+// sal_Bool Start
+// sal_uInt16 GetExitCode
+// sal_Bool IsRunning
+// sal_Bool WasGPF
// This implementation is a sample for a table driven version that
@@ -63,7 +63,7 @@
#define _BWRITE 0x0200 // can be used as Lvaluen
#define _LVALUE _BWRITE
#define _READWRITE 0x0300 // can read and written
-#define _OPT 0x0400 // TRUE: optional parameter
+#define _OPT 0x0400 // sal_True: optional parameter
#define _METHOD 0x1000 // Mask-Bit for a method
#define _PROPERTY 0x2000 // Mask-Bit for a property
#define _COLL 0x4000 // Mask-Bit for a collection
@@ -124,12 +124,12 @@ SbxVariable* ProcessWrapper::Find( const String& rName, SbxClassType t )
// otherwise search
Methods* p = pMethods;
short nIndex = 0;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
while( p->nArgs != -1 )
{
if( rName.EqualsIgnoreCaseAscii( p->pName ) )
{
- bFound = TRUE; break;
+ bFound = sal_True; break;
}
nIndex += ( p->nArgs & _ARGSMASK ) + 1;
p = pMethods + nIndex;
@@ -164,22 +164,22 @@ void ProcessWrapper::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCT,
{
SbxVariable* pVar = pHint->GetVar();
SbxArray* pNotifyPar = pVar->GetParameters();
- USHORT nIndex = (USHORT) pVar->GetUserData();
+ sal_uInt16 nIndex = (sal_uInt16) pVar->GetUserData();
// No index: put through
if( nIndex )
{
- ULONG t = pHint->GetId();
+ sal_uIntPtr t = pHint->GetId();
if( t == SBX_HINT_INFOWANTED )
pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
else
{
- BOOL bWrite = FALSE;
+ sal_Bool bWrite = sal_False;
if( t == SBX_HINT_DATACHANGED )
- bWrite = TRUE;
+ bWrite = sal_True;
if( t == SBX_HINT_DATAWANTED || bWrite )
{
// Parameter-Test for methods:
- USHORT nPar = pMethods[ --nIndex ].nArgs & 0x00FF;
+ sal_uInt16 nPar = pMethods[ --nIndex ].nArgs & 0x00FF;
// Element 0 is the return value
if( ( !pNotifyPar && nPar )
|| ( pNotifyPar && pNotifyPar->Count() < nPar+1 ) )
@@ -207,7 +207,7 @@ SbxInfo* ProcessWrapper::GetInfo( short nIdx )
{
p++;
String aMethodName( p->pName, RTL_TEXTENCODING_ASCII_US );
- USHORT nInfoFlags = ( p->nArgs >> 8 ) & 0x03;
+ sal_uInt16 nInfoFlags = ( p->nArgs >> 8 ) & 0x03;
if( p->nArgs & _OPT )
nInfoFlags |= SBX_OPTIONAL;
pResultInfo->AddParam( aMethodName, p->eType, nInfoFlags );
@@ -221,10 +221,10 @@ SbxInfo* ProcessWrapper::GetInfo( short nIdx )
////////////////////////////////////////////////////////////////////////////
-// Properties and methods save the return value in argv[0] (Get, bPut = FALSE)
-// and store the value from argv[0] (Put, bPut = TRUE)
+// Properties and methods save the return value in argv[0] (Get, bPut = sal_False)
+// and store the value from argv[0] (Put, bPut = sal_True)
-void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
{ // Imagefile of the executable
(void) pVar; /* avoid warning about unused parameter */
(void) bWriteIt; /* avoid warning about unused parameter */
@@ -234,28 +234,28 @@ void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, BOOL b
pProcess->SetImage(pMethodePar->Get( 1 )->GetString(), String() );
}
-void ProcessWrapper::PStart( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PStart( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
{ // Program is started
(void) pMethodePar; /* avoid warning about unused parameter */
(void) bWriteIt; /* avoid warning about unused parameter */
pVar->PutBool( pProcess->Start() );
}
-void ProcessWrapper::PGetExitCode( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PGetExitCode( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
{ // ExitCode of the program after it was finished
(void) pMethodePar; /* avoid warning about unused parameter */
(void) bWriteIt; /* avoid warning about unused parameter */
pVar->PutULong( pProcess->GetExitCode() );
}
-void ProcessWrapper::PIsRunning( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PIsRunning( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
{ // Program is still running
(void) pMethodePar; /* avoid warning about unused parameter */
(void) bWriteIt; /* avoid warning about unused parameter */
pVar->PutBool( pProcess->IsRunning() );
}
-void ProcessWrapper::PWasGPF( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PWasGPF( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
{ // Program faulted with GPF etc.
(void) pMethodePar; /* avoid warning about unused parameter */
(void) bWriteIt; /* avoid warning about unused parameter */
diff --git a/basic/source/app/processw.hxx b/basic/source/app/processw.hxx
index 32e486b0ffd8..f5d60b8d783c 100644..100755
--- a/basic/source/app/processw.hxx
+++ b/basic/source/app/processw.hxx
@@ -43,7 +43,7 @@ using SbxVariable::GetInfo;
public:
#endif
typedef void( ProcessWrapper::*pMeth )
- ( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
+ ( SbxVariable* pThis, SbxArray* pArgs, sal_Bool bWrite );
#if defined ( ICC )
private:
#endif
@@ -57,11 +57,11 @@ private:
static Methods aProcessMethods[]; // Method table
Methods *pMethods; // Current method table
- void PSetImage( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PStart( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PGetExitCode( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PIsRunning( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PWasGPF( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+ void PSetImage( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PStart( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PGetExitCode( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PIsRunning( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PWasGPF( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
// Internal members and methods
Process *pProcess;
diff --git a/basic/source/app/resids.hrc b/basic/source/app/resids.hrc
index 5d3fbb098dde..5d3fbb098dde 100644..100755
--- a/basic/source/app/resids.hrc
+++ b/basic/source/app/resids.hrc
diff --git a/basic/source/app/status.cxx b/basic/source/app/status.cxx
index 14b0fcde5e38..f545538a84bd 100644..100755
--- a/basic/source/app/status.cxx
+++ b/basic/source/app/status.cxx
@@ -73,7 +73,7 @@ void StatusLine::SetProfileName( const String& s )
IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
{
- USHORT nFirstWinPos=0;
+ sal_uInt16 nFirstWinPos=0;
MenuBar* pMenu = pFrame->GetMenuBar();
PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
@@ -82,14 +82,14 @@ IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
nFirstWinPos += pTTB->GetItemPos( pTTB->GetCurItemId() ) / 2;
- USHORT x;
+ sal_uInt16 x;
x = pTTB->GetItemPos( pTTB->GetCurItemId() );
x = pWinMenu->GetItemId( nFirstWinPos );
x = pWinMenu->GetItemCount();
AppWin* pWin = pFrame->FindWin( pWinMenu->GetItemText( pWinMenu->GetItemId( nFirstWinPos ) ).EraseAllChars( L'~' ) );
if ( pWin )
{
- pWin->Minimize( FALSE );
+ pWin->Minimize( sal_False );
pWin->ToTop();
}
return 0;
@@ -97,7 +97,7 @@ IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
void StatusLine::LoadTaskToolBox()
{
- USHORT nFirstWinPos=0;
+ sal_uInt16 nFirstWinPos=0;
MenuBar* pMenu = pFrame->GetMenuBar();
PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
diff --git a/basic/source/app/status.hxx b/basic/source/app/status.hxx
index 7c3b04bed8cc..7c3b04bed8cc 100644..100755
--- a/basic/source/app/status.hxx
+++ b/basic/source/app/status.hxx
diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src
index b7ce968b4438..365f5f3d4ee6 100644..100755
--- a/basic/source/app/svtmsg.src
+++ b/basic/source/app/svtmsg.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "svtmsg.hrc"
+#include "basic/svtmsg.hrc"
// Here are included the messages of the folder /basic/source/app
diff --git a/basic/source/app/testbasi.cxx b/basic/source/app/testbasi.cxx
index 05818806c8a8..05818806c8a8 100644..100755
--- a/basic/source/app/testbasi.cxx
+++ b/basic/source/app/testbasi.cxx
diff --git a/basic/source/app/testtool.idl b/basic/source/app/testtool.idl
index acda657881c7..acda657881c7 100644..100755
--- a/basic/source/app/testtool.idl
+++ b/basic/source/app/testtool.idl
diff --git a/basic/source/app/testtool.src b/basic/source/app/testtool.src
index 245cff6c7917..090cb735c139 100644..100755
--- a/basic/source/app/testtool.src
+++ b/basic/source/app/testtool.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "testtool.hrc"
+#include "basic/testtool.hrc"
///////////////////////////////
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index 2891cf5e7a16..4ffbef7121f8 100644..100755
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -44,19 +44,19 @@
TextEditImp::TextEditImp( AppEdit* pParent, const WinBits& aBits )
: Window( pParent, aBits )
, pAppEdit( pParent )
-, bHighlightning( FALSE )
-, bDoSyntaxHighlight( FALSE )
-, bDelayHighlight( TRUE )
+, bHighlightning( sal_False )
+, bDoSyntaxHighlight( sal_False )
+, bDelayHighlight( sal_True )
, nTipId( 0 )
-, bViewMoved( FALSE )
+, bViewMoved( sal_False )
{
pTextEngine = new TextEngine();
pTextEngine->SetMaxTextLen( STRING_MAXLEN );
- pTextEngine->EnableUndo( TRUE );
+ pTextEngine->EnableUndo( sal_True );
pTextView = new TextView( pTextEngine, this );
pTextEngine->InsertView( pTextView );
- pTextEngine->SetModified( FALSE );
+ pTextEngine->SetModified( sal_False );
aSyntaxIdleTimer.SetTimeout( 200 );
aSyntaxIdleTimer.SetTimeoutHdl( LINK( this, TextEditImp, SyntaxTimerHdl ) );
@@ -79,10 +79,10 @@ TextEditImp::~TextEditImp()
delete pTextEngine;
}
-BOOL TextEditImp::ViewMoved()
+sal_Bool TextEditImp::ViewMoved()
{
- BOOL bOld = bViewMoved;
- bViewMoved = FALSE;
+ sal_Bool bOld = bViewMoved;
+ bViewMoved = sal_False;
return bOld;
}
@@ -98,7 +98,7 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
pAppEdit->pVScroll->SetThumbPos( pTextView->GetStartDocPos().Y() );
if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->Scroll( 0, ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->GetCurYOffset() - pTextView->GetStartDocPos().Y() );
- bViewMoved = TRUE;
+ bViewMoved = sal_True;
}
else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
{
@@ -114,8 +114,8 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
else if( rTextHint.GetId() == TEXT_HINT_TEXTFORMATTED )
{
- ULONG nWidth = pTextEngine->CalcTextWidth();
- if ( (ULONG)nWidth != pAppEdit->nCurTextWidth )
+ sal_uIntPtr nWidth = pTextEngine->CalcTextWidth();
+ if ( (sal_uIntPtr)nWidth != pAppEdit->nCurTextWidth )
{
pAppEdit->nCurTextWidth = nWidth;
if ( pAppEdit->pHScroll )
@@ -128,12 +128,12 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
else if( rTextHint.GetId() == TEXT_HINT_PARAINSERTED )
{
if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
- ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, TRUE );
+ ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, sal_True );
}
else if( rTextHint.GetId() == TEXT_HINT_PARAREMOVED )
{
if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
- ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, FALSE );
+ ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, sal_False );
// Itchy adaption for two signs at line ends instead of one (hard coded default)
pTextEngine->SetMaxTextLen( STRING_MAXLEN - pTextEngine->GetParagraphCount() );
@@ -188,12 +188,12 @@ int TextAttribSpechial::operator==( const TextAttrib& rAttr ) const
( maFontWeight == ((const TextAttribSpechial&)rAttr).maFontWeight ) );
}
-void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
+void TextEditImp::ImpDoHighlight( const String& rSource, sal_uIntPtr nLineOff )
{
SbTextPortions aPortionList;
pAppEdit->GetBasicFrame()->Basic().Highlight( rSource, aPortionList );
- USHORT nCount = aPortionList.Count();
+ sal_uInt16 nCount = aPortionList.Count();
if ( !nCount )
return;
@@ -210,8 +210,8 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
}
// here is the postprocessing for types for the TestTool
- USHORT i;
- BOOL bWasTTControl = FALSE;
+ sal_uInt16 i;
+ sal_Bool bWasTTControl = sal_False;
for ( i = 0; i < aPortionList.Count(); i++ )
{
SbTextPortion& r = aPortionList[i];
@@ -228,20 +228,20 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
r.eType = pAppEdit->GetBasicFrame()->Basic().GetSymbolType( aSymbol, bWasTTControl );
if ( r.eType == TT_CONTROL )
- bWasTTControl = TRUE;
+ bWasTTControl = sal_True;
else
- bWasTTControl = FALSE;
+ bWasTTControl = sal_False;
}
break;
case SB_PUNCTUATION:
{
String aPunctuation = rSource.Copy( r.nStart, r.nEnd - r.nStart +1 );
if ( aPunctuation.CompareToAscii( "." ) != COMPARE_EQUAL )
- bWasTTControl = FALSE;
+ bWasTTControl = sal_False;
}
break;
default:
- bWasTTControl = FALSE;
+ bWasTTControl = sal_False;
}
}
@@ -271,7 +271,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
r.nEnd = rSource.Len()-1;
}
- BOOL bWasModified = pTextEngine->IsModified();
+ sal_Bool bWasModified = pTextEngine->IsModified();
for ( i = 0; i < aPortionList.Count(); i++ )
{
SbTextPortion& r = aPortionList[i];
@@ -280,7 +280,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
SbTextType eCol = r.eType;
Color aColor;
- ULONG nLine = nLineOff+r.nLine-1; // -1, because BASIC starts with 1
+ sal_uIntPtr nLine = nLineOff+r.nLine-1; // -1, because BASIC starts with 1
switch ( +eCol )
{
case SB_KEYWORD:
@@ -333,7 +333,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
pTextEngine->SetModified( bWasModified );
}
-void TextEditImp::DoSyntaxHighlight( ULONG nPara )
+void TextEditImp::DoSyntaxHighlight( sal_uIntPtr nPara )
{
// Due to delayed syntax highlight it can happen that the
// paragraph does no longer exist
@@ -355,7 +355,7 @@ void TextEditImp::DoDelayedSyntaxHighlight( xub_StrLen nPara )
{
if ( bDelayHighlight )
{
- aSyntaxLineTable.Insert( nPara, (void*)(ULONG)1 );
+ aSyntaxLineTable.Insert( nPara, (void*)(sal_uIntPtr)1 );
aSyntaxIdleTimer.Start();
}
else
@@ -366,32 +366,32 @@ void TextEditImp::DoDelayedSyntaxHighlight( xub_StrLen nPara )
IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG )
{
DBG_ASSERT( pTextView, "Not yet a View but Syntax-Highlight ?!" );
- pTextEngine->SetUpdateMode( FALSE );
+ pTextEngine->SetUpdateMode( sal_False );
- bHighlightning = TRUE;
- USHORT nLine;
+ bHighlightning = sal_True;
+ sal_uInt16 nLine;
while ( aSyntaxLineTable.First() && !Application::AnyInput( INPUT_MOUSEANDKEYBOARD ) )
{
- nLine = (USHORT)aSyntaxLineTable.GetCurKey();
+ nLine = (sal_uInt16)aSyntaxLineTable.GetCurKey();
DoSyntaxHighlight( nLine );
aSyntaxLineTable.Remove( nLine );
}
- BOOL bWasModified = pTextEngine->IsModified();
+ sal_Bool bWasModified = pTextEngine->IsModified();
if ( aSyntaxLineTable.Count() > 3 ) // Without VDev
{
- pTextEngine->SetUpdateMode( TRUE );
- pTextView->ShowCursor( TRUE, TRUE );
+ pTextEngine->SetUpdateMode( sal_True );
+ pTextView->ShowCursor( sal_True, sal_True );
}
else
- pTextEngine->SetUpdateMode( TRUE ); // ! With VDev
+ pTextEngine->SetUpdateMode( sal_True ); // ! With VDev
- // SetUpdateMode( TRUE ) soll kein Modify setzen
+ // SetUpdateMode( sal_True ) soll kein Modify setzen
pTextEngine->SetModified( bWasModified );
// SyntaxTimerHdl wird gerufen, wenn Text-Aenderung
// => gute Gelegenheit, Textbreite zu ermitteln!
- bHighlightning = FALSE;
+ bHighlightning = sal_False;
if ( aSyntaxLineTable.First() )
aImplSyntaxIdleTimer.Start();
@@ -405,7 +405,7 @@ void TextEditImp::InvalidateSyntaxHighlight()
DoDelayedSyntaxHighlight( i );
}
-void TextEditImp::SyntaxHighlight( BOOL bNew )
+void TextEditImp::SyntaxHighlight( sal_Bool bNew )
{
if ( ( bNew && bDoSyntaxHighlight ) || ( !bNew && !bDoSyntaxHighlight ) )
return;
@@ -422,12 +422,12 @@ void TextEditImp::SyntaxHighlight( BOOL bNew )
else
{
aSyntaxIdleTimer.Stop();
- pTextEngine->SetUpdateMode( FALSE );
- for ( ULONG i = 0; i < pTextEngine->GetParagraphCount(); i++ )
+ pTextEngine->SetUpdateMode( sal_False );
+ for ( sal_uIntPtr i = 0; i < pTextEngine->GetParagraphCount(); i++ )
pTextEngine->RemoveAttribs( i );
- pTextEngine->SetUpdateMode( TRUE );
- pTextView->ShowCursor(TRUE, TRUE );
+ pTextEngine->SetUpdateMode( sal_True );
+ pTextView->ShowCursor(sal_True, sal_True );
}
}
@@ -437,15 +437,15 @@ void TextEditImp::SetFont( const Font& rNewFont )
pTextEngine->SetFont(rNewFont);
}
-BOOL TextEditImp::IsModified()
+sal_Bool TextEditImp::IsModified()
{
return pTextEngine->IsModified();
}
void TextEditImp::KeyInput( const KeyEvent& rKeyEvent )
{
- BOOL bWasModified = pTextView->GetTextEngine()->IsModified();
- pTextView->GetTextEngine()->SetModified( FALSE );
+ sal_Bool bWasModified = pTextView->GetTextEngine()->IsModified();
+ pTextView->GetTextEngine()->SetModified( sal_False );
if ( !pTextView->KeyInput( rKeyEvent ) )
Window::KeyInput( rKeyEvent );
@@ -526,10 +526,10 @@ SbxBase* TextEditImp::GetSbxAtMousePos( String &aWord )
if ( aSuffixes.Search( aWord.GetChar(nLastChar) ) != STRING_NOTFOUND )
aWord.Erase( nLastChar, 1 );
// because perhaps TestTools throws an error
- BOOL bWasError = SbxBase::IsError();
- pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( TRUE );
+ sal_Bool bWasError = SbxBase::IsError();
+ pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( sal_True );
SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord );
- pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( FALSE );
+ pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( sal_False );
DBG_ASSERT( !( !bWasError && SbxBase::IsError()), "Error generated while retrieving Variable data for viewing" );
if ( !bWasError && SbxBase::IsError() )
SbxBase::ResetError();
@@ -655,8 +655,8 @@ DBG_NAME(TextEdit)
TextEdit::TextEdit( AppEdit* pParent, const WinBits& aBits )
: pBreakpointWindow( NULL )
-, bFileWasUTF8( FALSE )
-, bSaveAsUTF8( FALSE )
+, bFileWasUTF8( sal_False )
+, bSaveAsUTF8( sal_False )
, aEdit( pParent, aBits | WB_NOHIDESELECTION )
{
DBG_CTOR(TextEdit,0);
@@ -665,7 +665,7 @@ DBG_CTOR(TextEdit,0);
TextEdit::~TextEdit()
{DBG_DTOR(TextEdit,0);}
-void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
+void TextEdit::Highlight( sal_uIntPtr nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
{
if ( nLine ) // Should not occure but at 'Sub expected' in first line
nLine--;
@@ -691,7 +691,7 @@ void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
// Because nCol2 *may* point after the current statement
// (because the next one starts there) there are space
// that must be removed
- BOOL bColon = FALSE;
+ sal_Bool bColon = sal_False;
while ( s.GetChar( nCol2 ) == ' ' && nCol2 > nCol1 && !bColon )
{
@@ -699,7 +699,7 @@ void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
if ( s.GetChar( nCol2 ) == ':' )
{
nCol2--;
- bColon = TRUE;
+ bColon = sal_True;
}
}
@@ -724,31 +724,31 @@ String TextEdit::GetSelected(){ return aEdit.pTextView->GetSelected(); }
TextSelection TextEdit::GetSelection() const{ return aEdit.pTextView->GetSelection(); }
void TextEdit::SetSelection( const TextSelection& rSelection ){ aEdit.pTextView->SetSelection( rSelection ); }
-USHORT TextEdit::GetLineNr() const
+sal_uInt16 TextEdit::GetLineNr() const
{
- return sal::static_int_cast< USHORT >(
+ return sal::static_int_cast< sal_uInt16 >(
aEdit.pTextView->GetSelection().GetEnd().GetPara()+1);
}
void TextEdit::ReplaceSelected( const String& rStr ){ aEdit.pTextView->InsertText(rStr); }
-BOOL TextEdit::IsModified(){ return aEdit.IsModified(); }
+sal_Bool TextEdit::IsModified(){ return aEdit.IsModified(); }
String TextEdit::GetText() const
{
return aEdit.pTextEngine->GetText( GetSystemLineEnd() );
}
-void TextEdit::SetText( const String& rStr ){ aEdit.pTextEngine->SetText(rStr); aEdit.pTextEngine->SetModified( FALSE ); }
+void TextEdit::SetText( const String& rStr ){ aEdit.pTextEngine->SetText(rStr); aEdit.pTextEngine->SetModified( sal_False ); }
void TextEdit::SetModifyHdl( Link l ){ aEdit.SetModifyHdl(l); }
-BOOL TextEdit::HasText() const { return aEdit.pTextEngine->GetTextLen() > 0; }
+sal_Bool TextEdit::HasText() const { return aEdit.pTextEngine->GetTextLen() > 0; }
// Search from the beginning or at mark + 1
-BOOL TextEdit::Find( const String& s )
+sal_Bool TextEdit::Find( const String& s )
{
DBG_CHKTHIS(TextEdit,0);
TextSelection aSelection = aEdit.pTextView->GetSelection();
- ULONG nPara = aSelection.GetStart().GetPara();
+ sal_uIntPtr nPara = aSelection.GetStart().GetPara();
xub_StrLen nIndex = aSelection.GetStart().GetIndex();
if ( aSelection.HasRange() )
@@ -762,23 +762,23 @@ BOOL TextEdit::Find( const String& s )
if( nIndex != STRING_NOTFOUND )
{
aEdit.pTextView->SetSelection( TextSelection( TextPaM( nPara, nIndex ), TextPaM( nPara, nIndex + s.Len() ) ) );
- return TRUE;
+ return sal_True;
}
nIndex = 0;
nPara++;
}
- return FALSE;
+ return sal_False;
}
-BOOL TextEdit::Load( const String& aName )
+sal_Bool TextEdit::Load( const String& aName )
{
DBG_CHKTHIS(TextEdit,0);
- BOOL bOk = TRUE;
+ sal_Bool bOk = sal_True;
SvFileStream aStrm( aName, STREAM_STD_READ );
if( aStrm.IsOpen() )
{
String aText, aLine, aLineBreak;
- BOOL bIsFirstLine = TRUE;
+ sal_Bool bIsFirstLine = sal_True;
aLineBreak += '\n';
aLineBreak.ConvertLineEnd();
rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850;
@@ -788,29 +788,29 @@ DBG_CHKTHIS(TextEdit,0);
if ( bIsFirstLine && IsTTSignatureForUnicodeTextfile( aLine ) )
{
aFileEncoding = RTL_TEXTENCODING_UTF8;
- bFileWasUTF8 = TRUE;
+ bFileWasUTF8 = sal_True;
}
else
{
if ( !bIsFirstLine )
aText += aLineBreak;
aText += aLine;
- bIsFirstLine = FALSE;
+ bIsFirstLine = sal_False;
}
if( aStrm.GetError() != SVSTREAM_OK )
- bOk = FALSE;
+ bOk = sal_False;
}
SetText( aText );
}
else
- bOk = FALSE;
+ bOk = sal_False;
return bOk;
}
-BOOL TextEdit::Save( const String& aName )
+sal_Bool TextEdit::Save( const String& aName )
{
DBG_CHKTHIS(TextEdit,0);
- BOOL bOk = TRUE;
+ sal_Bool bOk = sal_True;
SvFileStream aStrm( aName, STREAM_STD_WRITE | STREAM_TRUNC );
rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850;
if( aStrm.IsOpen() )
@@ -825,10 +825,10 @@ DBG_CHKTHIS(TextEdit,0);
aSave.ConvertLineEnd(LINEEND_LF);
aStrm << ByteString( aSave, aFileEncoding ).GetBuffer();
if( aStrm.GetError() != SVSTREAM_OK )
- bOk = FALSE;
+ bOk = sal_False;
else
- aEdit.pTextEngine->SetModified(FALSE);
- } else bOk = FALSE;
+ aEdit.pTextEngine->SetModified(sal_False);
+ } else bOk = sal_False;
return bOk;
}
diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx
index 094896fa87f4..21044c75e4bf 100644..100755
--- a/basic/source/app/textedit.hxx
+++ b/basic/source/app/textedit.hxx
@@ -49,7 +49,7 @@ class TextEditImp : public Window, public SfxListener
using Window::Notify;
protected:
- void DoSyntaxHighlight( ULONG nPara );
+ void DoSyntaxHighlight( sal_uIntPtr nPara );
private:
@@ -63,10 +63,10 @@ private:
void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- void ImpDoHighlight( const String& rSource, ULONG nLineOff );
- BOOL bHighlightning;
- BOOL bDoSyntaxHighlight;
- BOOL bDelayHighlight;
+ void ImpDoHighlight( const String& rSource, sal_uIntPtr nLineOff );
+ sal_Bool bHighlightning;
+ sal_Bool bDoSyntaxHighlight;
+ sal_Bool bDelayHighlight;
SbxBase* GetSbxAtMousePos( String &aWord );
@@ -75,12 +75,12 @@ private:
DECL_LINK( ShowVarContents, void* );
Point aTipPos;
String aTipWord;
- ULONG nTipId;
+ sal_uIntPtr nTipId;
Timer HideTipTimer;
Timer ShowTipTimer;
- BOOL bViewMoved;
+ sal_Bool bViewMoved;
public:
TextEditImp( AppEdit *pParent, const WinBits& aBits );
@@ -90,7 +90,7 @@ public:
TextView *pTextView;
void SetFont( const Font& rNewFont );
- BOOL IsModified();
+ sal_Bool IsModified();
void SetModifyHdl( Link l ){ ModifyHdl = l; }
void KeyInput( const KeyEvent& rKeyEvent );
@@ -99,14 +99,14 @@ public:
void MouseButtonDown( const MouseEvent& rMouseEvent );
// void MouseMove( const MouseEvent& rMouseEvent );
void Command( const CommandEvent& rCEvt );
- //BOOL Drop( const DropEvent& rEvt );
- //BOOL QueryDrop( DropEvent& rEvt );
+ //sal_Bool Drop( const DropEvent& rEvt );
+ //sal_Bool QueryDrop( DropEvent& rEvt );
- BOOL ViewMoved();
+ sal_Bool ViewMoved();
void DoDelayedSyntaxHighlight( xub_StrLen nPara );
void InvalidateSyntaxHighlight();
- void SyntaxHighlight( BOOL bNew );
+ void SyntaxHighlight( sal_Bool bNew );
void BuildKontextMenu( PopupMenu *&pMenu );
};
@@ -116,13 +116,13 @@ DBG_NAMEEX(TextEdit)
class TextEdit : public DataEdit {
BreakpointWindow *pBreakpointWindow;
- BOOL bFileWasUTF8;
- BOOL bSaveAsUTF8;
+ sal_Bool bFileWasUTF8;
+ sal_Bool bSaveAsUTF8;
public:
TextEdit( AppEdit*, const WinBits& );
~TextEdit();
- void Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+ void Highlight( sal_uIntPtr nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
TextEditImp& GetTextEditImp() { return aEdit; }
void SetBreakpointWindow( BreakpointWindow *pBPWindow ){ pBreakpointWindow = pBPWindow; }
@@ -132,7 +132,7 @@ public:
virtual void BuildKontextMenu( PopupMenu *&pMenu );
- void SaveAsUTF8( BOOL bUTF8 ) { bSaveAsUTF8 = bUTF8; }
+ void SaveAsUTF8( sal_Bool bUTF8 ) { bSaveAsUTF8 = bUTF8; }
};
#endif
diff --git a/basic/source/app/ttbasic.cxx b/basic/source/app/ttbasic.cxx
index cfc12a85dcc4..cfc12a85dcc4 100644..100755
--- a/basic/source/app/ttbasic.cxx
+++ b/basic/source/app/ttbasic.cxx
diff --git a/basic/source/app/ttbasic.hxx b/basic/source/app/ttbasic.hxx
index 8810da66b5e9..8810da66b5e9 100644..100755
--- a/basic/source/app/ttbasic.hxx
+++ b/basic/source/app/ttbasic.hxx
diff --git a/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src
index e0f43e89b851..c2c017b167ca 100644..100755
--- a/basic/source/app/ttmsg.src
+++ b/basic/source/app/ttmsg.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "ttmsg.hrc"
+#include "basic/ttmsg.hrc"
// Here are included the messages of the folder /basic/source/testtool
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 2057a065e96c..f94155d67808 100644..100755
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -138,9 +138,17 @@ namespace basic
impl_getLocationForModel( const Reference< XModel >& _rxDocumentModel );
/** creates a new BasicManager instance for the given model
+
+ @param _out_rpBasicManager
+ reference to the pointer variable that will hold the new
+ BasicManager.
+
+ @param _rxDocumentModel
+ the model whose BasicManager will be created. Must not be <NULL/>.
*/
- BasicManagerPointer
- impl_createManagerForModel( const Reference< XModel >& _rxDocumentModel );
+ void impl_createManagerForModel(
+ BasicManagerPointer& _out_rpBasicManager,
+ const Reference< XModel >& _rxDocumentModel );
/** creates the application-wide BasicManager
*/
@@ -243,9 +251,17 @@ namespace basic
{
::osl::MutexGuard aGuard( m_aMutex );
+ /* #163556# (DR) - This function may be called recursively while
+ constructing the Basic manager and loading the Basic storage. By
+ passing the map entry received from impl_getLocationForModel() to
+ the function impl_createManagerForModel(), the new Basic manager
+ will be put immediately into the map of existing Basic managers,
+ thus a recursive call of this function will find and return it
+ without creating another instance.
+ */
BasicManagerPointer& pBasicManager = impl_getLocationForModel( _rxDocumentModel );
if ( pBasicManager == NULL )
- pBasicManager = impl_createManagerForModel( _rxDocumentModel );
+ impl_createManagerForModel( pBasicManager, _rxDocumentModel );
return pBasicManager;
}
@@ -407,21 +423,21 @@ namespace basic
}
//--------------------------------------------------------------------
- BasicManagerPointer ImplRepository::impl_createManagerForModel( const Reference< XModel >& _rxDocumentModel )
+ void ImplRepository::impl_createManagerForModel( BasicManagerPointer& _out_rpBasicManager, const Reference< XModel >& _rxDocumentModel )
{
StarBASIC* pAppBasic = impl_getDefaultAppBasicLibrary();
- BasicManager* pBasicManager( NULL );
+ _out_rpBasicManager = 0;
Reference< XStorage > xStorage;
if ( !impl_getDocumentStorage_nothrow( _rxDocumentModel, xStorage ) )
// the document is not able to provide the storage it is based on.
- return pBasicManager;
+ return;
Reference< XPersistentLibraryContainer > xBasicLibs;
Reference< XPersistentLibraryContainer > xDialogLibs;
if ( !impl_getDocumentLibraryContainers_nothrow( _rxDocumentModel, xBasicLibs, xDialogLibs ) )
// the document does not have BasicLibraries and DialogLibraries
- return pBasicManager;
+ return;
if ( xStorage.is() )
{
@@ -432,24 +448,24 @@ namespace basic
// Storage and BaseURL are only needed by binary documents!
SotStorageRef xDummyStor = new SotStorage( ::rtl::OUString() );
- pBasicManager = new BasicManager( *xDummyStor, String() /* TODO/LATER: xStorage */,
+ _out_rpBasicManager = new BasicManager( *xDummyStor, String() /* TODO/LATER: xStorage */,
pAppBasic,
- &aAppBasicDir, TRUE );
- if ( pBasicManager->HasErrors() )
+ &aAppBasicDir, sal_True );
+ if ( _out_rpBasicManager->HasErrors() )
{
// handle errors
- BasicError* pErr = pBasicManager->GetFirstError();
+ BasicError* pErr = _out_rpBasicManager->GetFirstError();
while ( pErr )
{
// show message to user
if ( ERRCODE_BUTTON_CANCEL == ErrorHandler::HandleError( pErr->GetErrorId() ) )
{
// user wants to break loading of BASIC-manager
- BasicManagerCleaner::deleteBasicManager( pBasicManager );
+ BasicManagerCleaner::deleteBasicManager( _out_rpBasicManager );
xStorage.clear();
break;
}
- pErr = pBasicManager->GetNextError();
+ pErr = _out_rpBasicManager->GetNextError();
}
}
}
@@ -460,14 +476,14 @@ namespace basic
// create new BASIC-manager
StarBASIC* pBasic = new StarBASIC( pAppBasic );
pBasic->SetFlag( SBX_EXTSEARCH );
- pBasicManager = new BasicManager( pBasic, NULL, TRUE );
+ _out_rpBasicManager = new BasicManager( pBasic, NULL, sal_True );
}
// knit the containers with the BasicManager
LibraryContainerInfo aInfo( xBasicLibs, xDialogLibs, dynamic_cast< OldBasicPassword* >( xBasicLibs.get() ) );
OSL_ENSURE( aInfo.mpOldBasicPassword, "ImplRepository::impl_createManagerForModel: wrong BasicLibraries implementation!" );
- pBasicManager->SetLibraryContainerInfo( aInfo );
- //pBasicCont->setBasicManager( pBasicManager );
+ _out_rpBasicManager->SetLibraryContainerInfo( aInfo );
+ //pBasicCont->setBasicManager( _out_rpBasicManager );
// that's not needed anymore today. The containers will retrieve their associated
// BasicManager from the BasicManagerRepository, when needed.
@@ -475,13 +491,13 @@ namespace basic
impl_initDocLibraryContainers_nothrow( xBasicLibs, xDialogLibs );
// so that also dialogs etc. could be 'qualified' addressed
- pBasicManager->GetLib(0)->SetParent( pAppBasic );
+ _out_rpBasicManager->GetLib(0)->SetParent( pAppBasic );
// global properties in the document's Basic
- pBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( _rxDocumentModel ) );
+ _out_rpBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( _rxDocumentModel ) );
// notify
- impl_notifyCreationListeners( _rxDocumentModel, *pBasicManager );
+ impl_notifyCreationListeners( _rxDocumentModel, *_out_rpBasicManager );
// register as listener for this model being disposed/closed
Reference< XComponent > xDocumentComponent( _rxDocumentModel, UNO_QUERY );
@@ -489,9 +505,14 @@ namespace basic
startComponentListening( xDocumentComponent );
// register as listener for the BasicManager being destroyed
- StartListening( *pBasicManager );
+ StartListening( *_out_rpBasicManager );
+
+ // #i104876: Library container must not be modified just after
+ // creation. This happens as side effect when creating default
+ // "Standard" libraries and needs to be corrected here
+ xBasicLibs->setModified( sal_False );
+ xDialogLibs->setModified( sal_False );
- return pBasicManager;
}
//--------------------------------------------------------------------
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index dde988b50d38..a2aa4b53207c 100644..100755
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -43,6 +43,8 @@
#include <tools/diagnose_ex.h>
#include <basic/sbmod.hxx>
#include <basic/sbobjmod.hxx>
+#include <unotools/intlwrapper.hxx>
+#include <comphelper/processfactory.hxx>
#include <basic/sbuno.hxx>
#include <basic/basmgr.hxx>
@@ -94,15 +96,15 @@ typedef vector< BasicError* > BasErrorLst;
#define CURR_VER 2
// Version 1
-// ULONG nEndPos
-// USHORT nId
-// USHORT nVer
-// BOOL bDoLoad
+// sal_uIntPtr nEndPos
+// sal_uInt16 nId
+// sal_uInt16 nVer
+// sal_Bool bDoLoad
// String LibName
// String AbsStorageName
// String RelStorageName
// Version 2
-// + BOOL bReference
+// + sal_Bool bReference
static const char* szStdLibName = "Standard";
static const char szBasicStorage[] = "StarBASIC";
@@ -254,7 +256,7 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr,
}
}
- pLib->SetModified( FALSE );
+ pLib->SetModified( sal_False );
}
@@ -312,7 +314,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const ContainerEvent
}
else
pLib->MakeModule32( aName, aMod );
- pLib->SetModified( FALSE );
+ pLib->SetModified( sal_False );
}
}
}
@@ -346,7 +348,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const ContainerEvent
else
pLib->MakeModule32( aName, aMod );
- pLib->SetModified( FALSE );
+ pLib->SetModified( sal_False );
}
}
@@ -366,8 +368,8 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const ContainerEvent&
StarBASIC* pLib = mpMgr->GetLib( aName );
if( pLib )
{
- USHORT nLibId = mpMgr->GetLibId( aName );
- mpMgr->RemoveLib( nLibId, FALSE );
+ sal_uInt16 nLibId = mpMgr->GetLibId( aName );
+ mpMgr->RemoveLib( nLibId, sal_False );
}
}
else
@@ -377,7 +379,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const ContainerEvent&
if( pMod )
{
pLib->Remove( pMod );
- pLib->SetModified( FALSE );
+ pLib->SetModified( sal_False );
}
}
}
@@ -452,7 +454,7 @@ BasicError::BasicError()
nReason = 0;
}
-BasicError::BasicError( ULONG nId, USHORT nR, const String& rErrStr ) :
+BasicError::BasicError( sal_uIntPtr nId, sal_uInt16 nR, const String& rErrStr ) :
aErrStr( rErrStr )
{
nErrorId = nId;
@@ -478,10 +480,10 @@ private:
String aRelStorageName;
String aPassword;
- BOOL bDoLoad;
- BOOL bReference;
- BOOL bPasswordVerified;
- BOOL bFoundInPath; // Must not relativated again!
+ sal_Bool bDoLoad;
+ sal_Bool bReference;
+ sal_Bool bPasswordVerified;
+ sal_Bool bFoundInPath; // Must not relativated again!
// Lib represents library in new UNO library container
Reference< XLibraryContainer > mxScriptCont;
@@ -490,10 +492,10 @@ public:
BasicLibInfo();
BasicLibInfo( const String& rStorageName );
- BOOL IsReference() const { return bReference; }
- BOOL& IsReference() { return bReference; }
+ sal_Bool IsReference() const { return bReference; }
+ sal_Bool& IsReference() { return bReference; }
- BOOL IsExtern() const { return ! aStorageName.EqualsAscii(szImbedded); }
+ sal_Bool IsExtern() const { return ! aStorageName.EqualsAscii(szImbedded); }
void SetStorageName( const String& rName ) { aStorageName = rName; }
const String& GetStorageName() const { return aStorageName; }
@@ -516,19 +518,19 @@ public:
void SetLibName( const String& rName ) { aLibName = rName; }
// Only temporary for Load/Save
- BOOL DoLoad() { return bDoLoad; }
+ sal_Bool DoLoad() { return bDoLoad; }
- BOOL HasPassword() const { return aPassword.Len() != 0; }
+ sal_Bool HasPassword() const { return aPassword.Len() != 0; }
const String& GetPassword() const { return aPassword; }
void SetPassword( const String& rNewPassword )
{ aPassword = rNewPassword; }
- BOOL IsPasswordVerified() const { return bPasswordVerified; }
- void SetPasswordVerified() { bPasswordVerified = TRUE; }
+ sal_Bool IsPasswordVerified() const { return bPasswordVerified; }
+ void SetPasswordVerified() { bPasswordVerified = sal_True; }
- BOOL IsFoundInPath() const { return bFoundInPath; }
- void SetFoundInPath( BOOL bInPath ) { bFoundInPath = bInPath; }
+ sal_Bool IsFoundInPath() const { return bFoundInPath; }
+ void SetFoundInPath( sal_Bool bInPath ) { bFoundInPath = bInPath; }
- void Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, BOOL bUseOldReloadInfo );
+ void Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, sal_Bool bUseOldReloadInfo );
static BasicLibInfo* Create( SotStorageStream& rSStream );
Reference< XLibraryContainer > GetLibraryContainer( void )
@@ -644,10 +646,10 @@ BasicLibInfo* BasicLibs::Remove( BasicLibInfo* LibInfo )
BasicLibInfo::BasicLibInfo()
{
- bReference = FALSE;
- bPasswordVerified = FALSE;
- bDoLoad = FALSE;
- bFoundInPath = FALSE;
+ bReference = sal_False;
+ bPasswordVerified = sal_False;
+ bDoLoad = sal_False;
+ bFoundInPath = sal_False;
mxScriptCont = NULL;
aStorageName = String::CreateFromAscii(szImbedded);
aRelStorageName = String::CreateFromAscii(szImbedded);
@@ -655,20 +657,20 @@ BasicLibInfo::BasicLibInfo()
BasicLibInfo::BasicLibInfo( const String& rStorageName )
{
- bReference = TRUE;
- bPasswordVerified = FALSE;
- bDoLoad = FALSE;
+ bReference = sal_True;
+ bPasswordVerified = sal_False;
+ bDoLoad = sal_False;
mxScriptCont = NULL;
aStorageName = rStorageName;
}
-void BasicLibInfo::Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, BOOL bUseOldReloadInfo )
+void BasicLibInfo::Store( SotStorageStream& rSStream, const String& rBasMgrStorageName, sal_Bool bUseOldReloadInfo )
{
- ULONG nStartPos = rSStream.Tell();
+ sal_uIntPtr nStartPos = rSStream.Tell();
sal_uInt32 nEndPos = 0;
- USHORT nId = LIBINFO_ID;
- USHORT nVer = CURR_VER;
+ sal_uInt16 nId = LIBINFO_ID;
+ sal_uInt16 nVer = CURR_VER;
rSStream << nEndPos;
rSStream << nId;
@@ -682,7 +684,7 @@ void BasicLibInfo::Store( SotStorageStream& rSStream, const String& rBasMgrStora
aStorageName = aCurStorageName;
// Load again?
- BOOL bDoLoad_ = xLib.Is();
+ sal_Bool bDoLoad_ = xLib.Is();
if ( bUseOldReloadInfo )
bDoLoad_ = DoLoad();
rSStream << bDoLoad_;
@@ -735,8 +737,8 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
BasicLibInfo* pInfo = new BasicLibInfo;
sal_uInt32 nEndPos;
- USHORT nId;
- USHORT nVer;
+ sal_uInt16 nId;
+ sal_uInt16 nVer;
rSStream >> nEndPos;
rSStream >> nId;
@@ -746,7 +748,7 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
if( nId == LIBINFO_ID )
{
// Reload?
- BOOL bDoLoad;
+ sal_Bool bDoLoad;
rSStream >> bDoLoad;
pInfo->bDoLoad = bDoLoad;
@@ -767,7 +769,7 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
if ( nVer >= 2 )
{
- BOOL bReferenz;
+ sal_Bool bReferenz;
rSStream >> bReferenz;
pInfo->IsReference() = bReferenz;
}
@@ -790,7 +792,7 @@ void BasicLibInfo::CalcRelStorageName( const String& rMgrStorageName )
else
SetRelStorageName( String() );
}
-BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib, String* pLibPath, BOOL bDocMgr ) : mbDocMgr( bDocMgr )
+BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib, String* pLibPath, sal_Bool bDocMgr ) : mbDocMgr( bDocMgr )
{
DBG_CTOR( BasicManager, 0 );
@@ -827,13 +829,13 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
xStdLib->SetName( String::CreateFromAscii(szStdLibName) );
pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) );
xStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
- xStdLib->SetModified( FALSE );
+ xStdLib->SetModified( sal_False );
}
else
{
pStdLib->SetParent( pParentFromStdLib );
// The other get StdLib as parent:
- for ( USHORT nBasic = 1; nBasic < GetLibCount(); nBasic++ )
+ for ( sal_uInt16 nBasic = 1; nBasic < GetLibCount(); nBasic++ )
{
StarBASIC* pBasic = GetLib( nBasic );
if ( pBasic )
@@ -844,7 +846,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
}
}
// Modified through insert
- pStdLib->SetModified( FALSE );
+ pStdLib->SetModified( sal_False );
}
// #91626 Save all stream data to save it unmodified if basic isn't modified
@@ -855,12 +857,12 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
*static_cast<SvStream*>(&xManagerStream) >> *mpImpl->mpManagerStream;
SotStorageRef xBasicStorage = rStorage.OpenSotStorage
- ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, FALSE );
+ ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, sal_False );
if( xBasicStorage.Is() && !xBasicStorage->GetError() )
{
- USHORT nLibs = GetLibCount();
+ sal_uInt16 nLibs = GetLibCount();
mpImpl->mppLibStreams = new SvMemoryStream*[ nLibs ];
- for( USHORT nL = 0; nL < nLibs; nL++ )
+ for( sal_uInt16 nL = 0; nL < nLibs; nL++ )
{
BasicLibInfo* pInfo = pLibs->GetObject( nL );
DBG_ASSERT( pInfo, "pInfo?!" );
@@ -879,7 +881,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
LoadOldBasicManager( rStorage );
}
- bBasMgrModified = FALSE;
+ bBasMgrModified = sal_False;
}
void copyToLibraryContainer( StarBASIC* pBasic, const LibraryContainerInfo& rInfo )
@@ -898,8 +900,8 @@ void copyToLibraryContainer( StarBASIC* pBasic, const LibraryContainerInfo& rInf
if ( !xLib.is() )
return;
- USHORT nModCount = pBasic->GetModules()->Count();
- for ( USHORT nMod = 0 ; nMod < nModCount ; nMod++ )
+ sal_uInt16 nModCount = pBasic->GetModules()->Count();
+ for ( sal_uInt16 nMod = 0 ; nMod < nModCount ; nMod++ )
{
SbModule* pModule = (SbModule*)pBasic->GetModules()->Get( nMod );
DBG_ASSERT( pModule, "Modul nicht erhalten!" );
@@ -963,14 +965,14 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
else
{
// No libs? Maybe an 5.2 document already loaded
- USHORT nLibs = GetLibCount();
- for( USHORT nL = 0; nL < nLibs; nL++ )
+ sal_uInt16 nLibs = GetLibCount();
+ for( sal_uInt16 nL = 0; nL < nLibs; nL++ )
{
BasicLibInfo* pBasLibInfo = pLibs->GetObject( nL );
StarBASIC* pLib = pBasLibInfo->GetLib();
if( !pLib )
{
- BOOL bLoaded = ImpLoadLibary( pBasLibInfo, NULL, FALSE );
+ sal_Bool bLoaded = ImpLoadLibary( pBasLibInfo, NULL, sal_False );
if( bLoaded )
pLib = pBasLibInfo->GetLib();
}
@@ -999,7 +1001,7 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
SetGlobalUNOConstant( "DialogLibraries", makeAny( mpImpl->maContainerInfo.mxDialogCont ) );
}
-BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, BOOL bDocMgr ) : mbDocMgr( bDocMgr )
+BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, sal_Bool bDocMgr ) : mbDocMgr( bDocMgr )
{
DBG_CTOR( BasicManager, 0 );
Init();
@@ -1016,8 +1018,8 @@ BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, BOOL bDocMgr ) :
pSLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
// Save is only necessary if basic has changed
- xStdLib->SetModified( FALSE );
- bBasMgrModified = FALSE;
+ xStdLib->SetModified( sal_False );
+ bBasMgrModified = sal_False;
}
BasicManager::BasicManager()
@@ -1042,7 +1044,7 @@ void BasicManager::ImpMgrNotLoaded( const String& rStorageName )
xStdLib->SetName( String::CreateFromAscii(szStdLibName) );
pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) );
xStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
- xStdLib->SetModified( FALSE );
+ xStdLib->SetModified( sal_False );
}
@@ -1057,7 +1059,7 @@ void BasicManager::ImpCreateStdLib( StarBASIC* pParentFromStdLib )
}
-void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, BOOL bLoadLibs )
+void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseURL, sal_Bool bLoadLibs )
{
DBG_CHKTHIS( BasicManager, 0 );
@@ -1095,7 +1097,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
sal_uInt32 nEndPos;
*xManagerStream >> nEndPos;
- USHORT nLibs;
+ sal_uInt16 nLibs;
*xManagerStream >> nLibs;
// Plausibility!
if( nLibs & 0xF000 )
@@ -1103,7 +1105,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
DBG_ASSERT( !this, "BasicManager-Stream defect!" );
return;
}
- for ( USHORT nL = 0; nL < nLibs; nL++ )
+ for ( sal_uInt16 nL = 0; nL < nLibs; nL++ )
{
BasicLibInfo* pInfo = BasicLibInfo::Create( *xManagerStream );
@@ -1113,7 +1115,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
{
INetURLObject aObj( aRealStorageName, INET_PROT_FILE );
aObj.removeSegment();
- bool bWasAbsolute = FALSE;
+ bool bWasAbsolute = sal_False;
aObj = aObj.smartRel2Abs( pInfo->GetRelStorageName(), bWasAbsolute );
//*** TODO: Replace if still necessary
@@ -1129,7 +1131,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
if( aPathCFG.SearchFile( aSearchFile, SvtPathOptions::PATH_BASIC ) )
{
pInfo->SetStorageName( aSearchFile );
- pInfo->SetFoundInPath( TRUE );
+ pInfo->SetFoundInPath( sal_True );
}
}
}
@@ -1192,8 +1194,8 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
{
String aCurStorageName( aStorName );
INetURLObject aCurStorage( aCurStorageName, INET_PROT_FILE );
- USHORT nLibs = aLibs.GetTokenCount( LIB_SEP );
- for ( USHORT nLib = 0; nLib < nLibs; nLib++ )
+ sal_uInt16 nLibs = aLibs.GetTokenCount( LIB_SEP );
+ for ( sal_uInt16 nLib = 0; nLib < nLibs; nLib++ )
{
String aLibInfo( aLibs.GetToken( nLib, LIB_SEP ) );
// TODO: Remove == 2
@@ -1205,7 +1207,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
INetURLObject aLibRelStorage( aStorName );
aLibRelStorage.removeSegment();
- bool bWasAbsolute = FALSE;
+ bool bWasAbsolute = sal_False;
aLibRelStorage = aLibRelStorage.smartRel2Abs( aLibRelStorageName, bWasAbsolute);
DBG_ASSERT(!bWasAbsolute, "RelStorageName was absolute!" );
@@ -1214,14 +1216,14 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
xStorageRef = &rStorage;
else
{
- xStorageRef = new SotStorage( FALSE, aLibAbsStorage.GetMainURL
- ( INetURLObject::NO_DECODE ), eStorageReadMode, TRUE );
+ xStorageRef = new SotStorage( sal_False, aLibAbsStorage.GetMainURL
+ ( INetURLObject::NO_DECODE ), eStorageReadMode, sal_True );
if ( xStorageRef->GetError() != ERRCODE_NONE )
- xStorageRef = new SotStorage( FALSE, aLibRelStorage.
- GetMainURL( INetURLObject::NO_DECODE ), eStorageReadMode, TRUE );
+ xStorageRef = new SotStorage( sal_False, aLibRelStorage.
+ GetMainURL( INetURLObject::NO_DECODE ), eStorageReadMode, sal_True );
}
if ( xStorageRef.Is() )
- AddLib( *xStorageRef, aLibName, FALSE );
+ AddLib( *xStorageRef, aLibName, sal_False );
else
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, aStorName, ERRCODE_BUTTON_OK );
@@ -1258,8 +1260,8 @@ bool BasicManager::HasExeCode( const String& sLib )
if ( pLib )
{
SbxArray* pMods = pLib->GetModules();
- USHORT nMods = pMods ? pMods->Count() : 0;
- for( USHORT i = 0; i < nMods; i++ )
+ sal_uInt16 nMods = pMods ? pMods->Count() : 0;
+ for( sal_uInt16 i = 0; i < nMods; i++ )
{
SbModule* p = (SbModule*) pMods->Get( i );
if ( p )
@@ -1274,7 +1276,7 @@ void BasicManager::Init()
{
DBG_CHKTHIS( BasicManager, 0 );
- bBasMgrModified = FALSE;
+ bBasMgrModified = sal_False;
pErrorMgr = new BasicErrorManager;
pLibs = new BasicLibs;
mpImpl = new BasicManagerImpl();
@@ -1289,7 +1291,7 @@ BasicLibInfo* BasicManager::CreateLibInfo()
return pInf;
}
-BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly ) const
+sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, sal_Bool bInfosOnly ) const
{
DBG_CHKTHIS( BasicManager, 0 );
@@ -1317,10 +1319,10 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
}
if ( !xStorage.Is() )
- xStorage = new SotStorage( FALSE, aStorageName, eStorageReadMode );
+ xStorage = new SotStorage( sal_False, aStorageName, eStorageReadMode );
SotStorageRef xBasicStorage = xStorage->OpenSotStorage
- ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, FALSE );
+ ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), eStorageReadMode, sal_False );
if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
{
@@ -1338,7 +1340,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
}
else
{
- BOOL bLoaded = FALSE;
+ sal_Bool bLoaded = sal_False;
if ( xBasicStream->Seek( STREAM_SEEK_TO_END ) != 0 )
{
if ( !bInfosOnly )
@@ -1351,7 +1353,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
xBasicStream->SetBufferSize( 0 );
StarBASICRef xStdLib = pLibInfo->GetLib();
xStdLib->SetName( pLibInfo->GetLibName() );
- xStdLib->SetModified( FALSE );
+ xStdLib->SetModified( sal_False );
xStdLib->SetFlag( SBX_DONTSTORE );
}
else
@@ -1360,7 +1362,7 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
xBasicStream->Seek( STREAM_SEEK_TO_BEGIN );
ImplEncryptStream( *xBasicStream );
SbxBase::Skip( *xBasicStream );
- bLoaded = TRUE;
+ bLoaded = sal_True;
}
}
if ( !bLoaded )
@@ -1387,20 +1389,20 @@ BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorag
return bLoaded;
}
}
- return FALSE;
+ return sal_False;
}
-BOOL BasicManager::ImplEncryptStream( SvStream& rStrm ) const
+sal_Bool BasicManager::ImplEncryptStream( SvStream& rStrm ) const
{
- ULONG nPos = rStrm.Tell();
- UINT32 nCreator;
+ sal_uIntPtr nPos = rStrm.Tell();
+ sal_uInt32 nCreator;
rStrm >> nCreator;
rStrm.Seek( nPos );
- BOOL bProtected = FALSE;
+ sal_Bool bProtected = sal_False;
if ( nCreator != SBXCR_SBX )
{
// Should only be the case for encrypted Streams
- bProtected = TRUE;
+ bProtected = sal_True;
rStrm.SetKey( szCryptingKey );
rStrm.RefreshBuffer();
}
@@ -1409,11 +1411,11 @@ BOOL BasicManager::ImplEncryptStream( SvStream& rStrm ) const
// This code is necessary to load the BASIC of Beta 1
// TODO: Which Beta 1?
-BOOL BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const
+sal_Bool BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const
{
- BOOL bProtected = ImplEncryptStream( rStrm );
+ sal_Bool bProtected = ImplEncryptStream( rStrm );
SbxBaseRef xNew = SbxBase::Load( rStrm );
- BOOL bLoaded = FALSE;
+ sal_Bool bLoaded = sal_False;
if( xNew.Is() )
{
if( xNew->IsA( TYPE(StarBASIC) ) )
@@ -1432,8 +1434,8 @@ BOOL BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) con
// Fill new libray container (5.2 -> 6.0)
copyToLibraryContainer( pNew, mpImpl->maContainerInfo );
- pNew->SetModified( FALSE );
- bLoaded = TRUE;
+ pNew->SetModified( sal_False );
+ bLoaded = sal_True;
}
}
if ( bProtected )
@@ -1441,14 +1443,14 @@ BOOL BasicManager::ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) con
return bLoaded;
}
-void BasicManager::CheckModules( StarBASIC* pLib, BOOL bReference ) const
+void BasicManager::CheckModules( StarBASIC* pLib, sal_Bool bReference ) const
{
if ( !pLib )
return;
- BOOL bModified = pLib->IsModified();
+ sal_Bool bModified = pLib->IsModified();
- for ( USHORT nMod = 0; nMod < pLib->GetModules()->Count(); nMod++ )
+ for ( sal_uInt16 nMod = 0; nMod < pLib->GetModules()->Count(); nMod++ )
{
SbModule* pModule = (SbModule*)pLib->GetModules()->Get( nMod );
DBG_ASSERT( pModule, "Modul nicht erhalten!" );
@@ -1461,11 +1463,11 @@ void BasicManager::CheckModules( StarBASIC* pLib, BOOL bReference ) const
if( !bModified && bReference )
{
OSL_FAIL( "Per Reference eingebundene Basic-Library ist nicht compiliert!" );
- pLib->SetModified( FALSE );
+ pLib->SetModified( sal_False );
}
}
-StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, BOOL bReference )
+StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, sal_Bool bReference )
{
DBG_CHKTHIS( BasicManager, 0 );
@@ -1483,11 +1485,11 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, B
// Use original name otherwise ImpLoadLibary failes...
pLibInfo->SetLibName( rLibName );
// Funktioniert so aber nicht, wenn Name doppelt
- USHORT nLibId = (USHORT) pLibs->GetPos( pLibInfo );
+ sal_uInt16 nLibId = (sal_uInt16) pLibs->GetPos( pLibInfo );
// Set StorageName before load because it is compared with pCurStorage
pLibInfo->SetStorageName( aStorageName );
- BOOL bLoaded = ImpLoadLibary( pLibInfo, &rStorage );
+ sal_Bool bLoaded = ImpLoadLibary( pLibInfo, &rStorage );
if ( bLoaded )
{
@@ -1496,20 +1498,20 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, B
if ( bReference )
{
- pLibInfo->GetLib()->SetModified( FALSE ); // Don't save in this case
+ pLibInfo->GetLib()->SetModified( sal_False ); // Don't save in this case
pLibInfo->SetRelStorageName( String() );
- pLibInfo->IsReference() = TRUE;
+ pLibInfo->IsReference() = sal_True;
}
else
{
- pLibInfo->GetLib()->SetModified( TRUE ); // Must be saved after Add!
+ pLibInfo->GetLib()->SetModified( sal_True ); // Must be saved after Add!
pLibInfo->SetStorageName( String::CreateFromAscii(szImbedded) ); // Save in BasicManager-Storage
}
- bBasMgrModified = TRUE;
+ bBasMgrModified = sal_True;
}
else
{
- RemoveLib( nLibId, FALSE );
+ RemoveLib( nLibId, sal_False );
pLibInfo = 0;
}
@@ -1519,7 +1521,7 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, B
return 0;
}
-BOOL BasicManager::IsReference( USHORT nLib )
+sal_Bool BasicManager::IsReference( sal_uInt16 nLib )
{
DBG_CHKTHIS( BasicManager, 0 );
@@ -1528,16 +1530,16 @@ BOOL BasicManager::IsReference( USHORT nLib )
if ( pLibInfo )
return pLibInfo->IsReference();
- return FALSE;
+ return sal_False;
}
-BOOL BasicManager::RemoveLib( USHORT nLib )
+sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib )
{
// Only pyhsical deletion if no reference
return RemoveLib( nLib, !IsReference( nLib ) );
}
-BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
+sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage )
{
DBG_CHKTHIS( BasicManager, 0 );
DBG_ASSERT( nLib, "Standard-Lib cannot be removed!" );
@@ -1550,7 +1552,7 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
// String aErrorText( BasicResId( IDS_SBERR_REMOVELIB ) );
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, String(), ERRCODE_BUTTON_OK );
pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_STDLIB, pLibInfo->GetLibName() ) );
- return FALSE;
+ return sal_False;
}
// If one of the streams cannot be opened, this is not an error,
@@ -1560,14 +1562,14 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
{
SotStorageRef xStorage;
if ( !pLibInfo->IsExtern() )
- xStorage = new SotStorage( FALSE, GetStorageName() );
+ xStorage = new SotStorage( sal_False, GetStorageName() );
else
- xStorage = new SotStorage( FALSE, pLibInfo->GetStorageName() );
+ xStorage = new SotStorage( sal_False, pLibInfo->GetStorageName() );
if ( xStorage->IsStorage( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)) ) )
{
SotStorageRef xBasicStorage = xStorage->OpenSotStorage
- ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), STREAM_STD_READWRITE, FALSE );
+ ( String(RTL_CONSTASCII_USTRINGPARAM(szBasicStorage)), STREAM_STD_READWRITE, sal_False );
if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
{
@@ -1604,20 +1606,20 @@ BOOL BasicManager::RemoveLib( USHORT nLib, BOOL bDelBasicFromStorage )
}
}
}
- bBasMgrModified = TRUE;
+ bBasMgrModified = sal_True;
if ( pLibInfo->GetLib().Is() )
GetStdLib()->Remove( pLibInfo->GetLib() );
delete pLibs->Remove( pLibInfo );
- return TRUE; // Remove was successful, del unimportant
+ return sal_True; // Remove was successful, del unimportant
}
-USHORT BasicManager::GetLibCount() const
+sal_uInt16 BasicManager::GetLibCount() const
{
DBG_CHKTHIS( BasicManager, 0 );
- return (USHORT)pLibs->Count();
+ return (sal_uInt16)pLibs->Count();
}
-StarBASIC* BasicManager::GetLib( USHORT nLib ) const
+StarBASIC* BasicManager::GetLib( sal_uInt16 nLib ) const
{
DBG_CHKTHIS( BasicManager, 0 );
BasicLibInfo* pInf = pLibs->GetObject( nLib );
@@ -1649,7 +1651,7 @@ StarBASIC* BasicManager::GetLib( const String& rName ) const
return 0;
}
-USHORT BasicManager::GetLibId( const String& rName ) const
+sal_uInt16 BasicManager::GetLibId( const String& rName ) const
{
DBG_CHKTHIS( BasicManager, 0 );
@@ -1657,14 +1659,14 @@ USHORT BasicManager::GetLibId( const String& rName ) const
while ( pInf )
{
if ( pInf->GetLibName().CompareIgnoreCaseToAscii( rName ) == COMPARE_EQUAL )
- return (USHORT)pLibs->GetCurPos();
+ return (sal_uInt16)pLibs->GetCurPos();
pInf = pLibs->Next();
}
return LIB_NOTFOUND;
}
-BOOL BasicManager::HasLib( const String& rName ) const
+sal_Bool BasicManager::HasLib( const String& rName ) const
{
DBG_CHKTHIS( BasicManager, 0 );
@@ -1672,14 +1674,14 @@ BOOL BasicManager::HasLib( const String& rName ) const
while ( pInf )
{
if ( pInf->GetLibName().CompareIgnoreCaseToAscii( rName ) == COMPARE_EQUAL )
- return TRUE;
+ return sal_True;
pInf = pLibs->Next();
}
- return FALSE;
+ return sal_False;
}
-BOOL BasicManager::SetLibName( USHORT nLib, const String& rName )
+sal_Bool BasicManager::SetLibName( sal_uInt16 nLib, const String& rName )
{
DBG_CHKTHIS( BasicManager, 0 );
@@ -1692,15 +1694,15 @@ BOOL BasicManager::SetLibName( USHORT nLib, const String& rName )
{
StarBASICRef xStdLib = pLibInfo->GetLib();
xStdLib->SetName( rName );
- xStdLib->SetModified( TRUE );
+ xStdLib->SetModified( sal_True );
}
- bBasMgrModified = TRUE;
- return TRUE;
+ bBasMgrModified = sal_True;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-String BasicManager::GetLibName( USHORT nLib )
+String BasicManager::GetLibName( sal_uInt16 nLib )
{
DBG_CHKTHIS( BasicManager, 0 );
@@ -1711,11 +1713,11 @@ String BasicManager::GetLibName( USHORT nLib )
return String();
}
-BOOL BasicManager::LoadLib( USHORT nLib )
+sal_Bool BasicManager::LoadLib( sal_uInt16 nLib )
{
DBG_CHKTHIS( BasicManager, 0 );
- BOOL bDone = FALSE;
+ sal_Bool bDone = sal_False;
BasicLibInfo* pLibInfo = pLibs->GetObject( nLib );
DBG_ASSERT( pLibInfo, "Lib?!" );
if ( pLibInfo )
@@ -1729,7 +1731,7 @@ BOOL BasicManager::LoadLib( USHORT nLib )
}
else
{
- bDone = ImpLoadLibary( pLibInfo, NULL, FALSE );
+ bDone = ImpLoadLibary( pLibInfo, NULL, sal_False );
StarBASIC* pLib = GetLib( nLib );
if ( pLib )
{
@@ -1772,10 +1774,10 @@ StarBASIC* BasicManager::CreateLib
{
if( LinkTargetURL.Len() != 0 )
{
- SotStorageRef xStorage = new SotStorage( FALSE, LinkTargetURL, STREAM_READ | STREAM_SHARE_DENYWRITE );
+ SotStorageRef xStorage = new SotStorage( sal_False, LinkTargetURL, STREAM_READ | STREAM_SHARE_DENYWRITE );
if( !xStorage->GetError() )
{
- pLib = AddLib( *xStorage, rLibName, TRUE );
+ pLib = AddLib( *xStorage, rLibName, sal_True );
}
DBG_ASSERT( pLib, "XML Import: Linked basic library could not be loaded");
@@ -1829,16 +1831,16 @@ BasicLibInfo* BasicManager::FindLibInfo( StarBASIC* pBasic ) const
}
-BOOL BasicManager::IsModified() const
+sal_Bool BasicManager::IsModified() const
{
DBG_CHKTHIS( BasicManager, 0 );
if ( bBasMgrModified )
- return TRUE;
+ return sal_True;
return IsBasicModified();
}
-BOOL BasicManager::IsBasicModified() const
+sal_Bool BasicManager::IsBasicModified() const
{
DBG_CHKTHIS( BasicManager, 0 );
@@ -1846,17 +1848,17 @@ BOOL BasicManager::IsBasicModified() const
while ( pInf )
{
if ( pInf->GetLib().Is() && pInf->GetLib()->IsModified() )
- return TRUE;
+ return sal_True;
pInf = pLibs->Next();
}
- return FALSE;
+ return sal_False;
}
-void BasicManager::SetFlagToAllLibs( short nFlag, BOOL bSet ) const
+void BasicManager::SetFlagToAllLibs( short nFlag, sal_Bool bSet ) const
{
- USHORT nLibs = GetLibCount();
- for ( USHORT nL = 0; nL < nLibs; nL++ )
+ sal_uInt16 nLibs = GetLibCount();
+ for ( sal_uInt16 nL = 0; nL < nLibs; nL++ )
{
BasicLibInfo* pInfo = pLibs->GetObject( nL );
DBG_ASSERT( pInfo, "Info?!" );
@@ -1871,7 +1873,7 @@ void BasicManager::SetFlagToAllLibs( short nFlag, BOOL bSet ) const
}
}
-BOOL BasicManager::HasErrors()
+sal_Bool BasicManager::HasErrors()
{
DBG_CHKTHIS( BasicManager, 0 );
return pErrorMgr->HasErrors();
@@ -1977,6 +1979,116 @@ bool BasicManager::LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequen
return false;
}
+
+namespace
+{
+ SbMethod* lcl_queryMacro( BasicManager* i_manager, String const& i_fullyQualifiedName )
+ {
+ sal_uInt16 nLast = 0;
+ String sMacro = i_fullyQualifiedName;
+ String sLibName = sMacro.GetToken( 0, '.', nLast );
+ String sModule = sMacro.GetToken( 0, '.', nLast );
+ sMacro.Erase( 0, nLast );
+
+ IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
+ const CollatorWrapper* pCollator = aIntlWrapper.getCollator();
+ sal_uInt16 nLibCount = i_manager->GetLibCount();
+ for ( sal_uInt16 nLib = 0; nLib < nLibCount; ++nLib )
+ {
+ if ( COMPARE_EQUAL == pCollator->compareString( i_manager->GetLibName( nLib ), sLibName ) )
+ {
+ StarBASIC* pLib = i_manager->GetLib( nLib );
+ if( !pLib )
+ {
+ i_manager->LoadLib( nLib );
+ pLib = i_manager->GetLib( nLib );
+ }
+
+ if( pLib )
+ {
+ sal_uInt16 nModCount = pLib->GetModules()->Count();
+ for( sal_uInt16 nMod = 0; nMod < nModCount; ++nMod )
+ {
+ SbModule* pMod = (SbModule*)pLib->GetModules()->Get( nMod );
+ if ( pMod && COMPARE_EQUAL == pCollator->compareString( pMod->GetName(), sModule ) )
+ {
+ SbMethod* pMethod = (SbMethod*)pMod->Find( sMacro, SbxCLASS_METHOD );
+ if( pMethod )
+ return pMethod;
+ }
+ }
+ }
+ }
+ }
+ return 0;
+ }
+}
+
+bool BasicManager::HasMacro( String const& i_fullyQualifiedName ) const
+{
+ return ( NULL != lcl_queryMacro( const_cast< BasicManager* >( this ), i_fullyQualifiedName ) );
+}
+
+ErrCode BasicManager::ExecuteMacro( String const& i_fullyQualifiedName, SbxArray* i_arguments, SbxValue* i_retValue )
+{
+ SbMethod* pMethod = lcl_queryMacro( this, i_fullyQualifiedName );
+ ErrCode nError = 0;
+ if ( pMethod )
+ {
+ if ( i_arguments )
+ pMethod->SetParameters( i_arguments );
+ nError = pMethod->Call( i_retValue );
+ }
+ else
+ nError = ERRCODE_BASIC_PROC_UNDEFINED;
+ return nError;
+}
+
+ErrCode BasicManager::ExecuteMacro( String const& i_fullyQualifiedName, String const& i_commaSeparatedArgs, SbxValue* i_retValue )
+{
+ SbMethod* pMethod = lcl_queryMacro( this, i_fullyQualifiedName );
+ if ( !pMethod )
+ return ERRCODE_BASIC_PROC_UNDEFINED;
+
+ // arguments must be quoted
+ String sQuotedArgs;
+ String sArgs( i_commaSeparatedArgs );
+ if ( sArgs.Len()<2 || sArgs.GetBuffer()[1] == '\"')
+ // no args or already quoted args
+ sQuotedArgs = sArgs;
+ else
+ {
+ // quote parameters
+ sArgs.Erase( 0, 1 );
+ sArgs.Erase( sArgs.Len()-1, 1 );
+
+ sQuotedArgs = '(';
+
+ sal_uInt16 nCount = sArgs.GetTokenCount(',');
+ for ( sal_uInt16 n=0; n<nCount; ++n )
+ {
+ sQuotedArgs += '\"';
+ sQuotedArgs += sArgs.GetToken( n, ',' );
+ sQuotedArgs += '\"';
+ if ( n<nCount-1 )
+ sQuotedArgs += ',';
+ }
+
+ sQuotedArgs += ')';
+ }
+
+ // add quoted arguments and do the call
+ String sCall( '[' );
+ sCall += pMethod->GetName();
+ sCall += sQuotedArgs;
+ sCall += ']';
+
+ SbxVariable* pRet = pMethod->GetParent()->Execute( sCall );
+ if ( pRet )
+ *i_retValue = *pRet;
+ return SbxBase::GetError();
+}
+
//=====================================================================
class ModuleInfo_Impl : public ModuleInfoHelper
@@ -2130,10 +2242,10 @@ Sequence< ::rtl::OUString > ModuleContainer_Impl::getElementNames()
throw(RuntimeException)
{
SbxArray* pMods = mpLib ? mpLib->GetModules() : NULL;
- USHORT nMods = pMods ? pMods->Count() : 0;
+ sal_uInt16 nMods = pMods ? pMods->Count() : 0;
Sequence< ::rtl::OUString > aRetSeq( nMods );
::rtl::OUString* pRetSeq = aRetSeq.getArray();
- for( USHORT i = 0 ; i < nMods ; i++ )
+ for( sal_uInt16 i = 0 ; i < nMods ; i++ )
{
SbxVariable* pMod = pMods->Get( i );
pRetSeq[i] = ::rtl::OUString( pMod->GetName() );
@@ -2460,10 +2572,10 @@ Any LibraryContainer_Impl::getByName( const ::rtl::OUString& aName )
Sequence< ::rtl::OUString > LibraryContainer_Impl::getElementNames()
throw(RuntimeException)
{
- USHORT nLibs = mpMgr->GetLibCount();
+ sal_uInt16 nLibs = mpMgr->GetLibCount();
Sequence< ::rtl::OUString > aRetSeq( nLibs );
::rtl::OUString* pRetSeq = aRetSeq.getArray();
- for( USHORT i = 0 ; i < nLibs ; i++ )
+ for( sal_uInt16 i = 0 ; i < nLibs ; i++ )
{
pRetSeq[i] = ::rtl::OUString( mpMgr->GetLibName( i ) );
}
@@ -2500,7 +2612,7 @@ void LibraryContainer_Impl::removeByName( const ::rtl::OUString& Name )
StarBASIC* pLib = mpMgr->GetLib( Name );
if( !pLib )
throw NoSuchElementException();
- USHORT nLibId = mpMgr->GetLibId( Name );
+ sal_uInt16 nLibId = mpMgr->GetLibId( Name );
mpMgr->RemoveLib( nLibId );
}
diff --git a/basic/source/basmgr/makefile.mk b/basic/source/basmgr/makefile.mk
index e08e9cc753bd..615a8e8465ef 100644..100755
--- a/basic/source/basmgr/makefile.mk
+++ b/basic/source/basmgr/makefile.mk
@@ -39,7 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
SLOFILES= \
$(SLO)$/basmgr.obj \
- $(SLO)$/basicmanagerrepository.obj
+ $(SLO)$/basicmanagerrepository.obj\
+ $(SLO)$/vbahelper.obj
# --- Targets -------------------------------------------------------------
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
new file mode 100755
index 000000000000..a09446f2e40b
--- /dev/null
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -0,0 +1,212 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basic.hxx"
+
+#include "basic/vbahelper.hxx"
+#include <com/sun/star/container/XEnumeration.hpp>
+#include <com/sun/star/frame/XDesktop.hpp>
+#include <com/sun/star/frame/XModel2.hpp>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <comphelper/processfactory.hxx>
+
+namespace basic {
+namespace vba {
+
+using namespace ::com::sun::star;
+
+// ============================================================================
+
+namespace {
+
+/** Creates the global module manager needed to identify the type of documents.
+ */
+uno::Reference< frame::XModuleManager > lclCreateModuleManager()
+{
+ uno::Reference< frame::XModuleManager > xModuleManager;
+ try
+ {
+ uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_SET_THROW );
+ xModuleManager.set( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ) ) ), uno::UNO_QUERY );
+ }
+ catch( uno::Exception& )
+ {
+ }
+ OSL_ENSURE( xModuleManager.is(), "::basic::vba::lclCreateModuleManager - cannot create module manager" );
+ return xModuleManager;
+}
+
+// ----------------------------------------------------------------------------
+
+/** Returns the document service name of the specified document.
+ */
+::rtl::OUString lclIdentifyDocument( const uno::Reference< frame::XModuleManager >& rxModuleManager, const uno::Reference< frame::XModel >& rxModel )
+{
+ ::rtl::OUString aServiceName;
+ if( rxModuleManager.is() )
+ {
+ try
+ {
+ aServiceName = rxModuleManager->identify( rxModel );
+ }
+ catch( uno::Exception& )
+ {
+ }
+ OSL_ENSURE( aServiceName.getLength() > 0, "::basic::vba::lclIdentifyDocument - cannot identify document" );
+ }
+ return aServiceName;
+}
+
+// ----------------------------------------------------------------------------
+
+/** Returns an enumeration of all open documents.
+ */
+uno::Reference< container::XEnumeration > lclCreateDocumentEnumeration()
+{
+ uno::Reference< container::XEnumeration > xEnumeration;
+ try
+ {
+ uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), uno::UNO_SET_THROW );
+ uno::Reference< frame::XDesktop > xDesktop( xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ) ), uno::UNO_QUERY_THROW );
+ uno::Reference< container::XEnumerationAccess > xComponentsEA( xDesktop->getComponents(), uno::UNO_SET_THROW );
+ xEnumeration = xComponentsEA->createEnumeration();
+
+ }
+ catch( uno::Exception& )
+ {
+ }
+ OSL_ENSURE( xEnumeration.is(), "::basic::vba::lclCreateDocumentEnumeration - cannot create enumeration of all documents" );
+ return xEnumeration;
+}
+
+// ----------------------------------------------------------------------------
+
+/** Locks or unlocks the controllers of the specified document model.
+ */
+void lclLockControllers( const uno::Reference< frame::XModel >& rxModel, sal_Bool bLockControllers )
+{
+ if( rxModel.is() ) try
+ {
+ if( bLockControllers )
+ rxModel->lockControllers();
+ else
+ rxModel->unlockControllers();
+ }
+ catch( uno::Exception& )
+ {
+ }
+}
+
+// ----------------------------------------------------------------------------
+
+/** Enables or disables the container windows of all controllers of the
+ specified document model.
+ */
+void lclEnableContainerWindows( const uno::Reference< frame::XModel >& rxModel, sal_Bool bEnableWindows )
+{
+ try
+ {
+ uno::Reference< frame::XModel2 > xModel2( rxModel, uno::UNO_QUERY_THROW );
+ uno::Reference< container::XEnumeration > xControllersEnum( xModel2->getControllers(), uno::UNO_SET_THROW );
+ // iterate over all controllers
+ while( xControllersEnum->hasMoreElements() )
+ {
+ try
+ {
+ uno::Reference< frame::XController > xController( xControllersEnum->nextElement(), uno::UNO_QUERY_THROW );
+ uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_SET_THROW );
+ uno::Reference< awt::XWindow > xWindow( xFrame->getContainerWindow(), uno::UNO_SET_THROW );
+ xWindow->setEnable( bEnableWindows );
+ }
+ catch( uno::Exception& )
+ {
+ }
+ }
+ }
+ catch( uno::Exception& )
+ {
+ }
+}
+
+// ----------------------------------------------------------------------------
+
+typedef void (*ModifyDocumentFunc)( const uno::Reference< frame::XModel >&, sal_Bool );
+
+/** Implementation iterating over all documents that have the same type as the
+ specified model, and calling the passed functor.
+ */
+void lclIterateDocuments( ModifyDocumentFunc pModifyDocumentFunc, const uno::Reference< frame::XModel >& rxModel, sal_Bool bModificator )
+{
+ uno::Reference< frame::XModuleManager > xModuleManager = lclCreateModuleManager();
+ uno::Reference< container::XEnumeration > xDocumentsEnum = lclCreateDocumentEnumeration();
+ ::rtl::OUString aIdentifier = lclIdentifyDocument( xModuleManager, rxModel );
+ if( xModuleManager.is() && xDocumentsEnum.is() && (aIdentifier.getLength() > 0) )
+ {
+ // iterate over all open documents
+ while( xDocumentsEnum->hasMoreElements() )
+ {
+ try
+ {
+ uno::Reference< frame::XModel > xCurrModel( xDocumentsEnum->nextElement(), uno::UNO_QUERY_THROW );
+ ::rtl::OUString aCurrIdentifier = lclIdentifyDocument( xModuleManager, xCurrModel );
+ if( aCurrIdentifier == aIdentifier )
+ pModifyDocumentFunc( xCurrModel, bModificator );
+ }
+ catch( uno::Exception& )
+ {
+ }
+ }
+ }
+ else
+ {
+ // no module manager, no documents enumeration, no identifier -> at least process the passed document
+ pModifyDocumentFunc( rxModel, bModificator );
+ }
+}
+
+} // namespace
+
+// ============================================================================
+
+void lockControllersOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, sal_Bool bLockControllers )
+{
+ lclIterateDocuments( &lclLockControllers, rxModel, bLockControllers );
+}
+
+// ============================================================================
+
+void enableContainerWindowsOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, sal_Bool bEnableWindows )
+{
+ lclIterateDocuments( &lclEnableContainerWindows, rxModel, bEnableWindows );
+}
+
+// ============================================================================
+
+} // namespace vba
+} // namespace basic
diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx
index 24cc000edfe7..a06c0d05ed18 100644..100755
--- a/basic/source/classes/disas.cxx
+++ b/basic/source/classes/disas.cxx
@@ -236,7 +236,7 @@ static const char* _crlf()
}
// This method exists because we want to load the file as own segment
-BOOL SbModule::Disassemble( String& rText )
+sal_Bool SbModule::Disassemble( String& rText )
{
rText.Erase();
if( pImage )
@@ -244,7 +244,7 @@ BOOL SbModule::Disassemble( String& rText )
SbiDisas aDisas( this, pImage );
aDisas.Disas( rText );
}
- return BOOL( rText.Len() != 0 );
+ return sal_Bool( rText.Len() != 0 );
}
SbiDisas::SbiDisas( SbModule* p, const SbiImage* q ) : rImg( *q ), pMod( p )
@@ -278,23 +278,23 @@ SbiDisas::SbiDisas( SbModule* p, const SbiImage* q ) : rImg( *q ), pMod( p )
}
nOff = 0;
// Add the publics
- for( USHORT i = 0; i < pMod->GetMethods()->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pMod->GetMethods()->Count(); i++ )
{
SbMethod* pMeth = PTR_CAST(SbMethod,pMod->GetMethods()->Get( i ));
if( pMeth )
{
- USHORT nPos = (USHORT) (pMeth->GetId());
+ sal_uInt16 nPos = (sal_uInt16) (pMeth->GetId());
cLabels[ nPos >> 3 ] |= ( 1 << ( nPos & 7 ) );
}
}
}
// Read current opcode
-BOOL SbiDisas::Fetch()
+sal_Bool SbiDisas::Fetch()
{
nPC = nOff;
if( nOff >= rImg.GetCodeSize() )
- return FALSE;
+ return sal_False;
const unsigned char* p = (const unsigned char*)( rImg.GetCode() + nOff );
eOp = (SbiOpcode) ( *p++ & 0xFF );
if( eOp <= SbOP0_END )
@@ -302,29 +302,29 @@ BOOL SbiDisas::Fetch()
nOp1 = nOp2 = 0;
nParts = 1;
nOff++;
- return TRUE;
+ return sal_True;
}
else if( eOp <= SbOP1_END )
{
nOff += 5;
if( nOff > rImg.GetCodeSize() )
- return FALSE;
+ return sal_False;
nOp1 = *p++; nOp1 |= *p++ << 8; nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
nParts = 2;
- return TRUE;
+ return sal_True;
}
else if( eOp <= SbOP2_END )
{
nOff += 9;
if( nOff > rImg.GetCodeSize() )
- return FALSE;
+ return sal_False;
nOp1 = *p++; nOp1 |= *p++ << 8; nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
nOp2 = *p++; nOp2 |= *p++ << 8; nOp2 |= *p++ << 16; nOp2 |= *p++ << 24;
nParts = 3;
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
void SbiDisas::Disas( SvStream& r )
@@ -351,7 +351,7 @@ void SbiDisas::Disas( String& r )
aText.ConvertLineEnd();
}
-BOOL SbiDisas::DisasLine( String& rText )
+sal_Bool SbiDisas::DisasLine( String& rText )
{
char cBuf[ 100 ];
const char* pMask[] = {
@@ -361,7 +361,7 @@ BOOL SbiDisas::DisasLine( String& rText )
"%08" SAL_PRIXUINT32 " %02X %08X %08X " };
rText.Erase();
if( !Fetch() )
- return FALSE;
+ return sal_False;
// New line?
if( eOp == _STMNT && nOp1 != nLine )
@@ -369,8 +369,8 @@ BOOL SbiDisas::DisasLine( String& rText )
// Find line
String aSource = rImg.aOUSource;
nLine = nOp1;
- USHORT n = 0;
- USHORT l = (USHORT)nLine;
+ sal_uInt16 n = 0;
+ sal_uInt16 l = (sal_uInt16)nLine;
while( --l ) {
n = aSource.SearchAscii( "\n", n );
if( n == STRING_NOTFOUND ) break;
@@ -379,16 +379,16 @@ BOOL SbiDisas::DisasLine( String& rText )
// Show position
if( n != STRING_NOTFOUND )
{
- USHORT n2 = aSource.SearchAscii( "\n", n );
+ sal_uInt16 n2 = aSource.SearchAscii( "\n", n );
if( n2 == STRING_NOTFOUND ) n2 = aSource.Len() - n;
String s( aSource.Copy( n, n2 - n + 1 ) );
- BOOL bDone;
+ sal_Bool bDone;
do {
- bDone = TRUE;
+ bDone = sal_True;
n = s.Search( '\r' );
- if( n != STRING_NOTFOUND ) bDone = FALSE, s.Erase( n, 1 );
+ if( n != STRING_NOTFOUND ) bDone = sal_False, s.Erase( n, 1 );
n = s.Search( '\n' );
- if( n != STRING_NOTFOUND ) bDone = FALSE, s.Erase( n, 1 );
+ if( n != STRING_NOTFOUND ) bDone = sal_False, s.Erase( n, 1 );
} while( !bDone );
// snprintf( cBuf, sizeof(cBuf), pMask[ 0 ], nPC );
// rText += cBuf;
@@ -404,7 +404,7 @@ BOOL SbiDisas::DisasLine( String& rText )
{
// Public?
ByteString aByteMethName;
- for( USHORT i = 0; i < pMod->GetMethods()->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pMod->GetMethods()->Count(); i++ )
{
SbMethod* pMeth = PTR_CAST(SbMethod,pMod->GetMethods()->Get( i ));
if( pMeth )
@@ -434,7 +434,7 @@ BOOL SbiDisas::DisasLine( String& rText )
rText += ':';
rText.AppendAscii( _crlf() );
}
- snprintf( cBuf, sizeof(cBuf), pMask[ nParts ], nPC, (USHORT) eOp, nOp1, nOp2 );
+ snprintf( cBuf, sizeof(cBuf), pMask[ nParts ], nPC, (sal_uInt16) eOp, nOp1, nOp2 );
String aPCodeStr;
aPCodeStr.AppendAscii( cBuf );
@@ -454,13 +454,13 @@ BOOL SbiDisas::DisasLine( String& rText )
rText += aPCodeStr;
- return TRUE;
+ return sal_True;
}
// Read from StringPool
void SbiDisas::StrOp( String& rText )
{
- String aStr = rImg.GetString( (USHORT)nOp1 );
+ String aStr = rImg.GetString( (sal_uInt16)nOp1 );
ByteString aByteString( aStr, RTL_TEXTENCODING_ASCII_US );
const char* p = aByteString.GetBuffer();
if( p )
@@ -472,7 +472,7 @@ void SbiDisas::StrOp( String& rText )
else
{
rText.AppendAscii( "?String? " );
- rText += (USHORT)nOp1;
+ rText += (sal_uInt16)nOp1;
}
}
@@ -526,7 +526,7 @@ void SbiDisas::ResumeOp( String& rText )
}
// print Prompt
-// FALSE/TRUE
+// sal_False/TRUE
void SbiDisas::PromptOp( String& rText )
{
if( nOp1 )
@@ -558,16 +558,16 @@ void SbiDisas::CharOp( String& rText )
rText += '\'';
else
rText.AppendAscii( "char " ),
- rText += (USHORT)nOp1;
+ rText += (sal_uInt16)nOp1;
}
// Print var: String-ID and type
void SbiDisas::VarOp( String& rText )
{
- rText += rImg.GetString( (USHORT)(nOp1 & 0x7FFF) );
+ rText += rImg.GetString( (sal_uInt16)(nOp1 & 0x7FFF) );
rText.AppendAscii( "\t; " );
// The type
- UINT32 n = nOp1;
+ sal_uInt32 n = nOp1;
nOp1 = nOp2;
TypeOp( rText );
if( n & 0x8000 )
@@ -577,7 +577,7 @@ void SbiDisas::VarOp( String& rText )
// Define variable: String-ID and type
void SbiDisas::VarDefOp( String& rText )
{
- rText += rImg.GetString( (USHORT)(nOp1 & 0x7FFF) );
+ rText += rImg.GetString( (sal_uInt16)(nOp1 & 0x7FFF) );
rText.AppendAscii( "\t; " );
// The Typ
nOp1 = nOp2;
@@ -590,7 +590,7 @@ void SbiDisas::OffOp( String& rText )
rText += String::CreateFromInt32( nOp1 & 0x7FFF );
rText.AppendAscii( "\t; " );
// The type
- UINT32 n = nOp1;
+ sal_uInt32 n = nOp1;
nOp1 = nOp2;
TypeOp( rText );
if( n & 0x8000 )
@@ -618,11 +618,11 @@ void SbiDisas::TypeOp( String& rText )
else
{
rText.AppendAscii( "type " );
- rText += (USHORT)nOp1;
+ rText += (sal_uInt16)nOp1;
}
}
-// TRUE-Label, condition Opcode
+// sal_True-Label, condition Opcode
void SbiDisas::CaseOp( String& rText )
{
LblOp( rText );
@@ -635,8 +635,8 @@ void SbiDisas::StmntOp( String& rText )
{
rText += String::CreateFromInt32( nOp1 );
rText += ',';
- UINT32 nCol = nOp2 & 0xFF;
- UINT32 nFor = nOp2 / 0x100;
+ sal_uInt32 nCol = nOp2 & 0xFF;
+ sal_uInt32 nFor = nOp2 / 0x100;
rText += String::CreateFromInt32( nCol );
rText.AppendAscii( " (For-Level: " );
rText += String::CreateFromInt32( nFor );
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index 44f55aa65f7a..44f55aa65f7a 100644..100755
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 37b8037bf9e3..bb26b99129dd 100644..100755
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -88,54 +88,6 @@ using namespace ::cppu;
using namespace ::osl;
-
-Reference< frame::XModel > getModelFromBasic( SbxObject* pBasic )
-{
- OSL_PRECOND( pBasic != NULL, "getModelFromBasic: illegal call!" );
- if ( !pBasic )
- return NULL;
-
- // look for the ThisComponent variable, first in the parent (which
- // might be the document's Basic), then in the parent's parent (which might be
- // the application Basic)
- const ::rtl::OUString sThisComponent( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) );
- SbxVariable* pThisComponent = NULL;
-
- SbxObject* pLookup = pBasic->GetParent();
- while ( pLookup && !pThisComponent )
- {
- pThisComponent = pLookup->Find( sThisComponent, SbxCLASS_OBJECT );
- pLookup = pLookup->GetParent();
- }
- if ( !pThisComponent )
- {
- OSL_TRACE("Failed to get ThisComponent");
- // the application Basic, at the latest, should have this variable
- return NULL;
- }
-
- Any aThisComponent( sbxToUnoValue( pThisComponent ) );
- Reference< frame::XModel > xModel( aThisComponent, UNO_QUERY );
- if ( !xModel.is() )
- {
- // it's no XModel. Okay, ThisComponent nowadays is allowed to be a controller.
- Reference< frame::XController > xController( aThisComponent, UNO_QUERY );
- if ( xController.is() )
- xModel = xController->getModel();
- }
-
- if ( !xModel.is() )
- return NULL;
-
-#if OSL_DEBUG_LEVEL > 0
- OSL_TRACE("Have model ThisComponent points to url %s",
- ::rtl::OUStringToOString( xModel->getURL(),
- RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-#endif
-
- return xModel;
-}
-
void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Reference< frame::XModel >& xModel )
{
OSL_TRACE("SFURL_firing_impl() processing script url %s",
@@ -346,7 +298,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
if( aName == aLibName )
{
// Search only in the lib, not automatically in application basic
- USHORT nFlags = pBasic->GetFlags();
+ sal_uInt16 nFlags = pBasic->GetFlags();
pBasic->ResetFlag( SBX_GBLSEARCH );
pMethVar = pBasic->Find( aMacro, SbxCLASS_DONTCARE );
pBasic->SetFlags( nFlags );
@@ -376,7 +328,7 @@ void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any
{
SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
- xArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+ xArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
}
}
@@ -486,7 +438,7 @@ Any implFindDialogLibForDialogBasic( const Any& aAnyISP, SbxObject* pBasic, Star
return aDlgLibAny;
}
-void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -565,7 +517,7 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
bool bDocDialog = false;
StarBASIC* pFoundBasic = NULL;
OSL_TRACE("About to try get a hold of ThisComponent");
- Reference< frame::XModel > xModel = getModelFromBasic( pINST->GetBasic() ) ;
+ Reference< frame::XModel > xModel = StarBASIC::GetModelFromBasic( pINST->GetBasic() ) ;
aDlgLibAny = implFindDialogLibForDialogBasic( aAnyISP, pINST->GetBasic(), pFoundBasic );
// If we found the dialog then it belongs to the Search basic
if ( !pFoundBasic )
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 716cbe0497d7..d9e7bc521af1 100644..100755
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -48,8 +48,8 @@ SbiImage::SbiImage()
nLegacyCodeSize =
nDimBase = 0;
bInit =
- bError = FALSE;
- bFirstInit = TRUE;
+ bError = sal_False;
+ bFirstInit = sal_True;
eCharSet = gsl_getSystemTextEncoding();
}
@@ -74,7 +74,7 @@ void SbiImage::Clear()
nCodeSize = 0;
eCharSet = gsl_getSystemTextEncoding();
nDimBase = 0;
- bError = FALSE;
+ bError = sal_False;
}
/**************************************************************************
@@ -83,25 +83,25 @@ void SbiImage::Clear()
*
**************************************************************************/
-BOOL SbiGood( SvStream& r )
+sal_Bool SbiGood( SvStream& r )
{
- return BOOL( !r.IsEof() && r.GetError() == SVSTREAM_OK );
+ return sal_Bool( !r.IsEof() && r.GetError() == SVSTREAM_OK );
}
// Open Record
-ULONG SbiOpenRecord( SvStream& r, UINT16 nSignature, UINT16 nElem )
+sal_uIntPtr SbiOpenRecord( SvStream& r, sal_uInt16 nSignature, sal_uInt16 nElem )
{
- ULONG nPos = r.Tell();
- r << nSignature << (INT32) 0 << nElem;
+ sal_uIntPtr nPos = r.Tell();
+ r << nSignature << (sal_Int32) 0 << nElem;
return nPos;
}
// Close Record
-void SbiCloseRecord( SvStream& r, ULONG nOff )
+void SbiCloseRecord( SvStream& r, sal_uIntPtr nOff )
{
- ULONG nPos = r.Tell();
+ sal_uIntPtr nPos = r.Tell();
r.Seek( nOff + 2 );
- r << (INT32) ( nPos - nOff - 8 );
+ r << (sal_Int32) ( nPos - nOff - 8 );
r.Seek( nPos );
}
@@ -113,40 +113,40 @@ void SbiCloseRecord( SvStream& r, ULONG nOff )
// If the version number does not find, binary parts are omitted, but not
// source, comments and name
-BOOL SbiImage::Load( SvStream& r )
+sal_Bool SbiImage::Load( SvStream& r )
{
- UINT32 nVersion = 0; // Versionsnumber
+ sal_uInt32 nVersion = 0; // Versionsnumber
return Load( r, nVersion );
}
-BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
+sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
{
- UINT16 nSign, nCount;
- UINT32 nLen, nOff;
+ sal_uInt16 nSign, nCount;
+ sal_uInt32 nLen, nOff;
Clear();
// Read Master-Record
r >> nSign >> nLen >> nCount;
- ULONG nLast = r.Tell() + nLen;
- UINT32 nCharSet; // System charset
- UINT32 lDimBase;
- UINT16 nReserved1;
- UINT32 nReserved2;
- UINT32 nReserved3;
- BOOL bBadVer = FALSE;
+ sal_uIntPtr nLast = r.Tell() + nLen;
+ sal_uInt32 nCharSet; // System charset
+ sal_uInt32 lDimBase;
+ sal_uInt16 nReserved1;
+ sal_uInt32 nReserved2;
+ sal_uInt32 nReserved3;
+ sal_Bool bBadVer = sal_False;
if( nSign == B_MODULE )
{
r >> nVersion >> nCharSet >> lDimBase
>> nFlags >> nReserved1 >> nReserved2 >> nReserved3;
eCharSet = (CharSet) nCharSet;
eCharSet = GetSOLoadTextEncoding( eCharSet );
- bBadVer = BOOL( nVersion > B_CURVERSION );
- nDimBase = (USHORT) lDimBase;
+ bBadVer = sal_Bool( nVersion > B_CURVERSION );
+ nDimBase = (sal_uInt16) lDimBase;
}
bool bLegacy = ( nVersion < B_EXT_IMG_VERSION );
- ULONG nNext;
+ sal_uIntPtr nNext;
while( ( nNext = r.Tell() ) < nLast )
{
@@ -174,7 +174,7 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
#ifdef EXTENDED_BINARY_MODULES
case B_EXTSOURCE:
{
- for( UINT16 j = 0 ; j < nCount ; j++ )
+ for( sal_uInt16 j = 0 ; j < nCount ; j++ )
{
String aTmp;
r.ReadByteString( aTmp, eCharSet );
@@ -191,10 +191,10 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
if ( bLegacy )
{
ReleaseLegacyBuffer(); // release any previously held buffer
- nLegacyCodeSize = (UINT16) nCodeSize;
+ nLegacyCodeSize = (sal_uInt16) nCodeSize;
pLegacyPCode = pCode;
- PCodeBuffConvertor< UINT16, UINT32 > aLegacyToNew( (BYTE*)pLegacyPCode, nLegacyCodeSize );
+ PCodeBuffConvertor< sal_uInt16, sal_uInt32 > aLegacyToNew( (sal_uInt8*)pLegacyPCode, nLegacyCodeSize );
aLegacyToNew.convert();
pCode = (char*)aLegacyToNew.GetBuffer();
nCodeSize = aLegacyToNew.GetSize();
@@ -220,20 +220,20 @@ BOOL SbiImage::Load( SvStream& r, UINT32& nVersion )
for( i = 0; i < nStrings && SbiGood( r ); i++ )
{
r >> nOff;
- pStringOff[ i ] = (USHORT) nOff;
+ pStringOff[ i ] = (sal_uInt16) nOff;
}
r >> nLen;
if( SbiGood( r ) )
{
delete [] pStrings;
pStrings = new sal_Unicode[ nLen ];
- nStringSize = (USHORT) nLen;
+ nStringSize = (sal_uInt16) nLen;
char* pByteStrings = new char[ nLen ];
r.Read( pByteStrings, nStringSize );
for( short j = 0; j < nStrings; j++ )
{
- USHORT nOff2 = (USHORT) pStringOff[ j ];
+ sal_uInt16 nOff2 = (sal_uInt16) pStringOff[ j ];
String aStr( pByteStrings + nOff2, eCharSet );
memcpy( pStrings + nOff2, aStr.GetBuffer(), (aStr.Len() + 1) * sizeof( sal_Unicode ) );
}
@@ -253,11 +253,11 @@ done:
//if( eCharSet != ::GetSystemCharSet() )
//ConvertStrings();
if( !SbiGood( r ) )
- bError = TRUE;
- return BOOL( !bError );
+ bError = sal_True;
+ return sal_Bool( !bError );
}
-BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
+sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
{
bool bLegacy = ( nVer < B_EXT_IMG_VERSION );
@@ -268,23 +268,23 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
SbiImage aEmptyImg;
aEmptyImg.aName = aName;
aEmptyImg.Save( r, B_LEGACYVERSION );
- return TRUE;
+ return sal_True;
}
// First of all the header
- ULONG nStart = SbiOpenRecord( r, B_MODULE, 1 );
- ULONG nPos;
+ sal_uIntPtr nStart = SbiOpenRecord( r, B_MODULE, 1 );
+ sal_uIntPtr nPos;
eCharSet = GetSOStoreTextEncoding( eCharSet );
if ( bLegacy )
- r << (INT32) B_LEGACYVERSION;
+ r << (sal_Int32) B_LEGACYVERSION;
else
- r << (INT32) B_CURVERSION;
- r << (INT32) eCharSet
- << (INT32) nDimBase
- << (INT16) nFlags
- << (INT16) 0
- << (INT32) 0
- << (INT32) 0;
+ r << (sal_Int32) B_CURVERSION;
+ r << (sal_Int32) eCharSet
+ << (sal_Int32) nDimBase
+ << (sal_Int16) nFlags
+ << (sal_Int16) 0
+ << (sal_Int32) 0
+ << (sal_Int32) 0;
// Name?
if( aName.Len() && SbiGood( r ) )
@@ -321,9 +321,9 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
if( nLen > STRING_MAXLEN )
{
sal_Int32 nRemainingLen = nLen - nMaxUnitSize;
- UINT16 nUnitCount = UINT16( (nRemainingLen + nMaxUnitSize - 1) / nMaxUnitSize );
+ sal_uInt16 nUnitCount = sal_uInt16( (nRemainingLen + nMaxUnitSize - 1) / nMaxUnitSize );
nPos = SbiOpenRecord( r, B_EXTSOURCE, nUnitCount );
- for( UINT16 i = 0 ; i < nUnitCount ; i++ )
+ for( sal_uInt16 i = 0 ; i < nUnitCount ; i++ )
{
sal_Int32 nCopyLen =
(nRemainingLen > nMaxUnitSize) ? nMaxUnitSize : nRemainingLen;
@@ -342,7 +342,7 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
if ( bLegacy )
{
ReleaseLegacyBuffer(); // release any previously held buffer
- PCodeBuffConvertor< UINT32, UINT16 > aNewToLegacy( (BYTE*)pCode, nCodeSize );
+ PCodeBuffConvertor< sal_uInt32, sal_uInt16 > aNewToLegacy( (sal_uInt8*)pCode, nCodeSize );
aNewToLegacy.convert();
pLegacyPCode = (char*)aNewToLegacy.GetBuffer();
nLegacyCodeSize = aNewToLegacy.GetSize();
@@ -357,21 +357,21 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
{
nPos = SbiOpenRecord( r, B_STRINGPOOL, nStrings );
// For every String:
- // UINT32 Offset of the Strings in the Stringblock
+ // sal_uInt32 Offset of the Strings in the Stringblock
short i;
for( i = 0; i < nStrings && SbiGood( r ); i++ )
- r << (UINT32) pStringOff[ i ];
+ r << (sal_uInt32) pStringOff[ i ];
// Then the String-Block
char* pByteStrings = new char[ nStringSize ];
for( i = 0; i < nStrings; i++ )
{
- USHORT nOff = (USHORT) pStringOff[ i ];
+ sal_uInt16 nOff = (sal_uInt16) pStringOff[ i ];
ByteString aStr( pStrings + nOff, eCharSet );
memcpy( pByteStrings + nOff, aStr.GetBuffer(), (aStr.Len() + 1) * sizeof( char ) );
}
- r << (UINT32) nStringSize;
+ r << (sal_uInt32) nStringSize;
r.Write( pByteStrings, nStringSize );
delete[] pByteStrings;
@@ -380,8 +380,8 @@ BOOL SbiImage::Save( SvStream& r, UINT32 nVer )
// Set overall length
SbiCloseRecord( r, nStart );
if( !SbiGood( r ) )
- bError = TRUE;
- return BOOL( !bError );
+ bError = sal_True;
+ return sal_Bool( !bError );
}
/**************************************************************************
@@ -397,15 +397,15 @@ void SbiImage::MakeStrings( short nSize )
nStringOff = 0;
nStringSize = 1024;
pStrings = new sal_Unicode[ nStringSize ];
- pStringOff = new UINT32[ nSize ];
+ pStringOff = new sal_uInt32[ nSize ];
if( pStrings && pStringOff )
{
nStrings = nSize;
- memset( pStringOff, 0, nSize * sizeof( UINT32 ) );
+ memset( pStringOff, 0, nSize * sizeof( sal_uInt32 ) );
memset( pStrings, 0, nStringSize * sizeof( sal_Unicode ) );
}
else
- bError = TRUE;
+ bError = sal_True;
}
// Add a string to StringPool. The String buffer is dynamically
@@ -413,16 +413,16 @@ void SbiImage::MakeStrings( short nSize )
void SbiImage::AddString( const String& r )
{
if( nStringIdx >= nStrings )
- bError = TRUE;
+ bError = sal_True;
if( !bError )
{
xub_StrLen len = r.Len() + 1;
- UINT32 needed = nStringOff + len;
+ sal_uInt32 needed = nStringOff + len;
if( needed > 0xFFFFFF00L )
- bError = TRUE; // out of mem!
+ bError = sal_True; // out of mem!
else if( needed > nStringSize )
{
- UINT32 nNewLen = needed + 1024;
+ sal_uInt32 nNewLen = needed + 1024;
nNewLen &= 0xFFFFFC00; // trim to 1K border
if( nNewLen > 0xFFFFFF00L )
nNewLen = 0xFFFFFF00L;
@@ -432,10 +432,10 @@ void SbiImage::AddString( const String& r )
memcpy( p, pStrings, nStringSize * sizeof( sal_Unicode ) );
delete[] pStrings;
pStrings = p;
- nStringSize = sal::static_int_cast< UINT32 >(nNewLen);
+ nStringSize = sal::static_int_cast< sal_uInt16 >(nNewLen);
}
else
- bError = TRUE;
+ bError = sal_True;
}
if( !bError )
{
@@ -454,7 +454,7 @@ void SbiImage::AddString( const String& r )
// The block was fetched by the compiler from class SbBuffer and
// is already created with new. Additionally it contains all Integers
// in Big Endian format, so can be directly read/written.
-void SbiImage::AddCode( char* p, UINT32 s )
+void SbiImage::AddCode( char* p, sal_uInt32 s )
{
pCode = p;
nCodeSize = s;
@@ -488,14 +488,14 @@ String SbiImage::GetString( short nId ) const
{
if( nId && nId <= nStrings )
{
- UINT32 nOff = pStringOff[ nId - 1 ];
+ sal_uInt32 nOff = pStringOff[ nId - 1 ];
sal_Unicode* pStr = pStrings + nOff;
// #i42467: Special treatment for vbNullChar
if( *pStr == 0 )
{
- UINT32 nNextOff = (nId < nStrings) ? pStringOff[ nId ] : nStringOff;
- UINT32 nLen = nNextOff - nOff - 1;
+ sal_uInt32 nNextOff = (nId < nStrings) ? pStringOff[ nId ] : nStringOff;
+ sal_uInt32 nLen = nNextOff - nOff - 1;
if( nLen == 1 )
{
// Force length 1 and make char 0 afterwards
@@ -518,14 +518,14 @@ const SbxObject* SbiImage::FindType (String aTypeName) const
return rTypes.Is() ? (SbxObject*)rTypes->Find(aTypeName,SbxCLASS_OBJECT) : NULL;
}
-UINT16 SbiImage::CalcLegacyOffset( INT32 nOffset )
+sal_uInt16 SbiImage::CalcLegacyOffset( sal_Int32 nOffset )
{
- return SbiCodeGen::calcLegacyOffSet( (BYTE*)pCode, nOffset ) ;
+ return SbiCodeGen::calcLegacyOffSet( (sal_uInt8*)pCode, nOffset ) ;
}
-UINT32 SbiImage::CalcNewOffset( INT16 nOffset )
+sal_uInt32 SbiImage::CalcNewOffset( sal_Int16 nOffset )
{
- return SbiCodeGen::calcNewOffSet( (BYTE*)pLegacyPCode, nOffset ) ;
+ return SbiCodeGen::calcNewOffSet( (sal_uInt8*)pLegacyPCode, nOffset ) ;
}
void SbiImage::ReleaseLegacyBuffer()
@@ -535,11 +535,11 @@ void SbiImage::ReleaseLegacyBuffer()
nLegacyCodeSize = 0;
}
-BOOL SbiImage::ExceedsLegacyLimits()
+sal_Bool SbiImage::ExceedsLegacyLimits()
{
if ( ( nStringSize > 0xFF00L ) || ( CalcLegacyOffset( nCodeSize ) > 0xFF00L ) )
- return TRUE;
- return FALSE;
+ return sal_True;
+ return sal_False;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/classes/makefile.mk b/basic/source/classes/makefile.mk
index e00ed4674cc1..e00ed4674cc1 100644..100755
--- a/basic/source/classes/makefile.mk
+++ b/basic/source/classes/makefile.mk
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 2c01c49f814c..2f20c0e016fe 100644..100755
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -94,7 +94,7 @@ SbPropertyValues::~SbPropertyValues()
{
_xInfo = Reference< XPropertySetInfo >();
- for ( USHORT n = 0; n < _aPropVals.Count(); ++n )
+ for ( sal_uInt16 n = 0; n < _aPropVals.Count(); ++n )
delete _aPropVals.GetObject( n );
}
@@ -113,7 +113,7 @@ Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw(
//-------------------------------------------------------------------------
-INT32 SbPropertyValues::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
+sal_Int32 SbPropertyValues::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
{
PropertyValue **ppPV;
ppPV = (PropertyValue **)
@@ -134,9 +134,9 @@ void SbPropertyValues::setPropertyValue(
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException)
{
- INT32 nIndex = GetIndex_Impl( aPropertyName );
+ sal_Int32 nIndex = GetIndex_Impl( aPropertyName );
PropertyValue *pPropVal = _aPropVals.GetObject(
- sal::static_int_cast< USHORT >(nIndex));
+ sal::static_int_cast< sal_uInt16 >(nIndex));
pPropVal->Value = aValue;
}
@@ -148,10 +148,10 @@ Any SbPropertyValues::getPropertyValue(
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException)
{
- INT32 nIndex = GetIndex_Impl( aPropertyName );
+ sal_Int32 nIndex = GetIndex_Impl( aPropertyName );
if ( nIndex != USHRT_MAX )
return _aPropVals.GetObject(
- sal::static_int_cast< USHORT >(nIndex))->Value;
+ sal::static_int_cast< sal_uInt16 >(nIndex))->Value;
return Any();
}
@@ -200,7 +200,7 @@ void SbPropertyValues::removeVetoableChangeListener(
Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException)
{
Sequence<PropertyValue> aRet( _aPropVals.Count());
- for ( USHORT n = 0; n < _aPropVals.Count(); ++n )
+ for ( sal_uInt16 n = 0; n < _aPropVals.Count(); ++n )
aRet.getArray()[n] = *_aPropVals.GetObject(n);
return aRet;
}
@@ -232,14 +232,14 @@ PropertySetInfoImpl::PropertySetInfoImpl()
{
}
-INT32 PropertySetInfoImpl::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
+sal_Int32 PropertySetInfoImpl::GetIndex_Impl( const ::rtl::OUString &rPropName ) const
{
Property *pP;
pP = (Property*)
bsearch( &rPropName, _aProps.getConstArray(), _aProps.getLength(),
sizeof( Property ),
SbCompare_UString_Property_Impl );
- return pP ? sal::static_int_cast<INT32>( (pP-_aProps.getConstArray()) / sizeof(pP) ) : -1;
+ return pP ? sal::static_int_cast<sal_Int32>( (pP-_aProps.getConstArray()) / sizeof(pP) ) : -1;
}
Sequence< Property > PropertySetInfoImpl::getProperties(void) throw()
@@ -273,7 +273,7 @@ SbPropertySetInfo::SbPropertySetInfo()
SbPropertySetInfo::SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals )
{
aImpl._aProps.realloc( rPropVals.Count() );
- for ( USHORT n = 0; n < rPropVals.Count(); ++n )
+ for ( sal_uInt16 n = 0; n < rPropVals.Count(); ++n )
{
Property &rProp = aImpl._aProps.getArray()[n];
const PropertyValue &rPropVal = *rPropVals.GetObject(n);
@@ -303,7 +303,7 @@ Property SbPropertySetInfo::getPropertyByName(const ::rtl::OUString& Name)
return aImpl.getPropertyByName( Name );
}
-BOOL SbPropertySetInfo::hasPropertyByName(const ::rtl::OUString& Name)
+sal_Bool SbPropertySetInfo::hasPropertyByName(const ::rtl::OUString& Name)
throw( RuntimeException )
{
return aImpl.hasPropertyByName( Name );
@@ -324,7 +324,7 @@ SbPropertyContainer::~SbPropertyContainer()
//----------------------------------------------------------------------------
void SbPropertyContainer::addProperty(const ::rtl::OUString& Name,
- INT16 Attributes,
+ sal_Int16 Attributes,
const Any& DefaultValue)
throw( PropertyExistException, IllegalTypeException,
IllegalArgumentException, RuntimeException )
@@ -354,7 +354,7 @@ Property SbPropertyContainer::getPropertyByName(const ::rtl::OUString& Name)
return aImpl.getPropertyByName( Name );
}
-BOOL SbPropertyContainer::hasPropertyByName(const ::rtl::OUString& Name)
+sal_Bool SbPropertyContainer::hasPropertyByName(const ::rtl::OUString& Name)
throw( RuntimeException )
{
return aImpl.hasPropertyByName( Name );
@@ -376,7 +376,7 @@ void SbPropertyContainer::setPropertyValues(const Sequence< PropertyValue >& Pro
//----------------------------------------------------------------------------
-void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 83c9cc15265a..bb65b0c8b82b 100644..100755
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -53,7 +53,10 @@
#include "sb.hrc"
#include <basrid.hxx>
#include <osl/mutex.hxx>
+#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/util/XCloseBroadcaster.hpp>
+#include <com/sun/star/util/XCloseListener.hpp>
#include "errobject.hxx"
#include <boost/unordered_map.hpp>
@@ -67,11 +70,151 @@ TYPEINIT1(StarBASIC,SbxObject)
#define RTLNAME "@SBRTL"
// i#i68894#
+using namespace ::com::sun::star;
using com::sun::star::uno::Reference;
using com::sun::star::uno::Any;
using com::sun::star::uno::UNO_QUERY;
using com::sun::star::lang::XMultiServiceFactory;
+// ============================================================================
+
+class DocBasicItem : public ::cppu::WeakImplHelper1< util::XCloseListener >
+{
+public:
+ explicit DocBasicItem( StarBASIC& rDocBasic );
+ virtual ~DocBasicItem();
+
+ inline const SbxObjectRef& getClassModules() const { return mxClassModules; }
+ inline bool isDocClosed() const { return mbDocClosed; }
+
+ void clearDependingVarsOnDelete( StarBASIC& rDeletedBasic );
+
+ void startListening();
+ void stopListening();
+
+ virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException);
+ virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException);
+ virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException);
+
+private:
+ StarBASIC& mrDocBasic;
+ SbxObjectRef mxClassModules;
+ bool mbDocClosed;
+ bool mbDisposed;
+};
+
+// ----------------------------------------------------------------------------
+
+DocBasicItem::DocBasicItem( StarBASIC& rDocBasic ) :
+ mrDocBasic( rDocBasic ),
+ mxClassModules( new SbxObject( String() ) ),
+ mbDocClosed( false ),
+ mbDisposed( false )
+{
+}
+
+DocBasicItem::~DocBasicItem()
+{
+ stopListening();
+}
+
+void DocBasicItem::clearDependingVarsOnDelete( StarBASIC& rDeletedBasic )
+{
+ mrDocBasic.implClearDependingVarsOnDelete( &rDeletedBasic );
+}
+
+void DocBasicItem::startListening()
+{
+ Any aThisComp;
+ mrDocBasic.GetUNOConstant( "ThisComponent", aThisComp );
+ Reference< util::XCloseBroadcaster > xCloseBC( aThisComp, UNO_QUERY );
+ if( xCloseBC.is() )
+ try { xCloseBC->addCloseListener( this ); } catch( uno::Exception& ) {}
+}
+
+void DocBasicItem::stopListening()
+{
+ if( mbDisposed ) return;
+ mbDisposed = true;
+ Any aThisComp;
+ mrDocBasic.GetUNOConstant( "ThisComponent", aThisComp );
+ Reference< util::XCloseBroadcaster > xCloseBC( aThisComp, UNO_QUERY );
+ if( xCloseBC.is() )
+ try { xCloseBC->removeCloseListener( this ); } catch( uno::Exception& ) {}
+}
+
+void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException)
+{
+}
+
+void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException)
+{
+ stopListening();
+ mbDocClosed = true;
+}
+
+void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException)
+{
+ stopListening();
+}
+
+// ----------------------------------------------------------------------------
+
+namespace {
+
+typedef ::rtl::Reference< DocBasicItem > DocBasicItemRef;
+typedef boost::unordered_map< const StarBASIC *, DocBasicItemRef > DocBasicItemMap;
+ // ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInitDependencyMap;
+
+static DocBasicItemMap GaDocBasicItems;
+
+const DocBasicItem* lclFindDocBasicItem( const StarBASIC* pDocBasic )
+{
+ DocBasicItemMap::iterator it = GaDocBasicItems.find( pDocBasic );
+ return (it != GaDocBasicItems.end()) ? it->second.get() : 0;
+}
+
+void lclInsertDocBasicItem( StarBASIC& rDocBasic )
+{
+ DocBasicItemRef& rxDocBasicItem = GaDocBasicItems[ &rDocBasic ];
+ rxDocBasicItem.set( new DocBasicItem( rDocBasic ) );
+ rxDocBasicItem->startListening();
+}
+
+void lclRemoveDocBasicItem( StarBASIC& rDocBasic )
+{
+ DocBasicItemMap::iterator it = GaDocBasicItems.find( &rDocBasic );
+ if( it != GaDocBasicItems.end() )
+ {
+ it->second->stopListening();
+ GaDocBasicItems.erase( it );
+ }
+ DocBasicItemMap::iterator it_end = GaDocBasicItems.end();
+ for( it = GaDocBasicItems.begin(); it != it_end; ++it )
+ it->second->clearDependingVarsOnDelete( rDocBasic );
+}
+
+StarBASIC* lclGetDocBasicForModule( SbModule* pModule )
+{
+ StarBASIC* pRetBasic = NULL;
+ SbxObject* pCurParent = pModule;
+ while( pCurParent->GetParent() != NULL )
+ {
+ pCurParent = pCurParent->GetParent();
+ StarBASIC* pDocBasic = PTR_CAST( StarBASIC, pCurParent );
+ if( pDocBasic != NULL && pDocBasic->IsDocBasic() )
+ {
+ pRetBasic = pDocBasic;
+ break;
+ }
+ }
+ return pRetBasic;
+}
+
+} // namespace
+
+// ============================================================================
+
SbxObject* StarBASIC::getVBAGlobals( )
{
if ( !pVBAGlobals )
@@ -113,7 +256,7 @@ SbxVariable* StarBASIC::VBAFind( const String& rName, SbxClassType t )
// Create array for conversion SFX <-> VB error code
struct SFX_VB_ErrorItem
{
- USHORT nErrorVB;
+ sal_uInt16 nErrorVB;
SbError nErrorSFX;
};
@@ -249,7 +392,7 @@ const SFX_VB_ErrorItem SFX_VB_ErrorTab[] =
// the Modul-relationshop. But it works only when a modul is loaded.
// Can cause troubles with separately loaded properties!
-SbxBase* SbiFactory::Create( UINT16 nSbxId, UINT32 nCreator )
+SbxBase* SbiFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
{
if( nCreator == SBXCR_SBX )
{
@@ -298,11 +441,11 @@ SbxObject* SbiFactory::CreateObject( const String& rClass )
class SbOLEFactory : public SbxFactory
{
public:
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
};
-SbxBase* SbOLEFactory::Create( UINT16, UINT32 )
+SbxBase* SbOLEFactory::Create( sal_uInt16, sal_uInt32 )
{
// Not supported
return NULL;
@@ -323,11 +466,11 @@ SbxObject* SbOLEFactory::CreateObject( const String& rClassName )
class SbFormFactory : public SbxFactory
{
public:
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
};
-SbxBase* SbFormFactory::Create( UINT16, UINT32 )
+SbxBase* SbFormFactory::Create( sal_uInt16, sal_uInt32 )
{
// Not supported
return NULL;
@@ -341,7 +484,18 @@ SbxObject* SbFormFactory::CreateObject( const String& rClassName )
{
if( SbUserFormModule* pFormModule = PTR_CAST( SbUserFormModule, pVar->GetObject() ) )
{
- pFormModule->Load();
+ bool bInitState = pFormModule->getInitState();
+ if( bInitState )
+ {
+ // Not the first instantiate, reset
+ bool bTriggerTerminateEvent = false;
+ pFormModule->ResetApiObj( bTriggerTerminateEvent );
+ pFormModule->setInitState( false );
+ }
+ else
+ {
+ pFormModule->Load();
+ }
return pFormModule->CreateInstance();
}
}
@@ -360,8 +514,8 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
// Copy the properties, not only the reference to them
SbxArray* pProps = pRet->GetProperties();
- UINT32 nCount = pProps->Count32();
- for( UINT32 i = 0 ; i < nCount ; i++ )
+ sal_uInt32 nCount = pProps->Count32();
+ for( sal_uInt32 i = 0 ; i < nCount ; i++ )
{
SbxVariable* pVar = pProps->Get32( i );
SbxProperty* pProp = PTR_CAST( SbxProperty, pVar );
@@ -378,18 +532,18 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
pDest->setHasFixedSize( pSource->hasFixedSize() );
if ( pSource->GetDims() && pSource->hasFixedSize() )
{
- INT32 lb = 0;
- INT32 ub = 0;
- for ( INT32 j = 1 ; j <= pSource->GetDims(); ++j )
+ sal_Int32 lb = 0;
+ sal_Int32 ub = 0;
+ for ( sal_Int32 j = 1 ; j <= pSource->GetDims(); ++j )
{
- pSource->GetDim32( (INT32)j, lb, ub );
+ pSource->GetDim32( (sal_Int32)j, lb, ub );
pDest->AddDim32( lb, ub );
}
}
else
pDest->unoAddDim( 0, -1 ); // variant array
- USHORT nSavFlags = pVar->GetFlags();
+ sal_uInt16 nSavFlags = pVar->GetFlags();
pNewProp->ResetFlag( SBX_FIXED );
// need to reset the FIXED flag
// when calling PutObject ( because the type will not match Object )
@@ -415,11 +569,11 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj )
class SbTypeFactory : public SbxFactory
{
public:
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
};
-SbxBase* SbTypeFactory::Create( UINT16, UINT32 )
+SbxBase* SbTypeFactory::Create( sal_uInt16, sal_uInt32 )
{
// Not supported
return NULL;
@@ -444,6 +598,7 @@ SbxObject* createUserTypeImpl( const String& rClassName )
return pRetObj;
}
+
TYPEINIT1(SbClassModuleObject,SbModule)
SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
@@ -463,8 +618,8 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
// Copy the methods from original class module
SbxArray* pClassMethods = pClassModule->GetMethods();
- UINT32 nMethodCount = pClassMethods->Count32();
- UINT32 i;
+ sal_uInt32 nMethodCount = pClassMethods->Count32();
+ sal_uInt32 i;
for( i = 0 ; i < nMethodCount ; i++ )
{
SbxVariable* pVar = pClassMethods->Get32( i );
@@ -476,7 +631,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
SbMethod* pMethod = PTR_CAST(SbMethod, pVar );
if( pMethod )
{
- USHORT nFlags_ = pMethod->GetFlags();
+ sal_uInt16 nFlags_ = pMethod->GetFlags();
pMethod->SetFlag( SBX_NO_BROADCAST );
SbMethod* pNewMethod = new SbMethod( *pMethod );
pNewMethod->ResetFlag( SBX_NO_BROADCAST );
@@ -484,7 +639,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
pNewMethod->pMod = this;
pNewMethod->SetParent( this );
pMethods->PutDirect( pNewMethod, i );
- StartListening( pNewMethod->GetBroadcaster(), TRUE );
+ StartListening( pNewMethod->GetBroadcaster(), sal_True );
}
}
}
@@ -522,14 +677,14 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
// Copy the properties from original class module
SbxArray* pClassProps = pClassModule->GetProperties();
- UINT32 nPropertyCount = pClassProps->Count32();
+ sal_uInt32 nPropertyCount = pClassProps->Count32();
for( i = 0 ; i < nPropertyCount ; i++ )
{
SbxVariable* pVar = pClassProps->Get32( i );
SbProcedureProperty* pProcedureProp = PTR_CAST( SbProcedureProperty, pVar );
if( pProcedureProp )
{
- USHORT nFlags_ = pProcedureProp->GetFlags();
+ sal_uInt16 nFlags_ = pProcedureProp->GetFlags();
pProcedureProp->SetFlag( SBX_NO_BROADCAST );
SbProcedureProperty* pNewProp = new SbProcedureProperty
( pProcedureProp->GetName(), pProcedureProp->GetType() );
@@ -538,14 +693,14 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
pNewProp->ResetFlag( SBX_NO_BROADCAST ); // except the Broadcast if it was set
pProcedureProp->SetFlags( nFlags_ );
pProps->PutDirect( pNewProp, i );
- StartListening( pNewProp->GetBroadcaster(), TRUE );
+ StartListening( pNewProp->GetBroadcaster(), sal_True );
}
else
{
SbxProperty* pProp = PTR_CAST( SbxProperty, pVar );
if( pProp )
{
- USHORT nFlags_ = pProp->GetFlags();
+ sal_uInt16 nFlags_ = pProp->GetFlags();
pProp->SetFlag( SBX_NO_BROADCAST );
SbxProperty* pNewProp = new SbxProperty( *pProp );
@@ -559,7 +714,6 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
if( pObj != NULL )
{
String aObjClass = pObj->GetClassName();
- (void)aObjClass;
SbClassModuleObject* pClassModuleObj = PTR_CAST(SbClassModuleObject,pObjBase);
if( pClassModuleObj != NULL )
@@ -594,8 +748,12 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
SbClassModuleObject::~SbClassModuleObject()
{
+ // do not trigger termination event when document is already closed
if( StarBASIC::IsRunning() )
- triggerTerminateEvent();
+ if( StarBASIC* pDocBasic = lclGetDocBasicForModule( this ) )
+ if( const DocBasicItem* pDocBasicItem = lclFindDocBasicItem( pDocBasic ) )
+ if( !pDocBasicItem->isDocClosed() )
+ triggerTerminateEvent();
// Must be deleted by base class dtor because this data
// is not owned by the SbClassModuleObject object
@@ -606,7 +764,7 @@ SbClassModuleObject::~SbClassModuleObject()
void SbClassModuleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
{
- SbModule::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
+ handleProcedureProperties( rBC, rHint );
}
SbxVariable* SbClassModuleObject::Find( const XubString& rName, SbxClassType t )
@@ -683,8 +841,14 @@ SbClassFactory::~SbClassFactory()
void SbClassFactory::AddClassModule( SbModule* pClassModule )
{
+ SbxObjectRef xToUseClassModules = xClassModules;
+
+ if( StarBASIC* pDocBasic = lclGetDocBasicForModule( pClassModule ) )
+ if( const DocBasicItem* pDocBasicItem = lclFindDocBasicItem( pDocBasic ) )
+ xToUseClassModules = pDocBasicItem->getClassModules();
+
SbxObject* pParent = pClassModule->GetParent();
- xClassModules->Insert( pClassModule );
+ xToUseClassModules->Insert( pClassModule );
pClassModule->SetParent( pParent );
}
@@ -693,7 +857,7 @@ void SbClassFactory::RemoveClassModule( SbModule* pClassModule )
xClassModules->Remove( pClassModule );
}
-SbxBase* SbClassFactory::Create( UINT16, UINT32 )
+SbxBase* SbClassFactory::Create( sal_uInt16, sal_uInt32 )
{
// Not supported
return NULL;
@@ -701,12 +865,19 @@ SbxBase* SbClassFactory::Create( UINT16, UINT32 )
SbxObject* SbClassFactory::CreateObject( const String& rClassName )
{
- SbxVariable* pVar = xClassModules->Find( rClassName, SbxCLASS_DONTCARE );
+ SbxObjectRef xToUseClassModules = xClassModules;
+
+ if( SbModule* pMod = pMOD )
+ if( StarBASIC* pDocBasic = lclGetDocBasicForModule( pMod ) )
+ if( const DocBasicItem* pDocBasicItem = lclFindDocBasicItem( pDocBasic ) )
+ xToUseClassModules = pDocBasicItem->getClassModules();
+
+ SbxVariable* pVar = xToUseClassModules->Find( rClassName, SbxCLASS_OBJECT );
SbxObject* pRet = NULL;
if( pVar )
{
- SbModule* pMod = (SbModule*)pVar;
- pRet = new SbClassModuleObject( pMod );
+ SbModule* pVarMod = (SbModule*)pVar;
+ pRet = new SbClassModuleObject( pVarMod );
}
return pRet;
}
@@ -718,21 +889,19 @@ SbModule* SbClassFactory::FindClass( const String& rClassName )
return pMod;
}
-StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic )
+StarBASIC::StarBASIC( StarBASIC* p, sal_Bool bIsDocBasic )
: SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASIC") ) ), bDocBasic( bIsDocBasic )
{
SetParent( p );
pLibInfo = NULL;
- bNoRtl = bBreak = FALSE;
- bVBAEnabled = FALSE;
+ bNoRtl = bBreak = sal_False;
+ bVBAEnabled = sal_False;
pModules = new SbxArray;
if( !GetSbData()->nInst++ )
{
pSBFAC = new SbiFactory;
AddFactory( pSBFAC );
- pUNOFAC = new SbUnoFactory;
- AddFactory( pUNOFAC );
pTYPEFAC = new SbTypeFactory;
AddFactory( pTYPEFAC );
pCLASSFAC = new SbClassFactory;
@@ -741,23 +910,31 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic )
AddFactory( pOLEFAC );
pFORMFAC = new SbFormFactory;
AddFactory( pFORMFAC );
+ pUNOFAC = new SbUnoFactory;
+ AddFactory( pUNOFAC );
}
pRtl = new SbiStdObject( String( RTL_CONSTASCII_USTRINGPARAM(RTLNAME) ), this );
// Search via StarBasic is always global
SetFlag( SBX_GBLSEARCH );
pVBAGlobals = NULL;
- bQuit = FALSE;
+ bQuit = sal_False;
+
+ if( bDocBasic )
+ lclInsertDocBasicItem( *this );
}
// #51727 Override SetModified so that the modified state
// is not given to the parent
-void StarBASIC::SetModified( BOOL b )
+void StarBASIC::SetModified( sal_Bool b )
{
SbxBase::SetModified( b );
}
StarBASIC::~StarBASIC()
{
+ // Needs to be first action as it can trigger events
+ disposeComVariablesForBasic( this );
+
if( !--GetSbData()->nInst )
{
RemoveFactory( pSBFAC );
@@ -786,18 +963,30 @@ StarBASIC::~StarBASIC()
}
#endif
}
+ else if( bDocBasic )
+ {
+ SbxError eOld = SbxBase::GetError();
+
+ lclRemoveDocBasicItem( *this );
+
+ SbxBase::ResetError();
+ if( eOld != SbxERR_OK )
+ SbxBase::SetError( eOld );
+ }
// #100326 Set Parent NULL in registered listeners
if( xUnoListeners.Is() )
{
- USHORT uCount = xUnoListeners->Count();
- for( USHORT i = 0 ; i < uCount ; i++ )
+ sal_uInt16 uCount = xUnoListeners->Count();
+ for( sal_uInt16 i = 0 ; i < uCount ; i++ )
{
SbxVariable* pListenerObj = xUnoListeners->Get( i );
pListenerObj->SetParent( NULL );
}
xUnoListeners = NULL;
}
+
+ clearUnoMethodsForBasic( this );
}
// Override new() operator, so that everyone can create a new instance
@@ -805,7 +994,7 @@ void* StarBASIC::operator new( size_t n )
{
if( n < sizeof( StarBASIC ) )
{
-// DBG_ASSERT( FALSE, "Warnung: inkompatibler BASIC-Stand!" );
+// DBG_ASSERT( sal_False, "Warnung: inkompatibler BASIC-Stand!" );
n = sizeof( StarBASIC );
}
return ::operator new( n );
@@ -816,6 +1005,27 @@ void StarBASIC::operator delete( void* p )
::operator delete( p );
}
+void StarBASIC::implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic )
+{
+ if( this != pDeletedBasic )
+ {
+ for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
+ {
+ SbModule* p = (SbModule*)pModules->Get( i );
+ p->ClearVarsDependingOnDeletedBasic( pDeletedBasic );
+ }
+ }
+
+ for( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
+ {
+ SbxVariable* pVar = pObjs->Get( nObj );
+ StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
+ if( pBasic && pBasic != pDeletedBasic )
+ pBasic->implClearDependingVarsOnDelete( pDeletedBasic );
+ }
+}
+
+
/**************************************************************************
*
* Creation/Managment of modules
@@ -860,7 +1070,7 @@ SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo,
p->SetSource32( rSrc );
p->SetParent( this );
pModules->Insert( p, pModules->Count() );
- SetModified( TRUE );
+ SetModified( sal_True );
return p;
}
@@ -870,14 +1080,14 @@ void StarBASIC::Insert( SbxVariable* pVar )
{
pModules->Insert( pVar, pModules->Count() );
pVar->SetParent( this );
- StartListening( pVar->GetBroadcaster(), TRUE );
+ StartListening( pVar->GetBroadcaster(), sal_True );
}
else
{
- BOOL bWasModified = IsModified();
+ sal_Bool bWasModified = IsModified();
SbxObject::Insert( pVar );
if( !bWasModified && pVar->IsSet( SBX_DONTSTORE ) )
- SetModified( FALSE );
+ SetModified( sal_False );
}
}
@@ -895,17 +1105,17 @@ void StarBASIC::Remove( SbxVariable* pVar )
SbxObject::Remove( pVar );
}
-BOOL StarBASIC::Compile( SbModule* pMod )
+sal_Bool StarBASIC::Compile( SbModule* pMod )
{
- return pMod ? pMod->Compile() : FALSE;
+ return pMod ? pMod->Compile() : sal_False;
}
-BOOL StarBASIC::Disassemble( SbModule* pMod, String& rText )
+sal_Bool StarBASIC::Disassemble( SbModule* pMod, String& rText )
{
rText.Erase();
if( pMod )
pMod->Disassemble( rText );
- return BOOL( rText.Len() != 0 );
+ return sal_Bool( rText.Len() != 0 );
}
void StarBASIC::Clear()
@@ -916,7 +1126,7 @@ void StarBASIC::Clear()
SbModule* StarBASIC::FindModule( const String& rName )
{
- for( USHORT i = 0; i < pModules->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
{
SbModule* p = (SbModule*) pModules->Get( i );
if( p->GetName().EqualsIgnoreCaseAscii( rName ) )
@@ -945,15 +1155,15 @@ struct ClassModuleRunInitItem
{}
};
-typedef boost::unordered_map< ::rtl::OUString, ClassModuleRunInitItem,
- ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleInitDependencyMap;
-
-static ModuleInitDependencyMap* GpMIDMap = NULL;
+// Derive from unordered_map type instead of typedef
+// to allow forward declaration in sbmod.hxx
+class ModuleInitDependencyMap : public
+ boost::unordered_map< ::rtl::OUString, ClassModuleRunInitItem,
+ ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > >
+{};
-void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
+void SbModule::implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassModuleRunInitItem& rItem )
{
- ModuleInitDependencyMap& rMIDMap = *GpMIDMap;
-
rItem.m_bProcessing = true;
//bool bAnyDependencies = true;
@@ -968,8 +1178,8 @@ void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
String& rStr = *it;
// Is required type a class module?
- ModuleInitDependencyMap::iterator itFind = rMIDMap.find( rStr );
- if( itFind != rMIDMap.end() )
+ ModuleInitDependencyMap::iterator itFind = rMap.find( rStr );
+ if( itFind != rMap.end() )
{
ClassModuleRunInitItem& rParentItem = itFind->second;
if( rParentItem.m_bProcessing )
@@ -980,7 +1190,7 @@ void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
}
if( !rParentItem.m_bRunInitDone )
- implProcessModuleRunInit( rParentItem );
+ implProcessModuleRunInit( rMap, rParentItem );
}
}
}
@@ -994,8 +1204,10 @@ void SbModule::implProcessModuleRunInit( ClassModuleRunInitItem& rItem )
// Run Init-Code of all modules (including inserted libraries)
void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
{
+ SolarMutexGuard guard;
+
// Init own modules
- for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+ for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
{
SbModule* pModule = (SbModule*)pModules->Get( nMod );
if( !pModule->IsCompiled() )
@@ -1008,8 +1220,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
// Consider required types to init in right order. Class modules
// that are required by other modules have to be initialized first.
ModuleInitDependencyMap aMIDMap;
- GpMIDMap = &aMIDMap;
- for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+ for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
{
SbModule* pModule = (SbModule*)pModules->Get( nMod );
String aModuleName = pModule->GetName();
@@ -1021,12 +1232,11 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
for( it = aMIDMap.begin() ; it != aMIDMap.end(); ++it )
{
ClassModuleRunInitItem& rItem = it->second;
- SbModule::implProcessModuleRunInit( rItem );
+ SbModule::implProcessModuleRunInit( aMIDMap, rItem );
}
- GpMIDMap = NULL;
// Call RunInit on standard modules
- for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+ for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
{
SbModule* pModule = (SbModule*)pModules->Get( nMod );
if( !pModule->isProxyModule() )
@@ -1035,7 +1245,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
// Check all objects if they are BASIC,
// if yes initialize
- for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+ for ( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
{
SbxVariable* pVar = pObjs->Get( nObj );
StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -1049,14 +1259,14 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit )
void StarBASIC::DeInitAllModules( void )
{
// Deinit own modules
- for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+ for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
{
SbModule* pModule = (SbModule*)pModules->Get( nMod );
- if( pModule->pImage )
+ if( pModule->pImage && !pModule->isProxyModule() && !pModule->ISA(SbObjModule) )
pModule->pImage->bInit = false;
}
- for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ )
+ for ( sal_uInt16 nObj = 0; nObj < pObjs->Count(); nObj++ )
{
SbxVariable* pVar = pObjs->Get( nObj );
StarBASIC* pBasic = PTR_CAST(StarBASIC,pVar);
@@ -1069,13 +1279,13 @@ void StarBASIC::DeInitAllModules( void )
void StarBASIC::ClearGlobalVars( void )
{
SbxArrayRef xProps( GetProperties() );
- USHORT nPropCount = xProps->Count();
- for ( USHORT nProp = 0 ; nProp < nPropCount ; ++nProp )
+ sal_uInt16 nPropCount = xProps->Count();
+ for ( sal_uInt16 nProp = 0 ; nProp < nPropCount ; ++nProp )
{
SbxBase* pVar = xProps->Get( nProp );
pVar->Clear();
}
- SetModified( TRUE );
+ SetModified( sal_True );
}
// This implementation at first searches within the runtime library,
@@ -1106,7 +1316,7 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
}
// Search module
if( !pRes )
- for( USHORT i = 0; i < pModules->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
{
SbModule* p = (SbModule*) pModules->Get( i );
if( p->IsVisible() )
@@ -1123,12 +1333,12 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
}
// Only variables qualified by the Module Name e.g. Sheet1.foo
// should work for Documant && Class type Modules
- INT32 nType = p->GetModuleType();
+ sal_Int32 nType = p->GetModuleType();
if ( nType == ModuleType::DOCUMENT || nType == ModuleType::FORM )
continue;
// otherwise check if the element is available
// unset GBLSEARCH-Flag (due to Rekursion)
- USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
+ sal_uInt16 nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
p->ResetFlag( SBX_GBLSEARCH );
pRes = p->Find( rName, t );
p->SetFlag( nGblFlag );
@@ -1144,9 +1354,9 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
return pRes;
}
-BOOL StarBASIC::Call( const String& rName, SbxArray* pParam )
+sal_Bool StarBASIC::Call( const String& rName, SbxArray* pParam )
{
- BOOL bRes = SbxObject::Call( rName, pParam );
+ sal_Bool bRes = SbxObject::Call( rName, pParam );
if( !bRes )
{
SbxError eErr = SbxBase::GetError();
@@ -1169,7 +1379,7 @@ SbxBase* StarBASIC::FindSBXInCurrentScope( const String& rName )
// Preserve old interface
SbxVariable* StarBASIC::FindVarInCurrentScopy
-( const String& rName, USHORT& rStatus )
+( const String& rName, sal_uInt16& rStatus )
{
rStatus = 1; // Presumption: nothing found
SbxVariable* pVar = NULL;
@@ -1187,7 +1397,7 @@ SbxVariable* StarBASIC::FindVarInCurrentScopy
void StarBASIC::QuitAndExitApplication()
{
Stop();
- bQuit = TRUE;
+ bQuit = sal_True;
}
void StarBASIC::Stop()
@@ -1200,9 +1410,9 @@ void StarBASIC::Stop()
}
}
-BOOL StarBASIC::IsRunning()
+sal_Bool StarBASIC::IsRunning()
{
- return BOOL( pINST != NULL );
+ return sal_Bool( pINST != NULL );
}
/**************************************************************************
@@ -1213,7 +1423,7 @@ BOOL StarBASIC::IsRunning()
// Activation of an object. There is no need to access active objects
// with name via BASIC. If NULL is given, everything is activated.
-void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
+void StarBASIC::ActivateObject( const String* pName, sal_Bool bActivate )
{
if( pName )
{
@@ -1228,7 +1438,7 @@ void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
}
else
{
- for( USHORT i = 0; i < GetObjects()->Count(); i++ )
+ for( sal_uInt16 i = 0; i < GetObjects()->Count(); i++ )
{
SbxObject* p = (SbxObject*) GetObjects()->Get( i );
if( bActivate )
@@ -1245,7 +1455,7 @@ void StarBASIC::ActivateObject( const String* pName, BOOL bActivate )
*
**************************************************************************/
-SbMethod* StarBASIC::GetActiveMethod( USHORT nLevel )
+SbMethod* StarBASIC::GetActiveMethod( sal_uInt16 nLevel )
{
if( pINST )
return pINST->GetCaller( nLevel );
@@ -1261,41 +1471,41 @@ SbModule* StarBASIC::GetActiveModule()
return pCMOD;
}
-USHORT StarBASIC::BreakPoint( USHORT l, USHORT c1, USHORT c2 )
+sal_uInt16 StarBASIC::BreakPoint( sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
{
SetErrorData( 0, l, c1, c2 );
- bBreak = TRUE;
+ bBreak = sal_True;
if( GetSbData()->aBreakHdl.IsSet() )
- return (USHORT) GetSbData()->aBreakHdl.Call( this );
+ return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
else
return BreakHdl();
}
-USHORT StarBASIC::StepPoint( USHORT l, USHORT c1, USHORT c2 )
+sal_uInt16 StarBASIC::StepPoint( sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
{
SetErrorData( 0, l, c1, c2 );
- bBreak = FALSE;
+ bBreak = sal_False;
if( GetSbData()->aBreakHdl.IsSet() )
- return (USHORT) GetSbData()->aBreakHdl.Call( this );
+ return (sal_uInt16) GetSbData()->aBreakHdl.Call( this );
else
return BreakHdl();
}
-USHORT StarBASIC::BreakHdl()
+sal_uInt16 StarBASIC::BreakHdl()
{
- return (USHORT) ( aBreakHdl.IsSet()
+ return (sal_uInt16) ( aBreakHdl.IsSet()
? aBreakHdl.Call( this ) : SbDEBUG_CONTINUE );
}
// Calls for error handler and break handler
-USHORT StarBASIC::GetLine() { return GetSbData()->nLine; }
-USHORT StarBASIC::GetCol1() { return GetSbData()->nCol1; }
-USHORT StarBASIC::GetCol2() { return GetSbData()->nCol2; }
+sal_uInt16 StarBASIC::GetLine() { return GetSbData()->nLine; }
+sal_uInt16 StarBASIC::GetCol1() { return GetSbData()->nCol1; }
+sal_uInt16 StarBASIC::GetCol2() { return GetSbData()->nCol2; }
// Specific to error handler
SbError StarBASIC::GetErrorCode() { return GetSbData()->nCode; }
const String& StarBASIC::GetErrorText() { return GetSbData()->aErrMsg; }
-BOOL StarBASIC::IsCompilerError() { return GetSbData()->bCompiler; }
+sal_Bool StarBASIC::IsCompilerError() { return GetSbData()->bCompiler; }
void StarBASIC::SetGlobalLanguageMode( SbLanguageMode eLanguageMode )
{
GetSbData()->eLanguageMode = eLanguageMode;
@@ -1322,9 +1532,9 @@ SbLanguageMode StarBASIC::GetLanguageMode()
// binaere search by VB-Error -> SFX-Error.
// Map back new error codes to old, Sbx-compatible
-USHORT StarBASIC::GetVBErrorCode( SbError nError )
+sal_uInt16 StarBASIC::GetVBErrorCode( SbError nError )
{
- USHORT nRet = 0;
+ sal_uInt16 nRet = 0;
if( SbiRuntime::isVBAEnabled() )
{
@@ -1349,7 +1559,7 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError )
// search loop
const SFX_VB_ErrorItem* pErrItem;
- USHORT nIndex = 0;
+ sal_uInt16 nIndex = 0;
do
{
pErrItem = SFX_VB_ErrorTab + nIndex;
@@ -1364,7 +1574,7 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError )
return nRet;
}
-SbError StarBASIC::GetSfxFromVBError( USHORT nError )
+SbError StarBASIC::GetSfxFromVBError( sal_uInt16 nError )
{
SbError nRet = 0L;
@@ -1396,7 +1606,7 @@ SbError StarBASIC::GetSfxFromVBError( USHORT nError )
}
}
const SFX_VB_ErrorItem* pErrItem;
- USHORT nIndex = 0;
+ sal_uInt16 nIndex = 0;
do
{
pErrItem = SFX_VB_ErrorTab + nIndex;
@@ -1416,7 +1626,7 @@ SbError StarBASIC::GetSfxFromVBError( USHORT nError )
// set Error- / Break-data
void StarBASIC::SetErrorData
-( SbError nCode, USHORT nLine, USHORT nCol1, USHORT nCol2 )
+( SbError nCode, sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 )
{
SbiGlobals& aGlobals = *GetSbData();
aGlobals.nCode = nCode;
@@ -1432,26 +1642,26 @@ struct BasicStringList_Impl : private Resource
{
ResId aResId;
- BasicStringList_Impl( ResId& rErrIdP, USHORT nId)
+ BasicStringList_Impl( ResId& rErrIdP, sal_uInt16 nId)
: Resource( rErrIdP ),aResId(nId, *rErrIdP.GetResMgr() ){}
~BasicStringList_Impl() { FreeResource(); }
String GetString(){ return String( aResId ); }
- BOOL IsErrorTextAvailable( void )
+ sal_Bool IsErrorTextAvailable( void )
{ return IsAvailableRes(aResId.SetRT(RSC_STRING)); }
};
//----------------------------------------------------------------
// Flag, that prevent the activation of the SFX-Resources at a Basic error
-static BOOL bStaticSuppressSfxResource = FALSE;
+static sal_Bool bStaticSuppressSfxResource = sal_False;
-void StarBASIC::StaticSuppressSfxResource( BOOL bSuppress )
+void StarBASIC::StaticSuppressSfxResource( sal_Bool bSuppress )
{
bStaticSuppressSfxResource = bSuppress;
}
// Hack for #83750, use bStaticSuppressSfxResource as setup flag
-BOOL runsInSetup( void )
+sal_Bool runsInSetup( void )
{
return bStaticSuppressSfxResource;
}
@@ -1467,11 +1677,11 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
return;
}
- USHORT nOldID = GetVBErrorCode( nId );
+ sal_uInt16 nOldID = GetVBErrorCode( nId );
// intantiate the help class
BasResId aId( RID_BASIC_START );
- BasicStringList_Impl aMyStringList( aId, USHORT(nId & ERRCODE_RES_MASK) );
+ BasicStringList_Impl aMyStringList( aId, sal_uInt16(nId & ERRCODE_RES_MASK) );
if( aMyStringList.IsErrorTextAvailable() )
{
@@ -1479,7 +1689,7 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
String aMsg1 = aMyStringList.GetString();
// replace argument placeholder with %s
String aSrgStr( RTL_CONSTASCII_USTRINGPARAM("$(ARG1)") );
- USHORT nResult = aMsg1.Search( aSrgStr );
+ sal_uInt16 nResult = aMsg1.Search( aSrgStr );
if( nResult != STRING_NOTFOUND )
{
@@ -1500,8 +1710,8 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
}
-BOOL StarBASIC::CError
- ( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::CError
+ ( SbError code, const String& rMsg, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
{
SolarMutexGuard aSolarGuard;
@@ -1511,39 +1721,39 @@ BOOL StarBASIC::CError
// #109018 Check if running Basic is affected
StarBASIC* pStartedBasic = pINST->GetBasic();
if( pStartedBasic != this )
- return FALSE;
+ return sal_False;
Stop();
}
// set flag, so that GlobalRunInit notice the error
- GetSbData()->bGlobalInitErr = TRUE;
+ GetSbData()->bGlobalInitErr = sal_True;
// tinker the error message
MakeErrorText( code, rMsg );
// Implementation of the code for the string transport to SFX-Error
if( rMsg.Len() )
- code = (ULONG)*new StringErrorInfo( code, String(rMsg) );
+ code = (sal_uIntPtr)*new StringErrorInfo( code, String(rMsg) );
SetErrorData( code, l, c1, c2 );
- GetSbData()->bCompiler = TRUE;
- BOOL bRet;
+ GetSbData()->bCompiler = sal_True;
+ sal_Bool bRet;
if( GetSbData()->aErrHdl.IsSet() )
- bRet = (BOOL) GetSbData()->aErrHdl.Call( this );
+ bRet = (sal_Bool) GetSbData()->aErrHdl.Call( this );
else
bRet = ErrorHdl();
- GetSbData()->bCompiler = FALSE; // only true for error handler
+ GetSbData()->bCompiler = sal_False; // only true for error handler
return bRet;
}
-BOOL StarBASIC::RTError
- ( SbError code, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::RTError
+ ( SbError code, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
{
return RTError( code, String(), l, c1, c2 );
}
-BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1, USHORT c2 )
+sal_Bool StarBASIC::RTError( SbError code, const String& rMsg, sal_uInt16 l, sal_uInt16 c1, sal_uInt16 c2 )
{
SolarMutexGuard aSolarGuard;
@@ -1565,15 +1775,15 @@ BOOL StarBASIC::RTError( SbError code, const String& rMsg, USHORT l, USHORT c1,
aTmp += String::CreateFromInt32( SbxErrObject::getUnoErrObject()->getNumber() );
aTmp += String( RTL_CONSTASCII_USTRINGPARAM("\'\n") );
aTmp += GetSbData()->aErrMsg.Len() ? GetSbData()->aErrMsg : rMsg;
- code = (ULONG)*new StringErrorInfo( code, aTmp );
+ code = (sal_uIntPtr)*new StringErrorInfo( code, aTmp );
}
else
- code = (ULONG)*new StringErrorInfo( code, String(rMsg) );
+ code = (sal_uIntPtr)*new StringErrorInfo( code, String(rMsg) );
}
SetErrorData( code, l, c1, c2 );
if( GetSbData()->aErrHdl.IsSet() )
- return (BOOL) GetSbData()->aErrHdl.Call( this );
+ return (sal_Bool) GetSbData()->aErrHdl.Call( this );
else
return ErrorHdl();
}
@@ -1618,7 +1828,7 @@ String StarBASIC::GetErrorMsg()
return String();
}
-USHORT StarBASIC::GetErl()
+sal_uInt16 StarBASIC::GetErl()
{
if( pINST )
return pINST->GetErl();
@@ -1626,10 +1836,10 @@ USHORT StarBASIC::GetErl()
return 0;
}
-BOOL StarBASIC::ErrorHdl()
+sal_Bool StarBASIC::ErrorHdl()
{
- return (BOOL) ( aErrorHdl.IsSet()
- ? aErrorHdl.Call( this ) : FALSE );
+ return (sal_Bool) ( aErrorHdl.IsSet()
+ ? aErrorHdl.Call( this ) : sal_False );
}
Link StarBASIC::GetGlobalErrorHdl()
@@ -1667,16 +1877,16 @@ SbxArrayRef StarBASIC::getUnoListeners( void )
*
**************************************************************************/
-BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
+sal_Bool StarBASIC::LoadData( SvStream& r, sal_uInt16 nVer )
{
if( !SbxObject::LoadData( r, nVer ) )
- return FALSE;
+ return sal_False;
// #95459 Delete dialogs, otherwise endless recursion
// in SbxVarable::GetType() if dialogs are accessed
- USHORT nObjCount = pObjs->Count();
+ sal_uInt16 nObjCount = pObjs->Count();
SbxVariable** ppDeleteTab = new SbxVariable*[ nObjCount ];
- USHORT nObj;
+ sal_uInt16 nObj;
for( nObj = 0 ; nObj < nObjCount ; nObj++ )
{
@@ -1692,14 +1902,14 @@ BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
}
delete[] ppDeleteTab;
- UINT16 nMod;
+ sal_uInt16 nMod;
pModules->Clear();
r >> nMod;
- for( USHORT i = 0; i < nMod; i++ )
+ for( sal_uInt16 i = 0; i < nMod; i++ )
{
SbModule* pMod = (SbModule*) SbxBase::Load( r );
if( !pMod )
- return FALSE;
+ return sal_False;
else if( pMod->ISA(SbJScriptModule) )
{
// assign Ref, so that pMod will be deleted
@@ -1722,26 +1932,26 @@ BOOL StarBASIC::LoadData( SvStream& r, USHORT nVer )
// Search via StarBASIC is at all times global
DBG_ASSERT( IsSet( SBX_GBLSEARCH ), "Basic ohne GBLSEARCH geladen" );
SetFlag( SBX_GBLSEARCH );
- return TRUE;
+ return sal_True;
}
-BOOL StarBASIC::StoreData( SvStream& r ) const
+sal_Bool StarBASIC::StoreData( SvStream& r ) const
{
if( !SbxObject::StoreData( r ) )
- return FALSE;
- r << (UINT16) pModules->Count();
- for( USHORT i = 0; i < pModules->Count(); i++ )
+ return sal_False;
+ r << (sal_uInt16) pModules->Count();
+ for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
{
SbModule* p = (SbModule*) pModules->Get( i );
if( !p->Store( r ) )
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
-BOOL StarBASIC::LoadOldModules( SvStream& )
+sal_Bool StarBASIC::LoadOldModules( SvStream& )
{
- return FALSE;
+ return sal_False;
}
bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
@@ -1757,6 +1967,54 @@ bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::u
return bRes;
}
+Reference< frame::XModel > StarBASIC::GetModelFromBasic( SbxObject* pBasic )
+{
+ OSL_PRECOND( pBasic != NULL, "getModelFromBasic: illegal call!" );
+ if ( !pBasic )
+ return NULL;
+
+ // look for the ThisComponent variable, first in the parent (which
+ // might be the document's Basic), then in the parent's parent (which might be
+ // the application Basic)
+ const ::rtl::OUString sThisComponent( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) );
+ SbxVariable* pThisComponent = NULL;
+
+ SbxObject* pLookup = pBasic->GetParent();
+ while ( pLookup && !pThisComponent )
+ {
+ pThisComponent = pLookup->Find( sThisComponent, SbxCLASS_OBJECT );
+ pLookup = pLookup->GetParent();
+ }
+ if ( !pThisComponent )
+ {
+ OSL_TRACE("Failed to get ThisComponent");
+ // the application Basic, at the latest, should have this variable
+ return NULL;
+ }
+
+ Any aThisComponentAny( sbxToUnoValue( pThisComponent ) );
+ Reference< frame::XModel > xModel( aThisComponentAny, UNO_QUERY );
+ if ( !xModel.is() )
+ {
+ // it's no XModel. Okay, ThisComponent nowadays is allowed to be a controller.
+ Reference< frame::XController > xController( aThisComponentAny, UNO_QUERY );
+ if ( xController.is() )
+ xModel = xController->getModel();
+ }
+
+ if ( !xModel.is() )
+ return NULL;
+
+#if OSL_DEBUG_LEVEL > 0
+ OSL_TRACE("Have model ThisComponent points to url %s",
+ ::rtl::OUStringToOString( xModel->getURL(),
+ RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+#endif
+
+ return xModel;
+}
+
+
//========================================================================
// #118116 Implementation Collection object
@@ -1766,7 +2024,7 @@ static const char pCountStr[] = "Count";
static const char pAddStr[] = "Add";
static const char pItemStr[] = "Item";
static const char pRemoveStr[] = "Remove";
-static USHORT nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
+static sal_uInt16 nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
SbxInfoRef BasicCollection::xAddInfo = NULL;
SbxInfoRef BasicCollection::xItemInfo = NULL;
@@ -1837,10 +2095,10 @@ void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
const SbxHint* p = PTR_CAST(SbxHint,&rHint);
if( p )
{
- ULONG nId = p->GetId();
- BOOL bRead = BOOL( nId == SBX_HINT_DATAWANTED );
- BOOL bWrite = BOOL( nId == SBX_HINT_DATACHANGED );
- BOOL bRequestInfo = BOOL( nId == SBX_HINT_INFOWANTED );
+ sal_uIntPtr nId = p->GetId();
+ sal_Bool bRead = sal_Bool( nId == SBX_HINT_DATAWANTED );
+ sal_Bool bWrite = sal_Bool( nId == SBX_HINT_DATACHANGED );
+ sal_Bool bRequestInfo = sal_Bool( nId == SBX_HINT_INFOWANTED );
SbxVariable* pVar = p->GetVar();
SbxArray* pArg = pVar->GetParameters();
XubString aVarName( pVar->GetName() );
@@ -1875,9 +2133,9 @@ void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
SbxObject::SFX_NOTIFY( rCst, rId1, rHint, rId2 );
}
-INT32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
+sal_Int32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
{
- INT32 nIndex = -1;
+ sal_Int32 nIndex = -1;
if( pIndexVar->GetType() == SbxSTRING )
nIndex = implGetIndexForName( pIndexVar->GetString() );
else
@@ -1885,12 +2143,12 @@ INT32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )
return nIndex;
}
-INT32 BasicCollection::implGetIndexForName( const String& rName )
+sal_Int32 BasicCollection::implGetIndexForName( const String& rName )
{
- INT32 nIndex = -1;
- INT32 nCount = xItemArray->Count32();
- INT32 nNameHash = MakeHashCode( rName );
- for( INT32 i = 0 ; i < nCount ; i++ )
+ sal_Int32 nIndex = -1;
+ sal_Int32 nCount = xItemArray->Count32();
+ sal_Int32 nNameHash = MakeHashCode( rName );
+ for( sal_Int32 i = 0 ; i < nCount ; i++ )
{
SbxVariable* pVar = xItemArray->Get32( i );
if( pVar->GetHashCode() == nNameHash &&
@@ -1905,7 +2163,7 @@ INT32 BasicCollection::implGetIndexForName( const String& rName )
void BasicCollection::CollAdd( SbxArray* pPar_ )
{
- USHORT nCount = pPar_->Count();
+ sal_uInt16 nCount = pPar_->Count();
if( nCount < 2 || nCount > 5 )
{
SetError( SbxERR_WRONG_ARGS );
@@ -1931,7 +2189,7 @@ void BasicCollection::CollAdd( SbxArray* pPar_ )
return;
}
SbxVariable* pAfter = pPar_->Get(4);
- INT32 nAfterIndex = implGetIndex( pAfter );
+ sal_Int32 nAfterIndex = implGetIndex( pAfter );
if( nAfterIndex == -1 )
{
SetError( SbERR_BAD_ARGUMENT );
@@ -1941,7 +2199,7 @@ void BasicCollection::CollAdd( SbxArray* pPar_ )
}
else // if( nCount == 4 )
{
- INT32 nBeforeIndex = implGetIndex( pBefore );
+ sal_Int32 nBeforeIndex = implGetIndex( pBefore );
if( nBeforeIndex == -1 )
{
SetError( SbERR_BAD_ARGUMENT );
@@ -1990,8 +2248,8 @@ void BasicCollection::CollItem( SbxArray* pPar_ )
}
SbxVariable* pRes = NULL;
SbxVariable* p = pPar_->Get( 1 );
- INT32 nIndex = implGetIndex( p );
- if( nIndex >= 0 && nIndex < (INT32)xItemArray->Count32() )
+ sal_Int32 nIndex = implGetIndex( p );
+ if( nIndex >= 0 && nIndex < (sal_Int32)xItemArray->Count32() )
pRes = xItemArray->Get32( nIndex );
if( !pRes )
SetError( SbERR_BAD_ARGUMENT );
@@ -2008,8 +2266,8 @@ void BasicCollection::CollRemove( SbxArray* pPar_ )
}
SbxVariable* p = pPar_->Get( 1 );
- INT32 nIndex = implGetIndex( p );
- if( nIndex >= 0 && nIndex < (INT32)xItemArray->Count32() )
+ sal_Int32 nIndex = implGetIndex( p );
+ if( nIndex >= 0 && nIndex < (sal_Int32)xItemArray->Count32() )
xItemArray->Remove32( nIndex );
else
SetError( SbERR_BAD_ARGUMENT );
diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src
index df916c64b031..df916c64b031 100644..100755
--- a/basic/source/classes/sb.src
+++ b/basic/source/classes/sb.src
diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx
index 0732b0c0e1d4..2f0a9fe93fee 100644..100755
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -62,13 +62,13 @@ SbiGlobals::SbiGlobals()
nCode = 0;
nLine = 0;
nCol1 = nCol2 = 0;
- bCompiler = FALSE;
- bGlobalInitErr = FALSE;
- bRunInit = FALSE;
+ bCompiler = sal_False;
+ bGlobalInitErr = sal_False;
+ bRunInit = sal_False;
eLanguageMode = SB_LANG_BASIC;
pErrStack = NULL;
pTransliterationWrapper = NULL;
- bBlockCompilerError = FALSE;
+ bBlockCompilerError = sal_False;
pAppBasMgr = NULL;
pMSOMacroRuntimLib = NULL;
}
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 9dffcf21361e..28765880c6e4 100644..100755
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -34,15 +34,18 @@
#include <svl/hint.hxx>
#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/extract.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/extract.hxx>
#include <comphelper/processfactory.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
#include <com/sun/star/script/ArrayWrapper.hpp>
+#include <com/sun/star/script/NativeObjectWrapper.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/DeploymentException.hpp>
@@ -60,6 +63,7 @@
#include <com/sun/star/script/XTypeConverter.hpp>
#include <com/sun/star/script/XDefaultProperty.hpp>
#include <com/sun/star/script/XDefaultMethod.hpp>
+#include <com/sun/star/script/XDirectInvocation.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/reflection/XIdlArray.hpp>
@@ -454,7 +458,7 @@ String implGetWrappedMsg( const WrappedTargetException& e )
void implHandleBasicErrorException( BasicErrorException& e )
{
- SbError nError = StarBASIC::GetSfxFromVBError( (USHORT)e.ErrorCode );
+ SbError nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)e.ErrorCode );
StarBASIC::Error( nError, e.ErrorMessageArgument );
}
@@ -480,7 +484,7 @@ void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
{
if ( aBasicError.ErrorCode != 0 )
{
- nError = StarBASIC::GetSfxFromVBError( (USHORT) aBasicError.ErrorCode );
+ nError = StarBASIC::GetSfxFromVBError( (sal_uInt16) aBasicError.ErrorCode );
if ( nError == 0 )
{
nError = (SbError) aBasicError.ErrorCode;
@@ -507,7 +511,7 @@ void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
// special handling for BasicErrorException errors
if ( aWrapped.TargetException >>= aBasicError )
{
- nError = StarBASIC::GetSfxFromVBError( (USHORT)aBasicError.ErrorCode );
+ nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)aBasicError.ErrorCode );
aMessageBuf.append( aBasicError.ErrorMessageArgument );
aExamine.clear();
break;
@@ -552,6 +556,43 @@ static void implHandleAnyException( const Any& _rCaughtException )
}
}
+// NativeObjectWrapper handling
+struct ObjectItem
+{
+ SbxObjectRef m_xNativeObj;
+
+ ObjectItem( void )
+ {}
+ ObjectItem( SbxObject* pNativeObj )
+ : m_xNativeObj( pNativeObj )
+ {}
+};
+static std::vector< ObjectItem > GaNativeObjectWrapperVector;
+
+void clearNativeObjectWrapperVector( void )
+{
+ GaNativeObjectWrapperVector.clear();
+}
+
+sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj )
+{
+ sal_uInt32 nIndex = GaNativeObjectWrapperVector.size();
+ GaNativeObjectWrapperVector.push_back( ObjectItem( pNativeObj ) );
+ return nIndex;
+}
+
+SbxObject* lcl_getNativeObject( sal_uInt32 nIndex )
+{
+ SbxObjectRef xRetObj;
+ if( nIndex < GaNativeObjectWrapperVector.size() )
+ {
+ ObjectItem& rItem = GaNativeObjectWrapperVector[ nIndex ];
+ xRetObj = rItem.m_xNativeObj;
+ }
+ return xRetObj;
+}
+
+
// convert from Uno to Sbx
SbxDataType unoToSbxType( TypeClass eType )
{
@@ -634,7 +675,7 @@ static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int
sal_Int32 nLen = xIdlArray->getLen( aValue );
for ( sal_Int32 index = 0; index < nLen; ++index )
{
- Any aElementAny = xIdlArray->get( aValue, (UINT32)index );
+ Any aElementAny = xIdlArray->get( aValue, (sal_uInt32)index );
// This detects the dimension were currently processing
if ( dimCopy == dimension )
{
@@ -736,6 +777,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
if( eTypeClass == TypeClass_STRUCT )
{
ArrayWrapper aWrap;
+ NativeObjectWrapper aNativeObjectWrapper;
if ( (aValue >>= aWrap) )
{
SbxDimArray* pArray = NULL;
@@ -746,7 +788,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
if ( pArray )
{
SbxDimArrayRef xArray = pArray;
- USHORT nFlags = pVar->GetFlags();
+ sal_uInt16 nFlags = pVar->GetFlags();
pVar->ResetFlag( SBX_FIXED );
pVar->PutObject( (SbxDimArray*)xArray );
pVar->SetFlags( nFlags );
@@ -755,6 +797,18 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
pVar->PutEmpty();
break;
}
+ else if ( (aValue >>= aNativeObjectWrapper) )
+ {
+ sal_uInt32 nIndex = 0;
+ if( (aNativeObjectWrapper.ObjectId >>= nIndex) )
+ {
+ SbxObject* pObj = lcl_getNativeObject( nIndex );
+ pVar->PutObject( pObj );
+ }
+ else
+ pVar->PutEmpty();
+ break;
+ }
else
{
SbiInstance* pInst = pINST;
@@ -856,7 +910,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
for( i = 0 ; i < nLen ; i++ )
{
// convert elements
- Any aElementAny = xIdlArray->get( aValue, (UINT32)i );
+ Any aElementAny = xIdlArray->get( aValue, (sal_uInt32)i );
SbxVariableRef xVar = new SbxVariable( eSbxElementType );
unoToSbxValue( (SbxVariable*)xVar, aElementAny );
@@ -870,7 +924,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
}
// return the Array
- USHORT nFlags = pVar->GetFlags();
+ sal_uInt16 nFlags = pVar->GetFlags();
pVar->ResetFlag( SBX_FIXED );
pVar->PutObject( (SbxDimArray*)xArray );
pVar->SetFlags( nFlags );
@@ -1008,9 +1062,9 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
// this one - otherwise the whole will be considered as Any-Sequence
sal_Bool bNeedsInit = sal_True;
- INT32 nSize = nUpper - nLower + 1;
- INT32 nIdx = nLower;
- for( INT32 i = 0 ; i < nSize ; i++,nIdx++ )
+ sal_Int32 nSize = nUpper - nLower + 1;
+ sal_Int32 nIdx = nLower;
+ for( sal_Int32 i = 0 ; i < nSize ; i++,nIdx++ )
{
SbxVariableRef xVar = pArray->Get32( &nIdx );
Type aType = getUnoTypeForSbxValue( (SbxVariable*)xVar );
@@ -1046,10 +1100,10 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
if( eElementTypeClass == TypeClass_VOID || eElementTypeClass == TypeClass_ANY )
{
// For this check the array's dim structure does not matter
- UINT32 nFlatArraySize = pArray->Count32();
+ sal_uInt32 nFlatArraySize = pArray->Count32();
sal_Bool bNeedsInit = sal_True;
- for( UINT32 i = 0 ; i < nFlatArraySize ; i++ )
+ for( sal_uInt32 i = 0 ; i < nFlatArraySize ; i++ )
{
SbxVariableRef xVar = pArray->SbxArray::Get32( i );
Type aType = getUnoTypeForSbxValue( (SbxVariable*)xVar );
@@ -1123,6 +1177,20 @@ Any sbxToUnoValueImpl( SbxVariable* pVar, bool bBlockConversionToSmallestType =
if( pClassModule->createCOMWrapperForIface( aRetAny, pClassModuleObj ) )
return aRetAny;
}
+ if( !xObj->ISA(SbUnoObject) )
+ {
+ // Create NativeObjectWrapper to identify object in case of callbacks
+ SbxObject* pObj = PTR_CAST(SbxObject,pVar->GetObject());
+ if( pObj != NULL )
+ {
+ NativeObjectWrapper aNativeObjectWrapper;
+ sal_uInt32 nIndex = lcl_registerNativeObjectWrapper( pObj );
+ aNativeObjectWrapper.ObjectId <<= nIndex;
+ Any aRetAny;
+ aRetAny <<= aNativeObjectWrapper;
+ return aRetAny;
+ }
+ }
}
}
@@ -1259,6 +1327,29 @@ Any sbxToUnoValue( SbxVariable* pVar )
return sbxToUnoValueImpl( pVar );
}
+// Funktion, um einen globalen Bezeichner im
+// UnoScope zu suchen und fuer Sbx zu wrappen
+static bool implGetTypeByName( const String& rName, Type& rRetType )
+{
+ bool bSuccess = false;
+
+ Reference< XHierarchicalNameAccess > xTypeAccess = getTypeProvider_Impl();
+ if( xTypeAccess->hasByHierarchicalName( rName ) )
+ {
+ Any aRet = xTypeAccess->getByHierarchicalName( rName );
+ Reference< XTypeDescription > xTypeDesc;
+ aRet >>= xTypeDesc;
+
+ if( xTypeDesc.is() )
+ {
+ rRetType = Type( xTypeDesc->getTypeClass(), xTypeDesc->getName() );
+ bSuccess = true;
+ }
+ }
+ return bSuccess;
+}
+
+
// converting of Sbx to Uno with known target class
Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty )
{
@@ -1344,6 +1435,39 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
}
break;
+ case TypeClass_TYPE:
+ {
+ if( eBaseType == SbxOBJECT )
+ {
+ // XIdlClass?
+ Reference< XIdlClass > xIdlClass;
+
+ SbxBaseRef pObj = (SbxBase*)pVar->GetObject();
+ if( pObj && pObj->ISA(SbUnoObject) )
+ {
+ Any aUnoAny = ((SbUnoObject*)(SbxBase*)pObj)->getUnoAny();
+ aUnoAny >>= xIdlClass;
+ }
+
+ if( xIdlClass.is() )
+ {
+ ::rtl::OUString aClassName = xIdlClass->getName();
+ Type aType( xIdlClass->getTypeClass(), aClassName.getStr() );
+ aRetVal <<= aType;
+ }
+ }
+ else if( eBaseType == SbxSTRING )
+ {
+ // String representing type?
+ String aTypeName = pVar->GetString();
+ Type aType;
+ bool bSuccess = implGetTypeByName( aTypeName, aType );
+ if( bSuccess )
+ aRetVal <<= aType;
+ }
+ }
+ break;
+
/* we leave out the following types
case TypeClass_SERVICE: break;
case TypeClass_CLASS: break;
@@ -1532,7 +1656,7 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
return aRetVal;
}
-void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOLEAutomation, UINT32 nParamCount )
+void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOLEAutomation, sal_uInt32 nParamCount )
{
AutomationNamedArgsSbxArray* pArgNamesArray = NULL;
if( bOLEAutomation )
@@ -1541,7 +1665,7 @@ void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOL
args.realloc( nParamCount );
Any* pAnyArgs = args.getArray();
bool bBlockConversionToSmallestType = pINST->IsCompatibility();
- UINT32 i = 0;
+ sal_uInt32 i = 0;
if( pArgNamesArray )
{
Sequence< ::rtl::OUString >& rNameSeq = pArgNamesArray->getNames();
@@ -1549,7 +1673,7 @@ void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOL
Any aValAny;
for( i = 0 ; i < nParamCount ; i++ )
{
- USHORT iSbx = (USHORT)(i+1);
+ sal_uInt16 iSbx = (sal_uInt16)(i+1);
aValAny = sbxToUnoValueImpl( pParams->Get( iSbx ),
bBlockConversionToSmallestType );
@@ -1572,7 +1696,7 @@ void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOL
{
for( i = 0 ; i < nParamCount ; i++ )
{
- pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (USHORT)(i+1) ),
+ pAnyArgs[i] = sbxToUnoValueImpl( pParams->Get( (sal_uInt16)(i+1) ),
bBlockConversionToSmallestType );
}
}
@@ -1584,9 +1708,9 @@ enum INVOKETYPE
SetProp,
Func
};
-Any invokeAutomationMethod( const String& Name, Sequence< Any >& args, SbxArray* pParams, UINT32 nParamCount, Reference< XInvocation >& rxInvocation, INVOKETYPE invokeType = Func )
+Any invokeAutomationMethod( const String& Name, Sequence< Any >& args, SbxArray* pParams, sal_uInt32 nParamCount, Reference< XInvocation >& rxInvocation, INVOKETYPE invokeType = Func )
{
- Sequence< INT16 > OutParamIndex;
+ Sequence< sal_Int16 > OutParamIndex;
Sequence< Any > OutParam;
Any aRetAny;
@@ -1611,30 +1735,30 @@ Any invokeAutomationMethod( const String& Name, Sequence< Any >& args, SbxArray*
break; // should introduce an error here
}
- const INT16* pIndices = OutParamIndex.getConstArray();
- UINT32 nLen = OutParamIndex.getLength();
+ const sal_Int16* pIndices = OutParamIndex.getConstArray();
+ sal_uInt32 nLen = OutParamIndex.getLength();
if( nLen )
{
const Any* pNewValues = OutParam.getConstArray();
- for( UINT32 j = 0 ; j < nLen ; j++ )
+ for( sal_uInt32 j = 0 ; j < nLen ; j++ )
{
- INT16 iTarget = pIndices[ j ];
- if( iTarget >= (INT16)nParamCount )
+ sal_Int16 iTarget = pIndices[ j ];
+ if( iTarget >= (sal_Int16)nParamCount )
break;
- unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pNewValues[ j ] );
+ unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pNewValues[ j ] );
}
}
return aRetAny;
}
// Debugging help method to readout the imlemented interfaces of an object
-String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, USHORT nRekLevel )
+String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, sal_uInt16 nRekLevel )
{
Type aIfaceType = ::getCppuType( (const Reference< XInterface > *)0 );
static Reference< XIdlClass > xIfaceClass = TypeToIdlClass( aIfaceType );
String aRetStr;
- for( USHORT i = 0 ; i < nRekLevel ; i++ )
+ for( sal_uInt16 i = 0 ; i < nRekLevel ; i++ )
aRetStr.AppendAscii( " " );
aRetStr += String( xClass->getName() );
::rtl::OUString aClassName = xClass->getName();
@@ -1653,8 +1777,8 @@ String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference<
// get the super interfaces
Sequence< Reference< XIdlClass > > aSuperClassSeq = xClass->getSuperclasses();
const Reference< XIdlClass >* pClasses = aSuperClassSeq.getConstArray();
- UINT32 nSuperIfaceCount = aSuperClassSeq.getLength();
- for( UINT32 j = 0 ; j < nSuperIfaceCount ; j++ )
+ sal_uInt32 nSuperIfaceCount = aSuperClassSeq.getLength();
+ for( sal_uInt32 j = 0 ; j < nSuperIfaceCount ; j++ )
{
const Reference< XIdlClass >& rxIfaceClass = pClasses[j];
if( !rxIfaceClass->equals( xIfaceClass ) )
@@ -1735,8 +1859,8 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj,
{
Sequence< Type > aTypeSeq = xTypeProvider->getTypes();
const Type* pTypeArray = aTypeSeq.getConstArray();
- UINT32 nIfaceCount = aTypeSeq.getLength();
- for( UINT32 j = 0 ; j < nIfaceCount ; j++ )
+ sal_uInt32 nIfaceCount = aTypeSeq.getLength();
+ for( sal_uInt32 j = 0 ; j < nIfaceCount ; j++ )
{
const Type& rType = pTypeArray[j];
@@ -1814,8 +1938,8 @@ String Impl_GetSupportedInterfaces( SbUnoObject* pUnoObj )
// get the interfaces of the implementation
Sequence< Type > aTypeSeq = xTypeProvider->getTypes();
const Type* pTypeArray = aTypeSeq.getConstArray();
- UINT32 nIfaceCount = aTypeSeq.getLength();
- for( UINT32 j = 0 ; j < nIfaceCount ; j++ )
+ sal_uInt32 nIfaceCount = aTypeSeq.getLength();
+ for( sal_uInt32 j = 0 ; j < nIfaceCount ; j++ )
{
const Type& rType = pTypeArray[j];
@@ -1913,13 +2037,13 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
}
Sequence<Property> props = xAccess->getProperties( PropertyConcept::ALL - PropertyConcept::DANGEROUS );
- UINT32 nUnoPropCount = props.getLength();
+ sal_uInt32 nUnoPropCount = props.getLength();
const Property* pUnoProps = props.getConstArray();
SbxArray* pProps = pUnoObj->GetProperties();
- USHORT nPropCount = pProps->Count();
- USHORT nPropsPerLine = 1 + nPropCount / 30;
- for( USHORT i = 0; i < nPropCount; i++ )
+ sal_uInt16 nPropCount = pProps->Count();
+ sal_uInt16 nPropsPerLine = 1 + nPropCount / 30;
+ for( sal_uInt16 i = 0; i < nPropCount; i++ )
{
SbxVariable* pVar = pProps->Get( i );
if( pVar )
@@ -1932,7 +2056,7 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
// Is it in Uno a sequence?
SbxDataType eType = pVar->GetFullType();
- BOOL bMaybeVoid = FALSE;
+ sal_Bool bMaybeVoid = sal_False;
if( i < nUnoPropCount )
{
const Property& rProp = pUnoProps[ i ];
@@ -1942,7 +2066,7 @@ String Impl_DumpProperties( SbUnoObject* pUnoObj )
if( rProp.Attributes & PropertyAttribute::MAYBEVOID )
{
eType = unoToSbxType( rProp.Type.getTypeClass() );
- bMaybeVoid = TRUE;
+ bMaybeVoid = sal_True;
}
if( eType == SbxOBJECT )
{
@@ -1993,14 +2117,14 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj )
const Reference< XIdlMethod >* pUnoMethods = methods.getConstArray();
SbxArray* pMethods = pUnoObj->GetMethods();
- USHORT nMethodCount = pMethods->Count();
+ sal_uInt16 nMethodCount = pMethods->Count();
if( !nMethodCount )
{
aRet.AppendAscii( "\nNo methods found\n" );
return aRet;
}
- USHORT nPropsPerLine = 1 + nMethodCount / 30;
- for( USHORT i = 0; i < nMethodCount; i++ )
+ sal_uInt16 nPropsPerLine = 1 + nMethodCount / 30;
+ for( sal_uInt16 i = 0; i < nMethodCount; i++ )
{
SbxVariable* pVar = pMethods->Get( i );
if( pVar )
@@ -2028,12 +2152,12 @@ String Impl_DumpMethods( SbUnoObject* pUnoObj )
// the get-method mustn't have a parameter
Sequence< Reference< XIdlClass > > aParamsSeq = rxMethod->getParameterTypes();
- UINT32 nParamCount = aParamsSeq.getLength();
+ sal_uInt32 nParamCount = aParamsSeq.getLength();
const Reference< XIdlClass >* pParams = aParamsSeq.getConstArray();
if( nParamCount > 0 )
{
- for( USHORT j = 0; j < nParamCount; j++ )
+ for( sal_uInt16 j = 0; j < nParamCount; j++ )
{
String aTypeStr = Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) );
aPropStr += aTypeStr;
@@ -2080,7 +2204,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
if( pHint->GetId() == SBX_HINT_DATAWANTED )
{
// Test-Properties
- INT32 nId = pProp->nId;
+ sal_Int32 nId = pProp->nId;
if( nId < 0 )
{
// Id == -1: Display implemented interfaces according the ClassProvider
@@ -2131,7 +2255,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
try
{
- UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
+ sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
sal_Bool bCanBeConsideredAMethod = mxInvocation->hasMethod( pProp->GetName() );
Any aRetAny;
if ( bCanBeConsideredAMethod && nParamCount )
@@ -2204,18 +2328,18 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
if( pHint->GetId() == SBX_HINT_DATAWANTED )
{
// number of Parameter -1 because of Param0 == this
- UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
+ sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
Sequence<Any> args;
- BOOL bOutParams = FALSE;
- UINT32 i;
+ sal_Bool bOutParams = sal_False;
+ sal_uInt32 i;
if( !bInvocation && mxUnoAccess.is() )
{
// get info
const Sequence<ParamInfo>& rInfoSeq = pMeth->getParamInfos();
const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
- UINT32 nUnoParamCount = rInfoSeq.getLength();
- UINT32 nAllocParamCount = nParamCount;
+ sal_uInt32 nUnoParamCount = rInfoSeq.getLength();
+ sal_uInt32 nAllocParamCount = nParamCount;
// ignore surplus parameter; alternative: throw an error
if( nParamCount > nUnoParamCount )
@@ -2258,14 +2382,14 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
com::sun::star::uno::Type aType( rxClass->getTypeClass(), rxClass->getName() );
// ATTENTION: Don't forget for Sbx-Parameter the offset!
- pAnyArgs[i] = sbxToUnoValue( pParams->Get( (USHORT)(i+1) ), aType );
+ pAnyArgs[i] = sbxToUnoValue( pParams->Get( (sal_uInt16)(i+1) ), aType );
// If it is not certain check whether the out-parameter are available.
if( !bOutParams )
{
ParamMode aParamMode = rInfo.aMode;
if( aParamMode != ParamMode_IN )
- bOutParams = TRUE;
+ bOutParams = sal_True;
}
}
}
@@ -2277,7 +2401,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
}
// call the method
- GetSbData()->bBlockCompilerError = TRUE; // #106433 Block compiler errors for API calls
+ GetSbData()->bBlockCompilerError = sal_True; // #106433 Block compiler errors for API calls
try
{
if( !bInvocation && mxUnoAccess.is() )
@@ -2296,13 +2420,13 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const Sequence<ParamInfo>& rInfoSeq = pMeth->getParamInfos();
const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
- UINT32 j;
+ sal_uInt32 j;
for( j = 0 ; j < nParamCount ; j++ )
{
const ParamInfo& rInfo = pParamInfos[j];
ParamMode aParamMode = rInfo.aMode;
if( aParamMode != ParamMode_IN )
- unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pAnyArgs[ j ] );
+ unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pAnyArgs[ j ] );
}
}
}
@@ -2310,7 +2434,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
Any aRetAny = invokeAutomationMethod( pMeth->GetName(), args, pParams, nParamCount, mxInvocation );
unoToSbxValue( pVar, aRetAny );
- }
+ }
// remove parameter here, because this was not done anymore in unoToSbxValue()
// for arrays
@@ -2321,7 +2445,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
implHandleAnyException( ::cppu::getCaughtException() );
}
- GetSbData()->bBlockCompilerError = FALSE; // #106433 Unblock compiler errors
+ GetSbData()->bBlockCompilerError = sal_False; // #106433 Unblock compiler errors
}
}
else
@@ -2337,8 +2461,8 @@ Reference< XInvocation > createDynamicInvocationFor( const Any& aAny );
SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
: SbxObject( aName_ )
- , bNeedIntrospection( TRUE )
- , bIgnoreNativeCOMObjectMembers( FALSE )
+ , bNeedIntrospection( sal_True )
+ , bNativeCOMObject( sal_False )
{
static Reference< XIntrospection > xIntrospection;
@@ -2381,7 +2505,7 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
// The remainder refers only to the introspection
if( !xTypeProvider.is() )
{
- bNeedIntrospection = FALSE;
+ bNeedIntrospection = sal_False;
return;
}
@@ -2389,34 +2513,34 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
// hiding of equally named COM symbols, e.g. XInvocation::getValue
Reference< oleautomation::XAutomationObject > xAutomationObject( aUnoObj_, UNO_QUERY );
if( xAutomationObject.is() )
- bIgnoreNativeCOMObjectMembers = TRUE;
+ bNativeCOMObject = sal_True;
}
maTmpUnoObj = aUnoObj_;
//*** Define the name ***
- BOOL bFatalError = TRUE;
+ sal_Bool bFatalError = sal_True;
// Is it an interface or a struct?
- BOOL bSetClassName = FALSE;
+ sal_Bool bSetClassName = sal_False;
String aClassName_;
if( eType == TypeClass_STRUCT || eType == TypeClass_EXCEPTION )
{
// Struct is Ok
- bFatalError = FALSE;
+ bFatalError = sal_False;
// insert the real name of the class
if( aName_.Len() == 0 )
{
aClassName_ = String( aUnoObj_.getValueType().getTypeName() );
- bSetClassName = TRUE;
+ bSetClassName = sal_True;
}
}
else if( eType == TypeClass_INTERFACE )
{
// Interface works always through the type in the Any
- bFatalError = FALSE;
+ bFatalError = sal_False;
// Ask for the XIdlClassProvider-Interface
Reference< XIdlClassProvider > xClassProvider( x, UNO_QUERY );
@@ -2426,14 +2550,14 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
if( aName_.Len() == 0 )
{
Sequence< Reference< XIdlClass > > szClasses = xClassProvider->getIdlClasses();
- UINT32 nLen = szClasses.getLength();
+ sal_uInt32 nLen = szClasses.getLength();
if( nLen )
{
const Reference< XIdlClass > xImplClass = szClasses.getConstArray()[ 0 ];
if( xImplClass.is() )
{
aClassName_ = String( xImplClass->getName() );
- bSetClassName = TRUE;
+ bSetClassName = sal_True;
}
}
}
@@ -2464,7 +2588,7 @@ void SbUnoObject::doIntrospection( void )
if( !bNeedIntrospection )
return;
- bNeedIntrospection = FALSE;
+ bNeedIntrospection = sal_False;
if( !xIntrospection.is() )
{
@@ -2513,6 +2637,47 @@ void SbUnoObject::doIntrospection( void )
// Start of a list of all SbUnoMethod-Instances
static SbUnoMethod* pFirst = NULL;
+void clearUnoMethodsForBasic( StarBASIC* pBasic )
+{
+ SbUnoMethod* pMeth = pFirst;
+ while( pMeth )
+ {
+ SbxObject* pObject = dynamic_cast< SbxObject* >( pMeth->GetParent() );
+ if ( pObject )
+ {
+ StarBASIC* pModBasic = dynamic_cast< StarBASIC* >( pObject->GetParent() );
+ if ( pModBasic == pBasic )
+ {
+ // for now the solution is to remove the method from the list and to clear it,
+ // but in case the element should be correctly transfered to another StarBASIC,
+ // we should either set module parent to NULL without clearing it, or even
+ // set the new StarBASIC as the parent of the module
+ // pObject->SetParent( NULL );
+
+ if( pMeth == pFirst )
+ pFirst = pMeth->pNext;
+ else if( pMeth->pPrev )
+ pMeth->pPrev->pNext = pMeth->pNext;
+ if( pMeth->pNext )
+ pMeth->pNext->pPrev = pMeth->pPrev;
+
+ pMeth->pPrev = NULL;
+ pMeth->pNext = NULL;
+
+ pMeth->SbxValue::Clear();
+ pObject->SbxValue::Clear();
+
+ // start from the beginning after object clearing, the cycle will end since the method is removed each time
+ pMeth = pFirst;
+ }
+ else
+ pMeth = pMeth->pNext;
+ }
+ else
+ pMeth = pMeth->pNext;
+ }
+}
+
void clearUnoMethods( void )
{
SbUnoMethod* pMeth = pFirst;
@@ -2529,10 +2694,12 @@ SbUnoMethod::SbUnoMethod
const String& aName_,
SbxDataType eSbxType,
Reference< XIdlMethod > xUnoMethod_,
- bool bInvocation
+ bool bInvocation,
+ bool bDirect
)
: SbxMethod( aName_, eSbxType )
, mbInvocation( bInvocation )
+ , mbDirectInvocation( bDirect )
{
m_xUnoMethod = xUnoMethod_;
pParamInfoSeq = NULL;
@@ -2568,16 +2735,16 @@ SbxInfo* SbUnoMethod::GetInfo()
const Sequence<ParamInfo>& rInfoSeq = getParamInfos();
const ParamInfo* pParamInfos = rInfoSeq.getConstArray();
- UINT32 nParamCount = rInfoSeq.getLength();
+ sal_uInt32 nParamCount = rInfoSeq.getLength();
- for( UINT32 i = 0 ; i < nParamCount ; i++ )
+ for( sal_uInt32 i = 0 ; i < nParamCount ; i++ )
{
const ParamInfo& rInfo = pParamInfos[i];
::rtl::OUString aParamName = rInfo.aName;
// const Reference< XIdlClass >& rxClass = rInfo.aType;
SbxDataType t = SbxVARIANT;
- USHORT nFlags_ = SBX_READ;
+ sal_uInt16 nFlags_ = SBX_READ;
pInfo->AddParam( aParamName, t, nFlags_ );
}
}
@@ -2600,7 +2767,7 @@ SbUnoProperty::SbUnoProperty
const String& aName_,
SbxDataType eSbxType,
const Property& aUnoProp_,
- INT32 nId_,
+ sal_Int32 nId_,
bool bInvocation
)
: SbxProperty( aName_, eSbxType )
@@ -2633,7 +2800,7 @@ SbxVariable* SbUnoObject::Find( const String& rName, SbxClassType t )
if( !pRes )
{
::rtl::OUString aUName( rName );
- if( mxUnoAccess.is() && !bIgnoreNativeCOMObjectMembers )
+ if( mxUnoAccess.is() && !bNativeCOMObject )
{
if( mxExactName.is() )
{
@@ -2734,6 +2901,17 @@ SbxVariable* SbUnoObject::Find( const String& rName, SbxClassType t )
QuickInsert( (SbxVariable*)xMethRef );
pRes = xMethRef;
}
+ else
+ {
+ Reference< XDirectInvocation > xDirectInvoke( mxInvocation, UNO_QUERY );
+ if ( xDirectInvoke.is() && xDirectInvoke->hasMember( aUName ) )
+ {
+ SbxVariableRef xMethRef = new SbUnoMethod( aUName, SbxVARIANT, xDummyMethod, true, true );
+ QuickInsert( (SbxVariable*)xMethRef );
+ pRes = xMethRef;
+ }
+
+ }
}
catch( RuntimeException& e )
{
@@ -2793,11 +2971,11 @@ void SbUnoObject::implCreateAll( void )
// get instrospection
Reference< XIntrospectionAccess > xAccess = mxUnoAccess;
- if( !xAccess.is() || bIgnoreNativeCOMObjectMembers )
+ if( !xAccess.is() || bNativeCOMObject )
{
if( mxInvocation.is() )
xAccess = mxInvocation->getIntrospection();
- else if( bIgnoreNativeCOMObjectMembers )
+ else if( bNativeCOMObject )
return;
}
if( !xAccess.is() )
@@ -2805,10 +2983,10 @@ void SbUnoObject::implCreateAll( void )
// Establish properties
Sequence<Property> props = xAccess->getProperties( PropertyConcept::ALL - PropertyConcept::DANGEROUS );
- UINT32 nPropCount = props.getLength();
+ sal_uInt32 nPropCount = props.getLength();
const Property* pProps_ = props.getConstArray();
- UINT32 i;
+ sal_uInt32 i;
for( i = 0 ; i < nPropCount ; i++ )
{
const Property& rProp = pProps_[ i ];
@@ -2831,7 +3009,7 @@ void SbUnoObject::implCreateAll( void )
// Create methods
Sequence< Reference< XIdlMethod > > aMethodSeq = xAccess->getMethods
( MethodConcept::ALL - MethodConcept::DANGEROUS );
- UINT32 nMethCount = aMethodSeq.getLength();
+ sal_uInt32 nMethCount = aMethodSeq.getLength();
const Reference< XIdlMethod >* pMethods_ = aMethodSeq.getConstArray();
for( i = 0 ; i < nMethCount ; i++ )
{
@@ -2891,7 +3069,7 @@ SbUnoObject* Impl_CreateUnoStruct( const String& aClassName )
// Factory-Class to create Uno-Structs per DIM AS NEW
-SbxBase* SbUnoFactory::Create( UINT16, UINT32 )
+SbxBase* SbUnoFactory::Create( sal_uInt16, sal_uInt32 )
{
// Via SbxId nothing works in Uno
return NULL;
@@ -2924,7 +3102,7 @@ void createAllObjectProperties( SbxObject* pObj )
}
-void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -2949,7 +3127,7 @@ void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
refVar->PutObject( (SbUnoObject*)xUnoObj );
}
-void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -3003,7 +3181,7 @@ void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
}
}
-void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -3061,7 +3239,7 @@ void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar,
}
}
-void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -3085,13 +3263,13 @@ void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL
}
}
-void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
// We need 2 parameter minimum
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount < 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3100,7 +3278,7 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
// variable for the return value
SbxVariableRef refVar = rPar.Get(0);
- refVar->PutBool( FALSE );
+ refVar->PutBool( sal_False );
// get the Uno-Object
SbxBaseRef pObj = (SbxBase*)rPar.Get( 1 )->GetObject();
@@ -3119,7 +3297,7 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
if( !xCoreReflection.is() )
return;
- for( USHORT i = 2 ; i < nParCount ; i++ )
+ for( sal_uInt16 i = 2 ; i < nParCount ; i++ )
{
// get the name of the interface of the struct
String aIfaceName = rPar.Get( i )->GetString();
@@ -3137,10 +3315,10 @@ void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
}
// Every thing works; then return TRUE
- refVar->PutBool( TRUE );
+ refVar->PutBool( sal_True );
}
-void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -3154,7 +3332,7 @@ void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
// variable for the return value
SbxVariableRef refVar = rPar.Get(0);
- refVar->PutBool( FALSE );
+ refVar->PutBool( sal_False );
// get the Uno-Object
SbxVariableRef xParam = rPar.Get( 1 );
@@ -3166,11 +3344,11 @@ void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
Any aAny = ((SbUnoObject*)(SbxBase*)pObj)->getUnoAny();
TypeClass eType = aAny.getValueType().getTypeClass();
if( eType == TypeClass_STRUCT )
- refVar->PutBool( TRUE );
+ refVar->PutBool( sal_True );
}
-void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -3183,7 +3361,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
// variable for the return value
SbxVariableRef refVar = rPar.Get(0);
- refVar->PutBool( FALSE );
+ refVar->PutBool( sal_False );
// get the Uno-Objects
SbxVariableRef xParam1 = rPar.Get( 1 );
@@ -3215,7 +3393,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
//XInterfaceRef x2 = *(XInterfaceRef*)aAny2.get();
if( x1 == x2 )
- refVar->PutBool( TRUE );
+ refVar->PutBool( sal_True );
}
typedef boost::unordered_map< ::rtl::OUString, std::vector< ::rtl::OUString >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ModuleHash;
@@ -3488,7 +3666,7 @@ SbxVariable* SbUnoClass::Find( const XubString& rName, SbxClassType t )
// Take us out as listener at once,
// the values are all constant
if( pRes->IsBroadcaster() )
- EndListening( pRes->GetBroadcaster(), TRUE );
+ EndListening( pRes->GetBroadcaster(), sal_True );
}
}
return pRes;
@@ -3572,14 +3750,14 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
if( pUnoCtor && pHint->GetId() == SBX_HINT_DATAWANTED )
{
// Parameter count -1 because of Param0 == this
- UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
+ sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
Sequence<Any> args;
- BOOL bOutParams = FALSE;
+ sal_Bool bOutParams = sal_False;
Reference< XServiceConstructorDescription > xCtor = pUnoCtor->getServiceCtorDesc();
Sequence< Reference< XParameter > > aParameterSeq = xCtor->getParameters();
const Reference< XParameter >* pParameterSeq = aParameterSeq.getConstArray();
- UINT32 nUnoParamCount = aParameterSeq.getLength();
+ sal_uInt32 nUnoParamCount = aParameterSeq.getLength();
// Default: Ignore not needed parameters
bool bParameterError = false;
@@ -3597,8 +3775,8 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
}
// Too many parameters with context as first parameter?
- USHORT nSbxParameterOffset = 1;
- USHORT nParameterOffsetByContext = 0;
+ sal_uInt16 nSbxParameterOffset = 1;
+ sal_uInt16 nParameterOffsetByContext = 0;
Reference < XComponentContext > xFirstParamContext;
if( nParamCount > nUnoParamCount )
{
@@ -3609,8 +3787,8 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
nParameterOffsetByContext = 1;
}
- UINT32 nEffectiveParamCount = nParamCount - nParameterOffsetByContext;
- UINT32 nAllocParamCount = nEffectiveParamCount;
+ sal_uInt32 nEffectiveParamCount = nParamCount - nParameterOffsetByContext;
+ sal_uInt32 nAllocParamCount = nEffectiveParamCount;
if( nEffectiveParamCount > nUnoParamCount )
{
if( !bRestParameterMode )
@@ -3637,9 +3815,9 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
args.realloc( nAllocParamCount );
Any* pAnyArgs = args.getArray();
- for( UINT32 i = 0 ; i < nEffectiveParamCount ; i++ )
+ for( sal_uInt32 i = 0 ; i < nEffectiveParamCount ; i++ )
{
- USHORT iSbx = (USHORT)(i + nSbxParameterOffset + nParameterOffsetByContext);
+ sal_uInt16 iSbx = (sal_uInt16)(i + nSbxParameterOffset + nParameterOffsetByContext);
// bRestParameterMode allows nEffectiveParamCount > nUnoParamCount
Reference< XParameter > xParam;
@@ -3661,7 +3839,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
if( !bOutParams )
{
if( xParam->isOut() )
- bOutParams = TRUE;
+ bOutParams = sal_True;
}
}
else
@@ -3706,14 +3884,14 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
const Any* pAnyArgs = args.getConstArray();
- for( UINT32 j = 0 ; j < nUnoParamCount ; j++ )
+ for( sal_uInt32 j = 0 ; j < nUnoParamCount ; j++ )
{
Reference< XParameter > xParam = pParameterSeq[j];
if( !xParam.is() )
continue;
if( xParam->isOut() )
- unoToSbxValue( (SbxVariable*)pParams->Get( (USHORT)(j+1) ), pAnyArgs[ j ] );
+ unoToSbxValue( (SbxVariable*)pParams->Get( (sal_uInt16)(j+1) ), pAnyArgs[ j ] );
}
}
}
@@ -3798,8 +3976,8 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
SbxVariable* pVar = pHint->GetVar();
SbxArray* pParams = pVar->GetParameters();
- UINT32 nParamCount = pParams ? ((UINT32)pParams->Count() - 1) : 0;
- UINT32 nAllowedParamCount = 1;
+ sal_uInt32 nParamCount = pParams ? ((sal_uInt32)pParams->Count() - 1) : 0;
+ sal_uInt32 nAllowedParamCount = 1;
Reference < XComponentContext > xContextToUse;
if( nParamCount > 0 )
@@ -3858,7 +4036,7 @@ public:
~BasicAllListener_Impl();
// Methods of XInterface
- //virtual BOOL queryInterface( Uik aUik, Reference< XInterface > & rOut );
+ //virtual sal_Bool queryInterface( Uik aUik, Reference< XInterface > & rOut );
// Methods of XAllListener
virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException );
@@ -3904,13 +4082,13 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
// Create in a Basic Array
SbxArrayRef xSbxArray = new SbxArray( SbxVARIANT );
const Any * pArgs = Event.Arguments.getConstArray();
- INT32 nCount = Event.Arguments.getLength();
- for( INT32 i = 0; i < nCount; i++ )
+ sal_Int32 nCount = Event.Arguments.getLength();
+ for( sal_Int32 i = 0; i < nCount; i++ )
{
// Convert elements
SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
- xSbxArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+ xSbxArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
}
pLib->Call( aMethodName, xSbxArray );
@@ -3922,7 +4100,7 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
if( pVar )
{
// #95792 Avoid a second call
- USHORT nFlags = pVar->GetFlags();
+ sal_uInt16 nFlags = pVar->GetFlags();
pVar->SetFlag( SBX_NO_BROADCAST );
*pRet = sbxToUnoValueImpl( pVar );
pVar->SetFlags( nFlags );
@@ -4117,7 +4295,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const ::rtl::OUStri
// Uno-Service erzeugen
// 1. Parameter == Prefix-Name of the macro
// 2. Parameter == fully qualified name of the listener
-void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
//RTLFUNC(CreateUnoListener)
{
(void)bWrite;
@@ -4181,7 +4359,7 @@ void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
//========================================================================
// Represents the DefaultContext property of the ProcessServiceManager
// in the Basic runtime system.
-void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
@@ -4209,11 +4387,13 @@ void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite
//========================================================================
// Creates a Basic wrapper object for a strongly typed Uno value
// 1. parameter: Uno type as full qualified type name, e.g. "byte[]"
-void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
{
(void)pBasic;
(void)bWrite;
+ static String aTypeTypeString( RTL_CONSTASCII_USTRINGPARAM("type") );
+
// 2 parameters needed
if ( rPar.Count() != 3 )
{
@@ -4225,6 +4405,41 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
String aTypeName = rPar.Get(1)->GetString();
SbxVariable* pVal = rPar.Get(2);
+ if( aTypeName == aTypeTypeString )
+ {
+ SbxDataType eBaseType = pVal->SbxValue::GetType();
+ String aValTypeName;
+ if( eBaseType == SbxSTRING )
+ {
+ aValTypeName = pVal->GetString();
+ }
+ else if( eBaseType == SbxOBJECT )
+ {
+ // XIdlClass?
+ Reference< XIdlClass > xIdlClass;
+
+ SbxBaseRef pObj = (SbxBase*)pVal->GetObject();
+ if( pObj && pObj->ISA(SbUnoObject) )
+ {
+ Any aUnoAny = ((SbUnoObject*)(SbxBase*)pObj)->getUnoAny();
+ aUnoAny >>= xIdlClass;
+ }
+
+ if( xIdlClass.is() )
+ aValTypeName = xIdlClass->getName();
+ }
+ Type aType;
+ bool bSuccess = implGetTypeByName( aValTypeName, aType );
+ if( bSuccess )
+ {
+ Any aTypeAny( aType );
+ SbxVariableRef refVar = rPar.Get(0);
+ SbxObjectRef xUnoAnyObject = new SbUnoAnyObject( aTypeAny );
+ refVar->PutObject( xUnoAnyObject );
+ }
+ return;
+ }
+
// Check the type
Reference< XHierarchicalNameAccess > xTypeAccess = getTypeProvider_Impl();
Any aRet;
@@ -4280,14 +4495,26 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
//==========================================================================
-typedef WeakImplHelper1< XInvocation > ModuleInvocationProxyHelper;
+namespace {
+class OMutexBasis
+{
+protected:
+ // this mutex is necessary for OInterfaceContainerHelper
+ ::osl::Mutex m_aMutex;
+};
+} // namespace
+
+typedef WeakImplHelper2< XInvocation, XComponent > ModuleInvocationProxyHelper;
-class ModuleInvocationProxy : public ModuleInvocationProxyHelper
+class ModuleInvocationProxy : public OMutexBasis,
+ public ModuleInvocationProxyHelper
{
::rtl::OUString m_aPrefix;
SbxObjectRef m_xScopeObj;
bool m_bProxyIsClassModuleObject;
+ ::cppu::OInterfaceContainerHelper m_aListeners;
+
public:
ModuleInvocationProxy( const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj );
~ModuleInvocationProxy()
@@ -4307,11 +4534,17 @@ public:
Sequence< sal_Int16 >& rOutParamIndex,
Sequence< Any >& rOutParam )
throw( CannotConvertException, InvocationTargetException );
+
+ // XComponent
+ virtual void SAL_CALL dispose() throw(RuntimeException);
+ virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException);
+ virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException);
};
ModuleInvocationProxy::ModuleInvocationProxy( const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj )
: m_aPrefix( aPrefix + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_") ) )
, m_xScopeObj( xScopeObj )
+ , m_aListeners( m_aMutex )
{
m_bProxyIsClassModuleObject = xScopeObj.Is() ? xScopeObj->ISA(SbClassModuleObject) : false;
}
@@ -4408,13 +4641,27 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const ::rtl::OUString& rFunction,
SolarMutexGuard guard;
Any aRet;
- if( !m_xScopeObj.Is() )
+ SbxObjectRef xScopeObj = m_xScopeObj;
+ if( !xScopeObj.Is() )
return aRet;
::rtl::OUString aFunctionName = m_aPrefix;
aFunctionName += rFunction;
- SbxVariable* p = m_xScopeObj->Find( aFunctionName, SbxCLASS_METHOD );
+ sal_Bool bSetRescheduleBack = sal_False;
+ sal_Bool bOldReschedule = sal_True;
+ SbiInstance* pInst = pINST;
+ if( pInst && pInst->IsCompatibility() )
+ {
+ bOldReschedule = pInst->IsReschedule();
+ if ( bOldReschedule )
+ {
+ pInst->EnableReschedule( sal_False );
+ bSetRescheduleBack = sal_True;
+ }
+ }
+
+ SbxVariable* p = xScopeObj->Find( aFunctionName, SbxCLASS_METHOD );
SbMethod* pMeth = p != NULL ? PTR_CAST(SbMethod,p) : NULL;
if( pMeth == NULL )
{
@@ -4434,7 +4681,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const ::rtl::OUString& rFunction,
{
SbxVariableRef xVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( (SbxVariable*)xVar, pArgs[i] );
- xArray->Put( xVar, sal::static_int_cast< USHORT >(i+1) );
+ xArray->Put( xVar, sal::static_int_cast< sal_uInt16 >(i+1) );
}
}
@@ -4446,11 +4693,38 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const ::rtl::OUString& rFunction,
aRet = sbxToUnoValue( xValue );
pMeth->SetParameters( NULL );
+ if( bSetRescheduleBack )
+ pInst->EnableReschedule( bOldReschedule );
+
// TODO: OutParameter?
return aRet;
}
+void SAL_CALL ModuleInvocationProxy::dispose()
+ throw(RuntimeException)
+{
+ ::osl::MutexGuard aGuard( m_aMutex );
+
+ EventObject aEvent( (XComponent*)this );
+ m_aListeners.disposeAndClear( aEvent );
+
+ m_xScopeObj = NULL;
+}
+
+void SAL_CALL ModuleInvocationProxy::addEventListener( const Reference< XEventListener >& xListener )
+ throw (RuntimeException)
+{
+ m_aListeners.addInterface( xListener );
+}
+
+void SAL_CALL ModuleInvocationProxy::removeEventListener( const Reference< XEventListener >& xListener )
+ throw (RuntimeException)
+{
+ m_aListeners.removeInterface( xListener );
+}
+
+
Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::OUString& aVBAType,
const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj )
{
@@ -4480,6 +4754,97 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::
return xRet;
}
+typedef std::vector< WeakReference< XComponent > > ComponentRefVector;
+
+struct StarBasicDisposeItem
+{
+ StarBASIC* m_pBasic;
+ SbxArrayRef m_pRegisteredVariables;
+ ComponentRefVector m_vComImplementsObjects;
+
+ StarBasicDisposeItem( StarBASIC* pBasic )
+ : m_pBasic( pBasic )
+ {
+ m_pRegisteredVariables = new SbxArray();
+ }
+};
+
+typedef std::vector< StarBasicDisposeItem* > DisposeItemVector;
+
+static DisposeItemVector GaDisposeItemVector;
+
+DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic )
+{
+ DisposeItemVector::iterator it;
+ for( it = GaDisposeItemVector.begin() ; it != GaDisposeItemVector.end() ; ++it )
+ {
+ StarBasicDisposeItem* pItem = *it;
+ if( pItem->m_pBasic == pBasic )
+ return it;
+ }
+ return GaDisposeItemVector.end();
+}
+
+StarBasicDisposeItem* lcl_getOrCreateItemForBasic( StarBASIC* pBasic )
+{
+ DisposeItemVector::iterator it = lcl_findItemForBasic( pBasic );
+ StarBasicDisposeItem* pItem = (it != GaDisposeItemVector.end()) ? *it : NULL;
+ if( pItem == NULL )
+ {
+ pItem = new StarBasicDisposeItem( pBasic );
+ GaDisposeItemVector.push_back( pItem );
+ }
+ return pItem;
+}
+
+void registerComponentToBeDisposedForBasic
+ ( Reference< XComponent > xComponent, StarBASIC* pBasic )
+{
+ StarBasicDisposeItem* pItem = lcl_getOrCreateItemForBasic( pBasic );
+ pItem->m_vComImplementsObjects.push_back( xComponent );
+}
+
+void registerComListenerVariableForBasic( SbxVariable* pVar, StarBASIC* pBasic )
+{
+ StarBasicDisposeItem* pItem = lcl_getOrCreateItemForBasic( pBasic );
+ SbxArray* pArray = pItem->m_pRegisteredVariables;
+ pArray->Put( pVar, pArray->Count() );
+}
+
+void disposeComVariablesForBasic( StarBASIC* pBasic )
+{
+ DisposeItemVector::iterator it = lcl_findItemForBasic( pBasic );
+ if( it != GaDisposeItemVector.end() )
+ {
+ StarBasicDisposeItem* pItem = *it;
+
+ SbxArray* pArray = pItem->m_pRegisteredVariables;
+ sal_uInt16 nCount = pArray->Count();
+ for( sal_uInt16 i = 0 ; i < nCount ; ++i )
+ {
+ SbxVariable* pVar = pArray->Get( i );
+ pVar->ClearComListener();
+ }
+
+ ComponentRefVector& rv = pItem->m_vComImplementsObjects;
+ ComponentRefVector::iterator itCRV;
+ for( itCRV = rv.begin() ; itCRV != rv.end() ; ++itCRV )
+ {
+ try
+ {
+ Reference< XComponent > xComponent( (*itCRV).get(), UNO_QUERY_THROW );
+ xComponent->dispose();
+ }
+ catch( Exception& )
+ {}
+ }
+
+ delete pItem;
+ GaDisposeItemVector.erase( it );
+ }
+}
+
+
// Handle module implements mechanism for OLE types
bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject )
{
@@ -4500,8 +4865,8 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
bool bSuccess = false;
SbxArray* pModIfaces = pClassData->mxIfaces;
- USHORT nCount = pModIfaces->Count();
- for( USHORT i = 0 ; i < nCount ; ++i )
+ sal_uInt16 nCount = pModIfaces->Count();
+ for( sal_uInt16 i = 0 ; i < nCount ; ++i )
{
SbxVariable* pVar = pModIfaces->Get( i );
::rtl::OUString aIfaceName = pVar->GetName();
@@ -4533,6 +4898,23 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
if( bSuccess )
{
+ Reference< XComponent > xComponent( xProxy, UNO_QUERY );
+ if( xComponent.is() )
+ {
+ StarBASIC* pParentBasic = NULL;
+ SbxObject* pCurObject = this;
+ do
+ {
+ SbxObject* pObjParent = pCurObject->GetParent();
+ pParentBasic = PTR_CAST( StarBASIC, pObjParent );
+ pCurObject = pObjParent;
+ }
+ while( pParentBasic == NULL && pCurObject != NULL );
+
+ OSL_ASSERT( pParentBasic != NULL );
+ registerComponentToBeDisposedForBasic( xComponent, pParentBasic );
+ }
+
o_rRetAny <<= xRet;
break;
}
@@ -4542,4 +4924,31 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP
return bSuccess;
}
+
+// Due to an incorrect behavior IE returns an object instead of a string
+// in some scenarios. Calling toString at the object may correct this.
+// Helper function used in sbxvalue.cxx
+bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal )
+{
+ bool bSuccess = false;
+
+ SbUnoObject* pUnoObj = NULL;
+ if( pObj != NULL && (pUnoObj = PTR_CAST(SbUnoObject,(SbxObject*)pObj)) != NULL )
+ {
+ // Only for native COM objects
+ if( pUnoObj->isNativeCOMObject() )
+ {
+ SbxVariableRef pMeth = pObj->Find( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "toString" ) ), SbxCLASS_METHOD );
+ if ( pMeth.Is() )
+ {
+ SbxValues aRes;
+ pMeth->Get( aRes );
+ pVal->Put( aRes );
+ bSuccess = true;
+ }
+ }
+ }
+ return bSuccess;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 28b783c3d7d8..55c3d9037ef9 100644..100755
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -51,12 +51,16 @@
#include <basic/basrdll.hxx>
#include <osl/mutex.hxx>
#include <basic/sbobjmod.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <basic/vbahelper.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <unotools/eventcfg.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/script/ModuleType.hpp>
#include <com/sun/star/script/vba/XVBACompatibility.hpp>
#include <com/sun/star/document/XVbaMethodParameter.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/document/XEventBroadcaster.hpp>
+#include <com/sun/star/document/XEventListener.hpp>
using namespace com::sun::star;
@@ -263,7 +267,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
if ( pInfo )
{
sal_Int32 nSbxOptional = 0;
- USHORT n = 1;
+ sal_uInt16 n = 1;
for ( const SbxParamInfo* pParamInfo = pInfo->GetParam( n ); pParamInfo; pParamInfo = pInfo->GetParam( ++n ) )
{
if ( ( pParamInfo->nFlags & SBX_OPTIONAL ) != 0 )
@@ -287,7 +291,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
{
SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), pParams[i] );
- xSbxParams->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+ xSbxParams->Put( xSbxVar, static_cast< sal_uInt16 >( i ) + 1 );
// Enable passing by ref
if ( xSbxVar->GetType() != SbxVARIANT )
@@ -309,7 +313,7 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
if ( pInfo_ )
{
OutParamMap aOutParamMap;
- for ( USHORT n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
+ for ( sal_uInt16 n = 1, nCount = xSbxParams->Count(); n < nCount; ++n )
{
const SbxParamInfo* pParamInfo = pInfo_->GetParam( n );
if ( pParamInfo && ( pParamInfo->eType & SbxBYREF ) != 0 )
@@ -407,7 +411,7 @@ SbMethodRef DocObjectWrapper::getMethod( const rtl::OUString& aName ) throw (Run
SbMethodRef pMethod = NULL;
if ( m_pMod )
{
- USHORT nSaveFlgs = m_pMod->GetFlags();
+ sal_uInt16 nSaveFlgs = m_pMod->GetFlags();
// Limit search to this module
m_pMod->ResetFlag( SBX_GBLSEARCH );
pMethod = (SbMethod*) m_pMod->SbModule::Find( aName, SbxCLASS_METHOD );
@@ -422,7 +426,7 @@ SbPropertyRef DocObjectWrapper::getProperty( const rtl::OUString& aName ) throw
SbPropertyRef pProperty = NULL;
if ( m_pMod )
{
- USHORT nSaveFlgs = m_pMod->GetFlags();
+ sal_uInt16 nSaveFlgs = m_pMod->GetFlags();
// Limit search to this module.
m_pMod->ResetFlag( SBX_GBLSEARCH );
pProperty = (SbProperty*)m_pMod->SbModule::Find( aName, SbxCLASS_PROPERTY );
@@ -441,11 +445,7 @@ TYPEINIT1(SbJScriptMethod,SbMethod)
TYPEINIT1(SbObjModule,SbModule)
TYPEINIT1(SbUserFormModule,SbObjModule)
-SV_DECL_VARARR(SbiBreakpoints,USHORT,4,4)
-SV_IMPL_VARARR(SbiBreakpoints,USHORT)
-
-
-SV_IMPL_VARARR(HighlightPortions, HighlightPortion)
+typedef std::vector<HighlightPortion> HighlightPortions;
bool getDefaultVBAMode( StarBASIC* pb )
{
@@ -497,30 +497,18 @@ IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, /*pNull*/ )
return 0L;
}
-bool UnlockControllerHack( StarBASIC* pBasic )
+void VBAUnlockDocuments( StarBASIC* pBasic )
{
- bool bRes = false;
if ( pBasic && pBasic->IsDocBasic() )
{
- uno::Any aUnoVar;
- ::rtl::OUString sVarName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" )) );
- SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( pBasic->Find( sVarName, SbxCLASS_DONTCARE ) );
+ SbUnoObject* pGlobs = dynamic_cast< SbUnoObject* >( pBasic->Find( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) ), SbxCLASS_DONTCARE ) );
if ( pGlobs )
- aUnoVar = pGlobs->getUnoAny();
- uno::Reference< frame::XModel > xModel( aUnoVar, uno::UNO_QUERY);
- if ( xModel.is() )
{
- try
- {
- xModel->unlockControllers();
- bRes = true;
- }
- catch( uno::Exception& )
- {
- }
+ uno::Reference< frame::XModel > xModel( pGlobs->getUnoAny(), uno::UNO_QUERY );
+ ::basic::vba::lockControllersOfAllDocuments( xModel, sal_False );
+ ::basic::vba::enableContainerWindowsOfAllDocuments( xModel, sal_True );
}
}
- return bRes;
}
/////////////////////////////////////////////////////////////////////////////
@@ -528,7 +516,7 @@ bool UnlockControllerHack( StarBASIC* pBasic )
// A Basic module has set EXTSEARCH, so that the elements, that the modul contains,
// could be found from other module.
-SbModule::SbModule( const String& rName, BOOL bVBACompat )
+SbModule::SbModule( const String& rName, sal_Bool bVBACompat )
: SbxObject( String( RTL_CONSTASCII_USTRINGPARAM("StarBASICModule") ) ),
pImage( NULL ), pBreaks( NULL ), pClassData( NULL ), mbVBACompat( bVBACompat ), pDocObject( NULL ), bIsProxyModule( false )
{
@@ -564,9 +552,9 @@ SbModule::GetUnoModule()
return mxWrapper;
}
-BOOL SbModule::IsCompiled() const
+sal_Bool SbModule::IsCompiled() const
{
- return BOOL( pImage != 0 );
+ return sal_Bool( pImage != 0 );
}
const SbxObject* SbModule::FindType( String aTypeName ) const
@@ -585,12 +573,12 @@ void SbModule::StartDefinitions()
// methods and properties persist, but they are invalid;
// at least are the information under certain conditions clogged
- USHORT i;
+ sal_uInt16 i;
for( i = 0; i < pMethods->Count(); i++ )
{
SbMethod* p = PTR_CAST(SbMethod,pMethods->Get( i ) );
if( p )
- p->bInvalid = TRUE;
+ p->bInvalid = sal_True;
}
for( i = 0; i < pProps->Count(); )
{
@@ -616,11 +604,11 @@ SbMethod* SbModule::GetMethod( const String& rName, SbxDataType t )
pMeth->SetParent( this );
pMeth->SetFlags( SBX_READ );
pMethods->Put( pMeth, pMethods->Count() );
- StartListening( pMeth->GetBroadcaster(), TRUE );
+ StartListening( pMeth->GetBroadcaster(), sal_True );
}
// The method is per default valid, because it could be
// created from the compiler (code generator) as well.
- pMeth->bInvalid = FALSE;
+ pMeth->bInvalid = sal_False;
pMeth->ResetFlag( SBX_FIXED );
pMeth->SetFlag( SBX_WRITE );
pMeth->SetType( t );
@@ -644,7 +632,7 @@ SbProperty* SbModule::GetProperty( const String& rName, SbxDataType t )
pProp->SetFlag( SBX_READWRITE );
pProp->SetParent( this );
pProps->Put( pProp, pProps->Count() );
- StartListening( pProp->GetBroadcaster(), TRUE );
+ StartListening( pProp->GetBroadcaster(), sal_True );
}
return pProp;
}
@@ -662,7 +650,7 @@ SbProcedureProperty* SbModule::GetProcedureProperty
pProp->SetFlag( SBX_READWRITE );
pProp->SetParent( this );
pProps->Put( pProp, pProps->Count() );
- StartListening( pProp->GetBroadcaster(), TRUE );
+ StartListening( pProp->GetBroadcaster(), sal_True );
}
return pProp;
}
@@ -681,7 +669,7 @@ SbIfaceMapperMethod* SbModule::GetIfaceMapperMethod
pMapperMethod->SetFlags( SBX_READ );
pMethods->Put( pMapperMethod, pMethods->Count() );
}
- pMapperMethod->bInvalid = FALSE;
+ pMapperMethod->bInvalid = sal_False;
return pMapperMethod;
}
@@ -694,9 +682,9 @@ TYPEINIT1(SbIfaceMapperMethod,SbMethod)
// From the code generator: remove invalid entries
-void SbModule::EndDefinitions( BOOL bNewState )
+void SbModule::EndDefinitions( sal_Bool bNewState )
{
- for( USHORT i = 0; i < pMethods->Count(); )
+ for( sal_uInt16 i = 0; i < pMethods->Count(); )
{
SbMethod* p = PTR_CAST(SbMethod,pMethods->Get( i ) );
if( p )
@@ -712,7 +700,7 @@ void SbModule::EndDefinitions( BOOL bNewState )
else
i++;
}
- SetModified( TRUE );
+ SetModified( sal_True );
}
void SbModule::Clear()
@@ -808,12 +796,12 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
aVals.eType = SbxVARIANT;
SbxArray* pArg = pVar->GetParameters();
- USHORT nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
+ sal_uInt16 nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
if( nVarParCount > 1 )
{
SbxArrayRef xMethParameters = new SbxArray;
xMethParameters->Put( pMethVar, 0 ); // Method as parameter 0
- for( USHORT i = 1 ; i < nVarParCount ; ++i )
+ for( sal_uInt16 i = 1 ; i < nVarParCount ; ++i )
{
SbxVariable* pPar = pArg->Get( i );
xMethParameters->Put( pPar, i );
@@ -895,7 +883,7 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
// side effects when using name as variable implicitely
bool bForwardToSbxObject = true;
- ULONG nId = pHint->GetId();
+ sal_uIntPtr nId = pHint->GetId();
if( (nId == SBX_HINT_DATAWANTED || nId == SBX_HINT_DATACHANGED) &&
pVar->GetName().EqualsIgnoreCaseAscii( "name" ) )
bForwardToSbxObject = false;
@@ -953,7 +941,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
aTok.SetCompatible( true );
else if ( ( eCurTok == VBASUPPORT ) && ( aTok.Next() == NUMBER ) )
{
- BOOL bIsVBA = ( aTok.GetDbl()== 1 );
+ sal_Bool bIsVBA = ( aTok.GetDbl()== 1 );
SetVBACompat( bIsVBA );
aTok.SetCompatible( bIsVBA );
}
@@ -965,7 +953,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
SbMethod* pMeth = NULL;
if( eEndTok != NIL )
{
- USHORT nLine1 = aTok.GetLine();
+ sal_uInt16 nLine1 = aTok.GetLine();
if( aTok.Next() == SYMBOL )
{
String aName_( aTok.GetSym() );
@@ -975,7 +963,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
pMeth = GetMethod( aName_, t );
pMeth->nLine1 = pMeth->nLine2 = nLine1;
// The method is for a start VALID
- pMeth->bInvalid = FALSE;
+ pMeth->bInvalid = sal_False;
}
else
eEndTok = NIL;
@@ -995,18 +983,18 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
pMeth->nLine2 = aTok.GetLine();
}
}
- EndDefinitions( TRUE );
+ EndDefinitions( sal_True );
}
void SbModule::SetComment( const String& r )
{
aComment = r;
- SetModified( TRUE );
+ SetModified( sal_True );
}
-SbMethod* SbModule::GetFunctionForLine( USHORT nLine )
+SbMethod* SbModule::GetFunctionForLine( sal_uInt16 nLine )
{
- for( USHORT i = 0; i < pMethods->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pMethods->Count(); i++ )
{
SbMethod* p = (SbMethod*) pMethods->Get( i );
if( p->GetSbxId() == SBXID_BASICMETHOD )
@@ -1020,14 +1008,14 @@ SbMethod* SbModule::GetFunctionForLine( USHORT nLine )
// Broadcast of a hint to all Basics
-static void _SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
+static void _SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
{
// Self a BASIC?
if( pObj->IsA( TYPE(StarBASIC) ) && pObj->IsBroadcaster() )
pObj->GetBroadcaster().Broadcast( SbxHint( nId, p ) );
// Then ask for the subobjects
SbxArray* pObjs = pObj->GetObjects();
- for( USHORT i = 0; i < pObjs->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pObjs->Count(); i++ )
{
SbxVariable* pVar = pObjs->Get( i );
if( pVar->IsA( TYPE(SbxObject) ) )
@@ -1035,7 +1023,7 @@ static void _SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
}
}
-static void SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
+static void SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
{
while( pObj->GetParent() )
pObj = pObj->GetParent();
@@ -1072,8 +1060,8 @@ void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic )
// Go over all Sub-Basics
SbxArray* pObjs = pBasic->GetObjects();
- USHORT nCount = pObjs->Count();
- for( USHORT i = 0 ; i < nCount ; i++ )
+ sal_uInt16 nCount = pObjs->Count();
+ for( sal_uInt16 i = 0 ; i < nCount ; i++ )
{
SbxVariable* pObjVar = pObjs->Get( i );
StarBASIC* pSubBasic = PTR_CAST( StarBASIC, pObjVar );
@@ -1097,25 +1085,25 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
if( ((StarBASIC*)p) != pBasic )
ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p );
}
-BOOL SbModule::IsVBACompat() const
+sal_Bool SbModule::IsVBACompat() const
{
return mbVBACompat;
}
-void SbModule::SetVBACompat( BOOL bCompat )
+void SbModule::SetVBACompat( sal_Bool bCompat )
{
mbVBACompat = bCompat;
}
// Run a Basic-subprogram
-USHORT SbModule::Run( SbMethod* pMeth )
+sal_uInt16 SbModule::Run( SbMethod* pMeth )
{
OSL_TRACE("About to run %s, vba compatmode is %d", rtl::OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), mbVBACompat );
- static USHORT nMaxCallLevel = 0;
+ static sal_uInt16 nMaxCallLevel = 0;
static String aMSOMacroRuntimeLibName = String::CreateFromAscii( "Launcher" );
static String aMSOMacroRuntimeAppSymbol = String::CreateFromAscii( "Application" );
- USHORT nRes = 0;
- BOOL bDelInst = BOOL( pINST == NULL );
+ sal_uInt16 nRes = 0;
+ sal_Bool bDelInst = sal_Bool( pINST == NULL );
bool bQuit = false;
StarBASICRef xBasic;
if( bDelInst )
@@ -1160,7 +1148,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
GlobalRunInit( /* bBasicStart = */ bDelInst );
// Appeared a compiler error? Then we don't launch
- if( GetSbData()->bGlobalInitErr == FALSE )
+ if( GetSbData()->bGlobalInitErr == sal_False )
{
if( bDelInst )
{
@@ -1182,7 +1170,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
pINST->pRun = pRt;
if ( mbVBACompat )
{
- pINST->EnableCompatibility( TRUE );
+ pINST->EnableCompatibility( sal_True );
}
while( pRt->Step() ) {}
if( pRt->pNext )
@@ -1202,7 +1190,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
GetpApp()->Yield();
}
- nRes = TRUE;
+ nRes = sal_True;
pINST->pRun = pRt->pNext;
pINST->nCallLvl--; // Call-Level down again
@@ -1214,29 +1202,30 @@ USHORT SbModule::Run( SbMethod* pMeth )
delete pRt;
pMOD = pOldMod;
- if ( pINST->nCallLvl == 0 && IsVBACompat() )
- {
- // VBA always ensure screenupdating is enabled after completing
- StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
- if ( pBasic && pBasic->IsDocBasic() )
- {
- UnlockControllerHack( pBasic );
- }
- }
if( bDelInst )
{
// #57841 Clear Uno-Objects, which were helt in RTL functions,
// at the end of the program, so that nothing were helt.
ClearUnoObjectsInRTL_Impl( xBasic );
+ clearNativeObjectWrapperVector();
+
DBG_ASSERT(pINST->nCallLvl==0,"BASIC-Call-Level > 0");
- delete pINST, pINST = NULL, bDelInst = FALSE;
+ delete pINST, pINST = NULL, bDelInst = sal_False;
// #i30690
SolarMutexGuard aSolarGuard;
SendHint( GetParent(), SBX_HINT_BASICSTOP, pMeth );
GlobalRunDeInit();
+
+ // VBA always ensures screenupdating is enabled after completing
+ if ( mbVBACompat )
+ VBAUnlockDocuments( PTR_CAST( StarBASIC, GetParent() ) );
+
+#ifdef DBG_TRACE_BASIC
+ dbg_DeInitTrace();
+#endif
}
}
else
@@ -1248,10 +1237,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
StarBASIC::FatalError( SbERR_STACK_OVERFLOW );
}
- // VBA always ensure screenupdating is enabled after completing
StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
- if ( pBasic && pBasic->IsDocBasic() && !pINST )
- UnlockControllerHack( pBasic );
if( bDelInst )
{
// #57841 Clear Uno-Objects, which were helt in RTL functions,
@@ -1281,9 +1267,9 @@ void SbModule::RunInit()
&& pImage->GetFlag( SBIMG_INITCODE ) )
{
// Set flag, so that RunInit get activ (Testtool)
- GetSbData()->bRunInit = TRUE;
+ GetSbData()->bRunInit = sal_True;
- // BOOL bDelInst = BOOL( pINST == NULL );
+ // sal_Bool bDelInst = sal_Bool( pINST == NULL );
// if( bDelInst )
// pINST = new SbiInstance( (StarBASIC*) GetParent() );
SbModule* pOldMod = pMOD;
@@ -1300,11 +1286,11 @@ void SbModule::RunInit()
pMOD = pOldMod;
// if( bDelInst )
// delete pINST, pINST = NULL;
- pImage->bInit = TRUE;
- pImage->bFirstInit = FALSE;
+ pImage->bInit = sal_True;
+ pImage->bFirstInit = sal_False;
// RunInit is not activ anymore
- GetSbData()->bRunInit = FALSE;
+ GetSbData()->bRunInit = sal_False;
}
}
@@ -1338,7 +1324,7 @@ void SbModule::RemoveVars()
void SbModule::ClearPrivateVars()
{
- for( USHORT i = 0 ; i < pProps->Count() ; i++ )
+ for( sal_uInt16 i = 0 ; i < pProps->Count() ; i++ )
{
SbProperty* p = PTR_CAST(SbProperty,pProps->Get( i ) );
if( p )
@@ -1349,12 +1335,12 @@ void SbModule::ClearPrivateVars()
SbxArray* pArray = PTR_CAST(SbxArray,p->GetObject());
if( pArray )
{
- for( USHORT j = 0 ; j < pArray->Count() ; j++ )
+ for( sal_uInt16 j = 0 ; j < pArray->Count() ; j++ )
{
SbxVariable* pj = PTR_CAST(SbxVariable,pArray->Get( j ));
pj->SbxValue::Clear();
/*
- USHORT nFlags = pj->GetFlags();
+ sal_uInt16 nFlags = pj->GetFlags();
pj->SetFlags( (nFlags | SBX_WRITE) & (~SBX_FIXED) );
pj->PutEmpty();
pj->SetFlags( nFlags );
@@ -1366,7 +1352,7 @@ void SbModule::ClearPrivateVars()
{
p->SbxValue::Clear();
/*
- USHORT nFlags = p->GetFlags();
+ sal_uInt16 nFlags = p->GetFlags();
p->SetFlags( (nFlags | SBX_WRITE) & (~SBX_FIXED) );
p->PutEmpty();
p->SetFlags( nFlags );
@@ -1376,23 +1362,76 @@ void SbModule::ClearPrivateVars()
}
}
-// At first in this module, to remain 358-capable
-// (Avoid branch in sb.cxx)
+void SbModule::implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic )
+{
+ if( pVar->SbxValue::GetType() != SbxOBJECT || pVar->ISA( SbProcedureProperty ) )
+ return;
+
+ SbxObject* pObj = PTR_CAST(SbxObject,pVar->GetObject());
+ if( pObj != NULL )
+ {
+ SbxObject* p = pObj;
+
+ SbModule* pMod = PTR_CAST( SbModule, p );
+ if( pMod != NULL )
+ pMod->ClearVarsDependingOnDeletedBasic( pDeletedBasic );
+
+ while( (p = p->GetParent()) != NULL )
+ {
+ StarBASIC* pBasic = PTR_CAST( StarBASIC, p );
+ if( pBasic != NULL && pBasic == pDeletedBasic )
+ {
+ pVar->SbxValue::Clear();
+ break;
+ }
+ }
+ }
+}
+
+void SbModule::ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic )
+{
+ (void)pDeletedBasic;
+
+ for( sal_uInt16 i = 0 ; i < pProps->Count() ; i++ )
+ {
+ SbProperty* p = PTR_CAST(SbProperty,pProps->Get( i ) );
+ if( p )
+ {
+ if( p->GetType() & SbxARRAY )
+ {
+ SbxArray* pArray = PTR_CAST(SbxArray,p->GetObject());
+ if( pArray )
+ {
+ for( sal_uInt16 j = 0 ; j < pArray->Count() ; j++ )
+ {
+ SbxVariable* pVar = PTR_CAST(SbxVariable,pArray->Get( j ));
+ implClearIfVarDependsOnDeletedBasic( pVar, pDeletedBasic );
+ }
+ }
+ }
+ else
+ {
+ implClearIfVarDependsOnDeletedBasic( p, pDeletedBasic );
+ }
+ }
+ }
+}
+
void StarBASIC::ClearAllModuleVars( void )
{
// Initialise the own module
- for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ )
+ for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ )
{
SbModule* pModule = (SbModule*)pModules->Get( nMod );
// Initialise only, if the startcode was already executed
- if( pModule->pImage && pModule->pImage->bInit )
+ if( pModule->pImage && pModule->pImage->bInit && !pModule->isProxyModule() && !pModule->ISA(SbObjModule) )
pModule->ClearPrivateVars();
}
}
// Execution of the init-code of all module
-void SbModule::GlobalRunInit( BOOL bBasicStart )
+void SbModule::GlobalRunInit( sal_Bool bBasicStart )
{
// If no Basic-Start, only initialise, if the module is not initialised
if( !bBasicStart )
@@ -1403,7 +1442,7 @@ void SbModule::GlobalRunInit( BOOL bBasicStart )
// With the help of this flags could be located in SbModule::Run() after the call of
// GlobalRunInit, if at the intialising of the module
// an error occurred. Then it will not be launched.
- GetSbData()->bGlobalInitErr = FALSE;
+ GetSbData()->bGlobalInitErr = sal_False;
// Parent of the module is a Basic
StarBASIC *pBasic = PTR_CAST(StarBASIC,GetParent());
@@ -1450,15 +1489,15 @@ void SbModule::GlobalRunDeInit( void )
// Search for the next STMNT-Command in the code. This was used from the STMNT-
// Opcode to set the endcolumn.
-const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol ) const
+const sal_uInt8* SbModule::FindNextStmnt( const sal_uInt8* p, sal_uInt16& nLine, sal_uInt16& nCol ) const
{
- return FindNextStmnt( p, nLine, nCol, FALSE );
+ return FindNextStmnt( p, nLine, nCol, sal_False );
}
-const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
- BOOL bFollowJumps, const SbiImage* pImg ) const
+const sal_uInt8* SbModule::FindNextStmnt( const sal_uInt8* p, sal_uInt16& nLine, sal_uInt16& nCol,
+ sal_Bool bFollowJumps, const SbiImage* pImg ) const
{
- UINT32 nPC = (UINT32) ( p - (const BYTE*) pImage->GetCode() );
+ sal_uInt32 nPC = (sal_uInt32) ( p - (const sal_uInt8*) pImage->GetCode() );
while( nPC < pImage->GetCodeSize() )
{
SbiOpcode eOp = (SbiOpcode ) ( *p++ );
@@ -1466,20 +1505,20 @@ const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
if( bFollowJumps && eOp == _JUMP && pImg )
{
DBG_ASSERT( pImg, "FindNextStmnt: pImg==NULL with FollowJumps option" );
- UINT32 nOp1 = *p++; nOp1 |= *p++ << 8;
+ sal_uInt32 nOp1 = *p++; nOp1 |= *p++ << 8;
nOp1 |= *p++ << 16; nOp1 |= *p++ << 24;
- p = (const BYTE*) pImg->GetCode() + nOp1;
+ p = (const sal_uInt8*) pImg->GetCode() + nOp1;
}
else if( eOp >= SbOP1_START && eOp <= SbOP1_END )
p += 4, nPC += 4;
else if( eOp == _STMNT )
{
- UINT32 nl, nc;
+ sal_uInt32 nl, nc;
nl = *p++; nl |= *p++ << 8;
nl |= *p++ << 16 ; nl |= *p++ << 24;
nc = *p++; nc |= *p++ << 8;
nc |= *p++ << 16 ; nc |= *p++ << 24;
- nLine = (USHORT)nl; nCol = (USHORT)nc;
+ nLine = (sal_uInt16)nl; nCol = (sal_uInt16)nc;
return p;
}
else if( eOp >= SbOP2_START && eOp <= SbOP2_END )
@@ -1495,67 +1534,63 @@ const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
// Test, if a line contains STMNT-Opcodes
-BOOL SbModule::IsBreakable( USHORT nLine ) const
+sal_Bool SbModule::IsBreakable( sal_uInt16 nLine ) const
{
if( !pImage )
- return FALSE;
- const BYTE* p = (const BYTE* ) pImage->GetCode();
- USHORT nl, nc;
+ return sal_False;
+ const sal_uInt8* p = (const sal_uInt8* ) pImage->GetCode();
+ sal_uInt16 nl, nc;
while( ( p = FindNextStmnt( p, nl, nc ) ) != NULL )
if( nl == nLine )
- return TRUE;
- return FALSE;
+ return sal_True;
+ return sal_False;
}
-USHORT SbModule::GetBPCount() const
+size_t SbModule::GetBPCount() const
{
- return pBreaks ? pBreaks->Count() : 0;
+ return pBreaks ? pBreaks->size() : 0;
}
-USHORT SbModule::GetBP( USHORT n ) const
+sal_uInt16 SbModule::GetBP( size_t n ) const
{
- if( pBreaks && n < pBreaks->Count() )
- return pBreaks->GetObject( n );
+ if( pBreaks && n < pBreaks->size() )
+ return pBreaks->operator[]( n );
else
return 0;
}
-BOOL SbModule::IsBP( USHORT nLine ) const
+sal_Bool SbModule::IsBP( sal_uInt16 nLine ) const
{
if( pBreaks )
{
- const USHORT* p = pBreaks->GetData();
- USHORT n = pBreaks->Count();
- for( USHORT i = 0; i < n; i++, p++ )
+ for( size_t i = 0; i < pBreaks->size(); i++ )
{
- USHORT b = *p;
+ sal_uInt16 b = pBreaks->operator[]( i );
if( b == nLine )
- return TRUE;
+ return sal_True;
if( b < nLine )
break;
}
}
- return FALSE;
+ return sal_False;
}
-BOOL SbModule::SetBP( USHORT nLine )
+sal_Bool SbModule::SetBP( sal_uInt16 nLine )
{
if( !IsBreakable( nLine ) )
- return FALSE;
+ return sal_False;
if( !pBreaks )
pBreaks = new SbiBreakpoints;
- const USHORT* p = pBreaks->GetData();
- USHORT n = pBreaks->Count();
- USHORT i;
- for( i = 0; i < n; i++, p++ )
+ size_t i;
+ for( i = 0; i < pBreaks->size(); i++ )
{
- USHORT b = *p;
+ sal_uInt16 b = pBreaks->operator[]( i );
if( b == nLine )
- return TRUE;
+ return sal_True;
if( b < nLine )
break;
}
- pBreaks->Insert( &nLine, 1, i );
+ pBreaks->insert( pBreaks->begin() + i, nLine );
// #38568: Set during runtime as well here SbDEBUG_BREAK
if( pINST && pINST->pRun )
@@ -1564,24 +1599,24 @@ BOOL SbModule::SetBP( USHORT nLine )
return IsBreakable( nLine );
}
-BOOL SbModule::ClearBP( USHORT nLine )
+sal_Bool SbModule::ClearBP( sal_uInt16 nLine )
{
- BOOL bRes = FALSE;
+ sal_Bool bRes = sal_False;
if( pBreaks )
{
- const USHORT* p = pBreaks->GetData();
- USHORT n = pBreaks->Count();
- for( USHORT i = 0; i < n; i++, p++ )
+ for( size_t i = 0; i < pBreaks->size(); i++ )
{
- USHORT b = *p;
+ sal_uInt16 b = pBreaks->operator[]( i );
if( b == nLine )
{
- pBreaks->Remove( i, 1 ); bRes = TRUE; break;
+ pBreaks->erase( pBreaks->begin() + i );
+ bRes = sal_True;
+ break;
}
if( b < nLine )
break;
}
- if( !pBreaks->Count() )
+ if( pBreaks->empty() )
delete pBreaks, pBreaks = NULL;
}
return bRes;
@@ -1589,7 +1624,8 @@ BOOL SbModule::ClearBP( USHORT nLine )
void SbModule::ClearAllBP()
{
- delete pBreaks; pBreaks = NULL;
+ delete pBreaks;
+ pBreaks = NULL;
}
void
@@ -1597,39 +1633,39 @@ SbModule::fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg ) const
{
if ( !pImg )
pImg = pImage;
- for( UINT32 i = 0; i < pMethods->Count(); i++ )
+ for( sal_uInt32 i = 0; i < pMethods->Count(); i++ )
{
- SbMethod* pMeth = PTR_CAST(SbMethod,pMethods->Get( (USHORT)i ) );
+ SbMethod* pMeth = PTR_CAST(SbMethod,pMethods->Get( (sal_uInt16)i ) );
if( pMeth )
{
//fixup method start positions
if ( bCvtToLegacy )
pMeth->nStart = pImg->CalcLegacyOffset( pMeth->nStart );
else
- pMeth->nStart = pImg->CalcNewOffset( (USHORT)pMeth->nStart );
+ pMeth->nStart = pImg->CalcNewOffset( (sal_uInt16)pMeth->nStart );
}
}
}
-BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbModule::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
Clear();
if( !SbxObject::LoadData( rStrm, 1 ) )
- return FALSE;
+ return sal_False;
// As a precaution...
SetFlag( SBX_EXTSEARCH | SBX_GBLSEARCH );
- BYTE bImage;
+ sal_uInt8 bImage;
rStrm >> bImage;
if( bImage )
{
SbiImage* p = new SbiImage;
- UINT32 nImgVer = 0;
+ sal_uInt32 nImgVer = 0;
if( !p->Load( rStrm, nImgVer ) )
{
delete p;
- return FALSE;
+ return sal_False;
}
// If the image is in old format, we fix up the method start offsets
if ( nImgVer < B_EXT_IMG_VERSION )
@@ -1657,24 +1693,24 @@ BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
delete p;
}
}
- return TRUE;
+ return sal_True;
}
-BOOL SbModule::StoreData( SvStream& rStrm ) const
+sal_Bool SbModule::StoreData( SvStream& rStrm ) const
{
- BOOL bFixup = ( pImage && !pImage->ExceedsLegacyLimits() );
+ sal_Bool bFixup = ( pImage && !pImage->ExceedsLegacyLimits() );
if ( bFixup )
fixUpMethodStart( true );
- BOOL bRet = SbxObject::StoreData( rStrm );
+ sal_Bool bRet = SbxObject::StoreData( rStrm );
if ( !bRet )
- return FALSE;
+ return sal_False;
if( pImage )
{
pImage->aOUSource = aOUSource;
pImage->aComment = aComment;
pImage->aName = GetName();
- rStrm << (BYTE) 1;
+ rStrm << (sal_uInt8) 1;
// # PCode is saved only for legacy formats only
// It should be noted that it probably isn't necessary
// It would be better not to store the image ( more flexible with
@@ -1691,12 +1727,12 @@ BOOL SbModule::StoreData( SvStream& rStrm ) const
aImg.aOUSource = aOUSource;
aImg.aComment = aComment;
aImg.aName = GetName();
- rStrm << (BYTE) 1;
+ rStrm << (sal_uInt8) 1;
return aImg.Save( rStrm );
}
}
-BOOL SbModule::ExceedsLegacyModuleSize()
+sal_Bool SbModule::ExceedsLegacyModuleSize()
{
if ( !IsCompiled() )
Compile();
@@ -1753,17 +1789,17 @@ bool SbModule::HasExeCode()
}
// Store only image, no source
-BOOL SbModule::StoreBinaryData( SvStream& rStrm )
+sal_Bool SbModule::StoreBinaryData( SvStream& rStrm )
{
return StoreBinaryData( rStrm, 0 );
}
-BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbModule::StoreBinaryData( SvStream& rStrm, sal_uInt16 nVer )
{
- BOOL bRet = Compile();
+ sal_Bool bRet = Compile();
if( bRet )
{
- BOOL bFixup = ( !nVer && !pImage->ExceedsLegacyLimits() );// save in old image format, fix up method starts
+ sal_Bool bFixup = ( !nVer && !pImage->ExceedsLegacyLimits() );// save in old image format, fix up method starts
if ( bFixup ) // save in old image format, fix up method starts
fixUpMethodStart( true );
@@ -1774,7 +1810,7 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
pImage->aComment = aComment;
pImage->aName = GetName();
- rStrm << (BYTE) 1;
+ rStrm << (sal_uInt8) 1;
if ( nVer )
bRet = pImage->Save( rStrm, B_EXT_IMG_VERSION );
else
@@ -1791,7 +1827,7 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
// Called for >= OO 1.0 passwd protected libraries only
//
-BOOL SbModule::LoadBinaryData( SvStream& rStrm )
+sal_Bool SbModule::LoadBinaryData( SvStream& rStrm )
{
::rtl::OUString aKeepSource = aOUSource;
bool bRet = LoadData( rStrm, 2 );
@@ -1800,10 +1836,10 @@ BOOL SbModule::LoadBinaryData( SvStream& rStrm )
return bRet;
}
-BOOL SbModule::LoadCompleted()
+sal_Bool SbModule::LoadCompleted()
{
SbxArray* p = GetMethods();
- USHORT i;
+ sal_uInt16 i;
for( i = 0; i < p->Count(); i++ )
{
SbMethod* q = PTR_CAST(SbMethod,p->Get( i ) );
@@ -1817,9 +1853,101 @@ BOOL SbModule::LoadCompleted()
if( q )
q->pMod = this;
}
- return TRUE;
+ return sal_True;
+}
+
+void SbModule::handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint )
+{
+ bool bDone = false;
+
+ const SbxHint* pHint = PTR_CAST(SbxHint,&rHint);
+ if( pHint )
+ {
+ SbxVariable* pVar = pHint->GetVar();
+ SbProcedureProperty* pProcProperty = PTR_CAST( SbProcedureProperty, pVar );
+ if( pProcProperty )
+ {
+ bDone = true;
+
+ if( pHint->GetId() == SBX_HINT_DATAWANTED )
+ {
+ String aProcName;
+ aProcName.AppendAscii( "Property Get " );
+ aProcName += pProcProperty->GetName();
+
+ SbxVariable* pMeth = Find( aProcName, SbxCLASS_METHOD );
+ if( pMeth )
+ {
+ SbxValues aVals;
+ aVals.eType = SbxVARIANT;
+
+ SbxArray* pArg = pVar->GetParameters();
+ sal_uInt16 nVarParCount = (pArg != NULL) ? pArg->Count() : 0;
+ if( nVarParCount > 1 )
+ {
+ SbxArrayRef xMethParameters = new SbxArray;
+ xMethParameters->Put( pMeth, 0 ); // Method as parameter 0
+ for( sal_uInt16 i = 1 ; i < nVarParCount ; ++i )
+ {
+ SbxVariable* pPar = pArg->Get( i );
+ xMethParameters->Put( pPar, i );
+ }
+
+ pMeth->SetParameters( xMethParameters );
+ pMeth->Get( aVals );
+ pMeth->SetParameters( NULL );
+ }
+ else
+ {
+ pMeth->Get( aVals );
+ }
+
+ pVar->Put( aVals );
+ }
+ }
+ else if( pHint->GetId() == SBX_HINT_DATACHANGED )
+ {
+ SbxVariable* pMeth = NULL;
+
+ bool bSet = pProcProperty->isSet();
+ if( bSet )
+ {
+ pProcProperty->setSet( false );
+
+ String aProcName;
+ aProcName.AppendAscii( "Property Set " );
+ aProcName += pProcProperty->GetName();
+ pMeth = Find( aProcName, SbxCLASS_METHOD );
+ }
+ if( !pMeth ) // Let
+ {
+ String aProcName;
+ aProcName.AppendAscii( "Property Let " );
+ aProcName += pProcProperty->GetName();
+ pMeth = Find( aProcName, SbxCLASS_METHOD );
+ }
+
+ if( pMeth )
+ {
+ // Setup parameters
+ SbxArrayRef xArray = new SbxArray;
+ xArray->Put( pMeth, 0 ); // Method as parameter 0
+ xArray->Put( pVar, 1 );
+ pMeth->SetParameters( xArray );
+
+ SbxValues aVals;
+ pMeth->Get( aVals );
+ pMeth->SetParameters( NULL );
+ }
+ }
+ }
+ }
+
+ if( !bDone )
+ SbModule::Notify( rBC, rHint );
}
+
/////////////////////////////////////////////////////////////////////////
// Implementation SbJScriptModule (Basic-Modul fuer JavaScript-Sourcen)
SbJScriptModule::SbJScriptModule( const String& rName )
@@ -1827,32 +1955,32 @@ SbJScriptModule::SbJScriptModule( const String& rName )
{
}
-BOOL SbJScriptModule::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbJScriptModule::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
(void)nVer;
Clear();
if( !SbxObject::LoadData( rStrm, 1 ) )
- return FALSE;
+ return sal_False;
// Get the source string
String aTmp;
rStrm.ReadByteString( aTmp, gsl_getSystemTextEncoding() );
aOUSource = aTmp;
//rStrm >> aSource;
- return TRUE;
+ return sal_True;
}
-BOOL SbJScriptModule::StoreData( SvStream& rStrm ) const
+sal_Bool SbJScriptModule::StoreData( SvStream& rStrm ) const
{
if( !SbxObject::StoreData( rStrm ) )
- return FALSE;
+ return sal_False;
// Write the source string
String aTmp = aOUSource;
rStrm.WriteByteString( aTmp, gsl_getSystemTextEncoding() );
//rStrm << aSource;
- return TRUE;
+ return sal_True;
}
@@ -1861,7 +1989,7 @@ BOOL SbJScriptModule::StoreData( SvStream& rStrm ) const
SbMethod::SbMethod( const String& r, SbxDataType t, SbModule* p )
: SbxMethod( r, t ), pMod( p )
{
- bInvalid = TRUE;
+ bInvalid = sal_True;
nStart =
nDebugFlags =
nLine1 =
@@ -1908,35 +2036,35 @@ SbxArray* SbMethod::GetStatics()
return refStatics;
}
-BOOL SbMethod::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbMethod::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
if( !SbxMethod::LoadData( rStrm, 1 ) )
- return FALSE;
- INT16 n;
+ return sal_False;
+ sal_Int16 n;
rStrm >> n;
- INT16 nTempStart = (INT16)nStart;
+ sal_Int16 nTempStart = (sal_Int16)nStart;
// nDebugFlags = n; // From 1996-01-16: no longer take over
if( nVer == 2 )
rStrm >> nLine1 >> nLine2 >> nTempStart >> bInvalid;
// From: 1996-07-02: HACK ue to 'Referenz could not be saved'
SetFlag( SBX_NO_MODIFY );
nStart = nTempStart;
- return TRUE;
+ return sal_True;
}
-BOOL SbMethod::StoreData( SvStream& rStrm ) const
+sal_Bool SbMethod::StoreData( SvStream& rStrm ) const
{
if( !SbxMethod::StoreData( rStrm ) )
- return FALSE;
- rStrm << (INT16) nDebugFlags
- << (INT16) nLine1
- << (INT16) nLine2
- << (INT16) nStart
- << (BYTE) bInvalid;
- return TRUE;
+ return sal_False;
+ rStrm << (sal_Int16) nDebugFlags
+ << (sal_Int16) nLine1
+ << (sal_Int16) nLine2
+ << (sal_Int16) nStart
+ << (sal_uInt8) bInvalid;
+ return sal_True;
}
-void SbMethod::GetLineRange( USHORT& l1, USHORT& l2 )
+void SbMethod::GetLineRange( sal_uInt16& l1, sal_uInt16& l2 )
{
l1 = nLine1; l2 = nLine2;
}
@@ -1991,7 +2119,7 @@ ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
// #100883 Own Broadcast for SbMethod
-void SbMethod::Broadcast( ULONG nHintId )
+void SbMethod::Broadcast( sal_uIntPtr nHintId )
{
if( pCst && !IsSet( SBX_NO_BROADCAST ) && StaticIsEnabledBroadcasting() )
{
@@ -2023,7 +2151,7 @@ void SbMethod::Broadcast( ULONG nHintId )
pCst = pSave;
pSave->Broadcast( SbxHint( nHintId, pThisCopy ) );
- USHORT nSaveFlags = GetFlags();
+ sal_uInt16 nSaveFlags = GetFlags();
SetFlag( SBX_READWRITE );
pCst = NULL;
Put( pThisCopy->GetValues_Impl() );
@@ -2057,6 +2185,11 @@ SbObjModule::SbObjModule( const String& rName, const com::sun::star::script::Mod
else if ( mInfo.ModuleObject.is() )
SetUnoObject( uno::makeAny( mInfo.ModuleObject ) );
}
+
+SbObjModule::~SbObjModule()
+{
+}
+
void
SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException )
{
@@ -2093,22 +2226,34 @@ SbObjModule::Find( const XubString& rName, SbxClassType t )
return pVar;
}
-typedef ::cppu::WeakImplHelper2< awt::XTopWindowListener, awt::XWindowListener > FormObjEventListener_BASE;
+void SbObjModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+ const SfxHint& rHint, const TypeId& rHintType )
+{
+ SbModule::handleProcedureProperties( rBC, rHint );
+}
+
+
+typedef ::cppu::WeakImplHelper3<
+ awt::XTopWindowListener,
+ awt::XWindowListener,
+ document::XEventListener > FormObjEventListener_BASE;
class FormObjEventListenerImpl : public FormObjEventListener_BASE
{
SbUserFormModule* mpUserForm;
uno::Reference< lang::XComponent > mxComponent;
+ uno::Reference< frame::XModel > mxModel;
bool mbDisposed;
sal_Bool mbOpened;
sal_Bool mbActivated;
sal_Bool mbShowing;
- FormObjEventListenerImpl(); // not defined
+
FormObjEventListenerImpl(const FormObjEventListenerImpl&); // not defined
+ FormObjEventListenerImpl& operator=(const FormObjEventListenerImpl&); // not defined
public:
- FormObjEventListenerImpl( SbUserFormModule* pUserForm, const uno::Reference< lang::XComponent >& xComponent ) :
- mpUserForm( pUserForm ), mxComponent( xComponent) ,
+ FormObjEventListenerImpl( SbUserFormModule* pUserForm, const uno::Reference< lang::XComponent >& xComponent, const uno::Reference< frame::XModel >& xModel ) :
+ mpUserForm( pUserForm ), mxComponent( xComponent), mxModel( xModel ),
mbDisposed( false ), mbOpened( sal_False ), mbActivated( sal_False ), mbShowing( sal_False )
{
if ( mxComponent.is() )
@@ -2125,6 +2270,15 @@ public:
}
catch( uno::Exception& ) {}
}
+
+ if ( mxModel.is() )
+ {
+ try
+ {
+ uno::Reference< document::XEventBroadcaster >( mxModel, uno::UNO_QUERY_THROW )->addEventListener( this );
+ }
+ catch( uno::Exception& ) {}
+ }
}
virtual ~FormObjEventListenerImpl()
@@ -2151,6 +2305,16 @@ public:
catch( uno::Exception& ) {}
}
mxComponent.clear();
+
+ if ( mxModel.is() && !mbDisposed )
+ {
+ try
+ {
+ uno::Reference< document::XEventBroadcaster >( mxModel, uno::UNO_QUERY_THROW )->removeEventListener( this );
+ }
+ catch( uno::Exception& ) {}
+ }
+ mxModel.clear();
}
virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
@@ -2256,13 +2420,25 @@ public:
{
}
+ virtual void SAL_CALL notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException)
+ {
+ // early dosposing on document event "OnUnload", to be sure Basic still exists when calling VBA "UserForm_Terminate"
+ if( rEvent.EventName == GlobalEventConfig::GetEventName( STR_EVENT_CLOSEDOC ) )
+ {
+ removeListener();
+ mbDisposed = true;
+ if ( mpUserForm )
+ mpUserForm->ResetApiObj(); // will trigger "UserForm_Terminate"
+ }
+ }
+
virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
{
OSL_TRACE("** Userform/Dialog disposing");
+ removeListener();
mbDisposed = true;
- mxComponent.clear();
if ( mpUserForm )
- mpUserForm->ResetApiObj();
+ mpUserForm->ResetApiObj( false ); // pass false (too late to trigger VBA events here)
}
};
@@ -2278,9 +2454,9 @@ SbUserFormModule::~SbUserFormModule()
{
}
-void SbUserFormModule::ResetApiObj()
+void SbUserFormModule::ResetApiObj( bool bTriggerTerminateEvent )
{
- if ( m_xDialog.is() ) // probably someone close the dialog window
+ if ( bTriggerTerminateEvent && m_xDialog.is() ) // probably someone close the dialog window
{
triggerTerminateEvent();
}
@@ -2310,7 +2486,7 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
{
SbxVariableRef xSbxVar = new SbxVariable( SbxVARIANT );
unoToSbxValue( static_cast< SbxVariable* >( xSbxVar ), aArguments[i] );
- xArray->Put( xSbxVar, static_cast< USHORT >( i ) + 1 );
+ xArray->Put( xSbxVar, static_cast< sal_uInt16 >( i ) + 1 );
// Enable passing by ref
if ( xSbxVar->GetType() != SbxVARIANT )
@@ -2323,7 +2499,7 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
for ( sal_Int32 i = 0; i < aArguments.getLength(); ++i )
{
- aArguments[i] = sbxToUnoValue( xArray->Get( static_cast< USHORT >(i) + 1) );
+ aArguments[i] = sbxToUnoValue( xArray->Get( static_cast< sal_uInt16 >(i) + 1) );
}
pMeth->SetParameters( NULL );
}
@@ -2392,10 +2568,10 @@ SbUserFormModuleInstance::SbUserFormModuleInstance( SbUserFormModule* pParentMod
{
}
-BOOL SbUserFormModuleInstance::IsClass( const XubString& rName ) const
+sal_Bool SbUserFormModuleInstance::IsClass( const XubString& rName ) const
{
- BOOL bParentNameMatches = m_pParentModule->GetName().EqualsIgnoreCaseAscii( rName );
- BOOL bRet = bParentNameMatches || SbxObject::IsClass( rName );
+ sal_Bool bParentNameMatches = m_pParentModule->GetName().EqualsIgnoreCaseAscii( rName );
+ sal_Bool bRet = bParentNameMatches || SbxObject::IsClass( rName );
return bRet;
}
@@ -2466,11 +2642,12 @@ void SbUserFormModule::Unload()
}
+void registerComponentToBeDisposedForBasic( Reference< XComponent > xComponent, StarBASIC* pBasic );
+
void SbUserFormModule::InitObject()
{
try
{
-
String aHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
SbUnoObject* pGlobs = (SbUnoObject*)GetParent()->Find( aHook, SbxCLASS_DONTCARE );
if ( m_xModel.is() && pGlobs )
@@ -2503,11 +2680,27 @@ void SbUserFormModule::InitObject()
aArgs[ 2 ] <<= m_xModel;
aArgs[ 3 ] <<= sProjectName;
pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.UserForm")), aArgs ) ) );
- uno::Reference< lang::XComponent > xComponent( aArgs[ 1 ], uno::UNO_QUERY_THROW );
- // remove old listener if it exists
- if ( m_DialogListener.get() )
+
+ uno::Reference< lang::XComponent > xComponent( m_xDialog, uno::UNO_QUERY_THROW );
+
+ // the dialog must be disposed at the end!
+ StarBASIC* pParentBasic = NULL;
+ SbxObject* pCurObject = this;
+ do
+ {
+ SbxObject* pObjParent = pCurObject->GetParent();
+ pParentBasic = PTR_CAST( StarBASIC, pObjParent );
+ pCurObject = pObjParent;
+ }
+ while( pParentBasic == NULL && pCurObject != NULL );
+
+ OSL_ASSERT( pParentBasic != NULL );
+ registerComponentToBeDisposedForBasic( xComponent, pParentBasic );
+
+ // if old listener object exists, remove it from dialog and document model
+ if( m_DialogListener.is() )
m_DialogListener->removeListener();
- m_DialogListener = new FormObjEventListenerImpl( this, xComponent );
+ m_DialogListener.set( new FormObjEventListenerImpl( this, xComponent, m_xModel ) );
triggerInitializeEvent();
}
@@ -2530,7 +2723,7 @@ SbUserFormModule::Find( const XubString& rName, SbxClassType t )
SbProperty::SbProperty( const String& r, SbxDataType t, SbModule* p )
: SbxProperty( r, t ), pMod( p )
{
- bInvalid = FALSE;
+ bInvalid = sal_False;
}
SbProperty::~SbProperty()
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index c248d4100675..2e0fb542d3c2 100644..100755
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -33,7 +33,7 @@
#include "buffer.hxx"
#include <string.h>
-const static UINT32 UP_LIMIT=0xFFFFFF00L;
+const static sal_uInt32 UP_LIMIT=0xFFFFFF00L;
// The SbiBuffer will be expanded in increments of at least 16 Bytes.
// This is necessary, because many classes emanate from a buffer length
@@ -70,24 +70,24 @@ char* SbiBuffer::GetBuffer()
// Test, if the buffer can contain n Bytes.
// In case of doubt it will be enlarged
-BOOL SbiBuffer::Check( USHORT n )
+sal_Bool SbiBuffer::Check( sal_uInt16 n )
{
- if( !n ) return TRUE;
- if( ( static_cast<UINT32>( nOff )+ n ) > static_cast<UINT32>( nSize ) )
+ if( !n ) return sal_True;
+ if( ( static_cast<sal_uInt32>( nOff )+ n ) > static_cast<sal_uInt32>( nSize ) )
{
if( nInc == 0 )
- return FALSE;
- USHORT nn = 0;
+ return sal_False;
+ sal_uInt16 nn = 0;
while( nn < n ) nn = nn + nInc;
char* p;
- if( ( static_cast<UINT32>( nSize ) + nn ) > UP_LIMIT ) p = NULL;
+ if( ( static_cast<sal_uInt32>( nSize ) + nn ) > UP_LIMIT ) p = NULL;
else p = new char [nSize + nn];
if( !p )
{
pParser->Error( SbERR_PROG_TOO_LARGE );
nInc = 0;
delete[] pBuf; pBuf = NULL;
- return FALSE;
+ return sal_False;
}
else
{
@@ -98,19 +98,19 @@ BOOL SbiBuffer::Check( USHORT n )
nSize = nSize + nn;
}
}
- return TRUE;
+ return sal_True;
}
// Conditioning of the buffer onto the passed Byte limit
-void SbiBuffer::Align( INT32 n )
+void SbiBuffer::Align( sal_Int32 n )
{
if( nOff % n ) {
- UINT32 nn =( ( nOff + n ) / n ) * n;
+ sal_uInt32 nn =( ( nOff + n ) / n ) * n;
if( nn <= UP_LIMIT )
{
nn = nn - nOff;
- if( Check( static_cast<USHORT>(nn) ) )
+ if( Check( static_cast<sal_uInt16>(nn) ) )
{
memset( pCur, 0, nn );
pCur += nn;
@@ -122,13 +122,13 @@ void SbiBuffer::Align( INT32 n )
// Patch of a Location
-void SbiBuffer::Patch( UINT32 off, UINT32 val )
+void SbiBuffer::Patch( sal_uInt32 off, sal_uInt32 val )
{
- if( ( off + sizeof( UINT32 ) ) < nOff )
+ if( ( off + sizeof( sal_uInt32 ) ) < nOff )
{
- UINT16 val1 = static_cast<UINT16>( val & 0xFFFF );
- UINT16 val2 = static_cast<UINT16>( val >> 16 );
- BYTE* p = (BYTE*) pBuf + off;
+ sal_uInt16 val1 = static_cast<sal_uInt16>( val & 0xFFFF );
+ sal_uInt16 val2 = static_cast<sal_uInt16>( val >> 16 );
+ sal_uInt8* p = (sal_uInt8*) pBuf + off;
*p++ = (char) ( val1 & 0xFF );
*p++ = (char) ( val1 >> 8 );
*p++ = (char) ( val2 & 0xFF );
@@ -140,18 +140,18 @@ void SbiBuffer::Patch( UINT32 off, UINT32 val )
// establish a linkage. The beginning of the linkage is at the passed parameter,
// the end of the linkage is 0.
-void SbiBuffer::Chain( UINT32 off )
+void SbiBuffer::Chain( sal_uInt32 off )
{
if( off && pBuf )
{
- BYTE *ip;
- UINT32 i = off;
- UINT32 val1 = (nOff & 0xFFFF);
- UINT32 val2 = (nOff >> 16);
+ sal_uInt8 *ip;
+ sal_uInt32 i = off;
+ sal_uInt32 val1 = (nOff & 0xFFFF);
+ sal_uInt32 val2 = (nOff >> 16);
do
{
- ip = (BYTE*) pBuf + i;
- BYTE* pTmp = ip;
+ ip = (sal_uInt8*) pBuf + i;
+ sal_uInt8* pTmp = ip;
i = *pTmp++; i |= *pTmp++ << 8; i |= *pTmp++ << 16; i |= *pTmp++ << 24;
if( i >= nOff )
@@ -167,84 +167,84 @@ void SbiBuffer::Chain( UINT32 off )
}
}
-BOOL SbiBuffer::operator +=( INT8 n )
+sal_Bool SbiBuffer::operator +=( sal_Int8 n )
{
if( Check( 1 ) )
{
- *pCur++ = (char) n; nOff++; return TRUE;
- } else return FALSE;
+ *pCur++ = (char) n; nOff++; return sal_True;
+ } else return sal_False;
}
-BOOL SbiBuffer::operator +=( UINT8 n )
+sal_Bool SbiBuffer::operator +=( sal_uInt8 n )
{
if( Check( 1 ) )
{
- *pCur++ = (char) n; nOff++; return TRUE;
- } else return FALSE;
+ *pCur++ = (char) n; nOff++; return sal_True;
+ } else return sal_False;
}
-BOOL SbiBuffer::operator +=( INT16 n )
+sal_Bool SbiBuffer::operator +=( sal_Int16 n )
{
if( Check( 2 ) )
{
*pCur++ = (char) ( n & 0xFF );
*pCur++ = (char) ( n >> 8 );
- nOff += 2; return TRUE;
- } else return FALSE;
+ nOff += 2; return sal_True;
+ } else return sal_False;
}
-BOOL SbiBuffer::operator +=( UINT16 n )
+sal_Bool SbiBuffer::operator +=( sal_uInt16 n )
{
if( Check( 2 ) )
{
*pCur++ = (char) ( n & 0xFF );
*pCur++ = (char) ( n >> 8 );
- nOff += 2; return TRUE;
- } else return FALSE;
+ nOff += 2; return sal_True;
+ } else return sal_False;
}
-BOOL SbiBuffer::operator +=( UINT32 n )
+sal_Bool SbiBuffer::operator +=( sal_uInt32 n )
{
if( Check( 4 ) )
{
- UINT16 n1 = static_cast<UINT16>( n & 0xFFFF );
- UINT16 n2 = static_cast<UINT16>( n >> 16 );
+ sal_uInt16 n1 = static_cast<sal_uInt16>( n & 0xFFFF );
+ sal_uInt16 n2 = static_cast<sal_uInt16>( n >> 16 );
if ( operator +=( n1 ) && operator +=( n2 ) )
- return TRUE;
- return TRUE;
+ return sal_True;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-BOOL SbiBuffer::operator +=( INT32 n )
+sal_Bool SbiBuffer::operator +=( sal_Int32 n )
{
- return operator +=( (UINT32) n );
+ return operator +=( (sal_uInt32) n );
}
-BOOL SbiBuffer::operator +=( const String& n )
+sal_Bool SbiBuffer::operator +=( const String& n )
{
- USHORT l = n.Len() + 1;
+ sal_uInt16 l = n.Len() + 1;
if( Check( l ) )
{
ByteString aByteStr( n, gsl_getSystemTextEncoding() );
memcpy( pCur, aByteStr.GetBuffer(), l );
pCur += l;
nOff = nOff + l;
- return TRUE;
+ return sal_True;
}
- else return FALSE;
+ else return sal_False;
}
-BOOL SbiBuffer::Add( const void* p, USHORT len )
+sal_Bool SbiBuffer::Add( const void* p, sal_uInt16 len )
{
if( Check( len ) )
{
memcpy( pCur, p, len );
pCur += len;
nOff = nOff + len;
- return TRUE;
- } else return FALSE;
+ return sal_True;
+ } else return sal_False;
}
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index b6791156dbf3..83d1a1965840 100644..100755
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -42,13 +42,13 @@ SbiCodeGen::SbiCodeGen( SbModule& r, SbiParser* p, short nInc )
: rMod( r ), aCode( p, nInc )
{
pParser = p;
- bStmnt = FALSE;
+ bStmnt = sal_False;
nLine = 0;
nCol = 0;
nForLevel = 0;
}
-UINT32 SbiCodeGen::GetPC()
+sal_uInt32 SbiCodeGen::GetPC()
{
return aCode.GetSize();
}
@@ -57,7 +57,7 @@ UINT32 SbiCodeGen::GetPC()
void SbiCodeGen::Statement()
{
- bStmnt = TRUE;
+ bStmnt = sal_True;
nLine = pParser->GetLine();
nCol = pParser->GetCol1();
@@ -73,7 +73,7 @@ void SbiCodeGen::GenStmnt()
{
if( bStmnt )
{
- bStmnt = FALSE;
+ bStmnt = sal_False;
Gen( _STMNT, nLine, nCol );
}
}
@@ -81,39 +81,39 @@ void SbiCodeGen::GenStmnt()
// The Gen-Routines return the offset of the 1. operand,
// so that jumps can sink their backchain there.
-UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode )
+sal_uInt32 SbiCodeGen::Gen( SbiOpcode eOpcode )
{
#ifdef DBG_UTIL
if( eOpcode < SbOP0_START || eOpcode > SbOP0_END )
pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE1" );
#endif
GenStmnt();
- aCode += (UINT8) eOpcode;
+ aCode += (sal_uInt8) eOpcode;
return GetPC();
}
-UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd )
+sal_uInt32 SbiCodeGen::Gen( SbiOpcode eOpcode, sal_uInt32 nOpnd )
{
#ifdef DBG_UTIL
if( eOpcode < SbOP1_START || eOpcode > SbOP1_END )
pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE2" );
#endif
GenStmnt();
- aCode += (UINT8) eOpcode;
- UINT32 n = GetPC();
+ aCode += (sal_uInt8) eOpcode;
+ sal_uInt32 n = GetPC();
aCode += nOpnd;
return n;
}
-UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd1, UINT32 nOpnd2 )
+sal_uInt32 SbiCodeGen::Gen( SbiOpcode eOpcode, sal_uInt32 nOpnd1, sal_uInt32 nOpnd2 )
{
#ifdef DBG_UTIL
if( eOpcode < SbOP2_START || eOpcode > SbOP2_END )
pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE3" );
#endif
GenStmnt();
- aCode += (UINT8) eOpcode;
- UINT32 n = GetPC();
+ aCode += (sal_uInt8) eOpcode;
+ sal_uInt32 n = GetPC();
aCode += nOpnd1;
aCode += nOpnd2;
return n;
@@ -178,7 +178,7 @@ void SbiCodeGen::Save()
String aProcName = pProc->GetName();
String aIfaceProcName;
String aIfaceName;
- USHORT nPassCount = 1;
+ sal_uInt16 nPassCount = 1;
if( nIfaceCount )
{
int nPropPrefixFound =
@@ -206,7 +206,7 @@ void SbiCodeGen::Save()
}
}
SbMethod* pMeth = NULL;
- for( USHORT nPass = 0 ; nPass < nPassCount ; nPass++ )
+ for( sal_uInt16 nPass = 0 ; nPass < nPassCount ; nPass++ )
{
if( nPass == 1 )
aProcName = aIfaceProcName;
@@ -271,7 +271,7 @@ void SbiCodeGen::Save()
// The parameter:
SbxInfo* pInfo = pMeth->GetInfo();
String aHelpFile, aComment;
- ULONG nHelpId = 0;
+ sal_uIntPtr nHelpId = 0;
if( pInfo )
{
// Rescue the additional data
@@ -284,7 +284,7 @@ void SbiCodeGen::Save()
pInfo->SetComment( aComment );
SbiSymPool* pPool = &pProc->GetParams();
// The first element is always the value of the function!
- for( USHORT i = 1; i < pPool->GetSize(); i++ )
+ for( sal_uInt16 i = 1; i < pPool->GetSize(); i++ )
{
SbiSymDef* pPar = pPool->Get( i );
SbxDataType t = pPar->GetType();
@@ -293,14 +293,14 @@ void SbiCodeGen::Save()
if( pPar->GetDims() )
t = (SbxDataType) ( t | SbxARRAY );
// #33677 hand-over an Optional-Info
- USHORT nFlags = SBX_READ;
+ sal_uInt16 nFlags = SBX_READ;
if( pPar->IsOptional() )
nFlags |= SBX_OPTIONAL;
pInfo->AddParam( pPar->GetName(), t, nFlags );
- UINT32 nUserData = 0;
- USHORT nDefaultId = pPar->GetDefaultId();
+ sal_uInt32 nUserData = 0;
+ sal_uInt16 nDefaultId = pPar->GetDefaultId();
if( nDefaultId )
nUserData |= nDefaultId;
if( pPar->IsParamArray() )
@@ -322,14 +322,14 @@ void SbiCodeGen::Save()
// The global StringPool. 0 is not occupied.
SbiStringPool* pPool = &pParser->aGblStrings;
- USHORT nSize = pPool->GetSize();
+ sal_uInt16 nSize = pPool->GetSize();
p->MakeStrings( nSize );
- USHORT i;
+ sal_uInt16 i;
for( i = 1; i <= nSize; i++ )
p->AddString( pPool->Find( i ) );
// Insert types
- USHORT nCount = pParser->rTypeArray->Count();
+ sal_uInt16 nCount = pParser->rTypeArray->Count();
for (i = 0; i < nCount; i++)
p->AddType((SbxObject *)pParser->rTypeArray->Get(i));
@@ -352,7 +352,7 @@ class PCodeVisitor
public:
virtual ~PCodeVisitor();
- virtual void start( BYTE* pStart ) = 0;
+ virtual void start( sal_uInt8* pStart ) = 0;
virtual void processOpCode0( SbiOpcode eOp ) = 0;
virtual void processOpCode1( SbiOpcode eOp, T nOp1 ) = 0;
virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) = 0;
@@ -368,8 +368,8 @@ class PCodeBufferWalker
{
private:
T m_nBytes;
- BYTE* m_pCode;
- T readParam( BYTE*& pCode )
+ sal_uInt8* m_pCode;
+ T readParam( sal_uInt8*& pCode )
{
short nBytes = sizeof( T );
T nOp1=0;
@@ -378,15 +378,15 @@ private:
return nOp1;
}
public:
- PCodeBufferWalker( BYTE* pCode, T nBytes ): m_nBytes( nBytes ), m_pCode( pCode )
+ PCodeBufferWalker( sal_uInt8* pCode, T nBytes ): m_nBytes( nBytes ), m_pCode( pCode )
{
}
void visitBuffer( PCodeVisitor< T >& visitor )
{
- BYTE* pCode = m_pCode;
+ sal_uInt8* pCode = m_pCode;
if ( !pCode )
return;
- BYTE* pEnd = pCode + m_nBytes;
+ sal_uInt8* pEnd = pCode + m_nBytes;
visitor.start( m_pCode );
T nOp1 = 0, nOp2 = 0;
for( ; pCode < pEnd; )
@@ -428,7 +428,7 @@ class OffSetAccumulator : public PCodeVisitor< T >
public:
OffSetAccumulator() : m_nNumOp0(0), m_nNumSingleParams(0), m_nNumDoubleParams(0){}
- virtual void start( BYTE* /*pStart*/ ){}
+ virtual void start( sal_uInt8* /*pStart*/ ){}
virtual void processOpCode0( SbiOpcode /*eOp*/ ){ ++m_nNumOp0; }
virtual void processOpCode1( SbiOpcode /*eOp*/, T /*nOp1*/ ){ ++m_nNumSingleParams; }
virtual void processOpCode2( SbiOpcode /*eOp*/, T /*nOp1*/, T /*nOp2*/ ) { ++m_nNumDoubleParams; }
@@ -449,18 +449,18 @@ template < class T, class S >
class BufferTransformer : public PCodeVisitor< T >
{
- BYTE* m_pStart;
+ sal_uInt8* m_pStart;
SbiBuffer m_ConvertedBuf;
public:
BufferTransformer():m_pStart(NULL), m_ConvertedBuf( NULL, 1024 ) {}
- virtual void start( BYTE* pStart ){ m_pStart = pStart; }
+ virtual void start( sal_uInt8* pStart ){ m_pStart = pStart; }
virtual void processOpCode0( SbiOpcode eOp )
{
- m_ConvertedBuf += (UINT8)eOp;
+ m_ConvertedBuf += (sal_uInt8)eOp;
}
virtual void processOpCode1( SbiOpcode eOp, T nOp1 )
{
- m_ConvertedBuf += (UINT8)eOp;
+ m_ConvertedBuf += (sal_uInt8)eOp;
switch( eOp )
{
case _JUMP:
@@ -485,7 +485,7 @@ public:
}
virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 )
{
- m_ConvertedBuf += (UINT8)eOp;
+ m_ConvertedBuf += (sal_uInt8)eOp;
if ( eOp == _CASEIS )
if ( nOp1 )
nOp1 = static_cast<T>( convertBufferOffSet(m_pStart, nOp1) );
@@ -502,7 +502,7 @@ public:
{
return m_ConvertedBuf;
}
- static S convertBufferOffSet( BYTE* pStart, T nOp1 )
+ static S convertBufferOffSet( sal_uInt8* pStart, T nOp1 )
{
PCodeBufferWalker< T > aBuff( pStart, nOp1);
OffSetAccumulator< T, S > aVisitor;
@@ -511,16 +511,16 @@ public:
}
};
-UINT32
-SbiCodeGen::calcNewOffSet( BYTE* pCode, UINT16 nOffset )
+sal_uInt32
+SbiCodeGen::calcNewOffSet( sal_uInt8* pCode, sal_uInt16 nOffset )
{
- return BufferTransformer< UINT16, UINT32 >::convertBufferOffSet( pCode, nOffset );
+ return BufferTransformer< sal_uInt16, sal_uInt32 >::convertBufferOffSet( pCode, nOffset );
}
-UINT16
-SbiCodeGen::calcLegacyOffSet( BYTE* pCode, UINT32 nOffset )
+sal_uInt16
+SbiCodeGen::calcLegacyOffSet( sal_uInt8* pCode, sal_uInt32 nOffset )
{
- return BufferTransformer< UINT32, UINT16 >::convertBufferOffSet( pCode, nOffset );
+ return BufferTransformer< sal_uInt32, sal_uInt16 >::convertBufferOffSet( pCode, nOffset );
}
template <class T, class S>
@@ -530,11 +530,11 @@ PCodeBuffConvertor<T,S>::convert()
PCodeBufferWalker< T > aBuf( m_pStart, m_nSize );
BufferTransformer< T, S > aTrnsfrmer;
aBuf.visitBuffer( aTrnsfrmer );
- m_pCnvtdBuf = (BYTE*)aTrnsfrmer.buffer().GetBuffer();
+ m_pCnvtdBuf = (sal_uInt8*)aTrnsfrmer.buffer().GetBuffer();
m_nCnvtdSize = static_cast<S>( aTrnsfrmer.buffer().GetSize() );
}
-template class PCodeBuffConvertor< UINT16, UINT32 >;
-template class PCodeBuffConvertor< UINT32, UINT16 >;
+template class PCodeBuffConvertor< sal_uInt16, sal_uInt32 >;
+template class PCodeBuffConvertor< sal_uInt32, sal_uInt16 >;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 88ad0f8c25f1..a24f4ea9e7e3 100644..100755
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -40,7 +40,7 @@ SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
// Return-value: a new instance, which were inserted and then deleted.
// Array-Indexex were returned as SbiDimList
-SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, BOOL bStatic, BOOL bConst )
+SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, sal_Bool bStatic, sal_Bool bConst )
{
bool bWithEvents = false;
if( Peek() == WITHEVENTS )
@@ -75,7 +75,7 @@ SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, BOOL bStatic, BOOL bConst )
// Resolving of a AS-Type-Declaration
// The data type were inserted into the handed over variable
-void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
+void SbiParser::TypeDecl( SbiSymDef& rDef, sal_Bool bAsNewAlreadyParsed )
{
SbxDataType eType = rDef.GetType();
if( bAsNewAlreadyParsed || Peek() == AS )
@@ -196,34 +196,34 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
void SbiParser::Dim()
{
- DefVar( _DIM, ( pProc && bVBASupportOn ) ? pProc->IsStatic() : FALSE );
+ DefVar( _DIM, ( pProc && bVBASupportOn ) ? pProc->IsStatic() : sal_False );
}
-void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
+void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
{
SbiSymPool* pOldPool = pPool;
- BOOL bSwitchPool = FALSE;
- BOOL bPersistantGlobal = FALSE;
+ sal_Bool bSwitchPool = sal_False;
+ sal_Bool bPersistantGlobal = sal_False;
SbiToken eFirstTok = eCurTok;
if( pProc && ( eCurTok == GLOBAL || eCurTok == PUBLIC || eCurTok == PRIVATE ) )
Error( SbERR_NOT_IN_SUBR, eCurTok );
if( eCurTok == PUBLIC || eCurTok == GLOBAL )
{
- bSwitchPool = TRUE; // at the right moment switch to the global pool
+ bSwitchPool = sal_True; // at the right moment switch to the global pool
if( eCurTok == GLOBAL )
- bPersistantGlobal = TRUE;
+ bPersistantGlobal = sal_True;
}
// behavior in VBA is that a module scope variable's lifetime is
// tied to the document. e.g. a module scope variable is global
if( GetBasic()->IsDocBasic() && bVBASupportOn && !pProc )
- bPersistantGlobal = TRUE;
+ bPersistantGlobal = sal_True;
// PRIVATE is a synonymous for DIM
// _CONST_?
- BOOL bConst = FALSE;
+ sal_Bool bConst = sal_False;
if( eCurTok == _CONST_ )
- bConst = TRUE;
+ bConst = sal_True;
else if( Peek() == _CONST_ )
- Next(), bConst = TRUE;
+ Next(), bConst = sal_True;
// #110004 It can also be a sub/function
if( !bConst && (eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ||
@@ -244,10 +244,10 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
if( bNewGblDefs && nGblChain == 0 )
{
nGblChain = aGen.Gen( _JUMP, 0 );
- bNewGblDefs = FALSE;
+ bNewGblDefs = sal_False;
}
Next();
- DefProc( FALSE, bPrivate );
+ DefProc( sal_False, bPrivate );
return;
}
else if( eCurTok == ENUM )
@@ -294,14 +294,14 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
SbiDimList* pDim;
// From 1997-07-09, #40689, Statics -> Modul-Initialising, skip in Sub
- UINT32 nEndOfStaticLbl = 0;
+ sal_uInt32 nEndOfStaticLbl = 0;
if( !bVBASupportOn && bStatic )
{
nEndOfStaticLbl = aGen.Gen( _JUMP, 0 );
aGen.Statement(); // catch up on static here
}
- BOOL bDefined = FALSE;
+ sal_Bool bDefined = sal_False;
while( ( pDef = VarDecl( &pDim, bStatic, bConst ) ) != NULL )
{
EnableErrors();
@@ -310,12 +310,12 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
pPool = &aGlobals;
SbiSymDef* pOld = pPool->Find( pDef->GetName() );
// From 1996-03-31, #25651#, search also in the Runtime-Library
- BOOL bRtlSym = FALSE;
+ sal_Bool bRtlSym = sal_False;
if( !pOld )
{
pOld = CheckRTLForSym( pDef->GetName(), SbxVARIANT );
if( pOld )
- bRtlSym = TRUE;
+ bRtlSym = sal_True;
}
if( pOld && !(eOp == _REDIM || eOp == _REDIMP) )
{
@@ -324,7 +324,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
}
if( pOld )
{
- bDefined = TRUE;
+ bDefined = sal_True;
// always an error at a RTL-S
if( !bRtlSym && (eOp == _REDIM || eOp == _REDIMP) )
{
@@ -370,17 +370,20 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
}
global: aGen.BackChain( nGblChain );
nGblChain = 0;
- bGblDefs = bNewGblDefs = TRUE;
+ bGblDefs = bNewGblDefs = sal_True;
break;
default: eOp2 = _LOCAL;
}
- UINT32 nOpnd2 = sal::static_int_cast< UINT16 >( pDef->GetType() );
+ sal_uInt32 nOpnd2 = sal::static_int_cast< sal_uInt16 >( pDef->GetType() );
if( pDef->IsWithEvents() )
nOpnd2 |= SBX_TYPE_WITH_EVENTS_FLAG;
+ if( bCompatible && pDef->IsNew() )
+ nOpnd2 |= SBX_TYPE_DIM_AS_NEW_FLAG;
+
short nFixedStringLength = pDef->GetFixedStringLength();
if( nFixedStringLength >= 0 )
- nOpnd2 |= (SBX_FIXED_LEN_STRING_FLAG + (UINT32(nFixedStringLength) << 17)); // len = all bits above 0x10000
+ nOpnd2 |= (SBX_FIXED_LEN_STRING_FLAG + (sal_uInt32(nFixedStringLength) << 17)); // len = all bits above 0x10000
aGen.Gen( eOp2, pDef->GetId(), nOpnd2 );
}
@@ -490,10 +493,10 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
}
pDef->SetDims( pDim->GetDims() );
if( bPersistantGlobal )
- pDef->SetGlobal( TRUE );
+ pDef->SetGlobal( sal_True );
SbiExpression aExpr( this, *pDef, pDim );
aExpr.Gen();
- pDef->SetGlobal( FALSE );
+ pDef->SetGlobal( sal_False );
aGen.Gen( (eOp == _STATIC) ? _DIM : eOp );
}
}
@@ -518,7 +521,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
{
// maintain the global chain
nGblChain = aGen.Gen( _JUMP, 0 );
- bGblDefs = bNewGblDefs = TRUE;
+ bGblDefs = bNewGblDefs = sal_True;
// Register for Sub a jump to the end of statics
aGen.BackChain( nEndOfStaticLbl );
@@ -531,7 +534,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
void SbiParser::ReDim()
{
- DefVar( _REDIM, ( pProc && bVBASupportOn ) ? pProc->IsStatic() : FALSE );
+ DefVar( _REDIM, ( pProc && bVBASupportOn ) ? pProc->IsStatic() : sal_False );
}
// ERASE array, ...
@@ -551,10 +554,10 @@ void SbiParser::Erase()
void SbiParser::Type()
{
- DefType( FALSE );
+ DefType( sal_False );
}
-void SbiParser::DefType( BOOL bPrivate )
+void SbiParser::DefType( sal_Bool bPrivate )
{
// TODO: Use bPrivate
(void)bPrivate;
@@ -573,7 +576,7 @@ void SbiParser::DefType( BOOL bPrivate )
SbiSymDef* pElem;
SbiDimList* pDim = NULL;
- BOOL bDone = FALSE;
+ sal_Bool bDone = sal_False;
while( !bDone && !IsEof() )
{
@@ -581,7 +584,7 @@ void SbiParser::DefType( BOOL bPrivate )
{
case ENDTYPE :
pElem = NULL;
- bDone = TRUE;
+ bDone = sal_True;
Next();
break;
@@ -593,9 +596,9 @@ void SbiParser::DefType( BOOL bPrivate )
default:
pDim = NULL;
- pElem = VarDecl(&pDim,FALSE,FALSE);
+ pElem = VarDecl(&pDim,sal_False,sal_False);
if( !pElem )
- bDone = TRUE; // Error occurred
+ bDone = sal_True; // Error occurred
}
if( pElem )
{
@@ -616,8 +619,8 @@ void SbiParser::DefType( BOOL bPrivate )
for ( short i=0; i<pDim->GetSize();++i )
{
- INT32 ub = -1;
- INT32 lb = nBase;
+ sal_Int32 ub = -1;
+ sal_Int32 lb = nBase;
SbiExprNode* pNode = pDim->Get(i)->GetExprNode();
ub = pNode->GetNumber();
if ( !pDim->Get( i )->IsBased() ) // each dim is low/up
@@ -636,7 +639,7 @@ void SbiParser::DefType( BOOL bPrivate )
}
else
pArray->unoAddDim( 0, -1 ); // variant array
- USHORT nSavFlags = pTypeElem->GetFlags();
+ sal_uInt16 nSavFlags = pTypeElem->GetFlags();
// need to reset the FIXED flag
// when calling PutObject ( because the type will not match Object )
pTypeElem->ResetFlag( SBX_FIXED );
@@ -646,7 +649,7 @@ void SbiParser::DefType( BOOL bPrivate )
// Nested user type?
if( eElemType == SbxOBJECT )
{
- USHORT nElemTypeId = pElem->GetTypeId();
+ sal_uInt16 nElemTypeId = pElem->GetTypeId();
if( nElemTypeId != 0 )
{
String aTypeName( aGblStrings.Find( nElemTypeId ) );
@@ -676,10 +679,10 @@ void SbiParser::DefType( BOOL bPrivate )
void SbiParser::Enum()
{
- DefEnum( FALSE );
+ DefEnum( sal_False );
}
-void SbiParser::DefEnum( BOOL bPrivate )
+void SbiParser::DefEnum( sal_Bool bPrivate )
{
// Read a the new Token. It had to be a symbol
if (!TestSymbol())
@@ -698,7 +701,7 @@ void SbiParser::DefEnum( BOOL bPrivate )
SbiSymDef* pElem;
SbiDimList* pDim;
- BOOL bDone = FALSE;
+ sal_Bool bDone = sal_False;
// Starting with -1 to make first default value 0 after ++
sal_Int32 nCurrentEnumValue = -1;
@@ -708,7 +711,7 @@ void SbiParser::DefEnum( BOOL bPrivate )
{
case ENDENUM :
pElem = NULL;
- bDone = TRUE;
+ bDone = sal_True;
Next();
break;
@@ -721,20 +724,20 @@ void SbiParser::DefEnum( BOOL bPrivate )
default:
{
// TODO: Check existing!
- BOOL bDefined = FALSE;
+ sal_Bool bDefined = sal_False;
pDim = NULL;
- pElem = VarDecl( &pDim, FALSE, TRUE );
+ pElem = VarDecl( &pDim, sal_False, sal_True );
if( !pElem )
{
- bDone = TRUE; // Error occurred
+ bDone = sal_True; // Error occurred
break;
}
else if( pDim )
{
delete pDim;
Error( SbERR_SYNTAX );
- bDone = TRUE; // Error occurred
+ bDone = sal_True; // Error occurred
break;
}
@@ -764,7 +767,7 @@ void SbiParser::DefEnum( BOOL bPrivate )
if( pOld )
{
Error( SbERR_VAR_DEFINED, pElem->GetName() );
- bDone = TRUE; // Error occurred
+ bDone = sal_True; // Error occurred
break;
}
@@ -775,13 +778,13 @@ void SbiParser::DefEnum( BOOL bPrivate )
SbiOpcode eOp = _GLOBAL;
aGen.BackChain( nGblChain );
nGblChain = 0;
- bGblDefs = bNewGblDefs = TRUE;
+ bGblDefs = bNewGblDefs = sal_True;
aGen.Gen(
eOp, pElem->GetId(),
- sal::static_int_cast< UINT16 >( pElem->GetType() ) );
+ sal::static_int_cast< sal_uInt16 >( pElem->GetType() ) );
aVar.Gen();
- USHORT nStringId = aGen.GetParser()->aGblStrings.Add( nCurrentEnumValue, SbxLONG );
+ sal_uInt16 nStringId = aGen.GetParser()->aGblStrings.Add( nCurrentEnumValue, SbxLONG );
aGen.Gen( _NUMBER, nStringId );
aGen.Gen( _PUTC );
}
@@ -812,10 +815,10 @@ void SbiParser::DefEnum( BOOL bPrivate )
// the first Token is already read in (SUB/FUNCTION)
// xxx Name [LIB "name"[ALIAS "name"]][(Parameter)][AS TYPE]
-SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
+SbiProcDef* SbiParser::ProcDecl( sal_Bool bDecl )
{
- BOOL bFunc = BOOL( eCurTok == FUNCTION );
- BOOL bProp = BOOL( eCurTok == GET || eCurTok == SET || eCurTok == LET );
+ sal_Bool bFunc = sal_Bool( eCurTok == FUNCTION );
+ sal_Bool bProp = sal_Bool( eCurTok == GET || eCurTok == SET || eCurTok == LET );
if( !TestSymbol() ) return NULL;
String aName( aSym );
SbxDataType eType = eScanType;
@@ -850,7 +853,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
Error( SbERR_UNEXPECTED, ALIAS );
if( pDef->IsCdecl() )
Error( SbERR_UNEXPECTED, _CDECL_ );
- pDef->SetCdecl( FALSE );
+ pDef->SetCdecl( sal_False );
pDef->GetLib().Erase();
pDef->GetAlias().Erase();
}
@@ -861,7 +864,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
Error( SbERR_UNEXPECTED, ALIAS );
if( pDef->IsCdecl() )
Error( SbERR_UNEXPECTED, _CDECL_ );
- pDef->SetCdecl( FALSE );
+ pDef->SetCdecl( sal_False );
pDef->GetAlias().Erase();
}
// Brackets?
@@ -872,23 +875,23 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
Next();
else
for(;;) {
- BOOL bByVal = FALSE;
- BOOL bOptional = FALSE;
- BOOL bParamArray = FALSE;
+ sal_Bool bByVal = sal_False;
+ sal_Bool bOptional = sal_False;
+ sal_Bool bParamArray = sal_False;
while( Peek() == BYVAL || Peek() == BYREF || Peek() == _OPTIONAL_ )
{
- if ( Peek() == BYVAL ) Next(), bByVal = TRUE;
- else if ( Peek() == BYREF ) Next(), bByVal = FALSE;
- else if ( Peek() == _OPTIONAL_ ) Next(), bOptional = TRUE;
+ if ( Peek() == BYVAL ) Next(), bByVal = sal_True;
+ else if ( Peek() == BYREF ) Next(), bByVal = sal_False;
+ else if ( Peek() == _OPTIONAL_ ) Next(), bOptional = sal_True;
}
if( bCompatible && Peek() == PARAMARRAY )
{
if( bByVal || bOptional )
Error( SbERR_UNEXPECTED, PARAMARRAY );
Next();
- bParamArray = TRUE;
+ bParamArray = sal_True;
}
- SbiSymDef* pPar = VarDecl( NULL, FALSE, FALSE );
+ SbiSymDef* pPar = VarDecl( NULL, sal_False, sal_False );
if( !pPar )
break;
if( bByVal )
@@ -901,13 +904,13 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
SbiToken eTok = Next();
if( eTok != COMMA && eTok != RPAREN )
{
- BOOL bError2 = TRUE;
+ sal_Bool bError2 = sal_True;
if( bOptional && bCompatible && eTok == EQ )
{
SbiConstExpression* pDefaultExpr = new SbiConstExpression( this );
SbxDataType eType2 = pDefaultExpr->GetType();
- USHORT nStringId;
+ sal_uInt16 nStringId;
if( eType2 == SbxSTRING )
nStringId = aGblStrings.Add( pDefaultExpr->GetString() );
else
@@ -918,7 +921,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
eTok = Next();
if( eTok == COMMA || eTok == RPAREN )
- bError2 = FALSE;
+ bError2 = sal_False;
}
if( bError2 )
{
@@ -945,10 +948,10 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
void SbiParser::Declare()
{
- DefDeclare( FALSE );
+ DefDeclare( sal_False );
}
-void SbiParser::DefDeclare( BOOL bPrivate )
+void SbiParser::DefDeclare( sal_Bool bPrivate )
{
Next();
if( eCurTok != SUB && eCurTok != FUNCTION )
@@ -957,7 +960,7 @@ void SbiParser::DefDeclare( BOOL bPrivate )
{
bool bFunction = (eCurTok == FUNCTION);
- SbiProcDef* pDef = ProcDecl( TRUE );
+ SbiProcDef* pDef = ProcDecl( sal_True );
if( pDef )
{
if( !pDef->GetLib().Len() )
@@ -990,39 +993,39 @@ void SbiParser::DefDeclare( BOOL bPrivate )
if( bNewGblDefs && nGblChain == 0 )
{
nGblChain = aGen.Gen( _JUMP, 0 );
- bNewGblDefs = FALSE;
+ bNewGblDefs = sal_False;
}
- USHORT nSavLine = nLine;
+ sal_uInt16 nSavLine = nLine;
aGen.Statement();
pDef->Define();
pDef->SetLine1( nSavLine );
pDef->SetLine2( nSavLine );
SbiSymPool& rPool = pDef->GetParams();
- USHORT nParCount = rPool.GetSize();
+ sal_uInt16 nParCount = rPool.GetSize();
SbxDataType eType = pDef->GetType();
if( bFunction )
- aGen.Gen( _PARAM, 0, sal::static_int_cast< UINT16 >( eType ) );
+ aGen.Gen( _PARAM, 0, sal::static_int_cast< sal_uInt16 >( eType ) );
if( nParCount > 1 )
{
aGen.Gen( _ARGC );
- for( USHORT i = 1 ; i < nParCount ; ++i )
+ for( sal_uInt16 i = 1 ; i < nParCount ; ++i )
{
SbiSymDef* pParDef = rPool.Get( i );
SbxDataType eParType = pParDef->GetType();
- aGen.Gen( _PARAM, i, sal::static_int_cast< UINT16 >( eParType ) );
+ aGen.Gen( _PARAM, i, sal::static_int_cast< sal_uInt16 >( eParType ) );
aGen.Gen( _ARGV );
- USHORT nTyp = sal::static_int_cast< USHORT >( pParDef->GetType() );
+ sal_uInt16 nTyp = sal::static_int_cast< sal_uInt16 >( pParDef->GetType() );
if( pParDef->IsByVal() )
{
// Reset to avoid additional byval in call to wrapper function
- pParDef->SetByVal( FALSE );
+ pParDef->SetByVal( sal_False );
nTyp |= 0x8000;
}
aGen.Gen( _ARGTYP, nTyp );
@@ -1032,12 +1035,12 @@ void SbiParser::DefDeclare( BOOL bPrivate )
aGen.Gen( _LIB, aGblStrings.Add( pDef->GetLib() ) );
SbiOpcode eOp = pDef->IsCdecl() ? _CALLC : _CALL;
- USHORT nId = pDef->GetId();
+ sal_uInt16 nId = pDef->GetId();
if( pDef->GetAlias().Len() )
nId = ( nId & 0x8000 ) | aGblStrings.Add( pDef->GetAlias() );
if( nParCount > 1 )
nId |= 0x8000;
- aGen.Gen( eOp, nId, sal::static_int_cast< UINT16 >( eType ) );
+ aGen.Gen( eOp, nId, sal::static_int_cast< sal_uInt16 >( eType ) );
if( bFunction )
aGen.Gen( _PUT );
@@ -1079,18 +1082,18 @@ void SbiParser::Call()
void SbiParser::SubFunc()
{
- DefProc( FALSE, FALSE );
+ DefProc( sal_False, sal_False );
}
// Read in of a procedure
-BOOL runsInSetup( void );
+sal_Bool runsInSetup( void );
-void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
+void SbiParser::DefProc( sal_Bool bStatic, sal_Bool bPrivate )
{
- USHORT l1 = nLine, l2 = nLine;
- BOOL bSub = BOOL( eCurTok == SUB );
- BOOL bProperty = BOOL( eCurTok == PROPERTY );
+ sal_uInt16 l1 = nLine, l2 = nLine;
+ sal_Bool bSub = sal_Bool( eCurTok == SUB );
+ sal_Bool bProperty = sal_Bool( eCurTok == PROPERTY );
PropertyMode ePropertyMode = PROPERTY_MODE_NONE;
if( bProperty )
{
@@ -1106,7 +1109,7 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
}
SbiToken eExit = eCurTok;
- SbiProcDef* pDef = ProcDecl( FALSE );
+ SbiProcDef* pDef = ProcDecl( sal_False );
if( !pDef )
return;
pDef->setPropertyMode( ePropertyMode );
@@ -1160,13 +1163,13 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
if( bStatic )
{
if ( bVBASupportOn )
- pProc->SetStatic( TRUE );
+ pProc->SetStatic( sal_True );
else
Error( SbERR_NOT_IMPLEMENTED ); // STATIC SUB ...
}
else
{
- pProc->SetStatic( FALSE );
+ pProc->SetStatic( sal_False );
}
// Normal case: Local variable->parameter->global variable
pProc->GetLocals().SetParent( &pProc->GetParams() );
@@ -1191,10 +1194,10 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
void SbiParser::Static()
{
- DefStatic( FALSE );
+ DefStatic( sal_False );
}
-void SbiParser::DefStatic( BOOL bPrivate )
+void SbiParser::DefStatic( sal_Bool bPrivate )
{
switch( Peek() )
{
@@ -1206,10 +1209,10 @@ void SbiParser::DefStatic( BOOL bPrivate )
if( bNewGblDefs && nGblChain == 0 )
{
nGblChain = aGen.Gen( _JUMP, 0 );
- bNewGblDefs = FALSE;
+ bNewGblDefs = sal_False;
}
Next();
- DefProc( TRUE, bPrivate );
+ DefProc( sal_True, bPrivate );
break;
default: {
if( !pProc )
@@ -1217,7 +1220,7 @@ void SbiParser::DefStatic( BOOL bPrivate )
// Reset the Pool, so that STATIC-Declarations go into the
// global Pool
SbiSymPool* p = pPool; pPool = &aPublics;
- DefVar( _STATIC, TRUE );
+ DefVar( _STATIC, sal_True );
pPool = p;
} break;
}
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 5975314e8870..1dcd5fc73e59 100644..100755
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -76,12 +76,12 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
case SbxINTEGER: pGen->Gen( _CONST, (short) nVal ); break;
case SbxSTRING:
{
- USHORT nStringId = pGen->GetParser()->aGblStrings.Add( aStrVal, TRUE );
+ sal_uInt16 nStringId = pGen->GetParser()->aGblStrings.Add( aStrVal, sal_True );
pGen->Gen( _SCONST, nStringId ); break;
}
default:
{
- USHORT nStringId = pGen->GetParser()->aGblStrings.Add( nVal, eType );
+ sal_uInt16 nStringId = pGen->GetParser()->aGblStrings.Add( nVal, eType );
pGen->Gen( _NUMBER, nStringId );
}
}
@@ -175,7 +175,7 @@ void SbiExprNode::GenElement( SbiOpcode eOp )
// The ID is either the position or the String-ID
// If the bit Bit 0x8000 is set, the variable have
// a parameter list.
- USHORT nId = ( eOp == _PARAM ) ? pDef->GetPos() : pDef->GetId();
+ sal_uInt16 nId = ( eOp == _PARAM ) ? pDef->GetPos() : pDef->GetId();
// Build a parameter list
if( aVar.pPar && aVar.pPar->GetSize() )
{
@@ -183,7 +183,7 @@ void SbiExprNode::GenElement( SbiOpcode eOp )
aVar.pPar->Gen();
}
- pGen->Gen( eOp, nId, sal::static_int_cast< UINT16 >( GetType() ) );
+ pGen->Gen( eOp, nId, sal::static_int_cast< sal_uInt16 >( GetType() ) );
if( aVar.pvMorePar )
{
@@ -208,7 +208,7 @@ void SbiExprList::Gen()
{
pParser->aGen.Gen( _ARGC );
// From 1996-01-10: Type adjustment at DECLARE
- USHORT nCount = 1 /*, nParAnz = 0*/;
+ sal_uInt16 nCount = 1 /*, nParAnz = 0*/;
// SbiSymPool* pPool = NULL;
for( SbiExpression* pExpr = pFirst; pExpr; pExpr = pExpr->pNext,nCount++ )
{
@@ -216,7 +216,7 @@ void SbiExprList::Gen()
if( pExpr->GetName().Len() )
{
// named arg
- USHORT nSid = pParser->aGblStrings.Add( pExpr->GetName() );
+ sal_uInt16 nSid = pParser->aGblStrings.Add( pExpr->GetName() );
pParser->aGen.Gen( _ARGN, nSid );
/* TODO: Check after Declare concept change
@@ -227,7 +227,7 @@ void SbiExprList::Gen()
pParser->Error( SbERR_NO_NAMED_ARGS );
// Later, if Named Args at DECLARE is posible
- //for( USHORT i = 1 ; i < nParAnz ; i++ )
+ //for( sal_uInt16 i = 1 ; i < nParAnz ; i++ )
//{
// SbiSymDef* pDef = pPool->Get( i );
// const String& rName = pDef->GetName();
@@ -261,7 +261,7 @@ void SbiExpression::Gen( RecursiveMode eRecMode )
pParser->aGen.Gen( _BYVAL );
if( bBased )
{
- USHORT uBase = pParser->nBase;
+ sal_uInt16 uBase = pParser->nBase;
if( pParser->IsCompatible() )
uBase |= 0x8000; // #109275 Flag compatiblity
pParser->aGen.Gen( _BASED, uBase );
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 7a3dc862cb16..f454071c0377 100644..100755
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -54,7 +54,7 @@ SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, SbiToken t, SbiExprNode*
nVal = 0;
eType = SbxVARIANT; // Nodes are always Variant
eNodeType = SbxNODE;
- bComposite= TRUE;
+ bComposite= sal_True;
}
SbiExprNode::SbiExprNode( SbiParser* p, double n, SbxDataType t )
@@ -87,11 +87,11 @@ SbiExprNode::SbiExprNode( SbiParser* p, const SbiSymDef& r, SbxDataType t, SbiEx
aVar.pNext= NULL;
// Results of functions are at no time fixed
- bComposite= BOOL( aVar.pDef->GetProcDef() != NULL );
+ bComposite= sal_Bool( aVar.pDef->GetProcDef() != NULL );
}
// #120061 TypeOf
-SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, USHORT nId )
+SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, sal_uInt16 nId )
{
BaseInit( p );
@@ -102,7 +102,7 @@ SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, USHORT nId )
}
// new <type>
-SbiExprNode::SbiExprNode( SbiParser* p, USHORT nId )
+SbiExprNode::SbiExprNode( SbiParser* p, sal_uInt16 nId )
{
BaseInit( p );
@@ -119,8 +119,8 @@ void SbiExprNode::BaseInit( SbiParser* p )
pLeft = NULL;
pRight = NULL;
pWithParent = NULL;
- bComposite = FALSE;
- bError = FALSE;
+ bComposite = sal_False;
+ bError = sal_False;
}
SbiExprNode::~SbiExprNode()
@@ -175,7 +175,7 @@ SbiExprNode* SbiExprNode::GetRealNode()
// This method transform the type, if it fits into the Integer range
-BOOL SbiExprNode::IsIntConst()
+sal_Bool SbiExprNode::IsIntConst()
{
if( eNodeType == SbxNUMVAL )
{
@@ -186,29 +186,29 @@ BOOL SbiExprNode::IsIntConst()
{
nVal = (double) (short) nVal;
eType = SbxINTEGER;
- return TRUE;
+ return sal_True;
}
}
}
- return FALSE;
+ return sal_False;
}
-BOOL SbiExprNode::IsNumber()
+sal_Bool SbiExprNode::IsNumber()
{
- return BOOL( eNodeType == SbxNUMVAL );
+ return sal_Bool( eNodeType == SbxNUMVAL );
}
-BOOL SbiExprNode::IsString()
+sal_Bool SbiExprNode::IsString()
{
- return BOOL( eNodeType == SbxSTRVAL );
+ return sal_Bool( eNodeType == SbxSTRVAL );
}
-BOOL SbiExprNode::IsVariable()
+sal_Bool SbiExprNode::IsVariable()
{
- return BOOL( eNodeType == SbxVARVAL );
+ return sal_Bool( eNodeType == SbxVARVAL );
}
-BOOL SbiExprNode::IsLvalue()
+sal_Bool SbiExprNode::IsLvalue()
{
return IsVariable();
}
@@ -284,7 +284,7 @@ void SbiExprNode::FoldConstants()
String rr( pRight->GetString() );
delete pLeft; pLeft = NULL;
delete pRight; pRight = NULL;
- bComposite = FALSE;
+ bComposite = sal_False;
if( eTok == PLUS || eTok == CAT )
{
eTok = CAT;
@@ -321,7 +321,7 @@ void SbiExprNode::FoldConstants()
break;
default:
pGen->GetParser()->Error( SbERR_CONVERSION );
- bError = TRUE;
+ bError = sal_True;
}
}
}
@@ -335,50 +335,50 @@ void SbiExprNode::FoldConstants()
|| eTok == IDIV || eTok == MOD )
{
// Integer operations
- BOOL err = FALSE;
- if( nl > SbxMAXLNG ) err = TRUE, nl = SbxMAXLNG;
+ sal_Bool err = sal_False;
+ if( nl > SbxMAXLNG ) err = sal_True, nl = SbxMAXLNG;
else
- if( nl < SbxMINLNG ) err = TRUE, nl = SbxMINLNG;
- if( nr > SbxMAXLNG ) err = TRUE, nr = SbxMAXLNG;
+ if( nl < SbxMINLNG ) err = sal_True, nl = SbxMINLNG;
+ if( nr > SbxMAXLNG ) err = sal_True, nr = SbxMAXLNG;
else
- if( nr < SbxMINLNG ) err = TRUE, nr = SbxMINLNG;
+ if( nr < SbxMINLNG ) err = sal_True, nr = SbxMINLNG;
ll = (long) nl; lr = (long) nr;
llMod = (long) (nl < 0 ? nl - 0.5 : nl + 0.5);
lrMod = (long) (nr < 0 ? nr - 0.5 : nr + 0.5);
if( err )
{
pGen->GetParser()->Error( SbERR_MATH_OVERFLOW );
- bError = TRUE;
+ bError = sal_True;
}
}
- BOOL bBothInt = BOOL( pLeft->eType < SbxSINGLE
+ sal_Bool bBothInt = sal_Bool( pLeft->eType < SbxSINGLE
&& pRight->eType < SbxSINGLE );
delete pLeft; pLeft = NULL;
delete pRight; pRight = NULL;
nVal = 0;
eType = SbxDOUBLE;
eNodeType = SbxNUMVAL;
- bComposite = FALSE;
- BOOL bCheckType = FALSE;
+ bComposite = sal_False;
+ sal_Bool bCheckType = sal_False;
switch( eTok )
{
case EXPON:
nVal = pow( nl, nr ); break;
case MUL:
- bCheckType = TRUE;
+ bCheckType = sal_True;
nVal = nl * nr; break;
case DIV:
if( !nr )
{
pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL;
- bError = TRUE;
+ bError = sal_True;
} else nVal = nl / nr;
break;
case PLUS:
- bCheckType = TRUE;
+ bCheckType = sal_True;
nVal = nl + nr; break;
case MINUS:
- bCheckType = TRUE;
+ bCheckType = sal_True;
nVal = nl - nr; break;
case EQ:
nVal = ( nl == nr ) ? SbxTRUE : SbxFALSE;
@@ -402,14 +402,14 @@ void SbiExprNode::FoldConstants()
if( !lr )
{
pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL;
- bError = TRUE;
+ bError = sal_True;
} else nVal = ll / lr;
eType = SbxLONG; break;
case MOD:
if( !lr )
{
pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL;
- bError = TRUE;
+ bError = sal_True;
} else nVal = llMod % lrMod;
eType = SbxLONG; break;
case AND:
@@ -448,21 +448,21 @@ void SbiExprNode::FoldConstants()
pLeft = NULL;
eType = SbxDOUBLE;
eNodeType = SbxNUMVAL;
- bComposite = FALSE;
+ bComposite = sal_False;
switch( eTok )
{
case NEG:
nVal = -nVal; break;
case NOT: {
// Integer operation!
- BOOL err = FALSE;
- if( nVal > SbxMAXLNG ) err = TRUE, nVal = SbxMAXLNG;
+ sal_Bool err = sal_False;
+ if( nVal > SbxMAXLNG ) err = sal_True, nVal = SbxMAXLNG;
else
- if( nVal < SbxMINLNG ) err = TRUE, nVal = SbxMINLNG;
+ if( nVal < SbxMINLNG ) err = sal_True, nVal = SbxMINLNG;
if( err )
{
pGen->GetParser()->Error( SbERR_MATH_OVERFLOW );
- bError = TRUE;
+ bError = sal_True;
}
nVal = (double) ~((long) nVal);
eType = SbxLONG;
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 6cf3f36a5646..cef0542c43bc 100644..100755
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -43,7 +43,7 @@ SbiExpression::SbiExpression( SbiParser* p, SbiExprType t,
SbiExprMode eMode, const KeywordSymbolInfo* pKeywordSymbolInfo )
{
pParser = p;
- bError = bByVal = bBased = bBracket = FALSE;
+ bError = bByVal = bBased = bBracket = sal_False;
nParenLevel = 0;
eCurExpr = t;
m_eMode = eMode;
@@ -62,7 +62,7 @@ SbiExpression::SbiExpression( SbiParser* p, double n, SbxDataType t )
pParser = p;
eCurExpr = SbOPERAND;
pNext = NULL;
- bError = bByVal = bBased = bBracket = FALSE;
+ bError = bByVal = bBased = bBracket = sal_False;
pExpr = new SbiExprNode( pParser, n, t );
pExpr->Optimize();
}
@@ -71,7 +71,7 @@ SbiExpression::SbiExpression( SbiParser* p, const String& r )
{
pParser = p;
pNext = NULL;
- bError = bByVal = bBased = bBracket = FALSE;
+ bError = bByVal = bBased = bBracket = sal_False;
eCurExpr = SbOPERAND;
pExpr = new SbiExprNode( pParser, r );
}
@@ -80,7 +80,7 @@ SbiExpression::SbiExpression( SbiParser* p, const SbiSymDef& r, SbiExprList* pPa
{
pParser = p;
pNext = NULL;
- bError = bByVal = bBased = bBracket = FALSE;
+ bError = bByVal = bBased = bBracket = sal_False;
eCurExpr = SbOPERAND;
pExpr = new SbiExprNode( pParser, r, SbxVARIANT, pPar );
}
@@ -89,7 +89,7 @@ SbiExpression::SbiExpression( SbiParser* p, SbiToken t )
{
pParser = p;
pNext = NULL;
- bError = bByVal = bBased = bBracket = FALSE;
+ bError = bByVal = bBased = bBracket = sal_False;
eCurExpr = SbOPERAND;
pExpr = new SbiExprNode( pParser, NULL, t, NULL );
}
@@ -108,17 +108,17 @@ SbiExpression::~SbiExpression()
// Folgen Parameter ohne Klammer? Dies kann eine Zahl, ein String,
// ein Symbol oder auch ein Komma sein (wenn der 1. Parameter fehlt)
-static BOOL DoParametersFollow( SbiParser* p, SbiExprType eCurExpr, SbiToken eTok )
+static sal_Bool DoParametersFollow( SbiParser* p, SbiExprType eCurExpr, SbiToken eTok )
{
if( eTok == LPAREN )
- return TRUE;
+ return sal_True;
// Aber nur, wenn CALL-aehnlich!
if( !p->WhiteSpace() || eCurExpr != SbSYMBOL )
- return FALSE;
+ return sal_False;
if ( eTok == NUMBER || eTok == MINUS || eTok == FIXSTRING
|| eTok == SYMBOL || eTok == COMMA || eTok == DOT || eTok == NOT || eTok == BYVAL )
{
- return TRUE;
+ return sal_True;
}
else // check for default params with reserved names ( e.g. names of tokens )
{
@@ -126,9 +126,9 @@ static BOOL DoParametersFollow( SbiParser* p, SbiExprType eCurExpr, SbiToken eTo
// Urk the Next() / Peek() symantics are... weird
tokens.Next();
if ( tokens.Peek() == ASSIGN )
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
// Definition eines neuen Symbols
@@ -139,7 +139,7 @@ static SbiSymDef* AddSym
{
SbiSymDef* pDef;
// A= ist keine Prozedur
- BOOL bHasType = BOOL( eTok == EQ || eTok == DOT );
+ sal_Bool bHasType = sal_Bool( eTok == EQ || eTok == DOT );
if( ( !bHasType && eCurExpr == SbSYMBOL ) || pPar )
{
// Dies ist also eine Prozedur
@@ -152,14 +152,14 @@ static SbiSymDef* AddSym
// Sonderbehandlung fuer Colls wie Documents(1)
if( eCurExpr == SbSTDEXPR )
- bHasType = TRUE;
+ bHasType = sal_True;
pDef = pProc;
pDef->SetType( bHasType ? eType : SbxEMPTY );
if( pPar )
{
// Dummy-Parameter generieren
- USHORT n = 1;
+ sal_uInt16 n = 1;
for( short i = 0; i < pPar->GetSize(); i++ )
{
String aPar = String::CreateFromAscii( "PAR" );
@@ -233,7 +233,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
else
{
pParser->Error( SbERR_SYNTAX );
- bError = TRUE;
+ bError = sal_True;
}
}
@@ -260,18 +260,18 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
// Es koennte ein Objektteil sein, wenn . oder ! folgt
// Bei . muss aber die Variable bereits definiert sein; wenn pDef
// nach der Suche NULL ist, isses ein Objekt!
- BOOL bObj = BOOL( ( eTok == DOT || eTok == EXCLAM )
+ sal_Bool bObj = sal_Bool( ( eTok == DOT || eTok == EXCLAM )
&& !pParser->WhiteSpace() );
if( bObj )
{
- bBracket = FALSE; // Now the bracket for the first term is obsolete
+ bBracket = sal_False; // Now the bracket for the first term is obsolete
if( eType == SbxVARIANT )
eType = SbxOBJECT;
else
{
// Name%. geht wirklich nicht!
pParser->Error( SbERR_BAD_DECLARATION, aSym );
- bError = TRUE;
+ bError = sal_True;
}
}
// Suche:
@@ -331,7 +331,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
{
// Wie? Erst mit AS definieren und dann einen Suffix nehmen?
pParser->Error( SbERR_BAD_DECLARATION, aSym );
- bError = TRUE;
+ bError = sal_True;
}
else if ( eType == SbxVARIANT )
// Falls nix angegeben, den Typ des Eintrags nehmen
@@ -356,13 +356,13 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
else
{
pParser->Error( SbERR_BAD_DECLARATION, aSym );
- bError = TRUE;
+ bError = sal_True;
}
}
}
SbiExprNode* pNd = new SbiExprNode( pParser, *pDef, eType );
if( !pPar )
- pPar = new SbiParameters( pParser,FALSE,FALSE );
+ pPar = new SbiParameters( pParser,sal_False,sal_False );
pNd->aVar.pPar = pPar;
pNd->aVar.pvMorePar = pvMoreParLcl;
if( bObj )
@@ -376,9 +376,9 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
{
// defer error until runtime if in vba mode
if ( !pParser->IsVBASupportOn() )
- {
+ {
pParser->Error( SbERR_BAD_DECLARATION, aSym );
- bError = TRUE;
+ bError = sal_True;
}
}
if( !bError )
@@ -404,14 +404,14 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
eTok != XOR && eTok != EQV && eTok != IMP && eTok != IS )
{
pParser->Error( SbERR_VAR_EXPECTED );
- bError = TRUE;
+ bError = sal_True;
}
}
/* #118410 Allow type for Class methods and RTL object, e.g. RTL.Chr$(97)
else
{
if( pParser->GetType() != SbxVARIANT )
- pParser->Error( SbERR_SYNTAX ), bError = TRUE;
+ pParser->Error( SbERR_SYNTAX ), bError = sal_True;
}
*/
if( bError )
@@ -442,7 +442,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
}
}
- BOOL bObj = BOOL( ( eTok == DOT || eTok == EXCLAM ) && !pParser->WhiteSpace() );
+ sal_Bool bObj = sal_Bool( ( eTok == DOT || eTok == EXCLAM ) && !pParser->WhiteSpace() );
if( bObj )
{
if( eType == SbxVARIANT )
@@ -451,7 +451,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
{
// Name%. geht wirklich nicht!
pParser->Error( SbERR_BAD_DECLARATION, aSym );
- bError = TRUE;
+ bError = sal_True;
}
}
@@ -482,7 +482,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
if( pDef->GetType() != SbxOBJECT )
{
pParser->Error( SbERR_BAD_DECLARATION, aSym );
- bError = TRUE;
+ bError = sal_True;
}
if( !bError )
{
@@ -559,7 +559,7 @@ SbiExprNode* SbiExpression::Operand( bool bUsedForTypeOf )
}
}
nParenLevel--;
- pRes->bComposite = TRUE;
+ pRes->bComposite = sal_True;
break;
default:
// Zur Zeit sind Keywords hier OK!
@@ -609,7 +609,7 @@ SbiExprNode* SbiExpression::Unary()
pParser->TestToken( IS );
String aDummy;
SbiSymDef* pTypeDef = new SbiSymDef( aDummy );
- pParser->TypeDecl( *pTypeDef, TRUE );
+ pParser->TypeDecl( *pTypeDef, sal_True );
pNd = new SbiExprNode( pParser, pObjNode, pTypeDef->GetTypeId() );
break;
}
@@ -618,7 +618,7 @@ SbiExprNode* SbiExpression::Unary()
pParser->Next();
String aStr;
SbiSymDef* pTypeDef = new SbiSymDef( aStr );
- pParser->TypeDecl( *pTypeDef, TRUE );
+ pParser->TypeDecl( *pTypeDef, sal_True );
pNd = new SbiExprNode( pParser, pTypeDef->GetTypeId() );
break;
}
@@ -847,7 +847,7 @@ SbiExprNode* SbiExpression::VBA_Imp()
SbiExprNode* SbiExpression::Like()
{
- SbiExprNode* pNd = pParser->IsVBASupportOn() ? VBA_Imp() : Comp();
+ SbiExprNode* pNd = pParser->IsVBASupportOn() ? VBA_Not() : Comp();
if( m_eMode != EXPRMODE_EMPTY_PAREN )
{
short nCount = 0;
@@ -859,7 +859,7 @@ SbiExprNode* SbiExpression::Like()
if( nCount > 1 && !pParser->IsVBASupportOn() )
{
pParser->Error( SbERR_SYNTAX );
- bError = TRUE;
+ bError = sal_True;
}
}
return pNd;
@@ -909,28 +909,28 @@ SbiConstExpression::SbiConstExpression( SbiParser* p ) : SbiExpression( p )
}
else
{
- // #40204 Spezialbehandlung fuer BOOL-Konstanten
- BOOL bIsBool = FALSE;
+ // #40204 Spezialbehandlung fuer sal_Bool-Konstanten
+ sal_Bool bIsBool = sal_False;
if( pExpr->eNodeType == SbxVARVAL )
{
SbiSymDef* pVarDef = pExpr->GetVar();
- // Ist es eine BOOL-Konstante?
- BOOL bBoolVal = FALSE;
+ // Ist es eine sal_Bool-Konstante?
+ sal_Bool bBoolVal = sal_False;
if( pVarDef->GetName().EqualsIgnoreCaseAscii( "true" ) )
//if( pVarDef->GetName().ICompare( "true" ) == COMPARE_EQUAL )
{
- bIsBool = TRUE;
- bBoolVal = TRUE;
+ bIsBool = sal_True;
+ bBoolVal = sal_True;
}
else if( pVarDef->GetName().EqualsIgnoreCaseAscii( "false" ) )
//else if( pVarDef->GetName().ICompare( "false" ) == COMPARE_EQUAL )
{
- bIsBool = TRUE;
- bBoolVal = FALSE;
+ bIsBool = sal_True;
+ bBoolVal = sal_False;
}
- // Wenn es ein BOOL ist, Node austauschen
+ // Wenn es ein sal_Bool ist, Node austauschen
if( bIsBool )
{
delete pExpr;
@@ -982,7 +982,7 @@ SbiExprList::SbiExprList( SbiParser* p )
nExpr =
nDim = 0;
bError =
- bBracket = FALSE;
+ bBracket = sal_False;
}
SbiExprList::~SbiExprList()
@@ -1030,8 +1030,8 @@ void SbiExprList::addExpression( SbiExpression* pExpr )
// #i79918/#i80532: bConst has never been set to true
// -> reused as bStandaloneExpression
-//SbiParameters::SbiParameters( SbiParser* p, BOOL bConst, BOOL bPar) :
-SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPar) :
+//SbiParameters::SbiParameters( SbiParser* p, sal_Bool bConst, sal_Bool bPar) :
+SbiParameters::SbiParameters( SbiParser* p, sal_Bool bStandaloneExpression, sal_Bool bPar) :
SbiExprList( p )
{
if( !bPar )
@@ -1051,7 +1051,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
}
else
{
- bBracket = TRUE;
+ bBracket = sal_True;
pParser->Next();
eTok = pParser->Peek();
}
@@ -1075,7 +1075,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
{
pExpr = new SbiExpression( pParser, 0, SbxEMPTY );
//if( bConst )
- // pParser->Error( SbERR_SYNTAX ), bError = TRUE;
+ // pParser->Error( SbERR_SYNTAX ), bError = sal_True;
}
// Benannte Argumente: entweder .name= oder name:=
else
@@ -1091,25 +1091,25 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
if( bAssumeExprLParenMode )
{
pExpr = new SbiExpression( pParser, SbSTDEXPR, EXPRMODE_LPAREN_PENDING );
- bAssumeExprLParenMode = FALSE;
+ bAssumeExprLParenMode = sal_False;
SbiExprMode eModeAfter = pExpr->m_eMode;
if( eModeAfter == EXPRMODE_LPAREN_NOT_NEEDED )
{
- bBracket = TRUE;
+ bBracket = sal_True;
}
else if( eModeAfter == EXPRMODE_ARRAY_OR_OBJECT )
{
// Expression "looks" like an array assignment
// a(...)[(...)] = ? or a(...).b(...)
// RPAREN is already parsed
- bBracket = TRUE;
+ bBracket = sal_True;
bAssumeArrayMode = true;
eTok = NIL;
}
else if( eModeAfter == EXPRMODE_EMPTY_PAREN )
{
- bBracket = TRUE;
+ bBracket = sal_True;
delete pExpr;
if( bByVal )
pParser->Error( SbERR_LVALUE_EXPECTED );
@@ -1135,7 +1135,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
pParser->Next();
pExpr = new SbiExpression( pParser );
//if( bConst )
- // pParser->Error( SbERR_SYNTAX ), bError = TRUE;
+ // pParser->Error( SbERR_SYNTAX ), bError = sal_True;
}
pExpr->GetName() = aName;
}
@@ -1160,7 +1160,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
pParser->Error( bBracket
? SbERR_BAD_BRACKETS
: SbERR_EXPECTED, COMMA );
- bError = TRUE;
+ bError = sal_True;
}
else
{
@@ -1178,7 +1178,7 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
if( !bBracket )
{
pParser->Error( SbERR_BAD_BRACKETS );
- bError = TRUE;
+ bError = sal_True;
}
}
nDim = nExpr;
@@ -1197,12 +1197,12 @@ SbiParameters::SbiParameters( SbiParser* p, BOOL bStandaloneExpression, BOOL bPa
SbiDimList::SbiDimList( SbiParser* p ) : SbiExprList( p )
{
- bConst = TRUE;
+ bConst = sal_True;
if( pParser->Next() != LPAREN )
{
pParser->Error( SbERR_EXPECTED, LPAREN );
- bError = TRUE; return;
+ bError = sal_True; return;
}
if( pParser->Peek() != RPAREN )
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 7ca4a7babdea..5c4abc680826 100644..100755
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -36,9 +36,9 @@
// Test, ob ein I/O-Channel angegeben wurde
-BOOL SbiParser::Channel( BOOL bAlways )
+sal_Bool SbiParser::Channel( sal_Bool bAlways )
{
- BOOL bRes = FALSE;
+ sal_Bool bRes = sal_False;
Peek();
if( IsHash() )
{
@@ -47,7 +47,7 @@ BOOL SbiParser::Channel( BOOL bAlways )
Next();
aExpr.Gen();
aGen.Gen( _CHANNEL );
- bRes = TRUE;
+ bRes = sal_True;
}
else if( bAlways )
Error( SbERR_EXPECTED, "#" );
@@ -61,7 +61,7 @@ BOOL SbiParser::Channel( BOOL bAlways )
void SbiParser::Print()
{
- BOOL bChan = Channel();
+ sal_Bool bChan = Channel();
// Die Ausdruecke zum Drucken:
while( !bAbort )
{
@@ -92,7 +92,7 @@ void SbiParser::Print()
void SbiParser::Write()
{
- BOOL bChan = Channel();
+ sal_Bool bChan = Channel();
// Die Ausdruecke zum Drucken:
while( !bAbort )
{
@@ -144,8 +144,8 @@ void SbiParser::Line()
void SbiParser::LineInput()
{
- Channel( TRUE );
- // BOOL bChan = Channel( TRUE );
+ Channel( sal_True );
+ // sal_Bool bChan = Channel( sal_True );
SbiExpression* pExpr = new SbiExpression( this, SbOPERAND );
/* AB 15.1.96: Keinen allgemeinen Ausdruck mehr zulassen
SbiExpression* pExpr = new SbiExpression( this );
@@ -181,8 +181,8 @@ void SbiParser::LineInput()
void SbiParser::Input()
{
aGen.Gen( _RESTART );
- Channel( TRUE );
- // BOOL bChan = Channel( TRUE );
+ Channel( sal_True );
+ // sal_Bool bChan = Channel( sal_True );
SbiExpression* pExpr = new SbiExpression( this, SbOPERAND );
/* ALT: Jetzt keinen allgemeinen Ausdruck mehr zulassen
SbiExpression* pExpr = new SbiExpression( this );
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index b5131c58dfaf..f904c9ee51f3 100644..100755
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -35,7 +35,7 @@
void SbiParser::If()
{
- UINT32 nEndLbl;
+ sal_uInt32 nEndLbl;
SbiToken eTok = NIL;
// Ende-Tokens ignorieren:
SbiExpression aCond( this );
@@ -47,8 +47,8 @@ void SbiParser::If()
// eingefuegt werden, damit bei ELSEIF nicht erneut die Bedingung
// ausgewertet wird. Die Tabelle nimmt alle Absprungstellen auf.
#define JMP_TABLE_SIZE 100
- UINT32 pnJmpToEndLbl[JMP_TABLE_SIZE]; // 100 ELSEIFs zulaessig
- USHORT iJmp = 0; // aktueller Tabellen-Index
+ sal_uInt32 pnJmpToEndLbl[JMP_TABLE_SIZE]; // 100 ELSEIFs zulaessig
+ sal_uInt16 iJmp = 0; // aktueller Tabellen-Index
// multiline IF
nEndLbl = aGen.Gen( _JUMPF, 0 );
@@ -59,7 +59,7 @@ void SbiParser::If()
eTok = Peek();
if( IsEof() )
{
- Error( SbERR_BAD_BLOCK, IF ); bAbort = TRUE; return;
+ Error( SbERR_BAD_BLOCK, IF ); bAbort = sal_True; return;
}
}
// ELSEIF?
@@ -68,7 +68,7 @@ void SbiParser::If()
// #27720# Bei erfolgreichem IF/ELSEIF auf ENDIF springen
if( iJmp >= JMP_TABLE_SIZE )
{
- Error( SbERR_PROG_TOO_LARGE ); bAbort = TRUE; return;
+ Error( SbERR_PROG_TOO_LARGE ); bAbort = sal_True; return;
}
pnJmpToEndLbl[iJmp++] = aGen.Gen( _JUMP, 0 );
@@ -88,14 +88,14 @@ void SbiParser::If()
eTok = Peek();
if( IsEof() )
{
- Error( SbERR_BAD_BLOCK, ELSEIF ); bAbort = TRUE; return;
+ Error( SbERR_BAD_BLOCK, ELSEIF ); bAbort = sal_True; return;
}
}
}
if( eTok == ELSE )
{
Next();
- UINT32 nElseLbl = nEndLbl;
+ sal_uInt32 nElseLbl = nEndLbl;
nEndLbl = aGen.Gen( _JUMP, 0 );
aGen.BackChain( nElseLbl );
@@ -115,7 +115,7 @@ void SbiParser::If()
else
{
// single line IF
- bSingleLineIf = TRUE;
+ bSingleLineIf = sal_True;
nEndLbl = aGen.Gen( _JUMPF, 0 );
Push( eCurTok );
while( !bAbort )
@@ -128,7 +128,7 @@ void SbiParser::If()
if( eTok == ELSE )
{
Next();
- UINT32 nElseLbl = nEndLbl;
+ sal_uInt32 nElseLbl = nEndLbl;
nEndLbl = aGen.Gen( _JUMP, 0 );
aGen.BackChain( nElseLbl );
while( !bAbort )
@@ -139,7 +139,7 @@ void SbiParser::If()
break;
}
}
- bSingleLineIf = FALSE;
+ bSingleLineIf = sal_False;
}
aGen.BackChain( nEndLbl );
}
@@ -157,7 +157,7 @@ void SbiParser::NoIf()
void SbiParser::DoLoop()
{
- UINT32 nStartLbl = aGen.GetPC();
+ sal_uInt32 nStartLbl = aGen.GetPC();
OpenBlock( DO );
SbiToken eTok = Next();
if( IsEoln( eTok ) )
@@ -184,7 +184,7 @@ void SbiParser::DoLoop()
SbiExpression aCond( this );
aCond.Gen();
}
- UINT32 nEndLbl = aGen.Gen( eTok == UNTIL ? _JUMPT : _JUMPF, 0 );
+ sal_uInt32 nEndLbl = aGen.Gen( eTok == UNTIL ? _JUMPT : _JUMPF, 0 );
StmntBlock( LOOP );
TestEoln();
aGen.Gen( _JUMP, nStartLbl );
@@ -198,9 +198,9 @@ void SbiParser::DoLoop()
void SbiParser::While()
{
SbiExpression aCond( this );
- UINT32 nStartLbl = aGen.GetPC();
+ sal_uInt32 nStartLbl = aGen.GetPC();
aCond.Gen();
- UINT32 nEndLbl = aGen.Gen( _JUMPF, 0 );
+ sal_uInt32 nEndLbl = aGen.Gen( _JUMPF, 0 );
StmntBlock( WEND );
aGen.Gen( _JUMP, nStartLbl );
aGen.BackChain( nEndLbl );
@@ -249,9 +249,9 @@ void SbiParser::For()
aGen.Gen( _INITFOR );
}
- UINT32 nLoop = aGen.GetPC();
+ sal_uInt32 nLoop = aGen.GetPC();
// Test durchfuehren, evtl. Stack freigeben
- UINT32 nEndTarget = aGen.Gen( _TESTFOR, 0 );
+ sal_uInt32 nEndTarget = aGen.Gen( _TESTFOR, 0 );
OpenBlock( FOR );
StmntBlock( NEXT );
aGen.Gen( _NEXT );
@@ -306,7 +306,7 @@ void SbiParser::OnGoto()
{
SbiExpression aCond( this );
aCond.Gen();
- UINT32 nLabelsTarget = aGen.Gen( _ONJUMP, 0 );
+ sal_uInt32 nLabelsTarget = aGen.Gen( _ONJUMP, 0 );
SbiToken eTok = Next();
if( eTok != GOTO && eTok != GOSUB )
{
@@ -314,13 +314,13 @@ void SbiParser::OnGoto()
eTok = GOTO;
}
// Label-Tabelle einlesen:
- UINT32 nLbl = 0;
+ sal_uInt32 nLbl = 0;
do
{
Next(); // Label holen
if( MayBeLabel() )
{
- UINT32 nOff = pProc->GetLabels().Reference( aSym );
+ sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
aGen.Gen( _JUMP, nOff );
nLbl++;
}
@@ -340,7 +340,7 @@ void SbiParser::Goto()
Next();
if( MayBeLabel() )
{
- UINT32 nOff = pProc->GetLabels().Reference( aSym );
+ sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
aGen.Gen( eOp, nOff );
}
else Error( SbERR_LABEL_EXPECTED );
@@ -353,7 +353,7 @@ void SbiParser::Return()
Next();
if( MayBeLabel() )
{
- UINT32 nOff = pProc->GetLabels().Reference( aSym );
+ sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
aGen.Gen( _RETURN, nOff );
}
else aGen.Gen( _RETURN, 0 );
@@ -369,9 +369,9 @@ void SbiParser::Select()
aCase.Gen();
aGen.Gen( _CASE );
TestEoln();
- UINT32 nNextTarget = 0;
- UINT32 nDoneTarget = 0;
- BOOL bElse = FALSE;
+ sal_uInt32 nNextTarget = 0;
+ sal_uInt32 nDoneTarget = 0;
+ sal_Bool bElse = sal_False;
// Die Cases einlesen:
while( !bAbort )
{
@@ -382,13 +382,13 @@ void SbiParser::Select()
aGen.BackChain( nNextTarget ), nNextTarget = 0;
aGen.Statement();
// Jeden Case einlesen
- BOOL bDone = FALSE;
- UINT32 nTrueTarget = 0;
+ sal_Bool bDone = sal_False;
+ sal_uInt32 nTrueTarget = 0;
if( Peek() == ELSE )
{
// CASE ELSE
Next();
- bElse = TRUE;
+ bElse = sal_True;
}
else while( !bDone )
{
@@ -407,7 +407,7 @@ void SbiParser::Select()
aCompare.Gen();
nTrueTarget = aGen.Gen(
_CASEIS, nTrueTarget,
- sal::static_int_cast< UINT16 >(
+ sal::static_int_cast< sal_uInt16 >(
SbxEQ + ( eTok2 - EQ ) ) );
}
else
@@ -428,7 +428,7 @@ void SbiParser::Select()
}
if( Peek() == COMMA ) Next();
- else TestEoln(), bDone = TRUE;
+ else TestEoln(), bDone = sal_True;
}
// Alle Cases abgearbeitet
if( !bElse )
@@ -493,7 +493,7 @@ void SbiParser::On()
aGen.Gen( _STDERROR );
else
{
- UINT32 nOff = pProc->GetLabels().Reference( aSym );
+ sal_uInt32 nOff = pProc->GetLabels().Reference( aSym );
aGen.Gen( _ERRHDL, nOff );
}
}
@@ -525,7 +525,7 @@ void SbiParser::On()
void SbiParser::Resume()
{
- UINT32 nLbl;
+ sal_uInt32 nLbl;
switch( Next() )
{
diff --git a/basic/source/comp/makefile.mk b/basic/source/comp/makefile.mk
index 5fe64ceae091..5fe64ceae091 100644..100755
--- a/basic/source/comp/makefile.mk
+++ b/basic/source/comp/makefile.mk
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 6d6c02ce0308..38189bc2025c 100644..100755
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -36,18 +36,18 @@ struct SbiParseStack { // "Stack" fuer Statement-Blocks
SbiParseStack* pNext; // Chain
SbiExprNode* pWithVar; // Variable fuer WITH
SbiToken eExitTok; // Exit-Token
- UINT32 nChain; // JUMP-Chain
+ sal_uInt32 nChain; // JUMP-Chain
};
struct SbiStatement {
SbiToken eTok;
void( SbiParser::*Func )(); // Verarbeitungsroutine
- BOOL bMain; // TRUE: ausserhalb SUBs OK
- BOOL bSubr; // TRUE: in SUBs OK
+ sal_Bool bMain; // sal_True: ausserhalb SUBs OK
+ sal_Bool bSubr; // sal_True: in SUBs OK
};
-#define Y TRUE
-#define N FALSE
+#define Y sal_True
+#define N sal_False
static SbiStatement StmntTable [] = {
{ ATTRIBUTE, &SbiParser::Attribute, Y, Y, }, // ATTRIBUTE
@@ -143,7 +143,7 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
bGblDefs =
bNewGblDefs =
bSingleLineIf =
- bExplicit = FALSE;
+ bExplicit = sal_False;
bClassModule = ( pm->GetModuleType() == com::sun::star::script::ModuleType::CLASS );
OSL_TRACE("Parser - %s, bClassModule %d", rtl::OUStringToOString( pm->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), bClassModule );
pPool = &aPublics;
@@ -189,7 +189,7 @@ SbiSymDef* SbiParser::CheckRTLForSym( const String& rSym, SbxDataType eType )
// Globale Chainkette schliessen
-BOOL SbiParser::HasGlobalCode()
+sal_Bool SbiParser::HasGlobalCode()
{
if( bGblDefs && nGblChain )
{
@@ -254,49 +254,49 @@ void SbiParser::Exit()
Error( SbERR_BAD_EXIT );
}
-BOOL SbiParser::TestSymbol( BOOL bKwdOk )
+sal_Bool SbiParser::TestSymbol( sal_Bool bKwdOk )
{
Peek();
if( eCurTok == SYMBOL || ( bKwdOk && IsKwd( eCurTok ) ) )
{
- Next(); return TRUE;
+ Next(); return sal_True;
}
Error( SbERR_SYMBOL_EXPECTED );
- return FALSE;
+ return sal_False;
}
// Testen auf ein bestimmtes Token
-BOOL SbiParser::TestToken( SbiToken t )
+sal_Bool SbiParser::TestToken( SbiToken t )
{
if( Peek() == t )
{
- Next(); return TRUE;
+ Next(); return sal_True;
}
else
{
Error( SbERR_EXPECTED, t );
- return FALSE;
+ return sal_False;
}
}
// Testen auf Komma oder EOLN
-BOOL SbiParser::TestComma()
+sal_Bool SbiParser::TestComma()
{
SbiToken eTok = Peek();
if( IsEoln( eTok ) )
{
Next();
- return FALSE;
+ return sal_False;
}
else if( eTok != COMMA )
{
Error( SbERR_EXPECTED, COMMA );
- return FALSE;
+ return sal_False;
}
Next();
- return TRUE;
+ return sal_True;
}
// Testen, ob EOLN vorliegt
@@ -322,16 +322,16 @@ void SbiParser::StmntBlock( SbiToken eEnd )
if( IsEof() )
{
Error( SbERR_BAD_BLOCK, eEnd );
- bAbort = TRUE;
+ bAbort = sal_True;
}
}
// Die Hauptroutine. Durch wiederholten Aufrufs dieser Routine wird
-// die Quelle geparst. Returnwert FALSE bei Ende/Fehlern.
+// die Quelle geparst. Returnwert sal_False bei Ende/Fehlern.
-BOOL SbiParser::Parse()
+sal_Bool SbiParser::Parse()
{
- if( bAbort ) return FALSE;
+ if( bAbort ) return sal_False;
EnableErrors();
@@ -347,16 +347,16 @@ BOOL SbiParser::Parse()
// ein nGblChain vorhanden sein, daher vorher abfragen
if( bNewGblDefs && nGblChain == 0 )
nGblChain = aGen.Gen( _JUMP, 0 );
- return FALSE;
+ return sal_False;
}
// Leerstatement?
if( IsEoln( eCurTok ) )
{
- Next(); return TRUE;
+ Next(); return sal_True;
}
- if( !bSingleLineIf && MayBeLabel( TRUE ) )
+ if( !bSingleLineIf && MayBeLabel( sal_True ) )
{
// Ist ein Label
if( !pProc )
@@ -367,7 +367,7 @@ BOOL SbiParser::Parse()
// Leerstatement?
if( IsEoln( eCurTok ) )
{
- Next(); return TRUE;
+ Next(); return sal_True;
}
}
@@ -380,13 +380,13 @@ BOOL SbiParser::Parse()
Next();
if( eCurTok != NIL )
aGen.Statement();
- return FALSE;
+ return sal_False;
}
// Kommentar?
if( eCurTok == REM )
{
- Next(); return TRUE;
+ Next(); return sal_True;
}
// In vba it's possible to do Error.foobar ( even if it results in
@@ -442,7 +442,7 @@ BOOL SbiParser::Parse()
( eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ) )
{
nGblChain = aGen.Gen( _JUMP, 0 );
- bNewGblDefs = FALSE;
+ bNewGblDefs = sal_False;
}
// Statement-Opcode bitte auch am Anfang einer Sub
if( ( p->bSubr && (eCurTok != STATIC || Peek() == SUB || Peek() == FUNCTION ) ) ||
@@ -473,7 +473,7 @@ BOOL SbiParser::Parse()
}
// Der Parser bricht am Ende ab, das naechste Token ist noch nicht
// geholt!
- return TRUE;
+ return sal_True;
}
// Innerste With-Variable liefern
@@ -578,7 +578,7 @@ void SbiParser::Assign()
SbiExpression aExpr( this );
aLvalue.Gen();
aExpr.Gen();
- USHORT nLen = 0;
+ sal_uInt16 nLen = 0;
SbiSymDef* pDef = aLvalue.GetRealVar();
{
if( pDef->GetConstDef() )
@@ -609,7 +609,7 @@ void SbiParser::Set()
Next();
String aStr;
SbiSymDef* pTypeDef = new SbiSymDef( aStr );
- TypeDecl( *pTypeDef, TRUE );
+ TypeDecl( *pTypeDef, sal_True );
aLvalue.Gen();
// aGen.Gen( _CLASS, pDef->GetTypeId() | 0x8000 );
@@ -761,7 +761,7 @@ void SbiParser::EnableCompatibility()
{
if( !bCompatible )
AddConstants();
- bCompatible = TRUE;
+ bCompatible = sal_True;
}
// OPTION
@@ -771,7 +771,7 @@ void SbiParser::Option()
switch( Next() )
{
case EXPLICIT:
- bExplicit = TRUE; break;
+ bExplicit = sal_True; break;
case BASE:
if( Next() == NUMBER )
{
@@ -794,9 +794,9 @@ void SbiParser::Option()
{
SbiToken eTok = Next();
if( eTok == BINARY )
- bText = FALSE;
+ bText = sal_False;
else if( eTok == SYMBOL && GetSym().EqualsIgnoreCaseAscii("text") )
- bText = TRUE;
+ bText = sal_True;
else
Error( SbERR_EXPECTED, "Text/Binary" );
break;
@@ -806,7 +806,7 @@ void SbiParser::Option()
break;
case CLASSMODULE:
- bClassModule = TRUE;
+ bClassModule = sal_True;
aGen.GetModule().SetModuleType( com::sun::star::script::ModuleType::CLASS );
break;
case VBASUPPORT: // Option VBASupport used to override the module mode ( in fact this must reset the mode
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 03c9a50c18da..8f5aa58bfe97 100644..100755
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -32,17 +32,216 @@
#include <basic/sbx.hxx>
#include "sbcomp.hxx"
#include "image.hxx"
+#include <basic/sbobjmod.hxx>
+
+// To activate tracing enable in sbtrace.hxx
+#ifdef DBG_TRACE_BASIC
+
+// Trace Settings, used if no ini file / not found in ini file
+static char GpTraceFileNameDefault[] = "d:\\zBasic.Asm\\BasicTrace.txt";
+static char* GpTraceFileName = GpTraceFileNameDefault;
+
+// GbTraceOn:
+// true = tracing is active, false = tracing is disabled, default = true
+// Set to false initially if you want to activate tracing on demand with
+// TraceCommand( "TraceOn" ), see below
+static bool GbTraceOn = true;
+
+// GbIncludePCodes:
+// true = PCodes are written to trace, default = false, correspondents
+// with TraceCommand( "PCodeOn" / "PCodeOff" ), see below
+static bool GbIncludePCodes = false;
+
+static int GnIndentPerCallLevel = 4;
+static int GnIndentForPCode = 2;
+
+/*
+ With trace enabled the runtime function TraceCommand
+ can be used to influence the trace functionality
+ from within the running Basic macro.
+
+ Format: TraceCommand( command as String [, param as Variant] )
+
+ Supported commands (command is NOT case sensitive):
+ TraceCommand "TraceOn" sets GbTraceOn = true
+ TraceCommand "TraceOff" sets GbTraceOn = false
+
+ TraceCommand "PCodeOn" sets GbIncludePCodes = true
+ TraceCommand "PCodeOff" sets GbIncludePCodes = false
+
+ TraceCommand "Print", aVal writes aVal into the trace file as
+ long as it can be converted to string
+*/
+
+static void lcl_skipWhites( char*& rpc )
+{
+ while( *rpc == ' ' || *rpc == '\t' )
+ ++rpc;
+}
+
+inline void lcl_findNextLine( char*& rpc, char* pe )
+{
+ // Find line end
+ while( rpc < pe && *rpc != 13 && *rpc != 10 )
+ ++rpc;
+
+ // Read all
+ while( rpc < pe && (*rpc == 13 || *rpc == 10) )
+ ++rpc;
+}
+
+inline bool lcl_isAlpha( char c )
+{
+ bool bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+ return bRet;
+}
+
+static void lcl_ReadIniFile( const char* pIniFileName )
+{
+ const int BUF_SIZE = 1000;
+ static sal_Char TraceFileNameBuffer[BUF_SIZE];
+ sal_Char Buffer[BUF_SIZE];
+ sal_Char VarNameBuffer[BUF_SIZE];
+ sal_Char ValBuffer[BUF_SIZE];
+
+ FILE* pFile = fopen( pIniFileName ,"rb" );
+ if( pFile == NULL )
+ return;
+
+ size_t nRead = fread( Buffer, 1, BUF_SIZE, pFile );
+
+ // Scan
+ char* pc = Buffer;
+ char* pe = Buffer + nRead;
+ while( pc < pe )
+ {
+ lcl_skipWhites( pc ); if( pc == pe ) break;
+
+ // Read variable
+ char* pVarStart = pc;
+ while( pc < pe && lcl_isAlpha( *pc ) )
+ ++pc;
+ int nVarLen = pc - pVarStart;
+ if( nVarLen == 0 )
+ {
+ lcl_findNextLine( pc, pe );
+ continue;
+ }
+ strncpy( VarNameBuffer, pVarStart, nVarLen );
+ VarNameBuffer[nVarLen] = '\0';
+
+ // Check =
+ lcl_skipWhites( pc ); if( pc == pe ) break;
+ if( *pc != '=' )
+ continue;
+ ++pc;
+ lcl_skipWhites( pc ); if( pc == pe ) break;
+
+ // Read value
+ char* pValStart = pc;
+ while( pc < pe && *pc != 13 && *pc != 10 )
+ ++pc;
+ int nValLen = pc - pValStart;
+ if( nValLen == 0 )
+ {
+ lcl_findNextLine( pc, pe );
+ continue;
+ }
+ strncpy( ValBuffer, pValStart, nValLen );
+ ValBuffer[nValLen] = '\0';
+
+ // Match variables
+ if( strcmp( VarNameBuffer, "GpTraceFileName") == 0 )
+ {
+ strcpy( TraceFileNameBuffer, ValBuffer );
+ GpTraceFileName = TraceFileNameBuffer;
+ }
+ else
+ if( strcmp( VarNameBuffer, "GbTraceOn") == 0 )
+ GbTraceOn = (strcmp( ValBuffer, "true" ) == 0);
+ else
+ if( strcmp( VarNameBuffer, "GbIncludePCodes") == 0 )
+ GbIncludePCodes = (strcmp( ValBuffer, "true" ) == 0);
+ else
+ if( strcmp( VarNameBuffer, "GnIndentPerCallLevel") == 0 )
+ GnIndentPerCallLevel = strtol( ValBuffer, NULL, 10 );
+ else
+ if( strcmp( VarNameBuffer, "GnIndentForPCode") == 0 )
+ GnIndentForPCode = strtol( ValBuffer, NULL, 10 );
+ }
+ fclose( pFile );
+}
+ if( eType & SbxARRAY )
+
+void RTL_Impl_TraceCommand( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
+{
+ (void)pBasic;
+ (void)bWrite;
+
+ if ( rPar.Count() < 2 )
+ {
+ StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ return;
+ }
+
+ String aCommand = rPar.Get(1)->GetString();
+
+ if( aCommand.EqualsIgnoreCaseAscii( "TraceOn" ) )
+ GbTraceOn = true;
+ else
+ if( aCommand.EqualsIgnoreCaseAscii( "TraceOff" ) )
+ GbTraceOn = false;
+ else
+ if( aCommand.EqualsIgnoreCaseAscii( "PCodeOn" ) )
+ GbIncludePCodes = true;
+ else
+ if( aCommand.EqualsIgnoreCaseAscii( "PCodeOff" ) )
+ GbIncludePCodes = false;
+ else
+ if( aCommand.EqualsIgnoreCaseAscii( "Print" ) )
+ {
+ if ( rPar.Count() < 3 )
+ {
+ StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ return;
+ }
+
+ SbxError eOld = SbxBase::GetError();
+ if( eOld != SbxERR_OK )
+ SbxBase::ResetError();
+
+ String aValStr = rPar.Get(2)->GetString();
+ SbxError eErr = SbxBase::GetError();
+ if( eErr != SbxERR_OK )
+ {
+ aValStr = String( RTL_CONSTASCII_USTRINGPARAM( "<ERROR converting value to String>" ) );
+ SbxBase::ResetError();
+ }
+
+ char Buffer[500];
+ const char* pValStr = OUStringToOString( rtl::OUString( aValStr ), RTL_TEXTENCODING_ASCII_US ).getStr();
+
+ sprintf( Buffer, "### TRACE_PRINT: %s ###", pValStr );
+ int nIndent = GnLastCallLvl * GnIndentPerCallLevel;
+ lcl_lineOut( GpTraceFileName, Buffer, lcl_getSpaces( nIndent ) );
+
+ if( eOld != SbxERR_OK )
+ SbxBase::SetError( eOld );
+ }
+}
+
+#endif
// Diese Routine ist hier definiert, damit der Compiler als eigenes Segment
// geladen werden kann.
-BOOL SbModule::Compile()
+sal_Bool SbModule::Compile()
{
if( pImage )
- return TRUE;
+ return sal_True;
StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
if( !pBasic )
- return FALSE;
+ return sal_False;
SbxBase::ResetError();
// Aktuelles Modul!
SbModule* pOld = pCMOD;
@@ -61,13 +260,14 @@ BOOL SbModule::Compile()
// Beim Compilieren eines Moduls werden die Modul-globalen
// Variablen aller Module ungueltig
- BOOL bRet = IsCompiled();
+ sal_Bool bRet = IsCompiled();
if( bRet )
{
- pBasic->ClearAllModuleVars();
+ if( !this->ISA(SbObjModule) )
+ pBasic->ClearAllModuleVars();
RemoveVars(); // remove 'this' Modules variables
// clear all method statics
- for( USHORT i = 0; i < pMethods->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pMethods->Count(); i++ )
{
SbMethod* p = PTR_CAST(SbMethod,pMethods->Get( i ) );
if( p )
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index a430ae0f7460..6e9b80dde9c0 100644..100755
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -67,9 +67,9 @@ SbiScanner::SbiScanner( const ::rtl::OUString& rBuf, StarBASIC* p ) : aBuf( rBuf
bUsedForHilite =
bCompatible =
bVBASupportOn =
- bPrevLineExtentsComment = FALSE;
+ bPrevLineExtentsComment = sal_False;
bHash =
- bErrors = TRUE;
+ bErrors = sal_True;
}
SbiScanner::~SbiScanner()
@@ -91,19 +91,19 @@ void SbiScanner::GenError( SbError code )
{
if( GetSbData()->bBlockCompilerError )
{
- bAbort = TRUE;
+ bAbort = sal_True;
return;
}
if( !bError && bErrors )
{
- BOOL bRes = TRUE;
+ sal_Bool bRes = sal_True;
// Nur einen Fehler pro Statement reporten
- bError = TRUE;
+ bError = sal_True;
if( pBasic )
{
// Falls EXPECTED oder UNEXPECTED kommen sollte, bezieht es sich
// immer auf das letzte Token, also die Col1 uebernehmen
- USHORT nc = nColLock ? nSavedCol1 : nCol1;
+ sal_uInt16 nc = nColLock ? nSavedCol1 : nCol1;
switch( code )
{
case SbERR_EXPECTED:
@@ -123,16 +123,16 @@ void SbiScanner::GenError( SbError code )
nErrors++;
}
-// Falls sofort ein Doppelpunkt folgt, wird TRUE zurueckgeliefert.
+// Falls sofort ein Doppelpunkt folgt, wird sal_True zurueckgeliefert.
// Wird von SbiTokenizer::MayBeLabel() verwendet, um einen Label zu erkennen
-BOOL SbiScanner::DoesColonFollow()
+sal_Bool SbiScanner::DoesColonFollow()
{
if( pLine && *pLine == ':' )
{
- pLine++; nCol++; return TRUE;
+ pLine++; nCol++; return sal_True;
}
- else return FALSE;
+ else return sal_False;
}
// Testen auf ein legales Suffix
@@ -144,41 +144,55 @@ static SbxDataType GetSuffixType( sal_Unicode c )
{
sal_uInt32 n = aSuffixesStr.Search( c );
if( STRING_NOTFOUND != n && c != ' ' )
- return SbxDataType( (USHORT) n + SbxINTEGER );
+ return SbxDataType( (sal_uInt16) n + SbxINTEGER );
}
return SbxVARIANT;
}
// Einlesen des naechsten Symbols in die Variablen aSym, nVal und eType
-// Returnwert ist FALSE bei EOF oder Fehlern
+// Returnwert ist sal_False bei EOF oder Fehlern
#define BUF_SIZE 80
-BOOL SbiScanner::NextSym()
+namespace {
+
+/** Returns true, if the passed character is a white space character. */
+inline bool lclIsWhitespace( sal_Unicode cChar )
+{
+ return (cChar == ' ') || (cChar == '\t') || (cChar == '\f');
+}
+
+} // namespace
+
+sal_Bool SbiScanner::NextSym()
{
// Fuer den EOLN-Fall merken
- USHORT nOldLine = nLine;
- USHORT nOldCol1 = nCol1;
- USHORT nOldCol2 = nCol2;
+ sal_uInt16 nOldLine = nLine;
+ sal_uInt16 nOldCol1 = nCol1;
+ sal_uInt16 nOldCol2 = nCol2;
sal_Unicode buf[ BUF_SIZE ], *p = buf;
- bHash = FALSE;
+ bHash = sal_False;
eScanType = SbxVARIANT;
aSym.Erase();
bSymbol =
- bNumber = bSpaces = FALSE;
+ bNumber = bSpaces = sal_False;
// Zeile einlesen?
if( !pLine )
{
- INT32 n = nBufPos;
- INT32 nLen = aBuf.getLength();
+ sal_Int32 n = nBufPos;
+ sal_Int32 nLen = aBuf.getLength();
if( nBufPos >= nLen )
- return FALSE;
+ return sal_False;
const sal_Unicode* p2 = aBuf.getStr();
p2 += n;
while( ( n < nLen ) && ( *p2 != '\n' ) && ( *p2 != '\r' ) )
p2++, n++;
- aLine = aBuf.copy( nBufPos, n - nBufPos );
+ // #163944# ignore trailing whitespace
+ sal_Int32 nCopyEndPos = n;
+ while( (nBufPos < nCopyEndPos) && lclIsWhitespace( aBuf[ nCopyEndPos - 1 ] ) )
+ --nCopyEndPos;
+ aLine = aBuf.copy( nBufPos, nCopyEndPos - nBufPos );
if( n < nLen )
{
if( *p2 == '\r' && *( p2+1 ) == '\n' )
@@ -194,8 +208,8 @@ BOOL SbiScanner::NextSym()
}
// Leerstellen weg:
- while( *pLine && (( *pLine == ' ' ) || ( *pLine == '\t' ) || ( *pLine == '\f' )) )
- pLine++, nCol++, bSpaces = TRUE;
+ while( lclIsWhitespace( *pLine ) )
+ pLine++, nCol++, bSpaces = sal_True;
nCol1 = nCol;
@@ -210,7 +224,7 @@ BOOL SbiScanner::NextSym()
{
pLine++;
nCol++;
- bHash = TRUE;
+ bHash = sal_True;
}
// Symbol? Dann Zeichen kopieren.
@@ -220,11 +234,35 @@ BOOL SbiScanner::NextSym()
if( *pLine == '_' && !*(pLine+1) )
{ pLine++;
goto eoln; }
- bSymbol = TRUE;
+ bSymbol = sal_True;
short n = nCol;
for ( ; (BasicSimpleCharClass::isAlphaNumeric( *pLine, bCompatible ) || ( *pLine == '_' ) ); pLine++ )
nCol++;
aSym = aLine.copy( n, nCol - n );
+
+ // Special handling for "go to"
+ if( bCompatible && *pLine && aSym.EqualsIgnoreCaseAscii( "go" ) )
+ {
+ const sal_Unicode* pTestLine = pLine;
+ short nTestCol = nCol;
+ while( lclIsWhitespace( *pTestLine ) )
+ {
+ pTestLine++;
+ nTestCol++;
+ }
+
+ if( *pTestLine && *(pTestLine + 1) )
+ {
+ String aTestSym = aLine.copy( nTestCol, 2 );
+ if( aTestSym.EqualsIgnoreCaseAscii( "to" ) )
+ {
+ aSym = String::CreateFromAscii( "goto" );
+ pLine = pTestLine + 2;
+ nCol = nTestCol + 2;
+ }
+ }
+ }
+
// Abschliessendes '_' durch Space ersetzen, wenn Zeilenende folgt
// (sonst falsche Zeilenfortsetzung)
if( !bUsedForHilite && !*pLine && *(pLine-1) == '_' )
@@ -256,13 +294,13 @@ BOOL SbiScanner::NextSym()
short ndig = 0;
short ncdig = 0;
eScanType = SbxDOUBLE;
- BOOL bBufOverflow = FALSE;
+ sal_Bool bBufOverflow = sal_False;
while( strchr( "0123456789.DEde", *pLine ) && *pLine )
{
// AB 4.1.1996: Buffer voll? -> leer weiter scannen
if( (p-buf) == (BUF_SIZE-1) )
{
- bBufOverflow = TRUE;
+ bBufOverflow = sal_True;
pLine++, nCol++;
continue;
}
@@ -299,7 +337,7 @@ BOOL SbiScanner::NextSym()
if (!exp) ndig++;
}
*p = 0;
- aSym = p; bNumber = TRUE;
+ aSym = p; bNumber = sal_True;
// Komma, Exponent mehrfach vorhanden?
if( comma > 1 || exp > 1 )
{ aError = '.';
@@ -359,10 +397,10 @@ BOOL SbiScanner::NextSym()
// Wird als Operator angesehen
pLine--; nCol--; nCol1 = nCol-1; aSym = '&'; return SYMBOL;
}
- bNumber = TRUE;
+ bNumber = sal_True;
long l = 0;
int i;
- BOOL bBufOverflow = FALSE;
+ sal_Bool bBufOverflow = sal_False;
while( BasicSimpleCharClass::isAlphaNumeric( *pLine & 0xFF, bCompatible ) )
{
sal_Unicode ch = sal::static_int_cast< sal_Unicode >(
@@ -370,7 +408,7 @@ BOOL SbiScanner::NextSym()
pLine++; nCol++;
// AB 4.1.1996: Buffer voll, leer weiter scannen
if( (p-buf) == (BUF_SIZE-1) )
- bBufOverflow = TRUE;
+ bBufOverflow = sal_True;
else if( String( cmp ).Search( ch ) != STRING_NOTFOUND )
//else if( strchr( cmp, ch ) )
*p++ = ch;
@@ -403,7 +441,7 @@ BOOL SbiScanner::NextSym()
{
sal_Unicode cSep = *pLine;
if( cSep == '[' )
- bSymbol = TRUE, cSep = ']';
+ bSymbol = sal_True, cSep = ']';
short n = nCol+1;
while( *pLine )
{
@@ -423,7 +461,7 @@ BOOL SbiScanner::NextSym()
// Doppelte Stringbegrenzer raus
String s( cSep );
s += cSep;
- USHORT nIdx = 0;
+ sal_uInt16 nIdx = 0;
do
{
nIdx = aSym.Search( s, nIdx );
@@ -462,15 +500,15 @@ PrevLineCommentLbl:
if( bPrevLineExtentsComment || (eScanType != SbxSTRING &&
( aSym.GetBuffer()[0] == '\'' || aSym.EqualsIgnoreCaseAscii( "REM" ) ) ) )
{
- bPrevLineExtentsComment = FALSE;
+ bPrevLineExtentsComment = sal_False;
aSym = String::CreateFromAscii( "REM" );
- USHORT nLen = String( pLine ).Len();
+ sal_uInt16 nLen = String( pLine ).Len();
if( bCompatible && pLine[ nLen - 1 ] == '_' && pLine[ nLen - 2 ] == ' ' )
- bPrevLineExtentsComment = TRUE;
+ bPrevLineExtentsComment = sal_True;
nCol2 = nCol2 + nLen;
pLine = NULL;
}
- return TRUE;
+ return sal_True;
// Sonst Zeilen-Ende: aber bitte auf '_' testen, ob die
// Zeile nicht weitergeht!
@@ -485,7 +523,7 @@ eoln:
// .Method
// ^^^ <- spaces is legal in MSO VBA
OSL_TRACE("*** resetting bSpaces***");
- bSpaces = FALSE;
+ bSpaces = sal_False;
}
return bRes;
}
@@ -497,7 +535,7 @@ eoln:
nCol2 = nOldCol2;
aSym = '\n';
nColLock = 0;
- return TRUE;
+ return sal_True;
}
}
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 6ab16e1abf19..8e5badb5330d 100644..100755
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -59,7 +59,7 @@ SbiStringPool::~SbiStringPool()
// Suchen
-const String& SbiStringPool::Find( USHORT n ) const
+const String& SbiStringPool::Find( sal_uInt16 n ) const
{
if( !n || n > aData.Count() )
return aEmpty;
@@ -70,10 +70,10 @@ const String& SbiStringPool::Find( USHORT n ) const
// Hinzufuegen eines Strings. Der String wird Case-Insensitiv
// verglichen.
-short SbiStringPool::Add( const String& rVal, BOOL bNoCase )
+short SbiStringPool::Add( const String& rVal, sal_Bool bNoCase )
{
- USHORT n = aData.Count();
- for( USHORT i = 0; i < n; i++ )
+ sal_uInt16 n = aData.Count();
+ for( sal_uInt16 i = 0; i < n; i++ )
{
String* p = aData.GetObject( i );
if( ( bNoCase && p->Equals( rVal ) )
@@ -126,7 +126,7 @@ void SbiSymPool::Clear()
SbiSymDef* SbiSymPool::First()
{
- nCur = (USHORT) -1;
+ nCur = (sal_uInt16) -1;
return Next();
}
@@ -207,9 +207,10 @@ void SbiSymPool::Add( SbiSymDef* pDef )
SbiSymDef* SbiSymPool::Find( const String& rName ) const
{
- for( USHORT i = 0; i < aData.Count(); i++ )
+ sal_uInt16 nCount = aData.Count();
+ for( sal_uInt16 i = 0; i < nCount; i++ )
{
- SbiSymDef* p = aData.GetObject( i );
+ SbiSymDef* p = aData.GetObject( nCount - i - 1 );
if( ( !p->nProcId || ( p->nProcId == nProcId ) )
&& ( p->aName.EqualsIgnoreCaseAscii( rName ) ) )
return p;
@@ -222,9 +223,9 @@ SbiSymDef* SbiSymPool::Find( const String& rName ) const
// Suchen ueber ID-Nummer
-SbiSymDef* SbiSymPool::FindId( USHORT n ) const
+SbiSymDef* SbiSymPool::FindId( sal_uInt16 n ) const
{
- for( USHORT i = 0; i < aData.Count(); i++ )
+ for( sal_uInt16 i = 0; i < aData.Count(); i++ )
{
SbiSymDef* p = aData.GetObject( i );
if( p->nId == n && ( !p->nProcId || ( p->nProcId == nProcId ) ) )
@@ -238,7 +239,7 @@ SbiSymDef* SbiSymPool::FindId( USHORT n ) const
// Suchen ueber Position (ab 0)
-SbiSymDef* SbiSymPool::Get( USHORT n ) const
+SbiSymDef* SbiSymPool::Get( sal_uInt16 n ) const
{
if( n >= aData.Count() )
return NULL;
@@ -246,7 +247,7 @@ SbiSymDef* SbiSymPool::Get( USHORT n ) const
return aData.GetObject( n );
}
-UINT32 SbiSymPool::Define( const String& rName )
+sal_uInt32 SbiSymPool::Define( const String& rName )
{
SbiSymDef* p = Find( rName );
if( p )
@@ -258,7 +259,7 @@ UINT32 SbiSymPool::Define( const String& rName )
return p->Define();
}
-UINT32 SbiSymPool::Reference( const String& rName )
+sal_uInt32 SbiSymPool::Reference( const String& rName )
{
SbiSymDef* p = Find( rName );
if( !p )
@@ -272,7 +273,7 @@ UINT32 SbiSymPool::Reference( const String& rName )
void SbiSymPool::CheckRefs()
{
- for( USHORT i = 0; i < aData.Count(); i++ )
+ for( sal_uInt16 i = 0; i < aData.Count(); i++ )
{
SbiSymDef* p = aData.GetObject( i );
if( !p->IsDefined() )
@@ -304,7 +305,7 @@ SbiSymDef::SbiSymDef( const String& rName ) : aName( rName )
bWithEvents =
bByVal =
bChained =
- bGlobal = FALSE;
+ bGlobal = sal_False;
pIn =
pPool = NULL;
nDefaultId = 0;
@@ -360,11 +361,11 @@ void SbiSymDef::SetType( SbxDataType t )
// Es wird der Wert zurueckgeliefert, der als Operand gespeichert
// werden soll.
-UINT32 SbiSymDef::Reference()
+sal_uInt32 SbiSymDef::Reference()
{
if( !bChained )
{
- UINT32 n = nChain;
+ sal_uInt32 n = nChain;
nChain = pIn->pParser->aGen.GetOffset();
return n;
}
@@ -374,13 +375,13 @@ UINT32 SbiSymDef::Reference()
// Definition eines Symbols.
// Hier wird der Backchain aufgeloest, falls vorhanden
-UINT32 SbiSymDef::Define()
+sal_uInt32 SbiSymDef::Define()
{
- UINT32 n = pIn->pParser->aGen.GetPC();
+ sal_uInt32 n = pIn->pParser->aGen.GetPC();
pIn->pParser->aGen.GenStmnt();
if( nChain ) pIn->pParser->aGen.BackChain( nChain );
nChain = n;
- bChained = TRUE;
+ bChained = sal_True;
return nChain;
}
@@ -409,7 +410,7 @@ SbiSymScope SbiSymDef::GetScope() const
// 3) aLabels: Labels
SbiProcDef::SbiProcDef( SbiParser* pParser, const String& rName,
- BOOL bProcDecl )
+ sal_Bool bProcDecl )
: SbiSymDef( rName )
, aParams( pParser->aGblStrings, SbPARAM ) // wird gedumpt
, aLabels( pParser->aLclStrings, SbLOCAL ) // wird nicht gedumpt
@@ -421,9 +422,9 @@ SbiProcDef::SbiProcDef( SbiParser* pParser, const String& rName,
nLine1 =
nLine2 = 0;
mePropMode = PROPERTY_MODE_NONE;
- bPublic = TRUE;
- bCdecl = FALSE;
- bStatic = FALSE;
+ bPublic = sal_True;
+ bCdecl = sal_False;
+ bStatic = sal_False;
// Fuer Returnwerte ist das erste Element der Parameterliste
// immer mit dem Namen und dem Typ der Proc definiert
aParams.AddSym( aName );
@@ -451,7 +452,7 @@ void SbiProcDef::Match( SbiProcDef* pOld )
{
SbiSymDef* po, *pn=NULL;
// Parameter 0 ist der Funktionsname
- USHORT i;
+ sal_uInt16 i;
for( i = 1; i < aParams.GetSize(); i++ )
{
po = pOld->aParams.Get( i );
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index bd853a9bda89..c3a953118878 100644..100755
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -388,10 +388,10 @@ SbiTokenizer::SbiTokenizer( const ::rtl::OUString& rSrc, StarBASIC* pb )
//if( StarBASIC::GetGlobalLanguageMode() == SB_LANG_JAVASCRIPT )
// pTokTable = aTokTable_Java;
TokenTable *tp;
- bEof = bAs = FALSE;
+ bEof = bAs = sal_False;
eCurTok = NIL;
ePush = NIL;
- bEos = bKeywords = bErrorIsSymbol = TRUE;
+ bEos = bKeywords = bErrorIsSymbol = sal_True;
if( !nToken )
for( nToken = 0, tp = pTokTable; tp->t; nToken++, tp++ ) {}
}
@@ -433,9 +433,9 @@ SbiToken SbiTokenizer::Peek()
{
if( ePush == NIL )
{
- USHORT nOldLine = nLine;
- USHORT nOldCol1 = nCol1;
- USHORT nOldCol2 = nCol2;
+ sal_uInt16 nOldLine = nLine;
+ sal_uInt16 nOldCol1 = nCol1;
+ sal_uInt16 nOldCol2 = nCol2;
ePush = Next();
nPLine = nLine; nLine = nOldLine;
nPCol1 = nCol1; nCol1 = nOldCol1;
@@ -500,15 +500,15 @@ SbiToken SbiTokenizer::Next()
// Sonst einlesen:
if( !NextSym() )
{
- bEof = bEos = TRUE;
+ bEof = bEos = sal_True;
return eCurTok = EOLN;
}
// Zeilenende?
if( aSym.GetBuffer()[0] == '\n' )
{
- bEos = TRUE; return eCurTok = EOLN;
+ bEos = sal_True; return eCurTok = EOLN;
}
- bEos = FALSE;
+ bEos = sal_False;
// Zahl?
if( bNumber )
@@ -575,10 +575,10 @@ special:
{
// AB, 15.3.96, Spezialbehandlung fuer END, beim Peek() geht die
// aktuelle Zeile verloren, daher alles merken und danach restaurieren
- USHORT nOldLine = nLine;
- USHORT nOldCol = nCol;
- USHORT nOldCol1 = nCol1;
- USHORT nOldCol2 = nCol2;
+ sal_uInt16 nOldLine = nLine;
+ sal_uInt16 nOldCol = nCol;
+ sal_uInt16 nOldCol1 = nCol1;
+ sal_uInt16 nOldCol2 = nCol2;
String aOldSym = aSym;
SaveLine(); // pLine im Scanner sichern
@@ -614,11 +614,11 @@ special:
eCurTok = tp->t;
// AS: Datentypen sind Keywords
if( tp->t == AS )
- bAs = TRUE;
+ bAs = sal_True;
else
{
if( bAs )
- bAs = FALSE;
+ bAs = sal_False;
else if( eCurTok >= DATATYPE1 && eCurTok <= DATATYPE2 && (bErrorIsSymbol || eCurTok != _ERROR_) )
eCurTok = SYMBOL;
}
@@ -655,12 +655,12 @@ special:
// Kann das aktuell eingelesene Token ein Label sein?
-BOOL SbiTokenizer::MayBeLabel( BOOL bNeedsColon )
+sal_Bool SbiTokenizer::MayBeLabel( sal_Bool bNeedsColon )
{
if( eCurTok == SYMBOL || m_aTokenLabelInfo.canTokenBeLabel( eCurTok ) )
- return bNeedsColon ? DoesColonFollow() : TRUE;
+ return bNeedsColon ? DoesColonFollow() : sal_True;
else
- return BOOL( eCurTok == NUMBER
+ return sal_Bool( eCurTok == NUMBER
&& eScanType == SbxINTEGER
&& nVal >= 0 );
}
@@ -672,8 +672,8 @@ BOOL SbiTokenizer::MayBeLabel( BOOL bNeedsColon )
void SbiTokenizer::Hilite( SbTextPortions& rList )
{
- bErrors = FALSE;
- bUsedForHilite = TRUE;
+ bErrors = sal_False;
+ bUsedForHilite = sal_True;
SbiToken eLastTok = NIL;
for( ;; )
{
@@ -711,7 +711,7 @@ void SbiTokenizer::Hilite( SbTextPortions& rList )
break;
eLastTok = eCurTok;
}
- bUsedForHilite = FALSE;
+ bUsedForHilite = sal_False;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx
index 7a6a2092693d..24c4bc002f60 100644..100755
--- a/basic/source/inc/buffer.hxx
+++ b/basic/source/inc/buffer.hxx
@@ -38,27 +38,27 @@ class SbiBuffer { // Code/Konstanten-Puffer:
SbiParser* pParser; // fuer Fehlermeldungen
char* pBuf; // Puffer-Pointer
char* pCur; // aktueller Puffer-Pointer
- UINT32 nOff; // aktuelles Offset
- UINT32 nSize; // aktuelle Groesse
+ sal_uInt32 nOff; // aktuelles Offset
+ sal_uInt32 nSize; // aktuelle Groesse
short nInc; // Inkrement
- BOOL Check( USHORT ); // Buffergroesse testen
+ sal_Bool Check( sal_uInt16 ); // Buffergroesse testen
public:
SbiBuffer( SbiParser*, short ); // Inkrement
~SbiBuffer();
- void Patch( UINT32, UINT32 ); // Patchen
- void Chain( UINT32 ); // Back-Chain
- void Align( INT32 ); // Alignment
- BOOL Add( const void*, USHORT );// Element anfuegen
- BOOL operator += (const String&);// Basic-String speichern
- BOOL operator += (INT8); // Zeichen speichern
- BOOL operator += (INT16); // Integer speichern
- BOOL operator += (UINT8); // Zeichen speichern
- BOOL operator += (UINT16); // Integer speichern
- BOOL operator += (UINT32); // Integer speichern
- BOOL operator += (INT32); // Integer speichern
+ void Patch( sal_uInt32, sal_uInt32 ); // Patchen
+ void Chain( sal_uInt32 ); // Back-Chain
+ void Align( sal_Int32 ); // Alignment
+ sal_Bool Add( const void*, sal_uInt16 );// Element anfuegen
+ sal_Bool operator += (const String&);// Basic-String speichern
+ sal_Bool operator += (sal_Int8); // Zeichen speichern
+ sal_Bool operator += (sal_Int16); // Integer speichern
+ sal_Bool operator += (sal_uInt8); // Zeichen speichern
+ sal_Bool operator += (sal_uInt16); // Integer speichern
+ sal_Bool operator += (sal_uInt32); // Integer speichern
+ sal_Bool operator += (sal_Int32); // Integer speichern
char* GetBuffer(); // Puffer rausgeben (selbst loeschen!)
char* GetBufferPtr(){ return pBuf; }
- UINT32 GetSize() { return nOff; }
+ sal_uInt32 GetSize() { return nOff; }
};
#endif
diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx
index cfafcddec8e0..21d19312fd17 100644..100755
--- a/basic/source/inc/codegen.hxx
+++ b/basic/source/inc/codegen.hxx
@@ -41,28 +41,28 @@ class SbiCodeGen { // Code-Erzeugung:
SbiBuffer aCode; // Code-Puffer
short nLine, nCol; // Zeile, Spalte fuer Stmnt-Befehl
short nForLevel; // #29955 for-Schleifen-Ebene
- BOOL bStmnt; // TRUE: Statement-Opcode liegt an
+ sal_Bool bStmnt; // sal_True: Statement-Opcode liegt an
public:
SbiCodeGen( SbModule&, SbiParser*, short );
SbiParser* GetParser() { return pParser; }
SbModule& GetModule() { return rMod; }
- UINT32 Gen( SbiOpcode );
- UINT32 Gen( SbiOpcode, UINT32 );
- UINT32 Gen( SbiOpcode, UINT32, UINT32 );
- void Patch( UINT32 o, UINT32 v ){ aCode.Patch( o, v ); }
- void BackChain( UINT32 off ) { aCode.Chain( off ); }
+ sal_uInt32 Gen( SbiOpcode );
+ sal_uInt32 Gen( SbiOpcode, sal_uInt32 );
+ sal_uInt32 Gen( SbiOpcode, sal_uInt32, sal_uInt32 );
+ void Patch( sal_uInt32 o, sal_uInt32 v ){ aCode.Patch( o, v ); }
+ void BackChain( sal_uInt32 off ) { aCode.Chain( off ); }
void Statement();
void GenStmnt(); // evtl. Statement-Opcode erzeugen
- UINT32 GetPC();
- UINT32 GetOffset() { return GetPC() + 1; }
+ sal_uInt32 GetPC();
+ sal_uInt32 GetOffset() { return GetPC() + 1; }
void Save();
// #29955 for-Schleifen-Ebene pflegen
void IncForLevel( void ) { nForLevel++; }
void DecForLevel( void ) { nForLevel--; }
- static UINT32 calcNewOffSet( BYTE* pCode, UINT16 nOffset );
- static UINT16 calcLegacyOffSet( BYTE* pCode, UINT32 nOffset );
+ static sal_uInt32 calcNewOffSet( sal_uInt8* pCode, sal_uInt16 nOffset );
+ static sal_uInt16 calcLegacyOffSet( sal_uInt8* pCode, sal_uInt32 nOffset );
};
@@ -70,8 +70,8 @@ template < class T, class S >
class PCodeBuffConvertor
{
T m_nSize; //
- BYTE* m_pStart;
- BYTE* m_pCnvtdBuf;
+ sal_uInt8* m_pStart;
+ sal_uInt8* m_pCnvtdBuf;
S m_nCnvtdSize; //
// Disable usual copying symantics and bodgy default ctor
@@ -79,11 +79,11 @@ class PCodeBuffConvertor
PCodeBuffConvertor(const PCodeBuffConvertor& );
PCodeBuffConvertor& operator = ( const PCodeBuffConvertor& );
public:
- PCodeBuffConvertor( BYTE* pCode, T nSize ): m_nSize( nSize ), m_pStart( pCode ), m_pCnvtdBuf( NULL ), m_nCnvtdSize( 0 ){ convert(); }
+ PCodeBuffConvertor( sal_uInt8* pCode, T nSize ): m_nSize( nSize ), m_pStart( pCode ), m_pCnvtdBuf( NULL ), m_nCnvtdSize( 0 ){ convert(); }
S GetSize(){ return m_nCnvtdSize; }
void convert();
// Caller owns the buffer returned
- BYTE* GetBuffer() { return m_pCnvtdBuf; }
+ sal_uInt8* GetBuffer() { return m_pCnvtdBuf; }
};
// #111897 PARAM_INFO flags start at 0x00010000 to not
diff --git a/basic/source/inc/collelem.hxx b/basic/source/inc/collelem.hxx
index 2c39e711f993..2c39e711f993 100644..100755
--- a/basic/source/inc/collelem.hxx
+++ b/basic/source/inc/collelem.hxx
diff --git a/basic/source/inc/disas.hxx b/basic/source/inc/disas.hxx
index 93929dab42a9..1756d36bfacf 100644..100755
--- a/basic/source/inc/disas.hxx
+++ b/basic/source/inc/disas.hxx
@@ -38,14 +38,14 @@ class SbiDisas {
const SbiImage& rImg;
SbModule* pMod;
char cLabels[ MAX_LABELS ]; // Bitvektor fuer Labels
- UINT32 nOff; // aktuelle Position
- UINT32 nPC; // Position des Opcodes
+ sal_uInt32 nOff; // aktuelle Position
+ sal_uInt32 nPC; // Position des Opcodes
SbiOpcode eOp; // Opcode
- UINT32 nOp1, nOp2; // Operanden
- UINT32 nParts; // 1, 2 oder 3
- UINT32 nLine; // aktuelle Zeile
- BOOL DisasLine( String& );
- BOOL Fetch(); // naechster Opcode
+ sal_uInt32 nOp1, nOp2; // Operanden
+ sal_uInt32 nParts; // 1, 2 oder 3
+ sal_uInt32 nLine; // aktuelle Zeile
+ sal_Bool DisasLine( String& );
+ sal_Bool Fetch(); // naechster Opcode
public:
SbiDisas( SbModule*, const SbiImage* );
void Disas( SvStream& );
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index 94c10ca86b2e..94c10ca86b2e 100644..100755
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index 1e94a3927e93..1e94a3927e93 100644..100755
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 1819877f5c43..0ae218d14c18 100644..100755
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -99,7 +99,7 @@ class SbiExprNode { // Operatoren (und Operanden)
friend class SbiExpression;
friend class SbiConstExpression;
union {
- USHORT nTypeStrId; // gepoolter String-ID, #i59791/#i45570 Now only for TypeOf
+ sal_uInt16 nTypeStrId; // gepoolter String-ID, #i59791/#i45570 Now only for TypeOf
double nVal; // numerischer Wert
SbVar aVar; // oder Variable
};
@@ -111,19 +111,19 @@ class SbiExprNode { // Operatoren (und Operanden)
SbiNodeType eNodeType; // Art des Nodes
SbxDataType eType; // aktueller Datentyp
SbiToken eTok; // Token des Operators
- BOOL bComposite; // TRUE: Zusammengesetzter Ausdruck
- BOOL bError; // TRUE: Fehlerhaft
+ sal_Bool bComposite; // sal_True: Zusammengesetzter Ausdruck
+ sal_Bool bError; // sal_True: Fehlerhaft
void FoldConstants(); // Constant Folding durchfuehren
void CollectBits(); // Umwandeln von Zahlen in Strings
- BOOL IsOperand() // TRUE, wenn Operand
- { return BOOL( eNodeType != SbxNODE && eNodeType != SbxTYPEOF && eNodeType != SbxNEW ); }
- BOOL IsTypeOf()
- { return BOOL( eNodeType == SbxTYPEOF ); }
- BOOL IsNew()
- { return BOOL( eNodeType == SbxNEW ); }
- BOOL IsNumber(); // TRUE bei Zahlen
- BOOL IsString(); // TRUE bei Strings
- BOOL IsLvalue(); // TRUE, falls als Lvalue verwendbar
+ sal_Bool IsOperand() // sal_True, wenn Operand
+ { return sal_Bool( eNodeType != SbxNODE && eNodeType != SbxTYPEOF && eNodeType != SbxNEW ); }
+ sal_Bool IsTypeOf()
+ { return sal_Bool( eNodeType == SbxTYPEOF ); }
+ sal_Bool IsNew()
+ { return sal_Bool( eNodeType == SbxNEW ); }
+ sal_Bool IsNumber(); // sal_True bei Zahlen
+ sal_Bool IsString(); // sal_True bei Strings
+ sal_Bool IsLvalue(); // sal_True, falls als Lvalue verwendbar
void GenElement( SbiOpcode ); // Element
void BaseInit( SbiParser* p ); // Hilfsfunktion fuer Ctor, AB 17.12.95
public:
@@ -132,15 +132,15 @@ public:
SbiExprNode( SbiParser*, const String& );
SbiExprNode( SbiParser*, const SbiSymDef&, SbxDataType, SbiExprList* = NULL );
SbiExprNode( SbiParser*, SbiExprNode*, SbiToken, SbiExprNode* );
- SbiExprNode( SbiParser*, SbiExprNode*, USHORT ); // #120061 TypeOf
- SbiExprNode( SbiParser*, USHORT ); // new <type>
+ SbiExprNode( SbiParser*, SbiExprNode*, sal_uInt16 ); // #120061 TypeOf
+ SbiExprNode( SbiParser*, sal_uInt16 ); // new <type>
virtual ~SbiExprNode();
- BOOL IsValid() { return BOOL( !bError ); }
- BOOL IsConstant() // TRUE bei konstantem Operanden
- { return BOOL( eNodeType == SbxSTRVAL || eNodeType == SbxNUMVAL ); }
- BOOL IsIntConst(); // TRUE bei Integer-Konstanten
- BOOL IsVariable(); // TRUE, wenn Variable
+ sal_Bool IsValid() { return sal_Bool( !bError ); }
+ sal_Bool IsConstant() // sal_True bei konstantem Operanden
+ { return sal_Bool( eNodeType == SbxSTRVAL || eNodeType == SbxNUMVAL ); }
+ sal_Bool IsIntConst(); // sal_True bei Integer-Konstanten
+ sal_Bool IsVariable(); // sal_True, wenn Variable
SbiExprNode* GetWithParent() { return pWithParent; }
void SetWithParent( SbiExprNode* p ) { pWithParent = p; }
@@ -173,11 +173,11 @@ protected:
SbiExprNode* pExpr; // Der Expression-Baum
SbiExprType eCurExpr; // Art des Ausdrucks
SbiExprMode m_eMode; // Expression context
- BOOL bBased; // TRUE: einfacher DIM-Teil (+BASE)
- BOOL bError; // TRUE: Fehler
- BOOL bByVal; // TRUE: ByVal-Parameter
- BOOL bBracket; // TRUE: Parameter list with brackets
- USHORT nParenLevel;
+ sal_Bool bBased; // sal_True: einfacher DIM-Teil (+BASE)
+ sal_Bool bError; // sal_True: Fehler
+ sal_Bool bByVal; // sal_True: ByVal-Parameter
+ sal_Bool bBracket; // sal_True: Parameter list with brackets
+ sal_uInt16 nParenLevel;
SbiExprNode* Term( const KeywordSymbolInfo* pKeywordSymbolInfo = NULL );
SbiExprNode* ObjTerm( SbiSymDef& );
SbiExprNode* Operand( bool bUsedForTypeOf = false );
@@ -206,16 +206,16 @@ public:
SbiExpression( SbiParser*, SbiToken ); // Spezial-Expr mit Spezial-Tokens
~SbiExpression();
String& GetName() { return aArgName; }
- void SetBased() { bBased = TRUE; }
- BOOL IsBased() { return bBased; }
- void SetByVal() { bByVal = TRUE; }
- BOOL IsByVal() { return bByVal; }
- BOOL IsBracket() { return bBracket; }
- BOOL IsValid() { return pExpr->IsValid(); }
- BOOL IsConstant() { return pExpr->IsConstant(); }
- BOOL IsVariable() { return pExpr->IsVariable(); }
- BOOL IsLvalue() { return pExpr->IsLvalue(); }
- BOOL IsIntConstant() { return pExpr->IsIntConst(); }
+ void SetBased() { bBased = sal_True; }
+ sal_Bool IsBased() { return bBased; }
+ void SetByVal() { bByVal = sal_True; }
+ sal_Bool IsByVal() { return bByVal; }
+ sal_Bool IsBracket() { return bBracket; }
+ sal_Bool IsValid() { return pExpr->IsValid(); }
+ sal_Bool IsConstant() { return pExpr->IsConstant(); }
+ sal_Bool IsVariable() { return pExpr->IsVariable(); }
+ sal_Bool IsLvalue() { return pExpr->IsLvalue(); }
+ sal_Bool IsIntConstant() { return pExpr->IsIntConst(); }
const String& GetString() { return pExpr->GetString(); }
SbiSymDef* GetVar() { return pExpr->GetVar(); }
SbiSymDef* GetRealVar() { return pExpr->GetRealVar(); }
@@ -243,31 +243,31 @@ protected:
SbiExpression* pFirst; // Expressions
short nExpr; // Anzahl Expressions
short nDim; // Anzahl Dimensionen
- BOOL bError; // TRUE: Fehler
- BOOL bBracket; // TRUE: Klammern
+ sal_Bool bError; // sal_True: Fehler
+ sal_Bool bBracket; // sal_True: Klammern
public:
SbiExprList( SbiParser* );
virtual ~SbiExprList();
- BOOL IsBracket() { return bBracket; }
- BOOL IsValid() { return BOOL( !bError ); }
+ sal_Bool IsBracket() { return bBracket; }
+ sal_Bool IsValid() { return sal_Bool( !bError ); }
short GetSize() { return nExpr; }
short GetDims() { return nDim; }
SbiExpression* Get( short );
- BOOL Test( const SbiProcDef& ); // Parameter-Checks
+ sal_Bool Test( const SbiProcDef& ); // Parameter-Checks
void Gen(); // Code-Erzeugung
void addExpression( SbiExpression* pExpr );
};
class SbiParameters : public SbiExprList {
public:
- SbiParameters( SbiParser*, BOOL bConst = FALSE, BOOL bPar = TRUE);// parsender Ctor
+ SbiParameters( SbiParser*, sal_Bool bConst = sal_False, sal_Bool bPar = sal_True);// parsender Ctor
};
class SbiDimList : public SbiExprList {
- BOOL bConst; // TRUE: Alles sind Integer-Konstanten
+ sal_Bool bConst; // sal_True: Alles sind Integer-Konstanten
public:
SbiDimList( SbiParser* ); // Parsender Ctor
- BOOL IsConstant() { return bConst; }
+ sal_Bool IsConstant() { return bConst; }
};
#endif
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index 0319daf7261b..087581617297 100644..100755
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -58,9 +58,9 @@ class SvStream;
// Diese Records enthalten wiederum weitere Records. Jeder Record hat
// den folgenden Header:
-// UINT16 Kennung
-// UINT32 Laenge des Records ohne Header
-// UINT16 Anzahl Unterelemente
+// sal_uInt16 Kennung
+// sal_uInt32 Laenge des Records ohne Header
+// sal_uInt16 Anzahl Unterelemente
// Alle Datei-Offsets in Records sind relativ zum Start des Moduls!
@@ -85,33 +85,33 @@ class SvStream;
#endif
// Ein Library Record enthaelt nur Module Records
-// UINT16 Kennung BL
-// UINT32 Laenge des Records
-// UINT16 Anzahl Module
+// sal_uInt16 Kennung BL
+// sal_uInt32 Laenge des Records
+// sal_uInt16 Anzahl Module
// Ein Modul-Record enthaelt alle anderen Recordtypen
-// UINT16 Kennung BM
-// UINT32 Laenge des Records
-// UINT16 1
+// sal_uInt16 Kennung BM
+// sal_uInt32 Laenge des Records
+// sal_uInt16 1
// Daten:
-// UINT32 Versionsnummer
-// UINT32 Zeichensatz
-// UINT32 Startadresse Initialisierungscode
-// UINT32 Startadresse Sub Main
-// UINT32 Reserviert
-// UINT32 Reserviert
+// sal_uInt32 Versionsnummer
+// sal_uInt32 Zeichensatz
+// sal_uInt32 Startadresse Initialisierungscode
+// sal_uInt32 Startadresse Sub Main
+// sal_uInt32 Reserviert
+// sal_uInt32 Reserviert
// Modulname, Kommentar und Quellcode:
-// UINT16 Kennung MN, MC oder SC
-// UINT32 Laenge des Records
-// UINT16 1
+// sal_uInt16 Kennung MN, MC oder SC
+// sal_uInt32 Laenge des Records
+// sal_uInt16 1
// Daten:
// String-Instanz
// P-Code:
-// UINT16 Kennung PC
-// UINT32 Laenge des Records
-// UINT16 1
+// sal_uInt16 Kennung PC
+// sal_uInt32 Laenge des Records
+// sal_uInt16 1
// Daten:
// Der P-Code als Bytesack
@@ -119,62 +119,62 @@ class SvStream;
// Verweise auf diese Strings sind in Form eines Indexes in diesen Pool.
// Liste aller Publics:
-// UINT16 Kennung PU oder Pu
-// UINT32 Laenge des Records
-// UINT16 Anzahl der Publics
+// sal_uInt16 Kennung PU oder Pu
+// sal_uInt32 Laenge des Records
+// sal_uInt16 Anzahl der Publics
// Daten fuer jeden Public-Eintrag:
-// UINT16 String-Index
-// UINT32 Startadresse im P-Code-Image (UINT16 fuer alte Publics)
-// UINT16 Datentyp des Returnwertes (ab Version 2)
+// sal_uInt16 String-Index
+// sal_uInt32 Startadresse im P-Code-Image (sal_uInt16 fuer alte Publics)
+// sal_uInt16 Datentyp des Returnwertes (ab Version 2)
// Verzeichnis der Symbol-Tabellen:
-// UINT16 Kennung SP
-// UINT32 Laenge des Records
-// UINT16 Anzahl der Symboltabellen
+// sal_uInt16 Kennung SP
+// sal_uInt32 Laenge des Records
+// sal_uInt16 Anzahl der Symboltabellen
// Daten fuer jede Symboltabelle:
-// UINT16 Stringindex des Namens
-// UINT16 Anzahl Symbole
-// UINT16 Scope-Kennung
+// sal_uInt16 Stringindex des Namens
+// sal_uInt16 Anzahl Symbole
+// sal_uInt16 Scope-Kennung
// Symboltabelle:
-// UINT16 Kennung SY
-// UINT32 Laenge des Records
-// UINT16 Anzahl der Symbole
+// sal_uInt16 Kennung SY
+// sal_uInt32 Laenge des Records
+// sal_uInt16 Anzahl der Symbole
// Daten:
-// UINT16 Stringindex des Namens
-// UINT16 Anzahl Symbole
+// sal_uInt16 Stringindex des Namens
+// sal_uInt16 Anzahl Symbole
// Daten fuer jedes Symbol:
-// UINT16 Stringindex des Namens
-// UINT16 Datentyp
-// UINT16 Laenge bei STRING*n-Symbolen (0x8000: STATIC-Variable)
+// sal_uInt16 Stringindex des Namens
+// sal_uInt16 Datentyp
+// sal_uInt16 Laenge bei STRING*n-Symbolen (0x8000: STATIC-Variable)
// Stringpool:
-// UINT16 Kennung ST
-// UINT32 Laenge des Records
-// UINT16 Anzahl der Strings
+// sal_uInt16 Kennung ST
+// sal_uInt32 Laenge des Records
+// sal_uInt16 Anzahl der Strings
// Daten fuer jeden String:
-// UINT32 Offset in den Block aller Strings
+// sal_uInt32 Offset in den Block aller Strings
// Danach folgt der Block aller Strings, die dort als ASCIIZ-Strings liegen.
// Line Ranges:
-// UINT16 Kennung LR
-// UINT32 Laenge des Records
-// UINT16 Anzahl der Strings
+// sal_uInt16 Kennung LR
+// sal_uInt32 Laenge des Records
+// sal_uInt16 Anzahl der Strings
// Daten fuer jedes Public:
-// UINT16 1. Zeile (Sub XXX)
-// UINT16 2. Zeile (End Sub)
+// sal_uInt16 1. Zeile (Sub XXX)
+// sal_uInt16 2. Zeile (End Sub)
// SBX-Objekte:
-// UINT16 Anzahl Objekte
+// sal_uInt16 Anzahl Objekte
// .... Objektdaten
////////////////////////////////////////////////////////////////////////////
// Service-Routinen (in IMAGE.CXX)
-BOOL SbGood( SvStream& r );
-ULONG SbOpenRecord( SvStream&, UINT16 nSignature, UINT16 nElem );
-void SbCloseRecord( SvStream&, ULONG );
+sal_Bool SbGood( SvStream& r );
+sal_uIntPtr SbOpenRecord( SvStream&, sal_uInt16 nSignature, sal_uInt16 nElem );
+void SbCloseRecord( SvStream&, sal_uIntPtr );
#endif
diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index 24a530ed1061..b852ba1e427f 100644..100755
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/image.hxx
@@ -43,25 +43,25 @@ class SbiImage {
SbxArrayRef rTypes; // User defined types
SbxArrayRef rEnums; // Enum types
- UINT32* pStringOff; // StringId-Offsets
+ sal_uInt32* pStringOff; // StringId-Offsets
sal_Unicode* pStrings; // StringPool
char* pCode; // Code-Image
char* pLegacyPCode; // Code-Image
- BOOL bError; // TRUE: Fehler
- USHORT nFlags; // Flags (s.u.)
+ sal_Bool bError; // sal_True: Fehler
+ sal_uInt16 nFlags; // Flags (s.u.)
short nStrings; // Anzahl Strings
- UINT32 nStringSize; // Groesse des String-Puffers
- UINT32 nCodeSize; // Groesse des Code-Blocks
- UINT16 nLegacyCodeSize; // Groesse des Code-Blocks
- UINT16 nDimBase; // OPTION BASE-Wert
+ sal_uInt32 nStringSize; // Groesse des String-Puffers
+ sal_uInt32 nCodeSize; // Groesse des Code-Blocks
+ sal_uInt16 nLegacyCodeSize; // Groesse des Code-Blocks
+ sal_uInt16 nDimBase; // OPTION BASE-Wert
rtl_TextEncoding eCharSet; // Zeichensatz fuer Strings
// temporaere Verwaltungs-Variable:
short nStringIdx; // aktueller String-Index
- UINT32 nStringOff; // aktuelle Pos im Stringpuffer
+ sal_uInt32 nStringOff; // aktuelle Pos im Stringpuffer
// Routinen fuer Compiler:
void MakeStrings( short ); // StringPool einrichten
void AddString( const String& );// String zufuegen
- void AddCode( char*, UINT32 ); // Codeblock dazu
+ void AddCode( char*, sal_uInt32 ); // Codeblock dazu
void AddType(SbxObject *); // User-Type mit aufnehmen
void AddEnum(SbxObject *); // Register enum type
@@ -69,35 +69,35 @@ public:
String aName; // Makroname
::rtl::OUString aOUSource; // Quellcode
String aComment; // Kommentar
- BOOL bInit; // TRUE: Init-Code ist gelaufen
- BOOL bFirstInit; // TRUE, wenn das Image das erste mal nach
+ sal_Bool bInit; // sal_True: Init-Code ist gelaufen
+ sal_Bool bFirstInit; // sal_True, wenn das Image das erste mal nach
// dem Compilieren initialisiert wird.
SbiImage();
~SbiImage();
void Clear(); // Inhalt loeschen
- BOOL Load( SvStream&, UINT32& nVer ); // Loads image from stream
+ sal_Bool Load( SvStream&, sal_uInt32& nVer ); // Loads image from stream
// nVer is set to version
// of image
- BOOL Load( SvStream& );
- BOOL Save( SvStream&, UINT32 = B_CURVERSION );
- BOOL IsError() { return bError; }
+ sal_Bool Load( SvStream& );
+ sal_Bool Save( SvStream&, sal_uInt32 = B_CURVERSION );
+ sal_Bool IsError() { return bError; }
const char* GetCode() const { return pCode; }
- UINT32 GetCodeSize() const { return nCodeSize; }
+ sal_uInt32 GetCodeSize() const { return nCodeSize; }
::rtl::OUString& GetSource32() { return aOUSource; }
- USHORT GetBase() const { return nDimBase; }
+ sal_uInt16 GetBase() const { return nDimBase; }
String GetString( short nId ) const;
//const char* GetString( short nId ) const;
const SbxObject* FindType (String aTypeName) const;
SbxArrayRef GetEnums() { return rEnums; }
- void SetFlag( USHORT n ) { nFlags |= n; }
- USHORT GetFlag( USHORT n ) const { return nFlags & n; }
- UINT16 CalcLegacyOffset( INT32 nOffset );
- UINT32 CalcNewOffset( INT16 nOffset );
+ void SetFlag( sal_uInt16 n ) { nFlags |= n; }
+ sal_uInt16 GetFlag( sal_uInt16 n ) const { return nFlags & n; }
+ sal_uInt16 CalcLegacyOffset( sal_Int32 nOffset );
+ sal_uInt32 CalcNewOffset( sal_Int16 nOffset );
void ReleaseLegacyBuffer();
- BOOL ExceedsLegacyLimits();
+ sal_Bool ExceedsLegacyLimits();
};
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index 6d04889776b7..48d6ce39d506 100644..100755
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -48,10 +48,10 @@ class SvStream;
class SbiStream {
SvStream* pStrm; // der Stream
- ULONG nExpandOnWriteTo; // bei Schreibzugriff, den Stream
+ sal_uIntPtr nExpandOnWriteTo; // bei Schreibzugriff, den Stream
// bis zu dieser Groesse aufblasen
ByteString aLine; // aktuelle Zeile
- ULONG nLine; // aktuelle Zeilennummer
+ sal_uIntPtr nLine; // aktuelle Zeilennummer
short nLen; // Pufferlaenge
short nMode; // Bits:
short nChan; // aktueller Kanal
@@ -63,9 +63,9 @@ public:
~SbiStream();
SbError Open( short, const ByteString&, short, short, short );
SbError Close();
- SbError Read( ByteString&, USHORT = 0, bool bForceReadingPerByte=false );
+ SbError Read( ByteString&, sal_uInt16 = 0, bool bForceReadingPerByte=false );
SbError Read( char& );
- SbError Write( const ByteString&, USHORT = 0 );
+ SbError Write( const ByteString&, sal_uInt16 = 0 );
bool IsText() const { return (nMode & SBSTRM_BINARY) == 0; }
bool IsRandom() const { return (nMode & SBSTRM_RANDOM) != 0; }
@@ -74,8 +74,8 @@ public:
bool IsAppend() const { return (nMode & SBSTRM_APPEND) != 0; }
short GetBlockLen() const { return nLen; }
short GetMode() const { return nMode; }
- ULONG GetLine() const { return nLine; }
- void SetExpandOnWriteTo( ULONG n ) { nExpandOnWriteTo = n; }
+ sal_uIntPtr GetLine() const { return nLine; }
+ void SetExpandOnWriteTo( sal_uIntPtr n ) { nExpandOnWriteTo = n; }
void ExpandFile();
SvStream* GetStrm() { return pStrm; }
};
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 419230c1c2b6..419230c1c2b6 100644..100755
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
diff --git a/basic/source/inc/object.hxx b/basic/source/inc/object.hxx
index c1fdad21d1ce..1b25ee41a25d 100644..100755
--- a/basic/source/inc/object.hxx
+++ b/basic/source/inc/object.hxx
@@ -59,7 +59,7 @@ using SbxVariable::GetInfo;
public:
#endif
typedef void( SampleObject::*pMeth )
- ( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
+ ( SbxVariable* pThis, SbxArray* pArgs, sal_Bool bWrite );
#if defined ( ICC )
private:
#endif
@@ -73,10 +73,10 @@ private:
static Methods aMethods[]; // Methodentabelle
// Methoden
- void Display( SbxVariable*, SbxArray*, BOOL );
- void Event( SbxVariable*, SbxArray*, BOOL );
- void Square( SbxVariable*, SbxArray*, BOOL );
- void Create( SbxVariable*, SbxArray*, BOOL );
+ void Display( SbxVariable*, SbxArray*, sal_Bool );
+ void Event( SbxVariable*, SbxArray*, sal_Bool );
+ void Square( SbxVariable*, SbxArray*, sal_Bool );
+ void Create( SbxVariable*, SbxArray*, sal_Bool );
// Infoblock auffuellen
SbxInfo* GetInfo( short nIdx );
// Broadcaster Notification
diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx
index cbc98ac22fd4..cbc98ac22fd4 100644..100755
--- a/basic/source/inc/opcodes.hxx
+++ b/basic/source/inc/opcodes.hxx
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 3db87e49817c..1b58e5d39f0b 100644..100755
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -47,24 +47,24 @@ class SbiParser : public SbiTokenizer
SbiProcDef* pProc; // aktuelle Prozedur
SbiExprNode* pWithVar; // aktuelle With-Variable
SbiToken eEndTok; // das Ende-Token
- UINT32 nGblChain; // Chainkette fuer globale DIMs
- BOOL bGblDefs; // TRUE globale Definitionen allgemein
- BOOL bNewGblDefs; // TRUE globale Definitionen vor Sub
- BOOL bSingleLineIf; // TRUE einzeiliges if-Statement
-
- SbiSymDef* VarDecl( SbiDimList**,BOOL,BOOL );// Variablen-Deklaration
- SbiProcDef* ProcDecl(BOOL bDecl);// Prozedur-Deklaration
- void DefStatic( BOOL bPrivate );
- void DefProc( BOOL bStatic, BOOL bPrivate ); // Prozedur einlesen
- void DefVar( SbiOpcode eOp, BOOL bStatic ); // DIM/REDIM einlesen
- void TypeDecl( SbiSymDef&, BOOL bAsNewAlreadyParsed=FALSE ); // AS-Deklaration
+ sal_uInt32 nGblChain; // Chainkette fuer globale DIMs
+ sal_Bool bGblDefs; // sal_True globale Definitionen allgemein
+ sal_Bool bNewGblDefs; // sal_True globale Definitionen vor Sub
+ sal_Bool bSingleLineIf; // sal_True einzeiliges if-Statement
+
+ SbiSymDef* VarDecl( SbiDimList**,sal_Bool,sal_Bool );// Variablen-Deklaration
+ SbiProcDef* ProcDecl(sal_Bool bDecl);// Prozedur-Deklaration
+ void DefStatic( sal_Bool bPrivate );
+ void DefProc( sal_Bool bStatic, sal_Bool bPrivate ); // Prozedur einlesen
+ void DefVar( SbiOpcode eOp, sal_Bool bStatic ); // DIM/REDIM einlesen
+ void TypeDecl( SbiSymDef&, sal_Bool bAsNewAlreadyParsed=sal_False ); // AS-Deklaration
void OpenBlock( SbiToken, SbiExprNode* = NULL ); // Block oeffnen
void CloseBlock(); // Block aufloesen
- BOOL Channel( BOOL=FALSE ); // Kanalnummer parsen
+ sal_Bool Channel( sal_Bool=sal_False ); // Kanalnummer parsen
void StmntBlock( SbiToken ); // Statement-Block abarbeiten
- void DefType( BOOL bPrivate ); // Parse type declaration
- void DefEnum( BOOL bPrivate ); // Parse enum declaration
- void DefDeclare( BOOL bPrivate );
+ void DefType( sal_Bool bPrivate ); // Parse type declaration
+ void DefEnum( sal_Bool bPrivate ); // Parse enum declaration
+ void DefDeclare( sal_Bool bPrivate );
void EnableCompatibility();
public:
SbxArrayRef rTypeArray; // das Type-Array
@@ -79,26 +79,26 @@ public:
SbiSymPool* pPool; // aktueller Pool
SbiExprType eCurExpr; // aktueller Expr-Typ
short nBase; // OPTION BASE-Wert
- BOOL bText; // OPTION COMPARE TEXT
- BOOL bExplicit; // TRUE: OPTION EXPLICIT
- BOOL bClassModule; // TRUE: OPTION ClassModule
+ sal_Bool bText; // OPTION COMPARE TEXT
+ sal_Bool bExplicit; // sal_True: OPTION EXPLICIT
+ sal_Bool bClassModule; // sal_True: OPTION ClassModule
StringVector aIfaceVector; // Holds all interfaces implemented by a class module
StringVector aRequiredTypes; // Types used in Dim As New <type> outside subs
SbxDataType eDefTypes[26]; // DEFxxx-Datentypen
SbiParser( StarBASIC*, SbModule* );
- BOOL Parse(); // die Aktion
+ sal_Bool Parse(); // die Aktion
SbiExprNode* GetWithVar(); // Innerste With-Variable liefern
// AB 31.3.1996, Symbol in Runtime-Library suchen
SbiSymDef* CheckRTLForSym( const String& rSym, SbxDataType eType );
void AddConstants( void );
- BOOL HasGlobalCode(); // Globaler Code definiert?
+ sal_Bool HasGlobalCode(); // Globaler Code definiert?
- BOOL TestToken( SbiToken ); // bestimmtes TOken?
- BOOL TestSymbol( BOOL=FALSE ); // Symbol?
- BOOL TestComma(); // Komma oder EOLN?
+ sal_Bool TestToken( SbiToken ); // bestimmtes TOken?
+ sal_Bool TestSymbol( sal_Bool=sal_False ); // Symbol?
+ sal_Bool TestComma(); // Komma oder EOLN?
void TestEoln(); // EOLN?
void Symbol( const KeywordSymbolInfo* pKeywordSymbolInfo = NULL ); // Let oder Call
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index 1381d082dcdd..1497bbc0df9d 100644..100755
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -56,7 +56,7 @@ class SbPropertyValues: public SbPropertyValuesHelper
NS_UNO::Reference< ::com::sun::star::beans::XPropertySetInfo > _xInfo;
private:
- INT32 GetIndex_Impl( const ::rtl::OUString &rPropName ) const;
+ sal_Int32 GetIndex_Impl( const ::rtl::OUString &rPropName ) const;
public:
SbPropertyValues();
@@ -157,7 +157,7 @@ public:
// XPropertyContainer
virtual void SAL_CALL addProperty( const ::rtl::OUString& Name,
- INT16 Attributes,
+ sal_Int16 Attributes,
const NS_UNO::Any& DefaultValue)
throw( NS_BEANS::PropertyExistException, NS_BEANS::IllegalTypeException,
NS_LANG::IllegalArgumentException, NS_UNO::RuntimeException );
@@ -181,7 +181,7 @@ public:
class StarBASIC;
class SbxArray;
-void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
#undef NS_BEANS
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index b6b0814d1e33..df694e548844 100644..100755
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -103,10 +103,10 @@ struct SbiForStack { // for/next stack:
// For each support
ForType eForType;
- INT32 nCurCollectionIndex;
- INT32* pArrayCurIndices;
- INT32* pArrayLowerBounds;
- INT32* pArrayUpperBounds;
+ sal_Int32 nCurCollectionIndex;
+ sal_Int32* pArrayCurIndices;
+ sal_Int32* pArrayLowerBounds;
+ sal_Int32* pArrayUpperBounds;
Reference< XEnumeration > xEnumeration;
SbiForStack( void )
@@ -124,8 +124,8 @@ struct SbiForStack { // for/next stack:
struct SbiGosubStack { // GOSUB-Stack:
SbiGosubStack* pNext; // Chain
- const BYTE* pCode; // Return-Pointer
- USHORT nStartForLvl; // #118235: For Level in moment of gosub
+ const sal_uInt8* pCode; // Return-Pointer
+ sal_uInt16 nStartForLvl; // #118235: For Level in moment of gosub
};
#define MAXRECURSION 500 // max. 500 Rekursionen
@@ -150,7 +150,7 @@ public:
#else
::osl::Directory* pDir;
#endif
- INT16 nDirFlags;
+ sal_Int16 nDirFlags;
short nCurDirPos;
String sFullNameToBeChecked;
@@ -192,9 +192,9 @@ class SbiInstance
SbError nErr; // aktueller Fehlercode
String aErrorMsg; // letzte Error-Message fuer $ARG
- USHORT nErl; // aktuelle Fehlerzeile
- BOOL bReschedule; // Flag: TRUE = Reschedule in Hauptschleife
- BOOL bCompatibility; // Flag: TRUE = VBA runtime compatibility mode
+ sal_uInt16 nErl; // aktuelle Fehlerzeile
+ sal_Bool bReschedule; // Flag: sal_True = Reschedule in Hauptschleife
+ sal_Bool bCompatibility; // Flag: sal_True = VBA runtime compatibility mode
ComponentVector_t ComponentVector;
public:
@@ -203,9 +203,9 @@ public:
// #31460 Neues Konzept fuer StepInto/Over/Out,
// Erklaerung siehe runtime.cxx bei SbiInstance::CalcBreakCallLevel()
- USHORT nCallLvl; // Call-Level (wg. Rekursion)
- USHORT nBreakCallLvl; // Call-Level zum Anhalten
- void CalcBreakCallLevel( USHORT nFlags ); // Gemaess Flags setzen
+ sal_uInt16 nCallLvl; // Call-Level (wg. Rekursion)
+ sal_uInt16 nBreakCallLvl; // Call-Level zum Anhalten
+ void CalcBreakCallLevel( sal_uInt16 nFlags ); // Gemaess Flags setzen
SbiInstance( StarBASIC* );
~SbiInstance();
@@ -222,14 +222,14 @@ public:
SbError GetErr() { return nErr; }
String GetErrorMsg() { return aErrorMsg; }
xub_StrLen GetErl() { return nErl; }
- void EnableReschedule( BOOL bEnable ) { bReschedule = bEnable; }
- BOOL IsReschedule( void ) { return bReschedule; }
- void EnableCompatibility( BOOL bEnable ) { bCompatibility = bEnable; }
- BOOL IsCompatibility( void ) { return bCompatibility; }
+ void EnableReschedule( sal_Bool bEnable ) { bReschedule = bEnable; }
+ sal_Bool IsReschedule( void ) { return bReschedule; }
+ void EnableCompatibility( sal_Bool bEnable ) { bCompatibility = bEnable; }
+ sal_Bool IsCompatibility( void ) { return bCompatibility; }
ComponentVector_t& getComponentVector( void ) { return ComponentVector; }
- SbMethod* GetCaller( USHORT );
+ SbMethod* GetCaller( sal_uInt16 );
SbModule* GetActiveModule();
SbxArray* GetLocals( SbMethod* );
@@ -269,9 +269,11 @@ struct RefSaveItem
class SbiRuntime
{
+ friend void SbRtl_CallByName( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+
typedef void( SbiRuntime::*pStep0 )();
- typedef void( SbiRuntime::*pStep1 )( UINT32 nOp1 );
- typedef void( SbiRuntime::*pStep2 )( UINT32 nOp1, UINT32 nOp2 );
+ typedef void( SbiRuntime::*pStep1 )( sal_uInt32 nOp1 );
+ typedef void( SbiRuntime::*pStep2 )( sal_uInt32 nOp1, sal_uInt32 nOp2 );
static pStep0 aStep0[]; // Opcode-Tabelle Gruppe 0
static pStep1 aStep1[]; // Opcode-Tabelle Gruppe 1
static pStep2 aStep2[]; // Opcode-Tabelle Gruppe 2
@@ -291,15 +293,15 @@ class SbiRuntime
SbiArgvStack* pArgvStk; // ARGV-Stack
SbiGosubStack* pGosubStk; // GOSUB stack
SbiForStack* pForStk; // FOR/NEXT-Stack
- USHORT nExprLvl; // Tiefe des Expr-Stacks
- USHORT nGosubLvl; // Zum Vermeiden von Tot-Rekursionen
- USHORT nForLvl; // #118235: Maintain for level
- const BYTE* pCode; // aktueller Code-Pointer
- const BYTE* pStmnt; // Beginn des lezten Statements
- const BYTE* pError; // Adresse des aktuellen Error-Handlers
- const BYTE* pRestart; // Restart-Adresse
- const BYTE* pErrCode; // Restart-Adresse RESUME NEXT
- const BYTE* pErrStmnt; // Restart-Adresse RESUMT 0
+ sal_uInt16 nExprLvl; // Tiefe des Expr-Stacks
+ sal_uInt16 nGosubLvl; // Zum Vermeiden von Tot-Rekursionen
+ sal_uInt16 nForLvl; // #118235: Maintain for level
+ const sal_uInt8* pCode; // aktueller Code-Pointer
+ const sal_uInt8* pStmnt; // Beginn des lezten Statements
+ const sal_uInt8* pError; // Adresse des aktuellen Error-Handlers
+ const sal_uInt8* pRestart; // Restart-Adresse
+ const sal_uInt8* pErrCode; // Restart-Adresse RESUME NEXT
+ const sal_uInt8* pErrStmnt; // Restart-Adresse RESUMT 0
String aLibName; // Lib-Name fuer Declare-Call
SbxArrayRef refParams; // aktuelle Prozedur-Parameter
SbxArrayRef refLocals; // lokale Variable
@@ -307,14 +309,14 @@ class SbiRuntime
// AB, 28.3.2000 #74254, Ein refSaveObj reicht nicht! Neu: pRefSaveList (s.u.)
//SbxVariableRef refSaveObj; // #56368 Bei StepElem Referenz sichern
short nArgc; // aktueller Argc
- BOOL bRun; // TRUE: Programm ist aktiv
- BOOL bError; // TRUE: Fehler behandeln
- BOOL bInError; // TRUE: in einem Fehler-Handler
- BOOL bBlocked; // TRUE: blocked by next call level, #i48868
- BOOL bVBAEnabled;
- USHORT nFlags; // Debugging-Flags
+ sal_Bool bRun; // sal_True: Programm ist aktiv
+ sal_Bool bError; // sal_True: Fehler behandeln
+ sal_Bool bInError; // sal_True: in einem Fehler-Handler
+ sal_Bool bBlocked; // sal_True: blocked by next call level, #i48868
+ sal_Bool bVBAEnabled;
+ sal_uInt16 nFlags; // Debugging-Flags
SbError nError; // letzter Fehler
- USHORT nOps; // Opcode-Zaehler
+ sal_uInt16 nOps; // Opcode-Zaehler
sal_uInt32 m_nLastTime;
RefSaveItem* pRefSaveList; // #74254 Temporaere Referenzen sichern
@@ -343,17 +345,17 @@ class SbiRuntime
}
SbxVariable* FindElement
- ( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError, BOOL bLocal, BOOL bStatic = FALSE );
- void SetupArgs( SbxVariable*, UINT32 );
+ ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, sal_Bool bLocal, sal_Bool bStatic = sal_False );
+ void SetupArgs( SbxVariable*, sal_uInt32 );
SbxVariable* CheckArray( SbxVariable* );
void PushVar( SbxVariable* ); // Variable push
SbxVariableRef PopVar(); // Variable pop
SbxVariable* GetTOS( short=0 ); // Variable vom TOS holen
void TOSMakeTemp(); // TOS in temp. Variable wandeln
- BOOL ClearExprStack(); // Expr-Stack freigeben
+ sal_Bool ClearExprStack(); // Expr-Stack freigeben
- void PushGosub( const BYTE* ); // GOSUB-Element push
+ void PushGosub( const sal_uInt8* ); // GOSUB-Element push
void PopGosub(); // GOSUB-Element pop
void ClearGosubStack(); // GOSUB-Stack freigeben
@@ -373,7 +375,7 @@ class SbiRuntime
void SetParameters( SbxArray* );// Parameter uebernehmen
// MUSS NOCH IMPLEMENTIERT WERDEN
- void DllCall( const String&, const String&, SbxArray*, SbxDataType, BOOL );
+ void DllCall( const String&, const String&, SbxArray*, SbxDataType, sal_Bool );
// #56204 DIM-Funktionalitaet in Hilfsmethode auslagern (step0.cxx)
void DimImpl( SbxVariableRef refVar );
@@ -381,7 +383,7 @@ class SbiRuntime
// #115829
bool implIsClass( SbxObject* pObj, const String& aClass );
- void StepSETCLASS_impl( UINT32 nOp1, bool bHandleDflt = false );
+ void StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt = false );
// Die nachfolgenden Routinen werden vom Single Stepper
// gerufen und implementieren die einzelnen Opcodes
@@ -404,40 +406,40 @@ class SbiRuntime
void StepLSET(), StepRSET(), StepREDIMP_ERASE(), StepERASE_CLEAR();
void StepARRAYACCESS(), StepBYVAL();
// Alle Opcodes mit einem Operanden
- void StepLOADNC( UINT32 ), StepLOADSC( UINT32 ), StepLOADI( UINT32 );
- void StepARGN( UINT32 ), StepBASED( UINT32 ), StepPAD( UINT32 );
- void StepJUMP( UINT32 ), StepJUMPT( UINT32 );
- void StepJUMPF( UINT32 ), StepONJUMP( UINT32 );
- void StepGOSUB( UINT32 ), StepRETURN( UINT32 );
- void StepTESTFOR( UINT32 ), StepCASETO( UINT32 ), StepERRHDL( UINT32 );
- void StepRESUME( UINT32 ), StepSETCLASS( UINT32 ), StepVBASETCLASS( UINT32 ), StepTESTCLASS( UINT32 ), StepLIB( UINT32 );
+ void StepLOADNC( sal_uInt32 ), StepLOADSC( sal_uInt32 ), StepLOADI( sal_uInt32 );
+ void StepARGN( sal_uInt32 ), StepBASED( sal_uInt32 ), StepPAD( sal_uInt32 );
+ void StepJUMP( sal_uInt32 ), StepJUMPT( sal_uInt32 );
+ void StepJUMPF( sal_uInt32 ), StepONJUMP( sal_uInt32 );
+ void StepGOSUB( sal_uInt32 ), StepRETURN( sal_uInt32 );
+ void StepTESTFOR( sal_uInt32 ), StepCASETO( sal_uInt32 ), StepERRHDL( sal_uInt32 );
+ void StepRESUME( sal_uInt32 ), StepSETCLASS( sal_uInt32 ), StepVBASETCLASS( sal_uInt32 ), StepTESTCLASS( sal_uInt32 ), StepLIB( sal_uInt32 );
bool checkClass_Impl( const SbxVariableRef& refVal, const String& aClass, bool bRaiseErrors, bool bDefault = true );
- void StepCLOSE( UINT32 ), StepPRCHAR( UINT32 ), StepARGTYP( UINT32 );
+ void StepCLOSE( sal_uInt32 ), StepPRCHAR( sal_uInt32 ), StepARGTYP( sal_uInt32 );
// Alle Opcodes mit zwei Operanden
- void StepRTL( UINT32, UINT32 ), StepPUBLIC( UINT32, UINT32 ), StepPUBLIC_P( UINT32, UINT32 );
- void StepPUBLIC_Impl( UINT32, UINT32, bool bUsedForClassModule );
- void StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError, BOOL bLocal, BOOL bStatic = FALSE );
- void StepFIND( UINT32, UINT32 ), StepELEM( UINT32, UINT32 );
- void StepGLOBAL( UINT32, UINT32 ), StepLOCAL( UINT32, UINT32 );
- void StepPARAM( UINT32, UINT32), StepCREATE( UINT32, UINT32 );
- void StepCALL( UINT32, UINT32 ), StepCALLC( UINT32, UINT32 );
- void StepCASEIS( UINT32, UINT32 ), StepSTMNT( UINT32, UINT32 );
+ void StepRTL( sal_uInt32, sal_uInt32 ), StepPUBLIC( sal_uInt32, sal_uInt32 ), StepPUBLIC_P( sal_uInt32, sal_uInt32 );
+ void StepPUBLIC_Impl( sal_uInt32, sal_uInt32, bool bUsedForClassModule );
+ void StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, sal_Bool bLocal, sal_Bool bStatic = sal_False );
+ void StepFIND( sal_uInt32, sal_uInt32 ), StepELEM( sal_uInt32, sal_uInt32 );
+ void StepGLOBAL( sal_uInt32, sal_uInt32 ), StepLOCAL( sal_uInt32, sal_uInt32 );
+ void StepPARAM( sal_uInt32, sal_uInt32), StepCREATE( sal_uInt32, sal_uInt32 );
+ void StepCALL( sal_uInt32, sal_uInt32 ), StepCALLC( sal_uInt32, sal_uInt32 );
+ void StepCASEIS( sal_uInt32, sal_uInt32 ), StepSTMNT( sal_uInt32, sal_uInt32 );
SbxVariable* StepSTATIC_Impl( String& aName, SbxDataType& t );
- void StepOPEN( UINT32, UINT32 ), StepSTATIC( UINT32, UINT32 );
- void StepTCREATE(UINT32,UINT32), StepDCREATE(UINT32,UINT32);
- void StepGLOBAL_P( UINT32, UINT32 ),StepFIND_G( UINT32, UINT32 );
- void StepDCREATE_REDIMP(UINT32,UINT32), StepDCREATE_IMPL(UINT32,UINT32);
- void StepFIND_CM( UINT32, UINT32 );
- void StepFIND_STATIC( UINT32, UINT32 );
- void implCreateFixedString( SbxVariable* pStrVar, UINT32 nOp2 );
+ void StepOPEN( sal_uInt32, sal_uInt32 ), StepSTATIC( sal_uInt32, sal_uInt32 );
+ void StepTCREATE(sal_uInt32,sal_uInt32), StepDCREATE(sal_uInt32,sal_uInt32);
+ void StepGLOBAL_P( sal_uInt32, sal_uInt32 ),StepFIND_G( sal_uInt32, sal_uInt32 );
+ void StepDCREATE_REDIMP(sal_uInt32,sal_uInt32), StepDCREATE_IMPL(sal_uInt32,sal_uInt32);
+ void StepFIND_CM( sal_uInt32, sal_uInt32 );
+ void StepFIND_STATIC( sal_uInt32, sal_uInt32 );
+ void implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, sal_uInt32 nOp2 );
public:
void SetVBAEnabled( bool bEnabled );
- USHORT GetImageFlag( USHORT n ) const;
- USHORT GetBase();
+ sal_uInt16 GetImageFlag( sal_uInt16 n ) const;
+ sal_uInt16 GetBase();
xub_StrLen nLine,nCol1,nCol2; // aktuelle Zeile, Spaltenbereich
SbiRuntime* pNext; // Stack-Chain
- SbiRuntime( SbModule*, SbMethod*, UINT32 );
+ SbiRuntime( SbModule*, SbMethod*, sal_uInt32 );
~SbiRuntime();
void Error( SbError, bool bVBATranslationAlreadyDone = false ); // Fehler setzen, falls != 0
void Error( SbError, const String& ); // Fehler setzen, falls != 0
@@ -445,15 +447,15 @@ public:
void FatalError( SbError, const String& ); // Fehlerbehandlung=Standard, Fehler setzen
static sal_Int32 translateErrorToVba( SbError nError, String& rMsg );
void DumpPCode();
- BOOL Step(); // Einzelschritt (ein Opcode)
- void Stop() { bRun = FALSE; }
- BOOL IsRun() { return bRun; }
- void block( void ) { bBlocked = TRUE; }
- void unblock( void ) { bBlocked = FALSE; }
+ sal_Bool Step(); // Einzelschritt (ein Opcode)
+ void Stop() { bRun = sal_False; }
+ sal_Bool IsRun() { return bRun; }
+ void block( void ) { bBlocked = sal_True; }
+ void unblock( void ) { bBlocked = sal_False; }
SbMethod* GetMethod() { return pMeth; }
SbModule* GetModule() { return pMod; }
- USHORT GetDebugFlags() { return nFlags; }
- void SetDebugFlags( USHORT nFl ) { nFlags = nFl; }
+ sal_uInt16 GetDebugFlags() { return nFlags; }
+ void SetDebugFlags( sal_uInt16 nFl ) { nFlags = nFl; }
SbMethod* GetCaller();
SbxArray* GetLocals();
SbxArray* GetParams();
@@ -487,12 +489,12 @@ StarBASIC* GetCurrentBasic( StarBASIC* pRTBasic );
// no DDE functionality, no DLLCALL) in basic because
// of portal "virtual" users (portal user != UNIX user)
// (Implemented in iosys.cxx)
-BOOL needSecurityRestrictions( void );
+sal_Bool needSecurityRestrictions( void );
-// Returns TRUE if UNO is available, otherwise the old
+// Returns sal_True if UNO is available, otherwise the old
// file system implementation has to be used
// (Implemented in iosys.cxx)
-BOOL hasUno( void );
+sal_Bool hasUno( void );
// Converts possibly relative paths to absolute paths
// according to the setting done by ChDir/ChDrive
diff --git a/basic/source/inc/sbcomp.hxx b/basic/source/inc/sbcomp.hxx
index 2918e67880f0..2918e67880f0 100644..100755
--- a/basic/source/inc/sbcomp.hxx
+++ b/basic/source/inc/sbcomp.hxx
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index 7003b5a0a1bb..34d08f6e8c21 100644..100755
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -47,7 +47,7 @@ class SbModule;
class SbiFactory : public SbxFactory
{
public:
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
};
@@ -80,7 +80,7 @@ public:
void AddClassModule( SbModule* pClassModule );
void RemoveClassModule( SbModule* pClassModule );
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
SbModule* FindClass( const String& rClassName );
@@ -118,14 +118,14 @@ struct SbiGlobals
SbError nCode; // aktueller Fehlercode
xub_StrLen nLine; // aktuelle Zeile
xub_StrLen nCol1,nCol2; // aktuelle Spalten (von,bis)
- BOOL bCompiler; // Flag fuer Compiler-Error
- BOOL bGlobalInitErr; // Beim GlobalInit trat ein Compiler-Fehler auf
- BOOL bRunInit; // TRUE, wenn RunInit vom Basic aktiv ist
+ sal_Bool bCompiler; // Flag fuer Compiler-Error
+ sal_Bool bGlobalInitErr; // Beim GlobalInit trat ein Compiler-Fehler auf
+ sal_Bool bRunInit; // sal_True, wenn RunInit vom Basic aktiv ist
String aErrMsg; // Puffer fuer GetErrorText()
SbLanguageMode eLanguageMode; // Flag fuer Visual-Basic-Script-Modus
SbErrorStack* pErrStack; // Stack fuer die im Fehlerfall abgebaute SbiRuntime Kette
::utl::TransliterationWrapper* pTransliterationWrapper; // For StrComp
- BOOL bBlockCompilerError;
+ sal_Bool bBlockCompilerError;
BasicManager* pAppBasMgr;
StarBASIC* pMSOMacroRuntimLib; // Lib containing MSO Macro Runtime API entry symbols
diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index f2cc8a3d3865..f2cc8a3d3865 100644..100755
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx
index b3aa275aec0d..55091dc681c5 100644..100755
--- a/basic/source/inc/sbjsmod.hxx
+++ b/basic/source/inc/sbjsmod.hxx
@@ -37,8 +37,8 @@
class SbJScriptModule : public SbModule
{
- virtual BOOL LoadData( SvStream&, USHORT );
- virtual BOOL StoreData( SvStream& ) const;
+ virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
+ virtual sal_Bool StoreData( SvStream& ) const;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1);
TYPEINFO();
diff --git a/basic/source/inc/sbtrace.hxx b/basic/source/inc/sbtrace.hxx
new file mode 100755
index 000000000000..50e344fb63d2
--- /dev/null
+++ b/basic/source/inc/sbtrace.hxx
@@ -0,0 +1,44 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SBTRACE_HXX
+#define _SBTRACE_HXX
+
+//#define DBG_TRACE_BASIC
+
+#ifdef DBG_TRACE_BASIC
+void dbg_InitTrace( void );
+void dbg_DeInitTrace( void );
+void dbg_traceStep( SbModule* pModule, UINT32 nPC, INT32 nCallLvl );
+void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl, bool bLeave = false );
+void dbg_traceNotifyError( SbError nTraceErr, const String& aTraceErrMsg, bool bTraceErrHandled, INT32 nCallLvl );
+void dbg_RegisterTraceTextForPC( SbModule* pModule, UINT32 nPC,
+ const String& aTraceStr_STMNT, const String& aTraceStr_PCode );
+void RTL_Impl_TraceCommand( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+#endif
+
+#endif
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index faf913229ad3..5905f7f4640f 100644..100755
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -52,8 +52,8 @@ class SbUnoObject: public SbxObject
::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > mxInvocation;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactName;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XExactName > mxExactNameInvocation;
- BOOL bNeedIntrospection;
- BOOL bIgnoreNativeCOMObjectMembers;
+ sal_Bool bNeedIntrospection;
+ sal_Bool bNativeCOMObject;
::com::sun::star::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection!
// Hilfs-Methode zum Anlegen der dbg_-Properties
@@ -85,17 +85,22 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > getInvocation( void ) { return mxInvocation; }
void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
+
+ bool isNativeCOMObject( void )
+ { return bNativeCOMObject; }
};
SV_DECL_IMPL_REF(SbUnoObject);
// #67781 Rueckgabewerte der Uno-Methoden loeschen
void clearUnoMethods( void );
+void clearUnoMethodsForBasic( StarBASIC* pBasic );
class SbUnoMethod : public SbxMethod
{
friend class SbUnoObject;
friend void clearUnoMethods( void );
+ friend void clearUnoMethodsForBasic( StarBASIC* pBasic );
::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > m_xUnoMethod;
::com::sun::star::uno::Sequence< ::com::sun::star::reflection::ParamInfo >* pParamInfoSeq;
@@ -104,13 +109,15 @@ class SbUnoMethod : public SbxMethod
SbUnoMethod* pPrev;
SbUnoMethod* pNext;
- bool mbInvocation; // Method is based on invocation
+ bool mbInvocation; // Method is based on invocation
+ bool mbDirectInvocation; // Method should be used with XDirectInvocation interface
public:
TYPEINFO();
SbUnoMethod( const String& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_,
- bool bInvocation );
+ bool bInvocation,
+ bool bDirect = false );
virtual ~SbUnoMethod();
virtual SbxInfo* GetInfo();
@@ -118,6 +125,8 @@ public:
bool isInvocationBased( void )
{ return mbInvocation; }
+ bool needsDirectInvocation( void )
+ { return mbDirectInvocation; }
};
@@ -127,7 +136,7 @@ class SbUnoProperty : public SbxProperty
// Daten der Uno-Property
::com::sun::star::beans::Property aUnoProp;
- INT32 nId;
+ sal_Int32 nId;
bool mbInvocation; // Property is based on invocation
@@ -135,7 +144,7 @@ class SbUnoProperty : public SbxProperty
public:
TYPEINFO();
SbUnoProperty( const String& aName_, SbxDataType eSbxType,
- const ::com::sun::star::beans::Property& aUnoProp_, INT32 nId_, bool bInvocation );
+ const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation );
bool isInvocationBased( void )
{ return mbInvocation; }
@@ -145,7 +154,7 @@ public:
class SbUnoFactory : public SbxFactory
{
public:
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
};
@@ -284,15 +293,18 @@ public:
class StarBASIC;
// Impl-Methoden fuer RTL
-void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
-void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+void RTL_Impl_CreateUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_HasInterfaces( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_IsUnoStruct( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
+
+void disposeComVariablesForBasic( StarBASIC* pBasic );
+void clearNativeObjectWrapperVector( void );
//========================================================================
@@ -309,8 +321,8 @@ class BasicCollection : public SbxObject
virtual ~BasicCollection();
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
- INT32 implGetIndex( SbxVariable* pIndexVar );
- INT32 implGetIndexForName( const String& rName );
+ sal_Int32 implGetIndex( SbxVariable* pIndexVar );
+ sal_Int32 implGetIndexForName( const String& rName );
void CollAdd( SbxArray* pPar_ );
void CollItem( SbxArray* pPar_ );
void CollRemove( SbxArray* pPar_ );
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index 5a6a29c1a9c7..5abfc1efdd3c 100644..100755
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -57,33 +57,33 @@ protected:
short nCol; // aktuelle Spaltennummer
short nErrors; // Anzahl Fehler
short nColLock; // Lock-Zaehler fuer Col1
- INT32 nBufPos; // aktuelle Buffer-Pos
- USHORT nLine; // aktuelle Zeile
- USHORT nCol1, nCol2; // aktuelle 1. und 2. Spalte
- BOOL bSymbol; // TRUE: Symbol gescannt
- BOOL bNumber; // TRUE: Zahl gescannt
- BOOL bSpaces; // TRUE: Whitespace vor Token
- BOOL bErrors; // TRUE: Fehler generieren
- BOOL bAbort; // TRUE: abbrechen
- BOOL bHash; // TRUE: # eingelesen
- BOOL bError; // TRUE: Fehler generieren
- BOOL bUsedForHilite; // TRUE: Nutzung fuer Highlighting
- BOOL bCompatible; // TRUE: OPTION Compatibl
- BOOL bVBASupportOn; // TRUE: OPTION VBASupport 1 otherwise default False
- BOOL bPrevLineExtentsComment; // TRUE: Previous line is comment and ends on "... _"
+ sal_Int32 nBufPos; // aktuelle Buffer-Pos
+ sal_uInt16 nLine; // aktuelle Zeile
+ sal_uInt16 nCol1, nCol2; // aktuelle 1. und 2. Spalte
+ sal_Bool bSymbol; // sal_True: Symbol gescannt
+ sal_Bool bNumber; // sal_True: Zahl gescannt
+ sal_Bool bSpaces; // sal_True: Whitespace vor Token
+ sal_Bool bErrors; // sal_True: Fehler generieren
+ sal_Bool bAbort; // sal_True: abbrechen
+ sal_Bool bHash; // sal_True: # eingelesen
+ sal_Bool bError; // sal_True: Fehler generieren
+ sal_Bool bUsedForHilite; // sal_True: Nutzung fuer Highlighting
+ sal_Bool bCompatible; // sal_True: OPTION Compatibl
+ sal_Bool bVBASupportOn; // sal_True: OPTION VBASupport 1 otherwise default False
+ sal_Bool bPrevLineExtentsComment; // sal_True: Previous line is comment and ends on "... _"
void GenError( SbError );
public:
SbiScanner( const ::rtl::OUString&, StarBASIC* = NULL );
~SbiScanner();
- void EnableErrors() { bError = FALSE; }
- BOOL IsHash() { return bHash; }
- BOOL IsCompatible() { return bCompatible; }
+ void EnableErrors() { bError = sal_False; }
+ sal_Bool IsHash() { return bHash; }
+ sal_Bool IsCompatible() { return bCompatible; }
void SetCompatible( bool b ) { bCompatible = b; } // #118206
- BOOL IsVBASupportOn() { return bVBASupportOn; }
+ sal_Bool IsVBASupportOn() { return bVBASupportOn; }
void SetVBASupportOn( bool b ) { bVBASupportOn = b; }
- BOOL WhiteSpace() { return bSpaces; }
+ sal_Bool WhiteSpace() { return bSpaces; }
short GetErrors() { return nErrors; }
short GetLine() { return nLine; }
short GetCol1() { return nCol1; }
@@ -94,9 +94,9 @@ public:
void RestoreLine(void) { pLine = pSaveLine; }
void LockColumn();
void UnlockColumn();
- BOOL DoesColonFollow();
+ sal_Bool DoesColonFollow();
- BOOL NextSym(); // naechstes Symbol lesen
+ sal_Bool NextSym(); // naechstes Symbol lesen
const String& GetSym() { return aSym; }
SbxDataType GetType() { return eScanType; }
double GetDbl() { return nVal; }
@@ -122,22 +122,22 @@ class BasicSimpleCharClass
static LetterTable aLetterTable;
public:
- static BOOL isAlpha( sal_Unicode c, bool bCompatible )
+ static sal_Bool isAlpha( sal_Unicode c, bool bCompatible )
{
- BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
+ sal_Bool bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
|| (bCompatible && aLetterTable.isLetter( c ));
return bRet;
}
- static BOOL isDigit( sal_Unicode c )
+ static sal_Bool isDigit( sal_Unicode c )
{
- BOOL bRet = (c >= '0' && c <= '9');
+ sal_Bool bRet = (c >= '0' && c <= '9');
return bRet;
}
- static BOOL isAlphaNumeric( sal_Unicode c, bool bCompatible )
+ static sal_Bool isAlphaNumeric( sal_Unicode c, bool bCompatible )
{
- BOOL bRet = isDigit( c ) || isAlpha( c, bCompatible );
+ sal_Bool bRet = isDigit( c ) || isAlpha( c, bCompatible );
return bRet;
}
};
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index f7f948bd0b31..0966c258380a 100644..100755
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -44,6 +44,7 @@ namespace basic
class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPassword
{
::rtl::OUString maScriptLanguage;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxCodeNameAccess;
// Methods to distinguish between deffirent library types
virtual SfxLibrary* SAL_CALL implCreateLibrary( const ::rtl::OUString& aName );
diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx
index 9087b81e3028..7abaf47492f1 100644..100755
--- a/basic/source/inc/stdobj.hxx
+++ b/basic/source/inc/stdobj.hxx
@@ -46,7 +46,7 @@ class SbiStdObject : public SbxObject
public:
SbiStdObject( const String&, StarBASIC* );
virtual SbxVariable* Find( const String&, SbxClassType );
- virtual void SetModified( BOOL );
+ virtual void SetModified( sal_Bool );
};
#endif
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index b8457b3c811b..adfee46b4aed 100644..100755
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -59,12 +59,12 @@ class SbiStringPool { // String-Pool
public:
SbiStringPool( SbiParser* );
~SbiStringPool();
- USHORT GetSize() const { return aData.Count(); }
- // AB 8.4.1999, Default wegen #64236 auf TRUE geaendert
- // Wenn der Bug sauber behoben ist, wieder auf FALSE aendern.
- short Add( const String&, BOOL=TRUE );
+ sal_uInt16 GetSize() const { return aData.Count(); }
+ // AB 8.4.1999, Default wegen #64236 auf sal_True geaendert
+ // Wenn der Bug sauber behoben ist, wieder auf sal_False aendern.
+ short Add( const String&, sal_Bool=sal_True );
short Add( double, SbxDataType );
- const String& Find( USHORT ) const;
+ const String& Find( sal_uInt16 ) const;
SbiParser* GetParser() { return pParser; }
};
@@ -81,8 +81,8 @@ protected:
SbiSymPool* pParent; // uebergeordneter Symbol-Pool
SbiParser* pParser; // der Parser
SbiSymScope eScope; // Scope des Pools
- USHORT nProcId; // aktuelles ProcId fuer STATIC-Variable
- USHORT nCur; // Iterator
+ sal_uInt16 nProcId; // aktuelles ProcId fuer STATIC-Variable
+ sal_uInt16 nCur; // Iterator
public:
SbiSymPool( SbiStringPool&, SbiSymScope );
~SbiSymPool();
@@ -91,7 +91,7 @@ public:
void SetParent( SbiSymPool* p ) { pParent = p; }
void SetProcId( short n ) { nProcId = n; }
- USHORT GetSize() const { return aData.Count(); }
+ sal_uInt16 GetSize() const { return aData.Count(); }
SbiSymScope GetScope() const { return eScope; }
void SetScope( SbiSymScope s ) { eScope = s; }
SbiParser* GetParser() { return pParser; }
@@ -100,12 +100,12 @@ public:
SbiProcDef* AddProc( const String& );// Prozedur hinzufuegen
void Add( SbiSymDef* ); // Symbol uebernehmen
SbiSymDef* Find( const String& ) const;// Variablenname
- SbiSymDef* FindId( USHORT ) const; // Variable per ID suchen
- SbiSymDef* Get( USHORT ) const; // Variable per Position suchen
+ SbiSymDef* FindId( sal_uInt16 ) const; // Variable per ID suchen
+ SbiSymDef* Get( sal_uInt16 ) const; // Variable per Position suchen
SbiSymDef* First(), *Next(); // Iteratoren
- UINT32 Define( const String& ); // Label definieren
- UINT32 Reference( const String& ); // Label referenzieren
+ sal_uInt32 Define( const String& ); // Label definieren
+ sal_uInt32 Reference( const String& ); // Label referenzieren
void CheckRefs(); // offene Referenzen suchen
};
@@ -120,21 +120,21 @@ protected:
SbiSymPool* pPool; // Pool fuer Unterelemente
short nLen; // Stringlaenge bei STRING*n
short nDims; // Array-Dimensionen
- USHORT nId; // Symbol-Nummer
- USHORT nTypeId; // String-ID des Datentyps (Dim X AS Dytentyp)
- USHORT nProcId; // aktuelles ProcId fuer STATIC-Variable
- USHORT nPos; // Positions-Nummer
- UINT32 nChain; // Backchain-Kette
- BOOL bNew : 1; // TRUE: Dim As New...
- BOOL bChained : 1; // TRUE: Symbol ist in Code definiert
- BOOL bByVal : 1; // TRUE: ByVal-Parameter
- BOOL bOpt : 1; // TRUE: optionaler Parameter
- BOOL bStatic : 1; // TRUE: STATIC-Variable
- BOOL bAs : 1; // TRUE: Datentyp per AS XXX definiert
- BOOL bGlobal : 1; // TRUE: Global-Variable
- BOOL bParamArray : 1; // TRUE: ParamArray parameter
- BOOL bWithEvents : 1; // TRUE: Declared WithEvents
- USHORT nDefaultId; // Symbol number of default value
+ sal_uInt16 nId; // Symbol-Nummer
+ sal_uInt16 nTypeId; // String-ID des Datentyps (Dim X AS Dytentyp)
+ sal_uInt16 nProcId; // aktuelles ProcId fuer STATIC-Variable
+ sal_uInt16 nPos; // Positions-Nummer
+ sal_uInt32 nChain; // Backchain-Kette
+ sal_Bool bNew : 1; // sal_True: Dim As New...
+ sal_Bool bChained : 1; // sal_True: Symbol ist in Code definiert
+ sal_Bool bByVal : 1; // sal_True: ByVal-Parameter
+ sal_Bool bOpt : 1; // sal_True: optionaler Parameter
+ sal_Bool bStatic : 1; // sal_True: STATIC-Variable
+ sal_Bool bAs : 1; // sal_True: Datentyp per AS XXX definiert
+ sal_Bool bGlobal : 1; // sal_True: Global-Variable
+ sal_Bool bParamArray : 1; // sal_True: ParamArray parameter
+ sal_Bool bWithEvents : 1; // sal_True: Declared WithEvents
+ sal_uInt16 nDefaultId; // Symbol number of default value
short nFixedStringLength; // String length in: Dim foo As String*Length
public:
SbiSymDef( const String& );
@@ -146,42 +146,42 @@ public:
virtual void SetType( SbxDataType );
const String& GetName();
SbiSymScope GetScope() const;
- USHORT GetProcId() const{ return nProcId; }
- UINT32 GetAddr() const { return nChain; }
- USHORT GetId() const { return nId; }
- USHORT GetTypeId() const{ return nTypeId; }
- void SetTypeId( USHORT n ) { nTypeId = n; eType = SbxOBJECT; }
- USHORT GetPos() const { return nPos; }
+ sal_uInt16 GetProcId() const{ return nProcId; }
+ sal_uInt32 GetAddr() const { return nChain; }
+ sal_uInt16 GetId() const { return nId; }
+ sal_uInt16 GetTypeId() const{ return nTypeId; }
+ void SetTypeId( sal_uInt16 n ) { nTypeId = n; eType = SbxOBJECT; }
+ sal_uInt16 GetPos() const { return nPos; }
void SetLen( short n ){ nLen = n; }
short GetLen() const { return nLen; }
void SetDims( short n ) { nDims = n; }
short GetDims() const { return nDims; }
- BOOL IsDefined() const{ return bChained; }
- void SetOptional() { bOpt = TRUE; }
- void SetParamArray() { bParamArray = TRUE; }
- void SetWithEvents() { bWithEvents = TRUE; }
- void SetByVal( BOOL bByVal_ = TRUE )
+ sal_Bool IsDefined() const{ return bChained; }
+ void SetOptional() { bOpt = sal_True; }
+ void SetParamArray() { bParamArray = sal_True; }
+ void SetWithEvents() { bWithEvents = sal_True; }
+ void SetByVal( sal_Bool bByVal_ = sal_True )
{ bByVal = bByVal_; }
- void SetStatic( BOOL bAsStatic = TRUE ) { bStatic = bAsStatic; }
- void SetNew() { bNew = TRUE; }
- void SetDefinedAs() { bAs = TRUE; }
- void SetGlobal(BOOL b){ bGlobal = b; }
- void SetDefaultId( USHORT n ) { nDefaultId = n; }
- USHORT GetDefaultId( void ) { return nDefaultId; }
- BOOL IsOptional() const{ return bOpt; }
- BOOL IsParamArray() const{ return bParamArray; }
- BOOL IsWithEvents() const{ return bWithEvents; }
- BOOL IsByVal() const { return bByVal; }
- BOOL IsStatic() const { return bStatic; }
- BOOL IsNew() const { return bNew; }
- BOOL IsDefinedAs() const { return bAs; }
- BOOL IsGlobal() const { return bGlobal; }
+ void SetStatic( sal_Bool bAsStatic = sal_True ) { bStatic = bAsStatic; }
+ void SetNew() { bNew = sal_True; }
+ void SetDefinedAs() { bAs = sal_True; }
+ void SetGlobal(sal_Bool b){ bGlobal = b; }
+ void SetDefaultId( sal_uInt16 n ) { nDefaultId = n; }
+ sal_uInt16 GetDefaultId( void ) { return nDefaultId; }
+ sal_Bool IsOptional() const{ return bOpt; }
+ sal_Bool IsParamArray() const{ return bParamArray; }
+ sal_Bool IsWithEvents() const{ return bWithEvents; }
+ sal_Bool IsByVal() const { return bByVal; }
+ sal_Bool IsStatic() const { return bStatic; }
+ sal_Bool IsNew() const { return bNew; }
+ sal_Bool IsDefinedAs() const { return bAs; }
+ sal_Bool IsGlobal() const { return bGlobal; }
short GetFixedStringLength( void ) const { return nFixedStringLength; }
void SetFixedStringLength( short n ) { nFixedStringLength = n; }
SbiSymPool& GetPool();
- UINT32 Define(); // Symbol in Code definieren
- UINT32 Reference(); // Symbol in Code referenzieren
+ sal_uInt32 Define(); // Symbol in Code definieren
+ sal_uInt32 Reference(); // Symbol in Code referenzieren
private:
SbiSymDef( const SbiSymDef& );
@@ -193,14 +193,14 @@ class SbiProcDef : public SbiSymDef { // Prozedur-Definition (aus Basic):
SbiSymPool aLabels; // lokale Sprungziele
String aLibName; // LIB "name"
String aAlias; // ALIAS "name"
- USHORT nLine1, nLine2; // Zeilenbereich
+ sal_uInt16 nLine1, nLine2; // Zeilenbereich
PropertyMode mePropMode; // Marks if this is a property procedure and which
String maPropName; // Property name if property procedure (!= proc name)
- BOOL bCdecl : 1; // TRUE: CDECL angegeben
- BOOL bPublic : 1; // TRUE: proc ist PUBLIC
- BOOL mbProcDecl : 1; // TRUE: instanciated by SbiParser::ProcDecl
+ sal_Bool bCdecl : 1; // sal_True: CDECL angegeben
+ sal_Bool bPublic : 1; // sal_True: proc ist PUBLIC
+ sal_Bool mbProcDecl : 1; // sal_True: instanciated by SbiParser::ProcDecl
public:
- SbiProcDef( SbiParser*, const String&, BOOL bProcDecl=false );
+ SbiProcDef( SbiParser*, const String&, sal_Bool bProcDecl=false );
virtual ~SbiProcDef();
virtual SbiProcDef* GetProcDef();
virtual void SetType( SbxDataType );
@@ -209,15 +209,15 @@ public:
SbiSymPool& GetLocals() { return GetPool();}
String& GetLib() { return aLibName; }
String& GetAlias() { return aAlias; }
- void SetPublic( BOOL b ) { bPublic = b; }
- BOOL IsPublic() const { return bPublic; }
- void SetCdecl( BOOL b = TRUE) { bCdecl = b; }
- BOOL IsCdecl() const { return bCdecl; }
- BOOL IsUsedForProcDecl() const { return mbProcDecl; }
- void SetLine1( USHORT n ) { nLine1 = n; }
- USHORT GetLine1() const { return nLine1; }
- void SetLine2( USHORT n ) { nLine2 = n; }
- USHORT GetLine2() const { return nLine2; }
+ void SetPublic( sal_Bool b ) { bPublic = b; }
+ sal_Bool IsPublic() const { return bPublic; }
+ void SetCdecl( sal_Bool b = sal_True) { bCdecl = b; }
+ sal_Bool IsCdecl() const { return bCdecl; }
+ sal_Bool IsUsedForProcDecl() const { return mbProcDecl; }
+ void SetLine1( sal_uInt16 n ) { nLine1 = n; }
+ sal_uInt16 GetLine1() const { return nLine1; }
+ void SetLine2( sal_uInt16 n ) { nLine2 = n; }
+ sal_uInt16 GetLine2() const { return nLine2; }
PropertyMode getPropertyMode() { return mePropMode; }
void setPropertyMode( PropertyMode ePropMode );
const String& GetPropName() { return maPropName; }
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index 544eef119e01..deb6764f2e2c 100644..100755
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -141,25 +141,25 @@ class SbiTokenizer : public SbiScanner {
protected:
SbiToken eCurTok; // aktuelles Token
SbiToken ePush; // Pushback-Token
- USHORT nPLine, nPCol1, nPCol2; // Pushback-Location
- BOOL bEof; // TRUE bei Dateiende
- BOOL bEos; // TRUE bei Statement-Ende
- BOOL bKeywords; // TRUE, falls Keywords geparst werden
- BOOL bAs; // letztes Keyword war AS
- BOOL bErrorIsSymbol; // Handle Error token as Symbol, not keyword
+ sal_uInt16 nPLine, nPCol1, nPCol2; // Pushback-Location
+ sal_Bool bEof; // sal_True bei Dateiende
+ sal_Bool bEos; // sal_True bei Statement-Ende
+ sal_Bool bKeywords; // sal_True, falls Keywords geparst werden
+ sal_Bool bAs; // letztes Keyword war AS
+ sal_Bool bErrorIsSymbol; // Handle Error token as Symbol, not keyword
public:
SbiTokenizer( const ::rtl::OUString&, StarBASIC* = NULL );
~SbiTokenizer();
- inline BOOL IsEof() { return bEof; }
- inline BOOL IsEos() { return bEos; }
+ inline sal_Bool IsEof() { return bEof; }
+ inline sal_Bool IsEos() { return bEos; }
void Push( SbiToken ); // Pushback eines Tokens
const String& Symbol( SbiToken );// Rueckumwandlung
SbiToken Peek(); // das naechste Token lesen
SbiToken Next(); // Ein Token lesen
- BOOL MayBeLabel( BOOL= FALSE ); // Kann es ein Label sein?
+ sal_Bool MayBeLabel( sal_Bool= sal_False ); // Kann es ein Label sein?
void Hilite( SbTextPortions& ); // Syntax-Highlighting
@@ -168,14 +168,14 @@ public:
void Error( SbError, const char* );
void Error( SbError, String );
- void Keywords( BOOL b ) { bKeywords = b; }
+ void Keywords( sal_Bool b ) { bKeywords = b; }
- static BOOL IsEoln( SbiToken t )
- { return BOOL( t == EOS || t == EOLN || t == REM ); }
- static BOOL IsKwd( SbiToken t )
- { return BOOL( t >= FIRSTKWD && t <= LASTKWD ); }
- static BOOL IsExtra( SbiToken t )
- { return BOOL( t >= FIRSTEXTRA ); }
+ static sal_Bool IsEoln( SbiToken t )
+ { return sal_Bool( t == EOS || t == EOLN || t == REM ); }
+ static sal_Bool IsKwd( SbiToken t )
+ { return sal_Bool( t >= FIRSTKWD && t <= LASTKWD ); }
+ static sal_Bool IsExtra( SbiToken t )
+ { return sal_Bool( t >= FIRSTEXTRA ); }
};
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index a705aa24aa00..910ecce98f72 100644..100755
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -55,8 +55,8 @@ BasicDLL::BasicDLL()
::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
pSttResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(stt), aLocale );
pBasResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(sb), aLocale );
- bDebugMode = FALSE;
- bBreakEnabled = TRUE;
+ bDebugMode = sal_False;
+ bBreakEnabled = sal_True;
}
BasicDLL::~BasicDLL()
@@ -65,7 +65,7 @@ BasicDLL::~BasicDLL()
delete pBasResMgr;
}
-void BasicDLL::EnableBreak( BOOL bEnable )
+void BasicDLL::EnableBreak( sal_Bool bEnable )
{
BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -73,7 +73,7 @@ void BasicDLL::EnableBreak( BOOL bEnable )
pThis->bBreakEnabled = bEnable;
}
-void BasicDLL::SetDebugMode( BOOL bDebugMode )
+void BasicDLL::SetDebugMode( sal_Bool bDebugMode )
{
BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -86,7 +86,7 @@ void BasicDLL::BasicBreak()
{
//bJustStopping: Wenn jemand wie wild x-mal STOP drueckt, aber das Basic
// nicht schnell genug anhaelt, kommt die Box ggf. oefters...
- static BOOL bJustStopping = FALSE;
+ static sal_Bool bJustStopping = sal_False;
BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC);
DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" );
@@ -94,11 +94,11 @@ void BasicDLL::BasicBreak()
{
if ( StarBASIC::IsRunning() && !bJustStopping && ( pThis->bBreakEnabled || pThis->bDebugMode ) )
{
- bJustStopping = TRUE;
+ bJustStopping = sal_True;
StarBASIC::Stop();
String aMessageStr( BasResId( IDS_SBERR_TERMINATED ) );
InfoBox( 0, aMessageStr ).Execute();
- bJustStopping = FALSE;
+ bJustStopping = sal_False;
}
}
}
diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx
new file mode 100755
index 000000000000..ba3def41838f
--- /dev/null
+++ b/basic/source/runtime/comenumwrapper.cxx
@@ -0,0 +1,81 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_basic.hxx"
+#include "comenumwrapper.hxx"
+
+using namespace ::com::sun::star;
+
+::sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements()
+ throw ( uno::RuntimeException )
+{
+ sal_Bool bResult = sal_False;
+
+ try
+ {
+ if ( m_xInvocation.is() )
+ {
+ sal_Int32 nLength = 0;
+ bResult =
+ ( ( m_xInvocation->getValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "length" ) ) ) >>= nLength )
+ && nLength > m_nCurInd );
+ }
+ }
+ catch( uno::Exception& )
+ {}
+
+ return bResult;
+}
+
+uno::Any SAL_CALL ComEnumerationWrapper::nextElement()
+ throw ( container::NoSuchElementException,
+ lang::WrappedTargetException,
+ uno::RuntimeException )
+{
+ try
+ {
+ if ( m_xInvocation.is() )
+ {
+ uno::Sequence< sal_Int16 > aNamedParamIndex;
+ uno::Sequence< uno::Any > aNamedParam;
+ uno::Sequence< uno::Any > aArgs( 1 );
+
+ aArgs[0] <<= m_nCurInd++;
+
+ return m_xInvocation->invoke( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "item" ) ),
+ aArgs,
+ aNamedParamIndex,
+ aNamedParam );
+ }
+ }
+ catch( uno::Exception& )
+ {}
+
+ throw container::NoSuchElementException();
+}
+
+
diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx
new file mode 100755
index 000000000000..b2464d686f67
--- /dev/null
+++ b/basic/source/runtime/comenumwrapper.hxx
@@ -0,0 +1,54 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _COMENUMWRAPPER_HXX
+#define _COMENUMWRAPPER_HXX
+
+#include <com/sun/star/container/XEnumeration.hpp>
+#include <com/sun/star/script/XInvocation.hpp>
+
+#include <cppuhelper/implbase1.hxx>
+
+class ComEnumerationWrapper : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumeration >
+{
+ ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > m_xInvocation;
+ sal_Int32 m_nCurInd;
+
+public:
+ ComEnumerationWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation >& xInvocation )
+ : m_xInvocation( xInvocation )
+ , m_nCurInd( 0 )
+ {
+ }
+
+ // container::XEnumeration
+ virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+};
+
+#endif // _COMENUMWRAPPER_HXX
+
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index a2536bfab045..83ce5b05adb5 100644..100755
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -92,12 +92,12 @@ SbiDdeControl::~SbiDdeControl()
delete pConvList;
}
-INT16 SbiDdeControl::GetFreeChannel()
+sal_Int16 SbiDdeControl::GetFreeChannel()
{
- INT16 nListSize = (INT16)pConvList->Count();
+ sal_Int16 nListSize = (sal_Int16)pConvList->Count();
DdeConnection* pPtr = pConvList->First();
pPtr = pConvList->Next(); // nullten eintrag ueberspringen
- INT16 nChannel;
+ sal_Int16 nChannel;
for( nChannel = 1; nChannel < nListSize; nChannel++ )
{
if( pPtr == DDE_FREECHANNEL )
@@ -110,7 +110,7 @@ INT16 SbiDdeControl::GetFreeChannel()
}
SbError SbiDdeControl::Initiate( const String& rService, const String& rTopic,
- INT16& rnHandle )
+ sal_Int16& rnHandle )
{
SbError nErr;
DdeConnection* pConv = new DdeConnection( rService, rTopic );
@@ -122,26 +122,26 @@ SbError SbiDdeControl::Initiate( const String& rService, const String& rTopic,
}
else
{
- INT16 nChannel = GetFreeChannel();
- pConvList->Replace( pConv, (ULONG)nChannel );
+ sal_Int16 nChannel = GetFreeChannel();
+ pConvList->Replace( pConv, (sal_uIntPtr)nChannel );
rnHandle = nChannel;
}
return 0;
}
-SbError SbiDdeControl::Terminate( INT16 nChannel )
+SbError SbiDdeControl::Terminate( sal_Int16 nChannel )
{
- DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+ DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
return SbERR_DDE_NO_CHANNEL;
- pConvList->Replace( DDE_FREECHANNEL, (ULONG)nChannel );
+ pConvList->Replace( DDE_FREECHANNEL, (sal_uIntPtr)nChannel );
delete pConv;
return 0L;
}
SbError SbiDdeControl::TerminateAll()
{
- INT16 nChannel = (INT16)pConvList->Count();
+ sal_Int16 nChannel = (sal_Int16)pConvList->Count();
while( nChannel )
{
nChannel--;
@@ -155,9 +155,9 @@ SbError SbiDdeControl::TerminateAll()
return 0;
}
-SbError SbiDdeControl::Request( INT16 nChannel, const String& rItem, String& rResult )
+SbError SbiDdeControl::Request( sal_Int16 nChannel, const String& rItem, String& rResult )
{
- DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+ DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
return SbERR_DDE_NO_CHANNEL;
@@ -168,9 +168,9 @@ SbError SbiDdeControl::Request( INT16 nChannel, const String& rItem, String& rRe
return GetLastErr( pConv );
}
-SbError SbiDdeControl::Execute( INT16 nChannel, const String& rCommand )
+SbError SbiDdeControl::Execute( sal_Int16 nChannel, const String& rCommand )
{
- DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+ DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
return SbERR_DDE_NO_CHANNEL;
DdeExecute aRequest( *pConv, rCommand, 30000 );
@@ -178,9 +178,9 @@ SbError SbiDdeControl::Execute( INT16 nChannel, const String& rCommand )
return GetLastErr( pConv );
}
-SbError SbiDdeControl::Poke( INT16 nChannel, const String& rItem, const String& rData )
+SbError SbiDdeControl::Poke( sal_Int16 nChannel, const String& rItem, const String& rData )
{
- DdeConnection* pConv = pConvList->GetObject( (ULONG)nChannel );
+ DdeConnection* pConv = pConvList->GetObject( (sal_uIntPtr)nChannel );
if( !nChannel || !pConv || pConv == DDE_FREECHANNEL )
return SbERR_DDE_NO_CHANNEL;
DdePoke aRequest( *pConv, rItem, DdeData(rData), 30000 );
diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx
index 65be2e76ecff..2f12e8128791 100644..100755
--- a/basic/source/runtime/ddectrl.hxx
+++ b/basic/source/runtime/ddectrl.hxx
@@ -42,7 +42,7 @@ class SbiDdeControl
private:
DECL_LINK( Data, DdeData* );
SbError GetLastErr( DdeConnection* );
- INT16 GetFreeChannel();
+ sal_Int16 GetFreeChannel();
DdeConnections* pConvList;
String aData;
@@ -52,12 +52,12 @@ public:
~SbiDdeControl();
SbError Initiate( const String& rService, const String& rTopic,
- INT16& rnHandle );
- SbError Terminate( INT16 nChannel );
+ sal_Int16& rnHandle );
+ SbError Terminate( sal_Int16 nChannel );
SbError TerminateAll();
- SbError Request( INT16 nChannel, const String& rItem, String& rResult );
- SbError Execute( INT16 nChannel, const String& rCommand );
- SbError Poke( INT16 nChannel, const String& rItem, const String& rData );
+ SbError Request( sal_Int16 nChannel, const String& rItem, String& rResult );
+ SbError Execute( sal_Int16 nChannel, const String& rCommand );
+ SbError Poke( sal_Int16 nChannel, const String& rItem, const String& rData );
};
#endif
diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx
index db32b646b619..db32b646b619 100644..100755
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 87be0587bb81..1a5845e10ee2 100644..100755
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -158,7 +158,7 @@ std::size_t alignment(SbxVariable * variable) {
std::size_t n = 1;
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
GetProperties();
- for (USHORT i = 0; i < props->Count(); ++i) {
+ for (sal_uInt16 i = 0; i < props->Count(); ++i) {
n = std::max(n, alignment(props->Get(i)));
}
return n;
@@ -173,9 +173,9 @@ std::size_t alignment(SbxVariable * variable) {
} else {
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
int dims = arr->GetDims();
- std::vector< INT32 > low(dims);
+ std::vector< sal_Int32 > low(dims);
for (int i = 0; i < dims; ++i) {
- INT32 up;
+ sal_Int32 up;
arr->GetDim32(i + 1, low[i], up);
}
return alignment(arr->Get32(&low[0]));
@@ -209,7 +209,7 @@ SbError marshalStruct(
OSL_ASSERT(variable != 0);
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
GetProperties();
- for (USHORT i = 0; i < props->Count(); ++i) {
+ for (sal_uInt16 i = 0; i < props->Count(); ++i) {
SbError e = marshal(false, props->Get(i), false, blob, offset, data);
if (e != ERRCODE_NONE) {
return e;
@@ -225,12 +225,12 @@ SbError marshalArray(
OSL_ASSERT(variable != 0);
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
int dims = arr->GetDims();
- std::vector< INT32 > low(dims);
- std::vector< INT32 > up(dims);
+ std::vector< sal_Int32 > low(dims);
+ std::vector< sal_Int32 > up(dims);
for (int i = 0; i < dims; ++i) {
arr->GetDim32(i + 1, low[i], up[i]);
}
- for (std::vector< INT32 > idx = low;;) {
+ for (std::vector< sal_Int32 > idx = low;;) {
SbError e = marshal(
false, arr->Get32(&idx[0]), false, blob, offset, data);
if (e != ERRCODE_NONE) {
@@ -395,7 +395,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
alignment(variable)));
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
GetProperties();
- for (USHORT i = 0; i < props->Count(); ++i) {
+ for (sal_uInt16 i = 0; i < props->Count(); ++i) {
data = unmarshal(props->Get(i), data);
}
break;
@@ -413,12 +413,12 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
} else {
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
int dims = arr->GetDims();
- std::vector< INT32 > low(dims);
- std::vector< INT32 > up(dims);
+ std::vector< sal_Int32 > low(dims);
+ std::vector< sal_Int32 > up(dims);
for (int i = 0; i < dims; ++i) {
arr->GetDim32(i + 1, low[i], up[i]);
}
- for (std::vector< INT32 > idx = low;;) {
+ for (std::vector< sal_Int32 > idx = low;;) {
data = unmarshal(arr->Get32(&idx[0]), data);
int i = dims - 1;
while (idx[i] == up[i]) {
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 64419c9e3b6e..b2f48bd0ab1a 100644..100755
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -165,7 +165,7 @@ std::size_t alignment(SbxVariable * variable) {
std::size_t n = 1;
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
GetProperties();
- for (USHORT i = 0; i < props->Count(); ++i) {
+ for (sal_uInt16 i = 0; i < props->Count(); ++i) {
n = std::max(n, alignment(props->Get(i)));
}
return n;
@@ -180,9 +180,9 @@ std::size_t alignment(SbxVariable * variable) {
} else {
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
int dims = arr->GetDims();
- std::vector< INT32 > low(dims);
+ std::vector< sal_Int32 > low(dims);
for (int i = 0; i < dims; ++i) {
- INT32 up;
+ sal_Int32 up;
arr->GetDim32(i + 1, low[i], up);
}
return alignment(arr->Get32(&low[0]));
@@ -203,7 +203,8 @@ SbError marshalString(
return e;
}
std::vector< char > * blob = data.newBlob();
- blob->insert(blob->begin(), str.getStr(), str.getStr() + str.getLength() + 1 );
+ blob->insert(
+ blob->begin(), str.getStr(), str.getStr() + str.getLength() + 1);
*buffer = address(*blob);
data.unmarshalStrings.push_back(StringData(variable, *buffer, special));
return ERRCODE_NONE;
@@ -216,7 +217,7 @@ SbError marshalStruct(
OSL_ASSERT(variable != 0);
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
GetProperties();
- for (USHORT i = 0; i < props->Count(); ++i) {
+ for (sal_uInt16 i = 0; i < props->Count(); ++i) {
SbError e = marshal(false, props->Get(i), false, blob, offset, data);
if (e != ERRCODE_NONE) {
return e;
@@ -232,12 +233,12 @@ SbError marshalArray(
OSL_ASSERT(variable != 0);
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
int dims = arr->GetDims();
- std::vector< INT32 > low(dims);
- std::vector< INT32 > up(dims);
+ std::vector< sal_Int32 > low(dims);
+ std::vector< sal_Int32 > up(dims);
for (int i = 0; i < dims; ++i) {
arr->GetDim32(i + 1, low[i], up[i]);
}
- for (std::vector< INT32 > idx = low;;) {
+ for (std::vector< sal_Int32 > idx = low;;) {
SbError e = marshal(
false, arr->Get32(&idx[0]), false, blob, offset, data);
if (e != ERRCODE_NONE) {
@@ -402,7 +403,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
alignment(variable)));
SbxArray * props = PTR_CAST(SbxObject, variable->GetObject())->
GetProperties();
- for (USHORT i = 0; i < props->Count(); ++i) {
+ for (sal_uInt16 i = 0; i < props->Count(); ++i) {
data = unmarshal(props->Get(i), data);
}
break;
@@ -420,12 +421,12 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
} else {
SbxDimArray * arr = PTR_CAST(SbxDimArray, variable->GetObject());
int dims = arr->GetDims();
- std::vector< INT32 > low(dims);
- std::vector< INT32 > up(dims);
+ std::vector< sal_Int32 > low(dims);
+ std::vector< sal_Int32 > up(dims);
for (int i = 0; i < dims; ++i) {
arr->GetDim32(i + 1, low[i], up[i]);
}
- for (std::vector< INT32 > idx = low;;) {
+ for (std::vector< sal_Int32 > idx = low;;) {
data = unmarshal(arr->Get32(&idx[0]), data);
int i = dims - 1;
while (idx[i] == up[i]) {
@@ -485,7 +486,7 @@ SbError call(
RTL_CONSTASCII_STRINGPARAM("KERNEL32.DLL")) &&
(proc.name ==
rtl::OString(RTL_CONSTASCII_STRINGPARAM("GetLogicalDriveStringsA")));
- for (USHORT i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
+ for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
SbError e = marshal(
true, arguments->Get(i), special && i == 2, stack, stack.size(),
data);
@@ -547,7 +548,7 @@ SbError call(
OSL_ASSERT(false);
break;
}
- for (USHORT i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
+ for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
arguments->Get(i)->ResetFlag(SBX_REFERENCE);
//TODO: skipped for errors?!?
}
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 1507ffe7f94f..1507ffe7f94f 100644..100755
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index cc385ce4a199..a21d3e794eee 100644..100755
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -161,14 +161,14 @@ RTLFUNC(InputBox)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count();
+ sal_uIntPtr nArgCount = rPar.Count();
if ( nArgCount < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
String aTitle;
String aDefault;
- INT32 nX = -1, nY = -1; // zentrieren
+ sal_Int32 nX = -1, nY = -1; // zentrieren
const String& rPrompt = rPar.Get(1)->GetString();
if ( nArgCount > 2 && !rPar.Get(2)->IsErr() )
aTitle = rPar.Get(2)->GetString();
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 10990fc9fb39..cea9f7a01d3e 100644..100755
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -215,13 +215,13 @@ void SbiStream::MapError()
// Hack for #83750
-BOOL runsInSetup( void );
+sal_Bool runsInSetup( void );
-BOOL needSecurityRestrictions( void )
+sal_Bool needSecurityRestrictions( void )
{
#ifdef _USE_UNO
- static BOOL bNeedInit = TRUE;
- static BOOL bRetVal = TRUE;
+ static sal_Bool bNeedInit = sal_True;
+ static sal_Bool bRetVal = sal_True;
if( bNeedInit )
{
@@ -230,11 +230,11 @@ BOOL needSecurityRestrictions( void )
if( runsInSetup() )
{
// Setup is not critical
- bRetVal = FALSE;
+ bRetVal = sal_False;
return bRetVal;
}
- bNeedInit = FALSE;
+ bNeedInit = sal_False;
// Get system user to compare to portal user
oslSecurity aSecurity = osl_getCurrentSecurity();
@@ -243,12 +243,12 @@ BOOL needSecurityRestrictions( void )
if( !bRet )
{
// No valid security! -> Secure mode!
- return TRUE;
+ return sal_True;
}
Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
if( !xSMgr.is() )
- return TRUE;
+ return sal_True;
Reference< XBridgeFactory > xBridgeFac( xSMgr->createInstance
( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" )) ), UNO_QUERY );
@@ -263,13 +263,13 @@ BOOL needSecurityRestrictions( void )
if( nBridgeCount == 0 )
{
// No bridges -> local
- bRetVal = FALSE;
+ bRetVal = sal_False;
return bRetVal;
}
// Iterate through all bridges to find (portal) user property
const Reference< XBridge >* pBridges = aBridgeSeq.getConstArray();
- bRetVal = FALSE; // Now only TRUE if user different from portal user is found
+ bRetVal = sal_False; // Now only sal_True if user different from portal user is found
sal_Int32 i;
for( i = 0 ; i < nBridgeCount ; i++ )
{
@@ -287,7 +287,7 @@ BOOL needSecurityRestrictions( void )
else
{
// Different user -> Secure mode!
- bRetVal = TRUE;
+ bRetVal = sal_True;
break;
}
}
@@ -297,27 +297,27 @@ BOOL needSecurityRestrictions( void )
return bRetVal;
#else
- return FALSE;
+ return sal_False;
#endif
}
-// Returns TRUE if UNO is available, otherwise the old file
+// Returns sal_True if UNO is available, otherwise the old file
// system implementation has to be used
// #89378 New semantic: Don't just ask for UNO but for UCB
-BOOL hasUno( void )
+sal_Bool hasUno( void )
{
#ifdef _USE_UNO
- static BOOL bNeedInit = TRUE;
- static BOOL bRetVal = TRUE;
+ static sal_Bool bNeedInit = sal_True;
+ static sal_Bool bRetVal = sal_True;
if( bNeedInit )
{
- bNeedInit = FALSE;
+ bNeedInit = sal_False;
Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
if( !xSMgr.is() )
{
// No service manager at all
- bRetVal = FALSE;
+ bRetVal = sal_False;
}
else
{
@@ -327,13 +327,13 @@ BOOL hasUno( void )
if ( !( xManager.is() && xManager->queryContentProvider( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "file:///" )) ).is() ) )
{
// No UCB
- bRetVal = FALSE;
+ bRetVal = sal_False;
}
}
}
return bRetVal;
#else
- return FALSE;
+ return sal_False;
#endif
}
@@ -349,11 +349,11 @@ class OslStream : public SvStream
public:
OslStream( const String& rName, short nStrmMode );
~OslStream();
- virtual ULONG GetData( void* pData, ULONG nSize );
- virtual ULONG PutData( const void* pData, ULONG nSize );
- virtual ULONG SeekPos( ULONG nPos );
+ virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize );
+ virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize );
+ virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos );
virtual void FlushData();
- virtual void SetSize( ULONG nSize );
+ virtual void SetSize( sal_uIntPtr nSize );
};
OslStream::OslStream( const String& rName, short nStrmMode )
@@ -394,21 +394,21 @@ OslStream::~OslStream()
maFile.close();
}
-ULONG OslStream::GetData( void* pData, ULONG nSize )
+sal_uIntPtr OslStream::GetData( void* pData, sal_uIntPtr nSize )
{
sal_uInt64 nBytesRead = nSize;
maFile.read( pData, nBytesRead, nBytesRead );
- return (ULONG)nBytesRead;
+ return (sal_uIntPtr)nBytesRead;
}
-ULONG OslStream::PutData( const void* pData, ULONG nSize )
+sal_uIntPtr OslStream::PutData( const void* pData, sal_uIntPtr nSize )
{
sal_uInt64 nBytesWritten;
maFile.write( pData, (sal_uInt64)nSize, nBytesWritten );
- return (ULONG)nBytesWritten;
+ return (sal_uIntPtr)nBytesWritten;
}
-ULONG OslStream::SeekPos( ULONG nPos )
+sal_uIntPtr OslStream::SeekPos( sal_uIntPtr nPos )
{
if( nPos == STREAM_SEEK_TO_END )
maFile.setPos( Pos_End, 0 );
@@ -416,14 +416,14 @@ ULONG OslStream::SeekPos( ULONG nPos )
maFile.setPos( Pos_Absolut, (sal_uInt64)nPos );
sal_uInt64 nRealPos(0);
maFile.getPos( nRealPos );
- return sal::static_int_cast<ULONG>(nRealPos);
+ return sal::static_int_cast<sal_uIntPtr>(nRealPos);
}
void OslStream::FlushData()
{
}
-void OslStream::SetSize( ULONG nSize )
+void OslStream::SetSize( sal_uIntPtr nSize )
{
maFile.setSize( (sal_uInt64)nSize );
}
@@ -444,17 +444,17 @@ public:
UCBStream( Reference< XOutputStream > & xOS );
UCBStream( Reference< XStream > & xS );
~UCBStream();
- virtual ULONG GetData( void* pData, ULONG nSize );
- virtual ULONG PutData( const void* pData, ULONG nSize );
- virtual ULONG SeekPos( ULONG nPos );
+ virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize );
+ virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize );
+ virtual sal_uIntPtr SeekPos( sal_uIntPtr nPos );
virtual void FlushData();
- virtual void SetSize( ULONG nSize );
+ virtual void SetSize( sal_uIntPtr nSize );
};
/*
-ULONG UCBErrorToSvStramError( ucb::IOErrorCode nError )
+sal_uIntPtr UCBErrorToSvStramError( ucb::IOErrorCode nError )
{
- ULONG eReturn = ERRCODE_IO_GENERAL;
+ sal_uIntPtr eReturn = ERRCODE_IO_GENERAL;
switch( nError )
{
case ucb::IOErrorCode_ABORT: eReturn = SVSTREAM_GENERALERROR; break;
@@ -525,7 +525,7 @@ UCBStream::~UCBStream()
}
}
-ULONG UCBStream::GetData( void* pData, ULONG nSize )
+sal_uIntPtr UCBStream::GetData( void* pData, sal_uIntPtr nSize )
{
try
{
@@ -554,7 +554,7 @@ ULONG UCBStream::GetData( void* pData, ULONG nSize )
return 0;
}
-ULONG UCBStream::PutData( const void* pData, ULONG nSize )
+sal_uIntPtr UCBStream::PutData( const void* pData, sal_uIntPtr nSize )
{
try
{
@@ -581,13 +581,13 @@ ULONG UCBStream::PutData( const void* pData, ULONG nSize )
return 0;
}
-ULONG UCBStream::SeekPos( ULONG nPos )
+sal_uIntPtr UCBStream::SeekPos( sal_uIntPtr nPos )
{
try
{
if( xSeek.is() )
{
- ULONG nLen = sal::static_int_cast<ULONG>( xSeek->getLength() );
+ sal_uIntPtr nLen = sal::static_int_cast<sal_uIntPtr>( xSeek->getLength() );
if( nPos > nLen )
nPos = nLen;
xSeek->seek( nPos );
@@ -621,7 +621,7 @@ void UCBStream::FlushData()
}
}
-void UCBStream::SetSize( ULONG nSize )
+void UCBStream::SetSize( sal_uIntPtr nSize )
{
(void)nSize;
@@ -728,7 +728,7 @@ SbError SbiStream::Close()
return nError;
}
-SbError SbiStream::Read( ByteString& rBuf, USHORT n, bool bForceReadingPerByte )
+SbError SbiStream::Read( ByteString& rBuf, sal_uInt16 n, bool bForceReadingPerByte )
{
nExpandOnWriteTo = 0;
if( !bForceReadingPerByte && IsText() )
@@ -767,10 +767,10 @@ void SbiStream::ExpandFile()
{
if ( nExpandOnWriteTo )
{
- ULONG nCur = pStrm->Seek(STREAM_SEEK_TO_END);
+ sal_uIntPtr nCur = pStrm->Seek(STREAM_SEEK_TO_END);
if( nCur < nExpandOnWriteTo )
{
- ULONG nDiff = nExpandOnWriteTo - nCur;
+ sal_uIntPtr nDiff = nExpandOnWriteTo - nCur;
char c = 0;
while( nDiff-- )
*pStrm << c;
@@ -783,7 +783,7 @@ void SbiStream::ExpandFile()
}
}
-SbError SbiStream::Write( const ByteString& rBuf, USHORT n )
+SbError SbiStream::Write( const ByteString& rBuf, sal_uInt16 n )
{
ExpandFile();
if( IsAppend() )
@@ -794,7 +794,7 @@ SbError SbiStream::Write( const ByteString& rBuf, USHORT n )
aLine += rBuf;
// Raus damit, wenn das Ende ein LF ist, aber CRLF vorher
// strippen, da der SvStrm ein CRLF anfuegt!
- USHORT nLineLen = aLine.Len();
+ sal_uInt16 nLineLen = aLine.Len();
if( nLineLen && aLine.GetBuffer()[ --nLineLen ] == 0x0A )
{
aLine.Erase( nLineLen );
@@ -1013,8 +1013,8 @@ void SbiIoSystem::ReadCon( ByteString& rIn )
void SbiIoSystem::WriteCon( const ByteString& rText )
{
aOut += rText;
- USHORT n1 = aOut.Search( '\n' );
- USHORT n2 = aOut.Search( '\r' );
+ sal_uInt16 n1 = aOut.Search( '\n' );
+ sal_uInt16 n2 = aOut.Search( '\r' );
if( n1 != STRING_NOTFOUND || n2 != STRING_NOTFOUND )
{
if( n1 == STRING_NOTFOUND ) n1 = n2;
diff --git a/basic/source/runtime/makefile.mk b/basic/source/runtime/makefile.mk
index 64d9a6ff446d..29969416caab 100644..100755
--- a/basic/source/runtime/makefile.mk
+++ b/basic/source/runtime/makefile.mk
@@ -41,6 +41,7 @@ ENABLE_EXCEPTIONS = TRUE
SLOFILES= \
$(SLO)$/basrdll.obj \
+ $(SLO)$/comenumwrapper.obj \
$(SLO)$/inputbox.obj\
$(SLO)$/runtime.obj \
$(SLO)$/step0.obj \
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 380064bb0da8..8335d6f88d26 100644..100755
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -36,7 +36,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/sound.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
#include <vcl/msgbox.hxx>
#include <basic/sbx.hxx>
#include <svl/zforlist.hxx>
@@ -105,15 +105,10 @@ using namespace com::sun::star::script;
SbxVariable* getDefaultProp( SbxVariable* pRef );
-#if defined (WIN) || defined (WNT) || defined (OS2)
+#if defined (WNT) || defined (OS2)
#include <direct.h> // _getdcwd get current work directory, _chdrive
#endif
-#ifdef WIN
-#include <dos.h> // _dos_getfileattr
-#include <errno.h>
-#endif
-
#ifdef UNX
#include <errno.h>
#include <unistd.h>
@@ -164,7 +159,7 @@ static CharClass& GetCharClass( void )
return aCharClass;
}
-static inline BOOL isFolder( FileStatus::Type aType )
+static inline sal_Bool isFolder( FileStatus::Type aType )
{
return ( aType == FileStatus::Directory || aType == FileStatus::Volume );
}
@@ -230,8 +225,8 @@ static com::sun::star::uno::Reference< XSimpleFileAccess3 > getFileAccess( void
-// Properties und Methoden legen beim Get (bPut = FALSE) den Returnwert
-// im Element 0 des Argv ab; beim Put (bPut = TRUE) wird der Wert aus
+// Properties und Methoden legen beim Get (bPut = sal_False) den Returnwert
+// im Element 0 des Argv ab; beim Put (bPut = sal_True) wird der Wert aus
// Element 0 gespeichert.
// CreateObject( class )
@@ -264,7 +259,7 @@ RTLFUNC(Error)
{
String aErrorMsg;
SbError nErr = 0L;
- INT32 nCode = 0;
+ sal_Int32 nCode = 0;
if( rPar.Count() == 1 )
{
nErr = StarBASIC::GetErrBasic();
@@ -276,7 +271,7 @@ RTLFUNC(Error)
if( nCode > 65535L )
StarBASIC::Error( SbERR_CONVERSION );
else
- nErr = StarBASIC::GetSfxFromVBError( (USHORT)nCode );
+ nErr = StarBASIC::GetSfxFromVBError( (sal_uInt16)nCode );
}
bool bVBA = SbiRuntime::isVBAEnabled();
@@ -425,7 +420,7 @@ RTLFUNC(CurDir)
// zu ermitteln, dass eine virtuelle URL geliefert werden koennte.
// rPar.Get(0)->PutEmpty();
-#if defined (WIN) || defined (WNT) || defined (OS2)
+#if defined (WNT) || defined (OS2)
int nCurDir = 0; // Current dir // JSM
if ( rPar.Count() == 2 )
{
@@ -462,7 +457,7 @@ RTLFUNC(CurDir)
int nSize = _PATH_INCR;
char* pMem;
- while( TRUE )
+ while( sal_True )
{
pMem = new char[nSize];
if( !pMem )
@@ -499,17 +494,17 @@ RTLFUNC(ChDir) // JSM
{
#ifdef _ENABLE_CUR_DIR
String aPath = rPar.Get(1)->GetString();
- BOOL bError = FALSE;
+ sal_Bool bError = sal_False;
#ifdef WNT
// #55997 Laut MI hilft es bei File-URLs einen DirEntry zwischenzuschalten
// #40996 Harmoniert bei Verwendung der WIN32-Funktion nicht mit getdir
DirEntry aEntry( aPath );
ByteString aFullPath( aEntry.GetFull(), gsl_getSystemTextEncoding() );
if( chdir( aFullPath.GetBuffer()) )
- bError = TRUE;
+ bError = sal_True;
#else
if (!DirEntry(aPath).SetCWD())
- bError = TRUE;
+ bError = sal_True;
#endif
if( bError )
StarBASIC::Error( SbERR_PATH_NOT_FOUND );
@@ -532,7 +527,7 @@ RTLFUNC(ChDrive) // JSM
#ifndef UNX
String aPar1 = rPar.Get(1)->GetString();
-#if defined (WIN) || defined (WNT) || defined (OS2)
+#if defined (WNT) || defined (OS2)
if (aPar1.Len() > 0)
{
int nCurDrive = (int)aPar1.GetBuffer()[0]; ;
@@ -727,7 +722,7 @@ RTLFUNC(MkDir) // JSM
SbxArrayRef pPar = new SbxArray;
SbxVariableRef pVar = new SbxVariable();
pPar->Put( pVar, 0 );
- SbRtl_CurDir( pBasic, *pPar, FALSE );
+ SbRtl_CurDir( pBasic, *pPar, sal_False );
String aCurPath = pPar->Get(0)->GetString();
File::getFileURLFromSystemPath( aCurPath, sCurDirURL );
@@ -920,7 +915,7 @@ RTLFUNC(FileLen)
{
SbxVariableRef pArg = rPar.Get( 1 );
String aStr( pArg->GetString() );
- INT32 nLen = 0;
+ sal_Int32 nLen = 0;
// <-- UCB
if( hasUno() )
{
@@ -948,7 +943,7 @@ RTLFUNC(FileLen)
DirectoryItem::get( getFullPathUNC( aStr ), aItem );
FileStatus aFileStatus( FileStatusMask_FileSize );
aItem.getFileStatus( aFileStatus );
- nLen = (INT32)aFileStatus.getFileSize();
+ nLen = (sal_Int32)aFileStatus.getFileSize();
#endif
}
rPar.Get(0)->PutLong( (long)nLen );
@@ -1002,23 +997,23 @@ RTLFUNC(InStr)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uIntPtr nArgCount = rPar.Count()-1;
if ( nArgCount < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- USHORT nStartPos = 1;
+ sal_uInt16 nStartPos = 1;
- USHORT nFirstStringPos = 1;
+ sal_uInt16 nFirstStringPos = 1;
if ( nArgCount >= 3 )
{
- INT32 lStartPos = rPar.Get(1)->GetLong();
+ sal_Int32 lStartPos = rPar.Get(1)->GetLong();
if( lStartPos <= 0 || lStartPos > 0xffff )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
lStartPos = 1;
}
- nStartPos = (USHORT)lStartPos;
+ nStartPos = (sal_uInt16)lStartPos;
nFirstStringPos++;
}
@@ -1028,7 +1023,7 @@ RTLFUNC(InStr)
if( bCompatibility )
{
SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
- bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+ bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
}
else
{
@@ -1037,7 +1032,7 @@ RTLFUNC(InStr)
if ( nArgCount == 4 )
bTextMode = rPar.Get(4)->GetInteger();
- USHORT nPos;
+ sal_uInt16 nPos;
const String& rToken = rPar.Get(nFirstStringPos+1)->GetString();
// #97545 Always find empty string
@@ -1084,7 +1079,7 @@ RTLFUNC(InStrRev)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uIntPtr nArgCount = rPar.Count()-1;
if ( nArgCount < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -1092,7 +1087,7 @@ RTLFUNC(InStrRev)
String aStr1 = rPar.Get(1)->GetString();
String aToken = rPar.Get(2)->GetString();
- INT32 lStartPos = -1;
+ sal_Int32 lStartPos = -1;
if ( nArgCount >= 3 )
{
lStartPos = rPar.Get(3)->GetLong();
@@ -1109,7 +1104,7 @@ RTLFUNC(InStrRev)
if( bCompatibility )
{
SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
- bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+ bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
}
else
{
@@ -1118,13 +1113,13 @@ RTLFUNC(InStrRev)
if ( nArgCount == 4 )
bTextMode = rPar.Get(4)->GetInteger();
- USHORT nStrLen = aStr1.Len();
- USHORT nStartPos = lStartPos == -1 ? nStrLen : (USHORT)lStartPos;
+ sal_uInt16 nStrLen = aStr1.Len();
+ sal_uInt16 nStartPos = lStartPos == -1 ? nStrLen : (sal_uInt16)lStartPos;
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
if( nStartPos <= nStrLen )
{
- USHORT nTokenLen = aToken.Len();
+ sal_uInt16 nTokenLen = aToken.Len();
if( !nTokenLen )
{
// Always find empty string
@@ -1140,7 +1135,7 @@ RTLFUNC(InStrRev)
if( nRet == -1 )
nPos = 0;
else
- nPos = (USHORT)nRet + 1;
+ nPos = (sal_uInt16)nRet + 1;
}
else
{
@@ -1154,7 +1149,7 @@ RTLFUNC(InStrRev)
if( nRet == -1 )
nPos = 0;
else
- nPos = (USHORT)nRet + 1;
+ nPos = (sal_uInt16)nRet + 1;
}
}
}
@@ -1238,7 +1233,7 @@ RTLFUNC(Left)
else
{
String aStr( rPar.Get(1)->GetString() );
- INT32 lResultLen = rPar.Get(2)->GetLong();
+ sal_Int32 lResultLen = rPar.Get(2)->GetLong();
if( lResultLen > 0xffff )
{
lResultLen = 0xffff;
@@ -1248,7 +1243,7 @@ RTLFUNC(Left)
lResultLen = 0;
StarBASIC::Error( SbERR_BAD_ARGUMENT );
}
- aStr.Erase( (USHORT)lResultLen );
+ aStr.Erase( (sal_uInt16)lResultLen );
rPar.Get(0)->PutString( aStr );
}
}
@@ -1297,7 +1292,7 @@ RTLFUNC(Mid)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uIntPtr nArgCount = rPar.Count()-1;
if ( nArgCount < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -1307,23 +1302,23 @@ RTLFUNC(Mid)
// Anders als im Original kann in dieser Variante der 3. Parameter
// nLength nicht weggelassen werden. Ist ueber bWrite schon vorgesehen.
if( nArgCount == 4 )
- bWrite = TRUE;
+ bWrite = sal_True;
String aArgStr = rPar.Get(1)->GetString();
- USHORT nStartPos = (USHORT)(rPar.Get(2)->GetLong() );
+ sal_uInt16 nStartPos = (sal_uInt16)(rPar.Get(2)->GetLong() );
if ( nStartPos == 0 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
nStartPos--;
- USHORT nLen = 0xffff;
+ sal_uInt16 nLen = 0xffff;
bool bWriteNoLenParam = false;
if ( nArgCount == 3 || bWrite )
{
- INT32 n = rPar.Get(3)->GetLong();
+ sal_Int32 n = rPar.Get(3)->GetLong();
if( bWrite && n == -1 )
bWriteNoLenParam = true;
- nLen = (USHORT)n;
+ nLen = (sal_uInt16)n;
}
String aResultStr;
if ( bWrite )
@@ -1332,7 +1327,7 @@ RTLFUNC(Mid)
bool bCompatibility = ( pInst && pInst->IsCompatibility() );
if( bCompatibility )
{
- USHORT nArgLen = aArgStr.Len();
+ sal_uInt16 nArgLen = aArgStr.Len();
if( nStartPos + 1 > nArgLen )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1340,8 +1335,8 @@ RTLFUNC(Mid)
}
String aReplaceStr = rPar.Get(4)->GetString();
- USHORT nReplaceStrLen = aReplaceStr.Len();
- USHORT nReplaceLen;
+ sal_uInt16 nReplaceStrLen = aReplaceStr.Len();
+ sal_uInt16 nReplaceLen;
if( bWriteNoLenParam )
{
nReplaceLen = nReplaceStrLen;
@@ -1353,12 +1348,12 @@ RTLFUNC(Mid)
nReplaceLen = nReplaceStrLen;
}
- USHORT nReplaceEndPos = nStartPos + nReplaceLen;
+ sal_uInt16 nReplaceEndPos = nStartPos + nReplaceLen;
if( nReplaceEndPos > nArgLen )
nReplaceLen -= (nReplaceEndPos - nArgLen);
aResultStr = aArgStr;
- USHORT nErase = nReplaceLen;
+ sal_uInt16 nErase = nReplaceLen;
aResultStr.Erase( nStartPos, nErase );
aResultStr.Insert( aReplaceStr, 0, nReplaceLen, nStartPos );
}
@@ -1406,7 +1401,7 @@ RTLFUNC(Replace)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uIntPtr nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 6 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -1415,7 +1410,7 @@ RTLFUNC(Replace)
String aFindStr = rPar.Get(2)->GetString();
String aReplaceStr = rPar.Get(3)->GetString();
- INT32 lStartPos = 1;
+ sal_Int32 lStartPos = 1;
if ( nArgCount >= 4 )
{
if( rPar.Get(4)->GetType() != SbxEMPTY )
@@ -1427,7 +1422,7 @@ RTLFUNC(Replace)
}
}
- INT32 lCount = -1;
+ sal_Int32 lCount = -1;
if( nArgCount >=5 )
{
if( rPar.Get(5)->GetType() != SbxEMPTY )
@@ -1445,7 +1440,7 @@ RTLFUNC(Replace)
if( bCompatibility )
{
SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
- bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+ bTextMode = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
}
else
{
@@ -1454,14 +1449,14 @@ RTLFUNC(Replace)
if ( nArgCount == 6 )
bTextMode = rPar.Get(6)->GetInteger();
- USHORT nExpStrLen = aExpStr.Len();
- USHORT nFindStrLen = aFindStr.Len();
- USHORT nReplaceStrLen = aReplaceStr.Len();
+ sal_uInt16 nExpStrLen = aExpStr.Len();
+ sal_uInt16 nFindStrLen = aFindStr.Len();
+ sal_uInt16 nReplaceStrLen = aReplaceStr.Len();
if( lStartPos <= nExpStrLen )
{
- USHORT nPos = static_cast<USHORT>( lStartPos - 1 );
- USHORT nCounts = 0;
+ sal_uInt16 nPos = static_cast<sal_uInt16>( lStartPos - 1 );
+ sal_uInt16 nCounts = 0;
while( lCount == -1 || lCount > nCounts )
{
String aSrcStr( aExpStr );
@@ -1483,7 +1478,7 @@ RTLFUNC(Replace)
}
}
}
- rPar.Get(0)->PutString( aExpStr.Copy( static_cast<USHORT>(lStartPos - 1) ) );
+ rPar.Get(0)->PutString( aExpStr.Copy( static_cast<sal_uInt16>(lStartPos - 1) ) );
}
}
@@ -1497,7 +1492,7 @@ RTLFUNC(Right)
else
{
const String& rStr = rPar.Get(1)->GetString();
- INT32 lResultLen = rPar.Get(2)->GetLong();
+ sal_Int32 lResultLen = rPar.Get(2)->GetLong();
if( lResultLen > 0xffff )
{
lResultLen = 0xffff;
@@ -1507,8 +1502,8 @@ RTLFUNC(Right)
lResultLen = 0;
StarBASIC::Error( SbERR_BAD_ARGUMENT );
}
- USHORT nResultLen = (USHORT)lResultLen;
- USHORT nStrLen = rStr.Len();
+ sal_uInt16 nResultLen = (sal_uInt16)lResultLen;
+ sal_uInt16 nStrLen = rStr.Len();
if ( nResultLen > nStrLen )
nResultLen = nStrLen;
String aResultStr = rStr.Copy( nStrLen-nResultLen );
@@ -1549,7 +1544,7 @@ RTLFUNC(Sgn)
else
{
double aDouble = rPar.Get(1)->GetDouble();
- INT16 nResult = 0;
+ sal_Int16 nResult = 0;
if ( aDouble > 0 )
nResult = 1;
else if ( aDouble < 0 )
@@ -1568,7 +1563,7 @@ RTLFUNC(Space)
else
{
String aStr;
- aStr.Fill( (USHORT)(rPar.Get(1)->GetLong() ));
+ aStr.Fill( (sal_uInt16)(rPar.Get(1)->GetLong() ));
rPar.Get(0)->PutString( aStr );
}
}
@@ -1583,7 +1578,7 @@ RTLFUNC(Spc)
else
{
String aStr;
- aStr.Fill( (USHORT)(rPar.Get(1)->GetLong() ));
+ aStr.Fill( (sal_uInt16)(rPar.Get(1)->GetLong() ));
rPar.Get(0)->PutString( aStr );
}
}
@@ -1633,11 +1628,11 @@ RTLFUNC(Str)
const sal_Unicode* pBuf = aStr.GetBuffer();
bool bNeg = ( pBuf[0] == '-' );
- USHORT iZeroSearch = 0;
+ sal_uInt16 iZeroSearch = 0;
if( bNeg )
iZeroSearch++;
- USHORT iNext = iZeroSearch + 1;
+ sal_uInt16 iNext = iZeroSearch + 1;
if( pBuf[iZeroSearch] == '0' && nLen > iNext && pBuf[iNext] == '.' )
{
aStr.Erase( iZeroSearch, 1 );
@@ -1668,16 +1663,16 @@ RTLFUNC(StrComp)
const String& rStr2 = rPar.Get(2)->GetString();
SbiInstance* pInst = pINST;
- INT16 nTextCompare;
+ sal_Int16 nTextCompare;
bool bCompatibility = ( pInst && pInst->IsCompatibility() );
if( bCompatibility )
{
SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
- nTextCompare = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : FALSE;
+ nTextCompare = pRT ? pRT->GetImageFlag( SBIMG_COMPARETEXT ) : sal_False;
}
else
{
- nTextCompare = TRUE;
+ nTextCompare = sal_True;
}
if ( rPar.Count() == 4 )
nTextCompare = rPar.Get(3)->GetInteger();
@@ -1713,7 +1708,7 @@ RTLFUNC(StrComp)
nRetValue = 1;
}
- rPar.Get(0)->PutInteger( sal::static_int_cast< INT16 >( nRetValue ) );
+ rPar.Get(0)->PutInteger( sal::static_int_cast< sal_Int16 >( nRetValue ) );
}
RTLFUNC(String)
@@ -1727,10 +1722,10 @@ RTLFUNC(String)
{
String aStr;
sal_Unicode aFiller;
- INT32 lCount = rPar.Get(1)->GetLong();
+ sal_Int32 lCount = rPar.Get(1)->GetLong();
if( lCount < 0 || lCount > 0xffff )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- USHORT nCount = (USHORT)lCount;
+ sal_uInt16 nCount = (sal_uInt16)lCount;
if( rPar.Get(2)->GetType() == SbxINTEGER )
aFiller = (sal_Unicode)rPar.Get(2)->GetInteger();
else
@@ -1788,7 +1783,7 @@ RTLFUNC(Val)
String aStr( rPar.Get(1)->GetString() );
// lt. Mikkysoft bei Kommas abbrechen!
-// for( USHORT n=0; n < aStr.Len(); n++ )
+// for( sal_uInt16 n=0; n < aStr.Len(); n++ )
// if( aStr[n] == ',' ) aStr[n] = '.';
FilterWhiteSpace( aStr );
@@ -1803,7 +1798,7 @@ RTLFUNC(Val)
if ( nRadix != 10 )
{
ByteString aByteStr( aStr, gsl_getSystemTextEncoding() );
- INT16 nlResult = (INT16)strtol( aByteStr.GetBuffer()+2, &pEndPtr, nRadix);
+ sal_Int16 nlResult = (sal_Int16)strtol( aByteStr.GetBuffer()+2, &pEndPtr, nRadix);
nResult = (double)nlResult;
}
}
@@ -1821,46 +1816,46 @@ RTLFUNC(Val)
// Helper functions for date conversion
-INT16 implGetDateDay( double aDate )
+sal_Int16 implGetDateDay( double aDate )
{
aDate -= 2.0; // normieren: 1.1.1900 => 0.0
Date aRefDate( 1, 1, 1900 );
if ( aDate >= 0.0 )
{
aDate = floor( aDate );
- aRefDate += (ULONG)aDate;
+ aRefDate += (sal_uIntPtr)aDate;
}
else
{
aDate = ceil( aDate );
- aRefDate -= (ULONG)(-1.0 * aDate);
+ aRefDate -= (sal_uIntPtr)(-1.0 * aDate);
}
- INT16 nRet = (INT16)( aRefDate.GetDay() );
+ sal_Int16 nRet = (sal_Int16)( aRefDate.GetDay() );
return nRet;
}
-INT16 implGetDateMonth( double aDate )
+sal_Int16 implGetDateMonth( double aDate )
{
Date aRefDate( 1,1,1900 );
long nDays = (long)aDate;
nDays -= 2; // normieren: 1.1.1900 => 0.0
aRefDate += nDays;
- INT16 nRet = (INT16)( aRefDate.GetMonth() );
+ sal_Int16 nRet = (sal_Int16)( aRefDate.GetMonth() );
return nRet;
}
-INT16 implGetDateYear( double aDate )
+sal_Int16 implGetDateYear( double aDate )
{
Date aRefDate( 1,1,1900 );
long nDays = (long) aDate;
nDays -= 2; // normieren: 1.1.1900 => 0.0
aRefDate += nDays;
- INT16 nRet = (INT16)( aRefDate.GetYear() );
+ sal_Int16 nRet = (sal_Int16)( aRefDate.GetYear() );
return nRet;
}
-BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet )
{
if ( nYear < 30 && SbiRuntime::isVBAEnabled() )
nYear += 2000;
@@ -1870,7 +1865,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
if ((nYear < 100 || nYear > 9999) )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- return FALSE;
+ return sal_False;
}
if ( !SbiRuntime::isVBAEnabled() )
{
@@ -1878,7 +1873,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
(nDay < 1 || nDay > 31 ) )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- return FALSE;
+ return sal_False;
}
}
else
@@ -1893,7 +1888,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
{
// inacurrate around leap year, don't use days to calculate,
// just modify the months directory
- INT16 nYearAdj = ( nMonth /12 ); // default to positive months inputed
+ sal_Int16 nYearAdj = ( nMonth /12 ); // default to positive months inputed
if ( nMonth <=0 )
nYearAdj = ( ( nMonth -12 ) / 12 );
aCurDate.SetYear( aCurDate.GetYear() + nYearAdj );
@@ -1910,7 +1905,7 @@ BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet )
long nDiffDays = GetDayDiff( aCurDate );
rdRet = (double)nDiffDays;
- return TRUE;
+ return sal_True;
}
// Function to convert date to ISO 8601 date format
@@ -1944,14 +1939,14 @@ RTLFUNC(CDateFromIso)
if ( rPar.Count() == 2 )
{
String aStr = rPar.Get(1)->GetString();
- INT16 iMonthStart = aStr.Len() - 4;
+ sal_Int16 iMonthStart = aStr.Len() - 4;
String aYearStr = aStr.Copy( 0, iMonthStart );
String aMonthStr = aStr.Copy( iMonthStart, 2 );
String aDayStr = aStr.Copy( iMonthStart+2, 2 );
double dDate;
- if( implDateSerial( (INT16)aYearStr.ToInt32(),
- (INT16)aMonthStr.ToInt32(), (INT16)aDayStr.ToInt32(), dDate ) )
+ if( implDateSerial( (sal_Int16)aYearStr.ToInt32(),
+ (sal_Int16)aMonthStr.ToInt32(), (sal_Int16)aDayStr.ToInt32(), dDate ) )
{
rPar.Get(0)->PutDate( dDate );
}
@@ -1970,9 +1965,9 @@ RTLFUNC(DateSerial)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nYear = rPar.Get(1)->GetInteger();
- INT16 nMonth = rPar.Get(2)->GetInteger();
- INT16 nDay = rPar.Get(3)->GetInteger();
+ sal_Int16 nYear = rPar.Get(1)->GetInteger();
+ sal_Int16 nMonth = rPar.Get(2)->GetInteger();
+ sal_Int16 nDay = rPar.Get(3)->GetInteger();
double dDate;
if( implDateSerial( nYear, nMonth, nDay, dDate ) )
@@ -1989,11 +1984,11 @@ RTLFUNC(TimeSerial)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nHour = rPar.Get(1)->GetInteger();
+ sal_Int16 nHour = rPar.Get(1)->GetInteger();
if ( nHour == 24 )
nHour = 0; // Wegen UNO DateTimes, die bis 24 Uhr gehen
- INT16 nMinute = rPar.Get(2)->GetInteger();
- INT16 nSecond = rPar.Get(3)->GetInteger();
+ sal_Int16 nMinute = rPar.Get(2)->GetInteger();
+ sal_Int16 nSecond = rPar.Get(3)->GetInteger();
if ((nHour < 0 || nHour > 23) ||
(nMinute < 0 || nMinute > 59 ) ||
(nSecond < 0 || nSecond > 59 ))
@@ -2002,7 +1997,7 @@ RTLFUNC(TimeSerial)
return;
}
- INT32 nSeconds = nHour;
+ sal_Int32 nSeconds = nHour;
nSeconds *= 3600;
nSeconds += nMinute * 60;
nSeconds += nSecond;
@@ -2032,7 +2027,7 @@ RTLFUNC(DateValue)
sal_uInt32 nIndex;
double fResult;
String aStr( rPar.Get(1)->GetString() );
- BOOL bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );
+ sal_Bool bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );
short nType = pFormatter->GetType( nIndex );
// DateValue("February 12, 1969") raises error if the system locale is not en_US
@@ -2093,7 +2088,7 @@ RTLFUNC(TimeValue)
sal_uInt32 nIndex;
double fResult;
- BOOL bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),
+ sal_Bool bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),
nIndex, fResult );
short nType = pFormatter->GetType(nIndex);
if(bSuccess && (nType==NUMBERFORMAT_TIME||nType==NUMBERFORMAT_DATETIME))
@@ -2124,7 +2119,7 @@ RTLFUNC(Day)
SbxVariableRef pArg = rPar.Get( 1 );
double aDate = pArg->GetDate();
- INT16 nDay = implGetDateDay( aDate );
+ sal_Int16 nDay = implGetDateDay( aDate );
rPar.Get(0)->PutInteger( nDay );
}
}
@@ -2138,19 +2133,19 @@ RTLFUNC(Year)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nYear = implGetDateYear( rPar.Get(1)->GetDate() );
+ sal_Int16 nYear = implGetDateYear( rPar.Get(1)->GetDate() );
rPar.Get(0)->PutInteger( nYear );
}
}
-INT16 implGetHour( double dDate )
+sal_Int16 implGetHour( double dDate )
{
if( dDate < 0.0 )
dDate *= -1.0;
double nFrac = dDate - floor( dDate );
nFrac *= 86400.0;
- INT32 nSeconds = (INT32)(nFrac + 0.5);
- INT16 nHour = (INT16)(nSeconds / 3600);
+ sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+ sal_Int16 nHour = (sal_Int16)(nSeconds / 3600);
return nHour;
}
@@ -2164,20 +2159,20 @@ RTLFUNC(Hour)
else
{
double nArg = rPar.Get(1)->GetDate();
- INT16 nHour = implGetHour( nArg );
+ sal_Int16 nHour = implGetHour( nArg );
rPar.Get(0)->PutInteger( nHour );
}
}
-INT16 implGetMinute( double dDate )
+sal_Int16 implGetMinute( double dDate )
{
if( dDate < 0.0 )
dDate *= -1.0;
double nFrac = dDate - floor( dDate );
nFrac *= 86400.0;
- INT32 nSeconds = (INT32)(nFrac + 0.5);
- INT16 nTemp = (INT16)(nSeconds % 3600);
- INT16 nMin = nTemp / 60;
+ sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+ sal_Int16 nTemp = (sal_Int16)(nSeconds % 3600);
+ sal_Int16 nMin = nTemp / 60;
return nMin;
}
@@ -2191,7 +2186,7 @@ RTLFUNC(Minute)
else
{
double nArg = rPar.Get(1)->GetDate();
- INT16 nMin = implGetMinute( nArg );
+ sal_Int16 nMin = implGetMinute( nArg );
rPar.Get(0)->PutInteger( nMin );
}
}
@@ -2205,24 +2200,24 @@ RTLFUNC(Month)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nMonth = implGetDateMonth( rPar.Get(1)->GetDate() );
+ sal_Int16 nMonth = implGetDateMonth( rPar.Get(1)->GetDate() );
rPar.Get(0)->PutInteger( nMonth );
}
}
-INT16 implGetSecond( double dDate )
+sal_Int16 implGetSecond( double dDate )
{
if( dDate < 0.0 )
dDate *= -1.0;
double nFrac = dDate - floor( dDate );
nFrac *= 86400.0;
- INT32 nSeconds = (INT32)(nFrac + 0.5);
- INT16 nTemp = (INT16)(nSeconds / 3600);
+ sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
+ sal_Int16 nTemp = (sal_Int16)(nSeconds / 3600);
nSeconds -= nTemp * 3600;
- nTemp = (INT16)(nSeconds / 60);
+ nTemp = (sal_Int16)(nSeconds / 60);
nSeconds -= nTemp * 60;
- INT16 nRet = (INT16)nSeconds;
+ sal_Int16 nRet = (sal_Int16)nSeconds;
return nRet;
}
@@ -2236,7 +2231,7 @@ RTLFUNC(Second)
else
{
double nArg = rPar.Get(1)->GetDate();
- INT16 nSecond = implGetSecond( nArg );
+ sal_Int16 nSecond = implGetSecond( nArg );
rPar.Get(0)->PutInteger( nSecond );
}
}
@@ -2388,7 +2383,7 @@ RTLFUNC(IsArray)
if ( rPar.Count() < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
- rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) ? TRUE : FALSE );
+ rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) ? sal_True : sal_False );
}
RTLFUNC(IsObject)
@@ -2407,7 +2402,7 @@ RTLFUNC(IsObject)
SbxBase::ResetError();
SbUnoClass* pUnoClass;
- BOOL bObject;
+ sal_Bool bObject;
if( pObj && NULL != ( pUnoClass=PTR_CAST(SbUnoClass,pObj) ) )
{
bObject = pUnoClass->getUnoClass().is();
@@ -2429,14 +2424,14 @@ RTLFUNC(IsDate)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- // #46134 Nur String wird konvertiert, andere Typen ergeben FALSE
+ // #46134 Nur String wird konvertiert, andere Typen ergeben sal_False
SbxVariableRef xArg = rPar.Get( 1 );
SbxDataType eType = xArg->GetType();
- BOOL bDate = FALSE;
+ sal_Bool bDate = sal_False;
if( eType == SbxDATE )
{
- bDate = TRUE;
+ bDate = sal_True;
}
else if( eType == SbxSTRING )
{
@@ -2518,12 +2513,12 @@ RTLFUNC(IsNull)
// #51475 Wegen Uno-Objekten auch true liefern,
// wenn der pObj-Wert NULL ist
SbxVariableRef pArg = rPar.Get( 1 );
- BOOL bNull = rPar.Get(1)->IsNull();
+ sal_Bool bNull = rPar.Get(1)->IsNull();
if( !bNull && pArg->GetType() == SbxOBJECT )
{
SbxBase* pObj = pArg->GetObject();
if( !pObj )
- bNull = TRUE;
+ bNull = sal_True;
}
rPar.Get( 0 )->PutBool( bNull );
}
@@ -2663,7 +2658,7 @@ inline sal_Bool implCheckWildcard( const String& rName, SbiRTLData* pRTLData )
bool isRootDir( String aDirURLStr )
{
INetURLObject aDirURLObj( aDirURLStr );
- BOOL bRoot = FALSE;
+ sal_Bool bRoot = sal_False;
// Check if it's a root directory
sal_Int32 nCount = aDirURLObj.getSegmentCount();
@@ -2671,22 +2666,22 @@ bool isRootDir( String aDirURLStr )
// No segment means Unix root directory "file:///"
if( nCount == 0 )
{
- bRoot = TRUE;
+ bRoot = sal_True;
}
// Exactly one segment needs further checking, because it
// can be Unix "file:///foo/" -> no root
// or Windows "file:///c:/" -> root
else if( nCount == 1 )
{
- ::rtl::OUString aSeg1 = aDirURLObj.getName( 0, TRUE,
+ ::rtl::OUString aSeg1 = aDirURLObj.getName( 0, sal_True,
INetURLObject::DECODE_WITH_CHARSET );
if( aSeg1.getStr()[1] == (sal_Unicode)':' )
{
- bRoot = TRUE;
+ bRoot = sal_True;
}
}
// More than one segments can never be root
- // so bRoot remains FALSE
+ // so bRoot remains sal_False
return bRoot;
}
@@ -2698,7 +2693,7 @@ RTLFUNC(Dir)
String aPath;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount > 3 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -2753,7 +2748,7 @@ RTLFUNC(Dir)
rPar.Get(0)->PutString( aEmptyStr );
}
- USHORT nFlags = 0;
+ sal_uInt16 nFlags = 0;
if ( nParCount > 2 )
pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
else
@@ -2767,7 +2762,7 @@ RTLFUNC(Dir)
// #78651 Add "." and ".." directories for VB compatibility
if( bIncludeFolders )
{
- BOOL bRoot = isRootDir( aDirURLStr );
+ sal_Bool bRoot = isRootDir( aDirURLStr );
// If it's no root directory we flag the need for
// the "." and ".." directories by the value -2
@@ -2837,7 +2832,7 @@ RTLFUNC(Dir)
}
INetURLObject aURL( aFile );
- aPath = aURL.getName( INetURLObject::LAST_SEGMENT, TRUE,
+ aPath = aURL.getName( INetURLObject::LAST_SEGMENT, sal_True,
INetURLObject::DECODE_WITH_CHARSET );
}
@@ -2868,23 +2863,19 @@ RTLFUNC(Dir)
rPar.Get(0)->PutString( aEntry.GetName() );
return;
}
- USHORT nFlags = 0;
+ sal_uInt16 nFlags = 0;
if ( nParCount > 2 )
pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
else
pRTLData->nDirFlags = 0;
- // Nur diese Bitmaske ist unter Windows erlaubt
- #ifdef WIN
- if( nFlags & ~0x1E )
- StarBASIC::Error( SbERR_BAD_ARGUMENT ), pRTLData->nDirFlags = 0;
- #endif
+
// Sb_ATTR_VOLUME wird getrennt gehandelt
if( pRTLData->nDirFlags & Sb_ATTR_VOLUME )
aPath = aEntry.GetVolume();
else
{
// Die richtige Auswahl treffen
- USHORT nMode = FSYS_KIND_FILE;
+ sal_uInt16 nMode = FSYS_KIND_FILE;
if( nFlags & Sb_ATTR_DIRECTORY )
nMode |= FSYS_KIND_DIR;
if( nFlags == Sb_ATTR_DIRECTORY )
@@ -2907,31 +2898,7 @@ RTLFUNC(Dir)
}
DirEntry aNextEntry=(*(pRTLData->pDir))[pRTLData->nCurDirPos++];
aPath = aNextEntry.GetName(); //Full();
- #ifdef WIN
- aNextEntry.ToAbs();
- String sFull(aNextEntry.GetFull());
- unsigned nFlags;
-
- if (_dos_getfileattr( sFull.GetStr(), &nFlags ))
- StarBASIC::Error( SbERR_FILE_NOT_FOUND );
- else
- {
- INT16 nCurFlags = pRTLData->nDirFlags;
- if( (nCurFlags == Sb_ATTR_NORMAL)
- && !(nFlags & ( _A_HIDDEN | _A_SYSTEM | _A_VOLID | _A_SUBDIR ) ) )
- break;
- else if( (nCurFlags & Sb_ATTR_HIDDEN) && (nFlags & _A_HIDDEN) )
- break;
- else if( (nCurFlags & Sb_ATTR_SYSTEM) && (nFlags & _A_SYSTEM) )
- break;
- else if( (nCurFlags & Sb_ATTR_VOLUME) && (nFlags & _A_VOLID) )
- break;
- else if( (nCurFlags & Sb_ATTR_DIRECTORY) && (nFlags & _A_SUBDIR) )
- break;
- }
- #else
break;
- #endif
}
}
rPar.Get(0)->PutString( aPath );
@@ -2943,7 +2910,7 @@ RTLFUNC(Dir)
String aDirURL = implSetupWildcard( aFileParam, pRTLData );
- USHORT nFlags = 0;
+ sal_uInt16 nFlags = 0;
if ( nParCount > 2 )
pRTLData->nDirFlags = nFlags = rPar.Get(2)->GetInteger();
else
@@ -2965,7 +2932,7 @@ RTLFUNC(Dir)
pRTLData->nCurDirPos = 0;
if( bIncludeFolders )
{
- BOOL bRoot = isRootDir( aDirURL );
+ sal_Bool bRoot = isRootDir( aDirURL );
// If it's no root directory we flag the need for
// the "." and ".." directories by the value -2
@@ -3045,7 +3012,7 @@ RTLFUNC(GetAttr)
if ( rPar.Count() == 2 )
{
- INT16 nFlags = 0;
+ sal_Int16 nFlags = 0;
// In Windows, We want to use Windows API to get the file attributes
// for VBA interoperability.
@@ -3062,7 +3029,7 @@ RTLFUNC(GetAttr)
{
if (nRealFlags == FILE_ATTRIBUTE_NORMAL)
nRealFlags = 0;
- nFlags = (INT16) (nRealFlags);
+ nFlags = (sal_Int16) (nRealFlags);
}
else
StarBASIC::Error( SbERR_FILE_NOT_FOUND );
@@ -3228,7 +3195,7 @@ RTLFUNC(EOF)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
// nChannel--; // macht MD beim Oeffnen auch nicht
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3237,7 +3204,7 @@ RTLFUNC(EOF)
StarBASIC::Error( SbERR_BAD_CHANNEL );
return;
}
- BOOL bIsEof;
+ sal_Bool bIsEof;
SvStream* pSvStrm = pSbStrm->GetStrm();
if ( pSbStrm->IsText() )
{
@@ -3268,7 +3235,7 @@ RTLFUNC(FileAttr)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
// nChannel--;
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3277,9 +3244,9 @@ RTLFUNC(FileAttr)
StarBASIC::Error( SbERR_BAD_CHANNEL );
return;
}
- INT16 nRet;
+ sal_Int16 nRet;
if ( rPar.Get(2)->GetInteger() == 1 )
- nRet = (INT16)(pSbStrm->GetMode());
+ nRet = (sal_Int16)(pSbStrm->GetMode());
else
nRet = 0; // System file handle not supported
@@ -3296,7 +3263,7 @@ RTLFUNC(Loc)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
if ( !pSbStrm )
@@ -3305,7 +3272,7 @@ RTLFUNC(Loc)
return;
}
SvStream* pSvStrm = pSbStrm->GetStrm();
- ULONG nPos;
+ sal_uIntPtr nPos;
if( pSbStrm->IsRandom())
{
short nBlockLen = pSbStrm->GetBlockLen();
@@ -3320,7 +3287,7 @@ RTLFUNC(Loc)
nPos = ( pSvStrm->Tell()+1 ) / 128;
else
nPos = pSvStrm->Tell();
- rPar.Get(0)->PutLong( (INT32)nPos );
+ rPar.Get(0)->PutLong( (sal_Int32)nPos );
}
}
@@ -3334,7 +3301,7 @@ RTLFUNC(Lof)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
if ( !pSbStrm )
@@ -3343,10 +3310,10 @@ RTLFUNC(Lof)
return;
}
SvStream* pSvStrm = pSbStrm->GetStrm();
- ULONG nOldPos = pSvStrm->Tell();
- ULONG nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
+ sal_uIntPtr nOldPos = pSvStrm->Tell();
+ sal_uIntPtr nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
pSvStrm->Seek( nOldPos );
- rPar.Get(0)->PutLong( (INT32)nLen );
+ rPar.Get(0)->PutLong( (sal_Int32)nLen );
}
}
@@ -3363,7 +3330,7 @@ RTLFUNC(Seek)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
// nChannel--;
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
@@ -3376,15 +3343,15 @@ RTLFUNC(Seek)
if ( nArgs == 2 ) // Seek-Function
{
- ULONG nPos = pStrm->Tell();
+ sal_uIntPtr nPos = pStrm->Tell();
if( pSbStrm->IsRandom() )
nPos = nPos / pSbStrm->GetBlockLen();
nPos++; // Basic zaehlt ab 1
- rPar.Get(0)->PutLong( (INT32)nPos );
+ rPar.Get(0)->PutLong( (sal_Int32)nPos );
}
else // Seek-Statement
{
- INT32 nPos = rPar.Get(2)->GetLong();
+ sal_Int32 nPos = rPar.Get(2)->GetLong();
if ( nPos < 1 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3394,7 +3361,7 @@ RTLFUNC(Seek)
pSbStrm->SetExpandOnWriteTo( 0 );
if ( pSbStrm->IsRandom() )
nPos *= pSbStrm->GetBlockLen();
- pStrm->Seek( (ULONG)nPos );
+ pStrm->Seek( (sal_uIntPtr)nPos );
pSbStrm->SetExpandOnWriteTo( nPos );
}
}
@@ -3404,7 +3371,7 @@ RTLFUNC(Format)
(void)pBasic;
(void)bWrite;
- USHORT nArgCount = (USHORT)rPar.Count();
+ sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
if ( nArgCount < 2 || nArgCount > 3 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -3428,11 +3395,11 @@ RTLFUNC(Randomize)
if ( rPar.Count() > 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- INT16 nSeed;
+ sal_Int16 nSeed;
if( rPar.Count() == 2 )
- nSeed = (INT16)rPar.Get(1)->GetInteger();
+ nSeed = (sal_Int16)rPar.Get(1)->GetInteger();
else
- nSeed = (INT16)rand();
+ nSeed = (sal_Int16)rand();
srand( nSeed );
}
@@ -3453,7 +3420,7 @@ RTLFUNC(Rnd)
//
-// Syntax: Shell("Path",[ Window-Style,[ "Params", [ bSync = FALSE ]]])
+// Syntax: Shell("Path",[ Window-Style,[ "Params", [ bSync = sal_False ]]])
//
// WindowStyles (VBA-kompatibel):
// 2 == Minimized
@@ -3477,7 +3444,7 @@ RTLFUNC(Shell)
return;
}
- ULONG nArgCount = rPar.Count();
+ sal_uIntPtr nArgCount = rPar.Count();
if ( nArgCount < 2 || nArgCount > 5 )
{
rPar.Get(0)->PutLong(0);
@@ -3499,13 +3466,13 @@ RTLFUNC(Shell)
// Spezial-Behandlung (leere Liste) vermeiden
aCmdLine.AppendAscii( " " );
}
- USHORT nLen = aCmdLine.Len();
+ sal_uInt16 nLen = aCmdLine.Len();
// #55735 Wenn Parameter dabei sind, muessen die abgetrennt werden
// #72471 Auch die einzelnen Parameter trennen
std::list<String> aTokenList;
String aToken;
- USHORT i = 0;
+ sal_uInt16 i = 0;
sal_Unicode c;
while( i < nLen )
{
@@ -3519,7 +3486,7 @@ RTLFUNC(Shell)
if( c == '\"' || c == '\'' )
{
- USHORT iFoundPos = aCmdLine.Search( c, i + 1 );
+ sal_uInt16 iFoundPos = aCmdLine.Search( c, i + 1 );
// Wenn nichts gefunden wurde, Rest kopieren
if( iFoundPos == STRING_NOTFOUND )
@@ -3535,9 +3502,9 @@ RTLFUNC(Shell)
}
else
{
- USHORT iFoundSpacePos = aCmdLine.Search( ' ', i );
- USHORT iFoundTabPos = aCmdLine.Search( '\t', i );
- USHORT iFoundPos = Min( iFoundSpacePos, iFoundTabPos );
+ sal_uInt16 iFoundSpacePos = aCmdLine.Search( ' ', i );
+ sal_uInt16 iFoundTabPos = aCmdLine.Search( '\t', i );
+ sal_uInt16 iFoundPos = Min( iFoundSpacePos, iFoundTabPos );
// Wenn nichts gefunden wurde, Rest kopieren
if( iFoundPos == STRING_NOTFOUND )
@@ -3557,7 +3524,7 @@ RTLFUNC(Shell)
}
// #55735 / #72471 Ende
- INT16 nWinStyle = 0;
+ sal_Int16 nWinStyle = 0;
if( nArgCount >= 3 )
{
nWinStyle = rPar.Get(2)->GetInteger();
@@ -3574,7 +3541,7 @@ RTLFUNC(Shell)
break;
}
- BOOL bSync = FALSE;
+ sal_Bool bSync = sal_False;
if( nArgCount >= 5 )
bSync = rPar.Get(4)->GetBool();
if( bSync )
@@ -3589,7 +3556,7 @@ RTLFUNC(Shell)
++iter;
- USHORT nParamCount = sal::static_int_cast< USHORT >(
+ sal_uInt16 nParamCount = sal::static_int_cast< sal_uInt16 >(
aTokenList.size() - 1 );
rtl_uString** pParamList = NULL;
if( nParamCount )
@@ -3605,7 +3572,7 @@ RTLFUNC(Shell)
}
oslProcess pApp;
- BOOL bSucc = osl_executeProcess(
+ sal_Bool bSucc = osl_executeProcess(
aOUStrProgUNC.pData,
pParamList,
nParamCount,
@@ -3650,7 +3617,7 @@ RTLFUNC(VarType)
else
{
SbxDataType eType = rPar.Get(1)->GetType();
- rPar.Get(0)->PutInteger( (INT16)eType );
+ rPar.Get(0)->PutInteger( (sal_Int16)eType );
}
}
@@ -3700,7 +3667,7 @@ String getBasicTypeName( SbxDataType eType )
};
int nPos = ((int)eType) & 0x0FFF;
- USHORT nTypeNameCount = sizeof( pTypeNames ) / sizeof( char* );
+ sal_uInt16 nTypeNameCount = sizeof( pTypeNames ) / sizeof( char* );
if ( nPos < 0 || nPos >= nTypeNameCount )
nPos = nTypeNameCount - 1;
String aRetStr = String::CreateFromAscii( pTypeNames[nPos] );
@@ -3776,7 +3743,7 @@ RTLFUNC(TypeName)
else
{
SbxDataType eType = rPar.Get(1)->GetType();
- BOOL bIsArray = ( ( eType & SbxARRAY ) != 0 );
+ sal_Bool bIsArray = ( ( eType & SbxARRAY ) != 0 );
String aRetStr;
if ( SbiRuntime::isVBAEnabled() && eType == SbxOBJECT )
@@ -3799,7 +3766,7 @@ RTLFUNC(Len)
else
{
const String& rStr = rPar.Get(1)->GetString();
- rPar.Get(0)->PutLong( (INT32)rStr.Len() );
+ rPar.Get(0)->PutLong( (sal_Int32)rStr.Len() );
}
}
@@ -3825,7 +3792,7 @@ RTLFUNC(DDEInitiate)
const String& rTopic = rPar.Get(2)->GetString();
SbiDdeControl* pDDE = pINST->GetDdeControl();
- INT16 nChannel;
+ sal_Int16 nChannel;
SbError nDdeErr = pDDE->Initiate( rApp, rTopic, nChannel );
if( nDdeErr )
StarBASIC::Error( nDdeErr );
@@ -3852,7 +3819,7 @@ RTLFUNC(DDETerminate)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
SbiDdeControl* pDDE = pINST->GetDdeControl();
SbError nDdeErr = pDDE->Terminate( nChannel );
if( nDdeErr )
@@ -3904,7 +3871,7 @@ RTLFUNC(DDERequest)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
const String& rItem = rPar.Get(2)->GetString();
SbiDdeControl* pDDE = pINST->GetDdeControl();
String aResult;
@@ -3934,7 +3901,7 @@ RTLFUNC(DDEExecute)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
const String& rCommand = rPar.Get(2)->GetString();
SbiDdeControl* pDDE = pINST->GetDdeControl();
SbError nDdeErr = pDDE->Execute( nChannel, rCommand );
@@ -3961,7 +3928,7 @@ RTLFUNC(DDEPoke)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nChannel = rPar.Get(1)->GetInteger();
+ sal_Int16 nChannel = rPar.Get(1)->GetInteger();
const String& rItem = rPar.Get(2)->GetString();
const String& rData = rPar.Get(3)->GetString();
SbiDdeControl* pDDE = pINST->GetDdeControl();
@@ -4001,7 +3968,7 @@ RTLFUNC(LBound)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if ( nParCount != 3 && nParCount != 2 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -4011,7 +3978,7 @@ RTLFUNC(LBound)
SbxDimArray* pArr = PTR_CAST(SbxDimArray,pParObj);
if( pArr )
{
- INT32 nLower, nUpper;
+ sal_Int32 nLower, nUpper;
short nDim = (nParCount == 3) ? (short)rPar.Get(2)->GetInteger() : 1;
if( !pArr->GetDim32( nDim, nLower, nUpper ) )
StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -4027,7 +3994,7 @@ RTLFUNC(UBound)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if ( nParCount != 3 && nParCount != 2 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -4038,7 +4005,7 @@ RTLFUNC(UBound)
SbxDimArray* pArr = PTR_CAST(SbxDimArray,pParObj);
if( pArr )
{
- INT32 nLower, nUpper;
+ sal_Int32 nLower, nUpper;
short nDim = (nParCount == 3) ? (short)rPar.Get(2)->GetInteger() : 1;
if( !pArr->GetDim32( nDim, nLower, nUpper ) )
StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -4060,10 +4027,10 @@ RTLFUNC(RGB)
return;
}
- ULONG nRed = rPar.Get(1)->GetInteger() & 0xFF;
- ULONG nGreen = rPar.Get(2)->GetInteger() & 0xFF;
- ULONG nBlue = rPar.Get(3)->GetInteger() & 0xFF;
- ULONG nRGB;
+ sal_uIntPtr nRed = rPar.Get(1)->GetInteger() & 0xFF;
+ sal_uIntPtr nGreen = rPar.Get(2)->GetInteger() & 0xFF;
+ sal_uIntPtr nBlue = rPar.Get(3)->GetInteger() & 0xFF;
+ sal_uIntPtr nRGB;
SbiInstance* pInst = pINST;
bool bCompatibility = ( pInst && pInst->IsCompatibility() );
@@ -4083,7 +4050,7 @@ RTLFUNC(QBColor)
(void)pBasic;
(void)bWrite;
- static const INT32 pRGB[] =
+ static const sal_Int32 pRGB[] =
{
0x000000,
0x800000,
@@ -4109,13 +4076,13 @@ RTLFUNC(QBColor)
return;
}
- INT16 nCol = rPar.Get(1)->GetInteger();
+ sal_Int16 nCol = rPar.Get(1)->GetInteger();
if( nCol < 0 || nCol > 15 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT32 nRGB = pRGB[ nCol ];
+ sal_Int32 nRGB = pRGB[ nCol ];
rPar.Get(0)->PutLong( nRGB );
}
@@ -4125,7 +4092,7 @@ RTLFUNC(StrConv)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uIntPtr nArgCount = rPar.Count()-1;
if( nArgCount < 2 || nArgCount > 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -4133,16 +4100,16 @@ RTLFUNC(StrConv)
}
String aOldStr = rPar.Get(1)->GetString();
- INT32 nConversion = rPar.Get(2)->GetLong();
+ sal_Int32 nConversion = rPar.Get(2)->GetLong();
- USHORT nLanguage = LANGUAGE_SYSTEM;
+ sal_uInt16 nLanguage = LANGUAGE_SYSTEM;
if( nArgCount == 3 )
{
// LCID not supported now
//nLanguage = rPar.Get(3)->GetInteger();
}
- USHORT nOldLen = aOldStr.Len();
+ sal_uInt16 nOldLen = aOldStr.Len();
if( nOldLen == 0 )
{
// null string,return
@@ -4150,7 +4117,7 @@ RTLFUNC(StrConv)
return;
}
- INT32 nType = 0;
+ sal_Int32 nType = 0;
if ( (nConversion & 0x03) == 3 ) // vbProperCase
{
CharClass& rCharClass = GetCharClass();
@@ -4184,10 +4151,10 @@ RTLFUNC(StrConv)
if ( (nConversion & 0x40) == 64 ) // vbUnicode
{
// convert the string to byte string, preserving unicode (2 bytes per character)
- USHORT nSize = aNewStr.Len()*2;
+ sal_uInt16 nSize = aNewStr.Len()*2;
const sal_Unicode* pSrc = aNewStr.GetBuffer();
sal_Char* pChar = new sal_Char[nSize+1];
- for( USHORT i=0; i < nSize; i++ )
+ for( sal_uInt16 i=0; i < nSize; i++ )
{
pChar[i] = static_cast< sal_Char >( i%2 ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
if( i%2 )
@@ -4208,7 +4175,7 @@ RTLFUNC(StrConv)
// there is no concept about default codepage in unix. so it is incorrectly in unix
::rtl::OString aOStr = ::rtl::OUStringToOString(aNewStr,osl_getThreadTextEncoding());
const sal_Char* pChar = aOStr.getStr();
- USHORT nArraySize = static_cast< USHORT >( aOStr.getLength() );
+ sal_uInt16 nArraySize = static_cast< sal_uInt16 >( aOStr.getLength() );
SbxDimArray* pArray = new SbxDimArray(SbxBYTE);
bool bIncIndex = (IsBaseIndexOne() && SbiRuntime::isVBAEnabled() );
if(nArraySize)
@@ -4223,7 +4190,7 @@ RTLFUNC(StrConv)
pArray->unoAddDim( 0, -1 );
}
- for( USHORT i=0; i< nArraySize; i++)
+ for( sal_uInt16 i=0; i< nArraySize; i++)
{
SbxVariable* pNew = new SbxVariable( SbxBYTE );
pNew->PutByte(*pChar);
@@ -4236,7 +4203,7 @@ RTLFUNC(StrConv)
}
SbxVariableRef refVar = rPar.Get(0);
- USHORT nFlags = refVar->GetFlags();
+ sal_uInt16 nFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->PutObject( pArray );
refVar->SetFlags( nFlags );
@@ -4392,17 +4359,17 @@ RTLFUNC(MsgBox)
WB_YES_NO, // MB_YESNO
WB_RETRY_CANCEL // MB_RETRYCANCEL
};
- static const INT16 nButtonMap[] =
+ static const sal_Int16 nButtonMap[] =
{
- 2, // #define RET_CANCEL FALSE
- 1, // #define RET_OK TRUE
+ 2, // #define RET_CANCEL sal_False
+ 1, // #define RET_OK sal_True
6, // #define RET_YES 2
7, // #define RET_NO 3
4 // #define RET_RETRY 4
};
- USHORT nArgCount = (USHORT)rPar.Count();
+ sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
if( nArgCount < 2 || nArgCount > 6 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -4469,11 +4436,11 @@ RTLFUNC(MsgBox)
pBox = new MessBox( pParent, nWinBits, aTitle, aMsg );
}
pBox->SetText( aTitle );
- USHORT nRet = (USHORT)pBox->Execute();
- if( nRet == TRUE )
+ sal_uInt16 nRet = (sal_uInt16)pBox->Execute();
+ if( nRet == sal_True )
nRet = 1;
- INT16 nMappedRet;
+ sal_Int16 nMappedRet;
if( nStyle == 2 )
{
nMappedRet = nRet;
@@ -4496,7 +4463,7 @@ RTLFUNC(SetAttr) // JSM
if ( rPar.Count() == 3 )
{
String aStr = rPar.Get(1)->GetString();
- INT16 nFlags = rPar.Get(2)->GetInteger();
+ sal_Int16 nFlags = rPar.Get(2)->GetInteger();
// <-- UCB
if( hasUno() )
@@ -4524,16 +4491,6 @@ RTLFUNC(SetAttr) // JSM
// #57064 Bei virtuellen URLs den Real-Path extrahieren
DirEntry aEntry( aStr );
String aFile = aEntry.GetFull();
- #ifdef WIN
- int nErr = _dos_setfileattr( aFile.GetStr(),(unsigned ) nFlags );
- if ( nErr )
- {
- if (errno == EACCES)
- StarBASIC::Error( SbERR_ACCESS_DENIED );
- else
- StarBASIC::Error( SbERR_FILE_NOT_FOUND );
- }
- #endif
ByteString aByteFile( aFile, gsl_getSystemTextEncoding() );
#ifdef WNT
if (!SetFileAttributes (aByteFile.GetBuffer(),(DWORD)nFlags))
@@ -4582,7 +4539,7 @@ RTLFUNC(DumpAllObjects)
(void)pBasic;
(void)bWrite;
- USHORT nArgCount = (USHORT)rPar.Count();
+ sal_uInt16 nArgCount = (sal_uInt16)rPar.Count();
if( nArgCount < 2 || nArgCount > 3 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else if( !pBasic )
@@ -4610,7 +4567,7 @@ RTLFUNC(FileExists)
if ( rPar.Count() == 2 )
{
String aStr = rPar.Get(1)->GetString();
- BOOL bExists = FALSE;
+ sal_Bool bExists = sal_False;
// <-- UCB
if( hasUno() )
@@ -4657,10 +4614,10 @@ RTLFUNC(Partition)
return;
}
- INT32 nNumber = rPar.Get(1)->GetLong();
- INT32 nStart = rPar.Get(2)->GetLong();
- INT32 nStop = rPar.Get(3)->GetLong();
- INT32 nInterval = rPar.Get(4)->GetLong();
+ sal_Int32 nNumber = rPar.Get(1)->GetLong();
+ sal_Int32 nStart = rPar.Get(2)->GetLong();
+ sal_Int32 nStop = rPar.Get(3)->GetLong();
+ sal_Int32 nInterval = rPar.Get(4)->GetLong();
if( nStart < 0 || nStop <= nStart || nInterval < 1 )
{
@@ -4677,9 +4634,9 @@ RTLFUNC(Partition)
// calculate the maximun number of characters before lowervalue and uppervalue
::rtl::OUString aBeforeStart = ::rtl::OUString::valueOf( nStart - 1 );
::rtl::OUString aAfterStop = ::rtl::OUString::valueOf( nStop + 1 );
- INT32 nLen1 = aBeforeStart.getLength();
- INT32 nLen2 = aAfterStop.getLength();
- INT32 nLen = nLen1 >= nLen2 ? nLen1:nLen2;
+ sal_Int32 nLen1 = aBeforeStart.getLength();
+ sal_Int32 nLen2 = aAfterStop.getLength();
+ sal_Int32 nLen = nLen1 >= nLen2 ? nLen1:nLen2;
::rtl::OUStringBuffer aRetStr( nLen * 2 + 1);
::rtl::OUString aLowerValue;
@@ -4694,8 +4651,8 @@ RTLFUNC(Partition)
}
else
{
- INT32 nLowerValue = nNumber;
- INT32 nUpperValue = nLowerValue;
+ sal_Int32 nLowerValue = nNumber;
+ sal_Int32 nUpperValue = nLowerValue;
if( nInterval > 1 )
{
nLowerValue = ((( nNumber - nStart ) / nInterval ) * nInterval ) + nStart;
@@ -4712,14 +4669,14 @@ RTLFUNC(Partition)
if( nLen > nLen1 )
{
// appending the leading spaces for the lowervalue
- for ( INT32 i= (nLen - nLen1) ; i > 0; --i )
+ for ( sal_Int32 i= (nLen - nLen1) ; i > 0; --i )
aRetStr.appendAscii(" ");
}
aRetStr.append( aLowerValue ).appendAscii(":");
if( nLen > nLen2 )
{
// appending the leading spaces for the uppervalue
- for ( INT32 i= (nLen - nLen2) ; i > 0; --i )
+ for ( sal_Int32 i= (nLen - nLen2) ; i > 0; --i )
aRetStr.appendAscii(" ");
}
aRetStr.append( aUpperValue );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 4c4cecb08b04..4d8b0380ff2f 100644..100755
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -29,11 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
-#if defined(WIN)
-#include <string.h>
-#else
#include <stdlib.h> // getenv
-#endif
#include <vcl/svapp.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/wrkwin.hxx>
@@ -51,10 +47,6 @@
#include <svpm.h>
#endif
-#if defined(WIN)
-#include <tools/svwin.h>
-#endif
-
#ifndef CLK_TCK
#define CLK_TCK CLOCKS_PER_SEC
#endif
@@ -123,13 +115,133 @@ static Reference< XCalendar > getLocaleCalendar( void )
return xCalendar;
}
+RTLFUNC(CallByName)
+{
+ (void)pBasic;
+ (void)bWrite;
+
+ const sal_Int16 vbGet = 2;
+ const sal_Int16 vbLet = 4;
+ const sal_Int16 vbMethod = 1;
+ const sal_Int16 vbSet = 8;
+
+ // At least 3 parameter needed plus function itself -> 4
+ sal_uInt16 nParCount = rPar.Count();
+ if ( nParCount < 4 )
+ {
+ StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ return;
+ }
+
+ // 1. parameter is object
+ SbxBase* pObjVar = (SbxObject*)rPar.Get(1)->GetObject();
+ SbxObject* pObj = NULL;
+ if( pObjVar )
+ pObj = PTR_CAST(SbxObject,pObjVar);
+ if( !pObj && pObjVar && pObjVar->ISA(SbxVariable) )
+ {
+ SbxBase* pObjVarObj = ((SbxVariable*)pObjVar)->GetObject();
+ pObj = PTR_CAST(SbxObject,pObjVarObj);
+ }
+ if( !pObj )
+ {
+ StarBASIC::Error( SbERR_BAD_PARAMETER );
+ return;
+ }
+
+ // 2. parameter is ProcedureName
+ String aNameStr = rPar.Get(2)->GetString();
+
+ // 3. parameter is CallType
+ sal_Int16 nCallType = rPar.Get(3)->GetInteger();
+
+ //SbxObject* pFindObj = NULL;
+ SbxVariable* pFindVar = pObj->Find( aNameStr, SbxCLASS_DONTCARE );
+ if( pFindVar == NULL )
+ {
+ StarBASIC::Error( SbERR_PROC_UNDEFINED );
+ return;
+ }
+
+ switch( nCallType )
+ {
+ case vbGet:
+ {
+ SbxValues aVals;
+ aVals.eType = SbxVARIANT;
+ pFindVar->Get( aVals );
+
+ SbxVariableRef refVar = rPar.Get(0);
+ refVar->Put( aVals );
+ }
+ break;
+ case vbLet:
+ case vbSet:
+ {
+ if ( nParCount != 5 )
+ {
+ StarBASIC::Error( SbERR_BAD_ARGUMENT );
+ return;
+ }
+ SbxVariableRef pValVar = rPar.Get(4);
+ if( nCallType == vbLet )
+ {
+ SbxValues aVals;
+ aVals.eType = SbxVARIANT;
+ pValVar->Get( aVals );
+ pFindVar->Put( aVals );
+ }
+ else
+ {
+ SbxVariableRef rFindVar = pFindVar;
+ SbiInstance* pInst = pINST;
+ SbiRuntime* pRT = pInst ? pInst->pRun : NULL;
+ if( pRT != NULL )
+ pRT->StepSET_Impl( pValVar, rFindVar, false );
+ }
+ }
+ break;
+ case vbMethod:
+ {
+ SbMethod* pMeth = PTR_CAST(SbMethod,pFindVar);
+ if( pMeth == NULL )
+ {
+ StarBASIC::Error( SbERR_PROC_UNDEFINED );
+ return;
+ }
+
+ // Setup parameters
+ SbxArrayRef xArray;
+ sal_uInt16 nMethParamCount = nParCount - 4;
+ if( nMethParamCount > 0 )
+ {
+ xArray = new SbxArray;
+ for( sal_uInt16 i = 0 ; i < nMethParamCount ; i++ )
+ {
+ SbxVariable* pPar = rPar.Get( i + 4 );
+ xArray->Put( pPar, i + 1 );
+ }
+ }
+
+ // Call method
+ SbxVariableRef refVar = rPar.Get(0);
+ if( xArray.Is() )
+ pMeth->SetParameters( xArray );
+ pMeth->Call( refVar );
+ pMeth->SetParameters( NULL );
+ }
+ break;
+ default:
+ StarBASIC::Error( SbERR_PROC_UNDEFINED );
+ }
+}
RTLFUNC(CBool) // JSM
{
(void)pBasic;
(void)bWrite;
- BOOL bVal = FALSE;
+ sal_Bool bVal = sal_False;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
@@ -146,7 +258,7 @@ RTLFUNC(CByte) // JSM
(void)pBasic;
(void)bWrite;
- BYTE nByte = 0;
+ sal_uInt8 nByte = 0;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
@@ -247,7 +359,7 @@ RTLFUNC(CInt) // JSM
(void)pBasic;
(void)bWrite;
- INT16 nVal = 0;
+ sal_Int16 nVal = 0;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
@@ -264,7 +376,7 @@ RTLFUNC(CLng) // JSM
(void)pBasic;
(void)bWrite;
- INT32 nVal = 0;
+ sal_Int32 nVal = 0;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
@@ -290,7 +402,7 @@ RTLFUNC(CSng) // JSM
// AB #41690 , String holen
double dVal = 0.0;
String aScanStr = pSbxVariable->GetString();
- SbError Error = SbxValue::ScanNumIntnl( aScanStr, dVal, /*bSingle=*/TRUE );
+ SbError Error = SbxValue::ScanNumIntnl( aScanStr, dVal, /*bSingle=*/sal_True );
if( SbxBase::GetError() == SbxERR_OK && Error != SbxERR_OK )
StarBASIC::Error( Error );
nVal = (float)dVal;
@@ -345,7 +457,7 @@ RTLFUNC(CVErr)
(void)pBasic;
(void)bWrite;
- INT16 nErrCode = 0;
+ sal_Int16 nErrCode = 0;
if ( rPar.Count() == 2 )
{
SbxVariable *pSbxVariable = rPar.Get(1);
@@ -416,10 +528,10 @@ RTLFUNC(Red)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+ sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
nRGB &= 0x00FF0000;
nRGB >>= 16;
- rPar.Get(0)->PutInteger( (INT16)nRGB );
+ rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
}
}
@@ -432,10 +544,10 @@ RTLFUNC(Green)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+ sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
nRGB &= 0x0000FF00;
nRGB >>= 8;
- rPar.Get(0)->PutInteger( (INT16)nRGB );
+ rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
}
}
@@ -448,9 +560,9 @@ RTLFUNC(Blue)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- ULONG nRGB = (ULONG)rPar.Get(1)->GetLong();
+ sal_uIntPtr nRGB = (sal_uIntPtr)rPar.Get(1)->GetLong();
nRGB &= 0x000000FF;
- rPar.Get(0)->PutInteger( (INT16)nRGB );
+ rPar.Get(0)->PutInteger( (sal_Int16)nRGB );
}
}
@@ -460,11 +572,11 @@ RTLFUNC(Switch)
(void)pBasic;
(void)bWrite;
- USHORT nCount = rPar.Count();
+ sal_uInt16 nCount = rPar.Count();
if( !(nCount & 0x0001 ))
// Anzahl der Argumente muss ungerade sein
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- USHORT nCurExpr = 1;
+ sal_uInt16 nCurExpr = 1;
while( nCurExpr < (nCount-1) )
{
if( rPar.Get( nCurExpr )->GetBool())
@@ -536,6 +648,7 @@ RTLFUNC(DoEvents)
// basic runtime pcode ( on a timed basis )
// always return 0
rPar.Get(0)->PutInteger( 0 );
+ Application::Reschedule( true );
}
RTLFUNC(GetGUIVersion)
@@ -559,8 +672,8 @@ RTLFUNC(Choose)
if ( rPar.Count() < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- INT16 nIndex = rPar.Get(1)->GetInteger();
- USHORT nCount = rPar.Count();
+ sal_Int16 nIndex = rPar.Get(1)->GetInteger();
+ sal_uInt16 nCount = rPar.Count();
nCount--;
if( nCount == 1 || nIndex > (nCount-1) || nIndex < 1 )
{
@@ -592,7 +705,7 @@ RTLFUNC(GetSolarVersion)
(void)pBasic;
(void)bWrite;
- rPar.Get(0)->PutLong( (INT32)SUPD );
+ rPar.Get(0)->PutLong( (sal_Int32)SUPD );
}
RTLFUNC(TwipsPerPixelX)
@@ -600,7 +713,7 @@ RTLFUNC(TwipsPerPixelX)
(void)pBasic;
(void)bWrite;
- INT32 nResult = 0;
+ sal_Int32 nResult = 0;
Size aSize( 100,0 );
MapMode aMap( MAP_TWIP );
OutputDevice* pDevice = Application::GetDefaultDevice();
@@ -617,7 +730,7 @@ RTLFUNC(TwipsPerPixelY)
(void)pBasic;
(void)bWrite;
- INT32 nResult = 0;
+ sal_Int32 nResult = 0;
Size aSize( 0,100 );
MapMode aMap( MAP_TWIP );
OutputDevice* pDevice = Application::GetDefaultDevice();
@@ -644,7 +757,7 @@ bool IsBaseIndexOne()
bool result = false;
if ( pINST && pINST->pRun )
{
- USHORT res = pINST->pRun->GetBase();
+ sal_uInt16 res = pINST->pRun->GetBase();
if ( res )
result = true;
}
@@ -657,7 +770,7 @@ RTLFUNC(Array)
(void)bWrite;
SbxDimArray* pArray = new SbxDimArray( SbxVARIANT );
- USHORT nArraySize = rPar.Count() - 1;
+ sal_uInt16 nArraySize = rPar.Count() - 1;
// Option Base zunaechst ignorieren (kennt leider nur der Compiler)
bool bIncIndex = (IsBaseIndexOne() && SbiRuntime::isVBAEnabled() );
@@ -674,10 +787,10 @@ RTLFUNC(Array)
}
// Parameter ins Array uebernehmen
- // ATTENTION: Using type USHORT for loop variable is
+ // ATTENTION: Using type sal_uInt16 for loop variable is
// mandatory to workaround a problem with the
// Solaris Intel compiler optimizer! See i104354
- for( USHORT i = 0 ; i < nArraySize ; i++ )
+ for( sal_uInt16 i = 0 ; i < nArraySize ; i++ )
{
SbxVariable* pVar = rPar.Get(i+1);
SbxVariable* pNew = new SbxVariable( *pVar );
@@ -690,7 +803,7 @@ RTLFUNC(Array)
// Array zurueckliefern
SbxVariableRef refVar = rPar.Get(0);
- USHORT nFlags = refVar->GetFlags();
+ sal_uInt16 nFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->PutObject( pArray );
refVar->SetFlags( nFlags );
@@ -711,12 +824,12 @@ RTLFUNC(DimArray)
(void)bWrite;
SbxDimArray * pArray = new SbxDimArray( SbxVARIANT );
- USHORT nArrayDims = rPar.Count() - 1;
+ sal_uInt16 nArrayDims = rPar.Count() - 1;
if( nArrayDims > 0 )
{
- for( USHORT i = 0; i < nArrayDims ; i++ )
+ for( sal_uInt16 i = 0; i < nArrayDims ; i++ )
{
- INT32 ub = rPar.Get(i+1)->GetLong();
+ sal_Int32 ub = rPar.Get(i+1)->GetLong();
if( ub < 0 )
{
StarBASIC::Error( SbERR_OUT_OF_RANGE );
@@ -730,7 +843,7 @@ RTLFUNC(DimArray)
// Array zurueckliefern
SbxVariableRef refVar = rPar.Get(0);
- USHORT nFlags = refVar->GetFlags();
+ sal_uInt16 nFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->PutObject( pArray );
refVar->SetFlags( nFlags );
@@ -849,12 +962,12 @@ RTLFUNC(FindPropertyObject)
-BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
- BOOL bBinary, short nBlockLen, BOOL bIsArray )
+sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
+ sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
{
- ULONG nFPos = pStrm->Tell();
+ sal_uIntPtr nFPos = pStrm->Tell();
- BOOL bIsVariant = !rVar.IsFixed();
+ sal_Bool bIsVariant = !rVar.IsFixed();
SbxDataType eType = rVar.GetType();
switch( eType )
@@ -863,7 +976,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
case SbxCHAR:
case SbxBYTE:
if( bIsVariant )
- *pStrm << (USHORT)SbxBYTE; // VarType Id
+ *pStrm << (sal_uInt16)SbxBYTE; // VarType Id
*pStrm << rVar.GetByte();
break;
@@ -875,25 +988,25 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
case SbxINT:
case SbxUINT:
if( bIsVariant )
- *pStrm << (USHORT)SbxINTEGER; // VarType Id
+ *pStrm << (sal_uInt16)SbxINTEGER; // VarType Id
*pStrm << rVar.GetInteger();
break;
case SbxLONG:
case SbxULONG:
if( bIsVariant )
- *pStrm << (USHORT)SbxLONG; // VarType Id
+ *pStrm << (sal_uInt16)SbxLONG; // VarType Id
*pStrm << rVar.GetLong();
break;
case SbxSALINT64:
case SbxSALUINT64:
if( bIsVariant )
- *pStrm << (USHORT)SbxSALINT64; // VarType Id
+ *pStrm << (sal_uInt16)SbxSALINT64; // VarType Id
*pStrm << (sal_uInt64)rVar.GetInt64();
break;
case SbxSINGLE:
if( bIsVariant )
- *pStrm << (USHORT)eType; // VarType Id
+ *pStrm << (sal_uInt16)eType; // VarType Id
*pStrm << rVar.GetSingle();
break;
@@ -901,7 +1014,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
case SbxCURRENCY:
case SbxDATE:
if( bIsVariant )
- *pStrm << (USHORT)eType; // VarType Id
+ *pStrm << (sal_uInt16)eType; // VarType Id
*pStrm << rVar.GetDouble();
break;
@@ -912,7 +1025,7 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
if( !bBinary || bIsArray )
{
if( bIsVariant )
- *pStrm << (USHORT)SbxSTRING;
+ *pStrm << (sal_uInt16)SbxSTRING;
pStrm->WriteByteString( rStr, gsl_getSystemTextEncoding() );
//*pStrm << rStr;
}
@@ -929,31 +1042,31 @@ BOOL lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
default:
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- return FALSE;
+ return sal_False;
}
if( nBlockLen )
pStrm->Seek( nFPos + nBlockLen );
- return pStrm->GetErrorCode() ? FALSE : TRUE;
+ return pStrm->GetErrorCode() ? sal_False : sal_True;
}
-BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
- BOOL bBinary, short nBlockLen, BOOL bIsArray )
+sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
+ sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray )
{
(void)bBinary;
(void)bIsArray;
double aDouble;
- ULONG nFPos = pStrm->Tell();
+ sal_uIntPtr nFPos = pStrm->Tell();
- BOOL bIsVariant = !rVar.IsFixed();
+ sal_Bool bIsVariant = !rVar.IsFixed();
SbxDataType eVarType = rVar.GetType();
SbxDataType eSrcType = eVarType;
if( bIsVariant )
{
- USHORT nTemp;
+ sal_uInt16 nTemp;
*pStrm >> nTemp;
eSrcType = (SbxDataType)nTemp;
}
@@ -964,7 +1077,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
case SbxCHAR:
case SbxBYTE:
{
- BYTE aByte;
+ sal_uInt8 aByte;
*pStrm >> aByte;
rVar.PutByte( aByte );
}
@@ -978,7 +1091,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
case SbxINT:
case SbxUINT:
{
- INT16 aInt;
+ sal_Int16 aInt;
*pStrm >> aInt;
rVar.PutInteger( aInt );
}
@@ -987,7 +1100,7 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
case SbxLONG:
case SbxULONG:
{
- INT32 aInt;
+ sal_Int32 aInt;
*pStrm >> aInt;
rVar.PutLong( aInt );
}
@@ -1034,23 +1147,23 @@ BOOL lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
default:
StarBASIC::Error( SbERR_BAD_ARGUMENT );
- return FALSE;
+ return sal_False;
}
if( nBlockLen )
pStrm->Seek( nFPos + nBlockLen );
- return pStrm->GetErrorCode() ? FALSE : TRUE;
+ return pStrm->GetErrorCode() ? sal_False : sal_True;
}
// nCurDim = 1...n
-BOOL lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
- BOOL bBinary, short nCurDim, short* pOtherDims, BOOL bWrite )
+sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
+ sal_Bool bBinary, short nCurDim, short* pOtherDims, sal_Bool bWrite )
{
DBG_ASSERT( nCurDim > 0,"Bad Dim");
short nLower, nUpper;
if( !rArr.GetDim( nCurDim, nLower, nUpper ) )
- return FALSE;
+ return sal_False;
for( short nCur = nLower; nCur <= nUpper; nCur++ )
{
pOtherDims[ nCurDim-1 ] = nCur;
@@ -1059,19 +1172,19 @@ BOOL lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm,
else
{
SbxVariable* pVar = rArr.Get( (const short*)pOtherDims );
- BOOL bRet;
+ sal_Bool bRet;
if( bWrite )
- bRet = lcl_WriteSbxVariable(*pVar, pStrm, bBinary, 0, TRUE );
+ bRet = lcl_WriteSbxVariable(*pVar, pStrm, bBinary, 0, sal_True );
else
- bRet = lcl_ReadSbxVariable(*pVar, pStrm, bBinary, 0, TRUE );
+ bRet = lcl_ReadSbxVariable(*pVar, pStrm, bBinary, 0, sal_True );
if( !bRet )
- return FALSE;
+ return sal_False;
}
}
- return TRUE;
+ return sal_True;
}
-void PutGet( SbxArray& rPar, BOOL bPut )
+void PutGet( SbxArray& rPar, sal_Bool bPut )
{
// Wir brauchen 3 Parameter
if ( rPar.Count() != 4 )
@@ -1079,9 +1192,9 @@ void PutGet( SbxArray& rPar, BOOL bPut )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nFileNo = rPar.Get(1)->GetInteger();
+ sal_Int16 nFileNo = rPar.Get(1)->GetInteger();
SbxVariable* pVar2 = rPar.Get(2);
- BOOL bHasRecordNo = (BOOL)(pVar2->GetType() != SbxEMPTY);
+ sal_Bool bHasRecordNo = (sal_Bool)(pVar2->GetType() != SbxEMPTY);
long nRecordNo = pVar2->GetLong();
if ( nFileNo < 1 || ( bHasRecordNo && nRecordNo < 1 ) )
{
@@ -1099,7 +1212,7 @@ void PutGet( SbxArray& rPar, BOOL bPut )
}
SvStream* pStrm = pSbStrm->GetStrm();
- BOOL bRandom = pSbStrm->IsRandom();
+ sal_Bool bRandom = pSbStrm->IsRandom();
short nBlockLen = bRandom ? pSbStrm->GetBlockLen() : 0;
if( bPut )
@@ -1111,7 +1224,7 @@ void PutGet( SbxArray& rPar, BOOL bPut )
// auf die Startposition seeken
if( bHasRecordNo )
{
- ULONG nFilePos = bRandom ? (ULONG)(nBlockLen*nRecordNo) : (ULONG)nRecordNo;
+ sal_uIntPtr nFilePos = bRandom ? (sal_uIntPtr)(nBlockLen*nRecordNo) : (sal_uIntPtr)nRecordNo;
pStrm->Seek( nFilePos );
}
@@ -1123,11 +1236,11 @@ void PutGet( SbxArray& rPar, BOOL bPut )
pArr = PTR_CAST(SbxDimArray,pParObj);
}
- BOOL bRet;
+ sal_Bool bRet;
if( pArr )
{
- ULONG nFPos = pStrm->Tell();
+ sal_uIntPtr nFPos = pStrm->Tell();
short nDims = pArr->GetDims();
short* pDims = new short[ nDims ];
bRet = lcl_WriteReadSbxArray(*pArr,pStrm,!bRandom,nDims,pDims,bPut);
@@ -1138,9 +1251,9 @@ void PutGet( SbxArray& rPar, BOOL bPut )
else
{
if( bPut )
- bRet = lcl_WriteSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, FALSE);
+ bRet = lcl_WriteSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, sal_False);
else
- bRet = lcl_ReadSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, FALSE);
+ bRet = lcl_ReadSbxVariable(*pVar, pStrm, !bRandom, nBlockLen, sal_False);
}
if( !bRet || pStrm->GetErrorCode() )
StarBASIC::Error( SbERR_IO_ERROR );
@@ -1151,7 +1264,7 @@ RTLFUNC(Put)
(void)pBasic;
(void)bWrite;
- PutGet( rPar, TRUE );
+ PutGet( rPar, sal_True );
}
RTLFUNC(Get)
@@ -1159,7 +1272,7 @@ RTLFUNC(Get)
(void)pBasic;
(void)bWrite;
- PutGet( rPar, FALSE );
+ PutGet( rPar, sal_False );
}
RTLFUNC(Environ)
@@ -1174,46 +1287,21 @@ RTLFUNC(Environ)
}
String aResult;
// sollte ANSI sein, aber unter Win16 in DLL nicht moeglich
-#if defined(WIN)
- LPSTR lpszEnv = GetDOSEnvironment();
- String aCompareStr( rPar.Get(1)->GetString() );
- aCompareStr += '=';
- const char* pCompare = aCompareStr.GetStr();
- int nCompareLen = aCompareStr.Len();
- while ( *lpszEnv )
- {
- // Es werden alle EnvString in der Form ENV=VAL 0-terminiert
- // aneinander gehaengt.
-
- if ( strnicmp( pCompare, lpszEnv, nCompareLen ) == 0 )
- {
- aResult = (const char*)(lpszEnv+nCompareLen);
- rPar.Get(0)->PutString( aResult );
- return;
- }
- lpszEnv += lstrlen( lpszEnv ) + 1; // Next Enviroment-String
- }
-#else
ByteString aByteStr( rPar.Get(1)->GetString(), gsl_getSystemTextEncoding() );
const char* pEnvStr = getenv( aByteStr.GetBuffer() );
if ( pEnvStr )
aResult = String::CreateFromAscii( pEnvStr );
-#endif
rPar.Get(0)->PutString( aResult );
}
-static double GetDialogZoomFactor( BOOL bX, long nValue )
+static double GetDialogZoomFactor( sal_Bool bX, long nValue )
{
OutputDevice* pDevice = Application::GetDefaultDevice();
double nResult = 0;
if( pDevice )
{
Size aRefSize( nValue, nValue );
-#ifndef WIN
Fraction aFracX( 1, 26 );
-#else
- Fraction aFracX( 1, 23 );
-#endif
Fraction aFracY( 1, 24 );
MapMode aMap( MAP_APPFONT, Point(), aFracX, aFracY );
Size aScaledSize = pDevice->LogicToPixel( aRefSize, aMap );
@@ -1246,7 +1334,7 @@ RTLFUNC(GetDialogZoomFactorX)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- rPar.Get(0)->PutDouble( GetDialogZoomFactor( TRUE, rPar.Get(1)->GetLong() ));
+ rPar.Get(0)->PutDouble( GetDialogZoomFactor( sal_True, rPar.Get(1)->GetLong() ));
}
RTLFUNC(GetDialogZoomFactorY)
@@ -1259,7 +1347,7 @@ RTLFUNC(GetDialogZoomFactorY)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- rPar.Get(0)->PutDouble( GetDialogZoomFactor( FALSE, rPar.Get(1)->GetLong()));
+ rPar.Get(0)->PutDouble( GetDialogZoomFactor( sal_False, rPar.Get(1)->GetLong()));
}
@@ -1328,7 +1416,7 @@ RTLFUNC(TypeLen)
else
{
SbxDataType eType = rPar.Get(1)->GetType();
- INT16 nLen = 0;
+ sal_Int16 nLen = 0;
switch( eType )
{
case SbxEMPTY:
@@ -1383,7 +1471,7 @@ RTLFUNC(TypeLen)
case SbxLPWSTR:
case SbxCoreSTRING:
case SbxSTRING:
- nLen = (INT16)rPar.Get(1)->GetString().Len();
+ nLen = (sal_Int16)rPar.Get(1)->GetString().Len();
break;
default:
@@ -1482,7 +1570,7 @@ RTLFUNC(EqualUnoObjects)
// Instanciate "com.sun.star.awt.UnoControlDialog" on basis
// of a DialogLibrary entry: Convert from XML-ByteSequence
// and attach events. Implemented in classes\eventatt.cxx
-void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
+void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite );
RTLFUNC(CreateUnoDialog)
{
@@ -1555,13 +1643,19 @@ RTLFUNC(GetDefaultContext)
RTL_Impl_GetDefaultContext( pBasic, rPar, bWrite );
}
+#ifdef DBG_TRACE_BASIC
+RTLFUNC(TraceCommand)
+{
+ RTL_Impl_TraceCommand( pBasic, rPar, bWrite );
+}
+#endif
RTLFUNC(Join)
{
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if ( nParCount != 3 && nParCount != 2 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1602,7 +1696,7 @@ RTLFUNC(Split)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if ( nParCount < 2 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1620,7 +1714,7 @@ RTLFUNC(Split)
else
aDelim = String::CreateFromAscii( " " );
- INT32 nCount = -1;
+ sal_Int32 nCount = -1;
if( nParCount == 4 )
nCount = rPar.Get(3)->GetLong();
@@ -1674,7 +1768,7 @@ RTLFUNC(Split)
// Array zurueckliefern
SbxVariableRef refVar = rPar.Get(0);
- USHORT nFlags = refVar->GetFlags();
+ sal_uInt16 nFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->PutObject( pArray );
refVar->SetFlags( nFlags );
@@ -1687,7 +1781,7 @@ RTLFUNC(MonthName)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount != 2 && nParCount != 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1703,14 +1797,14 @@ RTLFUNC(MonthName)
Sequence< CalendarItem > aMonthSeq = xCalendar->getMonths();
sal_Int32 nMonthCount = aMonthSeq.getLength();
- INT16 nVal = rPar.Get(1)->GetInteger();
+ sal_Int16 nVal = rPar.Get(1)->GetInteger();
if( nVal < 1 || nVal > nMonthCount )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- BOOL bAbbreviate = false;
+ sal_Bool bAbbreviate = false;
if( nParCount == 3 )
bAbbreviate = rPar.Get(2)->GetBool();
@@ -1727,7 +1821,7 @@ RTLFUNC(WeekdayName)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount < 2 || nParCount > 4 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1742,9 +1836,9 @@ RTLFUNC(WeekdayName)
}
Sequence< CalendarItem > aDaySeq = xCalendar->getDays();
- INT16 nDayCount = (INT16)aDaySeq.getLength();
- INT16 nDay = rPar.Get(1)->GetInteger();
- INT16 nFirstDay = 0;
+ sal_Int16 nDayCount = (sal_Int16)aDaySeq.getLength();
+ sal_Int16 nDay = rPar.Get(1)->GetInteger();
+ sal_Int16 nFirstDay = 0;
if( nParCount == 4 )
{
nFirstDay = rPar.Get(3)->GetInteger();
@@ -1755,7 +1849,7 @@ RTLFUNC(WeekdayName)
}
}
if( nFirstDay == 0 )
- nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+ nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
nDay = 1 + (nDay + nDayCount + nFirstDay - 2) % nDayCount;
if( nDay < 1 || nDay > nDayCount )
@@ -1764,7 +1858,7 @@ RTLFUNC(WeekdayName)
return;
}
- BOOL bAbbreviate = false;
+ sal_Bool bAbbreviate = false;
if( nParCount >= 3 )
{
SbxVariable* pPar2 = rPar.Get(2);
@@ -1779,16 +1873,16 @@ RTLFUNC(WeekdayName)
rPar.Get(0)->PutString( String(aRetStr) );
}
-INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay = 0 )
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 )
{
Date aRefDate( 1,1,1900 );
long nDays = (long) aDate;
nDays -= 2; // normieren: 1.1.1900 => 0
aRefDate += nDays;
DayOfWeek aDay = aRefDate.GetDayOfWeek();
- INT16 nDay;
+ sal_Int16 nDay;
if ( aDay != SUNDAY )
- nDay = (INT16)aDay + 2;
+ nDay = (sal_Int16)aDay + 2;
else
nDay = 1; // 1==Sonntag
@@ -1808,7 +1902,7 @@ INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay
StarBASIC::Error( SbERR_INTERNAL_ERROR );
return 0;
}
- nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+ nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
}
nDay = 1 + (nDay + 7 - nFirstDay) % 7;
}
@@ -1820,7 +1914,7 @@ RTLFUNC(Weekday)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if ( nParCount < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -1828,13 +1922,13 @@ RTLFUNC(Weekday)
double aDate = rPar.Get(1)->GetDate();
bool bFirstDay = false;
- INT16 nFirstDay = 0;
+ sal_Int16 nFirstDay = 0;
if ( nParCount > 2 )
{
nFirstDay = rPar.Get(2)->GetInteger();
bFirstDay = true;
}
- INT16 nDay = implGetWeekDay( aDate, bFirstDay, nFirstDay );
+ sal_Int16 nDay = implGetWeekDay( aDate, bFirstDay, nFirstDay );
rPar.Get(0)->PutInteger( nDay );
}
}
@@ -1888,7 +1982,7 @@ static IntervalInfo pIntervalTable[] =
IntervalInfo* getIntervalInfo( const String& rStringCode )
{
IntervalInfo* pInfo = NULL;
- INT16 i = 0;
+ sal_Int16 i = 0;
while( (pInfo = pIntervalTable + i)->mpStringCode != NULL )
{
if( rStringCode.EqualsIgnoreCaseAscii( pInfo->mpStringCode ) )
@@ -1899,30 +1993,30 @@ IntervalInfo* getIntervalInfo( const String& rStringCode )
}
// From methods.cxx
-BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet );
-INT16 implGetDateDay( double aDate );
-INT16 implGetDateMonth( double aDate );
-INT16 implGetDateYear( double aDate );
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet );
+sal_Int16 implGetDateDay( double aDate );
+sal_Int16 implGetDateMonth( double aDate );
+sal_Int16 implGetDateYear( double aDate );
-INT16 implGetHour( double dDate );
-INT16 implGetMinute( double dDate );
-INT16 implGetSecond( double dDate );
+sal_Int16 implGetHour( double dDate );
+sal_Int16 implGetMinute( double dDate );
+sal_Int16 implGetSecond( double dDate );
-inline void implGetDayMonthYear( INT16& rnYear, INT16& rnMonth, INT16& rnDay, double dDate )
+inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate )
{
rnDay = implGetDateDay( dDate );
rnMonth = implGetDateMonth( dDate );
rnYear = implGetDateYear( dDate );
}
-inline INT16 limitToINT16( INT32 n32 )
+inline sal_Int16 limitToINT16( sal_Int32 n32 )
{
if( n32 > 32767 )
n32 = 32767;
else if( n32 < -32768 )
n32 = -32768;
- return (INT16)n32;
+ return (sal_Int16)n32;
}
RTLFUNC(DateAdd)
@@ -1930,7 +2024,7 @@ RTLFUNC(DateAdd)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount != 4 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -1945,7 +2039,7 @@ RTLFUNC(DateAdd)
return;
}
- INT32 lNumber = rPar.Get(2)->GetLong();
+ sal_Int32 lNumber = rPar.Get(2)->GetLong();
double dDate = rPar.Get(3)->GetDate();
double dNewDate = 0;
if( pInfo->mbSimple )
@@ -1958,15 +2052,15 @@ RTLFUNC(DateAdd)
// Keep hours, minutes, seconds
double dHoursMinutesSeconds = dDate - floor( dDate );
- BOOL bOk = TRUE;
- INT16 nYear, nMonth, nDay;
- INT16 nTargetYear16 = 0, nTargetMonth = 0;
+ sal_Bool bOk = sal_True;
+ sal_Int16 nYear, nMonth, nDay;
+ sal_Int16 nTargetYear16 = 0, nTargetMonth = 0;
implGetDayMonthYear( nYear, nMonth, nDay, dDate );
switch( pInfo->meInterval )
{
case INTERVAL_YYYY:
{
- INT32 nTargetYear = lNumber + nYear;
+ sal_Int32 nTargetYear = lNumber + nYear;
nTargetYear16 = limitToINT16( nTargetYear );
nTargetMonth = nMonth;
bOk = implDateSerial( nTargetYear16, nTargetMonth, nDay, dNewDate );
@@ -1978,20 +2072,20 @@ RTLFUNC(DateAdd)
bool bNeg = (lNumber < 0);
if( bNeg )
lNumber = -lNumber;
- INT32 nYearsAdd;
- INT16 nMonthAdd;
+ sal_Int32 nYearsAdd;
+ sal_Int16 nMonthAdd;
if( pInfo->meInterval == INTERVAL_Q )
{
nYearsAdd = lNumber / 4;
- nMonthAdd = (INT16)( 3 * (lNumber % 4) );
+ nMonthAdd = (sal_Int16)( 3 * (lNumber % 4) );
}
else
{
nYearsAdd = lNumber / 12;
- nMonthAdd = (INT16)( lNumber % 12 );
+ nMonthAdd = (sal_Int16)( lNumber % 12 );
}
- INT32 nTargetYear;
+ sal_Int32 nTargetYear;
if( bNeg )
{
nTargetMonth = nMonth - nMonthAdd;
@@ -2000,7 +2094,7 @@ RTLFUNC(DateAdd)
nTargetMonth += 12;
nYearsAdd++;
}
- nTargetYear = (INT32)nYear - nYearsAdd;
+ nTargetYear = (sal_Int32)nYear - nYearsAdd;
}
else
{
@@ -2010,7 +2104,7 @@ RTLFUNC(DateAdd)
nTargetMonth -= 12;
nYearsAdd++;
}
- nTargetYear = (INT32)nYear + nYearsAdd;
+ nTargetYear = (sal_Int32)nYear + nYearsAdd;
}
nTargetYear16 = limitToINT16( nTargetYear );
bOk = implDateSerial( nTargetYear16, nTargetMonth, nDay, dNewDate );
@@ -2022,14 +2116,14 @@ RTLFUNC(DateAdd)
if( bOk )
{
// Overflow?
- INT16 nNewYear, nNewMonth, nNewDay;
+ sal_Int16 nNewYear, nNewMonth, nNewDay;
implGetDayMonthYear( nNewYear, nNewMonth, nNewDay, dNewDate );
if( nNewYear > 9999 || nNewYear < 100 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- INT16 nCorrectionDay = nDay;
+ sal_Int16 nCorrectionDay = nDay;
while( nNewMonth > nTargetMonth )
{
nCorrectionDay--;
@@ -2055,7 +2149,7 @@ RTLFUNC(DateDiff)
// DateDiff(interval, date1, date2[, firstdayofweek[, firstweekofyear]])
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount < 4 || nParCount > 6 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2078,30 +2172,30 @@ RTLFUNC(DateDiff)
{
case INTERVAL_YYYY:
{
- INT16 nYear1 = implGetDateYear( dDate1 );
- INT16 nYear2 = implGetDateYear( dDate2 );
+ sal_Int16 nYear1 = implGetDateYear( dDate1 );
+ sal_Int16 nYear2 = implGetDateYear( dDate2 );
dRet = nYear2 - nYear1;
break;
}
case INTERVAL_Q:
{
- INT16 nYear1 = implGetDateYear( dDate1 );
- INT16 nYear2 = implGetDateYear( dDate2 );
- INT16 nQ1 = 1 + (implGetDateMonth( dDate1 ) - 1) / 3;
- INT16 nQ2 = 1 + (implGetDateMonth( dDate2 ) - 1) / 3;
- INT16 nQGes1 = 4 * nYear1 + nQ1;
- INT16 nQGes2 = 4 * nYear2 + nQ2;
+ sal_Int16 nYear1 = implGetDateYear( dDate1 );
+ sal_Int16 nYear2 = implGetDateYear( dDate2 );
+ sal_Int16 nQ1 = 1 + (implGetDateMonth( dDate1 ) - 1) / 3;
+ sal_Int16 nQ2 = 1 + (implGetDateMonth( dDate2 ) - 1) / 3;
+ sal_Int16 nQGes1 = 4 * nYear1 + nQ1;
+ sal_Int16 nQGes2 = 4 * nYear2 + nQ2;
dRet = nQGes2 - nQGes1;
break;
}
case INTERVAL_M:
{
- INT16 nYear1 = implGetDateYear( dDate1 );
- INT16 nYear2 = implGetDateYear( dDate2 );
- INT16 nMonth1 = implGetDateMonth( dDate1 );
- INT16 nMonth2 = implGetDateMonth( dDate2 );
- INT16 nMonthGes1 = 12 * nYear1 + nMonth1;
- INT16 nMonthGes2 = 12 * nYear2 + nMonth2;
+ sal_Int16 nYear1 = implGetDateYear( dDate1 );
+ sal_Int16 nYear2 = implGetDateYear( dDate2 );
+ sal_Int16 nMonth1 = implGetDateMonth( dDate1 );
+ sal_Int16 nMonth2 = implGetDateMonth( dDate2 );
+ sal_Int16 nMonthGes1 = 12 * nYear1 + nMonth1;
+ sal_Int16 nMonthGes2 = 12 * nYear2 + nMonth2;
dRet = nMonthGes2 - nMonthGes1;
break;
}
@@ -2120,7 +2214,7 @@ RTLFUNC(DateDiff)
double dDays2 = floor( dDate2 );
if( pInfo->meInterval == INTERVAL_WW )
{
- INT16 nFirstDay = 1; // Default
+ sal_Int16 nFirstDay = 1; // Default
if( nParCount >= 5 )
{
nFirstDay = rPar.Get(4)->GetInteger();
@@ -2137,17 +2231,17 @@ RTLFUNC(DateDiff)
StarBASIC::Error( SbERR_INTERNAL_ERROR );
return;
}
- nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+ nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
}
}
- INT16 nDay1 = implGetWeekDay( dDate1 );
- INT16 nDay1_Diff = nDay1 - nFirstDay;
+ sal_Int16 nDay1 = implGetWeekDay( dDate1 );
+ sal_Int16 nDay1_Diff = nDay1 - nFirstDay;
if( nDay1_Diff < 0 )
nDay1_Diff += 7;
dDays1 -= nDay1_Diff;
- INT16 nDay2 = implGetWeekDay( dDate2 );
- INT16 nDay2_Diff = nDay2 - nFirstDay;
+ sal_Int16 nDay2 = implGetWeekDay( dDate2 );
+ sal_Int16 nDay2_Diff = nDay2 - nFirstDay;
if( nDay2_Diff < 0 )
nDay2_Diff += 7;
dDays2 -= nDay2_Diff;
@@ -2182,7 +2276,7 @@ RTLFUNC(DateDiff)
}
double implGetDateOfFirstDayInFirstWeek
- ( INT16 nYear, INT16& nFirstDay, INT16& nFirstWeek, bool* pbError = NULL )
+ ( sal_Int16 nYear, sal_Int16& nFirstDay, sal_Int16& nFirstWeek, bool* pbError = NULL )
{
SbError nError = 0;
if( nFirstDay < 0 || nFirstDay > 7 )
@@ -2208,9 +2302,9 @@ double implGetDateOfFirstDayInFirstWeek
}
if( nFirstDay == 0 )
- nFirstDay = INT16( xCalendar->getFirstDayOfWeek() + 1 );
+ nFirstDay = sal_Int16( xCalendar->getFirstDayOfWeek() + 1 );
- INT16 nFirstWeekMinDays = 0; // Not used for vbFirstJan1 = default
+ sal_Int16 nFirstWeekMinDays = 0; // Not used for vbFirstJan1 = default
if( nFirstWeek == 0 )
{
nFirstWeekMinDays = xCalendar->getMinimumNumberOfDaysForFirstWeek();
@@ -2233,14 +2327,14 @@ double implGetDateOfFirstDayInFirstWeek
implDateSerial( nYear, 1, 1, dBaseDate );
double dRetDate = dBaseDate;
- INT16 nWeekDay0101 = implGetWeekDay( dBaseDate );
- INT16 nDayDiff = nWeekDay0101 - nFirstDay;
+ sal_Int16 nWeekDay0101 = implGetWeekDay( dBaseDate );
+ sal_Int16 nDayDiff = nWeekDay0101 - nFirstDay;
if( nDayDiff < 0 )
nDayDiff += 7;
if( nFirstWeekMinDays )
{
- INT16 nThisWeeksDaysInYearCount = 7 - nDayDiff;
+ sal_Int16 nThisWeeksDaysInYearCount = 7 - nDayDiff;
if( nThisWeeksDaysInYearCount < nFirstWeekMinDays )
nDayDiff -= 7;
}
@@ -2255,7 +2349,7 @@ RTLFUNC(DatePart)
// DatePart(interval, date[,firstdayofweek[, firstweekofyear]])
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount < 3 || nParCount > 5 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2272,7 +2366,7 @@ RTLFUNC(DatePart)
double dDate = rPar.Get(2)->GetDate();
- INT32 nRet = 0;
+ sal_Int32 nRet = 0;
switch( pInfo->meInterval )
{
case INTERVAL_YYYY:
@@ -2292,10 +2386,10 @@ RTLFUNC(DatePart)
}
case INTERVAL_Y:
{
- INT16 nYear = implGetDateYear( dDate );
+ sal_Int16 nYear = implGetDateYear( dDate );
double dBaseDate;
implDateSerial( nYear, 1, 1, dBaseDate );
- nRet = 1 + INT32( dDate - dBaseDate );
+ nRet = 1 + sal_Int32( dDate - dBaseDate );
break;
}
case INTERVAL_D:
@@ -2306,7 +2400,7 @@ RTLFUNC(DatePart)
case INTERVAL_W:
{
bool bFirstDay = false;
- INT16 nFirstDay = 1; // Default
+ sal_Int16 nFirstDay = 1; // Default
if( nParCount >= 4 )
{
nFirstDay = rPar.Get(3)->GetInteger();
@@ -2317,15 +2411,15 @@ RTLFUNC(DatePart)
}
case INTERVAL_WW:
{
- INT16 nFirstDay = 1; // Default
+ sal_Int16 nFirstDay = 1; // Default
if( nParCount >= 4 )
nFirstDay = rPar.Get(3)->GetInteger();
- INT16 nFirstWeek = 1; // Default
+ sal_Int16 nFirstWeek = 1; // Default
if( nParCount == 5 )
nFirstWeek = rPar.Get(4)->GetInteger();
- INT16 nYear = implGetDateYear( dDate );
+ sal_Int16 nYear = implGetDateYear( dDate );
bool bError = false;
double dYearFirstDay = implGetDateOfFirstDayInFirstWeek( nYear, nFirstDay, nFirstWeek, &bError );
if( !bError )
@@ -2345,7 +2439,7 @@ RTLFUNC(DatePart)
// Calculate week
double dDiff = dDate - dYearFirstDay;
- nRet = 1 + INT32( dDiff / 7 );
+ nRet = 1 + sal_Int32( dDiff / 7 );
}
break;
}
@@ -2376,7 +2470,7 @@ RTLFUNC(FormatDateTime)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount < 2 || nParCount > 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2384,7 +2478,7 @@ RTLFUNC(FormatDateTime)
}
double dDate = rPar.Get(1)->GetDate();
- INT16 nNamedFormat = 0;
+ sal_Int16 nNamedFormat = 0;
if( nParCount > 2 )
{
nNamedFormat = rPar.Get(2)->GetInteger();
@@ -2434,7 +2528,7 @@ RTLFUNC(FormatDateTime)
}
LanguageType eLangType = GetpApp()->GetSettings().GetLanguage();
- ULONG nIndex = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eLangType );
+ sal_uIntPtr nIndex = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eLangType );
Color* pCol;
pFormatter->GetOutputString( dDate, nIndex, aRetStr, &pCol );
@@ -2479,7 +2573,7 @@ RTLFUNC(Round)
(void)pBasic;
(void)bWrite;
- USHORT nParCount = rPar.Count();
+ sal_uInt16 nParCount = rPar.Count();
if( nParCount != 2 && nParCount != 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -2498,7 +2592,7 @@ RTLFUNC(Round)
dVal = -dVal;
}
- INT16 numdecimalplaces = 0;
+ sal_Int16 numdecimalplaces = 0;
if( nParCount == 3 )
{
numdecimalplaces = rPar.Get(2)->GetInteger();
@@ -2557,7 +2651,7 @@ RTLFUNC(SYD)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 4 )
{
@@ -2581,7 +2675,7 @@ RTLFUNC(SLN)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 3 )
{
@@ -2604,7 +2698,7 @@ RTLFUNC(Pmt)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 5 )
{
@@ -2649,7 +2743,7 @@ RTLFUNC(PPmt)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 4 || nArgCount > 6 )
{
@@ -2696,7 +2790,7 @@ RTLFUNC(PV)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 5 )
{
@@ -2741,7 +2835,7 @@ RTLFUNC(NPV)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 1 || nArgCount > 2 )
{
@@ -2769,7 +2863,7 @@ RTLFUNC(NPer)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 5 )
{
@@ -2814,7 +2908,7 @@ RTLFUNC(MIRR)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 3 )
{
@@ -2845,7 +2939,7 @@ RTLFUNC(IRR)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 1 || nArgCount > 2 )
{
@@ -2882,7 +2976,7 @@ RTLFUNC(IPmt)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 4 || nArgCount > 6 )
{
@@ -2929,7 +3023,7 @@ RTLFUNC(FV)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 5 )
{
@@ -2974,7 +3068,7 @@ RTLFUNC(DDB)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 4 || nArgCount > 5 )
{
@@ -3013,7 +3107,7 @@ RTLFUNC(Rate)
(void)pBasic;
(void)bWrite;
- ULONG nArgCount = rPar.Count()-1;
+ sal_uLong nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 6 )
{
@@ -3096,7 +3190,7 @@ RTLFUNC(CompatibilityMode)
(void)bWrite;
bool bEnabled = false;
- USHORT nCount = rPar.Count();
+ sal_uInt16 nCount = rPar.Count();
if ( nCount != 1 && nCount != 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -3123,8 +3217,8 @@ RTLFUNC(Input)
return;
}
- USHORT nByteCount = rPar.Get(1)->GetUShort();
- INT16 nFileNumber = rPar.Get(2)->GetInteger();
+ sal_uInt16 nByteCount = rPar.Get(1)->GetUShort();
+ sal_Int16 nFileNumber = rPar.Get(2)->GetInteger();
SbiIoSystem* pIosys = pINST->GetIoSystem();
SbiStream* pSbStrm = pIosys->GetStream( nFileNumber );
diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx
index 42b0dd0dddca..8f441827905f 100644..100755
--- a/basic/source/runtime/props.cxx
+++ b/basic/source/runtime/props.cxx
@@ -35,8 +35,8 @@
#include "errobject.hxx"
-// Properties und Methoden legen beim Get (bWrite = FALSE) den Returnwert
-// im Element 0 des Argv ab; beim Put (bWrite = TRUE) wird der Wert aus
+// Properties und Methoden legen beim Get (bWrite = sal_False) den Returnwert
+// im Element 0 des Argv ab; beim Put (bWrite = sal_True) wird der Wert aus
// Element 0 gespeichert.
RTLFUNC(Erl)
@@ -60,9 +60,9 @@ RTLFUNC(Err)
{
if( bWrite )
{
- INT32 nVal = rPar.Get( 0 )->GetLong();
+ sal_Int32 nVal = rPar.Get( 0 )->GetLong();
if( nVal <= 65535L )
- StarBASIC::Error( StarBASIC::GetSfxFromVBError( (USHORT) nVal ) );
+ StarBASIC::Error( StarBASIC::GetSfxFromVBError( (sal_uInt16) nVal ) );
}
else
rPar.Get( 0 )->PutLong( StarBASIC::GetVBErrorCode( StarBASIC::GetErrBasic() ) );
@@ -74,7 +74,7 @@ RTLFUNC(False)
(void)pBasic;
(void)bWrite;
- rPar.Get(0)->PutBool( FALSE );
+ rPar.Get(0)->PutBool( sal_False );
}
RTLFUNC(Empty)
@@ -115,7 +115,7 @@ RTLFUNC(True)
(void)pBasic;
(void)bWrite;
- rPar.Get( 0 )->PutBool( TRUE );
+ rPar.Get( 0 )->PutBool( sal_True );
}
RTLFUNC(ATTR_NORMAL)
diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx
index 9eb6f495f433..c129d997ca9d 100644..100755
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -27,11 +27,12 @@
************************************************************************/
#include <basic/sbstar.hxx>
+#include "sbtrace.hxx"
-#define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
+#define RTLFUNC( name ) void SbRtl_##name( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite )
#define RTLNAME( name ) &SbRtl_##name
-typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, BOOL bWrite );
+typedef void( *RtlCall ) ( StarBASIC* p, SbxArray& rArgs, sal_Bool bWrite );
// Properties
@@ -285,6 +286,7 @@ extern RTLFUNC(AboutStarBasic);
extern RTLFUNC(LoadPicture);
extern RTLFUNC(SavePicture);
+extern RTLFUNC(CallByName);
extern RTLFUNC(CBool); // JSM
extern RTLFUNC(CByte); // JSM
extern RTLFUNC(CCur); // JSM
@@ -360,6 +362,10 @@ extern RTLFUNC(CDec);
extern RTLFUNC(Partition); // Fong
+#ifdef DBG_TRACE_BASIC
+extern RTLFUNC(TraceCommand);
+#endif
+
extern double Now_Impl();
extern void Wait_Impl( bool bDurationBased, SbxArray& rPar );
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index d0babeee3d96..8609c2a2c97d 100644..100755
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -46,6 +46,8 @@
#include "sbunoobj.hxx"
#include "errobject.hxx"
+#include "comenumwrapper.hxx"
+
SbxVariable* getDefaultProp( SbxVariable* pRef );
using namespace ::com::sun::star;
@@ -60,13 +62,13 @@ bool SbiRuntime::isVBAEnabled()
}
// #91147 Global reschedule flag
-static BOOL bStaticGlobalEnableReschedule = TRUE;
+static sal_Bool bStaticGlobalEnableReschedule = sal_True;
-void StarBASIC::StaticEnableReschedule( BOOL bReschedule )
+void StarBASIC::StaticEnableReschedule( sal_Bool bReschedule )
{
bStaticGlobalEnableReschedule = bReschedule;
}
-void StarBASIC::SetVBAEnabled( BOOL bEnabled )
+void StarBASIC::SetVBAEnabled( sal_Bool bEnabled )
{
if ( bDocBasic )
{
@@ -74,15 +76,15 @@ void StarBASIC::SetVBAEnabled( BOOL bEnabled )
}
}
-BOOL StarBASIC::isVBAEnabled()
+sal_Bool StarBASIC::isVBAEnabled()
{
if ( bDocBasic )
{
if( SbiRuntime::isVBAEnabled() )
- return TRUE;
+ return sal_True;
return bVBAEnabled;
}
- return FALSE;
+ return sal_False;
}
@@ -254,12 +256,12 @@ SbiRTLData::~SbiRTLData()
// (siehe auch step2.cxx, SbiRuntime::StepSTMNT() )
// Hilfsfunktion, um den BreakCallLevel gemaess der der Debug-Flags zu ermitteln
-void SbiInstance::CalcBreakCallLevel( USHORT nFlags )
+void SbiInstance::CalcBreakCallLevel( sal_uInt16 nFlags )
{
// Break-Flag wegfiltern
- nFlags &= ~((USHORT)SbDEBUG_BREAK);
+ nFlags &= ~((sal_uInt16)SbDEBUG_BREAK);
- USHORT nRet;
+ sal_uInt16 nRet;
switch( nFlags )
{
case SbDEBUG_STEPINTO:
@@ -292,8 +294,8 @@ SbiInstance::SbiInstance( StarBASIC* p )
nBreakCallLvl = 0;
nErr =
nErl = 0;
- bReschedule = TRUE;
- bCompatibility = FALSE;
+ bReschedule = sal_True;
+ bCompatibility = sal_False;
}
SbiInstance::~SbiInstance()
@@ -451,7 +453,7 @@ void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const String& rMsg )
{
if( !bWatchMode )
{
- SbError n = StarBASIC::GetSfxFromVBError( static_cast< USHORT >( nVBNumber ) );
+ SbError n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
if ( !n )
n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
@@ -465,7 +467,7 @@ void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const String& rMsg )
void SbiInstance::setErrorVB( sal_Int32 nVBNumber, const String& rMsg )
{
- SbError n = StarBASIC::GetSfxFromVBError( static_cast< USHORT >( nVBNumber ) );
+ SbError n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
if( !n )
n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
@@ -516,7 +518,7 @@ SbModule* SbiInstance::GetActiveModule()
return NULL;
}
-SbMethod* SbiInstance::GetCaller( USHORT nLevel )
+SbMethod* SbiInstance::GetCaller( sal_uInt16 nLevel )
{
SbiRuntime* p = pRun;
while( nLevel-- && p )
@@ -544,7 +546,7 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth )
// Achtung: pMeth kann auch NULL sein (beim Aufruf des Init-Codes)
-SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
+SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, sal_uInt32 nStart )
: rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ),
pMod( pm ), pMeth( pe ), pImg( pMod->pImage ), mpExtCaller(0), m_nLastTime(0)
{
@@ -559,11 +561,11 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
pRestart = NULL;
pNext = NULL;
pCode =
- pStmnt = (const BYTE* ) pImg->GetCode() + nStart;
+ pStmnt = (const sal_uInt8* ) pImg->GetCode() + nStart;
bRun =
- bError = TRUE;
- bInError = FALSE;
- bBlocked = FALSE;
+ bError = sal_True;
+ bInError = sal_False;
+ bBlocked = sal_False;
nLine = 0;
nCol1 = 0;
nCol2 = 0;
@@ -623,10 +625,10 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
refParams->Put( pMeth, 0 );
SbxInfo* pInfo = pMeth ? pMeth->GetInfo() : NULL;
- USHORT nParamCount = pParams ? pParams->Count() : 1;
+ sal_uInt16 nParamCount = pParams ? pParams->Count() : 1;
if( nParamCount > 1 )
{
- for( USHORT i = 1 ; i < nParamCount ; i++ )
+ for( sal_uInt16 i = 1 ; i < nParamCount ; i++ )
{
const SbxParamInfo* p = pInfo ? pInfo->GetParam( i ) : NULL;
@@ -634,9 +636,9 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
if( p && (p->nUserData & PARAM_INFO_PARAMARRAY) != 0 )
{
SbxDimArray* pArray = new SbxDimArray( SbxVARIANT );
- USHORT nParamArrayParamCount = nParamCount - i;
+ sal_uInt16 nParamArrayParamCount = nParamCount - i;
pArray->unoAddDim( 0, nParamArrayParamCount - 1 );
- for( USHORT j = i ; j < nParamCount ; j++ )
+ for( sal_uInt16 j = i ; j < nParamCount ; j++ )
{
SbxVariable* v = pParams->Get( j );
short nDimIndex = j - i;
@@ -654,16 +656,16 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
SbxVariable* v = pParams->Get( i );
// Methoden sind immer byval!
- BOOL bByVal = v->IsA( TYPE(SbxMethod) );
+ sal_Bool bByVal = v->IsA( TYPE(SbxMethod) );
SbxDataType t = v->GetType();
if( p )
{
- bByVal |= BOOL( ( p->eType & SbxBYREF ) == 0 );
+ bByVal |= sal_Bool( ( p->eType & SbxBYREF ) == 0 );
t = (SbxDataType) ( p->eType & 0x0FFF );
if( !bByVal && t != SbxVARIANT &&
(!v->IsFixed() || (SbxDataType)(v->GetType() & 0x0FFF ) != t) )
- bByVal = TRUE;
+ bByVal = sal_True;
}
if( bByVal )
{
@@ -709,7 +711,7 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
// Einen P-Code ausfuehren
-BOOL SbiRuntime::Step()
+sal_Bool SbiRuntime::Step()
{
if( bRun )
{
@@ -732,7 +734,7 @@ BOOL SbiRuntime::Step()
}
SbiOpcode eOp = (SbiOpcode ) ( *pCode++ );
- UINT32 nOp1, nOp2;
+ sal_uInt32 nOp1, nOp2;
if( eOp <= SbOP0_END )
{
(this->*( aStep0[ eOp ] ) )();
@@ -782,7 +784,7 @@ BOOL SbiRuntime::Step()
// Im Error Handler? Dann Std-Error
if ( !bInError )
{
- bInError = TRUE;
+ bInError = sal_True;
if( !bError ) // On Error Resume Next
StepRESUME( 1 );
@@ -807,7 +809,7 @@ BOOL SbiRuntime::Step()
while( NULL != (pRt = pRt->pNext) )
{
// Gibt es einen Error-Handler?
- if( pRt->bError == FALSE || pRt->pError != NULL )
+ if( pRt->bError == sal_False || pRt->pError != NULL )
{
pRtErrHdl = pRt;
break;
@@ -830,7 +832,7 @@ BOOL SbiRuntime::Step()
// Fehler setzen
pRt->nError = err;
if( pRt != pRtErrHdl )
- pRt->bRun = FALSE;
+ pRt->bRun = sal_False;
// In Error-Stack eintragen
SbErrorStackEntry *pEntry = new SbErrorStackEntry
@@ -882,11 +884,12 @@ void SbiRuntime::Error( SbError _errCode, const String& _details )
{
if ( _errCode )
{
- OSL_ENSURE( pInst->pRun == this, "SbiRuntime::Error: can't propagate the error message details!" );
+ // Not correct for class module usage, remove for now
+ //OSL_ENSURE( pInst->pRun == this, "SbiRuntime::Error: can't propagate the error message details!" );
if ( pInst->pRun == this )
{
pInst->Error( _errCode, _details );
- OSL_POSTCOND( nError == _errCode, "SbiRuntime::Error: the instance is expecte to propagate the error code back to me!" );
+ //OSL_POSTCOND( nError == _errCode, "SbiRuntime::Error: the instance is expecte to propagate the error code back to me!" );
}
else
{
@@ -918,7 +921,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, String& rMsg )
{
// TEST, has to be vb here always
#ifdef DBG_UTIL
- SbError nTmp = StarBASIC::GetSfxFromVBError( (USHORT)nError );
+ SbError nTmp = StarBASIC::GetSfxFromVBError( (sal_uInt16)nError );
DBG_ASSERT( nTmp, "No VB error!" );
#endif
@@ -928,7 +931,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, String& rMsg )
rMsg = String( RTL_CONSTASCII_USTRINGPARAM("Internal Object Error:") );
}
// no num? most likely then it *is* really a vba err
- USHORT nVBErrorCode = StarBASIC::GetVBErrorCode( nError );
+ sal_uInt16 nVBErrorCode = StarBASIC::GetVBErrorCode( nError );
sal_Int32 nVBAErrorNumber = ( nVBErrorCode == 0 ) ? nError : nVBErrorCode;
return nVBAErrorNumber;
}
@@ -989,7 +992,7 @@ SbxVariableRef SbiRuntime::PopVar()
return xVar;
}
-BOOL SbiRuntime::ClearExprStack()
+sal_Bool SbiRuntime::ClearExprStack()
{
// Achtung: Clear() reicht nicht, da Methods geloescht werden muessen
while ( nExprLvl )
@@ -997,7 +1000,7 @@ BOOL SbiRuntime::ClearExprStack()
PopVar();
}
refExprStk->Clear();
- return FALSE;
+ return sal_False;
}
// Variable auf dem Expression-Stack holen, ohne sie zu entfernen
@@ -1013,7 +1016,7 @@ SbxVariable* SbiRuntime::GetTOS( short n )
return new SbxVariable;
}
#endif
- return refExprStk->Get( (USHORT) n );
+ return refExprStk->Get( (sal_uInt16) n );
}
// Sicherstellen, dass TOS eine temporaere Variable ist
@@ -1048,7 +1051,7 @@ void SbiRuntime::TOSMakeTemp()
}
// Der GOSUB-Stack nimmt Returnadressen fuer GOSUBs auf
-void SbiRuntime::PushGosub( const BYTE* pc )
+void SbiRuntime::PushGosub( const sal_uInt8* pc )
{
if( ++nGosubLvl > MAXRECURSION )
StarBASIC::FatalError( SbERR_STACK_OVERFLOW );
@@ -1185,6 +1188,23 @@ void SbiRuntime::PushForEach()
p->xEnumeration = xEnumerationAccess->createEnumeration();
p->eForType = FOR_EACH_XENUMERATION;
}
+ else if ( isVBAEnabled() && pUnoObj->isNativeCOMObject() )
+ {
+ uno::Reference< script::XInvocation > xInvocation;
+ if ( ( aAny >>= xInvocation ) && xInvocation.is() )
+ {
+ try
+ {
+ p->xEnumeration = new ComEnumerationWrapper( xInvocation );
+ p->eForType = FOR_EACH_XENUMERATION;
+ }
+ catch( uno::Exception& )
+ {}
+ }
+
+ if ( !p->xEnumeration.is() )
+ bError_ = true;
+ }
else
{
bError_ = true;
@@ -1238,7 +1258,7 @@ void SbiRuntime::DllCall
const String& aDLLName, // Name der DLL
SbxArray* pArgs, // Parameter (ab Index 1, kann NULL sein)
SbxDataType eResType, // Returnwert
- BOOL bCDecl ) // TRUE: nach C-Konventionen
+ sal_Bool bCDecl ) // sal_True: nach C-Konventionen
{
// No DllCall for "virtual" portal users
if( needSecurityRestrictions() )
@@ -1265,13 +1285,13 @@ void SbiRuntime::DllCall
Error( nErr );
PushVar( pRes );
}
-USHORT
-SbiRuntime::GetImageFlag( USHORT n ) const
+
+sal_uInt16 SbiRuntime::GetImageFlag( sal_uInt16 n ) const
{
return pImg->GetFlag( n );
}
-USHORT
-SbiRuntime::GetBase()
+
+sal_uInt16 SbiRuntime::GetBase()
{
return pImg->GetBase();
}
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index f2f51c4406c7..40a1fa911437 100644..100755
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -68,7 +68,7 @@ struct Methods {
SbxDataType eType; // Datentyp
short nArgs; // Argumente und Flags
RtlCall pFunc; // Function Pointer
- USHORT nHash; // Hashcode
+ sal_uInt16 nHash; // Hashcode
};
struct StringHashCode
@@ -135,6 +135,10 @@ static Methods aMethods[] = {
{ "Blue", SbxINTEGER, 1 | _FUNCTION, RTLNAME(Blue),0 },
{ "RGB-Value", SbxLONG, 0,NULL,0 },
+{ "CallByName", SbxVARIANT, 3 | _FUNCTION, RTLNAME(CallByName),0 },
+ { "Object", SbxOBJECT, 0,NULL,0 },
+ { "ProcedureName",SbxSTRING, 0,NULL,0 },
+ { "CallType", SbxINTEGER, 0,NULL,0 },
{ "CBool", SbxBOOL, 1 | _FUNCTION, RTLNAME(CBool),0 },
{ "expression", SbxVARIANT, 0,NULL,0 },
{ "CByte", SbxBYTE, 1 | _FUNCTION, RTLNAME(CByte),0 },
@@ -645,6 +649,10 @@ static Methods aMethods[] = {
{ "TimeValue", SbxDATE, 1 | _FUNCTION, RTLNAME(TimeValue),0 },
{ "String", SbxSTRING, 0,NULL,0 },
{ "TOGGLE", SbxINTEGER, _CPROP, RTLNAME(TOGGLE),0 },
+#ifdef DBG_TRACE_BASIC
+{ "TraceCommand", SbxNULL, 1 | _FUNCTION, RTLNAME(TraceCommand),0 },
+ { "Command", SbxSTRING, 0,NULL,0 },
+#endif
{ "Trim", SbxSTRING, 1 | _FUNCTION, RTLNAME(Trim),0 },
{ "String", SbxSTRING, 0,NULL,0 },
{ "True", SbxBOOL, _CPROP, RTLNAME(True),0 },
@@ -780,11 +788,11 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
if( !pVar )
{
// sonst suchen
- USHORT nHash_ = SbxVariable::MakeHashCode( rName );
+ sal_uInt16 nHash_ = SbxVariable::MakeHashCode( rName );
Methods* p = aMethods;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
short nIndex = 0;
- USHORT nSrchMask = _TYPEMASK;
+ sal_uInt16 nSrchMask = _TYPEMASK;
switch( t )
{
case SbxCLASS_METHOD: nSrchMask = _METHOD; break;
@@ -799,14 +807,14 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
&& ( rName.EqualsIgnoreCaseAscii( p->pName ) ) )
{
SbiInstance* pInst = pINST;
- bFound = TRUE;
+ bFound = sal_True;
if( p->nArgs & _COMPTMASK )
{
if( !pInst || !pInst->IsCompatibility() )
- bFound = FALSE;
+ bFound = sal_False;
}
if ( pInst && pInst->IsCompatibility() && VBABlackListQuery::isBlackListed( rName ) )
- bFound = FALSE;
+ bFound = sal_False;
break;
}
nIndex += ( p->nArgs & _ARGSMASK ) + 1;
@@ -834,8 +842,8 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
return pVar;
}
-// SetModified mu bei der RTL abgklemmt werden
-void SbiStdObject::SetModified( BOOL )
+// SetModified mu� bei der RTL abgklemmt werden
+void SbiStdObject::SetModified( sal_Bool )
{
}
@@ -850,17 +858,17 @@ void SbiStdObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- ULONG t = pHint->GetId();
- USHORT nCallId = (USHORT) pVar->GetUserData();
+ sal_uIntPtr t = pHint->GetId();
+ sal_uInt16 nCallId = (sal_uInt16) pVar->GetUserData();
if( nCallId )
{
if( t == SBX_HINT_INFOWANTED )
pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
else
{
- BOOL bWrite = FALSE;
+ sal_Bool bWrite = sal_False;
if( t == SBX_HINT_DATACHANGED )
- bWrite = TRUE;
+ bWrite = sal_True;
if( t == SBX_HINT_DATAWANTED || bWrite )
{
RtlCall p = (RtlCall) aMethods[ nCallId-1 ].pFunc;
@@ -895,7 +903,7 @@ SbxInfo* SbiStdObject::GetInfo( short nIdx )
{
p++;
String aName_ = String::CreateFromAscii( p->pName );
- USHORT nFlags_ = ( p->nArgs >> 8 ) & 0x03;
+ sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03;
if( p->nArgs & _OPT )
nFlags_ |= SBX_OPTIONAL;
pInfo_->AddParam( aName_, p->eType, nFlags_ );
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 28bda15bcacc..10b4269227c9 100644..100755
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -72,7 +72,7 @@ SbxObject* SbStdFactory::CreateObject( const String& rClassName )
-void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
{
@@ -81,7 +81,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
}
GraphicType eType = aGraphic.GetType();
- INT16 nType = 0;
+ sal_Int16 nType = 0;
if( eType == GRAPHIC_BITMAP )
nType = 1;
@@ -93,7 +93,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, BOOL bWrite )
}
-void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
{
@@ -105,10 +105,10 @@ void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, BOOL bWrite )
aSize = GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() );
aSize = GetpApp()->GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
- pVar->PutInteger( (INT16)aSize.Width() );
+ pVar->PutInteger( (sal_Int16)aSize.Width() );
}
-void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
{
@@ -120,7 +120,7 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, BOOL bWrite )
aSize = GetpApp()->GetAppWindow()->LogicToPixel( aSize, aGraphic.GetPrefMapMode() );
aSize = GetpApp()->GetAppWindow()->PixelToLogic( aSize, MapMode( MAP_TWIP ) );
- pVar->PutInteger( (INT16)aSize.Height() );
+ pVar->PutInteger( (sal_Int16)aSize.Height() );
}
@@ -170,8 +170,8 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- USHORT nWhich = (USHORT)pVar->GetUserData();
- BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+ sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData();
+ sal_Bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
// Propteries
switch( nWhich )
@@ -187,7 +187,7 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
//-----------------------------------------------------------------------------
-void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
SetBold( pVar->GetBool() );
@@ -195,7 +195,7 @@ void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, BOOL bWrite )
pVar->PutBool( IsBold() );
}
-void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
SetItalic( pVar->GetBool() );
@@ -203,7 +203,7 @@ void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, BOOL bWrite )
pVar->PutBool( IsItalic() );
}
-void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
SetStrikeThrough( pVar->GetBool() );
@@ -211,7 +211,7 @@ void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, BOOL bWrite )
pVar->PutBool( IsStrikeThrough() );
}
-void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
SetUnderline( pVar->GetBool() );
@@ -219,15 +219,15 @@ void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, BOOL bWrite )
pVar->PutBool( IsUnderline() );
}
-void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
- SetSize( (USHORT)pVar->GetInteger() );
+ SetSize( (sal_uInt16)pVar->GetInteger() );
else
- pVar->PutInteger( (INT16)GetSize() );
+ pVar->PutInteger( (sal_Int16)GetSize() );
}
-void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, BOOL bWrite )
+void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, sal_Bool bWrite )
{
if( bWrite )
SetFontName( pVar->GetString() );
@@ -292,8 +292,8 @@ void SbStdFont::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- USHORT nWhich = (USHORT)pVar->GetUserData();
- BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+ sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData();
+ sal_Bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
// Propteries
switch( nWhich )
@@ -349,7 +349,7 @@ sal_Bool TransferableHelperImpl::GetData( const ::com::sun::star::datatransfer::
}
*/
-void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, sal_Bool )
{
if( pPar_ && (pPar_->Count() > 1) )
{
@@ -360,7 +360,7 @@ void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, BOOL )
//Clipboard::Clear();
}
-void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
(void)pVar;
@@ -370,7 +370,7 @@ void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
return;
}
- USHORT nFormat = pPar_->Get(1)->GetInteger();
+ sal_uInt16 nFormat = pPar_->Get(1)->GetInteger();
if( !nFormat || nFormat > 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -393,7 +393,7 @@ void SbStdClipboard::MethGetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
*/
}
-void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
if( !pPar_ || (pPar_->Count() != 2) )
{
@@ -401,18 +401,18 @@ void SbStdClipboard::MethGetFormat( SbxVariable* pVar, SbxArray* pPar_, BOOL )
return;
}
- USHORT nFormat = pPar_->Get(1)->GetInteger();
+ sal_uInt16 nFormat = pPar_->Get(1)->GetInteger();
if( !nFormat || nFormat > 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
- pVar->PutBool( FALSE );
+ pVar->PutBool( sal_False );
//pVar->PutBool( Clipboard::HasFormat( nFormat ) );
}
-void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
if( pPar_ && (pPar_->Count() > 1) )
{
@@ -424,7 +424,7 @@ void SbStdClipboard::MethGetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
//pVar->PutString( Clipboard::PasteString() );
}
-void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
(void)pVar;
@@ -434,7 +434,7 @@ void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
return;
}
- USHORT nFormat = pPar_->Get(2)->GetInteger();
+ sal_uInt16 nFormat = pPar_->Get(2)->GetInteger();
if( !nFormat || nFormat > 3 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -458,7 +458,7 @@ void SbStdClipboard::MethSetData( SbxVariable* pVar, SbxArray* pPar_, BOOL )
*/
}
-void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
(void)pVar;
@@ -531,8 +531,8 @@ void SbStdClipboard::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- USHORT nWhich = (USHORT)pVar->GetUserData();
- BOOL bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
+ sal_uInt16 nWhich = (sal_uInt16)pVar->GetUserData();
+ sal_Bool bWrite = pHint->GetId() == SBX_HINT_DATACHANGED;
// Methods
switch( nWhich )
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 156df6aa7e38..520df18ecdd5 100644..100755
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -48,6 +48,7 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::
const ::rtl::OUString& aPrefix, SbxObjectRef xScopeObj );
#include <algorithm>
+#include <boost/unordered_map.hpp>
// for a patch forward declaring these methods below makes sense
// but, #FIXME lets really just move the methods to the top
@@ -121,7 +122,6 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
}
}
-#ifndef WIN
static SbxVariable* pTRUE = NULL;
static SbxVariable* pFALSE = NULL;
static SbxVariable* pNULL = NULL;
@@ -143,7 +143,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
if( !pTRUE )
{
pTRUE = new SbxVariable;
- pTRUE->PutBool( TRUE );
+ pTRUE->PutBool( sal_True );
pTRUE->AddRef();
}
PushVar( pTRUE );
@@ -153,22 +153,11 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
if( !pFALSE )
{
pFALSE = new SbxVariable;
- pFALSE->PutBool( FALSE );
+ pFALSE->PutBool( sal_False );
pFALSE->AddRef();
}
PushVar( pFALSE );
}
-#else
- SbxVariable* pRes = new SbxVariable;
- if ( bVBAEnabled && ( p1->IsNull() || p2->IsNull() ) )
- pRes->PutNull();
- else
- {
- BOOL bRes = p2->Compare( eOp, *p1 );
- pRes->PutBool( bRes );
- }
- PushVar( pRes );
-#endif
}
void SbiRuntime::StepEXP() { StepArith( SbxEXP ); }
@@ -327,7 +316,7 @@ void SbiRuntime::StepIS()
eType2 = refVar2->GetType();
}
- BOOL bRes = BOOL( eType1 == SbxOBJECT && eType2 == SbxOBJECT );
+ sal_Bool bRes = sal_Bool( eType1 == SbxOBJECT && eType2 == SbxOBJECT );
if ( bVBAEnabled && !bRes )
Error( SbERR_INVALID_USAGE_OBJECT );
bRes = ( bRes && refVar1->GetObject() == refVar2->GetObject() );
@@ -386,11 +375,11 @@ void SbiRuntime::StepPUT()
SbxVariableRef refVal = PopVar();
SbxVariableRef refVar = PopVar();
// Store auf die eigene Methode (innerhalb einer Function)?
- BOOL bFlagsChanged = FALSE;
- USHORT n = 0;
+ sal_Bool bFlagsChanged = sal_False;
+ sal_uInt16 n = 0;
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
{
- bFlagsChanged = TRUE;
+ bFlagsChanged = sal_True;
n = refVar->GetFlags();
refVar->SetFlag( SBX_WRITE );
}
@@ -426,9 +415,54 @@ void SbiRuntime::StepPUT()
}
+// VBA Dim As New behavior handling, save init object information
+struct DimAsNewRecoverItem
+{
+ String m_aObjClass;
+ String m_aObjName;
+ SbxObject* m_pObjParent;
+ SbModule* m_pClassModule;
+
+ DimAsNewRecoverItem( void )
+ : m_pObjParent( NULL )
+ , m_pClassModule( NULL )
+ {}
+
+ DimAsNewRecoverItem( const String& rObjClass, const String& rObjName,
+ SbxObject* pObjParent, SbModule* pClassModule )
+ : m_aObjClass( rObjClass )
+ , m_aObjName( rObjName )
+ , m_pObjParent( pObjParent )
+ , m_pClassModule( pClassModule )
+ {}
+
+};
+
+
+struct SbxVariablePtrHash
+{
+ size_t operator()( SbxVariable* pVar ) const
+ { return (size_t)pVar; }
+};
+
+typedef boost::unordered_map< SbxVariable*, DimAsNewRecoverItem,
+ SbxVariablePtrHash > DimAsNewRecoverHash;
+
+static DimAsNewRecoverHash GaDimAsNewRecoverHash;
+
+void removeDimAsNewRecoverItem( SbxVariable* pVar )
+{
+ DimAsNewRecoverHash::iterator it = GaDimAsNewRecoverHash.find( pVar );
+ if( it != GaDimAsNewRecoverHash.end() )
+ GaDimAsNewRecoverHash.erase( it );
+}
+
+
// Speichern Objektvariable
// Nicht-Objekt-Variable fuehren zu Fehlern
+static const char pCollectionStr[] = "Collection";
+
void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, bool bHandleDefaultProp )
{
// #67733 Typen mit Array-Flag sind auch ok
@@ -478,11 +512,11 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
else
{
// Store auf die eigene Methode (innerhalb einer Function)?
- BOOL bFlagsChanged = FALSE;
- USHORT n = 0;
+ sal_Bool bFlagsChanged = sal_False;
+ sal_uInt16 n = 0;
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
{
- bFlagsChanged = TRUE;
+ bFlagsChanged = sal_True;
n = refVar->GetFlags();
refVar->SetFlag( SBX_WRITE );
}
@@ -531,8 +565,14 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
}
}
+ // Handle Dim As New
+ sal_Bool bDimAsNew = bVBAEnabled && refVar->IsSet( SBX_DIM_AS_NEW );
+ SbxBaseRef xPrevVarObj;
+ if( bDimAsNew )
+ xPrevVarObj = refVar->GetObject();
+
// Handle withevents
- BOOL bWithEvents = refVar->IsSet( SBX_WITH_EVENTS );
+ sal_Bool bWithEvents = refVar->IsSet( SBX_WITH_EVENTS );
if ( bWithEvents )
{
Reference< XInterface > xComListener;
@@ -549,7 +589,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
xComListener = createComListener( aControlAny, aVBAType, aPrefix, xScopeObj );
refVal->SetDeclareClassName( aDeclareClassName );
- refVal->SetComListener( xComListener ); // Hold reference
+ refVal->SetComListener( xComListener, &rBasic ); // Hold reference
}
*refVar = *refVal;
@@ -559,6 +599,68 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
*refVar = *refVal;
}
+ if ( bDimAsNew )
+ {
+ if( !refVar->ISA(SbxObject) )
+ {
+ SbxBase* pValObjBase = refVal->GetObject();
+ if( pValObjBase == NULL )
+ {
+ if( xPrevVarObj.Is() )
+ {
+ // Object is overwritten with NULL, instantiate init object
+ DimAsNewRecoverHash::iterator it = GaDimAsNewRecoverHash.find( refVar );
+ if( it != GaDimAsNewRecoverHash.end() )
+ {
+ const DimAsNewRecoverItem& rItem = it->second;
+ if( rItem.m_pClassModule != NULL )
+ {
+ SbClassModuleObject* pNewObj = new SbClassModuleObject( rItem.m_pClassModule );
+ pNewObj->SetName( rItem.m_aObjName );
+ pNewObj->SetParent( rItem.m_pObjParent );
+ refVar->PutObject( pNewObj );
+ }
+ else if( rItem.m_aObjClass.EqualsIgnoreCaseAscii( pCollectionStr ) )
+ {
+ BasicCollection* pNewCollection = new BasicCollection( String( RTL_CONSTASCII_USTRINGPARAM(pCollectionStr) ) );
+ pNewCollection->SetName( rItem.m_aObjName );
+ pNewCollection->SetParent( rItem.m_pObjParent );
+ refVar->PutObject( pNewCollection );
+ }
+ }
+ }
+ }
+ else
+ {
+ // Does old value exist?
+ bool bFirstInit = !xPrevVarObj.Is();
+ if( bFirstInit )
+ {
+ // Store information to instantiate object later
+ SbxObject* pValObj = PTR_CAST(SbxObject,pValObjBase);
+ if( pValObj != NULL )
+ {
+ String aObjClass = pValObj->GetClassName();
+
+ SbClassModuleObject* pClassModuleObj = PTR_CAST(SbClassModuleObject,pValObjBase);
+ if( pClassModuleObj != NULL )
+ {
+ SbModule* pClassModule = pClassModuleObj->getClassModule();
+ GaDimAsNewRecoverHash[refVar] =
+ DimAsNewRecoverItem( aObjClass, pValObj->GetName(), pValObj->GetParent(), pClassModule );
+ }
+ else if( aObjClass.EqualsIgnoreCaseAscii( "Collection" ) )
+ {
+ GaDimAsNewRecoverHash[refVar] =
+ DimAsNewRecoverItem( aObjClass, pValObj->GetName(), pValObj->GetParent(), NULL );
+ }
+ }
+ }
+ }
+ }
+ }
+
+
// lhs is a property who's value is currently (Empty e.g. no broadcast yet)
// in this case if there is a default prop involved the value of the
// default property may infact be void so the type will also be SbxEMPTY
@@ -599,14 +701,14 @@ void SbiRuntime::StepLSET()
else
{
// Store auf die eigene Methode (innerhalb einer Function)?
- USHORT n = refVar->GetFlags();
+ sal_uInt16 n = refVar->GetFlags();
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
refVar->SetFlag( SBX_WRITE );
String aRefVarString = refVar->GetString();
String aRefValString = refVal->GetString();
- USHORT nVarStrLen = aRefVarString.Len();
- USHORT nValStrLen = aRefValString.Len();
+ sal_uInt16 nVarStrLen = aRefVarString.Len();
+ sal_uInt16 nValStrLen = aRefValString.Len();
String aNewStr;
if( nVarStrLen > nValStrLen )
{
@@ -635,14 +737,14 @@ void SbiRuntime::StepRSET()
else
{
// Store auf die eigene Methode (innerhalb einer Function)?
- USHORT n = refVar->GetFlags();
+ sal_uInt16 n = refVar->GetFlags();
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
refVar->SetFlag( SBX_WRITE );
String aRefVarString = refVar->GetString();
String aRefValString = refVal->GetString();
- USHORT nPos = 0;
- USHORT nVarStrLen = aRefVarString.Len();
+ sal_uInt16 nPos = 0;
+ sal_uInt16 nVarStrLen = aRefVarString.Len();
if( nVarStrLen > aRefValString.Len() )
{
aRefVarString.Fill(nVarStrLen,' ');
@@ -703,10 +805,10 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar )
// AB 2.4.1996, auch Arrays ohne Dimensionsangaben zulassen (VB-komp.)
if( pDims )
{
- for( USHORT i = 1; i < pDims->Count(); )
+ for( sal_uInt16 i = 1; i < pDims->Count(); )
{
- INT32 lb = pDims->Get( i++ )->GetLong();
- INT32 ub = pDims->Get( i++ )->GetLong();
+ sal_Int32 lb = pDims->Get( i++ )->GetLong();
+ sal_Int32 ub = pDims->Get( i++ )->GetLong();
if( ub < lb )
Error( SbERR_OUT_OF_RANGE ), ub = lb;
pArray->AddDim32( lb, ub );
@@ -720,7 +822,7 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar )
// Uno-Sequences der Laenge 0 eine Dimension anlegen
pArray->unoAddDim( 0, -1 );
}
- USHORT nSavFlags = refVar->GetFlags();
+ sal_uInt16 nSavFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->PutObject( pArray );
refVar->SetFlags( nSavFlags );
@@ -782,7 +884,7 @@ void SbiRuntime::StepREDIMP()
short nDimsNew = pNewArray->GetDims();
short nDimsOld = pOldArray->GetDims();
short nDims = nDimsNew;
- BOOL bRangeError = FALSE;
+ sal_Bool bRangeError = sal_False;
// Store dims to use them for copying later
sal_Int32* pLowerBounds = new sal_Int32[nDims];
@@ -791,7 +893,7 @@ void SbiRuntime::StepREDIMP()
if( nDimsOld != nDimsNew )
{
- bRangeError = TRUE;
+ bRangeError = sal_True;
}
else
{
@@ -808,7 +910,7 @@ void SbiRuntime::StepREDIMP()
// All bounds but the last have to be the same
if( i < nDims && ( lBoundNew != lBoundOld || uBoundNew != uBoundOld ) )
{
- bRangeError = TRUE;
+ bRangeError = sal_True;
break;
}
else
@@ -877,7 +979,7 @@ void SbiRuntime::StepREDIMP_ERASE()
void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType )
{
- USHORT nSavFlags = refVar->GetFlags();
+ sal_uInt16 nSavFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->SetType( SbxDataType(eType & 0x0FFF) );
refVar->SetFlags( nSavFlags );
@@ -1046,7 +1148,7 @@ void SbiRuntime::StepINPUT()
// zu fuellen, dann mit einem Stringwert
if( !pVar->IsFixed() || pVar->IsNumeric() )
{
- USHORT nLen = 0;
+ sal_uInt16 nLen = 0;
if( !pVar->Scan( s, &nLen ) )
{
err = SbxBase::GetError();
@@ -1169,7 +1271,7 @@ void SbiRuntime::StepENDCASE()
void SbiRuntime::StepSTDERROR()
{
- pError = NULL; bError = TRUE;
+ pError = NULL; bError = sal_True;
pInst->aErrorMsg = String();
pInst->nErr = 0L;
pInst->nErl = 0;
@@ -1184,14 +1286,14 @@ void SbiRuntime::StepNOERROR()
pInst->nErl = 0;
nError = 0L;
SbxErrObject::getUnoErrObject()->Clear();
- bError = FALSE;
+ bError = sal_False;
}
// UP verlassen
void SbiRuntime::StepLEAVE()
{
- bRun = FALSE;
+ bRun = sal_False;
// If VBA and we are leaving an ErrorHandler then clear the error ( it's been processed )
if ( bInError && pError )
SbxErrObject::getUnoErrObject()->Clear();
@@ -1326,7 +1428,7 @@ void SbiRuntime::StepEMPTY()
void SbiRuntime::StepERROR()
{
SbxVariableRef refCode = PopVar();
- USHORT n = refCode->GetUShort();
+ sal_uInt16 n = refCode->GetUShort();
SbError error = StarBASIC::GetSfxFromVBError( n );
if ( bVBAEnabled )
pInst->Error( error );
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index e023750cc27a..659152548e53 100644..100755
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -44,14 +44,14 @@ bool checkUnoObjectType( SbUnoObject* refVal,
// Laden einer numerischen Konstanten (+ID)
-void SbiRuntime::StepLOADNC( UINT32 nOp1 )
+void SbiRuntime::StepLOADNC( sal_uInt32 nOp1 )
{
SbxVariable* p = new SbxVariable( SbxDOUBLE );
// #57844 Lokalisierte Funktion benutzen
String aStr = pImg->GetString( static_cast<short>( nOp1 ) );
// Auch , zulassen !!!
- USHORT iComma = aStr.Search( ',' );
+ sal_uInt16 iComma = aStr.Search( ',' );
if( iComma != STRING_NOTFOUND )
{
String aStr1 = aStr.Copy( 0, iComma );
@@ -68,7 +68,7 @@ void SbiRuntime::StepLOADNC( UINT32 nOp1 )
// Laden einer Stringkonstanten (+ID)
-void SbiRuntime::StepLOADSC( UINT32 nOp1 )
+void SbiRuntime::StepLOADSC( sal_uInt32 nOp1 )
{
SbxVariable* p = new SbxVariable;
p->PutString( pImg->GetString( static_cast<short>( nOp1 ) ) );
@@ -77,16 +77,16 @@ void SbiRuntime::StepLOADSC( UINT32 nOp1 )
// Immediate Load (+Wert)
-void SbiRuntime::StepLOADI( UINT32 nOp1 )
+void SbiRuntime::StepLOADI( sal_uInt32 nOp1 )
{
SbxVariable* p = new SbxVariable;
- p->PutInteger( static_cast<INT16>( nOp1 ) );
+ p->PutInteger( static_cast<sal_Int16>( nOp1 ) );
PushVar( p );
}
// Speichern eines named Arguments in Argv (+Arg-Nr ab 1!)
-void SbiRuntime::StepARGN( UINT32 nOp1 )
+void SbiRuntime::StepARGN( sal_uInt32 nOp1 )
{
if( !refArgv )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -110,18 +110,18 @@ void SbiRuntime::StepARGN( UINT32 nOp1 )
// Konvertierung des Typs eines Arguments in Argv fuer DECLARE-Fkt. (+Typ)
-void SbiRuntime::StepARGTYP( UINT32 nOp1 )
+void SbiRuntime::StepARGTYP( sal_uInt32 nOp1 )
{
if( !refArgv )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
else
{
- BOOL bByVal = (nOp1 & 0x8000) != 0; // Ist BYVAL verlangt?
+ sal_Bool bByVal = (nOp1 & 0x8000) != 0; // Ist BYVAL verlangt?
SbxDataType t = (SbxDataType) (nOp1 & 0x7FFF);
SbxVariable* pVar = refArgv->Get( refArgv->Count() - 1 ); // letztes Arg
- // BYVAL prfen
- if( pVar->GetRefCount() > 2 ) // 2 ist normal fr BYVAL
+ // BYVAL pr�fen
+ if( pVar->GetRefCount() > 2 ) // 2 ist normal f�r BYVAL
{
// Parameter ist eine Referenz
if( bByVal )
@@ -132,7 +132,7 @@ void SbiRuntime::StepARGTYP( UINT32 nOp1 )
refExprStk->Put( pVar, refArgv->Count() - 1 );
}
else
- pVar->SetFlag( SBX_REFERENCE ); // Ref-Flag fr DllMgr
+ pVar->SetFlag( SBX_REFERENCE ); // Ref-Flag f�r DllMgr
}
else
{
@@ -155,7 +155,7 @@ void SbiRuntime::StepARGTYP( UINT32 nOp1 )
// String auf feste Laenge bringen (+Laenge)
-void SbiRuntime::StepPAD( UINT32 nOp1 )
+void SbiRuntime::StepPAD( sal_uInt32 nOp1 )
{
SbxVariable* p = GetTOS();
String& s = (String&)(const String&) *p;
@@ -167,20 +167,20 @@ void SbiRuntime::StepPAD( UINT32 nOp1 )
// Sprung (+Target)
-void SbiRuntime::StepJUMP( UINT32 nOp1 )
+void SbiRuntime::StepJUMP( sal_uInt32 nOp1 )
{
#ifdef DBG_UTIL
// #QUESTION shouln't this be
- // if( (BYTE*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() )
+ // if( (sal_uInt8*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() )
if( nOp1 >= pImg->GetCodeSize() )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
#endif
- pCode = (const BYTE*) pImg->GetCode() + nOp1;
+ pCode = (const sal_uInt8*) pImg->GetCode() + nOp1;
}
// TOS auswerten, bedingter Sprung (+Target)
-void SbiRuntime::StepJUMPT( UINT32 nOp1 )
+void SbiRuntime::StepJUMPT( sal_uInt32 nOp1 )
{
SbxVariableRef p = PopVar();
if( p->GetBool() )
@@ -189,7 +189,7 @@ void SbiRuntime::StepJUMPT( UINT32 nOp1 )
// TOS auswerten, bedingter Sprung (+Target)
-void SbiRuntime::StepJUMPF( UINT32 nOp1 )
+void SbiRuntime::StepJUMPF( sal_uInt32 nOp1 )
{
SbxVariableRef p = PopVar();
// In a test e.g. If Null then
@@ -206,36 +206,36 @@ void SbiRuntime::StepJUMPF( UINT32 nOp1 )
// ...
//Falls im Operanden 0x8000 gesetzt ist, Returnadresse pushen (ON..GOSUB)
-void SbiRuntime::StepONJUMP( UINT32 nOp1 )
+void SbiRuntime::StepONJUMP( sal_uInt32 nOp1 )
{
SbxVariableRef p = PopVar();
- INT16 n = p->GetInteger();
+ sal_Int16 n = p->GetInteger();
if( nOp1 & 0x8000 )
{
nOp1 &= 0x7FFF;
//PushGosub( pCode + 3 * nOp1 );
PushGosub( pCode + 5 * nOp1 );
}
- if( n < 1 || static_cast<UINT32>(n) > nOp1 )
- n = static_cast<INT16>( nOp1 + 1 );
- //nOp1 = (UINT32) ( (const char*) pCode - pImg->GetCode() ) + 3 * --n;
- nOp1 = (UINT32) ( (const char*) pCode - pImg->GetCode() ) + 5 * --n;
+ if( n < 1 || static_cast<sal_uInt32>(n) > nOp1 )
+ n = static_cast<sal_Int16>( nOp1 + 1 );
+ //nOp1 = (sal_uInt32) ( (const char*) pCode - pImg->GetCode() ) + 3 * --n;
+ nOp1 = (sal_uInt32) ( (const char*) pCode - pImg->GetCode() ) + 5 * --n;
StepJUMP( nOp1 );
}
// UP-Aufruf (+Target)
-void SbiRuntime::StepGOSUB( UINT32 nOp1 )
+void SbiRuntime::StepGOSUB( sal_uInt32 nOp1 )
{
PushGosub( pCode );
if( nOp1 >= pImg->GetCodeSize() )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
- pCode = (const BYTE*) pImg->GetCode() + nOp1;
+ pCode = (const sal_uInt8*) pImg->GetCode() + nOp1;
}
// UP-Return (+0 oder Target)
-void SbiRuntime::StepRETURN( UINT32 nOp1 )
+void SbiRuntime::StepRETURN( sal_uInt32 nOp1 )
{
PopGosub();
if( nOp1 )
@@ -244,7 +244,7 @@ void SbiRuntime::StepRETURN( UINT32 nOp1 )
// FOR-Variable testen (+Endlabel)
-void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
+void SbiRuntime::StepTESTFOR( sal_uInt32 nOp1 )
{
if( !pForStk )
{
@@ -307,7 +307,7 @@ void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
{
BasicCollection* pCollection = (BasicCollection*)(SbxVariable*)pForStk->refEnd;
SbxArrayRef xItemArray = pCollection->xItemArray;
- INT32 nCount = xItemArray->Count32();
+ sal_Int32 nCount = xItemArray->Count32();
if( pForStk->nCurCollectionIndex < nCount )
{
SbxVariable* pRes = xItemArray->Get32( pForStk->nCurCollectionIndex );
@@ -346,7 +346,7 @@ void SbiRuntime::StepTESTFOR( UINT32 nOp1 )
// Tos+1 <= Tos+2 <= Tos, 2xremove (+Target)
-void SbiRuntime::StepCASETO( UINT32 nOp1 )
+void SbiRuntime::StepCASETO( sal_uInt32 nOp1 )
{
if( !refCaseStk || !refCaseStk->Count() )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -362,9 +362,9 @@ void SbiRuntime::StepCASETO( UINT32 nOp1 )
// Fehler-Handler
-void SbiRuntime::StepERRHDL( UINT32 nOp1 )
+void SbiRuntime::StepERRHDL( sal_uInt32 nOp1 )
{
- const BYTE* p = pCode;
+ const sal_uInt8* p = pCode;
StepJUMP( nOp1 );
pError = pCode;
pCode = p;
@@ -377,7 +377,7 @@ void SbiRuntime::StepERRHDL( UINT32 nOp1 )
// Resume nach Fehlern (+0=statement, 1=next or Label)
-void SbiRuntime::StepRESUME( UINT32 nOp1 )
+void SbiRuntime::StepRESUME( sal_uInt32 nOp1 )
{
// AB #32714 Resume ohne Error? -> Fehler
if( !bInError )
@@ -388,8 +388,8 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
if( nOp1 )
{
// Code-Zeiger auf naechstes Statement setzen
- USHORT n1, n2;
- pCode = pMod->FindNextStmnt( pErrCode, n1, n2, TRUE, pImg );
+ sal_uInt16 n1, n2;
+ pCode = pMod->FindNextStmnt( pErrCode, n1, n2, sal_True, pImg );
}
else
pCode = pErrStmnt;
@@ -402,7 +402,7 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
pInst->nErr = 0;
pInst->nErl = 0;
nError = 0;
- bInError = FALSE;
+ bInError = sal_False;
// Error-Stack loeschen
SbErrorStack*& rErrStack = GetSbData()->pErrStack;
@@ -411,7 +411,7 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 )
}
// Kanal schliessen (+Kanal, 0=Alle)
-void SbiRuntime::StepCLOSE( UINT32 nOp1 )
+void SbiRuntime::StepCLOSE( sal_uInt32 nOp1 )
{
SbError err;
if( !nOp1 )
@@ -430,7 +430,7 @@ void SbiRuntime::StepCLOSE( UINT32 nOp1 )
// Zeichen ausgeben (+char)
-void SbiRuntime::StepPRCHAR( UINT32 nOp1 )
+void SbiRuntime::StepPRCHAR( sal_uInt32 nOp1 )
{
ByteString s( (char) nOp1 );
pIosys->Write( s );
@@ -521,7 +521,7 @@ bool SbiRuntime::checkClass_Impl( const SbxVariableRef& refVal,
return bOk;
}
-void SbiRuntime::StepSETCLASS_impl( UINT32 nOp1, bool bHandleDflt )
+void SbiRuntime::StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt )
{
SbxVariableRef refVal = PopVar();
SbxVariableRef refVar = PopVar();
@@ -532,17 +532,17 @@ void SbiRuntime::StepSETCLASS_impl( UINT32 nOp1, bool bHandleDflt )
StepSET_Impl( refVal, refVar, bHandleDflt ); // don't do handle dflt prop for a "proper" set
}
-void SbiRuntime::StepVBASETCLASS( UINT32 nOp1 )
+void SbiRuntime::StepVBASETCLASS( sal_uInt32 nOp1 )
{
StepSETCLASS_impl( nOp1, false );
}
-void SbiRuntime::StepSETCLASS( UINT32 nOp1 )
+void SbiRuntime::StepSETCLASS( sal_uInt32 nOp1 )
{
StepSETCLASS_impl( nOp1, true );
}
-void SbiRuntime::StepTESTCLASS( UINT32 nOp1 )
+void SbiRuntime::StepTESTCLASS( sal_uInt32 nOp1 )
{
SbxVariableRef xObjVal = PopVar();
String aClass( pImg->GetString( static_cast<short>( nOp1 ) ) );
@@ -556,7 +556,7 @@ void SbiRuntime::StepTESTCLASS( UINT32 nOp1 )
// Library fuer anschliessenden Declare-Call definieren
-void SbiRuntime::StepLIB( UINT32 nOp1 )
+void SbiRuntime::StepLIB( sal_uInt32 nOp1 )
{
aLibName = pImg->GetString( static_cast<short>( nOp1 ) );
}
@@ -565,14 +565,14 @@ void SbiRuntime::StepLIB( UINT32 nOp1 )
// Dieser Opcode wird vor DIM/REDIM-Anweisungen gepusht,
// wenn nur ein Index angegeben wurde.
-void SbiRuntime::StepBASED( UINT32 nOp1 )
+void SbiRuntime::StepBASED( sal_uInt32 nOp1 )
{
SbxVariable* p1 = new SbxVariable;
SbxVariableRef x2 = PopVar();
// #109275 Check compatiblity mode
bool bCompatible = ((nOp1 & 0x8000) != 0);
- USHORT uBase = static_cast<USHORT>(nOp1 & 1); // Can only be 0 or 1
+ sal_uInt16 uBase = static_cast<sal_uInt16>(nOp1 & 1); // Can only be 0 or 1
p1->PutInteger( uBase );
if( !bCompatible )
x2->Compute( SbxPLUS, *p1 );
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 543c69a34b97..2b8dbc71cf03 100644..100755
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -57,7 +57,7 @@ SbxVariable* getVBAConstant( const String& rName );
// 0x8000 - Argv ist belegt
SbxVariable* SbiRuntime::FindElement
- ( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal, BOOL bStatic )
+ ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, sal_Bool bLocal, sal_Bool bStatic )
{
bool bIsVBAInterOp = SbiRuntime::isVBAEnabled();
if( bIsVBAInterOp )
@@ -75,7 +75,7 @@ SbxVariable* SbiRuntime::FindElement
}
else
{
- BOOL bFatalError = FALSE;
+ sal_Bool bFatalError = sal_False;
SbxDataType t = (SbxDataType) nOp2;
String aName( pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) ) );
// Hacky capture of Evaluate [] syntax
@@ -108,8 +108,8 @@ SbxVariable* SbiRuntime::FindElement
if( !pElem )
{
// Die RTL brauchen wir nicht mehr zu durchsuchen!
- BOOL bSave = rBasic.bNoRtl;
- rBasic.bNoRtl = TRUE;
+ sal_Bool bSave = rBasic.bNoRtl;
+ rBasic.bNoRtl = sal_True;
pElem = pObj->Find( aName, SbxCLASS_DONTCARE );
// #110004, #112015: Make private really private
@@ -142,15 +142,19 @@ SbxVariable* SbiRuntime::FindElement
else
pElem = VBAConstantHelper::instance().getVBAConstant( aName );
}
- // #72382 VORSICHT! Liefert jetzt wegen unbekannten
- // Modulen IMMER ein Ergebnis!
- SbUnoClass* pUnoClass = findUnoClass( aName );
- if( pUnoClass )
+
+ if( !pElem )
{
- pElem = new SbxVariable( t );
- SbxValues aRes( SbxOBJECT );
- aRes.pObj = pUnoClass;
- pElem->SbxVariable::Put( aRes );
+ // #72382 VORSICHT! Liefert jetzt wegen unbekannten
+ // Modulen IMMER ein Ergebnis!
+ SbUnoClass* pUnoClass = findUnoClass( aName );
+ if( pUnoClass )
+ {
+ pElem = new SbxVariable( t );
+ SbxValues aRes( SbxOBJECT );
+ aRes.pObj = pUnoClass;
+ pElem->SbxVariable::Put( aRes );
+ }
}
// #62939 Wenn eine Uno-Klasse gefunden wurde, muss
@@ -176,14 +180,14 @@ SbxVariable* SbiRuntime::FindElement
// Nicht da und nicht im Objekt?
// Hat das Ding Parameter, nicht einrichten!
if( nOp1 & 0x8000 )
- bFatalError = TRUE;
+ bFatalError = sal_True;
// ALT: StarBASIC::FatalError( nNotFound );
// Sonst, falls keine Parameter sind, anderen Error Code verwenden
if( !bLocal || pImg->GetFlag( SBIMG_EXPLICIT ) )
{
// #39108 Bei explizit und als ELEM immer ein Fatal Error
- bFatalError = TRUE;
+ bFatalError = sal_True;
// Falls keine Parameter sind, anderen Error Code verwenden
if( !( nOp1 & 0x8000 ) && nNotFound == SbERR_PROC_UNDEFINED )
@@ -228,19 +232,19 @@ SbxVariable* SbiRuntime::FindElement
{
// Soll der Typ konvertiert werden?
SbxDataType t2 = pElem->GetType();
- BOOL bSet = FALSE;
+ sal_Bool bSet = sal_False;
if( !( pElem->GetFlags() & SBX_FIXED ) )
{
if( t != SbxVARIANT && t != t2 &&
t >= SbxINTEGER && t <= SbxSTRING )
- pElem->SetType( t ), bSet = TRUE;
+ pElem->SetType( t ), bSet = sal_True;
}
// pElem auf eine Ref zuweisen, um ggf. eine Temp-Var zu loeschen
SbxVariableRef refTemp = pElem;
// Moegliche Reste vom letzten Aufruf der SbxMethod beseitigen
// Vorher Schreiben freigeben, damit kein Error gesetzt wird.
- USHORT nSavFlags = pElem->GetFlags();
+ sal_uInt16 nSavFlags = pElem->GetFlags();
pElem->SetFlag( SBX_READWRITE | SBX_NO_BROADCAST );
pElem->SbxValue::Clear();
pElem->SetFlags( nSavFlags );
@@ -309,8 +313,8 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
SbxInfo* pInfo = pMeth->GetInfo();
if( pInfo && refParams )
{
- USHORT nParamCount = refParams->Count();
- USHORT j = 1;
+ sal_uInt16 nParamCount = refParams->Count();
+ sal_uInt16 j = 1;
const SbxParamInfo* pParam = pInfo->GetParam( j );
while( pParam )
{
@@ -337,8 +341,8 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
if( !pElem )
{
// RTL nicht durchsuchen!
- BOOL bSave = rBasic.bNoRtl;
- rBasic.bNoRtl = TRUE;
+ sal_Bool bSave = rBasic.bNoRtl;
+ rBasic.bNoRtl = sal_True;
pElem = pMod->Find( rName, SbxCLASS_DONTCARE );
rBasic.bNoRtl = bSave;
}
@@ -350,20 +354,20 @@ SbxBase* SbiRuntime::FindElementExtern( const String& rName )
// Dabei auch die Argumente umsetzen, falls benannte Parameter
// verwendet wurden
-void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
+void SbiRuntime::SetupArgs( SbxVariable* p, sal_uInt32 nOp1 )
{
if( nOp1 & 0x8000 )
{
if( !refArgv )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
- BOOL bHasNamed = FALSE;
- USHORT i;
- USHORT nArgCount = refArgv->Count();
+ sal_Bool bHasNamed = sal_False;
+ sal_uInt16 i;
+ sal_uInt16 nArgCount = refArgv->Count();
for( i = 1 ; i < nArgCount ; i++ )
{
if( refArgv->GetAlias( i ).Len() )
{
- bHasNamed = TRUE; break;
+ bHasNamed = sal_True; break;
}
}
if( bHasNamed )
@@ -390,7 +394,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
{
bError_ = false;
- USHORT nCurPar = 1;
+ sal_uInt16 nCurPar = 1;
AutomationNamedArgsSbxArray* pArg =
new AutomationNamedArgsSbxArray( nArgCount );
::rtl::OUString* pNames = pArg->getNames().getArray();
@@ -406,12 +410,40 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
}
}
}
+ else if( bVBAEnabled && p->GetType() == SbxOBJECT && (!p->ISA(SbxMethod) || !p->IsBroadcaster()) )
+ {
+ // Check for default method with named parameters
+ SbxBaseRef pObj = (SbxBase*)p->GetObject();
+ if( pObj && pObj->ISA(SbUnoObject) )
+ {
+ SbUnoObject* pUnoObj = (SbUnoObject*)(SbxBase*)pObj;
+ Any aAny = pUnoObj->getUnoAny();
+
+ if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE )
+ {
+ Reference< XInterface > x = *(Reference< XInterface >*)aAny.getValue();
+ Reference< XDefaultMethod > xDfltMethod( x, UNO_QUERY );
+
+ rtl::OUString sDefaultMethod;
+ if ( xDfltMethod.is() )
+ sDefaultMethod = xDfltMethod->getDefaultMethodName();
+ if ( sDefaultMethod.getLength() )
+ {
+ SbxVariable* meth = pUnoObj->Find( sDefaultMethod, SbxCLASS_METHOD );
+ if( meth != NULL )
+ pInfo = meth->GetInfo();
+ if( pInfo )
+ bError_ = false;
+ }
+ }
+ }
+ }
if( bError_ )
Error( SbERR_NO_NAMED_ARGS );
}
else
{
- USHORT nCurPar = 1;
+ sal_uInt16 nCurPar = 1;
SbxArray* pArg = new SbxArray;
for( i = 1 ; i < nArgCount ; i++ )
{
@@ -420,7 +452,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 )
if( rName.Len() )
{
// nCurPar wird auf den gefundenen Parameter gesetzt
- USHORT j = 1;
+ sal_uInt16 j = 1;
const SbxParamInfo* pParam = pInfo->GetParam( j );
while( pParam )
{
@@ -511,7 +543,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
// Haben wir Index-Access?
if( xIndexAccess.is() )
{
- UINT32 nParamCount = (UINT32)pPar->Count() - 1;
+ sal_uInt32 nParamCount = (sal_uInt32)pPar->Count() - 1;
if( nParamCount != 1 )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
@@ -519,7 +551,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
}
// Index holen
- INT32 nIndex = pPar->Get( 1 )->GetLong();
+ sal_Int32 nIndex = pPar->Get( 1 )->GetLong();
Reference< XInterface > xRet;
try
{
@@ -588,6 +620,12 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
pCol->CollItem( pPar );
}
}
+ else if( bVBAEnabled ) // !pObj
+ {
+ SbxArray* pParam = pElem->GetParameters();
+ if( pParam != NULL )
+ Error( SbERR_NO_OBJECT );
+ }
}
}
@@ -596,13 +634,13 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
// Laden eines Elements aus der Runtime-Library (+StringID+Typ)
-void SbiRuntime::StepRTL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepRTL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- PushVar( FindElement( rBasic.pRtl, nOp1, nOp2, SbERR_PROC_UNDEFINED, FALSE ) );
+ PushVar( FindElement( rBasic.pRtl, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_False ) );
}
void
-SbiRuntime::StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal, BOOL bStatic )
+SbiRuntime::StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError nNotFound, sal_Bool bLocal, sal_Bool bStatic )
{
if( !refLocals )
refLocals = new SbxArray;
@@ -610,34 +648,34 @@ SbiRuntime::StepFIND_Impl( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nN
}
// Laden einer lokalen/globalen Variablen (+StringID+Typ)
-void SbiRuntime::StepFIND( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE );
+ StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True );
}
// Search inside a class module (CM) to enable global search in time
-void SbiRuntime::StepFIND_CM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_CM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
SbClassModuleObject* pClassModuleObject = PTR_CAST(SbClassModuleObject,pMod);
if( pClassModuleObject )
pMod->SetFlag( SBX_GBLSEARCH );
- StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE );
+ StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True );
if( pClassModuleObject )
pMod->ResetFlag( SBX_GBLSEARCH );
}
-void SbiRuntime::StepFIND_STATIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_STATIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, TRUE, TRUE );
+ StepFIND_Impl( pMod, nOp1, nOp2, SbERR_PROC_UNDEFINED, sal_True, sal_True );
}
// Laden eines Objekt-Elements (+StringID+Typ)
// Das Objekt liegt auf TOS
-void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepELEM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
// Liegt auf dem TOS ein Objekt?
SbxVariableRef pObjVar = PopVar();
@@ -656,7 +694,7 @@ void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
if( pObj )
SaveRef( (SbxVariable*)pObj );
- PushVar( FindElement( pObj, nOp1, nOp2, SbERR_NO_METHOD, FALSE ) );
+ PushVar( FindElement( pObj, nOp1, nOp2, SbERR_NO_METHOD, sal_False ) );
}
// Laden eines Parameters (+Offset+Typ)
@@ -664,17 +702,17 @@ void SbiRuntime::StepELEM( UINT32 nOp1, UINT32 nOp2 )
// Der Datentyp SbxEMPTY zeigt an, daa kein Parameter angegeben ist.
// Get( 0 ) darf EMPTY sein
-void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPARAM( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
- USHORT i = static_cast<USHORT>( nOp1 & 0x7FFF );
+ sal_uInt16 i = static_cast<sal_uInt16>( nOp1 & 0x7FFF );
SbxDataType t = (SbxDataType) nOp2;
SbxVariable* p;
// #57915 Missing sauberer loesen
- USHORT nParamCount = refParams->Count();
+ sal_uInt16 nParamCount = refParams->Count();
if( i >= nParamCount )
{
- INT16 iLoop = i;
+ sal_Int16 iLoop = i;
while( iLoop >= nParamCount )
{
p = new SbxVariable();
@@ -700,7 +738,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
//if( p->GetType() == SbxEMPTY && ( i ) )
{
// Wenn ein Parameter fehlt, kann er OPTIONAL sein
- BOOL bOpt = FALSE;
+ sal_Bool bOpt = sal_False;
if( pMeth )
{
SbxInfo* pInfo = pMeth->GetInfo();
@@ -710,7 +748,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
if( pParam && ( (pParam->nFlags & SBX_OPTIONAL) != 0 ) )
{
// Default value?
- USHORT nDefaultId = sal::static_int_cast< USHORT >(
+ sal_uInt16 nDefaultId = sal::static_int_cast< sal_uInt16 >(
pParam->nUserData & 0xffff );
if( nDefaultId > 0 )
{
@@ -719,11 +757,11 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
p->PutString( aDefaultStr );
refParams->Put( p, i );
}
- bOpt = TRUE;
+ bOpt = sal_True;
}
}
}
- if( bOpt == FALSE )
+ if( bOpt == sal_False )
Error( SbERR_NOT_OPTIONAL );
}
else if( t != SbxVARIANT && (SbxDataType)(p->GetType() & 0x0FFF ) != t )
@@ -741,7 +779,7 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 )
// Case-Test (+True-Target+Test-Opcode)
-void SbiRuntime::StepCASEIS( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCASEIS( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
if( !refCaseStk || !refCaseStk->Count() )
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -757,13 +795,13 @@ void SbiRuntime::StepCASEIS( UINT32 nOp1, UINT32 nOp2 )
// Aufruf einer DLL-Prozedur (+StringID+Typ)
// Auch hier zeigt das MSB des StringIDs an, dass Argv belegt ist
-void SbiRuntime::StepCALL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCALL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
String aName = pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) );
SbxArray* pArgs = NULL;
if( nOp1 & 0x8000 )
pArgs = refArgv;
- DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, FALSE );
+ DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, sal_False );
aLibName = String();
if( nOp1 & 0x8000 )
PopArgv();
@@ -772,13 +810,13 @@ void SbiRuntime::StepCALL( UINT32 nOp1, UINT32 nOp2 )
// Aufruf einer DLL-Prozedur nach CDecl (+StringID+Typ)
// Auch hier zeigt das MSB des StringIDs an, dass Argv belegt ist
-void SbiRuntime::StepCALLC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCALLC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
String aName = pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) );
SbxArray* pArgs = NULL;
if( nOp1 & 0x8000 )
pArgs = refArgv;
- DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, TRUE );
+ DllCall( aName, aLibName, pArgs, (SbxDataType) nOp2, sal_True );
aLibName = String();
if( nOp1 & 0x8000 )
PopArgv();
@@ -787,14 +825,14 @@ void SbiRuntime::StepCALLC( UINT32 nOp1, UINT32 nOp2 )
// Beginn eines Statements (+Line+Col)
-void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepSTMNT( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
// Wenn der Expr-Stack am Anfang einen Statements eine Variable enthaelt,
// hat ein Trottel X als Funktion aufgerufen, obwohl es eine Variable ist!
- BOOL bFatalExpr = FALSE;
+ sal_Bool bFatalExpr = sal_False;
String sUnknownMethodName;
if( nExprLvl > 1 )
- bFatalExpr = TRUE;
+ bFatalExpr = sal_True;
else if( nExprLvl )
{
SbxVariable* p = refExprStk->Get( 0 );
@@ -802,7 +840,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
&& refLocals.Is() && refLocals->Find( p->GetName(), p->GetClass() ) )
{
sUnknownMethodName = p->GetName();
- bFatalExpr = TRUE;
+ bFatalExpr = sal_True;
}
}
// Der Expr-Stack ist nun nicht mehr notwendig
@@ -822,7 +860,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
return;
}
pStmnt = pCode - 9;
- USHORT nOld = nLine;
+ sal_uInt16 nOld = nLine;
nLine = static_cast<short>( nOp1 );
// #29955 & 0xFF, um for-Schleifen-Ebene wegzufiltern
@@ -834,8 +872,8 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
// around the final column of this statement to set
nCol2 = 0xffff;
- USHORT n1, n2;
- const BYTE* p = pMod->FindNextStmnt( pCode, n1, n2 );
+ sal_uInt16 n1, n2;
+ const sal_uInt8* p = pMod->FindNextStmnt( pCode, n1, n2 );
if( p )
{
if( n1 == nOp1 )
@@ -848,8 +886,8 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
// #29955 for-Schleifen-Ebene korrigieren, #67452 NICHT im Error-Handler sonst Chaos
if( !bInError )
{
- // (Bei Sprngen aus Schleifen tritt hier eine Differenz auf)
- USHORT nExspectedForLevel = static_cast<USHORT>( nOp2 / 0x100 );
+ // (Bei Spr�ngen aus Schleifen tritt hier eine Differenz auf)
+ sal_uInt16 nExspectedForLevel = static_cast<sal_uInt16>( nOp2 / 0x100 );
if( pGosubStk )
nExspectedForLevel = nExspectedForLevel + pGosubStk->nStartForLvl;
@@ -860,12 +898,12 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
}
// 16.10.96: #31460 Neues Konzept fuer StepInto/Over/Out
- // Erklrung siehe bei _ImplGetBreakCallLevel.
+ // Erkl�rung siehe bei _ImplGetBreakCallLevel.
if( pInst->nCallLvl <= pInst->nBreakCallLvl )
//if( nFlags & SbDEBUG_STEPINTO )
{
StarBASIC* pStepBasic = GetCurrentBasic( &rBasic );
- USHORT nNewFlags = pStepBasic->StepPoint( nLine, nCol1, nCol2 );
+ sal_uInt16 nNewFlags = pStepBasic->StepPoint( nLine, nCol1, nCol2 );
// Neuen BreakCallLevel ermitteln
pInst->CalcBreakCallLevel( nNewFlags );
@@ -874,10 +912,10 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
// Breakpoints nur bei STMNT-Befehlen in neuer Zeile!
else if( ( nOp1 != nOld )
&& ( nFlags & SbDEBUG_BREAK )
- && pMod->IsBP( static_cast<USHORT>( nOp1 ) ) )
+ && pMod->IsBP( static_cast<sal_uInt16>( nOp1 ) ) )
{
StarBASIC* pBreakBasic = GetCurrentBasic( &rBasic );
- USHORT nNewFlags = pBreakBasic->BreakPoint( nLine, nCol1, nCol2 );
+ sal_uInt16 nNewFlags = pBreakBasic->BreakPoint( nLine, nCol1, nCol2 );
// Neuen BreakCallLevel ermitteln
pInst->CalcBreakCallLevel( nNewFlags );
@@ -892,7 +930,7 @@ void SbiRuntime::StepSTMNT( UINT32 nOp1, UINT32 nOp2 )
// Kanalnummer
// Dateiname
-void SbiRuntime::StepOPEN( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepOPEN( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
SbxVariableRef pName = PopVar();
SbxVariableRef pChan = PopVar();
@@ -907,7 +945,7 @@ void SbiRuntime::StepOPEN( UINT32 nOp1, UINT32 nOp2 )
// Objekt kreieren (+StringID+StringID)
-void SbiRuntime::StepCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
String aClass( pImg->GetString( static_cast<short>( nOp2 ) ) );
SbxObject *pObj = SbxBase::CreateObject( aClass );
@@ -925,12 +963,12 @@ void SbiRuntime::StepCREATE( UINT32 nOp1, UINT32 nOp2 )
}
}
-void SbiRuntime::StepDCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
StepDCREATE_IMPL( nOp1, nOp2 );
}
-void SbiRuntime::StepDCREATE_REDIMP( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE_REDIMP( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
StepDCREATE_IMPL( nOp1, nOp2 );
}
@@ -957,7 +995,7 @@ void implCopyDimArray_DCREATE( SbxDimArray* pNewArray, SbxDimArray* pOldArray, s
}
// #56204 Objekt-Array kreieren (+StringID+StringID), DCREATE == Dim-Create
-void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepDCREATE_IMPL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
SbxVariableRef refVar = PopVar();
@@ -979,11 +1017,11 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
// Dimensionen auswerten
short nDims = pArray->GetDims();
- INT32 nTotalSize = 0;
+ sal_Int32 nTotalSize = 0;
// es muss ein eindimensionales Array sein
- INT32 nLower, nUpper, nSize;
- INT32 i;
+ sal_Int32 nLower, nUpper, nSize;
+ sal_Int32 i;
for( i = 0 ; i < nDims ; i++ )
{
pArray->GetDim32( i+1, nLower, nUpper );
@@ -1021,7 +1059,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
short nDimsNew = pArray->GetDims();
short nDimsOld = pOldArray->GetDims();
short nDims = nDimsNew;
- BOOL bRangeError = FALSE;
+ sal_Bool bRangeError = sal_False;
// Store dims to use them for copying later
sal_Int32* pLowerBounds = new sal_Int32[nDims];
@@ -1029,7 +1067,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
sal_Int32* pActualIndices = new sal_Int32[nDims];
if( nDimsOld != nDimsNew )
{
- bRangeError = TRUE;
+ bRangeError = sal_True;
}
else
{
@@ -1072,7 +1110,7 @@ void SbiRuntime::StepDCREATE_IMPL( UINT32 nOp1, UINT32 nOp2 )
SbxObject* createUserTypeImpl( const String& rClassName ); // sb.cxx
-void SbiRuntime::StepTCREATE( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepTCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
String aClass( pImg->GetString( static_cast<short>( nOp2 ) ) );
@@ -1086,17 +1124,29 @@ void SbiRuntime::StepTCREATE( UINT32 nOp1, UINT32 nOp2 )
PushVar( pNew );
}
-void SbiRuntime::implCreateFixedString( SbxVariable* pStrVar, UINT32 nOp2 )
+void SbiRuntime::implHandleSbxFlags( SbxVariable* pVar, SbxDataType t, sal_uInt32 nOp2 )
{
- USHORT nCount = static_cast<USHORT>( nOp2 >> 17 ); // len = all bits above 0x10000
- String aStr;
- aStr.Fill( nCount, 0 );
- pStrVar->PutString( aStr );
+ bool bWithEvents = ((t & 0xff) == SbxOBJECT && (nOp2 & SBX_TYPE_WITH_EVENTS_FLAG) != 0);
+ if( bWithEvents )
+ pVar->SetFlag( SBX_WITH_EVENTS );
+
+ bool bDimAsNew = ((nOp2 & SBX_TYPE_DIM_AS_NEW_FLAG) != 0);
+ if( bDimAsNew )
+ pVar->SetFlag( SBX_DIM_AS_NEW );
+
+ bool bFixedString = ((t & 0xff) == SbxSTRING && (nOp2 & SBX_FIXED_LEN_STRING_FLAG) != 0);
+ if( bFixedString )
+ {
+ sal_uInt16 nCount = static_cast<sal_uInt16>( nOp2 >> 17 ); // len = all bits above 0x10000
+ String aStr;
+ aStr.Fill( nCount, 0 );
+ pVar->PutString( aStr );
+ }
}
// Einrichten einer lokalen Variablen (+StringID+Typ)
-void SbiRuntime::StepLOCAL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepLOCAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
if( !refLocals.Is() )
refLocals = new SbxArray;
@@ -1106,23 +1156,18 @@ void SbiRuntime::StepLOCAL( UINT32 nOp1, UINT32 nOp2 )
SbxDataType t = (SbxDataType)(nOp2 & 0xffff);
SbxVariable* p = new SbxVariable( t );
p->SetName( aName );
- bool bWithEvents = ((t & 0xff) == SbxOBJECT && (nOp2 & SBX_TYPE_WITH_EVENTS_FLAG) != 0);
- if( bWithEvents )
- p->SetFlag( SBX_WITH_EVENTS );
- bool bFixedString = ((t & 0xff) == SbxSTRING && (nOp2 & SBX_FIXED_LEN_STRING_FLAG) != 0);
- if( bFixedString )
- implCreateFixedString( p, nOp2 );
+ implHandleSbxFlags( p, t, nOp2 );
refLocals->Put( p, refLocals->Count() );
}
}
// Einrichten einer modulglobalen Variablen (+StringID+Typ)
-void SbiRuntime::StepPUBLIC_Impl( UINT32 nOp1, UINT32 nOp2, bool bUsedForClassModule )
+void SbiRuntime::StepPUBLIC_Impl( sal_uInt32 nOp1, sal_uInt32 nOp2, bool bUsedForClassModule )
{
String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
SbxDataType t = (SbxDataType)(SbxDataType)(nOp2 & 0xffff);;
- BOOL bFlag = pMod->IsSet( SBX_NO_MODIFY );
+ sal_Bool bFlag = pMod->IsSet( SBX_NO_MODIFY );
pMod->SetFlag( SBX_NO_MODIFY );
SbxVariableRef p = pMod->Find( aName, SbxCLASS_PROPERTY );
if( p.Is() )
@@ -1138,21 +1183,16 @@ void SbiRuntime::StepPUBLIC_Impl( UINT32 nOp1, UINT32 nOp2, bool bUsedForClassMo
// AB: 2.7.1996: HACK wegen 'Referenz kann nicht gesichert werden'
pProp->SetFlag( SBX_NO_MODIFY);
- bool bWithEvents = ((t & 0xff) == SbxOBJECT && (nOp2 & SBX_TYPE_WITH_EVENTS_FLAG) != 0);
- if( bWithEvents )
- pProp->SetFlag( SBX_WITH_EVENTS );
- bool bFixedString = ((t & 0xff) == SbxSTRING && (nOp2 & SBX_FIXED_LEN_STRING_FLAG) != 0);
- if( bFixedString )
- implCreateFixedString( p, nOp2 );
+ implHandleSbxFlags( pProp, t, nOp2 );
}
}
-void SbiRuntime::StepPUBLIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPUBLIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
StepPUBLIC_Impl( nOp1, nOp2, false );
}
-void SbiRuntime::StepPUBLIC_P( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepPUBLIC_P( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
// Creates module variable that isn't reinitialised when
// between invocations ( for VBASupport & document basic only )
@@ -1165,7 +1205,7 @@ void SbiRuntime::StepPUBLIC_P( UINT32 nOp1, UINT32 nOp2 )
// Einrichten einer globalen Variablen (+StringID+Typ)
-void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepGLOBAL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
if( pImg->GetFlag( SBIMG_CLASSMODULE ) )
StepPUBLIC_Impl( nOp1, nOp2, true );
@@ -1183,7 +1223,7 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
pMod->AddVarName( aName );
}
- BOOL bFlag = pStorage->IsSet( SBX_NO_MODIFY );
+ sal_Bool bFlag = pStorage->IsSet( SBX_NO_MODIFY );
rBasic.SetFlag( SBX_NO_MODIFY );
SbxVariableRef p = pStorage->Find( aName, SbxCLASS_PROPERTY );
if( p.Is() )
@@ -1203,7 +1243,7 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
// Creates global variable that isn't reinitialised when
// basic is restarted, P=PERSIST (+StringID+Typ)
-void SbiRuntime::StepGLOBAL_P( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepGLOBAL_P( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
if( pMod->pImage->bFirstInit )
{
@@ -1215,7 +1255,7 @@ void SbiRuntime::StepGLOBAL_P( UINT32 nOp1, UINT32 nOp2 )
// Searches for global variable, behavior depends on the fact
// if the variable is initialised for the first time
-void SbiRuntime::StepFIND_G( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepFIND_G( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
if( pMod->pImage->bFirstInit )
{
@@ -1253,7 +1293,7 @@ SbxVariable* SbiRuntime::StepSTATIC_Impl( String& aName, SbxDataType& t )
return p;
}
// Einrichten einer statischen Variablen (+StringID+Typ)
-void SbiRuntime::StepSTATIC( UINT32 nOp1, UINT32 nOp2 )
+void SbiRuntime::StepSTATIC( sal_uInt32 nOp1, sal_uInt32 nOp2 )
{
String aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
SbxDataType t = (SbxDataType) nOp2;
diff --git a/basic/source/runtime/wnt-mingw.s b/basic/source/runtime/wnt-mingw.s
index 8c332c1a8ce8..8c332c1a8ce8 100644..100755
--- a/basic/source/runtime/wnt-mingw.s
+++ b/basic/source/runtime/wnt-mingw.s
diff --git a/basic/source/runtime/wnt-x86.asm b/basic/source/runtime/wnt-x86.asm
index 2a8710e34243..2a8710e34243 100644..100755
--- a/basic/source/runtime/wnt-x86.asm
+++ b/basic/source/runtime/wnt-x86.asm
diff --git a/basic/source/sample/collelem.cxx b/basic/source/sample/collelem.cxx
index b7b2e717aedc..80ee91db309f 100644..100755
--- a/basic/source/sample/collelem.cxx
+++ b/basic/source/sample/collelem.cxx
@@ -56,7 +56,7 @@ void SampleElement::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- ULONG t = pHint->GetId();
+ sal_uIntPtr t = pHint->GetId();
if( t == SBX_HINT_DATAWANTED && pVar->GetUserData() == 0x12345678 )
{
// Die Say-Methode:
diff --git a/basic/source/sample/makefile.mk b/basic/source/sample/makefile.mk
index 5261f13cfe43..5261f13cfe43 100644..100755
--- a/basic/source/sample/makefile.mk
+++ b/basic/source/sample/makefile.mk
diff --git a/basic/source/sample/object.cxx b/basic/source/sample/object.cxx
index 99501a1b7c70..2c3ca7e29797 100644..100755
--- a/basic/source/sample/object.cxx
+++ b/basic/source/sample/object.cxx
@@ -74,7 +74,7 @@
#define _BWRITE 0x0200 // kann as Lvalue verwendet werden
#define _LVALUE _BWRITE // kann as Lvalue verwendet werden
#define _READWRITE 0x0300 // beides
-#define _OPT 0x0400 // TRUE: optionaler Parameter
+#define _OPT 0x0400 // sal_True: optionaler Parameter
#define _METHOD 0x1000 // Masken-Bit fuer eine Methode
#define _PROPERTY 0x2000 // Masken-Bit fuer eine Property
#define _COLL 0x4000 // Masken-Bit fuer eine Collection
@@ -130,12 +130,12 @@ SbxVariable* SampleObject::Find( const String& rName, SbxClassType t )
// sonst suchen
Methods* p = aMethods;
short nIndex = 0;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
while( p->nArgs != -1 )
{
if( rName.EqualsIgnoreCaseAscii( p->pName ) )
{
- bFound = TRUE; break;
+ bFound = sal_True; break;
}
nIndex += ( p->nArgs & _ARGSMASK ) + 1;
p = aMethods + nIndex;
@@ -172,22 +172,22 @@ void SampleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCT,
{
SbxVariable* pVar = pHint->GetVar();
SbxArray* pPar_ = pVar->GetParameters();
- USHORT nIndex = (USHORT) pVar->GetUserData();
+ sal_uInt16 nIndex = (sal_uInt16) pVar->GetUserData();
// kein Index: weiterreichen!
if( nIndex )
{
- ULONG t = pHint->GetId();
+ sal_uIntPtr t = pHint->GetId();
if( t == SBX_HINT_INFOWANTED )
pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
else
{
- BOOL bWrite = FALSE;
+ sal_Bool bWrite = sal_False;
if( t == SBX_HINT_DATACHANGED )
- bWrite = TRUE;
+ bWrite = sal_True;
if( t == SBX_HINT_DATAWANTED || bWrite )
{
// Parameter-Test fuer Methoden:
- USHORT nPar = aMethods[ --nIndex ].nArgs & 0x00FF;
+ sal_uInt16 nPar = aMethods[ --nIndex ].nArgs & 0x00FF;
// Element 0 ist der Returnwert
if( ( !pPar_ && nPar )
|| ( pPar_->Count() != nPar+1 ) )
@@ -217,7 +217,7 @@ SbxInfo* SampleObject::GetInfo( short nIdx )
{
p++;
String aName_ = String::CreateFromAscii( p->pName );
- USHORT nFlags_ = ( p->nArgs >> 8 ) & 0x03;
+ sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03;
if( p->nArgs & _OPT )
nFlags_ |= SBX_OPTIONAL;
pInfo_->AddParam( aName_, p->eType, nFlags_ );
@@ -227,13 +227,13 @@ SbxInfo* SampleObject::GetInfo( short nIdx )
////////////////////////////////////////////////////////////////////////////
-// Properties und Methoden legen beim Get (bPut = FALSE) den Returnwert
-// im Element 0 des Argv ab; beim Put (bPut = TRUE) wird der Wert aus
+// Properties und Methoden legen beim Get (bPut = sal_False) den Returnwert
+// im Element 0 des Argv ab; beim Put (bPut = sal_True) wird der Wert aus
// Element 0 gespeichert.
// Die Methoden:
-void SampleObject::Display( SbxVariable*, SbxArray* pPar_, BOOL )
+void SampleObject::Display( SbxVariable*, SbxArray* pPar_, sal_Bool )
{
// GetString() loest u.U. auch einen Error aus!
String s( pPar_->Get( 1 )->GetString() );
@@ -241,7 +241,7 @@ void SampleObject::Display( SbxVariable*, SbxArray* pPar_, BOOL )
InfoBox( NULL, s ).Execute();
}
-void SampleObject::Square( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SampleObject::Square( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
double n = pPar_->Get( 1 )->GetDouble();
pVar->PutDouble( n * n );
@@ -249,14 +249,14 @@ void SampleObject::Square( SbxVariable* pVar, SbxArray* pPar_, BOOL )
// Callback nach BASIC:
-void SampleObject::Event( SbxVariable*, SbxArray* pPar_, BOOL )
+void SampleObject::Event( SbxVariable*, SbxArray* pPar_, sal_Bool )
{
Call( pPar_->Get( 1 )->GetString(), NULL );
}
// Neues Element anlegen
-void SampleObject::Create( SbxVariable* pVar, SbxArray* pPar_, BOOL )
+void SampleObject::Create( SbxVariable* pVar, SbxArray* pPar_, sal_Bool )
{
pVar->PutObject(
MakeObject( pPar_->Get( 1 )->GetString(), String( RTL_CONSTASCII_USTRINGPARAM("SampleElement") ) ) );
diff --git a/basic/source/sample/sample.bas b/basic/source/sample/sample.bas
index d0e416871af0..d0e416871af0 100644..100755
--- a/basic/source/sample/sample.bas
+++ b/basic/source/sample/sample.bas
diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src
index 7e576134fad5..7e576134fad5 100644..100755
--- a/basic/source/sbx/format.src
+++ b/basic/source/sbx/format.src
diff --git a/basic/source/sbx/makefile.mk b/basic/source/sbx/makefile.mk
index 332c6a0d426d..332c6a0d426d 100644..100755
--- a/basic/source/sbx/makefile.mk
+++ b/basic/source/sbx/makefile.mk
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 0028696fa85b..f230a6b8ed83 100644..100755
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -36,8 +36,8 @@ using namespace std;
struct SbxDim { // an array-dimension:
SbxDim* pNext; // Link
- INT32 nLbound, nUbound; // Limitations
- INT32 nSize; // Number of elements
+ sal_Int32 nLbound, nUbound; // Limitations
+ sal_Int32 nSize; // Number of elements
};
class SbxVarEntry : public SbxVariableRef {
@@ -89,7 +89,7 @@ SbxArray& SbxArray::operator=( const SbxArray& rArray )
eType = rArray.eType;
Clear();
SbxVarRefs* pSrc = rArray.pData;
- for( UINT32 i = 0; i < pSrc->size(); i++ )
+ for( sal_uInt32 i = 0; i < pSrc->size(); i++ )
{
SbxVarEntryPtr pSrcRef = (*pSrc)[i];
const SbxVariable* pSrc_ = *pSrcRef;
@@ -127,8 +127,8 @@ SbxClassType SbxArray::GetClass() const
void SbxArray::Clear()
{
- UINT32 nSize = pData->size();
- for( UINT32 i = 0 ; i < nSize ; i++ )
+ sal_uInt32 nSize = pData->size();
+ for( sal_uInt32 i = 0 ; i < nSize ; i++ )
{
SbxVarEntry* pEntry = (*pData)[i];
delete pEntry;
@@ -136,19 +136,19 @@ void SbxArray::Clear()
pData->clear();
}
-UINT32 SbxArray::Count32() const
+sal_uInt32 SbxArray::Count32() const
{
return pData->size();
}
-USHORT SbxArray::Count() const
+sal_uInt16 SbxArray::Count() const
{
- UINT32 nCount = pData->size();
+ sal_uInt32 nCount = pData->size();
DBG_ASSERT( nCount <= SBX_MAXINDEX, "SBX: Array-Index > SBX_MAXINDEX" );
- return (USHORT)nCount;
+ return (sal_uInt16)nCount;
}
-SbxVariableRef& SbxArray::GetRef32( UINT32 nIdx )
+SbxVariableRef& SbxArray::GetRef32( sal_uInt32 nIdx )
{
// If necessary extend the array
DBG_ASSERT( nIdx <= SBX_MAXINDEX32, "SBX: Array-Index > SBX_MAXINDEX32" );
@@ -166,7 +166,7 @@ SbxVariableRef& SbxArray::GetRef32( UINT32 nIdx )
return *((*pData)[nIdx]);
}
-SbxVariableRef& SbxArray::GetRef( USHORT nIdx )
+SbxVariableRef& SbxArray::GetRef( sal_uInt16 nIdx )
{
// If necessary extend the array
DBG_ASSERT( nIdx <= SBX_MAXINDEX, "SBX: Array-Index > SBX_MAXINDEX" );
@@ -184,7 +184,7 @@ SbxVariableRef& SbxArray::GetRef( USHORT nIdx )
return *((*pData)[nIdx]);
}
-SbxVariable* SbxArray::Get32( UINT32 nIdx )
+SbxVariable* SbxArray::Get32( sal_uInt32 nIdx )
{
if( !CanRead() )
{
@@ -203,7 +203,7 @@ SbxVariable* SbxArray::Get32( UINT32 nIdx )
return rRef;
}
-SbxVariable* SbxArray::Get( USHORT nIdx )
+SbxVariable* SbxArray::Get( sal_uInt16 nIdx )
{
if( !CanRead() )
{
@@ -222,7 +222,7 @@ SbxVariable* SbxArray::Get( USHORT nIdx )
return rRef;
}
-void SbxArray::Put32( SbxVariable* pVar, UINT32 nIdx )
+void SbxArray::Put32( SbxVariable* pVar, sal_uInt32 nIdx )
{
if( !CanWrite() )
SetError( SbxERR_PROP_READONLY );
@@ -242,7 +242,7 @@ void SbxArray::Put32( SbxVariable* pVar, UINT32 nIdx )
}
}
-void SbxArray::Put( SbxVariable* pVar, USHORT nIdx )
+void SbxArray::Put( SbxVariable* pVar, sal_uInt16 nIdx )
{
if( !CanWrite() )
SetError( SbxERR_PROP_READONLY );
@@ -262,7 +262,7 @@ void SbxArray::Put( SbxVariable* pVar, USHORT nIdx )
}
}
-const XubString& SbxArray::GetAlias( USHORT nIdx )
+const XubString& SbxArray::GetAlias( sal_uInt16 nIdx )
{
if( !CanRead() )
{
@@ -281,7 +281,7 @@ const XubString& SbxArray::GetAlias( USHORT nIdx )
return *rRef.pAlias;
}
-void SbxArray::PutAlias( const XubString& rAlias, USHORT nIdx )
+void SbxArray::PutAlias( const XubString& rAlias, sal_uInt16 nIdx )
{
if( !CanWrite() )
SetError( SbxERR_PROP_READONLY );
@@ -295,7 +295,7 @@ void SbxArray::PutAlias( const XubString& rAlias, USHORT nIdx )
}
}
-void SbxArray::Insert32( SbxVariable* pVar, UINT32 nIdx )
+void SbxArray::Insert32( SbxVariable* pVar, sal_uInt32 nIdx )
{
DBG_ASSERT( pData->size() <= SBX_MAXINDEX32, "SBX: Array wird zu gross" );
if( pData->size() > SBX_MAXINDEX32 )
@@ -318,7 +318,7 @@ void SbxArray::Insert32( SbxVariable* pVar, UINT32 nIdx )
SetFlag( SBX_MODIFIED );
}
-void SbxArray::Insert( SbxVariable* pVar, USHORT nIdx )
+void SbxArray::Insert( SbxVariable* pVar, sal_uInt16 nIdx )
{
DBG_ASSERT( pData->size() <= 0x3FF0, "SBX: Array wird zu gross" );
if( pData->size() > 0x3FF0 )
@@ -326,7 +326,7 @@ void SbxArray::Insert( SbxVariable* pVar, USHORT nIdx )
Insert32( pVar, nIdx );
}
-void SbxArray::Remove32( UINT32 nIdx )
+void SbxArray::Remove32( sal_uInt32 nIdx )
{
if( nIdx < pData->size() )
{
@@ -337,7 +337,7 @@ void SbxArray::Remove32( UINT32 nIdx )
}
}
-void SbxArray::Remove( USHORT nIdx )
+void SbxArray::Remove( sal_uInt16 nIdx )
{
if( nIdx < pData->size() )
{
@@ -352,7 +352,7 @@ void SbxArray::Remove( SbxVariable* pVar )
{
if( pVar )
{
- for( UINT32 i = 0; i < pData->size(); i++ )
+ for( sal_uInt32 i = 0; i < pData->size(); i++ )
{
SbxVariableRef* pRef = (*pData)[i];
// SbxVariableRef* pRef = pData->GetObject( i );
@@ -371,8 +371,8 @@ void SbxArray::Merge( SbxArray* p )
{
if( p )
{
- UINT32 nSize = p->Count();
- for( UINT32 i = 0; i < nSize; i++ )
+ sal_uInt32 nSize = p->Count();
+ for( sal_uInt32 i = 0; i < nSize; i++ )
{
SbxVarEntryPtr pRef1 = (*(p->pData))[i];
// Is the element by name already inside?
@@ -381,8 +381,8 @@ void SbxArray::Merge( SbxArray* p )
if( pVar )
{
XubString aName = pVar->GetName();
- USHORT nHash = pVar->GetHashCode();
- for( UINT32 j = 0; j < pData->size(); j++ )
+ sal_uInt16 nHash = pVar->GetHashCode();
+ for( sal_uInt32 j = 0; j < pData->size(); j++ )
{
SbxVariableRef* pRef2 = (*pData)[j];
if( (*pRef2)->GetHashCode() == nHash
@@ -409,10 +409,10 @@ void SbxArray::Merge( SbxArray* p )
// Search of an element via the user data. If the element is
// object, it will also be scanned.
-SbxVariable* SbxArray::FindUserData( UINT32 nData )
+SbxVariable* SbxArray::FindUserData( sal_uInt32 nData )
{
SbxVariable* p = NULL;
- for( UINT32 i = 0; i < pData->size(); i++ )
+ for( sal_uInt32 i = 0; i < pData->size(); i++ )
{
SbxVariableRef* pRef = (*pData)[i];
SbxVariable* pVar = *pRef;
@@ -432,7 +432,7 @@ SbxVariable* SbxArray::FindUserData( UINT32 nData )
case SbxCLASS_OBJECT:
{
// Objects are not allowed to scan their parent.
- USHORT nOld = pVar->GetFlags();
+ sal_uInt16 nOld = pVar->GetFlags();
pVar->ResetFlag( SBX_GBLSEARCH );
p = ((SbxObject*) pVar)->FindUserData( nData );
pVar->SetFlags( nOld );
@@ -460,19 +460,19 @@ SbxVariable* SbxArray::FindUserData( UINT32 nData )
SbxVariable* SbxArray::Find( const XubString& rName, SbxClassType t )
{
SbxVariable* p = NULL;
- UINT32 nCount = pData->size();
+ sal_uInt32 nCount = pData->size();
if( !nCount )
return NULL;
- BOOL bExtSearch = IsSet( SBX_EXTSEARCH );
- USHORT nHash = SbxVariable::MakeHashCode( rName );
- for( UINT32 i = 0; i < nCount; i++ )
+ sal_Bool bExtSearch = IsSet( SBX_EXTSEARCH );
+ sal_uInt16 nHash = SbxVariable::MakeHashCode( rName );
+ for( sal_uInt32 i = 0; i < nCount; i++ )
{
SbxVariableRef* pRef = (*pData)[i];
SbxVariable* pVar = *pRef;
if( pVar && pVar->IsVisible() )
{
// The very secure search works as well, if there is no hashcode!
- USHORT nVarHash = pVar->GetHashCode();
+ sal_uInt16 nVarHash = pVar->GetHashCode();
if( ( !nVarHash || nVarHash == nHash )
&& ( t == SbxCLASS_DONTCARE || pVar->GetClass() == t )
&& ( pVar->GetName().EqualsIgnoreCaseAscii( rName ) ) )
@@ -489,7 +489,7 @@ SbxVariable* SbxArray::Find( const XubString& rName, SbxClassType t )
case SbxCLASS_OBJECT:
{
// Objects are not allowed to scan their parent.
- USHORT nOld = pVar->GetFlags();
+ sal_uInt16 nOld = pVar->GetFlags();
pVar->ResetFlag( SBX_GBLSEARCH );
p = ((SbxObject*) pVar)->Find( rName, t );
pVar->SetFlags( nOld );
@@ -511,18 +511,18 @@ SbxVariable* SbxArray::Find( const XubString& rName, SbxClassType t )
return p;
}
-BOOL SbxArray::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
- UINT16 nElem;
+ sal_uInt16 nElem;
Clear();
- BOOL bRes = TRUE;
- USHORT f = nFlags;
+ sal_Bool bRes = sal_True;
+ sal_uInt16 f = nFlags;
nFlags |= SBX_WRITE;
rStrm >> nElem;
nElem &= 0x7FFF;
- for( UINT32 n = 0; n < nElem; n++ )
+ for( sal_uInt32 n = 0; n < nElem; n++ )
{
- UINT16 nIdx;
+ sal_uInt16 nIdx;
rStrm >> nIdx;
SbxVariable* pVar = (SbxVariable*) Load( rStrm );
if( pVar )
@@ -532,7 +532,7 @@ BOOL SbxArray::LoadData( SvStream& rStrm, USHORT nVer )
}
else
{
- bRes = FALSE; break;
+ bRes = sal_False; break;
}
}
if( bRes )
@@ -541,10 +541,10 @@ BOOL SbxArray::LoadData( SvStream& rStrm, USHORT nVer )
return bRes;
}
-BOOL SbxArray::StoreData( SvStream& rStrm ) const
+sal_Bool SbxArray::StoreData( SvStream& rStrm ) const
{
- UINT32 nElem = 0;
- UINT32 n;
+ sal_uInt32 nElem = 0;
+ sal_uInt32 n;
// Which elements are even defined?
for( n = 0; n < pData->size(); n++ )
{
@@ -553,23 +553,23 @@ BOOL SbxArray::StoreData( SvStream& rStrm ) const
if( p && !( p->GetFlags() & SBX_DONTSTORE ) )
nElem++;
}
- rStrm << (UINT16) nElem;
+ rStrm << (sal_uInt16) nElem;
for( n = 0; n < pData->size(); n++ )
{
SbxVariableRef* pRef = (*pData)[n];
SbxVariable* p = *pRef;
if( p && !( p->GetFlags() & SBX_DONTSTORE ) )
{
- rStrm << (UINT16) n;
+ rStrm << (sal_uInt16) n;
if( !p->Store( rStrm ) )
- return FALSE;
+ return sal_False;
}
}
return StorePrivateData( rStrm );
}
// #100883 Method to set method directly to parameter array
-void SbxArray::PutDirect( SbxVariable* pVar, UINT32 nIdx )
+void SbxArray::PutDirect( SbxVariable* pVar, sal_uInt32 nIdx )
{
SbxVariableRef& rRef = GetRef32( nIdx );
rRef = pVar;
@@ -632,7 +632,7 @@ void SbxDimArray::Clear()
// Add a dimension
-void SbxDimArray::AddDimImpl32( INT32 lb, INT32 ub, BOOL bAllowSize0 )
+void SbxDimArray::AddDimImpl32( sal_Int32 lb, sal_Int32 ub, sal_Bool bAllowSize0 )
{
SbxError eRes = SbxERR_OK;
if( ub < lb && !bAllowSize0 )
@@ -656,51 +656,51 @@ void SbxDimArray::AddDimImpl32( INT32 lb, INT32 ub, BOOL bAllowSize0 )
void SbxDimArray::AddDim( short lb, short ub )
{
- AddDimImpl32( lb, ub, FALSE );
+ AddDimImpl32( lb, ub, sal_False );
}
void SbxDimArray::unoAddDim( short lb, short ub )
{
- AddDimImpl32( lb, ub, TRUE );
+ AddDimImpl32( lb, ub, sal_True );
}
-void SbxDimArray::AddDim32( INT32 lb, INT32 ub )
+void SbxDimArray::AddDim32( sal_Int32 lb, sal_Int32 ub )
{
- AddDimImpl32( lb, ub, FALSE );
+ AddDimImpl32( lb, ub, sal_False );
}
-void SbxDimArray::unoAddDim32( INT32 lb, INT32 ub )
+void SbxDimArray::unoAddDim32( sal_Int32 lb, sal_Int32 ub )
{
- AddDimImpl32( lb, ub, TRUE );
+ AddDimImpl32( lb, ub, sal_True );
}
// Readout dimension data
-BOOL SbxDimArray::GetDim32( INT32 n, INT32& rlb, INT32& rub ) const
+sal_Bool SbxDimArray::GetDim32( sal_Int32 n, sal_Int32& rlb, sal_Int32& rub ) const
{
if( n < 1 || n > nDim )
{
- SetError( SbxERR_BOUNDS ); rub = rlb = 0; return FALSE;
+ SetError( SbxERR_BOUNDS ); rub = rlb = 0; return sal_False;
}
SbxDim* p = pFirst;
while( --n )
p = p->pNext;
rub = p->nUbound;
rlb = p->nLbound;
- return TRUE;
+ return sal_True;
}
-BOOL SbxDimArray::GetDim( short n, short& rlb, short& rub ) const
+sal_Bool SbxDimArray::GetDim( short n, short& rlb, short& rub ) const
{
- INT32 rlb32, rub32;
- BOOL bRet = GetDim32( n, rlb32, rub32 );
+ sal_Int32 rlb32, rub32;
+ sal_Bool bRet = GetDim32( n, rlb32, rub32 );
if( bRet )
{
if( rlb32 < -SBX_MAXINDEX || rub32 > SBX_MAXINDEX )
{
SetError( SbxERR_BOUNDS );
- return FALSE;
+ return sal_False;
}
rub = (short)rub32;
rlb = (short)rlb32;
@@ -710,15 +710,15 @@ BOOL SbxDimArray::GetDim( short n, short& rlb, short& rub ) const
// Element-Ptr with the help of an index list
-UINT32 SbxDimArray::Offset32( const INT32* pIdx )
+sal_uInt32 SbxDimArray::Offset32( const sal_Int32* pIdx )
{
- UINT32 nPos = 0;
+ sal_uInt32 nPos = 0;
for( SbxDim* p = pFirst; p; p = p->pNext )
{
- INT32 nIdx = *pIdx++;
+ sal_Int32 nIdx = *pIdx++;
if( nIdx < p->nLbound || nIdx > p->nUbound )
{
- nPos = (UINT32)SBX_MAXINDEX32 + 1; break;
+ nPos = (sal_uInt32)SBX_MAXINDEX32 + 1; break;
}
nPos = nPos * p->nSize + nIdx - p->nLbound;
}
@@ -729,7 +729,7 @@ UINT32 SbxDimArray::Offset32( const INT32* pIdx )
return nPos;
}
-USHORT SbxDimArray::Offset( const short* pIdx )
+sal_uInt16 SbxDimArray::Offset( const short* pIdx )
{
long nPos = 0;
for( SbxDim* p = pFirst; p; p = p->pNext )
@@ -745,7 +745,7 @@ USHORT SbxDimArray::Offset( const short* pIdx )
{
SetError( SbxERR_BOUNDS ); nPos = 0;
}
- return (USHORT) nPos;
+ return (sal_uInt16) nPos;
}
SbxVariableRef& SbxDimArray::GetRef( const short* pIdx )
@@ -763,17 +763,17 @@ void SbxDimArray::Put( SbxVariable* p, const short* pIdx )
SbxArray::Put( p, Offset( pIdx ) );
}
-SbxVariableRef& SbxDimArray::GetRef32( const INT32* pIdx )
+SbxVariableRef& SbxDimArray::GetRef32( const sal_Int32* pIdx )
{
return SbxArray::GetRef32( Offset32( pIdx ) );
}
-SbxVariable* SbxDimArray::Get32( const INT32* pIdx )
+SbxVariable* SbxDimArray::Get32( const sal_Int32* pIdx )
{
return SbxArray::Get32( Offset32( pIdx ) );
}
-void SbxDimArray::Put32( SbxVariable* p, const INT32* pIdx )
+void SbxDimArray::Put32( SbxVariable* p, const sal_Int32* pIdx )
{
SbxArray::Put32( p, Offset32( pIdx ) );
}
@@ -781,38 +781,38 @@ void SbxDimArray::Put32( SbxVariable* p, const INT32* pIdx )
// Element-Number with the help of Parameter-Array
-UINT32 SbxDimArray::Offset32( SbxArray* pPar )
+sal_uInt32 SbxDimArray::Offset32( SbxArray* pPar )
{
if( nDim == 0 || !pPar || ( ( nDim != ( pPar->Count() - 1 ) ) && SbiRuntime::isVBAEnabled() ) )
{
SetError( SbxERR_BOUNDS ); return 0;
}
- UINT32 nPos = 0;
- USHORT nOff = 1; // Non element 0!
+ sal_uInt32 nPos = 0;
+ sal_uInt16 nOff = 1; // Non element 0!
for( SbxDim* p = pFirst; p && !IsError(); p = p->pNext )
{
- INT32 nIdx = pPar->Get( nOff++ )->GetLong();
+ sal_Int32 nIdx = pPar->Get( nOff++ )->GetLong();
if( nIdx < p->nLbound || nIdx > p->nUbound )
{
- nPos = (UINT32) SBX_MAXINDEX32+1; break;
+ nPos = (sal_uInt32) SBX_MAXINDEX32+1; break;
}
nPos = nPos * p->nSize + nIdx - p->nLbound;
}
- if( nPos > (UINT32) SBX_MAXINDEX32 )
+ if( nPos > (sal_uInt32) SBX_MAXINDEX32 )
{
SetError( SbxERR_BOUNDS ); nPos = 0;
}
return nPos;
}
-USHORT SbxDimArray::Offset( SbxArray* pPar )
+sal_uInt16 SbxDimArray::Offset( SbxArray* pPar )
{
- UINT32 nPos = Offset32( pPar );
+ sal_uInt32 nPos = Offset32( pPar );
if( nPos > (long) SBX_MAXINDEX )
{
SetError( SbxERR_BOUNDS ); nPos = 0;
}
- return (USHORT) nPos;
+ return (sal_uInt16) nPos;
}
SbxVariableRef& SbxDimArray::GetRef( SbxArray* pPar )
@@ -830,27 +830,27 @@ void SbxDimArray::Put( SbxVariable* p, SbxArray* pPar )
SbxArray::Put32( p, Offset32( pPar ) );
}
-BOOL SbxDimArray::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxDimArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
short nDimension;
rStrm >> nDimension;
for( short i = 0; i < nDimension && rStrm.GetError() == SVSTREAM_OK; i++ )
{
- INT16 lb, ub;
+ sal_Int16 lb, ub;
rStrm >> lb >> ub;
AddDim( lb, ub );
}
return SbxArray::LoadData( rStrm, nVer );
}
-BOOL SbxDimArray::StoreData( SvStream& rStrm ) const
+sal_Bool SbxDimArray::StoreData( SvStream& rStrm ) const
{
- rStrm << (INT16) nDim;
+ rStrm << (sal_Int16) nDim;
for( short i = 0; i < nDim; i++ )
{
short lb, ub;
GetDim( i, lb, ub );
- rStrm << (INT16) lb << (INT16) ub;
+ rStrm << (sal_Int16) lb << (sal_Int16) ub;
}
return SbxArray::StoreData( rStrm );
}
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 6683fbdc56ee..77f34d90f370 100644..100755
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -109,13 +109,13 @@ void SbxBase::Clear()
DBG_CHKTHIS( SbxBase, 0 );
}
-BOOL SbxBase::IsFixed() const
+sal_Bool SbxBase::IsFixed() const
{
DBG_CHKTHIS( SbxBase, 0 );
return IsSet( SBX_FIXED );
}
-void SbxBase::SetModified( BOOL b )
+void SbxBase::SetModified( sal_Bool b )
{
DBG_CHKTHIS( SbxBase, 0 );
if( IsSet( SBX_NO_MODIFY ) )
@@ -138,9 +138,9 @@ void SbxBase::SetError( SbxError e )
p->eSbxError = e;
}
-BOOL SbxBase::IsError()
+sal_Bool SbxBase::IsError()
{
- return BOOL( GetSbxData_Impl()->eSbxError != SbxERR_OK );
+ return sal_Bool( GetSbxData_Impl()->eSbxError != SbxERR_OK );
}
void SbxBase::ResetError()
@@ -154,7 +154,7 @@ void SbxBase::AddFactory( SbxFactory* pFac )
const SbxFactory* pTemp = pFac;
// From 1996-03-06: take the HandleLast-Flag into account
- USHORT nPos = p->aFacs.Count(); // Insert-Position
+ sal_uInt16 nPos = p->aFacs.Count(); // Insert position
if( !pFac->IsHandleLast() ) // Only if not self HandleLast
{
// Rank new factory in front of factories with HandleLast
@@ -168,7 +168,7 @@ void SbxBase::AddFactory( SbxFactory* pFac )
void SbxBase::RemoveFactory( SbxFactory* pFac )
{
SbxAppData* p = GetSbxData_Impl();
- for( USHORT i = 0; i < p->aFacs.Count(); i++ )
+ for( sal_uInt16 i = 0; i < p->aFacs.Count(); i++ )
{
if( p->aFacs.GetObject( i ) == pFac )
{
@@ -178,7 +178,7 @@ void SbxBase::RemoveFactory( SbxFactory* pFac )
}
-SbxBase* SbxBase::Create( UINT16 nSbxId, UINT32 nCreator )
+SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
{
// #91626: Hack to skip old Basic dialogs
// Problem: There does not exist a factory any more,
@@ -204,7 +204,7 @@ SbxBase* SbxBase::Create( UINT16 nSbxId, UINT32 nCreator )
// Unknown type: go over the factories!
SbxAppData* p = GetSbxData_Impl();
SbxBase* pNew = NULL;
- for( USHORT i = 0; i < p->aFacs.Count(); i++ )
+ for( sal_uInt16 i = 0; i < p->aFacs.Count(); i++ )
{
SbxFactory* pFac = p->aFacs.GetObject( i );
pNew = pFac->Create( nSbxId, nCreator );
@@ -226,7 +226,7 @@ SbxObject* SbxBase::CreateObject( const XubString& rClass )
{
SbxAppData* p = GetSbxData_Impl();
SbxObject* pNew = NULL;
- for( USHORT i = 0; i < p->aFacs.Count(); i++ )
+ for( sal_uInt16 i = 0; i < p->aFacs.Count(); i++ )
{
pNew = p->aFacs.GetObject( i )->CreateObject( rClass );
if( pNew )
@@ -244,15 +244,15 @@ SbxObject* SbxBase::CreateObject( const XubString& rClass )
return pNew;
}
-static BOOL bStaticEnableBroadcasting = TRUE;
+static sal_Bool bStaticEnableBroadcasting = sal_True;
// Sbx-Solution in exchange for SfxBroadcaster::Enable()
-void SbxBase::StaticEnableBroadcasting( BOOL bEnable )
+void SbxBase::StaticEnableBroadcasting( sal_Bool bEnable )
{
bStaticEnableBroadcasting = bEnable;
}
-BOOL SbxBase::StaticIsEnabledBroadcasting( void )
+sal_Bool SbxBase::StaticIsEnabledBroadcasting( void )
{
return bStaticEnableBroadcasting;
}
@@ -260,15 +260,15 @@ BOOL SbxBase::StaticIsEnabledBroadcasting( void )
SbxBase* SbxBase::Load( SvStream& rStrm )
{
- UINT16 nSbxId, nFlags, nVer;
- UINT32 nCreator, nSize;
+ sal_uInt16 nSbxId, nFlags, nVer;
+ sal_uInt32 nCreator, nSize;
rStrm >> nCreator >> nSbxId >> nFlags >> nVer;
// Correcting a foolishness of mine:
if( nFlags & SBX_RESERVED )
nFlags = ( nFlags & ~SBX_RESERVED ) | SBX_GBLSEARCH;
- ULONG nOldPos = rStrm.Tell();
+ sal_uIntPtr nOldPos = rStrm.Tell();
rStrm >> nSize;
SbxBase* p = Create( nSbxId, nCreator );
if( p )
@@ -276,7 +276,7 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
p->nFlags = nFlags;
if( p->LoadData( rStrm, nVer ) )
{
- ULONG nNewPos = rStrm.Tell();
+ sal_uIntPtr nNewPos = rStrm.Tell();
nOldPos += nSize;
DBG_ASSERT( nOldPos >= nNewPos, "SBX: Zu viele Daten eingelesen" );
if( nOldPos != nNewPos )
@@ -304,81 +304,81 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
// Skip the Sbx-Object inside the stream
void SbxBase::Skip( SvStream& rStrm )
{
- UINT16 nSbxId, nFlags, nVer;
- UINT32 nCreator, nSize;
+ sal_uInt16 nSbxId, nFlags, nVer;
+ sal_uInt32 nCreator, nSize;
rStrm >> nCreator >> nSbxId >> nFlags >> nVer;
- ULONG nStartPos = rStrm.Tell();
+ sal_uIntPtr nStartPos = rStrm.Tell();
rStrm >> nSize;
rStrm.Seek( nStartPos + nSize );
}
-BOOL SbxBase::Store( SvStream& rStrm )
+sal_Bool SbxBase::Store( SvStream& rStrm )
{
DBG_CHKTHIS( SbxBase, 0 );
if( !( nFlags & SBX_DONTSTORE ) )
{
- rStrm << (UINT32) GetCreator()
- << (UINT16) GetSbxId()
- << (UINT16) GetFlags()
- << (UINT16) GetVersion();
- ULONG nOldPos = rStrm.Tell();
- rStrm << (UINT32) 0L;
- BOOL bRes = StoreData( rStrm );
- ULONG nNewPos = rStrm.Tell();
+ rStrm << (sal_uInt32) GetCreator()
+ << (sal_uInt16) GetSbxId()
+ << (sal_uInt16) GetFlags()
+ << (sal_uInt16) GetVersion();
+ sal_uIntPtr nOldPos = rStrm.Tell();
+ rStrm << (sal_uInt32) 0L;
+ sal_Bool bRes = StoreData( rStrm );
+ sal_uIntPtr nNewPos = rStrm.Tell();
rStrm.Seek( nOldPos );
- rStrm << (UINT32) ( nNewPos - nOldPos );
+ rStrm << (sal_uInt32) ( nNewPos - nOldPos );
rStrm.Seek( nNewPos );
if( rStrm.GetError() != SVSTREAM_OK )
- bRes = FALSE;
+ bRes = sal_False;
if( bRes )
bRes = StoreCompleted();
return bRes;
}
else
- return TRUE;
+ return sal_True;
}
-BOOL SbxBase::LoadData( SvStream&, USHORT )
+sal_Bool SbxBase::LoadData( SvStream&, sal_uInt16 )
{
DBG_CHKTHIS( SbxBase, 0 );
- return FALSE;
+ return sal_False;
}
-BOOL SbxBase::StoreData( SvStream& ) const
+sal_Bool SbxBase::StoreData( SvStream& ) const
{
DBG_CHKTHIS( SbxBase, 0 );
- return FALSE;
+ return sal_False;
}
-BOOL SbxBase::LoadPrivateData( SvStream&, USHORT )
+sal_Bool SbxBase::LoadPrivateData( SvStream&, sal_uInt16 )
{
DBG_CHKTHIS( SbxBase, 0 );
- return TRUE;
+ return sal_True;
}
-BOOL SbxBase::StorePrivateData( SvStream& ) const
+sal_Bool SbxBase::StorePrivateData( SvStream& ) const
{
DBG_CHKTHIS( SbxBase, 0 );
- return TRUE;
+ return sal_True;
}
-BOOL SbxBase::LoadCompleted()
+sal_Bool SbxBase::LoadCompleted()
{
DBG_CHKTHIS( SbxBase, 0 );
- return TRUE;
+ return sal_True;
}
-BOOL SbxBase::StoreCompleted()
+sal_Bool SbxBase::StoreCompleted()
{
DBG_CHKTHIS( SbxBase, 0 );
- return TRUE;
+ return sal_True;
}
//////////////////////////////// SbxFactory ////////////////////////////////
-SbxBase* SbxFactory::Create( UINT16, UINT32 )
+SbxBase* SbxFactory::Create( sal_uInt16, sal_uInt32 )
{
return NULL;
}
@@ -394,7 +394,7 @@ SbxInfo::~SbxInfo()
{}
void SbxInfo::AddParam
- ( const XubString& rName, SbxDataType eType, USHORT nFlags )
+ ( const XubString& rName, SbxDataType eType, sal_uInt16 nFlags )
{
const SbxParamInfo* p = new SbxParamInfo( rName, eType, nFlags );
aParams.Insert( p, aParams.Count() );
@@ -407,7 +407,7 @@ void SbxInfo::AddParam( const SbxParamInfo& r )
aParams.Insert( p, aParams.Count() );
}
-const SbxParamInfo* SbxInfo::GetParam( USHORT n ) const
+const SbxParamInfo* SbxInfo::GetParam( sal_uInt16 n ) const
{
if( n < 1 || n > aParams.Count() )
return NULL;
@@ -415,18 +415,18 @@ const SbxParamInfo* SbxInfo::GetParam( USHORT n ) const
return aParams.GetObject( n-1 );
}
-BOOL SbxInfo::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
aParams.Remove( 0, aParams.Count() );
- UINT16 nParam;
+ sal_uInt16 nParam;
rStrm.ReadByteString( aComment, RTL_TEXTENCODING_ASCII_US );
rStrm.ReadByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US );
rStrm >> nHelpId >> nParam;
while( nParam-- )
{
XubString aName;
- UINT16 nType, nFlags;
- UINT32 nUserData = 0;
+ sal_uInt16 nType, nFlags;
+ sal_uInt32 nUserData = 0;
rStrm.ReadByteString( aName, RTL_TEXTENCODING_ASCII_US );
rStrm >> nType >> nFlags;
if( nVer > 1 )
@@ -435,23 +435,23 @@ BOOL SbxInfo::LoadData( SvStream& rStrm, USHORT nVer )
SbxParamInfo* p = aParams.GetObject( aParams.Count() - 1 );
p->nUserData = nUserData;
}
- return TRUE;
+ return sal_True;
}
-BOOL SbxInfo::StoreData( SvStream& rStrm ) const
+sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const
{
rStrm.WriteByteString( aComment, RTL_TEXTENCODING_ASCII_US );
rStrm.WriteByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US );
rStrm << nHelpId << aParams.Count();
- for( USHORT i = 0; i < aParams.Count(); i++ )
+ for( sal_uInt16 i = 0; i < aParams.Count(); i++ )
{
SbxParamInfo* p = aParams.GetObject( i );
rStrm.WriteByteString( p->aName, RTL_TEXTENCODING_ASCII_US );
- rStrm << (UINT16) p->eType
- << (UINT16) p->nFlags
- << (UINT32) p->nUserData;
+ rStrm << (sal_uInt16) p->eType
+ << (sal_uInt16) p->nFlags
+ << (sal_uInt32) p->nUserData;
}
- return TRUE;
+ return sal_True;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxbool.cxx b/basic/source/sbx/sbxbool.cxx
index 03b435af1ef6..7efb748355cc 100644..100755
--- a/basic/source/sbx/sbxbool.cxx
+++ b/basic/source/sbx/sbxbool.cxx
@@ -86,15 +86,15 @@ enum SbxBOOL ImpGetBool( const SbxValues* p )
else if( !p->pOUString->equalsIgnoreAsciiCase( SbxRes( STRING_FALSE ) ) )
{
// Jetzt kann es noch in eine Zahl konvertierbar sein
- BOOL bError = TRUE;
+ sal_Bool bError = sal_True;
double n;
SbxDataType t;
- USHORT nLen = 0;
+ sal_uInt16 nLen = 0;
if( ImpScan( *p->pOUString, n, t, &nLen ) == SbxERR_OK )
{
if( nLen == p->pOUString->getLength() )
{
- bError = FALSE;
+ bError = sal_False;
if( n != 0.0 )
nRes = SbxTRUE;
}
@@ -146,7 +146,7 @@ enum SbxBOOL ImpGetBool( const SbxValues* p )
return nRes;
}
-void ImpPutBool( SbxValues* p, INT16 n )
+void ImpPutBool( SbxValues* p, sal_Int16 n )
{
if( n )
n = SbxTRUE;
@@ -155,17 +155,17 @@ void ImpPutBool( SbxValues* p, INT16 n )
case SbxCHAR:
p->nChar = (xub_Unicode) n; break;
case SbxUINT:
- p->nByte = (BYTE) n; break;
+ p->nByte = (sal_uInt8) n; break;
case SbxINTEGER:
case SbxBOOL:
p->nInteger = n; break;
case SbxLONG:
p->nLong = n; break;
case SbxULONG:
- p->nULong = (UINT32) n; break;
+ p->nULong = (sal_uInt32) n; break;
case SbxERROR:
case SbxUSHORT:
- p->nUShort = (UINT16) n; break;
+ p->nUShort = (sal_uInt16) n; break;
case SbxSINGLE:
p->nSingle = n; break;
case SbxDATE:
@@ -178,7 +178,7 @@ void ImpPutBool( SbxValues* p, INT16 n )
p->uInt64 = (sal_uInt64) n; break;
case SbxDECIMAL:
case SbxBYREF | SbxDECIMAL:
- ImpCreateDecimal( p )->setInt( (INT16)n );
+ ImpCreateDecimal( p )->setInt( (sal_Int16)n );
break;
case SbxBYREF | SbxSTRING:
@@ -194,7 +194,7 @@ void ImpPutBool( SbxValues* p, INT16 n )
{
SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);
if( pVal )
- pVal->PutBool( BOOL( n != 0 ) );
+ pVal->PutBool( sal_Bool( n != 0 ) );
else
SbxBase::SetError( SbxERR_NO_OBJECT );
break;
@@ -202,17 +202,17 @@ void ImpPutBool( SbxValues* p, INT16 n )
case SbxBYREF | SbxCHAR:
*p->pChar = (xub_Unicode) n; break;
case SbxBYREF | SbxBYTE:
- *p->pByte = (BYTE) n; break;
+ *p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
- *p->pInteger = (INT16) n; break;
+ *p->pInteger = (sal_Int16) n; break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
*p->pLong = n; break;
case SbxBYREF | SbxULONG:
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxSINGLE:
*p->pSingle = n; break;
case SbxBYREF | SbxDATE:
diff --git a/basic/source/sbx/sbxbyte.cxx b/basic/source/sbx/sbxbyte.cxx
index cbdc32c30d4f..90d8ecc40a20 100644..100755
--- a/basic/source/sbx/sbxbyte.cxx
+++ b/basic/source/sbx/sbxbyte.cxx
@@ -32,10 +32,10 @@
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
-BYTE ImpGetByte( const SbxValues* p )
+sal_uInt8 ImpGetByte( const SbxValues* p )
{
SbxValues aTmp;
- BYTE nRes;
+ sal_uInt8 nRes;
start:
switch( +p->eType )
{
@@ -49,10 +49,10 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (BYTE) p->nChar;
+ nRes = (sal_uInt8) p->nChar;
break;
case SbxBYTE:
- nRes = (BYTE) p->nByte; break;
+ nRes = (sal_uInt8) p->nByte; break;
case SbxINTEGER:
case SbxBOOL:
if( p->nInteger > SbxMAXBYTE )
@@ -64,16 +64,16 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (BYTE) p->nInteger;
+ nRes = (sal_uInt8) p->nInteger;
break;
case SbxERROR:
case SbxUSHORT:
- if( p->nUShort > (USHORT) SbxMAXBYTE )
+ if( p->nUShort > (sal_uInt16) SbxMAXBYTE )
{
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
}
else
- nRes = (BYTE) p->nUShort;
+ nRes = (sal_uInt8) p->nUShort;
break;
case SbxLONG:
if( p->nLong > SbxMAXBYTE )
@@ -85,7 +85,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (BYTE) p->nLong;
+ nRes = (sal_uInt8) p->nLong;
break;
case SbxULONG:
if( p->nULong > SbxMAXBYTE )
@@ -93,7 +93,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
}
else
- nRes = (BYTE) p->nULong;
+ nRes = (sal_uInt8) p->nULong;
break;
case SbxCURRENCY:
case SbxSALINT64:
@@ -110,7 +110,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (BYTE) val;
+ nRes = (sal_uInt8) val;
break;
}
case SbxSALUINT64:
@@ -119,7 +119,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXBYTE;
}
else
- nRes = (BYTE) p->uInt64;
+ nRes = (sal_uInt8) p->uInt64;
break;
case SbxSINGLE:
if( p->nSingle > SbxMAXBYTE )
@@ -131,7 +131,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (BYTE) ImpRound( p->nSingle );
+ nRes = (sal_uInt8) ImpRound( p->nSingle );
break;
case SbxDATE:
case SbxDOUBLE:
@@ -157,7 +157,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (BYTE) ImpRound( dVal );
+ nRes = (sal_uInt8) ImpRound( dVal );
break;
}
case SbxBYREF | SbxSTRING:
@@ -180,7 +180,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (BYTE) ( d + 0.5 );
+ nRes = (sal_uInt8) ( d + 0.5 );
}
break;
case SbxOBJECT:
@@ -231,7 +231,7 @@ start:
return nRes;
}
-void ImpPutByte( SbxValues* p, BYTE n )
+void ImpPutByte( SbxValues* p, sal_uInt8 n )
{
switch( +p->eType )
{
diff --git a/basic/source/sbx/sbxchar.cxx b/basic/source/sbx/sbxchar.cxx
index f579eafa9047..ee4cb48b8efb 100644..100755
--- a/basic/source/sbx/sbxchar.cxx
+++ b/basic/source/sbx/sbxchar.cxx
@@ -145,7 +145,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINCHAR;
}
else
- nRes = (BYTE) ImpRound( dVal );
+ nRes = (sal_uInt8) ImpRound( dVal );
break;
}
case SbxBYREF | SbxSTRING:
@@ -276,17 +276,17 @@ start:
case SbxBYREF | SbxCHAR:
*p->pChar = n; break;
case SbxBYREF | SbxBYTE:
- *p->pByte = (BYTE) n; break;
+ *p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
*p->pInteger = n; break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
- *p->pLong = (INT32) n; break;
+ *p->pLong = (sal_Int32) n; break;
case SbxBYREF | SbxULONG:
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxSINGLE:
*p->pSingle = (float) n; break;
case SbxBYREF | SbxDATE:
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index e5518d79a2fd..7023be059f5e 100644..100755
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -42,7 +42,7 @@ static const char* pCount;
static const char* pAdd;
static const char* pItem;
static const char* pRemove;
-static USHORT nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
+static sal_uInt16 nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
/////////////////////////////////////////////////////////////////////////
@@ -62,7 +62,7 @@ SbxCollection::SbxCollection( const XubString& rClass )
}
Initialize();
// For Access on itself
- StartListening( GetBroadcaster(), TRUE );
+ StartListening( GetBroadcaster(), sal_True );
}
SbxCollection::SbxCollection( const SbxCollection& rColl )
@@ -102,7 +102,7 @@ void SbxCollection::Initialize()
p->SetFlag( SBX_DONTSTORE );
}
-SbxVariable* SbxCollection::FindUserData( UINT32 nData )
+SbxVariable* SbxCollection::FindUserData( sal_uInt32 nData )
{
if( GetParameters() )
{
@@ -130,9 +130,9 @@ void SbxCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
const SbxHint* p = PTR_CAST(SbxHint,&rHint);
if( p )
{
- ULONG nId = p->GetId();
- BOOL bRead = BOOL( nId == SBX_HINT_DATAWANTED );
- BOOL bWrite = BOOL( nId == SBX_HINT_DATACHANGED );
+ sal_uIntPtr nId = p->GetId();
+ sal_Bool bRead = sal_Bool( nId == SBX_HINT_DATAWANTED );
+ sal_Bool bWrite = sal_Bool( nId == SBX_HINT_DATACHANGED );
SbxVariable* pVar = p->GetVar();
SbxArray* pArg = pVar->GetParameters();
if( bRead || bWrite )
@@ -192,7 +192,7 @@ void SbxCollection::CollItem( SbxArray* pPar_ )
{
short n = p->GetInteger();
if( n >= 1 && n <= (short) pObjs->Count() )
- pRes = pObjs->Get( (USHORT) n - 1 );
+ pRes = pObjs->Get( (sal_uInt16) n - 1 );
}
if( !pRes )
SetError( SbxERR_BAD_INDEX );
@@ -212,13 +212,13 @@ void SbxCollection::CollRemove( SbxArray* pPar_ )
if( n < 1 || n > (short) pObjs->Count() )
SetError( SbxERR_BAD_INDEX );
else
- Remove( pObjs->Get( (USHORT) n - 1 ) );
+ Remove( pObjs->Get( (sal_uInt16) n - 1 ) );
}
}
-BOOL SbxCollection::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
- BOOL bRes = SbxObject::LoadData( rStrm, nVer );
+ sal_Bool bRes = SbxObject::LoadData( rStrm, nVer );
Initialize();
return bRes;
}
@@ -226,7 +226,7 @@ BOOL SbxCollection::LoadData( SvStream& rStrm, USHORT nVer )
/////////////////////////////////////////////////////////////////////////
SbxStdCollection::SbxStdCollection
- ( const XubString& rClass, const XubString& rElem, BOOL b )
+ ( const XubString& rClass, const XubString& rElem, sal_Bool b )
: SbxCollection( rClass ), aElemClass( rElem ),
bAddRemoveOk( b )
{}
@@ -278,9 +278,9 @@ void SbxStdCollection::CollRemove( SbxArray* pPar_ )
SbxCollection::CollRemove( pPar_ );
}
-BOOL SbxStdCollection::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxStdCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
- BOOL bRes = SbxCollection::LoadData( rStrm, nVer );
+ sal_Bool bRes = SbxCollection::LoadData( rStrm, nVer );
if( bRes )
{
rStrm.ReadByteString( aElemClass, RTL_TEXTENCODING_ASCII_US );
@@ -289,9 +289,9 @@ BOOL SbxStdCollection::LoadData( SvStream& rStrm, USHORT nVer )
return bRes;
}
-BOOL SbxStdCollection::StoreData( SvStream& rStrm ) const
+sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const
{
- BOOL bRes = SbxCollection::StoreData( rStrm );
+ sal_Bool bRes = SbxCollection::StoreData( rStrm );
if( bRes )
{
rStrm.WriteByteString( aElemClass, RTL_TEXTENCODING_ASCII_US );
diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx
index ad455b2872af..2a11f151d862 100644..100755
--- a/basic/source/sbx/sbxconv.hxx
+++ b/basic/source/sbx/sbxconv.hxx
@@ -34,19 +34,19 @@
class SbxArray;
// SBXSCAN.CXX
-extern void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreString=FALSE );
+extern void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, sal_Bool bCoreString=sal_False );
extern SbxError ImpScan
- ( const ::rtl::OUString& rSrc, double& nVal, SbxDataType& rType, USHORT* pLen,
- BOOL bAllowIntntl=FALSE, BOOL bOnlyIntntl=FALSE );
+ ( const ::rtl::OUString& rSrc, double& nVal, SbxDataType& rType, sal_uInt16* pLen,
+ sal_Bool bAllowIntntl=sal_False, sal_Bool bOnlyIntntl=sal_False );
// with advanced evaluation (International, "TRUE"/"FALSE")
-extern BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType );
+extern sal_Bool ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType );
// SBXINT.CXX
double ImpRound( double );
-INT16 ImpGetInteger( const SbxValues* );
-void ImpPutInteger( SbxValues*, INT16 );
+sal_Int16 ImpGetInteger( const SbxValues* );
+void ImpPutInteger( SbxValues*, sal_Int16 );
sal_Int64 ImpGetInt64( const SbxValues* );
void ImpPutInt64( SbxValues*, sal_Int64 );
@@ -60,8 +60,8 @@ double ImpSalUInt64ToDouble( sal_uInt64 n );
// SBXLNG.CXX
-INT32 ImpGetLong( const SbxValues* );
-void ImpPutLong( SbxValues*, INT32 );
+sal_Int32 ImpGetLong( const SbxValues* );
+void ImpPutLong( SbxValues*, sal_Int32 );
// SBXSNG.CXX
@@ -71,7 +71,7 @@ void ImpPutSingle( SbxValues*, float );
// SBXDBL.CXX
double ImpGetDouble( const SbxValues* );
-void ImpPutDouble( SbxValues*, double, BOOL bCoreString=FALSE );
+void ImpPutDouble( SbxValues*, double, sal_Bool bCoreString=sal_False );
// SBXCURR.CXX
@@ -110,23 +110,23 @@ sal_Unicode ImpGetChar( const SbxValues* );
void ImpPutChar( SbxValues*, sal_Unicode );
// SBXBYTE.CXX
-BYTE ImpGetByte( const SbxValues* );
-void ImpPutByte( SbxValues*, BYTE );
+sal_uInt8 ImpGetByte( const SbxValues* );
+void ImpPutByte( SbxValues*, sal_uInt8 );
// SBXUINT.CXX
-UINT16 ImpGetUShort( const SbxValues* );
-void ImpPutUShort( SbxValues*, UINT16 );
+sal_uInt16 ImpGetUShort( const SbxValues* );
+void ImpPutUShort( SbxValues*, sal_uInt16 );
// SBXULNG.CXX
-UINT32 ImpGetULong( const SbxValues* );
-void ImpPutULong( SbxValues*, UINT32 );
+sal_uInt32 ImpGetULong( const SbxValues* );
+void ImpPutULong( SbxValues*, sal_uInt32 );
// SBXBOOL.CXX
enum SbxBOOL ImpGetBool( const SbxValues* );
-void ImpPutBool( SbxValues*, INT16 );
+void ImpPutBool( SbxValues*, sal_Int16 );
// ByteArray <--> String
SbxArray* StringToByteArray(const ::rtl::OUString& rStr);
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index de80ea281b16..0ea500bb0ba2 100644..100755
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -474,7 +474,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); val = 0;
}
- *p->pByte = (BYTE) val; break;
+ *p->pByte = (sal_uInt8) val; break;
}
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
@@ -488,7 +488,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); val = SbxMININT;
}
- *p->pInteger = (INT16) val; break;
+ *p->pInteger = (sal_uInt16) val; break;
}
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
@@ -502,7 +502,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); val = 0;
}
- *p->pUShort = (UINT16) val; break;
+ *p->pUShort = (sal_uInt16) val; break;
}
case SbxBYREF | SbxLONG:
{
@@ -515,7 +515,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); val = SbxMINLNG;
}
- *p->pLong = (INT32) val; break;
+ *p->pLong = (sal_Int32) val; break;
}
case SbxBYREF | SbxULONG:
{
@@ -528,7 +528,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); val = 0;
}
- *p->pULong = (UINT32) val;
+ *p->pULong = (sal_uInt32) val; break;
break;
}
case SbxBYREF | SbxCURRENCY:
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index 282409f081d2..804506c18215 100644..100755
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -122,13 +122,13 @@ double ImpGetDate( const SbxValues* p )
pFormatter->PutandConvertEntry( aStr, nCheckPos, nType,
nIndex, LANGUAGE_GERMAN, eLangType );
- BOOL bSuccess = pFormatter->IsNumberFormat( *p->pOUString, nIndex, nRes );
+ sal_Bool bSuccess = pFormatter->IsNumberFormat( *p->pOUString, nIndex, nRes );
if ( bSuccess )
{
short nType_ = pFormatter->GetType( nIndex );
if(!(nType_ & ( NUMBERFORMAT_DATETIME | NUMBERFORMAT_DATE |
NUMBERFORMAT_TIME | NUMBERFORMAT_DEFINED )))
- bSuccess = FALSE;
+ bSuccess = sal_False;
}
if ( !bSuccess )
@@ -317,7 +317,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pByte = (BYTE) n; break;
+ *p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
if( n > SbxMAXINT )
@@ -328,7 +328,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
}
- *p->pInteger = (INT16) n; break;
+ *p->pInteger = (sal_Int16) n; break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
if( n > SbxMAXUINT )
@@ -339,7 +339,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
if( n > SbxMAXLNG )
{
@@ -349,7 +349,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINLNG;
}
- *p->pLong = (INT32) n; break;
+ *p->pLong = (sal_Int32) n; break;
case SbxBYREF | SbxULONG:
if( n > SbxMAXULNG )
{
@@ -359,7 +359,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxSINGLE:
if( n > SbxMAXSNG )
{
diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx
index 570da2cf0626..c4bbbe46c4ec 100644..100755
--- a/basic/source/sbx/sbxdbl.cxx
+++ b/basic/source/sbx/sbxdbl.cxx
@@ -141,7 +141,7 @@ double ImpGetDouble( const SbxValues* p )
return nRes;
}
-void ImpPutDouble( SbxValues* p, double n, BOOL bCoreString )
+void ImpPutDouble( SbxValues* p, double n, sal_Bool bCoreString )
{
SbxValues aTmp;
start:
@@ -232,7 +232,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pByte = (BYTE) n; break;
+ *p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
if( n > SbxMAXINT )
@@ -243,7 +243,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
}
- *p->pInteger = (INT16) n; break;
+ *p->pInteger = (sal_Int16) n; break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
if( n > SbxMAXUINT )
@@ -254,7 +254,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
if( n > SbxMAXLNG )
{
@@ -264,7 +264,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINLNG;
}
- *p->pLong = (INT32) n; break;
+ *p->pLong = (sal_Int32) n; break;
case SbxBYREF | SbxULONG:
if( n > SbxMAXULNG )
{
@@ -274,7 +274,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxSINGLE:
if( n > SbxMAXSNG )
{
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 86464627ba73..91553270736a 100644..100755
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -155,32 +155,32 @@ SbxDecimal::CmpResult compare( const SbxDecimal &rLeft, const SbxDecimal &rRight
void SbxDecimal::setChar( sal_Unicode val )
{
- VarDecFromUI2( (USHORT)val, &maDec );
+ VarDecFromUI2( (sal_uInt16)val, &maDec );
}
-void SbxDecimal::setByte( BYTE val )
+void SbxDecimal::setByte( sal_uInt8 val )
{
- VarDecFromUI1( (BYTE)val, &maDec );
+ VarDecFromUI1( (sal_uInt8)val, &maDec );
}
-void SbxDecimal::setShort( INT16 val )
+void SbxDecimal::setShort( sal_Int16 val )
{
VarDecFromI2( (short)val, &maDec );
}
-void SbxDecimal::setLong( INT32 val )
+void SbxDecimal::setLong( sal_Int32 val )
{
VarDecFromI4( (long)val, &maDec );
}
-void SbxDecimal::setUShort( UINT16 val )
+void SbxDecimal::setUShort( sal_uInt16 val )
{
- VarDecFromUI2( (USHORT)val, &maDec );
+ VarDecFromUI2( (sal_uInt16)val, &maDec );
}
-void SbxDecimal::setULong( UINT32 val )
+void SbxDecimal::setULong( sal_uInt32 val )
{
- VarDecFromUI4( (ULONG)val, &maDec );
+ VarDecFromUI4( (sal_uIntPtr)val, &maDec );
}
bool SbxDecimal::setSingle( float val )
@@ -197,12 +197,12 @@ bool SbxDecimal::setDouble( double val )
void SbxDecimal::setInt( int val )
{
- setLong( (INT32)val );
+ setLong( (sal_Int32)val );
}
void SbxDecimal::setUInt( unsigned int val )
{
- setULong( (UINT32)val );
+ setULong( (sal_uInt32)val );
}
// sbxscan.cxx
@@ -258,31 +258,31 @@ bool SbxDecimal::getChar( sal_Unicode& rVal )
return bRet;
}
-bool SbxDecimal::getByte( BYTE& rVal )
+bool SbxDecimal::getByte( sal_uInt8& rVal )
{
bool bRet = ( VarUI1FromDec( &maDec, &rVal ) == S_OK );
return bRet;
}
-bool SbxDecimal::getShort( INT16& rVal )
+bool SbxDecimal::getShort( sal_Int16& rVal )
{
bool bRet = ( VarI2FromDec( &maDec, &rVal ) == S_OK );
return bRet;
}
-bool SbxDecimal::getLong( INT32& rVal )
+bool SbxDecimal::getLong( sal_Int32& rVal )
{
bool bRet = ( VarI4FromDec( &maDec, &rVal ) == S_OK );
return bRet;
}
-bool SbxDecimal::getUShort( UINT16& rVal )
+bool SbxDecimal::getUShort( sal_uInt16& rVal )
{
bool bRet = ( VarUI2FromDec( &maDec, &rVal ) == S_OK );
return bRet;
}
-bool SbxDecimal::getULong( UINT32& rVal )
+bool SbxDecimal::getULong( sal_uInt32& rVal )
{
bool bRet = ( VarUI4FromDec( &maDec, &rVal ) == S_OK );
return bRet;
@@ -302,7 +302,7 @@ bool SbxDecimal::getDouble( double& rVal )
bool SbxDecimal::getInt( int& rVal )
{
- INT32 TmpVal;
+ sal_Int32 TmpVal;
bool bRet = getLong( TmpVal );
rVal = TmpVal;
return bRet;
@@ -310,7 +310,7 @@ bool SbxDecimal::getInt( int& rVal )
bool SbxDecimal::getUInt( unsigned int& rVal )
{
- UINT32 TmpVal;
+ sal_uInt32 TmpVal;
bool bRet = getULong( TmpVal );
rVal = TmpVal;
return bRet;
@@ -361,11 +361,11 @@ SbxDecimal::CmpResult compare( const SbxDecimal &rLeft, const SbxDecimal &rRight
}
void SbxDecimal::setChar( sal_Unicode val ) { (void)val; }
-void SbxDecimal::setByte( BYTE val ) { (void)val; }
-void SbxDecimal::setShort( INT16 val ) { (void)val; }
-void SbxDecimal::setLong( INT32 val ) { (void)val; }
-void SbxDecimal::setUShort( UINT16 val ) { (void)val; }
-void SbxDecimal::setULong( UINT32 val ) { (void)val; }
+void SbxDecimal::setByte( sal_uInt8 val ) { (void)val; }
+void SbxDecimal::setShort( sal_Int16 val ) { (void)val; }
+void SbxDecimal::setLong( sal_Int32 val ) { (void)val; }
+void SbxDecimal::setUShort( sal_uInt16 val ) { (void)val; }
+void SbxDecimal::setULong( sal_uInt32 val ) { (void)val; }
bool SbxDecimal::setSingle( float val ) { (void)val; return false; }
bool SbxDecimal::setDouble( double val ) { (void)val; return false; }
void SbxDecimal::setInt( int val ) { (void)val; }
@@ -373,11 +373,11 @@ void SbxDecimal::setUInt( unsigned int val ) { (void)val; }
bool SbxDecimal::setString( ::rtl::OUString* pOUString ) { (void)pOUString; return false; }
bool SbxDecimal::getChar( sal_Unicode& rVal ) { (void)rVal; return false; }
-bool SbxDecimal::getByte( BYTE& rVal ) { (void)rVal; return false; }
-bool SbxDecimal::getShort( INT16& rVal ) { (void)rVal; return false; }
-bool SbxDecimal::getLong( INT32& rVal ) { (void)rVal; return false; }
-bool SbxDecimal::getUShort( UINT16& rVal ) { (void)rVal; return false; }
-bool SbxDecimal::getULong( UINT32& rVal ) { (void)rVal; return false; }
+bool SbxDecimal::getByte( sal_uInt8& rVal ) { (void)rVal; return false; }
+bool SbxDecimal::getShort( sal_Int16& rVal ) { (void)rVal; return false; }
+bool SbxDecimal::getLong( sal_Int32& rVal ) { (void)rVal; return false; }
+bool SbxDecimal::getUShort( sal_uInt16& rVal ) { (void)rVal; return false; }
+bool SbxDecimal::getULong( sal_uInt32& rVal ) { (void)rVal; return false; }
bool SbxDecimal::getSingle( float& rVal ) { (void)rVal; return false; }
bool SbxDecimal::getDouble( double& rVal ) { (void)rVal; return false; }
bool SbxDecimal::getInt( int& rVal ) { (void)rVal; return false; }
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index 5438c151e60f..c783010f0ed2 100644..100755
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -62,7 +62,7 @@ class SbxDecimal
#ifdef WIN32
DECIMAL maDec;
#endif
- INT32 mnRefCount;
+ sal_Int32 mnRefCount;
public:
SbxDecimal( void );
@@ -77,11 +77,11 @@ public:
void fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
void setChar( sal_Unicode val );
- void setByte( BYTE val );
- void setShort( INT16 val );
- void setLong( INT32 val );
- void setUShort( UINT16 val );
- void setULong( UINT32 val );
+ void setByte( sal_uInt8 val );
+ void setShort( sal_Int16 val );
+ void setLong( sal_Int32 val );
+ void setUShort( sal_uInt16 val );
+ void setULong( sal_uInt32 val );
bool setSingle( float val );
bool setDouble( double val );
void setInt( int val );
@@ -98,11 +98,11 @@ public:
}
bool getChar( sal_Unicode& rVal );
- bool getByte( BYTE& rVal );
- bool getShort( INT16& rVal );
- bool getLong( INT32& rVal );
- bool getUShort( UINT16& rVal );
- bool getULong( UINT32& rVal );
+ bool getByte( sal_uInt8& rVal );
+ bool getShort( sal_Int16& rVal );
+ bool getLong( sal_Int32& rVal );
+ bool getUShort( sal_uInt16& rVal );
+ bool getULong( sal_uInt32& rVal );
bool getSingle( float& rVal );
bool getDouble( double& rVal );
bool getInt( int& rVal );
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index cc48256fbfbc..f12ffc0bf817 100644..100755
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -36,21 +36,21 @@
class SbxSimpleCharClass
{
public:
- BOOL isAlpha( sal_Unicode c ) const
+ sal_Bool isAlpha( sal_Unicode c ) const
{
- BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+ sal_Bool bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
return bRet;
}
- BOOL isDigit( sal_Unicode c ) const
+ sal_Bool isDigit( sal_Unicode c ) const
{
- BOOL bRet = (c >= '0' && c <= '9');
+ sal_Bool bRet = (c >= '0' && c <= '9');
return bRet;
}
- BOOL isAlphaNumeric( sal_Unicode c ) const
+ sal_Bool isAlphaNumeric( sal_Unicode c ) const
{
- BOOL bRet = isDigit( c ) || isAlpha( c );
+ sal_Bool bRet = isDigit( c ) || isAlpha( c );
return bRet;
}
};
@@ -72,7 +72,7 @@ static const xub_Unicode* SkipWhitespace( const xub_Unicode* p )
static const xub_Unicode* Symbol( const xub_Unicode* p, XubString& rSym, const SbxSimpleCharClass& rCharClass )
{
- USHORT nLen = 0;
+ sal_uInt16 nLen = 0;
// Did we have a nonstandard symbol?
if( *p == '[' )
{
@@ -142,7 +142,7 @@ static SbxVariable* QualifiedName
// a function (with optional parameters).
static SbxVariable* Operand
- ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf, BOOL bVar )
+ ( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf, sal_Bool bVar )
{
static SbxSimpleCharClass aCharClass;
@@ -154,7 +154,7 @@ static SbxVariable* Operand
|| *p == '&' ) )
{
// A number could be scanned in directly!
- USHORT nLen;
+ sal_uInt16 nLen;
if( !refVar->Scan( XubString( p ), &nLen ) )
refVar.Clear();
else
@@ -192,12 +192,12 @@ static SbxVariable* Operand
static SbxVariable* MulDiv( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf )
{
const xub_Unicode* p = *ppBuf;
- SbxVariableRef refVar( Operand( pObj, pGbl, &p, FALSE ) );
+ SbxVariableRef refVar( Operand( pObj, pGbl, &p, sal_False ) );
p = SkipWhitespace( p );
while( refVar.Is() && ( *p == '*' || *p == '/' ) )
{
xub_Unicode cOp = *p++;
- SbxVariableRef refVar2( Operand( pObj, pGbl, &p, FALSE ) );
+ SbxVariableRef refVar2( Operand( pObj, pGbl, &p, sal_False ) );
if( refVar2.Is() )
{
// temporary variable!
@@ -256,7 +256,7 @@ static SbxVariable* PlusMinus( SbxObject* pObj, SbxObject* pGbl, const xub_Unico
static SbxVariable* Assign( SbxObject* pObj, SbxObject* pGbl, const xub_Unicode** ppBuf )
{
const xub_Unicode* p = *ppBuf;
- SbxVariableRef refVar( Operand( pObj, pGbl, &p, TRUE ) );
+ SbxVariableRef refVar( Operand( pObj, pGbl, &p, sal_True ) );
p = SkipWhitespace( p );
if( refVar.Is() )
{
@@ -304,7 +304,7 @@ static SbxVariable* Element
SbxVariableRef refVar;
if( aSym.Len() )
{
- USHORT nOld = pObj->GetFlags();
+ sal_uInt16 nOld = pObj->GetFlags();
if( pObj == pGbl )
pObj->SetFlag( SBX_GBLSEARCH );
refVar = pObj->Find( aSym, t );
@@ -318,7 +318,7 @@ static SbxVariable* Element
{
p++;
SbxArrayRef refPar = new SbxArray;
- USHORT nArg = 0;
+ sal_uInt16 nArg = 0;
// We are once relaxed and accept as well
// the line- or commandend as delimiter
// Search parameter always global!
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index 3e6aee717283..d1a85cb07d3a 100644..100755
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -152,7 +152,7 @@ void SbxBasicFormater::ShowError( char * sErrMsg )
// um eine Position zu gr"osseren Indizes, d.h. es wird Platz f"ur
// ein neues (einzuf"ugendes) Zeichen geschafft.
// ACHTUNG: der String MUSS gross genug sein !
-inline void SbxBasicFormater::ShiftString( String& sStrg, USHORT nStartPos )
+inline void SbxBasicFormater::ShiftString( String& sStrg, sal_uInt16 nStartPos )
{
sStrg.Erase( nStartPos,1 );
}
@@ -175,7 +175,7 @@ void SbxBasicFormater::AppendDigit( String& sStrg, short nDigit )
// verschiebt den Dezimal-Punkt um eine Stelle nach links
void SbxBasicFormater::LeftShiftDecimalPoint( String& sStrg )
{
- USHORT nPos = sStrg.Search( cDecPoint );
+ sal_uInt16 nPos = sStrg.Search( cDecPoint );
if( nPos!=STRING_NOTFOUND )
{
@@ -189,13 +189,13 @@ void SbxBasicFormater::LeftShiftDecimalPoint( String& sStrg )
// es wird ein Flag zur"uckgeliefert, falls ein Overflow auftrat,
// d.h. 99.99 --> 100.00, d.h. ein Gr"ossenordung ge"andert wurde
// (geschieht beim Runden einer 9).
-void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow )
+void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, sal_Bool& bOverflow )
{
// wurde ggf ein falscher Index uebergeben --> Aufruf ignorieren
if( nPos<0 )
return;
- bOverflow = FALSE;
+ bOverflow = sal_False;
// "uberspringe den Dezimalpunkt und Tausender-Trennzeichen
sal_Unicode c = sStrg.GetChar( nPos );
if( nPos>0 && (c == cDecPoint || c == cThousandSep) )
@@ -219,7 +219,7 @@ void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow
ShiftString( sStrg,0 );
// f"uhrende 1 einf"ugen: z.B. 99.99 f"ur 0.0
sStrg.SetChar( 0, '1' );
- bOverflow = TRUE;
+ bOverflow = sal_True;
}
else
{
@@ -244,7 +244,7 @@ void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow
ShiftString( sStrg,nPos+1 );
// f"uhrende 1 einf"ugen
sStrg.SetChar( nPos+1, '1' );
- bOverflow = TRUE;
+ bOverflow = sal_True;
}
}
}
@@ -252,7 +252,7 @@ void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos, BOOL& bOverflow
// rundet in einem String die Ziffer an der angegebenen Stelle
void SbxBasicFormater::StrRoundDigit( String& sStrg, short nPos )
{
- BOOL bOverflow;
+ sal_Bool bOverflow;
StrRoundDigit( sStrg,nPos,bOverflow );
}
@@ -303,7 +303,7 @@ void SbxBasicFormater::InitExp( double _dNewExp )
// bestimmt die Ziffer an der angegebenen Stelle (gedacht zur Anwendung im
// Scan-Durchlauf)
-short SbxBasicFormater::GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit )
+short SbxBasicFormater::GetDigitAtPosScan( short nPos, sal_Bool& bFoundFirstDigit )
{
// Versuch eine gr"ossere Ziffer zu lesen,
// z.B. Stelle 4 in 1.234,
@@ -313,18 +313,18 @@ short SbxBasicFormater::GetDigitAtPosScan( short nPos, BOOL& bFoundFirstDigit )
return _NO_DIGIT;
// bestimme den Index der Stelle in dem Number-String:
// "uberlese das Vorzeichen
- USHORT no = 1;
+ sal_uInt16 no = 1;
// falls notwendig den Dezimal-Punkt "uberlesen:
if( nPos<nNumExp )
no++;
no += nNumExp-nPos;
// Abfrage der ersten (g"ultigen) Ziffer der Zahl --> Flag setzen
if( nPos==nNumExp )
- bFoundFirstDigit = TRUE;
+ bFoundFirstDigit = sal_True;
return (short)(sSciNumStrg.GetChar( no ) - ASCII_0);
}
-short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit )
+short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, sal_Bool& bFoundFirstDigit )
{
// ist die abgefragte Stelle zu gross f"ur den Exponenten ?
if( nPos>nExpExp )
@@ -332,11 +332,11 @@ short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit
// bestimme den Index der Stelle in dem Number-String:
// "uberlese das Vorzeichen
- USHORT no = 1;
+ sal_uInt16 no = 1;
no += nExpExp-nPos;
// Abfrage der ersten (g"ultigen) Ziffer der Zahl --> Flag setzen
if( nPos==nExpExp )
- bFoundFirstDigit = TRUE;
+ bFoundFirstDigit = sal_True;
return (short)(sNumExpStrg.GetChar( no ) - ASCII_0);
}
@@ -344,7 +344,7 @@ short SbxBasicFormater::GetDigitAtPosExpScan( short nPos, BOOL& bFoundFirstDigit
// Zahl ggf. NICHT normiert (z.B. 1.2345e-03) dargestellt werden soll,
// sondern eventuell 123.345e-3 !
short SbxBasicFormater::GetDigitAtPosExpScan( double dNewExponent, short nPos,
- BOOL& bFoundFirstDigit )
+ sal_Bool& bFoundFirstDigit )
{
// neuer Exponent wurde "ubergeben, aktualisiere
// die tempor"aren Klassen-Variablen
@@ -382,7 +382,7 @@ TODO: ggf einen 'intelligenten' Peek-Parser um Rundungsfehler bei
//
// ACHTUNG: anscheinend gibt es manchmal noch Probleme mit Rundungs-Fehlern!
short SbxBasicFormater::GetDigitAtPos( double dNumber, short nPos,
- double& dNextNumber, BOOL& bFoundFirstDigit )
+ double& dNextNumber, sal_Bool& bFoundFirstDigit )
// ACHTUNG: nPos kann auch negativ werden, f"ur Stellen nach dem Dezimal-Punkt
{
double dDigit;
@@ -399,7 +399,7 @@ short SbxBasicFormater::GetDigitAtPos( double dNumber, short nPos,
if( nMaxDigit<nPos && !bFoundFirstDigit && nPos>=0 )
return _NO_DIGIT;
// Ziffer gefunden, setze Flag:
- bFoundFirstDigit = TRUE;
+ bFoundFirstDigit = sal_True;
for( short i=nMaxDigit; i>=nPos; i-- )
{
double dI = (double)i;
@@ -431,14 +431,14 @@ short SbxBasicFormater::RoundDigit( double dNumber )
// und liefert diesen zur"uck.
// Somit wird ein neuer String erzeugt, der vom Aufrufer wieder freigegeben
// werden muss
-String SbxBasicFormater::GetPosFormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::GetPosFormatString( const String& sFormatStrg, sal_Bool & bFound )
{
- bFound = FALSE; // default...
- USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+ bFound = sal_False; // default...
+ sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
if( nPos!=STRING_NOTFOUND )
{
- bFound = TRUE;
+ bFound = sal_True;
// der Format-String f"ur die positiven Zahlen ist alles
// vor dem ersten ';'
return sFormatStrg.Copy( 0,nPos );
@@ -450,10 +450,10 @@ String SbxBasicFormater::GetPosFormatString( const String& sFormatStrg, BOOL & b
}
// siehe auch GetPosFormatString()
-String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, sal_Bool & bFound )
{
- bFound = FALSE; // default...
- USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+ bFound = sal_False; // default...
+ sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
if( nPos!=STRING_NOTFOUND )
{
@@ -463,7 +463,7 @@ String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, BOOL & b
String sTempStrg = sFormatStrg.Copy( nPos+1 );
// und suche darin ggf. ein weiteres ';'
nPos = sTempStrg.Search( FORMAT_SEPARATOR );
- bFound = TRUE;
+ bFound = sal_True;
if( nPos==STRING_NOTFOUND )
// keins gefunden, liefere alles...
return sTempStrg;
@@ -477,10 +477,10 @@ String SbxBasicFormater::GetNegFormatString( const String& sFormatStrg, BOOL & b
}
// siehe auch GetPosFormatString()
-String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, sal_Bool & bFound )
{
- bFound = FALSE; // default...
- USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+ bFound = sal_False; // default...
+ sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
if( nPos!=STRING_NOTFOUND )
{
@@ -492,7 +492,7 @@ String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, BOOL & bFo
nPos = sTempStrg.Search( FORMAT_SEPARATOR );
if( nPos!=STRING_NOTFOUND )
{
- bFound = TRUE;
+ bFound = sal_True;
sTempStrg = sTempStrg.Copy( nPos+1 );
nPos = sTempStrg.Search( FORMAT_SEPARATOR );
if( nPos==STRING_NOTFOUND )
@@ -509,10 +509,10 @@ String SbxBasicFormater::Get0FormatString( const String& sFormatStrg, BOOL & bFo
}
// siehe auch GetPosFormatString()
-String SbxBasicFormater::GetNullFormatString( const String& sFormatStrg, BOOL & bFound )
+String SbxBasicFormater::GetNullFormatString( const String& sFormatStrg, sal_Bool & bFound )
{
- bFound = FALSE; // default...
- USHORT nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
+ bFound = sal_False; // default...
+ sal_uInt16 nPos = sFormatStrg.Search( FORMAT_SEPARATOR );
if( nPos!=STRING_NOTFOUND )
{
@@ -529,7 +529,7 @@ String SbxBasicFormater::GetNullFormatString( const String& sFormatStrg, BOOL &
nPos = sTempStrg.Search( FORMAT_SEPARATOR );
if( nPos!=STRING_NOTFOUND )
{
- bFound = TRUE;
+ bFound = sal_True;
return sTempStrg.Copy( nPos+1 );
}
}
@@ -546,11 +546,11 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
short& nNoOfDigitsLeft, short& nNoOfDigitsRight,
short& nNoOfOptionalDigitsLeft,
short& nNoOfExponentDigits, short& nNoOfOptionalExponentDigits,
- BOOL& bPercent, BOOL& bCurrency, BOOL& bScientific,
- BOOL& bGenerateThousandSeparator,
+ sal_Bool& bPercent, sal_Bool& bCurrency, sal_Bool& bScientific,
+ sal_Bool& bGenerateThousandSeparator,
short& nMultipleThousandSeparators )
{
- USHORT nLen;
+ sal_uInt16 nLen;
short nState = 0;
nLen = sFormatStrg.Len();
@@ -560,9 +560,9 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
nNoOfOptionalDigitsLeft = 0;
nNoOfExponentDigits = 0;
nNoOfOptionalExponentDigits = 0;
- bPercent = FALSE;
- bCurrency = FALSE;
- bScientific = FALSE;
+ bPercent = sal_False;
+ bCurrency = sal_False;
+ bScientific = sal_False;
// ab 11.7.97: sobald ein Komma in dem Format String gefunden wird,
// werden alle 3 Zehnerpotenzen markiert (d.h. tausender, milionen, ...)
// bisher wurde nur an den gesetzten Position ein Tausender-Separator
@@ -571,7 +571,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
bGenerateThousandSeparator = sFormatStrg.Search( ',' ) != STRING_NOTFOUND;
nMultipleThousandSeparators = 0;
// und untersuche den Format-String nach den gew"unschten Informationen
- for( USHORT i=0; i<nLen; i++ )
+ for( sal_uInt16 i=0; i<nLen; i++ )
{
sal_Unicode c = sFormatStrg.GetChar( i );
switch( c ) {
@@ -614,7 +614,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
return -1; // ERROR: zu viele Dezimal-Punkte
break;
case '%':
- bPercent = TRUE;
+ bPercent = sal_True;
/* old:
bPercent++;
if( bPercent>1 )
@@ -622,7 +622,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
*/
break;
case '(':
- bCurrency = TRUE;
+ bCurrency = sal_True;
break;
case ',':
{
@@ -638,7 +638,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
if( nNoOfDigitsLeft > 0 || nNoOfDigitsRight > 0 )
{
nState = -1; // breche jetzt das Z"ahlen der Stellen ab
- bScientific = TRUE;
+ bScientific = sal_True;
}
/* old:
bScientific++;
@@ -653,7 +653,7 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
i++;
break;
case CREATE_1000SEP_CHAR:
- bGenerateThousandSeparator = TRUE;
+ bGenerateThousandSeparator = sal_True;
break;
}
}
@@ -664,12 +664,12 @@ short SbxBasicFormater::AnalyseFormatString( const String& sFormatStrg,
// erzeugt werden soll
void SbxBasicFormater::ScanFormatString( double dNumber,
const String& sFormatStrg, String& sReturnStrg,
- BOOL bCreateSign )
+ sal_Bool bCreateSign )
{
short /*nErr,*/nNoOfDigitsLeft,nNoOfDigitsRight,nNoOfOptionalDigitsLeft,
nNoOfExponentDigits,nNoOfOptionalExponentDigits,
nMultipleThousandSeparators;
- BOOL bPercent,bCurrency,bScientific,bGenerateThousandSeparator;
+ sal_Bool bPercent,bCurrency,bScientific,bGenerateThousandSeparator;
// Initialisiere den Return-String
sReturnStrg = String();
@@ -720,12 +720,12 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
double dExponent;
short i,nLen;
short nState,nDigitPos,nExponentPos,nMaxDigit,nMaxExponentDigit;
- BOOL bFirstDigit,bFirstExponentDigit,bFoundFirstDigit,
+ sal_Bool bFirstDigit,bFirstExponentDigit,bFoundFirstDigit,
bIsNegative,bZeroSpaceOn, bSignHappend,bDigitPosNegative;
// Initialisierung der Arbeits-Variablen
- bSignHappend = FALSE;
- bFoundFirstDigit = FALSE;
+ bSignHappend = sal_False;
+ bFoundFirstDigit = sal_False;
bIsNegative = dNumber<0.0;
nLen = sFormatStrg.Len();
dExponent = get_number_of_digits( dNumber );
@@ -749,8 +749,8 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
// hier ben"otigt man keine Exponent-Daten !
bDigitPosNegative = (nDigitPos < 0);
}
- bFirstDigit = TRUE;
- bFirstExponentDigit = TRUE;
+ bFirstDigit = sal_True;
+ bFirstExponentDigit = sal_True;
nState = 0; // 0 --> Mantisse; 1 --> Exponent
bZeroSpaceOn = 0;
@@ -780,14 +780,14 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
// Behandlung der Mantisse
if( bFirstDigit )
{
- //org:bFirstDigit = FALSE;
+ //org:bFirstDigit = sal_False;
// ggf. Vorzeichen erzeugen
// Bem.: bei bCurrency soll das negative
// Vorzeichen durch () angezeigt werden
if( bIsNegative && !bCreateSign/*!bCurrency*/ && !bSignHappend )
{
// nur einmal ein Vorzeichen ausgeben
- bSignHappend = TRUE;
+ bSignHappend = sal_True;
StrAppendChar( sReturnStrg,'-' );
}
// hier jetzt "uberz"ahlige Stellen ausgeben,
@@ -805,7 +805,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
// wurde wirklich eine Ziffer eingefuegt ?
if( nTempDigit!=_NO_DIGIT )
// jetzt wurde wirklich eine Ziffer ausgegeben, Flag setzen
- bFirstDigit = FALSE;
+ bFirstDigit = sal_False;
// muss ggf. ein Tausender-Trennzeichen erzeugt werden?
if( bGenerateThousandSeparator && ( c=='0' || nMaxDigit>=nDigitPos ) && j>0 && (j % 3 == 0) )
StrAppendChar( sReturnStrg,cThousandSep );
@@ -817,7 +817,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
{
AppendDigit( sReturnStrg,0 ); // Ja
// jetzt wurde wirklich eine Ziffer ausgegeben, Flag setzen
- bFirstDigit = FALSE;
+ bFirstDigit = sal_False;
bZeroSpaceOn = 1;
// BEM.: bei Visual-Basic schaltet die erste 0 f"ur alle
// nachfolgenden # (bis zum Dezimal-Punkt) die 0 ein,
@@ -837,7 +837,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
// wurde wirklich eine Ziffer eingefuegt ?
if( nTempDigit!=_NO_DIGIT )
// jetzt wurde wirklich eine Ziffer ausgegeben, Flag setzen
- bFirstDigit = FALSE;
+ bFirstDigit = sal_False;
// muss ggf. ein Tausender-Trennzeichen erzeugt werden?
if( bGenerateThousandSeparator && ( c=='0' || nMaxDigit>=nDigitPos ) && nDigitPos>0 && (nDigitPos % 3 == 0) )
StrAppendChar( sReturnStrg,cThousandSep );
@@ -851,7 +851,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
if( bFirstExponentDigit )
{
// Vorzeichen wurde schon bei e/E ausgegeben
- bFirstExponentDigit = FALSE;
+ bFirstExponentDigit = sal_False;
if( nMaxExponentDigit>nExponentPos )
// hier jetzt "uberz"ahlige Stellen ausgeben,
// d.h. vom Format-String nicht erfasste Stellen
@@ -912,7 +912,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
break;
}
- BOOL bOverflow = FALSE;
+ sal_Bool bOverflow = sal_False;
#ifdef _with_sprintf
short nNextDigit = GetDigitAtPosScan( nDigitPos,bFoundFirstDigit );
#else
@@ -1046,7 +1046,7 @@ void SbxBasicFormater::ScanFormatString( double dNumber,
String SbxBasicFormater::BasicFormatNull( String sFormatStrg )
{
- BOOL bNullFormatFound;
+ sal_Bool bNullFormatFound;
String sNullFormatStrg = GetNullFormatString( sFormatStrg,bNullFormatFound );
if( bNullFormatFound )
@@ -1058,7 +1058,7 @@ String SbxBasicFormater::BasicFormatNull( String sFormatStrg )
String SbxBasicFormater::BasicFormat( double dNumber, String sFormatStrg )
{
- BOOL bPosFormatFound,bNegFormatFound,b0FormatFound;
+ sal_Bool bPosFormatFound,bNegFormatFound,b0FormatFound;
// analysiere Format-String auf vordefinierte Formate:
if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_GENERALNUMBER ) )
@@ -1107,7 +1107,7 @@ String SbxBasicFormater::BasicFormat( double dNumber, String sFormatStrg )
// verwende String fuer positive Werte
sTempStrg = sPosFormatStrg;
}
- ScanFormatString( dNumber, sTempStrg, sReturnStrg,/*bCreateSign=*/FALSE );
+ ScanFormatString( dNumber, sTempStrg, sReturnStrg,/*bCreateSign=*/sal_False );
}
else
{
@@ -1136,33 +1136,33 @@ String SbxBasicFormater::BasicFormat( double dNumber, String sFormatStrg )
{
ScanFormatString( dNumber,
(/*sPosFormatStrg!=EMPTYFORMATSTRING*/bPosFormatFound ? sPosFormatStrg : sFormatStrg),
- sReturnStrg,/*bCreateSign=*/FALSE );
+ sReturnStrg,/*bCreateSign=*/sal_False );
}
}
return sReturnStrg;
}
-BOOL SbxBasicFormater::isBasicFormat( String sFormatStrg )
+sal_Bool SbxBasicFormater::isBasicFormat( String sFormatStrg )
{
if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_GENERALNUMBER ) )
- return TRUE;
+ return sal_True;
if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_CURRENCY ) )
- return TRUE;
+ return sal_True;
if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_FIXED ) )
- return TRUE;
+ return sal_True;
if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_STANDARD ) )
- return TRUE;
+ return sal_True;
if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_PERCENT ) )
- return TRUE;
+ return sal_True;
if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_SCIENTIFIC ) )
- return TRUE;
+ return sal_True;
if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_YESNO ) )
- return TRUE;
+ return sal_True;
if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_TRUEFALSE ) )
- return TRUE;
+ return sal_True;
if( sFormatStrg.EqualsIgnoreCaseAscii( BASICFORMAT_ONOFF ) )
- return TRUE;
- return FALSE;
+ return sal_True;
+ return sal_False;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index 285295c05f45..289622a016fd 100644..100755
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -37,10 +37,10 @@ double ImpRound( double d )
return d + ( d < 0 ? -0.5 : 0.5 );
}
-INT16 ImpGetInteger( const SbxValues* p )
+sal_Int16 ImpGetInteger( const SbxValues* p )
{
SbxValues aTmp;
- INT16 nRes;
+ sal_Int16 nRes;
start:
switch( +p->eType )
{
@@ -57,12 +57,12 @@ start:
nRes = p->nInteger; break;
case SbxERROR:
case SbxUSHORT:
- if( p->nUShort > (USHORT) SbxMAXINT )
+ if( p->nUShort > (sal_uInt16) SbxMAXINT )
{
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
}
else
- nRes = (INT16) p->nUShort;
+ nRes = (sal_Int16) p->nUShort;
break;
case SbxLONG:
if( p->nLong > SbxMAXINT )
@@ -74,7 +74,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) p->nLong;
+ nRes = (sal_Int16) p->nLong;
break;
case SbxULONG:
if( p->nULong > SbxMAXINT )
@@ -82,7 +82,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
}
else
- nRes = (INT16) p->nULong;
+ nRes = (sal_Int16) p->nULong;
break;
case SbxSINGLE:
if( p->nSingle > SbxMAXINT )
@@ -94,7 +94,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) ImpRound( p->nSingle );
+ nRes = (sal_Int16) ImpRound( p->nSingle );
break;
case SbxCURRENCY:
{
@@ -109,7 +109,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) (tstVal);
+ nRes = (sal_Int16) (tstVal);
break;
}
case SbxSALINT64:
@@ -122,7 +122,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) p->nInt64;
+ nRes = (sal_Int16) p->nInt64;
break;
case SbxSALUINT64:
if( p->uInt64 > SbxMAXINT )
@@ -130,7 +130,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXINT;
}
else
- nRes = (INT16) p->uInt64;
+ nRes = (sal_Int16) p->uInt64;
break;
case SbxDATE:
case SbxDOUBLE:
@@ -155,7 +155,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) ImpRound( dVal );
+ nRes = (sal_Int16) ImpRound( dVal );
break;
}
case SbxLPSTR:
@@ -178,7 +178,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMININT;
}
else
- nRes = (INT16) ImpRound( d );
+ nRes = (sal_Int16) ImpRound( d );
}
break;
case SbxOBJECT:
@@ -229,7 +229,7 @@ start:
return nRes;
}
-void ImpPutInteger( SbxValues* p, INT16 n )
+void ImpPutInteger( SbxValues* p, sal_Int16 n )
{
SbxValues aTmp;
start:
@@ -302,7 +302,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pByte = (BYTE) n; break;
+ *p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
*p->pInteger = n; break;
@@ -312,15 +312,15 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
- *p->pLong = (INT32) n; break;
+ *p->pLong = (sal_Int32) n; break;
case SbxBYREF | SbxULONG:
if( n < 0 )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxCURRENCY:
*p->pnInt64 = n * CURRENCY_FACTOR; break;
case SbxBYREF | SbxSALINT64:
@@ -587,7 +587,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pByte = (BYTE) n; break;
+ *p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
if( n > SbxMAXINT )
@@ -598,7 +598,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
}
- *p->pInteger = (INT16) n; break;
+ *p->pInteger = (sal_Int16) n; break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
if( n > SbxMAXUINT )
@@ -609,7 +609,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
if( n > SbxMAXLNG )
{
@@ -619,7 +619,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMINLNG;
}
- *p->pLong = (INT32) n; break;
+ *p->pLong = (sal_Int32) n; break;
case SbxBYREF | SbxULONG:
if( n > SbxMAXULNG )
{
@@ -629,7 +629,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxSINGLE:
*p->pSingle = (float) n; break;
case SbxBYREF | SbxDATE:
@@ -857,33 +857,33 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXBYTE;
}
- *p->pByte = (BYTE) n; break;
+ *p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
if( n > SbxMAXINT )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXINT;
}
- *p->pInteger = (INT16) n; break;
+ *p->pInteger = (sal_Int16) n; break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
if( n > SbxMAXUINT )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXUINT;
}
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
if( n > SbxMAXLNG )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXLNG;
}
- *p->pLong = (INT32) n; break;
+ *p->pLong = (sal_Int32) n; break;
case SbxBYREF | SbxULONG:
if( n > SbxMAXULNG )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXULNG;
}
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxSINGLE:
*p->pDouble = (float)ImpSalUInt64ToDouble( n ); break;
case SbxBYREF | SbxDATE:
diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx
index 32e994520c13..dd772fe4a52a 100644..100755
--- a/basic/source/sbx/sbxlng.cxx
+++ b/basic/source/sbx/sbxlng.cxx
@@ -32,10 +32,10 @@
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
-INT32 ImpGetLong( const SbxValues* p )
+sal_Int32 ImpGetLong( const SbxValues* p )
{
SbxValues aTmp;
- INT32 nRes;
+ sal_Int32 nRes;
start:
switch( +p->eType )
{
@@ -61,7 +61,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXLNG;
}
else
- nRes = (INT32) p->nULong;
+ nRes = (sal_Int32) p->nULong;
break;
case SbxSINGLE:
if( p->nSingle > SbxMAXLNG )
@@ -73,7 +73,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
}
else
- nRes = (INT32) ImpRound( p->nSingle );
+ nRes = (sal_Int32) ImpRound( p->nSingle );
break;
case SbxSALINT64:
nRes = p->nInt64;
@@ -84,7 +84,7 @@ start:
case SbxCURRENCY:
{
sal_Int64 tstVal = p->nInt64 / CURRENCY_FACTOR;
- nRes = (INT32) (tstVal);
+ nRes = (sal_Int32) (tstVal);
if( tstVal < SbxMINLNG || SbxMAXLNG < tstVal ) SbxBase::SetError( SbxERR_OVERFLOW );
if( SbxMAXLNG < tstVal ) nRes = SbxMAXLNG;
if( tstVal < SbxMINLNG ) nRes = SbxMINLNG;
@@ -114,7 +114,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
}
else
- nRes = (INT32) ImpRound( dVal );
+ nRes = (sal_Int32) ImpRound( dVal );
break;
}
case SbxBYREF | SbxSTRING:
@@ -137,7 +137,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMINLNG;
}
else
- nRes = (INT32) ImpRound( d );
+ nRes = (sal_Int32) ImpRound( d );
}
break;
case SbxOBJECT:
@@ -189,7 +189,7 @@ start:
return nRes;
}
-void ImpPutLong( SbxValues* p, INT32 n )
+void ImpPutLong( SbxValues* p, sal_Int32 n )
{
SbxValues aTmp;
@@ -267,7 +267,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pByte = (BYTE) n; break;
+ *p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
if( n > SbxMAXINT )
@@ -278,7 +278,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
}
- *p->pInteger = (INT16) n; break;
+ *p->pInteger = (sal_Int16) n; break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
if( n > SbxMAXUINT )
@@ -289,7 +289,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
*p->pLong = n; break;
case SbxBYREF | SbxULONG:
@@ -297,7 +297,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pULong = (UINT32) n; break;
+ *p->pULong = (sal_uInt32) n; break;
case SbxBYREF | SbxSALINT64:
*p->pnInt64 = n; break;
case SbxBYREF | SbxSALUINT64:
diff --git a/basic/source/sbx/sbxmstrm.cxx b/basic/source/sbx/sbxmstrm.cxx
index e4ed782d75b2..e4ed782d75b2 100644..100755
--- a/basic/source/sbx/sbxmstrm.cxx
+++ b/basic/source/sbx/sbxmstrm.cxx
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 45f2d46ed254..a6d089602ba4 100644..100755
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -41,7 +41,7 @@ TYPEINIT2(SbxObject,SbxVariable,SfxListener)
static const char* pNameProp; // Name-Property
static const char* pParentProp; // Parent-Property
-static USHORT nNameHash = 0, nParentHash = 0;
+static sal_uInt16 nNameHash = 0, nParentHash = 0;
/////////////////////////////////////////////////////////////////////////
@@ -86,18 +86,18 @@ SbxObject& SbxObject::operator=( const SbxObject& r )
pDfltProp = r.pDfltProp;
SetName( r.GetName() );
SetFlags( r.GetFlags() );
- SetModified( TRUE );
+ SetModified( sal_True );
}
return *this;
}
static void CheckParentsOnDelete( SbxObject* pObj, SbxArray* p )
{
- for( USHORT i = 0; i < p->Count(); i++ )
+ for( sal_uInt16 i = 0; i < p->Count(); i++ )
{
SbxVariableRef& rRef = p->GetRef( i );
if( rRef->IsBroadcaster() )
- pObj->EndListening( rRef->GetBroadcaster(), TRUE );
+ pObj->EndListening( rRef->GetBroadcaster(), sal_True );
// Did the element have more then one reference and still a Listener?
if( rRef->GetRefCount() > 1 )
{
@@ -112,6 +112,9 @@ SbxObject::~SbxObject()
CheckParentsOnDelete( this, pProps );
CheckParentsOnDelete( this, pMethods );
CheckParentsOnDelete( this, pObjs );
+
+ // avoid handling in ~SbxVariable as SBX_DIM_AS_NEW == SBX_GBLSEARCH
+ ResetFlag( SBX_DIM_AS_NEW );
}
SbxDataType SbxObject::GetType() const
@@ -136,7 +139,7 @@ void SbxObject::Clear()
p->ResetFlag( SBX_WRITE );
p->SetFlag( SBX_DONTSTORE );
pDfltProp = NULL;
- SetModified( FALSE );
+ SetModified( sal_False );
}
void SbxObject::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
@@ -145,14 +148,14 @@ void SbxObject::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
const SbxHint* p = PTR_CAST(SbxHint,&rHint);
if( p )
{
- ULONG nId = p->GetId();
- BOOL bRead = BOOL( nId == SBX_HINT_DATAWANTED );
- BOOL bWrite = BOOL( nId == SBX_HINT_DATACHANGED );
+ sal_uIntPtr nId = p->GetId();
+ sal_Bool bRead = sal_Bool( nId == SBX_HINT_DATAWANTED );
+ sal_Bool bWrite = sal_Bool( nId == SBX_HINT_DATACHANGED );
SbxVariable* pVar = p->GetVar();
if( bRead || bWrite )
{
XubString aVarName( pVar->GetName() );
- USHORT nHash_ = MakeHashCode( aVarName );
+ sal_uInt16 nHash_ = MakeHashCode( aVarName );
if( nHash_ == nNameHash
&& aVarName.EqualsIgnoreCaseAscii( pNameProp ) )
{
@@ -173,12 +176,12 @@ void SbxObject::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
}
}
-BOOL SbxObject::IsClass( const XubString& rName ) const
+sal_Bool SbxObject::IsClass( const XubString& rName ) const
{
- return BOOL( aClassName.EqualsIgnoreCaseAscii( rName ) );
+ return sal_Bool( aClassName.EqualsIgnoreCaseAscii( rName ) );
}
-SbxVariable* SbxObject::FindUserData( UINT32 nData )
+SbxVariable* SbxObject::FindUserData( sal_uInt32 nData )
{
if( !GetAll( SbxCLASS_DONTCARE ) )
return NULL;
@@ -195,10 +198,10 @@ SbxVariable* SbxObject::FindUserData( UINT32 nData )
while( !pRes && pCur->pParent )
{
// I myself was already searched through!
- USHORT nOwn = pCur->GetFlags();
+ sal_uInt16 nOwn = pCur->GetFlags();
pCur->ResetFlag( SBX_EXTSEARCH );
// I search already global!
- USHORT nPar = pCur->pParent->GetFlags();
+ sal_uInt16 nPar = pCur->pParent->GetFlags();
pCur->pParent->ResetFlag( SBX_GBLSEARCH );
pRes = pCur->pParent->FindUserData( nData );
pCur->SetFlags( nOwn );
@@ -212,7 +215,7 @@ SbxVariable* SbxObject::FindUserData( UINT32 nData )
SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
{
#ifdef DBG_UTIL
- static USHORT nLvl = 0;
+ static sal_uInt16 nLvl = 0;
static const char* pCls[] =
{ "DontCare","Array","Value","Variable","Method","Property","Object" };
ByteString aNameStr1( (const UniString&)rName, RTL_TEXTENCODING_ASCII_US );
@@ -262,10 +265,10 @@ SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
while( !pRes && pCur->pParent )
{
// I myself was already searched through!
- USHORT nOwn = pCur->GetFlags();
+ sal_uInt16 nOwn = pCur->GetFlags();
pCur->ResetFlag( SBX_EXTSEARCH );
// I search already global!
- USHORT nPar = pCur->pParent->GetFlags();
+ sal_uInt16 nPar = pCur->pParent->GetFlags();
pCur->pParent->ResetFlag( SBX_GBLSEARCH );
pRes = pCur->pParent->Find( rName, t );
pCur->SetFlags( nOwn );
@@ -290,7 +293,7 @@ SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
// The whole thing recursive, because Call() might be overloaded
// Qualified names are allowed
-BOOL SbxObject::Call( const XubString& rName, SbxArray* pParam )
+sal_Bool SbxObject::Call( const XubString& rName, SbxArray* pParam )
{
SbxVariable* pMeth = FindQualified( rName, SbxCLASS_DONTCARE);
if( pMeth && pMeth->ISA(SbxMethod) )
@@ -300,10 +303,10 @@ BOOL SbxObject::Call( const XubString& rName, SbxArray* pParam )
pMeth->SetParameters( pParam );
pMeth->Broadcast( SBX_HINT_DATAWANTED );
pMeth->SetParameters( NULL );
- return TRUE;
+ return sal_True;
}
SetError( SbxERR_NO_METHOD );
- return FALSE;
+ return sal_False;
}
SbxProperty* SbxObject::GetDfltProperty()
@@ -321,14 +324,14 @@ void SbxObject::SetDfltProperty( const XubString& rName )
if ( rName != aDfltPropName )
pDfltProp = NULL;
aDfltPropName = rName;
- SetModified( TRUE );
+ SetModified( sal_True );
}
void SbxObject::SetDfltProperty( SbxProperty* p )
{
if( p )
{
- USHORT n;
+ sal_uInt16 n;
SbxArray* pArray = FindVar( p, n );
pArray->Put( p, n );
if( p->GetParent() != this )
@@ -336,14 +339,14 @@ void SbxObject::SetDfltProperty( SbxProperty* p )
Broadcast( SBX_HINT_OBJECTCHANGED );
}
pDfltProp = p;
- SetModified( TRUE );
+ SetModified( sal_True );
}
// Search of a already available variable. If she was located,
// the index will be set, elsewise will be delivered the Count of the Array.
// In any case it will be delivered the correct Array.
-SbxArray* SbxObject::FindVar( SbxVariable* pVar, USHORT& nArrayIdx )
+SbxArray* SbxObject::FindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
{
SbxArray* pArray = NULL;
if( pVar ) switch( pVar->GetClass() )
@@ -362,7 +365,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, USHORT& nArrayIdx )
pArray->ResetFlag( SBX_EXTSEARCH );
SbxVariable* pOld = pArray->Find( pVar->GetName(), pVar->GetClass() );
if( pOld )
- for( USHORT i = 0; i < pArray->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pArray->Count(); i++ )
{
SbxVariableRef& rRef = pArray->GetRef( i );
if( (SbxVariable*) rRef == pOld )
@@ -432,9 +435,9 @@ SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, SbxDataTy
}
pVar->SetParent( this );
pArray->Put( pVar, pArray->Count() );
- SetModified( TRUE );
+ SetModified( sal_True );
// The object listen always
- StartListening( pVar->GetBroadcaster(), TRUE );
+ StartListening( pVar->GetBroadcaster(), sal_True );
Broadcast( SBX_HINT_OBJECTCHANGED );
return pVar;
}
@@ -470,9 +473,9 @@ SbxObject* SbxObject::MakeObject( const XubString& rName, const XubString& rClas
pVar->SetName( rName );
pVar->SetParent( this );
pObjs->Put( pVar, pObjs->Count() );
- SetModified( TRUE );
+ SetModified( sal_True );
// The object listen always
- StartListening( pVar->GetBroadcaster(), TRUE );
+ StartListening( pVar->GetBroadcaster(), sal_True );
Broadcast( SBX_HINT_OBJECTCHANGED );
}
return pVar;
@@ -480,7 +483,7 @@ SbxObject* SbxObject::MakeObject( const XubString& rName, const XubString& rClas
void SbxObject::Insert( SbxVariable* pVar )
{
- USHORT nIdx;
+ sal_uInt16 nIdx;
SbxArray* pArray = FindVar( pVar, nIdx );
if( pArray )
{
@@ -512,7 +515,7 @@ void SbxObject::Insert( SbxVariable* pVar )
}
#endif
*/
- EndListening( pOld->GetBroadcaster(), TRUE );
+ EndListening( pOld->GetBroadcaster(), sal_True );
if( pVar->GetClass() == SbxCLASS_PROPERTY )
{
if( pOld == pDfltProp )
@@ -520,11 +523,11 @@ void SbxObject::Insert( SbxVariable* pVar )
}
}
}
- StartListening( pVar->GetBroadcaster(), TRUE );
+ StartListening( pVar->GetBroadcaster(), sal_True );
pArray->Put( pVar, nIdx );
if( pVar->GetParent() != this )
pVar->SetParent( this );
- SetModified( TRUE );
+ SetModified( sal_True );
Broadcast( SBX_HINT_OBJECTCHANGED );
#ifdef DBG_UTIL
static const char* pCls[] =
@@ -561,11 +564,11 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
}
if( pArray )
{
- StartListening( pVar->GetBroadcaster(), TRUE );
+ StartListening( pVar->GetBroadcaster(), sal_True );
pArray->Put( pVar, pArray->Count() );
if( pVar->GetParent() != this )
pVar->SetParent( this );
- SetModified( TRUE );
+ SetModified( sal_True );
#ifdef DBG_UTIL
static const char* pCls[] =
{ "DontCare","Array","Value","Variable","Method","Property","Object" };
@@ -600,11 +603,11 @@ void SbxObject::VCPtrInsert( SbxVariable* pVar )
}
if( pArray )
{
- StartListening( pVar->GetBroadcaster(), TRUE );
+ StartListening( pVar->GetBroadcaster(), sal_True );
pArray->Put( pVar, pArray->Count() );
if( pVar->GetParent() != this )
pVar->SetParent( this );
- SetModified( TRUE );
+ SetModified( sal_True );
Broadcast( SBX_HINT_OBJECTCHANGED );
}
}
@@ -616,7 +619,7 @@ void SbxObject::Remove( const XubString& rName, SbxClassType t )
void SbxObject::Remove( SbxVariable* pVar )
{
- USHORT nIdx;
+ sal_uInt16 nIdx;
SbxArray* pArray = FindVar( pVar, nIdx );
if( pArray && nIdx < pArray->Count() )
{
@@ -629,13 +632,13 @@ void SbxObject::Remove( SbxVariable* pVar )
#endif
SbxVariableRef pVar_ = pArray->Get( nIdx );
if( pVar_->IsBroadcaster() )
- EndListening( pVar_->GetBroadcaster(), TRUE );
+ EndListening( pVar_->GetBroadcaster(), sal_True );
if( (SbxVariable*) pVar_ == pDfltProp )
pDfltProp = NULL;
pArray->Remove( nIdx );
if( pVar_->GetParent() == this )
pVar_->SetParent( NULL );
- SetModified( TRUE );
+ SetModified( sal_True );
Broadcast( SBX_HINT_OBJECTCHANGED );
}
}
@@ -643,26 +646,26 @@ void SbxObject::Remove( SbxVariable* pVar )
// From 1997-03-23, cleanup per Pointer for Controls (double names!)
void SbxObject::VCPtrRemove( SbxVariable* pVar )
{
- USHORT nIdx;
+ sal_uInt16 nIdx;
// New FindVar-Method, otherwise identical with the normal method
SbxArray* pArray = VCPtrFindVar( pVar, nIdx );
if( pArray && nIdx < pArray->Count() )
{
SbxVariableRef xVar = pArray->Get( nIdx );
if( xVar->IsBroadcaster() )
- EndListening( xVar->GetBroadcaster(), TRUE );
+ EndListening( xVar->GetBroadcaster(), sal_True );
if( (SbxVariable*) xVar == pDfltProp )
pDfltProp = NULL;
pArray->Remove( nIdx );
if( xVar->GetParent() == this )
xVar->SetParent( NULL );
- SetModified( TRUE );
+ SetModified( sal_True );
Broadcast( SBX_HINT_OBJECTCHANGED );
}
}
// From 1997-03-23, associated special method, search only by Pointer
-SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, USHORT& nArrayIdx )
+SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
{
SbxArray* pArray = NULL;
if( pVar ) switch( pVar->GetClass() )
@@ -677,7 +680,7 @@ SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, USHORT& nArrayIdx )
if( pArray )
{
nArrayIdx = pArray->Count();
- for( USHORT i = 0; i < pArray->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pArray->Count(); i++ )
{
SbxVariableRef& rRef = pArray->GetRef( i );
if( (SbxVariable*) rRef == pVar )
@@ -691,9 +694,9 @@ SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, USHORT& nArrayIdx )
-void SbxObject::SetPos( SbxVariable* pVar, USHORT nPos )
+void SbxObject::SetPos( SbxVariable* pVar, sal_uInt16 nPos )
{
- USHORT nIdx;
+ sal_uInt16 nIdx;
SbxArray* pArray = FindVar( pVar, nIdx );
if( pArray )
{
@@ -706,41 +709,41 @@ void SbxObject::SetPos( SbxVariable* pVar, USHORT nPos )
pArray->Insert( refVar, nPos );
}
}
-// SetModified( TRUE );
+// SetModified( sal_True );
// Broadcast( SBX_HINT_OBJECTCHANGED );
}
-static BOOL LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
+static sal_Bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
{
SbxArrayRef p = (SbxArray*) SbxBase::Load( rStrm );
if( !p.Is() )
- return FALSE;
- for( USHORT i = 0; i < p->Count(); i++ )
+ return sal_False;
+ for( sal_uInt16 i = 0; i < p->Count(); i++ )
{
SbxVariableRef& r = p->GetRef( i );
SbxVariable* pVar = r;
if( pVar )
{
pVar->SetParent( pThis );
- pThis->StartListening( pVar->GetBroadcaster(), TRUE );
+ pThis->StartListening( pVar->GetBroadcaster(), sal_True );
}
}
pArray->Merge( p );
- return TRUE;
+ return sal_True;
}
// The load of an object is additive!
-BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
// Help for the read in of old objects: just TRUE back,
// LoadPrivateData() had to set the default status up
if( !nVer )
- return TRUE;
+ return sal_True;
pDfltProp = NULL;
if( !SbxVariable::LoadData( rStrm, nVer ) )
- return FALSE;
+ return sal_False;
// If it contains no alien object, insert ourselves
if( aData.eType == SbxOBJECT && !aData.pObj )
aData.pObj = this;
@@ -748,11 +751,11 @@ BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
XubString aDfltProp;
rStrm.ReadByteString( aClassName, RTL_TEXTENCODING_ASCII_US );
rStrm.ReadByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US );
- ULONG nPos = rStrm.Tell();
+ sal_uIntPtr nPos = rStrm.Tell();
rStrm >> nSize;
if( !LoadPrivateData( rStrm, nVer ) )
- return FALSE;
- ULONG nNewPos = rStrm.Tell();
+ return sal_False;
+ sal_uIntPtr nNewPos = rStrm.Tell();
nPos += nSize;
DBG_ASSERT( nPos >= nNewPos, "SBX: Zu viele Daten eingelesen" );
if( nPos != nNewPos )
@@ -760,39 +763,39 @@ BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
if( !LoadArray( rStrm, this, pMethods )
|| !LoadArray( rStrm, this, pProps )
|| !LoadArray( rStrm, this, pObjs ) )
- return FALSE;
+ return sal_False;
// Set properties
if( aDfltProp.Len() )
pDfltProp = (SbxProperty*) pProps->Find( aDfltProp, SbxCLASS_PROPERTY );
- SetModified( FALSE );
- return TRUE;
+ SetModified( sal_False );
+ return sal_True;
}
-BOOL SbxObject::StoreData( SvStream& rStrm ) const
+sal_Bool SbxObject::StoreData( SvStream& rStrm ) const
{
if( !SbxVariable::StoreData( rStrm ) )
- return FALSE;
+ return sal_False;
XubString aDfltProp;
if( pDfltProp )
aDfltProp = pDfltProp->GetName();
rStrm.WriteByteString( aClassName, RTL_TEXTENCODING_ASCII_US );
rStrm.WriteByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US );
- ULONG nPos = rStrm.Tell();
- rStrm << (UINT32) 0L;
+ sal_uIntPtr nPos = rStrm.Tell();
+ rStrm << (sal_uInt32) 0L;
if( !StorePrivateData( rStrm ) )
- return FALSE;
- ULONG nNew = rStrm.Tell();
+ return sal_False;
+ sal_uIntPtr nNew = rStrm.Tell();
rStrm.Seek( nPos );
- rStrm << (UINT32) ( nNew - nPos );
+ rStrm << (sal_uInt32) ( nNew - nPos );
rStrm.Seek( nNew );
if( !pMethods->Store( rStrm ) )
- return FALSE;
+ return sal_False;
if( !pProps->Store( rStrm ) )
- return FALSE;
+ return sal_False;
if( !pObjs->Store( rStrm ) )
- return FALSE;
- ((SbxObject*) this)->SetModified( FALSE );
- return TRUE;
+ return sal_False;
+ ((SbxObject*) this)->SetModified( sal_False );
+ return sal_True;
}
XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
@@ -802,7 +805,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
XubString aSource;
SbxArrayRef xProps( GetProperties() );
bool bLineFeed = false;
- for ( USHORT nProp = 0; nProp < xProps->Count(); ++nProp )
+ for ( sal_uInt16 nProp = 0; nProp < xProps->Count(); ++nProp )
{
SbxPropertyRef xProp = (SbxProperty*) xProps->Get(nProp);
XubString aPropName( xProp->GetName() );
@@ -850,7 +853,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
return aSource;
}
-static BOOL CollectAttrs( const SbxBase* p, XubString& rRes )
+static sal_Bool CollectAttrs( const SbxBase* p, XubString& rRes )
{
XubString aAttrs;
if( p->IsHidden() )
@@ -878,19 +881,19 @@ static BOOL CollectAttrs( const SbxBase* p, XubString& rRes )
rRes.AssignAscii( " (" );
rRes += aAttrs;
rRes += ')';
- return TRUE;
+ return sal_True;
}
else
{
rRes.Erase();
- return FALSE;
+ return sal_False;
}
}
-void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
+void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
{
// Shifting
- static USHORT nLevel = 0;
+ static sal_uInt16 nLevel = 0;
if ( nLevel > 10 )
{
rStrm << "<too deep>" << endl;
@@ -898,7 +901,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
}
++nLevel;
String aIndent;
- for ( USHORT n = 1; n < nLevel; ++n )
+ for ( sal_uInt16 n = 1; n < nLevel; ++n )
aIndent.AppendAscii( " " );
// if necessary complete the object
@@ -909,7 +912,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
ByteString aNameStr( (const UniString&)GetName(), RTL_TEXTENCODING_ASCII_US );
ByteString aClassNameStr( (const UniString&)aClassName, RTL_TEXTENCODING_ASCII_US );
rStrm << "Object( "
- << ByteString::CreateFromInt64( (ULONG) this ).GetBuffer() << "=='"
+ << ByteString::CreateFromInt64( (sal_uIntPtr) this ).GetBuffer() << "=='"
<< ( aNameStr.Len() ? aNameStr.GetBuffer() : "<unnamed>" ) << "', "
<< "of class '" << aClassNameStr.GetBuffer() << "', "
<< "counts "
@@ -919,7 +922,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
{
ByteString aParentNameStr( (const UniString&)GetName(), RTL_TEXTENCODING_ASCII_US );
rStrm << "in parent "
- << ByteString::CreateFromInt64( (ULONG) GetParent() ).GetBuffer()
+ << ByteString::CreateFromInt64( (sal_uIntPtr) GetParent() ).GetBuffer()
<< "=='" << ( aParentNameStr.Len() ? aParentNameStr.GetBuffer() : "<unnamed>" ) << "'";
}
else
@@ -938,7 +941,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
// Methods
rStrm << aIndentNameStr.GetBuffer() << "- Methods:" << endl;
- for( USHORT i = 0; i < pMethods->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pMethods->Count(); i++ )
{
SbxVariableRef& r = pMethods->GetRef( i );
SbxVariable* pVar = r;
@@ -971,7 +974,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
// Properties
rStrm << aIndentNameStr.GetBuffer() << "- Properties:" << endl;
{
- for( USHORT i = 0; i < pProps->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pProps->Count(); i++ )
{
SbxVariableRef& r = pProps->GetRef( i );
SbxVariable* pVar = r;
@@ -1005,7 +1008,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
// Objects
rStrm << aIndentNameStr.GetBuffer() << "- Objects:" << endl;
{
- for( USHORT i = 0; i < pObjs->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pObjs->Count(); i++ )
{
SbxVariableRef& r = pObjs->GetRef( i );
SbxVariable* pVar = r;
@@ -1029,7 +1032,7 @@ SvDispatch* SbxObject::GetSvDispatch()
return NULL;
}
-BOOL SbxMethod::Run( SbxValues* pValues )
+sal_Bool SbxMethod::Run( SbxValues* pValues )
{
SbxValues aRes;
if( !pValues )
@@ -1048,7 +1051,7 @@ SbxClassType SbxProperty::GetClass() const
return SbxCLASS_PROPERTY;
}
-void SbxObject::GarbageCollection( ULONG /*nObjects*/ )
+void SbxObject::GarbageCollection( sal_uIntPtr /* nObjects */ )
/* [Description]
diff --git a/basic/source/sbx/sbxres.cxx b/basic/source/sbx/sbxres.cxx
index 61080be5deb1..5b6466e21e2c 100644..100755
--- a/basic/source/sbx/sbxres.cxx
+++ b/basic/source/sbx/sbxres.cxx
@@ -81,12 +81,12 @@ static const char* pSbxRes[] = {
"True"
};
-const char* GetSbxRes( USHORT nId )
+const char* GetSbxRes( sal_uInt16 nId )
{
return ( ( nId > SBXRES_MAX ) ? "???" : pSbxRes[ nId ] );
}
-SbxRes::SbxRes( USHORT nId )
+SbxRes::SbxRes( sal_uInt16 nId )
: ::rtl::OUString( ::rtl::OUString::createFromAscii( GetSbxRes( nId ) ) )
{}
diff --git a/basic/source/sbx/sbxres.hxx b/basic/source/sbx/sbxres.hxx
index 135dcf80f7c9..c50b197a4e88 100644..100755
--- a/basic/source/sbx/sbxres.hxx
+++ b/basic/source/sbx/sbxres.hxx
@@ -79,10 +79,10 @@
class SbxRes : public ::rtl::OUString
{
public:
- SbxRes( USHORT );
+ SbxRes( sal_uInt16 );
};
-const char* GetSbxRes( USHORT );
+const char* GetSbxRes( sal_uInt16 );
#endif
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index c7cfe6e6850e..3b6d37286cd1 100644..100755
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -71,7 +71,7 @@ void ImpGetIntntlSep( sal_Unicode& rcDecimalSep, sal_Unicode& rcThousandSep )
// Fixed ist und das ganze nicht hineinpasst!
SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType,
- USHORT* pLen, BOOL bAllowIntntl, BOOL bOnlyIntntl )
+ sal_uInt16* pLen, sal_Bool bAllowIntntl, sal_Bool bOnlyIntntl )
{
::rtl::OString aBStr( ::rtl::OUStringToOString( rWSrc, RTL_TEXTENCODING_ASCII_US ) );
@@ -102,15 +102,15 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
const char* pStart = aBStr.getStr();
const char* p = pStart;
char buf[ 80 ], *q = buf;
- BOOL bRes = TRUE;
- BOOL bMinus = FALSE;
+ sal_Bool bRes = sal_True;
+ sal_Bool bMinus = sal_False;
nVal = 0;
SbxDataType eScanType = SbxSINGLE;
// Whitespace wech
while( *p &&( *p == ' ' || *p == '\t' ) ) p++;
// Zahl? Dann einlesen und konvertieren.
if( *p == '-' )
- p++, bMinus = TRUE;
+ p++, bMinus = sal_True;
if( isdigit( *p ) ||( (*p == cNonIntntlComma || *p == cIntntlComma ||
*p == cIntntl1000) && isdigit( *(p+1 ) ) ) )
{
@@ -171,7 +171,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
*q = 0;
// Komma, Exponent mehrfach vorhanden?
if( comma > 1 || exp > 1 )
- bRes = FALSE;
+ bRes = sal_False;
// Kann auf Integer gefaltet werden?
if( !comma && !exp )
{
@@ -203,7 +203,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
{
case 'O': cmp = "01234567"; base = 8; ndig = 11; break;
case 'H': break;
- default : bRes = FALSE;
+ default : bRes = sal_False;
}
long l = 0;
int i;
@@ -212,7 +212,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
char ch = sal::static_int_cast< char >( toupper( *p ) );
p++;
if( strchr( cmp, ch ) ) *q++ = ch;
- else bRes = FALSE;
+ else bRes = sal_False;
}
*q = 0;
for( q = buf; *q; q++ )
@@ -221,7 +221,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
if( i > 9 ) i -= 7;
l =( l * base ) + i;
if( !ndig-- )
- bRes = FALSE;
+ bRes = sal_False;
}
if( *p == '&' ) p++;
nVal = (double) l;
@@ -234,7 +234,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
return SbxERR_CONVERSION;
}
if( pLen )
- *pLen = (USHORT) ( p - pStart );
+ *pLen = (sal_uInt16) ( p - pStart );
if( !bRes )
return SbxERR_CONVERSION;
if( bMinus )
@@ -244,12 +244,12 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double& nVal, SbxDataType& rType
}
// Schnittstelle fuer CDbl im Basic
-SbxError SbxValue::ScanNumIntnl( const String& rSrc, double& nVal, BOOL bSingle )
+SbxError SbxValue::ScanNumIntnl( const String& rSrc, double& nVal, sal_Bool bSingle )
{
SbxDataType t;
- USHORT nLen = 0;
+ sal_uInt16 nLen = 0;
SbxError nRetError = ImpScan( rSrc, nVal, t, &nLen,
- /*bAllowIntntl*/FALSE, /*bOnlyIntntl*/TRUE );
+ /*bAllowIntntl*/sal_False, /*bOnlyIntntl*/sal_True );
// Komplett gelesen?
if( nRetError == SbxERR_OK && nLen != rSrc.Len() )
nRetError = SbxERR_CONVERSION;
@@ -270,20 +270,20 @@ static double roundArray[] = {
/***************************************************************************
|*
-|* void myftoa( double, char *, short, short, BOOL, BOOL )
+|* void myftoa( double, char *, short, short, sal_Bool, sal_Bool )
|*
|* Beschreibung: Konversion double --> ASCII
|* Parameter: double die Zahl.
|* char * der Zielpuffer
|* short Anzahl Nachkommastellen
|* short Weite des Exponenten( 0=kein E )
-|* BOOL TRUE: mit 1000er Punkten
-|* BOOL TRUE: formatfreie Ausgabe
+|* sal_Bool sal_True: mit 1000er Punkten
+|* sal_Bool sal_True: formatfreie Ausgabe
|*
***************************************************************************/
static void myftoa( double nNum, char * pBuf, short nPrec, short nExpWidth,
- BOOL bPt, BOOL bFix, sal_Unicode cForceThousandSep = 0 )
+ sal_Bool bPt, sal_Bool bFix, sal_Unicode cForceThousandSep = 0 )
{
short nExp = 0; // Exponent
@@ -391,7 +391,7 @@ static void myftoa( double nNum, char * pBuf, short nPrec, short nExpWidth,
#pragma warning(disable: 4748) // "... because optimizations are disabled ..."
#endif
-void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreString )
+void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, sal_Bool bCoreString )
{
char *q;
char cBuf[ 40 ], *p = cBuf;
@@ -407,7 +407,7 @@ void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreStrin
}
double dMaxNumWithoutExp = (nPrec == 6) ? 1E6 : 1E14;
myftoa( nNum, p, nPrec,( nNum &&( nNum < 1E-1 || nNum >= dMaxNumWithoutExp ) ) ? 4:0,
- FALSE, TRUE, cDecimalSep );
+ sal_False, sal_True, cDecimalSep );
// Trailing Zeroes weg:
for( p = cBuf; *p &&( *p != 'E' ); p++ ) {}
q = p; p--;
@@ -422,13 +422,13 @@ void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreStrin
#pragma optimize( "", on )
#endif
-BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
+sal_Bool ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
{
// Merken, ob ueberhaupt was geaendert wurde
- BOOL bChanged = FALSE;
+ sal_Bool bChanged = sal_False;
::rtl::OUString aNewString;
- // Nur Spezial-Flle behandeln, als Default tun wir nichts
+ // Nur Spezial-F�lle behandeln, als Default tun wir nichts
switch( eTargetType )
{
// Bei Fliesskomma International beruecksichtigen
@@ -451,25 +451,25 @@ BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
{
sal_Unicode* pStr = (sal_Unicode*)aNewString.getStr();
pStr[nPos] = (sal_Unicode)'.';
- bChanged = TRUE;
+ bChanged = sal_True;
}
}
break;
}
- // Bei BOOL TRUE und FALSE als String pruefen
+ // Bei sal_Bool sal_True und sal_False als String pruefen
case SbxBOOL:
{
if( rSrc.equalsIgnoreAsciiCaseAscii( "true" ) )
{
aNewString = ::rtl::OUString::valueOf( (sal_Int32)SbxTRUE );
- bChanged = TRUE;
+ bChanged = sal_True;
}
else
if( rSrc.equalsIgnoreAsciiCaseAscii( "false" ) )
{
aNewString = ::rtl::OUString::valueOf( (sal_Int32)SbxFALSE );
- bChanged = TRUE;
+ bChanged = sal_True;
}
break;
}
@@ -490,7 +490,7 @@ BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType )
// lasse diesen Code vorl"aufig drin, zum 'abgucken'
// der bisherigen Implementation
-static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt )
+static sal_uInt16 printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt )
{
const String& rFmt = rWFmt;
char cFill = ' '; // Fuellzeichen
@@ -499,10 +499,10 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
short nPrec = 0; // Anzahl Nachkommastellen
short nWidth = 0; // Zahlenweite gesamnt
short nLen; // Laenge konvertierte Zahl
- BOOL bPoint = FALSE; // TRUE: mit 1000er Kommas
- BOOL bTrail = FALSE; // TRUE, wenn folgendes Minus
- BOOL bSign = FALSE; // TRUE: immer mit Vorzeichen
- BOOL bNeg = FALSE; // TRUE: Zahl ist negativ
+ sal_Bool bPoint = sal_False; // sal_True: mit 1000er Kommas
+ sal_Bool bTrail = sal_False; // sal_True, wenn folgendes Minus
+ sal_Bool bSign = sal_False; // sal_True: immer mit Vorzeichen
+ sal_Bool bNeg = sal_False; // sal_True: Zahl ist negativ
char cBuf [1024]; // Zahlenpuffer
char * p;
const char* pFmt = rFmt;
@@ -518,7 +518,7 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
case 0:
break;
case '+':
- bSign = TRUE; nWidth++; break;
+ bSign = sal_True; nWidth++; break;
case '*':
nWidth++; cFill = '*';
if( *pFmt == '$' ) nWidth++, pFmt++, cPre = '$';
@@ -537,7 +537,7 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
// 1000er Kommas?
if( *pFmt == ',' )
{
- nWidth++; pFmt++; bPoint = TRUE;
+ nWidth++; pFmt++; bPoint = sal_True;
} else break;
}
// Nachkomma:
@@ -551,14 +551,14 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
pFmt++, nExpDig++, nWidth++;
// Folgendes Minus:
if( !bSign && *pFmt == '-' )
- pFmt++, bTrail = TRUE;
+ pFmt++, bTrail = sal_True;
// Zahl konvertieren:
if( nPrec > 15 ) nPrec = 15;
- if( nNum < 0.0 ) nNum = -nNum, bNeg = TRUE;
+ if( nNum < 0.0 ) nNum = -nNum, bNeg = sal_True;
p = cBuf;
if( bSign ) *p++ = bNeg ? '-' : '+';
- myftoa( nNum, p, nPrec, nExpDig, bPoint, FALSE );
+ myftoa( nNum, p, nPrec, nExpDig, bPoint, sal_False );
nLen = strlen( cBuf );
// Ueberlauf?
@@ -573,12 +573,12 @@ static USHORT printfmtnum( double nNum, XubString& rRes, const XubString& rWFmt
if( bTrail )
rRes += bNeg ? '-' : ' ';
- return (USHORT) ( pFmt - (const char*) rFmt );
+ return (sal_uInt16) ( pFmt - (const char*) rFmt );
}
#endif //_old_format_code_
-static USHORT printfmtstr( const XubString& rStr, XubString& rRes, const XubString& rFmt )
+static sal_uInt16 printfmtstr( const XubString& rStr, XubString& rRes, const XubString& rFmt )
{
const xub_Unicode* pStr = rStr.GetBuffer();
const xub_Unicode* pFmtStart = rFmt.GetBuffer();
@@ -603,12 +603,12 @@ static USHORT printfmtstr( const XubString& rStr, XubString& rRes, const XubStri
rRes = rStr;
break;
}
- return (USHORT) ( pFmt - pFmtStart );
+ return (sal_uInt16) ( pFmt - pFmtStart );
}
/////////////////////////////////////////////////////////////////////////
-BOOL SbxValue::Scan( const XubString& rSrc, USHORT* pLen )
+sal_Bool SbxValue::Scan( const XubString& rSrc, sal_uInt16* pLen )
{
SbxError eRes = SbxERR_OK;
if( !CanWrite() )
@@ -627,10 +627,10 @@ BOOL SbxValue::Scan( const XubString& rSrc, USHORT* pLen )
}
if( eRes )
{
- SetError( eRes ); return FALSE;
+ SetError( eRes ); return sal_False;
}
else
- return TRUE;
+ return sal_True;
}
@@ -648,7 +648,7 @@ ResMgr* implGetResMgr( void )
class SbxValueFormatResId : public ResId
{
public:
- SbxValueFormatResId( USHORT nId )
+ SbxValueFormatResId( sal_uInt16 nId )
: ResId( nId, *implGetResMgr() )
{}
};
@@ -693,7 +693,7 @@ static VbaFormatInfo pFormatInfoTable[] =
VbaFormatInfo* getFormatInfo( const String& rFmt )
{
VbaFormatInfo* pInfo = NULL;
- INT16 i = 0;
+ sal_Int16 i = 0;
while( (pInfo = pFormatInfoTable + i )->mpVbaFormat != NULL )
{
if( rFmt.EqualsIgnoreCaseAscii( pInfo->mpVbaFormat ) )
@@ -713,11 +713,11 @@ VbaFormatInfo* getFormatInfo( const String& rFmt )
#define VBAFORMAT_UPPERCASE ">"
// From methods1.cxx
-INT16 implGetWeekDay( double aDate, bool bFirstDayParam = false, INT16 nFirstDay = 0 );
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 );
// from methods.cxx
-INT16 implGetMinute( double dDate );
-INT16 implGetDateYear( double aDate );
-BOOL implDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, double& rdRet );
+sal_Int16 implGetMinute( double dDate );
+sal_Int16 implGetDateYear( double aDate );
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet );
void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
{
@@ -751,7 +751,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
double nNumber;
Color* pCol;
- BOOL bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, nNumber );
+ sal_Bool bSuccess = aFormatter.IsNumberFormat( aStr, nIndex, nNumber );
// number format, use SvNumberFormatter to handle it.
if( bSuccess )
@@ -804,7 +804,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_N )
|| aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN ))
{
- INT32 nMin = implGetMinute( nNumber );
+ sal_Int32 nMin = implGetMinute( nNumber );
if( nMin < 10 && aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_NN ) )
{
// Minute in two digits
@@ -819,15 +819,15 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
}
else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_W ))
{
- INT32 nWeekDay = implGetWeekDay( nNumber );
+ sal_Int32 nWeekDay = implGetWeekDay( nNumber );
rRes = String::CreateFromInt32( nWeekDay );
}
else if( aFmtStr.EqualsIgnoreCaseAscii( VBAFORMAT_Y ))
{
- INT16 nYear = implGetDateYear( nNumber );
+ sal_Int16 nYear = implGetDateYear( nNumber );
double dBaseDate;
implDateSerial( nYear, 1, 1, dBaseDate );
- INT32 nYear32 = 1 + INT32( nNumber - dBaseDate );
+ sal_Int32 nYear32 = 1 + sal_Int32( nNumber - dBaseDate );
rRes = String::CreateFromInt32( nYear32 );
}
else
@@ -948,7 +948,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
// #45355 wenn es numerisch ist, muss gewandelt werden
if( IsNumericRTL() )
{
- ScanNumIntnl( GetString(), d, /*bSingle*/FALSE );
+ ScanNumIntnl( GetString(), d, /*bSingle*/sal_False );
goto cvt2;
}
else
diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx
index 68bdcfe58609..62c98131a2c2 100644..100755
--- a/basic/source/sbx/sbxsng.cxx
+++ b/basic/source/sbx/sbxsng.cxx
@@ -260,7 +260,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pByte = (BYTE) n; break;
+ *p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
if( n > SbxMAXINT )
@@ -271,7 +271,7 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMININT;
}
- *p->pInteger = (INT16) n; break;
+ *p->pInteger = (sal_Int16) n; break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
if( n > SbxMAXUINT )
@@ -282,10 +282,10 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = 0;
}
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
{
- INT32 i;
+ sal_Int32 i;
if( n > SbxMAXLNG )
{
SbxBase::SetError( SbxERR_OVERFLOW ); i = SbxMAXLNG;
@@ -296,13 +296,13 @@ start:
}
else
{
- i = sal::static_int_cast< INT32 >(n);
+ i = sal::static_int_cast< sal_Int32 >(n);
}
*p->pLong = i; break;
}
case SbxBYREF | SbxULONG:
{
- UINT32 i;
+ sal_uInt32 i;
if( n > SbxMAXULNG )
{
SbxBase::SetError( SbxERR_OVERFLOW ); i = SbxMAXULNG;
@@ -313,7 +313,7 @@ start:
}
else
{
- i = sal::static_int_cast< UINT32 >(n);
+ i = sal::static_int_cast< sal_uInt32 >(n);
}
*p->pULong = i; break;
}
diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx
index 1b634d57d66c..27d1ca192868 100644..100755
--- a/basic/source/sbx/sbxstr.cxx
+++ b/basic/source/sbx/sbxstr.cxx
@@ -148,9 +148,9 @@
XubString aRes;
aTmp.eType = SbxSTRING;
if( p->eType == SbxDOUBLE )
- ImpPutDouble( &aTmp, p->nDouble, TRUE ); // true = bCoreString
+ ImpPutDouble( &aTmp, p->nDouble, sal_True ); // true = bCoreString
else
- ImpPutDouble( &aTmp, *p->pDouble, TRUE ); // true = bCoreString
+ ImpPutDouble( &aTmp, *p->pDouble, sal_True ); // true = bCoreString
return aRes;
}
else
@@ -228,7 +228,7 @@ void ImpPutString( SbxValues* p, const ::rtl::OUString* n )
case SbxBYREF | SbxINTEGER:
*p->pInteger = ImpGetInteger( p ); break;
case SbxBYREF | SbxBOOL:
- *p->pUShort = sal::static_int_cast< UINT16 >( ImpGetBool( p ) );
+ *p->pUShort = sal::static_int_cast< sal_uInt16 >( ImpGetBool( p ) );
break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
@@ -275,10 +275,10 @@ SbxArray* StringToByteArray(const ::rtl::OUString& rStr)
pArray->unoAddDim( 0, -1 );
}
- for( USHORT i=0; i< nArraySize; i++)
+ for( sal_uInt16 i=0; i< nArraySize; i++)
{
SbxVariable* pNew = new SbxVariable( SbxBYTE );
- BYTE aByte = static_cast< BYTE >( i%2 ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
+ sal_uInt8 aByte = static_cast< sal_uInt8 >( i%2 ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff );
pNew->PutByte( aByte );
pNew->SetFlag( SBX_WRITE );
pArray->Put( pNew, i );
@@ -291,10 +291,10 @@ SbxArray* StringToByteArray(const ::rtl::OUString& rStr)
// Convert an array of bytes to string (2bytes per character)
::rtl::OUString ByteArrayToString(SbxArray* pArr)
{
- USHORT nCount = pArr->Count();
+ sal_uInt16 nCount = pArr->Count();
::rtl::OUStringBuffer aStrBuf;
sal_Unicode aChar = 0;
- for( USHORT i = 0 ; i < nCount ; i++ )
+ for( sal_uInt16 i = 0 ; i < nCount ; i++ )
{
sal_Unicode aTempChar = pArr->Get(i)->GetByte();
if( i%2 )
diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx
index 3115fd850f89..5922b3571987 100644..100755
--- a/basic/source/sbx/sbxuint.cxx
+++ b/basic/source/sbx/sbxuint.cxx
@@ -32,10 +32,10 @@
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
-UINT16 ImpGetUShort( const SbxValues* p )
+sal_uInt16 ImpGetUShort( const SbxValues* p )
{
SbxValues aTmp;
- UINT16 nRes;
+ sal_uInt16 nRes;
start:
switch( +p->eType )
{
@@ -71,7 +71,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (UINT16) p->nLong;
+ nRes = (sal_uInt16) p->nLong;
break;
case SbxULONG:
if( p->nULong > SbxMAXUINT )
@@ -79,7 +79,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXUINT;
}
else
- nRes = (UINT16) p->nULong;
+ nRes = (sal_uInt16) p->nULong;
break;
case SbxCURRENCY:
if( p->nInt64 / CURRENCY_FACTOR > SbxMAXUINT )
@@ -91,7 +91,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (UINT16) (p->nInt64 / CURRENCY_FACTOR);
+ nRes = (sal_uInt16) (p->nInt64 / CURRENCY_FACTOR);
break;
case SbxSALINT64:
if( p->nInt64 > SbxMAXUINT )
@@ -103,7 +103,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (UINT16) p->nInt64;
+ nRes = (sal_uInt16) p->nInt64;
break;
case SbxSALUINT64:
if( p->uInt64 > SbxMAXUINT )
@@ -111,7 +111,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = SbxMAXUINT;
}
else
- nRes = (UINT16) p->uInt64;
+ nRes = (sal_uInt16) p->uInt64;
break;
case SbxSINGLE:
if( p->nSingle > SbxMAXUINT )
@@ -123,7 +123,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (UINT16) ( p->nSingle + 0.5 );
+ nRes = (sal_uInt16) ( p->nSingle + 0.5 );
break;
case SbxDATE:
case SbxDOUBLE:
@@ -149,7 +149,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (UINT16) ( dVal + 0.5 );
+ nRes = (sal_uInt16) ( dVal + 0.5 );
break;
}
case SbxBYREF | SbxSTRING:
@@ -172,7 +172,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (UINT16) ( d + 0.5 );
+ nRes = (sal_uInt16) ( d + 0.5 );
}
break;
case SbxOBJECT:
@@ -223,7 +223,7 @@ start:
return nRes;
}
-void ImpPutUShort( SbxValues* p, UINT16 n )
+void ImpPutUShort( SbxValues* p, sal_uInt16 n )
{
SbxValues aTmp;
@@ -289,14 +289,14 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXBYTE;
}
- *p->pByte = (BYTE) n; break;
+ *p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
if( n > SbxMAXINT )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXINT;
}
- *p->pInteger = (INT16) n; break;
+ *p->pInteger = (sal_Int16) n; break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
*p->pUShort = n; break;
diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx
index 10c1dbd4f8d7..b8f74b4bf5e6 100644..100755
--- a/basic/source/sbx/sbxulng.cxx
+++ b/basic/source/sbx/sbxulng.cxx
@@ -32,10 +32,10 @@
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
-UINT32 ImpGetULong( const SbxValues* p )
+sal_uInt32 ImpGetULong( const SbxValues* p )
{
SbxValues aTmp;
- UINT32 nRes;
+ sal_uInt32 nRes;
start:
switch( +p->eType )
{
@@ -81,7 +81,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (UINT32) ( p->nSingle + 0.5 );
+ nRes = (sal_uInt32) ( p->nSingle + 0.5 );
break;
case SbxDATE:
case SbxDOUBLE:
@@ -116,7 +116,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (UINT32) ( dVal + 0.5 );
+ nRes = (sal_uInt32) ( dVal + 0.5 );
break;
}
case SbxBYREF | SbxSTRING:
@@ -139,7 +139,7 @@ start:
SbxBase::SetError( SbxERR_OVERFLOW ); nRes = 0;
}
else
- nRes = (UINT32) ( d + 0.5 );
+ nRes = (sal_uInt32) ( d + 0.5 );
}
break;
case SbxOBJECT:
@@ -190,7 +190,7 @@ start:
return nRes;
}
-void ImpPutULong( SbxValues* p, UINT32 n )
+void ImpPutULong( SbxValues* p, sal_uInt32 n )
{
SbxValues aTmp;
start:
@@ -257,27 +257,27 @@ start:
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXBYTE;
}
- *p->pByte = (BYTE) n; break;
+ *p->pByte = (sal_uInt8) n; break;
case SbxBYREF | SbxINTEGER:
case SbxBYREF | SbxBOOL:
if( n > SbxMAXINT )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXINT;
}
- *p->pInteger = (INT16) n; break;
+ *p->pInteger = (sal_Int16) n; break;
case SbxBYREF | SbxERROR:
case SbxBYREF | SbxUSHORT:
if( n > SbxMAXUINT )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXUINT;
}
- *p->pUShort = (UINT16) n; break;
+ *p->pUShort = (sal_uInt16) n; break;
case SbxBYREF | SbxLONG:
if( n > SbxMAXLNG )
{
SbxBase::SetError( SbxERR_OVERFLOW ); n = SbxMAXLNG;
}
- *p->pLong = (INT32) n; break;
+ *p->pLong = (sal_Int32) n; break;
case SbxBYREF | SbxULONG:
*p->pULong = n; break;
case SbxBYREF | SbxSINGLE:
diff --git a/basic/source/sbx/sbxvals.cxx b/basic/source/sbx/sbxvals.cxx
new file mode 100755
index 000000000000..71a3bfc7f0d8
--- /dev/null
+++ b/basic/source/sbx/sbxvals.cxx
@@ -0,0 +1,109 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basic.hxx"
+
+#define _TLBIGINT_INT64
+#include <tools/bigint.hxx>
+#include <basic/sbx.hxx>
+
+///////////////////////////// BigInt/Currency //////////////////////////////
+
+SbxValues::SbxValues( const BigInt &rBig ) : eType(SbxCURRENCY)
+{
+ rBig.INT64( &nLong64 );
+}
+
+//TODO: BigInt is TOOLS_DLLPUBLIC, and its four member functions only declared
+// and defined within basic (#define _TLBIGINT_INT64) are a bad hack that causes
+// "warning C4273: 'function' : inconsistent dll linkage" on MSC; this whole
+// mess should be cleaned up properly (e.g., by completely removing Sbx[U]INT64
+// and using sal_[u]Int64 instead):
+#if defined _MSC_VER
+#pragma warning(disable: 4273)
+#endif
+
+sal_Bool BigInt::INT64( SbxINT64 *p ) const
+{
+ if( bIsBig ) {
+ if( nLen > 4 || (nNum[3] & 0x8000) )
+ return sal_False;
+
+ p->nLow = ((sal_uInt32)nNum[1] << 16) | (sal_uInt32)nNum[0];
+ p->nHigh = ((sal_uInt32)nNum[3] << 16) | (sal_uInt32)nNum[2];
+ if( bIsNeg )
+ p->CHS();
+ }
+ else
+ p->Set( (sal_Int32)nVal );
+
+ return sal_True;
+}
+
+BigInt::BigInt( const SbxINT64 &r )
+{
+ BigInt a10000 = 0x10000;
+
+ *this = r.nHigh;
+ if( r.nHigh )
+ *this *= a10000;
+ *this += (sal_uInt16)(r.nLow >> 16);
+ *this *= a10000;
+ *this += (sal_uInt16)r.nLow;
+}
+
+sal_Bool BigInt::UINT64( SbxUINT64 *p ) const
+{
+ if( bIsBig ) {
+ if( bIsNeg || nLen > 4 )
+ return sal_False;
+
+ p->nLow = ((sal_uInt32)nNum[1] << 16) | (sal_uInt32)nNum[0];
+ p->nHigh = ((sal_uInt32)nNum[3] << 16) | (sal_uInt32)nNum[2];
+ }
+ else {
+ if( nVal < 0 )
+ return sal_False;
+
+ p->Set( (sal_uInt32)nVal );
+ }
+
+ return sal_True;
+}
+
+BigInt::BigInt( const SbxUINT64 &r )
+{
+ BigInt a10000 = 0x10000;
+
+ *this = BigInt(r.nHigh);
+ if( r.nHigh )
+ *this *= a10000;
+ *this += (sal_uInt16)(r.nLow >> 16);
+ *this *= a10000;
+ *this += (sal_uInt16)r.nLow;
+}
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 6838e68eeeaa..2c3adaa4302d 100644..100755
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -62,7 +62,7 @@ int matherr( struct _exception* p )
#endif
default: SbxBase::SetError( SbxERR_NOTIMP ); break;
}
- return TRUE;
+ return sal_True;
}
#endif
@@ -87,21 +87,21 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase()
if( p )
switch( t & 0x0FFF )
{
- case SbxINTEGER: n |= SbxBYREF; aData.pInteger = (INT16*) p; break;
+ case SbxINTEGER: n |= SbxBYREF; aData.pInteger = (sal_Int16*) p; break;
case SbxSALUINT64: n |= SbxBYREF; aData.puInt64 = (sal_uInt64*) p; break;
case SbxSALINT64:
case SbxCURRENCY: n |= SbxBYREF; aData.pnInt64 = (sal_Int64*) p; break;
- case SbxLONG: n |= SbxBYREF; aData.pLong = (INT32*) p; break;
+ case SbxLONG: n |= SbxBYREF; aData.pLong = (sal_Int32*) p; break;
case SbxSINGLE: n |= SbxBYREF; aData.pSingle = (float*) p; break;
case SbxDATE:
case SbxDOUBLE: n |= SbxBYREF; aData.pDouble = (double*) p; break;
case SbxSTRING: n |= SbxBYREF; aData.pOUString = (::rtl::OUString*) p; break;
case SbxERROR:
case SbxUSHORT:
- case SbxBOOL: n |= SbxBYREF; aData.pUShort = (UINT16*) p; break;
- case SbxULONG: n |= SbxBYREF; aData.pULong = (UINT32*) p; break;
+ case SbxBOOL: n |= SbxBYREF; aData.pUShort = (sal_uInt16*) p; break;
+ case SbxULONG: n |= SbxBYREF; aData.pULong = (sal_uInt32*) p; break;
case SbxCHAR: n |= SbxBYREF; aData.pChar = (sal_Unicode*) p; break;
- case SbxBYTE: n |= SbxBYREF; aData.pByte = (BYTE*) p; break;
+ case SbxBYTE: n |= SbxBYREF; aData.pByte = (sal_uInt8*) p; break;
case SbxINT: n |= SbxBYREF; aData.pInt = (int*) p; break;
case SbxOBJECT:
aData.pObj = (SbxBase*) p;
@@ -222,8 +222,8 @@ SbxValue::~SbxValue()
{
HACK(nicht bei Parent-Prop - sonst CyclicRef)
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
- BOOL bParentProp = pThisVar && 5345 ==
- ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) );
+ sal_Bool bParentProp = pThisVar && 5345 ==
+ ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
if ( !bParentProp )
aData.pObj->ReleaseRef();
}
@@ -253,8 +253,8 @@ void SbxValue::Clear()
{
HACK(nicht bei Parent-Prop - sonst CyclicRef)
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
- BOOL bParentProp = pThisVar && 5345 ==
- ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) );
+ sal_Bool bParentProp = pThisVar && 5345 ==
+ ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
if ( !bParentProp )
aData.pObj->ReleaseRef();
}
@@ -279,7 +279,7 @@ void SbxValue::Clear()
// Dummy
-void SbxValue::Broadcast( ULONG )
+void SbxValue::Broadcast( sal_uIntPtr )
{}
//////////////////////////// Readout data //////////////////////////////
@@ -291,11 +291,13 @@ void SbxValue::Broadcast( ULONG )
SbxValue* SbxValue::TheRealValue() const
{
- return TheRealValue( TRUE );
+ return TheRealValue( sal_True );
}
// #55226 ship additional information
-SbxValue* SbxValue::TheRealValue( BOOL bObjInObjError ) const
+bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal ); // sbunoobj.cxx
+
+SbxValue* SbxValue::TheRealValue( sal_Bool bObjInObjError ) const
{
SbxValue* p = (SbxValue*) this;
for( ;; )
@@ -320,8 +322,12 @@ SbxValue* SbxValue::TheRealValue( BOOL bObjInObjError ) const
((SbxValue*) pObj)->aData.eType == SbxOBJECT &&
((SbxValue*) pObj)->aData.pObj == pObj )
{
- SetError( SbxERR_BAD_PROP_VALUE );
- p = NULL;
+ bool bSuccess = handleToStringForCOMObjects( pObj, p );
+ if( !bSuccess )
+ {
+ SetError( SbxERR_BAD_PROP_VALUE );
+ p = NULL;
+ }
}
else if( pDflt )
p = pDflt;
@@ -364,9 +370,9 @@ SbxValue* SbxValue::TheRealValue( BOOL bObjInObjError ) const
return p;
}
-BOOL SbxValue::Get( SbxValues& rRes ) const
+sal_Bool SbxValue::Get( SbxValues& rRes ) const
{
- BOOL bRes = FALSE;
+ sal_Bool bRes = sal_False;
SbxError eOld = GetError();
if( eOld != SbxERR_OK )
ResetError();
@@ -401,7 +407,7 @@ BOOL SbxValue::Get( SbxValues& rRes ) const
case SbxDECIMAL: rRes.pDecimal = ImpGetDecimal( &p->aData ); break;
case SbxDATE: rRes.nDouble = ImpGetDate( &p->aData ); break;
case SbxBOOL:
- rRes.nUShort = sal::static_int_cast< UINT16 >(
+ rRes.nUShort = sal::static_int_cast< sal_uInt16 >(
ImpGetBool( &p->aData ) );
break;
case SbxCHAR: rRes.nChar = ImpGetChar( &p->aData ); break;
@@ -456,18 +462,18 @@ BOOL SbxValue::Get( SbxValues& rRes ) const
}
if( !IsError() )
{
- bRes = TRUE;
+ bRes = sal_True;
if( eOld != SbxERR_OK )
SetError( eOld );
}
return bRes;
}
-BOOL SbxValue::GetNoBroadcast( SbxValues& rRes )
+sal_Bool SbxValue::GetNoBroadcast( SbxValues& rRes )
{
- USHORT nFlags_ = GetFlags();
+ sal_uInt16 nFlags_ = GetFlags();
SetFlag( SBX_NO_BROADCAST );
- BOOL bRes = Get( rRes );
+ sal_Bool bRes = Get( rRes );
SetFlags( nFlags_ );
return bRes;
}
@@ -507,7 +513,7 @@ const XubString& SbxValue::GetCoreString() const
return aResult;
}
-BOOL SbxValue::HasObject() const
+sal_Bool SbxValue::HasObject() const
{
ErrCode eErr = GetError();
SbxValues aRes;
@@ -517,31 +523,31 @@ BOOL SbxValue::HasObject() const
return 0 != aRes.pObj;
}
-BOOL SbxValue::GetBool() const
+sal_Bool SbxValue::GetBool() const
{
SbxValues aRes;
aRes.eType = SbxBOOL;
Get( aRes );
- return BOOL( aRes.nUShort != 0 );
+ return sal_Bool( aRes.nUShort != 0 );
}
#define GET( g, e, t, m ) \
t SbxValue::g() const { SbxValues aRes(e); Get( aRes ); return aRes.m; }
-GET( GetByte, SbxBYTE, BYTE, nByte )
+GET( GetByte, SbxBYTE, sal_uInt8, nByte )
GET( GetChar, SbxCHAR, xub_Unicode, nChar )
GET( GetCurrency, SbxCURRENCY, sal_Int64, nInt64 )
GET( GetDate, SbxDATE, double, nDouble )
GET( GetData, SbxDATAOBJECT, void*, pData )
GET( GetDouble, SbxDOUBLE, double, nDouble )
-GET( GetErr, SbxERROR, UINT16, nUShort )
+GET( GetErr, SbxERROR, sal_uInt16, nUShort )
GET( GetInt, SbxINT, int, nInt )
-GET( GetInteger, SbxINTEGER, INT16, nInteger )
-GET( GetLong, SbxLONG, INT32, nLong )
+GET( GetInteger, SbxINTEGER, sal_Int16, nInteger )
+GET( GetLong, SbxLONG, sal_Int32, nLong )
GET( GetObject, SbxOBJECT, SbxBase*, pObj )
GET( GetSingle, SbxSINGLE, float, nSingle )
-GET( GetULong, SbxULONG, UINT32, nULong )
-GET( GetUShort, SbxUSHORT, UINT16, nUShort )
+GET( GetULong, SbxULONG, sal_uInt32, nULong )
+GET( GetUShort, SbxUSHORT, sal_uInt16, nUShort )
GET( GetInt64, SbxSALINT64, sal_Int64, nInt64 )
GET( GetUInt64, SbxSALUINT64, sal_uInt64, uInt64 )
GET( GetDecimal, SbxDECIMAL, SbxDecimal*, pDecimal )
@@ -549,9 +555,9 @@ GET( GetDecimal, SbxDECIMAL, SbxDecimal*, pDecimal )
//////////////////////////// Write data /////////////////////////////
-BOOL SbxValue::Put( const SbxValues& rVal )
+sal_Bool SbxValue::Put( const SbxValues& rVal )
{
- BOOL bRes = FALSE;
+ sal_Bool bRes = sal_False;
SbxError eOld = GetError();
if( eOld != SbxERR_OK )
ResetError();
@@ -565,7 +571,7 @@ BOOL SbxValue::Put( const SbxValues& rVal )
// the real values
SbxValue* p = this;
if( rVal.eType != SbxOBJECT )
- p = TheRealValue( FALSE ); // #55226 Don't allow an error here
+ p = TheRealValue( sal_False ); // Don't allow an error here
if( p )
{
if( !p->CanWrite() )
@@ -594,16 +600,16 @@ BOOL SbxValue::Put( const SbxValues& rVal )
case SbxSTRING: ImpPutString( &p->aData, rVal.pOUString ); break;
case SbxINT:
#if SAL_TYPES_SIZEOFINT == 2
- ImpPutInteger( &p->aData, (INT16) rVal.nInt );
+ ImpPutInteger( &p->aData, (sal_Int16) rVal.nInt );
#else
- ImpPutLong( &p->aData, (INT32) rVal.nInt );
+ ImpPutLong( &p->aData, (sal_Int32) rVal.nInt );
#endif
break;
case SbxUINT:
#if SAL_TYPES_SIZEOFINT == 2
- ImpPutUShort( &p->aData, (UINT16) rVal.nUInt );
+ ImpPutUShort( &p->aData, (sal_uInt16) rVal.nUInt );
#else
- ImpPutULong( &p->aData, (UINT32) rVal.nUInt );
+ ImpPutULong( &p->aData, (sal_uInt32) rVal.nUInt );
#endif
break;
case SbxOBJECT:
@@ -628,8 +634,8 @@ BOOL SbxValue::Put( const SbxValues& rVal )
}
HACK(nicht bei Parent-Prop - sonst CyclicRef)
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
- BOOL bParentProp = pThisVar && 5345 ==
- ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) );
+ sal_Bool bParentProp = pThisVar && 5345 ==
+ ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
if ( !bParentProp )
p->aData.pObj->AddRef();
}
@@ -649,11 +655,11 @@ BOOL SbxValue::Put( const SbxValues& rVal )
}
if( !IsError() )
{
- p->SetModified( TRUE );
+ p->SetModified( sal_True );
p->Broadcast( SBX_HINT_DATACHANGED );
if( eOld != SbxERR_OK )
SetError( eOld );
- bRes = TRUE;
+ bRes = sal_True;
}
}
}
@@ -667,7 +673,7 @@ BOOL SbxValue::Put( const SbxValues& rVal )
// if Float were declared with ',' as the decimal seperator or BOOl
// explicit with "TRUE" or "FALSE".
// Implementation in ImpConvStringExt (SBXSCAN.CXX)
-BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
+sal_Bool SbxValue::PutStringExt( const ::rtl::OUString& r )
{
// Copy; if it is Unicode convert it immediately
::rtl::OUString aStr( r );
@@ -682,7 +688,7 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
// Only if really something was converted, take the copy,
// elsewise take the original (Unicode remain)
- BOOL bRet;
+ sal_Bool bRet;
if( ImpConvStringExt( aStr, eTargetType ) )
aRes.pOUString = (::rtl::OUString*)&aStr;
else
@@ -690,7 +696,7 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
// #34939: Set a Fixed-Flag at Strings. which contain a number, and
// if this has a Num-Type, so that the type will not be changed
- USHORT nFlags_ = GetFlags();
+ sal_uInt16 nFlags_ = GetFlags();
if( ( eTargetType >= SbxINTEGER && eTargetType <= SbxCURRENCY ) ||
( eTargetType >= SbxCHAR && eTargetType <= SbxUINT ) ||
eTargetType == SbxBOOL )
@@ -702,7 +708,7 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
}
Put( aRes );
- bRet = BOOL( !IsError() );
+ bRet = sal_Bool( !IsError() );
// If it throwed an error with FIXED, set it back
// (UI-Action should not cast an error, but only fail)
@@ -713,102 +719,102 @@ BOOL SbxValue::PutStringExt( const ::rtl::OUString& r )
return bRet;
}
-BOOL SbxValue::PutString( const xub_Unicode* p )
+sal_Bool SbxValue::PutString( const xub_Unicode* p )
{
::rtl::OUString aVal( p );
SbxValues aRes;
aRes.eType = SbxSTRING;
aRes.pOUString = &aVal;
Put( aRes );
- return BOOL( !IsError() );
+ return sal_Bool( !IsError() );
}
-BOOL SbxValue::PutBool( BOOL b )
+sal_Bool SbxValue::PutBool( sal_Bool b )
{
SbxValues aRes;
aRes.eType = SbxBOOL;
- aRes.nUShort = sal::static_int_cast< UINT16 >(b ? SbxTRUE : SbxFALSE);
+ aRes.nUShort = sal::static_int_cast< sal_uInt16 >(b ? SbxTRUE : SbxFALSE);
Put( aRes );
- return BOOL( !IsError() );
+ return sal_Bool( !IsError() );
}
-BOOL SbxValue::PutEmpty()
+sal_Bool SbxValue::PutEmpty()
{
- BOOL bRet = SetType( SbxEMPTY );
- SetModified( TRUE );
+ sal_Bool bRet = SetType( SbxEMPTY );
+ SetModified( sal_True );
return bRet;
}
-BOOL SbxValue::PutNull()
+sal_Bool SbxValue::PutNull()
{
- BOOL bRet = SetType( SbxNULL );
+ sal_Bool bRet = SetType( SbxNULL );
if( bRet )
- SetModified( TRUE );
+ SetModified( sal_True );
return bRet;
}
// Special decimal methods
-BOOL SbxValue::PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec )
+sal_Bool SbxValue::PutDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec )
{
SbxValue::Clear();
aData.pDecimal = new SbxDecimal( rAutomationDec );
aData.pDecimal->addRef();
aData.eType = SbxDECIMAL;
- return TRUE;
+ return sal_True;
}
-BOOL SbxValue::fillAutomationDecimal
+sal_Bool SbxValue::fillAutomationDecimal
( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec )
{
SbxDecimal* pDecimal = GetDecimal();
if( pDecimal != NULL )
{
pDecimal->fillAutomationDecimal( rAutomationDec );
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-BOOL SbxValue::PutpChar( const xub_Unicode* p )
+sal_Bool SbxValue::PutpChar( const xub_Unicode* p )
{
::rtl::OUString aVal( p );
SbxValues aRes;
aRes.eType = SbxLPSTR;
aRes.pOUString = &aVal;
Put( aRes );
- return BOOL( !IsError() );
+ return sal_Bool( !IsError() );
}
-BOOL SbxValue::PutString( const ::rtl::OUString& r )
+sal_Bool SbxValue::PutString( const ::rtl::OUString& r )
{
SbxValues aRes;
aRes.eType = SbxSTRING;
aRes.pOUString = (::rtl::OUString*) &r;
Put( aRes );
- return BOOL( !IsError() );
+ return sal_Bool( !IsError() );
}
#define PUT( p, e, t, m ) \
-BOOL SbxValue::p( t n ) \
-{ SbxValues aRes(e); aRes.m = n; Put( aRes ); return BOOL( !IsError() ); }
+sal_Bool SbxValue::p( t n ) \
+{ SbxValues aRes(e); aRes.m = n; Put( aRes ); return sal_Bool( !IsError() ); }
-PUT( PutByte, SbxBYTE, BYTE, nByte )
+PUT( PutByte, SbxBYTE, sal_uInt8, nByte )
PUT( PutChar, SbxCHAR, sal_Unicode, nChar )
PUT( PutCurrency, SbxCURRENCY, const sal_Int64&, nInt64 )
PUT( PutDate, SbxDATE, double, nDouble )
PUT( PutData, SbxDATAOBJECT, void*, pData )
PUT( PutDouble, SbxDOUBLE, double, nDouble )
-PUT( PutErr, SbxERROR, UINT16, nUShort )
+PUT( PutErr, SbxERROR, sal_uInt16, nUShort )
PUT( PutInt, SbxINT, int, nInt )
-PUT( PutInteger, SbxINTEGER, INT16, nInteger )
-PUT( PutLong, SbxLONG, INT32, nLong )
+PUT( PutInteger, SbxINTEGER, sal_Int16, nInteger )
+PUT( PutLong, SbxLONG, sal_Int32, nLong )
PUT( PutObject, SbxOBJECT, SbxBase*, pObj )
PUT( PutSingle, SbxSINGLE, float, nSingle )
-PUT( PutULong, SbxULONG, UINT32, nULong )
-PUT( PutUShort, SbxUSHORT, UINT16, nUShort )
+PUT( PutULong, SbxULONG, sal_uInt32, nULong )
+PUT( PutUShort, SbxUSHORT, sal_uInt16, nUShort )
PUT( PutInt64, SbxSALINT64, sal_Int64, nInt64 )
PUT( PutUInt64, SbxSALUINT64, sal_uInt64, uInt64 )
PUT( PutDecimal, SbxDECIMAL, SbxDecimal*, pDecimal )
@@ -816,7 +822,7 @@ PUT( PutDecimal, SbxDECIMAL, SbxDecimal*, pDecimal )
////////////////////////// Setting of the data type ///////////////////////////
-BOOL SbxValue::IsFixed() const
+sal_Bool SbxValue::IsFixed() const
{
return ( (GetFlags() & SBX_FIXED) | (aData.eType & SbxBYREF) ) != 0;
}
@@ -825,22 +831,22 @@ BOOL SbxValue::IsFixed() const
// or if it contains a complete convertible String
// #41692, implement it for RTL and Basic-Core seperably
-BOOL SbxValue::IsNumeric() const
+sal_Bool SbxValue::IsNumeric() const
{
- return ImpIsNumeric( /*bOnlyIntntl*/FALSE );
+ return ImpIsNumeric( /*bOnlyIntntl*/sal_False );
}
-BOOL SbxValue::IsNumericRTL() const
+sal_Bool SbxValue::IsNumericRTL() const
{
- return ImpIsNumeric( /*bOnlyIntntl*/TRUE );
+ return ImpIsNumeric( /*bOnlyIntntl*/sal_True );
}
-BOOL SbxValue::ImpIsNumeric( BOOL bOnlyIntntl ) const
+sal_Bool SbxValue::ImpIsNumeric( sal_Bool bOnlyIntntl ) const
{
if( !CanRead() )
{
- SetError( SbxERR_PROP_WRITEONLY ); return FALSE;
+ SetError( SbxERR_PROP_WRITEONLY ); return sal_False;
}
// Test downcast!!!
if( this->ISA(SbxVariable) )
@@ -853,14 +859,14 @@ BOOL SbxValue::ImpIsNumeric( BOOL bOnlyIntntl ) const
::rtl::OUString s( *aData.pOUString );
double n;
SbxDataType t2;
- USHORT nLen = 0;
- if( ImpScan( s, n, t2, &nLen, /*bAllowIntntl*/FALSE, bOnlyIntntl ) == SbxERR_OK )
- return BOOL( nLen == s.getLength() );
+ sal_uInt16 nLen = 0;
+ if( ImpScan( s, n, t2, &nLen, /*bAllowIntntl*/sal_False, bOnlyIntntl ) == SbxERR_OK )
+ return sal_Bool( nLen == s.getLength() );
}
- return FALSE;
+ return sal_False;
}
else
- return BOOL( t == SbxEMPTY
+ return sal_Bool( t == SbxEMPTY
|| ( t >= SbxINTEGER && t <= SbxCURRENCY )
|| ( t >= SbxCHAR && t <= SbxUINT ) );
}
@@ -880,19 +886,19 @@ SbxDataType SbxValue::GetFullType() const
return aData.eType;
}
-BOOL SbxValue::SetType( SbxDataType t )
+sal_Bool SbxValue::SetType( SbxDataType t )
{
DBG_ASSERT( !( t & 0xF000 ), "Setzen von BYREF|ARRAY verboten!" );
if( ( t == SbxEMPTY && aData.eType == SbxVOID )
|| ( aData.eType == SbxEMPTY && t == SbxVOID ) )
- return TRUE;
+ return sal_True;
if( ( t & 0x0FFF ) == SbxVARIANT )
{
// Trial to set the data type to Variant
ResetFlag( SBX_FIXED );
if( IsFixed() )
{
- SetError( SbxERR_CONVERSION ); return FALSE;
+ SetError( SbxERR_CONVERSION ); return sal_False;
}
t = SbxEMPTY;
}
@@ -900,7 +906,7 @@ BOOL SbxValue::SetType( SbxDataType t )
{
if( !CanWrite() || IsFixed() )
{
- SetError( SbxERR_CONVERSION ); return FALSE;
+ SetError( SbxERR_CONVERSION ); return sal_False;
}
else
{
@@ -915,12 +921,12 @@ BOOL SbxValue::SetType( SbxDataType t )
{
HACK(nicht bei Parent-Prop - sonst CyclicRef)
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
- UINT16 nSlotId = pThisVar
- ? ( (INT16) ( pThisVar->GetUserData() & 0xFFFF ) )
+ sal_uInt16 nSlotId = pThisVar
+ ? ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) )
: 0;
DBG_ASSERT( nSlotId != 5345 || pThisVar->GetName() == UniString::CreateFromAscii( "Parent" ),
"SID_PARENTOBJECT heisst nicht 'Parent'" );
- BOOL bParentProp = 5345 == nSlotId;
+ sal_Bool bParentProp = 5345 == nSlotId;
if ( !bParentProp )
aData.pObj->ReleaseRef();
}
@@ -932,31 +938,31 @@ BOOL SbxValue::SetType( SbxDataType t )
aData.eType = t;
}
}
- return TRUE;
+ return sal_True;
}
-BOOL SbxValue::Convert( SbxDataType eTo )
+sal_Bool SbxValue::Convert( SbxDataType eTo )
{
eTo = SbxDataType( eTo & 0x0FFF );
if( ( aData.eType & 0x0FFF ) == eTo )
- return TRUE;
+ return sal_True;
if( !CanWrite() )
- return FALSE;
+ return sal_False;
if( eTo == SbxVARIANT )
{
// Trial to set the data type to Variant
ResetFlag( SBX_FIXED );
if( IsFixed() )
{
- SetError( SbxERR_CONVERSION ); return FALSE;
+ SetError( SbxERR_CONVERSION ); return sal_False;
}
else
- return TRUE;
+ return sal_True;
}
// Converting from zero doesn't work. Once zero, always zero!
if( aData.eType == SbxNULL )
{
- SetError( SbxERR_CONVERSION ); return FALSE;
+ SetError( SbxERR_CONVERSION ); return sal_False;
}
// Conversion of the data:
@@ -970,17 +976,17 @@ BOOL SbxValue::Convert( SbxDataType eTo )
{
SetType( eTo );
Put( aNew );
- SetModified( TRUE );
+ SetModified( sal_True );
}
Broadcast( SBX_HINT_CONVERTED );
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
////////////////////////////////// Calculating /////////////////////////////////
-BOOL SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp )
+sal_Bool SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp )
{
bool bVBAInterop = SbiRuntime::isVBAEnabled();
@@ -1334,7 +1340,7 @@ Lbl_OpIsDouble:
}
Lbl_OpIsEmpty:
- BOOL bRes = BOOL( !IsError() );
+ sal_Bool bRes = sal_Bool( !IsError() );
if( bRes && eOld != SbxERR_OK )
SetError( eOld );
return bRes;
@@ -1342,11 +1348,11 @@ Lbl_OpIsEmpty:
// The comparison routine deliver TRUE or FALSE.
-BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
+sal_Bool SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
{
bool bVBAInterop = SbiRuntime::isVBAEnabled();
- BOOL bRes = FALSE;
+ sal_Bool bRes = sal_False;
SbxError eOld = GetError();
if( eOld != SbxERR_OK )
ResetError();
@@ -1354,24 +1360,24 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
SetError( SbxERR_PROP_WRITEONLY );
else if( GetType() == SbxNULL && rOp.GetType() == SbxNULL && !bVBAInterop )
{
- bRes = TRUE;
+ bRes = sal_True;
}
else if( GetType() == SbxEMPTY && rOp.GetType() == SbxEMPTY )
- bRes = !bVBAInterop ? TRUE : ( eOp == SbxEQ ? TRUE : FALSE );
+ bRes = !bVBAInterop ? sal_True : ( eOp == SbxEQ ? sal_True : sal_False );
// Special rule 1: If an operand is zero, the result is FALSE
else if( GetType() == SbxNULL || rOp.GetType() == SbxNULL )
- bRes = FALSE;
+ bRes = sal_False;
// Special rule 2: If both are variant and one is numeric
// and the other is a String, num is < str
else if( !IsFixed() && !rOp.IsFixed()
&& ( rOp.GetType() == SbxSTRING && GetType() != SbxSTRING && IsNumeric() ) && !bVBAInterop
)
- bRes = BOOL( eOp == SbxLT || eOp == SbxLE || eOp == SbxNE );
+ bRes = sal_Bool( eOp == SbxLT || eOp == SbxLE || eOp == SbxNE );
else if( !IsFixed() && !rOp.IsFixed()
&& ( GetType() == SbxSTRING && rOp.GetType() != SbxSTRING && rOp.IsNumeric() )
&& !bVBAInterop
)
- bRes = BOOL( eOp == SbxGT || eOp == SbxGE || eOp == SbxNE );
+ bRes = sal_Bool( eOp == SbxGT || eOp == SbxGE || eOp == SbxNE );
else
{
SbxValues aL, aR;
@@ -1383,17 +1389,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
if( Get( aL ) && rOp.Get( aR ) ) switch( eOp )
{
case SbxEQ:
- bRes = BOOL( *aL.pOUString == *aR.pOUString ); break;
+ bRes = sal_Bool( *aL.pOUString == *aR.pOUString ); break;
case SbxNE:
- bRes = BOOL( *aL.pOUString != *aR.pOUString ); break;
+ bRes = sal_Bool( *aL.pOUString != *aR.pOUString ); break;
case SbxLT:
- bRes = BOOL( *aL.pOUString < *aR.pOUString ); break;
+ bRes = sal_Bool( *aL.pOUString < *aR.pOUString ); break;
case SbxGT:
- bRes = BOOL( *aL.pOUString > *aR.pOUString ); break;
+ bRes = sal_Bool( *aL.pOUString > *aR.pOUString ); break;
case SbxLE:
- bRes = BOOL( *aL.pOUString <= *aR.pOUString ); break;
+ bRes = sal_Bool( *aL.pOUString <= *aR.pOUString ); break;
case SbxGE:
- bRes = BOOL( *aL.pOUString >= *aR.pOUString ); break;
+ bRes = sal_Bool( *aL.pOUString >= *aR.pOUString ); break;
default:
SetError( SbxERR_NOTIMP );
}
@@ -1407,17 +1413,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
switch( eOp )
{
case SbxEQ:
- bRes = BOOL( aL.nSingle == aR.nSingle ); break;
+ bRes = sal_Bool( aL.nSingle == aR.nSingle ); break;
case SbxNE:
- bRes = BOOL( aL.nSingle != aR.nSingle ); break;
+ bRes = sal_Bool( aL.nSingle != aR.nSingle ); break;
case SbxLT:
- bRes = BOOL( aL.nSingle < aR.nSingle ); break;
+ bRes = sal_Bool( aL.nSingle < aR.nSingle ); break;
case SbxGT:
- bRes = BOOL( aL.nSingle > aR.nSingle ); break;
+ bRes = sal_Bool( aL.nSingle > aR.nSingle ); break;
case SbxLE:
- bRes = BOOL( aL.nSingle <= aR.nSingle ); break;
+ bRes = sal_Bool( aL.nSingle <= aR.nSingle ); break;
case SbxGE:
- bRes = BOOL( aL.nSingle >= aR.nSingle ); break;
+ bRes = sal_Bool( aL.nSingle >= aR.nSingle ); break;
default:
SetError( SbxERR_NOTIMP );
}
@@ -1433,17 +1439,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
switch( eOp )
{
case SbxEQ:
- bRes = BOOL( eRes == SbxDecimal::EQ ); break;
+ bRes = sal_Bool( eRes == SbxDecimal::EQ ); break;
case SbxNE:
- bRes = BOOL( eRes != SbxDecimal::EQ ); break;
+ bRes = sal_Bool( eRes != SbxDecimal::EQ ); break;
case SbxLT:
- bRes = BOOL( eRes == SbxDecimal::LT ); break;
+ bRes = sal_Bool( eRes == SbxDecimal::LT ); break;
case SbxGT:
- bRes = BOOL( eRes == SbxDecimal::GT ); break;
+ bRes = sal_Bool( eRes == SbxDecimal::GT ); break;
case SbxLE:
- bRes = BOOL( eRes != SbxDecimal::GT ); break;
+ bRes = sal_Bool( eRes != SbxDecimal::GT ); break;
case SbxGE:
- bRes = BOOL( eRes != SbxDecimal::LT ); break;
+ bRes = sal_Bool( eRes != SbxDecimal::LT ); break;
default:
SetError( SbxERR_NOTIMP );
}
@@ -1466,17 +1472,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
switch( eOp )
{
case SbxEQ:
- bRes = BOOL( aL.nDouble == aR.nDouble ); break;
+ bRes = sal_Bool( aL.nDouble == aR.nDouble ); break;
case SbxNE:
- bRes = BOOL( aL.nDouble != aR.nDouble ); break;
+ bRes = sal_Bool( aL.nDouble != aR.nDouble ); break;
case SbxLT:
- bRes = BOOL( aL.nDouble < aR.nDouble ); break;
+ bRes = sal_Bool( aL.nDouble < aR.nDouble ); break;
case SbxGT:
- bRes = BOOL( aL.nDouble > aR.nDouble ); break;
+ bRes = sal_Bool( aL.nDouble > aR.nDouble ); break;
case SbxLE:
- bRes = BOOL( aL.nDouble <= aR.nDouble ); break;
+ bRes = sal_Bool( aL.nDouble <= aR.nDouble ); break;
case SbxGE:
- bRes = BOOL( aL.nDouble >= aR.nDouble ); break;
+ bRes = sal_Bool( aL.nDouble >= aR.nDouble ); break;
default:
SetError( SbxERR_NOTIMP );
}
@@ -1488,7 +1494,7 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
if ( bVBAInterop && eOp == SbxEQ && GetError() == SbxERR_CONVERSION )
{
ResetError();
- bRes = FALSE;
+ bRes = sal_False;
}
}
}
@@ -1500,12 +1506,12 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
///////////////////////////// Reading/Writing ////////////////////////////
-BOOL SbxValue::LoadData( SvStream& r, USHORT )
+sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
{
// #TODO see if these types are really dumped to any stream
// more than likely this is functionality used in the binfilter alone
SbxValue::Clear();
- UINT16 nType;
+ sal_uInt16 nType;
r >> nType;
aData.eType = SbxDataType( nType );
switch( nType )
@@ -1525,7 +1531,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
if( ImpScan( aVal, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE )
{
aData.nSingle = 0.0F;
- return FALSE;
+ return sal_False;
}
aData.nSingle = (float) d;
break;
@@ -1540,7 +1546,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK )
{
aData.nDouble = 0.0;
- return FALSE;
+ return sal_False;
}
break;
}
@@ -1576,7 +1582,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
r >> aData.nUShort; break;
case SbxOBJECT:
{
- BYTE nMode;
+ sal_uInt8 nMode;
r >> nMode;
switch( nMode )
{
@@ -1585,7 +1591,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
break;
case 1:
aData.pObj = SbxBase::Load( r );
- return BOOL( aData.pObj != NULL );
+ return sal_Bool( aData.pObj != NULL );
case 2:
aData.pObj = this;
break;
@@ -1605,7 +1611,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
r >> aData.nULong; break;
case SbxINT:
{
- BYTE n;
+ sal_uInt8 n;
r >> n;
// Match the Int on this system?
if( n > SAL_TYPES_SIZEOFINT )
@@ -1616,7 +1622,7 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
}
case SbxUINT:
{
- BYTE n;
+ sal_uInt8 n;
r >> n;
// Match the UInt on this system?
if( n > SAL_TYPES_SIZEOFINT )
@@ -1641,14 +1647,14 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
ResetFlag(SBX_FIXED);
aData.eType = SbxNULL;
DBG_ASSERT( !this, "Nicht unterstuetzer Datentyp geladen" );
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
-BOOL SbxValue::StoreData( SvStream& r ) const
+sal_Bool SbxValue::StoreData( SvStream& r ) const
{
- UINT16 nType = sal::static_int_cast< UINT16 >(aData.eType);
+ sal_uInt16 nType = sal::static_int_cast< sal_uInt16 >(aData.eType);
r << nType;
switch( nType & 0x0FFF )
{
@@ -1699,14 +1705,14 @@ BOOL SbxValue::StoreData( SvStream& r ) const
{
if( PTR_CAST(SbxValue,aData.pObj) != this )
{
- r << (BYTE) 1;
+ r << (sal_uInt8) 1;
return aData.pObj->Store( r );
}
else
- r << (BYTE) 2;
+ r << (sal_uInt8) 2;
}
else
- r << (BYTE) 0;
+ r << (sal_uInt8) 0;
break;
case SbxCHAR:
{
@@ -1720,13 +1726,13 @@ BOOL SbxValue::StoreData( SvStream& r ) const
r << aData.nULong; break;
case SbxINT:
{
- BYTE n = SAL_TYPES_SIZEOFINT;
+ sal_uInt8 n = SAL_TYPES_SIZEOFINT;
r << n << (sal_Int32)aData.nInt;
break;
}
case SbxUINT:
{
- BYTE n = SAL_TYPES_SIZEOFINT;
+ sal_uInt8 n = SAL_TYPES_SIZEOFINT;
r << n << (sal_uInt32)aData.nUInt;
break;
}
@@ -1743,9 +1749,9 @@ BOOL SbxValue::StoreData( SvStream& r ) const
break;
default:
DBG_ASSERT( !this, "Speichern eines nicht unterstuetzten Datentyps" );
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 35eb5e4bd38f..9a981cccc7ca 100644..100755
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -47,9 +47,9 @@ using namespace com::sun::star::uno;
TYPEINIT1(SbxVariable,SbxValue)
TYPEINIT1(SbxHint,SfxSimpleHint)
-extern UINT32 nVarCreator; // in SBXBASE.CXX, fuer LoadData()
+extern sal_uInt32 nVarCreator; // in SBXBASE.CXX, fuer LoadData()
#ifdef DBG_UTIL
-static ULONG nVar = 0;
+static sal_uIntPtr nVar = 0;
#endif
///////////////////////////// SbxVariableImpl ////////////////////////////
@@ -59,13 +59,17 @@ class SbxVariableImpl
friend class SbxVariable;
String m_aDeclareClassName;
Reference< XInterface > m_xComListener;
+ StarBASIC* m_pComListenerParentBasic;
SbxVariableImpl( void )
+ : m_pComListenerParentBasic( NULL )
{}
SbxVariableImpl( const SbxVariableImpl& r )
: m_aDeclareClassName( r.m_aDeclareClassName )
, m_xComListener( r.m_xComListener )
- {}
+ , m_pComListenerParentBasic( r.m_pComListenerParentBasic )
+ {
+ }
};
@@ -83,12 +87,18 @@ SbxVariable::SbxVariable() : SbxValue()
#endif
}
+void registerComListenerVariableForBasic( SbxVariable* pVar, StarBASIC* pBasic );
+
SbxVariable::SbxVariable( const SbxVariable& r )
: SvRefBase( r ), SbxValue( r ), mpPar( r.mpPar ), pInfo( r.pInfo )
{
mpSbxVariableImpl = NULL;
if( r.mpSbxVariableImpl != NULL )
+ {
mpSbxVariableImpl = new SbxVariableImpl( *r.mpSbxVariableImpl );
+ if( mpSbxVariableImpl->m_xComListener.is() )
+ registerComListenerVariableForBasic( this, mpSbxVariableImpl->m_pComListenerParentBasic );
+ }
pCst = NULL;
if( r.CanRead() )
{
@@ -123,6 +133,8 @@ SbxVariable::SbxVariable( SbxDataType t, void* p ) : SbxValue( t, p )
#endif
}
+void removeDimAsNewRecoverItem( SbxVariable* pVar );
+
SbxVariable::~SbxVariable()
{
#ifdef DBG_UTIL
@@ -132,6 +144,8 @@ SbxVariable::~SbxVariable()
if ( maName.EqualsAscii( aCellsStr ) )
maName.AssignAscii( aCellsStr, sizeof( aCellsStr )-1 );
#endif
+ if( IsSet( SBX_DIM_AS_NEW ))
+ removeDimAsNewRecoverItem( this );
delete mpSbxVariableImpl;
delete pCst;
}
@@ -148,7 +162,7 @@ SfxBroadcaster& SbxVariable::GetBroadcaster()
// Perhaps some day one could cut the parameter 0.
// then the copying will be dropped ...
-void SbxVariable::Broadcast( ULONG nHintId )
+void SbxVariable::Broadcast( sal_uIntPtr nHintId )
{
if( pCst && !IsSet( SBX_NO_BROADCAST ) && StaticIsEnabledBroadcasting() )
{
@@ -163,7 +177,7 @@ void SbxVariable::Broadcast( ULONG nHintId )
// Avoid further broadcasting
SfxBroadcaster* pSave = pCst;
pCst = NULL;
- USHORT nSaveFlags = GetFlags();
+ sal_uInt16 nSaveFlags = GetFlags();
SetFlag( SBX_READWRITE );
if( mpPar.Is() )
// Register this as element 0, but don't change over the parent!
@@ -181,7 +195,7 @@ SbxInfo* SbxVariable::GetInfo()
{
Broadcast( SBX_HINT_INFOWANTED );
if( pInfo.Is() )
- SetModified( TRUE );
+ SetModified( sal_True );
}
return pInfo;
}
@@ -228,7 +242,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
aTmp += cType;
}
aTmp += '(';
- for( USHORT i = 0; i < pInfo->aParams.Count(); i++ )
+ for( sal_uInt16 i = 0; i < pInfo->aParams.Count(); i++ )
{
const SbxParamInfo* q = pInfo->aParams.GetObject( i );
int nt = q->eType & 0x0FFF;
@@ -262,7 +276,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
aTmp += String( SbxRes( STRING_AS ) );
if( nt < 32 )
aTmp += String( SbxRes(
- sal::static_int_cast< USHORT >( STRING_TYPES + nt ) ) );
+ sal::static_int_cast< sal_uInt16 >( STRING_TYPES + nt ) ) );
else
aTmp += String( SbxRes( STRING_ANY ) );
}
@@ -275,7 +289,7 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
aTmp += String( SbxRes( STRING_AS ) );
if( et < 32 )
aTmp += String( SbxRes(
- sal::static_int_cast< USHORT >( STRING_TYPES + et ) ) );
+ sal::static_int_cast< sal_uInt16 >( STRING_TYPES + et ) ) );
else
aTmp += String( SbxRes( STRING_ANY ) );
}
@@ -285,21 +299,21 @@ const XubString& SbxVariable::GetName( SbxNameType t ) const
// Create a simple hashcode: the first six characters were evaluated.
-USHORT SbxVariable::MakeHashCode( const XubString& rName )
+sal_uInt16 SbxVariable::MakeHashCode( const XubString& rName )
{
- USHORT n = 0;
- USHORT nLen = rName.Len();
+ sal_uInt16 n = 0;
+ sal_uInt16 nLen = rName.Len();
if( nLen > 6 )
nLen = 6;
const xub_Unicode* p = rName.GetBuffer();
while( nLen-- )
{
- BYTE c = (BYTE)*p;
+ sal_uInt8 c = (sal_uInt8)*p;
p++;
// If we have a commen sigen break!!
if( c >= 0x80 )
return 0;
- n = sal::static_int_cast< USHORT >( ( n << 3 ) + toupper( c ) );
+ n = sal::static_int_cast< sal_uInt16 >( ( n << 3 ) + toupper( c ) );
}
return n;
}
@@ -311,7 +325,11 @@ SbxVariable& SbxVariable::operator=( const SbxVariable& r )
SbxValue::operator=( r );
delete mpSbxVariableImpl;
if( r.mpSbxVariableImpl != NULL )
+ {
mpSbxVariableImpl = new SbxVariableImpl( *r.mpSbxVariableImpl );
+ if( mpSbxVariableImpl->m_xComListener.is() )
+ registerComListenerVariableForBasic( this, mpSbxVariableImpl->m_pComListenerParentBasic );
+ }
else
mpSbxVariableImpl = NULL;
return *this;
@@ -334,7 +352,7 @@ SbxClassType SbxVariable::GetClass() const
return SbxCLASS_VARIABLE;
}
-void SbxVariable::SetModified( BOOL b )
+void SbxVariable::SetModified( sal_Bool b )
{
if( IsSet( SBX_NO_MODIFY ) )
return;
@@ -350,11 +368,11 @@ void SbxVariable::SetParent( SbxObject* p )
if ( p && ISA(SbxObject) )
{
// then this had to be a child of the new parent
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
SbxArray *pChilds = p->GetObjects();
if ( pChilds )
{
- for ( USHORT nIdx = 0; !bFound && nIdx < pChilds->Count(); ++nIdx )
+ for ( sal_uInt16 nIdx = 0; !bFound && nIdx < pChilds->Count(); ++nIdx )
bFound = ( this == pChilds->Get(nIdx) );
}
if ( !bFound )
@@ -392,26 +410,35 @@ void SbxVariable::SetDeclareClassName( const String& rDeclareClassName )
pImpl->m_aDeclareClassName = rDeclareClassName;
}
-void SbxVariable::SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener )
+void SbxVariable::SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener,
+ StarBASIC* pParentBasic )
{
SbxVariableImpl* pImpl = getImpl();
pImpl->m_xComListener = xComListener;
+ pImpl->m_pComListenerParentBasic = pParentBasic;
+ registerComListenerVariableForBasic( this, pParentBasic );
+}
+
+void SbxVariable::ClearComListener( void )
+{
+ SbxVariableImpl* pImpl = getImpl();
+ pImpl->m_xComListener.clear();
}
////////////////////////////// Loading/Saving /////////////////////////////
-BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
+sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
{
- UINT16 nType;
- BYTE cMark;
+ sal_uInt16 nType;
+ sal_uInt8 cMark;
rStrm >> cMark;
if( cMark == 0xFF )
{
if( !SbxValue::LoadData( rStrm, nVer ) )
- return FALSE;
+ return sal_False;
rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US );
- UINT32 nTemp;
+ sal_uInt32 nTemp;
rStrm >> nTemp;
nUserData = nTemp;
}
@@ -420,7 +447,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
rStrm.SeekRel( -1L );
rStrm >> nType;
rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US );
- UINT32 nTemp;
+ sal_uInt32 nTemp;
rStrm >> nTemp;
nUserData = nTemp;
// correction: old methods have instead of SbxNULL now SbxEMPTY
@@ -448,7 +475,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
if( ImpScan( aTmpString, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE )
{
aTmp.nSingle = 0;
- return FALSE;
+ return sal_False;
}
aTmp.nSingle = (float) d;
break;
@@ -462,7 +489,7 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
if( ImpScan( aTmpString, aTmp.nDouble, t, NULL ) != SbxERR_OK )
{
aTmp.nDouble = 0;
- return FALSE;
+ return sal_False;
}
break;
}
@@ -476,11 +503,11 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
default:
aData.eType = SbxNULL;
DBG_ASSERT( !this, "Nicht unterstuetzer Datentyp geladen" );
- return FALSE;
+ return sal_False;
}
// putt value
if( nType != SbxNULL && nType != SbxEMPTY && !Put( aTmp ) )
- return FALSE;
+ return sal_False;
}
rStrm >> cMark;
// cMark is also a version number!
@@ -489,29 +516,29 @@ BOOL SbxVariable::LoadData( SvStream& rStrm, USHORT nVer )
if( cMark )
{
if( cMark > 2 )
- return FALSE;
+ return sal_False;
pInfo = new SbxInfo;
- pInfo->LoadData( rStrm, (USHORT) cMark );
+ pInfo->LoadData( rStrm, (sal_uInt16) cMark );
}
// Load private data only, if it is a SbxVariable
if( GetClass() == SbxCLASS_VARIABLE && !LoadPrivateData( rStrm, nVer ) )
- return FALSE;
+ return sal_False;
((SbxVariable*) this)->Broadcast( SBX_HINT_DATACHANGED );
nHash = MakeHashCode( maName );
- SetModified( TRUE );
- return TRUE;
+ SetModified( sal_True );
+ return sal_True;
}
-BOOL SbxVariable::StoreData( SvStream& rStrm ) const
+sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const
{
- rStrm << (BYTE) 0xFF; // Marker
- BOOL bValStore;
+ rStrm << (sal_uInt8) 0xFF; // Marker
+ sal_Bool bValStore;
if( this->IsA( TYPE(SbxMethod) ) )
{
// #50200 Avoid that objects , which during the runtime
// as return-value are saved in the method as a value were saved
SbxVariable* pThis = (SbxVariable*)this;
- USHORT nSaveFlags = GetFlags();
+ sal_uInt16 nSaveFlags = GetFlags();
pThis->SetFlag( SBX_WRITE );
pThis->SbxValue::Clear();
pThis->SetFlags( nSaveFlags );
@@ -525,23 +552,23 @@ BOOL SbxVariable::StoreData( SvStream& rStrm ) const
else
bValStore = SbxValue::StoreData( rStrm );
if( !bValStore )
- return FALSE;
+ return sal_False;
// if( !SbxValue::StoreData( rStrm ) )
- // return FALSE;
+ // return sal_False;
rStrm.WriteByteString( maName, RTL_TEXTENCODING_ASCII_US );
- rStrm << (UINT32)nUserData;
+ rStrm << (sal_uInt32)nUserData;
if( pInfo.Is() )
{
- rStrm << (BYTE) 2; // Version 2: with UserData!
+ rStrm << (sal_uInt8) 2; // Version 2: with UserData!
pInfo->StoreData( rStrm );
}
else
- rStrm << (BYTE) 0;
+ rStrm << (sal_uInt8) 0;
// Save private data only, if it is a SbxVariable
if( GetClass() == SbxCLASS_VARIABLE )
return StorePrivateData( rStrm );
else
- return TRUE;
+ return sal_True;
}
////////////////////////////// SbxInfo ///////////////////////////////////
@@ -549,7 +576,7 @@ BOOL SbxVariable::StoreData( SvStream& rStrm ) const
SbxInfo::SbxInfo() : aHelpFile(), nHelpId( 0 ), aParams()
{}
-SbxInfo::SbxInfo( const String& r, UINT32 n )
+SbxInfo::SbxInfo( const String& r, sal_uInt32 n )
: aHelpFile( r ), nHelpId( n ), aParams()
{}
@@ -582,7 +609,7 @@ SbxAlias::~SbxAlias()
EndListening( xAlias->GetBroadcaster() );
}
-void SbxAlias::Broadcast( ULONG nHt )
+void SbxAlias::Broadcast( sal_uIntPtr nHt )
{
if( xAlias.Is() && StaticIsEnabledBroadcasting() )
{
@@ -612,11 +639,11 @@ void SbxAlias::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
}
}
-void SbxVariable::Dump( SvStream& rStrm, BOOL bFill )
+void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill )
{
ByteString aBNameStr( (const UniString&)GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US );
rStrm << "Variable( "
- << ByteString::CreateFromInt64( (ULONG) this ).GetBuffer() << "=="
+ << ByteString::CreateFromInt64( (sal_uIntPtr) this ).GetBuffer() << "=="
<< aBNameStr.GetBuffer();
ByteString aBParentNameStr( (const UniString&)GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US );
if ( GetParent() )
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 6af1675b9175..04df56763a13 100644..100755
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -144,7 +144,7 @@ bool writeOasis2OOoLibraryElement(
if (! xSMgr.is())
{
- return FALSE;
+ return sal_False;
}
Reference< xml::sax::XParser > xParser(
@@ -166,7 +166,7 @@ bool writeOasis2OOoLibraryElement(
if ( !xParser.is() || !xWriter.is() )
{
- return FALSE;
+ return sal_False;
}
Sequence<Any> aArgs( 1 );
@@ -187,7 +187,7 @@ bool writeOasis2OOoLibraryElement(
xParser->parseStream( source );
- return TRUE;
+ return sal_True;
}
void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
@@ -206,13 +206,13 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
Reference< XInputStream > xInput( xISP->createInputStream() );
- bool bComplete = FALSE;
+ bool bComplete = sal_False;
if ( mbOasis2OOoFormat )
{
bComplete = writeOasis2OOoLibraryElement( xInput, xOutput );
}
- if ( bComplete == FALSE )
+ if ( bComplete == sal_False )
{
Sequence< sal_Int8 > bytes;
sal_Int32 nRead = xInput->readBytes( bytes, xInput->available() );
@@ -280,7 +280,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
{
// if we cannot get the version then the
// Oasis2OOoTransformer will not be used
- OSL_ASSERT(FALSE);
+ OSL_ASSERT(sal_False);
}
}
@@ -411,7 +411,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
{
OSL_ENSURE( 0, "Parsing error\n" );
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFile );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
return aRetAny;
}
diff --git a/basic/source/uno/makefile.mk b/basic/source/uno/makefile.mk
index 52e7f7004c4d..52e7f7004c4d 100644..100755
--- a/basic/source/uno/makefile.mk
+++ b/basic/source/uno/makefile.mk
diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx
index d36f424bb532..d46108e92dad 100644..100755
--- a/basic/source/uno/modsizeexceeded.cxx
+++ b/basic/source/uno/modsizeexceeded.cxx
@@ -28,9 +28,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
-#include "modsizeexceeded.hxx"
+#include "basic/modsizeexceeded.hxx"
-#include <framework/interaction.hxx>
+#include <comphelper/interaction.hxx>
#include <com/sun/star/script/ModuleSizeExceededRequest.hpp>
using namespace com::sun::star;
@@ -46,8 +46,8 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >&
m_aRequest <<= aReq;
- m_xAbort.set( uno::Reference< task::XInteractionAbort >(new framework::ContinuationAbort), uno::UNO_QUERY );
- m_xApprove.set( uno::Reference< task::XInteractionApprove >(new framework::ContinuationApprove ), uno::UNO_QUERY );
+ m_xAbort.set( uno::Reference< task::XInteractionAbort >(new comphelper::OInteractionAbort), uno::UNO_QUERY );
+ m_xApprove.set( uno::Reference< task::XInteractionApprove >(new comphelper::OInteractionApprove ), uno::UNO_QUERY );
m_lContinuations.realloc( 2 );
m_lContinuations[0] = m_xApprove;
m_lContinuations[1] = m_xAbort;
@@ -56,15 +56,15 @@ ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >&
sal_Bool
ModuleSizeExceeded::isAbort() const
{
- framework::ContinuationAbort* pBase = static_cast< framework::ContinuationAbort* >( m_xAbort.get() );
- return pBase->isSelected();
+ comphelper::OInteractionAbort* pBase = static_cast< comphelper::OInteractionAbort* >( m_xAbort.get() );
+ return pBase->wasSelected();
}
sal_Bool
ModuleSizeExceeded::isApprove() const
{
- framework::ContinuationApprove* pBase = static_cast< framework::ContinuationApprove* >( m_xApprove.get() );
- return pBase->isSelected();
+ comphelper::OInteractionApprove* pBase = static_cast< comphelper::OInteractionApprove* >( m_xApprove.get() );
+ return pBase->wasSelected();
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 9c65b6a5f2b8..9479d56e0844 100644..100755
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -738,7 +738,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
if( nPass == 0 )
{
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -760,7 +760,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
{
xInput.clear();
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFileName );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -1489,7 +1489,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
throw;
SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aElementPath );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -1601,7 +1601,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
throw;
SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aLibInfoPath );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -1676,7 +1676,7 @@ sal_Bool SfxLibraryContainer::implLoadLibraryIndexFile( SfxLibrary* pLib,
if( !GbMigrationSuppressErrors )
{
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aLibInfoPath );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -1700,7 +1700,7 @@ sal_Bool SfxLibraryContainer::implLoadLibraryIndexFile( SfxLibrary* pLib,
{
OSL_ENSURE( 0, "Parsing error\n" );
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aLibInfoPath );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
return sal_False;
}
@@ -2029,7 +2029,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
}
catch( uno::Exception& )
{
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -2051,7 +2051,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
{
xOut.clear();
SfxErrorContext aEc( ERRCTX_SFX_SAVEDOC, aLibInfoPath );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
@@ -2081,7 +2081,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
catch( uno::Exception& )
{
OSL_ENSURE( sal_False, "Problem during storing of libraries!\n" );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
}
@@ -2808,19 +2808,37 @@ OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString
void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (RuntimeException)
{
- BasicManager* pBasMgr = getBasicManager();
- if( pBasMgr )
+ /* The member variable mbVBACompat must be set first, the following call
+ to getBasicManager() may call getVBACompatibilityMode() which returns
+ this value. */
+ mbVBACompat = _vbacompatmodeon;
+ if( BasicManager* pBasMgr = getBasicManager() )
{
// get the standard library
- String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
- if ( pBasMgr->GetName().Len() )
- aLibName = pBasMgr->GetName();
+ String aLibName = pBasMgr->GetName();
+ if ( aLibName.Len() == 0 )
+ aLibName = String( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
- StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
- if( pBasic )
+ if( StarBASIC* pBasic = pBasMgr->GetLib( aLibName ) )
pBasic->SetVBAEnabled( _vbacompatmodeon );
+
+ /* If in VBA compatibility mode, force creation of the VBA Globals
+ object. Each application will create an instance of its own
+ implementation and store it in its Basic manager. Implementations
+ will do all necessary additional initialization, such as
+ registering the global "This***Doc" UNO constant, starting the
+ document events processor etc.
+ */
+ if( mbVBACompat ) try
+ {
+ Reference< frame::XModel > xModel( mxOwnerDocument ); // weak-ref -> ref
+ Reference< XMultiServiceFactory > xFactory( xModel, UNO_QUERY_THROW );
+ xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) );
+ }
+ catch( Exception& )
+ {
+ }
}
- mbVBACompat = _vbacompatmodeon;
}
void SAL_CALL SfxLibraryContainer::setProjectName( const ::rtl::OUString& _projectname ) throw (RuntimeException)
diff --git a/basic/source/uno/sbmodule.cxx b/basic/source/uno/sbmodule.cxx
index 3c8d115b1912..3c8d115b1912 100644..100755
--- a/basic/source/uno/sbmodule.cxx
+++ b/basic/source/uno/sbmodule.cxx
diff --git a/basic/source/uno/sbmodule.hxx b/basic/source/uno/sbmodule.hxx
index 2dd0b3dd7910..2dd0b3dd7910 100644..100755
--- a/basic/source/uno/sbmodule.hxx
+++ b/basic/source/uno/sbmodule.hxx
diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx
index 5c4e1fc98309..5c4e1fc98309 100644..100755
--- a/basic/source/uno/sbservices.cxx
+++ b/basic/source/uno/sbservices.cxx
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index d6bd191cd0da..ebfc68863ea0 100644..100755
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -61,7 +61,7 @@
#include <basic/basmgr.hxx>
#include <basic/sbmod.hxx>
#include <basic/basicmanagerrepository.hxx>
-#include "modsizeexceeded.hxx"
+#include "basic/modsizeexceeded.hxx"
#include <xmlscript/xmlmod_imexp.hxx>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/util/VetoException.hpp>
@@ -82,7 +82,7 @@ using namespace com::sun::star;
using namespace cppu;
using namespace osl;
-using com::sun::star::uno::Reference;
+using ::rtl::OUString;
using ::rtl::OUString;
@@ -300,7 +300,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
catch( Exception& )
{
SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFile );
- ULONG nErrorCode = ERRCODE_IO_GENERAL;
+ sal_uIntPtr nErrorCode = ERRCODE_IO_GENERAL;
ErrorHandler::HandleError( nErrorCode );
}
@@ -311,24 +311,21 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
// aMod.aName ignored
if( aMod.aModuleType.getLength() > 0 )
{
- if( !getVBACompatibilityMode() )
+ /* If in VBA compatibility mode, force creation of the VBA Globals
+ object. Each application will create an instance of its own
+ implementation and store it in its Basic manager. Implementations
+ will do all necessary additional initialization, such as
+ registering the global "This***Doc" UNO constant, starting the
+ document events processor etc.
+ */
+ if( getVBACompatibilityMode() ) try
+ {
+ Reference< frame::XModel > xModel( mxOwnerDocument ); // weak-ref -> ref
+ Reference< XMultiServiceFactory > xFactory( xModel, UNO_QUERY_THROW );
+ xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) );
+ }
+ catch( Exception& )
{
- setVBACompatibilityMode( sal_True );
-
- Any aGlobs;
- Sequence< Any > aArgs(1);
- Reference<frame::XModel > xModel( mxOwnerDocument );
- aArgs[ 0 ] <<= xModel;
-
- BasicManager* pBasicMgr = getBasicManager();
- if( pBasicMgr )
- {
- aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs );
- pBasicMgr->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
- }
- pBasicMgr = BasicManagerRepository::getApplicationBasicManager( sal_False );
- if( pBasicMgr )
- pBasicMgr->SetGlobalUNOConstant( "ThisExcelDoc", aArgs[0] );
}
script::ModuleInfo aModInfo;
@@ -353,25 +350,21 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
RTL_CONSTASCII_STRINGPARAM("document") ))
{
aModInfo.ModuleType = ModuleType::DOCUMENT;
- Reference<frame::XModel > xModel( mxOwnerDocument );
- Reference< XMultiServiceFactory> xSF( xModel, UNO_QUERY);
- Reference< container::XNameAccess > xVBACodeNameAccess;
- if( xSF.is() )
+
+ // #163691# use the same codename access instance for all document modules
+ if( !mxCodeNameAccess.is() ) try
{
- try
- {
- xVBACodeNameAccess.set( xSF->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "ooo.vba.VBAObjectModuleObjectProvider"))),
- UNO_QUERY );
- }
- catch(uno::Exception&) {}
+ Reference<frame::XModel > xModel( mxOwnerDocument );
+ Reference< XMultiServiceFactory> xSF( xModel, UNO_QUERY_THROW );
+ mxCodeNameAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider" ) ) ), UNO_QUERY );
}
- if( xVBACodeNameAccess.is() )
+ catch( Exception& ) {}
+
+ if( mxCodeNameAccess.is() )
{
try
{
- aModInfo.ModuleObject.set( xVBACodeNameAccess->getByName( aElementName), uno::UNO_QUERY );
+ aModInfo.ModuleObject.set( mxCodeNameAccess->getByName( aElementName), uno::UNO_QUERY );
}
catch(uno::Exception&)
{
@@ -661,7 +654,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
throw uno::RuntimeException();
SvMemoryStream aMemStream;
- /*BOOL bStore = */pMod->StoreBinaryData( aMemStream );
+ /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream );
sal_Int32 nSize = (sal_Int32)aMemStream.Tell();
Sequence< sal_Int8 > aBinSeq( nSize );
@@ -802,7 +795,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE );
SvMemoryStream aMemStream;
- /*BOOL bStore = */pMod->StoreBinaryData( aMemStream );
+ /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream );
sal_Int32 nSize = (sal_Int32)aMemStream.Tell();
Sequence< sal_Int8 > aBinSeq( nSize );
@@ -959,7 +952,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
if( !pMod )
{
pMod = pBasicLib->MakeModule( aElementName, String() );
- pBasicLib->SetModified( FALSE );
+ pBasicLib->SetModified( sal_False );
}
//OUString aCodeStreamName( RTL_CONSTASCII_USTRINGPARAM("code.bin") );
@@ -981,7 +974,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), nError );
}
- /*BOOL bRet = */pMod->LoadBinaryData( *pStream );
+ /*sal_Bool bRet = */pMod->LoadBinaryData( *pStream );
// TODO: Check return value
delete pStream;
@@ -1071,7 +1064,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
if( !pMod )
{
pMod = pBasicLib->MakeModule( aElementName, String() );
- pBasicLib->SetModified( FALSE );
+ pBasicLib->SetModified( sal_False );
}
try {
@@ -1090,7 +1083,7 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
nError );
}
- /*BOOL bRet = */pMod->LoadBinaryData( *pStream );
+ /*sal_Bool bRet = */pMod->LoadBinaryData( *pStream );
// TODO: Check return value
delete pStream;
diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk
index 534b8a25bd14..635b29369868 100644..100755
--- a/basic/util/makefile.mk
+++ b/basic/util/makefile.mk
@@ -137,4 +137,10 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
$(SRS)$/basic.srs:
$(TYPE) $(SRS)$/classes.srs + $(SRS)$/runtime.srs + $(SRS)$/sbx.srs > $@
+ALLTAR : $(MISC)/sb.component
+$(MISC)/sb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ sb.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt sb.component
diff --git a/basic/util/sb.component b/basic/util/sb.component
new file mode 100755
index 000000000000..4687bd1e7d0b
--- /dev/null
+++ b/basic/util/sb.component
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sfx2.DialogLibraryContainer">
+ <service name="com.sun.star.script.DialogLibraryContainer"/>
+ <service name="com.sun.star.script.DocumentDialogLibraryContainer"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.sfx2.ScriptLibraryContainer">
+ <service name="com.sun.star.script.DocumentScriptLibraryContainer"/>
+ <service name="com.sun.star.script.ScriptLibraryContainer"/>
+ </implementation>
+</component>
diff --git a/basic/win/res/basic.ico b/basic/win/res/basic.ico
index c453a0fa988f..c453a0fa988f 100644..100755
--- a/basic/win/res/basic.ico
+++ b/basic/win/res/basic.ico
Binary files differ
diff --git a/basic/win/res/testtool.ico b/basic/win/res/testtool.ico
index db880c8678a7..db880c8678a7 100644..100755
--- a/basic/win/res/testtool.ico
+++ b/basic/win/res/testtool.ico
Binary files differ
diff --git a/basic/win/res/work.ico b/basic/win/res/work.ico
index 43e3b5b3df03..43e3b5b3df03 100644..100755
--- a/basic/win/res/work.ico
+++ b/basic/win/res/work.ico
Binary files differ
diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx
new file mode 100755
index 000000000000..7e3efc597ac1
--- /dev/null
+++ b/basic/workben/mgrtest.cxx
@@ -0,0 +1,591 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basic.hxx"
+#include <vcl/svapp.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/toolbox.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/sound.hxx>
+#include <basic/basmgr.hxx>
+#include <basic/sbx.hxx>
+#include <basic/sbmod.hxx>
+#include <basic/basrdll.hxx>
+
+//#include <sv.hxx>
+//#include <basic.hxx>
+//#include <sostor.hxx>
+
+// Defines for ToolBox-Id's
+#define TB_NEW 1
+#define TB_OPENSTORAGE 2
+#define TB_SAVESTORAGE 3
+#define TB_ORG 4
+#define TB_CREATELIB1 10
+#define TB_CREATELIB2 11
+#define TB_CREATELIB3 12
+#define TB_LOADLIB1 20
+#define TB_LOADLIB2 21
+#define TB_LOADLIB3 22
+#define TB_STORELIBX 30
+#define TB_UNLOADX 31
+#define TB_LOADX 32
+#define TB_EXECX 33
+#define TB_REMOVEX 34
+#define TB_REMOVEDELX 35
+
+#define TB_LIB0 40
+#define TB_LIB1 41
+#define TB_LIB2 42
+#define TB_LIB3 43
+
+const char* pLib1Str = "Lib1";
+const char* pLib2Str = "Lib2";
+const char* pLib3Str = "Lib3";
+
+// Test-Application
+class TestApp : public Application
+{
+public:
+ virtual void Main( void );
+ virtual void Main( int, char*[] );
+};
+
+// Test-Window with a ToolBox to choose a test from
+// and the typically used virtual methods
+class TestWindow : public WorkWindow
+{
+private:
+ ToolBox aToolBox;
+ BasicManager* pBasMgr;
+
+ void CheckError();
+ sal_uInt16 nLibX;
+ DECL_LINK( BasicErrorHdl, StarBASIC * );
+
+
+public:
+ TestWindow();
+ ~TestWindow();
+
+ virtual void Paint( const Rectangle& );
+ virtual void Resize();
+ virtual void KeyInput( const KeyEvent& rKeyEvt );
+ virtual void MouseMove( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt );
+
+ DECL_LINK( TBSelect, ToolBox * );
+ void UpdateToolBox();
+ void ShowInfo();
+};
+
+TestWindow::~TestWindow()
+{
+}
+
+TestWindow::TestWindow() :
+ WorkWindow( NULL, WB_APP | WB_STDWORK | WB_3DLOOK | WB_CLIPCHILDREN ) ,
+ aToolBox( this, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_LINESPACING ) )
+{
+ nLibX = 0;
+
+ aToolBox.SetButtonType( BUTTON_TEXT );
+ aToolBox.SetLineCount( 2 );
+ aToolBox.SetPosPixel( Point( 0, 0 ) );
+ aToolBox.SetSelectHdl( LINK( this, TestWindow, TBSelect ) );
+
+ Font aFont;
+ aFont.SetName( "Helv" );
+ aFont.SetSize( Size( 0, 6 ) );
+ aFont.SetPitch( PITCH_VARIABLE );
+ aFont.SetFamily( FAMILY_SWISS );
+ aFont.SetTransparent( sal_True );
+ aFont.SetAlign( ALIGN_TOP );
+ aToolBox.SetFont( aFont );
+ SetFont( aFont );
+
+ aToolBox.InsertItem( TB_NEW, "New" );
+ aToolBox.SetHelpText( TB_NEW, "New BasicManager" );
+ aToolBox.InsertItem( TB_OPENSTORAGE, "Load" );
+ aToolBox.SetHelpText( TB_OPENSTORAGE, "Load Storage D:\\MYSTORE.SVS" );
+ aToolBox.InsertItem( TB_SAVESTORAGE, "Save" );
+ aToolBox.SetHelpText( TB_SAVESTORAGE, "Save Storage D:\\MYSTORE.SVS" );
+
+ aToolBox.InsertSeparator();
+
+ aToolBox.InsertItem( TB_ORG, "Verwalten" );
+ aToolBox.SetHelpText( TB_ORG, "Libaries verwalten" );
+
+ aToolBox.InsertSeparator();
+
+ aToolBox.InsertItem( TB_LIB0, "0" );
+ aToolBox.SetHelpText( TB_LIB0, "Aktuelle Lib: STANDARD" );
+ aToolBox.InsertItem( TB_LIB1, "1" );
+ aToolBox.SetHelpText( TB_LIB1, "Aktuelle Lib: 1" );
+ aToolBox.InsertItem( TB_LIB2, "2" );
+ aToolBox.SetHelpText( TB_LIB2, "Aktuelle Lib: 2" );
+ aToolBox.InsertItem( TB_LIB3, "3" );
+ aToolBox.SetHelpText( TB_LIB3, "Aktuelle Lib: 3" );
+
+ aToolBox.InsertBreak();
+ aToolBox.InsertItem( TB_CREATELIB1, "CreateLib1" );
+ aToolBox.SetHelpText( TB_CREATELIB1, "Create Libary LIB1" );
+ aToolBox.InsertItem( TB_CREATELIB2, "CreateLib2" );
+ aToolBox.SetHelpText( TB_CREATELIB2, "Create Libary LIB2" );
+ aToolBox.InsertItem( TB_CREATELIB3, "CreateLib3" );
+ aToolBox.SetHelpText( TB_CREATELIB3, "Create Libary LIB3" );
+
+ aToolBox.InsertSeparator();
+ aToolBox.InsertItem( TB_LOADLIB1, "LoadLib1" );
+ aToolBox.SetHelpText( TB_LOADLIB1, "Load Libary LIB1" );
+ aToolBox.InsertItem( TB_LOADLIB2, "LoadLib2" );
+ aToolBox.SetHelpText( TB_LOADLIB2, "Load Libary LIB2" );
+ aToolBox.InsertItem( TB_LOADLIB3, "LoadLib3" );
+ aToolBox.SetHelpText( TB_LOADLIB3, "Load Libary LIB3" );
+
+ aToolBox.InsertSeparator();
+ aToolBox.InsertItem( TB_STORELIBX, "StoreLibX" );
+ aToolBox.SetHelpText( TB_STORELIBX, "Store Libary LIBX" );
+ aToolBox.InsertItem( TB_UNLOADX, "UnloadX" );
+ aToolBox.SetHelpText( TB_UNLOADX, "Unload Libary LIBX" );
+ aToolBox.InsertItem( TB_LOADX, "LoadX" );
+ aToolBox.SetHelpText( TB_LOADX, "Load Libary LIBX" );
+ aToolBox.InsertItem( TB_EXECX, "ExecX" );
+ aToolBox.SetHelpText( TB_EXECX, "Execute 'Libary' LIBX" );
+ aToolBox.InsertItem( TB_REMOVEX, "RemoveX" );
+ aToolBox.SetHelpText( TB_REMOVEX, "Remove Libary LIBX" );
+ aToolBox.InsertItem( TB_REMOVEDELX, "RemDelX" );
+ aToolBox.SetHelpText( TB_REMOVEDELX, "Remove and delete Libary LIBX" );
+
+ pBasMgr = 0;
+
+ Show();
+ UpdateToolBox();
+ aToolBox.Show();
+}
+void TestWindow::ShowInfo()
+{
+ Invalidate();
+ Update();
+ long nH = GetTextSize( "X" ).Height();
+ if ( pBasMgr )
+ {
+ Point aPos( 10, aToolBox.GetSizePixel().Height()+5 );
+ for ( sal_uInt16 nLib = 0; nLib < pBasMgr->GetLibCount(); nLib++ )
+ {
+ String aOutStr( nLib );
+ aOutStr +=": ";
+ StarBASIC* pL = pBasMgr->GetLib( nLib );
+ aOutStr += '[';
+ aOutStr += pBasMgr->GetLibName( nLib );
+ aOutStr += "]<";
+ if ( pL )
+ aOutStr += pL->GetName();
+ else
+ aOutStr += "NoLoaded";
+ aOutStr += ">, Storage='";
+ aOutStr += pBasMgr->GetLibStorageName( nLib );
+ aOutStr += "', bLoaded=";
+ aOutStr += (sal_uInt16)pBasMgr->IsLibLoaded( nLib );
+ DrawText( aPos, aOutStr );
+ aPos.Y() += nH;
+ }
+ }
+}
+
+void TestWindow::UpdateToolBox()
+{
+ // View of some buttons as checked or disabled if
+ // wished by tests
+ aToolBox.EnableItem( TB_ORG, (sal_Bool)(sal_uIntPtr)pBasMgr );
+
+ aToolBox.EnableItem( TB_CREATELIB1, (sal_Bool)(sal_uIntPtr)pBasMgr );
+ aToolBox.EnableItem( TB_CREATELIB2, (sal_Bool)(sal_uIntPtr)pBasMgr );
+ aToolBox.EnableItem( TB_CREATELIB3, (sal_Bool)(sal_uIntPtr)pBasMgr );
+
+ aToolBox.EnableItem( TB_LOADLIB1, (sal_Bool)(sal_uIntPtr)pBasMgr );
+ aToolBox.EnableItem( TB_LOADLIB2, (sal_Bool)(sal_uIntPtr)pBasMgr );
+ aToolBox.EnableItem( TB_LOADLIB3, (sal_Bool)(sal_uIntPtr)pBasMgr );
+
+ aToolBox.EnableItem( TB_STORELIBX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+ aToolBox.EnableItem( TB_EXECX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+ aToolBox.EnableItem( TB_UNLOADX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+ aToolBox.EnableItem( TB_LOADX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+ aToolBox.EnableItem( TB_REMOVEX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+ aToolBox.EnableItem( TB_REMOVEDELX, (sal_Bool)(sal_uIntPtr)pBasMgr );
+
+ aToolBox.CheckItem( TB_LIB0, nLibX == 0 );
+ aToolBox.CheckItem( TB_LIB1, nLibX == 1 );
+ aToolBox.CheckItem( TB_LIB2, nLibX == 2 );
+ aToolBox.CheckItem( TB_LIB3, nLibX == 3 );
+}
+
+IMPL_LINK( TestWindow, TBSelect, ToolBox *, p )
+{
+ sal_uInt16 nId = aToolBox.GetCurItemId();
+ sal_Bool bChecked = aToolBox.IsItemChecked( nId );
+ switch ( nId )
+ {
+ case TB_NEW:
+ {
+ delete pBasMgr;
+ pBasMgr = new BasicManager( new StarBASIC );
+ pBasMgr->SetStorageName( "d:\\mystore.svs" );
+ }
+ break;
+ case TB_OPENSTORAGE:
+ {
+ delete pBasMgr;
+ SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs", STREAM_READ | STREAM_SHARE_DENYWRITE );
+ DBG_ASSERT( xStorage.Is(), "Kein Storage!" );
+ pBasMgr = new BasicManager( *xStorage );
+ }
+ break;
+ case TB_SAVESTORAGE:
+ {
+ if ( pBasMgr)
+ {
+ SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs" );
+ DBG_ASSERT( xStorage.Is(), "Kein Storage!" );
+ pBasMgr->Store( *xStorage );
+ }
+ }
+ break;
+ case TB_ORG:
+ {
+ if ( pBasMgr)
+ {
+ InfoBox( 0, "Organisieren..." ).Execute();
+ }
+ }
+ break;
+ case TB_CREATELIB1:
+ {
+ if ( pBasMgr )
+ {
+ sal_uInt16 nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib1Str ) );
+ if ( nLib != LIB_NOTFOUND )
+ {
+ pBasMgr->SetLibStorageName( nLib, "d:\\mystore.svs" );
+ StarBASIC* pLib = pBasMgr->GetLib( pLib1Str );
+ DBG_ASSERT( pLib, "Lib?!" );
+ String aSource( "Sub SubInLib1Mod1\nprint\"XXX\"\nEnd Sub");
+ SbModule* pM = pLib->MakeModule( "ModLib1", aSource );
+ DBG_ASSERT( pM, "Modul?" );
+ pLib->Compile( pM );
+ }
+ else
+ InfoBox( 0, "CreateLibary fehlgeschlagen..." ).Execute();
+ }
+ }
+ break;
+ case TB_CREATELIB2:
+ {
+ if ( pBasMgr )
+ {
+ sal_uInt16 nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib2Str ) );
+ if ( nLib != LIB_NOTFOUND )
+ {
+ pBasMgr->SetLibStorageName( nLib, "d:\\mystore.svs" );
+ StarBASIC* pLib = pBasMgr->GetLib( pLib2Str );
+ DBG_ASSERT( pLib, "Lib?!" );
+ SbModule* pM = pLib->MakeModule( "ModuleLib2", "Sub SubInLib2\n print \"Tralala\" \nEnd Sub\n" );
+ pLib->Compile( pM );
+ }
+ else
+ InfoBox( 0, "CreateLibary fehlgeschlagen..." ).Execute();
+ }
+ }
+ break;
+ case TB_CREATELIB3:
+ {
+ if ( pBasMgr )
+ {
+ // liegt in einem anderen Storage !!!
+ sal_uInt16 nLib = pBasMgr->GetLibId( pBasMgr->CreateLib( pLib3Str ) );
+ if ( nLib != LIB_NOTFOUND )
+ {
+ pBasMgr->SetLibStorageName( nLib, "d:\\mystore2.svs" );
+ StarBASIC* pLib = pBasMgr->GetLib( pLib3Str );
+ DBG_ASSERT( pLib, "Lib?!" );
+ SbModule* pM = pLib->MakeModule( "ModuleLib2", "Sub XYZInLib3\n print \"?!\" \nEnd Sub\n" );
+ pLib->Compile( pM );
+ }
+ else
+ InfoBox( 0, "CreateLibary fehlgeschlagen..." ).Execute();
+ }
+ }
+ break;
+ case TB_LOADLIB1:
+ {
+ if ( pBasMgr )
+ {
+ SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs" );
+ if ( !pBasMgr->AddLib( *xStorage, pLib1Str, sal_False ) )
+ Sound::Beep();
+ }
+ }
+ break;
+ case TB_LOADLIB2:
+ {
+ if ( pBasMgr )
+ {
+ SvStorageRef xStorage = new SvStorage( "d:\\mystore.svs" );
+ if ( !pBasMgr->AddLib( *xStorage, pLib2Str, sal_False ) )
+ Sound::Beep();
+ }
+ }
+ break;
+ case TB_LOADLIB3:
+ {
+ if ( pBasMgr )
+ {
+ // liegt in einem anderen Storage !!!
+ SvStorageRef xStorage = new SvStorage( "d:\\mystore2.svs" );
+ if ( !pBasMgr->AddLib( *xStorage, pLib3Str, sal_False ) )
+ Sound::Beep();
+ }
+ }
+ break;
+ case TB_STORELIBX:
+ {
+ if ( pBasMgr )
+ pBasMgr->StoreLib( nLibX );
+ }
+ break;
+ case TB_UNLOADX:
+ {
+ if ( pBasMgr )
+ pBasMgr->UnloadLib( nLibX );
+ }
+ break;
+ case TB_LOADX:
+ {
+ if ( pBasMgr )
+ pBasMgr->LoadLib( nLibX );
+ }
+ break;
+ case TB_REMOVEX:
+ {
+ if ( pBasMgr )
+ pBasMgr->RemoveLib( nLibX, sal_False );
+ }
+ break;
+ case TB_REMOVEDELX:
+ {
+ if ( pBasMgr )
+ pBasMgr->RemoveLib( nLibX, sal_True );
+ }
+ break;
+ case TB_EXECX:
+ {
+ if ( pBasMgr )
+ {
+ StarBASIC* pBasic = pBasMgr->GetLib( nLibX );
+ if ( pBasic && pBasic->GetModules()->Count() )
+ {
+ pBasic->SetErrorHdl( LINK( this, TestWindow, BasicErrorHdl ) );
+
+ SbModule* pMod = (SbModule*)pBasic->GetModules()->Get( 0 );
+ if ( pMod && pMod->GetMethods()->Count() )
+ pMod->GetMethods()->Get(0)->GetInteger();
+ }
+ }
+ }
+ break;
+
+ case TB_LIB0: nLibX = 0;
+ break;
+ case TB_LIB1: nLibX = 1;
+ break;
+ case TB_LIB2: nLibX = 2;
+ break;
+ case TB_LIB3: nLibX = 3;
+ break;
+ }
+
+ UpdateToolBox();
+ CheckError();
+ ShowInfo();
+ return 0;
+}
+
+void TestWindow::CheckError()
+{
+ if ( pBasMgr )
+ {
+ BasicError* pError = pBasMgr->GetFirstError();
+ while ( pError )
+ {
+ String aErrorStr;
+ String aReasonStr;
+ switch ( pError->GetErrorId() )
+ {
+ case BASERR_ID_STDLIBOPEN:
+ aErrorStr = "Standard-Lib konnte nicht geoffnet werden.";
+ break;
+ case BASERR_ID_STDLIBSAVE:
+ aErrorStr = "Standard-Lib konnte nicht gespeichert werden.";
+ break;
+ case BASERR_ID_LIBLOAD:
+ aErrorStr = "Lib konnte nicht geoffnet werden.";
+ break;
+ case BASERR_ID_LIBCREATE:
+ aErrorStr = "Lib konnte nicht erzeugt werden.";
+ break;
+ case BASERR_ID_LIBSAVE:
+ aErrorStr = "Lib konnte nicht gespeichert werden.";
+ break;
+ case BASERR_ID_MGROPEN:
+ aErrorStr = "Manager konnte nicht geladen werden.";
+ break;
+ case BASERR_ID_MGRSAVE:
+ aErrorStr = "Manager konnte nicht gespeichert werden.";
+ break;
+ case BASERR_ID_UNLOADLIB:
+ aErrorStr = "Libary konnte nicht entladen werden.";
+ break;
+ case BASERR_ID_REMOVELIB:
+ aErrorStr = "Libary konnte nicht entfernt werden.";
+ break;
+ default:
+ aErrorStr = "Unbekannter Fehler!";
+ }
+
+ switch ( pError->GetReason() )
+ {
+ case BASERR_REASON_OPENSTORAGE:
+ aReasonStr = "Der Storage konnte nicht geoeffnet werden";
+ break;
+ case BASERR_REASON_OPENLIBSTORAGE:
+ aReasonStr = "Der Lib-Storage konnte nicht geoeffnet werden";
+ break;
+ case BASERR_REASON_OPENMGRSTREAM:
+ aReasonStr = "Der Manager-Stream konnte nicht geoeffnet werden";
+ break;
+ case BASERR_REASON_OPENLIBSTREAM:
+ aReasonStr = "Der Basic-Stream konnte nicht geoeffnet werden";
+ break;
+ case BASERR_REASON_STDLIB:
+ aReasonStr = "STANDARD-Lib";
+ break;
+ case BASERR_REASON_BASICLOADERROR:
+ aReasonStr = "Fehler beim Laden des Basics";
+ default:
+ aReasonStr = " - ";
+ }
+
+ String aErr( aErrorStr );
+ aErr += "\nGrund: ";
+ aErr += aReasonStr;
+ InfoBox( 0, aErr ).Execute();
+
+ pError = pBasMgr->GetNextError();
+ }
+ pBasMgr->ClearErrors();
+ }
+}
+
+void __EXPORT TestWindow::Paint( const Rectangle& rRec )
+{
+}
+
+void __EXPORT TestWindow::Resize()
+{
+ Size aTBSz = aToolBox.CalcWindowSizePixel();
+ aToolBox.SetSizePixel( Size( GetOutputSizePixel().Width(), aTBSz.Height()) );
+ Invalidate();
+ ShowInfo();
+}
+
+void __EXPORT TestWindow::KeyInput( const KeyEvent& rKEvt )
+{
+ char nCharCode = rKEvt.GetCharCode();
+ sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
+
+ // Nur bei Alt-Return
+ if ( ( nCode == KEY_RETURN ) && rKEvt.GetKeyCode().IsMod2() )
+ ;
+ else
+ WorkWindow::KeyInput( rKEvt );
+
+ UpdateToolBox();
+}
+
+void __EXPORT TestWindow::MouseMove( const MouseEvent& rMEvt )
+{
+}
+
+void __EXPORT TestWindow::MouseButtonDown( const MouseEvent& rMEvt )
+{
+ ShowInfo();
+}
+
+void __EXPORT TestWindow::MouseButtonUp( const MouseEvent& rMEvt )
+{
+ UpdateToolBox();
+}
+
+IMPL_LINK( TestWindow, BasicErrorHdl, StarBASIC *, pBasic )
+{
+ String aErrorText( pBasic->GetErrorText() );
+
+ String aErrorTextPrefix;
+ if( pBasic->IsCompilerError() )
+ {
+ aErrorTextPrefix = "Compilererror: ";
+ }
+ else
+ {
+ aErrorTextPrefix = "Runtimeerror: ";
+ aErrorTextPrefix += pBasic->GetErrorCode();
+ aErrorTextPrefix += " ";
+ }
+
+ InfoBox( 0, String( aErrorTextPrefix + aErrorText ) ).Execute();
+ return 0;
+}
+
+void __EXPORT TestApp::Main( void )
+{
+ Main( 0, NULL );
+}
+
+void __EXPORT TestApp::Main( int, char*[] )
+{
+ BasicDLL aBasiDLL;
+ SvFactory::Init();
+ EnableSVLook();
+ TestWindow aWindow;
+ Execute();
+ SvFactory::DeInit();
+}
+
+
+TestApp aTestApp;
diff --git a/configmgr/inc/makefile.mk b/configmgr/inc/makefile.mk
index 3dd2fc4d4811..3dd2fc4d4811 100644..100755
--- a/configmgr/inc/makefile.mk
+++ b/configmgr/inc/makefile.mk
diff --git a/configmgr/inc/pch/precompiled_configmgr.cxx b/configmgr/inc/pch/precompiled_configmgr.cxx
index b06c3f4384e4..b06c3f4384e4 100644..100755
--- a/configmgr/inc/pch/precompiled_configmgr.cxx
+++ b/configmgr/inc/pch/precompiled_configmgr.cxx
diff --git a/configmgr/inc/pch/precompiled_configmgr.hxx b/configmgr/inc/pch/precompiled_configmgr.hxx
index af05be7c03d3..af05be7c03d3 100644..100755
--- a/configmgr/inc/pch/precompiled_configmgr.hxx
+++ b/configmgr/inc/pch/precompiled_configmgr.hxx
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst
index 3999f6460c40..6043290f0914 100644..100755
--- a/configmgr/prj/build.lst
+++ b/configmgr/prj/build.lst
@@ -1,4 +1,4 @@
-cg configmgr : BOOST:boost comphelper cppu cppuhelper offuh sal salhelper NULL
+cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offuh sal salhelper stlport xmlreader NULL
cg configmgr\inc nmake - all cg_inc NULL
cg configmgr\source nmake - all cg_source cg_inc NULL
cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL
diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst
index 17ccdbe86a08..34b6cf3e0010 100644..100755
--- a/configmgr/prj/d.lst
+++ b/configmgr/prj/d.lst
@@ -1,3 +1,4 @@
..\%__SRC%\bin\configmgr.uno.dll %_DEST%\bin%_EXT%\configmgr.uno.dll
..\%__SRC%\lib\configmgr.uno.dylib %_DEST%\lib%_EXT%\configmgr.uno.dylib
..\%__SRC%\lib\configmgr.uno.so %_DEST%\lib%_EXT%\configmgr.uno.so
+..\%__SRC%\misc\configmgr.component %_DEST%\xml%_EXT%\configmgr.component
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index 027aa599b6ce..027aa599b6ce 100644..100755
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index fdb82f172cb1..fdb82f172cb1 100644..100755
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
diff --git a/configmgr/qa/unit/no_localization b/configmgr/qa/unit/no_localization
index e69de29bb2d1..e69de29bb2d1 100644..100755
--- a/configmgr/qa/unit/no_localization
+++ b/configmgr/qa/unit/no_localization
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index fe8d29e9ef88..fe8d29e9ef88 100644..100755
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
diff --git a/configmgr/qa/unit/urebootstrap.ini b/configmgr/qa/unit/urebootstrap.ini
index c413645d0f43..c413645d0f43 100644..100755
--- a/configmgr/qa/unit/urebootstrap.ini
+++ b/configmgr/qa/unit/urebootstrap.ini
diff --git a/configmgr/qa/unit/version.map b/configmgr/qa/unit/version.map
index 6b30413b896e..6b30413b896e 100644..100755
--- a/configmgr/qa/unit/version.map
+++ b/configmgr/qa/unit/version.map
diff --git a/configmgr/qa/unoapi/Test.java b/configmgr/qa/unoapi/Test.java
index 4d1f5a3c4be7..4d1f5a3c4be7 100644..100755
--- a/configmgr/qa/unoapi/Test.java
+++ b/configmgr/qa/unoapi/Test.java
diff --git a/configmgr/qa/unoapi/makefile.mk b/configmgr/qa/unoapi/makefile.mk
index 252e4a0d9af4..252e4a0d9af4 100644..100755
--- a/configmgr/qa/unoapi/makefile.mk
+++ b/configmgr/qa/unoapi/makefile.mk
diff --git a/configmgr/qa/unoapi/module.sce b/configmgr/qa/unoapi/module.sce
index d9b1c8b540b3..d9b1c8b540b3 100644..100755
--- a/configmgr/qa/unoapi/module.sce
+++ b/configmgr/qa/unoapi/module.sce
diff --git a/configmgr/source/README b/configmgr/source/README
index b00990d1eeb2..f26c68ecf7c0 100644..100755
--- a/configmgr/source/README
+++ b/configmgr/source/README
@@ -51,16 +51,13 @@ propertynode.cxx
setnode.cxx
Internal representations of data nodes.
-pad.cxx
parsemanager.cxx
parser.hxx
-span.hxx
valueparser.cxx
xcdparser.cxx
xcsparser.cxx
xcuparser.cxx
xmldata.cxx
-xmlreader.cxx
XML file reading.
modifications.cxx
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 7fcd7a1c3402..ef7ba869cf94 100644..100755
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -912,7 +912,8 @@ rtl::OUString Access::getImplementationName() throw (css::uno::RuntimeException)
OSL_ASSERT(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "configmgr.Access" ) );
+ return rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("org.openoffice-configmgr::Access"));
}
sal_Bool Access::supportsService(rtl::OUString const & ServiceName)
@@ -1995,45 +1996,83 @@ rtl::Reference< ChildAccess > Access::getUnmodifiedChild(
}
rtl::Reference< ChildAccess > Access::getSubChild(rtl::OUString const & path) {
- rtl::OUString name;
- bool setElement;
- rtl::OUString templateName;
- sal_Int32 i = Data::parseSegment(
- path, 0, &name, &setElement, &templateName);
- if (i == -1 || (i != path.getLength() && path[i] != '/')) {
- return rtl::Reference< ChildAccess >();
- }
- rtl::Reference< ChildAccess > child(getChild(name));
- if (!child.is()) {
- return rtl::Reference< ChildAccess >();
- }
- if (setElement) {
- rtl::Reference< Node > p(getNode());
- switch (p->kind()) {
- case Node::KIND_LOCALIZED_PROPERTY:
- if (!Components::allLocales(getRootAccess()->getLocale()) ||
- templateName.getLength() != 0)
- {
+ sal_Int32 i = 0;
+ // For backwards compatibility, allow absolute paths where meaningful:
+ if (path.getLength() != 0 && path[0] == '/') {
+ ++i;
+ if (!getRootAccess().is()) {
+ return rtl::Reference< ChildAccess >();
+ }
+ Path abs(getAbsolutePath());
+ for (Path::iterator j(abs.begin()); j != abs.end(); ++j) {
+ rtl::OUString name1;
+ bool setElement1;
+ rtl::OUString templateName1;
+ i = Data::parseSegment(
+ path, i, &name1, &setElement1, &templateName1);
+ if (i == -1 || (i != path.getLength() && path[i] != '/')) {
return rtl::Reference< ChildAccess >();
}
- break;
- case Node::KIND_SET:
- if (templateName.getLength() != 0 &&
- !dynamic_cast< SetNode * >(p.get())->isValidTemplate(
- templateName))
+ rtl::OUString name2;
+ bool setElement2;
+ rtl::OUString templateName2;
+ Data::parseSegment(*j, 0, &name2, &setElement2, &templateName2);
+ if (name1 != name2 || setElement1 != setElement2 ||
+ (setElement1 &&
+ !Data::equalTemplateNames(templateName1, templateName2)))
{
return rtl::Reference< ChildAccess >();
}
- break;
- default:
+ if (i != path.getLength()) {
+ ++i;
+ }
+ }
+ }
+ for (rtl::Reference< Access > parent(this);;) {
+ rtl::OUString name;
+ bool setElement;
+ rtl::OUString templateName;
+ i = Data::parseSegment(path, i, &name, &setElement, &templateName);
+ if (i == -1 || (i != path.getLength() && path[i] != '/')) {
return rtl::Reference< ChildAccess >();
}
+ rtl::Reference< ChildAccess > child(parent->getChild(name));
+ if (!child.is()) {
+ return rtl::Reference< ChildAccess >();
+ }
+ if (setElement) {
+ rtl::Reference< Node > p(parent->getNode());
+ switch (p->kind()) {
+ case Node::KIND_LOCALIZED_PROPERTY:
+ if (!Components::allLocales(getRootAccess()->getLocale()) ||
+ templateName.getLength() != 0)
+ {
+ return rtl::Reference< ChildAccess >();
+ }
+ break;
+ case Node::KIND_SET:
+ if (templateName.getLength() != 0 &&
+ !dynamic_cast< SetNode * >(p.get())->isValidTemplate(
+ templateName))
+ {
+ return rtl::Reference< ChildAccess >();
+ }
+ break;
+ default:
+ return rtl::Reference< ChildAccess >();
+ }
+ }
+ // For backwards compatibility, ignore a final slash after non-value
+ // nodes:
+ if (child->isValue()) {
+ return i == path.getLength()
+ ? child : rtl::Reference< ChildAccess >();
+ } else if (i >= path.getLength() - 1) {
+ return child;
+ }
+ ++i;
+ parent = child.get();
}
- // For backwards compatibility, ignore a final slash after non-value nodes:
- return child->isValue()
- ? (i == path.getLength() ? child : rtl::Reference< ChildAccess >())
- : (i >= path.getLength() - 1
- ? child : child->getSubChild(path.copy(i + 1)));
}
bool Access::setChildProperty(
@@ -2091,9 +2130,8 @@ css::beans::Property Access::asProperty() {
default:
type = cppu::UnoType< css::uno::XInterface >::get(); //TODO: correct?
nillable = false;
- removable = false;
- if ( getParentNode() != NULL )
- removable = getParentNode()->kind() == Node::KIND_SET;
+ rtl::Reference< Node > parent(getParentNode());
+ removable = parent.is() && parent->kind() == Node::KIND_SET;
break;
}
return css::beans::Property(
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index bf314f2f6aca..bf314f2f6aca 100644..100755
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
diff --git a/configmgr/source/additions.hxx b/configmgr/source/additions.hxx
index 5278dec2995f..5278dec2995f 100644..100755
--- a/configmgr/source/additions.hxx
+++ b/configmgr/source/additions.hxx
diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx
index 8634dfa08bc3..8634dfa08bc3 100644..100755
--- a/configmgr/source/broadcaster.cxx
+++ b/configmgr/source/broadcaster.cxx
diff --git a/configmgr/source/broadcaster.hxx b/configmgr/source/broadcaster.hxx
index 75db85ec015d..75db85ec015d 100644..100755
--- a/configmgr/source/broadcaster.hxx
+++ b/configmgr/source/broadcaster.hxx
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 3d9c40bc072b..3d9c40bc072b 100644..100755
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index 77fd5190aae8..77fd5190aae8 100644..100755
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 44c2d32a924e..108e08fa7a12 100644..100755
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -217,7 +217,7 @@ void Components::WriteThread::run() {
reference_->clear();
}
-void Components::initSingleton(
+Components & Components::getSingleton(
css::uno::Reference< css::uno::XComponentContext > const & context)
{
OSL_ASSERT(context.is());
@@ -226,10 +226,6 @@ void Components::initSingleton(
singleton = &theSingleton;
singletonCreated = true;
}
-}
-
-Components & Components::getSingleton() {
- OSL_ASSERT(singletonCreated);
if (singleton == 0) {
throw css::uno::RuntimeException(
rtl::OUString(
@@ -869,7 +865,7 @@ void Components::parseModificationLayer() {
"configmgr user registrymodifications.xcu does not (yet) exist");
// Migrate old user layer data (can be removed once migration is no
// longer relevant, probably OOo 4; also see hack for xsi namespace in
- // XmlReader constructor):
+ // xmlreader::XmlReader::registerNamespaceIri):
parseFiles(
Data::NO_LAYER, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".xcu")),
&parseXcuFile,
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index e810c6aee2db..9d216e1bb915 100644..100755
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -67,12 +67,10 @@ class RootAccess;
class Components: private boost::noncopyable {
public:
- static void initSingleton(
+ static Components & getSingleton(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
const & context);
- static Components & getSingleton();
-
static bool allLocales(rtl::OUString const & locale);
rtl::Reference< Node > resolvePathRepresentation(
diff --git a/configmgr/source/configmgr.component b/configmgr/source/configmgr.component
new file mode 100755
index 000000000000..6ed51257005d
--- /dev/null
+++ b/configmgr/source/configmgr.component
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.configuration.ConfigurationProvider">
+ <service name="com.sun.star.configuration.ConfigurationProvider"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.configuration.ConfigurationRegistry">
+ <service name="com.sun.star.configuration.ConfigurationRegistry"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.configuration.DefaultProvider">
+ <service name="com.sun.star.configuration.DefaultProvider"/>
+ <singleton name="com.sun.star.configuration.theDefaultProvider"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.configuration.Update">
+ <service name="com.sun.star.configuration.Update_Service"/>
+ <singleton name="com.sun.star.configuration.Update"/>
+ </implementation>
+</component>
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index cccb74658c11..6b8d967e92b9 100644..100755
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -56,7 +56,7 @@
#include "cppu/unotype.hxx"
#include "cppuhelper/compbase5.hxx"
#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase2.hxx"
#include "cppuhelper/interfacecontainer.hxx"
#include "cppuhelper/weak.hxx"
#include "osl/diagnose.h"
@@ -129,7 +129,6 @@ private:
virtual css::uno::Sequence< rtl::OUString > SAL_CALL
getSupportedServiceNames() throw (css::uno::RuntimeException)
{ return configuration_provider::getSupportedServiceNames(); }
- //TODO: DefaultProvider?
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
rtl::OUString const & aServiceSpecifier)
@@ -279,8 +278,7 @@ Service::createInstanceWithArguments(
static_cast< cppu::OWeakObject * >(this));
}
osl::MutexGuard guard(*lock_);
- Components::initSingleton(context_);
- Components & components = Components::getSingleton();
+ Components & components = Components::getSingleton(context_);
rtl::Reference< RootAccess > root(
new RootAccess(components, nodepath, locale, update));
if (root->isValue()) {
@@ -391,14 +389,14 @@ void Service::flushModifications() const {
Components * components;
{
osl::MutexGuard guard(*lock_);
- Components::initSingleton(context_);
- components = &Components::getSingleton();
+ components = &Components::getSingleton(context_);
}
components->flushModifications();
}
class Factory:
- public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
+ public cppu::WeakImplHelper2<
+ css::lang::XSingleComponentFactory, css::lang::XServiceInfo >,
private boost::noncopyable
{
public:
@@ -417,6 +415,18 @@ private:
css::uno::Sequence< css::uno::Any > const & Arguments,
css::uno::Reference< css::uno::XComponentContext > const & Context)
throw (css::uno::Exception, css::uno::RuntimeException);
+
+ virtual rtl::OUString SAL_CALL getImplementationName()
+ throw (css::uno::RuntimeException)
+ { return configuration_provider::getImplementationName(); }
+
+ virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
+ throw (css::uno::RuntimeException)
+ { return ServiceName == getSupportedServiceNames()[0]; } //TODO
+
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+ getSupportedServiceNames() throw (css::uno::RuntimeException)
+ { return configuration_provider::getSupportedServiceNames(); }
};
css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx
index a55e99809d79..a55e99809d79 100644..100755
--- a/configmgr/source/configurationprovider.hxx
+++ b/configmgr/source/configurationprovider.hxx
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index f4fe588d01a7..a46d5ceb2e13 100644..100755
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -37,7 +37,6 @@
#include "com/sun/star/lang/XMultiComponentFactory.hpp"
#include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
#include "com/sun/star/registry/InvalidRegistryException.hpp"
#include "com/sun/star/registry/InvalidValueException.hpp"
#include "com/sun/star/registry/MergeConflictException.hpp"
@@ -57,13 +56,11 @@
#include "com/sun/star/uno/XInterface.hpp"
#include "com/sun/star/util/XFlushable.hpp"
#include "cppu/unotype.hxx"
-#include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/implbase3.hxx"
#include "cppuhelper/weak.hxx"
#include "osl/diagnose.h"
#include "osl/mutex.hxx"
-#include "rtl/unload.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
@@ -878,53 +875,12 @@ rtl::OUString RegistryKey::getResolvedName(rtl::OUString const & aKeyName)
return aKeyName;
}
-class Factory:
- public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
- private boost::noncopyable
-{
-public:
- Factory() {}
-
-private:
- virtual ~Factory() {}
-
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- createInstanceWithContext(
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException);
-
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- createInstanceWithArgumentsAndContext(
- css::uno::Sequence< css::uno::Any > const & Arguments,
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException);
-};
-
-css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException)
-{
- return createInstanceWithArgumentsAndContext(
- css::uno::Sequence< css::uno::Any >(), Context);
}
-css::uno::Reference< css::uno::XInterface >
-Factory::createInstanceWithArgumentsAndContext(
- css::uno::Sequence< css::uno::Any > const & Arguments,
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException)
+css::uno::Reference< css::uno::XInterface > create(
+ css::uno::Reference< css::uno::XComponentContext > const & context)
{
- if (Arguments.getLength() != 0) {
- throw css::uno::Exception(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationRegistry must be"
- " instantiated without arguments")),
- static_cast< cppu::OWeakObject * >(this));
- }
- return static_cast< cppu::OWeakObject * >(new Service(Context));
-}
-
+ return static_cast< cppu::OWeakObject * >(new Service(context));
}
rtl::OUString getImplementationName() {
@@ -940,14 +896,6 @@ css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
return css::uno::Sequence< rtl::OUString >(&name, 1);
}
-css::uno::Reference< css::lang::XSingleComponentFactory > createFactory(
- cppu::ComponentFactoryFunc, rtl::OUString const &,
- css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
- SAL_THROW(())
-{
- return new Factory;
-}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/configurationregistry.hxx b/configmgr/source/configurationregistry.hxx
index 459fcc4535bc..fdba8f51e583 100644..100755
--- a/configmgr/source/configurationregistry.hxx
+++ b/configmgr/source/configurationregistry.hxx
@@ -31,28 +31,28 @@
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/Sequence.hxx"
-#include "cppuhelper/factory.hxx"
-#include "rtl/unload.h"
#include "sal/types.h"
-namespace com { namespace sun { namespace star { namespace lang {
- class XSingleComponentFactory;
-} } } }
+namespace com { namespace sun { namespace star {
+ namespace uno {
+ class XComponentContext;
+ class XInterface;
+ }
+} } }
namespace rtl { class OUString; }
namespace configmgr { namespace configuration_registry {
+com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
+create(
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+ const & context);
+
rtl::OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
getSupportedServiceNames();
-com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
-SAL_CALL createFactory(
- cppu::ComponentFactoryFunc, rtl::OUString const &,
- com::sun::star::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
- SAL_THROW(());
-
} }
#endif
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index 989f543b197d..989f543b197d 100644..100755
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx
index f60ecfa1e807..f60ecfa1e807 100644..100755
--- a/configmgr/source/data.hxx
+++ b/configmgr/source/data.hxx
diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx
index 16cf66df0d55..6e65301e8c82 100644..100755
--- a/configmgr/source/defaultprovider.cxx
+++ b/configmgr/source/defaultprovider.cxx
@@ -29,25 +29,16 @@
#include "precompiled_configmgr.hxx"
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
-#include "boost/shared_ptr.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Exception.hpp"
#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/Sequence.hxx"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp"
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
-#include "cppuhelper/weak.hxx"
-#include "sal/types.h"
-#include "rtl/unload.h"
+#include "osl/mutex.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "configurationprovider.hxx"
+#include "defaultprovider.hxx"
#include "lock.hxx"
namespace configmgr { namespace default_provider {
@@ -56,63 +47,15 @@ namespace {
namespace css = com::sun::star;
-class Factory:
- public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
- private boost::noncopyable
+css::uno::Reference< css::uno::XInterface > create(
+ css::uno::Reference< css::uno::XComponentContext > const & context)
{
-public:
- Factory()
- {
- lock_ = lock();
- }
-
-private:
- virtual ~Factory() {}
-
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- createInstanceWithContext(
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException);
-
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- createInstanceWithArgumentsAndContext(
- css::uno::Sequence< css::uno::Any > const & Arguments,
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException);
-
- boost::shared_ptr<osl::Mutex> lock_;
-};
-
-css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException)
-{
- return createInstanceWithArgumentsAndContext(
- css::uno::Sequence< css::uno::Any >(), Context);
-}
-
-css::uno::Reference< css::uno::XInterface >
-Factory::createInstanceWithArgumentsAndContext(
- css::uno::Sequence< css::uno::Any > const & Arguments,
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException)
-{
- if (Arguments.getLength() != 0) {
- throw css::uno::Exception(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.DefaultProvider must be"
- " instantiated without arguments")),
- static_cast< cppu::OWeakObject * >(this));
- }
osl::MutexGuard guard(*lock_);
static css::uno::Reference< css::uno::XInterface > singleton(
- configuration_provider::createDefault(Context));
+ configuration_provider::createDefault(context));
return singleton;
}
-}
-
rtl::OUString getImplementationName() {
return rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
@@ -126,15 +69,6 @@ css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
return css::uno::Sequence< rtl::OUString >(&name, 1);
}
-css::uno::Reference< css::lang::XSingleComponentFactory >
-SAL_CALL createFactory(
- cppu::ComponentFactoryFunc, rtl::OUString const &,
- css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
- SAL_THROW(())
-{
- return new Factory;
-}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/defaultprovider.hxx b/configmgr/source/defaultprovider.hxx
index 5202148fa34e..1dbc44d525e0 100644..100755
--- a/configmgr/source/defaultprovider.hxx
+++ b/configmgr/source/defaultprovider.hxx
@@ -33,28 +33,28 @@
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/Sequence.hxx"
-#include "cppuhelper/factory.hxx"
-#include "rtl/unload.h"
#include "sal/types.h"
-namespace com { namespace sun { namespace star { namespace lang {
- class XSingleComponentFactory;
-} } } }
+namespace com { namespace sun { namespace star {
+ namespace uno {
+ class XComponentContext;
+ class XInterface;
+ }
+} } }
namespace rtl { class OUString; }
namespace configmgr { namespace default_provider {
+com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
+create(
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+ const & context);
+
rtl::OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
getSupportedServiceNames();
-com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
-SAL_CALL createFactory(
- cppu::ComponentFactoryFunc, rtl::OUString const &,
- com::sun::star::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
- SAL_THROW(());
-
} }
#endif
diff --git a/configmgr/source/groupnode.cxx b/configmgr/source/groupnode.cxx
index fa56afa1a29c..fa56afa1a29c 100644..100755
--- a/configmgr/source/groupnode.cxx
+++ b/configmgr/source/groupnode.cxx
diff --git a/configmgr/source/groupnode.hxx b/configmgr/source/groupnode.hxx
index 02f1679998a2..02f1679998a2 100644..100755
--- a/configmgr/source/groupnode.hxx
+++ b/configmgr/source/groupnode.hxx
diff --git a/configmgr/source/localizedpropertynode.cxx b/configmgr/source/localizedpropertynode.cxx
index c03f552de1d3..c03f552de1d3 100644..100755
--- a/configmgr/source/localizedpropertynode.cxx
+++ b/configmgr/source/localizedpropertynode.cxx
diff --git a/configmgr/source/localizedpropertynode.hxx b/configmgr/source/localizedpropertynode.hxx
index bbe934e36bcd..bbe934e36bcd 100644..100755
--- a/configmgr/source/localizedpropertynode.hxx
+++ b/configmgr/source/localizedpropertynode.hxx
diff --git a/configmgr/source/localizedvaluenode.cxx b/configmgr/source/localizedvaluenode.cxx
index ac6346f09227..ac6346f09227 100644..100755
--- a/configmgr/source/localizedvaluenode.cxx
+++ b/configmgr/source/localizedvaluenode.cxx
diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx
index 23139bec4029..23139bec4029 100644..100755
--- a/configmgr/source/localizedvaluenode.hxx
+++ b/configmgr/source/localizedvaluenode.hxx
diff --git a/configmgr/source/lock.cxx b/configmgr/source/lock.cxx
index 3950a2d5e3e0..3950a2d5e3e0 100644..100755
--- a/configmgr/source/lock.cxx
+++ b/configmgr/source/lock.cxx
diff --git a/configmgr/source/lock.hxx b/configmgr/source/lock.hxx
index b37e83a44ee2..b37e83a44ee2 100644..100755
--- a/configmgr/source/lock.hxx
+++ b/configmgr/source/lock.hxx
diff --git a/configmgr/source/makefile.mk b/configmgr/source/makefile.mk
index 777fed3323d8..94747d9dd803 100644..100755
--- a/configmgr/source/makefile.mk
+++ b/configmgr/source/makefile.mk
@@ -52,7 +52,6 @@ SLOFILES = \
$(SLO)/modifications.obj \
$(SLO)/node.obj \
$(SLO)/nodemap.obj \
- $(SLO)/pad.obj \
$(SLO)/parsemanager.obj \
$(SLO)/partial.obj \
$(SLO)/propertynode.obj \
@@ -66,8 +65,7 @@ SLOFILES = \
$(SLO)/xcdparser.obj \
$(SLO)/xcsparser.obj \
$(SLO)/xcuparser.obj \
- $(SLO)/xmldata.obj \
- $(SLO)/xmlreader.obj
+ $(SLO)/xmldata.obj
SHL1IMPLIB = i$(SHL1TARGET)
SHL1OBJS = $(SLOFILES)
@@ -76,9 +74,18 @@ SHL1STDLIBS = \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALHELPERLIB) \
- $(SALLIB)
+ $(SALLIB) \
+ $(XMLREADERLIB)
SHL1TARGET = configmgr.uno
SHL1USE_EXPORTS = name
DEF1NAME = $(SHL1TARGET)
.INCLUDE: target.mk
+
+ALLTAR : $(MISC)/configmgr.component
+
+$(MISC)/configmgr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ configmgr.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt configmgr.component
diff --git a/configmgr/source/modifications.cxx b/configmgr/source/modifications.cxx
index e83d4a501af6..e83d4a501af6 100644..100755
--- a/configmgr/source/modifications.cxx
+++ b/configmgr/source/modifications.cxx
diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx
index fa4f08a157fd..fa4f08a157fd 100644..100755
--- a/configmgr/source/modifications.hxx
+++ b/configmgr/source/modifications.hxx
diff --git a/configmgr/source/node.cxx b/configmgr/source/node.cxx
index 69f53e28b1d9..58d13c4fee55 100644..100755
--- a/configmgr/source/node.cxx
+++ b/configmgr/source/node.cxx
@@ -102,10 +102,6 @@ Node::~Node() {}
void Node::clear() {}
-rtl::Reference< Node > Node::findMember(rtl::OUString const &) {
- return rtl::Reference< Node >();
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx
index 27eea9c4642e..932d11cf3744 100644..100755
--- a/configmgr/source/node.hxx
+++ b/configmgr/source/node.hxx
@@ -32,11 +32,12 @@
#include "sal/config.h"
#include "rtl/ref.hxx"
-#include "rtl/ustring.hxx"
#include "salhelper/simplereferenceobject.hxx"
#include "nodemap.hxx"
+namespace rtl { class OUString; }
+
namespace configmgr {
class Node: public salhelper::SimpleReferenceObject {
@@ -70,8 +71,6 @@ protected:
virtual ~Node();
virtual void clear();
- virtual rtl::Reference< Node > findMember(rtl::OUString const & name);
-
int layer_;
int finalized_;
};
diff --git a/configmgr/source/nodemap.cxx b/configmgr/source/nodemap.cxx
index 432aa64e7991..432aa64e7991 100644..100755
--- a/configmgr/source/nodemap.cxx
+++ b/configmgr/source/nodemap.cxx
diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx
index 5e9e501e9fc7..5e9e501e9fc7 100644..100755
--- a/configmgr/source/nodemap.hxx
+++ b/configmgr/source/nodemap.hxx
diff --git a/configmgr/source/pad.cxx b/configmgr/source/pad.cxx
index 68a92b5aa741..68a92b5aa741 100644..100755
--- a/configmgr/source/pad.cxx
+++ b/configmgr/source/pad.cxx
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index b6fe53f17126..d5a2d2ddd5b0 100644..100755
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -33,10 +33,11 @@
#include "com/sun/star/uno/RuntimeException.hpp"
#include "osl/diagnose.h"
#include "sal/types.h"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
#include "parsemanager.hxx"
#include "parser.hxx"
-#include "xmlreader.hxx"
namespace configmgr {
@@ -53,28 +54,42 @@ ParseManager::ParseManager(
reader_(url), parser_(parser)
{
OSL_ASSERT(parser.is());
+ int id;
+ id = reader_.registerNamespaceIri(
+ xmlreader::Span(
+ RTL_CONSTASCII_STRINGPARAM("http://openoffice.org/2001/registry")));
+ OSL_ASSERT(id == NAMESPACE_OOR);
+ id = reader_.registerNamespaceIri(
+ xmlreader::Span(
+ RTL_CONSTASCII_STRINGPARAM("http://www.w3.org/2001/XMLSchema")));
+ OSL_ASSERT(id == NAMESPACE_XS);
+ id = reader_.registerNamespaceIri(
+ xmlreader::Span(
+ RTL_CONSTASCII_STRINGPARAM(
+ "http://www.w3.org/2001/XMLSchema-instance")));
+ OSL_ASSERT(id == NAMESPACE_XSI);
}
bool ParseManager::parse() {
for (;;) {
switch (itemData_.is()
- ? XmlReader::RESULT_BEGIN
+ ? xmlreader::XmlReader::RESULT_BEGIN
: reader_.nextItem(
- parser_->getTextMode(), &itemData_, &itemNamespace_))
+ parser_->getTextMode(), &itemData_, &itemNamespaceId_))
{
- case XmlReader::RESULT_BEGIN:
- if (!parser_->startElement(reader_, itemNamespace_, itemData_))
+ case xmlreader::XmlReader::RESULT_BEGIN:
+ if (!parser_->startElement(reader_, itemNamespaceId_, itemData_))
{
return false;
}
break;
- case XmlReader::RESULT_END:
+ case xmlreader::XmlReader::RESULT_END:
parser_->endElement(reader_);
break;
- case XmlReader::RESULT_TEXT:
+ case xmlreader::XmlReader::RESULT_TEXT:
parser_->characters(itemData_);
break;
- case XmlReader::RESULT_DONE:
+ case xmlreader::XmlReader::RESULT_DONE:
return true;
}
itemData_.clear();
diff --git a/configmgr/source/parsemanager.hxx b/configmgr/source/parsemanager.hxx
index 47719fce8a89..a6a238b0a0ec 100644..100755
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -36,9 +36,8 @@
#include "rtl/ref.hxx"
#include "sal/types.h"
#include "salhelper/simplereferenceobject.hxx"
-
-#include "span.hxx"
-#include "xmlreader.hxx"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
namespace rtl { class OUString; }
@@ -56,13 +55,15 @@ public:
bool parse();
+ enum { NAMESPACE_OOR = 1, NAMESPACE_XS = 2, NAMESPACE_XSI = 3 };
+
private:
virtual ~ParseManager();
- XmlReader reader_;
+ xmlreader::XmlReader reader_;
rtl::Reference< Parser > parser_;
- Span itemData_;
- XmlReader::Namespace itemNamespace_;
+ xmlreader::Span itemData_;
+ int itemNamespaceId_;
};
}
diff --git a/configmgr/source/parser.hxx b/configmgr/source/parser.hxx
index 0c2435ed19bd..a7151b71c616 100644..100755
--- a/configmgr/source/parser.hxx
+++ b/configmgr/source/parser.hxx
@@ -34,23 +34,23 @@
#include <memory>
#include "salhelper/simplereferenceobject.hxx"
+#include "xmlreader/xmlreader.hxx"
-#include "xmlreader.hxx"
+namespace xmlreader { struct Span; }
namespace configmgr {
-struct Span;
-
class Parser: public salhelper::SimpleReferenceObject {
public:
- virtual XmlReader::Text getTextMode() = 0;
+ virtual xmlreader::XmlReader::Text getTextMode() = 0;
virtual bool startElement(
- XmlReader & reader, XmlReader::Namespace ns, Span const & name) = 0;
+ xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
+ = 0;
- virtual void endElement(XmlReader const & reader) = 0;
+ virtual void endElement(xmlreader::XmlReader const & reader) = 0;
- virtual void characters(Span const & text) = 0;
+ virtual void characters(xmlreader::Span const & text) = 0;
protected:
Parser() {}
diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index f3f91a4c05a6..f3f91a4c05a6 100644..100755
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
diff --git a/configmgr/source/partial.hxx b/configmgr/source/partial.hxx
index 135aa5d66355..135aa5d66355 100644..100755
--- a/configmgr/source/partial.hxx
+++ b/configmgr/source/partial.hxx
diff --git a/configmgr/source/path.hxx b/configmgr/source/path.hxx
index 2de401099d00..2de401099d00 100644..100755
--- a/configmgr/source/path.hxx
+++ b/configmgr/source/path.hxx
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
index 8e2eec660d2b..8e2eec660d2b 100644..100755
--- a/configmgr/source/propertynode.cxx
+++ b/configmgr/source/propertynode.cxx
diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx
index 6e0edc895f29..6e0edc895f29 100644..100755
--- a/configmgr/source/propertynode.hxx
+++ b/configmgr/source/propertynode.hxx
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index ef5982e3a56d..ef5982e3a56d 100644..100755
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index c1751210c50c..c1751210c50c 100644..100755
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index 6dc4b92c8b33..d274cd8973ca 100644..100755
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -29,17 +29,14 @@
#include "precompiled_configmgr.hxx"
#include "sal/config.h"
-#include "com/sun/star/registry/XRegistryKey.hpp"
#include "com/sun/star/uno/Exception.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp"
+#include "cppuhelper/factory.hxx"
#include "cppuhelper/implementationentry.hxx"
#include "osl/diagnose.h"
#include "uno/lbnames.h"
-#include "rtl/textenc.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
#include "sal/types.h"
#include "configurationprovider.hxx"
@@ -63,15 +60,17 @@ static cppu::ImplementationEntry const services[] = {
{ &dummy, &configmgr::configuration_provider::getImplementationName,
&configmgr::configuration_provider::getSupportedServiceNames,
&configmgr::configuration_provider::createFactory, 0, 0 },
- { &dummy, &configmgr::default_provider::getImplementationName,
+ { &configmgr::default_provider::create,
+ &configmgr::default_provider::getImplementationName,
&configmgr::default_provider::getSupportedServiceNames,
- &configmgr::default_provider::createFactory, 0, 0 },
- { &dummy, &configmgr::configuration_registry::getImplementationName,
+ &cppu::createSingleComponentFactory, 0, 0 },
+ { &configmgr::configuration_registry::create,
+ &configmgr::configuration_registry::getImplementationName,
&configmgr::configuration_registry::getSupportedServiceNames,
- &configmgr::configuration_registry::createFactory, 0, 0 },
- { &dummy, &configmgr::update::getImplementationName,
+ &cppu::createSingleComponentFactory, 0, 0 },
+ { &configmgr::update::create, &configmgr::update::getImplementationName,
&configmgr::update::getSupportedServiceNames,
- &configmgr::update::createFactory, 0, 0 },
+ &cppu::createSingleComponentFactory, 0, 0 },
{ 0, 0, 0, 0, 0, 0 }
};
@@ -91,48 +90,4 @@ component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void * pServiceManager, void * pRegistryKey)
-{
- if (!component_writeInfoHelper(pServiceManager, pRegistryKey, services)) {
- return false;
- }
- try {
- css::uno::Reference< css::registry::XRegistryKey >(
- (css::uno::Reference< css::registry::XRegistryKey >(
- static_cast< css::registry::XRegistryKey * >(pRegistryKey))->
- createKey(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "/com.sun.star.comp.configuration.DefaultProvider/UNO/"
- "SINGLETONS/"
- "com.sun.star.configuration.theDefaultProvider")))),
- css::uno::UNO_SET_THROW)->
- setStringValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.DefaultProvider")));
- css::uno::Reference< css::registry::XRegistryKey >(
- (css::uno::Reference< css::registry::XRegistryKey >(
- static_cast< css::registry::XRegistryKey * >(pRegistryKey))->
- createKey(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "/com.sun.star.comp.configuration.Update/UNO/"
- "SINGLETONS/com.sun.star.configuration.Update")))),
- css::uno::UNO_SET_THROW)->
- setStringValue(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.Update_Service")));
- } catch (css::uno::Exception & e) {
- (void) e;
- OSL_TRACE(
- "configmgr component_writeInfo exception: %s",
- rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
- return false;
- }
- return true;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/setnode.cxx b/configmgr/source/setnode.cxx
index 52b117bb0154..52b117bb0154 100644..100755
--- a/configmgr/source/setnode.cxx
+++ b/configmgr/source/setnode.cxx
diff --git a/configmgr/source/setnode.hxx b/configmgr/source/setnode.hxx
index 00bcab2a55a1..00bcab2a55a1 100644..100755
--- a/configmgr/source/setnode.hxx
+++ b/configmgr/source/setnode.hxx
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index b3bfd72d3e8d..b3bfd72d3e8d 100644..100755
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
diff --git a/configmgr/source/type.hxx b/configmgr/source/type.hxx
index 91e335de1e44..91e335de1e44 100644..100755
--- a/configmgr/source/type.hxx
+++ b/configmgr/source/type.hxx
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 7208eb3f8c69..d63ff05841ab 100644..100755
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -34,20 +34,15 @@
#include "boost/noncopyable.hpp"
#include "boost/shared_ptr.hpp"
#include "com/sun/star/configuration/XUpdate.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Exception.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/Sequence.hxx"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp"
-#include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/weak.hxx"
#include "osl/mutex.hxx"
#include "rtl/ref.hxx"
-#include "rtl/unload.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
@@ -78,8 +73,10 @@ class Service:
private boost::noncopyable
{
public:
- Service()
+ Service(css::uno::Reference< css::uno::XComponentContext > const context):
+ context_(context)
{
+ OSL_ASSERT(context.is());
lock_ = lock();
}
@@ -104,6 +101,7 @@ private:
throw (css::uno::RuntimeException);
boost::shared_ptr<osl::Mutex> lock_;
+ css::uno::Reference< css::uno::XComponentContext > context_;
};
void Service::insertExtensionXcsFile(
@@ -111,7 +109,7 @@ void Service::insertExtensionXcsFile(
throw (css::uno::RuntimeException)
{
osl::MutexGuard g(*lock_);
- Components::getSingleton().insertExtensionXcsFile(shared, fileUri);
+ Components::getSingleton(context_).insertExtensionXcsFile(shared, fileUri);
}
void Service::insertExtensionXcuFile(
@@ -121,10 +119,10 @@ void Service::insertExtensionXcuFile(
Broadcaster bc;
{
osl::MutexGuard g(*lock_);
+ Components & components = Components::getSingleton(context_);
Modifications mods;
- Components::getSingleton().insertExtensionXcuFile(
- shared, fileUri, &mods);
- Components::getSingleton().initGlobalBroadcaster(
+ components.insertExtensionXcuFile(shared, fileUri, &mods);
+ components.initGlobalBroadcaster(
mods, rtl::Reference< RootAccess >(), &bc);
}
bc.send();
@@ -136,9 +134,10 @@ void Service::removeExtensionXcuFile(rtl::OUString const & fileUri)
Broadcaster bc;
{
osl::MutexGuard g(*lock_);
+ Components & components = Components::getSingleton(context_);
Modifications mods;
- Components::getSingleton().removeExtensionXcuFile(fileUri, &mods);
- Components::getSingleton().initGlobalBroadcaster(
+ components.removeExtensionXcuFile(fileUri, &mods);
+ components.initGlobalBroadcaster(
mods, rtl::Reference< RootAccess >(), &bc);
}
bc.send();
@@ -153,62 +152,22 @@ void Service::insertModificationXcuFile(
Broadcaster bc;
{
osl::MutexGuard g(*lock_);
+ Components & components = Components::getSingleton(context_);
Modifications mods;
- Components::getSingleton().insertModificationXcuFile(
+ components.insertModificationXcuFile(
fileUri, seqToSet(includedPaths), seqToSet(excludedPaths), &mods);
- Components::getSingleton().initGlobalBroadcaster(
+ components.initGlobalBroadcaster(
mods, rtl::Reference< RootAccess >(), &bc);
}
bc.send();
}
-class Factory:
- public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
- private boost::noncopyable
-{
-public:
- Factory() {}
-
-private:
- virtual ~Factory() {}
-
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- createInstanceWithContext(
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException);
-
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- createInstanceWithArgumentsAndContext(
- css::uno::Sequence< css::uno::Any > const & Arguments,
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException);
-};
-
-css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
- css::uno::Reference< css::uno::XComponentContext > const & Context)
- throw (css::uno::Exception, css::uno::RuntimeException)
-{
- return createInstanceWithArgumentsAndContext(
- css::uno::Sequence< css::uno::Any >(), Context);
}
-css::uno::Reference< css::uno::XInterface >
-Factory::createInstanceWithArgumentsAndContext(
- css::uno::Sequence< css::uno::Any > const & Arguments,
- css::uno::Reference< css::uno::XComponentContext > const &)
- throw (css::uno::Exception, css::uno::RuntimeException)
+css::uno::Reference< css::uno::XInterface > create(
+ css::uno::Reference< css::uno::XComponentContext > const & context)
{
- if (Arguments.getLength() != 0) {
- throw css::uno::Exception(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.configuration.Update must be"
- " instantiated without arguments")),
- static_cast< cppu::OWeakObject * >(this));
- }
- return static_cast< cppu::OWeakObject * >(new Service);
-}
-
+ return static_cast< cppu::OWeakObject * >(new Service(context));
}
rtl::OUString getImplementationName() {
@@ -223,14 +182,6 @@ css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
return css::uno::Sequence< rtl::OUString >(&name, 1);
}
-css::uno::Reference< css::lang::XSingleComponentFactory > createFactory(
- cppu::ComponentFactoryFunc, rtl::OUString const &,
- css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
- SAL_THROW(())
-{
- return new Factory;
-}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/update.hxx b/configmgr/source/update.hxx
index 77b7affb48ac..3e423679d327 100644..100755
--- a/configmgr/source/update.hxx
+++ b/configmgr/source/update.hxx
@@ -33,28 +33,28 @@
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/Sequence.hxx"
-#include "cppuhelper/factory.hxx"
-#include "rtl/unload.h"
#include "sal/types.h"
-namespace com { namespace sun { namespace star { namespace lang {
- class XSingleComponentFactory;
-} } } }
+namespace com { namespace sun { namespace star {
+ namespace uno {
+ class XComponentContext;
+ class XInterface;
+ }
+} } }
namespace rtl { class OUString; }
namespace configmgr { namespace update {
+com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
+create(
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+ const &);
+
rtl::OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
getSupportedServiceNames();
-com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
-SAL_CALL createFactory(
- cppu::ComponentFactoryFunc, rtl::OUString const &,
- com::sun::star::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
- SAL_THROW(());
-
} }
#endif
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 03201d26f9dc..8488531019cb 100644..100755
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -41,16 +41,17 @@
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
#include "localizedvaluenode.hxx"
#include "node.hxx"
#include "nodemap.hxx"
+#include "parsemanager.hxx"
#include "propertynode.hxx"
-#include "span.hxx"
#include "type.hxx"
#include "valueparser.hxx"
#include "xmldata.hxx"
-#include "xmlreader.hxx"
namespace configmgr {
@@ -75,7 +76,7 @@ bool parseHexDigit(char c, int * value) {
return false;
}
-bool parseValue(Span const & text, sal_Bool * value) {
+bool parseValue(xmlreader::Span const & text, sal_Bool * value) {
OSL_ASSERT(text.is() && value != 0);
if (text.equals(RTL_CONSTASCII_STRINGPARAM("true")) ||
text.equals(RTL_CONSTASCII_STRINGPARAM("1")))
@@ -92,7 +93,7 @@ bool parseValue(Span const & text, sal_Bool * value) {
return false;
}
-bool parseValue(Span const & text, sal_Int16 * value) {
+bool parseValue(xmlreader::Span const & text, sal_Int16 * value) {
OSL_ASSERT(text.is() && value != 0);
// For backwards compatibility, support hexadecimal values:
sal_Int32 n =
@@ -111,7 +112,7 @@ bool parseValue(Span const & text, sal_Int16 * value) {
return false;
}
-bool parseValue(Span const & text, sal_Int32 * value) {
+bool parseValue(xmlreader::Span const & text, sal_Int32 * value) {
OSL_ASSERT(text.is() && value != 0);
// For backwards compatibility, support hexadecimal values:
*value =
@@ -126,7 +127,7 @@ bool parseValue(Span const & text, sal_Int32 * value) {
return true;
}
-bool parseValue(Span const & text, sal_Int64 * value) {
+bool parseValue(xmlreader::Span const & text, sal_Int64 * value) {
OSL_ASSERT(text.is() && value != 0);
// For backwards compatibility, support hexadecimal values:
*value =
@@ -141,20 +142,22 @@ bool parseValue(Span const & text, sal_Int64 * value) {
return true;
}
-bool parseValue(Span const & text, double * value) {
+bool parseValue(xmlreader::Span const & text, double * value) {
OSL_ASSERT(text.is() && value != 0);
*value = rtl::OString(text.begin, text.length).toDouble();
//TODO: check valid lexical representation
return true;
}
-bool parseValue(Span const & text, rtl::OUString * value) {
+bool parseValue(xmlreader::Span const & text, rtl::OUString * value) {
OSL_ASSERT(text.is() && value != 0);
- *value = xmldata::convertFromUtf8(text);
+ *value = text.convertFromUtf8();
return true;
}
-bool parseValue(Span const & text, css::uno::Sequence< sal_Int8 > * value) {
+bool parseValue(
+ xmlreader::Span const & text, css::uno::Sequence< sal_Int8 > * value)
+{
OSL_ASSERT(text.is() && value != 0);
if ((text.length & 1) != 0) {
return false;
@@ -174,7 +177,9 @@ bool parseValue(Span const & text, css::uno::Sequence< sal_Int8 > * value) {
return true;
}
-template< typename T > css::uno::Any parseSingleValue(Span const & text) {
+template< typename T > css::uno::Any parseSingleValue(
+ xmlreader::Span const & text)
+{
T val;
if (!parseValue(text, &val)) {
throw css::uno::RuntimeException(
@@ -185,21 +190,23 @@ template< typename T > css::uno::Any parseSingleValue(Span const & text) {
}
template< typename T > css::uno::Any parseListValue(
- rtl::OString const & separator, Span const & text)
+ rtl::OString const & separator, xmlreader::Span const & text)
{
comphelper::SequenceAsVector< T > seq;
- Span sep;
+ xmlreader::Span sep;
if (separator.getLength() == 0) {
- sep = Span(RTL_CONSTASCII_STRINGPARAM(" "));
+ sep = xmlreader::Span(RTL_CONSTASCII_STRINGPARAM(" "));
} else {
- sep = Span(separator.getStr(), separator.getLength());
+ sep = xmlreader::Span(separator.getStr(), separator.getLength());
}
if (text.length != 0) {
- for (Span t(text);;) {
+ for (xmlreader::Span t(text);;) {
sal_Int32 i = rtl_str_indexOfStr_WithLength(
t.begin, t.length, sep.begin, sep.length);
T val;
- if (!parseValue(Span(t.begin, i == -1 ? t.length : i), &val)) {
+ if (!parseValue(
+ xmlreader::Span(t.begin, i == -1 ? t.length : i), &val))
+ {
throw css::uno::RuntimeException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid value")),
css::uno::Reference< css::uno::XInterface >());
@@ -216,7 +223,7 @@ template< typename T > css::uno::Any parseListValue(
}
css::uno::Any parseValue(
- rtl::OString const & separator, Span const & text, Type type)
+ rtl::OString const & separator, xmlreader::Span const & text, Type type)
{
switch (type) {
case TYPE_ANY:
@@ -267,7 +274,7 @@ ValueParser::ValueParser(int layer): layer_(layer) {}
ValueParser::~ValueParser() {}
-XmlReader::Text ValueParser::getTextMode() const {
+xmlreader::XmlReader::Text ValueParser::getTextMode() const {
if (node_.is()) {
switch (state_) {
case STATE_TEXT:
@@ -279,23 +286,24 @@ XmlReader::Text ValueParser::getTextMode() const {
return
(type_ == TYPE_STRING || type_ == TYPE_STRING_LIST ||
separator_.getLength() != 0)
- ? XmlReader::TEXT_RAW : XmlReader::TEXT_NORMALIZED;
+ ? xmlreader::XmlReader::TEXT_RAW
+ : xmlreader::XmlReader::TEXT_NORMALIZED;
default:
break;
}
}
- return XmlReader::TEXT_NONE;
+ return xmlreader::XmlReader::TEXT_NONE;
}
bool ValueParser::startElement(
- XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+ xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
{
if (!node_.is()) {
return false;
}
switch (state_) {
case STATE_TEXT:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("it")) &&
isListType(type_) && separator_.getLength() == 0)
{
@@ -307,18 +315,18 @@ bool ValueParser::startElement(
}
// fall through
case STATE_IT:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("unicode")) &&
(type_ == TYPE_STRING || type_ == TYPE_STRING_LIST))
{
sal_Int32 scalar = -1;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("scalar")))
{
if (!parseValue(reader.getAttributeValue(true), &scalar)) {
@@ -353,7 +361,7 @@ bool ValueParser::startElement(
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
- xmldata::convertFromUtf8(name) +
+ name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
@@ -440,7 +448,7 @@ bool ValueParser::endElement() {
return true;
}
-void ValueParser::characters(Span const & text) {
+void ValueParser::characters(xmlreader::Span const & text) {
if (node_.is()) {
OSL_ASSERT(state_ == STATE_TEXT || state_ == STATE_IT);
pad_.add(text.begin, text.length);
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index 66f3fafd82af..a3ee2310ea35 100644..100755
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -37,19 +37,19 @@
#include "rtl/ref.hxx"
#include "rtl/string.hxx"
#include "rtl/ustring.hxx"
+#include "xmlreader/pad.hxx"
+#include "xmlreader/xmlreader.hxx"
-#include "pad.hxx"
#include "type.hxx"
-#include "xmlreader.hxx"
namespace com { namespace sun { namespace star { namespace uno {
class Any;
} } } }
+namespace xmlreader { struct Span; }
namespace configmgr {
class Node;
-struct Span;
class ValueParser: private boost::noncopyable {
public:
@@ -57,14 +57,14 @@ public:
~ValueParser();
- XmlReader::Text getTextMode() const;
+ xmlreader::XmlReader::Text getTextMode() const;
bool startElement(
- XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+ xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name);
bool endElement();
- void characters(Span const & text);
+ void characters(xmlreader::Span const & text);
void start(
rtl::Reference< Node > const & property,
@@ -84,7 +84,7 @@ private:
rtl::Reference< Node > node_;
rtl::OUString localizedName_;
State state_;
- Pad pad_;
+ xmlreader::Pad pad_;
std::vector< com::sun::star::uno::Any > items_;
};
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 7e01aabeb5da..fcb1129bba1e 100644..100755
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -46,6 +46,7 @@
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
+#include "xmlreader/span.hxx"
#include "data.hxx"
#include "groupnode.hxx"
@@ -55,7 +56,6 @@
#include "node.hxx"
#include "nodemap.hxx"
#include "propertynode.hxx"
-#include "span.hxx"
#include "type.hxx"
#include "writemodfile.hxx"
@@ -342,22 +342,23 @@ void writeNode(
rtl::Reference< Node > const & parent, rtl::OUString const & name,
rtl::Reference< Node > const & node)
{
- static Span const typeNames[] = {
- Span(), Span(), Span(), // TYPE_ERROR, TYPE_NIL, TYPE_ANY
- Span(RTL_CONSTASCII_STRINGPARAM("xs:boolean")),
- Span(RTL_CONSTASCII_STRINGPARAM("xs:short")),
- Span(RTL_CONSTASCII_STRINGPARAM("xs:int")),
- Span(RTL_CONSTASCII_STRINGPARAM("xs:long")),
- Span(RTL_CONSTASCII_STRINGPARAM("xs:double")),
- Span(RTL_CONSTASCII_STRINGPARAM("xs:string")),
- Span(RTL_CONSTASCII_STRINGPARAM("xs:hexBinary")),
- Span(RTL_CONSTASCII_STRINGPARAM("oor:boolean-list")),
- Span(RTL_CONSTASCII_STRINGPARAM("oor:short-list")),
- Span(RTL_CONSTASCII_STRINGPARAM("oor:int-list")),
- Span(RTL_CONSTASCII_STRINGPARAM("oor:long-list")),
- Span(RTL_CONSTASCII_STRINGPARAM("oor:double-list")),
- Span(RTL_CONSTASCII_STRINGPARAM("oor:string-list")),
- Span(RTL_CONSTASCII_STRINGPARAM("oor:hexBinary-list")) };
+ static xmlreader::Span const typeNames[] = {
+ xmlreader::Span(), xmlreader::Span(), xmlreader::Span(),
+ // TYPE_ERROR, TYPE_NIL, TYPE_ANY
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:boolean")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:short")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:int")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:long")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:double")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:string")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("xs:hexBinary")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:boolean-list")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:short-list")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:int-list")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:long-list")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:double-list")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:string-list")),
+ xmlreader::Span(RTL_CONSTASCII_STRINGPARAM("oor:hexBinary-list")) };
switch (node->kind()) {
case Node::KIND_PROPERTY:
{
diff --git a/configmgr/source/writemodfile.hxx b/configmgr/source/writemodfile.hxx
index 0277bacdc477..0277bacdc477 100644..100755
--- a/configmgr/source/writemodfile.hxx
+++ b/configmgr/source/writemodfile.hxx
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index 06bb88858d93..7c2e21d6c6bb 100644..100755
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -38,13 +38,14 @@
#include "rtl/string.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
-#include "span.hxx"
+#include "parsemanager.hxx"
#include "xcdparser.hxx"
#include "xcsparser.hxx"
#include "xcuparser.hxx"
#include "xmldata.hxx"
-#include "xmlreader.hxx"
namespace configmgr {
@@ -60,22 +61,22 @@ XcdParser::XcdParser(int layer, Dependencies const & dependencies, Data & data):
XcdParser::~XcdParser() {}
-XmlReader::Text XcdParser::getTextMode() {
+xmlreader::XmlReader::Text XcdParser::getTextMode() {
return nestedParser_.is()
- ? nestedParser_->getTextMode() : XmlReader::TEXT_NONE;
+ ? nestedParser_->getTextMode() : xmlreader::XmlReader::TEXT_NONE;
}
bool XcdParser::startElement(
- XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+ xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
{
if (nestedParser_.is()) {
OSL_ASSERT(nesting_ != LONG_MAX);
++nesting_;
- return nestedParser_->startElement(reader, ns, name);
+ return nestedParser_->startElement(reader, nsId, name);
}
switch (state_) {
case STATE_START:
- if (ns == XmlReader::NAMESPACE_OOR &&
+ if (nsId == ParseManager::NAMESPACE_OOR &&
name.equals(RTL_CONSTASCII_STRINGPARAM("data")))
{
state_ = STATE_DEPENDENCIES;
@@ -83,18 +84,19 @@ bool XcdParser::startElement(
}
break;
case STATE_DEPENDENCIES:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("dependency")))
{
if (dependency_.getLength() == 0) {
- Span attrFile;
+ xmlreader::Span attrFile;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_NONE && //TODO: _OOR
+ if (attrNsId == xmlreader::XmlReader::NAMESPACE_NONE &&
+ //TODO: _OOR
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("file")))
{
attrFile = reader.getAttributeValue(false);
@@ -108,7 +110,7 @@ bool XcdParser::startElement(
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
- dependency_ = xmldata::convertFromUtf8(attrFile);
+ dependency_ = attrFile.convertFromUtf8();
if (dependency_.getLength() == 0) {
throw css::uno::RuntimeException(
(rtl::OUString(
@@ -128,19 +130,19 @@ bool XcdParser::startElement(
state_ = STATE_COMPONENTS;
// fall through
case STATE_COMPONENTS:
- if (ns == XmlReader::NAMESPACE_OOR &&
+ if (nsId == ParseManager::NAMESPACE_OOR &&
name.equals(RTL_CONSTASCII_STRINGPARAM("component-schema")))
{
nestedParser_ = new XcsParser(layer_, data_);
nesting_ = 1;
- return nestedParser_->startElement(reader, ns, name);
+ return nestedParser_->startElement(reader, nsId, name);
}
- if (ns == XmlReader::NAMESPACE_OOR &&
+ if (nsId == ParseManager::NAMESPACE_OOR &&
name.equals(RTL_CONSTASCII_STRINGPARAM("component-data")))
{
nestedParser_ = new XcuParser(layer_ + 1, data_, 0, 0, 0);
nesting_ = 1;
- return nestedParser_->startElement(reader, ns, name);
+ return nestedParser_->startElement(reader, nsId, name);
}
break;
default: // STATE_DEPENDENCY
@@ -149,12 +151,12 @@ bool XcdParser::startElement(
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
- xmldata::convertFromUtf8(name) +
+ name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
-void XcdParser::endElement(XmlReader const & reader) {
+void XcdParser::endElement(xmlreader::XmlReader const & reader) {
if (nestedParser_.is()) {
nestedParser_->endElement(reader);
if (--nesting_ == 0) {
@@ -175,7 +177,7 @@ void XcdParser::endElement(XmlReader const & reader) {
}
}
-void XcdParser::characters(Span const & text) {
+void XcdParser::characters(xmlreader::Span const & text) {
if (nestedParser_.is()) {
nestedParser_->characters(text);
}
diff --git a/configmgr/source/xcdparser.hxx b/configmgr/source/xcdparser.hxx
index a57646a5379d..6e98160dfeff 100644..100755
--- a/configmgr/source/xcdparser.hxx
+++ b/configmgr/source/xcdparser.hxx
@@ -35,14 +35,15 @@
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
+#include "xmlreader/xmlreader.hxx"
#include "parser.hxx"
-#include "xmlreader.hxx"
+
+namespace xmlreader { struct Span; }
namespace configmgr {
struct Data;
-struct Span;
class XcdParser: public Parser {
public:
@@ -53,14 +54,14 @@ public:
private:
virtual ~XcdParser();
- virtual XmlReader::Text getTextMode();
+ virtual xmlreader::XmlReader::Text getTextMode();
virtual bool startElement(
- XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+ xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name);
- virtual void endElement(XmlReader const & reader);
+ virtual void endElement(xmlreader::XmlReader const & reader);
- virtual void characters(Span const & text);
+ virtual void characters(xmlreader::Span const & text);
enum State {
STATE_START, STATE_DEPENDENCIES, STATE_DEPENDENCY, STATE_COMPONENTS };
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index 7d28718ff805..c558bd9864b7 100644..100755
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -42,18 +42,19 @@
#include "rtl/string.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
#include "data.hxx"
#include "localizedpropertynode.hxx"
#include "groupnode.hxx"
#include "node.hxx"
#include "nodemap.hxx"
+#include "parsemanager.hxx"
#include "propertynode.hxx"
#include "setnode.hxx"
-#include "span.hxx"
#include "xcsparser.hxx"
#include "xmldata.hxx"
-#include "xmlreader.hxx"
namespace configmgr {
@@ -126,18 +127,18 @@ XcsParser::XcsParser(int layer, Data & data):
XcsParser::~XcsParser() {}
-XmlReader::Text XcsParser::getTextMode() {
+xmlreader::XmlReader::Text XcsParser::getTextMode() {
return valueParser_.getTextMode();
}
bool XcsParser::startElement(
- XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+ xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
{
- if (valueParser_.startElement(reader, ns, name)) {
+ if (valueParser_.startElement(reader, nsId, name)) {
return true;
}
if (state_ == STATE_START) {
- if (ns == XmlReader::NAMESPACE_OOR &&
+ if (nsId == ParseManager::NAMESPACE_OOR &&
name.equals(RTL_CONSTASCII_STRINGPARAM("component-schema"))) {
handleComponentSchema(reader);
state_ = STATE_COMPONENT_SCHEMA;
@@ -149,7 +150,7 @@ bool XcsParser::startElement(
// prop constraints; accepting all four at illegal places (and with
// illegal content):
if (ignoring_ > 0 ||
- (ns == XmlReader::NAMESPACE_NONE &&
+ (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
(name.equals(RTL_CONSTASCII_STRINGPARAM("info")) ||
name.equals(RTL_CONSTASCII_STRINGPARAM("import")) ||
name.equals(RTL_CONSTASCII_STRINGPARAM("uses")) ||
@@ -161,7 +162,7 @@ bool XcsParser::startElement(
}
switch (state_) {
case STATE_COMPONENT_SCHEMA:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("templates")))
{
state_ = STATE_TEMPLATES;
@@ -169,7 +170,7 @@ bool XcsParser::startElement(
}
// fall through
case STATE_TEMPLATES_DONE:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("component")))
{
state_ = STATE_COMPONENT;
@@ -184,13 +185,13 @@ bool XcsParser::startElement(
break;
case STATE_TEMPLATES:
if (elements_.empty()) {
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("group")))
{
handleGroup(reader, true);
return true;
}
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("set")))
{
handleSet(reader, true);
@@ -204,7 +205,7 @@ bool XcsParser::startElement(
switch (elements_.top().node->kind()) {
case Node::KIND_PROPERTY:
case Node::KIND_LOCALIZED_PROPERTY:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("value")))
{
handlePropValue(reader, elements_.top().node);
@@ -212,25 +213,25 @@ bool XcsParser::startElement(
}
break;
case Node::KIND_GROUP:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("prop")))
{
handleProp(reader);
return true;
}
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("node-ref")))
{
handleNodeRef(reader);
return true;
}
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("group")))
{
handleGroup(reader, false);
return true;
}
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("set")))
{
handleSet(reader, false);
@@ -238,7 +239,7 @@ bool XcsParser::startElement(
}
break;
case Node::KIND_SET:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("item")))
{
handleSetItem(
@@ -261,12 +262,12 @@ bool XcsParser::startElement(
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
- xmldata::convertFromUtf8(name) +
+ name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) + reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
-void XcsParser::endElement(XmlReader const & reader) {
+void XcsParser::endElement(xmlreader::XmlReader const & reader) {
if (valueParser_.endElement()) {
return;
}
@@ -343,23 +344,23 @@ void XcsParser::endElement(XmlReader const & reader) {
}
}
-void XcsParser::characters(Span const & text) {
+void XcsParser::characters(xmlreader::Span const & text) {
valueParser_.characters(text);
}
-void XcsParser::handleComponentSchema(XmlReader & reader) {
+void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
//TODO: oor:version, xml:lang attributes
rtl::OStringBuffer buf;
buf.append('.');
bool hasPackage = false;
bool hasName = false;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("package")))
{
if (hasPackage) {
@@ -372,9 +373,9 @@ void XcsParser::handleComponentSchema(XmlReader & reader) {
css::uno::Reference< css::uno::XInterface >());
}
hasPackage = true;
- Span s(reader.getAttributeValue(false));
+ xmlreader::Span s(reader.getAttributeValue(false));
buf.insert(0, s.begin, s.length);
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
{
if (hasName) {
@@ -386,7 +387,7 @@ void XcsParser::handleComponentSchema(XmlReader & reader) {
css::uno::Reference< css::uno::XInterface >());
}
hasName = true;
- Span s(reader.getAttributeValue(false));
+ xmlreader::Span s(reader.getAttributeValue(false));
buf.append(s.begin, s.length);
}
}
@@ -406,38 +407,36 @@ void XcsParser::handleComponentSchema(XmlReader & reader) {
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
- componentName_ = xmldata::convertFromUtf8(
- Span(buf.getStr(), buf.getLength()));
+ componentName_ = xmlreader::Span(buf.getStr(), buf.getLength()).
+ convertFromUtf8();
}
-void XcsParser::handleNodeRef(XmlReader & reader) {
+void XcsParser::handleNodeRef(xmlreader::XmlReader & reader) {
bool hasName = false;
rtl::OUString name;
rtl::OUString component(componentName_);
bool hasNodeType = false;
rtl::OUString nodeType;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
{
hasName = true;
- name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ name = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
{
- component = xmldata::convertFromUtf8(
- reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ component = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
{
hasNodeType = true;
- nodeType = xmldata::convertFromUtf8(
- reader.getAttributeValue(false));
+ nodeType = reader.getAttributeValue(false).convertFromUtf8();
}
}
if (!hasName) {
@@ -466,33 +465,33 @@ void XcsParser::handleNodeRef(XmlReader & reader) {
elements_.push(Element(node, name));
}
-void XcsParser::handleProp(XmlReader & reader) {
+void XcsParser::handleProp(xmlreader::XmlReader & reader) {
bool hasName = false;
rtl::OUString name;
valueParser_.type_ = TYPE_ERROR;
bool localized = false;
bool nillable = true;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
{
hasName = true;
- name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ name = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
{
valueParser_.type_ = xmldata::parseType(
reader, reader.getAttributeValue(true));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("localized")))
{
localized = xmldata::parseBoolean(reader.getAttributeValue(true));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nillable")))
{
nillable = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -526,16 +525,16 @@ void XcsParser::handleProp(XmlReader & reader) {
}
void XcsParser::handlePropValue(
- XmlReader & reader, rtl::Reference< Node > const & property)
+ xmlreader::XmlReader & reader, rtl::Reference< Node > const & property)
{
- Span attrSeparator;
+ xmlreader::Span attrSeparator;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator")))
{
attrSeparator = reader.getAttributeValue(false);
@@ -554,22 +553,22 @@ void XcsParser::handlePropValue(
valueParser_.start(property);
}
-void XcsParser::handleGroup(XmlReader & reader, bool isTemplate) {
+void XcsParser::handleGroup(xmlreader::XmlReader & reader, bool isTemplate) {
bool hasName = false;
rtl::OUString name;
bool extensible = false;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
{
hasName = true;
- name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ name = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("extensible")))
{
extensible = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -593,34 +592,32 @@ void XcsParser::handleGroup(XmlReader & reader, bool isTemplate) {
name));
}
-void XcsParser::handleSet(XmlReader & reader, bool isTemplate) {
+void XcsParser::handleSet(xmlreader::XmlReader & reader, bool isTemplate) {
bool hasName = false;
rtl::OUString name;
rtl::OUString component(componentName_);
bool hasNodeType = false;
rtl::OUString nodeType;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
{
hasName = true;
- name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ name = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
{
- component = xmldata::convertFromUtf8(
- reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ component = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
{
hasNodeType = true;
- nodeType = xmldata::convertFromUtf8(
- reader.getAttributeValue(false));
+ nodeType = reader.getAttributeValue(false).convertFromUtf8();
}
}
if (!hasName) {
@@ -643,27 +640,25 @@ void XcsParser::handleSet(XmlReader & reader, bool isTemplate) {
name));
}
-void XcsParser::handleSetItem(XmlReader & reader, SetNode * set) {
+void XcsParser::handleSetItem(xmlreader::XmlReader & reader, SetNode * set) {
rtl::OUString component(componentName_);
bool hasNodeType = false;
rtl::OUString nodeType;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
{
- component = xmldata::convertFromUtf8(
- reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ component = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
{
hasNodeType = true;
- nodeType = xmldata::convertFromUtf8(
- reader.getAttributeValue(false));
+ nodeType = reader.getAttributeValue(false).convertFromUtf8();
}
}
set->getAdditionalTemplateNames().push_back(
diff --git a/configmgr/source/xcsparser.hxx b/configmgr/source/xcsparser.hxx
index 43d65a93b49a..c259a02eaec8 100644..100755
--- a/configmgr/source/xcsparser.hxx
+++ b/configmgr/source/xcsparser.hxx
@@ -35,17 +35,18 @@
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
+#include "xmlreader/xmlreader.hxx"
#include "node.hxx"
#include "parser.hxx"
#include "valueparser.hxx"
-#include "xmlreader.hxx"
+
+namespace xmlreader { struct Span; }
namespace configmgr {
class SetNode;
struct Data;
-struct Span;
class XcsParser: public Parser {
public:
@@ -54,29 +55,29 @@ public:
private:
virtual ~XcsParser();
- virtual XmlReader::Text getTextMode();
+ virtual xmlreader::XmlReader::Text getTextMode();
virtual bool startElement(
- XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+ xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name);
- virtual void endElement(XmlReader const & reader);
+ virtual void endElement(xmlreader::XmlReader const & reader);
- virtual void characters(Span const & text);
+ virtual void characters(xmlreader::Span const & text);
- void handleComponentSchema(XmlReader & reader);
+ void handleComponentSchema(xmlreader::XmlReader & reader);
- void handleNodeRef(XmlReader & reader);
+ void handleNodeRef(xmlreader::XmlReader & reader);
- void handleProp(XmlReader & reader);
+ void handleProp(xmlreader::XmlReader & reader);
void handlePropValue(
- XmlReader & reader, rtl::Reference< Node > const & property);
+ xmlreader::XmlReader & reader, rtl::Reference< Node > const & property);
- void handleGroup(XmlReader & reader, bool isTemplate);
+ void handleGroup(xmlreader::XmlReader & reader, bool isTemplate);
- void handleSet(XmlReader & reader, bool isTemplate);
+ void handleSet(xmlreader::XmlReader & reader, bool isTemplate);
- void handleSetItem(XmlReader & reader, SetNode * set);
+ void handleSetItem(xmlreader::XmlReader & reader, SetNode * set);
enum State {
STATE_START, STATE_COMPONENT_SCHEMA, STATE_TEMPLATES,
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 44eb4453332c..3a81ea4e3673 100644..100755
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -42,6 +42,8 @@
#include "rtl/string.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
#include "data.hxx"
#include "localizedpropertynode.hxx"
@@ -50,14 +52,13 @@
#include "modifications.hxx"
#include "node.hxx"
#include "nodemap.hxx"
+#include "parsemanager.hxx"
#include "partial.hxx"
#include "path.hxx"
#include "propertynode.hxx"
#include "setnode.hxx"
-#include "span.hxx"
#include "xcuparser.hxx"
#include "xmldata.hxx"
-#include "xmlreader.hxx"
namespace configmgr {
@@ -80,22 +81,22 @@ XcuParser::XcuParser(
XcuParser::~XcuParser() {}
-XmlReader::Text XcuParser::getTextMode() {
+xmlreader::XmlReader::Text XcuParser::getTextMode() {
return valueParser_.getTextMode();
}
bool XcuParser::startElement(
- XmlReader & reader, XmlReader::Namespace ns, Span const & name)
+ xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
{
- if (valueParser_.startElement(reader, ns, name)) {
+ if (valueParser_.startElement(reader, nsId, name)) {
return true;
}
if (state_.empty()) {
- if (ns == XmlReader::NAMESPACE_OOR &&
+ if (nsId == ParseManager::NAMESPACE_OOR &&
name.equals(RTL_CONSTASCII_STRINGPARAM("component-data")))
{
handleComponentData(reader);
- } else if (ns == XmlReader::NAMESPACE_OOR &&
+ } else if (nsId == ParseManager::NAMESPACE_OOR &&
name.equals(RTL_CONSTASCII_STRINGPARAM("items")))
{
state_.push(State(rtl::Reference< Node >(), false));
@@ -103,7 +104,7 @@ bool XcuParser::startElement(
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("bad root element <")) +
- xmldata::convertFromUtf8(name) +
+ name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
@@ -111,7 +112,7 @@ bool XcuParser::startElement(
} else if (state_.top().ignore) {
state_.push(State(false));
} else if (!state_.top().node.is()) {
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("item")))
{
handleItem(reader);
@@ -119,7 +120,7 @@ bool XcuParser::startElement(
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("bad items node member <")) +
- xmldata::convertFromUtf8(name) +
+ name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
@@ -127,7 +128,7 @@ bool XcuParser::startElement(
} else {
switch (state_.top().node->kind()) {
case Node::KIND_PROPERTY:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("value")))
{
handlePropValue(
@@ -138,14 +139,14 @@ bool XcuParser::startElement(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad property node member <")) +
- xmldata::convertFromUtf8(name) +
+ name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
break;
case Node::KIND_LOCALIZED_PROPERTY:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("value")))
{
handleLocpropValue(
@@ -157,7 +158,7 @@ bool XcuParser::startElement(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad localized property node member <")) +
- xmldata::convertFromUtf8(name) +
+ name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
@@ -166,18 +167,18 @@ bool XcuParser::startElement(
case Node::KIND_LOCALIZED_VALUE:
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad member <")) +
- xmldata::convertFromUtf8(name) +
+ name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
case Node::KIND_GROUP:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("prop")))
{
handleGroupProp(
reader,
dynamic_cast< GroupNode * >(state_.top().node.get()));
- } else if (ns == XmlReader::NAMESPACE_NONE &&
+ } else if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("node")))
{
handleGroupNode(reader, state_.top().node);
@@ -186,19 +187,19 @@ bool XcuParser::startElement(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"bad group node member <")) +
- xmldata::convertFromUtf8(name) +
+ name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
break;
case Node::KIND_SET:
- if (ns == XmlReader::NAMESPACE_NONE &&
+ if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("node")))
{
handleSetNode(
reader, dynamic_cast< SetNode * >(state_.top().node.get()));
- } else if (ns == XmlReader::NAMESPACE_NONE &&
+ } else if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
name.equals(RTL_CONSTASCII_STRINGPARAM("prop")))
{
OSL_TRACE(
@@ -210,7 +211,7 @@ bool XcuParser::startElement(
throw css::uno::RuntimeException(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("bad set node member <")) +
- xmldata::convertFromUtf8(name) +
+ name.convertFromUtf8() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("> in ")) +
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
@@ -221,7 +222,7 @@ bool XcuParser::startElement(
return true;
}
-void XcuParser::endElement(XmlReader const &) {
+void XcuParser::endElement(xmlreader::XmlReader const &) {
if (valueParser_.endElement()) {
return;
}
@@ -246,11 +247,11 @@ void XcuParser::endElement(XmlReader const &) {
}
}
-void XcuParser::characters(Span const & text) {
+void XcuParser::characters(xmlreader::Span const & text) {
valueParser_.characters(text);
}
-XcuParser::Operation XcuParser::parseOperation(Span const & text) {
+XcuParser::Operation XcuParser::parseOperation(xmlreader::Span const & text) {
OSL_ASSERT(text.is());
if (text.equals(RTL_CONSTASCII_STRINGPARAM("modify"))) {
return OPERATION_MODIFY;
@@ -266,11 +267,11 @@ XcuParser::Operation XcuParser::parseOperation(Span const & text) {
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid op ")) +
- xmldata::convertFromUtf8(text)),
+ text.convertFromUtf8()),
css::uno::Reference< css::uno::XInterface >());
}
-void XcuParser::handleComponentData(XmlReader & reader) {
+void XcuParser::handleComponentData(xmlreader::XmlReader & reader) {
rtl::OStringBuffer buf;
buf.append('.');
bool hasPackage = false;
@@ -278,12 +279,12 @@ void XcuParser::handleComponentData(XmlReader & reader) {
Operation op = OPERATION_MODIFY;
bool finalized = false;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("package")))
{
if (hasPackage) {
@@ -296,9 +297,9 @@ void XcuParser::handleComponentData(XmlReader & reader) {
css::uno::Reference< css::uno::XInterface >());
}
hasPackage = true;
- Span s(reader.getAttributeValue(false));
+ xmlreader::Span s(reader.getAttributeValue(false));
buf.insert(0, s.begin, s.length);
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
{
if (hasName) {
@@ -310,13 +311,13 @@ void XcuParser::handleComponentData(XmlReader & reader) {
css::uno::Reference< css::uno::XInterface >());
}
hasName = true;
- Span s(reader.getAttributeValue(false));
+ xmlreader::Span s(reader.getAttributeValue(false));
buf.append(s.begin, s.length);
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
{
op = parseOperation(reader.getAttributeValue(true));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
{
finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -338,8 +339,8 @@ void XcuParser::handleComponentData(XmlReader & reader) {
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
- componentName_ = xmldata::convertFromUtf8(
- Span(buf.getStr(), buf.getLength()));
+ componentName_ = xmlreader::Span(buf.getStr(), buf.getLength()).
+ convertFromUtf8();
if (trackPath_) {
OSL_ASSERT(path_.empty());
path_.push_back(componentName_);
@@ -381,15 +382,15 @@ void XcuParser::handleComponentData(XmlReader & reader) {
state_.push(State(node, finalizedLayer < valueParser_.getLayer()));
}
-void XcuParser::handleItem(XmlReader & reader) {
- Span attrPath;
+void XcuParser::handleItem(xmlreader::XmlReader & reader) {
+ xmlreader::Span attrPath;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("path")))
{
attrPath = reader.getAttributeValue(false);
@@ -402,7 +403,7 @@ void XcuParser::handleItem(XmlReader & reader) {
reader.getUrl()),
css::uno::Reference< css::uno::XInterface >());
}
- rtl::OUString path(xmldata::convertFromUtf8(attrPath));
+ rtl::OUString path(attrPath.convertFromUtf8());
int finalizedLayer;
rtl::Reference< Node > node(
data_.resolvePathRepresentation(
@@ -447,21 +448,23 @@ void XcuParser::handleItem(XmlReader & reader) {
state_.push(State(node, finalizedLayer < valueParser_.getLayer()));
}
-void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) {
+void XcuParser::handlePropValue(
+ xmlreader::XmlReader & reader, PropertyNode * prop)
+ {
bool nil = false;
rtl::OString separator;
rtl::OUString external;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_XSI &&
+ if (attrNsId == ParseManager::NAMESPACE_XSI &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nil")))
{
nil = xmldata::parseBoolean(reader.getAttributeValue(true));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
{
Type type = xmldata::parseType(
@@ -474,10 +477,10 @@ void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) {
css::uno::Reference< css::uno::XInterface >());
}
valueParser_.type_ = type;
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator")))
{
- Span s(reader.getAttributeValue(false));
+ xmlreader::Span s(reader.getAttributeValue(false));
if (s.length == 0) {
throw css::uno::RuntimeException(
(rtl::OUString(
@@ -487,10 +490,10 @@ void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) {
css::uno::Reference< css::uno::XInterface >());
}
separator = rtl::OString(s.begin, s.length);
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("external")))
{
- external = xmldata::convertFromUtf8(reader.getAttributeValue(true));
+ external = reader.getAttributeValue(true).convertFromUtf8();
if (external.getLength() == 0) {
throw css::uno::RuntimeException(
(rtl::OUString(
@@ -530,27 +533,27 @@ void XcuParser::handlePropValue(XmlReader & reader, PropertyNode * prop) {
}
void XcuParser::handleLocpropValue(
- XmlReader & reader, LocalizedPropertyNode * locprop)
+ xmlreader::XmlReader & reader, LocalizedPropertyNode * locprop)
{
rtl::OUString name;
bool nil = false;
rtl::OString separator;
Operation op = OPERATION_FUSE;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_XML &&
+ if (attrNsId == xmlreader::XmlReader::NAMESPACE_XML &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("lang")))
{
- name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_XSI &&
+ name = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_XSI &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("nil")))
{
nil = xmldata::parseBoolean(reader.getAttributeValue(true));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
{
Type type = xmldata::parseType(
@@ -563,10 +566,10 @@ void XcuParser::handleLocpropValue(
css::uno::Reference< css::uno::XInterface >());
}
valueParser_.type_ = type;
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("separator")))
{
- Span s(reader.getAttributeValue(false));
+ xmlreader::Span s(reader.getAttributeValue(false));
if (s.length == 0) {
throw css::uno::RuntimeException(
(rtl::OUString(
@@ -576,7 +579,7 @@ void XcuParser::handleLocpropValue(
css::uno::Reference< css::uno::XInterface >());
}
separator = rtl::OString(s.begin, s.length);
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
{
op = parseOperation(reader.getAttributeValue(true));
@@ -652,32 +655,34 @@ void XcuParser::handleLocpropValue(
}
}
-void XcuParser::handleGroupProp(XmlReader & reader, GroupNode * group) {
+void XcuParser::handleGroupProp(
+ xmlreader::XmlReader & reader, GroupNode * group)
+{
bool hasName = false;
rtl::OUString name;
Type type = TYPE_ERROR;
Operation op = OPERATION_MODIFY;
bool finalized = false;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
{
hasName = true;
- name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ name = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("type")))
{
type = xmldata::parseType(reader, reader.getAttributeValue(true));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
{
op = parseOperation(reader.getAttributeValue(true));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
{
finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -727,8 +732,8 @@ void XcuParser::handleGroupProp(XmlReader & reader, GroupNode * group) {
}
void XcuParser::handleUnknownGroupProp(
- XmlReader const & reader, GroupNode * group, rtl::OUString const & name,
- Type type, Operation operation, bool finalized)
+ xmlreader::XmlReader const & reader, GroupNode * group,
+ rtl::OUString const & name, Type type, Operation operation, bool finalized)
{
switch (operation) {
case OPERATION_REPLACE:
@@ -768,7 +773,7 @@ void XcuParser::handleUnknownGroupProp(
}
void XcuParser::handlePlainGroupProp(
- XmlReader const & reader, GroupNode * group,
+ xmlreader::XmlReader const & reader, GroupNode * group,
NodeMap::iterator const & propertyIndex, rtl::OUString const & name,
Type type, Operation operation, bool finalized)
{
@@ -822,7 +827,7 @@ void XcuParser::handlePlainGroupProp(
}
void XcuParser::handleLocalizedGroupProp(
- XmlReader const & reader, LocalizedPropertyNode * property,
+ xmlreader::XmlReader const & reader, LocalizedPropertyNode * property,
rtl::OUString const & name, Type type, Operation operation, bool finalized)
{
if (property->getLayer() > valueParser_.getLayer()) {
@@ -880,28 +885,28 @@ void XcuParser::handleLocalizedGroupProp(
}
void XcuParser::handleGroupNode(
- XmlReader & reader, rtl::Reference< Node > const & group)
+ xmlreader::XmlReader & reader, rtl::Reference< Node > const & group)
{
bool hasName = false;
rtl::OUString name;
Operation op = OPERATION_MODIFY;
bool finalized = false;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
{
hasName = true;
- name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ name = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
{
op = parseOperation(reader.getAttributeValue(true));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
{
finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -951,7 +956,7 @@ void XcuParser::handleGroupNode(
state_.top().locked || finalizedLayer < valueParser_.getLayer()));
}
-void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
+void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
bool hasName = false;
rtl::OUString name;
rtl::OUString component(componentName_);
@@ -961,36 +966,34 @@ void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
bool finalized = false;
bool mandatory = false;
for (;;) {
- XmlReader::Namespace attrNs;
- Span attrLn;
- if (!reader.nextAttribute(&attrNs, &attrLn)) {
+ int attrNsId;
+ xmlreader::Span attrLn;
+ if (!reader.nextAttribute(&attrNsId, &attrLn)) {
break;
}
- if (attrNs == XmlReader::NAMESPACE_OOR &&
+ if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("name")))
{
hasName = true;
- name = xmldata::convertFromUtf8(reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ name = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("component")))
{
- component = xmldata::convertFromUtf8(
- reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ component = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("node-type")))
{
hasNodeType = true;
- nodeType = xmldata::convertFromUtf8(
- reader.getAttributeValue(false));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ nodeType = reader.getAttributeValue(false).convertFromUtf8();
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
{
op = parseOperation(reader.getAttributeValue(true));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("finalized")))
{
finalized = xmldata::parseBoolean(reader.getAttributeValue(true));
- } else if (attrNs == XmlReader::NAMESPACE_OOR &&
+ } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
attrLn.equals(RTL_CONSTASCII_STRINGPARAM("mandatory")))
{
mandatory = xmldata::parseBoolean(reader.getAttributeValue(true));
@@ -1097,17 +1100,25 @@ void XcuParser::handleSetNode(XmlReader & reader, SetNode * set) {
}
break;
case OPERATION_REMOVE:
- // Ignore removal of unknown members, members finalized in a lower
- // layer, and members made mandatory in this or a lower layer:
- if (i != set->getMembers().end() && !state_.top().locked &&
- finalizedLayer >= valueParser_.getLayer() &&
- mandatoryLayer > valueParser_.getLayer())
{
- set->getMembers().erase(i);
+ // Ignore removal of unknown members, members finalized in a lower
+ // layer, and members made mandatory in this or a lower layer;
+ // forget about user-layer removals that no longer remove anything
+ // (so that paired additions/removals in the user layer do not grow
+ // registrymodifications.xcu unbounded):
+ bool known = i != set->getMembers().end();
+ if (known && !state_.top().locked &&
+ finalizedLayer >= valueParser_.getLayer() &&
+ mandatoryLayer > valueParser_.getLayer())
+ {
+ set->getMembers().erase(i);
+ }
+ state_.push(State(true));
+ if (known) {
+ recordModification(false);
+ }
+ break;
}
- state_.push(State(true));
- recordModification(false);
- break;
}
}
diff --git a/configmgr/source/xcuparser.hxx b/configmgr/source/xcuparser.hxx
index e4d91d3093b3..dda51d254f37 100644..100755
--- a/configmgr/source/xcuparser.hxx
+++ b/configmgr/source/xcuparser.hxx
@@ -35,6 +35,7 @@
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
+#include "xmlreader/xmlreader.hxx"
#include "additions.hxx"
#include "node.hxx"
@@ -44,7 +45,8 @@
#include "type.hxx"
#include "valueparser.hxx"
#include "xmldata.hxx"
-#include "xmlreader.hxx"
+
+namespace xmlreader { struct Span; }
namespace configmgr {
@@ -55,7 +57,6 @@ class Partial;
class PropertyNode;
class SetNode;
struct Data;
-struct Span;
class XcuParser: public Parser {
public:
@@ -66,49 +67,50 @@ public:
private:
virtual ~XcuParser();
- virtual XmlReader::Text getTextMode();
+ virtual xmlreader::XmlReader::Text getTextMode();
virtual bool startElement(
- XmlReader & reader, XmlReader::Namespace ns, Span const & name);
+ xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name);
- virtual void endElement(XmlReader const & reader);
+ virtual void endElement(xmlreader::XmlReader const & reader);
- virtual void characters(Span const & span);
+ virtual void characters(xmlreader::Span const & span);
enum Operation {
OPERATION_MODIFY, OPERATION_REPLACE, OPERATION_FUSE, OPERATION_REMOVE };
- static Operation parseOperation(Span const & text);
+ static Operation parseOperation(xmlreader::Span const & text);
- void handleComponentData(XmlReader & reader);
+ void handleComponentData(xmlreader::XmlReader & reader);
- void handleItem(XmlReader & reader);
+ void handleItem(xmlreader::XmlReader & reader);
- void handlePropValue(XmlReader & reader, PropertyNode * prop);
+ void handlePropValue(xmlreader::XmlReader & reader, PropertyNode * prop);
void handleLocpropValue(
- XmlReader & reader, LocalizedPropertyNode * locprop);
+ xmlreader::XmlReader & reader, LocalizedPropertyNode * locprop);
- void handleGroupProp(XmlReader & reader, GroupNode * group);
+ void handleGroupProp(xmlreader::XmlReader & reader, GroupNode * group);
void handleUnknownGroupProp(
- XmlReader const & reader, GroupNode * group, rtl::OUString const & name,
- Type type, Operation operation, bool finalized);
+ xmlreader::XmlReader const & reader, GroupNode * group,
+ rtl::OUString const & name, Type type, Operation operation,
+ bool finalized);
void handlePlainGroupProp(
- XmlReader const & reader, GroupNode * group,
+ xmlreader::XmlReader const & reader, GroupNode * group,
NodeMap::iterator const & propertyIndex, rtl::OUString const & name,
Type type, Operation operation, bool finalized);
void handleLocalizedGroupProp(
- XmlReader const & reader, LocalizedPropertyNode * property,
+ xmlreader::XmlReader const & reader, LocalizedPropertyNode * property,
rtl::OUString const & name, Type type, Operation operation,
bool finalized);
void handleGroupNode(
- XmlReader & reader, rtl::Reference< Node > const & group);
+ xmlreader::XmlReader & reader, rtl::Reference< Node > const & group);
- void handleSetNode(XmlReader & reader, SetNode * set);
+ void handleSetNode(xmlreader::XmlReader & reader, SetNode * set);
void recordModification(bool addition);
diff --git a/configmgr/source/xmldata.cxx b/configmgr/source/xmldata.cxx
index 07cbd6f2c8e5..5120506bfbb4 100644..100755
--- a/configmgr/source/xmldata.cxx
+++ b/configmgr/source/xmldata.cxx
@@ -41,12 +41,12 @@
#include "rtl/ref.hxx"
#include "rtl/strbuf.hxx"
#include "rtl/string.h"
-#include "rtl/textcvt.h"
-#include "rtl/textenc.h"
#include "rtl/ustrbuf.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
+#include "xmlreader/span.hxx"
+#include "xmlreader/xmlreader.hxx"
#include "data.hxx"
#include "groupnode.hxx"
@@ -58,9 +58,7 @@
#include "parser.hxx"
#include "propertynode.hxx"
#include "setnode.hxx"
-#include "span.hxx"
#include "type.hxx"
-#include "xmlreader.hxx"
namespace configmgr {
@@ -72,90 +70,88 @@ namespace css = com::sun::star;
}
-rtl::OUString convertFromUtf8(Span const & text) {
- OSL_ASSERT(text.is());
- rtl_uString * s = 0;
- if (!rtl_convertStringToUString(
- &s, text.begin, text.length, RTL_TEXTENCODING_UTF8,
- (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
- RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR |
- RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)))
- {
- throw css::uno::RuntimeException(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("cannot convert from UTF-8")),
- css::uno::Reference< css::uno::XInterface >());
- }
- return rtl::OUString(s, SAL_NO_ACQUIRE);
-}
-
-Type parseType(XmlReader const & reader, Span const & text) {
+Type parseType(
+ xmlreader::XmlReader const & reader, xmlreader::Span const & text)
+{
OSL_ASSERT(text.is());
sal_Int32 i = rtl_str_indexOfChar_WithLength(text.begin, text.length, ':');
if (i >= 0) {
- switch (reader.getNamespace(Span(text.begin, i))) {
- case XmlReader::NAMESPACE_OOR:
- if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("any")))
+ switch (reader.getNamespaceId(xmlreader::Span(text.begin, i))) {
+ case ParseManager::NAMESPACE_OOR:
+ if (xmlreader::Span(text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("any")))
{
return TYPE_ANY;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("boolean-list")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("boolean-list")))
{
return TYPE_BOOLEAN_LIST;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("short-list")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("short-list")))
{
return TYPE_SHORT_LIST;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("int-list")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("int-list")))
{
return TYPE_INT_LIST;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("long-list")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("long-list")))
{
return TYPE_LONG_LIST;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("double-list")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("double-list")))
{
return TYPE_DOUBLE_LIST;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("string-list")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("string-list")))
{
return TYPE_STRING_LIST;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("hexBinary-list")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("hexBinary-list")))
{
return TYPE_HEXBINARY_LIST;
}
break;
- case XmlReader::NAMESPACE_XS:
- if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("boolean")))
+ case ParseManager::NAMESPACE_XS:
+ if (xmlreader::Span(text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("boolean")))
{
return TYPE_BOOLEAN;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("short")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("short")))
{
return TYPE_SHORT;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("int")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("int")))
{
return TYPE_INT;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("long")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("long")))
{
return TYPE_LONG;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("double")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("double")))
{
return TYPE_DOUBLE;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("string")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("string")))
{
return TYPE_STRING;
- } else if (Span(text.begin + i + 1, text.length - (i + 1)).equals(
- RTL_CONSTASCII_STRINGPARAM("hexBinary")))
+ } else if (xmlreader::Span(
+ text.begin + i + 1, text.length - (i + 1)).
+ equals(RTL_CONSTASCII_STRINGPARAM("hexBinary")))
{
return TYPE_HEXBINARY;
}
@@ -166,11 +162,11 @@ Type parseType(XmlReader const & reader, Span const & text) {
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid type ")) +
- convertFromUtf8(text)),
+ text.convertFromUtf8()),
css::uno::Reference< css::uno::XInterface >());
}
-bool parseBoolean(Span const & text) {
+bool parseBoolean(xmlreader::Span const & text) {
OSL_ASSERT(text.is());
if (text.equals(RTL_CONSTASCII_STRINGPARAM("true"))) {
return true;
@@ -180,7 +176,7 @@ bool parseBoolean(Span const & text) {
}
throw css::uno::RuntimeException(
(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid boolean ")) +
- convertFromUtf8(text)),
+ text.convertFromUtf8()),
css::uno::Reference< css::uno::XInterface >());
}
diff --git a/configmgr/source/xmldata.hxx b/configmgr/source/xmldata.hxx
index 36034f3f962b..2b35adaae4f9 100644..100755
--- a/configmgr/source/xmldata.hxx
+++ b/configmgr/source/xmldata.hxx
@@ -34,19 +34,19 @@
#include "type.hxx"
namespace rtl { class OUString; }
+namespace xmlreader {
+ class XmlReader;
+ struct Span;
+}
namespace configmgr {
-class XmlReader;
-struct Span;
-
namespace xmldata {
-rtl::OUString convertFromUtf8(Span const & text);
-
-Type parseType(XmlReader const & reader, Span const & text);
+Type parseType(
+ xmlreader::XmlReader const & reader, xmlreader::Span const & text);
-bool parseBoolean(Span const & text);
+bool parseBoolean(xmlreader::Span const & text);
rtl::OUString parseTemplateReference(
rtl::OUString const & component, bool hasNodeType,
diff --git a/configmgr/source/xmlreader.cxx b/configmgr/source/xmlreader.cxx
index 49963ca3188a..49963ca3188a 100644..100755
--- a/configmgr/source/xmlreader.cxx
+++ b/configmgr/source/xmlreader.cxx
diff --git a/configmgr/source/xmlreader.hxx b/configmgr/source/xmlreader.hxx
index c5436fea81f7..c5436fea81f7 100644..100755
--- a/configmgr/source/xmlreader.hxx
+++ b/configmgr/source/xmlreader.hxx
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
index af8bced79837..af8bced79837 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
index fa14c7f5649a..fa14c7f5649a 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
index 451dc6b1e325..451dc6b1e325 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
index cc4faaa3cedf..cc4faaa3cedf 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
index 276119e947b6..276119e947b6 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
index 6797ab39290b..6797ab39290b 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
index 4e24cd4c9385..4e24cd4c9385 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
index 2ac4d2dbede8..2ac4d2dbede8 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
index 6b9a4db50153..6b9a4db50153 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
index ce9581b93458..ce9581b93458 100644..100755
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
diff --git a/connectivity/dbtools.pmk b/connectivity/dbtools.pmk
index df102099323d..df102099323d 100644..100755
--- a/connectivity/dbtools.pmk
+++ b/connectivity/dbtools.pmk
diff --git a/connectivity/inc/connectivity/BlobHelper.hxx b/connectivity/inc/connectivity/BlobHelper.hxx
index a50de9d8639a..a50de9d8639a 100644..100755
--- a/connectivity/inc/connectivity/BlobHelper.hxx
+++ b/connectivity/inc/connectivity/BlobHelper.hxx
diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx
index e483ab949f4a..e483ab949f4a 100644..100755
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/connectivity/inc/connectivity/ConnectionWrapper.hxx
index 1689db1f5698..1689db1f5698 100644..100755
--- a/connectivity/inc/connectivity/ConnectionWrapper.hxx
+++ b/connectivity/inc/connectivity/ConnectionWrapper.hxx
diff --git a/connectivity/inc/connectivity/DateConversion.hxx b/connectivity/inc/connectivity/DateConversion.hxx
index cbab67251e4a..cbab67251e4a 100644..100755
--- a/connectivity/inc/connectivity/DateConversion.hxx
+++ b/connectivity/inc/connectivity/DateConversion.hxx
diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx
index 97db65f3a986..97db65f3a986 100644..100755
--- a/connectivity/inc/connectivity/DriversConfig.hxx
+++ b/connectivity/inc/connectivity/DriversConfig.hxx
diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index 955f8227c74a..955f8227c74a 100644..100755
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/connectivity/inc/connectivity/IParseContext.hxx
index 16bae3465820..16bae3465820 100644..100755
--- a/connectivity/inc/connectivity/IParseContext.hxx
+++ b/connectivity/inc/connectivity/IParseContext.hxx
diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx
index 281566b5e792..7fb664ad8060 100644..100755
--- a/connectivity/inc/connectivity/PColumn.hxx
+++ b/connectivity/inc/connectivity/PColumn.hxx
@@ -126,15 +126,27 @@ namespace connectivity
class OOO_DLLPUBLIC_DBTOOLS OOrderColumn :
public OOrderColumn_BASE, public OOrderColumn_PROP
{
- sal_Bool m_bAscending;
- sal_Bool m_bOrder;
+ const sal_Bool m_bAscending;
+ const ::rtl::OUString m_sTableName;
+
protected:
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const;
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
virtual ~OOrderColumn();
public:
- OOrderColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,sal_Bool _bCase,sal_Bool _bAscending);
+ OOrderColumn(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
+ const ::rtl::OUString& i_rOriginatingTableName,
+ sal_Bool _bCase,
+ sal_Bool _bAscending
+ );
+
+ OOrderColumn(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
+ sal_Bool _bCase,
+ sal_Bool _bAscending
+ );
virtual void construct();
diff --git a/connectivity/inc/connectivity/ParameterCont.hxx b/connectivity/inc/connectivity/ParameterCont.hxx
index 64cb5faf209b..64cb5faf209b 100644..100755
--- a/connectivity/inc/connectivity/ParameterCont.hxx
+++ b/connectivity/inc/connectivity/ParameterCont.hxx
diff --git a/connectivity/inc/connectivity/SQLStatementHelper.hxx b/connectivity/inc/connectivity/SQLStatementHelper.hxx
index c64268debfd9..c64268debfd9 100644..100755
--- a/connectivity/inc/connectivity/SQLStatementHelper.hxx
+++ b/connectivity/inc/connectivity/SQLStatementHelper.hxx
diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/connectivity/inc/connectivity/StdTypeDefs.hxx
index 50dd14358347..50dd14358347 100644..100755
--- a/connectivity/inc/connectivity/StdTypeDefs.hxx
+++ b/connectivity/inc/connectivity/StdTypeDefs.hxx
diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/connectivity/inc/connectivity/TColumnsHelper.hxx
index 92d0cbd0980e..92d0cbd0980e 100644..100755
--- a/connectivity/inc/connectivity/TColumnsHelper.hxx
+++ b/connectivity/inc/connectivity/TColumnsHelper.hxx
diff --git a/connectivity/inc/connectivity/TIndex.hxx b/connectivity/inc/connectivity/TIndex.hxx
index 518bc699ef53..518bc699ef53 100644..100755
--- a/connectivity/inc/connectivity/TIndex.hxx
+++ b/connectivity/inc/connectivity/TIndex.hxx
diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx
index 8526a149d859..8526a149d859 100644..100755
--- a/connectivity/inc/connectivity/TIndexColumns.hxx
+++ b/connectivity/inc/connectivity/TIndexColumns.hxx
diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx
index 9a8296ee967b..9a8296ee967b 100644..100755
--- a/connectivity/inc/connectivity/TIndexes.hxx
+++ b/connectivity/inc/connectivity/TIndexes.hxx
diff --git a/connectivity/inc/connectivity/TKey.hxx b/connectivity/inc/connectivity/TKey.hxx
index 8d8fb089fb59..8d8fb089fb59 100644..100755
--- a/connectivity/inc/connectivity/TKey.hxx
+++ b/connectivity/inc/connectivity/TKey.hxx
diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/connectivity/inc/connectivity/TKeyColumns.hxx
index a4ab8f4c6e36..a4ab8f4c6e36 100644..100755
--- a/connectivity/inc/connectivity/TKeyColumns.hxx
+++ b/connectivity/inc/connectivity/TKeyColumns.hxx
diff --git a/connectivity/inc/connectivity/TKeys.hxx b/connectivity/inc/connectivity/TKeys.hxx
index a1e3f8b613f1..a1e3f8b613f1 100644..100755
--- a/connectivity/inc/connectivity/TKeys.hxx
+++ b/connectivity/inc/connectivity/TKeys.hxx
diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx
index 432c8b7d7f4f..432c8b7d7f4f 100644..100755
--- a/connectivity/inc/connectivity/TTableHelper.hxx
+++ b/connectivity/inc/connectivity/TTableHelper.hxx
diff --git a/connectivity/inc/connectivity/conncleanup.hxx b/connectivity/inc/connectivity/conncleanup.hxx
index 374e70af468e..374e70af468e 100644..100755
--- a/connectivity/inc/connectivity/conncleanup.hxx
+++ b/connectivity/inc/connectivity/conncleanup.hxx
diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx
index 60c96fb71a2f..60c96fb71a2f 100644..100755
--- a/connectivity/inc/connectivity/dbcharset.hxx
+++ b/connectivity/inc/connectivity/dbcharset.hxx
diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx
index 096810fab60e..9f726e19dfe1 100644..100755
--- a/connectivity/inc/connectivity/dbconversion.hxx
+++ b/connectivity/inc/connectivity/dbconversion.hxx
@@ -99,17 +99,18 @@ namespace dbtools
const double& rValue,
sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException);
- static double getValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& xVariant, const ::com::sun::star::util::Date& rNullDate,
- sal_Int16 nKeyType);
+ static double getValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& xVariant, const ::com::sun::star::util::Date& rNullDate );
// get the columnvalue as string with a default format given by the column or a default format
// for the type
- static ::rtl::OUString getValue(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
+ static ::rtl::OUString getFormattedValue(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter,
const ::com::sun::star::lang::Locale& _rLocale,
const ::com::sun::star::util::Date& rNullDate);
- static ::rtl::OUString getValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _xColumn,
+ static ::rtl::OUString getFormattedValue(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _xColumn,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter,
const ::com::sun::star::util::Date& rNullDate,
sal_Int32 nKey,
diff --git a/connectivity/inc/connectivity/dbexception.hxx b/connectivity/inc/connectivity/dbexception.hxx
index aa87f82d9b43..aa87f82d9b43 100644..100755
--- a/connectivity/inc/connectivity/dbexception.hxx
+++ b/connectivity/inc/connectivity/dbexception.hxx
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index 630065276201..630065276201 100644..100755
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index 3555025d370f..3555025d370f 100644..100755
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
diff --git a/connectivity/inc/connectivity/dbtoolsdllapi.hxx b/connectivity/inc/connectivity/dbtoolsdllapi.hxx
index f322ce343f2d..f322ce343f2d 100644..100755
--- a/connectivity/inc/connectivity/dbtoolsdllapi.hxx
+++ b/connectivity/inc/connectivity/dbtoolsdllapi.hxx
diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx
index 07a5763dd1b0..b6e537ae4568 100644..100755
--- a/connectivity/inc/connectivity/filtermanager.hxx
+++ b/connectivity/inc/connectivity/filtermanager.hxx
@@ -34,7 +34,8 @@
#include <com/sun/star/sdb/XSQLQueryComposer.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
/** === end UNO includes === **/
-#include <rtl/ustring.hxx>
+
+#include <rtl/ustrbuf.hxx>
#include <vector>
#include "connectivity/dbtoolsdllapi.hxx"
@@ -112,10 +113,10 @@ namespace dbtools
/** appends one filter component to the statement in our composer
*/
- void appendFilterComponent( ::rtl::OUString& /* [inout] */ _rAppendTo, const ::rtl::OUString& _rComponent ) const;
+ void appendFilterComponent( ::rtl::OUStringBuffer& io_appendTo, const ::rtl::OUString& i_component ) const;
/// checks whether there is only one (or even no) non-empty filter component
- bool isThereAtMostOneComponent( ::rtl::OUString& _rOnlyComponent ) const;
+ bool isThereAtMostOneComponent( ::rtl::OUStringBuffer& o_singleComponent ) const;
/// returns the index of the first filter component which should be considered when building the composed filter
inline sal_Int32 getFirstApplicableFilterIndex() const
diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
index a2ae4c3df3aa..a2ae4c3df3aa 100644..100755
--- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx
+++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx
index 765ef3814448..765ef3814448 100644..100755
--- a/connectivity/inc/connectivity/parameters.hxx
+++ b/connectivity/inc/connectivity/parameters.hxx
diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx
index aa0a502a4e52..aa0a502a4e52 100644..100755
--- a/connectivity/inc/connectivity/paramwrapper.hxx
+++ b/connectivity/inc/connectivity/paramwrapper.hxx
diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx
index 84202f85e7c2..84202f85e7c2 100644..100755
--- a/connectivity/inc/connectivity/predicateinput.hxx
+++ b/connectivity/inc/connectivity/predicateinput.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
index 769ed2107536..769ed2107536 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
index dd2787a43aab..dd2787a43aab 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
index c3262b450ca0..c3262b450ca0 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
index c5198a507b64..c5198a507b64 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
index f35459582db1..f35459582db1 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
index 37c50d9956ab..37c50d9956ab 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
index 4058e91bbc76..4058e91bbc76 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
index 8236af4bc9dc..8236af4bc9dc 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx
index 23796368d208..23796368d208 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VKey.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
index 057b989fe1f1..057b989fe1f1 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx
index fe3223ec31a4..fe3223ec31a4 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VTable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx b/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
index 41d0d2c21a25..41d0d2c21a25 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx
index 5db5249e5220..5db5249e5220 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VUser.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx
index 3684009a1268..3684009a1268 100644..100755
--- a/connectivity/inc/connectivity/sdbcx/VView.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VView.hxx
diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx
index f422bbde277a..f422bbde277a 100644..100755
--- a/connectivity/inc/connectivity/sqlerror.hxx
+++ b/connectivity/inc/connectivity/sqlerror.hxx
diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx
index 71299b857cda..71299b857cda 100644..100755
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/connectivity/inc/connectivity/sqliterator.hxx
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index f7182c34df75..f7182c34df75 100644..100755
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index e7420d6c48c3..e7420d6c48c3 100644..100755
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
diff --git a/connectivity/inc/connectivity/standardsqlstate.hxx b/connectivity/inc/connectivity/standardsqlstate.hxx
index e93448408188..e93448408188 100644..100755
--- a/connectivity/inc/connectivity/standardsqlstate.hxx
+++ b/connectivity/inc/connectivity/standardsqlstate.hxx
diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx
index dcc6aff0501a..dcc6aff0501a 100644..100755
--- a/connectivity/inc/connectivity/statementcomposer.hxx
+++ b/connectivity/inc/connectivity/statementcomposer.hxx
diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx
index d35819fa6608..fe023e2acfc9 100644..100755
--- a/connectivity/inc/connectivity/virtualdbtools.hxx
+++ b/connectivity/inc/connectivity/virtualdbtools.hxx
@@ -257,17 +257,16 @@ namespace connectivity
virtual double getValue(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant,
- const ::com::sun::star::util::Date& rNullDate,
- sal_Int16 nKeyType) const = 0;
+ const ::com::sun::star::util::Date& rNullDate ) const = 0;
- virtual ::rtl::OUString getValue(
+ virtual ::rtl::OUString getFormattedValue(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
const ::com::sun::star::util::Date& _rNullDate,
sal_Int32 _nKey,
sal_Int16 _nKeyType) const = 0;
- virtual ::rtl::OUString getValue(
+ virtual ::rtl::OUString getFormattedValue(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter,
const ::com::sun::star::lang::Locale& _rLocale,
diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/connectivity/inc/connectivity/warningscontainer.hxx
index 273390ccbf7f..273390ccbf7f 100644..100755
--- a/connectivity/inc/connectivity/warningscontainer.hxx
+++ b/connectivity/inc/connectivity/warningscontainer.hxx
diff --git a/connectivity/inc/makefile.mk b/connectivity/inc/makefile.mk
index 51a3f225b30a..51a3f225b30a 100644..100755
--- a/connectivity/inc/makefile.mk
+++ b/connectivity/inc/makefile.mk
diff --git a/connectivity/inc/pch/precompiled_connectivity.cxx b/connectivity/inc/pch/precompiled_connectivity.cxx
index e4bdb424d850..e4bdb424d850 100644..100755
--- a/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/connectivity/inc/pch/precompiled_connectivity.cxx
diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx
index 2845d35e3ef8..2845d35e3ef8 100644..100755
--- a/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/connectivity/inc/pch/precompiled_connectivity.hxx
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 3998ac825328..796e50455d9c 100644..100755
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn connectivity : shell l10n comphelper MOZ:moz svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss NULL
+cn connectivity : shell L10N:l10n comphelper MOZ:moz svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
cn connectivity usr1 - all cn_mkout NULL
cn connectivity\inc nmake - all cn_inc NULL
cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL
@@ -28,5 +28,5 @@ cn connectivity\source\parse nmake - all cn_parse cn_
cn connectivity\source\simpledbt nmake - all cn_simpledbt cn_cmtools cn_inc NULL
cn connectivity\source\dbtools nmake - all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_inc NULL
+cn connectivity\qa nmake - all cn_qa cn_inc NULL
cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
-
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index e116ee5740ac..22bffa638254 100644..100755
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -2,6 +2,7 @@
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib
..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.*
..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*
..\source\cpool\*.xml %_DEST%\xml%_EXT%\*.xml
@@ -31,3 +32,20 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess
..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
+..\%__SRC%\misc\adabas.component %_DEST%\xml%_EXT%\adabas.component
+..\%__SRC%\misc\ado.component %_DEST%\xml%_EXT%\ado.component
+..\%__SRC%\misc\calc.component %_DEST%\xml%_EXT%\calc.component
+..\%__SRC%\misc\dbase.component %_DEST%\xml%_EXT%\dbase.component
+..\%__SRC%\misc\dbpool2.component %_DEST%\xml%_EXT%\dbpool2.component
+..\%__SRC%\misc\dbtools.component %_DEST%\xml%_EXT%\dbtools.component
+..\%__SRC%\misc\evoab.component %_DEST%\xml%_EXT%\evoab.component
+..\%__SRC%\misc\flat.component %_DEST%\xml%_EXT%\flat.component
+..\%__SRC%\misc\hsqldb.component %_DEST%\xml%_EXT%\hsqldb.component
+..\%__SRC%\misc\jdbc.component %_DEST%\xml%_EXT%\jdbc.component
+..\%__SRC%\misc\kab1.component %_DEST%\xml%_EXT%\kab1.component
+..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component
+..\%__SRC%\misc\mozab.component %_DEST%\xml%_EXT%\mozab.component
+..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml%_EXT%\mozbootstrap.component
+..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component
+..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component
+..\%__SRC%\misc\sdbc2.component %_DEST%\xml%_EXT%\sdbc2.component
diff --git a/connectivity/qa/drivers/dbase/DBaseDriverTest.java b/connectivity/qa/complex/connectivity/DBaseDriverTest.java
index 2e2920b4145b..5b9e456ab367 100644..100755
--- a/connectivity/qa/drivers/dbase/DBaseDriverTest.java
+++ b/connectivity/qa/complex/connectivity/DBaseDriverTest.java
@@ -24,36 +24,18 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-package qa.drivers.dbase;
+package complex.connectivity;
-import com.sun.star.sdbc.*;
+import complex.connectivity.dbase.DBaseDateFunctions;
+import complex.connectivity.dbase.DBaseStringFunctions;
+import complex.connectivity.dbase.DBaseSqlTests;
+import complex.connectivity.dbase.DBaseNumericFunctions;
import com.sun.star.lang.XMultiServiceFactory;
import complexlib.ComplexTestCase;
-import java.util.*;
-import java.io.*;
import share.LogWriter;
-//import complex.connectivity.DBaseStringFunctions;
-public class DBaseDriverTest extends ComplexTestCase
+public class DBaseDriverTest extends ComplexTestCase implements TestCase
{
-
- private static Properties props = new Properties();
- private XDriver m_xDiver;
- private String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
-
- static
- {
- try
- {
- String propsFile = "test.properties";
- props.load(new FileInputStream(propsFile));
- }
- catch (Exception ex)
- {
- throw new RuntimeException(ex);
- }
- }
-
public String[] getTestMethodNames()
{
return new String[]
@@ -62,19 +44,21 @@ public class DBaseDriverTest extends ComplexTestCase
};
}
+ @Override
public String getTestObjectName()
{
return "DBaseDriverTest";
}
- public void assure2(String s, boolean b)
+ @Override
+ public void assure( final String i_message, final boolean i_condition )
{
- assure(s, b);
+ super.assure( i_message, i_condition );
}
public LogWriter getLog()
{
- return log;
+ return ComplexTestCase.log;
}
public void Functions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
diff --git a/connectivity/qa/complex/connectivity/FlatFileAccess.java b/connectivity/qa/complex/connectivity/FlatFileAccess.java
new file mode 100755
index 000000000000..3f0481684827
--- /dev/null
+++ b/connectivity/qa/complex/connectivity/FlatFileAccess.java
@@ -0,0 +1,237 @@
+package complex.connectivity;
+
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sdb.CommandType;
+import com.sun.star.sdbc.SQLException;
+import com.sun.star.util.Date;
+import complexlib.ComplexTestCase;
+import connectivity.tools.CsvDatabase;
+import connectivity.tools.RowSet;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FlatFileAccess extends ComplexTestCase
+{
+ public FlatFileAccess()
+ {
+ super();
+ }
+
+ @Override
+ public String[] getTestMethodNames()
+ {
+ return new String[] {
+ "testBasicAccess",
+ "testCalendarFunctions",
+ "testSortingByFunction"
+ };
+ }
+
+ @Override
+ public String getTestObjectName()
+ {
+ return "FlatFileAccess";
+ }
+
+ public void before() throws Exception
+ {
+ m_database = new CsvDatabase( (XMultiServiceFactory)param.getMSF() );
+
+ // proper settings
+ final XPropertySet dataSourceSettings = m_database.getDataSource().geSettings();
+ dataSourceSettings.setPropertyValue( "Extension", "csv" );
+ dataSourceSettings.setPropertyValue( "HeaderLine", Boolean.TRUE );
+ dataSourceSettings.setPropertyValue( "FieldDelimiter", " " );
+ m_database.store();
+
+ // write the table(s) for our test
+ final String tableLocation = m_database.getTableFileLocation().getAbsolutePath();
+ final PrintWriter tableWriter = new PrintWriter( new FileOutputStream( tableLocation + File.separatorChar + "dates.csv", false ) );
+ tableWriter.println( "ID date" );
+ tableWriter.println( "1 2013-01-01" );
+ tableWriter.println( "2 2012-02-02" );
+ tableWriter.println( "3 2011-03-03" );
+ tableWriter.close();
+ }
+
+ public void after()
+ {
+ }
+
+ private class EqualityDate extends Date
+ {
+ EqualityDate( short i_day, short i_month, short i_year )
+ {
+ super( i_day, i_month, i_year );
+ }
+
+ EqualityDate( Date i_date )
+ {
+ super( i_date.Day, i_date.Month, i_date.Year );
+ }
+
+ @Override
+ public boolean equals( Object i_compare )
+ {
+ if ( !( i_compare instanceof Date ) )
+ return false;
+ return Day == ((Date)i_compare).Day
+ && Month == ((Date)i_compare).Month
+ && Year == ((Date)i_compare).Year;
+ }
+ }
+
+ /**
+ * ensures simple SELECTs from our table(s) work, and deliver the expected results
+ */
+ public void testBasicAccess()
+ {
+ testRowSetResults(
+ "SELECT * FROM \"dates\"",
+ new RowSetIntGetter(1),
+ new Integer[] { 1, 2, 3 },
+ "simple select", "wrong IDs"
+ );
+
+ testRowSetResults(
+ "SELECT * FROM \"dates\"",
+ new RowSetDateGetter( 2 ),
+ new EqualityDate[] { new EqualityDate( (short)1, (short)1, (short)2013 ),
+ new EqualityDate( (short)2, (short)2, (short)2012 ),
+ new EqualityDate( (short)3, (short)3, (short)2011 )
+ },
+ "simple select", "wrong dates"
+ );
+ testRowSetResults(
+ "SELECT \"date\", \"ID\" FROM \"dates\" ORDER BY \"ID\" DESC",
+ new RowSetIntGetter( 2 ),
+ new Integer[] { 3, 2, 1 },
+ "explicit column selection, sorted by IDs", "wrong IDs"
+ );
+ testRowSetResults(
+ "SELECT * FROM \"dates\" ORDER BY \"date\"",
+ new RowSetIntGetter( 1 ),
+ new Integer[] { 3, 2, 1 },
+ "sorted by date", "wrong IDs"
+ );
+ }
+
+ /**
+ * ensures the basic functionality for selecting calendar functions from a CSV table - this is a prerequisite for
+ * later tests.
+ */
+ public void testCalendarFunctions()
+ {
+ // simple check for proper results of the calendar functions (DATE/MONTH)
+ // The * at the first position is crucial here - there was code which wrongly calculated
+ // column positions of function columns when * was present in the statement
+ testRowSetResults(
+ "SELECT \"dates\".*, YEAR( \"date\" ) FROM \"dates\"",
+ new RowSetIntGetter( 3 ),
+ new Integer[] { 2013, 2012, 2011 },
+ "YEAR function", "wrong calculated years"
+ );
+ testRowSetResults(
+ "SELECT \"dates\".*, MONTH( \"date\" ) FROM \"dates\"",
+ new RowSetIntGetter( 3 ),
+ new Integer[] { 1, 2, 3 },
+ "MONTH function", "wrong calculated months"
+ );
+ }
+
+ /**
+ * ensures that sorting by a function column works
+ */
+ public void testSortingByFunction()
+ {
+ // most simple case: select a function, and sort by it
+ testRowSetResults(
+ "SELECT YEAR( \"date\" ) AS \"year\" FROM \"dates\" ORDER BY \"year\"",
+ new RowSetIntGetter(1),
+ new Integer[] { 2011, 2012, 2013 },
+ "single YEAR selection, sorted by years", "wrong calculated years"
+ );
+ // somewhat more "difficult" (this used to crash): Select all columns, plus a function, so the calculated
+ // column has a position greater than column count
+ testRowSetResults(
+ "SELECT \"dates\".*, YEAR( \"date\" ) AS \"year\" FROM \"dates\" ORDER BY \"year\" DESC",
+ new RowSetIntGetter(3),
+ new Integer[] { 2013, 2012, 2011 },
+ "extended YEAR selection, sorted by years", "wrong calculated years"
+ );
+ }
+
+ private interface RowSetValueGetter
+ {
+ public Object getValue( final RowSet i_rowSet ) throws SQLException;
+ }
+
+ private abstract class RowSetColumnValueGetter implements RowSetValueGetter
+ {
+ RowSetColumnValueGetter( final int i_columnIndex )
+ {
+ m_columnIndex = i_columnIndex;
+ }
+
+ protected final int m_columnIndex;
+ }
+
+ private class RowSetIntGetter extends RowSetColumnValueGetter
+ {
+ RowSetIntGetter( final int i_columnIndex )
+ {
+ super( i_columnIndex );
+ }
+
+ public Object getValue( final RowSet i_rowSet ) throws SQLException
+ {
+ return i_rowSet.getInt( m_columnIndex );
+ }
+ }
+
+ private class RowSetDateGetter extends RowSetColumnValueGetter
+ {
+ RowSetDateGetter( final int i_columnIndex )
+ {
+ super( i_columnIndex );
+ }
+
+ public Object getValue( final RowSet i_rowSet ) throws SQLException
+ {
+ return i_rowSet.getDate( m_columnIndex );
+ }
+ }
+
+ private <T> void testRowSetResults( String i_command, RowSetValueGetter i_getter,
+ T[] i_expectedValues, String i_context, String i_failureDesc )
+ {
+ RowSet rowSet = null;
+ try
+ {
+ rowSet = m_database.createRowSet( CommandType.COMMAND, i_command );
+ rowSet.execute();
+
+ List< T > values = new ArrayList< T >();
+ while ( rowSet.next() )
+ {
+ values.add( (T)i_getter.getValue( rowSet ) );
+ }
+ assureEquals( i_context + ": " + i_failureDesc, i_expectedValues, values.toArray(), true );
+ }
+ catch( final SQLException e )
+ {
+ failed( i_context + ": caught an exception: " + e.toString(), false );
+ }
+ finally
+ {
+ if ( rowSet != null )
+ rowSet.dispose();
+ }
+ }
+
+ private CsvDatabase m_database = null;
+}
diff --git a/connectivity/qa/drivers/hsqldb/DriverTest.java b/connectivity/qa/complex/connectivity/HsqlDriverTest.java
index d343a1309a05..28ad862c4a76 100644..100755
--- a/connectivity/qa/drivers/hsqldb/DriverTest.java
+++ b/connectivity/qa/complex/connectivity/HsqlDriverTest.java
@@ -24,63 +24,50 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-package qa.drivers.hsqldb;
+package complex.connectivity;
-import com.sun.star.awt.XWindow;
+import complex.connectivity.hsqldb.TestCacheSize;
import com.sun.star.frame.XModel;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.XCloseable;
-import com.sun.star.sdbc.*;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.sdbc.XDataSource;
import com.sun.star.frame.XStorable;
import com.sun.star.lang.*;
import com.sun.star.document.XDocumentSubStorageSupplier;
import complexlib.ComplexTestCase;
-import java.io.PrintWriter;
-import util.utils;
-import java.util.*;
-import java.io.*;
-import org.hsqldb.jdbcDriver;
-import qa.drivers.hsqldb.DatabaseMetaData;
import org.hsqldb.lib.StopWatch;
-import com.sun.star.sdbc.*;
-import com.sun.star.container.XNameAccess;
import com.sun.star.uno.UnoRuntime;
-import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.PropertyState;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.embed.XStorage;
+import com.sun.star.sdbc.XDataSource;
+import com.sun.star.sdbc.XDriver;
+import connectivity.tools.HsqlDatabase;
-public class DriverTest extends ComplexTestCase {
+public class HsqlDriverTest extends ComplexTestCase {
public String[] getTestMethodNames() {
return new String[] { "test" };
}
+ @Override
public String getTestObjectName() {
return "DriverTest";
}
public void assurePublic(String sMessage,boolean check){
- addResult(sMessage,check);
+ super.assure(sMessage,check);
}
public void test(){
- mThreadTimeOut = 10000000;
XDataSource ds = null;
System.gc();
try {
- XNameAccess xNameAccess = (XNameAccess)UnoRuntime.queryInterface(XNameAccess.class,((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.sdb.DatabaseContext"));
- ds = (XDataSource)UnoRuntime.queryInterface(XDataSource.class,xNameAccess.getByName("file:///g:/test.odb"));
+ HsqlDatabase database = new HsqlDatabase( (XMultiServiceFactory)param.getMSF() );
+ ds = database.getDataSource().getXDataSource();
} catch(Exception ex) {
- throw new RuntimeException("factory: unable to construct data source" );
+ throw new RuntimeException("factory: unable to construct data source" );
}
try{
@@ -141,7 +128,6 @@ public class DriverTest extends ComplexTestCase {
}catch(Exception e){}
}
public void test2(){
- mThreadTimeOut = 10000000;
System.gc();
com.sun.star.beans.PropertyValue[] info = null;
@@ -149,7 +135,7 @@ public class DriverTest extends ComplexTestCase {
try{
info = new com.sun.star.beans.PropertyValue[]{
new com.sun.star.beans.PropertyValue("JavaDriverClass",0,"org.hsqldb.jdbcDriver",PropertyState.DIRECT_VALUE)
- ,new com.sun.star.beans.PropertyValue("ParameterNameSubstitution",0,new Boolean(false),PropertyState.DIRECT_VALUE)
+ ,new com.sun.star.beans.PropertyValue("ParameterNameSubstitution",0, false,PropertyState.DIRECT_VALUE)
};
drv = (XDriver)UnoRuntime.queryInterface(XDriver.class,((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.comp.sdbc.JDBCDriver"));
TestCacheSize test = new TestCacheSize(((XMultiServiceFactory)param.getMSF()),info,drv);
diff --git a/connectivity/qa/drivers/jdbc/LongVarCharTest.java b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
index a9c9693cbd00..7b4418a82ab5 100644..100755
--- a/connectivity/qa/drivers/jdbc/LongVarCharTest.java
+++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
@@ -40,7 +40,7 @@ import com.sun.star.sdbc.XRow;
import com.sun.star.uno.UnoRuntime;
import complexlib.ComplexTestCase;
-public class LongVarCharTest extends ComplexTestCase
+public class JdbcLongVarCharTest extends ComplexTestCase
{
public String[] getTestMethodNames()
@@ -51,6 +51,7 @@ public class LongVarCharTest extends ComplexTestCase
};
}
+ @Override
public String getTestObjectName()
{
return "LongVarCharTest";
diff --git a/connectivity/qa/complex/connectivity/SubTestCase.java b/connectivity/qa/complex/connectivity/SubTestCase.java
new file mode 100755
index 000000000000..1c2e685c5943
--- /dev/null
+++ b/connectivity/qa/complex/connectivity/SubTestCase.java
@@ -0,0 +1,23 @@
+package complex.connectivity;
+
+import share.LogWriter;
+
+public class SubTestCase implements TestCase
+{
+ protected SubTestCase( final TestCase i_parentTestCase )
+ {
+ m_parentTestCase = i_parentTestCase;
+ }
+
+ public void assure( String i_message, boolean i_condition )
+ {
+ m_parentTestCase.assure( i_message, i_condition );
+ }
+
+ public LogWriter getLog()
+ {
+ return m_parentTestCase.getLog();
+ }
+
+ private final TestCase m_parentTestCase;
+}
diff --git a/sfx2/source/config/config.src b/connectivity/qa/complex/connectivity/TestCase.java
index 02afbfae54e7..bae5fcdcb4c4 100644..100755
--- a/sfx2/source/config/config.src
+++ b/connectivity/qa/complex/connectivity/TestCase.java
@@ -24,10 +24,12 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+package complex.connectivity;
-#include <sfx2/sfx.hrc>
+import share.LogWriter;
-String STR_FILTERNAME_CFG
+public interface TestCase
{
- Text [ en-US ] = "Configuration" ;
-};
+ public void assure( final String i_message, final boolean i_condition );
+ public LogWriter getLog();
+}
diff --git a/connectivity/qa/drivers/dbase/DBaseDateFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java
index b48ae2158359..9cfc6aaaf590 100644..100755
--- a/connectivity/qa/drivers/dbase/DBaseDateFunctions.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java
@@ -24,30 +24,26 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-package qa.drivers.dbase;
+package complex.connectivity.dbase;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.sdbc.*;
import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.XMultiServiceFactory;
+import complex.connectivity.TestCase;
+import complex.connectivity.SubTestCase;
-public class DBaseDateFunctions
+public class DBaseDateFunctions extends SubTestCase
{
private final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
private final XMultiServiceFactory m_xORB;
- private final DBaseDriverTest testcase;
- public DBaseDateFunctions(final XMultiServiceFactory _xORB, final DBaseDriverTest _testcase)
+ public DBaseDateFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase)
{
+ super( i_testCase );
m_xORB = _xORB;
- testcase = _testcase;
- }
-
- private void assure(final String s, final boolean b)
- {
- testcase.assure2(s, b);
}
public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
@@ -55,7 +51,7 @@ public class DBaseDateFunctions
final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
m_xORB.createInstance("com.sun.star.sdb.RowSet"));
- testcase.getLog().println("starting DateTime function test!");
+ getLog().println("starting DateTime function test!");
// set the properties needed to connect to a database
final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("DataSourceName", "Bibliography");
@@ -289,21 +285,21 @@ public class DBaseDateFunctions
{
final XRow row = execute(xRowRes, "CURDATE() ");
final com.sun.star.util.Date aDate = row.getDate(1);
- testcase.getLog().println("CURDATE() is '" + aDate.Year + "-" + aDate.Month + "-" + aDate.Day + "'");
+ getLog().println("CURDATE() is '" + aDate.Year + "-" + aDate.Month + "-" + aDate.Day + "'");
}
private void curtime(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
{
final XRow row = execute(xRowRes, "CURTIME() ");
final com.sun.star.util.Time aTime = row.getTime(1);
- testcase.getLog().println("CURTIME() is '" + aTime.Hours + ":" + aTime.Minutes + ":" + aTime.Seconds + "'");
+ getLog().println("CURTIME() is '" + aTime.Hours + ":" + aTime.Minutes + ":" + aTime.Seconds + "'");
}
private void now(final XRowSet xRowRes) throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
{
final XRow row = execute(xRowRes, "NOW() ");
final com.sun.star.util.DateTime aTime = row.getTimestamp(1);
- testcase.getLog().println("NOW() is '" + aTime.Year + "-" + aTime.Month + "-" + aTime.Day + "'");
- testcase.getLog().println("'" + aTime.Hours + ":" + aTime.Minutes + ":" + aTime.Seconds + "'");
+ getLog().println("NOW() is '" + aTime.Year + "-" + aTime.Month + "-" + aTime.Day + "'");
+ getLog().println("'" + aTime.Hours + ":" + aTime.Minutes + ":" + aTime.Seconds + "'");
}
}
diff --git a/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
index b3c8ff014a2f..f5aec94a3c23 100644..100755
--- a/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java
@@ -24,30 +24,25 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-package qa.drivers.dbase;
+package complex.connectivity.dbase;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.sdbc.*;
import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.XMultiServiceFactory;
+import complex.connectivity.SubTestCase;
+import complex.connectivity.TestCase;
-public class DBaseNumericFunctions
+public class DBaseNumericFunctions extends SubTestCase
{
-
private final String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
private final XMultiServiceFactory m_xORB;
- private final DBaseDriverTest testcase;
- public DBaseNumericFunctions(final XMultiServiceFactory _xORB, final DBaseDriverTest _testcase)
+ public DBaseNumericFunctions(final XMultiServiceFactory _xORB, final TestCase i_testCase)
{
+ super( i_testCase );
m_xORB = _xORB;
- testcase = _testcase;
- }
-
- private void assure(final String s, final boolean b)
- {
- testcase.assure2(s, b);
}
public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
@@ -55,7 +50,7 @@ public class DBaseNumericFunctions
final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
m_xORB.createInstance("com.sun.star.sdb.RowSet"));
- testcase.getLog().println("starting Numeric function test");
+ getLog().println("starting Numeric function test");
// set the properties needed to connect to a database
final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("DataSourceName", "Bibliography");
diff --git a/connectivity/qa/drivers/dbase/DBaseSqlTests.java b/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
index c393c5a48356..1265e05e7bef 100755
--- a/connectivity/qa/drivers/dbase/DBaseSqlTests.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseSqlTests.java
@@ -24,27 +24,23 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-package qa.drivers.dbase;
+package complex.connectivity.dbase;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.sdbc.*;
import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.XMultiServiceFactory;
+import complex.connectivity.TestCase;
+import complex.connectivity.SubTestCase;
-public class DBaseSqlTests
+public class DBaseSqlTests extends SubTestCase
{
private final XMultiServiceFactory m_xORB;
- private final DBaseDriverTest testcase;
- public DBaseSqlTests(final XMultiServiceFactory _xORB,final DBaseDriverTest _testcase)
+ public DBaseSqlTests(final XMultiServiceFactory _xORB,final TestCase i_testCase)
{
+ super( i_testCase );
m_xORB = _xORB;
- testcase = _testcase;
- }
-
- private void assure(final String s,final boolean b)
- {
- testcase.assure2(s, b);
}
public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
@@ -52,7 +48,7 @@ public class DBaseSqlTests
final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
m_xORB.createInstance("com.sun.star.sdb.RowSet"));
- testcase.getLog().println("starting SQL test");
+ getLog().println("starting SQL test");
// set the properties needed to connect to a database
final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("DataSourceName", "Bibliography");
@@ -88,7 +84,7 @@ public class DBaseSqlTests
}
catch(SQLException e)
{
- testcase.getLog().println(sql + " Error: " + e.getMessage());
+ getLog().println(sql + " Error: " + e.getMessage());
}
}
diff --git a/connectivity/qa/drivers/dbase/DBaseStringFunctions.java b/connectivity/qa/complex/connectivity/dbase/DBaseStringFunctions.java
index 1d4ccf0a9b26..30b94484d53d 100644..100755
--- a/connectivity/qa/drivers/dbase/DBaseStringFunctions.java
+++ b/connectivity/qa/complex/connectivity/dbase/DBaseStringFunctions.java
@@ -24,28 +24,24 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-package qa.drivers.dbase;
+package complex.connectivity.dbase;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.sdbc.*;
import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.XMultiServiceFactory;
+import complex.connectivity.SubTestCase;
+import complex.connectivity.TestCase;
-public class DBaseStringFunctions
+public class DBaseStringFunctions extends SubTestCase
{
private String where = "FROM \"biblio\" \"biblio\" where \"Identifier\" = 'BOR00'";
private final XMultiServiceFactory m_xORB;
- private final DBaseDriverTest testcase;
- public DBaseStringFunctions(final XMultiServiceFactory _xORB,final DBaseDriverTest _testcase)
+ public DBaseStringFunctions(final XMultiServiceFactory _xORB,final TestCase i_testCase)
{
+ super( i_testCase );
m_xORB = _xORB;
- testcase = _testcase;
- }
-
- private void assure(final String s,final boolean b)
- {
- testcase.assure2(s, b);
}
public void testFunctions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException
@@ -53,7 +49,7 @@ public class DBaseStringFunctions
final XRowSet xRowRes = (XRowSet) UnoRuntime.queryInterface(XRowSet.class,
m_xORB.createInstance("com.sun.star.sdb.RowSet"));
- testcase.getLog().println("starting String function test");
+ getLog().println("starting String function test");
// set the properties needed to connect to a database
final XPropertySet xProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xRowRes);
xProp.setPropertyValue("DataSourceName", "Bibliography");
diff --git a/connectivity/qa/drivers/hsqldb/DatabaseMetaData.java b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
index f78b080aaa5a..d5fa680f06c9 100644..100755
--- a/connectivity/qa/drivers/hsqldb/DatabaseMetaData.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
@@ -8,21 +8,19 @@
*
* @author oj93728
*/
-package qa.drivers.hsqldb;
+package complex.connectivity.hsqldb;
+import complex.connectivity.HsqlDriverTest;
import java.sql.*;
-import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
import java.lang.reflect.Method;
-import qa.drivers.hsqldb.DriverTest;
public class DatabaseMetaData {
private java.sql.DatabaseMetaData m_xMD;
- private DriverTest m_TestCase;
+ private HsqlDriverTest m_TestCase;
/** Creates a new instance of DatabaseMetaData */
- public DatabaseMetaData(DriverTest _testCase,java.sql.DatabaseMetaData _xmd) {
+ public DatabaseMetaData(HsqlDriverTest _testCase,java.sql.DatabaseMetaData _xmd) {
m_TestCase = _testCase;
m_xMD = _xmd;
}
diff --git a/connectivity/qa/drivers/hsqldb/TestCacheSize.java b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index 4701905772b8..6c4db8bdeee7 100644..100755
--- a/connectivity/qa/drivers/hsqldb/TestCacheSize.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -29,24 +29,16 @@
*/
-package qa.drivers.hsqldb;
+package complex.connectivity.hsqldb;
-import java.io.*;
import org.hsqldb.lib.StopWatch;
-import org.hsqldb.lib.FileAccess;
import java.util.Random;
import com.sun.star.lang.*;
import com.sun.star.uno.UnoRuntime;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.PropertyState;
-import com.sun.star.container.XNameAccess;
import com.sun.star.sdbc.*;
-import com.sun.star.document.XDocumentSubStorageSupplier;
-import com.sun.star.embed.XStorage;
-import com.sun.star.frame.XStorable;
/**
* Test large cached tables by setting up a cached table of 100000 records
@@ -123,17 +115,17 @@ public class TestCacheSize {
XDriver drv;
com.sun.star.beans.PropertyValue[] info;
- TestCacheSize(XMultiServiceFactory _xmulti,com.sun.star.beans.PropertyValue[] _info,XDriver _drv){
+ public TestCacheSize(XMultiServiceFactory _xmulti,com.sun.star.beans.PropertyValue[] _info,XDriver _drv){
servicefactory = _xmulti;
drv = _drv;
info = _info;
}
- void setURL(String _url){
+ public void setURL(String _url){
url = _url;
}
- protected void setUp() {
+ public void setUp() {
user = "sa";
password = "";
@@ -406,9 +398,9 @@ public class TestCacheSize {
+ (i * 1000 / (sw.elapsedTime() + 1)));
}
- protected void tearDown() {}
+ public void tearDown() {}
- protected void checkResults() {
+ public void checkResults() {
try {
StopWatch sw = new StopWatch();
diff --git a/connectivity/qa/connectivity/makefile.mk b/connectivity/qa/connectivity/makefile.mk
deleted file mode 100644
index 785f20692da3..000000000000
--- a/connectivity/qa/connectivity/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..
-TARGET = GeneralTest
-PRJNAME = connectivity
-PACKAGE = complex$/connectivity
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES =\
- $(TARGET).java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS = $(PACKAGE)
-JARTARGET = $(TARGET).jar
-JARCOMPRESS = TRUE
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-ALL : ALLTAR
-.ELSE
-ALL: ALLDEP
-.ENDIF
-
-.INCLUDE : target.mk
-
-
-run:
- java -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar org.openoffice.Runner -TestBase java_complex -o complex.connectivity.$(TARGET)
-
diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java
index b47c7c7961da..65f550be5abf 100755
--- a/connectivity/qa/connectivity/tools/AbstractDatabase.java
+++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java
@@ -47,18 +47,6 @@ import java.io.File;
*/
public abstract class AbstractDatabase implements DatabaseAccess
{
- // the service factory
-
- protected final XMultiServiceFactory m_orb;
- // the URL of the temporary file used for the database document
- protected String m_databaseDocumentFile;
- // the database document
- protected XOfficeDatabaseDocument m_databaseDocument;
- // the data source belonging to the database document
- protected DataSource m_dataSource;
- // the default connection
- protected Connection m_connection;
-
public AbstractDatabase(final XMultiServiceFactory orb) throws Exception
{
m_orb = orb;
@@ -75,7 +63,6 @@ public abstract class AbstractDatabase implements DatabaseAccess
*
* Multiple calls to this method return the same connection. The DbaseDatabase object keeps
* the ownership of the connection, so you don't need to (and should not) dispose/close it.
- *
*/
public Connection defaultConnection() throws SQLException
{
@@ -219,4 +206,15 @@ public abstract class AbstractDatabase implements DatabaseAccess
closeAndDelete();
super.finalize();
}
+
+ // the service factory
+ protected final XMultiServiceFactory m_orb;
+ // the URL of the temporary file used for the database document
+ protected String m_databaseDocumentFile;
+ // the database document
+ protected XOfficeDatabaseDocument m_databaseDocument;
+ // the data source belonging to the database document
+ protected DataSource m_dataSource;
+ // the default connection
+ protected Connection m_connection;
}
diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java
index a1b457884948..a1b457884948 100644..100755
--- a/connectivity/qa/connectivity/tools/CRMDatabase.java
+++ b/connectivity/qa/connectivity/tools/CRMDatabase.java
diff --git a/connectivity/qa/connectivity/tools/CsvDatabase.java b/connectivity/qa/connectivity/tools/CsvDatabase.java
new file mode 100755
index 000000000000..f9f16a718205
--- /dev/null
+++ b/connectivity/qa/connectivity/tools/CsvDatabase.java
@@ -0,0 +1,18 @@
+package connectivity.tools;
+
+import com.sun.star.lang.XMultiServiceFactory;
+
+public class CsvDatabase extends FlatFileDatabase
+{
+ // --------------------------------------------------------------------------------------------------------
+ public CsvDatabase( final XMultiServiceFactory i_orb ) throws Exception
+ {
+ super( i_orb, "flat" );
+ }
+
+ // --------------------------------------------------------------------------------------------------------
+ protected CsvDatabase( final XMultiServiceFactory i_orb, final String i_existingDocumentURL ) throws Exception
+ {
+ super( i_orb, i_existingDocumentURL, "flat" );
+ }
+}
diff --git a/connectivity/qa/connectivity/tools/DataSource.java b/connectivity/qa/connectivity/tools/DataSource.java
index 221ada3cb487..5c06f7d69622 100644..100755
--- a/connectivity/qa/connectivity/tools/DataSource.java
+++ b/connectivity/qa/connectivity/tools/DataSource.java
@@ -69,6 +69,14 @@ public class DataSource
return m_dataSource;
}
+ /**
+ * retrieves the data source's settings
+ */
+ public XPropertySet geSettings()
+ {
+ return UnoRuntime.queryInterface( XPropertySet.class, impl_getPropertyValue( "Settings" ) );
+ }
+
/** creates a query with a given name and SQL command
*/
public void createQuery(final String _name, final String _sqlCommand) throws ElementExistException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException
@@ -121,25 +129,35 @@ public class DataSource
return suppQueries.getQueryDefinitions();
}
- /** returns the name of the data source
- *
- * If a data source is registered at the database context, the name is the registration
- * name. Otherwise, its the URL which the respective database document is based on.
- *
- * Note that the above definition is from the UNO API, not from this wrapper here.
+ /**
+ * retrieves a property value from the data source
+ * @param i_propertyName
+ * the name of the property whose value is to be returned.
*/
- public String getName()
+ private Object impl_getPropertyValue( final String i_propertyName )
{
- String name = null;
+ Object propertyValue = null;
try
{
final XPropertySet dataSourceProps = UnoRuntime.queryInterface( XPropertySet.class, m_dataSource );
- name = (String) dataSourceProps.getPropertyValue("Name");
+ propertyValue = dataSourceProps.getPropertyValue( i_propertyName );
}
catch (Exception ex)
{
Logger.getLogger(DataSource.class.getName()).log(Level.SEVERE, null, ex);
}
- return name;
+ return propertyValue;
+ }
+
+ /** returns the name of the data source
+ *
+ * If a data source is registered at the database context, the name is the registration
+ * name. Otherwise, its the URL which the respective database document is based on.
+ *
+ * Note that the above definition is from the UNO API, not from this wrapper here.
+ */
+ public String getName()
+ {
+ return (String)impl_getPropertyValue( "Name" );
}
};
diff --git a/connectivity/qa/connectivity/tools/DbaseDatabase.java b/connectivity/qa/connectivity/tools/DbaseDatabase.java
index ae40be4222aa..19a44132adf4 100755
--- a/connectivity/qa/connectivity/tools/DbaseDatabase.java
+++ b/connectivity/qa/connectivity/tools/DbaseDatabase.java
@@ -1,98 +1,18 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
package connectivity.tools;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.frame.XStorable;
import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.sdb.XOfficeDatabaseDocument;
-import com.sun.star.sdbc.SQLException;
-import com.sun.star.uno.UnoRuntime;
-import helper.URLHelper;
-import java.io.File;
-
-/**
- *
- * @author Ocke
- */
-public class DbaseDatabase extends AbstractDatabase
+public class DbaseDatabase extends FlatFileDatabase
{
// --------------------------------------------------------------------------------------------------------
-
- public DbaseDatabase(final XMultiServiceFactory orb) throws Exception
+ public DbaseDatabase( final XMultiServiceFactory i_orb ) throws Exception
{
- super(orb);
- createDBDocument();
+ super( i_orb, "dbase" );
}
// --------------------------------------------------------------------------------------------------------
- public DbaseDatabase(final XMultiServiceFactory orb, final String _existingDocumentURL) throws Exception
- {
- super(orb, _existingDocumentURL);
- }
-
- /** creates an empty database document in a temporary location
- */
- private void createDBDocument() throws Exception
- {
- final File documentFile = File.createTempFile("dbase", ".odb");
- if ( documentFile.exists() )
- documentFile.delete();
- final File subPath = new File(documentFile.getParent() + File.separator + documentFile.getName().replaceAll(".odb", "") + File.separator );
- subPath.mkdir();
- //subPath.deleteOnExit();
- m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile);
- final String path = URLHelper.getFileURLFromSystemPath(subPath.getPath());
-
- m_databaseDocument = (XOfficeDatabaseDocument) UnoRuntime.queryInterface(
- XOfficeDatabaseDocument.class, m_orb.createInstance("com.sun.star.sdb.OfficeDatabaseDocument"));
- m_dataSource = new DataSource(m_orb, m_databaseDocument.getDataSource());
-
- final XPropertySet dsProperties = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, m_databaseDocument.getDataSource());
- dsProperties.setPropertyValue("URL", "sdbc:dbase:" + path);
-
- final XStorable storable = (XStorable) UnoRuntime.queryInterface(XStorable.class, m_databaseDocument);
- storable.storeAsURL(m_databaseDocumentFile, new PropertyValue[]
- {
- });
- }
-
- /** drops the table with a given name
-
- @param _name
- the name of the table to drop
- @param _ifExists
- TRUE if it should be dropped only when it exists.
- */
- public void dropTable(final String _name,final boolean _ifExists) throws SQLException
+ protected DbaseDatabase( final XMultiServiceFactory i_orb, final String i_existingDocumentURL ) throws Exception
{
- String dropStatement = "DROP TABLE \"" + _name;
- executeSQL(dropStatement);
+ super( i_orb, i_existingDocumentURL, "dbase" );
}
}
diff --git a/connectivity/qa/connectivity/tools/FlatFileDatabase.java b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
new file mode 100755
index 000000000000..5385f1e119f6
--- /dev/null
+++ b/connectivity/qa/connectivity/tools/FlatFileDatabase.java
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+package connectivity.tools;
+
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.frame.XStorable;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.sdb.XOfficeDatabaseDocument;
+import com.sun.star.sdbc.SQLException;
+import com.sun.star.uno.UnoRuntime;
+
+import helper.URLHelper;
+import java.io.File;
+
+class FlatFileDatabase extends AbstractDatabase
+{
+ // --------------------------------------------------------------------------------------------------------
+ protected FlatFileDatabase( final XMultiServiceFactory i_orb, final String i_urlSubScheme ) throws Exception
+ {
+ super(i_orb);
+ m_urlSubScheme = i_urlSubScheme;
+ createDBDocument();
+ }
+
+ // --------------------------------------------------------------------------------------------------------
+ protected FlatFileDatabase(final XMultiServiceFactory i_orb, final String i_existingDocumentURL,
+ final String i_urlSubScheme ) throws Exception
+ {
+ super( i_orb, i_existingDocumentURL );
+ m_urlSubScheme = i_urlSubScheme;
+
+ final XPropertySet dsProperties = UnoRuntime.queryInterface(XPropertySet.class, m_databaseDocument.getDataSource());
+ final String url = (String)dsProperties.getPropertyValue( "URL" );
+ final String expectedURLPrefix = "sdbc:" + m_urlSubScheme + ":";
+ if ( !url.startsWith( expectedURLPrefix ) )
+ throw new IllegalArgumentException( i_existingDocumentURL + " is of wrong type" );
+
+ final String location = url.substring( expectedURLPrefix.length() );
+ m_tableFileLocation = new File( location );
+ if ( m_tableFileLocation.isDirectory() )
+ throw new IllegalArgumentException( "unsupported table file location (must be a folder)" );
+ }
+
+ /**
+ * returns a {@link File} which represents the folder where the database's table files reside.
+ */
+ public File getTableFileLocation()
+ {
+ return m_tableFileLocation;
+ }
+
+ /** creates an empty database document in a temporary location
+ */
+ private void createDBDocument() throws Exception
+ {
+ final File documentFile = File.createTempFile( m_urlSubScheme, ".odb" );
+ if ( documentFile.exists() )
+ documentFile.delete();
+ m_tableFileLocation = new File(documentFile.getParent() + File.separator + documentFile.getName().replace(".odb", "") + File.separator );
+ m_tableFileLocation.mkdir();
+ //subPath.deleteOnExit();
+ m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile);
+ final String path = URLHelper.getFileURLFromSystemPath( m_tableFileLocation.getPath() );
+
+ m_databaseDocument = UnoRuntime.queryInterface( XOfficeDatabaseDocument.class,
+ m_orb.createInstance("com.sun.star.sdb.OfficeDatabaseDocument"));
+ m_dataSource = new DataSource(m_orb, m_databaseDocument.getDataSource());
+
+ final XPropertySet dsProperties = UnoRuntime.queryInterface(XPropertySet.class, m_databaseDocument.getDataSource());
+ dsProperties.setPropertyValue("URL", "sdbc:" + m_urlSubScheme + ":" + path);
+
+ final XStorable storable = UnoRuntime.queryInterface( XStorable.class, m_databaseDocument );
+ storable.storeAsURL( m_databaseDocumentFile, new PropertyValue[] { } );
+ }
+
+ /** drops the table with a given name
+
+ @param _name
+ the name of the table to drop
+ @param _ifExists
+ TRUE if it should be dropped only when it exists.
+ */
+ public void dropTable(final String _name,final boolean _ifExists) throws SQLException
+ {
+ String dropStatement = "DROP TABLE \"" + _name;
+ executeSQL(dropStatement);
+ }
+
+ final String m_urlSubScheme;
+ File m_tableFileLocation = null;
+}
diff --git a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
index c0c46d07149f..c0c46d07149f 100644..100755
--- a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index 058c61e1afaa..058c61e1afaa 100644..100755
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
diff --git a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
index dcda754f8b8c..dcda754f8b8c 100644..100755
--- a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
diff --git a/connectivity/qa/connectivity/tools/QueryDefinition.java b/connectivity/qa/connectivity/tools/QueryDefinition.java
index ebc9d1a25cfe..ebc9d1a25cfe 100644..100755
--- a/connectivity/qa/connectivity/tools/QueryDefinition.java
+++ b/connectivity/qa/connectivity/tools/QueryDefinition.java
diff --git a/connectivity/qa/connectivity/tools/RowSet.java b/connectivity/qa/connectivity/tools/RowSet.java
index a26456dcc746..31d0f237a1dd 100644..100755
--- a/connectivity/qa/connectivity/tools/RowSet.java
+++ b/connectivity/qa/connectivity/tools/RowSet.java
@@ -31,6 +31,7 @@ import com.sun.star.beans.XPropertySet;
import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNameAccess;
import com.sun.star.io.XInputStream;
+import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XArray;
@@ -48,7 +49,6 @@ import com.sun.star.util.Time;
public class RowSet implements XRowSet, XRow
{
- private XMultiServiceFactory m_orb;
private XRowSet m_rowSet;
private XRow m_row;
private XPropertySet m_rowSetProps;
@@ -57,14 +57,13 @@ public class RowSet implements XRowSet, XRow
{
try
{
- m_rowSetProps = (XPropertySet)UnoRuntime.queryInterface(
- XPropertySet.class, _orb.createInstance("com.sun.star.sdb.RowSet") );
+ m_rowSetProps = UnoRuntime.queryInterface( XPropertySet.class, _orb.createInstance( "com.sun.star.sdb.RowSet" ) );
m_rowSetProps.setPropertyValue( "DataSourceName", _dataSource );
m_rowSetProps.setPropertyValue( "CommandType", new Integer( _commandType ) );
m_rowSetProps.setPropertyValue( "Command", _command );
- m_rowSet = (XRowSet)UnoRuntime.queryInterface( XRowSet.class, m_rowSetProps );
- m_row = (XRow)UnoRuntime.queryInterface( XRow.class, m_rowSetProps );
+ m_rowSet = UnoRuntime.queryInterface( XRowSet.class, m_rowSetProps );
+ m_row = UnoRuntime.queryInterface( XRow.class, m_rowSetProps );
}
catch ( Exception e )
{
@@ -289,4 +288,12 @@ public class RowSet implements XRowSet, XRow
{
return m_row.getArray(i);
}
+
+ public void dispose()
+ {
+ if ( m_rowSet == null )
+ return;
+ XComponent rowSetComp = UnoRuntime.queryInterface( XComponent.class, m_rowSet );
+ rowSetComp.dispose();
+ }
};
diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk
index 07490532a1b1..d77da7f1b945 100644..100755
--- a/connectivity/qa/connectivity/tools/makefile.mk
+++ b/connectivity/qa/connectivity/tools/makefile.mk
@@ -42,15 +42,11 @@ all:
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar
JAVAFILES := $(shell @$(FIND) . -name "*.java")
-JAVACLASSFILES := $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:d)$(i:b).class)
#----- make a jar from compiled files ------------------------------
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS = $(PACKAGE)
-JARTARGET = $(TARGET).jar
-JARCOMPRESS = TRUE
+JARCLASSDIRS = $(PACKAGE)
+JARTARGET = $(TARGET).jar
# --- Targets ------------------------------------------------------
diff --git a/connectivity/qa/connectivity/tools/sdb/Connection.java b/connectivity/qa/connectivity/tools/sdb/Connection.java
index aac120fb1e73..aac120fb1e73 100644..100755
--- a/connectivity/qa/connectivity/tools/sdb/Connection.java
+++ b/connectivity/qa/connectivity/tools/sdb/Connection.java
diff --git a/connectivity/qa/drivers/dbase/.nbattrs b/connectivity/qa/drivers/dbase/.nbattrs
deleted file mode 100644
index 1ea7ed0bd8e6..000000000000
--- a/connectivity/qa/drivers/dbase/.nbattrs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE attributes PUBLIC "-//NetBeans//DTD DefaultAttributes 1.0//EN" "http://www.netbeans.org/dtds/attributes-1_0.dtd">
-<attributes version="1.0">
- <fileobject name="DBaseDriverTest.java">
- <attr name="class_dependency_complexlib.ComplexTestCase" stringvalue="DBaseDriverTest"/>
- </fileobject>
- <fileobject name="makefile.mk">
- <attr name="org.netbeans.modules.text.IsTextFile" boolvalue="true"/>
- </fileobject>
-</attributes>
diff --git a/connectivity/qa/drivers/dbase/makefile.mk b/connectivity/qa/drivers/dbase/makefile.mk
deleted file mode 100644
index d71670d67458..000000000000
--- a/connectivity/qa/drivers/dbase/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..
-TARGET = DBaseDriverTest
-PRJNAME = connectivity
-PACKAGE = qa$/drivers$/dbase
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES =\
- DBaseDateFunctions.java\
- DBaseDriverTest.java\
- DBaseNumericFunctions.java\
- DBaseStringFunctions.java\
- DBaseSqlTests.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS = $(PACKAGE)
-JARTARGET = $(TARGET).jar
-JARCOMPRESS = TRUE
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-run: $(CLASSDIR)$/$(JARTARGET)
- java -cp "$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar" org.openoffice.Runner -TestBase java_complex -o qa.drivers.dbase.$(TARGET)
-
diff --git a/connectivity/qa/drivers/dbase/test.properties b/connectivity/qa/drivers/dbase/test.properties
deleted file mode 100644
index c26879f480f3..000000000000
--- a/connectivity/qa/drivers/dbase/test.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# x-no-translate
-Driver=org.openoffice.comp.drivers.MySQL.Driver
-user=testuser
-password=
-URL=sdbc:mysql:odbc:MYSQL fs-11110 TESTUSER
diff --git a/connectivity/qa/drivers/jdbc/makefile.mk b/connectivity/qa/makefile.mk
index e9f03ce1be3c..ee41cab63554 100644..100755
--- a/connectivity/qa/drivers/jdbc/makefile.mk
+++ b/connectivity/qa/makefile.mk
@@ -25,42 +25,48 @@
#
#*************************************************************************
-PRJ = ..$/..$/..
-TARGET = LongVarCharTest
+PRJ = ..
+TARGET = ConnectivityComplexTests
PRJNAME = connectivity
-PACKAGE = complex$/connectivity
+PACKAGE = complex/connectivity
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
-
#----- compile .java files -----------------------------------------
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES =\
- LongVarCharTest.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar
+JAVAFILES := $(shell @$(FIND) complex -name "*.java")
#----- make a jar from compiled files ------------------------------
-MAXLINELENGTH = 100000
+JARCLASSDIRS = $(PACKAGE)
+JARTARGET = $(TARGET).jar
+
+# --- Runner Settings ----------------------------------------------
-JARCLASSDIRS = $(PACKAGE)
-JARTARGET = $(TARGET).jar
-JARCOMPRESS = TRUE
+# classpath and argument list
+RUNNER_CLASSPATH = -cp "$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar"
+RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex
# --- Targets ------------------------------------------------------
.IF "$(depend)" == ""
ALL : ALLTAR
+ @echo -----------------------------------------------------
+ @echo - do a 'dmake show_targets' to show available targets
+ @echo -----------------------------------------------------
.ELSE
ALL: ALLDEP
.ENDIF
.INCLUDE : target.mk
+show_targets:
+ +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
-run:
- java -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar org.openoffice.Runner -TestBase java_complex -o complex.connectivity.$(TARGET)
+run: $(CLASSDIR)$/$(JARTARGET)
+ +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce scenarios.sce
+run_%: $(CLASSDIR)$/$(JARTARGET)
+ +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//)
diff --git a/connectivity/qa/scenarios.sce b/connectivity/qa/scenarios.sce
new file mode 100755
index 000000000000..c085f11bd7d8
--- /dev/null
+++ b/connectivity/qa/scenarios.sce
@@ -0,0 +1,4 @@
+-o complex.connectivity.DBaseDriverTest
+-o complex.connectivity.HsqlDriverTest
+#-o complex.connectivity.JdbcLongVarCharTest
+-o complex.connectivity.FlatFileAccess
diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx
index 99bdeee12131..99bdeee12131 100644..100755
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx
index 48681b61e1f9..48681b61e1f9 100644..100755
--- a/connectivity/source/commontools/BlobHelper.cxx
+++ b/connectivity/source/commontools/BlobHelper.cxx
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 43c89fb56cfd..43c89fb56cfd 100644..100755
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index dc354c24eb9b..dc354c24eb9b 100644..100755
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 531df746045f..cd335987c121 100644..100755
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -44,6 +44,7 @@
#include "diagnose_ex.h"
#include <comphelper/numbers.hxx>
#include <rtl/ustrbuf.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::connectivity;
@@ -364,56 +365,59 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
}
//------------------------------------------------------------------------------
-double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
- const Date& rNullDate,
- sal_Int16 nKeyType)
+double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const Date& i_relativeToNullDate )
{
try
{
- switch (nKeyType & ~NumberFormat::DEFINED)
+ const Reference< XPropertySet > xProp( i_column, UNO_QUERY_THROW );
+
+ const sal_Int32 nColumnType = ::comphelper::getINT32( xProp->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_TYPE ) ) );
+ switch ( nColumnType )
{
- case NumberFormat::DATE:
- return toDouble( xVariant->getDate(), rNullDate);
- case NumberFormat::DATETIME:
- return toDouble(xVariant->getTimestamp(),rNullDate);
- case NumberFormat::TIME:
- return toDouble(xVariant->getTime());
- default:
+ case DataType::DATE:
+ return toDouble( i_column->getDate(), i_relativeToNullDate );
+
+ case DataType::TIME:
+ return toDouble( i_column->getTime() );
+
+ case DataType::TIMESTAMP:
+ return toDouble( i_column->getTimestamp(), i_relativeToNullDate );
+
+ default:
{
- Reference<XPropertySet> xProp(xVariant,UNO_QUERY);
- if ( xProp.is()
- && xProp->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))
- && !::comphelper::getBOOL(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))) )
+ sal_Bool bIsSigned = sal_True;
+ OSL_VERIFY( xProp->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_ISSIGNED ) ) >>= bIsSigned );
+ if ( !bIsSigned )
{
- switch (::comphelper::getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
+ switch ( nColumnType)
{
case DataType::TINYINT:
- return static_cast<double>(static_cast<sal_uInt8>(xVariant->getByte()));
+ return static_cast<double>(static_cast<sal_uInt8>(i_column->getByte()));
case DataType::SMALLINT:
- return static_cast<double>(static_cast<sal_uInt16>(xVariant->getShort()));
+ return static_cast<double>(static_cast<sal_uInt16>(i_column->getShort()));
case DataType::INTEGER:
- return static_cast<double>(static_cast<sal_uInt32>(xVariant->getInt()));
+ return static_cast<double>(static_cast<sal_uInt32>(i_column->getInt()));
case DataType::BIGINT:
- return static_cast<double>(static_cast<sal_uInt64>(xVariant->getLong()));
+ return static_cast<double>(static_cast<sal_uInt64>(i_column->getLong()));
}
}
-
- return xVariant->getDouble();
}
+ return i_column->getDouble();
}
}
- catch(const Exception& )
+ catch( const Exception& )
{
+ DBG_UNHANDLED_EXCEPTION();
return 0.0;
}
}
//------------------------------------------------------------------------------
-::rtl::OUString DBTypeConversion::getValue(const Reference< XPropertySet>& _xColumn,
+::rtl::OUString DBTypeConversion::getFormattedValue(const Reference< XPropertySet>& _xColumn,
const Reference<XNumberFormatter>& _xFormatter,
const ::com::sun::star::lang::Locale& _rLocale,
const Date& _rNullDate)
{
- OSL_ENSURE(_xColumn.is() && _xFormatter.is(), "DBTypeConversion::getValue: invalid arg !");
+ OSL_ENSURE(_xColumn.is() && _xFormatter.is(), "DBTypeConversion::getFormattedValue: invalid arg !");
if (!_xColumn.is() || !_xFormatter.is())
return ::rtl::OUString();
@@ -424,7 +428,7 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
}
catch (const Exception& )
{
- OSL_ENSURE(false, "DBTypeConversion::getValue: caught an exception while asking for the format key!");
+ OSL_ENSURE(false, "DBTypeConversion::getFormattedValue: caught an exception while asking for the format key!");
}
if (!nKey)
@@ -440,11 +444,11 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
sal_Int16 nKeyType = getNumberFormatType(_xFormatter, nKey) & ~NumberFormat::DEFINED;
- return DBTypeConversion::getValue(Reference< XColumn > (_xColumn, UNO_QUERY), _xFormatter, _rNullDate, nKey, nKeyType);
+ return DBTypeConversion::getFormattedValue(Reference< XColumn > (_xColumn, UNO_QUERY), _xFormatter, _rNullDate, nKey, nKeyType);
}
//------------------------------------------------------------------------------
-::rtl::OUString DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
+::rtl::OUString DBTypeConversion::getFormattedValue(const Reference<XColumn>& xVariant,
const Reference<XNumberFormatter>& xFormatter,
const Date& rNullDate,
sal_Int32 nKey,
@@ -461,23 +465,20 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
case NumberFormat::DATETIME:
{
// get a value which represents the given date, relative to the given null date
- double fValue = getValue(xVariant, rNullDate, nKeyType);
+ double fValue = getValue( xVariant, rNullDate );
if ( !xVariant->wasNull() )
{
// get the null date of the formatter
Date aFormatterNullDate( rNullDate );
try
{
- Reference< XPropertySet > xFormatterSettings;
- Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier( ) );
- if ( xSupplier.is() )
- xFormatterSettings = xSupplier->getNumberFormatSettings();
- if ( xFormatterSettings.is() )
- xFormatterSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= aFormatterNullDate;
+ Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier(), UNO_SET_THROW );
+ Reference< XPropertySet > xFormatterSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW );
+ OSL_VERIFY( xFormatterSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= aFormatterNullDate );
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "DBTypeConversion::getValue: caught an exception while retrieving the formatter's NullDate!" );
+ DBG_UNHANDLED_EXCEPTION();
}
// get a value which represents the given date, relative to the null date of the formatter
fValue -= toDays( rNullDate, aFormatterNullDate );
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index cc19bce60abb..cc19bce60abb 100644..100755
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index ad915996e1e7..96ab611142c0 100644..100755
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -901,11 +901,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const
}
//---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* serviceManager, com::sun::star::registry::XRegistryKey* registryKey)
-{
- return cppu::component_writeInfoHelper(serviceManager, registryKey, entries);
-}
-//---------------------------------------------------------------------------------------
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* implName, ::com::sun::star::lang::XMultiServiceFactory* serviceManager, void* registryKey)
{
return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index 0ec2d579337b..0ec2d579337b 100644..100755
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index c33ad7ff312c..0be8ea3f49f6 100644..100755
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -33,7 +33,7 @@
#include "connectivity/FValue.hxx"
#include "connectivity/CommonTools.hxx"
#include <connectivity/dbconversion.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <rtl/ustrbuf.hxx>
#include <rtl/logfile.hxx>
@@ -1754,7 +1754,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
}
// -----------------------------------------------------------------------------
-::com::sun::star::util::Date ORowSetValue::getDate() const
+::com::sun::star::util::Date ORowSetValue::getDate() const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getDate" );
::com::sun::star::util::Date aValue;
@@ -1769,8 +1769,6 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
break;
case DataType::DECIMAL:
case DataType::NUMERIC:
- aValue = DBTypeConversion::toDate((double)*this);
- break;
case DataType::FLOAT:
case DataType::DOUBLE:
case DataType::REAL:
@@ -1788,12 +1786,28 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
aValue.Year = pDateTime->Year;
}
break;
+ case DataType::BIT:
+ case DataType::BOOLEAN:
+ case DataType::TINYINT:
+ case DataType::SMALLINT:
+ case DataType::INTEGER:
+ case DataType::BIGINT:
+ aValue = DBTypeConversion::toDate( double( sal_Int64( *this ) ) );
+ break;
+
+ case DataType::BLOB:
+ case DataType::CLOB:
+ case DataType::OBJECT:
default:
- {
- Any aAnyValue = getAny();
- aAnyValue >>= aValue;
- break;
- }
+ OSL_ENSURE( false, "ORowSetValue::getDate: cannot retrieve the data!" );
+ // NO break!
+
+ case DataType::BINARY:
+ case DataType::VARBINARY:
+ case DataType::LONGVARBINARY:
+ case DataType::TIME:
+ aValue = DBTypeConversion::toDate( (double)0 );
+ break;
}
}
return aValue;
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 294c44dc9c23..294c44dc9c23 100644..100755
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index 40e119419f2d..40e119419f2d 100644..100755
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index f6b61ffe80a6..f6b61ffe80a6 100644..100755
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index a0808ae5e852..a0808ae5e852 100644..100755
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 86d89d8698b7..86d89d8698b7 100644..100755
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index 87ed49f030ae..87ed49f030ae 100644..100755
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 2580e6d493f8..2580e6d493f8 100644..100755
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 796310d36039..796310d36039 100644..100755
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index fa67a745f2bb..fa67a745f2bb 100644..100755
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 791b735dc652..791b735dc652 100644..100755
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 01d2be6d087f..01d2be6d087f 100644..100755
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index a9e21fb27ec3..a9e21fb27ec3 100644..100755
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index 99d89b83109d..90dbf8c6487e 100644..100755
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -155,10 +155,15 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio
bDone = sal_False;
}
- if(bDataFound && bDone )
+ if(bDataFound && bDone)
{
const sal_Int32 nDriverPos = m_pHelper->getDriverPos();
- if ( ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() )
+ if ( m_bDeletedVisible )
+ {
+ if ( nDriverPos > (sal_Int32)m_aBookmarksPositions.size() )
+ m_aBookmarksPositions.push_back(nDriverPos);
+ }
+ else if ( ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() )
m_aBookmarksPositions.push_back(nDriverPos);
/*sal_Int32 nDriverPos = m_pHelper->getDriverPos();
if(m_aBookmarks.find(nDriverPos) == m_aBookmarks.end())
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 8c88dabd7099..8c88dabd7099 100644..100755
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 6a8161da314b..6a8161da314b 100644..100755
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index acf6324a10f4..acf6324a10f4 100644..100755
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index a51cc0eeef02..a51cc0eeef02 100644..100755
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 5b759e170f68..5b759e170f68 100644..100755
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index ea96f9cb0c9e..ea96f9cb0c9e 100644..100755
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index acb995978f5a..acb995978f5a 100644..100755
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index a0e8534cd60d..9ee1581c5c3b 100644..100755
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -260,7 +260,7 @@ Reference< XDataSource> getDataSource_allowException(
const ::rtl::OUString& _rsTitleOrPath,
const Reference< XMultiServiceFactory >& _rxFactory )
{
- OSL_ENSURE( _rsTitleOrPath.getLength(), "getDataSource_allowException: invalid arg !" );
+ ENSURE_OR_RETURN( _rsTitleOrPath.getLength(), "getDataSource_allowException: invalid arg !", NULL );
Reference< XNameAccess> xDatabaseContext(
_rxFactory->createInstance(
@@ -280,8 +280,9 @@ Reference< XDataSource > getDataSource(
{
xDS = getDataSource_allowException( _rsTitleOrPath, _rxFactory );
}
- catch(Exception)
+ catch( const Exception& )
{
+ DBG_UNHANDLED_EXCEPTION();
}
return xDS;
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 21b17eeec624..0e35af8434b1 100644..100755
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -586,7 +586,6 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl::
try
{
const Reference< XPropertySet> xDataSourceProperties( findDataSource( _xChild ), UNO_QUERY );
- OSL_ENSURE( xDataSourceProperties.is(), "getDataSourceSetting: invalid data source object!" );
if ( !xDataSourceProperties.is() )
return false;
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 8c3153a8b974..5e06062b1846 100644..100755
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -36,6 +36,8 @@
#include "TConnection.hxx"
#include <osl/diagnose.h>
#include "connectivity/dbtools.hxx"
+#include <tools/diagnose_ex.h>
+#include <rtl/ustrbuf.hxx>
//........................................................................
namespace dbtools
@@ -93,7 +95,7 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FilterManager::setFilterComponent: setting the filter failed!" );
+ DBG_UNHANDLED_EXCEPTION();
}
}
@@ -114,44 +116,30 @@ namespace dbtools
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "FilterManager::setApplyPublicFilter: setting the filter failed!" );
+ DBG_UNHANDLED_EXCEPTION();
}
}
//--------------------------------------------------------------------
- namespace
+ void FilterManager::appendFilterComponent( ::rtl::OUStringBuffer& io_appendTo, const ::rtl::OUString& i_component ) const
{
- void lcl_ensureBracketed( ::rtl::OUString& /* [inout] */ _rExpression )
+ if ( io_appendTo.getLength() > 0 )
{
- OSL_ENSURE( _rExpression.getLength(), "lcl_ensureBracketed: expression is empty!" );
- if ( _rExpression.getLength() )
- {
- if ( ( _rExpression.getStr()[0] != '(' ) || ( _rExpression.getStr()[ _rExpression.getLength() - 1 ] != ')' ) )
- {
- ::rtl::OUString sComposed( RTL_CONSTASCII_USTRINGPARAM( "(" ) );
- sComposed += _rExpression;
- sComposed += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
- _rExpression = sComposed;
- }
- }
+ io_appendTo.insert( 0, sal_Unicode( '(' ) );
+ io_appendTo.insert( 1, sal_Unicode( ' ' ) );
+ io_appendTo.appendAscii( " ) AND " );
}
- }
- //--------------------------------------------------------------------
- void FilterManager::appendFilterComponent( ::rtl::OUString& /* [inout] */ _rAppendTo, const ::rtl::OUString& _rComponent ) const
- {
- if ( _rAppendTo.getLength() )
- _rAppendTo += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " AND " ) );
- ::rtl::OUString sComponent( _rComponent );
- lcl_ensureBracketed( sComponent );
- _rAppendTo += sComponent;
+ io_appendTo.appendAscii( "( " );
+ io_appendTo.append( i_component );
+ io_appendTo.appendAscii( " )" );
}
//--------------------------------------------------------------------
- bool FilterManager::isThereAtMostOneComponent( ::rtl::OUString& _rOnlyComponent ) const
+ bool FilterManager::isThereAtMostOneComponent( ::rtl::OUStringBuffer& o_singleComponent ) const
{
sal_Int32 nOnlyNonEmpty = -1;
- sal_Int32 i;
+ sal_Int32 i;
for ( i = getFirstApplicableFilterIndex(); i < FC_COMPONENT_COUNT; ++i )
{
if ( m_aFilterComponents[ i ].getLength() )
@@ -165,14 +153,14 @@ namespace dbtools
}
if ( nOnlyNonEmpty == -1 )
{
- _rOnlyComponent = ::rtl::OUString();
+ o_singleComponent.makeStringAndClear();
return true;
}
if ( i == FC_COMPONENT_COUNT )
{
// we found only one non-empty filter component
- _rOnlyComponent = m_aFilterComponents[ nOnlyNonEmpty ];
+ o_singleComponent = m_aFilterComponents[ nOnlyNonEmpty ];
return true;
}
return false;
@@ -181,17 +169,17 @@ namespace dbtools
//--------------------------------------------------------------------
::rtl::OUString FilterManager::getComposedFilter( ) const
{
- ::rtl::OUString sComposedFilter;
+ ::rtl::OUStringBuffer aComposedFilter;
// if we have only one non-empty component, then there's no need to compose anything
- if ( isThereAtMostOneComponent( sComposedFilter ) )
- return sComposedFilter;
-
- // append the single components
- for ( sal_Int32 i = getFirstApplicableFilterIndex(); i < FC_COMPONENT_COUNT; ++i )
- appendFilterComponent( sComposedFilter, m_aFilterComponents[ i ] );
+ if ( !isThereAtMostOneComponent( aComposedFilter ) )
+ {
+ // append the single components
+ for ( sal_Int32 i = getFirstApplicableFilterIndex(); i < FC_COMPONENT_COUNT; ++i )
+ appendFilterComponent( aComposedFilter, m_aFilterComponents[ i ] );
+ }
- return sComposedFilter;
+ return aComposedFilter.makeStringAndClear();
}
//........................................................................
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index feb45e5d38b4..ef7a06abe2c7 100644..100755
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -328,7 +328,7 @@ namespace dbtools
{
if ( m_pData->m_bNumericField )
{
- sStringValue = DBTypeConversion::getValue(
+ sStringValue = DBTypeConversion::getFormattedValue(
m_pData->m_xColumn, m_pData->m_xFormatter, m_pData->m_aNullDate, m_pData->m_nFormatKey, m_pData->m_nKeyType
);
}
diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk
index cab216092241..cab216092241 100644..100755
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 09ebd2096b9c..09ebd2096b9c 100644..100755
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index b652f2662cf9..b652f2662cf9 100644..100755
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 2a95477918c7..2a95477918c7 100644..100755
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index 09f7328be01f..09f7328be01f 100644..100755
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 59abac1d1016..59abac1d1016 100644..100755
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index ba8ba3819e47..ba8ba3819e47 100644..100755
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index f0ed7b0aa7b3..f0ed7b0aa7b3 100644..100755
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 3e63d401a735..3e63d401a735 100644..100755
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 8c3de660c8a3..8c3de660c8a3 100644..100755
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx
index fe3af73de4aa..fe3af73de4aa 100644..100755
--- a/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.cxx
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index afc2e19aeb5f..afc2e19aeb5f 100644..100755
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index 3d577d86deb5..3d577d86deb5 100644..100755
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index 1681f117f5ec..1681f117f5ec 100644..100755
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 9ebdd3f08272..9ebdd3f08272 100644..100755
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index ec318a530fd6..ec318a530fd6 100644..100755
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index 67cdace1a525..67cdace1a525 100644..100755
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index ccfffa870b9a..ccfffa870b9a 100644..100755
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index 738096bca750..1377704a0a2c 100644..100755
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -51,35 +51,6 @@ extern "C"
}
//---------------------------------------------------------------------------------------
-sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey)
-{
- ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
- sMainKeyName += OPoolCollection::getImplementationName_Static();
- sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- try
- {
- Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName);
- if (!xMainKey.is())
- return sal_False;
-
- Sequence< ::rtl::OUString > sServices = OPoolCollection::getSupportedServiceNames_Static();
- const ::rtl::OUString* pServices = sServices.getConstArray();
- for (sal_Int32 i=0; i<sServices.getLength(); ++i, ++pServices)
- xMainKey->createKey(*pServices);
- }
- catch(InvalidRegistryException&)
- {
- return sal_False;
- }
- catch(InvalidValueException&)
- {
- return sal_False;
- }
- return sal_True;
-}
-
-//---------------------------------------------------------------------------------------
void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
{
void* pRet = NULL;
diff --git a/connectivity/source/cpool/dbpool.xml b/connectivity/source/cpool/dbpool.xml
index 271423222641..271423222641 100644..100755
--- a/connectivity/source/cpool/dbpool.xml
+++ b/connectivity/source/cpool/dbpool.xml
diff --git a/connectivity/source/cpool/dbpool2.component b/connectivity/source/cpool/dbpool2.component
new file mode 100755
index 000000000000..2fa8a144959c
--- /dev/null
+++ b/connectivity/source/cpool/dbpool2.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.sdbc.OConnectionPool">
+ <service name="com.sun.star.sdbc.ConnectionPool"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/cpool/exports.dxp b/connectivity/source/cpool/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/cpool/exports.dxp
+++ b/connectivity/source/cpool/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk
index 393a797d2c66..45ec3727ea3b 100644..100755
--- a/connectivity/source/cpool/makefile.mk
+++ b/connectivity/source/cpool/makefile.mk
@@ -78,4 +78,10 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : target.mk
+ALLTAR : $(MISC)/dbpool2.component
+$(MISC)/dbpool2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ dbpool2.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt dbpool2.component
diff --git a/connectivity/source/dbtools/dbt.xml b/connectivity/source/dbtools/dbt.xml
index e2f8c8921c18..e2f8c8921c18 100644..100755
--- a/connectivity/source/dbtools/dbt.xml
+++ b/connectivity/source/dbtools/dbt.xml
diff --git a/connectivity/source/dbtools/dbtools.component b/connectivity/source/dbtools/dbtools.component
new file mode 100755
index 000000000000..08be953bb9d4
--- /dev/null
+++ b/connectivity/source/dbtools/dbtools.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="org.openoffice.comp.helper.DatabaseMetaDataResultSet">
+ <service name="com.sun.star.sdbc.ResultSet"/>
+ </implementation>
+ <implementation name="org.openoffice.comp.helper.ParameterSubstitution">
+ <service name="com.sun.star.sdb.ParameterSubstitution"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/dbtools/exports.dxp b/connectivity/source/dbtools/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/dbtools/exports.dxp
+++ b/connectivity/source/dbtools/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index 294c9a02f37f..90237153de77 100644..100755
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -94,3 +94,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
@echo _TI >$@
@echo _real >>$@
+
+ALLTAR : $(MISC)/dbtools.component
+
+$(MISC)/dbtools.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ dbtools.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt dbtools.component
diff --git a/connectivity/source/drivers/adabas/BCatalog.cxx b/connectivity/source/drivers/adabas/BCatalog.cxx
index e04f4d3a9373..e04f4d3a9373 100644..100755
--- a/connectivity/source/drivers/adabas/BCatalog.cxx
+++ b/connectivity/source/drivers/adabas/BCatalog.cxx
diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx
index 227646beeb9b..227646beeb9b 100644..100755
--- a/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/connectivity/source/drivers/adabas/BColumns.cxx
diff --git a/connectivity/source/drivers/adabas/BConnection.cxx b/connectivity/source/drivers/adabas/BConnection.cxx
index 33923c56a69d..33923c56a69d 100644..100755
--- a/connectivity/source/drivers/adabas/BConnection.cxx
+++ b/connectivity/source/drivers/adabas/BConnection.cxx
diff --git a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
index 2dbd6b22266b..2dbd6b22266b 100644..100755
--- a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 810b519e28b1..f692d50b8069 100644..100755
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -66,9 +66,7 @@
#include <memory>
#include <sys/stat.h>
-#if defined(MAC)
-const char sNewLine = '\015';
-#elif defined(UNX)
+#if defined(UNX)
const char sNewLine = '\012';
#else
const char sNewLine[] = "\015\012"; // \015\012 and not \n
@@ -873,7 +871,7 @@ void ODriver::createNeededDirs(const ::rtl::OUString& sDBName)
if(UCBContentHelper::Exists(sTemp))
UCBContentHelper::Kill(sTemp);
-#if !(defined(WIN) || defined(WNT))
+#if !(defined(WNT))
sTemp = sDBConfig;
sTemp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diag"));
if(!UCBContentHelper::IsFolder(sTemp))
@@ -895,7 +893,7 @@ void ODriver::createNeededDirs(const ::rtl::OUString& sDBName)
void ODriver::clearDatabase(const ::rtl::OUString& sDBName)
{ // stop the database
::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
::rtl::OUString sStop = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stop"));
const sal_uInt32 nArgsCount = 2;
rtl_uString *pArgs[nArgsCount] = { sDBName.pData, sStop.pData };
@@ -944,7 +942,7 @@ void ODriver::createDb( const TDatabaseStruct& _aInfo)
PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KERNELTRACESIZE")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("100")));
PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LOG_QUEUE_PAGES")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10")));
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OPMSG1")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/dev/null")));
#endif
@@ -1012,7 +1010,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME,
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
pFileStream->Seek(STREAM_SEEK_TO_END);
(*pFileStream) << "x_param"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
<< ".exe"
#endif
<< " -d "
@@ -1023,7 +1021,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME,
<< ::rtl::OString(_PWD,_PWD.getLength(),gsl_getSystemTextEncoding())
<< " "
<< ::rtl::OString(_CMD,_CMD.getLength(),gsl_getSystemTextEncoding())
-#if (defined(WIN) || defined(WNT))
+#if defined(WNT)
#if (OSL_DEBUG_LEVEL > 1) || defined(DBG_UTIL)
<< " >> %DBWORK%\\create.log 2>&1"
#endif
@@ -1079,7 +1077,7 @@ void ODriver::PutParam(const ::rtl::OUString& sDBName,
rtl_uString* pArgs[nArgsCount] = { sDBName.pData, rWhat.pData, rHow.pData };
::rtl::OUString sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("putparam"));
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
sCommand += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe"));
#endif
@@ -1146,7 +1144,7 @@ OSL_TRACE("CreateFile %d",_nSize);
int ODriver::X_START(const ::rtl::OUString& sDBName)
{
::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d"));
::rtl::OUString sArg3 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
@@ -1191,7 +1189,7 @@ int ODriver::X_START(const ::rtl::OUString& sDBName)
int ODriver::X_STOP(const ::rtl::OUString& sDBName)
{
::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d"));
::rtl::OUString sArg2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
@@ -1243,7 +1241,7 @@ void ODriver::XUTIL(const ::rtl::OUString& _rParam,
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
pFileStream->Seek(STREAM_SEEK_TO_END);
(*pFileStream) <<
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
"xutil.exe"
#else
"utility"
@@ -1301,7 +1299,7 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName,
::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
pFileStream->Seek(STREAM_SEEK_TO_END);
(*pFileStream) << "xload"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
<< ".exe"
#endif
<< " -d "
@@ -1375,7 +1373,7 @@ void ODriver::fillEnvironmentVariables()
::rtl::OUString ODriver::generateInitFile() const
{
String sExt;
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
sExt = String::CreateFromAscii(".sh");
#else
sExt = String::CreateFromAscii(".bat");
@@ -1383,13 +1381,13 @@ void ODriver::fillEnvironmentVariables()
String sWorkUrl(m_sDbWorkURL);
::utl::TempFile aCmdFile(String::CreateFromAscii("Init"),&sExt,&sWorkUrl);
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
String sPhysicalPath;
LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath);
chmod(ByteString(sPhysicalPath,gsl_getSystemTextEncoding()).GetBuffer(),S_IRUSR|S_IWUSR|S_IXUSR);
#endif
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
SvStream* pFileStream = aCmdFile.GetStream(STREAM_WRITE);
(*pFileStream) << "#!/bin/sh"
<< sNewLine
@@ -1499,7 +1497,7 @@ void ODriver::X_CONS(const ::rtl::OUString& sDBName,const ::rtl::OString& _ACTIO
pFileStream->Seek(STREAM_SEEK_TO_END);
(*pFileStream) << "x_cons"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
<< ".exe"
#endif
<< " "
@@ -1586,7 +1584,7 @@ sal_Bool ODriver::isVersion(const ::rtl::OUString& sDBName, const char* _pVersio
pFileStream->Seek(STREAM_SEEK_TO_END);
(*pFileStream) << "getparam"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
<< ".exe"
#endif
<< " "
@@ -1640,7 +1638,7 @@ void ODriver::checkAndInsertNewDevSpace(const ::rtl::OUString& sDBName,
pFileStream->Seek(STREAM_SEEK_TO_END);
(*pFileStream) << "getparam"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
<< ".exe"
#endif
<< " "
@@ -1726,7 +1724,7 @@ sal_Bool ODriver::isKernelVersion(const char* _pVersion)
// -----------------------------------------------------------------------------
void ODriver::installSystemTables( const TDatabaseStruct& _aInfo)
{
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
// xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% -b %m_sDbRoot%\env\TERMCHAR.ind
::rtl::OUString aBatch = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-b "));
::rtl::OUString sTemp2 = m_sDbRootURL + m_sDelimit
diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx
index 9834a9b63bed..0a10de3f6f55 100644..100755
--- a/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -130,7 +130,7 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
}
const sal_Char* pLibraryAsciiName = NULL;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
pLibraryAsciiName = "SQLOD32.DLL";
#elif ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX)
pLibraryAsciiName = "odbclib.so";
diff --git a/connectivity/source/drivers/adabas/BGroup.cxx b/connectivity/source/drivers/adabas/BGroup.cxx
index 64582b42432b..64582b42432b 100644..100755
--- a/connectivity/source/drivers/adabas/BGroup.cxx
+++ b/connectivity/source/drivers/adabas/BGroup.cxx
diff --git a/connectivity/source/drivers/adabas/BGroups.cxx b/connectivity/source/drivers/adabas/BGroups.cxx
index 0211a0a7f5aa..0211a0a7f5aa 100644..100755
--- a/connectivity/source/drivers/adabas/BGroups.cxx
+++ b/connectivity/source/drivers/adabas/BGroups.cxx
diff --git a/connectivity/source/drivers/adabas/BIndex.cxx b/connectivity/source/drivers/adabas/BIndex.cxx
index 7374aded7c5f..7374aded7c5f 100644..100755
--- a/connectivity/source/drivers/adabas/BIndex.cxx
+++ b/connectivity/source/drivers/adabas/BIndex.cxx
diff --git a/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx
index 7365d4c66581..7365d4c66581 100644..100755
--- a/connectivity/source/drivers/adabas/BIndexColumns.cxx
+++ b/connectivity/source/drivers/adabas/BIndexColumns.cxx
diff --git a/connectivity/source/drivers/adabas/BIndexes.cxx b/connectivity/source/drivers/adabas/BIndexes.cxx
index b338dfa8c435..b338dfa8c435 100644..100755
--- a/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/connectivity/source/drivers/adabas/BIndexes.cxx
diff --git a/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx
index 97c38d818efa..97c38d818efa 100644..100755
--- a/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/connectivity/source/drivers/adabas/BKeys.cxx
diff --git a/connectivity/source/drivers/adabas/BPreparedStatement.cxx b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
index c217f660d67b..c217f660d67b 100644..100755
--- a/connectivity/source/drivers/adabas/BPreparedStatement.cxx
+++ b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
diff --git a/connectivity/source/drivers/adabas/BResultSet.cxx b/connectivity/source/drivers/adabas/BResultSet.cxx
index 4ce890994092..4ce890994092 100644..100755
--- a/connectivity/source/drivers/adabas/BResultSet.cxx
+++ b/connectivity/source/drivers/adabas/BResultSet.cxx
diff --git a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
index 18605f519549..18605f519549 100644..100755
--- a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/adabas/BStatement.cxx b/connectivity/source/drivers/adabas/BStatement.cxx
index 6f5cf4028b90..6f5cf4028b90 100644..100755
--- a/connectivity/source/drivers/adabas/BStatement.cxx
+++ b/connectivity/source/drivers/adabas/BStatement.cxx
diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx
index 512bfbd5ec11..512bfbd5ec11 100644..100755
--- a/connectivity/source/drivers/adabas/BTable.cxx
+++ b/connectivity/source/drivers/adabas/BTable.cxx
diff --git a/connectivity/source/drivers/adabas/BTables.cxx b/connectivity/source/drivers/adabas/BTables.cxx
index 8689ef8b87f7..8689ef8b87f7 100644..100755
--- a/connectivity/source/drivers/adabas/BTables.cxx
+++ b/connectivity/source/drivers/adabas/BTables.cxx
diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx
index 42b72be0138d..42b72be0138d 100644..100755
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
diff --git a/connectivity/source/drivers/adabas/BUsers.cxx b/connectivity/source/drivers/adabas/BUsers.cxx
index 5ca28331d904..5ca28331d904 100644..100755
--- a/connectivity/source/drivers/adabas/BUsers.cxx
+++ b/connectivity/source/drivers/adabas/BUsers.cxx
diff --git a/connectivity/source/drivers/adabas/BViews.cxx b/connectivity/source/drivers/adabas/BViews.cxx
index 4914c08f2902..4914c08f2902 100644..100755
--- a/connectivity/source/drivers/adabas/BViews.cxx
+++ b/connectivity/source/drivers/adabas/BViews.cxx
diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx
index f18c5a65ec8f..082cddca89f5 100644..100755
--- a/connectivity/source/drivers/adabas/Bservices.cxx
+++ b/connectivity/source/drivers/adabas/Bservices.cxx
@@ -30,13 +30,11 @@
#include "precompiled_connectivity.hxx"
#include "adabas/BDriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::adabas;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pT
);
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- ODriver::getImplementationName_Static(),
- ODriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/adabas/adabas.component b/connectivity/source/drivers/adabas/adabas.component
new file mode 100755
index 000000000000..3c359c3d0217
--- /dev/null
+++ b/connectivity/source/drivers/adabas/adabas.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdbcx.adabas.ODriver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ <service name="com.sun.star.sdbcx.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/adabas/adabas.mxp.map b/connectivity/source/drivers/adabas/adabas.mxp.map
index 2ce9f111412b..f64c44c13fce 100644..100755
--- a/connectivity/source/drivers/adabas/adabas.mxp.map
+++ b/connectivity/source/drivers/adabas/adabas.mxp.map
@@ -1,5 +1,4 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
__mh_dylib_header
___builtin_delete
diff --git a/connectivity/source/drivers/adabas/adabas.xml b/connectivity/source/drivers/adabas/adabas.xml
index a8740023988b..a8740023988b 100644..100755
--- a/connectivity/source/drivers/adabas/adabas.xml
+++ b/connectivity/source/drivers/adabas/adabas.xml
diff --git a/connectivity/source/drivers/adabas/exports.dxp b/connectivity/source/drivers/adabas/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/adabas/exports.dxp
+++ b/connectivity/source/drivers/adabas/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index b5d9903f2737..bfc6a3dcfaac 100644..100755
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -104,3 +104,11 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/adabas.component
+
+$(MISC)/adabas.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ adabas.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt adabas.component
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 1d1cdabf656a..1d1cdabf656a 100644..100755
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx
index aa38e4b5123c..e4cbfbaa788c 100644..100755
--- a/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/connectivity/source/drivers/ado/ACatalog.cxx
@@ -80,7 +80,7 @@ void OCatalog::refreshTables()
if(m_pTables)
m_pTables->reFill(aVector);
else
- m_pTables = new OTables(this,m_aMutex,aVector,aTables,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+ m_pTables = new OTables(this,m_aMutex,aVector,aTables,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
}
// -------------------------------------------------------------------------
void OCatalog::refreshViews()
@@ -93,7 +93,7 @@ void OCatalog::refreshViews()
if(m_pViews)
m_pViews->reFill(aVector);
else
- m_pViews = new OViews(this,m_aMutex,aVector,aViews,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+ m_pViews = new OViews(this,m_aMutex,aVector,aViews,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
}
// -------------------------------------------------------------------------
void OCatalog::refreshGroups()
@@ -106,7 +106,7 @@ void OCatalog::refreshGroups()
if(m_pGroups)
m_pGroups->reFill(aVector);
else
- m_pGroups = new OGroups(this,m_aMutex,aVector,aGroups,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+ m_pGroups = new OGroups(this,m_aMutex,aVector,aGroups,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
}
// -------------------------------------------------------------------------
void OCatalog::refreshUsers()
@@ -119,7 +119,7 @@ void OCatalog::refreshUsers()
if(m_pUsers)
m_pUsers->reFill(aVector);
else
- m_pUsers = new OUsers(this,m_aMutex,aVector,aUsers,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+ m_pUsers = new OUsers(this,m_aMutex,aVector,aUsers,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 7ac506d99cae..7ac506d99cae 100644..100755
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index e095ed963462..a8e20c09d6bc 100644..100755
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -73,8 +73,14 @@ Reference< XPropertySet > OColumns::createDescriptor()
sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Reference< XPropertySet >& descriptor )
{
OAdoColumn* pColumn = NULL;
+ Reference< XPropertySet > xColumn;
if ( !getImplementation( pColumn, descriptor ) || pColumn == NULL )
- m_pConnection->throwGenericSQLException( STR_INVALID_COLUMN_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
+ {
+ // m_pConnection->throwGenericSQLException( STR_INVALID_COLUMN_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
+ pColumn = new OAdoColumn(isCaseSensitive(),m_pConnection);
+ xColumn = pColumn;
+ ::comphelper::copyProperties(descriptor,xColumn);
+ }
WpADOColumn aColumn = pColumn->getColumnImpl();
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 37fb4f981240..37fb4f981240 100644..100755
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index c5dd3927311c..c5dd3927311c 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 8bde02cd5239..8bde02cd5239 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 589fd04f6675..589fd04f6675 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index 12c250564113..12c250564113 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index c683dbdf5ad3..ca0f6acc970a 100644..100755
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -166,6 +166,37 @@ void ODriver::impl_checkURL_throw(const ::rtl::OUString& _sUrl)
Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
{
impl_checkURL_throw(url);
+ if ( acceptsURL(url) )
+ {
+ ::std::vector< DriverPropertyInfo > aDriverInfo;
+
+ Sequence< ::rtl::OUString > aBooleanValues(2);
+ aBooleanValues[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) );
+ aBooleanValues[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
+
+ aDriverInfo.push_back(DriverPropertyInfo(
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreDriverPrivileges"))
+ ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ignore the privileges from the database driver."))
+ ,sal_False
+ ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) )
+ ,aBooleanValues)
+ );
+ aDriverInfo.push_back(DriverPropertyInfo(
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EscapeDateTime"))
+ ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Escape date time format."))
+ ,sal_False
+ ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) )
+ ,aBooleanValues)
+ );
+ aDriverInfo.push_back(DriverPropertyInfo(
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings"))
+ ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Defines how the type info of the database metadata should be manipulated."))
+ ,sal_False
+ ,::rtl::OUString( )
+ ,Sequence< ::rtl::OUString > ())
+ );
+ return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
+ }
return Sequence< DriverPropertyInfo >();
}
// --------------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index 05267df5ced2..05267df5ced2 100644..100755
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx
index 8efca9efef7e..8efca9efef7e 100644..100755
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 468c1e9ba943..468c1e9ba943 100644..100755
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index 8969747eb192..8969747eb192 100644..100755
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index 43c8fd3dc419..43c8fd3dc419 100644..100755
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
diff --git a/connectivity/source/drivers/ado/AKeyColumn.cxx b/connectivity/source/drivers/ado/AKeyColumn.cxx
index 00da790fee89..00da790fee89 100644..100755
--- a/connectivity/source/drivers/ado/AKeyColumn.cxx
+++ b/connectivity/source/drivers/ado/AKeyColumn.cxx
diff --git a/connectivity/source/drivers/ado/AKeyColumns.cxx b/connectivity/source/drivers/ado/AKeyColumns.cxx
index 2dd66136a211..2dd66136a211 100644..100755
--- a/connectivity/source/drivers/ado/AKeyColumns.cxx
+++ b/connectivity/source/drivers/ado/AKeyColumns.cxx
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index b31d882244ba..b31d882244ba 100644..100755
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 3d6168116212..3d6168116212 100644..100755
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index feb6074eff61..feb6074eff61 100644..100755
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index 859d261ebfe6..859d261ebfe6 100644..100755
--- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index efb6735c318d..efb6735c318d 100644..100755
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index d3f74f6c777a..d3f74f6c777a 100644..100755
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index acb096545101..acb096545101 100644..100755
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index 7dc882050145..7dc882050145 100644..100755
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index 4e4cce3ce14a..4e4cce3ce14a 100644..100755
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index ac4fef472b65..ac4fef472b65 100644..100755
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index dee7d4ac6a64..dee7d4ac6a64 100644..100755
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index 47b98aa23cbb..47b98aa23cbb 100644..100755
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index 5bded2d19fc2..181181cd94fd 100644..100755
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -30,13 +30,11 @@
#include "precompiled_connectivity.hxx"
#include "ado/ADriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::ado;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -49,26 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pT
);
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, that must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "ADO::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -117,31 +95,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- ODriver::getImplementationName_Static(),
- ODriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "ADO::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 35f16c778fe0..35f16c778fe0 100644..100755
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
diff --git a/connectivity/source/drivers/ado/ado.component b/connectivity/source/drivers/ado/ado.component
new file mode 100755
index 000000000000..1962a6b710a7
--- /dev/null
+++ b/connectivity/source/drivers/ado/ado.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdbc.ado.ODriver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ <service name="com.sun.star.sdbcx.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/ado/ado.xcu b/connectivity/source/drivers/ado/ado.xcu
index 50c29cf7ba2e..e95e1a676c12 100755
--- a/connectivity/source/drivers/ado/ado.xcu
+++ b/connectivity/source/drivers/ado/ado.xcu
@@ -164,6 +164,11 @@
<value>false</value>
</prop>
</node>
+ <node oor:name="TypeInfoSettings" oor:op="replace">
+ <prop oor:name="Value" oor:type="oor:string-list">
+ <value oor:separator=",">Column(2) = 16,Column(3) = 1</value>
+ </prop>
+ </node>
</node>
<node oor:name="Features">
<node oor:name="UseSQL92NamingConstraints" oor:op="replace">
diff --git a/connectivity/source/drivers/ado/ado.xml b/connectivity/source/drivers/ado/ado.xml
index e60318939d1f..e60318939d1f 100644..100755
--- a/connectivity/source/drivers/ado/ado.xml
+++ b/connectivity/source/drivers/ado/ado.xml
diff --git a/connectivity/source/drivers/ado/ado_post_sys_include.h b/connectivity/source/drivers/ado/ado_post_sys_include.h
index c3110010b04d..c3110010b04d 100644..100755
--- a/connectivity/source/drivers/ado/ado_post_sys_include.h
+++ b/connectivity/source/drivers/ado/ado_post_sys_include.h
diff --git a/connectivity/source/drivers/ado/ado_pre_sys_include.h b/connectivity/source/drivers/ado/ado_pre_sys_include.h
index 0393e96d285c..0393e96d285c 100644..100755
--- a/connectivity/source/drivers/ado/ado_pre_sys_include.h
+++ b/connectivity/source/drivers/ado/ado_pre_sys_include.h
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index c6df59087faf..de0d53b50e97 100644..100755
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -106,7 +106,7 @@ sal_Int32 ADOS::MapADOType2Jdbc(DataTypeEnum eType)
case adDBTime: nType = DataType::TIME; break;
case adDate:
case adDBTimeStamp: nType = DataType::TIMESTAMP; break;
- case adBoolean: nType = DataType::BIT; break;
+ case adBoolean: nType = DataType::BOOLEAN; break;
// case adArray: nType = DataType::ARRAY; break;
case adBinary: nType = DataType::BINARY; break;
case adGUID: nType = DataType::OBJECT; break;
@@ -152,6 +152,7 @@ DataTypeEnum ADOS::MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine)
case DataType::DATE: return isJetEngine(_nJetEngine) ? adDate : adDBDate; break;
case DataType::TIME: return adDBTime; break;
case DataType::TIMESTAMP: return isJetEngine(_nJetEngine) ? adDate : adDBTimeStamp; break;
+ case DataType::BOOLEAN:
case DataType::BIT: return adBoolean; break;
case DataType::BINARY: return adBinary; break;
case DataType::VARCHAR: return adVarWChar; break;
diff --git a/connectivity/source/drivers/ado/exports.dxp b/connectivity/source/drivers/ado/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/ado/exports.dxp
+++ b/connectivity/source/drivers/ado/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index 77a3147d549b..02b72a7e7ab5 100644..100755
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -110,3 +110,11 @@ dummy:
# --- Targets ----------------------------------
.INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/ado.component
+
+$(MISC)/ado.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ ado.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt ado.component
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index 96345a020f30..96345a020f30 100644..100755
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx
index 019361e3d12f..019361e3d12f 100644..100755
--- a/connectivity/source/drivers/calc/CColumns.cxx
+++ b/connectivity/source/drivers/calc/CColumns.cxx
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 4fdb00bd52cc..4fdb00bd52cc 100644..100755
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index ca361392498d..ca361392498d 100644..100755
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index ecfd79a736c1..ecfd79a736c1 100644..100755
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
diff --git a/connectivity/source/drivers/calc/CPreparedStatement.cxx b/connectivity/source/drivers/calc/CPreparedStatement.cxx
index b80353dc151a..b80353dc151a 100644..100755
--- a/connectivity/source/drivers/calc/CPreparedStatement.cxx
+++ b/connectivity/source/drivers/calc/CPreparedStatement.cxx
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index 3085e135cd0f..3085e135cd0f 100644..100755
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
diff --git a/connectivity/source/drivers/calc/CStatement.cxx b/connectivity/source/drivers/calc/CStatement.cxx
index 1005d0c8af90..1005d0c8af90 100644..100755
--- a/connectivity/source/drivers/calc/CStatement.cxx
+++ b/connectivity/source/drivers/calc/CStatement.cxx
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 9ef399a8f443..cbfb9f976ba1 100644..100755
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -467,8 +467,8 @@ void OCalcTable::fillColumns()
String aStrFieldName;
aStrFieldName.AssignAscii("Column");
::rtl::OUString aTypeName;
- ::comphelper::UStringMixEqual aCase(m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
- const sal_Bool bStoresMixedCaseQuotedIdentifiers = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+ ::comphelper::UStringMixEqual aCase(m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
+ const sal_Bool bStoresMixedCaseQuotedIdentifiers = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
for (sal_Int32 i = 0; i < m_nDataCols; i++)
{
@@ -826,12 +826,12 @@ sal_Bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::fetchRow" );
// read the bookmark
- BOOL bIsCurRecordDeleted = sal_False;
+ sal_Bool bIsCurRecordDeleted = sal_False;
_rRow->setDeleted(bIsCurRecordDeleted);
*(_rRow->get())[0] = m_nFilePos;
if (!bRetrieveData)
- return TRUE;
+ return sal_True;
// fields
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index edc9bc1bdd8c..edc9bc1bdd8c 100644..100755
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
diff --git a/connectivity/source/drivers/calc/CalcDriver.xml b/connectivity/source/drivers/calc/CalcDriver.xml
index c6ff0d00fe55..c6ff0d00fe55 100644..100755
--- a/connectivity/source/drivers/calc/CalcDriver.xml
+++ b/connectivity/source/drivers/calc/CalcDriver.xml
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 97936db1a376..3a4e4f0745d8 100644..100755
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -30,13 +30,11 @@
#include "precompiled_connectivity.hxx"
#include "calc/CDriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::calc;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pT
);
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- ODriver::getImplementationName_Static(),
- ODriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/calc/calc.component b/connectivity/source/drivers/calc/calc.component
new file mode 100755
index 000000000000..be949f70de14
--- /dev/null
+++ b/connectivity/source/drivers/calc/calc.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdbc.calc.ODriver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ <service name="com.sun.star.sdbcx.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/calc/exports.dxp b/connectivity/source/drivers/calc/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/calc/exports.dxp
+++ b/connectivity/source/drivers/calc/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index 8b5958f30778..d36438a277b8 100644..100755
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -87,3 +87,13 @@ DEF1EXPORTFILE= exports.dxp
# --- Targets ----------------------------------
.INCLUDE : $(PRJ)$/target.pmk
+
+
+
+ALLTAR : $(MISC)/calc.component
+
+$(MISC)/calc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ calc.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt calc.component
diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index 4d524103e7e3..4d524103e7e3 100644..100755
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
diff --git a/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx
index 3c7edbf4ca55..721e31a75f1c 100644..100755
--- a/connectivity/source/drivers/dbase/DCode.cxx
+++ b/connectivity/source/drivers/dbase/DCode.cxx
@@ -115,7 +115,7 @@ OEvaluateSet* OFILEOperandAttr::preProcess(OBoolOperator* pOp, OOperand* pRight)
if (pIter)
{
pEvaluateSet = new OEvaluateSet();
- ULONG nRec = pIter->First();
+ sal_uIntPtr nRec = pIter->First();
while (nRec != NODE_NOTFOUND)
{
(*pEvaluateSet)[nRec] = nRec;
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index c3221c69b04c..c3221c69b04c 100644..100755
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index b30eb3cca0c9..b30eb3cca0c9 100644..100755
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index d1710f90dd6f..d1710f90dd6f 100644..100755
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 56f62e6c2325..56f62e6c2325 100644..100755
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 8a3c319c7ed9..c8a800d1eb37 100644..100755
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -68,7 +68,7 @@ using namespace com::sun::star::lang;
IMPLEMENT_SERVICE_INFO(ODbaseIndex,"com.sun.star.sdbcx.driver.dbase.Index","com.sun.star.sdbcx.Index");
// -------------------------------------------------------------------------
-ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable) : OIndex(sal_True/*_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers()*/)
+ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable) : OIndex(sal_True/*_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers()*/)
,m_pFileStream(NULL)
,m_nCurNode(NODE_NOTFOUND)
,m_pTable(_pTable)
@@ -144,7 +144,7 @@ ONDXPagePtr ODbaseIndex::getRoot()
{
m_nRootPage = m_aHeader.db_rootpage;
m_nPageCount = m_aHeader.db_pagecount;
- m_aRoot = CreatePage(m_nRootPage,NULL,TRUE);
+ m_aRoot = CreatePage(m_nRootPage,NULL,sal_True);
}
return m_aRoot;
}
@@ -186,7 +186,7 @@ OIndexIterator* ODbaseIndex::createIterator(OBoolOperator* pOp,
return new OIndexIterator(this, pOp, pOperand);
}
//------------------------------------------------------------------
-BOOL ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
{
OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
// Search a specific value in Index
@@ -208,13 +208,13 @@ BOOL ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValu
catch (Exception&)
{
OSL_ASSERT(0);
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------
-BOOL ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
{
openIndexFile();
OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -225,7 +225,7 @@ BOOL ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
}
//------------------------------------------------------------------
-BOOL ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
{
openIndexFile();
OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -234,35 +234,35 @@ BOOL ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
// Does the value already exist
// Use Find() always to determine the actual leaf
if (!ConvertToKey(&aKey, nRec, rValue) || (getRoot()->Find(aKey) && isUnique()))
- return FALSE;
+ return sal_False;
ONDXNode aNewNode(aKey);
// insert in the current leaf
if (!m_aCurLeaf.Is())
- return FALSE;
+ return sal_False;
- BOOL bResult = m_aCurLeaf->Insert(aNewNode);
+ sal_Bool bResult = m_aCurLeaf->Insert(aNewNode);
Release(bResult);
return bResult;
}
//------------------------------------------------------------------
-BOOL ODbaseIndex::Update(sal_uInt32 nRec, const ORowSetValue& rOldValue,
+sal_Bool ODbaseIndex::Update(sal_uInt32 nRec, const ORowSetValue& rOldValue,
const ORowSetValue& rNewValue)
{
openIndexFile();
OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
ONDXKey aKey;
if (!ConvertToKey(&aKey, nRec, rNewValue) || (isUnique() && getRoot()->Find(aKey)))
- return FALSE;
+ return sal_False;
else
return Delete(nRec, rOldValue) && Insert(nRec,rNewValue);
}
//------------------------------------------------------------------
-BOOL ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
{
openIndexFile();
OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -270,13 +270,13 @@ BOOL ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
// Always use Find() to determine the actual leaf
ONDXKey aKey;
if (!ConvertToKey(&aKey, nRec, rValue) || !getRoot()->Find(aKey))
- return FALSE;
+ return sal_False;
ONDXNode aNewNode(aKey);
// insert in the current leaf
if (!m_aCurLeaf.Is())
- return FALSE;
+ return sal_False;
#if OSL_DEBUG_LEVEL > 1
m_aRoot->PrintPage();
#endif
@@ -290,10 +290,10 @@ void ODbaseIndex::Collect(ONDXPage* pPage)
m_aCollector.push_back(pPage);
}
//------------------------------------------------------------------
-void ODbaseIndex::Release(BOOL bSave)
+void ODbaseIndex::Release(sal_Bool bSave)
{
// Release the Index-recources
- m_bUseCollector = FALSE;
+ m_bUseCollector = sal_False;
if (m_aCurLeaf.Is())
{
@@ -308,7 +308,7 @@ void ODbaseIndex::Release(BOOL bSave)
m_aRoot.Clear();
}
// Release all references, before the FileStream will be closed
- for (ULONG i = 0; i < m_aCollector.size(); i++)
+ for (sal_uIntPtr i = 0; i < m_aCollector.size(); i++)
m_aCollector[i]->QueryDelete();
m_aCollector.clear();
@@ -336,7 +336,7 @@ void ODbaseIndex::closeImpl()
}
}
//------------------------------------------------------------------
-ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent, BOOL bLoad)
+ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent, sal_Bool bLoad)
{
OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -401,14 +401,14 @@ void ODbaseIndex::createINFEntry()
Config aInfFile(sPhysicalPath);
aInfFile.SetGroup(dBASE_III_GROUP);
- USHORT nSuffix = aInfFile.GetKeyCount();
+ sal_uInt16 nSuffix = aInfFile.GetKeyCount();
ByteString aNewEntry,aKeyName;
- BOOL bCase = isCaseSensitive();
+ sal_Bool bCase = isCaseSensitive();
while (!aNewEntry.Len())
{
aNewEntry = "NDX";
aNewEntry += ByteString::CreateFromInt32(++nSuffix);
- for (USHORT i = 0; i < aInfFile.GetKeyCount(); i++)
+ for (sal_uInt16 i = 0; i < aInfFile.GetKeyCount(); i++)
{
aKeyName = aInfFile.GetKeyName(i);
if (bCase ? aKeyName == aNewEntry : aKeyName.EqualsIgnoreCaseAscii(aNewEntry))
@@ -421,7 +421,7 @@ void ODbaseIndex::createINFEntry()
aInfFile.WriteKey(aNewEntry,ByteString(sEntry,m_pTable->getConnection()->getTextEncoding()));
}
// -------------------------------------------------------------------------
-BOOL ODbaseIndex::DropImpl()
+sal_Bool ODbaseIndex::DropImpl()
{
closeImpl();
@@ -444,13 +444,13 @@ BOOL ODbaseIndex::DropImpl()
Config aInfFile(sPhysicalPath);
aInfFile.SetGroup(dBASE_III_GROUP);
- USHORT nKeyCnt = aInfFile.GetKeyCount();
+ sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
ByteString aKeyName;
String sEntry = m_Name;
sEntry += String::CreateFromAscii(".ndx");
// delete entries from the inf file
- for (USHORT nKey = 0; nKey < nKeyCnt; nKey++)
+ for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
{
// References the Key to an Index-file?
aKeyName = aInfFile.GetKeyName( nKey );
@@ -463,7 +463,7 @@ BOOL ODbaseIndex::DropImpl()
}
}
}
- return TRUE;
+ return sal_True;
}
// -------------------------------------------------------------------------
void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::rtl::OUString& _sFile)
@@ -474,7 +474,7 @@ void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::
m_pTable->getConnection()->throwGenericSQLException(_nErrorId,*this);
}
//------------------------------------------------------------------
-BOOL ODbaseIndex::CreateImpl()
+sal_Bool ODbaseIndex::CreateImpl()
{
// Create the Index
const ::rtl::OUString sFile = getCompletePath();
@@ -556,7 +556,7 @@ BOOL ODbaseIndex::CreateImpl()
xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
m_aHeader.db_keytype = (nType == DataType::VARCHAR || nType == DataType::CHAR) ? 0 : 1;
- m_aHeader.db_keylen = (m_aHeader.db_keytype) ? 8 : (USHORT)getINT32(xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
+ m_aHeader.db_keylen = (m_aHeader.db_keytype) ? 8 : (sal_uInt16)getINT32(xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
m_aHeader.db_keylen = (( m_aHeader.db_keylen - 1) / 4 + 1) * 4;
m_aHeader.db_maxkeys = (PAGE_SIZE - 4) / (8 + m_aHeader.db_keylen);
if ( m_aHeader.db_maxkeys < 3 )
@@ -567,7 +567,7 @@ BOOL ODbaseIndex::CreateImpl()
m_pFileStream->SetStreamSize(PAGE_SIZE);
ByteString aCol(aName,m_pTable->getConnection()->getTextEncoding());
- strncpy(m_aHeader.db_name,aCol.GetBuffer(),std::min((USHORT)sizeof(m_aHeader.db_name), aCol.Len()));
+ strncpy(m_aHeader.db_name,aCol.GetBuffer(),std::min((sal_uInt16)sizeof(m_aHeader.db_name), aCol.Len()));
m_aHeader.db_unique = m_IsUnique ? 1: 0;
m_aHeader.db_keyrec = m_aHeader.db_keylen + 8;
@@ -577,9 +577,9 @@ BOOL ODbaseIndex::CreateImpl()
m_nPageCount = 2;
m_aCurLeaf = m_aRoot = CreatePage(m_nRootPage);
- m_aRoot->SetModified(TRUE);
+ m_aRoot->SetModified(sal_True);
- m_bUseCollector = TRUE;
+ m_bUseCollector = sal_True;
sal_Int32 nRowsLeft = 0;
Reference<XRow> xRow(xSet,UNO_QUERY);
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 3b9d1302e86b..36268b7b30d1 100644..100755
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -70,7 +70,7 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName
,sal_False
,sal_False
,sal_False
- ,pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+ ,pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
return xRet;
}
@@ -83,7 +83,7 @@ void ODbaseIndexColumns::impl_refresh() throw(RuntimeException)
// -------------------------------------------------------------------------
Reference< XPropertySet > ODbaseIndexColumns::createDescriptor()
{
- return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+ return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
}
// -------------------------------------------------------------------------
sdbcx::ObjectType ODbaseIndexColumns::appendObject( const ::rtl::OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor )
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index f1335c7c0531..22bcd43da980 100644..100755
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -46,20 +46,20 @@ OIndexIterator::~OIndexIterator()
}
//------------------------------------------------------------------
-ULONG OIndexIterator::First()
+sal_uIntPtr OIndexIterator::First()
{
- return Find(TRUE);
+ return Find(sal_True);
}
//------------------------------------------------------------------
-ULONG OIndexIterator::Next()
+sal_uIntPtr OIndexIterator::Next()
{
- return Find(FALSE);
+ return Find(sal_False);
}
//------------------------------------------------------------------
-ULONG OIndexIterator::Find(BOOL bFirst)
+sal_uIntPtr OIndexIterator::Find(sal_Bool bFirst)
{
- ULONG nRes = STRING_NOTFOUND;
+ sal_uIntPtr nRes = STRING_NOTFOUND;
if (bFirst)
{
@@ -103,7 +103,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
// '<='-condition are saved. this is considered for inserts.
// ONDXIndex* m_pIndex = GetNDXIndex();
OOp_COMPARE aTempOp(SQLFilterOperator::GREATER);
- USHORT i = 0;
+ sal_uInt16 i = 0;
if (pPage->IsLeaf())
{
@@ -141,7 +141,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
}
//------------------------------------------------------------------
-ULONG OIndexIterator::GetCompare(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetCompare(sal_Bool bFirst)
{
ONDXKey* pKey = NULL;
sal_Int32 ePredicateType = PTR_CAST(file::OOp_COMPARE,m_pOperator)->getPredicateType();
@@ -211,7 +211,7 @@ ULONG OIndexIterator::GetCompare(BOOL bFirst)
}
//------------------------------------------------------------------
-ULONG OIndexIterator::GetLike(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetLike(sal_Bool bFirst)
{
if (bFirst)
{
@@ -231,7 +231,7 @@ ULONG OIndexIterator::GetLike(BOOL bFirst)
}
//------------------------------------------------------------------
-ULONG OIndexIterator::GetNull(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetNull(sal_Bool bFirst)
{
if (bFirst)
{
@@ -253,15 +253,15 @@ ULONG OIndexIterator::GetNull(BOOL bFirst)
}
//------------------------------------------------------------------
-ULONG OIndexIterator::GetNotNull(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetNotNull(sal_Bool bFirst)
{
ONDXKey* pKey;
if (bFirst)
{
// erst alle NULL werte abklappern
- for (ULONG nRec = GetNull(bFirst);
+ for (sal_uIntPtr nRec = GetNull(bFirst);
nRec != STRING_NOTFOUND;
- nRec = GetNull(FALSE))
+ nRec = GetNull(sal_False))
;
pKey = m_aCurLeaf.Is() ? &(*m_aCurLeaf)[m_nCurNode].GetKey() : NULL;
}
@@ -283,7 +283,7 @@ ONDXKey* OIndexIterator::GetNextKey()
ONDXPage* pParentPage = pPage->GetParent();
if (pParentPage)
{
- USHORT nPos = pParentPage->Search(pPage);
+ sal_uInt16 nPos = pParentPage->Search(pPage);
if (nPos != pParentPage->Count() - 1)
{ // page found
pPage = (*pParentPage)[nPos+1].GetChild(m_pIndex,pParentPage);
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index b65e2158aa43..b65e2158aa43 100644..100755
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
diff --git a/connectivity/source/drivers/dbase/DNoException.cxx b/connectivity/source/drivers/dbase/DNoException.cxx
index 8e1058b6e7a8..df0fa5af0fd8 100644..100755
--- a/connectivity/source/drivers/dbase/DNoException.cxx
+++ b/connectivity/source/drivers/dbase/DNoException.cxx
@@ -91,7 +91,7 @@ sal_Bool ODbaseTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In
OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
sal_Int32 nPos = m_aHeader.db_kopf + (sal_Int32)(m_nFilePos-1) * nEntryLen;
- ULONG nLen = m_pFileStream->Seek(nPos);
+ sal_uIntPtr nLen = m_pFileStream->Seek(nPos);
if (m_pFileStream->GetError() != ERRCODE_NONE)
goto Error;
@@ -127,10 +127,10 @@ End:
return sal_True;
}
// -----------------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
+sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemo" );
- BOOL bIsText = TRUE;
+ bool bIsText = true;
m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
switch (m_aMemoHeader.db_typ)
@@ -141,13 +141,13 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
ByteString aBStr;
static char aBuf[514];
aBuf[512] = 0; // to prevent a random value
- BOOL bReady = sal_False;
+ bool bReady = false;
do
{
m_pMemoStream->Read(&aBuf,512);
- USHORT i = 0;
+ sal_uInt16 i = 0;
while (aBuf[i] != cEOF && ++i < 512)
;
bReady = aBuf[i] == cEOF;
@@ -169,14 +169,14 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
// Foxpro stores text and binary data
if (m_aMemoHeader.db_typ == MemoFoxPro)
{
- if (((BYTE)sHeader[0]) != 0 || ((BYTE)sHeader[1]) != 0 || ((BYTE)sHeader[2]) != 0)
+ if (((sal_uInt8)sHeader[0]) != 0 || ((sal_uInt8)sHeader[1]) != 0 || ((sal_uInt8)sHeader[2]) != 0)
{
return sal_False;
}
bIsText = sHeader[3] != 0;
}
- else if (((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+ else if (((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
{
return sal_False;
}
@@ -215,7 +215,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
void ODbaseTable::AllocBuffer()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::AllocBuffer" );
- UINT16 nSize = m_aHeader.db_slng;
+ sal_uInt16 nSize = m_aHeader.db_slng;
OSL_ENSURE(nSize > 0, "Size too small");
if (m_nBufferSize != nSize)
@@ -228,11 +228,11 @@ void ODbaseTable::AllocBuffer()
if (m_pBuffer == NULL && nSize)
{
m_nBufferSize = nSize;
- m_pBuffer = new BYTE[m_nBufferSize+1];
+ m_pBuffer = new sal_uInt8[m_nBufferSize+1];
}
}
// -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteBuffer()
+sal_Bool ODbaseTable::WriteBuffer()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteBuffer" );
OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
@@ -268,7 +268,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
else
{
ByteString aBuf;
- USHORT nLen = rIndex.getHeader().db_keylen;
+ sal_uInt16 nLen = rIndex.getHeader().db_keylen;
char* pStr = aBuf.AllocBuffer(nLen+1);
rStream.Read(pStr,nLen);
@@ -301,7 +301,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
if (aKey.getValue().isNull())
{
memset(aNodeData.aData,0,rIndex.getHeader().db_keylen);
- rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+ rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
}
else
rStream << (double) aKey.getValue();
@@ -315,7 +315,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
ByteString aText(sValue.getStr(), rIndex.m_pTable->getConnection()->getTextEncoding());
strncpy(aNodeData.aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, aText.Len()));
}
- rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+ rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
}
rStream << aChild;
}
@@ -336,7 +336,7 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
// ONDXKey
//==================================================================
//------------------------------------------------------------------
-BOOL ONDXKey::IsText(sal_Int32 eType)
+sal_Bool ONDXKey::IsText(sal_Int32 eType)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXKey::IsText" );
return eType == DataType::VARCHAR || eType == DataType::CHAR;
@@ -364,7 +364,7 @@ StringCompare ONDXKey::Compare(const ONDXKey& rKey) const
}
else if (IsText(getDBType()))
{
- INT32 nRes = getValue().getString().compareTo(rKey.getValue());
+ sal_Int32 nRes = getValue().getString().compareTo(rKey.getValue());
eResult = (nRes > 0) ? COMPARE_GREATER : (nRes == 0) ? COMPARE_EQUAL : COMPARE_LESS;
}
else
@@ -441,15 +441,15 @@ ONDXPagePtr& ONDXPagePtr::operator= (ONDXPage* pRef)
return *this;
}
// -----------------------------------------------------------------------------
-static UINT32 nValue;
+static sal_uInt32 nValue;
//------------------------------------------------------------------
SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
{
rStream.Seek(rPage.GetPagePos() * 512);
rStream >> nValue >> rPage.aChild;
- rPage.nCount = USHORT(nValue);
+ rPage.nCount = sal_uInt16(nValue);
- for (USHORT i = 0; i < rPage.nCount; i++)
+ for (sal_uInt16 i = 0; i < rPage.nCount; i++)
rPage[i].Read(rStream, rPage.GetIndex());
return rStream;
}
@@ -458,7 +458,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& rPage)
{
// Page does not yet exist
- ULONG nSize = (rPage.GetPagePos() + 1) * 512;
+ sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * 512;
if (nSize > rStream.Seek(STREAM_SEEK_TO_END))
{
rStream.SetStreamSize(nSize);
@@ -466,27 +466,27 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
char aEmptyData[512];
memset(aEmptyData,0x00,512);
- rStream.Write((BYTE*)aEmptyData,512);
+ rStream.Write((sal_uInt8*)aEmptyData,512);
}
- ULONG nCurrentPos = rStream.Seek(rPage.GetPagePos() * 512);
+ sal_uIntPtr nCurrentPos = rStream.Seek(rPage.GetPagePos() * 512);
OSL_UNUSED( nCurrentPos );
nValue = rPage.nCount;
rStream << nValue << rPage.aChild;
- USHORT i = 0;
+ sal_uInt16 i = 0;
for (; i < rPage.nCount; i++)
rPage[i].Write(rStream, rPage);
// check if we have to fill the stream with '\0'
if(i < rPage.rIndex.getHeader().db_maxkeys)
{
- ULONG nTell = rStream.Tell() % 512;
- USHORT nBufferSize = rStream.GetBufferSize();
- ULONG nSize = nBufferSize - nTell;
+ sal_uIntPtr nTell = rStream.Tell() % 512;
+ sal_uInt16 nBufferSize = rStream.GetBufferSize();
+ sal_uIntPtr nSize = nBufferSize - nTell;
char* pEmptyData = new char[nSize];
memset(pEmptyData,0x00,nSize);
- rStream.Write((BYTE*)pEmptyData,nSize);
+ rStream.Write((sal_uInt8*)pEmptyData,nSize);
rStream.Seek(nTell);
delete [] pEmptyData;
}
@@ -501,7 +501,7 @@ void ONDXPage::PrintPage()
DBG_TRACE4("\nSDB: -----------Page: %d Parent: %d Count: %d Child: %d-----",
nPagePos, HasParent() ? aParent->GetPagePos() : 0 ,nCount, aChild.GetPagePos());
- for (USHORT i = 0; i < nCount; i++)
+ for (sal_uInt16 i = 0; i < nCount; i++)
{
ONDXNode rNode = (*this)[i];
ONDXKey& rKey = rNode.GetKey();
@@ -526,7 +526,7 @@ void ONDXPage::PrintPage()
{
#if OSL_DEBUG_LEVEL > 1
GetChild(&rIndex)->PrintPage();
- for (USHORT i = 0; i < nCount; i++)
+ for (sal_uInt16 i = 0; i < nCount; i++)
{
ONDXNode rNode = (*this)[i];
rNode.GetChild(&rIndex,this)->PrintPage();
@@ -537,18 +537,18 @@ void ONDXPage::PrintPage()
}
#endif
// -----------------------------------------------------------------------------
-BOOL ONDXPage::IsFull() const
+sal_Bool ONDXPage::IsFull() const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::IsFull" );
return Count() == rIndex.getHeader().db_maxkeys;
}
// -----------------------------------------------------------------------------
//------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXKey& rSearch)
+sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Search" );
// binary search afterwards
- USHORT i = 0xFFFF;
+ sal_uInt16 i = 0xFFFF;
while (++i < Count())
if ((*this)[i].GetKey() == rSearch)
break;
@@ -557,10 +557,10 @@ USHORT ONDXPage::Search(const ONDXKey& rSearch)
}
//------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXPage* pPage)
+sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Search" );
- USHORT i = 0xFFFF;
+ sal_uInt16 i = 0xFFFF;
while (++i < Count())
if (((*this)[i]).GetChild() == pPage)
break;
@@ -577,7 +577,7 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
OSL_ENSURE(rSearch != rReplace,"Invalid here:rSearch == rReplace");
if (rSearch != rReplace)
{
- USHORT nPos = NODE_NOTFOUND;
+ sal_uInt16 nPos = NODE_NOTFOUND;
ONDXPage* pPage = this;
while (pPage && (nPos = pPage->Search(rSearch)) == NODE_NOTFOUND)
@@ -586,34 +586,34 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
if (pPage)
{
(*pPage)[nPos].GetKey() = rReplace;
- pPage->SetModified(TRUE);
+ pPage->SetModified(sal_True);
}
}
}
// -----------------------------------------------------------------------------
-ONDXNode& ONDXPage::operator[] (USHORT nPos)
+ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos)
{
DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
return ppNodes[nPos];
}
//------------------------------------------------------------------
-const ONDXNode& ONDXPage::operator[] (USHORT nPos) const
+const ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) const
{
DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
return ppNodes[nPos];
}
// -----------------------------------------------------------------------------
-void ONDXPage::Remove(USHORT nPos)
+void ONDXPage::Remove(sal_uInt16 nPos)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Remove" );
DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
- for (USHORT i = nPos; i < (nCount-1); i++)
+ for (sal_uInt16 i = nPos; i < (nCount-1); i++)
(*this)[i] = (*this)[i+1];
nCount--;
- bModified = TRUE;
+ bModified = sal_True;
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index d67b477e3385..d67b477e3385 100644..100755
--- a/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 2d908607a324..2d908607a324 100644..100755
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
diff --git a/connectivity/source/drivers/dbase/DStatement.cxx b/connectivity/source/drivers/dbase/DStatement.cxx
index a6038aea6825..a6038aea6825 100644..100755
--- a/connectivity/source/drivers/dbase/DStatement.cxx
+++ b/connectivity/source/drivers/dbase/DStatement.cxx
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 8b29547057bb..5397bc4a036f 100644..100755
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -208,12 +208,12 @@ void ODbaseTable::readHeader()
m_pFileStream->RefreshBuffer(); // Make sure, that the header information actually is read again
m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
- BYTE nType=0;
+ sal_uInt8 nType=0;
(*m_pFileStream) >> nType;
if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
throwInvalidDbaseFormat();
- m_pFileStream->Read((char*)(&m_aHeader.db_aedat), 3*sizeof(BYTE));
+ m_pFileStream->Read((char*)(&m_aHeader.db_aedat), 3*sizeof(sal_uInt8));
if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
throwInvalidDbaseFormat();
(*m_pFileStream) >> m_aHeader.db_anz;
@@ -225,7 +225,7 @@ void ODbaseTable::readHeader()
(*m_pFileStream) >> m_aHeader.db_slng;
if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
throwInvalidDbaseFormat();
- m_pFileStream->Read((char*)(&m_aHeader.db_frei), 20*sizeof(BYTE));
+ m_pFileStream->Read((char*)(&m_aHeader.db_frei), 20*sizeof(sal_uInt8));
if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
throwInvalidDbaseFormat();
@@ -319,7 +319,7 @@ void ODbaseTable::fillColumns()
aStrFieldName.AssignAscii("Column");
::rtl::OUString aTypeName;
static const ::rtl::OUString sVARCHAR(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
- const sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+ const sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
const bool bFoxPro = m_aHeader.db_typ == VisualFoxPro || m_aHeader.db_typ == VisualFoxProAuto || m_aHeader.db_typ == FoxProMemo;
sal_Int32 i = 0;
@@ -528,7 +528,7 @@ void ODbaseTable::construct()
}
fillColumns();
- UINT32 nFileSize = lcl_getFileSize(*m_pFileStream);
+ sal_uInt32 nFileSize = lcl_getFileSize(*m_pFileStream);
m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
if ( m_aHeader.db_anz == 0 && ((nFileSize-m_aHeader.db_kopf)/m_aHeader.db_slng) > 0) // seems to be empty or someone wrote bullshit into the dbase file
m_aHeader.db_anz = ((nFileSize-m_aHeader.db_kopf)/m_aHeader.db_slng);
@@ -556,7 +556,7 @@ void ODbaseTable::construct()
}
}
//------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemoHeader()
+sal_Bool ODbaseTable::ReadMemoHeader()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemoHeader" );
m_pMemoStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
@@ -580,7 +580,7 @@ BOOL ODbaseTable::ReadMemoHeader()
m_pMemoStream->Seek(m_aMemoHeader.db_size);
m_pMemoStream->Read(sHeader,4);
- if ((m_pMemoStream->GetErrorCode() != ERRCODE_NONE) || ((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+ if ((m_pMemoStream->GetErrorCode() != ERRCODE_NONE) || ((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
m_aMemoHeader.db_typ = MemodBaseIII;
else
m_aMemoHeader.db_typ = MemodBaseIV;
@@ -603,7 +603,7 @@ BOOL ODbaseTable::ReadMemoHeader()
OSL_ENSURE( false, "ODbaseTable::ReadMemoHeader: unsupported memo type!" );
break;
}
- return TRUE;
+ return sal_True;
}
// -------------------------------------------------------------------------
String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _sName )
@@ -679,11 +679,11 @@ void ODbaseTable::refreshIndexes()
aURL.setExtension(String::CreateFromAscii("inf"));
Config aInfFile(aURL.getFSysPath(INetURLObject::FSYS_DETECT));
aInfFile.SetGroup(dBASE_III_GROUP);
- USHORT nKeyCnt = aInfFile.GetKeyCount();
+ sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
ByteString aKeyName;
ByteString aIndexName;
- for (USHORT nKey = 0; nKey < nKeyCnt; nKey++)
+ for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
{
// Refences the key an index-file?
aKeyName = aInfFile.GetKeyName( nKey );
@@ -786,7 +786,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::fetchRow" );
// Read the data
- BOOL bIsCurRecordDeleted = ((char)m_pBuffer[0] == '*') ? TRUE : sal_False;
+ bool bIsCurRecordDeleted = (char)m_pBuffer[0] == '*';
// only read the bookmark
@@ -795,7 +795,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
*(_rRow->get())[0] = m_nFilePos;
if (!bRetrieveData)
- return TRUE;
+ return sal_True;
sal_Size nByteOffset = 1;
// Fields:
@@ -968,13 +968,13 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
break;
case DataType::BIT:
{
- BOOL b;
+ sal_Bool b;
switch (* ((const char *)pData))
{
case 'T':
case 'Y':
- case 'J': b = TRUE; break;
- default: b = FALSE; break;
+ case 'J': b = sal_True; break;
+ default: b = sal_False; break;
}
*(_rRow->get())[i] = b;
}
@@ -1019,7 +1019,7 @@ void ODbaseTable::FileClose()
ODbaseTable_BASE::FileClose();
}
// -------------------------------------------------------------------------
-BOOL ODbaseTable::CreateImpl()
+sal_Bool ODbaseTable::CreateImpl()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateImpl" );
OSL_ENSURE(!m_pFileStream, "SequenceError");
@@ -1068,7 +1068,7 @@ BOOL ODbaseTable::CreateImpl()
{
}
- BOOL bMemoFile = sal_False;
+ sal_Bool bMemoFile = sal_False;
sal_Bool bOk = CreateFile(aURL, bMemoFile);
@@ -1131,7 +1131,7 @@ BOOL ODbaseTable::CreateImpl()
else
m_aHeader.db_typ = dBaseIII;
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl::OUString& _sColumnName)
@@ -1154,7 +1154,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl:
}
//------------------------------------------------------------------
// creates in principle dBase IV file format
-BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
+sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateFile" );
bCreateMemo = sal_False;
@@ -1165,7 +1165,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
if (!m_pFileStream)
return sal_False;
- BYTE nDbaseType = dBaseIII;
+ sal_uInt8 nDbaseType = dBaseIII;
Reference<XIndexAccess> xColumns(getColumns(),UNO_QUERY);
Reference<XPropertySet> xCol;
const ::rtl::OUString sPropType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
@@ -1207,19 +1207,19 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
memset(aBuffer,0,sizeof(aBuffer));
m_pFileStream->Seek(0L);
- (*m_pFileStream) << (BYTE) nDbaseType; // dBase format
- (*m_pFileStream) << (BYTE) (aDate.GetYear() % 100); // current date
+ (*m_pFileStream) << (sal_uInt8) nDbaseType; // dBase format
+ (*m_pFileStream) << (sal_uInt8) (aDate.GetYear() % 100); // current date
- (*m_pFileStream) << (BYTE) aDate.GetMonth();
- (*m_pFileStream) << (BYTE) aDate.GetDay();
+ (*m_pFileStream) << (sal_uInt8) aDate.GetMonth();
+ (*m_pFileStream) << (sal_uInt8) aDate.GetDay();
(*m_pFileStream) << 0L; // number of data records
- (*m_pFileStream) << (USHORT)((m_pColumns->getCount()+1) * 32 + 1); // header information,
+ (*m_pFileStream) << (sal_uInt16)((m_pColumns->getCount()+1) * 32 + 1); // header information,
// pColumns contains always an additional column
- (*m_pFileStream) << (USHORT) 0; // record length will be determined later
+ (*m_pFileStream) << (sal_uInt16) 0; // record length will be determined later
m_pFileStream->Write(aBuffer, 20);
- USHORT nRecLength = 1; // Length 1 for deleted flag
+ sal_uInt16 nRecLength = 1; // Length 1 for deleted flag
sal_Int32 nMaxFieldLength = m_pConnection->getMetaData()->getMaxColumnNameLength();
::rtl::OUString aName;
const ::rtl::OUString sPropName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
@@ -1312,9 +1312,9 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
{
throwInvalidColumnType(STR_INVALID_COLUMN_PRECISION, aName);
}
- (*m_pFileStream) << (BYTE) Min((unsigned)nPrecision, 255U); // field length
- nRecLength = nRecLength + (USHORT)::std::min((USHORT)nPrecision, (USHORT)255UL);
- (*m_pFileStream) << (BYTE)0; // decimals
+ (*m_pFileStream) << (sal_uInt8) Min((unsigned)nPrecision, 255U); // field length
+ nRecLength = nRecLength + (sal_uInt16)::std::min((sal_uInt16)nPrecision, (sal_uInt16)255UL);
+ (*m_pFileStream) << (sal_uInt8)0; // decimals
break;
case 'F':
case 'N':
@@ -1326,41 +1326,41 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
}
if (getBOOL(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))) // Currency will be treated separately
{
- (*m_pFileStream) << (BYTE)10; // standard length
- (*m_pFileStream) << (BYTE)4;
+ (*m_pFileStream) << (sal_uInt8)10; // standard length
+ (*m_pFileStream) << (sal_uInt8)4;
nRecLength += 10;
}
else
{
sal_Int32 nPrec = SvDbaseConverter::ConvertPrecisionToDbase(nPrecision,nScale);
- (*m_pFileStream) << (BYTE)( nPrec);
- (*m_pFileStream) << (BYTE)nScale;
- nRecLength += (USHORT)nPrec;
+ (*m_pFileStream) << (sal_uInt8)( nPrec);
+ (*m_pFileStream) << (sal_uInt8)nScale;
+ nRecLength += (sal_uInt16)nPrec;
}
break;
case 'L':
- (*m_pFileStream) << (BYTE)1;
- (*m_pFileStream) << (BYTE)0;
+ (*m_pFileStream) << (sal_uInt8)1;
+ (*m_pFileStream) << (sal_uInt8)0;
++nRecLength;
break;
case 'I':
- (*m_pFileStream) << (BYTE)4;
- (*m_pFileStream) << (BYTE)0;
+ (*m_pFileStream) << (sal_uInt8)4;
+ (*m_pFileStream) << (sal_uInt8)0;
nRecLength += 4;
break;
case 'Y':
case 'B':
case 'T':
case 'D':
- (*m_pFileStream) << (BYTE)8;
- (*m_pFileStream) << (BYTE)0;
+ (*m_pFileStream) << (sal_uInt8)8;
+ (*m_pFileStream) << (sal_uInt8)0;
nRecLength += 8;
break;
case 'M':
- bCreateMemo = TRUE;
- (*m_pFileStream) << (BYTE)10;
- (*m_pFileStream) << (BYTE)0;
+ bCreateMemo = sal_True;
+ (*m_pFileStream) << (sal_uInt8)10;
+ (*m_pFileStream) << (sal_uInt8)0;
nRecLength += 10;
if ( bBinary )
aBuffer[0] = 0x06;
@@ -1372,7 +1372,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
aBuffer[0] = 0x00;
}
- (*m_pFileStream) << (BYTE)FIELD_DESCRIPTOR_TERMINATOR; // end of header
+ (*m_pFileStream) << (sal_uInt8)FIELD_DESCRIPTOR_TERMINATOR; // end of header
(*m_pFileStream) << (char)DBF_EOL;
m_pFileStream->Seek(10L);
(*m_pFileStream) << nRecLength; // set record length afterwards
@@ -1381,9 +1381,9 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
{
m_pFileStream->Seek(0L);
if (nDbaseType == VisualFoxPro)
- (*m_pFileStream) << (BYTE) FoxProMemo;
+ (*m_pFileStream) << (sal_uInt8) FoxProMemo;
else
- (*m_pFileStream) << (BYTE) dBaseIIIMemo;
+ (*m_pFileStream) << (sal_uInt8) dBaseIIIMemo;
} // if (bCreateMemo)
}
catch ( const Exception& e )
@@ -1398,12 +1398,12 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
catch(const Exception&) { }
throw;
}
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------
// creates in principle dBase III file format
-BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
+sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateMemoFile" );
// filehandling macro for table creation
@@ -1415,16 +1415,8 @@ BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
char aBuffer[512]; // write buffer
memset(aBuffer,0,sizeof(aBuffer));
-#ifdef WIN
- m_pMemoStream->Seek(0L);
- for (UINT16 i = 0; i < 512; i++)
- {
- (*m_pMemoStream) << BYTE(0);
- }
-#else
m_pMemoStream->SetFiller('\0');
m_pMemoStream->SetStreamSize(512);
-#endif
m_pMemoStream->Seek(0L);
(*m_pMemoStream) << long(1); // pointer to the first free block
@@ -1432,16 +1424,16 @@ BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
m_pMemoStream->Flush();
delete m_pMemoStream;
m_pMemoStream = NULL;
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------
-BOOL ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
+sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::Drop_Static" );
INetURLObject aURL;
aURL.SetURL(_sUrl);
- BOOL bDropped = ::utl::UCBContentHelper::Kill(aURL.GetMainURL(INetURLObject::NO_DECODE));
+ sal_Bool bDropped = ::utl::UCBContentHelper::Kill(aURL.GetMainURL(INetURLObject::NO_DECODE));
if(bDropped)
{
@@ -1484,7 +1476,7 @@ BOOL ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFie
return bDropped;
}
// -----------------------------------------------------------------------------
-BOOL ODbaseTable::DropImpl()
+sal_Bool ODbaseTable::DropImpl()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::DropImpl" );
FileClose();
@@ -1492,7 +1484,7 @@ BOOL ODbaseTable::DropImpl()
if(!m_pIndexes)
refreshIndexes(); // look for indexes which must be deleted as well
- BOOL bDropped = Drop_Static(getEntry(m_pConnection,m_Name),HasMemoFields(),m_pIndexes);
+ sal_Bool bDropped = Drop_Static(getEntry(m_pConnection,m_Name),HasMemoFields(),m_pIndexes);
if(!bDropped)
{// we couldn't drop the table so we have to reopen it
construct();
@@ -1503,7 +1495,7 @@ BOOL ODbaseTable::DropImpl()
}
//------------------------------------------------------------------
-BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const Reference<XIndexAccess>& _xCols)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::InsertRow" );
// fill buffer with blanks
@@ -1513,13 +1505,13 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
// Copy new row completely:
// ... and add at the end as new Record:
- UINT32 nTempPos = m_nFilePos;
+ sal_uInt32 nTempPos = m_nFilePos;
- m_nFilePos = (ULONG)m_aHeader.db_anz + 1;
- BOOL bInsertRow = UpdateBuffer( rRow, NULL, _xCols );
+ m_nFilePos = (sal_uIntPtr)m_aHeader.db_anz + 1;
+ sal_Bool bInsertRow = UpdateBuffer( rRow, NULL, _xCols );
if ( bInsertRow )
{
- UINT32 nFileSize = 0, nMemoFileSize = 0;
+ sal_uInt32 nFileSize = 0, nMemoFileSize = 0;
nFileSize = lcl_getFileSize(*m_pFileStream);
@@ -1561,7 +1553,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
}
//------------------------------------------------------------------
-BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const Reference<XIndexAccess>& _xCols)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::UpdateRow" );
// fill buffer with blanks
@@ -1572,7 +1564,7 @@ BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const R
m_pFileStream->Seek(nPos);
m_pFileStream->Read((char*)m_pBuffer, m_aHeader.db_slng);
- UINT32 nMemoFileSize( 0 );
+ sal_uInt32 nMemoFileSize( 0 );
if (HasMemoFields() && m_pMemoStream)
{
m_pMemoStream->Seek(STREAM_SEEK_TO_END);
@@ -1591,7 +1583,7 @@ BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const R
}
//------------------------------------------------------------------
-BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
+sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::DeleteRow" );
// Set the Delete-Flag (be it set or not):
@@ -1601,13 +1593,13 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
OValueRefRow aRow = new OValueRefVector(_rCols.get().size());
- if (!fetchRow(aRow,_rCols,TRUE,TRUE))
+ if (!fetchRow(aRow,_rCols,sal_True,sal_True))
return sal_False;
Reference<XPropertySet> xCol;
::rtl::OUString aColName;
::comphelper::UStringMixEqual aCase(isCaseSensitive());
- for (USHORT i = 0; i < m_pColumns->getCount(); i++)
+ for (sal_uInt16 i = 0; i < m_pColumns->getCount(); i++)
{
Reference<XPropertySet> xIndex = isUniqueByColumnName(i);
if (xIndex.is())
@@ -1639,7 +1631,7 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
}
m_pFileStream->Seek(nFilePos);
- (*m_pFileStream) << (BYTE)'*'; // mark the row in the table as deleted
+ (*m_pFileStream) << (sal_uInt8)'*'; // mark the row in the table as deleted
m_pFileStream->Flush();
return sal_True;
}
@@ -1679,18 +1671,18 @@ double toDouble(const ByteString& rString)
}
//------------------------------------------------------------------
-BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const Reference<XIndexAccess>& _xCols)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::UpdateBuffer" );
OSL_ENSURE(m_pBuffer,"Buffer is NULL!");
if ( !m_pBuffer )
- return FALSE;
+ return sal_False;
sal_Int32 nByteOffset = 1;
// Update fields:
Reference<XPropertySet> xCol;
Reference<XPropertySet> xIndex;
- USHORT i;
+ sal_uInt16 i;
::rtl::OUString aColName;
const sal_Int32 nColumnCount = m_pColumns->getCount();
::std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount);
@@ -1956,7 +1948,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
char cNext = pData[nLen]; // Mark's scratch and replaced by 0
pData[nLen] = '\0'; // This is because the buffer is always a sign of greater ...
- ULONG nBlockNo = strtol((const char *)pData,NULL,10); // Block number read
+ sal_uIntPtr nBlockNo = strtol((const char *)pData,NULL,10); // Block number read
// Next initial character restore again:
pData[nLen] = cNext;
@@ -2012,14 +2004,14 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
}
// -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
+sal_Bool ODbaseTable::WriteMemo(ORowSetValue& aVariable, sal_uIntPtr& rBlockNr)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteMemo" );
// if the BlockNo 0 is given, the block will be appended at the end
- ULONG nSize = 0;
+ sal_uIntPtr nSize = 0;
::rtl::OString aStr;
::com::sun::star::uno::Sequence<sal_Int8> aValue;
- BYTE nHeader[4];
+ sal_uInt8 nHeader[4];
const bool bBinary = aVariable.getTypeKind() == DataType::LONGVARBINARY && m_aMemoHeader.db_typ == MemoFoxPro;
if ( bBinary )
{
@@ -2032,7 +2024,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
}
// append or overwrite
- BOOL bAppend = rBlockNr == 0;
+ sal_Bool bAppend = rBlockNr == 0;
if (!bAppend)
{
@@ -2049,7 +2041,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
m_pMemoStream->SeekRel(4L);
m_pMemoStream->Read(sHeader,4);
- ULONG nOldSize;
+ sal_uIntPtr nOldSize;
if (m_aMemoHeader.db_typ == MemoFoxPro)
nOldSize = ((((unsigned char)sHeader[0]) * 256 +
(unsigned char)sHeader[1]) * 256 +
@@ -2062,7 +2054,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
(unsigned char)sHeader[0] - 8;
// fits the new length in the used blocks
- ULONG nUsedBlocks = ((nSize + 8) / m_aMemoHeader.db_size) + (((nSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0),
+ sal_uIntPtr nUsedBlocks = ((nSize + 8) / m_aMemoHeader.db_size) + (((nSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0),
nOldUsedBlocks = ((nOldSize + 8) / m_aMemoHeader.db_size) + (((nOldSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0);
bAppend = nUsedBlocks > nOldUsedBlocks;
}
@@ -2071,7 +2063,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
if (bAppend)
{
- ULONG nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
+ sal_uIntPtr nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
// fill last block
rBlockNr = (nStreamSize / m_aMemoHeader.db_size) + ((nStreamSize % m_aMemoHeader.db_size) > 0 ? 1 : 0);
@@ -2096,30 +2088,30 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
case MemodBaseIV: // dBase IV-Memofeld with length
{
if ( MemodBaseIV == m_aMemoHeader.db_typ )
- (*m_pMemoStream) << (BYTE)0xFF
- << (BYTE)0xFF
- << (BYTE)0x08;
+ (*m_pMemoStream) << (sal_uInt8)0xFF
+ << (sal_uInt8)0xFF
+ << (sal_uInt8)0x08;
else
- (*m_pMemoStream) << (BYTE)0x00
- << (BYTE)0x00
- << (BYTE)0x00;
+ (*m_pMemoStream) << (sal_uInt8)0x00
+ << (sal_uInt8)0x00
+ << (sal_uInt8)0x00;
- UINT32 nWriteSize = nSize;
+ sal_uInt32 nWriteSize = nSize;
if (m_aMemoHeader.db_typ == MemoFoxPro)
{
if ( bBinary )
- (*m_pMemoStream) << (BYTE) 0x00; // Picture
+ (*m_pMemoStream) << (sal_uInt8) 0x00; // Picture
else
- (*m_pMemoStream) << (BYTE) 0x01; // Memo
+ (*m_pMemoStream) << (sal_uInt8) 0x01; // Memo
for (int i = 4; i > 0; nWriteSize >>= 8)
- nHeader[--i] = (BYTE) (nWriteSize % 256);
+ nHeader[--i] = (sal_uInt8) (nWriteSize % 256);
}
else
{
- (*m_pMemoStream) << (BYTE) 0x00;
+ (*m_pMemoStream) << (sal_uInt8) 0x00;
nWriteSize += 8;
for (int i = 0; i < 4; nWriteSize >>= 8)
- nHeader[i++] = (BYTE) (nWriteSize % 256);
+ nHeader[i++] = (sal_uInt8) (nWriteSize % 256);
}
m_pMemoStream->Write(nHeader,4);
@@ -2135,7 +2127,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
// Write the new block number
if (bAppend)
{
- ULONG nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
+ sal_uIntPtr nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
m_aMemoHeader.db_next = (nStreamSize / m_aMemoHeader.db_size) + ((nStreamSize % m_aMemoHeader.db_size) > 0 ? 1 : 0);
// Write the new block number
@@ -2192,7 +2184,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
if(xOldColumn.is())
xCopyColumn = xOldColumn->createDataDescriptor();
else
- xCopyColumn = new OColumn(getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+ xCopyColumn = new OColumn(getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
::comphelper::copyProperties(descriptor,xCopyColumn);
@@ -2217,7 +2209,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
if(xColumn.is())
xCpy = xColumn->createDataDescriptor();
else
- xCpy = new OColumn(getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+ xCpy = new OColumn(getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
::comphelper::copyProperties(xProp,xCpy);
xAppend->appendByDescriptor(xCpy);
}
@@ -2233,7 +2225,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
if(xColumn.is())
xCpy = xColumn->createDataDescriptor();
else
- xCpy = new OColumn(getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+ xCpy = new OColumn(getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
::comphelper::copyProperties(xProp,xCpy);
xAppend->appendByDescriptor(xCpy);
}
@@ -2374,7 +2366,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
{
Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
- sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+ sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
// copy the structure
for(sal_Int32 i=0;i < m_pColumns->getCount();++i)
{
@@ -2407,7 +2399,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
::dbtools::throwGenericSQLException( sError, *this );
}
- BOOL bAlreadyDroped = FALSE;
+ sal_Bool bAlreadyDroped = sal_False;
try
{
pNewTable->construct();
@@ -2416,7 +2408,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
// drop the old table
if(DropImpl())
{
- bAlreadyDroped = TRUE;
+ bAlreadyDroped = sal_True;
pNewTable->renameImpl(m_Name);
// release the temp file
}
@@ -2447,7 +2439,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
{
Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
- sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+ sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
// copy the structure
for(sal_Int32 i=0;i < m_pColumns->getCount();++i)
{
@@ -2680,10 +2672,10 @@ End:
return sal_True;
}
// -----------------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
+sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemo" );
- BOOL bIsText = TRUE;
+ bool bIsText = true;
m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
switch (m_aMemoHeader.db_typ)
@@ -2694,13 +2686,13 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
ByteString aBStr;
static char aBuf[514];
aBuf[512] = 0; // avoid random value
- BOOL bReady = sal_False;
+ sal_Bool bReady = sal_False;
do
{
m_pMemoStream->Read(&aBuf,512);
- USHORT i = 0;
+ sal_uInt16 i = 0;
while (aBuf[i] != cEOF && ++i < 512)
;
bReady = aBuf[i] == cEOF;
@@ -2724,7 +2716,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
{
bIsText = sHeader[3] != 0;
}
- else if (((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+ else if (((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
{
return sal_False;
}
@@ -2773,7 +2765,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
void ODbaseTable::AllocBuffer()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::AllocBuffer" );
- UINT16 nSize = m_aHeader.db_slng;
+ sal_uInt16 nSize = m_aHeader.db_slng;
OSL_ENSURE(nSize > 0, "Size too small");
if (m_nBufferSize != nSize)
@@ -2786,11 +2778,11 @@ void ODbaseTable::AllocBuffer()
if (m_pBuffer == NULL && nSize)
{
m_nBufferSize = nSize;
- m_pBuffer = new BYTE[m_nBufferSize+1];
+ m_pBuffer = new sal_uInt8[m_nBufferSize+1];
}
}
// -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteBuffer()
+sal_Bool ODbaseTable::WriteBuffer()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteBuffer" );
OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index ed811f9900b4..ed811f9900b4 100644..100755
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index ad840d666989..67af687fb3c4 100644..100755
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -30,13 +30,11 @@
#include "precompiled_connectivity.hxx"
#include "dbase/DDriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::dbase;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pT
);
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- ODriver::getImplementationName_Static(),
- ODriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/dbase/dbase.component b/connectivity/source/drivers/dbase/dbase.component
new file mode 100755
index 000000000000..7f913f083680
--- /dev/null
+++ b/connectivity/source/drivers/dbase/dbase.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdbc.dbase.ODriver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ <service name="com.sun.star.sdbcx.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/dbase/dbase.mxp.map b/connectivity/source/drivers/dbase/dbase.mxp.map
index c5b4377b04c3..87eccc45b66a 100644..100755
--- a/connectivity/source/drivers/dbase/dbase.mxp.map
+++ b/connectivity/source/drivers/dbase/dbase.mxp.map
@@ -1,5 +1,4 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
__mh_dylib_header
___builtin_delete
diff --git a/connectivity/source/drivers/dbase/dbase.xml b/connectivity/source/drivers/dbase/dbase.xml
index 3ebfd6185380..3ebfd6185380 100644..100755
--- a/connectivity/source/drivers/dbase/dbase.xml
+++ b/connectivity/source/drivers/dbase/dbase.xml
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 8cb76a33fb66..487c0b740b87 100644..100755
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -43,19 +43,19 @@ using namespace connectivity::dbase;
using namespace connectivity::file;
using namespace com::sun::star::sdbc;
// -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(UINT32 nRec)
+ONDXKey::ONDXKey(sal_uInt32 nRec)
:nRecord(nRec)
{
}
// -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec)
+ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
: ONDXKey_BASE(eType)
, nRecord(nRec)
, xValue(rVal)
{
}
// -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
+ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec)
: ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
,nRecord(nRec)
{
@@ -66,7 +66,8 @@ ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
}
}
// -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(double aVal, UINT32 nRec)
+
+ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
: ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE)
,nRecord(nRec)
,xValue(aVal)
@@ -79,7 +80,7 @@ ONDXKey::ONDXKey(double aVal, UINT32 nRec)
//==================================================================
ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent)
:nPagePos(nPos)
- ,bModified(FALSE)
+ ,bModified(sal_False)
,nCount(0)
,aParent(pParent)
,rIndex(rInd)
@@ -101,16 +102,16 @@ void ONDXPage::QueryDelete()
if (IsModified() && rIndex.m_pFileStream)
(*rIndex.m_pFileStream) << *this;
- bModified = FALSE;
+ bModified = sal_False;
if (rIndex.UseCollector())
{
if (aChild.Is())
- aChild->Release(FALSE);
+ aChild->Release(sal_False);
- for (USHORT i = 0; i < rIndex.getHeader().db_maxkeys;i++)
+ for (sal_uInt16 i = 0; i < rIndex.getHeader().db_maxkeys;i++)
{
if (ppNodes[i].GetChild().Is())
- ppNodes[i].GetChild()->Release(FALSE);
+ ppNodes[i].GetChild()->Release(sal_False);
ppNodes[i] = ONDXNode();
}
@@ -134,10 +135,10 @@ ONDXPagePtr& ONDXPage::GetChild(ODbaseIndex* pIndex)
}
//------------------------------------------------------------------
-USHORT ONDXPage::FindPos(const ONDXKey& rKey) const
+sal_uInt16 ONDXPage::FindPos(const ONDXKey& rKey) const
{
// searches the position for the given key in a page
- USHORT i = 0;
+ sal_uInt16 i = 0;
while (i < nCount && rKey > ((*this)[i]).GetKey())
i++;
@@ -145,17 +146,17 @@ USHORT ONDXPage::FindPos(const ONDXKey& rKey) const
}
//------------------------------------------------------------------
-BOOL ONDXPage::Find(const ONDXKey& rKey)
+sal_Bool ONDXPage::Find(const ONDXKey& rKey)
{
// searches the given key
// Speciality: At the end of the method
// the actual page and the position of the node, fulfilling the '<=' condition, are saved
// This is considered at insert.
- USHORT i = 0;
+ sal_uInt16 i = 0;
while (i < nCount && rKey > ((*this)[i]).GetKey())
i++;
- BOOL bResult = FALSE;
+ sal_Bool bResult = sal_False;
if (!IsLeaf())
{
@@ -167,7 +168,7 @@ BOOL ONDXPage::Find(const ONDXKey& rKey)
{
rIndex.m_aCurLeaf = this;
rIndex.m_nCurNode = i - 1;
- bResult = FALSE;
+ bResult = sal_False;
}
else
{
@@ -179,14 +180,14 @@ BOOL ONDXPage::Find(const ONDXKey& rKey)
}
//------------------------------------------------------------------
-BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
+sal_Bool ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
{
// When creating an index there can be multiple nodes added,
// these are sorted ascending
- BOOL bAppend = nRowsLeft > 0;
+ sal_Bool bAppend = nRowsLeft > 0;
if (IsFull())
{
- BOOL bResult = TRUE;
+ sal_Bool bResult = sal_True;
ONDXNode aSplitNode;
if (bAppend)
aSplitNode = rNode;
@@ -206,7 +207,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
}
else // Position unbekannt
{
- USHORT nPos = NODE_NOTFOUND;
+ sal_uInt16 nPos = NODE_NOTFOUND;
while (++nPos < nCount && rNode.GetKey() > ((*this)[nPos]).GetKey()) ;
--nCount; // (otherwise we might get Assertions and GPFs - 60593)
@@ -289,7 +290,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
}
else
{
- USHORT nNodePos = FindPos(rNode.GetKey());
+ sal_uInt16 nNodePos = FindPos(rNode.GetKey());
if (IsLeaf())
rIndex.m_nCurNode = nNodePos;
@@ -299,17 +300,17 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
}
//------------------------------------------------------------------
-BOOL ONDXPage::Insert(USHORT nPos, ONDXNode& rNode)
+sal_Bool ONDXPage::Insert(sal_uInt16 nPos, ONDXNode& rNode)
{
- USHORT nMaxCount = rIndex.getHeader().db_maxkeys;
+ sal_uInt16 nMaxCount = rIndex.getHeader().db_maxkeys;
if (nPos >= nMaxCount)
- return FALSE;
+ return sal_False;
if (nCount)
{
++nCount;
// shift right
- for (USHORT i = std::min((USHORT)(nMaxCount-1), (USHORT)(nCount-1)); nPos < i; --i)
+ for (sal_uInt16 i = std::min((sal_uInt16)(nMaxCount-1), (sal_uInt16)(nCount-1)); nPos < i; --i)
(*this)[i] = (*this)[i-1];
}
else
@@ -325,19 +326,19 @@ BOOL ONDXPage::Insert(USHORT nPos, ONDXNode& rNode)
rNode.GetChild()->SetParent(this);
}
- bModified = TRUE;
+ bModified = sal_True;
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------
-BOOL ONDXPage::Append(ONDXNode& rNode)
+sal_Bool ONDXPage::Append(ONDXNode& rNode)
{
DBG_ASSERT(!IsFull(), "kein Append moeglich");
return Insert(nCount, rNode);
}
//------------------------------------------------------------------
-void ONDXPage::Release(BOOL bSave)
+void ONDXPage::Release(sal_Bool bSave)
{
// free pages
if (aChild.Is())
@@ -346,7 +347,7 @@ void ONDXPage::Release(BOOL bSave)
// free pointer
aChild.Clear();
- for (USHORT i = 0; i < rIndex.getHeader().db_maxkeys;i++)
+ for (sal_uInt16 i = 0; i < rIndex.getHeader().db_maxkeys;i++)
{
if (ppNodes[i].GetChild())
ppNodes[i].GetChild()->Release(bSave);
@@ -356,7 +357,7 @@ void ONDXPage::Release(BOOL bSave)
aParent = NULL;
}
//------------------------------------------------------------------
-void ONDXPage::ReleaseFull(BOOL bSave)
+void ONDXPage::ReleaseFull(sal_Bool bSave)
{
ONDXPagePtr aTempParent = aParent;
Release(bSave);
@@ -365,7 +366,7 @@ void ONDXPage::ReleaseFull(BOOL bSave)
{
// Free pages not needed, there will be no reference anymore to the pages
// afterwards 'this' can't be valid anymore!!!
- USHORT nParentPos = aTempParent->Search(this);
+ sal_uInt16 nParentPos = aTempParent->Search(this);
if (nParentPos != NODE_NOTFOUND)
(*aTempParent)[nParentPos].GetChild().Clear();
else
@@ -373,7 +374,7 @@ void ONDXPage::ReleaseFull(BOOL bSave)
}
}
//------------------------------------------------------------------
-BOOL ONDXPage::Delete(USHORT nNodePos)
+sal_Bool ONDXPage::Delete(sal_uInt16 nNodePos)
{
if (IsLeaf())
{
@@ -396,7 +397,7 @@ BOOL ONDXPage::Delete(USHORT nNodePos)
if (HasParent() && nCount < (rIndex.GetMaxNodes() / 2))
{
// determine, which node points to the page
- USHORT nParentNodePos = aParent->Search(this);
+ sal_uInt16 nParentNodePos = aParent->Search(this);
// last element on parent-page -> merge with secondlast page
if (nParentNodePos == (aParent->Count() - 1))
{
@@ -419,7 +420,7 @@ BOOL ONDXPage::Delete(USHORT nNodePos)
else if (IsRoot())
// make sure that the position of the root is kept
rIndex.SetRootPos(nPagePos);
- return TRUE;
+ return sal_True;
}
@@ -440,7 +441,7 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
ONDXNode aResultNode;
if (IsLeaf())
{
- for (USHORT i = (nCount - (nCount / 2)), j = 0 ; i < nCount; i++)
+ for (sal_uInt16 i = (nCount - (nCount / 2)), j = 0 ; i < nCount; i++)
rPage.Insert(j++,(*this)[i]);
// this node contains a key that already exists in the tree and must be replaced
@@ -454,7 +455,7 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
}
else
{
- for (USHORT i = (nCount + 1) / 2 + 1, j = 0 ; i < nCount; i++)
+ for (sal_uInt16 i = (nCount + 1) / 2 + 1, j = 0 ; i < nCount; i++)
rPage.Insert(j++,(*this)[i]);
aResultNode = (*this)[(nCount + 1) / 2];
@@ -469,31 +470,31 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
// inner nodes have no record number
if (rIndex.isUnique())
aResultNode.GetKey().ResetRecord();
- bModified = TRUE;
+ bModified = sal_True;
return aResultNode;
}
//------------------------------------------------------------------
-void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
+void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage)
{
DBG_ASSERT(HasParent(), "kein Vater vorhanden");
DBG_ASSERT(nParentNodePos != NODE_NOTFOUND, "Falscher Indexaufbau");
/* Merge 2 pages */
ONDXNode aResultNode;
- USHORT nMaxNodes = rIndex.GetMaxNodes(),
+ sal_uInt16 nMaxNodes = rIndex.GetMaxNodes(),
nMaxNodes_2 = nMaxNodes / 2;
// Determine if page is right or left neighbour
- BOOL bRight = ((*xPage)[0].GetKey() > (*this)[0].GetKey()); // TRUE, if xPage is the right page
- USHORT nNewCount = (*xPage).Count() + Count();
+ sal_Bool bRight = ((*xPage)[0].GetKey() > (*this)[0].GetKey()); // sal_True, wenn xPage die rechte Seite ist
+ sal_uInt16 nNewCount = (*xPage).Count() + Count();
if (IsLeaf())
{
// Condition for merge
if (nNewCount < (nMaxNodes_2 * 2))
{
- USHORT nLastNode = bRight ? Count() - 1 : xPage->Count() - 1;
+ sal_uInt16 nLastNode = bRight ? Count() - 1 : xPage->Count() - 1;
if (bRight)
{
DBG_ASSERT(&xPage != this,"xPage und THIS duerfen nicht gleich sein: Endlosschleife");
@@ -518,7 +519,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
(*aParent)[nParentNodePos-1].SetChild(this,aParent);
else // or set as right node
aParent->SetChild(this);
- aParent->SetModified(TRUE);
+ aParent->SetModified(sal_True);
}
@@ -532,12 +533,12 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
aParent = NULL;
rIndex.SetRootPos(nPagePos);
rIndex.m_aRoot = this;
- SetModified(TRUE);
+ SetModified(sal_True);
}
else
aParent->SearchAndReplace((*this)[nLastNode].GetKey(),(*this)[nCount-1].GetKey());
- xPage->SetModified(FALSE);
+ xPage->SetModified(sal_False);
xPage->ReleaseFull(); // is not needed anymore
}
// balance the elements nNewCount >= (nMaxNodes_2 * 2)
@@ -580,7 +581,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
// Parent node will be integrated; is initialized with Child from xPage
(*aParent)[nParentNodePos].SetChild(xPage->GetChild(),aParent);
Append((*aParent)[nParentNodePos]);
- for (USHORT i = 0 ; i < xPage->Count(); i++)
+ for (sal_uInt16 i = 0 ; i < xPage->Count(); i++)
Append((*xPage)[i]);
}
else
@@ -604,7 +605,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
// afterwards parent node will be reset
(*aParent)[nParentNodePos].SetChild();
- aParent->SetModified(TRUE);
+ aParent->SetModified(sal_True);
if(aParent->IsRoot() && aParent->Count() == 1)
{
@@ -613,7 +614,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
aParent = NULL;
rIndex.SetRootPos(nPagePos);
rIndex.m_aRoot = this;
- SetModified(TRUE);
+ SetModified(sal_True);
}
else if(nParentNodePos)
// replace the node value
@@ -621,7 +622,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
// thats why the node must be updated here
aParent->SearchAndReplace((*aParent)[nParentNodePos-1].GetKey(),(*aParent)[nParentNodePos].GetKey());
- xPage->SetModified(FALSE);
+ xPage->SetModified(sal_False);
xPage->ReleaseFull();
}
// balance the elements
@@ -652,7 +653,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
(*aParent)[nParentNodePos].SetChild(this,aParent);
}
- aParent->SetModified(TRUE);
+ aParent->SetModified(sal_True);
}
}
}
@@ -674,7 +675,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
else
{
ByteString aBuf;
- USHORT nLen = rIndex.getHeader().db_keylen;
+ sal_uInt16 nLen = rIndex.getHeader().db_keylen;
char* pStr = aBuf.AllocBuffer(nLen+1);
rStream.Read(pStr,nLen);
@@ -706,7 +707,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
if (aKey.getValue().isNull())
{
memset(aNodeData.aData,0,rIndex.getHeader().db_keylen);
- rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+ rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
}
else
rStream << (double) aKey.getValue();
@@ -720,7 +721,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
ByteString aText(sValue.getStr(), rIndex.m_pTable->getConnection()->getTextEncoding());
strncpy(aNodeData.aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, aText.Len()));
}
- rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+ rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
}
rStream << aChild;
}
@@ -740,7 +741,7 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
// ONDXKey
//==================================================================
//------------------------------------------------------------------
-BOOL ONDXKey::IsText(sal_Int32 eType)
+sal_Bool ONDXKey::IsText(sal_Int32 eType)
{
return eType == DataType::VARCHAR || eType == DataType::CHAR;
}
@@ -766,7 +767,7 @@ StringCompare ONDXKey::Compare(const ONDXKey& rKey) const
}
else if (IsText(getDBType()))
{
- INT32 nRes = getValue().getString().compareTo(rKey.getValue());
+ sal_Int32 nRes = getValue().getString().compareTo(rKey.getValue());
eResult = (nRes > 0) ? COMPARE_GREATER : (nRes == 0) ? COMPARE_EQUAL : COMPARE_LESS;
}
else
@@ -839,15 +840,15 @@ ONDXPagePtr& ONDXPagePtr::operator= (ONDXPage* pRef)
return *this;
}
// -----------------------------------------------------------------------------
-static UINT32 nValue;
+static sal_uInt32 nValue;
//------------------------------------------------------------------
SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
{
rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
rStream >> nValue >> rPage.aChild;
- rPage.nCount = USHORT(nValue);
+ rPage.nCount = sal_uInt16(nValue);
- for (USHORT i = 0; i < rPage.nCount; i++)
+ for (sal_uInt16 i = 0; i < rPage.nCount; i++)
rPage[i].Read(rStream, rPage.GetIndex());
return rStream;
}
@@ -856,7 +857,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& rPage)
{
// Page doesn't exist yet
- ULONG nSize = (rPage.GetPagePos() + 1) * PAGE_SIZE;
+ sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * PAGE_SIZE;
if (nSize > rStream.Seek(STREAM_SEEK_TO_END))
{
rStream.SetStreamSize(nSize);
@@ -864,27 +865,27 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
char aEmptyData[PAGE_SIZE];
memset(aEmptyData,0x00,PAGE_SIZE);
- rStream.Write((BYTE*)aEmptyData,PAGE_SIZE);
+ rStream.Write((sal_uInt8*)aEmptyData,PAGE_SIZE);
}
- ULONG nCurrentPos = rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
+ sal_uIntPtr nCurrentPos = rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
OSL_UNUSED( nCurrentPos );
nValue = rPage.nCount;
rStream << nValue << rPage.aChild;
- USHORT i = 0;
+ sal_uInt16 i = 0;
for (; i < rPage.nCount; i++)
rPage[i].Write(rStream, rPage);
// check if we have to fill the stream with '\0'
if(i < rPage.rIndex.getHeader().db_maxkeys)
{
- ULONG nTell = rStream.Tell() % PAGE_SIZE;
- USHORT nBufferSize = rStream.GetBufferSize();
- ULONG nRemainSize = nBufferSize - nTell;
+ sal_uIntPtr nTell = rStream.Tell() % PAGE_SIZE;
+ sal_uInt16 nBufferSize = rStream.GetBufferSize();
+ sal_uIntPtr nRemainSize = nBufferSize - nTell;
char* pEmptyData = new char[nRemainSize];
memset(pEmptyData,0x00,nRemainSize);
- rStream.Write((BYTE*)pEmptyData,nRemainSize);
+ rStream.Write((sal_uInt8*)pEmptyData,nRemainSize);
rStream.Seek(nTell);
delete [] pEmptyData;
}
@@ -898,7 +899,7 @@ void ONDXPage::PrintPage()
DBG_TRACE4("\nSDB: -----------Page: %d Parent: %d Count: %d Child: %d-----",
nPagePos, HasParent() ? aParent->GetPagePos() : 0 ,nCount, aChild.GetPagePos());
- for (USHORT i = 0; i < nCount; i++)
+ for (sal_uInt16 i = 0; i < nCount; i++)
{
ONDXNode rNode = (*this)[i];
ONDXKey& rKey = rNode.GetKey();
@@ -923,7 +924,7 @@ void ONDXPage::PrintPage()
{
#if OSL_DEBUG_LEVEL > 1
GetChild(&rIndex)->PrintPage();
- for (USHORT i = 0; i < nCount; i++)
+ for (sal_uInt16 i = 0; i < nCount; i++)
{
ONDXNode rNode = (*this)[i];
rNode.GetChild(&rIndex,this)->PrintPage();
@@ -934,16 +935,16 @@ void ONDXPage::PrintPage()
}
#endif
// -----------------------------------------------------------------------------
-BOOL ONDXPage::IsFull() const
+sal_Bool ONDXPage::IsFull() const
{
return Count() == rIndex.getHeader().db_maxkeys;
}
// -----------------------------------------------------------------------------
//------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXKey& rSearch)
+sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
{
// binary search later
- USHORT i = NODE_NOTFOUND;
+ sal_uInt16 i = NODE_NOTFOUND;
while (++i < Count())
if ((*this)[i].GetKey() == rSearch)
break;
@@ -952,9 +953,9 @@ USHORT ONDXPage::Search(const ONDXKey& rSearch)
}
//------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXPage* pPage)
+sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
{
- USHORT i = NODE_NOTFOUND;
+ sal_uInt16 i = NODE_NOTFOUND;
while (++i < Count())
if (((*this)[i]).GetChild() == pPage)
break;
@@ -970,7 +971,7 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
OSL_ENSURE(rSearch != rReplace,"Invalid here:rSearch == rReplace");
if (rSearch != rReplace)
{
- USHORT nPos = NODE_NOTFOUND;
+ sal_uInt16 nPos = NODE_NOTFOUND;
ONDXPage* pPage = this;
while (pPage && (nPos = pPage->Search(rSearch)) == NODE_NOTFOUND)
@@ -979,33 +980,33 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
if (pPage)
{
(*pPage)[nPos].GetKey() = rReplace;
- pPage->SetModified(TRUE);
+ pPage->SetModified(sal_True);
}
}
}
// -----------------------------------------------------------------------------
-ONDXNode& ONDXPage::operator[] (USHORT nPos)
+ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos)
{
DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
return ppNodes[nPos];
}
//------------------------------------------------------------------
-const ONDXNode& ONDXPage::operator[] (USHORT nPos) const
+const ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) const
{
DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
return ppNodes[nPos];
}
// -----------------------------------------------------------------------------
-void ONDXPage::Remove(USHORT nPos)
+void ONDXPage::Remove(sal_uInt16 nPos)
{
DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
- for (USHORT i = nPos; i < (nCount-1); i++)
+ for (sal_uInt16 i = nPos; i < (nCount-1); i++)
(*this)[i] = (*this)[i+1];
nCount--;
- bModified = TRUE;
+ bModified = sal_True;
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/dbase/exports.dxp b/connectivity/source/drivers/dbase/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/dbase/exports.dxp
+++ b/connectivity/source/drivers/dbase/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index 1aac0b0b1e21..5c3344b1daad 100644..100755
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -127,3 +127,11 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/dbase.component
+
+$(MISC)/dbase.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ dbase.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt dbase.component
diff --git a/connectivity/source/drivers/evoab/LCatalog.cxx b/connectivity/source/drivers/evoab/LCatalog.cxx
index 25e06e2b90c0..25e06e2b90c0 100644..100755
--- a/connectivity/source/drivers/evoab/LCatalog.cxx
+++ b/connectivity/source/drivers/evoab/LCatalog.cxx
diff --git a/connectivity/source/drivers/evoab/LCatalog.hxx b/connectivity/source/drivers/evoab/LCatalog.hxx
index b8a205a38c83..b8a205a38c83 100644..100755
--- a/connectivity/source/drivers/evoab/LCatalog.hxx
+++ b/connectivity/source/drivers/evoab/LCatalog.hxx
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx
index 7d005bbf5fbe..7d005bbf5fbe 100644..100755
--- a/connectivity/source/drivers/evoab/LColumnAlias.cxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.cxx
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.hxx b/connectivity/source/drivers/evoab/LColumnAlias.hxx
index 419d158fa105..419d158fa105 100644..100755
--- a/connectivity/source/drivers/evoab/LColumnAlias.hxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.hxx
diff --git a/connectivity/source/drivers/evoab/LColumns.cxx b/connectivity/source/drivers/evoab/LColumns.cxx
index 5d69f28290b9..5d69f28290b9 100644..100755
--- a/connectivity/source/drivers/evoab/LColumns.cxx
+++ b/connectivity/source/drivers/evoab/LColumns.cxx
diff --git a/connectivity/source/drivers/evoab/LColumns.hxx b/connectivity/source/drivers/evoab/LColumns.hxx
index 5be028cdfe2e..5be028cdfe2e 100644..100755
--- a/connectivity/source/drivers/evoab/LColumns.hxx
+++ b/connectivity/source/drivers/evoab/LColumns.hxx
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx
index 2181de964ac4..2181de964ac4 100644..100755
--- a/connectivity/source/drivers/evoab/LConfigAccess.cxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.cxx
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.hxx b/connectivity/source/drivers/evoab/LConfigAccess.hxx
index c19c63c00750..c19c63c00750 100644..100755
--- a/connectivity/source/drivers/evoab/LConfigAccess.hxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.hxx
diff --git a/connectivity/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx
index 725f24ff2236..725f24ff2236 100644..100755
--- a/connectivity/source/drivers/evoab/LConnection.cxx
+++ b/connectivity/source/drivers/evoab/LConnection.cxx
diff --git a/connectivity/source/drivers/evoab/LConnection.hxx b/connectivity/source/drivers/evoab/LConnection.hxx
index 9d7df3e3d713..9d7df3e3d713 100644..100755
--- a/connectivity/source/drivers/evoab/LConnection.hxx
+++ b/connectivity/source/drivers/evoab/LConnection.hxx
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
index 77821cb6137b..77821cb6137b 100644..100755
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
index ebd693874818..ebd693874818 100644..100755
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/evoab/LDebug.cxx b/connectivity/source/drivers/evoab/LDebug.cxx
index b28e06c55b7e..b28e06c55b7e 100644..100755
--- a/connectivity/source/drivers/evoab/LDebug.cxx
+++ b/connectivity/source/drivers/evoab/LDebug.cxx
diff --git a/connectivity/source/drivers/evoab/LDebug.hxx b/connectivity/source/drivers/evoab/LDebug.hxx
index eeb9eed1860f..eeb9eed1860f 100644..100755
--- a/connectivity/source/drivers/evoab/LDebug.hxx
+++ b/connectivity/source/drivers/evoab/LDebug.hxx
diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx
index 637203e787d9..637203e787d9 100644..100755
--- a/connectivity/source/drivers/evoab/LDriver.cxx
+++ b/connectivity/source/drivers/evoab/LDriver.cxx
diff --git a/connectivity/source/drivers/evoab/LDriver.hxx b/connectivity/source/drivers/evoab/LDriver.hxx
index 65b15c50cd3f..65b15c50cd3f 100644..100755
--- a/connectivity/source/drivers/evoab/LDriver.hxx
+++ b/connectivity/source/drivers/evoab/LDriver.hxx
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index 99f7b6bb930e..b276b1f06ff0 100644..100755
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::lang;
// -------------------------------------------------------------------------
void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
{
- BOOL bRead = TRUE;
+ sal_Bool bRead = sal_True;
QuotedTokenizedString aHeaderLine;
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
@@ -106,7 +106,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
m_aPrecisions.reserve(nFieldCount);
m_aScales.reserve(nFieldCount);
- sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+ sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale);
// read description
sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter();
@@ -124,11 +124,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
aColumnName += String::CreateFromInt32(i+1);
sal_Int32 eType;
- UINT16 nPrecision = 0;
- UINT16 nScale = 0;
+ sal_uInt16 nPrecision = 0;
+ sal_uInt16 nScale = 0;
- BOOL bNumeric = FALSE;
- ULONG nIndex = 0;
+ sal_Bool bNumeric = sal_False;
+ sal_uIntPtr nIndex = 0;
// first without fielddelimiter
String aField;
@@ -136,7 +136,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
if (aField.Len() == 0 ||
(pConnection->getStringDelimiter() && pConnection->getStringDelimiter() == aField.GetChar(0)))
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
}
else
{
@@ -148,11 +148,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
if (aField2.Len() == 0)
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
}
else
{
- bNumeric = TRUE;
+ bNumeric = sal_True;
xub_StrLen nDot = 0;
for (xub_StrLen j = 0; j < aField2.Len(); j++)
{
@@ -162,7 +162,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
(!cThousandDelimiter || c != cThousandDelimiter) &&
!aCharClass.isDigit(aField2,j))
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
break;
}
if (cDecimalDelimiter && c == cDecimalDelimiter)
@@ -174,7 +174,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
}
if (nDot > 1) // if there is more than one dot it isn't a number
- bNumeric = FALSE;
+ bNumeric = sal_False;
if (bNumeric && cThousandDelimiter)
{
// Is the delimiter given correctly?
@@ -187,7 +187,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
continue;
else
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
break;
}
}
diff --git a/connectivity/source/drivers/evoab/LFolderList.hxx b/connectivity/source/drivers/evoab/LFolderList.hxx
index 81f1f032bc3b..f6cb1ac985ea 100644..100755
--- a/connectivity/source/drivers/evoab/LFolderList.hxx
+++ b/connectivity/source/drivers/evoab/LFolderList.hxx
@@ -64,7 +64,7 @@ namespace connectivity
private:
void fillColumns(const ::com::sun::star::lang::Locale& _aLocale);
- BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
+ sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
sal_Bool fetchRow(OValueRow _rRow,const OSQLColumns& _rCols);
sal_Bool seekRow(IResultSetHelper::Movement eCursorPosition);
diff --git a/connectivity/source/drivers/evoab/LNoException.cxx b/connectivity/source/drivers/evoab/LNoException.cxx
index fdeefbd8735b..3b223ddd943b 100644..100755
--- a/connectivity/source/drivers/evoab/LNoException.cxx
+++ b/connectivity/source/drivers/evoab/LNoException.cxx
@@ -41,20 +41,20 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
return 0;
xub_StrLen nTokCount = 1;
- BOOL bStart = TRUE; // Are we on the fist character of the token?
- BOOL bInString = FALSE; // Are we within a (cStrDel delimited) string?
+ sal_Bool bStart = sal_True; // Are we on the fist character of the token?
+ sal_Bool bInString = sal_False; // Are we within a (cStrDel delimited) string?
// Search for the first not-matching character (search ends at the end of string)
for( xub_StrLen i = 0; i < Len(); i++ )
{
if (bStart)
{
- bStart = FALSE;
+ bStart = sal_False;
// First character a string delimiter?
if ((*this).GetChar(i) == cStrDel)
{
- bInString = TRUE; // then we are within a string!
- continue; // read next character!
+ bInString = sal_True; // then we are within a string!
+ continue; // read next character!
}
}
@@ -70,7 +70,7 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
else
{
// end of String
- bInString = FALSE;
+ bInString = sal_False;
}
}
} else {
@@ -78,7 +78,7 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
if ( (*this).GetChar(i) == cTok )
{
nTokCount++;
- bStart = TRUE;
+ bStart = sal_True;
}
}
}
@@ -94,7 +94,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni
xub_StrLen nLen = Len();
if ( nLen )
{
- BOOL bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // are we within a (cStrDel delimited) String?
+ sal_Bool bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // are we within a (cStrDel delimited) String?
// Is the first character a String-Delimiter?
if (bInString )
@@ -116,7 +116,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni
else
{
// end of String
- bInString = FALSE;
+ bInString = sal_False;
}
}
else
@@ -151,7 +151,7 @@ sal_Bool OEvoabTable::checkHeaderLine()
{
if (m_nFilePos == 0 && ((OEvoabConnection*)m_pConnection)->isHeaderLine())
{
- BOOL bRead2;
+ sal_Bool bRead2;
do
{
bRead2 = m_pFileStream->ReadByteStringLine(m_aCurrentLine,m_pConnection->getTextEncoding());
diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.cxx b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
index fee0905e29ab..fee0905e29ab 100644..100755
--- a/connectivity/source/drivers/evoab/LPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.hxx b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
index 700768c686c0..700768c686c0 100644..100755
--- a/connectivity/source/drivers/evoab/LPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
diff --git a/connectivity/source/drivers/evoab/LResultSet.cxx b/connectivity/source/drivers/evoab/LResultSet.cxx
index 4ff0e701f8a4..4ff0e701f8a4 100644..100755
--- a/connectivity/source/drivers/evoab/LResultSet.cxx
+++ b/connectivity/source/drivers/evoab/LResultSet.cxx
diff --git a/connectivity/source/drivers/evoab/LResultSet.hxx b/connectivity/source/drivers/evoab/LResultSet.hxx
index ebd64292e911..ebd64292e911 100644..100755
--- a/connectivity/source/drivers/evoab/LResultSet.hxx
+++ b/connectivity/source/drivers/evoab/LResultSet.hxx
diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx
index f6603140e245..b0f7016c5e72 100644..100755
--- a/connectivity/source/drivers/evoab/LServices.cxx
+++ b/connectivity/source/drivers/evoab/LServices.cxx
@@ -30,13 +30,11 @@
#include "precompiled_connectivity.hxx"
#include "LDriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::evoab;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pT
);
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- OEvoabDriver::getImplementationName_Static(),
- OEvoabDriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/evoab/LStatement.cxx b/connectivity/source/drivers/evoab/LStatement.cxx
index a6350f11139b..a6350f11139b 100644..100755
--- a/connectivity/source/drivers/evoab/LStatement.cxx
+++ b/connectivity/source/drivers/evoab/LStatement.cxx
diff --git a/connectivity/source/drivers/evoab/LStatement.hxx b/connectivity/source/drivers/evoab/LStatement.hxx
index a870c4722034..a870c4722034 100644..100755
--- a/connectivity/source/drivers/evoab/LStatement.hxx
+++ b/connectivity/source/drivers/evoab/LStatement.hxx
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index e55d6fbca410..70df1622e8b1 100644..100755
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -72,7 +72,7 @@ using namespace ::com::sun::star::lang;
// -------------------------------------------------------------------------
void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
{
- BOOL bRead = TRUE;
+ sal_Bool bRead = sal_True;
QuotedTokenizedString aHeaderLine;
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
@@ -115,7 +115,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
m_aPrecisions.reserve(nFieldCount);
m_aScales.reserve(nFieldCount);
- sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+ sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale);
// read description
sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter();
@@ -141,11 +141,11 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
//OSL_TRACE("OEvoabTable::aColumnName = %s\n", ((OUtoCStr(::rtl::OUString(aColumnName))) ? (OUtoCStr(::rtl::OUString(aColumnName))):("NULL")) );
sal_Int32 eType;
- UINT16 nPrecision = 0;
- UINT16 nScale = 0;
+ sal_uInt16 nPrecision = 0;
+ sal_uInt16 nScale = 0;
- BOOL bNumeric = FALSE;
- ULONG nIndex = 0;
+ sal_Bool bNumeric = sal_False;
+ sal_uIntPtr nIndex = 0;
// first without fielddelimiter
String aField;
@@ -155,7 +155,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
if (aField.Len() == 0 ||
(pConnection->getStringDelimiter() && pConnection->getStringDelimiter() == aField.GetChar(0)))
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
}
else
{
@@ -169,11 +169,11 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
if (aField2.Len() == 0)
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
}
else
{
- bNumeric = TRUE;
+ bNumeric = sal_True;
xub_StrLen nDot = 0;
for (xub_StrLen j = 0; j < aField2.Len(); j++)
{
@@ -183,7 +183,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
(!cThousandDelimiter || c != cThousandDelimiter) &&
!aCharClass.isDigit(aField2,j))
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
break;
}
if (cDecimalDelimiter && c == cDecimalDelimiter)
@@ -195,7 +195,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
}
if (nDot > 1) // if there is more than one dot it isn't a number
- bNumeric = FALSE;
+ bNumeric = sal_False;
if (bNumeric && cThousandDelimiter)
{
// is the delimiter given correctly
@@ -208,7 +208,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
continue;
else
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
break;
}
}
@@ -510,7 +510,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa
*(_rRow->get())[0] = m_nFilePos;
if (!bRetrieveData)
- return TRUE;
+ return sal_True;
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
// Fields:
@@ -669,7 +669,7 @@ sal_Bool OEvoabTable::setColumnAliases()
aColumnFinalName = aColumnReadName;
sColumnFinalName = aColumnFinalName;
- sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+ sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
::rtl::OUString aTypeName;
aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
sdbcx::OColumn* pColumn = new sdbcx::OColumn(sColumnFinalName,aTypeName,::rtl::OUString(),
@@ -695,7 +695,7 @@ sal_Bool OEvoabTable::checkHeaderLine()
{
if (m_nFilePos == 0 && ((OEvoabConnection*)m_pConnection)->isHeaderLine())
{
- BOOL bRead2;
+ sal_Bool bRead2;
do
{
bRead2 = m_pFileStream->ReadByteStringLine(m_aCurrentLine,m_pConnection->getTextEncoding());
diff --git a/connectivity/source/drivers/evoab/LTable.hxx b/connectivity/source/drivers/evoab/LTable.hxx
index 998086be4985..998086be4985 100644..100755
--- a/connectivity/source/drivers/evoab/LTable.hxx
+++ b/connectivity/source/drivers/evoab/LTable.hxx
diff --git a/connectivity/source/drivers/evoab/LTables.cxx b/connectivity/source/drivers/evoab/LTables.cxx
index 26b5009683c6..26b5009683c6 100644..100755
--- a/connectivity/source/drivers/evoab/LTables.cxx
+++ b/connectivity/source/drivers/evoab/LTables.cxx
diff --git a/connectivity/source/drivers/evoab/LTables.hxx b/connectivity/source/drivers/evoab/LTables.hxx
index ef2c3f838da3..ef2c3f838da3 100644..100755
--- a/connectivity/source/drivers/evoab/LTables.hxx
+++ b/connectivity/source/drivers/evoab/LTables.hxx
diff --git a/connectivity/source/drivers/evoab/evoab.xml b/connectivity/source/drivers/evoab/evoab.xml
index f2bafcffdada..f2bafcffdada 100644..100755
--- a/connectivity/source/drivers/evoab/evoab.xml
+++ b/connectivity/source/drivers/evoab/evoab.xml
diff --git a/connectivity/source/drivers/evoab/exports.dxp b/connectivity/source/drivers/evoab/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/evoab/exports.dxp
+++ b/connectivity/source/drivers/evoab/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
index 82e0ce4b70b0..82e0ce4b70b0 100644..100755
--- a/connectivity/source/drivers/evoab/makefile.mk
+++ b/connectivity/source/drivers/evoab/makefile.mk
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
index d670735d2144..d670735d2144 100644..100755
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
diff --git a/connectivity/source/drivers/evoab2/EApi.h b/connectivity/source/drivers/evoab2/EApi.h
index 90422b7e01f8..90422b7e01f8 100644..100755
--- a/connectivity/source/drivers/evoab2/EApi.h
+++ b/connectivity/source/drivers/evoab2/EApi.h
diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx
index ec5c20392cb7..ec5c20392cb7 100644..100755
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx
index d55f218fd2df..d55f218fd2df 100644..100755
--- a/connectivity/source/drivers/evoab2/NCatalog.hxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.hxx
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx
index cfed31d54422..cfed31d54422 100644..100755
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx
index 8c98e9deaf17..8c98e9deaf17 100644..100755
--- a/connectivity/source/drivers/evoab2/NColumns.hxx
+++ b/connectivity/source/drivers/evoab2/NColumns.hxx
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index f1dc29c9a222..f1dc29c9a222 100644..100755
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index c61d938ccf2c..c61d938ccf2c 100644..100755
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 4aed0b3ee05a..4aed0b3ee05a 100644..100755
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index d6faab52665e..d6faab52665e 100644..100755
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx b/connectivity/source/drivers/evoab2/NDebug.cxx
index 612bb9319437..612bb9319437 100644..100755
--- a/connectivity/source/drivers/evoab2/NDebug.cxx
+++ b/connectivity/source/drivers/evoab2/NDebug.cxx
diff --git a/connectivity/source/drivers/evoab2/NDebug.hxx b/connectivity/source/drivers/evoab2/NDebug.hxx
index e522c7873971..e522c7873971 100644..100755
--- a/connectivity/source/drivers/evoab2/NDebug.hxx
+++ b/connectivity/source/drivers/evoab2/NDebug.hxx
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 855f0be63242..855f0be63242 100644..100755
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index 2b9a2cf0f395..2b9a2cf0f395 100644..100755
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 3f1ef4b572b6..3f1ef4b572b6 100644..100755
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
index 1df469d0c8fb..1df469d0c8fb 100644..100755
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 8fc193ae4f10..8fc193ae4f10 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 36c1f7d359f0..36c1f7d359f0 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 429dca24f7fa..429dca24f7fa 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index 29e432737dac..29e432737dac 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index 9e5b83d8736e..d028755081e2 100644..100755
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -36,7 +36,6 @@ using namespace connectivity::evoab;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -49,27 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pT
);
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "EVOAB::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -119,31 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- OEvoabDriver::getImplementationName_Static(),
- OEvoabDriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 2ea738ad3419..2ea738ad3419 100644..100755
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index d12956e96008..d12956e96008 100644..100755
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx
index 3d4538401f65..3d4538401f65 100644..100755
--- a/connectivity/source/drivers/evoab2/NTable.cxx
+++ b/connectivity/source/drivers/evoab2/NTable.cxx
diff --git a/connectivity/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx
index 8843f5fc157c..8843f5fc157c 100644..100755
--- a/connectivity/source/drivers/evoab2/NTable.hxx
+++ b/connectivity/source/drivers/evoab2/NTable.hxx
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index 1212214b7b63..1212214b7b63 100644..100755
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx
index 8654eb83997d..8654eb83997d 100644..100755
--- a/connectivity/source/drivers/evoab2/NTables.hxx
+++ b/connectivity/source/drivers/evoab2/NTables.hxx
diff --git a/connectivity/source/drivers/evoab2/evoab.component b/connectivity/source/drivers/evoab2/evoab.component
new file mode 100755
index 000000000000..a99719388d13
--- /dev/null
+++ b/connectivity/source/drivers/evoab2/evoab.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdbc.evoab.OEvoabDriver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/evoab2/evoab.xml b/connectivity/source/drivers/evoab2/evoab.xml
index f0abcc963b8d..f0abcc963b8d 100644..100755
--- a/connectivity/source/drivers/evoab2/evoab.xml
+++ b/connectivity/source/drivers/evoab2/evoab.xml
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index 474e001e0926..6f61762a0c8f 100644..100755
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -111,3 +111,11 @@ DEF1NAME= $(SHL1TARGET)
# --- Targets ----------------------------------
.INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/evoab.component
+
+$(MISC)/evoab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ evoab.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt evoab.component
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index df810c291704..df810c291704 100644..100755
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index b1f08c38db98..9c67f48bd6a6 100644..100755
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -73,7 +73,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
sal_False,
sal_False,
sal_False,
- m_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+ m_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
xRet = pRet;
break;
}
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 2626c1d29a30..2626c1d29a30 100644..100755
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index cd738291e1a5..cd738291e1a5 100644..100755
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx
index 792cb2d8bddb..792cb2d8bddb 100644..100755
--- a/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/connectivity/source/drivers/file/FDateFunctions.cxx
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 708a85ce1b56..708a85ce1b56 100644..100755
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index e4bd959d3577..b06cda7c5a49 100644..100755
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -101,16 +101,16 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
}
// Further descend in Parse Tree
- for (UINT32 i = 0; i < pParseNode->count(); i++)
+ for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
scanParameter(pParseNode->getChild(i),_rParaNodes);
}
// -----------------------------------------------------------------------------
OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::GetOrderbyKeyValue" );
- UINT32 nBookmarkValue = Abs((sal_Int32)(_rRow->get())[0]->getValue());
+ sal_uInt32 nBookmarkValue = Abs((sal_Int32)(_rRow->get())[0]->getValue());
- OKeyValue* pKeyValue = OKeyValue::createKeyValue((UINT32)nBookmarkValue);
+ OKeyValue* pKeyValue = OKeyValue::createKeyValue((sal_uInt32)nBookmarkValue);
::std::vector<sal_Int32>::iterator aIter = m_aOrderbyColumnNumber.begin();
for (;aIter != m_aOrderbyColumnNumber.end(); ++aIter)
diff --git a/connectivity/source/drivers/file/FNumericFunctions.cxx b/connectivity/source/drivers/file/FNumericFunctions.cxx
index 031905a01999..031905a01999 100644..100755
--- a/connectivity/source/drivers/file/FNumericFunctions.cxx
+++ b/connectivity/source/drivers/file/FNumericFunctions.cxx
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 75325a6e077c..170dc1c5494c 100644..100755
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -479,7 +479,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal
*((m_aParameterRow->get())[parameterIndex]) = x;
}
// -----------------------------------------------------------------------------
-UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
+sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::AddParameter" );
OSL_UNUSED( pParameter );
@@ -493,7 +493,7 @@ UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
::rtl::OUString sParameterName;
// set up Parameter-Column:
sal_Int32 eType = DataType::VARCHAR;
- UINT32 nPrecision = 255;
+ sal_uInt32 nPrecision = 255;
sal_Int32 nScale = 0;
sal_Int32 nNullable = ColumnValue::NULLABLE;
@@ -577,13 +577,13 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult)
if (!m_xParamColumns->get().empty())
{
// begin with AssignValues
- USHORT nParaCount=0; // gives the current number of previously set Parameters
+ sal_uInt16 nParaCount=0; // gives the current number of previously set Parameters
// search for parameters to be substituted:
size_t nCount = m_aAssignValues.is() ? m_aAssignValues->get().size() : 1; // 1 is important for the Criteria
for (size_t j = 1; j < nCount; j++)
{
- UINT32 nParameter = (*m_aAssignValues).getParameterIndex(j);
+ sal_uInt32 nParameter = (*m_aAssignValues).getParameterIndex(j);
if (nParameter == SQL_NO_PARAMETER)
continue; // this AssignValue is no Parameter
@@ -627,7 +627,7 @@ void OPreparedStatement::parseParamterElem(const String& _sColumnName,OSQLParseN
if(nParameter == -1)
nParameter = AddParameter(pRow_Value_Constructor_Elem,xCol);
// Save number of parameter in the variable:
- SetAssignValue(_sColumnName, String(), TRUE, nParameter);
+ SetAssignValue(_sColumnName, String(), sal_True, nParameter);
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index b9f60f63b076..d0056768663e 100644..100755
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -76,11 +76,7 @@ using namespace com::sun::star::sdbcx;
using namespace com::sun::star::container;
// Maximal number of Rows, that can be processed being sorted with ORDER BY:
-#if defined (WIN)
-#define MAX_KEYSET_SIZE 0x3ff0 // Somewhat less than a Segment, so there is still room for Memory-Debug-Information
-#else
#define MAX_KEYSET_SIZE 0x40000 // 256K
-#endif
namespace
{
@@ -143,7 +139,7 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte
m_nResultSetConcurrency = isCount() ? ResultSetConcurrency::READ_ONLY : ResultSetConcurrency::UPDATABLE;
construct();
- m_aSkipDeletedSet.SetDeleted(m_bShowDeleted);
+ m_aSkipDeletedSet.SetDeletedVisible(m_bShowDeleted);
osl_decrementInterlockedCount( &m_refCount );
}
@@ -648,7 +644,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException)
// we know that we append new rows at the end
// so we have to know where the end is
m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,sal_False);
- m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, TRUE, m_xColsIdx);
+ m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, sal_True, m_xColsIdx);
if(m_bRowInserted && m_pFileSet.is())
{
sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue();
@@ -904,20 +900,20 @@ IPropertyArrayHelper & OResultSet::getInfoHelper()
}
//------------------------------------------------------------------
-BOOL OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
- INT32 nFirstOffset,
- BOOL bEvaluate,
- BOOL bRetrieveData)
+sal_Bool OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
+ sal_Int32 nFirstOffset,
+ sal_Bool bEvaluate,
+ sal_Bool bRetrieveData)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::ExecuteRow" );
OSL_ENSURE(m_pSQLAnalyzer,"OResultSet::ExecuteRow: Analyzer isn't set!");
// For further Fetch-Operations this information may possibly be changed ...
IResultSetHelper::Movement eCursorPosition = eFirstCursorPosition;
- INT32 nOffset = nFirstOffset;
+ sal_Int32 nOffset = nFirstOffset;
const OSQLColumns & rTableCols = *(m_pTable->getTableColumns());
- BOOL bHasRestriction = m_pSQLAnalyzer->hasRestriction();
+ sal_Bool bHasRestriction = m_pSQLAnalyzer->hasRestriction();
again:
// protect from reading over the end when someboby is inserting while we are reading
@@ -940,8 +936,13 @@ again:
{
m_pTable->fetchRow(m_aEvaluateRow, rTableCols, sal_True,bRetrieveData || bHasRestriction);
- if ((!m_bShowDeleted && m_aEvaluateRow->isDeleted())
- || (bHasRestriction && !m_pSQLAnalyzer->evaluateRestriction()))
+ if ( ( !m_bShowDeleted
+ && m_aEvaluateRow->isDeleted()
+ )
+ || ( bHasRestriction
+ && !m_pSQLAnalyzer->evaluateRestriction()
+ )
+ )
{ // Evaluate the next record
// delete current row in Keyset
if (m_pEvaluationKeySet)
@@ -988,12 +989,14 @@ again:
// Evaluate may only be set,
// if the Keyset will be constructed further
- if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT && !isCount() &&
- (m_pFileSet.is() || m_pSortIndex) && bEvaluate)
+ if ( ( m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT )
+ && !isCount()
+ && bEvaluate
+ )
{
if (m_pSortIndex)
{
- OKeyValue* pKeyValue = GetOrderbyKeyValue(m_aEvaluateRow);
+ OKeyValue* pKeyValue = GetOrderbyKeyValue( m_aSelectRow );
m_pSortIndex->AddKeyValue(pKeyValue);
}
else if (m_pFileSet.is())
@@ -1008,7 +1011,7 @@ again:
if (bEvaluate)
{
// read the actual result-row
- bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,TRUE);
+ bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,sal_True);
}
if (bOK)
@@ -1023,7 +1026,7 @@ again:
sal_Bool bOK = sal_True;
if (bEvaluate)
{
- bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,TRUE);
+ bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,sal_True);
}
if (bOK)
{
@@ -1035,13 +1038,13 @@ again:
}
//-------------------------------------------------------------------
-BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, BOOL bRetrieveData)
+sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::Move" );
//IgnoreDeletedRows:
//
- INT32 nTempPos = m_nRowPos;
+ sal_Int32 nTempPos = m_nRowPos;
if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT &&
!isCount())
@@ -1049,7 +1052,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
if (!m_pFileSet.is()) //no Index available
{
// Normal FETCH
- ExecuteRow(eCursorPosition,nOffset,FALSE,bRetrieveData);
+ ExecuteRow(eCursorPosition,nOffset,sal_False,bRetrieveData);
// now set the bookmark for outside this is the logical pos and not the file pos
*(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1086,16 +1089,16 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
// The FileCursor is outside of the valid range, if:
// a.) m_nRowPos < 1
// b.) a KeySet exists and m_nRowPos > m_pFileSet->size()
- if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (INT32)m_pFileSet->get().size() ))
+ if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (sal_Int32)m_pFileSet->get().size() )) // && m_pFileSet->IsFrozen()
{
goto Error;
}
else
{
- if (m_nRowPos < (INT32)m_pFileSet->get().size())
+ if (m_nRowPos < (sal_Int32)m_pFileSet->get().size())
{
// Fetch via Index
- ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],FALSE,bRetrieveData);
+ ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],sal_False,bRetrieveData);
// now set the bookmark for outside
*(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1114,25 +1117,25 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
}
sal_Bool bOK = sal_True;
// Determine the number of further Fetches
- while (bOK && m_nRowPos >= (INT32)m_pFileSet->get().size())
+ while (bOK && m_nRowPos >= (sal_Int32)m_pFileSet->get().size())
{
if (m_pEvaluationKeySet)
{
- if (m_nRowPos >= (INT32)m_pEvaluationKeySet->size())
+ if (m_nRowPos >= (sal_Int32)m_pEvaluationKeySet->size())
return sal_False;
else if (m_nRowPos == 0)
{
m_aEvaluateIter = m_pEvaluationKeySet->begin();
- bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,TRUE, bRetrieveData);
+ bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData);
}
else
{
++m_aEvaluateIter;
- bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,TRUE, bRetrieveData);
+ bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData);
}
}
else
- bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE, FALSE);//bRetrieveData);
+ bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True, sal_False);//bRetrieveData);
}
if (bOK)
@@ -1280,8 +1283,8 @@ void OResultSet::sortRows()
::std::vector<sal_Int32>::iterator aOrderByIter = m_aOrderbyColumnNumber.begin();
for (::std::vector<sal_Int16>::size_type i=0;aOrderByIter != m_aOrderbyColumnNumber.end(); ++aOrderByIter,++i)
{
- OSL_ENSURE((sal_Int32)m_aRow->get().size() > *aOrderByIter,"Invalid Index");
- switch ((*(m_aRow->get().begin()+*aOrderByIter))->getValue().getTypeKind())
+ OSL_ENSURE((sal_Int32)m_aSelectRow->get().size() > *aOrderByIter,"Invalid Index");
+ switch ((*(m_aSelectRow->get().begin()+*aOrderByIter))->getValue().getTypeKind())
{
case DataType::CHAR:
case DataType::VARCHAR:
@@ -1310,7 +1313,7 @@ void OResultSet::sortRows()
OSL_FAIL("OFILECursor::Execute: Datentyp nicht implementiert");
break;
}
- (m_aEvaluateRow->get())[*aOrderByIter]->setBound(sal_True);
+ (m_aSelectRow->get())[*aOrderByIter]->setBound(sal_True);
}
m_pSortIndex = new OSortIndex(eKeyType,m_aOrderbyAscending);
@@ -1321,14 +1324,19 @@ void OResultSet::sortRows()
while (m_aEvaluateIter != m_pEvaluationKeySet->end())
{
- ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+ ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
++m_aEvaluateIter;
}
}
else
{
- while (ExecuteRow(IResultSetHelper::NEXT,1,TRUE))
+ while ( ExecuteRow( IResultSetHelper::NEXT, 1, sal_False, sal_True ) )
{
+ m_aSelectRow->get()[0]->setValue( m_aRow->get()[0]->getValue() );
+ if ( m_pSQLAnalyzer->hasFunctions() )
+ m_pSQLAnalyzer->setSelectionEvaluationResult( m_aSelectRow, m_aColMapping );
+ const sal_Int32 nBookmark = (*m_aRow->get().begin())->getValue();
+ ExecuteRow( IResultSetHelper::BOOKMARK, nBookmark, sal_True, sal_False );
}
}
@@ -1342,7 +1350,7 @@ void OResultSet::sortRows()
// -------------------------------------------------------------------------
-BOOL OResultSet::OpenImpl()
+sal_Bool OResultSet::OpenImpl()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::OpenImpl" );
OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!");
@@ -1410,9 +1418,9 @@ BOOL OResultSet::OpenImpl()
while (bOK)
{
if (m_pEvaluationKeySet)
- ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+ ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
else
- bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE);
+ bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True);
if (bOK)
{
@@ -1432,8 +1440,8 @@ BOOL OResultSet::OpenImpl()
}
else
{
- BOOL bDistinct = FALSE;
- BOOL bWasSorted = FALSE;
+ sal_Bool bDistinct = sal_False;
+ sal_Bool bWasSorted = sal_False;
OSQLParseNode *pDistinct = m_pParseTree->getChild(1);
::std::vector<sal_Int32> aOrderbyColumnNumberSave;
::std::vector<TAscendingOrder> aOrderbyAscendingSave;
@@ -1446,14 +1454,14 @@ BOOL OResultSet::OpenImpl()
aOrderbyColumnNumberSave = m_aOrderbyColumnNumber;
m_aOrderbyColumnNumber.clear();
aOrderbyAscendingSave.assign(m_aOrderbyAscending.begin(), m_aOrderbyAscending.end());
- bWasSorted = TRUE;
+ bWasSorted = sal_True;
}
// the first column is the bookmark column
::std::vector<sal_Int32>::iterator aColStart = (m_aColMapping.begin()+1);
::std::copy(aColStart, m_aColMapping.end(),::std::back_inserter(m_aOrderbyColumnNumber));
m_aOrderbyAscending.assign(m_aColMapping.size()-1, SQL_ASC);
- bDistinct = TRUE;
+ bDistinct = sal_True;
}
if (IsSorted())
@@ -1490,15 +1498,15 @@ BOOL OResultSet::OpenImpl()
if (nMaxRow)
{
#if OSL_DEBUG_LEVEL > 1
- INT32 nFound=0;
+ sal_Int32 nFound=0;
#endif
- INT32 nPos;
- INT32 nKey;
+ sal_Int32 nPos;
+ sal_Int32 nKey;
for( size_t j = nMaxRow-1; j > 0; --j)
{
nPos = (m_pFileSet->get())[j];
- ExecuteRow(IResultSetHelper::BOOKMARK,nPos,FALSE);
+ ExecuteRow(IResultSetHelper::BOOKMARK,nPos,sal_False);
m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping);
{ // copy row values
OValueRefVector::Vector::iterator copyFrom = m_aSelectRow->get().begin();
@@ -1511,7 +1519,7 @@ BOOL OResultSet::OpenImpl()
// compare with next row
nKey = (m_pFileSet->get())[j-1];
- ExecuteRow(IResultSetHelper::BOOKMARK,nKey,FALSE);
+ ExecuteRow(IResultSetHelper::BOOKMARK,nKey,sal_False);
m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping);
OValueRefVector::Vector::iterator loopInRow = m_aSelectRow->get().begin();
OValueVector::Vector::iterator existentInSearchRow = aSearchRow->get().begin();
@@ -1574,9 +1582,9 @@ BOOL OResultSet::OpenImpl()
while (bOK)
{
if (m_pEvaluationKeySet)
- ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+ ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
else
- bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE);
+ bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True);
if (bOK)
{
@@ -1598,7 +1606,7 @@ BOOL OResultSet::OpenImpl()
m_nRowCountResult = 0;
OSL_ENSURE(m_aAssignValues.is(),"No assign values set!");
- if(!m_pTable->InsertRow(*m_aAssignValues, TRUE,m_xColsIdx))
+ if(!m_pTable->InsertRow(*m_aAssignValues, sal_True,m_xColsIdx))
{
m_nFilePos = 0;
return sal_False;
@@ -1652,7 +1660,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
::std::vector<sal_Int32>& _rColMapping)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::setBoundedColumns" );
- ::comphelper::UStringMixEqual aCase(_xMetaData->storesMixedCaseQuotedIdentifiers());
+ ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers());
Reference<XPropertySet> xTableColumn;
::rtl::OUString sTableColumnName, sSelectColumnRealName;
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index 6d75d6f67357..6d75d6f67357 100644..100755
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index c470b1b2c927..63584d0a194b 100644..100755
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -442,19 +442,12 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
return;
// Everything tested and we have the name of the Column.
// What number is the Column?
- try
- {
- m_aOrderbyColumnNumber.push_back(xColLocate->findColumn(aColumnName));
- }
- catch(Exception)
- {
- ::rtl::Reference<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns();
- ::comphelper::UStringMixEqual aCase;
- OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),aColumnName,aCase);
- if ( aFind == aSelectColumns->get().end() )
- throw SQLException();
- m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->get().begin()) + 1);
- }
+ ::rtl::Reference<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns();
+ ::comphelper::UStringMixEqual aCase;
+ OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),aColumnName,aCase);
+ if ( aFind == aSelectColumns->get().end() )
+ throw SQLException();
+ m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->get().begin()) + 1);
// Ascending or Descending?
m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? SQL_DESC : SQL_ASC);
@@ -740,7 +733,7 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNam
else if (SQL_ISTOKEN(pRow_Value_Constructor_Elem,NULL))
{
// set NULL
- SetAssignValue(aColumnName, String(), TRUE);
+ SetAssignValue(aColumnName, String(), sal_True);
}
else if (SQL_ISRULE(pRow_Value_Constructor_Elem,parameter))
parseParamterElem(aColumnName,pRow_Value_Constructor_Elem);
@@ -752,8 +745,8 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNam
//------------------------------------------------------------------
void OStatement_Base::SetAssignValue(const String& aColumnName,
const String& aValue,
- BOOL bSetNull,
- UINT32 nParameter)
+ sal_Bool bSetNull,
+ sal_uInt32 nParameter)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::SetAssignValue" );
Reference<XPropertySet> xCol;
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index d5a9eea0407b..d5a9eea0407b 100644..100755
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 1aadb836fbac..2d31ff691e17 100644..100755
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::container;
DBG_NAME( file_OFileTable )
OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
-: OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers())
+: OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers())
,m_pConnection(_pConnection)
,m_pFileStream(NULL)
,m_nFilePos(0)
@@ -73,7 +73,7 @@ OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
const ::rtl::OUString& _Description ,
const ::rtl::OUString& _SchemaName,
const ::rtl::OUString& _CatalogName
- ) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers(),
+ ) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers(),
_Name,
_Type,
_Description,
@@ -205,19 +205,19 @@ void SAL_CALL OFileTable::release() throw()
OTable_TYPEDEF::release();
}
// -----------------------------------------------------------------------------
-BOOL OFileTable::InsertRow(OValueRefVector& /*rRow*/, BOOL /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+sal_Bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, sal_Bool /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::InsertRow" );
return sal_False;
}
// -----------------------------------------------------------------------------
-BOOL OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
+sal_Bool OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::DeleteRow" );
return sal_False;
}
// -----------------------------------------------------------------------------
-BOOL OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+sal_Bool OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::UpdateRow" );
return sal_False;
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index b5d918f1f0d9..b5d918f1f0d9 100644..100755
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index f0683987eaa9..a69f521aff67 100644..100755
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -104,7 +104,26 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
m_pConnection->throwGenericSQLException(STR_QUERY_COMPLEX_COUNT,NULL);
}
else
- m_aSelectionEvaluations.push_back( TPredicates() );
+ {
+ if ( SQL_ISPUNCTUATION( pColumnRef, "*" )
+ || ( SQL_ISRULE( pColumnRef, column_ref )
+ && ( pColumnRef->count() == 3 )
+ && ( pColumnRef->getChild(0)->getNodeType() == SQL_NODE_NAME )
+ && SQL_ISPUNCTUATION( pColumnRef->getChild(1), "." )
+ && SQL_ISRULE( pColumnRef->getChild(2), column_val )
+ && SQL_ISPUNCTUATION( pColumnRef->getChild(2)->getChild(0), "*" )
+ )
+ )
+ {
+ // push one element for each column of our table
+ const Reference< XNameAccess > xColumnNames( m_aCompiler->getOrigColumns() );
+ const Sequence< ::rtl::OUString > aColumnNames( xColumnNames->getElementNames() );
+ for ( sal_Int32 j=0; j<aColumnNames.getLength(); ++j )
+ m_aSelectionEvaluations.push_back( TPredicates() );
+ }
+ else
+ m_aSelectionEvaluations.push_back( TPredicates() );
+ }
}
}
}
@@ -264,12 +283,12 @@ OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos,
return new OOperandAttr(static_cast<sal_uInt16>(_nPos),_xCol);
}
// -----------------------------------------------------------------------------
-BOOL OSQLAnalyzer::hasRestriction() const
+sal_Bool OSQLAnalyzer::hasRestriction() const
{
return m_aCompiler->hasCode();
}
// -----------------------------------------------------------------------------
-BOOL OSQLAnalyzer::hasFunctions() const
+sal_Bool OSQLAnalyzer::hasFunctions() const
{
if ( m_bSelectionFirstTime )
{
@@ -290,11 +309,12 @@ void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std:
{
if ( aIter->second.is() )
{
- sal_Int32 map = nPos;
// the first column (index 0) is for convenience only. The first real select column is no 1.
- if ( (nPos > 0) && (nPos < static_cast<sal_Int32>(_rColumnMapping.size())) )
+ sal_Int32 map = nPos;
+ if ( nPos < static_cast< sal_Int32 >( _rColumnMapping.size() ) )
map = _rColumnMapping[nPos];
- aIter->second->startSelection((_pRow->get())[map]);
+ if ( map > 0 )
+ aIter->second->startSelection( (_pRow->get())[map] );
}
}
}
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 5bc61b64ccc8..bd408cd28c29 100644..100755
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -349,7 +349,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con
case DataType::LONGVARCHAR:
{
rtl::OUString sLH = aLH, sRH = aRH;
- INT32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
+ sal_Int32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
(
sLH.pData->buffer,
sLH.pData->length,
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index d008cedfba08..e8464c4740d7 100644..100755
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -60,7 +60,7 @@ DBG_NAME(OPredicateCompiler)
OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs)
: m_pAnalyzer(pAnalyzer)
, m_nParamCounter(0)
- , m_bORCondition(FALSE)
+ , m_bORCondition(sal_False)
{
DBG_CTOR(OPredicateCompiler,NULL);
}
diff --git a/connectivity/source/drivers/file/file.xml b/connectivity/source/drivers/file/file.xml
index 2d8281bca957..2d8281bca957 100644..100755
--- a/connectivity/source/drivers/file/file.xml
+++ b/connectivity/source/drivers/file/file.xml
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index 41f061de80ca..41f061de80ca 100644..100755
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index 2d7d5337739d..2469169a6963 100644..100755
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -45,8 +45,8 @@ namespace connectivity
return 0;
xub_StrLen nTokCount = 1;
- BOOL bStart = TRUE; // Are we on the first character in the Token?
- BOOL bInString = FALSE; // Are we WITHIN a (cStrDel delimited) String?
+ sal_Bool bStart = sal_True; // Are we on the first character in the Token?
+ sal_Bool bInString = sal_False; // Are we WITHIN a (cStrDel delimited) String?
// Search for String-end after the first not matching character
for( xub_StrLen i = 0; i < nLen; ++i )
@@ -54,11 +54,11 @@ namespace connectivity
const sal_Unicode cChar = m_sString.GetChar(i);
if (bStart)
{
- bStart = FALSE;
+ bStart = sal_False;
// First character a String-Delimiter?
if ( cChar == cStrDel )
{
- bInString = TRUE; // then we are now WITHIN the string!
+ bInString = sal_True; // then we are now WITHIN the string!
continue; // skip this character!
}
}
@@ -76,7 +76,7 @@ namespace connectivity
else
{
// String-End
- bInString = FALSE;
+ bInString = sal_False;
}
}
} // if (bInString)
@@ -86,7 +86,7 @@ namespace connectivity
if ( cChar == cTok )
{
++nTokCount;
- bStart = TRUE;
+ bStart = sal_True;
}
}
}
@@ -103,7 +103,7 @@ namespace connectivity
const xub_StrLen nLen = m_sString.Len();
if ( nLen )
{
- BOOL bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel); // are we WITHIN a (cStrDel delimited) String?
+ sal_Bool bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel); // are we WITHIN a (cStrDel delimited) String?
// First character a String-Delimiter?
if (bInString )
@@ -132,7 +132,7 @@ namespace connectivity
else
{
//end of String
- bInString = FALSE;
+ bInString = sal_False;
*pData = 0;
}
}
diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx
index 685947f48622..685947f48622 100644..100755
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx
index 43d78e0479bf..43d78e0479bf 100644..100755
--- a/connectivity/source/drivers/flat/EColumns.cxx
+++ b/connectivity/source/drivers/flat/EColumns.cxx
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index 1808e760c430..83b72c67ec6c 100644..100755
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -53,6 +53,7 @@ using namespace ::com::sun::star::lang;
// --------------------------------------------------------------------------------
OFlatConnection::OFlatConnection(ODriver* _pDriver) : OConnection(_pDriver)
+ ,m_nMaxRowsToScan(50)
,m_bHeaderLine(sal_True)
,m_cFieldDelimiter(';')
,m_cStringDelimiter('"')
@@ -105,10 +106,15 @@ void OFlatConnection::construct(const ::rtl::OUString& url,const Sequence< Prope
OSL_VERIFY( pBegin->Value >>= aVal );
m_cThousandDelimiter = aVal.toChar();
}
+ else if ( !pBegin->Name.compareToAscii("MaxRowScan") )
+ {
+ pBegin->Value >>= m_nMaxRowsToScan;
+ }
}
osl_decrementInterlockedCount( &m_refCount );
OConnection::construct(url,info);
+ m_bShowDeleted = sal_True; // we do not supported rows for this type
}
// --------------------------------------------------------------------------------
Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData( ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index 6281142f59ab..6281142f59ab 100644..100755
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index ef9a190102df..ef9a190102df 100644..100755
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
diff --git a/connectivity/source/drivers/flat/EPreparedStatement.cxx b/connectivity/source/drivers/flat/EPreparedStatement.cxx
index 4800d96a2907..4800d96a2907 100644..100755
--- a/connectivity/source/drivers/flat/EPreparedStatement.cxx
+++ b/connectivity/source/drivers/flat/EPreparedStatement.cxx
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index d484c8f51134..d484c8f51134 100644..100755
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
diff --git a/connectivity/source/drivers/flat/EStatement.cxx b/connectivity/source/drivers/flat/EStatement.cxx
index f7b617e8019e..f7b617e8019e 100644..100755
--- a/connectivity/source/drivers/flat/EStatement.cxx
+++ b/connectivity/source/drivers/flat/EStatement.cxx
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index bf6eb951da45..c4638889d15e 100644..100755
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::lang;
void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen@sun.com", "OFlatTable::fillColumns" );
- BOOL bRead = TRUE;
+ sal_Bool bRead = sal_True;
QuotedTokenizedString aHeaderLine;
OFlatConnection* pConnection = (OFlatConnection*)m_pConnection;
@@ -114,11 +114,11 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
m_aScales.clear();
// reserve some space
m_aColumns->get().reserve(nFieldCount+1);
- m_aTypes.reserve(nFieldCount+1);
- m_aPrecisions.reserve(nFieldCount+1);
- m_aScales.reserve(nFieldCount+1);
+ m_aTypes.assign(nFieldCount+1,DataType::SQLNULL);
+ m_aPrecisions.assign(nFieldCount+1,-1);
+ m_aScales.assign(nFieldCount+1,-1);
- const sal_Bool bCase = m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers();
+ const sal_Bool bCase = m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers();
CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale);
// read description
const sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter();
@@ -126,106 +126,186 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
String aColumnName;
::rtl::OUString aTypeName;
::comphelper::UStringMixEqual aCase(bCase);
- xub_StrLen nStartPosHeaderLine = 0; // use for eficient way to get the tokens
- xub_StrLen nStartPosFirstLine = 0; // use for eficient way to get the tokens
- xub_StrLen nStartPosFirstLine2 = 0;
- for (xub_StrLen i = 0; i < nFieldCount; i++)
+ ::std::vector<String> aColumnNames,m_aTypeNames;
+ m_aTypeNames.resize(nFieldCount);
+ const sal_Int32 nMaxRowsToScan = pConnection->getMaxRowsToScan();
+ sal_Int32 nRowCount = 0;
+ do
{
- if ( bHasHeaderLine )
+ xub_StrLen nStartPosHeaderLine = 0; // use for eficient way to get the tokens
+ xub_StrLen nStartPosFirstLine = 0; // use for eficient way to get the tokens
+ xub_StrLen nStartPosFirstLine2 = 0;
+ for (xub_StrLen i = 0; i < nFieldCount; i++)
{
- aHeaderLine.GetTokenSpecial(aColumnName,nStartPosHeaderLine,m_cFieldDelimiter,m_cStringDelimiter);
- if ( !aColumnName.Len() )
+ if ( nRowCount == 0)
{
- aColumnName = 'C';
- aColumnName += String::CreateFromInt32(i+1);
+ if ( bHasHeaderLine )
+ {
+ aHeaderLine.GetTokenSpecial(aColumnName,nStartPosHeaderLine,m_cFieldDelimiter,m_cStringDelimiter);
+ if ( !aColumnName.Len() )
+ {
+ aColumnName = 'C';
+ aColumnName += String::CreateFromInt32(i+1);
+ }
+ }
+ else
+ {
+ // no column name so ...
+ aColumnName = 'C';
+ aColumnName += String::CreateFromInt32(i+1);
+ }
+ aColumnNames.push_back(aColumnName);
}
+ impl_fillColumnInfo_nothrow(aFirstLine,nStartPosFirstLine,nStartPosFirstLine2,m_aTypes[i],m_aPrecisions[i],m_aScales[i],m_aTypeNames[i],cDecimalDelimiter,cThousandDelimiter,aCharClass);
}
- else
+ ++nRowCount;
+ }
+ while(nRowCount < nMaxRowsToScan && m_pFileStream->ReadByteStringLine(aFirstLine,nEncoding));
+
+ for (xub_StrLen i = 0; i < nFieldCount; i++)
+ {
+ // check if the columname already exists
+ String aAlias(aColumnNames[i]);
+ OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
+ sal_Int32 nExprCnt = 0;
+ while(aFind != m_aColumns->get().end())
{
- // no column name so ...
- aColumnName = 'C';
- aColumnName += String::CreateFromInt32(i+1);
+ (aAlias = aColumnNames[i]) += String::CreateFromInt32(++nExprCnt);
+ aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
}
- sal_Int32 eType;
- UINT16 nPrecision = 0;
- UINT16 nScale = 0;
- BOOL bNumeric = FALSE;
- ULONG nIndex = 0;
+ sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,m_aTypeNames[i],::rtl::OUString(),::rtl::OUString(),
+ ColumnValue::NULLABLE,
+ m_aPrecisions[i],
+ m_aScales[i],
+ m_aTypes[i],
+ sal_False,
+ sal_False,
+ sal_False,
+ bCase);
+ Reference< XPropertySet> xCol = pColumn;
+ m_aColumns->get().push_back(xCol);
+ }
+ m_pFileStream->Seek(m_nStartRowFilePos);
+}
+void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,xub_StrLen& nStartPosFirstLine,xub_StrLen& nStartPosFirstLine2
+ ,sal_Int32& io_nType,sal_Int32& io_nPrecisions,sal_Int32& io_nScales,String& o_sTypeName
+ ,const sal_Unicode cDecimalDelimiter,const sal_Unicode cThousandDelimiter,const CharClass& aCharClass)
+{
+ if ( io_nType != DataType::VARCHAR )
+ {
+ sal_Bool bNumeric = io_nType == DataType::SQLNULL || io_nType == DataType::DOUBLE || io_nType == DataType::DECIMAL || io_nType == DataType::INTEGER;
+ sal_uLong nIndex = 0;
- // first without fielddelimiter
- String aField;
- aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
- if (aField.Len() == 0 ||
- (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
+ if ( bNumeric )
{
- bNumeric = FALSE;
- if ( m_cStringDelimiter != '\0' )
- aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
- else
- nStartPosFirstLine2 = nStartPosFirstLine;
- }
- else
- {
- String aField2;
- if ( m_cStringDelimiter != '\0' )
- aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
- else
- aField2 = aField;
-
- if (aField2.Len() == 0)
+ // first without fielddelimiter
+ String aField;
+ aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
+ if (aField.Len() == 0 ||
+ (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
+ if ( m_cStringDelimiter != '\0' )
+ aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+ else
+ nStartPosFirstLine2 = nStartPosFirstLine;
}
else
{
- bNumeric = TRUE;
- xub_StrLen nDot = 0;
- xub_StrLen nDecimalDelCount = 0;
- for (xub_StrLen j = 0; j < aField2.Len(); j++)
+ String aField2;
+ if ( m_cStringDelimiter != '\0' )
+ aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+ else
+ aField2 = aField;
+
+ if (aField2.Len() == 0)
{
- const sal_Unicode c = aField2.GetChar(j);
- // just digits, decimal- and thousands-delimiter?
- if ( ( !cDecimalDelimiter || c != cDecimalDelimiter ) &&
- ( !cThousandDelimiter || c != cThousandDelimiter ) &&
- !aCharClass.isDigit(aField2,j) &&
- ( j != 0 || (c != '+' && c != '-' ) ) )
- {
- bNumeric = FALSE;
- break;
- }
- if (cDecimalDelimiter && c == cDecimalDelimiter)
- {
- nPrecision = 15; // we have an decimal value
- nScale = 2;
- ++nDecimalDelCount;
- } // if (cDecimalDelimiter && c == cDecimalDelimiter)
- if ( c == '.' )
- ++nDot;
+ bNumeric = sal_False;
}
-
- if (nDecimalDelCount > 1 || nDot > 1 ) // if there is more than one dot it isn't a number
- bNumeric = FALSE;
- if (bNumeric && cThousandDelimiter)
+ else
{
- // is the delimiter correctly given?
- const String aValue = aField2.GetToken(0,cDecimalDelimiter);
- for (sal_Int32 j = aValue.Len() - 4; j >= 0; j -= 4)
+ bNumeric = sal_True;
+ xub_StrLen nDot = 0;
+ xub_StrLen nDecimalDelCount = 0;
+ xub_StrLen nSpaceCount = 0;
+ for (xub_StrLen j = 0; j < aField2.Len(); j++)
{
- const sal_Unicode c = aValue.GetChar(static_cast<sal_uInt16>(j));
- // just digits, decimal- and thousands-delimiter?
- if (c == cThousandDelimiter && j)
+ const sal_Unicode c = aField2.GetChar(j);
+ if ( j == nSpaceCount && m_cFieldDelimiter != 32 && c == 32 )
+ {
+ ++nSpaceCount;
continue;
- else
+ }
+ // just digits, decimal- and thousands-delimiter?
+ if ( ( !cDecimalDelimiter || c != cDecimalDelimiter ) &&
+ ( !cThousandDelimiter || c != cThousandDelimiter ) &&
+ !aCharClass.isDigit(aField2,j) &&
+ ( j != 0 || (c != '+' && c != '-' ) ) )
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
break;
}
+ if (cDecimalDelimiter && c == cDecimalDelimiter)
+ {
+ io_nPrecisions = 15; // we have an decimal value
+ io_nScales = 2;
+ ++nDecimalDelCount;
+ } // if (cDecimalDelimiter && c == cDecimalDelimiter)
+ if ( c == '.' )
+ ++nDot;
}
- }
- // now it still can be a Date-field
- if (!bNumeric)
+ if (nDecimalDelCount > 1 || nDot > 1 ) // if there is more than one dot it isn't a number
+ bNumeric = sal_False;
+ if (bNumeric && cThousandDelimiter)
+ {
+ // Is the delimiter correct?
+ const String aValue = aField2.GetToken(0,cDecimalDelimiter);
+ for (sal_Int32 j = aValue.Len() - 4; j >= 0; j -= 4)
+ {
+ const sal_Unicode c = aValue.GetChar(static_cast<sal_uInt16>(j));
+ // just digits, decimal- and thousands-delimiter?
+ if (c == cThousandDelimiter && j)
+ continue;
+ else
+ {
+ bNumeric = sal_False;
+ break;
+ }
+ }
+ }
+
+ // now also check for a date field
+ if (!bNumeric)
+ {
+ try
+ {
+ nIndex = m_xNumberFormatter->detectNumberFormat(::com::sun::star::util::NumberFormat::ALL,aField2);
+ }
+ catch(Exception&)
+ {
+ }
+ }
+ }
+ }
+ }
+ else if ( io_nType == DataType::DATE || io_nType == DataType::TIMESTAMP || io_nType == DataType::TIME)
+ {
+ String aField;
+ aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
+ if (aField.Len() == 0 ||
+ (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
+ {
+ }
+ else
+ {
+ String aField2;
+ if ( m_cStringDelimiter != '\0' )
+ aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+ else
+ aField2 = aField;
+ if (aField2.Len() )
{
try
{
@@ -243,87 +323,83 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
{
if (cDecimalDelimiter)
{
- if(nPrecision)
+ if(io_nPrecisions)
{
- eType = DataType::DECIMAL;
+ io_nType = DataType::DECIMAL;
static const ::rtl::OUString s_sDECIMAL(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
- aTypeName = s_sDECIMAL;
+ o_sTypeName = s_sDECIMAL;
}
else
{
- eType = DataType::DOUBLE;
+ io_nType = DataType::DOUBLE;
static const ::rtl::OUString s_sDOUBLE(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"));
- aTypeName = s_sDOUBLE;
+ o_sTypeName = s_sDOUBLE;
}
}
else
- eType = DataType::INTEGER;
+ {
+ io_nType = DataType::INTEGER;
+ io_nPrecisions = 0;
+ io_nScales = 0;
+ }
nFlags = ColumnSearch::BASIC;
}
else
{
-
switch (comphelper::getNumberFormatType(m_xNumberFormatter,nIndex))
{
case NUMBERFORMAT_DATE:
- eType = DataType::DATE;
+ io_nType = DataType::DATE;
{
static const ::rtl::OUString s_sDATE(RTL_CONSTASCII_USTRINGPARAM("DATE"));
- aTypeName = s_sDATE;
+ o_sTypeName = s_sDATE;
}
break;
case NUMBERFORMAT_DATETIME:
- eType = DataType::TIMESTAMP;
+ io_nType = DataType::TIMESTAMP;
{
static const ::rtl::OUString s_sTIMESTAMP(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
- aTypeName = s_sTIMESTAMP;
+ o_sTypeName = s_sTIMESTAMP;
}
break;
case NUMBERFORMAT_TIME:
- eType = DataType::TIME;
+ io_nType = DataType::TIME;
{
static const ::rtl::OUString s_sTIME(RTL_CONSTASCII_USTRINGPARAM("TIME"));
- aTypeName = s_sTIME;
+ o_sTypeName = s_sTIME;
}
break;
default:
- eType = DataType::VARCHAR;
- nPrecision = 0; // nyi: Data can be longer!
- nScale = 0;
+ io_nType = DataType::VARCHAR;
+ io_nPrecisions = 0; // nyi: Data can be longer!
+ io_nScales = 0;
{
static const ::rtl::OUString s_sVARCHAR(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
- aTypeName = s_sVARCHAR;
+ o_sTypeName = s_sVARCHAR;
}
};
nFlags |= ColumnSearch::CHAR;
}
-
- // check if the columname already exists
- String aAlias(aColumnName);
- OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
- sal_Int32 nExprCnt = 0;
- while(aFind != m_aColumns->get().end())
+ }
+ else
+ {
+ String aField;
+ aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
+ if (aField.Len() == 0 ||
+ (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
{
- (aAlias = aColumnName) += String::CreateFromInt32(++nExprCnt);
- aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
+ if ( m_cStringDelimiter != '\0' )
+ aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+ else
+ nStartPosFirstLine2 = nStartPosFirstLine;
+ }
+ else
+ {
+ String aField2;
+ if ( m_cStringDelimiter != '\0' )
+ aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
}
-
- sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,aTypeName,::rtl::OUString(),::rtl::OUString(),
- ColumnValue::NULLABLE,
- nPrecision,
- nScale,
- eType,
- sal_False,
- sal_False,
- sal_False,
- bCase);
- Reference< XPropertySet> xCol = pColumn;
- m_aColumns->get().push_back(xCol);
- m_aTypes.push_back(eType);
- m_aPrecisions.push_back(nPrecision);
- m_aScales.push_back(nScale);
}
- m_pFileStream->Seek(m_nStartRowFilePos);
}
// -------------------------------------------------------------------------
OFlatTable::OFlatTable(sdbcx::OCollection* _pTables,OFlatConnection* _pConnection,
@@ -531,7 +607,7 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal
*(_rRow->get())[0] = m_nFilePos;
if (!bRetrieveData)
- return TRUE;
+ return sal_True;
if ( m_bNeedToReadLine )
{
sal_Int32 nCurrentPos = 0;
diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index f9ba451c4854..f9ba451c4854 100644..100755
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 3d11375df02f..68af0a19524e 100644..100755
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -30,13 +30,11 @@
#include "precompiled_connectivity.hxx"
#include "flat/EDriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::flat;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pT
);
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the Module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- ODriver::getImplementationName_Static(),
- ODriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/flat/exports.dxp b/connectivity/source/drivers/flat/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/flat/exports.dxp
+++ b/connectivity/source/drivers/flat/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/flat/flat.component b/connectivity/source/drivers/flat/flat.component
new file mode 100755
index 000000000000..fe8b79ee73b8
--- /dev/null
+++ b/connectivity/source/drivers/flat/flat.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdbc.flat.ODriver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ <service name="com.sun.star.sdbcx.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/flat/flat.mxp.map b/connectivity/source/drivers/flat/flat.mxp.map
index 54a8532f7840..2737c61b5a57 100644..100755
--- a/connectivity/source/drivers/flat/flat.mxp.map
+++ b/connectivity/source/drivers/flat/flat.mxp.map
@@ -1,5 +1,4 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
__mh_dylib_header
___builtin_delete
diff --git a/connectivity/source/drivers/flat/flat.xcu b/connectivity/source/drivers/flat/flat.xcu
index d00d1f98c38c..a54394e853e8 100755
--- a/connectivity/source/drivers/flat/flat.xcu
+++ b/connectivity/source/drivers/flat/flat.xcu
@@ -75,8 +75,18 @@
<value>false</value>
</prop>
</node>
+ <node oor:name="MaxRowScan" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:int">
+ <value>100</value>
+ </prop>
+ </node>
</node>
<node oor:name="Features">
+ <node oor:name="MaxRowScan" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
<node oor:name="UseSQL92NamingConstraints" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
<value>true</value>
diff --git a/connectivity/source/drivers/flat/flat.xml b/connectivity/source/drivers/flat/flat.xml
index f3738cc312ba..f3738cc312ba 100644..100755
--- a/connectivity/source/drivers/flat/flat.xml
+++ b/connectivity/source/drivers/flat/flat.xml
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index da801c44a830..0fe857919dd5 100644..100755
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -105,3 +105,11 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/flat.component
+
+$(MISC)/flat.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ flat.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt flat.component
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 2dda469c1fb8..2dda469c1fb8 100644..100755
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index 798afeaf20bf..798afeaf20bf 100644..100755
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 3f4ca4baea93..3f4ca4baea93 100644..100755
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 2a2b33a65154..0fc2a71ac10d 100644..100755
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -276,22 +276,38 @@ namespace connectivity
if ( pStream.get() )
{
ByteString sLine;
+ ByteString sVersionString;
while ( pStream->ReadLine(sLine) )
{
- if ( sLine.Equals("version=",0,sizeof("version=")-1) )
+ if ( sLine.Len() == 0 )
+ continue;
+ const ByteString sIniKey = sLine.GetToken( 0, '=' );
+ const ByteString sValue = sLine.GetToken( 1, '=' );
+ if ( sIniKey.Equals( "hsqldb.compatible_version" ) )
{
- sLine = sLine.GetToken(1,'=');
- const sal_Int32 nMajor = sLine.GetToken(0,'.').ToInt32();
- const sal_Int32 nMinor = sLine.GetToken(1,'.').ToInt32();
- const sal_Int32 nMicro = sLine.GetToken(2,'.').ToInt32();
- if ( nMajor > 1
- || ( nMajor == 1 && nMinor > 8 )
- || ( nMajor == 1 && nMinor == 8 && nMicro > 0 ) )
+ sVersionString = sValue;
+ }
+ else
+ {
+ if ( sIniKey.Equals( "version" )
+ && ( sVersionString.Len() == 0 )
+ )
{
- ::connectivity::SharedResources aResources;
- sMessage = aResources.getResourceString(STR_ERROR_NEW_VERSION);
+ sVersionString = sValue;
}
- break;
+ }
+ }
+ if ( sVersionString.Len() )
+ {
+ const sal_Int32 nMajor = sVersionString.GetToken(0,'.').ToInt32();
+ const sal_Int32 nMinor = sVersionString.GetToken(1,'.').ToInt32();
+ const sal_Int32 nMicro = sVersionString.GetToken(2,'.').ToInt32();
+ if ( nMajor > 1
+ || ( nMajor == 1 && nMinor > 8 )
+ || ( nMajor == 1 && nMinor == 8 && nMicro > 0 ) )
+ {
+ ::connectivity::SharedResources aResources;
+ sMessage = aResources.getResourceString(STR_ERROR_NEW_VERSION);
}
}
}
diff --git a/connectivity/source/drivers/hsqldb/HStorage.hxx b/connectivity/source/drivers/hsqldb/HStorage.hxx
index cd7e94b44bf0..cd7e94b44bf0 100644..100755
--- a/connectivity/source/drivers/hsqldb/HStorage.hxx
+++ b/connectivity/source/drivers/hsqldb/HStorage.hxx
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 1ce47beb572f..1ce47beb572f 100644..100755
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 2c99cc3a50b8..6dbf7a30bbbe 100644..100755
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -138,7 +138,7 @@ namespace connectivity
::rtl::OUString StorageContainer::removeOldURLPrefix(const ::rtl::OUString& _sURL)
{
::rtl::OUString sRet = _sURL;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
sal_Int32 nIndex = sRet.lastIndexOf('\\');
#else
sal_Int32 nIndex = sRet.lastIndexOf('/');
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 90ced7e5066c..90ced7e5066c 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index d055a87f2cbb..d055a87f2cbb 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index 070d5e8be5cb..070d5e8be5cb 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index b8af49d66dc8..b8af49d66dc8 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index f3849359f80f..f3849359f80f 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index a433ed0c34a3..a433ed0c34a3 100644..100755
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index 8cf6f649db0b..8cf6f649db0b 100644..100755
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 86f0ddfcca46..86f0ddfcca46 100644..100755
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index edc01233dc65..edc01233dc65 100644..100755
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index 2541c106cd2b..ac7b319ca44c 100644..100755
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -31,13 +31,11 @@
#include "hsqldb/HDriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::hsqldb;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -50,27 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pT
);
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the Module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -120,31 +97,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- ODriverDelegator::getImplementationName_Static(),
- ODriverDelegator::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 5a51e6d9bb7f..5a51e6d9bb7f 100644..100755
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index b9b78a675936..b9b78a675936 100644..100755
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index 4ef88ff7bdca..4ef88ff7bdca 100644..100755
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index a80350eef30c..a80350eef30c 100644..100755
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
diff --git a/connectivity/source/drivers/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx
index d29e67c2aa37..d29e67c2aa37 100644..100755
--- a/connectivity/source/drivers/hsqldb/accesslog.hxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.hxx
diff --git a/connectivity/source/drivers/hsqldb/exports.dxp b/connectivity/source/drivers/hsqldb/exports.dxp
index 7ff56f4f9977..3efc73741d24 100644..100755
--- a/connectivity/source/drivers/hsqldb/exports.dxp
+++ b/connectivity/source/drivers/hsqldb/exports.dxp
@@ -1,5 +1,4 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.component b/connectivity/source/drivers/hsqldb/hsqldb.component
new file mode 100755
index 000000000000..eb8ae477e749
--- /dev/null
+++ b/connectivity/source/drivers/hsqldb/hsqldb.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.sdbcx.comp.hsqldb.Driver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ <service name="com.sun.star.sdbcx.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.map b/connectivity/source/drivers/hsqldb/hsqldb.map
index b4fc53b320ef..b611aba02d5b 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqldb.map
+++ b/connectivity/source/drivers/hsqldb/hsqldb.map
@@ -1,7 +1,6 @@
UDK_3_0_0 {
global:
component_getImplementationEnvironment;
- component_writeInfo;
component_getFactory;
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream;
Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII;
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.xml b/connectivity/source/drivers/hsqldb/hsqldb.xml
index c456c253777d..c456c253777d 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqldb.xml
+++ b/connectivity/source/drivers/hsqldb/hsqldb.xml
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.hrc b/connectivity/source/drivers/hsqldb/hsqlui.hrc
index 2f25d5a8c198..2f25d5a8c198 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqlui.hrc
+++ b/connectivity/source/drivers/hsqldb/hsqlui.hrc
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src
index 913f366429ea..913f366429ea 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqlui.src
+++ b/connectivity/source/drivers/hsqldb/hsqlui.src
diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk
index 21274e8d4257..6e400696faa0 100644..100755
--- a/connectivity/source/drivers/hsqldb/makefile.mk
+++ b/connectivity/source/drivers/hsqldb/makefile.mk
@@ -103,6 +103,7 @@ SHL1STDLIBS=\
SHL1DEPN=
+SHL1CREATEJNILIB=TRUE
SHL1IMPLIB= i$(HSQLDB_TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
@@ -115,3 +116,11 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/hsqldb.component
+
+$(MISC)/hsqldb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ hsqldb.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt hsqldb.component
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index 5e30c0c17ad3..5e30c0c17ad3 100644..100755
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx
index 50765fa9cba4..50765fa9cba4 100644..100755
--- a/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/connectivity/source/drivers/jdbc/Blob.cxx
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index 307f6af80883..307f6af80883 100644..100755
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 81bb2c9859b3..81bb2c9859b3 100644..100755
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx
index b9c22e7bc955..b9c22e7bc955 100644..100755
--- a/connectivity/source/drivers/jdbc/Class.cxx
+++ b/connectivity/source/drivers/jdbc/Class.cxx
diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index 634274b238a3..634274b238a3 100644..100755
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 2fea1cea6d14..2fea1cea6d14 100644..100755
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index 36ff7a067cc4..36ff7a067cc4 100644..100755
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 4feff317369c..4feff317369c 100644..100755
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx
index ac61b9da9d8a..ac61b9da9d8a 100644..100755
--- a/connectivity/source/drivers/jdbc/Date.cxx
+++ b/connectivity/source/drivers/jdbc/Date.cxx
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 8f0d67508936..8f0d67508936 100644..100755
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
diff --git a/connectivity/source/drivers/jdbc/Exception.cxx b/connectivity/source/drivers/jdbc/Exception.cxx
index 330cb3eda39f..330cb3eda39f 100644..100755
--- a/connectivity/source/drivers/jdbc/Exception.cxx
+++ b/connectivity/source/drivers/jdbc/Exception.cxx
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index 6db9d15d2e55..6db9d15d2e55 100644..100755
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index de48039a3543..de48039a3543 100644..100755
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 90209d8c528b..90209d8c528b 100644..100755
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index da389c4188dd..da389c4188dd 100644..100755
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index f34c7ef05ffc..f34c7ef05ffc 100644..100755
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index e9e90e77f9fe..e9e90e77f9fe 100644..100755
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index a485372b3d66..a485372b3d66 100644..100755
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 3415122d8ce6..3415122d8ce6 100644..100755
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx
index 7d30e94c23b1..7d30e94c23b1 100644..100755
--- a/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/connectivity/source/drivers/jdbc/Ref.cxx
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 09e28dbac4c1..09e28dbac4c1 100644..100755
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 3d64d67630e8..3d64d67630e8 100644..100755
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx
index 6df28a63b63b..6df28a63b63b 100644..100755
--- a/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/connectivity/source/drivers/jdbc/SQLException.cxx
diff --git a/connectivity/source/drivers/jdbc/SQLWarning.cxx b/connectivity/source/drivers/jdbc/SQLWarning.cxx
index 85be40a6c342..85be40a6c342 100644..100755
--- a/connectivity/source/drivers/jdbc/SQLWarning.cxx
+++ b/connectivity/source/drivers/jdbc/SQLWarning.cxx
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index 18af00d67171..18af00d67171 100644..100755
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx
index 40713ed10beb..40713ed10beb 100644..100755
--- a/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/connectivity/source/drivers/jdbc/Throwable.cxx
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index b45e44ed4d9d..b45e44ed4d9d 100644..100755
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
diff --git a/connectivity/source/drivers/jdbc/exports.dxp b/connectivity/source/drivers/jdbc/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/jdbc/exports.dxp
+++ b/connectivity/source/drivers/jdbc/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/jdbc/jdbc.component b/connectivity/source/drivers/jdbc/jdbc.component
new file mode 100755
index 000000000000..5d7db4690ba5
--- /dev/null
+++ b/connectivity/source/drivers/jdbc/jdbc.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdbc.JDBCDriver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/jdbc/jdbc.mxp.map b/connectivity/source/drivers/jdbc/jdbc.mxp.map
index a4457e2478af..e02823e8c41b 100644..100755
--- a/connectivity/source/drivers/jdbc/jdbc.mxp.map
+++ b/connectivity/source/drivers/jdbc/jdbc.mxp.map
@@ -1,5 +1,4 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
__mh_dylib_header
___builtin_delete
diff --git a/connectivity/source/drivers/jdbc/jdbc.xml b/connectivity/source/drivers/jdbc/jdbc.xml
index bdce638fcf0f..bdce638fcf0f 100644..100755
--- a/connectivity/source/drivers/jdbc/jdbc.xml
+++ b/connectivity/source/drivers/jdbc/jdbc.xml
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index f29909d94fbd..fe98be8ad1ff 100644..100755
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -35,7 +35,6 @@ using namespace connectivity;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -48,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pModCount
);
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "SBA::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -123,31 +97,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- java_sql_Driver::getImplementationName_Static(),
- java_sql_Driver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "SBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index d676945f1789..befdc73d7bf8 100644..100755
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -110,3 +110,11 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/jdbc.component
+
+$(MISC)/jdbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ jdbc.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt jdbc.component
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index ae5672b3406f..ae5672b3406f 100644..100755
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx
index 99148afd5656..99148afd5656 100644..100755
--- a/connectivity/source/drivers/kab/KCatalog.cxx
+++ b/connectivity/source/drivers/kab/KCatalog.cxx
diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx
index 27f80caafc73..27f80caafc73 100644..100755
--- a/connectivity/source/drivers/kab/KCatalog.hxx
+++ b/connectivity/source/drivers/kab/KCatalog.hxx
diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx
index 398950c192ff..398950c192ff 100644..100755
--- a/connectivity/source/drivers/kab/KColumns.cxx
+++ b/connectivity/source/drivers/kab/KColumns.cxx
diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx
index 6ab3d32a39ec..6ab3d32a39ec 100644..100755
--- a/connectivity/source/drivers/kab/KColumns.hxx
+++ b/connectivity/source/drivers/kab/KColumns.hxx
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index b9761ebe9cb8..b9761ebe9cb8 100644..100755
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index b58460c0a80d..b58460c0a80d 100644..100755
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 922b636337d4..922b636337d4 100644..100755
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
diff --git a/connectivity/source/drivers/kab/KDEInit.h b/connectivity/source/drivers/kab/KDEInit.h
index 9a5ea70da211..9a5ea70da211 100644..100755
--- a/connectivity/source/drivers/kab/KDEInit.h
+++ b/connectivity/source/drivers/kab/KDEInit.h
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index e27ce35bce04..e27ce35bce04 100644..100755
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
index 2a3e130b6789..2a3e130b6789 100644..100755
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 20105d9b5db0..20105d9b5db0 100644..100755
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index e210bd7d5532..e210bd7d5532 100644..100755
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx
index 2b1c13649b01..2b1c13649b01 100644..100755
--- a/connectivity/source/drivers/kab/KPreparedStatement.cxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx
index dfaf0407e238..dfaf0407e238 100644..100755
--- a/connectivity/source/drivers/kab/KPreparedStatement.hxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index 7a7043eb34c6..7a7043eb34c6 100644..100755
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index fc7e5f49ce26..fc7e5f49ce26 100644..100755
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index 95fed3057cfc..95fed3057cfc 100644..100755
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
index 2e04fa84c8b6..2e04fa84c8b6 100644..100755
--- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx
index 94cc95b689cb..8f2d76357498 100644..100755
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -31,13 +31,11 @@
#include "KDriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::kab;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -50,31 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pTemp
);
-//***************************************************************************************
-//
-// The following C Api must be provided!
-// It consists in three functions that must be exported by the module
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "KAB::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -124,31 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void*,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- KabDriver::getImplementationName_Static(),
- KabDriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "KAB::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index 4121681255fd..4121681255fd 100644..100755
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index dcc141fc9bd2..dcc141fc9bd2 100644..100755
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx
index f0af9c6c41c5..f0af9c6c41c5 100644..100755
--- a/connectivity/source/drivers/kab/KTable.cxx
+++ b/connectivity/source/drivers/kab/KTable.cxx
diff --git a/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx
index 9ab4fb532143..9ab4fb532143 100644..100755
--- a/connectivity/source/drivers/kab/KTable.hxx
+++ b/connectivity/source/drivers/kab/KTable.hxx
diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx
index 55f10203b226..55f10203b226 100644..100755
--- a/connectivity/source/drivers/kab/KTables.cxx
+++ b/connectivity/source/drivers/kab/KTables.cxx
diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx
index d2d8179c09cf..d2d8179c09cf 100644..100755
--- a/connectivity/source/drivers/kab/KTables.hxx
+++ b/connectivity/source/drivers/kab/KTables.hxx
diff --git a/connectivity/source/drivers/kab/exports.dxp b/connectivity/source/drivers/kab/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/kab/exports.dxp
+++ b/connectivity/source/drivers/kab/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/kab/kab.xml b/connectivity/source/drivers/kab/kab.xml
index 943906d6c3e7..943906d6c3e7 100644..100755
--- a/connectivity/source/drivers/kab/kab.xml
+++ b/connectivity/source/drivers/kab/kab.xml
diff --git a/connectivity/source/drivers/kab/kab1.component b/connectivity/source/drivers/kab/kab1.component
new file mode 100755
index 000000000000..77227501d36c
--- /dev/null
+++ b/connectivity/source/drivers/kab/kab1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdbc.kab.Driver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/kab/kabdrv.map b/connectivity/source/drivers/kab/kabdrv.map
index 5de866f2e52f..5de866f2e52f 100644..100755
--- a/connectivity/source/drivers/kab/kabdrv.map
+++ b/connectivity/source/drivers/kab/kabdrv.map
diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx
index 6e44372924e5..6e44372924e5 100644..100755
--- a/connectivity/source/drivers/kab/kcondition.cxx
+++ b/connectivity/source/drivers/kab/kcondition.cxx
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index 34e014c637d6..34e014c637d6 100644..100755
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx
index 9acae2750e64..9acae2750e64 100644..100755
--- a/connectivity/source/drivers/kab/kfields.cxx
+++ b/connectivity/source/drivers/kab/kfields.cxx
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index 6a79455f906c..6a79455f906c 100644..100755
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
diff --git a/connectivity/source/drivers/kab/korder.cxx b/connectivity/source/drivers/kab/korder.cxx
index 6220a2383133..6220a2383133 100644..100755
--- a/connectivity/source/drivers/kab/korder.cxx
+++ b/connectivity/source/drivers/kab/korder.cxx
diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx
index 29fa9637c396..29fa9637c396 100644..100755
--- a/connectivity/source/drivers/kab/korder.hxx
+++ b/connectivity/source/drivers/kab/korder.hxx
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 98bedf66ede8..13d4857c9182 100644..100755
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -46,6 +46,9 @@ CFLAGS+=$(KDE_CFLAGS)
.IF "$(KDE_ROOT)"!=""
EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib
+.IF "$(OS)$(CPU)" == "LINUXX"
+EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib64
+.ENDIF
.ENDIF
# === KAB base library ==========================
@@ -136,3 +139,11 @@ dummy:
.INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/kab1.component
+
+$(MISC)/kab1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ kab1.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt kab1.component
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 1f273ad52b99..1f273ad52b99 100644..100755
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx
index 7ac3f4593d3f..7ac3f4593d3f 100644..100755
--- a/connectivity/source/drivers/macab/MacabAddressBook.hxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx
diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx
index 2e836e1390b9..2e836e1390b9 100644..100755
--- a/connectivity/source/drivers/macab/MacabCatalog.cxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.cxx
diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx
index c63f4187791a..c63f4187791a 100644..100755
--- a/connectivity/source/drivers/macab/MacabCatalog.hxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.hxx
diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx
index 8501aadd2a70..8501aadd2a70 100644..100755
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx
index 3cc87d4bedc8..3cc87d4bedc8 100644..100755
--- a/connectivity/source/drivers/macab/MacabColumns.hxx
+++ b/connectivity/source/drivers/macab/MacabColumns.hxx
diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx
index bb9052b463f0..bb9052b463f0 100644..100755
--- a/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/connectivity/source/drivers/macab/MacabConnection.cxx
diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
index f149847958b9..f149847958b9 100644..100755
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 896a5ca04c91..896a5ca04c91 100644..100755
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
index 0cc796bda9be..0cc796bda9be 100644..100755
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index ed6c40867c2a..ed6c40867c2a 100644..100755
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index 2648e3871e82..2648e3871e82 100644..100755
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
diff --git a/connectivity/source/drivers/macab/MacabGroup.cxx b/connectivity/source/drivers/macab/MacabGroup.cxx
index f254e2d48f82..f254e2d48f82 100644..100755
--- a/connectivity/source/drivers/macab/MacabGroup.cxx
+++ b/connectivity/source/drivers/macab/MacabGroup.cxx
diff --git a/connectivity/source/drivers/macab/MacabGroup.hxx b/connectivity/source/drivers/macab/MacabGroup.hxx
index afc45408face..afc45408face 100644..100755
--- a/connectivity/source/drivers/macab/MacabGroup.hxx
+++ b/connectivity/source/drivers/macab/MacabGroup.hxx
diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx
index 5393d9247dd0..5393d9247dd0 100644..100755
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx
index c2ca8d7a69d1..c2ca8d7a69d1 100644..100755
--- a/connectivity/source/drivers/macab/MacabHeader.hxx
+++ b/connectivity/source/drivers/macab/MacabHeader.hxx
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index aa94353e72cd..aa94353e72cd 100644..100755
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
index 15443ef7636c..15443ef7636c 100644..100755
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx
index d3521663e9e1..d3521663e9e1 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx
index 9ab992eeb27a..9ab992eeb27a 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecord.hxx
+++ b/connectivity/source/drivers/macab/MacabRecord.hxx
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 93cbca5b79f6..93cbca5b79f6 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx
index ff01bbc16227..ff01bbc16227 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecords.hxx
+++ b/connectivity/source/drivers/macab/MacabRecords.hxx
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index 6bc7d7ccca3d..6bc7d7ccca3d 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx
index 46363e979469..46363e979469 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSet.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.hxx
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 69f77633e1db..69f77633e1db 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
index ab5b9bd20062..ab5b9bd20062 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index 368bbd3db2fb..3f6967217afe 100644..100755
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -31,13 +31,11 @@
#include "MacabDriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::macab;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -50,31 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pTemp
);
-//***************************************************************************************
-//
-// The following C Api must be provided!
-// It consists in three functions that must be exported by the module
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "MACAB::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -124,31 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void*,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- MacabDriver::getImplementationName_Static(),
- MacabDriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "MACAB::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 583dc62910b6..583dc62910b6 100644..100755
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
index e9fabc4ee9dc..e9fabc4ee9dc 100644..100755
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx
index f6d78221d30d..f6d78221d30d 100644..100755
--- a/connectivity/source/drivers/macab/MacabTable.cxx
+++ b/connectivity/source/drivers/macab/MacabTable.cxx
diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx
index 1375aacc2e9a..1375aacc2e9a 100644..100755
--- a/connectivity/source/drivers/macab/MacabTable.hxx
+++ b/connectivity/source/drivers/macab/MacabTable.hxx
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx
index eddd6a68ab7f..eddd6a68ab7f 100644..100755
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx
index 657fa753d7d3..657fa753d7d3 100644..100755
--- a/connectivity/source/drivers/macab/MacabTables.hxx
+++ b/connectivity/source/drivers/macab/MacabTables.hxx
diff --git a/connectivity/source/drivers/macab/exports.dxp b/connectivity/source/drivers/macab/exports.dxp
index 9630d7e06768..f0e1c69934bc 100755
--- a/connectivity/source/drivers/macab/exports.dxp
+++ b/connectivity/source/drivers/macab/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/macab/macab1.component b/connectivity/source/drivers/macab/macab1.component
new file mode 100755
index 000000000000..0a120c041883
--- /dev/null
+++ b/connectivity/source/drivers/macab/macab1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdbc.macab.Driver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx
index 9c584cb96803..9c584cb96803 100644..100755
--- a/connectivity/source/drivers/macab/macabcondition.cxx
+++ b/connectivity/source/drivers/macab/macabcondition.cxx
diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx
index d268c4100bdb..d268c4100bdb 100644..100755
--- a/connectivity/source/drivers/macab/macabcondition.hxx
+++ b/connectivity/source/drivers/macab/macabcondition.hxx
diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx
index c1afc29d7867..c1afc29d7867 100644..100755
--- a/connectivity/source/drivers/macab/macaborder.cxx
+++ b/connectivity/source/drivers/macab/macaborder.cxx
diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx
index 2dbc6c5d2850..2dbc6c5d2850 100644..100755
--- a/connectivity/source/drivers/macab/macaborder.hxx
+++ b/connectivity/source/drivers/macab/macaborder.hxx
diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx
index 97e84c218986..97e84c218986 100644..100755
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk
index 31ffede390fd..b2e8db65dc6b 100755
--- a/connectivity/source/drivers/macab/makefile.mk
+++ b/connectivity/source/drivers/macab/makefile.mk
@@ -128,3 +128,11 @@ dummy:
.INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/macab1.component
+
+$(MISC)/macab1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ macab1.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt macab1.component
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx
index 45e399473eee..45e399473eee 100644..100755
--- a/connectivity/source/drivers/mozab/MCatalog.cxx
+++ b/connectivity/source/drivers/mozab/MCatalog.cxx
diff --git a/connectivity/source/drivers/mozab/MCatalog.hxx b/connectivity/source/drivers/mozab/MCatalog.hxx
index d75774f7de05..d75774f7de05 100644..100755
--- a/connectivity/source/drivers/mozab/MCatalog.hxx
+++ b/connectivity/source/drivers/mozab/MCatalog.hxx
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index 211a7c307542..211a7c307542 100644..100755
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx
index 1508ae53c2b6..1508ae53c2b6 100644..100755
--- a/connectivity/source/drivers/mozab/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx
diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx
index dc8effa590bc..dc8effa590bc 100644..100755
--- a/connectivity/source/drivers/mozab/MColumns.cxx
+++ b/connectivity/source/drivers/mozab/MColumns.cxx
diff --git a/connectivity/source/drivers/mozab/MColumns.hxx b/connectivity/source/drivers/mozab/MColumns.hxx
index 6328dc36e1f2..6328dc36e1f2 100644..100755
--- a/connectivity/source/drivers/mozab/MColumns.hxx
+++ b/connectivity/source/drivers/mozab/MColumns.hxx
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index 1ef4cf3ebe74..1ef4cf3ebe74 100644..100755
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.hxx b/connectivity/source/drivers/mozab/MConfigAccess.hxx
index 7aa02d0b4b5e..7aa02d0b4b5e 100644..100755
--- a/connectivity/source/drivers/mozab/MConfigAccess.hxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.hxx
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index df121ffeacce..df121ffeacce 100644..100755
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index 76dcb328c2c4..76dcb328c2c4 100644..100755
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
index 4bcea69d2f1a..4bcea69d2f1a 100644..100755
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
index 4fb8d5f9a145..4fb8d5f9a145 100644..100755
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index c0f0a39316bb..e78ed7dab7f0 100644..100755
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -251,7 +251,7 @@ EDriverType MozabDriver::impl_classifyURL( const ::rtl::OUString& url )
const sal_Char* pScheme;
} aSchemeMap[] =
{
-#if defined(WNT) || defined(WIN)
+#if defined(WNT)
{ Outlook, "outlook" },
{ OutlookExpress, "outlookexp" },
#endif
diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx
index b8ea911c7db1..b8ea911c7db1 100644..100755
--- a/connectivity/source/drivers/mozab/MDriver.hxx
+++ b/connectivity/source/drivers/mozab/MDriver.hxx
diff --git a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
index bc1b4fdc07d4..bc1b4fdc07d4 100644..100755
--- a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
+++ b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index f8d417bf60da..f8d417bf60da 100644..100755
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index 31cfa97bc3f0..31cfa97bc3f0 100644..100755
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index a41cbf780713..b233e19a8c56 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -898,8 +898,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
OSQLParseNode *pOptEscape;
const OSQLParseNode* pPart2 = parseTree->getChild(1);
pColumn = parseTree->getChild(0); // Match Item
- pAtom = pPart2->getChild(parseTree->count()-2); // Match String
- pOptEscape = pPart2->getChild(parseTree->count()-1); // Opt Escape Rule
+ pAtom = pPart2->getChild(pPart2->count()-2); // Match String
+ pOptEscape = pPart2->getChild(pPart2->count()-1); // Opt Escape Rule
(void)pOptEscape;
const bool bNot = SQL_ISTOKEN(pPart2->getChild(0), NOT);
@@ -1373,7 +1373,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
const Reference<XDatabaseMetaData>& _xMetaData,
::std::vector<sal_Int32>& _rColMapping)
{
- ::comphelper::UStringMixEqual aCase(_xMetaData->storesMixedCaseQuotedIdentifiers());
+ ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers());
Reference<XPropertySet> xTableColumn;
::rtl::OUString sTableColumnName, sSelectColumnRealName;
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx
index 47e9ad13d276..47e9ad13d276 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSet.hxx
+++ b/connectivity/source/drivers/mozab/MResultSet.hxx
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
index 99894fb750e1..99894fb750e1 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
index e04668070dfc..e04668070dfc 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index f82bb012af98..216dec207bb3 100644..100755
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -40,7 +40,6 @@ using namespace connectivity::mozab;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
using ::com::sun::star::mozilla::XMozillaBootstrap;
@@ -54,31 +53,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pTemp
);
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -128,37 +102,6 @@ component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-
- REGISTER_PROVIDER(
- MozabDriver::getImplementationName_Static(),
- MozabDriver::getSupportedServiceNames_Static(), xKey);
-
- Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
- REGISTER_PROVIDER(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")),
- aSNS, xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
{
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index 709676b21966..709676b21966 100644..100755
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx
index 41775540713c..41775540713c 100644..100755
--- a/connectivity/source/drivers/mozab/MStatement.hxx
+++ b/connectivity/source/drivers/mozab/MStatement.hxx
diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx
index ddfaed031770..ddfaed031770 100644..100755
--- a/connectivity/source/drivers/mozab/MTable.cxx
+++ b/connectivity/source/drivers/mozab/MTable.cxx
diff --git a/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx
index 3cc6728fe156..3cc6728fe156 100644..100755
--- a/connectivity/source/drivers/mozab/MTable.hxx
+++ b/connectivity/source/drivers/mozab/MTable.hxx
diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx
index b01c8fe9d6b2..b01c8fe9d6b2 100644..100755
--- a/connectivity/source/drivers/mozab/MTables.cxx
+++ b/connectivity/source/drivers/mozab/MTables.cxx
diff --git a/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx
index 56ed3d001d3e..56ed3d001d3e 100644..100755
--- a/connectivity/source/drivers/mozab/MTables.hxx
+++ b/connectivity/source/drivers/mozab/MTables.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index c7ca9e1287ff..ed9bdac5476c 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -239,7 +239,6 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
#include <cppuhelper/factory.hxx>
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -252,50 +251,6 @@ component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const ::rtl::OUString& aServiceImplName,
- const Sequence< ::rtl::OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- ::rtl::OUString aMainKeyName;
- aMainKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
- REGISTER_PROVIDER(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")),
- aSNS, xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
{
MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager));
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index 5a3f609ea90f..5a3f609ea90f 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 481cc7863c20..481cc7863c20 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
index 75f443d0f530..75f443d0f530 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
index f56df914a411..f56df914a411 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
index 57ff62261213..57ff62261213 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 8e2cf5deed40..8e2cf5deed40 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
index 0ccd4322539c..0ccd4322539c 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
index bb751a4c100f..bb751a4c100f 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
index 723af162ab5b..723af162ab5b 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
index 279faa7f2318..279faa7f2318 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
index 434c9e3af390..434c9e3af390 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 60d6b80bdf06..60d6b80bdf06 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 5cc807fceb11..5cc807fceb11 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
index 84684056f557..84684056f557 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
index 6e52c40b8f71..6e52c40b8f71 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
index c950e4d0e7e0..c950e4d0e7e0 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
index 2f17ea53f556..2f17ea53f556 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index 6a4172da205d..b44436e488ce 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -78,6 +78,14 @@ SHL1STDLIBS=\
$(SALLIB) \
$(COMPHELPERLIB)
+ALLTAR : $(MISC)/mozbootstrap.component
+
+$(MISC)/mozbootstrap.component .ERRREMOVE : \
+ $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component
+
.ELSE
SLOFILES += \
$(SLO)$/MNSInit.obj \
@@ -90,4 +98,3 @@ SLOFILES += \
# --- Targets ----------------------------------
.INCLUDE : target.mk
-
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
new file mode 100755
index 000000000000..5da158924a06
--- /dev/null
+++ b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
+ <service name="com.sun.star.mozilla.MozillaBootstrap"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
index f03d4a3bb208..f03d4a3bb208 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
index 3d01a103c9e2..3d01a103c9e2 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
index ec9bd9d63d74..ec9bd9d63d74 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
index 75913dcd525c..75913dcd525c 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
index 4208eb6db606..4208eb6db606 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
index b029a0e23638..b029a0e23638 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
+++ b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
index 15eeb5395195..15eeb5395195 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
+++ b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
diff --git a/connectivity/source/drivers/mozab/exports.dxp b/connectivity/source/drivers/mozab/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/mozab/exports.dxp
+++ b/connectivity/source/drivers/mozab/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 5ebc146e8e50..1928961b04b7 100644..100755
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -184,3 +184,11 @@ $(MISC)$/$(SHL2TARGET).flt: makefile.mk
@echo _TI >$@
@echo _real >>$@
+
+ALLTAR : $(MISC)/mozab.component
+
+$(MISC)/mozab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ mozab.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt mozab.component
diff --git a/connectivity/source/drivers/mozab/makefile_mozab.mk b/connectivity/source/drivers/mozab/makefile_mozab.mk
index c984f121a23c..c984f121a23c 100644..100755
--- a/connectivity/source/drivers/mozab/makefile_mozab.mk
+++ b/connectivity/source/drivers/mozab/makefile_mozab.mk
diff --git a/connectivity/source/drivers/mozab/mozab.component b/connectivity/source/drivers/mozab/mozab.component
new file mode 100755
index 000000000000..70f5da3bfe72
--- /dev/null
+++ b/connectivity/source/drivers/mozab/mozab.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
+ <service name="com.sun.star.mozilla.MozillaBootstrap"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.sdbc.MozabDriver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/mozab/mozab.xml b/connectivity/source/drivers/mozab/mozab.xml
index 6663387cf34c..6663387cf34c 100644..100755
--- a/connectivity/source/drivers/mozab/mozab.xml
+++ b/connectivity/source/drivers/mozab/mozab.xml
diff --git a/connectivity/source/drivers/mozab/mozabdrv.map b/connectivity/source/drivers/mozab/mozabdrv.map
index a431a0737754..a431a0737754 100644..100755
--- a/connectivity/source/drivers/mozab/mozabdrv.map
+++ b/connectivity/source/drivers/mozab/mozabdrv.map
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index 28cc64d707ba..28cc64d707ba 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
index 77de88b2f07d..77de88b2f07d 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
index c7f1dffd83c4..c7f1dffd83c4 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 4af7668e4ec2..4af7668e4ec2 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
index c7b5224893da..c7b5224893da 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
index 0ef193cc3bd8..0ef193cc3bd8 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
index b3e75c3763bb..b3e75c3763bb 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index df81bb886b5e..df81bb886b5e 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
index 06c13993edda..06c13993edda 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
index de6be351a854..de6be351a854 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
index 85e36e8abacd..85e36e8abacd 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
index d50097e5c65d..d50097e5c65d 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
index 6fdbcea39938..6fdbcea39938 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 177363509305..177363509305 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
index 2c17529ed48d..2c17529ed48d 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 1ce71c85b9da..1ce71c85b9da 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index 6884ddd2c8b3..6884ddd2c8b3 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
index 8bb78aca4e6b..8bb78aca4e6b 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
index df903eaa003f..df903eaa003f 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h
index a63db2b480c8..a63db2b480c8 100644..100755
--- a/connectivity/source/drivers/mozab/post_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/post_include_mozilla.h
diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h
index a90c6a394fd8..e5e3dac6e9a6 100644..100755
--- a/connectivity/source/drivers/mozab/pre_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h
@@ -26,13 +26,6 @@
*
************************************************************************/
-#ifndef BOOL
-# define MOZ_BOOL
-
-# define BOOL mozBOOL
-# define Bool mozBooL
-#endif
-
// Turn off DEBUG Assertions
#ifdef _DEBUG
#define _DEBUG_WAS_DEFINED _DEBUG
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index 090d0b5486d0..090d0b5486d0 100644..100755
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx
index 59c8abeae61f..59c8abeae61f 100644..100755
--- a/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/connectivity/source/drivers/mysql/YColumns.cxx
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index aef756916ec6..aef756916ec6 100644..100755
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index c5edb19af2bd..c5edb19af2bd 100644..100755
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index e40adf2c211a..e40adf2c211a 100644..100755
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 01cb1cbda515..01cb1cbda515 100644..100755
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index a95d1d527c05..a95d1d527c05 100644..100755
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index 0ba85c02ddd5..0ba85c02ddd5 100644..100755
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index b6bdec36e9b1..32122c6e7166 100644..100755
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -30,13 +30,11 @@
#include "precompiled_connectivity.hxx"
#include "mysql/YDriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::mysql;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -49,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pT
);
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -124,31 +97,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- ODriverDelegator::getImplementationName_Static(),
- ODriverDelegator::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/mysql/exports.dxp b/connectivity/source/drivers/mysql/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/mysql/exports.dxp
+++ b/connectivity/source/drivers/mysql/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk
index fbb68321cb01..453f4b652f21 100644..100755
--- a/connectivity/source/drivers/mysql/makefile.mk
+++ b/connectivity/source/drivers/mysql/makefile.mk
@@ -82,3 +82,11 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/mysql.component
+
+$(MISC)/mysql.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ mysql.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt mysql.component
diff --git a/connectivity/source/drivers/mysql/mysql.component b/connectivity/source/drivers/mysql/mysql.component
new file mode 100755
index 000000000000..ced2297fa07f
--- /dev/null
+++ b/connectivity/source/drivers/mysql/mysql.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="org.openoffice.comp.drivers.MySQL.Driver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ <service name="com.sun.star.sdbcx.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/mysql/mysql.xml b/connectivity/source/drivers/mysql/mysql.xml
index 6ef9f55721b1..6ef9f55721b1 100644..100755
--- a/connectivity/source/drivers/mysql/mysql.xml
+++ b/connectivity/source/drivers/mysql/mysql.xml
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index 7fe29c930afb..eed70634fe70 100644..100755
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -110,10 +110,6 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath)
if (bLoaded)
return sal_True;
-#ifdef WIN
- _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC.DLL"));
-
-#endif
#ifdef WNT
_rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC32.DLL"));
#endif
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index 1bca9cccc78a..1bca9cccc78a 100644..100755
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx
index 41185499aa15..41185499aa15 100644..100755
--- a/connectivity/source/drivers/odbc/ORealDriver.hxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.hxx
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index a13837224b93..6d701b87c5e2 100644..100755
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -77,3 +77,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
# --- Targets ----------------------------------
.INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/odbc.component
+
+$(MISC)/odbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ odbc.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt odbc.component
diff --git a/connectivity/source/drivers/odbc/odbc.component b/connectivity/source/drivers/odbc/odbc.component
new file mode 100755
index 000000000000..d4e6bc127da2
--- /dev/null
+++ b/connectivity/source/drivers/odbc/odbc.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdbc.ODBCDriver">
+ <service name="com.sun.star.sdbc.Driver"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/drivers/odbc/odbc.xml b/connectivity/source/drivers/odbc/odbc.xml
index ad7562ae7a35..ad7562ae7a35 100644..100755
--- a/connectivity/source/drivers/odbc/odbc.xml
+++ b/connectivity/source/drivers/odbc/odbc.xml
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 76f392c9b8a2..ecb1793c2076 100644..100755
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -31,13 +31,11 @@
#include "ORealDriver.hxx"
#include "odbc/ODriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::odbc;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -50,31 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pTemp
);
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "ODBC::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -125,31 +98,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- ODBCDriver::getImplementationName_Static(),
- ODBCDriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 891eabc7d5eb..891eabc7d5eb 100644..100755
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index c0d8383eb1a7..c0d8383eb1a7 100644..100755
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 8d880caa534f..8d880caa534f 100644..100755
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx b/connectivity/source/drivers/odbcbase/ODriver.cxx
index 0e8a49065f95..0e8a49065f95 100644..100755
--- a/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/connectivity/source/drivers/odbcbase/ODriver.cxx
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 3b45903ee1b2..3b45903ee1b2 100644..100755
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index e93a465cea3b..e93a465cea3b 100644..100755
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
diff --git a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
index 34f60939f9f8..34f60939f9f8 100644..100755
--- a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 51689b44e2b5..51689b44e2b5 100644..100755
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index 8ae72766fc04..8ae72766fc04 100644..100755
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk
index 85e96ea857d6..85e96ea857d6 100644..100755
--- a/connectivity/source/drivers/odbcbase/makefile.mk
+++ b/connectivity/source/drivers/odbcbase/makefile.mk
diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx
index 0284c70fab89..0284c70fab89 100644..100755
--- a/connectivity/source/inc/AutoRetrievingBase.hxx
+++ b/connectivity/source/inc/AutoRetrievingBase.hxx
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index c51468c0ff4d..c51468c0ff4d 100644..100755
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index 6f2a318e6e1c..6f2a318e6e1c 100644..100755
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx
index baa54737f482..baa54737f482 100644..100755
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
diff --git a/connectivity/source/inc/OSubComponent.hxx b/connectivity/source/inc/OSubComponent.hxx
index 8db7336b16d1..8db7336b16d1 100644..100755
--- a/connectivity/source/inc/OSubComponent.hxx
+++ b/connectivity/source/inc/OSubComponent.hxx
diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx
index 13f0fd2975ce..13f0fd2975ce 100644..100755
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx
index abfc1d107cb2..abfc1d107cb2 100644..100755
--- a/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/connectivity/source/inc/ParameterSubstitution.hxx
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index f65539da3f77..f65539da3f77 100644..100755
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index 92e974f508f8..92e974f508f8 100644..100755
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index 7fb815d21f50..7fb815d21f50 100644..100755
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx
index b5fa33b5c493..b5fa33b5c493 100644..100755
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx
index a02fde92e412..a02fde92e412 100644..100755
--- a/connectivity/source/inc/TPrivilegesResultSet.hxx
+++ b/connectivity/source/inc/TPrivilegesResultSet.hxx
diff --git a/connectivity/source/inc/TResultSetHelper.hxx b/connectivity/source/inc/TResultSetHelper.hxx
index 874b9d93d82b..874b9d93d82b 100644..100755
--- a/connectivity/source/inc/TResultSetHelper.hxx
+++ b/connectivity/source/inc/TResultSetHelper.hxx
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 8b9b49d75f22..19548a5e8ccd 100644..100755
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -99,7 +99,7 @@ namespace connectivity
@return the last position
*/
inline sal_Int32 getLastPosition() const { return m_aBookmarksPositions.size(); }
- inline void SetDeleted(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; }
+ inline void SetDeletedVisible(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; }
};
}
#endif // CONNECTIVITY_SKIPDELETEDSSET_HXX
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index 21212bc90ce6..21212bc90ce6 100644..100755
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
diff --git a/connectivity/source/inc/UStringDescription_Impl.hxx b/connectivity/source/inc/UStringDescription_Impl.hxx
index 2c2c33d03175..2c2c33d03175 100644..100755
--- a/connectivity/source/inc/UStringDescription_Impl.hxx
+++ b/connectivity/source/inc/UStringDescription_Impl.hxx
diff --git a/connectivity/source/inc/adabas/BCatalog.hxx b/connectivity/source/inc/adabas/BCatalog.hxx
index af411b825b5a..af411b825b5a 100644..100755
--- a/connectivity/source/inc/adabas/BCatalog.hxx
+++ b/connectivity/source/inc/adabas/BCatalog.hxx
diff --git a/connectivity/source/inc/adabas/BColumn.hxx b/connectivity/source/inc/adabas/BColumn.hxx
index 34afc908dedd..34afc908dedd 100644..100755
--- a/connectivity/source/inc/adabas/BColumn.hxx
+++ b/connectivity/source/inc/adabas/BColumn.hxx
diff --git a/connectivity/source/inc/adabas/BColumns.hxx b/connectivity/source/inc/adabas/BColumns.hxx
index 40eadf3e9bf9..40eadf3e9bf9 100644..100755
--- a/connectivity/source/inc/adabas/BColumns.hxx
+++ b/connectivity/source/inc/adabas/BColumns.hxx
diff --git a/connectivity/source/inc/adabas/BConnection.hxx b/connectivity/source/inc/adabas/BConnection.hxx
index afa5cc300a72..afa5cc300a72 100644..100755
--- a/connectivity/source/inc/adabas/BConnection.hxx
+++ b/connectivity/source/inc/adabas/BConnection.hxx
diff --git a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
index b60551069d4e..b60551069d4e 100644..100755
--- a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
+++ b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/adabas/BDriver.hxx b/connectivity/source/inc/adabas/BDriver.hxx
index 82cbc0594a31..82cbc0594a31 100644..100755
--- a/connectivity/source/inc/adabas/BDriver.hxx
+++ b/connectivity/source/inc/adabas/BDriver.hxx
diff --git a/connectivity/source/inc/adabas/BGroup.hxx b/connectivity/source/inc/adabas/BGroup.hxx
index 29a0486a7bc4..29a0486a7bc4 100644..100755
--- a/connectivity/source/inc/adabas/BGroup.hxx
+++ b/connectivity/source/inc/adabas/BGroup.hxx
diff --git a/connectivity/source/inc/adabas/BGroups.hxx b/connectivity/source/inc/adabas/BGroups.hxx
index 7989aaa4cbfd..7989aaa4cbfd 100644..100755
--- a/connectivity/source/inc/adabas/BGroups.hxx
+++ b/connectivity/source/inc/adabas/BGroups.hxx
diff --git a/connectivity/source/inc/adabas/BIndex.hxx b/connectivity/source/inc/adabas/BIndex.hxx
index d089d0bd8d89..d089d0bd8d89 100644..100755
--- a/connectivity/source/inc/adabas/BIndex.hxx
+++ b/connectivity/source/inc/adabas/BIndex.hxx
diff --git a/connectivity/source/inc/adabas/BIndexColumn.hxx b/connectivity/source/inc/adabas/BIndexColumn.hxx
index 9b515053ad31..9b515053ad31 100644..100755
--- a/connectivity/source/inc/adabas/BIndexColumn.hxx
+++ b/connectivity/source/inc/adabas/BIndexColumn.hxx
diff --git a/connectivity/source/inc/adabas/BIndexColumns.hxx b/connectivity/source/inc/adabas/BIndexColumns.hxx
index 80274d098dc7..80274d098dc7 100644..100755
--- a/connectivity/source/inc/adabas/BIndexColumns.hxx
+++ b/connectivity/source/inc/adabas/BIndexColumns.hxx
diff --git a/connectivity/source/inc/adabas/BIndexes.hxx b/connectivity/source/inc/adabas/BIndexes.hxx
index 451e4ef05e90..451e4ef05e90 100644..100755
--- a/connectivity/source/inc/adabas/BIndexes.hxx
+++ b/connectivity/source/inc/adabas/BIndexes.hxx
diff --git a/connectivity/source/inc/adabas/BKeys.hxx b/connectivity/source/inc/adabas/BKeys.hxx
index 1ba5f9372532..1ba5f9372532 100644..100755
--- a/connectivity/source/inc/adabas/BKeys.hxx
+++ b/connectivity/source/inc/adabas/BKeys.hxx
diff --git a/connectivity/source/inc/adabas/BPreparedStatement.hxx b/connectivity/source/inc/adabas/BPreparedStatement.hxx
index c74bf3a3f0cd..c74bf3a3f0cd 100644..100755
--- a/connectivity/source/inc/adabas/BPreparedStatement.hxx
+++ b/connectivity/source/inc/adabas/BPreparedStatement.hxx
diff --git a/connectivity/source/inc/adabas/BResultSet.hxx b/connectivity/source/inc/adabas/BResultSet.hxx
index 95a9a41eea84..95a9a41eea84 100644..100755
--- a/connectivity/source/inc/adabas/BResultSet.hxx
+++ b/connectivity/source/inc/adabas/BResultSet.hxx
diff --git a/connectivity/source/inc/adabas/BResultSetMetaData.hxx b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
index 3fe11e02743d..3fe11e02743d 100644..100755
--- a/connectivity/source/inc/adabas/BResultSetMetaData.hxx
+++ b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
diff --git a/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx
index 6f92bacc6fc9..6f92bacc6fc9 100644..100755
--- a/connectivity/source/inc/adabas/BStatement.hxx
+++ b/connectivity/source/inc/adabas/BStatement.hxx
diff --git a/connectivity/source/inc/adabas/BTable.hxx b/connectivity/source/inc/adabas/BTable.hxx
index 7dde9b69d2a9..7dde9b69d2a9 100644..100755
--- a/connectivity/source/inc/adabas/BTable.hxx
+++ b/connectivity/source/inc/adabas/BTable.hxx
diff --git a/connectivity/source/inc/adabas/BTables.hxx b/connectivity/source/inc/adabas/BTables.hxx
index 98aae92abfd0..98aae92abfd0 100644..100755
--- a/connectivity/source/inc/adabas/BTables.hxx
+++ b/connectivity/source/inc/adabas/BTables.hxx
diff --git a/connectivity/source/inc/adabas/BUser.hxx b/connectivity/source/inc/adabas/BUser.hxx
index da336939f071..da336939f071 100644..100755
--- a/connectivity/source/inc/adabas/BUser.hxx
+++ b/connectivity/source/inc/adabas/BUser.hxx
diff --git a/connectivity/source/inc/adabas/BUsers.hxx b/connectivity/source/inc/adabas/BUsers.hxx
index df4915cf4fb2..df4915cf4fb2 100644..100755
--- a/connectivity/source/inc/adabas/BUsers.hxx
+++ b/connectivity/source/inc/adabas/BUsers.hxx
diff --git a/connectivity/source/inc/adabas/BViews.hxx b/connectivity/source/inc/adabas/BViews.hxx
index 751726eed72a..751726eed72a 100644..100755
--- a/connectivity/source/inc/adabas/BViews.hxx
+++ b/connectivity/source/inc/adabas/BViews.hxx
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx
index 00398698ea13..00398698ea13 100644..100755
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
diff --git a/connectivity/source/inc/ado/ACatalog.hxx b/connectivity/source/inc/ado/ACatalog.hxx
index 4ac4a7ef4394..4ac4a7ef4394 100644..100755
--- a/connectivity/source/inc/ado/ACatalog.hxx
+++ b/connectivity/source/inc/ado/ACatalog.hxx
diff --git a/connectivity/source/inc/ado/ACollection.hxx b/connectivity/source/inc/ado/ACollection.hxx
index 3dafa36b9b3a..3dafa36b9b3a 100644..100755
--- a/connectivity/source/inc/ado/ACollection.hxx
+++ b/connectivity/source/inc/ado/ACollection.hxx
diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx
index ce93f201aef1..ce93f201aef1 100644..100755
--- a/connectivity/source/inc/ado/AColumn.hxx
+++ b/connectivity/source/inc/ado/AColumn.hxx
diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx
index 6f8867ec0fb4..6f8867ec0fb4 100644..100755
--- a/connectivity/source/inc/ado/AColumns.hxx
+++ b/connectivity/source/inc/ado/AColumns.hxx
diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx
index 4be35ae52fff..4be35ae52fff 100644..100755
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
index d2e6fe645f5d..d2e6fe645f5d 100644..100755
--- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index 4ac87c6ff7aa..4ac87c6ff7aa 100644..100755
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index fadbde55724e..fadbde55724e 100644..100755
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx
index 1efc9580ba35..1efc9580ba35 100644..100755
--- a/connectivity/source/inc/ado/ADriver.hxx
+++ b/connectivity/source/inc/ado/ADriver.hxx
diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx
index 7efe1650a89f..7efe1650a89f 100644..100755
--- a/connectivity/source/inc/ado/AGroup.hxx
+++ b/connectivity/source/inc/ado/AGroup.hxx
diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx
index 13808a8e0607..13808a8e0607 100644..100755
--- a/connectivity/source/inc/ado/AGroups.hxx
+++ b/connectivity/source/inc/ado/AGroups.hxx
diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx
index e21d05b990ba..e21d05b990ba 100644..100755
--- a/connectivity/source/inc/ado/AIndex.hxx
+++ b/connectivity/source/inc/ado/AIndex.hxx
diff --git a/connectivity/source/inc/ado/AIndexColumn.hxx b/connectivity/source/inc/ado/AIndexColumn.hxx
index 9d2057bbf565..9d2057bbf565 100644..100755
--- a/connectivity/source/inc/ado/AIndexColumn.hxx
+++ b/connectivity/source/inc/ado/AIndexColumn.hxx
diff --git a/connectivity/source/inc/ado/AIndexColumns.hxx b/connectivity/source/inc/ado/AIndexColumns.hxx
index be58ffb6f2b0..be58ffb6f2b0 100644..100755
--- a/connectivity/source/inc/ado/AIndexColumns.hxx
+++ b/connectivity/source/inc/ado/AIndexColumns.hxx
diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx
index 345c9ce8176d..345c9ce8176d 100644..100755
--- a/connectivity/source/inc/ado/AIndexes.hxx
+++ b/connectivity/source/inc/ado/AIndexes.hxx
diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx
index ad4dbada2b12..ad4dbada2b12 100644..100755
--- a/connectivity/source/inc/ado/AKey.hxx
+++ b/connectivity/source/inc/ado/AKey.hxx
diff --git a/connectivity/source/inc/ado/AKeyColumn.hxx b/connectivity/source/inc/ado/AKeyColumn.hxx
index 098a4b36e0f8..098a4b36e0f8 100644..100755
--- a/connectivity/source/inc/ado/AKeyColumn.hxx
+++ b/connectivity/source/inc/ado/AKeyColumn.hxx
diff --git a/connectivity/source/inc/ado/AKeyColumns.hxx b/connectivity/source/inc/ado/AKeyColumns.hxx
index 40873d2e252e..40873d2e252e 100644..100755
--- a/connectivity/source/inc/ado/AKeyColumns.hxx
+++ b/connectivity/source/inc/ado/AKeyColumns.hxx
diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx
index 03991d0345ba..03991d0345ba 100644..100755
--- a/connectivity/source/inc/ado/AKeys.hxx
+++ b/connectivity/source/inc/ado/AKeys.hxx
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx
index 585c9ff20a02..585c9ff20a02 100644..100755
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index 29dc7b7a4bbc..29dc7b7a4bbc 100644..100755
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index 535e333f5c25..535e333f5c25 100644..100755
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index baaa21ec5e78..baaa21ec5e78 100644..100755
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx
index afa740ad5427..afa740ad5427 100644..100755
--- a/connectivity/source/inc/ado/ATable.hxx
+++ b/connectivity/source/inc/ado/ATable.hxx
diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx
index 1548cd34f7f5..1548cd34f7f5 100644..100755
--- a/connectivity/source/inc/ado/ATables.hxx
+++ b/connectivity/source/inc/ado/ATables.hxx
diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx
index 922d9529c2e4..922d9529c2e4 100644..100755
--- a/connectivity/source/inc/ado/AUser.hxx
+++ b/connectivity/source/inc/ado/AUser.hxx
diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx
index 8e8c79d231cb..8e8c79d231cb 100644..100755
--- a/connectivity/source/inc/ado/AUsers.hxx
+++ b/connectivity/source/inc/ado/AUsers.hxx
diff --git a/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx
index 4ca8b51b6a2f..4ca8b51b6a2f 100644..100755
--- a/connectivity/source/inc/ado/AView.hxx
+++ b/connectivity/source/inc/ado/AView.hxx
diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx
index 78a4f16134d0..78a4f16134d0 100644..100755
--- a/connectivity/source/inc/ado/AViews.hxx
+++ b/connectivity/source/inc/ado/AViews.hxx
diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index fd343f32df61..fd343f32df61 100644..100755
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index 79371befcb7f..79371befcb7f 100644..100755
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index b34fec336685..b34fec336685 100644..100755
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx
index 614c139aecb5..614c139aecb5 100644..100755
--- a/connectivity/source/inc/ado/Awrapadox.hxx
+++ b/connectivity/source/inc/ado/Awrapadox.hxx
diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx
index 8ebbb6259c35..8ebbb6259c35 100644..100755
--- a/connectivity/source/inc/ado/WrapCatalog.hxx
+++ b/connectivity/source/inc/ado/WrapCatalog.hxx
diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx
index e39474b5057b..e39474b5057b 100644..100755
--- a/connectivity/source/inc/ado/WrapColumn.hxx
+++ b/connectivity/source/inc/ado/WrapColumn.hxx
diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx
index bc350f72eb3d..bc350f72eb3d 100644..100755
--- a/connectivity/source/inc/ado/WrapIndex.hxx
+++ b/connectivity/source/inc/ado/WrapIndex.hxx
diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx
index 3666338fd613..3666338fd613 100644..100755
--- a/connectivity/source/inc/ado/WrapKey.hxx
+++ b/connectivity/source/inc/ado/WrapKey.hxx
diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx
index 646b26e333de..646b26e333de 100644..100755
--- a/connectivity/source/inc/ado/WrapTable.hxx
+++ b/connectivity/source/inc/ado/WrapTable.hxx
diff --git a/connectivity/source/inc/ado/WrapTypeDefs.hxx b/connectivity/source/inc/ado/WrapTypeDefs.hxx
index c81ec6839ae9..c81ec6839ae9 100644..100755
--- a/connectivity/source/inc/ado/WrapTypeDefs.hxx
+++ b/connectivity/source/inc/ado/WrapTypeDefs.hxx
diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx
index eb07d0200582..eb07d0200582 100644..100755
--- a/connectivity/source/inc/ado/adoimp.hxx
+++ b/connectivity/source/inc/ado/adoimp.hxx
diff --git a/connectivity/source/inc/calc/CCatalog.hxx b/connectivity/source/inc/calc/CCatalog.hxx
index fb3616c0a075..fb3616c0a075 100644..100755
--- a/connectivity/source/inc/calc/CCatalog.hxx
+++ b/connectivity/source/inc/calc/CCatalog.hxx
diff --git a/connectivity/source/inc/calc/CColumns.hxx b/connectivity/source/inc/calc/CColumns.hxx
index bef6a7b767e8..bef6a7b767e8 100644..100755
--- a/connectivity/source/inc/calc/CColumns.hxx
+++ b/connectivity/source/inc/calc/CColumns.hxx
diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx
index b58f25cfc8c7..b58f25cfc8c7 100644..100755
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index e001e315f502..e001e315f502 100644..100755
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx
index 1488d3605888..1488d3605888 100644..100755
--- a/connectivity/source/inc/calc/CDriver.hxx
+++ b/connectivity/source/inc/calc/CDriver.hxx
diff --git a/connectivity/source/inc/calc/CPreparedStatement.hxx b/connectivity/source/inc/calc/CPreparedStatement.hxx
index 331b3aa5212d..331b3aa5212d 100644..100755
--- a/connectivity/source/inc/calc/CPreparedStatement.hxx
+++ b/connectivity/source/inc/calc/CPreparedStatement.hxx
diff --git a/connectivity/source/inc/calc/CResultSet.hxx b/connectivity/source/inc/calc/CResultSet.hxx
index d144f75dc09e..d144f75dc09e 100644..100755
--- a/connectivity/source/inc/calc/CResultSet.hxx
+++ b/connectivity/source/inc/calc/CResultSet.hxx
diff --git a/connectivity/source/inc/calc/CStatement.hxx b/connectivity/source/inc/calc/CStatement.hxx
index 46df690cb65d..46df690cb65d 100644..100755
--- a/connectivity/source/inc/calc/CStatement.hxx
+++ b/connectivity/source/inc/calc/CStatement.hxx
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index 0db28e7fd9a5..0db28e7fd9a5 100644..100755
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
diff --git a/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx
index 97f8f161fdbc..97f8f161fdbc 100644..100755
--- a/connectivity/source/inc/calc/CTables.hxx
+++ b/connectivity/source/inc/calc/CTables.hxx
diff --git a/connectivity/source/inc/dbase/DCatalog.hxx b/connectivity/source/inc/dbase/DCatalog.hxx
index 493fc94b470b..493fc94b470b 100644..100755
--- a/connectivity/source/inc/dbase/DCatalog.hxx
+++ b/connectivity/source/inc/dbase/DCatalog.hxx
diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx
index 7c5fc7312e1a..7c5fc7312e1a 100644..100755
--- a/connectivity/source/inc/dbase/DCode.hxx
+++ b/connectivity/source/inc/dbase/DCode.hxx
diff --git a/connectivity/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx
index fc86b7d42378..fc86b7d42378 100644..100755
--- a/connectivity/source/inc/dbase/DColumns.hxx
+++ b/connectivity/source/inc/dbase/DColumns.hxx
diff --git a/connectivity/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx
index 6d93cc5a19ac..6d93cc5a19ac 100644..100755
--- a/connectivity/source/inc/dbase/DConnection.hxx
+++ b/connectivity/source/inc/dbase/DConnection.hxx
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
index cde83ca67497..cde83ca67497 100644..100755
--- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
index 2d24d0f7585e..2d24d0f7585e 100644..100755
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
index 114aa25545fb..114aa25545fb 100644..100755
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx
index eac29c1826c2..eac29c1826c2 100644..100755
--- a/connectivity/source/inc/dbase/DDriver.hxx
+++ b/connectivity/source/inc/dbase/DDriver.hxx
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index fb3ed77e7048..7dcc6608cb84 100644..100755
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -84,13 +84,13 @@ namespace connectivity
ONDXPageList m_aCollector; // Pool von nicht mehr benoetigten Seiten
ONDXPagePtr m_aRoot, // Wurzel des b+ Baums
m_aCurLeaf; // aktuelles Blatt
- USHORT m_nCurNode; // Position des aktuellen Knoten
+ sal_uInt16 m_nCurNode; // Position des aktuellen Knoten
sal_uInt32 m_nPageCount,
m_nRootPage;
ODbaseTable* m_pTable;
- BOOL m_bUseCollector : 1; // Verwenden des GarbageCollectors
+ sal_Bool m_bUseCollector : 1; // Verwenden des GarbageCollectors
::rtl::OUString getCompletePath();
void closeImpl();
@@ -124,31 +124,31 @@ namespace connectivity
sal_uInt32 GetRootPos() {return m_nRootPage;}
sal_uInt32 GetPageCount() {return m_nPageCount;}
- BOOL IsText() const {return m_aHeader.db_keytype == 0;}
- USHORT GetMaxNodes() const {return m_aHeader.db_maxkeys;}
+ sal_Bool IsText() const {return m_aHeader.db_keytype == 0;}
+ sal_uInt16 GetMaxNodes() const {return m_aHeader.db_maxkeys;}
- virtual BOOL Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
- virtual BOOL Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
- virtual BOOL Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
- virtual BOOL Find(sal_uInt32 nRec, const ORowSetValue& rValue);
+ virtual sal_Bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
+ virtual sal_Bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
+ virtual sal_Bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
+ virtual sal_Bool Find(sal_uInt32 nRec, const ORowSetValue& rValue);
void createINFEntry();
- BOOL CreateImpl();
- BOOL DropImpl();
+ sal_Bool CreateImpl();
+ sal_Bool DropImpl();
DECLARE_SERVICE_INFO();
protected:
- ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, BOOL bLoad = FALSE);
+ ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, sal_Bool bLoad = sal_False);
void Collect(ONDXPage*);
ONDXPagePtr getRoot();
sal_Bool isUnique() const { return m_IsUnique; }
- BOOL UseCollector() const {return m_bUseCollector;}
+ sal_Bool UseCollector() const {return m_bUseCollector;}
// Tree operationen
void Insert(ONDXPagePtr aCurPage, ONDXNode& rNode);
- void Release(BOOL bSave = TRUE);
- BOOL ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
+ void Release(sal_Bool bSave = sal_True);
+ sal_Bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
};
SvStream& operator << (SvStream &rStream, ODbaseIndex&);
diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx
index 136c49a1f574..a38b137b95a4 100644..100755
--- a/connectivity/source/inc/dbase/DIndexColumns.hxx
+++ b/connectivity/source/inc/dbase/DIndexColumns.hxx
@@ -49,7 +49,7 @@ namespace connectivity
ODbaseIndexColumns( ODbaseIndex* _pIndex,
::osl::Mutex& _rMutex,
const TStringVector &_rVector)
- : sdbcx::OCollection(*_pIndex,_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+ : sdbcx::OCollection(*_pIndex,_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
, m_pIndex(_pIndex)
{}
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index a6c4308a35e2..ec98734053a9 100644..100755
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -48,14 +48,14 @@ namespace connectivity
ODbaseIndex* m_pIndex;
ONDXPagePtr m_aRoot,
m_aCurLeaf;
- USHORT m_nCurNode;
+ sal_uInt16 m_nCurNode;
protected:
- ULONG Find(BOOL bFirst);
- ULONG GetCompare(BOOL bFirst);
- ULONG GetLike(BOOL bFirst);
- ULONG GetNull(BOOL bFirst);
- ULONG GetNotNull(BOOL bFirst);
+ sal_uIntPtr Find(sal_Bool bFirst);
+ sal_uIntPtr GetCompare(sal_Bool bFirst);
+ sal_uIntPtr GetLike(sal_Bool bFirst);
+ sal_uIntPtr GetNull(sal_Bool bFirst);
+ sal_uIntPtr GetNotNull(sal_Bool bFirst);
ONDXKey* GetFirstKey(ONDXPage* pPage,
const file::OOperand& rKey);
@@ -76,8 +76,8 @@ namespace connectivity
}
virtual ~OIndexIterator();
- ULONG First();
- ULONG Next();
+ sal_uIntPtr First();
+ sal_uIntPtr Next();
};
}
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
index 7de170c1ca4c..2e693765cad4 100644..100755
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -31,9 +31,7 @@
#include <rtl/ref.hxx>
#include <tools/stream.hxx>
-#ifndef _VECTOR_
#include <vector>
-#endif
#endif // _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx
index bde6e63526da..a0dceffe9434 100644..100755
--- a/connectivity/source/inc/dbase/DIndexes.hxx
+++ b/connectivity/source/inc/dbase/DIndexes.hxx
@@ -51,7 +51,7 @@ namespace connectivity
virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
public:
ODbaseIndexes(ODbaseTable* _pTable, ::osl::Mutex& _rMutex,
- const TStringVector &_rVector) : ODbaseIndexes_BASE(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+ const TStringVector &_rVector) : ODbaseIndexes_BASE(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
, m_pTable(_pTable)
{}
diff --git a/connectivity/source/inc/dbase/DPreparedStatement.hxx b/connectivity/source/inc/dbase/DPreparedStatement.hxx
index 52bbaf73bb8c..52bbaf73bb8c 100644..100755
--- a/connectivity/source/inc/dbase/DPreparedStatement.hxx
+++ b/connectivity/source/inc/dbase/DPreparedStatement.hxx
diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx
index d5a05e946dcf..d5a05e946dcf 100644..100755
--- a/connectivity/source/inc/dbase/DResultSet.hxx
+++ b/connectivity/source/inc/dbase/DResultSet.hxx
diff --git a/connectivity/source/inc/dbase/DStatement.hxx b/connectivity/source/inc/dbase/DStatement.hxx
index 8029cf9ed79a..8029cf9ed79a 100644..100755
--- a/connectivity/source/inc/dbase/DStatement.hxx
+++ b/connectivity/source/inc/dbase/DStatement.hxx
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index ba41c10c8df7..7ca7ee62c0e5 100644..100755
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -69,26 +69,26 @@ namespace connectivity
private:
struct DBFHeader { /* Kopfsatz-Struktur */
DBFType db_typ; /* Dateityp */
- BYTE db_aedat[3]; /* Datum der letzen Aenderung */
+ sal_uInt8 db_aedat[3]; /* Datum der letzen Aenderung */
/* JJ MM TT */
sal_uInt32 db_anz; /* Anzahl der Saetze */
- USHORT db_kopf; /* laenge Kopfsatz-Struktur */
- USHORT db_slng; /* laenge der Daten-Saetze */
- BYTE db_frei[20]; /* reserviert */
+ sal_uInt16 db_kopf; /* laenge Kopfsatz-Struktur */
+ sal_uInt16 db_slng; /* laenge der Daten-Saetze */
+ sal_uInt8 db_frei[20]; /* reserviert */
};
struct DBFColumn { /* Feldbezeichner */
- BYTE db_fnm[11]; /* Feldname */
- BYTE db_typ; /* Feldtyp */
- UINT32 db_adr; /* Feldadresse */
- BYTE db_flng; /* Feldlaenge */
- BYTE db_dez; /* Dezimalstellen fuer N */
- BYTE db_frei2[14]; /* reserviert */
+ sal_uInt8 db_fnm[11]; /* Feldname */
+ sal_uInt8 db_typ; /* Feldtyp */
+ sal_uInt32 db_adr; /* Feldadresse */
+ sal_uInt8 db_flng; /* Feldlaenge */
+ sal_uInt8 db_dez; /* Dezimalstellen fuer N */
+ sal_uInt8 db_frei2[14]; /* reserviert */
};
struct DBFMemoHeader
{
DBFMemoType db_typ; /* Dateityp */
- UINT32 db_next; /* naechster freier Block */
- USHORT db_size; /* Blockgroesse: dBase 3 fest */
+ sal_uInt32 db_next; /* naechster freier Block */
+ sal_uInt16 db_size; /* Blockgroesse: dBase 3 fest */
};
::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset
@@ -108,15 +108,15 @@ namespace connectivity
void fillColumns();
String createTempFile();
void copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos);
- BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
- BOOL CreateMemoFile(const INetURLObject& aFile);
- BOOL HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;}
- BOOL ReadMemoHeader();
- BOOL ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable);
-
- BOOL WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr);
- BOOL WriteBuffer();
- BOOL UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+ sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
+ sal_Bool CreateMemoFile(const INetURLObject& aFile);
+ sal_Bool HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;}
+ sal_Bool ReadMemoHeader();
+ sal_Bool ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable);
+
+ sal_Bool WriteMemo(ORowSetValue& aVariable, sal_uIntPtr& rBlockNr);
+ sal_Bool WriteBuffer();
+ sal_Bool UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> isUniqueByColumnName(sal_Int32 _nColumnPos);
void AllocBuffer();
@@ -162,19 +162,19 @@ namespace connectivity
// XRename
virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
- BOOL DropImpl();
- BOOL CreateImpl();
+ sal_Bool DropImpl();
+ sal_Bool CreateImpl();
- virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
- virtual BOOL DeleteRow(const OSQLColumns& _rCols);
- virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+ virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+ virtual sal_Bool DeleteRow(const OSQLColumns& _rCols);
+ virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
virtual void dropColumn(sal_Int32 _nPos);
static String getEntry(file::OConnection* _pConnection,const ::rtl::OUString& _sURL );
- static BOOL Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes );
+ static sal_Bool Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes );
virtual void refreshHeader();
diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx
index 91ed713fe0b9..91ed713fe0b9 100644..100755
--- a/connectivity/source/inc/dbase/DTables.hxx
+++ b/connectivity/source/inc/dbase/DTables.hxx
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 97808ff7d838..c075ee322f3f 100644..100755
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -51,14 +51,14 @@ namespace connectivity
class ONDXKey : public ONDXKey_BASE
{
friend class ONDXNode;
- UINT32 nRecord; /* Satzzeiger */
+ sal_uInt32 nRecord; /* Satzzeiger */
ORowSetValue xValue; /* Schluesselwert */
public:
- ONDXKey(UINT32 nRec=0);
- ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec);
- ONDXKey(const rtl::OUString& aStr, UINT32 nRec = 0);
- ONDXKey(double aVal, UINT32 nRec = 0);
+ ONDXKey(sal_uInt32 nRec=0);
+ ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec);
+ ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec = 0);
+ ONDXKey(double aVal, sal_uInt32 nRec = 0);
inline ONDXKey(const ONDXKey& rKey);
@@ -67,21 +67,21 @@ namespace connectivity
virtual const ORowSetValue& getValue() const;
- UINT32 GetRecord() const { return nRecord; }
- void setRecord(UINT32 _nRec) { nRecord = _nRec; }
+ sal_uInt32 GetRecord() const { return nRecord; }
+ void setRecord(sal_uInt32 _nRec) { nRecord = _nRec; }
void ResetRecord() { nRecord = 0; }
- BOOL operator == (const ONDXKey& rKey) const;
- BOOL operator != (const ONDXKey& rKey) const;
- BOOL operator < (const ONDXKey& rKey) const;
- BOOL operator <= (const ONDXKey& rKey) const;
- BOOL operator > (const ONDXKey& rKey) const;
- BOOL operator >= (const ONDXKey& rKey) const;
+ sal_Bool operator == (const ONDXKey& rKey) const;
+ sal_Bool operator != (const ONDXKey& rKey) const;
+ sal_Bool operator < (const ONDXKey& rKey) const;
+ sal_Bool operator <= (const ONDXKey& rKey) const;
+ sal_Bool operator > (const ONDXKey& rKey) const;
+ sal_Bool operator >= (const ONDXKey& rKey) const;
- BOOL Load (SvFileStream& rStream, BOOL bText);
- BOOL Write(SvFileStream& rStream, BOOL bText);
+ sal_Bool Load (SvFileStream& rStream, sal_Bool bText);
+ sal_Bool Write(SvFileStream& rStream, sal_Bool bText);
- static BOOL IsText(sal_Int32 eType);
+ static sal_Bool IsText(sal_Int32 eType);
private:
StringCompare Compare(const ONDXKey& rKey) const;
@@ -101,18 +101,18 @@ namespace connectivity
friend SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
friend SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
- UINT32 nPagePos; // Position in der Indexdatei
+ sal_uInt32 nPagePos; // Position in der Indexdatei
public:
- ONDXPagePtr(UINT32 nPos = 0):nPagePos(nPos){}
+ ONDXPagePtr(sal_uInt32 nPos = 0):nPagePos(nPos){}
ONDXPagePtr(const ONDXPagePtr& rRef);
ONDXPagePtr(ONDXPage* pRefPage);
ONDXPagePtr& operator=(const ONDXPagePtr& rRef);
ONDXPagePtr& operator=(ONDXPage* pPageRef);
- UINT32 GetPagePos() const {return nPagePos;}
- BOOL HasPage() const {return nPagePos != 0;}
+ sal_uInt32 GetPagePos() const {return nPagePos;}
+ sal_Bool HasPage() const {return nPagePos != 0;}
// sal_Bool Is() const { return isValid(); }
};
//==================================================================
@@ -125,9 +125,9 @@ namespace connectivity
friend SvStream& operator << (SvStream &rStream, const ONDXPage&);
friend SvStream& operator >> (SvStream &rStream, ONDXPage&);
- UINT32 nPagePos; // Position in der Indexdatei
- BOOL bModified : 1;
- USHORT nCount;
+ sal_uInt32 nPagePos; // Position in der Indexdatei
+ sal_Bool bModified : 1;
+ sal_uInt16 nCount;
ONDXPagePtr aParent, // VaterSeite
aChild; // Zeiger auf rechte ChildPage
@@ -136,33 +136,33 @@ namespace connectivity
public:
// Knoten Operationen
- USHORT Count() const {return nCount;}
+ sal_uInt16 Count() const {return nCount;}
- BOOL Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0);
- BOOL Insert(USHORT nIndex, ONDXNode& rNode);
- BOOL Append(ONDXNode& rNode);
- BOOL Delete(USHORT);
- void Remove(USHORT);
- void Release(BOOL bSave = TRUE);
- void ReleaseFull(BOOL bSave = TRUE);
+ sal_Bool Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0);
+ sal_Bool Insert(sal_uInt16 nIndex, ONDXNode& rNode);
+ sal_Bool Append(ONDXNode& rNode);
+ sal_Bool Delete(sal_uInt16);
+ void Remove(sal_uInt16);
+ void Release(sal_Bool bSave = sal_True);
+ void ReleaseFull(sal_Bool bSave = sal_True);
// Aufteilen und Zerlegen
ONDXNode Split(ONDXPage& rPage);
- void Merge(USHORT nParentNodePos, ONDXPagePtr xPage);
+ void Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage);
// Zugriffsoperationen
- ONDXNode& operator[] (USHORT nPos);
- const ONDXNode& operator[] (USHORT nPos) const;
+ ONDXNode& operator[] (sal_uInt16 nPos);
+ const ONDXNode& operator[] (sal_uInt16 nPos) const;
- BOOL IsRoot() const;
- BOOL IsLeaf() const;
- BOOL IsModified() const;
- BOOL HasParent();
- BOOL HasChild() const;
+ sal_Bool IsRoot() const;
+ sal_Bool IsLeaf() const;
+ sal_Bool IsModified() const;
+ sal_Bool HasParent();
+ sal_Bool HasChild() const;
- BOOL IsFull() const;
+ sal_Bool IsFull() const;
- UINT32 GetPagePos() const {return nPagePos;}
+ sal_uInt32 GetPagePos() const {return nPagePos;}
ONDXPagePtr& GetChild(ODbaseIndex* pIndex = 0);
// Parent braucht nicht nachgeladen zu werden
@@ -174,8 +174,8 @@ namespace connectivity
void SetChild(ONDXPagePtr aCh);
void SetParent(ONDXPagePtr aPa);
- USHORT Search(const ONDXKey& rSearch);
- USHORT Search(const ONDXPage* pPage);
+ sal_uInt16 Search(const ONDXKey& rSearch);
+ sal_uInt16 Search(const ONDXPage* pPage);
void SearchAndReplace(const ONDXKey& rSearch, ONDXKey& rReplace);
protected:
@@ -184,11 +184,11 @@ namespace connectivity
virtual void QueryDelete();
- void SetModified(BOOL bMod) {bModified = bMod;}
- void SetPagePos(UINT32 nPage) {nPagePos = nPage;}
+ void SetModified(sal_Bool bMod) {bModified = bMod;}
+ void SetPagePos(sal_uInt32 nPage) {nPagePos = nPage;}
- BOOL Find(const ONDXKey&); // rek. Abstieg
- USHORT FindPos(const ONDXKey& rKey) const;
+ sal_Bool Find(const ONDXKey&); // rek. Abstieg
+ sal_uInt16 FindPos(const ONDXKey& rKey) const;
#if OSL_DEBUG_LEVEL > 1
void PrintPage();
@@ -200,11 +200,11 @@ namespace connectivity
SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
- inline BOOL ONDXPage::IsRoot() const {return !aParent.Is();}
- inline BOOL ONDXPage::IsLeaf() const {return !aChild.HasPage();}
- inline BOOL ONDXPage::IsModified() const {return bModified;}
- inline BOOL ONDXPage::HasParent() {return aParent.Is();}
- inline BOOL ONDXPage::HasChild() const {return aChild.HasPage();}
+ inline sal_Bool ONDXPage::IsRoot() const {return !aParent.Is();}
+ inline sal_Bool ONDXPage::IsLeaf() const {return !aChild.HasPage();}
+ inline sal_Bool ONDXPage::IsModified() const {return bModified;}
+ inline sal_Bool ONDXPage::HasParent() {return aParent.Is();}
+ inline sal_Bool ONDXPage::HasChild() const {return aChild.HasPage();}
inline ONDXPagePtr ONDXPage::GetParent() {return aParent;}
inline void ONDXPage::SetParent(ONDXPagePtr aPa = ONDXPagePtr())
@@ -240,7 +240,7 @@ namespace connectivity
:aChild(aPagePtr),aKey(rKey) {}
// verweist der Knoten auf eine Seite
- BOOL HasChild() const {return aChild.HasPage();}
+ sal_Bool HasChild() const {return aChild.HasPage();}
// Ist ein Index angegeben, kann gegebenfalls die Seite nachgeladen werden
ONDXPagePtr& GetChild(ODbaseIndex* pIndex = NULL, ONDXPage* = NULL);
@@ -257,14 +257,14 @@ namespace connectivity
//==================================================================
// inline implementation
//==================================================================
-// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec)
+// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
// : ONDXKey_BASE(eType)
// , nRecord(nRec),xValue(rVal)
// {
// }
-// inline ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
+// inline ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec)
// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
// ,nRecord(nRec)
// {
@@ -272,14 +272,14 @@ namespace connectivity
// xValue = aStr;
// }
-// inline ONDXKey::ONDXKey(double aVal, UINT32 nRec)
+// inline ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE)
// ,nRecord(nRec)
// ,xValue(aVal)
// {
// }
-// inline ONDXKey::ONDXKey(UINT32 nRec)
+// inline ONDXKey::ONDXKey(sal_uInt32 nRec)
// :nRecord(nRec)
// {
// }
@@ -302,29 +302,29 @@ namespace connectivity
return *this;
}
- inline BOOL ONDXKey::operator == (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator == (const ONDXKey& rKey) const
{
if(&rKey == this)
return sal_True;
return Compare(rKey) == COMPARE_EQUAL;
}
- inline BOOL ONDXKey::operator != (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator != (const ONDXKey& rKey) const
{
return !operator== (rKey);
}
- inline BOOL ONDXKey::operator < (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator < (const ONDXKey& rKey) const
{
return Compare(rKey) == COMPARE_LESS;
}
- inline BOOL ONDXKey::operator > (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator > (const ONDXKey& rKey) const
{
return Compare(rKey) == COMPARE_GREATER;
}
- inline BOOL ONDXKey::operator <= (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator <= (const ONDXKey& rKey) const
{
return !operator > (rKey);
}
- inline BOOL ONDXKey::operator >= (const ONDXKey& rKey) const
+ inline sal_Bool ONDXKey::operator >= (const ONDXKey& rKey) const
{
return !operator< (rKey);
}
diff --git a/connectivity/source/inc/diagnose_ex.h b/connectivity/source/inc/diagnose_ex.h
index 52043001c0bb..52043001c0bb 100644..100755
--- a/connectivity/source/inc/diagnose_ex.h
+++ b/connectivity/source/inc/diagnose_ex.h
diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx
index 49afc2d7ef02..49afc2d7ef02 100644..100755
--- a/connectivity/source/inc/file/FCatalog.hxx
+++ b/connectivity/source/inc/file/FCatalog.hxx
diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx
index 1d73de5924e3..9f95ea72b8cd 100644..100755
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -50,7 +50,7 @@ namespace connectivity
OColumns( OFileTable* _pTable,
::osl::Mutex& _rMutex,
const TStringVector &_rVector
- ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+ ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
,m_pTable(_pTable)
{}
};
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index 244d8055b4a8..244d8055b4a8 100644..100755
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx
index bf4db7268912..bf4db7268912 100644..100755
--- a/connectivity/source/inc/file/FDatabaseMetaData.hxx
+++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx
index 4133e61e1b3d..4133e61e1b3d 100644..100755
--- a/connectivity/source/inc/file/FDateFunctions.hxx
+++ b/connectivity/source/inc/file/FDateFunctions.hxx
diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx
index 337f8488bbd0..337f8488bbd0 100644..100755
--- a/connectivity/source/inc/file/FDriver.hxx
+++ b/connectivity/source/inc/file/FDriver.hxx
diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx
index f98cdb7a2642..f98cdb7a2642 100644..100755
--- a/connectivity/source/inc/file/FNumericFunctions.hxx
+++ b/connectivity/source/inc/file/FNumericFunctions.hxx
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 79cfd67eda3c..08125b1b9d8d 100644..100755
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -68,7 +68,7 @@ namespace connectivity
void checkAndResizeParameters(sal_Int32 parameterIndex);
void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x);
- UINT32 AddParameter(connectivity::OSQLParseNode * pParameter,
+ sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol);
void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes);
void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable);
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 2701985ca4d3..11c7c124dfa3 100644..100755
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -151,13 +151,13 @@ namespace connectivity
void construct();
sal_Bool evaluate();
- BOOL ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
- INT32 nOffset = 1,
- BOOL bEvaluate = TRUE,
- BOOL bRetrieveData = TRUE);
+ sal_Bool ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
+ sal_Int32 nOffset = 1,
+ sal_Bool bEvaluate = sal_True,
+ sal_Bool bRetrieveData = sal_True);
OKeyValue* GetOrderbyKeyValue(OValueRefRow& _rRow);
- BOOL IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;}
+ sal_Bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;}
// return true when the select statement is "select count(*) from table"
inline sal_Bool isCount() const { return m_bIsCount; }
@@ -172,7 +172,7 @@ namespace connectivity
using OResultSet_BASE::rBHelper;
- BOOL Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, BOOL bRetrieveData);
+ sal_Bool Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData);
virtual sal_Bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex);
// OPropertyArrayUsageHelper
@@ -285,7 +285,7 @@ namespace connectivity
// special methods
inline sal_Int32 mapColumn(sal_Int32 column);
- virtual BOOL OpenImpl();
+ virtual sal_Bool OpenImpl();
virtual void doTableSpecials(const OSQLTable& _xTable);
inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; }
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index e4824f5044e3..e4824f5044e3 100644..100755
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index b1b5b3bdf465..de7807079ab7 100644..100755
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -135,8 +135,8 @@ namespace connectivity
void GetAssignValues();
void SetAssignValue(const String& aColumnName,
const String& aValue,
- BOOL bSetNull = FALSE,
- UINT32 nParameter=SQL_NO_PARAMETER);
+ sal_Bool bSetNull = sal_False,
+ sal_uInt32 nParameter=SQL_NO_PARAMETER);
void ParseAssignValues( const ::std::vector< String>& aColumnNameList,
connectivity::OSQLParseNode* pRow_Value_Constructor_Elem,xub_StrLen nIndex);
diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx
index 6b3a6bc88c3e..6b3a6bc88c3e 100644..100755
--- a/connectivity/source/inc/file/FStringFunctions.hxx
+++ b/connectivity/source/inc/file/FStringFunctions.hxx
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index 687f96bb60bf..23a1086234f9 100644..100755
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -86,9 +86,9 @@ namespace connectivity
virtual sal_Bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData) = 0;
::rtl::Reference<OSQLColumns> getTableColumns() const {return m_aColumns;}
- virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
- virtual BOOL DeleteRow(const OSQLColumns& _rCols);
- virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+ virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+ virtual sal_Bool DeleteRow(const OSQLColumns& _rCols);
+ virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
virtual void dropColumn(sal_Int32 _nPos);
// refresh the header of file based tables to see changes done by someone
diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx
index e85fd51102bd..711d3ad88be4 100644..100755
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -47,7 +47,7 @@ namespace connectivity
virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
public:
OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
- const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+ const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
,m_xMetaData(_rMetaData)
{}
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index 60eb3bfae559..386807c05391 100644..100755
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -82,9 +82,9 @@ namespace connectivity
void dispose();
void start(OSQLParseNode* pSQLParseNode);
void clean();
- virtual BOOL hasRestriction() const;
- virtual BOOL hasFunctions() const;
- inline BOOL evaluateRestriction() { return m_aInterpreter->start(); }
+ virtual sal_Bool hasRestriction() const;
+ virtual sal_Bool hasFunctions() const;
+ inline sal_Bool evaluateRestriction() { return m_aInterpreter->start(); }
void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping);
void setOrigColumns(const OFileColumns& rCols);
virtual OOperandAttr* createOperandAttr(sal_Int32 _nPos,
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index ce489a34832d..ce489a34832d 100644..100755
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 95bdd48eda56..8a09061d3781 100644..100755
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -110,7 +110,7 @@ namespace connectivity
inline void startSelection(ORowSetValueDecoratorRef& _rVal)
{
- return evaluateSelection(m_rCompiler->m_aCodeList,_rVal);
+ evaluateSelection(m_rCompiler->m_aCodeList,_rVal);
}
diff --git a/connectivity/source/inc/file/filedllapi.hxx b/connectivity/source/inc/file/filedllapi.hxx
index ac826dc1040e..ac826dc1040e 100644..100755
--- a/connectivity/source/inc/file/filedllapi.hxx
+++ b/connectivity/source/inc/file/filedllapi.hxx
diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx
index cd4ace069420..cd4ace069420 100644..100755
--- a/connectivity/source/inc/file/quotedstring.hxx
+++ b/connectivity/source/inc/file/quotedstring.hxx
diff --git a/connectivity/source/inc/flat/ECatalog.hxx b/connectivity/source/inc/flat/ECatalog.hxx
index 18bf218e2c28..18bf218e2c28 100644..100755
--- a/connectivity/source/inc/flat/ECatalog.hxx
+++ b/connectivity/source/inc/flat/ECatalog.hxx
diff --git a/connectivity/source/inc/flat/EColumns.hxx b/connectivity/source/inc/flat/EColumns.hxx
index 63adc8fffbb4..63adc8fffbb4 100644..100755
--- a/connectivity/source/inc/flat/EColumns.hxx
+++ b/connectivity/source/inc/flat/EColumns.hxx
diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index 423e625f3cfd..23c4d4006d47 100644..100755
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -39,6 +39,7 @@ namespace connectivity
class OFlatConnection : public file::OConnection
{
private:
+ sal_Int32 m_nMaxRowsToScan;
sal_Bool m_bHeaderLine; // column names in first row
sal_Unicode m_cFieldDelimiter; // look at the name
sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter
@@ -56,6 +57,7 @@ namespace connectivity
inline sal_Unicode getStringDelimiter() const { return m_cStringDelimiter; }
inline sal_Unicode getDecimalDelimiter() const { return m_cDecimalDelimiter; }
inline sal_Unicode getThousandDelimiter() const { return m_cThousandDelimiter;}
+ inline sal_Int32 getMaxRowsToScan() const { return m_nMaxRowsToScan;}
// XServiceInfo
DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
index 14400139acf3..14400139acf3 100644..100755
--- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx
+++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx
index 617b4fe47c21..617b4fe47c21 100644..100755
--- a/connectivity/source/inc/flat/EDriver.hxx
+++ b/connectivity/source/inc/flat/EDriver.hxx
diff --git a/connectivity/source/inc/flat/EPreparedStatement.hxx b/connectivity/source/inc/flat/EPreparedStatement.hxx
index 16ab510838f2..16ab510838f2 100644..100755
--- a/connectivity/source/inc/flat/EPreparedStatement.hxx
+++ b/connectivity/source/inc/flat/EPreparedStatement.hxx
diff --git a/connectivity/source/inc/flat/EResultSet.hxx b/connectivity/source/inc/flat/EResultSet.hxx
index 9bafb5d9ecd0..9bafb5d9ecd0 100644..100755
--- a/connectivity/source/inc/flat/EResultSet.hxx
+++ b/connectivity/source/inc/flat/EResultSet.hxx
diff --git a/connectivity/source/inc/flat/EStatement.hxx b/connectivity/source/inc/flat/EStatement.hxx
index c38a7874a101..c38a7874a101 100644..100755
--- a/connectivity/source/inc/flat/EStatement.hxx
+++ b/connectivity/source/inc/flat/EStatement.hxx
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index 24b6ba412b59..59d7dfb354c6 100644..100755
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -34,6 +34,7 @@
#include "connectivity/CommonTools.hxx"
#include <tools/urlobj.hxx>
#include "file/quotedstring.hxx"
+#include <unotools/syslocale.hxx>
namespace connectivity
{
@@ -66,8 +67,11 @@ namespace connectivity
bool m_bNeedToReadLine;
private:
void fillColumns(const ::com::sun::star::lang::Locale& _aLocale);
- BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
+ sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
sal_Bool readLine(sal_Int32& _rnCurrentPos);
+ void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,xub_StrLen& nStartPosFirstLine,xub_StrLen& nStartPosFirstLine2
+ ,sal_Int32& io_nType,sal_Int32& io_nPrecisions,sal_Int32& io_nScales,String& o_sTypeName
+ ,const sal_Unicode cDecimalDelimiter,const sal_Unicode cThousandDelimiter,const CharClass& aCharClass);
public:
virtual void refreshColumns();
diff --git a/connectivity/source/inc/flat/ETables.hxx b/connectivity/source/inc/flat/ETables.hxx
index 818dbc8b38e4..818dbc8b38e4 100644..100755
--- a/connectivity/source/inc/flat/ETables.hxx
+++ b/connectivity/source/inc/flat/ETables.hxx
diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
index f46e19c022fd..f46e19c022fd 100644..100755
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ b/connectivity/source/inc/hsqldb/HCatalog.hxx
diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
index 5078e3566bfe..5078e3566bfe 100644..100755
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ b/connectivity/source/inc/hsqldb/HColumns.hxx
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index f86fdb9f4432..f86fdb9f4432 100644..100755
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index 2ef4164899c7..2ef4164899c7 100644..100755
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.h b/connectivity/source/inc/hsqldb/HStorageAccess.h
index 01d42a8f38f5..01d42a8f38f5 100644..100755
--- a/connectivity/source/inc/hsqldb/HStorageAccess.h
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.h
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index 079d8c7d0ec7..079d8c7d0ec7 100644..100755
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx
index 5f94b03617da..5f94b03617da 100644..100755
--- a/connectivity/source/inc/hsqldb/HStorageMap.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
index ef11cc13a4df..ef11cc13a4df 100644..100755
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
index 377868453b6e..377868453b6e 100644..100755
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.hxx
diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx
index aff601e33bd8..aff601e33bd8 100644..100755
--- a/connectivity/source/inc/hsqldb/HTools.hxx
+++ b/connectivity/source/inc/hsqldb/HTools.hxx
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
index f5df521ade33..f5df521ade33 100644..100755
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ b/connectivity/source/inc/hsqldb/HUser.hxx
diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx
index 0626c92e903c..0626c92e903c 100644..100755
--- a/connectivity/source/inc/hsqldb/HUsers.hxx
+++ b/connectivity/source/inc/hsqldb/HUsers.hxx
diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx
index 495c63e437cd..495c63e437cd 100644..100755
--- a/connectivity/source/inc/hsqldb/HView.hxx
+++ b/connectivity/source/inc/hsqldb/HView.hxx
diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx
index a8d9b83c7b17..a8d9b83c7b17 100644..100755
--- a/connectivity/source/inc/hsqldb/HViews.hxx
+++ b/connectivity/source/inc/hsqldb/HViews.hxx
diff --git a/connectivity/source/inc/hsqldb/StorageFileAccess.h b/connectivity/source/inc/hsqldb/StorageFileAccess.h
index c99a16f6df61..c99a16f6df61 100644..100755
--- a/connectivity/source/inc/hsqldb/StorageFileAccess.h
+++ b/connectivity/source/inc/hsqldb/StorageFileAccess.h
diff --git a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
index 2c635de5a12d..2c635de5a12d 100644..100755
--- a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
+++ b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
diff --git a/connectivity/source/inc/internalnode.hxx b/connectivity/source/inc/internalnode.hxx
index 08a29151623d..08a29151623d 100644..100755
--- a/connectivity/source/inc/internalnode.hxx
+++ b/connectivity/source/inc/internalnode.hxx
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index fc6661c27eaa..fc6661c27eaa 100644..100755
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx
index 4aeacbe7b62d..4aeacbe7b62d 100644..100755
--- a/connectivity/source/inc/java/GlobalRef.hxx
+++ b/connectivity/source/inc/java/GlobalRef.hxx
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index fb4cb6588635..fb4cb6588635 100644..100755
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx
index 20837abf136d..20837abf136d 100644..100755
--- a/connectivity/source/inc/java/io/InputStream.hxx
+++ b/connectivity/source/inc/java/io/InputStream.hxx
diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx
index 0e0a3e3e8f59..0e0a3e3e8f59 100644..100755
--- a/connectivity/source/inc/java/io/Reader.hxx
+++ b/connectivity/source/inc/java/io/Reader.hxx
diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx
index 68b6d9adfe0f..68b6d9adfe0f 100644..100755
--- a/connectivity/source/inc/java/lang/Boolean.hxx
+++ b/connectivity/source/inc/java/lang/Boolean.hxx
diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx
index 69af774a380d..69af774a380d 100644..100755
--- a/connectivity/source/inc/java/lang/Class.hxx
+++ b/connectivity/source/inc/java/lang/Class.hxx
diff --git a/connectivity/source/inc/java/lang/Exception.hxx b/connectivity/source/inc/java/lang/Exception.hxx
index 5e4111a54c6e..5e4111a54c6e 100644..100755
--- a/connectivity/source/inc/java/lang/Exception.hxx
+++ b/connectivity/source/inc/java/lang/Exception.hxx
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index 1fb37bd2cc23..1fb37bd2cc23 100644..100755
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx
index 273109fd67f0..273109fd67f0 100644..100755
--- a/connectivity/source/inc/java/lang/String.hxx
+++ b/connectivity/source/inc/java/lang/String.hxx
diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx
index 09b047ddf1ba..09b047ddf1ba 100644..100755
--- a/connectivity/source/inc/java/lang/Throwable.hxx
+++ b/connectivity/source/inc/java/lang/Throwable.hxx
diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx
index 86cd9d57f9bd..86cd9d57f9bd 100644..100755
--- a/connectivity/source/inc/java/math/BigDecimal.hxx
+++ b/connectivity/source/inc/java/math/BigDecimal.hxx
diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx
index ecfd94799513..ecfd94799513 100644..100755
--- a/connectivity/source/inc/java/sql/Array.hxx
+++ b/connectivity/source/inc/java/sql/Array.hxx
diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx
index da44418533c1..da44418533c1 100644..100755
--- a/connectivity/source/inc/java/sql/Blob.hxx
+++ b/connectivity/source/inc/java/sql/Blob.hxx
diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx
index 1269af2543bf..1269af2543bf 100644..100755
--- a/connectivity/source/inc/java/sql/CallableStatement.hxx
+++ b/connectivity/source/inc/java/sql/CallableStatement.hxx
diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx
index 1b861eeebed7..1b861eeebed7 100644..100755
--- a/connectivity/source/inc/java/sql/Clob.hxx
+++ b/connectivity/source/inc/java/sql/Clob.hxx
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index 899e89b86afc..899e89b86afc 100644..100755
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx
index 4985aa244eb6..4985aa244eb6 100644..100755
--- a/connectivity/source/inc/java/sql/ConnectionLog.hxx
+++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx
diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
index 04e85349440e..04e85349440e 100644..100755
--- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
+++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx
index 4e4b9e8ab7e3..4e4b9e8ab7e3 100644..100755
--- a/connectivity/source/inc/java/sql/Driver.hxx
+++ b/connectivity/source/inc/java/sql/Driver.hxx
diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index 3b54087b7e9e..3b54087b7e9e 100644..100755
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index f621f9ce2869..f621f9ce2869 100644..100755
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx
index 749b57a1db51..749b57a1db51 100644..100755
--- a/connectivity/source/inc/java/sql/PreparedStatement.hxx
+++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx
diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx
index f7410d46e2c8..f7410d46e2c8 100644..100755
--- a/connectivity/source/inc/java/sql/Ref.hxx
+++ b/connectivity/source/inc/java/sql/Ref.hxx
diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index 272661bdf30d..272661bdf30d 100644..100755
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/ResultSet.hxx
diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
index e859afee76de..e859afee76de 100644..100755
--- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
+++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx
index 21822162ef5f..21822162ef5f 100644..100755
--- a/connectivity/source/inc/java/sql/SQLException.hxx
+++ b/connectivity/source/inc/java/sql/SQLException.hxx
diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx
index c77c0e9f6ee9..c77c0e9f6ee9 100644..100755
--- a/connectivity/source/inc/java/sql/SQLWarning.hxx
+++ b/connectivity/source/inc/java/sql/SQLWarning.hxx
diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx
index f7cf48e3e3ee..f7cf48e3e3ee 100644..100755
--- a/connectivity/source/inc/java/sql/Timestamp.hxx
+++ b/connectivity/source/inc/java/sql/Timestamp.hxx
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index 1efaa76a861b..1efaa76a861b 100644..100755
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
diff --git a/connectivity/source/inc/java/util/Date.hxx b/connectivity/source/inc/java/util/Date.hxx
index d7be97f33519..d7be97f33519 100644..100755
--- a/connectivity/source/inc/java/util/Date.hxx
+++ b/connectivity/source/inc/java/util/Date.hxx
diff --git a/connectivity/source/inc/java/util/Property.hxx b/connectivity/source/inc/java/util/Property.hxx
index b31961b7e46f..b31961b7e46f 100644..100755
--- a/connectivity/source/inc/java/util/Property.hxx
+++ b/connectivity/source/inc/java/util/Property.hxx
diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx
index 42e884619163..42e884619163 100644..100755
--- a/connectivity/source/inc/mysql/YCatalog.hxx
+++ b/connectivity/source/inc/mysql/YCatalog.hxx
diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx
index 85c3b3b5eb7b..85c3b3b5eb7b 100644..100755
--- a/connectivity/source/inc/mysql/YColumns.hxx
+++ b/connectivity/source/inc/mysql/YColumns.hxx
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index 770afe34702e..770afe34702e 100644..100755
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx
index e5b44479ee14..e5b44479ee14 100644..100755
--- a/connectivity/source/inc/mysql/YTable.hxx
+++ b/connectivity/source/inc/mysql/YTable.hxx
diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index 7a3d62afa48f..7a3d62afa48f 100644..100755
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx
index 145fffc7a815..145fffc7a815 100644..100755
--- a/connectivity/source/inc/mysql/YUser.hxx
+++ b/connectivity/source/inc/mysql/YUser.hxx
diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx
index c7d71a897c67..c7d71a897c67 100644..100755
--- a/connectivity/source/inc/mysql/YUsers.hxx
+++ b/connectivity/source/inc/mysql/YUsers.hxx
diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx
index 038acfe5353b..038acfe5353b 100644..100755
--- a/connectivity/source/inc/mysql/YViews.hxx
+++ b/connectivity/source/inc/mysql/YViews.hxx
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index 2310a2e9352b..2310a2e9352b 100644..100755
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index c5dbe644705b..c5dbe644705b 100644..100755
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
index 08d4f91f3a94..08d4f91f3a94 100644..100755
--- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 1ae6042ca04f..1ae6042ca04f 100644..100755
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/odbc/ODefs3.hxx b/connectivity/source/inc/odbc/ODefs3.hxx
index 4eec4e8157c4..4eec4e8157c4 100644..100755
--- a/connectivity/source/inc/odbc/ODefs3.hxx
+++ b/connectivity/source/inc/odbc/ODefs3.hxx
diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx
index 7b28a196ee72..7b28a196ee72 100644..100755
--- a/connectivity/source/inc/odbc/ODriver.hxx
+++ b/connectivity/source/inc/odbc/ODriver.hxx
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index 33633d1e5696..bd53c4b55308 100644..100755
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -30,7 +30,7 @@
#ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_
#define _CONNECTIVITY_OFUNCTIONDEFS_HXX_
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
#ifdef _MSC_VER
#pragma warning(push)
diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx
index fc61134bae74..fc61134bae74 100644..100755
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ b/connectivity/source/inc/odbc/OFunctions.hxx
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 8c413555b17a..8c413555b17a 100644..100755
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index bbb39209496e..bbb39209496e 100644..100755
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 213db25288dc..213db25288dc 100644..100755
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 3532156e7d94..3532156e7d94 100644..100755
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index 7f48373e22f4..7f48373e22f4 100644..100755
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
diff --git a/connectivity/source/inc/odbc/odbcbasedllapi.hxx b/connectivity/source/inc/odbc/odbcbasedllapi.hxx
index e533ecdcdfd9..e533ecdcdfd9 100644..100755
--- a/connectivity/source/inc/odbc/odbcbasedllapi.hxx
+++ b/connectivity/source/inc/odbc/odbcbasedllapi.hxx
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index f9cce49cd62d..f9cce49cd62d 100644..100755
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
diff --git a/connectivity/source/inc/resource/adabas_res.hrc b/connectivity/source/inc/resource/adabas_res.hrc
index a5911dcd0e98..a5911dcd0e98 100644..100755
--- a/connectivity/source/inc/resource/adabas_res.hrc
+++ b/connectivity/source/inc/resource/adabas_res.hrc
diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc
index 717e194ca3a4..717e194ca3a4 100644..100755
--- a/connectivity/source/inc/resource/ado_res.hrc
+++ b/connectivity/source/inc/resource/ado_res.hrc
diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc
index e71901814140..e71901814140 100644..100755
--- a/connectivity/source/inc/resource/calc_res.hrc
+++ b/connectivity/source/inc/resource/calc_res.hrc
diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc
index ac7cb89a630e..ac7cb89a630e 100644..100755
--- a/connectivity/source/inc/resource/common_res.hrc
+++ b/connectivity/source/inc/resource/common_res.hrc
diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc
index 981f5a89b4df..981f5a89b4df 100644..100755
--- a/connectivity/source/inc/resource/conn_shared_res.hrc
+++ b/connectivity/source/inc/resource/conn_shared_res.hrc
diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc
index d4b31e614ced..d4b31e614ced 100644..100755
--- a/connectivity/source/inc/resource/dbase_res.hrc
+++ b/connectivity/source/inc/resource/dbase_res.hrc
diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc
index ebe7170beb96..ebe7170beb96 100644..100755
--- a/connectivity/source/inc/resource/evoab2_res.hrc
+++ b/connectivity/source/inc/resource/evoab2_res.hrc
diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc
index bbc451920ef4..bbc451920ef4 100644..100755
--- a/connectivity/source/inc/resource/file_res.hrc
+++ b/connectivity/source/inc/resource/file_res.hrc
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc
index 640ed8f5ce81..640ed8f5ce81 100644..100755
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ b/connectivity/source/inc/resource/hsqldb_res.hrc
diff --git a/connectivity/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc
index ff2c483f0948..ff2c483f0948 100644..100755
--- a/connectivity/source/inc/resource/jdbc_log.hrc
+++ b/connectivity/source/inc/resource/jdbc_log.hrc
diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc
index b03eecdb2b90..b03eecdb2b90 100644..100755
--- a/connectivity/source/inc/resource/kab_res.hrc
+++ b/connectivity/source/inc/resource/kab_res.hrc
diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc
index 74d64aa28ad8..74d64aa28ad8 100644..100755
--- a/connectivity/source/inc/resource/macab_res.hrc
+++ b/connectivity/source/inc/resource/macab_res.hrc
diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc
index 01e93ae17fd5..01e93ae17fd5 100644..100755
--- a/connectivity/source/inc/resource/mozab_res.hrc
+++ b/connectivity/source/inc/resource/mozab_res.hrc
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index aaac66c20539..aaac66c20539 100644..100755
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx
index 87ab6e783337..87ab6e783337 100644..100755
--- a/connectivity/source/inc/sqlscan.hxx
+++ b/connectivity/source/inc/sqlscan.hxx
diff --git a/connectivity/source/manager/exports.dxp b/connectivity/source/manager/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/manager/exports.dxp
+++ b/connectivity/source/manager/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk
index 52ec191ec836..4880407952f6 100644..100755
--- a/connectivity/source/manager/makefile.mk
+++ b/connectivity/source/manager/makefile.mk
@@ -76,4 +76,10 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : target.mk
+ALLTAR : $(MISC)/sdbc2.component
+$(MISC)/sdbc2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ sdbc2.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt sdbc2.component
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index e541cc2f5dec..e541cc2f5dec 100644..100755
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index 2bd22dd6cf68..2bd22dd6cf68 100644..100755
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index 136f9f754660..5dfaf0441b14 100644..100755
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -37,7 +37,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
//==========================================================================
//= registration
@@ -52,38 +51,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const
}
//---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey)
-{
-
-
- sal_Bool bReturn = sal_False;
-
- try
- {
- ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
- sMainKeyName += ::drivermanager::OSDBCDriverManager::getImplementationName_static();
- sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
- Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName);
- if (xMainKey.is())
- {
- Sequence< ::rtl::OUString > sServices(::drivermanager::OSDBCDriverManager::getSupportedServiceNames_static());
- const ::rtl::OUString* pBegin = sServices.getConstArray();
- const ::rtl::OUString* pEnd = pBegin + sServices.getLength();
- for (;pBegin != pEnd ; ++pBegin)
- xMainKey->createKey(*pBegin);
- bReturn = sal_True;
- }
- }
- catch(InvalidRegistryException&)
- {
- }
- catch(InvalidValueException&)
- {
- }
- return bReturn;
-}
-
-//---------------------------------------------------------------------------------------
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
{
void* pRet = NULL;
diff --git a/connectivity/source/manager/sdbc.mxp.map b/connectivity/source/manager/sdbc.mxp.map
index 14e33ebafb65..431725adbbec 100644..100755
--- a/connectivity/source/manager/sdbc.mxp.map
+++ b/connectivity/source/manager/sdbc.mxp.map
@@ -1,5 +1,4 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
__mh_dylib_header
___builtin_delete
diff --git a/connectivity/source/manager/sdbc2.component b/connectivity/source/manager/sdbc2.component
new file mode 100755
index 000000000000..6cce2b1d9fde
--- /dev/null
+++ b/connectivity/source/manager/sdbc2.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.sdbc.OSDBCDriverManager">
+ <service name="com.sun.star.sdbc.DriverManager"/>
+ </implementation>
+</component>
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 91a12b73f1cd..cff8c5d93fd9 100644..100755
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -32,7 +32,9 @@
#include "connectivity/PColumn.hxx"
#include "connectivity/dbtools.hxx"
#include "TConnection.hxx"
+
#include <comphelper/types.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::comphelper;
using namespace connectivity;
@@ -152,7 +154,7 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe
_rxResMetaData->getColumnType( _nColumnPos ),
_rxResMetaData->isAutoIncrement( _nColumnPos ),
_rxResMetaData->isCurrency( _nColumnPos ),
- _rxDBMetaData->storesMixedCaseQuotedIdentifiers()
+ _rxDBMetaData->supportsMixedCaseQuotedIdentifiers()
);
pColumn->setTableName( ::dbtools::composeTableName( _rxDBMetaData,
_rxResMetaData->getCatalogName( _nColumnPos ),
@@ -190,38 +192,85 @@ void OParseColumn::construct()
// -----------------------------------------------------------------------------
::cppu::IPropertyArrayHelper & SAL_CALL OParseColumn::getInfoHelper()
{
- OSL_ENSURE( !isNew(), "OParseColumn::OOrderColumn: a *new* OrderColumn?" );
+ OSL_ENSURE( !isNew(), "OParseColumn::getInfoHelper: a *new* ParseColumn?" );
return *OParseColumn_PROP::getArrayHelper();
}
+
// -----------------------------------------------------------------------------
-OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn
- ,sal_Bool _bCase
- ,sal_Bool _bAscending)
- : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))
- , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
- , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)))
- , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)))
- , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))
- , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))
- , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
- , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))
- , getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)))
- , sal_False
- , getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))
- , _bCase
- )
- , m_bAscending(_bAscending)
+namespace
+{
+ ::rtl::OUString lcl_getColumnTableName( const Reference< XPropertySet >& i_parseColumn )
+ {
+ ::rtl::OUString sColumnTableName;
+ try
+ {
+ OSL_VERIFY( i_parseColumn->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_TABLENAME ) ) >>= sColumnTableName );
+ }
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
+ return sColumnTableName;
+ }
+}
+
+// -----------------------------------------------------------------------------
+OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, const ::rtl::OUString& i_rOriginatingTableName,
+ sal_Bool _bCase, sal_Bool _bAscending )
+ : connectivity::sdbcx::OColumn(
+ getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),
+ getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))),
+ getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))),
+ getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))),
+ getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))),
+ getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))),
+ getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))),
+ getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))),
+ getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))),
+ sal_False,
+ getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))),
+ _bCase
+ )
+ ,m_bAscending(_bAscending)
+ ,m_sTableName( i_rOriginatingTableName )
{
construct();
}
+
+// -----------------------------------------------------------------------------
+OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, sal_Bool _bCase, sal_Bool _bAscending )
+ : connectivity::sdbcx::OColumn(
+ getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),
+ getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))),
+ getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))),
+ getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))),
+ getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))),
+ getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))),
+ getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))),
+ getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))),
+ getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))),
+ sal_False,
+ getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))),
+ _bCase
+ )
+ ,m_bAscending(_bAscending)
+ ,m_sTableName( lcl_getColumnTableName( _xColumn ) )
+{
+ construct();
+}
+
// -------------------------------------------------------------------------
OOrderColumn::~OOrderColumn()
{
}
+
// -------------------------------------------------------------------------
void OOrderColumn::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING),PROPERTY_ID_ISASCENDING,0,&m_bAscending, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING,
+ PropertyAttribute::READONLY, const_cast< sal_Bool* >( &m_bAscending ), ::getCppuType( reinterpret_cast< sal_Bool* >( NULL ) ) );
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME,
+ PropertyAttribute::READONLY, const_cast< ::rtl::OUString* >( &m_sTableName ), ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
}
// -----------------------------------------------------------------------------
::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const
@@ -231,17 +280,14 @@ void OOrderColumn::construct()
// -----------------------------------------------------------------------------
::cppu::IPropertyArrayHelper & SAL_CALL OOrderColumn::getInfoHelper()
{
- OSL_ENSURE( !isNew(), "OOrderColumn::OOrderColumn: a *new* OrderColumn?" );
+ OSL_ENSURE( !isNew(), "OOrderColumn::getInfoHelper: a *new* OrderColumn?" );
return *OOrderColumn_PROP::getArrayHelper();
}
// -----------------------------------------------------------------------------
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OOrderColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException)
{
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
- if ( m_bOrder )
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OrderColumn"));
- else
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GroupColumn"));
+ aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OrderColumn"));
return aSupported;
}
diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx
index db1f1585b7b7..db1f1585b7b7 100644..100755
--- a/connectivity/source/parse/internalnode.cxx
+++ b/connectivity/source/parse/internalnode.cxx
diff --git a/connectivity/source/parse/makefile.mk b/connectivity/source/parse/makefile.mk
index 510fbb2fc28e..510fbb2fc28e 100644..100755
--- a/connectivity/source/parse/makefile.mk
+++ b/connectivity/source/parse/makefile.mk
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 498f9aad900f..498f9aad900f 100644..100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 8a4f5e577908..8a4f5e577908 100644..100755
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 8bcf122e22de..f3f4ff179e02 100644..100755
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -94,7 +94,7 @@ namespace connectivity
OSL_PRECOND( m_xConnection.is(), "OSQLParseTreeIteratorImpl::OSQLParseTreeIteratorImpl: invalid connection!" );
m_xDatabaseMetaData = m_xConnection->getMetaData();
- m_bIsCaseSensitive = m_xDatabaseMetaData.is() && m_xDatabaseMetaData->storesMixedCaseQuotedIdentifiers();
+ m_bIsCaseSensitive = m_xDatabaseMetaData.is() && m_xDatabaseMetaData->supportsMixedCaseQuotedIdentifiers();
m_pTables.reset( new OSQLTables( m_bIsCaseSensitive ) );
m_pSubTables.reset( new OSQLTables( m_bIsCaseSensitive ) );
@@ -1911,12 +1911,12 @@ void OSQLParseTreeIterator::setOrderByColumnName(const ::rtl::OUString & rColumn
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::setOrderByColumnName" );
Reference<XPropertySet> xColumn = findColumn( rColumnName, rTableRange, false );
if ( xColumn.is() )
- m_aOrderColumns->get().push_back(new OOrderColumn(xColumn,isCaseSensitive(),bAscending));
+ m_aOrderColumns->get().push_back(new OOrderColumn( xColumn, rTableRange, isCaseSensitive(), bAscending ) );
else
{
sal_Int32 nId = rColumnName.toInt32();
if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->get().size()) )
- m_aOrderColumns->get().push_back(new OOrderColumn((m_aSelectColumns->get())[nId-1],isCaseSensitive(),bAscending));
+ m_aOrderColumns->get().push_back( new OOrderColumn( ( m_aSelectColumns->get() )[nId-1], isCaseSensitive(), bAscending ) );
}
#ifdef SQL_TEST_PARSETREEITERATOR
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 9ccad33c6c4a..9ccad33c6c4a 100644..100755
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
diff --git a/connectivity/source/parse/wrap_sqlbison.cxx b/connectivity/source/parse/wrap_sqlbison.cxx
index e58391867233..e58391867233 100644..100755
--- a/connectivity/source/parse/wrap_sqlbison.cxx
+++ b/connectivity/source/parse/wrap_sqlbison.cxx
diff --git a/connectivity/source/parse/wrap_sqlflex.cxx b/connectivity/source/parse/wrap_sqlflex.cxx
index a423977f61d3..a423977f61d3 100644..100755
--- a/connectivity/source/parse/wrap_sqlflex.cxx
+++ b/connectivity/source/parse/wrap_sqlflex.cxx
diff --git a/connectivity/source/resource/conn_error_message.src b/connectivity/source/resource/conn_error_message.src
index 7a5267f33058..7a5267f33058 100644..100755
--- a/connectivity/source/resource/conn_error_message.src
+++ b/connectivity/source/resource/conn_error_message.src
diff --git a/connectivity/source/resource/conn_log_res.src b/connectivity/source/resource/conn_log_res.src
index ea5bb9d00072..ea5bb9d00072 100644..100755
--- a/connectivity/source/resource/conn_log_res.src
+++ b/connectivity/source/resource/conn_log_res.src
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index db754477ce89..db754477ce89 100644..100755
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
diff --git a/connectivity/source/resource/makefile.mk b/connectivity/source/resource/makefile.mk
index b4944187dc2a..b4944187dc2a 100644..100755
--- a/connectivity/source/resource/makefile.mk
+++ b/connectivity/source/resource/makefile.mk
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 482e3d0f20a5..482e3d0f20a5 100644..100755
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index f49c9e4fdbeb..f49c9e4fdbeb 100644..100755
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index b620f398cc84..b620f398cc84 100644..100755
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 0d8827f8fc8d..0d8827f8fc8d 100644..100755
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index 90a83e6170e8..90a83e6170e8 100644..100755
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index 5c5bfb326ffd..5c5bfb326ffd 100644..100755
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index e05b6e43056b..e05b6e43056b 100644..100755
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index ac75c14ef778..ac75c14ef778 100644..100755
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index a6ae492de35b..a6ae492de35b 100644..100755
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 5a8baf11f62c..5a8baf11f62c 100644..100755
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index 4f12f0daa4e1..4f12f0daa4e1 100644..100755
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index 1b4a9b132c90..1b4a9b132c90 100644..100755
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 2f92e2fb55b4..2f92e2fb55b4 100644..100755
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
diff --git a/connectivity/source/sdbcx/makefile.mk b/connectivity/source/sdbcx/makefile.mk
index c036e83db58b..c036e83db58b 100644..100755
--- a/connectivity/source/sdbcx/makefile.mk
+++ b/connectivity/source/sdbcx/makefile.mk
diff --git a/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx
index 7cd445072cae..7cd445072cae 100644..100755
--- a/connectivity/source/simpledbt/charset_s.cxx
+++ b/connectivity/source/simpledbt/charset_s.cxx
diff --git a/connectivity/source/simpledbt/charset_s.hxx b/connectivity/source/simpledbt/charset_s.hxx
index aaafb15fdcc8..aaafb15fdcc8 100644..100755
--- a/connectivity/source/simpledbt/charset_s.hxx
+++ b/connectivity/source/simpledbt/charset_s.hxx
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index d3e8f52afb3a..d3e8f52afb3a 100644..100755
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx
index f08ed57b4daf..f08ed57b4daf 100644..100755
--- a/connectivity/source/simpledbt/dbtfactory.hxx
+++ b/connectivity/source/simpledbt/dbtfactory.hxx
diff --git a/connectivity/source/simpledbt/makefile.mk b/connectivity/source/simpledbt/makefile.mk
index 96bce967d33c..96bce967d33c 100644..100755
--- a/connectivity/source/simpledbt/makefile.mk
+++ b/connectivity/source/simpledbt/makefile.mk
diff --git a/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx
index 78e01e5e3cd4..78e01e5e3cd4 100644..100755
--- a/connectivity/source/simpledbt/parsenode_s.cxx
+++ b/connectivity/source/simpledbt/parsenode_s.cxx
diff --git a/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx
index 7459d1d0ceab..7459d1d0ceab 100644..100755
--- a/connectivity/source/simpledbt/parsenode_s.hxx
+++ b/connectivity/source/simpledbt/parsenode_s.hxx
diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx
index 498976a19f6d..498976a19f6d 100644..100755
--- a/connectivity/source/simpledbt/parser_s.cxx
+++ b/connectivity/source/simpledbt/parser_s.cxx
diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx
index 1658f7ae0fce..1658f7ae0fce 100644..100755
--- a/connectivity/source/simpledbt/parser_s.hxx
+++ b/connectivity/source/simpledbt/parser_s.hxx
diff --git a/connectivity/source/simpledbt/refbase.cxx b/connectivity/source/simpledbt/refbase.cxx
index d4788bbe6a3e..d4788bbe6a3e 100644..100755
--- a/connectivity/source/simpledbt/refbase.cxx
+++ b/connectivity/source/simpledbt/refbase.cxx
diff --git a/connectivity/source/simpledbt/refbase.hxx b/connectivity/source/simpledbt/refbase.hxx
index 11d2a0d54966..11d2a0d54966 100644..100755
--- a/connectivity/source/simpledbt/refbase.hxx
+++ b/connectivity/source/simpledbt/refbase.hxx
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx
index 56b211be249e..e6575e8d7560 100644..100755
--- a/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -30,7 +30,7 @@
#include "precompiled_connectivity.hxx"
#include <connectivity/virtualdbtools.hxx>
#include "staticdbtools_s.hxx"
-#include <connectivity/dbconversion.hxx>
+#include "connectivity/dbconversion.hxx"
#include <connectivity/dbtools.hxx>
#include <com/sun/star/sdb/SQLContext.hpp>
@@ -62,23 +62,23 @@ namespace connectivity
}
//----------------------------------------------------------------
- double ODataAccessStaticTools::getValue(const Reference< XColumn>& _rxVariant, const Date& rNullDate, sal_Int16 nKeyType) const
+ double ODataAccessStaticTools::getValue(const Reference< XColumn>& _rxVariant, const Date& rNullDate ) const
{
- return ::dbtools::DBTypeConversion::getValue(_rxVariant, rNullDate, nKeyType);
+ return ::dbtools::DBTypeConversion::getValue( _rxVariant, rNullDate );
}
//----------------------------------------------------------------
- ::rtl::OUString ODataAccessStaticTools::getValue(const Reference< XColumn >& _rxColumn, const Reference< XNumberFormatter >& _rxFormatter,
+ ::rtl::OUString ODataAccessStaticTools::getFormattedValue(const Reference< XColumn >& _rxColumn, const Reference< XNumberFormatter >& _rxFormatter,
const Date& _rNullDate, sal_Int32 _nKey, sal_Int16 _nKeyType) const
{
- return ::dbtools::DBTypeConversion::getValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType);
+ return ::dbtools::DBTypeConversion::getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType);
}
//----------------------------------------------------------------
- ::rtl::OUString ODataAccessStaticTools::getValue( const Reference< XPropertySet>& _rxColumn, const Reference< XNumberFormatter>& _rxFormatter,
+ ::rtl::OUString ODataAccessStaticTools::getFormattedValue( const Reference< XPropertySet>& _rxColumn, const Reference< XNumberFormatter>& _rxFormatter,
const Locale& _rLocale, const Date& _rNullDate ) const
{
- return ::dbtools::DBTypeConversion::getValue( _rxColumn, _rxFormatter, _rLocale, _rNullDate );
+ return ::dbtools::DBTypeConversion::getFormattedValue( _rxColumn, _rxFormatter, _rLocale, _rNullDate );
}
//----------------------------------------------------------------
diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx
index 497893b7cd63..c5fbf32aa310 100644..100755
--- a/connectivity/source/simpledbt/staticdbtools_s.hxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.hxx
@@ -55,11 +55,10 @@ namespace connectivity
// ------------------------------------------------
virtual double getValue(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant,
- const ::com::sun::star::util::Date& rNullDate,
- sal_Int16 nKeyType) const;
+ const ::com::sun::star::util::Date& rNullDate ) const;
// ------------------------------------------------
- virtual ::rtl::OUString getValue(
+ virtual ::rtl::OUString getFormattedValue(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
const ::com::sun::star::util::Date& _rNullDate,
@@ -67,7 +66,7 @@ namespace connectivity
sal_Int16 _nKeyType) const;
// ------------------------------------------------
- virtual ::rtl::OUString getValue(
+ virtual ::rtl::OUString getFormattedValue(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter,
const ::com::sun::star::lang::Locale& _rLocale,
diff --git a/connectivity/version.mk b/connectivity/version.mk
index fd2235cfd182..fd2235cfd182 100644..100755
--- a/connectivity/version.mk
+++ b/connectivity/version.mk
diff --git a/connectivity/workben/TT/StartTest.class b/connectivity/workben/TT/StartTest.class
index 28791c43eb9c..28791c43eb9c 100644..100755
--- a/connectivity/workben/TT/StartTest.class
+++ b/connectivity/workben/TT/StartTest.class
Binary files differ
diff --git a/connectivity/workben/TT/StartTest.java b/connectivity/workben/TT/StartTest.java
index 305f1fc4da9a..305f1fc4da9a 100644..100755
--- a/connectivity/workben/TT/StartTest.java
+++ b/connectivity/workben/TT/StartTest.java
diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx
index a994e2d6ff1c..a994e2d6ff1c 100644..100755
--- a/connectivity/workben/iniParser/main.cxx
+++ b/connectivity/workben/iniParser/main.cxx
diff --git a/connectivity/workben/iniParser/makefile.mk b/connectivity/workben/iniParser/makefile.mk
index d9ee3d0deda5..d9ee3d0deda5 100644..100755
--- a/connectivity/workben/iniParser/makefile.mk
+++ b/connectivity/workben/iniParser/makefile.mk
diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx
index 2123a22fd69a..2123a22fd69a 100644..100755
--- a/connectivity/workben/little/main.cxx
+++ b/connectivity/workben/little/main.cxx
diff --git a/connectivity/workben/little/makefile.mk b/connectivity/workben/little/makefile.mk
index 220fa91b75ab..220fa91b75ab 100644..100755
--- a/connectivity/workben/little/makefile.mk
+++ b/connectivity/workben/little/makefile.mk
diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx
index 22a062bfda97..22a062bfda97 100644..100755
--- a/connectivity/workben/skeleton/SResultSet.hxx
+++ b/connectivity/workben/skeleton/SResultSet.hxx
diff --git a/connectivity/workben/skeleton/how_to_write_a_driver.txt b/connectivity/workben/skeleton/how_to_write_a_driver.txt
index f76c1209e333..f76c1209e333 100644..100755
--- a/connectivity/workben/skeleton/how_to_write_a_driver.txt
+++ b/connectivity/workben/skeleton/how_to_write_a_driver.txt
diff --git a/connectivity/workben/testmoz/initUNO.cxx b/connectivity/workben/testmoz/initUNO.cxx
index 952ac372626f..952ac372626f 100644..100755
--- a/connectivity/workben/testmoz/initUNO.cxx
+++ b/connectivity/workben/testmoz/initUNO.cxx
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
index deca6f637ab4..deca6f637ab4 100644..100755
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
diff --git a/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk
index 7d906a2be412..7d906a2be412 100644..100755
--- a/connectivity/workben/testmoz/makefile.mk
+++ b/connectivity/workben/testmoz/makefile.mk
diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
index b05d132c1ac0..b05d132c1ac0 100644..100755
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ b/connectivity/workben/testmoz/mozthread.cxx
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index a525a2960440..3a4f5253c537 100644..100755
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -63,6 +63,8 @@ class Desktop : public Application
{
friend class UserInstall;
+ void doShutdown();
+
public:
enum BootstrapError
{
@@ -88,8 +90,8 @@ class Desktop : public Application
virtual void Init();
virtual void InitFinished();
virtual void DeInit();
- virtual BOOL QueryExit();
- virtual USHORT Exception(USHORT nError);
+ virtual sal_Bool QueryExit();
+ virtual sal_uInt16 Exception(sal_uInt16 nError);
virtual void SystemSettingsChanging( AllSettings& rSettings, Window* pFrame );
virtual void AppEvent( const ApplicationEvent& rAppEvent );
@@ -161,7 +163,7 @@ class Desktop : public Application
void StartSetup( const ::rtl::OUString& aParameters );
// Get a resource message string securely e.g. if resource cannot be retrieved return aFaultBackMsg
- ::rtl::OUString GetMsgString( USHORT nId, const ::rtl::OUString& aFaultBackMsg );
+ ::rtl::OUString GetMsgString( sal_uInt16 nId, const ::rtl::OUString& aFaultBackMsg );
// Create a error message depending on bootstrap failure code and an optional file url
::rtl::OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode,
@@ -200,7 +202,7 @@ class Desktop : public Application
sal_Bool m_bMinimized;
sal_Bool m_bInvisible;
bool m_bServicesRegistered;
- USHORT m_nAppEvents;
+ sal_uInt16 m_nAppEvents;
BootstrapError m_aBootstrapError;
BootstrapStatus m_aBootstrapStatus;
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
index 22492cd8ae88..22492cd8ae88 100644..100755
--- a/desktop/inc/deployment.hrc
+++ b/desktop/inc/deployment.hrc
diff --git a/desktop/inc/makefile.mk b/desktop/inc/makefile.mk
index 8715d814274f..8715d814274f 100644..100755
--- a/desktop/inc/makefile.mk
+++ b/desktop/inc/makefile.mk
diff --git a/desktop/inc/migration.hxx b/desktop/inc/migration.hxx
index 3319d8d7716f..3319d8d7716f 100644..100755
--- a/desktop/inc/migration.hxx
+++ b/desktop/inc/migration.hxx
diff --git a/desktop/inc/pch/precompiled_desktop.cxx b/desktop/inc/pch/precompiled_desktop.cxx
index 24d7e45f222d..24d7e45f222d 100644..100755
--- a/desktop/inc/pch/precompiled_desktop.cxx
+++ b/desktop/inc/pch/precompiled_desktop.cxx
diff --git a/desktop/inc/pch/precompiled_desktop.hxx b/desktop/inc/pch/precompiled_desktop.hxx
index 6baa50c69781..6baa50c69781 100644..100755
--- a/desktop/inc/pch/precompiled_desktop.hxx
+++ b/desktop/inc/pch/precompiled_desktop.hxx
diff --git a/desktop/os2/source/applauncher/launcher.cxx b/desktop/os2/source/applauncher/launcher.cxx
index 2a1a0e779b60..2a1a0e779b60 100644..100755
--- a/desktop/os2/source/applauncher/launcher.cxx
+++ b/desktop/os2/source/applauncher/launcher.cxx
diff --git a/desktop/os2/source/applauncher/launcher.hxx b/desktop/os2/source/applauncher/launcher.hxx
index 651098ef7382..651098ef7382 100644..100755
--- a/desktop/os2/source/applauncher/launcher.hxx
+++ b/desktop/os2/source/applauncher/launcher.hxx
diff --git a/desktop/os2/source/applauncher/makefile.mk b/desktop/os2/source/applauncher/makefile.mk
index bf71b57c2fdf..bf71b57c2fdf 100644..100755
--- a/desktop/os2/source/applauncher/makefile.mk
+++ b/desktop/os2/source/applauncher/makefile.mk
diff --git a/desktop/os2/source/applauncher/officeloader.cxx b/desktop/os2/source/applauncher/officeloader.cxx
index f3124acdcfeb..f3124acdcfeb 100644..100755
--- a/desktop/os2/source/applauncher/officeloader.cxx
+++ b/desktop/os2/source/applauncher/officeloader.cxx
diff --git a/desktop/os2/source/applauncher/quickstart.cxx b/desktop/os2/source/applauncher/quickstart.cxx
index b67389272f77..b67389272f77 100644..100755
--- a/desktop/os2/source/applauncher/quickstart.cxx
+++ b/desktop/os2/source/applauncher/quickstart.cxx
diff --git a/desktop/os2/source/applauncher/sbase.cxx b/desktop/os2/source/applauncher/sbase.cxx
index ed3e7cceb378..ed3e7cceb378 100644..100755
--- a/desktop/os2/source/applauncher/sbase.cxx
+++ b/desktop/os2/source/applauncher/sbase.cxx
diff --git a/desktop/os2/source/applauncher/scalc.cxx b/desktop/os2/source/applauncher/scalc.cxx
index 854f34e7f6c1..854f34e7f6c1 100644..100755
--- a/desktop/os2/source/applauncher/scalc.cxx
+++ b/desktop/os2/source/applauncher/scalc.cxx
diff --git a/desktop/os2/source/applauncher/sdraw.cxx b/desktop/os2/source/applauncher/sdraw.cxx
index b3f4bcff301a..b3f4bcff301a 100644..100755
--- a/desktop/os2/source/applauncher/sdraw.cxx
+++ b/desktop/os2/source/applauncher/sdraw.cxx
diff --git a/desktop/os2/source/applauncher/simpress.cxx b/desktop/os2/source/applauncher/simpress.cxx
index f4cf9575eb7b..f4cf9575eb7b 100644..100755
--- a/desktop/os2/source/applauncher/simpress.cxx
+++ b/desktop/os2/source/applauncher/simpress.cxx
diff --git a/desktop/os2/source/applauncher/smath.cxx b/desktop/os2/source/applauncher/smath.cxx
index d93b15d34519..d93b15d34519 100644..100755
--- a/desktop/os2/source/applauncher/smath.cxx
+++ b/desktop/os2/source/applauncher/smath.cxx
diff --git a/desktop/os2/source/applauncher/swriter.cxx b/desktop/os2/source/applauncher/swriter.cxx
index 4fc857cf2e53..4fc857cf2e53 100644..100755
--- a/desktop/os2/source/applauncher/swriter.cxx
+++ b/desktop/os2/source/applauncher/swriter.cxx
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 90f96d0176a6..a13732bc64c3 100644..100755
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,4 +1,4 @@
-dt desktop : l10n sfx2 stoc BERKELEYDB:berkeleydb sysui BOOST:boost svx xmlhelp sal unoil officecfg offuh NULL
+dt desktop : L10N:l10n sfx2 stoc BERKELEYDB:berkeleydb sysui BOOST:boost svx xmlhelp sal unoil officecfg offuh filter LIBXSLT:libxslt NULL
dt desktop usr1 - all dt_mkout NULL
dt desktop\inc nmake - all dt_inc NULL
dt desktop\prj get - all dt_prj NULL
@@ -43,3 +43,7 @@ dt desktop\registry\data\org\openoffice\Office nmake - a
dt desktop\source\registration\com\sun\star\servicetag\resources get - all sn_svctagres NULL
dt desktop\source\registration\com\sun\star\servicetag nmake - all sn_svctag NULL
dt desktop\source\registration\com\sun\star\registration nmake - all sn_regjob sn_svctag NULL
+dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL
+dt desktop\test\deployment\active nmake - all dt_test_deployment_active NULL
+dt desktop\test\deployment\boxt nmake - all dt_test_deployment_boxt NULL
+dt desktop\test\deployment\passive nmake - all dt_test_deployment_passive NULL
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 6251de274a69..442303258ff0 100644..100755
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -135,3 +135,11 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
+..\%__SRC%\misc\deployment.component %_DEST%\xml%_EXT%\deployment.component
+..\%__SRC%\misc\deploymentgui.component %_DEST%\xml%_EXT%\deploymentgui.component
+..\%__SRC%\misc\migrationoo2.component %_DEST%\xml%_EXT%\migrationoo2.component
+..\%__SRC%\misc\migrationoo3.component %_DEST%\xml%_EXT%\migrationoo3.component
+..\%__SRC%\misc\offacc.component %_DEST%\xml%_EXT%\offacc.component
+..\%__SRC%\misc\productregistration.jar.component %_DEST%\xml%_EXT%\productregistration.jar.component
+..\%__SRC%\misc\socomp.component %_DEST%\xml%_EXT%\socomp.component
+..\%__SRC%\misc\spl.component %_DEST%\xml%_EXT%\spl.component
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index e6b65d551f4e..16223914e740 100644..100755
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -35,20 +35,22 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
+
+# TODO: On Windows, test_dp_version.cxx fails due to BOOL redefinition between
+# windef.h and tools/solar.h caused by including "precompiled_desktop.hxx"; this
+# hack to temporarily disable PCH will become unnecessary with the fix for issue
+# 112600:
+CFLAGSCXX += -DDISABLE_PCH_HACK
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/test_dp_version.obj
SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
SHL1VERSIONMAP = version.map
+SHL1RPATH = NONE
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
SLOFILES = $(SHL1OBJS)
.INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
- $(TESTSHL2) $(SHL1TARGETN)
+.INCLUDE : _cppunit.mk
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx
index 20db14c4854b..480172bb5abe 100644..100755
--- a/desktop/qa/deployment_misc/test_dp_version.cxx
+++ b/desktop/qa/deployment_misc/test_dp_version.cxx
@@ -33,7 +33,10 @@
#include <cstddef>
-#include "testshl/simpleheader.hxx"
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
@@ -84,10 +87,10 @@ void Test::test() {
}
}
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
}
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/qa/deployment_misc/version.map b/desktop/qa/deployment_misc/version.map
index 7321bbca16ad..3308588ef6f8 100644..100755
--- a/desktop/qa/deployment_misc/version.map
+++ b/desktop/qa/deployment_misc/version.map
@@ -27,7 +27,7 @@
UDK_3_0_0 {
global:
- registerAllTestFunction;
+ cppunitTestPlugIn;
local:
*;
diff --git a/desktop/registry/data/org/openoffice/Office/Jobs.xcu b/desktop/registry/data/org/openoffice/Office/Jobs.xcu
index 0572d96a2a63..0572d96a2a63 100644..100755
--- a/desktop/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/desktop/registry/data/org/openoffice/Office/Jobs.xcu
diff --git a/desktop/registry/data/org/openoffice/Office/makefile.mk b/desktop/registry/data/org/openoffice/Office/makefile.mk
index 2ad8441ea3d3..2ad8441ea3d3 100644..100755
--- a/desktop/registry/data/org/openoffice/Office/makefile.mk
+++ b/desktop/registry/data/org/openoffice/Office/makefile.mk
diff --git a/desktop/scripts/basis-link b/desktop/scripts/basis-link
index 3af84201e04f..3af84201e04f 100644..100755
--- a/desktop/scripts/basis-link
+++ b/desktop/scripts/basis-link
diff --git a/desktop/scripts/makefile.mk b/desktop/scripts/makefile.mk
index 5c412f818702..5c412f818702 100644..100755
--- a/desktop/scripts/makefile.mk
+++ b/desktop/scripts/makefile.mk
diff --git a/desktop/scripts/mozwrapper.sh b/desktop/scripts/mozwrapper.sh
index 89b6415358be..89b6415358be 100644..100755
--- a/desktop/scripts/mozwrapper.sh
+++ b/desktop/scripts/mozwrapper.sh
diff --git a/desktop/scripts/odf-basis-link b/desktop/scripts/odf-basis-link
index 3af84201e04f..3af84201e04f 100644..100755
--- a/desktop/scripts/odf-basis-link
+++ b/desktop/scripts/odf-basis-link
diff --git a/desktop/scripts/sbase.sh b/desktop/scripts/sbase.sh
index e3a8ed07d5c0..e3a8ed07d5c0 100644..100755
--- a/desktop/scripts/sbase.sh
+++ b/desktop/scripts/sbase.sh
diff --git a/desktop/scripts/scalc.sh b/desktop/scripts/scalc.sh
index c9c3cde39e49..c9c3cde39e49 100644..100755
--- a/desktop/scripts/scalc.sh
+++ b/desktop/scripts/scalc.sh
diff --git a/desktop/scripts/sdraw.sh b/desktop/scripts/sdraw.sh
index 4131a2505f48..4131a2505f48 100644..100755
--- a/desktop/scripts/sdraw.sh
+++ b/desktop/scripts/sdraw.sh
diff --git a/desktop/scripts/simpress.sh b/desktop/scripts/simpress.sh
index d78ea14207c0..d78ea14207c0 100644..100755
--- a/desktop/scripts/simpress.sh
+++ b/desktop/scripts/simpress.sh
diff --git a/desktop/scripts/smaster.sh b/desktop/scripts/smaster.sh
index ed9b09d51279..ed9b09d51279 100644..100755
--- a/desktop/scripts/smaster.sh
+++ b/desktop/scripts/smaster.sh
diff --git a/desktop/scripts/smath.sh b/desktop/scripts/smath.sh
index 454fa135ff8e..454fa135ff8e 100644..100755
--- a/desktop/scripts/smath.sh
+++ b/desktop/scripts/smath.sh
diff --git a/desktop/scripts/so-basis-link b/desktop/scripts/so-basis-link
index 3af84201e04f..3af84201e04f 100644..100755
--- a/desktop/scripts/so-basis-link
+++ b/desktop/scripts/so-basis-link
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 018a587de43c..236ffd43fa3c 100644..100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -43,15 +43,14 @@ export SAL_ENABLE_FILE_LOCKING
#@# export JITC_PROCESSOR_TYPE=6
# resolve installation directory
-sd_cwd="`pwd`"
-if [ -h "$0" ] ; then
- sd_basename=`basename "$0"`
- sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
- cd "`dirname "$0"`"
- cd "`dirname "$sd_script"`"
-else
- cd "`dirname "$0"`"
-fi
+sd_cwd=`pwd`
+sd_res=$0
+while [ -h "$sd_res" ] ; do
+ cd "`dirname "$sd_res"`"
+ sd_basename=`basename "$sd_res"`
+ sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"`
+done
+cd "`dirname "$sd_res"`"
sd_prog=`pwd`
cd "$sd_cwd"
diff --git a/desktop/scripts/sweb.sh b/desktop/scripts/sweb.sh
index a365392584b6..a365392584b6 100644..100755
--- a/desktop/scripts/sweb.sh
+++ b/desktop/scripts/sweb.sh
diff --git a/desktop/scripts/swriter.sh b/desktop/scripts/swriter.sh
index 3fa48c0d3eba..3fa48c0d3eba 100644..100755
--- a/desktop/scripts/swriter.sh
+++ b/desktop/scripts/swriter.sh
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index 081e414365cf..a7566155aa0d 100644..100755
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -29,14 +29,13 @@
set -e
# resolve installation directory
-if [ -h "$0" ] ; then
- sd_basename=`basename "$0"`
- sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
- cd "`dirname "$0"`"
- cd "`dirname "$sd_script"`"
-else
- cd "`dirname "$0"`"
-fi
+sd_res=$0
+while [ -h "$sd_res" ] ; do
+ cd "`dirname "$sd_res"`"
+ sd_basename=`basename "$sd_res"`
+ sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"`
+done
+cd "`dirname "$sd_res"`"
sd_prog=`pwd`
case $1 in
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 16aec4542a23..4419ea077e98 100644..100755
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -31,15 +31,14 @@ SAL_ENABLE_FILE_LOCKING=1
export SAL_ENABLE_FILE_LOCKING
# resolve installation directory
-sd_cwd="`pwd`"
-if [ -h "$0" ] ; then
- sd_basename=`basename "$0"`
- sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
- cd "`dirname "$0"`"
- cd "`dirname "$sd_script"`"
-else
- cd "`dirname "$0"`"
-fi
+sd_cwd=`pwd`
+sd_res=$0
+while [ -h "$sd_res" ] ; do
+ cd "`dirname "$sd_res"`"
+ sd_basename=`basename "$sd_res"`
+ sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"`
+done
+cd "`dirname "$sd_res"`"
sd_prog=`pwd`
cd "$sd_cwd"
@@ -65,16 +64,27 @@ esac
#collect all bootstrap variables specified on the command line
#so that they can be passed as arguments to javaldx later on
+#Recognize the "sync" option. sync must be applied without any other
+#options except bootstrap variables or the verbose option
for arg in $@
do
case "$arg" in
-env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";;
+ sync) OPTSYNC=true;;
+ -v) VERBOSE=true;;
+ --verbose) VERBOSE=true;;
+ *) OPTOTHER=$arg;;
esac
done
+if [ "$OPTSYNC" = "true" ] && [ -z "$OPTOTHER" ]
+then
+ JVMFWKPARAMS='-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+fi
+
# extend the ld_library_path for java: javaldx checks the sofficerc for us
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
- my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+ my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
sd_platform=`uname -s`
@@ -100,6 +110,6 @@ unset XENVIRONMENT
# SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
# execute binary
-exec "$sd_prog/unopkg.bin" "$@" \
+exec "$sd_prog/unopkg.bin" "$@" "$JVMFWKPARAMS" \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
diff --git a/desktop/scripts/ure-link b/desktop/scripts/ure-link
index dd0ecb6115e8..dd0ecb6115e8 100644..100755
--- a/desktop/scripts/ure-link
+++ b/desktop/scripts/ure-link
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6651bd6349c4..82d5afd986cc 100644..100755
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -117,6 +117,7 @@
#include <osl/file.hxx>
#include <osl/process.h>
#include <osl/signal.h>
+#include <osl/thread.hxx>
#include <rtl/uuid.h>
#include <rtl/uri.hxx>
#include <unotools/pathoptions.hxx>
@@ -189,6 +190,7 @@ namespace desktop
static oslSignalHandler pSignalHandler = 0;
static sal_Bool _bCrashReporterEnabled = sal_True;
+static ::rtl::OUString getBrandSharePreregBundledPathURL();
// ----------------------------------------------------------------------------
ResMgr* Desktop::GetDesktopResManager()
@@ -227,7 +229,7 @@ ResMgr* Desktop::GetDesktopResManager()
// Get a message string securely. There is a fallback string if the resource
// is not available.
-OUString Desktop::GetMsgString( USHORT nId, const OUString& aFaultBackMsg )
+OUString Desktop::GetMsgString( sal_uInt16 nId, const OUString& aFaultBackMsg )
{
ResMgr* resMgr = GetDesktopResManager();
if ( !resMgr )
@@ -323,10 +325,8 @@ CommandLineArgs* Desktop::GetCommandLineArgs()
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !pArgs )
- {
pArgs = new CommandLineArgs;
}
- }
return pArgs;
}
@@ -555,6 +555,44 @@ static ::rtl::OUString getLastSyncFileURLFromUserInstallation()
return aTmp.makeStringAndClear();
}
+//Checks if the argument src is the folder of the help or configuration
+//backend in the prereg folder
+static bool excludeTmpFilesAndFolders(const rtl::OUString & src)
+{
+ const char helpBackend[] = "com.sun.star.comp.deployment.help.PackageRegistryBackend";
+ const char configBackend[] = "com.sun.star.comp.deployment.configuration.PackageRegistryBackend";
+ if (src.endsWithAsciiL(helpBackend, sizeof(helpBackend) - 1 )
+ || src.endsWithAsciiL(configBackend, sizeof(configBackend) - 1))
+ {
+ return true;
+ }
+ return false;
+}
+
+//If we are about to copy the contents of some special folder as determined
+//by excludeTmpFilesAndFolders, then we omit those files or folders with a name
+//derived from temporary folders.
+static bool isExcludedFileOrFolder( const rtl::OUString & name)
+{
+ char const * allowed[] = {
+ "backenddb.xml",
+ "configmgr.ini",
+ "registered_packages.db"
+ };
+
+ const unsigned int size = sizeof(allowed) / sizeof (char const *);
+ bool bExclude = true;
+ for (unsigned int i= 0; i < size; i ++)
+ {
+ ::rtl::OUString allowedName = ::rtl::OUString::createFromAscii(allowed[i]);
+ if (allowedName.equals(name))
+ {
+ bExclude = false;
+ break;
+ }
+ }
+ return bExclude;
+}
static osl::FileBase::RC copy_bundled_recursive(
const rtl::OUString& srcUnqPath,
@@ -577,6 +615,7 @@ throw()
err = osl::FileBase::E_None;
osl::Directory aDir( srcUnqPath );
+ bool bExcludeFiles = excludeTmpFilesAndFolders(srcUnqPath);
if (aDir.open() == osl::FileBase::E_None)
{
sal_Int32 n_Mask = FileStatusMask_FileURL |
@@ -612,7 +651,12 @@ throw()
// Special treatment for "lastsychronized" file. Must not be
// copied from the bundled folder!
- if ( IsDoc && aFileName.equalsAscii( pLastSyncFileName ))
+ //Also do not copy *.tmp files and *.tmp_ folders. This affects the files/folders
+ //from the help and configuration backend
+ if ( IsDoc && (aFileName.equalsAscii( pLastSyncFileName )
+ || bExcludeFiles && isExcludedFileOrFolder(aFileName)))
+ bFilter = true;
+ else if (!IsDoc && bExcludeFiles && isExcludedFileOrFolder(aFileName))
bFilter = true;
}
@@ -765,7 +809,7 @@ void Desktop::DeInit()
RTL_LOGFILE_CONTEXT_TRACE( aLog, "FINISHED WITH Destop::DeInit" );
}
-BOOL Desktop::QueryExit()
+sal_Bool Desktop::QueryExit()
{
try
{
@@ -791,7 +835,7 @@ BOOL Desktop::QueryExit()
xPropertySet->setPropertyValue( OUSTRING(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a );
}
- BOOL bExit = ( !xDesktop.is() || xDesktop->terminate() );
+ sal_Bool bExit = ( !xDesktop.is() || xDesktop->terminate() );
if ( !bExit && xPropertySet.is() )
@@ -1378,10 +1422,10 @@ void restartOnMac(bool passArguments) {
}
-USHORT Desktop::Exception(USHORT nError)
+sal_uInt16 Desktop::Exception(sal_uInt16 nError)
{
// protect against recursive calls
- static BOOL bInException = FALSE;
+ static sal_Bool bInException = sal_False;
sal_uInt16 nOldMode = Application::GetSystemWindowMode();
Application::SetSystemWindowMode( nOldMode & ~SYSTEMWINDOW_MODE_NOAUTOMODE );
@@ -1393,7 +1437,7 @@ USHORT Desktop::Exception(USHORT nError)
Application::Abort( aDoubleExceptionString );
}
- bInException = TRUE;
+ bInException = sal_True;
CommandLineArgs* pArgs = GetCommandLineArgs();
// save all modified documents ... if it's allowed doing so.
@@ -1479,8 +1523,26 @@ namespace {
}
}
-int Desktop::Main()
+struct ExecuteGlobals
+{
+ Reference < css::document::XEventListener > xGlobalBroadcaster;
+ sal_Bool bRestartRequested;
+ sal_Bool bUseSystemFileDialog;
+ std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
+ std::auto_ptr<SvtPathOptions> pPathOptions;
+
+ ExecuteGlobals()
+ : bRestartRequested( sal_False )
+ , bUseSystemFileDialog( sal_True )
+ {}
+};
+
+static ExecuteGlobals* pExecGlobals = NULL;
+
+void Desktop::Main()
{
+ pExecGlobals = new ExecuteGlobals();
+
RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Main" );
// Remember current context object
@@ -1539,14 +1601,8 @@ int Desktop::Main()
Reference< XMultiServiceFactory > xSMgr =
::comphelper::getProcessServiceFactory();
- std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
- std::auto_ptr<SvtPathOptions> pPathOptions;
-
Reference< ::com::sun::star::task::XRestartManager > xRestartManager;
- sal_Bool bRestartRequested( sal_False );
- sal_Bool bUseSystemFileDialog(sal_True);
- int nAcquireCount( 0 );
- Reference < css::document::XEventListener > xGlobalBroadcaster;
+ int nAcquireCount( 0 );
try
{
RegisterServices( xSMgr );
@@ -1574,7 +1630,7 @@ int Desktop::Main()
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ GetEnableATToolSupport" );
if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{
- BOOL bQuitApp;
+ sal_Bool bQuitApp;
if( !InitAccessBridge( true, bQuitApp ) )
if( bQuitApp )
@@ -1604,12 +1660,8 @@ int Desktop::Main()
// create title string
sal_Bool bCheckOk = sal_False;
::com::sun::star::lang::Locale aLocale;
- ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( "iso", aLocale );
- if ( !pLabelResMgr )
- {
- // no "iso" resource -> search for "ooo" resource
- pLabelResMgr = ResMgr::SearchCreateResMgr( "ooo", aLocale);
- }
+ String aMgrName = String::CreateFromAscii( "ofa" );
+ ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( "ofa", aLocale );
String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
delete pLabelResMgr;
@@ -1633,7 +1685,7 @@ int Desktop::Main()
SetDisplayName( aTitle );
SetSplashScreenProgress(35);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ create SvtPathOptions and SvtLanguageOptions" );
- pPathOptions.reset( new SvtPathOptions);
+ pExecGlobals->pPathOptions.reset( new SvtPathOptions);
SetSplashScreenProgress(40);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and SvtLanguageOptions" );
@@ -1650,7 +1702,7 @@ int Desktop::Main()
}
// create service for loadin SFX (still needed in startup)
- xGlobalBroadcaster = Reference < css::document::XEventListener >
+ pExecGlobals->xGlobalBroadcaster = Reference < css::document::XEventListener >
( xSMgr->createInstance(
DEFINE_CONST_UNICODE( "com.sun.star.frame.GlobalEventBroadcaster" ) ), UNO_QUERY );
@@ -1677,16 +1729,17 @@ int Desktop::Main()
Migration::migrateSettingsIfNecessary();
// keep a language options instance...
- pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
+ pExecGlobals->pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
- if (xGlobalBroadcaster.is())
+ if (pExecGlobals->xGlobalBroadcaster.is())
{
css::document::EventObject aEvent;
aEvent.EventName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnStartApp"));
- xGlobalBroadcaster->notifyEvent(aEvent);
+ pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
}
SetSplashScreenProgress(50);
+
// Backing Component
sal_Bool bCrashed = sal_False;
sal_Bool bExistsRecoveryData = sal_False;
@@ -1702,7 +1755,7 @@ int Desktop::Main()
}
// check whether the shutdown is caused by restart
- bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
+ pExecGlobals->bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
if ( pCmdLineArgs->IsHeadless() )
{
@@ -1710,43 +1763,38 @@ int Desktop::Main()
// headless mode relies on Application::EnableHeadlessMode()
// which does only work for VCL dialogs!!
SvtMiscOptions aMiscOptions;
- bUseSystemFileDialog = aMiscOptions.UseSystemFileDialog();
+ pExecGlobals->bUseSystemFileDialog = aMiscOptions.UseSystemFileDialog();
aMiscOptions.SetUseSystemFileDialog( sal_False );
}
- if ( !bRestartRequested )
+ if ( !pExecGlobals->bRestartRequested )
{
- if (
- (pCmdLineArgs->IsEmptyOrAcceptOnly() ) &&
+ if ((!pCmdLineArgs->WantsToLoadDocument() ) &&
(SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) &&
(!bExistsRecoveryData ) &&
(!bExistsSessionData ) &&
- (!Application::AnyInput( INPUT_APPEVENT ) )
- )
+ (!Application::AnyInput( INPUT_APPEVENT ) ))
{
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ create BackingComponent" );
- Reference< XFrame > xDesktopFrame( xSMgr->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
- if (xDesktopFrame.is())
- {
- SetSplashScreenProgress(60);
- Reference< XFrame > xBackingFrame;
- Reference< ::com::sun::star::awt::XWindow > xContainerWindow;
-
- xBackingFrame = xDesktopFrame->findFrame(OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0);
- if (xBackingFrame.is())
- xContainerWindow = xBackingFrame->getContainerWindow();
- if (xContainerWindow.is())
- {
- SetDocumentExtendedStyle(xContainerWindow);
- SetSplashScreenProgress(75);
- Sequence< Any > lArgs(1);
- lArgs[0] <<= xContainerWindow;
-
- Reference< XController > xBackingComp(
- xSMgr->createInstanceWithArguments(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule") ), lArgs),
- UNO_QUERY);
- SetSplashScreenProgress(80);
+ RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ create BackingComponent" );
+ Reference< XFrame > xDesktopFrame( xSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
+ if (xDesktopFrame.is())
+ {
+ SetSplashScreenProgress(60);
+ Reference< XFrame > xBackingFrame;
+ Reference< ::com::sun::star::awt::XWindow > xContainerWindow;
+
+ xBackingFrame = xDesktopFrame->findFrame(OUString( RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0);
+ if (xBackingFrame.is())
+ xContainerWindow = xBackingFrame->getContainerWindow();
+ if (xContainerWindow.is())
+ {
+ SetDocumentExtendedStyle(xContainerWindow);
+ SetSplashScreenProgress(75);
+ Sequence< Any > lArgs(1);
+ lArgs[0] <<= xContainerWindow;
+
+ Reference< XController > xBackingComp(
+ xSMgr->createInstanceWithArguments(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule") ), lArgs), UNO_QUERY);
if (xBackingComp.is())
{
Reference< ::com::sun::star::awt::XWindow > xBackingWin(xBackingComp, UNO_QUERY);
@@ -1788,10 +1836,9 @@ int Desktop::Main()
aOptions.SetVCLSettings();
SetSplashScreenProgress(60);
- if ( !bRestartRequested )
+ if ( !pExecGlobals->bRestartRequested )
{
Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
-
sal_Bool bTerminateRequested = sal_False;
// Preload function depends on an initialized sfx application!
@@ -1847,9 +1894,9 @@ int Desktop::Main()
new svt::JavaContext( com::sun::star::uno::getCurrentContext() ) );
// check whether the shutdown is caused by restart just before entering the Execute
- bRestartRequested = bRestartRequested || ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
+ pExecGlobals->bRestartRequested = pExecGlobals->bRestartRequested || ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
- if ( !bRestartRequested )
+ if ( !pExecGlobals->bRestartRequested )
{
// if this run of the office is triggered by restart, some additional actions should be done
DoRestartActionsIfNecessary( !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsNoQuickstart() );
@@ -1868,44 +1915,57 @@ int Desktop::Main()
FatalError( MakeStartupErrorMessage(exAnyCfg.Message) );
}
}
+ // CAUTION: you do not necessarily get here e.g. on the Mac.
+ // please put all deinitialization code into doShutdown
+ doShutdown();
+}
- if ( bRestartRequested )
+void Desktop::doShutdown()
+{
+ if( ! pExecGlobals )
+ return;
+
+ if ( pExecGlobals->bRestartRequested )
SetRestartState();
- if (xGlobalBroadcaster.is())
+ if (pExecGlobals->xGlobalBroadcaster.is())
{
css::document::EventObject aEvent;
aEvent.EventName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnCloseApp"));
- xGlobalBroadcaster->notifyEvent(aEvent);
+ pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
}
- delete pResMgr;
+ delete pResMgr, pResMgr = NULL;
// Restore old value
+ CommandLineArgs* pCmdLineArgs = GetCommandLineArgs();
if ( pCmdLineArgs->IsHeadless() )
- SvtMiscOptions().SetUseSystemFileDialog( bUseSystemFileDialog );
+ SvtMiscOptions().SetUseSystemFileDialog( pExecGlobals->bUseSystemFileDialog );
// remove temp directory
RemoveTemporaryDirectory();
FlushConfiguration();
// The acceptors in the AcceptorMap must be released (in DeregisterServices)
// with the solar mutex unlocked, to avoid deadlock:
- nAcquireCount = Application::ReleaseSolarMutex();
+ sal_uLong nAcquireCount = Application::ReleaseSolarMutex();
DeregisterServices();
Application::AcquireSolarMutex(nAcquireCount);
tools::DeInitTestToolLib();
// be sure that path/language options gets destroyed before
// UCB is deinitialized
RTL_LOGFILE_CONTEXT_TRACE( aLog, "-> dispose path/language options" );
- pLanguageOptions.reset( 0 );
- pPathOptions.reset( 0 );
+ pExecGlobals->pLanguageOptions.reset( 0 );
+ pExecGlobals->pPathOptions.reset( 0 );
RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- dispose path/language options" );
RTL_LOGFILE_CONTEXT_TRACE( aLog, "-> deinit ucb" );
::ucbhelper::ContentBroker::deinitialize();
RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- deinit ucb" );
+ sal_Bool bRR = pExecGlobals->bRestartRequested;
+ delete pExecGlobals, pExecGlobals = NULL;
+
RTL_LOGFILE_CONTEXT_TRACE( aLog, "FINISHED WITH Destop::Main" );
- if ( bRestartRequested )
+ if ( bRR )
{
restartOnMac(true);
if ( m_rSplashScreen.is() )
@@ -2037,9 +2097,9 @@ sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& r
// unfortunately this broke the QUARTZ behavior which is to always run
// in quickstart mode since Mac applications do not usually quit
// when the last document closes
- #ifndef QUARTZ
+ //#ifndef QUARTZ
if ( bQuickstart )
- #endif
+ //#endif
{
Sequence< Any > aSeq( 1 );
aSeq[0] <<= bQuickstart;
@@ -2093,18 +2153,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* )
SvtMenuOptions aMenuOpt;
hStyleSettings.SetUseImagesInMenus(aMenuOpt.GetMenuIconsState());
-
- sal_uInt16 nTabStyle = hStyleSettings.GetTabControlStyle();
- nTabStyle &= ~STYLE_TABCONTROL_SINGLELINE;
- if( aAppearanceCfg.IsSingleLineTabCtrl() )
- nTabStyle |=STYLE_TABCONTROL_SINGLELINE;
-
- nTabStyle &= ~STYLE_TABCONTROL_COLOR;
- if( aAppearanceCfg.IsColoredTabCtrl() )
- nTabStyle |= STYLE_TABCONTROL_COLOR;
-
- hStyleSettings.SetTabControlStyle(nTabStyle);
-
hStyleSettings.SetDragFullOptions( nDragFullOptions );
rSettings.SetStyleSettings ( hStyleSettings );
}
@@ -2141,9 +2189,7 @@ IMPL_LINK( Desktop, OpenClients_Impl, void*, EMPTYARG )
OfficeIPCThread::SetReady();
CloseSplashScreen();
-
CheckFirstRun( );
-
EnableOleAutomation();
if (getenv ("OOO_EXIT_POST_STARTUP"))
@@ -2536,7 +2582,7 @@ void Desktop::OpenClients()
// check if a document has been recovered - if there is one of if a document was loaded by cmdline, no default document
// should be created
Reference < XComponent > xFirst;
- BOOL bLoaded = FALSE;
+ sal_Bool bLoaded = sal_False;
CommandLineArgs* pArgs = GetCommandLineArgs();
SvtInternalOptions aInternalOptions;
@@ -2580,8 +2626,6 @@ void Desktop::OpenClients()
aHelpURLBuffer.appendAscii("&System=UNX");
#elif defined WNT
aHelpURLBuffer.appendAscii("&System=WIN");
-#elif defined MAC
- aHelpURLBuffer.appendAscii("&System=MAC");
#elif defined OS2
aHelpURLBuffer.appendAscii("&System=OS2");
#endif
@@ -2687,7 +2731,7 @@ void Desktop::OpenClients()
bCrashed ,
bExistsRecoveryData);
/* TODO we cant be shure, that at least one document could be recovered here successfully
- So we set bLoaded=TRUE to supress opening of the default document.
+ So we set bLoaded=sal_True to supress opening of the default document.
But we should make it more safe. Otherwhise we have an office without an UI ...
...
May be we can check the desktop if some documents are existing there.
@@ -3113,6 +3157,13 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
catch(const css::uno::Exception&)
{}
}
+ else if( rAppEvent.GetEvent() == "PRIVATE:DOSHUTDOWN" )
+ {
+ Desktop* pD = dynamic_cast<Desktop*>(GetpApp());
+ OSL_ENSURE( pD, "no desktop ?!?" );
+ if( pD )
+ pD->doShutdown();
+ }
}
void Desktop::OpenSplashScreen()
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index a5a161181efa..a5a161181efa 100644..100755
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 973a88357f46..973a88357f46 100644..100755
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
diff --git a/desktop/source/app/appinit.hxx b/desktop/source/app/appinit.hxx
index b4a756aa31ee..b4a756aa31ee 100644..100755
--- a/desktop/source/app/appinit.hxx
+++ b/desktop/source/app/appinit.hxx
diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx
index 287a9464793e..287a9464793e 100644..100755
--- a/desktop/source/app/appsys.cxx
+++ b/desktop/source/app/appsys.cxx
diff --git a/desktop/source/app/appsys.hxx b/desktop/source/app/appsys.hxx
index d2f13ff0aace..d2f13ff0aace 100644..100755
--- a/desktop/source/app/appsys.hxx
+++ b/desktop/source/app/appsys.hxx
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 20bad6f4504a..20bad6f4504a 100644..100755
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
diff --git a/desktop/source/app/checkinstall.cxx b/desktop/source/app/checkinstall.cxx
index c0e853d9eef5..c0e853d9eef5 100644..100755
--- a/desktop/source/app/checkinstall.cxx
+++ b/desktop/source/app/checkinstall.cxx
diff --git a/desktop/source/app/checkinstall.hxx b/desktop/source/app/checkinstall.hxx
index a4ee8c05c9ef..a4ee8c05c9ef 100644..100755
--- a/desktop/source/app/checkinstall.hxx
+++ b/desktop/source/app/checkinstall.hxx
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 6798e8ede85a..998f414c6887 100644..100755
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -146,20 +146,21 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
UNO_QUERY);
// parse command line arguments
- sal_Bool bPrintEvent = sal_False;
- sal_Bool bOpenEvent = sal_True;
- sal_Bool bViewEvent = sal_False;
- sal_Bool bStartEvent = sal_False;
- sal_Bool bPrintToEvent = sal_False;
- sal_Bool bPrinterName = sal_False;
- sal_Bool bForceOpenEvent = sal_False;
- sal_Bool bForceNewEvent = sal_False;
- sal_Bool bDisplaySpec = sal_False;
- sal_Bool bConversionEvent= sal_False;
- sal_Bool bConversionParamsEvent= sal_False;
- sal_Bool bBatchPrintEvent= sal_False;
- sal_Bool bBatchPrinterNameEvent= sal_False;
- sal_Bool bConversionOutEvent = sal_False;
+ bool bOpenEvent(true);
+ bool bPrintEvent(false);
+ bool bViewEvent(false);
+ bool bStartEvent(false);
+ bool bPrintToEvent(false);
+ bool bPrinterName(false);
+ bool bForceOpenEvent(false);
+ bool bForceNewEvent(false);
+ bool bDisplaySpec(false);
+ bool bOpenDoc(false);
+ bool bConversionEvent(false);
+ bool bConversionParamsEvent(false);
+ bool bBatchPrintEvent(false);
+ bool bBatchPrinterNameEvent(false);
+ bool bConversionOutEvent(false);
m_eArgumentCount = NONE;
@@ -191,119 +192,119 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("-n")))
{
// force new documents based on the following documents
- bForceNewEvent = sal_True;
- bOpenEvent = sal_False;
- bForceOpenEvent = sal_False;
- bPrintToEvent = sal_False;
- bPrintEvent = sal_False;
- bViewEvent = sal_False;
- bStartEvent = sal_False;
- bDisplaySpec = sal_False;
- }
- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("-o")))
- {
- // force open documents regards if they are templates or not
- bForceOpenEvent = sal_True;
- bOpenEvent = sal_False;
- bForceNewEvent = sal_False;
- bPrintToEvent = sal_False;
- bPrintEvent = sal_False;
- bViewEvent = sal_False;
- bStartEvent = sal_False;
- bDisplaySpec = sal_False;
- }
- else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("pt")))
+ bForceNewEvent = true;
+ bOpenEvent = false;
+ bForceOpenEvent = false;
+ bPrintToEvent = false;
+ bPrintEvent = false;
+ bViewEvent = false;
+ bStartEvent = false;
+ bDisplaySpec = false;
+ }
+ else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-o" )))
{
- // Print to special printer
- bPrintToEvent = sal_True;
- bPrinterName = sal_True;
- bPrintEvent = sal_False;
- bOpenEvent = sal_False;
- bForceNewEvent = sal_False;
- bViewEvent = sal_False;
- bStartEvent = sal_False;
- bDisplaySpec = sal_False;
- bForceOpenEvent = sal_False;
+ // force open documents regardless if they are templates or not
+ bForceOpenEvent = true;
+ bOpenEvent = false;
+ bForceNewEvent = false;
+ bPrintToEvent = false;
+ bPrintEvent = false;
+ bViewEvent = false;
+ bStartEvent = false;
+ bDisplaySpec = false;
}
- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("-p")))
+ else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-pt" )))
{
+ // Print to special printer
+ bPrintToEvent = true;
+ bPrinterName = true;
+ bPrintEvent = false;
+ bOpenEvent = false;
+ bForceNewEvent = false;
+ bViewEvent = false;
+ bStartEvent = false;
+ bDisplaySpec = false;
+ bForceOpenEvent = false;
+ }
+ else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-p" )))
+ {
// Print to default printer
- bPrintEvent = sal_True;
- bPrintToEvent = sal_False;
- bOpenEvent = sal_False;
- bForceNewEvent = sal_False;
- bForceOpenEvent = sal_False;
- bViewEvent = sal_False;
- bStartEvent = sal_False;
- bDisplaySpec = sal_False;
- }
- else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("view")))
- {
+ bPrintEvent = true;
+ bPrintToEvent = false;
+ bOpenEvent = false;
+ bForceNewEvent = false;
+ bForceOpenEvent = false;
+ bViewEvent = false;
+ bStartEvent = false;
+ bDisplaySpec = false;
+ }
+ else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-view" )))
+ {
// open in viewmode
- bOpenEvent = sal_False;
- bPrintEvent = sal_False;
- bPrintToEvent = sal_False;
- bForceNewEvent = sal_False;
- bForceOpenEvent = sal_False;
- bViewEvent = sal_True;
- bStartEvent = sal_False;
- bDisplaySpec = sal_False;
- }
- else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("show")))
- {
+ bOpenEvent = false;
+ bPrintEvent = false;
+ bPrintToEvent = false;
+ bForceNewEvent = false;
+ bForceOpenEvent = false;
+ bViewEvent = true;
+ bStartEvent = false;
+ bDisplaySpec = false;
+ }
+ else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-show" )))
+ {
// open in viewmode
- bOpenEvent = sal_False;
- bViewEvent = sal_False;
- bStartEvent = sal_True;
- bPrintEvent = sal_False;
- bPrintToEvent = sal_False;
- bForceNewEvent = sal_False;
- bForceOpenEvent = sal_False;
- bDisplaySpec = sal_False;
+ bOpenEvent = false;
+ bViewEvent = false;
+ bStartEvent = true;
+ bPrintEvent = false;
+ bPrintToEvent = false;
+ bForceNewEvent = false;
+ bForceOpenEvent = false;
+ bDisplaySpec = false;
}
else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("display")))
{
// set display
- bOpenEvent = sal_False;
- bPrintEvent = sal_False;
- bForceOpenEvent = sal_False;
- bPrintToEvent = sal_False;
- bForceNewEvent = sal_False;
- bViewEvent = sal_False;
- bStartEvent = sal_False;
- bDisplaySpec = sal_True;
+ bOpenEvent = false;
+ bPrintEvent = false;
+ bForceOpenEvent = false;
+ bPrintToEvent = false;
+ bForceNewEvent = false;
+ bViewEvent = false;
+ bStartEvent = false;
+ bDisplaySpec = true;
}
else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("language")))
{
- bOpenEvent = sal_False;
- bPrintEvent = sal_False;
- bForceOpenEvent = sal_False;
- bPrintToEvent = sal_False;
- bForceNewEvent = sal_False;
- bViewEvent = sal_False;
- bStartEvent = sal_False;
- bDisplaySpec = sal_False;
+ bOpenEvent = false;
+ bPrintEvent = false;
+ bForceOpenEvent = false;
+ bPrintToEvent = false;
+ bForceNewEvent = false;
+ bViewEvent = false;
+ bStartEvent = false;
+ bDisplaySpec = false;
}
else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("convert-to")))
{
- bOpenEvent = sal_False;
- bConversionEvent = sal_True;
- bConversionParamsEvent = sal_True;
+ bOpenEvent = false;
+ bConversionEvent = true;
+ bConversionParamsEvent = true;
}
else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("print-to-file")))
{
- bOpenEvent = sal_False;
- bBatchPrintEvent = sal_True;
+ bOpenEvent = false;
+ bBatchPrintEvent = true;
}
else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("printer-name")) &&
bBatchPrintEvent )
{
- bBatchPrinterNameEvent = sal_True;
+ bBatchPrinterNameEvent = true;
}
else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("outdir")) &&
(bConversionEvent || bBatchPrintEvent) )
{
- bConversionOutEvent = sal_True;
+ bConversionOutEvent = true;
}
}
else
@@ -312,24 +313,24 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
{
// first argument after "-pt" this must be the printer name
AddStringListParam_Impl( CMD_STRINGPARAM_PRINTERNAME, aArg );
- bPrinterName = sal_False;
+ bPrinterName = false;
}
else if ( bConversionParamsEvent && bConversionEvent )
{
// first argument must be the the params
AddStringListParam_Impl( CMD_STRINGPARAM_CONVERSIONPARAMS, aArg );
- bConversionParamsEvent = sal_False;
+ bConversionParamsEvent = false;
}
else if ( bBatchPrinterNameEvent && bBatchPrintEvent )
{
// first argument is the printer name
AddStringListParam_Impl( CMD_STRINGPARAM_PRINTERNAME, aArg );
- bBatchPrinterNameEvent = sal_False;
+ bBatchPrinterNameEvent = false;
}
else if ( (bConversionEvent || bBatchPrintEvent) && bConversionOutEvent )
{
AddStringListParam_Impl( CMD_STRINGPARAM_CONVERSIONOUT, aArg );
- bConversionOutEvent = sal_False;
+ bConversionOutEvent = false;
}
else
{
@@ -344,23 +345,45 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
}
// handle this argument as a filename
if ( bOpenEvent )
+ {
AddStringListParam_Impl( CMD_STRINGPARAM_OPENLIST, aArg );
+ bOpenDoc = true;
+ }
else if ( bViewEvent )
+ {
AddStringListParam_Impl( CMD_STRINGPARAM_VIEWLIST, aArg );
+ bOpenDoc = true;
+ }
else if ( bStartEvent )
+ {
AddStringListParam_Impl( CMD_STRINGPARAM_STARTLIST, aArg );
+ bOpenDoc = true;
+ }
else if ( bPrintEvent )
+ {
AddStringListParam_Impl( CMD_STRINGPARAM_PRINTLIST, aArg );
+ bOpenDoc = true;
+ }
else if ( bPrintToEvent )
+ {
AddStringListParam_Impl( CMD_STRINGPARAM_PRINTTOLIST, aArg );
+ bOpenDoc = true;
+ }
else if ( bForceNewEvent )
+ {
AddStringListParam_Impl( CMD_STRINGPARAM_FORCENEWLIST, aArg );
+ bOpenDoc = true;
+ }
else if ( bForceOpenEvent )
+ {
AddStringListParam_Impl( CMD_STRINGPARAM_FORCEOPENLIST, aArg );
- else if ( bDisplaySpec ){
+ bOpenDoc = true;
+ }
+ else if ( bDisplaySpec )
+ {
AddStringListParam_Impl( CMD_STRINGPARAM_DISPLAY, aArg );
- bDisplaySpec = sal_False; // only one display, not a list
- bOpenEvent = sal_True; // set back to standard
+ bDisplaySpec = false; // only one display, not a lsit
+ bOpenEvent = true; // set back to standard
}
else if ( bConversionEvent || bBatchPrintEvent )
AddStringListParam_Impl( CMD_STRINGPARAM_CONVERSIONLIST, aArg );
@@ -369,6 +392,9 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
}
}
}
+
+ if ( bOpenDoc )
+ m_bDocumentArgs = true;
}
void CommandLineArgs::AddStringListParam_Impl( StringParam eParam, const rtl::OUString& aParam )
@@ -509,7 +535,7 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
{
AddStringListParam_Impl( CMD_STRINGPARAM_SPLASHPIPE, oArg.copy(RTL_CONSTASCII_LENGTH("splash-pipe=")) );
}
- #ifdef MACOSX
+#ifdef MACOSX
/* #i84053# ignore -psn on Mac
Platform dependent #ifdef here is ugly, however this is currently
the only platform dependent parameter. Should more appear
@@ -520,7 +546,7 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
SetBoolParam_Impl( CMD_BOOLPARAM_PSN, sal_True );
return sal_True;
}
- #endif
+#endif
else if ( oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("infilter=")))
{
AddStringListParam_Impl( CMD_STRINGPARAM_INFILTER, oArg.copy(RTL_CONSTASCII_LENGTH("infilter=")) );
@@ -565,48 +591,56 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_WRITER );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_WRITER, sal_True );
+ m_bDocumentArgs = true;
}
else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "calc" )) == sal_True )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_CALC );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_CALC, sal_True );
+ m_bDocumentArgs = true;
}
else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "draw" )) == sal_True )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_DRAW );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_DRAW, sal_True );
+ m_bDocumentArgs = true;
}
else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "impress" )) == sal_True )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_IMPRESS );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_IMPRESS, sal_True );
+ m_bDocumentArgs = true;
}
else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "base" )) == sal_True )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_BASE );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_BASE, sal_True );
+ m_bDocumentArgs = true;
}
else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "global" )) == sal_True )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_GLOBAL );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_GLOBAL, sal_True );
+ m_bDocumentArgs = true;
}
else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "math" )) == sal_True )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_MATH );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_MATH, sal_True );
+ m_bDocumentArgs = true;
}
else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "web" )) == sal_True )
{
sal_Bool bAlreadySet = CheckGroupMembers( CMD_GRPID_MODULE, CMD_BOOLPARAM_WEB );
if ( !bAlreadySet )
SetBoolParam_Impl( CMD_BOOLPARAM_WEB, sal_True );
+ m_bDocumentArgs = true;
}
else
return sal_False;
@@ -635,12 +669,12 @@ sal_Bool CommandLineArgs::CheckGroupMembers( GroupParamId nGroupId, BoolParam nE
void CommandLineArgs::ResetParamValues()
{
int i;
-
for ( i = 0; i < CMD_BOOLPARAM_COUNT; i++ )
m_aBoolParams[i] = sal_False;
for ( i = 0; i < CMD_STRINGPARAM_COUNT; i++ )
m_aStrSetParams[i] = sal_False;
m_eArgumentCount = NONE;
+ m_bDocumentArgs = false;
}
void CommandLineArgs::SetBoolParam( BoolParam eParam, sal_Bool bNewValue )
@@ -963,6 +997,12 @@ sal_Bool CommandLineArgs::IsEmptyOrAcceptOnly() const
( ( m_eArgumentCount == ONE ) && m_aBoolParams[ CMD_BOOLPARAM_PSN ] );
}
+sal_Bool CommandLineArgs::WantsToLoadDocument() const
+{
+ osl::MutexGuard aMutexGuard( m_aMutex );
+ return m_bDocumentArgs;
+}
+
} // namespace desktop
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index f4618e8dbb3c..bd7e24a81147 100644..100755
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -39,7 +39,7 @@ namespace desktop
class CommandLineArgs
{
public:
- enum BoolParam // must be zero based!
+ enum BoolParam // must be zero based!
{
CMD_BOOLPARAM_MINIMIZED = 0,
CMD_BOOLPARAM_INVISIBLE,
@@ -99,7 +99,7 @@ class CommandLineArgs
CMD_STRINGPARAM_INFILTER,
CMD_STRINGPARAM_DISPLAY,
CMD_STRINGPARAM_LANGUAGE,
- CMD_STRINGPARAM_COUNT // must be last element!
+ CMD_STRINGPARAM_COUNT // must be last element!
};
enum GroupParamId
@@ -108,7 +108,8 @@ class CommandLineArgs
CMD_GRPID_COUNT
};
- struct Supplier {
+ struct Supplier
+ {
// Thrown from constructors and next:
class Exception {
public:
@@ -129,7 +130,7 @@ class CommandLineArgs
boost::optional< rtl::OUString > getCwdUrl() const { return m_cwdUrl; }
// generic methods to access parameter
- void SetBoolParam( BoolParam eParam, sal_Bool bNewValue );
+ void SetBoolParam( BoolParam eParam, sal_Bool bNewValue );
const rtl::OUString& GetStringParam( StringParam eParam ) const;
@@ -164,6 +165,7 @@ class CommandLineArgs
sal_Bool IsWeb() const;
sal_Bool IsVersion() const;
sal_Bool HasModuleParam() const;
+ sal_Bool WantsToLoadDocument() const;
// Access to string parameters
sal_Bool GetPortalConnectString( ::rtl::OUString& rPara) const;
@@ -184,17 +186,17 @@ class CommandLineArgs
sal_Bool GetConversionOut( ::rtl::OUString& rPara ) const;
// Special analyzed states (does not match directly to a command line parameter!)
- sal_Bool IsPrinting() const;
- sal_Bool IsEmpty() const;
- sal_Bool IsEmptyOrAcceptOnly() const;
+ sal_Bool IsPrinting() const;
+ sal_Bool IsEmpty() const;
+ sal_Bool IsEmptyOrAcceptOnly() const;
private:
enum Count { NONE, ONE, MANY };
struct GroupDefinition
{
- sal_Int32 nCount;
- BoolParam* pGroupMembers;
+ sal_Int32 nCount;
+ BoolParam* pGroupMembers;
};
// no copy and operator=
@@ -206,15 +208,16 @@ class CommandLineArgs
void ResetParamValues();
sal_Bool CheckGroupMembers( GroupParamId nGroup, BoolParam nExcludeMember ) const;
- void AddStringListParam_Impl( StringParam eParam, const rtl::OUString& aParam );
- void SetBoolParam_Impl( BoolParam eParam, sal_Bool bValue );
+ void AddStringListParam_Impl( StringParam eParam, const rtl::OUString& aParam );
+ void SetBoolParam_Impl( BoolParam eParam, sal_Bool bValue );
boost::optional< rtl::OUString > m_cwdUrl;
- sal_Bool m_aBoolParams[ CMD_BOOLPARAM_COUNT ]; // Stores boolean parameters
- rtl::OUString m_aStrParams[ CMD_STRINGPARAM_COUNT ]; // Stores string parameters
- sal_Bool m_aStrSetParams[ CMD_STRINGPARAM_COUNT ]; // Stores if string parameters are provided on cmdline
- Count m_eArgumentCount; // Number of Args
- mutable ::osl::Mutex m_aMutex;
+ sal_Bool m_aBoolParams[ CMD_BOOLPARAM_COUNT ]; // Stores boolean parameters
+ rtl::OUString m_aStrParams[ CMD_STRINGPARAM_COUNT ]; // Stores string parameters
+ sal_Bool m_aStrSetParams[ CMD_STRINGPARAM_COUNT ]; // Stores if string parameters are provided on cmdline
+ Count m_eArgumentCount; // Number of Args
+ bool m_bDocumentArgs; // A document creation/open/load arg is used
+ mutable ::osl::Mutex m_aMutex;
// static definition for groups where only one member can be true
static GroupDefinition m_pGroupDefinitions[ CMD_GRPID_COUNT ];
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 00754d91631e..00754d91631e 100644..100755
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx
index 5c92512ea1e9..5c92512ea1e9 100644..100755
--- a/desktop/source/app/cmdlinehelp.hxx
+++ b/desktop/source/app/cmdlinehelp.hxx
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index 7a6da3b8db25..7a4bf00671b2 100644..100755
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -81,7 +81,7 @@ typedef uno::Reference< lang::XMultiServiceFactory > ConfigurationProvider;
// Get a message string securely. There is a fallback string if the resource
// is not available. Adapted from Desktop::GetMsgString()
-OUString getMsgString( USHORT nId, char const * aFallBackMsg )
+OUString getMsgString( sal_uInt16 nId, char const * aFallBackMsg )
{
ResMgr* pResMgr = Desktop::GetDesktopResManager();
if ( !pResMgr || !nId )
diff --git a/desktop/source/app/configinit.hxx b/desktop/source/app/configinit.hxx
index 24fb01881396..24fb01881396 100644..100755
--- a/desktop/source/app/configinit.hxx
+++ b/desktop/source/app/configinit.hxx
diff --git a/desktop/source/app/copyright_ascii_ooo.c b/desktop/source/app/copyright_ascii_ooo.c
index 3984a81f26e5..3984a81f26e5 100644..100755
--- a/desktop/source/app/copyright_ascii_ooo.c
+++ b/desktop/source/app/copyright_ascii_ooo.c
diff --git a/desktop/source/app/copyright_ascii_sun.c b/desktop/source/app/copyright_ascii_sun.c
index c7d6e7e3c08d..c7d6e7e3c08d 100644..100755
--- a/desktop/source/app/copyright_ascii_sun.c
+++ b/desktop/source/app/copyright_ascii_sun.c
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 9c68d7b9fd2d..9c68d7b9fd2d 100644..100755
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 2f6897adf80e..98ee68685917 100644..100755
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -159,6 +159,7 @@ InfoBox INFOBOX_CMDLINEHELP
ModalDialog DLG_CMDLINEHELP
{
+ HelpID = "desktop:ModalDialog:DLG_CMDLINEHELP";
Text = "Help Message...";
Size = MAP_APPFONT(250, 365);
Border = True;
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index 2a8ed7ef628c..2a8ed7ef628c 100644..100755
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx
index b68a73cd9cf9..b68a73cd9cf9 100644..100755
--- a/desktop/source/app/desktopcontext.hxx
+++ b/desktop/source/app/desktopcontext.hxx
diff --git a/desktop/source/app/desktopresid.cxx b/desktop/source/app/desktopresid.cxx
index 0a0d23aa18be..ac8799a95a23 100644..100755
--- a/desktop/source/app/desktopresid.cxx
+++ b/desktop/source/app/desktopresid.cxx
@@ -37,7 +37,7 @@
namespace desktop
{
-DesktopResId::DesktopResId( USHORT nId ) :
+DesktopResId::DesktopResId( sal_uInt16 nId ) :
ResId( nId, *Desktop::GetDesktopResManager() )
{
}
diff --git a/desktop/source/app/desktopresid.hxx b/desktop/source/app/desktopresid.hxx
index 432c257b6b65..14d45a493f0c 100644..100755
--- a/desktop/source/app/desktopresid.hxx
+++ b/desktop/source/app/desktopresid.hxx
@@ -37,7 +37,7 @@ namespace desktop
class DesktopResId : public ResId
{
public:
- DesktopResId( USHORT nId );
+ DesktopResId( sal_uInt16 nId );
};
}
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 501fdc19bfd5..501fdc19bfd5 100644..100755
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 0fde60da603f..0fde60da603f 100644..100755
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
diff --git a/desktop/source/app/exports.dxp b/desktop/source/app/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/desktop/source/app/exports.dxp
+++ b/desktop/source/app/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index d70703103967..d70703103967 100644..100755
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index fdb229a47956..fdb229a47956 100644..100755
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx
index 5e534f2b2107..5e534f2b2107 100644..100755
--- a/desktop/source/app/lockfile.cxx
+++ b/desktop/source/app/lockfile.cxx
diff --git a/desktop/source/app/lockfile.hxx b/desktop/source/app/lockfile.hxx
index 5444714ec88c..5444714ec88c 100644..100755
--- a/desktop/source/app/lockfile.hxx
+++ b/desktop/source/app/lockfile.hxx
diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx
index 619102b70c2b..619102b70c2b 100644..100755
--- a/desktop/source/app/lockfile2.cxx
+++ b/desktop/source/app/lockfile2.cxx
diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c
index 88610ba18ef9..88610ba18ef9 100644..100755
--- a/desktop/source/app/main.c
+++ b/desktop/source/app/main.c
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index e7c30a2ca70f..e7c30a2ca70f 100644..100755
--- a/desktop/source/app/makefile.mk
+++ b/desktop/source/app/makefile.mk
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index f699463ec089..6088ee383022 100644..100755
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -844,8 +844,6 @@ void SAL_CALL OfficeIPCThread::run()
aHelpURLBuffer.appendAscii("&System=UNX");
#elif defined WNT
aHelpURLBuffer.appendAscii("&System=WIN");
-#elif defined MAC
- aHelpURLBuffer.appendAscii("&System=MAC");
#elif defined OS2
aHelpURLBuffer.appendAscii("&System=OS2");
#endif
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 765fc548788c..e50e46c280ea 100644..100755
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -123,7 +123,7 @@ class OfficeIPCThread : public osl::Thread
static void RequestsCompleted( int n = 1 );
static sal_Bool ExecuteCmdLineRequests( ProcessDocumentsRequest& );
- // return FALSE if second office
+ // return sal_False if second office
static Status EnableOfficeIPCThread();
static void DisableOfficeIPCThread();
// start dispatching events...
diff --git a/desktop/source/app/omutexmember.hxx b/desktop/source/app/omutexmember.hxx
index 175eae09fe93..175eae09fe93 100644..100755
--- a/desktop/source/app/omutexmember.hxx
+++ b/desktop/source/app/omutexmember.hxx
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index a4207ef97bfd..a4207ef97bfd 100644..100755
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
diff --git a/desktop/source/app/sofficemain.h b/desktop/source/app/sofficemain.h
index 539988834a02..539988834a02 100644..100755
--- a/desktop/source/app/sofficemain.h
+++ b/desktop/source/app/sofficemain.h
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index bc7a1219cdaa..bc7a1219cdaa 100644..100755
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
diff --git a/desktop/source/app/userinstall.hxx b/desktop/source/app/userinstall.hxx
index 6dcb5e91db41..6dcb5e91db41 100644..100755
--- a/desktop/source/app/userinstall.hxx
+++ b/desktop/source/app/userinstall.hxx
diff --git a/desktop/source/app/version.map b/desktop/source/app/version.map
index 0ffffcd58635..0ffffcd58635 100644..100755
--- a/desktop/source/app/version.map
+++ b/desktop/source/app/version.map
diff --git a/desktop/source/deployment/deployment.component b/desktop/source/deployment/deployment.component
new file mode 100755
index 000000000000..11385c7aa8d9
--- /dev/null
+++ b/desktop/source/deployment/deployment.component
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.deployment.ExtensionManager">
+ <service name="com.sun.star.comp.deployment.ExtensionManager"/>
+ <singleton name="com.sun.star.deployment.ExtensionManager"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.deployment.PackageInformationProvider">
+ <service name="com.sun.star.comp.deployment.PackageInformationProvider"/>
+ <singleton name="com.sun.star.deployment.PackageInformationProvider"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.deployment.PackageManagerFactory">
+ <service name="com.sun.star.comp.deployment.PackageManagerFactory"/>
+ <singleton name="com.sun.star.deployment.thePackageManagerFactory"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.deployment.ProgressLog">
+ <service name="com.sun.star.comp.deployment.ProgressLog"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.deployment.component.PackageRegistryBackend">
+ <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.deployment.configuration.PackageRegistryBackend">
+ <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.deployment.executable.PackageRegistryBackend">
+ <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.deployment.help.PackageRegistryBackend">
+ <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.deployment.script.PackageRegistryBackend">
+ <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.deployment.sfwk.PackageRegistryBackend">
+ <service name="com.sun.star.deployment.PackageRegistryBackend"/>
+ </implementation>
+</component>
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 0fc8b08a15b7..0fc8b08a15b7 100644..100755
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 78d4a64d3242..78d4a64d3242 100644..100755
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx
index b9b7959ccaba..16372bfbe0b9 100644..100755
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -93,27 +93,6 @@ void SAL_CALL component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-sal_Bool SAL_CALL component_writeInfo(
- lang::XMultiServiceFactory * pServiceManager,
- registry::XRegistryKey * pRegistryKey )
-{
- return component_writeInfoHelper(
- pServiceManager, pRegistryKey,
- dp_registry::backend::configuration::serviceDecl,
- dp_registry::backend::component::serviceDecl,
- dp_registry::backend::help::serviceDecl,
- dp_registry::backend::script::serviceDecl,
- dp_registry::backend::sfwk::serviceDecl,
- dp_registry::backend::executable::serviceDecl,
- dp_manager::factory::serviceDecl,
- dp_log::serviceDecl,
- dp_info::serviceDecl,
- dp_manager::serviceDecl) &&
- dp_manager::factory::singleton_entries( pRegistryKey ) &&
- dp_info::singleton_entries( pRegistryKey ) &&
- dp_manager::singleton_entries( pRegistryKey);
-}
-
void * SAL_CALL component_getFactory(
sal_Char const * pImplName,
lang::XMultiServiceFactory * pServiceManager,
diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx
index b46d9835548c..b46d9835548c 100644..100755
--- a/desktop/source/deployment/dp_xml.cxx
+++ b/desktop/source/deployment/dp_xml.cxx
diff --git a/desktop/source/deployment/gui/deploymentgui.component b/desktop/source/deployment/gui/deploymentgui.component
new file mode 100755
index 000000000000..d613f482e791
--- /dev/null
+++ b/desktop/source/deployment/gui/deploymentgui.component
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org. If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.deployment.ui.LicenseDialog">
+ <service name="com.sun.star.deployment.ui.LicenseDialog"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.deployment.ui.PackageManagerDialog">
+ <service name="com.sun.star.deployment.ui.PackageManagerDialog"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.deployment.ui.UpdateRequiredDialog">
+ <service name="com.sun.star.deployment.ui.UpdateRequiredDialog"/>
+ </implementation>
+</component>
diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx
index 8887b40a3946..1faaa9f9bae4 100644..100755
--- a/desktop/source/deployment/gui/descedit.cxx
+++ b/desktop/source/deployment/gui/descedit.cxx
@@ -61,7 +61,7 @@ void DescriptionEdit::Init()
// read-only
SetReadOnly();
// no cursor
- EnableCursor( FALSE );
+ EnableCursor( sal_False );
}
// -----------------------------------------------------------------------
diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx
index ed8b8f9c333f..ed8b8f9c333f 100644..100755
--- a/desktop/source/deployment/gui/descedit.hxx
+++ b/desktop/source/deployment/gui/descedit.hxx
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 1c57aa5b800e..1c57aa5b800e 100644..100755
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index d0ae3c468d9b..d3671fddf06f 100644..100755
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -125,6 +125,11 @@
#define RID_DLG_UPDATE_RELEASENOTES_LINK 29
#define RID_DLG_UPDATE_NOUPDATE 30
#define RID_DLG_UPDATE_VERSION 31
+#define RID_DLG_UPDATE_IGNORE 32
+#define RID_DLG_UPDATE_ENABLE 33
+#define RID_DLG_UPDATE_IGNORE_ALL 34
+#define RID_DLG_UPDATE_IGNORED_UPDATE 35
+
#define RID_DLG_UPDATEINSTALL (RID_DEPLOYMENT_GUI_START + 20)
@@ -157,6 +162,7 @@
#define RID_STR_NO_ADMIN_PRIVILEGE (RID_DEPLOYMENT_GUI_START+95)
#define RID_STR_ERROR_MISSING_DEPENDENCIES (RID_DEPLOYMENT_GUI_START+96)
#define RID_STR_ERROR_MISSING_LICENSE (RID_DEPLOYMENT_GUI_START+97)
+#define RID_STR_SHOW_LICENSE_CMD (RID_DEPLOYMENT_GUI_START+98)
#define WARNINGBOX_CONCURRENTINSTANCE (RID_DEPLOYMENT_GUI_START+100)
@@ -166,6 +172,7 @@
#define RID_WARNINGBOX_REMOVE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+104)
#define RID_WARNINGBOX_ENABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+105)
#define RID_WARNINGBOX_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106)
+#define RID_DLG_SHOW_LICENSE (RID_DEPLOYMENT_GUI_START+107)
#define RID_DLG_LICENSE RID_DEPLOYMENT_LICENSE_START
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
index 198498c4bd8c..5e766b9470cb 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
@@ -59,7 +59,7 @@ void AutoScrollEdit::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.IsA( TYPE(TextHint) ) )
{
- ULONG nId = ((const TextHint&)rHint).GetId();
+ sal_uLong nId = ((const TextHint&)rHint).GetId();
if ( nId == TEXT_HINT_VIEWSCROLLED )
{
ScrollBar* pScroll = GetVScrollBar();
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
index c49477358c1b..c49477358c1b 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
diff --git a/desktop/source/deployment/gui/dp_gui_backend.src b/desktop/source/deployment/gui/dp_gui_backend.src
index e5adb84ba596..e5adb84ba596 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_backend.src
+++ b/desktop/source/deployment/gui/dp_gui_backend.src
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 7019db610b85..7019db610b85 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index 48ef45fd15c0..48ef45fd15c0 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.src b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
index fa7465678326..e7adbce9992b 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.src
@@ -34,6 +34,7 @@
#define LOCAL_LIST_HEIGHT (6 * RSC_BS_CHARHEIGHT)
ModalDialog RID_DLG_DEPENDENCIES {
+ HelpID = "desktop:ModalDialog:RID_DLG_DEPENDENCIES";
Size = MAP_APPFONT(
(RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH +
RSC_SP_DLG_INNERBORDER_RIGHT),
@@ -52,6 +53,7 @@ ModalDialog RID_DLG_DEPENDENCIES {
NoLabel = TRUE;
};
ListBox RID_DLG_DEPENDENCIES_LIST {
+ HelpID = "desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST";
Pos = MAP_APPFONT(
RSC_SP_DLG_INNERBORDER_LEFT,
(RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT +
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index 2ea6fefff877..d8c3f77c4635 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -125,6 +125,11 @@ String RID_STR_ERROR_MISSING_LICENSE
Text [ en-US ] = "This extension is disabled because you haven't accepted the license yet.\n";
};
+String RID_STR_SHOW_LICENSE_CMD
+{
+ Text [ en-US ] = "Show license";
+};
+
// Dialog layout
// ---------------------------------------------------
// row 1 | multi line edit
@@ -175,6 +180,7 @@ String RID_STR_ERROR_MISSING_LICENSE
ModalDialog RID_DLG_LICENSE
{
+ HelpID = "desktop:ModalDialog:RID_DLG_LICENSE";
Text [ en-US ] = "Extension Software License Agreement";
Size = MAP_APPFONT(LIC_DLG_WIDTH, LIC_DLG_HEIGHT);
@@ -186,6 +192,7 @@ ModalDialog RID_DLG_LICENSE
MultiLineEdit ML_LICENSE
{
+ HelpID = "desktop:MultiLineEdit:RID_DLG_LICENSE:ML_LICENSE";
Pos = MAP_APPFONT(COL1_X, ROW1_Y);
Size = MAP_APPFONT(BODYWIDTH, ROW1_HEIGHT);
Border = TRUE;
@@ -240,6 +247,7 @@ ModalDialog RID_DLG_LICENSE
PushButton PB_LICENSE_DOWN
{
+ HelpID = "desktop:PushButton:RID_DLG_LICENSE:PB_LICENSE_DOWN";
TabStop = TRUE ;
Pos = MAP_APPFONT(COL5_X , ROW3_Y) ;
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT) ;
@@ -295,6 +303,35 @@ ModalDialog RID_DLG_LICENSE
};
+ModalDialog RID_DLG_SHOW_LICENSE
+{
+ Text [ en-US ] = "Extension Software License Agreement";
+ Size = MAP_APPFONT( 300, 200 );
+ OutputSize = TRUE;
+ SVLook = TRUE;
+ Moveable = TRUE;
+ Closeable = TRUE;
+ Sizeable = TRUE;
+
+ MultiLineEdit ML_LICENSE
+ {
+ Pos = MAP_APPFONT( 5, 5 );
+ Size = MAP_APPFONT( 300 - 10, 200 - 15 - RSC_CD_PUSHBUTTON_HEIGHT );
+ Border = TRUE;
+ VScroll = TRUE;
+ ReadOnly = TRUE;
+ };
+
+ OKButton RID_EM_BTN_CLOSE
+ {
+ TabStop = TRUE;
+ DefButton = TRUE;
+ Text [ en-US ] = "Close";
+ Pos = MAP_APPFONT( (300-RSC_CD_PUSHBUTTON_WIDTH)/2, 200 - 5 - RSC_CD_PUSHBUTTON_HEIGHT );
+ Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
+ };
+};
+
WarningBox RID_WARNINGBOX_INSTALL_EXTENSION {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 3790f273c305..f39242d9f005 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -40,8 +40,10 @@
#include "dp_gui_theextmgr.hxx"
#include "dp_gui_extensioncmdqueue.hxx"
#include "dp_misc.h"
+#include "dp_ucb.h"
#include "dp_update.hxx"
#include "dp_identifier.hxx"
+#include "dp_descriptioninfoset.hxx"
#include "vcl/ctrl.hxx"
#include "vcl/menu.hxx"
@@ -119,7 +121,8 @@ enum MENU_COMMAND
CMD_REMOVE = 1,
CMD_ENABLE,
CMD_DISABLE,
- CMD_UPDATE
+ CMD_UPDATE,
+ CMD_SHOW_LICENSE
};
class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
@@ -225,13 +228,10 @@ const Size ExtBoxWithBtns_Impl::GetMinOutputSizePixel() const
// -----------------------------------------------------------------------
void ExtBoxWithBtns_Impl::RecalcAll()
{
- ExtensionBox_Impl::RecalcAll();
-
const sal_Int32 nActive = getSelIndex();
if ( nActive != EXTENSION_LISTBOX_ENTRY_NOTFOUND )
{
- SetButtonPos( GetEntryRect( nActive ) );
SetButtonStatus( GetEntryData( nActive) );
}
else
@@ -240,6 +240,11 @@ void ExtBoxWithBtns_Impl::RecalcAll()
m_pEnableBtn->Hide();
m_pRemoveBtn->Hide();
}
+
+ ExtensionBox_Impl::RecalcAll();
+
+ if ( nActive != EXTENSION_LISTBOX_ENTRY_NOTFOUND )
+ SetButtonPos( GetEntryRect( nActive ) );
}
@@ -364,28 +369,29 @@ bool ExtBoxWithBtns_Impl::HandleTabKey( bool bReverse )
// -----------------------------------------------------------------------
MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long nPos )
{
- if ( ( nPos >= 0 ) && ( nPos < (long) getItemCount() ) )
- {
- if ( ! GetEntryData( nPos )->m_bLocked )
- {
- PopupMenu aPopup;
-
- aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) );
+ if ( nPos >= (long) getItemCount() )
+ return CMD_NONE;
- if ( GetEntryData( nPos )->m_bUser )
- {
- if ( GetEntryData( nPos )->m_eState == REGISTERED )
- aPopup.InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) );
- else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE )
- aPopup.InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) );
- }
+ PopupMenu aPopup;
- aPopup.InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) );
+ aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) );
- return (MENU_COMMAND) aPopup.Execute( this, rPos );
+ if ( ! GetEntryData( nPos )->m_bLocked )
+ {
+ if ( GetEntryData( nPos )->m_bUser )
+ {
+ if ( GetEntryData( nPos )->m_eState == REGISTERED )
+ aPopup.InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) );
+ else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE )
+ aPopup.InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) );
}
+ aPopup.InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) );
}
- return CMD_NONE;
+
+ if ( GetEntryData( nPos )->m_sLicenseText.Len() )
+ aPopup.InsertItem( CMD_SHOW_LICENSE, DialogHelper::getResourceString( RID_STR_SHOW_LICENSE_CMD ) );
+
+ return (MENU_COMMAND) aPopup.Execute( this, rPos );
}
//------------------------------------------------------------------------------
@@ -410,6 +416,12 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt )
break;
case CMD_REMOVE: m_pParent->removePackage( GetEntryData( nPos )->m_xPackage );
break;
+ case CMD_SHOW_LICENSE:
+ {
+ ShowLicenseDialog aLicenseDlg( m_pParent, GetEntryData( nPos )->m_xPackage );
+ aLicenseDlg.Execute();
+ break;
+ }
}
}
else if ( rMEvt.IsLeft() )
@@ -431,7 +443,7 @@ long ExtBoxWithBtns_Impl::Notify( NotifyEvent& rNEvt )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
KeyCode aKeyCode = pKEvt->GetKeyCode();
- USHORT nKeyCode = aKeyCode.GetCode();
+ sal_uInt16 nKeyCode = aKeyCode.GetCode();
if ( nKeyCode == KEY_TAB )
bHandled = HandleTabKey( aKeyCode.IsShift() );
@@ -558,14 +570,14 @@ DialogHelper::~DialogHelper()
}
//------------------------------------------------------------------------------
-ResId DialogHelper::getResId( USHORT nId )
+ResId DialogHelper::getResId( sal_uInt16 nId )
{
const SolarMutexGuard guard;
return ResId( nId, *DeploymentGuiResMgr::get() );
}
//------------------------------------------------------------------------------
-String DialogHelper::getResourceString( USHORT id )
+String DialogHelper::getResourceString( sal_uInt16 id )
{
// init with non-acquired solar mutex:
BrandName::get();
@@ -589,7 +601,7 @@ bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage >
//------------------------------------------------------------------------------
bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::XPackage > &xPackage,
Window *pParent,
- const USHORT nResID,
+ const sal_uInt16 nResID,
bool &bHadWarning )
{
if ( !bHadWarning && IsSharedPkgMgr( xPackage ) )
@@ -658,8 +670,8 @@ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
sMsgText.SearchAndReplaceAllAscii( "%PRODUCTNAME", BrandName::get() );
aQuery.SetMessText( sMsgText );
- USHORT nYesBtnID = aQuery.GetButtonId( 0 );
- USHORT nNoBtnID = aQuery.GetButtonId( 1 );
+ sal_uInt16 nYesBtnID = aQuery.GetButtonId( 0 );
+ sal_uInt16 nNoBtnID = aQuery.GetButtonId( 1 );
if ( nYesBtnID != BUTTONDIALOG_BUTTON_NOTFOUND )
aQuery.SetButtonText( nYesBtnID, getResourceString( RID_STR_INSTALL_FOR_ME ) );
@@ -1106,7 +1118,7 @@ IMPL_LINK( ExtMgrDialog, TimeOutHdl, Timer*, EMPTYARG )
}
if ( m_aProgressBar.IsVisible() )
- m_aProgressBar.SetValue( (USHORT) m_nProgress );
+ m_aProgressBar.SetValue( (sal_uInt16) m_nProgress );
m_aTimeoutTimer.Start();
}
@@ -1158,7 +1170,7 @@ void ExtMgrDialog::Resize()
Rectangle aNativeControlRegion, aNativeContentRegion;
if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
CTRL_STATE_ENABLED, aValue, rtl::OUString(),
- aNativeControlRegion, aNativeContentRegion ) != FALSE )
+ aNativeControlRegion, aNativeContentRegion ) != sal_False )
{
nProgressHeight = aNativeControlRegion.GetHeight();
}
@@ -1195,7 +1207,7 @@ long ExtMgrDialog::Notify( NotifyEvent& rNEvt )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
KeyCode aKeyCode = pKEvt->GetKeyCode();
- USHORT nKeyCode = aKeyCode.GetCode();
+ sal_uInt16 nKeyCode = aKeyCode.GetCode();
if ( nKeyCode == KEY_TAB )
{
@@ -1222,7 +1234,7 @@ long ExtMgrDialog::Notify( NotifyEvent& rNEvt )
}
//------------------------------------------------------------------------------
-BOOL ExtMgrDialog::Close()
+sal_Bool ExtMgrDialog::Close()
{
bool bRet = m_pManager->queryTermination();
if ( bRet )
@@ -1544,7 +1556,7 @@ IMPL_LINK( UpdateRequiredDialog, TimeOutHdl, Timer*, EMPTYARG )
}
if ( m_aProgressBar.IsVisible() )
- m_aProgressBar.SetValue( (USHORT) m_nProgress );
+ m_aProgressBar.SetValue( (sal_uInt16) m_nProgress );
m_aTimeoutTimer.Start();
}
@@ -1602,7 +1614,7 @@ void UpdateRequiredDialog::Resize()
Rectangle aNativeControlRegion, aNativeContentRegion;
if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
CTRL_STATE_ENABLED, aValue, rtl::OUString(),
- aNativeControlRegion, aNativeContentRegion ) != FALSE )
+ aNativeControlRegion, aNativeContentRegion ) != sal_False )
{
nProgressHeight = aNativeControlRegion.GetHeight();
}
@@ -1640,7 +1652,7 @@ short UpdateRequiredDialog::Execute()
//------------------------------------------------------------------------------
// VCL::Dialog
-BOOL UpdateRequiredDialog::Close()
+sal_Bool UpdateRequiredDialog::Close()
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1746,6 +1758,42 @@ void UpdateRequiredDialog::disableAllEntries()
m_aCloseBtn.SetText( m_sCloseText );
}
+//------------------------------------------------------------------------------
+// ShowLicenseDialog
+//------------------------------------------------------------------------------
+ShowLicenseDialog::ShowLicenseDialog( Window * pParent,
+ const uno::Reference< deployment::XPackage > &xPackage ) :
+ ModalDialog( pParent, DialogHelper::getResId( RID_DLG_SHOW_LICENSE ) ),
+ m_aLicenseText( this, DialogHelper::getResId( ML_LICENSE ) ),
+ m_aCloseBtn( this, DialogHelper::getResId( RID_EM_BTN_CLOSE ) )
+{
+ FreeResource();
+
+ OUString aText = xPackage->getLicenseText();
+ m_aLicenseText.SetText( aText );
+}
+
+//------------------------------------------------------------------------------
+ShowLicenseDialog::~ShowLicenseDialog()
+{}
+
+//------------------------------------------------------------------------------
+void ShowLicenseDialog::Resize()
+{
+ Size aTotalSize( GetOutputSizePixel() );
+ Size aTextSize( aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - RSC_SP_DLG_INNERBORDER_RIGHT,
+ aTotalSize.Height() - RSC_SP_DLG_INNERBORDER_TOP - 2*RSC_SP_DLG_INNERBORDER_BOTTOM
+ - m_aCloseBtn.GetSizePixel().Height() );
+
+ m_aLicenseText.SetPosSizePixel( Point( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ),
+ aTextSize );
+
+ Point aBtnPos( (aTotalSize.Width() - m_aCloseBtn.GetSizePixel().Width())/2,
+ aTotalSize.Height() - RSC_SP_DLG_INNERBORDER_BOTTOM
+ - m_aCloseBtn.GetSizePixel().Height() );
+ m_aCloseBtn.SetPosPixel( aBtnPos );
+}
+
//=================================================================================
// UpdateRequiredDialogService
//=================================================================================
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index b13adbb48051..8288d27b5e6f 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -36,6 +36,7 @@
#include "svtools/fixedhyper.hxx"
#include "svtools/prgsbar.hxx"
+#include "svtools/svmedit.hxx"
#include "osl/conditn.hxx"
#include "osl/mutex.hxx"
@@ -63,7 +64,7 @@ class DialogHelper
{
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
Dialog* m_pVCLWindow;
- ULONG m_nEventID;
+ sal_uLong m_nEventID;
bool m_bIsBusy;
public:
@@ -88,12 +89,12 @@ public:
virtual void prepareChecking() = 0;
virtual void checkEntries() = 0;
- static ResId getResId( USHORT nId );
- static String getResourceString( USHORT id );
+ static ResId getResId( sal_uInt16 nId );
+ static String getResourceString( sal_uInt16 id );
static bool IsSharedPkgMgr( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &);
static bool continueOnSharedExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &,
Window *pParent,
- const USHORT nResID,
+ const sal_uInt16 nResID,
bool &bHadWarning );
void setBusy( const bool bBusy ) { m_bIsBusy = bBusy; }
@@ -149,7 +150,7 @@ public:
virtual void Resize();
virtual long Notify( NotifyEvent& rNEvt );
- virtual BOOL Close();
+ virtual sal_Bool Close();
virtual void showProgress( bool bStart );
virtual void updateProgress( const ::rtl::OUString &rText,
@@ -221,7 +222,7 @@ public:
virtual short Execute();
virtual void Resize();
- virtual BOOL Close();
+ virtual sal_Bool Close();
virtual void showProgress( bool bStart );
virtual void updateProgress( const ::rtl::OUString &rText,
@@ -246,6 +247,20 @@ public:
};
//==============================================================================
+class ShowLicenseDialog : public ModalDialog
+{
+ MultiLineEdit m_aLicenseText;
+ OKButton m_aCloseBtn;
+
+public:
+ ShowLicenseDialog( Window * pParent,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
+ virtual ~ShowLicenseDialog();
+
+ virtual void Resize();
+};
+
+//==============================================================================
class UpdateRequiredDialogService : public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XExecutableDialog >
{
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const m_xComponentContext;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index 5233890d1da8..2d11f1175e88 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -43,6 +43,7 @@ ModelessDialog RID_DLG_EXTENSION_MANAGER
PushButton RID_EM_BTN_ADD
{
+ HelpID = "desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_ADD";
TabStop = TRUE;
Text [ en-US ] = "~Add...";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
@@ -50,6 +51,7 @@ ModelessDialog RID_DLG_EXTENSION_MANAGER
PushButton RID_EM_BTN_CHECK_UPDATES
{
+ HelpID = "desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_CHECK_UPDATES";
TabStop = TRUE;
Text [ en-US ] = "Check for ~Updates...";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
@@ -131,6 +133,7 @@ ModalDialog RID_DLG_UPDATE_REQUIRED
PushButton RID_EM_BTN_CHECK_UPDATES
{
+ HelpID = "desktop:PushButton:RID_DLG_UPDATE_REQUIRED:RID_EM_BTN_CHECK_UPDATES";
TabStop = TRUE;
Text [ en-US ] = "Check for ~Updates...";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
@@ -138,6 +141,7 @@ ModalDialog RID_DLG_UPDATE_REQUIRED
PushButton RID_EM_BTN_CLOSE
{
+ HelpID = "desktop:PushButton:RID_DLG_UPDATE_REQUIRED:RID_EM_BTN_CLOSE";
TabStop = TRUE;
DefButton = TRUE;
Text [ en-US ] = "Disable all";
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index a5f3dc60cfa0..a5f3dc60cfa0 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
index f8fd1f1b2e05..f8fd1f1b2e05 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 134593a7e5eb..17650b7a92d1 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -77,6 +77,7 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
m_sTitle = xPackage->getDisplayName();
m_sVersion = xPackage->getVersion();
m_sDescription = xPackage->getDescription();
+ m_sLicenseText = xPackage->getLicenseText();
beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
m_sPublisher = aInfo.First;
@@ -707,7 +708,7 @@ bool ExtensionBox_Impl::HandleTabKey( bool )
}
// -----------------------------------------------------------------------
-bool ExtensionBox_Impl::HandleCursorKey( USHORT nKeyCode )
+bool ExtensionBox_Impl::HandleCursorKey( sal_uInt16 nKeyCode )
{
if ( m_vEntries.empty() )
return true;
@@ -872,7 +873,7 @@ long ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
KeyCode aKeyCode = pKEvt->GetKeyCode();
- USHORT nKeyCode = aKeyCode.GetCode();
+ sal_uInt16 nKeyCode = aKeyCode.GetCode();
if ( nKeyCode == KEY_TAB )
bHandled = HandleTabKey( aKeyCode.IsShift() );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 7cdaa7483e7f..9dbbb7d33789 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -82,6 +82,7 @@ struct Entry_Impl
String m_sPublisher;
String m_sPublisherURL;
String m_sErrorText;
+ String m_sLicenseText;
Image m_aIcon;
Image m_aIconHC;
svt::FixedHyperlink *m_pPublisher;
@@ -166,7 +167,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
void SetupScrollBar();
void DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry );
bool HandleTabKey( bool bReverse );
- bool HandleCursorKey( USHORT nKeyCode );
+ bool HandleCursorKey( sal_uInt16 nKeyCode );
bool FindEntryPos( const TEntry_Impl pEntry, long nStart, long nEnd, long &nFound );
void DeleteRemoved();
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index c3457c629271..0853f9995d09 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -358,14 +358,6 @@ void SAL_CALL component_getImplementationEnvironment(
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-sal_Bool SAL_CALL component_writeInfo(
- lang::XMultiServiceFactory * pServiceManager,
- registry::XRegistryKey * pRegistryKey )
-{
- return component_writeInfoHelper(
- pServiceManager, pRegistryKey, dp_gui::serviceDecl, dp_gui::licenseDecl, dp_gui::updateDecl );
-}
-
void * SAL_CALL component_getFactory(
sal_Char const * pImplName,
lang::XMultiServiceFactory * pServiceManager,
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index 50eb9c393f45..e056e81fa395 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -55,7 +55,7 @@ struct BrandName : public ::rtl::StaticWithInit<const ::rtl::OUString, BrandName
class DpGuiResId : public ResId
{
public:
- DpGuiResId( USHORT nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {}
+ DpGuiResId( sal_uInt16 nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {}
};
} // namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index cac4ae05f65e..8adda1f85431 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -166,7 +166,7 @@ void TheExtensionManager::SetText( const ::rtl::OUString &rTitle )
}
//------------------------------------------------------------------------------
-void TheExtensionManager::ToTop( USHORT nFlags )
+void TheExtensionManager::ToTop( sal_uInt16 nFlags )
{
const SolarMutexGuard guard;
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 8289a3469aa0..39bad610bb9a 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -87,7 +87,7 @@ public:
void SetText( const ::rtl::OUString &rTitle );
void Show();
- void ToTop( USHORT nFlags );
+ void ToTop( sal_uInt16 nFlags );
bool Close();
bool isVisible();
diff --git a/desktop/source/deployment/gui/dp_gui_thread.cxx b/desktop/source/deployment/gui/dp_gui_thread.cxx
index 1ad857ad7b86..1ad857ad7b86 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_thread.cxx
+++ b/desktop/source/deployment/gui/dp_gui_thread.cxx
diff --git a/desktop/source/deployment/gui/dp_gui_thread.hxx b/desktop/source/deployment/gui/dp_gui_thread.hxx
index 624624b0cb3f..624624b0cb3f 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_thread.hxx
+++ b/desktop/source/deployment/gui/dp_gui_thread.hxx
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index d64fe351673d..9fb4b9f79816 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -29,6 +29,7 @@
#define INCLUDED_DP_GUI_UPDATEDATA_HXX
#include "sal/config.h"
+#include "tools/solar.h"
#include "rtl/ustring.hxx"
#include "com/sun/star/uno/Reference.hxx"
@@ -81,6 +82,10 @@ struct UpdateData
//are to be ignored.
::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage >
aUpdateSource;
+
+ // ID to find this entry in the update listbox
+ sal_uInt16 m_nID;
+ bool m_bIgnored;
};
}
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index e55e21c71eac..d678c8626465 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -44,14 +44,15 @@
#include "com/sun/star/awt/WindowAttribute.hpp"
#include "com/sun/star/awt/WindowClass.hpp"
#include "com/sun/star/awt/WindowDescriptor.hpp"
-#include "com/sun/star/awt/XThrobber.hpp"
#include "com/sun/star/awt/XToolkit.hpp"
#include "com/sun/star/awt/XWindow.hpp"
#include "com/sun/star/awt/XWindowPeer.hpp"
#include "com/sun/star/beans/NamedValue.hpp"
#include "com/sun/star/beans/Optional.hpp"
#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
#include "com/sun/star/deployment/DeploymentException.hpp"
#include "com/sun/star/deployment/UpdateInformationProvider.hpp"
#include "com/sun/star/deployment/XPackage.hpp"
@@ -63,6 +64,7 @@
#include "com/sun/star/frame/XDispatchProvider.hpp"
#include "com/sun/star/lang/IllegalArgumentException.hpp"
#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
#include "com/sun/star/system/XSystemShellExecute.hpp"
#include "com/sun/star/task/XAbortChannel.hpp"
@@ -77,6 +79,7 @@
#include "com/sun/star/uno/Sequence.hxx"
#include "com/sun/star/uno/XInterface.hpp"
#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XChangesBatch.hpp"
#include "com/sun/star/util/XURLTransformer.hpp"
#include "com/sun/star/xml/dom/XElement.hpp"
#include "com/sun/star/xml/dom/XNode.hpp"
@@ -129,16 +132,23 @@ namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
} } } }
-namespace css = ::com::sun::star;
-
+using namespace ::com::sun::star;
using dp_gui::UpdateDialog;
namespace {
static sal_Unicode const LF = 0x000A;
static sal_Unicode const CR = 0x000D;
+static const sal_uInt16 CMD_ENABLE_UPDATE = 1;
+static const sal_uInt16 CMD_IGNORE_UPDATE = 2;
+static const sal_uInt16 CMD_IGNORE_ALL_UPDATES = 3;
+
+#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
+
+#define IGNORED_UPDATES OUSTR("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates")
+#define PROPERTY_VERSION OUSTR("Version")
-enum Kind { ENABLED_UPDATE, DISABLED_UPDATE, GENERAL_ERROR, SPECIFIC_ERROR };
+enum Kind { ENABLED_UPDATE, DISABLED_UPDATE, SPECIFIC_ERROR };
rtl::OUString confineToParagraph(rtl::OUString const & text) {
// Confine arbitrary text to a single paragraph in a dp_gui::AutoScrollEdit.
@@ -151,86 +161,64 @@ rtl::OUString confineToParagraph(rtl::OUString const & text) {
struct UpdateDialog::DisabledUpdate {
rtl::OUString name;
- css::uno::Sequence< rtl::OUString > unsatisfiedDependencies;
+ uno::Sequence< rtl::OUString > unsatisfiedDependencies;
// We also want to show release notes and publisher for disabled updates
::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > aUpdateInfo;
+ sal_uInt16 m_nID;
};
struct UpdateDialog::SpecificError {
rtl::OUString name;
rtl::OUString message;
+ sal_uInt16 m_nID;
};
-union UpdateDialog::IndexUnion{
- std::vector< dp_gui::UpdateData >::size_type enabledUpdate;
- std::vector< UpdateDialog::DisabledUpdate >::size_type disabledUpdate;
- std::vector< rtl::OUString >::size_type generalError;
- std::vector< UpdateDialog::SpecificError >::size_type specificError;
-};
-
-struct UpdateDialog::Index {
- static std::auto_ptr< UpdateDialog::Index const > newEnabledUpdate(
- std::vector< dp_gui::UpdateData >::size_type n);
-
- static std::auto_ptr< UpdateDialog::Index const > newDisabledUpdate(
- std::vector< UpdateDialog::DisabledUpdate >::size_type n);
+//------------------------------------------------------------------------------
+struct UpdateDialog::IgnoredUpdate {
+ rtl::OUString sExtensionID;
+ rtl::OUString sVersion;
+ bool bRemoved;
- static std::auto_ptr< UpdateDialog::Index const > newGeneralError(
- std::vector< rtl::OUString >::size_type n);
-
- static std::auto_ptr< UpdateDialog::Index const > newSpecificError(
- std::vector< UpdateDialog::SpecificError >::size_type n);
-
- Kind kind;
- IndexUnion index;
-
-private:
- explicit Index(Kind theKind);
+ IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion );
};
-std::auto_ptr< UpdateDialog::Index const >
-UpdateDialog::Index::newEnabledUpdate(
- std::vector< dp_gui::UpdateData >::size_type n)
-{
- UpdateDialog::Index * p = new UpdateDialog::Index(ENABLED_UPDATE);
- p->index.enabledUpdate = n;
- return std::auto_ptr< UpdateDialog::Index const >(p);
-}
-
-std::auto_ptr< UpdateDialog::Index const >
-UpdateDialog::Index::newDisabledUpdate(
- std::vector< UpdateDialog::DisabledUpdate >::size_type n)
-{
- UpdateDialog::Index * p = new UpdateDialog::Index(DISABLED_UPDATE);
- p->index.disabledUpdate = n;
- return std::auto_ptr< UpdateDialog::Index const >(p);
-}
+//------------------------------------------------------------------------------
+UpdateDialog::IgnoredUpdate::IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion ):
+ sExtensionID( rExtensionID ),
+ sVersion( rVersion ),
+ bRemoved( false )
+{}
-std::auto_ptr< UpdateDialog::Index const > UpdateDialog::Index::newGeneralError(
- std::vector< rtl::OUString >::size_type n)
+//------------------------------------------------------------------------------
+struct UpdateDialog::Index
{
- UpdateDialog::Index * p = new UpdateDialog::Index(GENERAL_ERROR);
- p->index.generalError = n;
- return std::auto_ptr< UpdateDialog::Index const >(p);
-}
+ Kind m_eKind;
+ bool m_bIgnored;
+ sal_uInt16 m_nID;
+ sal_uInt16 m_nIndex;
+ rtl::OUString m_aName;
-std::auto_ptr< UpdateDialog::Index const >
-UpdateDialog::Index::newSpecificError(
- std::vector< UpdateDialog::SpecificError >::size_type n)
-{
- UpdateDialog::Index * p = new UpdateDialog::Index(SPECIFIC_ERROR);
- p->index.specificError = n;
- return std::auto_ptr< UpdateDialog::Index const >(p);
-}
+ Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName );
+};
-UpdateDialog::Index::Index(Kind theKind): kind(theKind) {}
+//------------------------------------------------------------------------------
+UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName ):
+ m_eKind( theKind ),
+ m_bIgnored( false ),
+ m_nID( nID ),
+ m_nIndex( nIndex ),
+ m_aName( rName )
+{}
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
class UpdateDialog::Thread: public dp_gui::Thread {
public:
Thread(
- css::uno::Reference< css::uno::XComponentContext > const & context,
+ uno::Reference< uno::XComponentContext > const & context,
UpdateDialog & dialog,
- const std::vector< css::uno::Reference< css::deployment::XPackage > > & vExtensionList);
+ const std::vector< uno::Reference< deployment::XPackage > > & vExtensionList);
void stop();
@@ -243,13 +231,13 @@ private:
virtual void execute();
void handleSpecificError(
- css::uno::Reference< css::deployment::XPackage > const & package,
- css::uno::Any const & exception) const;
+ uno::Reference< deployment::XPackage > const & package,
+ uno::Any const & exception) const;
- css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > >
+ uno::Sequence< uno::Reference< xml::dom::XElement > >
getUpdateInformation(
- css::uno::Reference< css::deployment::XPackage > const & package,
- css::uno::Sequence< rtl::OUString > const & urls,
+ uno::Reference< deployment::XPackage > const & package,
+ uno::Sequence< rtl::OUString > const & urls,
rtl::OUString const & identifier) const;
::rtl::OUString getUpdateDisplayString(
@@ -261,40 +249,40 @@ private:
dp_gui::UpdateData & out_data) const;
bool update(
- UpdateDialog::DisabledUpdate const & du,
- dp_gui::UpdateData const & data) const;
+ UpdateDialog::DisabledUpdate & du,
+ dp_gui::UpdateData & data) const;
- css::uno::Reference< css::uno::XComponentContext > m_context;
+ uno::Reference< uno::XComponentContext > m_context;
UpdateDialog & m_dialog;
- std::vector< css::uno::Reference< css::deployment::XPackage > > m_vExtensionList;
- css::uno::Reference< css::deployment::XUpdateInformationProvider > m_updateInformation;
- css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHdl;
+ std::vector< uno::Reference< deployment::XPackage > > m_vExtensionList;
+ uno::Reference< deployment::XUpdateInformationProvider > m_updateInformation;
+ uno::Reference< task::XInteractionHandler > m_xInteractionHdl;
// guarded by Application::GetSolarMutex():
- css::uno::Reference< css::task::XAbortChannel > m_abort;
+ uno::Reference< task::XAbortChannel > m_abort;
bool m_stop;
};
UpdateDialog::Thread::Thread(
- css::uno::Reference< css::uno::XComponentContext > const & context,
+ uno::Reference< uno::XComponentContext > const & context,
UpdateDialog & dialog,
- const std::vector< css::uno::Reference< css::deployment::XPackage > > &vExtensionList):
+ const std::vector< uno::Reference< deployment::XPackage > > &vExtensionList):
m_context(context),
m_dialog(dialog),
m_vExtensionList(vExtensionList),
m_updateInformation(
- css::deployment::UpdateInformationProvider::create(context)),
+ deployment::UpdateInformationProvider::create(context)),
m_stop(false)
{
if( m_context.is() )
{
- css::uno::Reference< css::lang::XMultiComponentFactory > xServiceManager( m_context->getServiceManager() );
+ uno::Reference< lang::XMultiComponentFactory > xServiceManager( m_context->getServiceManager() );
if( xServiceManager.is() )
{
- m_xInteractionHdl = css::uno::Reference< css::task::XInteractionHandler > (
+ m_xInteractionHdl = uno::Reference< task::XInteractionHandler > (
xServiceManager->createInstanceWithContext( OUSTR( "com.sun.star.task.InteractionHandler" ), m_context),
- css::uno::UNO_QUERY );
+ uno::UNO_QUERY );
if ( m_xInteractionHdl.is() )
m_updateInformation->setInteractionHandler( m_xInteractionHdl );
}
@@ -302,7 +290,7 @@ UpdateDialog::Thread::Thread(
}
void UpdateDialog::Thread::stop() {
- css::uno::Reference< css::task::XAbortChannel > abort;
+ uno::Reference< task::XAbortChannel > abort;
{
SolarMutexGuard g;
abort = m_abort;
@@ -317,7 +305,7 @@ void UpdateDialog::Thread::stop() {
UpdateDialog::Thread::~Thread()
{
if ( m_xInteractionHdl.is() )
- m_updateInformation->setInteractionHandler( css::uno::Reference< css::task::XInteractionHandler > () );
+ m_updateInformation->setInteractionHandler( uno::Reference< task::XInteractionHandler > () );
}
void UpdateDialog::Thread::execute()
@@ -328,16 +316,16 @@ void UpdateDialog::Thread::execute()
return;
}
}
- css::uno::Reference<css::deployment::XExtensionManager> extMgr =
- css::deployment::ExtensionManager::get(m_context);
+ uno::Reference<deployment::XExtensionManager> extMgr =
+ deployment::ExtensionManager::get(m_context);
- std::vector<std::pair<css::uno::Reference<css::deployment::XPackage>, css::uno::Any > > errors;
+ std::vector<std::pair<uno::Reference<deployment::XPackage>, uno::Any > > errors;
dp_misc::UpdateInfoMap updateInfoMap = dp_misc::getOnlineUpdateInfos(
m_context, extMgr, m_updateInformation, &m_vExtensionList, errors);
- typedef std::vector<std::pair<css::uno::Reference<css::deployment::XPackage>,
- css::uno::Any> >::const_iterator ITERROR;
+ typedef std::vector<std::pair<uno::Reference<deployment::XPackage>,
+ uno::Any> >::const_iterator ITERROR;
for (ITERROR ite = errors.begin(); ite != errors.end(); ++ite )
handleSpecificError(ite->first, ite->second);
@@ -356,13 +344,17 @@ void UpdateDialog::Thread::execute()
rtl::OUString sVersionUser;
rtl::OUString sVersionShared;
rtl::OUString sVersionBundled;
- css::uno::Sequence< css::uno::Reference< css::deployment::XPackage> > extensions;
+ uno::Sequence< uno::Reference< deployment::XPackage> > extensions;
try {
extensions = extMgr->getExtensionsWithSameIdentifier(
dp_misc::getIdentifier(info.extension), info.extension->getName(),
- css::uno::Reference<css::ucb::XCommandEnvironment>());
- } catch (css::lang::IllegalArgumentException& ) {
+ uno::Reference<ucb::XCommandEnvironment>());
+ } catch (lang::IllegalArgumentException& ) {
OSL_ASSERT(0);
+ continue;
+ } catch (css::ucb::CommandFailedException& ) {
+ OSL_ASSERT(0);
+ continue;
}
OSL_ASSERT(extensions.getLength() == 3);
if (extensions[0].is() )
@@ -379,7 +371,7 @@ void UpdateDialog::Thread::execute()
dp_misc::UPDATE_SOURCE sourceShared = dp_misc::isUpdateSharedExtension(
bSharedReadOnly, sVersionShared, sVersionBundled, sOnlineVersion);
- css::uno::Reference<css::deployment::XPackage> updateSource;
+ uno::Reference<deployment::XPackage> updateSource;
if (sourceUser != dp_misc::UPDATE_SOURCE_NONE)
{
if (sourceUser == dp_misc::UPDATE_SOURCE_SHARED)
@@ -418,13 +410,13 @@ void UpdateDialog::Thread::execute()
//Parameter package can be null
void UpdateDialog::Thread::handleSpecificError(
- css::uno::Reference< css::deployment::XPackage > const & package,
- css::uno::Any const & exception) const
+ uno::Reference< deployment::XPackage > const & package,
+ uno::Any const & exception) const
{
UpdateDialog::SpecificError data;
if (package.is())
data.name = package->getDisplayName();
- css::uno::Exception e;
+ uno::Exception e;
if (exception >>= e) {
data.message = e.Message;
}
@@ -466,7 +458,7 @@ void UpdateDialog::Thread::handleSpecificError(
/** out_data will only be filled if all dependencies are ok.
*/
void UpdateDialog::Thread::prepareUpdateData(
- css::uno::Reference< css::xml::dom::XNode > const & updateInfo,
+ uno::Reference< xml::dom::XNode > const & updateInfo,
UpdateDialog::DisabledUpdate & out_du,
dp_gui::UpdateData & out_data) const
{
@@ -474,7 +466,7 @@ void UpdateDialog::Thread::prepareUpdateData(
return;
dp_misc::DescriptionInfoset infoset(m_context, updateInfo);
OSL_ASSERT(infoset.getVersion().getLength() != 0);
- css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > > ds(
+ uno::Sequence< uno::Reference< xml::dom::XElement > > ds(
dp_misc::Dependencies::check(infoset));
out_du.aUpdateInfo = updateInfo;
@@ -497,8 +489,8 @@ void UpdateDialog::Thread::prepareUpdateData(
}
bool UpdateDialog::Thread::update(
- UpdateDialog::DisabledUpdate const & du,
- dp_gui::UpdateData const & data) const
+ UpdateDialog::DisabledUpdate & du,
+ dp_gui::UpdateData & data) const
{
bool ret = false;
if (du.unsatisfiedDependencies.getLength() == 0)
@@ -520,13 +512,14 @@ bool UpdateDialog::Thread::update(
// UpdateDialog ----------------------------------------------------------
UpdateDialog::UpdateDialog(
- css::uno::Reference< css::uno::XComponentContext > const & context,
+ uno::Reference< uno::XComponentContext > const & context,
Window * parent,
- const std::vector<css::uno::Reference< css::deployment::XPackage > > &vExtensionList,
+ const std::vector<uno::Reference< deployment::XPackage > > &vExtensionList,
std::vector< dp_gui::UpdateData > * updateData):
ModalDialog(parent,DpGuiResId(RID_DLG_UPDATE)),
m_context(context),
m_checking(this, DpGuiResId(RID_DLG_UPDATE_CHECKING)),
+ m_throbber(this, DpGuiResId(RID_DLG_UPDATE_THROBBER)),
m_update(this, DpGuiResId(RID_DLG_UPDATE_UPDATE)),
m_updates(
*this, DpGuiResId(RID_DLG_UPDATE_UPDATES),
@@ -541,7 +534,7 @@ UpdateDialog::UpdateDialog(
m_line(this, DpGuiResId(RID_DLG_UPDATE_LINE)),
m_help(this, DpGuiResId(RID_DLG_UPDATE_HELP)),
m_ok(this, DpGuiResId(RID_DLG_UPDATE_OK)),
- m_cancel(this, DpGuiResId(RID_DLG_UPDATE_CANCEL)),
+ m_close(this, DpGuiResId(RID_DLG_UPDATE_CLOSE)),
m_error(String(DpGuiResId(RID_DLG_UPDATE_ERROR))),
m_none(String(DpGuiResId(RID_DLG_UPDATE_NONE))),
m_noInstallable(String(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE))),
@@ -553,105 +546,116 @@ UpdateDialog::UpdateDialog(
m_noDependencyCurVer(String(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER))),
m_browserbased(String(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED))),
m_version(String(DpGuiResId(RID_DLG_UPDATE_VERSION))),
+ m_ignoredUpdate(String(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE))),
m_updateData(*updateData),
m_thread(
new UpdateDialog::Thread(
context, *this, vExtensionList)),
m_nFirstLineDelta(0),
- m_nOneLineMissing(0)
+ m_nOneLineMissing(0),
+ m_nLastID(1),
+ m_bModified( false )
// TODO: check!
// ,
// m_extensionManagerDialog(extensionManagerDialog)
{
OSL_ASSERT(updateData != NULL);
- m_xExtensionManager = css::deployment::ExtensionManager::get( context );
+ m_xExtensionManager = deployment::ExtensionManager::get( context );
- css::uno::Reference< css::awt::XToolkit > toolkit;
+ uno::Reference< awt::XToolkit > toolkit;
try {
- toolkit = css::uno::Reference< css::awt::XToolkit >(
- (css::uno::Reference< css::lang::XMultiComponentFactory >(
+ toolkit = uno::Reference< awt::XToolkit >(
+ (uno::Reference< lang::XMultiComponentFactory >(
m_context->getServiceManager(),
- css::uno::UNO_QUERY_THROW)->
+ uno::UNO_QUERY_THROW)->
createInstanceWithContext(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")),
m_context)),
- css::uno::UNO_QUERY_THROW);
- } catch (css::uno::RuntimeException &) {
+ uno::UNO_QUERY_THROW);
+ } catch (uno::RuntimeException &) {
throw;
- } catch (css::uno::Exception & e) {
- throw css::uno::RuntimeException(e.Message, e.Context);
- }
- Control c(this, DpGuiResId(RID_DLG_UPDATE_THROBBER));
- Point pos(c.GetPosPixel());
- Size size(c.GetSizePixel());
- try {
- m_throbber = css::uno::Reference< css::awt::XThrobber >(
- toolkit->createWindow(
- css::awt::WindowDescriptor(
- css::awt::WindowClass_SIMPLE,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Throbber")),
- GetComponentInterface(), 0,
- css::awt::Rectangle(
- pos.X(), pos.Y(), size.Width(), size.Height()),
- css::awt::WindowAttribute::SHOW)),
- css::uno::UNO_QUERY_THROW);
- } catch (css::lang::IllegalArgumentException & e) {
- throw css::uno::RuntimeException(e.Message, e.Context);
+ } catch (uno::Exception & e) {
+ throw uno::RuntimeException(e.Message, e.Context);
}
m_updates.SetSelectHdl(LINK(this, UpdateDialog, selectionHandler));
m_all.SetToggleHdl(LINK(this, UpdateDialog, allHandler));
m_ok.SetClickHdl(LINK(this, UpdateDialog, okHandler));
- m_cancel.SetClickHdl(LINK(this, UpdateDialog, cancelHandler));
+ m_close.SetClickHdl(LINK(this, UpdateDialog, closeHandler));
if ( ! dp_misc::office_is_running())
m_help.Disable();
FreeResource();
initDescription();
+ getIgnoredUpdates();
}
-UpdateDialog::~UpdateDialog() {
- for (USHORT i = 0; i < m_updates.getItemCount(); ++i) {
- delete static_cast< UpdateDialog::Index const * >(
- m_updates.GetEntryData(i));
+//------------------------------------------------------------------------------
+UpdateDialog::~UpdateDialog()
+{
+ storeIgnoredUpdates();
+
+ for ( std::vector< UpdateDialog::Index* >::iterator i( m_ListboxEntries.begin() ); i != m_ListboxEntries.end(); ++i )
+ {
+ delete (*i);
+ }
+ for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+ {
+ delete (*i);
}
}
-BOOL UpdateDialog::Close() {
+//------------------------------------------------------------------------------
+sal_Bool UpdateDialog::Close() {
m_thread->stop();
return ModalDialog::Close();
}
short UpdateDialog::Execute() {
- m_throbber->start();
+ m_throbber.start();
m_thread->launch();
return ModalDialog::Execute();
}
-UpdateDialog::CheckListBox::CheckListBox(
- UpdateDialog & dialog, ResId const & resource,
- Image const & normalStaticImage):
- SvxCheckListBox(
- &dialog, resource, normalStaticImage),
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & resource,
+ Image const & normalStaticImage ):
+ SvxCheckListBox( &dialog, resource, normalStaticImage ),
+ m_ignoreUpdate( String( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ) ),
+ m_ignoreAllUpdates( String( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ) ),
+ m_enableUpdate( String( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ) ),
m_dialog(dialog)
{}
+//------------------------------------------------------------------------------
UpdateDialog::CheckListBox::~CheckListBox() {}
-USHORT UpdateDialog::CheckListBox::getItemCount() const {
- ULONG i = GetEntryCount();
- OSL_ASSERT(i <= std::numeric_limits< USHORT >::max());
- return sal::static_int_cast< USHORT >(i);
+//------------------------------------------------------------------------------
+sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const {
+ sal_uLong i = GetEntryCount();
+ OSL_ASSERT(i <= std::numeric_limits< sal_uInt16 >::max());
+ return sal::static_int_cast< sal_uInt16 >(i);
}
-void UpdateDialog::CheckListBox::MouseButtonDown(MouseEvent const & event) {
+//------------------------------------------------------------------------------
+void UpdateDialog::CheckListBox::MouseButtonDown( MouseEvent const & event )
+{
// When clicking on a selected entry in an SvxCheckListBox, the entry's
// checkbox is toggled on mouse button down:
- SvxCheckListBox::MouseButtonDown(event);
+ SvxCheckListBox::MouseButtonDown( event );
+
+ if ( event.IsRight() )
+ {
+ handlePopupMenu( event.GetPosPixel() );
+ }
+
m_dialog.enableOk();
}
+//------------------------------------------------------------------------------
void UpdateDialog::CheckListBox::MouseButtonUp(MouseEvent const & event) {
// When clicking on an entry's checkbox in an SvxCheckListBox, the entry's
// checkbox is toggled on mouse button up:
@@ -664,25 +668,82 @@ void UpdateDialog::CheckListBox::KeyInput(KeyEvent const & event) {
m_dialog.enableOk();
}
-void UpdateDialog::insertItem(
- rtl::OUString const & name, USHORT position,
- std::auto_ptr< UpdateDialog::Index const > index, SvLBoxButtonKind kind)
+//------------------------------------------------------------------------------
+void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos )
{
- m_updates.InsertEntry(
- name, position,
- const_cast< void * >(static_cast< void const * >(index.release())),
- kind);
- //TODO #i72487#: UpdateDialog::Index potentially leaks as the exception
- // behavior of SvxCheckListBox::InsertEntry is unspecified
+ SvListEntry *pData = GetEntry( rPos );
+
+ if ( pData )
+ {
+ sal_uInt16 nEntryPos = GetSelectEntryPos();
+ UpdateDialog::Index * p = static_cast< UpdateDialog::Index * >( GetEntryData( nEntryPos ) );
+
+ if ( ( p->m_eKind == ENABLED_UPDATE ) || ( p->m_eKind == DISABLED_UPDATE ) )
+ {
+ PopupMenu aPopup;
+
+ if ( p->m_bIgnored )
+ aPopup.InsertItem( CMD_ENABLE_UPDATE, m_enableUpdate );
+ else
+ {
+ aPopup.InsertItem( CMD_IGNORE_UPDATE, m_ignoreUpdate );
+ aPopup.InsertItem( CMD_IGNORE_ALL_UPDATES, m_ignoreAllUpdates );
+ }
+
+ sal_uInt16 aCmd = aPopup.Execute( this, rPos );
+ if ( ( aCmd == CMD_IGNORE_UPDATE ) || ( aCmd == CMD_IGNORE_ALL_UPDATES ) )
+ {
+ p->m_bIgnored = true;
+ if ( p->m_eKind == ENABLED_UPDATE )
+ {
+ RemoveEntry( nEntryPos );
+ m_dialog.addAdditional( p, SvLBoxButtonKind_disabledCheckbox );
+ }
+ if ( aCmd == CMD_IGNORE_UPDATE )
+ m_dialog.setIgnoredUpdate( p, true, false );
+ else
+ m_dialog.setIgnoredUpdate( p, true, true );
+ // TODO: reselect entry to display new description!
+ }
+ else if ( aCmd == CMD_ENABLE_UPDATE )
+ {
+ p->m_bIgnored = false;
+ if ( p->m_eKind == ENABLED_UPDATE )
+ {
+ RemoveEntry( nEntryPos );
+ m_dialog.insertItem( p, SvLBoxButtonKind_enabledCheckbox );
+ }
+ m_dialog.setIgnoredUpdate( p, false, false );
+ }
+ }
+ }
}
-void UpdateDialog::addAdditional(
- rtl::OUString const & name, USHORT position,
- std::auto_ptr< UpdateDialog::Index const > index, SvLBoxButtonKind kind)
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+sal_uInt16 UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKind kind )
+{
+ m_updates.InsertEntry( pEntry->m_aName, LISTBOX_APPEND, static_cast< void * >( pEntry ), kind );
+
+ for ( sal_uInt16 i = m_updates.getItemCount(); i != 0 ; )
+ {
+ i -= 1;
+ UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( m_updates.GetEntryData( i ) );
+ if ( p == pEntry )
+ return i;
+ }
+ OSL_ASSERT(0);
+ return 0;
+}
+
+//------------------------------------------------------------------------------
+void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind kind )
{
m_all.Enable();
- if (m_all.IsChecked()) {
- insertItem(name, position, index, kind);
+ if (m_all.IsChecked())
+ {
+ insertItem( index, kind );
m_update.Enable();
m_updates.Enable();
m_description.Enable();
@@ -690,60 +751,80 @@ void UpdateDialog::addAdditional(
}
}
-void UpdateDialog::addEnabledUpdate(
- rtl::OUString const & name, dp_gui::UpdateData const & data)
+//------------------------------------------------------------------------------
+void UpdateDialog::addEnabledUpdate( rtl::OUString const & name,
+ dp_gui::UpdateData & data )
{
- std::vector< dp_gui::UpdateData >::size_type n = m_enabledUpdates.size();
- m_enabledUpdates.push_back(data);
- insertItem(
- name, sal::static_int_cast< USHORT >(n),
- UpdateDialog::Index::newEnabledUpdate(n),
- SvLBoxButtonKind_enabledCheckbox);
- // position overflow is rather harmless
- m_updates.CheckEntryPos(sal::static_int_cast< USHORT >(n));
- //TODO #i72487#: fragile computation; insertItem should instead return
- // pos
+ sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_enabledUpdates.size() );
+ UpdateDialog::Index *pEntry = new UpdateDialog::Index( ENABLED_UPDATE, m_nLastID, nIndex, name );
+
+ data.m_nID = m_nLastID;
+ m_nLastID += 1;
+
+ m_enabledUpdates.push_back( data );
+ m_ListboxEntries.push_back( pEntry );
+
+ if ( ! isIgnoredUpdate( pEntry ) )
+ {
+ sal_uInt16 nPos = insertItem( pEntry, SvLBoxButtonKind_enabledCheckbox );
+ m_updates.CheckEntryPos( nPos );
+ }
+ else
+ addAdditional( pEntry, SvLBoxButtonKind_disabledCheckbox );
+
m_update.Enable();
m_updates.Enable();
m_description.Enable();
m_descriptions.Enable();
}
-void UpdateDialog::addDisabledUpdate(UpdateDialog::DisabledUpdate const & data)
+//------------------------------------------------------------------------------
+void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data )
{
- std::vector< UpdateDialog::DisabledUpdate >::size_type n =
- m_disabledUpdates.size();
- m_disabledUpdates.push_back(data);
- addAdditional(
- data.name, sal::static_int_cast< USHORT >(m_enabledUpdates.size() + n),
- UpdateDialog::Index::newDisabledUpdate(n),
- SvLBoxButtonKind_disabledCheckbox);
- // position overflow is rather harmless
+ sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_disabledUpdates.size() );
+ UpdateDialog::Index *pEntry = new UpdateDialog::Index( DISABLED_UPDATE, m_nLastID, nIndex, data.name );
+
+ data.m_nID = m_nLastID;
+ m_nLastID += 1;
+
+ m_disabledUpdates.push_back( data );
+ m_ListboxEntries.push_back( pEntry );
+
+ isIgnoredUpdate( pEntry );
+ addAdditional( pEntry, SvLBoxButtonKind_disabledCheckbox );
}
-void UpdateDialog::addSpecificError(UpdateDialog::SpecificError const & data) {
- std::vector< UpdateDialog::SpecificError >::size_type n =
- m_specificErrors.size();
- m_specificErrors.push_back(data);
- addAdditional(
- data.name, LISTBOX_APPEND, UpdateDialog::Index::newSpecificError(n),
- SvLBoxButtonKind_staticImage);
+//------------------------------------------------------------------------------
+void UpdateDialog::addSpecificError( UpdateDialog::SpecificError & data )
+{
+ sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_specificErrors.size() );
+ UpdateDialog::Index *pEntry = new UpdateDialog::Index( DISABLED_UPDATE, m_nLastID, nIndex, data.name );
+
+ data.m_nID = m_nLastID;
+ m_nLastID += 1;
+
+ m_specificErrors.push_back( data );
+ m_ListboxEntries.push_back( pEntry );
+
+ addAdditional( pEntry, SvLBoxButtonKind_staticImage);
}
void UpdateDialog::checkingDone() {
m_checking.Hide();
- m_throbber->stop();
- css::uno::Reference< css::awt::XWindow >(
- m_throbber, css::uno::UNO_QUERY_THROW)->setVisible(false);
+ m_throbber.stop();
+ m_throbber.Hide();
if (m_updates.getItemCount() == 0)
{
clearDescription();
m_description.Enable();
m_descriptions.Enable();
- showDescription(
- ( m_disabledUpdates.empty() && m_generalErrors.empty() && m_specificErrors.empty() )
- ? m_none : m_noInstallable, false );
+
+ if ( m_disabledUpdates.empty() && m_specificErrors.empty() && m_ignoredUpdates.empty() )
+ showDescription( m_none, false );
+ else
+ showDescription( m_noInstallable, false );
}
+
enableOk();
}
@@ -755,7 +836,7 @@ void UpdateDialog::enableOk() {
// *********************************************************************************
void UpdateDialog::createNotifyJob( bool bPrepareOnly,
- css::uno::Sequence< css::uno::Sequence< rtl::OUString > > &rItemList )
+ uno::Sequence< uno::Sequence< rtl::OUString > > &rItemList )
{
if ( !dp_misc::office_is_running() )
return;
@@ -763,51 +844,51 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly,
// notify update check job
try
{
- css::uno::Reference< css::lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
- css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider(
+ uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
+ uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
xFactory->createInstance( OUSTR( "com.sun.star.configuration.ConfigurationProvider" )),
- css::uno::UNO_QUERY_THROW);
+ uno::UNO_QUERY_THROW);
- css::beans::PropertyValue aProperty;
+ beans::PropertyValue aProperty;
aProperty.Name = OUSTR( "nodepath" );
- aProperty.Value = css::uno::makeAny( OUSTR("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob") );
+ aProperty.Value = uno::makeAny( OUSTR("org.openoffice.Office.Addons/AddonUI/OfficeHelp/UpdateCheckJob") );
- css::uno::Sequence< css::uno::Any > aArgumentList( 1 );
- aArgumentList[0] = css::uno::makeAny( aProperty );
+ uno::Sequence< uno::Any > aArgumentList( 1 );
+ aArgumentList[0] = uno::makeAny( aProperty );
- css::uno::Reference< css::container::XNameAccess > xNameAccess(
+ uno::Reference< container::XNameAccess > xNameAccess(
xConfigProvider->createInstanceWithArguments(
OUSTR("com.sun.star.configuration.ConfigurationAccess"), aArgumentList ),
- css::uno::UNO_QUERY_THROW );
+ uno::UNO_QUERY_THROW );
- css::util::URL aURL;
+ util::URL aURL;
xNameAccess->getByName(OUSTR("URL")) >>= aURL.Complete;
- css::uno::Reference < css::util::XURLTransformer > xTransformer( xFactory->createInstance( OUSTR( "com.sun.star.util.URLTransformer" ) ),
- css::uno::UNO_QUERY_THROW );
+ uno::Reference < util::XURLTransformer > xTransformer( xFactory->createInstance( OUSTR( "com.sun.star.util.URLTransformer" ) ),
+ uno::UNO_QUERY_THROW );
xTransformer->parseStrict(aURL);
- css::uno::Reference < css::frame::XDesktop > xDesktop( xFactory->createInstance( OUSTR( "com.sun.star.frame.Desktop" ) ),
- css::uno::UNO_QUERY_THROW );
- css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( xDesktop->getCurrentFrame(),
- css::uno::UNO_QUERY_THROW );
- css::uno::Reference< css::frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0);
+ uno::Reference < frame::XDesktop > xDesktop( xFactory->createInstance( OUSTR( "com.sun.star.frame.Desktop" ) ),
+ uno::UNO_QUERY_THROW );
+ uno::Reference< frame::XDispatchProvider > xDispatchProvider( xDesktop->getCurrentFrame(),
+ uno::UNO_QUERY_THROW );
+ uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0);
if( xDispatch.is() )
{
- css::uno::Sequence< css::beans::PropertyValue > aPropList(2);
+ uno::Sequence< beans::PropertyValue > aPropList(2);
aProperty.Name = OUSTR( "updateList" );
- aProperty.Value = css::uno::makeAny( rItemList );
+ aProperty.Value = uno::makeAny( rItemList );
aPropList[0] = aProperty;
aProperty.Name = OUSTR( "prepareOnly" );
- aProperty.Value = css::uno::makeAny( bPrepareOnly );
+ aProperty.Value = uno::makeAny( bPrepareOnly );
aPropList[1] = aProperty;
xDispatch->dispatch(aURL, aPropList );
}
}
- catch( const css::uno::Exception& e )
+ catch( const uno::Exception& e )
{
dp_misc::TRACE( OUSTR("Caught exception: ")
+ e.Message + OUSTR("\n thread terminated.\n\n"));
@@ -820,26 +901,26 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly )
if ( !dp_misc::office_is_running() )
return;
- css::uno::Sequence< css::uno::Sequence< rtl::OUString > > aItemList;
+ uno::Sequence< uno::Sequence< rtl::OUString > > aItemList;
if ( ! bRecheckOnly )
{
sal_Int32 nCount = 0;
for ( sal_Int16 i = 0; i < m_updates.getItemCount(); ++i )
{
- css::uno::Sequence< rtl::OUString > aItem(2);
+ uno::Sequence< rtl::OUString > aItem(2);
UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >(m_updates.GetEntryData(i));
- if ( p->kind == ENABLED_UPDATE )
+ if ( p->m_eKind == ENABLED_UPDATE )
{
- dp_gui::UpdateData aUpdData = m_enabledUpdates[ p->index.enabledUpdate ];
+ dp_gui::UpdateData aUpdData = m_enabledUpdates[ p->m_nIndex ];
aItem[0] = dp_misc::getIdentifier( aUpdData.aInstalledPackage );
dp_misc::DescriptionInfoset aInfoset( m_context, aUpdData.aUpdateInfo );
aItem[1] = aInfoset.getVersion();
}
- else if ( p->kind == DISABLED_UPDATE )
+ else if ( p->m_eKind == DISABLED_UPDATE )
continue;
else
continue;
@@ -849,6 +930,8 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly )
nCount += 1;
}
}
+
+ storeIgnoredUpdates();
createNotifyJob( bPrepareOnly, aItemList );
}
@@ -922,17 +1005,17 @@ void UpdateDialog::clearDescription()
m_descriptions.SetPosSizePixel( m_aFirstLinePos, m_aFirstLineSize );
}
-bool UpdateDialog::showDescription(css::uno::Reference< css::xml::dom::XNode > const & aUpdateInfo)
+bool UpdateDialog::showDescription(uno::Reference< xml::dom::XNode > const & aUpdateInfo)
{
dp_misc::DescriptionInfoset infoset(m_context, aUpdateInfo);
return showDescription(infoset.getLocalizedPublisherNameAndURL(),
infoset.getLocalizedReleaseNotesURL());
}
-bool UpdateDialog::showDescription(css::uno::Reference< css::deployment::XPackage > const & aExtension)
+bool UpdateDialog::showDescription(uno::Reference< deployment::XPackage > const & aExtension)
{
OSL_ASSERT(aExtension.is());
- css::beans::StringPair pubInfo = aExtension->getPublisherInfo();
+ beans::StringPair pubInfo = aExtension->getPublisherInfo();
return showDescription(std::make_pair(pubInfo.First, pubInfo.Second),
OUSTR(""));
}
@@ -995,6 +1078,163 @@ bool UpdateDialog::showDescription( const String& rDescription, bool bWithPublis
return true;
}
+//------------------------------------------------------------------------------
+void UpdateDialog::getIgnoredUpdates()
+{
+ uno::Reference< lang::XMultiServiceFactory > xConfig( m_context->getServiceManager()->createInstanceWithContext(
+ OUSTR("com.sun.star.configuration.ConfigurationProvider"), m_context ), uno::UNO_QUERY_THROW);
+ beans::NamedValue aValue( OUSTR("nodepath"), uno::Any( IGNORED_UPDATES ) );
+ uno::Sequence< uno::Any > args(1);
+ args[0] <<= aValue;
+
+ uno::Reference< container::XNameAccess > xNameAccess( xConfig->createInstanceWithArguments( OUSTR("com.sun.star.configuration.ConfigurationAccess"), args), uno::UNO_QUERY_THROW );
+ uno::Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames();
+
+ for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ )
+ {
+ ::rtl::OUString aIdentifier = aElementNames[i];
+ ::rtl::OUString aVersion;
+
+ uno::Any aPropValue( uno::Reference< beans::XPropertySet >( xNameAccess->getByName( aIdentifier ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
+ aPropValue >>= aVersion;
+ IgnoredUpdate *pData = new IgnoredUpdate( aIdentifier, aVersion );
+ m_ignoredUpdates.push_back( pData );
+ }
+}
+
+//------------------------------------------------------------------------------
+void UpdateDialog::storeIgnoredUpdates()
+{
+ if ( m_bModified && ( m_ignoredUpdates.size() != 0 ) )
+ {
+ uno::Reference< lang::XMultiServiceFactory > xConfig( m_context->getServiceManager()->createInstanceWithContext(
+ OUSTR("com.sun.star.configuration.ConfigurationProvider"), m_context ), uno::UNO_QUERY_THROW );
+ beans::NamedValue aValue( OUSTR("nodepath"), uno::Any( IGNORED_UPDATES ) );
+ uno::Sequence< uno::Any > args(1);
+ args[0] <<= aValue;
+
+ uno::Reference< container::XNameContainer > xNameContainer( xConfig->createInstanceWithArguments(
+ OUSTR("com.sun.star.configuration.ConfigurationUpdateAccess"), args ), uno::UNO_QUERY_THROW );
+
+ for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+ {
+ if ( xNameContainer->hasByName( (*i)->sExtensionID ) )
+ {
+ if ( (*i)->bRemoved )
+ xNameContainer->removeByName( (*i)->sExtensionID );
+ else
+ uno::Reference< beans::XPropertySet >( xNameContainer->getByName( (*i)->sExtensionID ), uno::UNO_QUERY_THROW )->setPropertyValue( PROPERTY_VERSION, uno::Any( (*i)->sVersion ) );
+ }
+ else if ( ! (*i)->bRemoved )
+ {
+ uno::Reference< beans::XPropertySet > elem( uno::Reference< lang::XSingleServiceFactory >( xNameContainer, uno::UNO_QUERY_THROW )->createInstance(), uno::UNO_QUERY_THROW );
+ elem->setPropertyValue( PROPERTY_VERSION, uno::Any( (*i)->sVersion ) );
+ xNameContainer->insertByName( (*i)->sExtensionID, uno::Any( elem ) );
+ }
+ }
+
+ uno::Reference< util::XChangesBatch > xChangesBatch( xNameContainer, uno::UNO_QUERY );
+ if ( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
+ xChangesBatch->commitChanges();
+ }
+
+ m_bModified = false;
+}
+
+//------------------------------------------------------------------------------
+bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index )
+{
+ bool bIsIgnored = false;
+
+ if ( m_ignoredUpdates.size() != 0 )
+ {
+ rtl::OUString aExtensionID;
+ rtl::OUString aVersion;
+
+ if ( index->m_eKind == ENABLED_UPDATE )
+ {
+ dp_gui::UpdateData aUpdData = m_enabledUpdates[ index->m_nIndex ];
+ aExtensionID = dp_misc::getIdentifier( aUpdData.aInstalledPackage );
+ aVersion = aUpdData.updateVersion;
+ }
+ else if ( index->m_eKind == DISABLED_UPDATE )
+ {
+ DisabledUpdate &rData = m_disabledUpdates[ index->m_nIndex ];
+ dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo );
+ ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() );
+ if ( aID )
+ aExtensionID = *aID;
+ aVersion = aInfoset.getVersion();
+ }
+
+ for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+ {
+ if ( (*i)->sExtensionID == aExtensionID )
+ {
+ if ( ( (*i)->sVersion.getLength() == 0 ) || ( (*i)->sVersion == aVersion ) )
+ {
+ bIsIgnored = true;
+ index->m_bIgnored = true;
+ }
+ else // when we find another update of an ignored version, we will remove the old one to keep the ignored list small
+ (*i)->bRemoved = true;
+ break;
+ }
+ }
+ }
+
+ return bIsIgnored;
+}
+
+//------------------------------------------------------------------------------
+void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll )
+{
+ rtl::OUString aExtensionID;
+ rtl::OUString aVersion;
+
+ m_bModified = true;
+
+ if ( pIndex->m_eKind == ENABLED_UPDATE )
+ {
+ dp_gui::UpdateData aUpdData = m_enabledUpdates[ pIndex->m_nIndex ];
+ aExtensionID = dp_misc::getIdentifier( aUpdData.aInstalledPackage );
+ if ( !bIgnoreAll )
+ aVersion = aUpdData.updateVersion;
+ }
+ else if ( pIndex->m_eKind == DISABLED_UPDATE )
+ {
+ DisabledUpdate &rData = m_disabledUpdates[ pIndex->m_nIndex ];
+ dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo );
+ ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() );
+ if ( aID )
+ aExtensionID = *aID;
+ if ( !bIgnoreAll )
+ aVersion = aInfoset.getVersion();
+ }
+
+ if ( aExtensionID.getLength() )
+ {
+ bool bFound = false;
+ for ( std::vector< UpdateDialog::IgnoredUpdate* >::iterator i( m_ignoredUpdates.begin() ); i != m_ignoredUpdates.end(); ++i )
+ {
+ if ( (*i)->sExtensionID == aExtensionID )
+ {
+ (*i)->sVersion = aVersion;
+ (*i)->bRemoved = !bIgnore;
+ bFound = true;
+ break;
+ }
+ }
+ if ( bIgnore && !bFound )
+ {
+ IgnoredUpdate *pData = new IgnoredUpdate( aExtensionID, aVersion );
+ m_ignoredUpdates.push_back( pData );
+ }
+ }
+}
+
+//------------------------------------------------------------------------------
+
IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
{
rtl::OUStringBuffer b;
@@ -1003,38 +1243,32 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
m_updates.GetEntryData(m_updates.GetSelectEntryPos()));
clearDescription();
- if (p != NULL)
+ if ( p != NULL )
{
- //When the index is greater or equal than the amount of enabled updates then the "Show all"
- //button is probably checked. Then we show first all enabled and then the disabled
- //updates.
- USHORT pos = m_updates.GetSelectEntryPos();
- const std::vector< dp_gui::UpdateData >::size_type sizeEnabled =
- m_enabledUpdates.size();
- const std::vector< UpdateDialog::DisabledUpdate >::size_type sizeDisabled =
- m_disabledUpdates.size();
- if (pos < sizeEnabled)
- {
- if (m_enabledUpdates[pos].aUpdateSource.is())
- bInserted = showDescription(m_enabledUpdates[pos].aUpdateSource);
- else
- bInserted = showDescription(m_enabledUpdates[pos].aUpdateInfo);
- }
- else if (pos >= sizeEnabled
- && pos < (sizeEnabled + sizeDisabled))
- bInserted = showDescription(m_disabledUpdates[pos - sizeEnabled].aUpdateInfo);
+ sal_uInt16 pos = p->m_nIndex;
- switch (p->kind)
+ switch (p->m_eKind)
{
case ENABLED_UPDATE:
{
- b.append(m_noDescription);
+ if ( m_enabledUpdates[ pos ].aUpdateSource.is() )
+ bInserted = showDescription( m_enabledUpdates[ pos ].aUpdateSource );
+ else
+ bInserted = showDescription( m_enabledUpdates[ pos ].aUpdateInfo );
+
+ if ( p->m_bIgnored )
+ b.append( m_ignoredUpdate );
+
break;
}
case DISABLED_UPDATE:
{
- UpdateDialog::DisabledUpdate & data = m_disabledUpdates[
- p->index.disabledUpdate];
+ bInserted = showDescription( m_disabledUpdates[pos].aUpdateInfo );
+
+ if ( p->m_bIgnored )
+ b.append( m_ignoredUpdate );
+
+ UpdateDialog::DisabledUpdate & data = m_disabledUpdates[ pos ];
if (data.unsatisfiedDependencies.getLength() != 0)
{
// create error string for version mismatch
@@ -1078,23 +1312,12 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
}
break;
}
- case GENERAL_ERROR:
- {
- rtl::OUString & msg = m_generalErrors[p->index.generalError];
- b.append(m_failure);
- b.append(LF);
- b.append(msg.getLength() == 0 ? m_unknownError : msg);
- break;
- }
case SPECIFIC_ERROR:
{
- UpdateDialog::SpecificError & data = m_specificErrors[
- p->index.specificError];
+ UpdateDialog::SpecificError & data = m_specificErrors[ pos ];
b.append(m_failure);
b.append(LF);
- b.append(
- data.message.getLength() == 0
- ? m_unknownError : data.message);
+ b.append( data.message.getLength() == 0 ? m_unknownError : data.message );
break;
}
default:
@@ -1103,56 +1326,37 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
}
}
+ if ( b.getLength() == 0 )
+ b.append( m_noDescription );
+
showDescription( b.makeStringAndClear(), bInserted );
return 0;
}
-IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG) {
- if (m_all.IsChecked()) {
+IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG)
+{
+ if (m_all.IsChecked())
+ {
m_update.Enable();
m_updates.Enable();
m_description.Enable();
m_descriptions.Enable();
- std::vector< UpdateDialog::DisabledUpdate >::size_type n1 = 0;
- for (std::vector< UpdateDialog::DisabledUpdate >::iterator i(
- m_disabledUpdates.begin());
- i != m_disabledUpdates.end(); ++i)
- {
- insertItem(
- i->name, LISTBOX_APPEND,
- UpdateDialog::Index::newDisabledUpdate(n1++),
- SvLBoxButtonKind_disabledCheckbox);
- }
- std::vector< rtl::OUString >::size_type n2 = 0;
- for (std::vector< rtl::OUString >::iterator i(m_generalErrors.begin());
- i != m_generalErrors.end(); ++i)
+
+ for (std::vector< UpdateDialog::Index* >::iterator i( m_ListboxEntries.begin() );
+ i != m_ListboxEntries.end(); ++i )
{
- insertItem(
- m_error, LISTBOX_APPEND,
- UpdateDialog::Index::newGeneralError(n2++),
- SvLBoxButtonKind_staticImage);
+ if ( (*i)->m_bIgnored || ( (*i)->m_eKind != ENABLED_UPDATE ) )
+ insertItem( (*i), SvLBoxButtonKind_disabledCheckbox );
}
- std::vector< UpdateDialog::SpecificError >::size_type n3 = 0;
- for (std::vector< UpdateDialog::SpecificError >::iterator i(
- m_specificErrors.begin());
- i != m_specificErrors.end(); ++i)
+ }
+ else
+ {
+ for ( sal_uInt16 i = 0; i < m_updates.getItemCount(); )
{
- insertItem(
- i->name, LISTBOX_APPEND,
- UpdateDialog::Index::newSpecificError(n3++),
- SvLBoxButtonKind_staticImage);
- }
- } else {
- for (USHORT i = 0; i < m_updates.getItemCount();) {
- UpdateDialog::Index const * p =
- static_cast< UpdateDialog::Index const * >(
- m_updates.GetEntryData(i));
- if (p->kind != ENABLED_UPDATE) {
+ UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( m_updates.GetEntryData(i) );
+ if ( p->m_bIgnored || ( p->m_eKind != ENABLED_UPDATE ) )
+ {
m_updates.RemoveEntry(i);
- //TODO #i72487#: UpdateDialog::Index potentially leaks as
- // SvxCheckListBox::RemoveEntry's exception behavior is
- // unspecified
- delete p;
} else {
++i;
}
@@ -1185,12 +1389,12 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
}
- for (USHORT i = 0; i < m_updates.getItemCount(); ++i) {
+ for (sal_uInt16 i = 0; i < m_updates.getItemCount(); ++i) {
UpdateDialog::Index const * p =
static_cast< UpdateDialog::Index const * >(
m_updates.GetEntryData(i));
- if (p->kind == ENABLED_UPDATE && m_updates.IsChecked(i)) {
- m_updateData.push_back(m_enabledUpdates[p->index.enabledUpdate]);
+ if (p->m_eKind == ENABLED_UPDATE && m_updates.IsChecked(i)) {
+ m_updateData.push_back( m_enabledUpdates[ p->m_nIndex ] );
}
}
@@ -1198,7 +1402,7 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
return 0;
}
-IMPL_LINK(UpdateDialog, cancelHandler, void *, EMPTYARG) {
+IMPL_LINK(UpdateDialog, closeHandler, void *, EMPTYARG) {
m_thread->stop();
EndDialog(RET_CANCEL);
return 0;
@@ -1214,15 +1418,15 @@ IMPL_LINK( UpdateDialog, hyperlink_clicked, svt::FixedHyperlink*, pHyperlink )
try
{
- css::uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
+ uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
m_context->getServiceManager()->createInstanceWithContext(
OUSTR( "com.sun.star.system.SystemShellExecute" ),
- m_context), css::uno::UNO_QUERY_THROW);
- //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException
+ m_context), uno::UNO_QUERY_THROW);
+ //throws lang::IllegalArgumentException, system::SystemShellExecuteException
xSystemShellExecute->execute(
- sURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS);
+ sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS);
}
- catch (css::uno::Exception& )
+ catch (uno::Exception& )
{
}
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index f59cdd5eb13f..ea1cc8d56201 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -45,6 +45,7 @@
#include "vcl/dialog.hxx"
#include "vcl/fixed.hxx"
#include <svtools/fixedhyper.hxx>
+#include <vcl/throbber.hxx>
#include "descedit.hxx"
#include "dp_gui_updatedata.hxx"
@@ -58,7 +59,6 @@ class ResId;
class Window;
namespace com { namespace sun { namespace star {
- namespace awt { class XThrobber; }
namespace deployment { class XExtensionManager;
class XPackage; }
namespace uno { class XComponentContext; }
@@ -97,7 +97,7 @@ public:
~UpdateDialog();
- virtual BOOL Close();
+ virtual sal_Bool Close();
virtual short Execute();
@@ -111,8 +111,7 @@ private:
struct DisabledUpdate;
struct SpecificError;
- union IndexUnion;
- friend union IndexUnion;
+ struct IgnoredUpdate;
struct Index;
friend struct Index;
class Thread;
@@ -126,44 +125,43 @@ private:
virtual ~CheckListBox();
- USHORT getItemCount() const;
+ sal_uInt16 getItemCount() const;
private:
CheckListBox(UpdateDialog::CheckListBox &); // not defined
void operator =(UpdateDialog::CheckListBox &); // not defined
virtual void MouseButtonDown(MouseEvent const & event);
-
virtual void MouseButtonUp(MouseEvent const & event);
-
virtual void KeyInput(KeyEvent const & event);
+ void handlePopupMenu( const Point &rPos );
+
+ rtl::OUString m_ignoreUpdate;
+ rtl::OUString m_ignoreAllUpdates;
+ rtl::OUString m_enableUpdate;
UpdateDialog & m_dialog;
};
friend class CheckListBox;
- void insertItem(
- rtl::OUString const & name, USHORT position,
- std::auto_ptr< UpdateDialog::Index const > index,
- SvLBoxButtonKind kind);
+ sal_uInt16 insertItem( UpdateDialog::Index *pIndex, SvLBoxButtonKind kind );
+ void addAdditional( UpdateDialog::Index *pIndex, SvLBoxButtonKind kind );
+ bool isIgnoredUpdate( UpdateDialog::Index *pIndex );
+ void setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll );
- void addAdditional(
- rtl::OUString const & name, USHORT position,
- std::auto_ptr< UpdateDialog::Index const > index,
- SvLBoxButtonKind kind);
-
- void addEnabledUpdate(
- rtl::OUString const & name, dp_gui::UpdateData const & data);
-
- void addDisabledUpdate(UpdateDialog::DisabledUpdate const & data);
- void addSpecificError(UpdateDialog::SpecificError const & data);
+ void addEnabledUpdate( rtl::OUString const & name, dp_gui::UpdateData & data );
+ void addDisabledUpdate( UpdateDialog::DisabledUpdate & data );
+ void addSpecificError( UpdateDialog::SpecificError & data );
void checkingDone();
void enableOk();
+ void getIgnoredUpdates();
+ void storeIgnoredUpdates();
+
void initDescription();
void clearDescription();
bool showDescription(::com::sun::star::uno::Reference<
@@ -178,13 +176,13 @@ private:
DECL_LINK(selectionHandler, void *);
DECL_LINK(allHandler, void *);
DECL_LINK(okHandler, void *);
- DECL_LINK(cancelHandler, void *);
+ DECL_LINK(closeHandler, void *);
DECL_LINK(hyperlink_clicked, svt::FixedHyperlink *);
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
m_context;
FixedText m_checking;
- com::sun::star::uno::Reference< com::sun::star::awt::XThrobber > m_throbber;
+ Throbber m_throbber;
FixedText m_update;
UpdateDialog::CheckListBox m_updates;
CheckBox m_all;
@@ -197,7 +195,7 @@ private:
FixedLine m_line;
HelpButton m_help;
PushButton m_ok;
- CancelButton m_cancel;
+ PushButton m_close;
rtl::OUString m_error;
rtl::OUString m_none;
rtl::OUString m_noInstallable;
@@ -209,18 +207,22 @@ private:
rtl::OUString m_noDependencyCurVer;
rtl::OUString m_browserbased;
rtl::OUString m_version;
+ rtl::OUString m_ignoredUpdate;
std::vector< dp_gui::UpdateData > m_enabledUpdates;
std::vector< UpdateDialog::DisabledUpdate > m_disabledUpdates;
- std::vector< rtl::OUString > m_generalErrors;
std::vector< UpdateDialog::SpecificError > m_specificErrors;
+ std::vector< UpdateDialog::IgnoredUpdate* > m_ignoredUpdates;
+ std::vector< Index* > m_ListboxEntries;
std::vector< dp_gui::UpdateData > & m_updateData;
rtl::Reference< UpdateDialog::Thread > m_thread;
::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager;
- Point m_aFirstLinePos;
- Size m_aFirstLineSize;
- long m_nFirstLineDelta;
- long m_nOneLineMissing;
+ Point m_aFirstLinePos;
+ Size m_aFirstLineSize;
+ long m_nFirstLineDelta;
+ long m_nOneLineMissing;
+ sal_uInt16 m_nLastID;
+ bool m_bModified;
};
}
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 7e601851e757..b6b6bb7c41e3 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -60,11 +60,11 @@ ModalDialog RID_DLG_UPDATE {
Right = TRUE;
NoLabel = TRUE;
};
- Control RID_DLG_UPDATE_THROBBER {
+ FixedImage RID_DLG_UPDATE_THROBBER {
Pos = MAP_APPFONT(
RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - RSC_CD_FIXEDTEXT_HEIGHT,
RSC_SP_DLG_INNERBORDER_TOP);
- Size = MAP_APPFONT(RSC_CD_FIXEDTEXT_HEIGHT, RSC_CD_FIXEDTEXT_HEIGHT);
+ Size = MAP_APPFONT(RSC_CD_FIXEDTEXT_HEIGHT, RSC_CD_FIXEDTEXT_HEIGHT + 1);
};
FixedText RID_DLG_UPDATE_UPDATE {
Disable = TRUE;
@@ -86,6 +86,7 @@ ModalDialog RID_DLG_UPDATE {
TabStop = TRUE;
};
CheckBox RID_DLG_UPDATE_ALL {
+ HelpID = "desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL";
Disable = TRUE;
Pos = MAP_APPFONT(
RSC_SP_DLG_INNERBORDER_LEFT,
@@ -150,6 +151,7 @@ ModalDialog RID_DLG_UPDATE {
Text[en-US] = "Release Notes";
};
MultiLineEdit RID_DLG_UPDATE_DESCRIPTIONS {
+ HelpID = "desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS";
Disable = TRUE;
Border = TRUE;
Pos = MAP_APPFONT(
@@ -183,6 +185,7 @@ ModalDialog RID_DLG_UPDATE {
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
};
PushButton RID_DLG_UPDATE_OK {
+ HelpID = "desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK";
Disable = TRUE;
Pos = MAP_APPFONT(
(RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - RSC_CD_PUSHBUTTON_WIDTH -
@@ -196,7 +199,7 @@ ModalDialog RID_DLG_UPDATE {
Text[en-US] = "~Install";
DefButton = TRUE;
};
- CancelButton RID_DLG_UPDATE_CANCEL {
+ PushButton RID_DLG_UPDATE_CLOSE {
Pos = MAP_APPFONT(
RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - RSC_CD_PUSHBUTTON_WIDTH,
(RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
@@ -205,6 +208,7 @@ ModalDialog RID_DLG_UPDATE {
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + RSC_SP_FLGR_SPACE_Y +
RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y));
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
+ Text[en-US] = "Close";
};
Image RID_DLG_UPDATE_NORMALALERT {
@@ -219,7 +223,7 @@ ModalDialog RID_DLG_UPDATE {
Text[en-US] = "No new updates are available.";
};
String RID_DLG_UPDATE_NOINSTALLABLE {
- Text[en-US] = "No installable updates are available. To see all updates, mark the check box 'Show all updates'.";
+ Text[en-US] = "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'.";
};
String RID_DLG_UPDATE_FAILURE {
Text[en-US] = "An error occurred:";
@@ -228,7 +232,7 @@ ModalDialog RID_DLG_UPDATE {
Text[en-US] = "Unknown error.";
};
String RID_DLG_UPDATE_NODESCRIPTION {
- Text[en-US] = "No descriptions available for this extension.";
+ Text[en-US] = "No more details are available for this update.";
};
String RID_DLG_UPDATE_NOINSTALL {
Text[en-US] = "The extension cannot be updated because:";
@@ -242,10 +246,21 @@ ModalDialog RID_DLG_UPDATE {
String RID_DLG_UPDATE_BROWSERBASED {
Text[en-US] = "browser based update";
};
-
String RID_DLG_UPDATE_VERSION {
Text[en-US] = "Version";
};
+ String RID_DLG_UPDATE_IGNORE {
+ Text[en-US] = "Ignore this Update";
+ };
+ String RID_DLG_UPDATE_IGNORE_ALL {
+ Text[en-US] = "Ignore all Updates";
+ };
+ String RID_DLG_UPDATE_ENABLE {
+ Text[en-US] = "Enable Updates";
+ };
+ String RID_DLG_UPDATE_IGNORED_UPDATE {
+ Text[en-US] = "This update will be ignored.\n";
+ };
};
WarningBox RID_WARNINGBOX_UPDATE_SHARED_EXTENSION
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 0fc88df8ecce..928561ff9d0b 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -262,14 +262,14 @@ UpdateInstallDialog::UpdateInstallDialog(
m_xExtensionManager = css::deployment::ExtensionManager::get( xCtx );
m_cancel.SetClickHdl(LINK(this, UpdateInstallDialog, cancelHandler));
- m_mle_info.EnableCursor(FALSE);
+ m_mle_info.EnableCursor(sal_False);
if ( ! dp_misc::office_is_running())
m_help.Disable();
}
UpdateInstallDialog::~UpdateInstallDialog() {}
-BOOL UpdateInstallDialog::Close()
+sal_Bool UpdateInstallDialog::Close()
{
m_thread->stop();
return ModalDialog::Close();
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index a7b11ef355ec..4f89fdf4a4d7 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -80,7 +80,7 @@ public:
~UpdateInstallDialog();
- BOOL Close();
+ sal_Bool Close();
virtual short Execute();
private:
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
index d77dd256582c..f7cc93493b5d 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
@@ -90,6 +90,7 @@ ModalDialog RID_DLG_UPDATEINSTALL {
};
MultiLineEdit RID_DLG_UPDATE_INSTALL_INFO {
+ HelpID = "desktop:MultiLineEdit:RID_DLG_UPDATEINSTALL:RID_DLG_UPDATE_INSTALL_INFO";
Pos = MAP_APPFONT(
RSC_SP_DLG_INNERBORDER_LEFT,
RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
diff --git a/desktop/source/deployment/gui/dp_gui_versionboxes.src b/desktop/source/deployment/gui/dp_gui_versionboxes.src
index 878521ad6dd2..878521ad6dd2 100644..100755
--- a/desktop/source/deployment/gui/dp_gui_versionboxes.src
+++ b/desktop/source/deployment/gui/dp_gui_versionboxes.src
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 32faa7123b5b..ebe7c2b52ecb 100644..100755
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -63,7 +63,7 @@ namespace dp_gui {
class LicenseView : public MultiLineEdit, public SfxListener
{
- BOOL mbEndReached;
+ sal_Bool mbEndReached;
Link maEndReachedHdl;
Link maScrolledHdl;
@@ -73,9 +73,9 @@ public:
void ScrollDown( ScrollType eScroll );
- BOOL IsEndReached() const;
- BOOL EndReached() const { return mbEndReached; }
- void SetEndReached( BOOL bEnd ) { mbEndReached = bEnd; }
+ sal_Bool IsEndReached() const;
+ sal_Bool EndReached() const { return mbEndReached; }
+ void SetEndReached( sal_Bool bEnd ) { mbEndReached = bEnd; }
void SetEndReachedHdl( const Link& rHdl ) { maEndReachedHdl = rHdl; }
const Link& GetAutocompleteHdl() const { return maEndReachedHdl; }
@@ -146,20 +146,20 @@ void LicenseView::ScrollDown( ScrollType eScroll )
pScroll->DoScrollAction( eScroll );
}
-BOOL LicenseView::IsEndReached() const
+sal_Bool LicenseView::IsEndReached() const
{
- BOOL bEndReached;
+ sal_Bool bEndReached;
ExtTextView* pView = GetTextView();
ExtTextEngine* pEdit = GetTextEngine();
- ULONG nHeight = pEdit->GetTextHeight();
+ sal_uLong nHeight = pEdit->GetTextHeight();
Size aOutSize = pView->GetWindow()->GetOutputSizePixel();
Point aBottom( 0, aOutSize.Height() );
- if ( (ULONG) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
- bEndReached = TRUE;
+ if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
+ bEndReached = sal_True;
else
- bEndReached = FALSE;
+ bEndReached = sal_False;
return bEndReached;
}
@@ -168,8 +168,8 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.IsA( TYPE(TextHint) ) )
{
- BOOL bLastVal = EndReached();
- ULONG nId = ((const TextHint&)rHint).GetId();
+ sal_Bool bLastVal = EndReached();
+ sal_uLong nId = ((const TextHint&)rHint).GetId();
if ( nId == TEXT_HINT_PARAINSERTED )
{
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index 2bddfd4f4102..2bddfd4f4102 100644..100755
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
index 509761c5b1e1..73ca83792592 100644..100755
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -103,3 +103,11 @@ RESLIB1IMAGES= $(PRJ)$/res
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/deploymentgui.component
+
+$(MISC)/deploymentgui.component .ERRREMOVE : \
+ $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component
diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx
index 22e9e357b549..22e9e357b549 100644..100755
--- a/desktop/source/deployment/inc/db.hxx
+++ b/desktop/source/deployment/inc/db.hxx
diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx
index e39c70c99a91..e39c70c99a91 100644..100755
--- a/desktop/source/deployment/inc/dp_dependencies.hxx
+++ b/desktop/source/deployment/inc/dp_dependencies.hxx
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index d16e9127af8a..d16e9127af8a 100644..100755
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx
index f58b7663a173..f58b7663a173 100644..100755
--- a/desktop/source/deployment/inc/dp_identifier.hxx
+++ b/desktop/source/deployment/inc/dp_identifier.hxx
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 7a59e944f6af..7a59e944f6af 100644..100755
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
index 9e912531e9f8..9e912531e9f8 100644..100755
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
diff --git a/desktop/source/deployment/inc/dp_misc.mk b/desktop/source/deployment/inc/dp_misc.mk
index 829a6bb96bbf..829a6bb96bbf 100644..100755
--- a/desktop/source/deployment/inc/dp_misc.mk
+++ b/desktop/source/deployment/inc/dp_misc.mk
diff --git a/desktop/source/deployment/inc/dp_misc_api.hxx b/desktop/source/deployment/inc/dp_misc_api.hxx
index fbc248a1dfb2..fbc248a1dfb2 100644..100755
--- a/desktop/source/deployment/inc/dp_misc_api.hxx
+++ b/desktop/source/deployment/inc/dp_misc_api.hxx
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index c078cf902ec5..c078cf902ec5 100644..100755
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index b2b9fad07f49..b2b9fad07f49 100644..100755
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index 132e5df375a6..d23b187c2275 100644..100755
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -40,12 +40,12 @@
namespace dp_misc {
//==============================================================================
-ResId getResId( USHORT id );
+ResId getResId( sal_uInt16 id );
//==============================================================================
-DESKTOP_DEPLOYMENTMISC_DLLPUBLIC String getResourceString( USHORT id );
+DESKTOP_DEPLOYMENTMISC_DLLPUBLIC String getResourceString( sal_uInt16 id );
-template <typename Unique, USHORT id>
+template <typename Unique, sal_uInt16 id>
struct StaticResourceString :
public ::rtl::StaticWithInit<const ::rtl::OUString, Unique> {
const ::rtl::OUString operator () () { return getResourceString(id); }
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index 22d54de5885a..22d54de5885a 100644..100755
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx
index 1f22b2bb8d40..1f22b2bb8d40 100644..100755
--- a/desktop/source/deployment/inc/dp_update.hxx
+++ b/desktop/source/deployment/inc/dp_update.hxx
diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx
index f335b986c5e3..f335b986c5e3 100644..100755
--- a/desktop/source/deployment/inc/dp_version.hxx
+++ b/desktop/source/deployment/inc/dp_version.hxx
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index 4e178e1b37bf..4e178e1b37bf 100644..100755
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index ce494b449608..877379ad7300 100644..100755
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -109,3 +109,11 @@ RESLIB1SRSFILES += $(SRS)$/deployment_misc.srs
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/deployment.component
+
+$(MISC)/deployment.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ deployment.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt deployment.component
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index f220aaf40daa..f220aaf40daa 100644..100755
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index 2a4d18686346..2a4d18686346 100644..100755
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 78448cfa1726..78448cfa1726 100644..100755
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index 59349c469af0..59349c469af0 100644..100755
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 1b84fea78f77..f1236a5406dc 100644..100755
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -178,12 +178,8 @@ ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& x
::cppu::WeakComponentImplHelper1< css::deployment::XExtensionManager >(getMutex()),
m_xContext( xContext )
{
- Reference<deploy::XPackageManagerFactory> xPackageManagerFactory(
- deploy::thePackageManagerFactory::get(m_xContext));
- m_userRepository = xPackageManagerFactory->getPackageManager(OUSTR("user"));
- m_sharedRepository = xPackageManagerFactory->getPackageManager(OUSTR("shared"));
- m_bundledRepository = xPackageManagerFactory->getPackageManager(OUSTR("bundled"));
- m_tmpRepository = xPackageManagerFactory->getPackageManager(OUSTR("tmp"));
+ m_xPackageManagerFactory = deploy::thePackageManagerFactory::get(m_xContext);
+ OSL_ASSERT(m_xPackageManagerFactory.is());
m_repositoryNames.push_back(OUSTR("user"));
m_repositoryNames.push_back(OUSTR("shared"));
@@ -196,6 +192,23 @@ ExtensionManager::~ExtensionManager()
{
}
+Reference<deploy::XPackageManager> ExtensionManager::getUserRepository()
+{
+ return m_xPackageManagerFactory->getPackageManager(OUSTR("user"));
+}
+Reference<deploy::XPackageManager> ExtensionManager::getSharedRepository()
+{
+ return m_xPackageManagerFactory->getPackageManager(OUSTR("shared"));
+}
+Reference<deploy::XPackageManager> ExtensionManager::getBundledRepository()
+{
+ return m_xPackageManagerFactory->getPackageManager(OUSTR("bundled"));
+}
+Reference<deploy::XPackageManager> ExtensionManager::getTmpRepository()
+{
+ return m_xPackageManagerFactory->getPackageManager(OUSTR("tmp"));
+}
+
Reference<task::XAbortChannel> ExtensionManager::createAbortChannel()
throw (uno::RuntimeException)
{
@@ -208,11 +221,11 @@ ExtensionManager::getPackageManager(::rtl::OUString const & repository)
{
Reference<deploy::XPackageManager> xPackageManager;
if (repository.equals(OUSTR("user")))
- xPackageManager = m_userRepository;
+ xPackageManager = getUserRepository();
else if (repository.equals(OUSTR("shared")))
- xPackageManager = m_sharedRepository;
+ xPackageManager = getSharedRepository();
else if (repository.equals(OUSTR("bundled")))
- xPackageManager = m_bundledRepository;
+ xPackageManager = getBundledRepository();
else
throw lang::IllegalArgumentException(
OUSTR("No valid repository name provided."),
@@ -281,7 +294,7 @@ void ExtensionManager::addExtensionsToMap(
{
::std::list<Reference<deploy::XPackage> > extensionList;
Reference<deploy::XPackageManager> lRepos[] = {
- m_userRepository, m_sharedRepository, m_bundledRepository };
+ getUserRepository(), getSharedRepository(), getBundledRepository() };
for (int i(0); i != SAL_N_ELEMENTS(lRepos); ++i)
{
Reference<deploy::XPackage> xPackage;
@@ -492,7 +505,7 @@ Reference<deploy::XPackage> ExtensionManager::backupExtension(
if (xOldExtension.is())
{
- xBackup = m_tmpRepository->addPackage(
+ xBackup = getTmpRepository()->addPackage(
xOldExtension->getURL(), uno::Sequence<beans::NamedValue>(),
OUString(), Reference<task::XAbortChannel>(), tmpCmdEnv);
@@ -513,7 +526,7 @@ uno::Sequence< Reference<deploy::XPackageTypeInfo> >
ExtensionManager::getSupportedPackageTypes()
throw (uno::RuntimeException)
{
- return m_userRepository->getSupportedPackageTypes();
+ return getUserRepository()->getSupportedPackageTypes();
}
//Do some necessary checks and user interaction. This function does not
//aquire the extension manager mutex and that mutex must not be aquired
@@ -633,9 +646,9 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
//Determine the repository to use
Reference<deploy::XPackageManager> xPackageManager;
if (repository.equals(OUSTR("user")))
- xPackageManager = m_userRepository;
+ xPackageManager = getUserRepository();
else if (repository.equals(OUSTR("shared")))
- xPackageManager = m_sharedRepository;
+ xPackageManager = getSharedRepository();
else
throw lang::IllegalArgumentException(
OUSTR("No valid repository name provided."),
@@ -648,7 +661,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
getTempExtension(url, xAbortChannel, xCmdEnv);
//Make sure the extension is removed from the tmp repository in case
//of an exception
- ExtensionRemoveGuard tmpExtensionRemoveGuard(xTmpExtension, m_tmpRepository);
+ ExtensionRemoveGuard tmpExtensionRemoveGuard(xTmpExtension, getTmpRepository());
const OUString sIdentifier = dp_misc::getIdentifier(xTmpExtension);
const OUString sFileName = xTmpExtension->getName();
Reference<deploy::XPackage> xOldExtension;
@@ -692,7 +705,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
//the xTmpExtension
//no command environment supplied, only this class shall interact
//with the user!
- xExtensionBackup = m_tmpRepository->importExtension(
+ xExtensionBackup = getTmpRepository()->importExtension(
xOldExtension, Reference<task::XAbortChannel>(),
Reference<ucb::XCommandEnvironment>());
tmpExtensionRemoveGuard.reset(xExtensionBackup);
@@ -845,9 +858,9 @@ void ExtensionManager::removeExtension(
{
//Determine the repository to use
if (repository.equals(OUSTR("user")))
- xPackageManager = m_userRepository;
+ xPackageManager = getUserRepository();
else if (repository.equals(OUSTR("shared")))
- xPackageManager = m_sharedRepository;
+ xPackageManager = getSharedRepository();
else
throw lang::IllegalArgumentException(
OUSTR("No valid repository name provided."),
@@ -907,7 +920,7 @@ void ExtensionManager::removeExtension(
Reference<task::XAbortChannel>(),
tmpCmdEnv);
- m_tmpRepository->removePackage(
+ getTmpRepository()->removePackage(
dp_misc::getIdentifier(xExtensionBackup),
xExtensionBackup->getName(), xAbortChannel, xCmdEnv);
fireModified();
@@ -920,7 +933,7 @@ void ExtensionManager::removeExtension(
}
if (xExtensionBackup.is())
- m_tmpRepository->removePackage(
+ getTmpRepository()->removePackage(
dp_misc::getIdentifier(xExtensionBackup),
xExtensionBackup->getName(), xAbortChannel, xCmdEnv);
}
@@ -1147,13 +1160,13 @@ uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > >
id2extensions mapExt;
uno::Sequence<Reference<deploy::XPackage> > userExt =
- m_userRepository->getDeployedPackages(xAbort, xCmdEnv);
+ getUserRepository()->getDeployedPackages(xAbort, xCmdEnv);
addExtensionsToMap(mapExt, userExt, OUSTR("user"));
uno::Sequence<Reference<deploy::XPackage> > sharedExt =
- m_sharedRepository->getDeployedPackages(xAbort, xCmdEnv);
+ getSharedRepository()->getDeployedPackages(xAbort, xCmdEnv);
addExtensionsToMap(mapExt, sharedExt, OUSTR("shared"));
uno::Sequence<Reference<deploy::XPackage> > bundledExt =
- m_bundledRepository->getDeployedPackages(xAbort, xCmdEnv);
+ getBundledRepository()->getDeployedPackages(xAbort, xCmdEnv);
addExtensionsToMap(mapExt, bundledExt, OUSTR("bundled"));
//copy the values of the map to a vector for sorting
@@ -1223,7 +1236,7 @@ void ExtensionManager::reinstallDeployedExtensions(
const OUString id = dp_misc::getIdentifier(extensions[ pos ]);
const OUString fileName = extensions[ pos ]->getName();
OSL_ASSERT(id.getLength());
- activateExtension(id, fileName, false, false, xAbortChannel, xCmdEnv );
+ activateExtension(id, fileName, false, true, xAbortChannel, xCmdEnv );
}
catch (lang::DisposedException &)
{
@@ -1247,6 +1260,64 @@ void ExtensionManager::reinstallDeployedExtensions(
}
}
+/** Works on the bundled repository. That is using the variables
+ BUNDLED_EXTENSIONS and BUNDLED_EXTENSIONS_USER.
+ */
+void ExtensionManager::synchronizeBundledPrereg(
+ Reference<task::XAbortChannel> const & xAbortChannel,
+ Reference<ucb::XCommandEnvironment> const & xCmdEnv )
+ throw (deploy::DeploymentException,
+ uno::RuntimeException)
+{
+ try
+ {
+ String sSynchronizingBundled(StrSyncRepository::get());
+ sSynchronizingBundled.SearchAndReplaceAllAscii( "%NAME", OUSTR("bundled"));
+ dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled);
+
+ Reference<deploy::XPackageManagerFactory> xPackageManagerFactory(
+ deploy::thePackageManagerFactory::get(m_xContext));
+
+ Reference<deploy::XPackageManager> xMgr =
+ xPackageManagerFactory->getPackageManager(OUSTR("bundled_prereg"));
+ xMgr->synchronize(xAbortChannel, xCmdEnv);
+ progressBundled.update(OUSTR("\n\n"));
+
+ uno::Sequence<Reference<deploy::XPackage> > extensions = xMgr->getDeployedPackages(
+ xAbortChannel, xCmdEnv);
+ try
+ {
+ for (sal_Int32 i = 0; i < extensions.getLength(); i++)
+ {
+ extensions[i]->registerPackage(true, xAbortChannel, xCmdEnv);
+ }
+ }
+ catch (...)
+ {
+ OSL_ASSERT(0);
+ }
+ OUString lastSyncBundled(RTL_CONSTASCII_USTRINGPARAM(
+ "$BUNDLED_EXTENSIONS_PREREG/lastsynchronized"));
+ writeLastModified(lastSyncBundled, xCmdEnv);
+
+ } catch (deploy::DeploymentException& ) {
+ throw;
+ } catch (ucb::CommandFailedException & ) {
+ throw;
+ } catch (ucb::CommandAbortedException & ) {
+ throw;
+ } catch (lang::IllegalArgumentException &) {
+ throw;
+ } catch (uno::RuntimeException &) {
+ throw;
+ } catch (...) {
+ uno::Any exc = ::cppu::getCaughtException();
+ throw deploy::DeploymentException(
+ OUSTR("Extension Manager: exception in synchronize"),
+ static_cast<OWeakObject*>(this), exc);
+ }
+}
+
sal_Bool ExtensionManager::synchronize(
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
@@ -1264,13 +1335,13 @@ sal_Bool ExtensionManager::synchronize(
String sSynchronizingShared(StrSyncRepository::get());
sSynchronizingShared.SearchAndReplaceAllAscii( "%NAME", OUSTR("shared"));
dp_misc::ProgressLevel progressShared(xCmdEnv, sSynchronizingShared);
- bModified = m_sharedRepository->synchronize(xAbortChannel, xCmdEnv);
+ bModified = getSharedRepository()->synchronize(xAbortChannel, xCmdEnv);
progressShared.update(OUSTR("\n\n"));
String sSynchronizingBundled(StrSyncRepository::get());
sSynchronizingBundled.SearchAndReplaceAllAscii( "%NAME", OUSTR("bundled"));
dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled);
- bModified |= m_bundledRepository->synchronize(xAbortChannel, xCmdEnv);
+ bModified |= getBundledRepository()->synchronize(xAbortChannel, xCmdEnv);
progressBundled.update(OUSTR("\n\n"));
//Always determine the active extension. This is necessary for the
@@ -1397,7 +1468,7 @@ Reference<deploy::XPackage> ExtensionManager::getTempExtension(
{
Reference<ucb::XCommandEnvironment> tmpCmdEnvA(new TmpRepositoryCommandEnv());
- Reference<deploy::XPackage> xTmpPackage = m_tmpRepository->addPackage(
+ Reference<deploy::XPackage> xTmpPackage = getTmpRepository()->addPackage(
url, uno::Sequence<beans::NamedValue>(),OUString(), xAbortChannel, tmpCmdEnvA);
if (!xTmpPackage.is())
{
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 6bb8fa6e6377..6c6bd5cb41f3 100644..100755
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -200,6 +200,12 @@ public:
css::lang::IllegalArgumentException,
css::uno::RuntimeException);
+ virtual void SAL_CALL synchronizeBundledPrereg(
+ css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
+ throw (css::deployment::DeploymentException,
+ css::uno::RuntimeException);
+
virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL
getExtensionsWithUnacceptedLicenses(
::rtl::OUString const & repository,
@@ -224,11 +230,7 @@ private:
};
css::uno::Reference< css::uno::XComponentContext> m_xContext;
-
- css::uno::Reference<css::deployment::XPackageManager> m_userRepository;
- css::uno::Reference<css::deployment::XPackageManager> m_sharedRepository;
- css::uno::Reference<css::deployment::XPackageManager> m_bundledRepository;
- css::uno::Reference<css::deployment::XPackageManager> m_tmpRepository;
+ css::uno::Reference<css::deployment::XPackageManagerFactory> m_xPackageManagerFactory;
//only to be used within addExtension
::osl::Mutex m_addMutex;
@@ -238,6 +240,11 @@ private:
*/
::std::list< ::rtl::OUString > m_repositoryNames;
+ css::uno::Reference<css::deployment::XPackageManager> getUserRepository();
+ css::uno::Reference<css::deployment::XPackageManager> getSharedRepository();
+ css::uno::Reference<css::deployment::XPackageManager> getBundledRepository();
+ css::uno::Reference<css::deployment::XPackageManager> getTmpRepository();
+
bool isUserDisabled(::rtl::OUString const & identifier,
::rtl::OUString const & filename);
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 8021efe9dd3c..75fd006814bb 100644..100755
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -41,9 +41,8 @@
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/registry/XRegistryKey.hpp"
#include "com/sun/star/task/XAbortChannel.hpp"
-#include "com/sun/star/ucb/CommandFailedException.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
#include "com/sun/star/xml/dom/XElement.hpp"
#include "com/sun/star/xml/dom/XNode.hpp"
@@ -72,9 +71,8 @@ namespace xml = com::sun::star::xml ;
namespace dp_info {
class PackageInformationProvider :
- public ::cppu::WeakImplHelper3< deployment::XPackageInformationProvider,
- css_ucb::XCommandEnvironment,
- task::XInteractionHandler >
+ public ::cppu::WeakImplHelper1< deployment::XPackageInformationProvider >
+
{
public:
PackageInformationProvider( uno::Reference< uno::XComponentContext >const& xContext);
@@ -83,16 +81,6 @@ class PackageInformationProvider :
static uno::Sequence< rtl::OUString > getServiceNames();
static rtl::OUString getImplName();
- // XInteractionHandler
- virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& Request )
- throw( uno::RuntimeException );
- // XCommandEnvironment
- virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler()
- throw ( uno::RuntimeException ) { return static_cast<task::XInteractionHandler*>(this); };
-
- virtual uno::Reference< css_ucb::XProgressHandler > SAL_CALL getProgressHandler()
- throw ( uno::RuntimeException ) { return uno::Reference< css_ucb::XProgressHandler >(); };
-
// XPackageInformationProvider
virtual rtl::OUString SAL_CALL getPackageLocation( const rtl::OUString& extensionId )
throw ( uno::RuntimeException );
@@ -126,17 +114,6 @@ PackageInformationProvider::~PackageInformationProvider()
}
//------------------------------------------------------------------------------
-void SAL_CALL PackageInformationProvider::handle( uno::Reference< task::XInteractionRequest > const & rRequest)
- throw (uno::RuntimeException)
-{
- uno::Sequence< uno::Reference< task::XInteractionContinuation > > xContinuations = rRequest->getContinuations();
- if ( xContinuations.getLength() == 1 )
- {
- xContinuations[0]->select();
- }
-}
-
-//------------------------------------------------------------------------------
rtl::OUString PackageInformationProvider::getPackageLocation(
const rtl::OUString & repository,
const rtl::OUString& _rExtensionId )
@@ -151,7 +128,7 @@ rtl::OUString PackageInformationProvider::getPackageLocation(
xManager->getDeployedExtensions(
repository,
uno::Reference< task::XAbortChannel >(),
- static_cast < XCommandEnvironment *> (this) ) );
+ uno::Reference< css_ucb::XCommandEnvironment > () ) );
for ( int pos = packages.getLength(); pos--; )
{
@@ -321,7 +298,7 @@ uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL PackageInformationProvi
const uno::Sequence< uno::Sequence< uno::Reference<deployment::XPackage > > >
allExt = mgr->getAllExtensions(
uno::Reference< task::XAbortChannel >(),
- static_cast < XCommandEnvironment *> (this) );
+ uno::Reference< css_ucb::XCommandEnvironment > () );
uno::Sequence< uno::Sequence< rtl::OUString > > retList;
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index c75cb6375643..1158056e64c8 100644..100755
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -371,6 +371,24 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
//No stamp file. We assume that bundled is always readonly. It must not be
//modified from ExtensionManager but only by the installer
}
+ else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled_prereg") )) {
+ //This is a bundled repository but the registration data
+ //is in the brand layer: share/prereg
+ //It is special because the registration data are copied at the first startup
+ //into the user installation. The processed help and xcu files are not
+ //copied. Instead the backenddb.xml for the help backend references the help
+ //by using $BUNDLED_EXTENSION_PREREG instead $BUNDLED_EXTENSIONS_USER. The
+ //configmgr.ini also used $BUNDLED_EXTENSIONS_PREREG to refer to the xcu file
+ //which contain the replacement for %origin%.
+ that->m_activePackages = OUSTR(
+ "vnd.sun.star.expand:$BUNDLED_EXTENSIONS");
+ that->m_registrationData = OUSTR(
+ "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG");
+ that->m_registryCache = OUSTR(
+ "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/registry");
+ logFile = OUSTR(
+ "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/log.txt");
+ }
else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("tmp") )) {
that->m_activePackages = OUSTR(
"vnd.sun.star.expand:$TMP_EXTENSIONS/extensions");
@@ -950,6 +968,8 @@ void PackageManagerImpl::removePackage(
contentRemoved.writeStream( xData, true /* replace existing */ );
}
m_activePackagesDB->erase( id, fileName ); // to be removed upon next start
+ //remove any cached data hold by the backend
+ m_xRegistry->packageRemoved(xPackage->getURL(), xPackage->getPackageType()->getMediaType());
}
try_dispose( xPackage );
@@ -990,7 +1010,8 @@ OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data )
//The bundled extensions are not contained in an additional folder
//with a unique name. data.temporaryName contains already the
//UTF8 encoded folder name. See PackageManagerImpl::synchronize
- if (!m_context.equals(OUSTR("bundled")))
+ if (!m_context.equals(OUSTR("bundled"))
+ && !m_context.equals(OUSTR("bundled_prereg")))
{
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("_/") );
buf.append( ::rtl::Uri::encode( data.fileName, rtl_UriCharClassPchar,
@@ -1342,6 +1363,8 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
Reference<css::ucb::XCommandEnvironment> const & xCmdEnv)
{
bool bModified = false;
+ OSL_ASSERT(!m_context.equals(OUSTR("user")));
+
ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() );
//check if the folder exist at all. The shared extension folder
//may not exist for a normal user.
@@ -1367,8 +1390,8 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
//The temporary folders of user and shared have an '_' at then end.
//But the name in ActivePackages.temporaryName is saved without.
OUString title2 = title;
- bool bNotBundled = !m_context.equals(OUSTR("bundled"));
- if (bNotBundled)
+ bool bShared = m_context.equals(OUSTR("shared"));
+ if (bShared)
{
OSL_ASSERT(title2[title2.getLength() -1] == '_');
title2 = title2.copy(0, title2.getLength() -1);
@@ -1390,7 +1413,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
// an added extension
OUString url(m_activePackages_expanded + OUSTR("/") + titleEncoded);
OUString sExtFolder;
- if (bNotBundled) //that is, shared
+ if (bShared) //that is, shared
{
//Check if the extension was not "deleted" already which is indicated
//by a xxx.tmpremoved file
@@ -1412,7 +1435,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
ActivePackages::Data dbData;
dbData.temporaryName = titleEncoded;
- if (bNotBundled)
+ if (bShared)
dbData.fileName = sExtFolder;
else
dbData.fileName = title;
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 3b335d7e2362..3b335d7e2362 100644..100755
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
diff --git a/desktop/source/deployment/manager/dp_manager.hrc b/desktop/source/deployment/manager/dp_manager.hrc
index 6131cc381abf..6131cc381abf 100644..100755
--- a/desktop/source/deployment/manager/dp_manager.hrc
+++ b/desktop/source/deployment/manager/dp_manager.hrc
diff --git a/desktop/source/deployment/manager/dp_manager.src b/desktop/source/deployment/manager/dp_manager.src
index 7d38b880c37a..7d38b880c37a 100644..100755
--- a/desktop/source/deployment/manager/dp_manager.src
+++ b/desktop/source/deployment/manager/dp_manager.src
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index cb2f3b7f4387..cb2f3b7f4387 100644..100755
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx
index a2a568287f16..a2a568287f16 100644..100755
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index 103227f29226..103227f29226 100644..100755
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
diff --git a/desktop/source/deployment/manager/makefile.mk b/desktop/source/deployment/manager/makefile.mk
index 4dc6405e34bf..4dc6405e34bf 100644..100755
--- a/desktop/source/deployment/manager/makefile.mk
+++ b/desktop/source/deployment/manager/makefile.mk
diff --git a/desktop/source/deployment/misc/db.cxx b/desktop/source/deployment/misc/db.cxx
index 6ba2c25bc92c..6ba2c25bc92c 100644..100755
--- a/desktop/source/deployment/misc/db.cxx
+++ b/desktop/source/deployment/misc/db.cxx
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 6b937547ae93..6b937547ae93 100644..100755
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 90592c645c93..90592c645c93 100644..100755
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx
index b24ccd7def52..b24ccd7def52 100644..100755
--- a/desktop/source/deployment/misc/dp_identifier.cxx
+++ b/desktop/source/deployment/misc/dp_identifier.cxx
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index c42ccd249cb7..c42ccd249cb7 100644..100755
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index ba7952364663..ba7952364663 100644..100755
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
diff --git a/desktop/source/deployment/misc/dp_misc.hrc b/desktop/source/deployment/misc/dp_misc.hrc
index 55fabac5c5b5..55fabac5c5b5 100644..100755
--- a/desktop/source/deployment/misc/dp_misc.hrc
+++ b/desktop/source/deployment/misc/dp_misc.hrc
diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src
index 4639879d7582..d18fc4c45f16 100644..100755
--- a/desktop/source/deployment/misc/dp_misc.src
+++ b/desktop/source/deployment/misc/dp_misc.src
@@ -32,7 +32,7 @@ String RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN {
};
String RID_DEPLYOMENT_DEPENDENCIES_MIN {
- Text[en-US] = "Extensions requires at least %PRODUCTNAME %VERSION";
+ Text[en-US] = "Extension requires at least %PRODUCTNAME %VERSION";
};
String RID_DEPLYOMENT_DEPENDENCIES_MAX {
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index eefe9282c69d..eefe9282c69d 100644..100755
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index ddf50090e99b..82c5847811e5 100644..100755
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -72,14 +72,14 @@ osl::Mutex s_mutex;
} // anon namespace
//==============================================================================
-ResId getResId( USHORT id )
+ResId getResId( sal_uInt16 id )
{
const osl::MutexGuard guard( s_mutex );
return ResId( id, *DeploymentResMgr::get() );
}
//==============================================================================
-String getResourceString( USHORT id )
+String getResourceString( sal_uInt16 id )
{
const osl::MutexGuard guard( s_mutex );
String ret( ResId( id, *DeploymentResMgr::get() ) );
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index fa3896aab8c4..fa3896aab8c4 100644..100755
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index 8aee216e44cc..8aee216e44cc 100644..100755
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx
index 5c563b7dafb7..5c563b7dafb7 100644..100755
--- a/desktop/source/deployment/misc/dp_version.cxx
+++ b/desktop/source/deployment/misc/dp_version.cxx
diff --git a/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk
index 3e4bd68cb4c0..3e4bd68cb4c0 100644..100755
--- a/desktop/source/deployment/misc/makefile.mk
+++ b/desktop/source/deployment/misc/makefile.mk
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index 7de93a00cd86..749ec3896e16 100644..100755
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -83,26 +83,29 @@ OUString ComponentBackendDb::getKeyElementName()
void ComponentBackendDb::addEntry(::rtl::OUString const & url, Data const & data)
{
try{
- Reference<css::xml::dom::XNode> componentNode = writeKeyElement(url);
- writeSimpleElement(OUSTR("java-type-library"),
- OUString::valueOf((sal_Bool) data.javaTypeLibrary),
- componentNode);
-
- writeSimpleList(
- data.implementationNames,
- OUSTR("implementation-names"),
- OUSTR("name"),
- componentNode);
-
- writeVectorOfPair(
- data.singletons,
- OUSTR("singletons"),
- OUSTR("item"),
- OUSTR("key"),
- OUSTR("value"),
- componentNode);
-
- save();
+ if (!activateEntry(url))
+ {
+ Reference<css::xml::dom::XNode> componentNode = writeKeyElement(url);
+ writeSimpleElement(OUSTR("java-type-library"),
+ OUString::valueOf((sal_Bool) data.javaTypeLibrary),
+ componentNode);
+
+ writeSimpleList(
+ data.implementationNames,
+ OUSTR("implementation-names"),
+ OUSTR("name"),
+ componentNode);
+
+ writeVectorOfPair(
+ data.singletons,
+ OUSTR("singletons"),
+ OUSTR("item"),
+ OUSTR("key"),
+ OUSTR("value"),
+ componentNode);
+
+ save();
+ }
}
catch(css::uno::Exception &)
{
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 2e0e39eea29c..2e0e39eea29c 100644..100755
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index b09b31e74961..b163a99d3432 100644..100755
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -66,6 +66,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using ::rtl::OUString;
+namespace css = com::sun::star;
namespace dp_registry {
namespace backend {
@@ -122,14 +123,15 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
BackendImpl * getMyBackend() const;
const OUString m_loader;
- ComponentBackendDb::Data m_registeredComponentsDb;
enum reg {
REG_UNINIT, REG_VOID, REG_REGISTERED, REG_NOT_REGISTERED, REG_MAYBE_REGISTERED
} m_registered;
- Reference<loader::XImplementationLoader> getComponentInfo(
- t_stringlist * pImplNames, t_stringpairvec * pSingletons,
+ void getComponentInfo(
+ ComponentBackendDb::Data * data,
+ std::vector< css::uno::Reference< css::uno::XInterface > > *
+ factories,
Reference<XComponentContext> const & xContext );
virtual void SAL_CALL disposing();
@@ -162,6 +164,30 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
};
friend class ComponentPackageImpl;
+ class ComponentsPackageImpl : public ::dp_registry::backend::Package
+ {
+ BackendImpl * getMyBackend() const;
+
+ // Package
+ virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_(
+ ::osl::ResettableMutexGuard & guard,
+ ::rtl::Reference<AbortChannel> const & abortChannel,
+ Reference<XCommandEnvironment> const & xCmdEnv );
+ virtual void processPackage_(
+ ::osl::ResettableMutexGuard & guard,
+ bool registerPackage,
+ bool startup,
+ ::rtl::Reference<AbortChannel> const & abortChannel,
+ Reference<XCommandEnvironment> const & xCmdEnv );
+ public:
+ ComponentsPackageImpl(
+ ::rtl::Reference<PackageRegistryBackend> const & myBackend,
+ OUString const & url, OUString const & name,
+ Reference<deployment::XPackageTypeInfo> const & xPackageType,
+ bool bRemoved, OUString const & identifier);
+ };
+ friend class ComponentsPackageImpl;
+
class TypelibraryPackageImpl : public ::dp_registry::backend::Package
{
BackendImpl * getMyBackend() const;
@@ -231,8 +257,20 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
t_stringlist m_jar_typelibs;
t_stringlist m_rdb_typelibs;
- t_stringlist & getTypelibs( bool jar ) {
- return jar ? m_jar_typelibs : m_rdb_typelibs;
+ t_stringlist m_components;
+
+ enum RcItem { RCITEM_JAR_TYPELIB, RCITEM_RDB_TYPELIB, RCITEM_COMPONENTS };
+
+ t_stringlist & getRcItemList( RcItem kind ) {
+ switch (kind)
+ {
+ case RCITEM_JAR_TYPELIB:
+ return m_jar_typelibs;
+ case RCITEM_RDB_TYPELIB:
+ return m_rdb_typelibs;
+ default: // case RCITEM_COMPONENTS
+ return m_components;
+ }
}
bool m_unorc_inited;
@@ -254,6 +292,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
const Reference<deployment::XPackageTypeInfo> m_xDynComponentTypeInfo;
const Reference<deployment::XPackageTypeInfo> m_xJavaComponentTypeInfo;
const Reference<deployment::XPackageTypeInfo> m_xPythonComponentTypeInfo;
+ const Reference<deployment::XPackageTypeInfo> m_xComponentsTypeInfo;
const Reference<deployment::XPackageTypeInfo> m_xRDBTypelibTypeInfo;
const Reference<deployment::XPackageTypeInfo> m_xJavaTypelibTypeInfo;
Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
@@ -268,8 +307,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
std::auto_ptr<ComponentBackendDb> m_backendDb;
void addDataToDb(OUString const & url, ComponentBackendDb::Data const & data);
- void deleteDataFromDb(OUString const & url);
ComponentBackendDb::Data readDataFromDb(OUString const & url);
+ void revokeEntryFromDb(OUString const & url);
//These rdbs are for writing new service entries. The rdb files are copies
@@ -291,13 +330,31 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
OUString const & id, Reference<XInterface> const & xObject );
void releaseObject( OUString const & id );
- bool addToUnoRc( bool jarFile, OUString const & url,
+ bool addToUnoRc( RcItem kind, OUString const & url,
Reference<XCommandEnvironment> const & xCmdEnv );
- bool removeFromUnoRc( bool jarFile, OUString const & url,
+ bool removeFromUnoRc( RcItem kind, OUString const & url,
Reference<XCommandEnvironment> const & xCmdEnv );
- bool hasInUnoRc( bool jarFile, OUString const & url );
+ bool hasInUnoRc( RcItem kind, OUString const & url );
+
+ css::uno::Reference< css::registry::XRegistryKey > openRegistryKey(
+ css::uno::Reference< css::registry::XRegistryKey > const & base,
+ rtl::OUString const & path);
+ void extractComponentData(
+ css::uno::Reference< css::uno::XComponentContext > const & context,
+ css::uno::Reference< css::registry::XRegistryKey > const & registry,
+ ComponentBackendDb::Data * data,
+ std::vector< css::uno::Reference< css::uno::XInterface > > * factories,
+ css::uno::Reference< css::loader::XImplementationLoader > const *
+ componentLoader,
+ rtl::OUString const * componentUrl);
+ void componentLiveInsertion(
+ ComponentBackendDb::Data const & data,
+ std::vector< css::uno::Reference< css::uno::XInterface > > const &
+ factories);
+
+ void componentLiveRemoval(ComponentBackendDb::Data const & data);
public:
BackendImpl( Sequence<Any> const & args,
@@ -307,6 +364,10 @@ public:
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
getSupportedPackageTypes() throw (RuntimeException);
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException);
+
using PackageRegistryBackend::disposing;
//Will be called from ComponentPackageImpl
@@ -328,13 +389,7 @@ BackendImpl::ComponentPackageImpl::ComponentPackageImpl(
xPackageType, bRemoved, identifier),
m_loader( loader ),
m_registered( REG_UNINIT )
-{
- if (bRemoved)
- {
- m_registeredComponentsDb = getMyBackend()->readDataFromDb(url);
- }
-}
-
+{}
const Reference<registry::XSimpleRegistry>
BackendImpl::ComponentPackageImpl::getRDB() const
@@ -570,6 +625,12 @@ BackendImpl::BackendImpl(
getResourceString(
RID_STR_PYTHON_COMPONENT),
RID_IMG_COMPONENT ) ),
+ m_xComponentsTypeInfo( new Package::TypeInfo(
+ OUSTR("application/"
+ "vnd.sun.star.uno-components"),
+ OUSTR("*.components"),
+ getResourceString(RID_STR_COMPONENTS),
+ RID_IMG_COMPONENT ) ),
m_xRDBTypelibTypeInfo( new Package::TypeInfo(
OUSTR("application/"
"vnd.sun.star.uno-typelibrary;"
@@ -589,8 +650,9 @@ BackendImpl::BackendImpl(
m_typeInfos[ 0 ] = m_xDynComponentTypeInfo;
m_typeInfos[ 1 ] = m_xJavaComponentTypeInfo;
m_typeInfos[ 2 ] = m_xPythonComponentTypeInfo;
- m_typeInfos[ 3 ] = m_xRDBTypelibTypeInfo;
- m_typeInfos[ 4 ] = m_xJavaTypelibTypeInfo;
+ m_typeInfos[ 3 ] = m_xComponentsTypeInfo;
+ m_typeInfos[ 4 ] = m_xRDBTypelibTypeInfo;
+ m_typeInfos[ 5 ] = m_xJavaTypelibTypeInfo;
const Reference<XCommandEnvironment> xCmdEnv;
@@ -632,12 +694,6 @@ void BackendImpl::addDataToDb(
m_backendDb->addEntry(url, data);
}
-void BackendImpl::deleteDataFromDb(OUString const & url)
-{
- if (m_backendDb.get())
- m_backendDb->removeEntry(url);
-}
-
ComponentBackendDb::Data BackendImpl::readDataFromDb(OUString const & url)
{
ComponentBackendDb::Data data;
@@ -646,6 +702,12 @@ ComponentBackendDb::Data BackendImpl::readDataFromDb(OUString const & url)
return data;
}
+void BackendImpl::revokeEntryFromDb(OUString const & url)
+{
+ if (m_backendDb.get())
+ m_backendDb->revokeEntry(url);
+}
+
// XPackageRegistry
//______________________________________________________________________________
Sequence< Reference<deployment::XPackageTypeInfo> >
@@ -654,6 +716,14 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
return m_typeInfos;
}
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException)
+{
+ if (m_backendDb.get())
+ m_backendDb->removeEntry(url);
+}
+
// PackageRegistryBackend
//______________________________________________________________________________
Reference<deployment::XPackage> BackendImpl::bindPackage_(
@@ -769,6 +839,17 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
}
}
else if (subType.EqualsIgnoreCaseAscii(
+ "vnd.sun.star.uno-components"))
+ {
+ INetContentTypeParameter const * param = params.find(
+ ByteString("platform") );
+ if (param == 0 || platform_fits( param->m_sValue )) {
+ return new BackendImpl::ComponentsPackageImpl(
+ this, url, name, m_xComponentsTypeInfo, bRemoved,
+ identifier);
+ }
+ }
+ else if (subType.EqualsIgnoreCaseAscii(
"vnd.sun.star.uno-typelibrary"))
{
INetContentTypeParameter const * param = params.find(
@@ -861,11 +942,50 @@ void BackendImpl::unorc_verify_init(
while (index >= 0);
}
if (readLine( &line, OUSTR("UNO_SERVICES="), ucb_content,
- RTL_TEXTENCODING_UTF8 )) {
- sal_Int32 start = sizeof ("UNO_SERVICES=?$ORIGIN/") - 1;
- sal_Int32 sep = line.indexOf( ' ', start );
- OSL_ASSERT( sep > 0 );
- m_commonRDB_RO = line.copy( start, sep - start );
+ RTL_TEXTENCODING_UTF8 ))
+ {
+ // The UNO_SERVICES line always has the BNF form
+ // "UNO_SERVICES="
+ // ("?$ORIGIN/" <common-rdb>)? -- first
+ // "${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}"? -- second
+ // ("?" ("BUNDLED_EXTENSIONS" | -- third
+ // "UNO_SHARED_PACKAGES_CACHE" | "UNO_USER_PACKAGES_CACHE")
+ // ...)*
+ // so can unambiguously be split into its thre parts:
+ int state = 1;
+ for (sal_Int32 i = RTL_CONSTASCII_LENGTH("UNO_SERVICES=");
+ i >= 0;)
+ {
+ rtl::OUString token(line.getToken(0, ' ', i));
+ if (token.getLength() != 0)
+ {
+ if (state == 1 &&
+ token.matchAsciiL(
+ RTL_CONSTASCII_STRINGPARAM("?$ORIGIN/")))
+ {
+ m_commonRDB_RO = token.copy(
+ RTL_CONSTASCII_LENGTH("?$ORIGIN/"));
+ state = 2;
+ }
+ else if (state <= 2 &&
+ token.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM(
+ "${$ORIGIN/${_OS}_${_ARCH}rc:"
+ "UNO_SERVICES}")))
+ {
+ state = 3;
+ }
+ else
+ {
+ if (token[0] == '?')
+ {
+ token = token.copy(1);
+ }
+ m_components.push_back(token);
+ state = 3;
+ }
+ }
+ }
}
// native rc:
@@ -941,16 +1061,27 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
OUString sCommonRDB(m_commonRDB.getLength() > 0 ? m_commonRDB : m_commonRDB_RO);
OUString sNativeRDB(m_nativeRDB.getLength() > 0 ? m_nativeRDB : m_nativeRDB_RO);
- if (sCommonRDB.getLength() > 0 || sNativeRDB.getLength() > 0)
+ if (sCommonRDB.getLength() > 0 || sNativeRDB.getLength() > 0 ||
+ !m_components.empty())
{
- buf.append( RTL_CONSTASCII_STRINGPARAM("UNO_SERVICES=?$ORIGIN/") );
- buf.append( ::rtl::OUStringToOString(
- sCommonRDB, RTL_TEXTENCODING_ASCII_US ) );
+ buf.append( RTL_CONSTASCII_STRINGPARAM("UNO_SERVICES=") );
+ bool space = false;
+ if (sCommonRDB.getLength() > 0)
+ {
+ buf.append( RTL_CONSTASCII_STRINGPARAM("?$ORIGIN/") );
+ buf.append( ::rtl::OUStringToOString(
+ sCommonRDB, RTL_TEXTENCODING_ASCII_US ) );
+ space = true;
+ }
if (sNativeRDB.getLength() > 0)
{
+ if (space)
+ {
+ buf.append(' ');
+ }
buf.append( RTL_CONSTASCII_STRINGPARAM(
- " ${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}") );
- buf.append(LF);
+ "${$ORIGIN/${_OS}_${_ARCH}rc:UNO_SERVICES}") );
+ space = true;
// write native rc:
::rtl::OStringBuffer buf2;
@@ -972,6 +1103,18 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
xCmdEnv );
ucb_content.writeStream( xData, true /* replace existing */ );
}
+ for (t_stringlist::iterator i(m_components.begin());
+ i != m_components.end(); ++i)
+ {
+ if (space)
+ {
+ buf.append(' ');
+ }
+ buf.append('?');
+ buf.append(rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8));
+ space = true;
+ }
+ buf.append(LF);
}
// write unorc:
@@ -988,13 +1131,13 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
}
//______________________________________________________________________________
-bool BackendImpl::addToUnoRc( bool jarFile, OUString const & url_,
+bool BackendImpl::addToUnoRc( RcItem kind, OUString const & url_,
Reference<XCommandEnvironment> const & xCmdEnv )
{
const OUString rcterm( dp_misc::makeRcTerm(url_) );
const ::osl::MutexGuard guard( getMutex() );
unorc_verify_init( xCmdEnv );
- t_stringlist & rSet = getTypelibs(jarFile);
+ t_stringlist & rSet = getRcItemList(kind);
if (::std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) {
rSet.push_front( rcterm ); // prepend to list, thus overriding
// write immediately:
@@ -1008,13 +1151,13 @@ bool BackendImpl::addToUnoRc( bool jarFile, OUString const & url_,
//______________________________________________________________________________
bool BackendImpl::removeFromUnoRc(
- bool jarFile, OUString const & url_,
+ RcItem kind, OUString const & url_,
Reference<XCommandEnvironment> const & xCmdEnv )
{
const OUString rcterm( dp_misc::makeRcTerm(url_) );
const ::osl::MutexGuard guard( getMutex() );
unorc_verify_init( xCmdEnv );
- getTypelibs(jarFile).remove( rcterm );
+ getRcItemList(kind).remove( rcterm );
// write immediately:
m_unorc_modified = true;
unorc_flush( xCmdEnv );
@@ -1023,22 +1166,215 @@ bool BackendImpl::removeFromUnoRc(
//______________________________________________________________________________
bool BackendImpl::hasInUnoRc(
- bool jarFile, OUString const & url_ )
+ RcItem kind, OUString const & url_ )
{
const OUString rcterm( dp_misc::makeRcTerm(url_) );
const ::osl::MutexGuard guard( getMutex() );
- t_stringlist const & rSet = getTypelibs(jarFile);
+ t_stringlist const & rSet = getRcItemList(kind);
return ::std::find( rSet.begin(), rSet.end(), rcterm ) != rSet.end();
}
+css::uno::Reference< css::registry::XRegistryKey > BackendImpl::openRegistryKey(
+ css::uno::Reference< css::registry::XRegistryKey > const & base,
+ rtl::OUString const & path)
+{
+ OSL_ASSERT(base.is());
+ css::uno::Reference< css::registry::XRegistryKey > key(base->openKey(path));
+ if (!key.is()) {
+ throw css::deployment::DeploymentException(
+ (rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("missing registry entry ")) +
+ path + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" under ")) +
+ base->getKeyName()),
+ static_cast< OWeakObject * >(this), Any());
+ }
+ return key;
+}
+
+void BackendImpl::extractComponentData(
+ css::uno::Reference< css::uno::XComponentContext > const & context,
+ css::uno::Reference< css::registry::XRegistryKey > const & registry,
+ ComponentBackendDb::Data * data,
+ std::vector< css::uno::Reference< css::uno::XInterface > > * factories,
+ css::uno::Reference< css::loader::XImplementationLoader > const *
+ componentLoader,
+ rtl::OUString const * componentUrl)
+{
+ OSL_ASSERT(context.is() && registry.is() && data != 0 && factories != 0);
+ rtl::OUString registryName(registry->getKeyName());
+ sal_Int32 prefix = registryName.getLength();
+ if (!registryName.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM("/"))) {
+ prefix += RTL_CONSTASCII_LENGTH("/");
+ }
+ css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
+ keys(registry->openKeys());
+ css::uno::Reference< css::lang::XMultiComponentFactory > smgr(
+ context->getServiceManager(), css::uno::UNO_QUERY_THROW);
+ for (sal_Int32 i = 0; i < keys.getLength(); ++i) {
+ rtl::OUString name(keys[i]->getKeyName().copy(prefix));
+ data->implementationNames.push_back(name);
+ css::uno::Reference< css::registry::XRegistryKey > singletons(
+ keys[i]->openKey(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/SINGLETONS"))));
+ if (singletons.is()) {
+ sal_Int32 prefix2 = keys[i]->getKeyName().getLength() +
+ RTL_CONSTASCII_LENGTH("/UNO/SINGLETONS/");
+ css::uno::Sequence<
+ css::uno::Reference< css::registry::XRegistryKey > >
+ singletonKeys(singletons->openKeys());
+ for (sal_Int32 j = 0; j < singletonKeys.getLength(); ++j) {
+ data->singletons.push_back(
+ std::pair< rtl::OUString, rtl::OUString >(
+ singletonKeys[j]->getKeyName().copy(prefix2), name));
+ }
+ }
+ css::uno::Reference< css::loader::XImplementationLoader > loader;
+ if (componentLoader == 0) {
+ rtl::OUString activator(
+ openRegistryKey(
+ keys[i],
+ rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("UNO/ACTIVATOR")))->
+ getAsciiValue());
+ loader.set(
+ smgr->createInstanceWithContext(activator, context),
+ css::uno::UNO_QUERY);
+ if (!loader.is()) {
+ throw css::deployment::DeploymentException(
+ (rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM(
+ "cannot instantiate loader ")) +
+ activator),
+ static_cast< OWeakObject * >(this), Any());
+ }
+ } else {
+ OSL_ASSERT(componentLoader->is());
+ loader = *componentLoader;
+ }
+ factories->push_back(
+ loader->activate(
+ name, rtl::OUString(),
+ (componentUrl == 0
+ ? (openRegistryKey(
+ keys[i],
+ rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("UNO/LOCATION")))->
+ getAsciiValue())
+ : *componentUrl),
+ keys[i]));
+ }
+}
+
+void BackendImpl::componentLiveInsertion(
+ ComponentBackendDb::Data const & data,
+ std::vector< css::uno::Reference< css::uno::XInterface > > const &
+ factories)
+{
+ css::uno::Reference< css::container::XSet > set(
+ getComponentContext()->getServiceManager(), css::uno::UNO_QUERY_THROW);
+ std::vector< css::uno::Reference< css::uno::XInterface > >::const_iterator
+ factory(factories.begin());
+ for (t_stringlist::const_iterator i(data.implementationNames.begin());
+ i != data.implementationNames.end(); ++i)
+ {
+ try {
+ set->insert(css::uno::Any(*factory++));
+ } catch (container::ElementExistException &) {
+ OSL_TRACE(
+ "implementation %s already registered",
+ rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8).getStr());
+ }
+ }
+ if (!data.singletons.empty()) {
+ css::uno::Reference< css::container::XNameContainer >
+ rootContext(
+ getComponentContext()->getValueByName(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_root"))),
+ css::uno::UNO_QUERY);
+ if (rootContext.is()) {
+ for (t_stringpairvec::const_iterator i(data.singletons.begin());
+ i != data.singletons.end(); ++i)
+ {
+ rtl::OUString name(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/")) +
+ i->first);
+ try {
+ rootContext->removeByName(
+ name +
+ rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("/arguments")));
+ } catch (container::NoSuchElementException &) {}
+ try {
+ rootContext->insertByName(
+ (name +
+ rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("/service"))),
+ css::uno::Any(i->second));
+ } catch (container::ElementExistException &) {
+ rootContext->replaceByName(
+ (name +
+ rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("/service"))),
+ css::uno::Any(i->second));
+ }
+ try {
+ rootContext->insertByName(name, css::uno::Any());
+ } catch (container::ElementExistException &) {
+ OSL_TRACE(
+ "singleton %s already registered",
+ rtl::OUStringToOString(
+ i->first, RTL_TEXTENCODING_UTF8).getStr());
+ rootContext->replaceByName(name, css::uno::Any());
+ }
+ }
+ }
+ }
+}
+
+void BackendImpl::componentLiveRemoval(ComponentBackendDb::Data const & data) {
+ css::uno::Reference< css::container::XSet > set(
+ getComponentContext()->getServiceManager(), css::uno::UNO_QUERY_THROW);
+ for (t_stringlist::const_iterator i(data.implementationNames.begin());
+ i != data.implementationNames.end(); ++i)
+ {
+ try {
+ set->remove(css::uno::Any(*i));
+ } catch (css::container::NoSuchElementException &) {
+ // ignore if factory has not been live deployed
+ }
+ }
+ if (!data.singletons.empty()) {
+ css::uno::Reference< css::container::XNameContainer > rootContext(
+ getComponentContext()->getValueByName(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_root"))),
+ css::uno::UNO_QUERY);
+ if (rootContext.is()) {
+ for (t_stringpairvec::const_iterator i(data.singletons.begin());
+ i != data.singletons.end(); ++i)
+ {
+ rtl::OUString name(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/")) +
+ i->first);
+ try {
+ rootContext->removeByName(
+ name +
+ rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("/arguments")));
+ rootContext->removeByName(
+ name +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/service")));
+ rootContext->removeByName(name);
+ } catch (container::NoSuchElementException &) {}
+ }
+ }
+ }
+}
+
//______________________________________________________________________________
void BackendImpl::releaseObject( OUString const & id )
{
const ::osl::MutexGuard guard( getMutex() );
- if ( m_backendObjects.erase( id ) != 1 )
- {
- OSL_ASSERT( false );
- }
+ m_backendObjects.erase( id );
}
//______________________________________________________________________________
@@ -1121,66 +1457,45 @@ Reference<XComponentContext> raise_uno_process(
}
//------------------------------------------------------------------------------
-Reference<loader::XImplementationLoader>
-BackendImpl::ComponentPackageImpl::getComponentInfo(
- t_stringlist * pImplNames, t_stringpairvec * pSingletons,
+void BackendImpl::ComponentPackageImpl::getComponentInfo(
+ ComponentBackendDb::Data * data,
+ std::vector< css::uno::Reference< css::uno::XInterface > > * factories,
Reference<XComponentContext> const & xContext )
{
const Reference<loader::XImplementationLoader> xLoader(
xContext->getServiceManager()->createInstanceWithContext(
m_loader, xContext ), UNO_QUERY );
if (! xLoader.is())
- return Reference<loader::XImplementationLoader>();
+ {
+ throw css::deployment::DeploymentException(
+ (rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("cannot instantiate loader ")) +
+ m_loader),
+ static_cast< OWeakObject * >(this), Any());
+ }
// HACK: highly dependent on stoc/source/servicemanager
// and stoc/source/implreg implementation which rely on the same
// services.rdb format!
-
+ // .../UNO/LOCATION and .../UNO/ACTIVATOR appear not to be written by
+ // writeRegistryInfo, however, but are knwon, fixed values here, so
+ // can be passed into extractComponentData
+ rtl::OUString url(getURL());
const Reference<registry::XSimpleRegistry> xMemReg(
xContext->getServiceManager()->createInstanceWithContext(
OUSTR("com.sun.star.registry.SimpleRegistry"), xContext ),
UNO_QUERY_THROW );
xMemReg->open( OUString() /* in mem */, false, true );
- xLoader->writeRegistryInfo( xMemReg->getRootKey(), OUString(), getURL() );
-
- const Sequence< Reference<registry::XRegistryKey> > keys(
- xMemReg->getRootKey()->openKeys() );
- for ( sal_Int32 pos = keys.getLength(); pos--; )
- {
- Reference<registry::XRegistryKey> const & xImplKey = keys[ pos ];
- const OUString implName(
- xImplKey->getKeyName().copy( 1 /*leading slash*/ ) );
-
- // check for singletons:
- const Reference<registry::XRegistryKey> xSingletonKey(
- xImplKey->openKey( OUSTR("UNO/SINGLETONS") ) );
- if (xSingletonKey.is() && xSingletonKey->isValid())
- {
- const Sequence< Reference<registry::XRegistryKey> > singletonKeys(
- xSingletonKey->openKeys() );
- for ( sal_Int32 i = singletonKeys.getLength(); i--; )
- {
- Reference<registry::XRegistryKey> const & xSingleton =
- singletonKeys[ i ];
- pSingletons->push_back(
- ::std::pair<OUString, OUString>(
- xSingleton->getKeyName().copy(
- implName.getLength() +
- sizeof ("//UNO/SINGLETONS/") - 1 ),
- xSingleton->getStringValue() ) );
- }
- }
- else
- {
- pImplNames->push_back( implName );
- }
- }
-
- return xLoader;
+ xLoader->writeRegistryInfo( xMemReg->getRootKey(), OUString(), url );
+ getMyBackend()->extractComponentData(
+ xContext, xMemReg->getRootKey(), data, factories, &xLoader, &url);
}
// Package
//______________________________________________________________________________
+//We could use here BackendImpl::hasActiveEntry. However, this check is just as well.
+//And it also shows the problem if another extension has overwritten an implementation
+//entry, because it contains the same service implementation
beans::Optional< beans::Ambiguous<sal_Bool> >
BackendImpl::ComponentPackageImpl::isRegistered_(
::osl::ResettableMutexGuard &,
@@ -1267,223 +1582,74 @@ void BackendImpl::ComponentPackageImpl::processPackage_(
Reference<XCommandEnvironment> const & xCmdEnv )
{
BackendImpl * that = getMyBackend();
-
-
- const bool java = m_loader.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.Java2") );
- const OUString url( getURL() );
- bool isJavaTypelib;
- if (m_bRemoved)
- isJavaTypelib = m_registeredComponentsDb.javaTypeLibrary;
- else
- isJavaTypelib = java &&
- !jarManifestHeaderPresent( url, OUSTR("UNO-Type-Path"), xCmdEnv );
-
- ComponentBackendDb::Data data;
- data.javaTypeLibrary = isJavaTypelib;
- if (doRegisterPackage)
- {
- Reference <uno::XComponentContext> context(that->getComponentContext());
- if (! startup)
- {
- context.set(
- that->getObject( url ), UNO_QUERY );
-
- if (! context.is()) {
+ rtl::OUString url(getURL());
+ if (doRegisterPackage) {
+ ComponentBackendDb::Data data;
+ css::uno::Reference< css::uno::XComponentContext > context;
+ if (startup) {
+ context = that->getComponentContext();
+ } else {
+ context.set(that->getObject(url), css::uno::UNO_QUERY);
+ if (!context.is()) {
context.set(
- that->insertObject( url, raise_uno_process(
- that->getComponentContext(),
- abortChannel ) ),
- UNO_QUERY_THROW );
+ that->insertObject(
+ url,
+ raise_uno_process(
+ that->getComponentContext(), abortChannel)),
+ css::uno::UNO_QUERY_THROW);
}
}
-
- const Reference<registry::XSimpleRegistry> xServicesRDB( getRDB() );
- const Reference<registry::XImplementationRegistration> xImplReg(
+ css::uno::Reference< css::registry::XImplementationRegistration>(
context->getServiceManager()->createInstanceWithContext(
- OUSTR("com.sun.star.registry.ImplementationRegistration"),
- context ), UNO_QUERY_THROW );
-
- xImplReg->registerImplementation( m_loader, url, xServicesRDB );
- //only write to unorc if registration was successful.
- //It may fail if there is no suitable java.
- if (isJavaTypelib)
+ rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.registry.ImplementationRegistration")),
+ context),
+ css::uno::UNO_QUERY_THROW)->registerImplementation(
+ m_loader, url, getRDB());
+ // Only write to unorc after successful registration; it may fail if
+ // there is no suitable java
+ if (m_loader.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM("com.sun.star.loader.Java2")) &&
+ !jarManifestHeaderPresent(url, OUSTR("UNO-Type-Path"), xCmdEnv))
{
- that->addToUnoRc( java, url, xCmdEnv );
+ that->addToUnoRc(RCITEM_JAR_TYPELIB, url, xCmdEnv);
data.javaTypeLibrary = true;
}
-
- t_stringlist implNames;
- t_stringpairvec singletons;
- const Reference<loader::XImplementationLoader> xLoader(
- getComponentInfo( &implNames, &singletons, context ) );
- data.implementationNames = implNames;
- data.singletons = singletons;
-
- if (!startup)
- {
- // factories live insertion:
- const Reference<container::XSet> xSet(
- that->getComponentContext()->getServiceManager(), UNO_QUERY_THROW );
- for ( t_stringlist::const_iterator iPos( implNames.begin() );
- iPos != implNames.end(); ++iPos )
- {
- checkAborted( abortChannel );
- OUString const & implName = *iPos;
- // activate factory:
- const Reference<XInterface> xFactory(
- xLoader->activate(
- implName, OUString(), url,
- xServicesRDB->getRootKey()->openKey(
- OUSTR("/IMPLEMENTATIONS/") + implName ) ) );
- try {
- xSet->insert( Any(xFactory) );
- } // ignore if factory has already been inserted:
- catch (container::ElementExistException &) {
- OSL_ENSURE( 0, "### factory already registered?" );
- }
- }
-
- if (! singletons.empty())
- {
- // singletons live insertion:
- const Reference<container::XNameContainer> xRootContext(
- that->getComponentContext()->getValueByName(
- OUSTR("_root") ), UNO_QUERY );
- if (xRootContext.is())
- {
- for ( t_stringpairvec::const_iterator iPos(
- singletons.begin() );
- iPos != singletons.end(); ++iPos )
- {
- ::std::pair<OUString, OUString> const & sp = *iPos;
- const OUString name( OUSTR("/singletons/") + sp.first );
- // assure no arguments:
- try {
- xRootContext->removeByName( name + OUSTR("/arguments"));
- } catch (container::NoSuchElementException &) {}
- // used service:
- try {
- xRootContext->insertByName(
- name + OUSTR("/service"), Any(sp.second) );
- } catch (container::ElementExistException &) {
- xRootContext->replaceByName(
- name + OUSTR("/service"), Any(sp.second) );
- }
- // singleton entry:
- try {
- xRootContext->insertByName( name, Any() );
- } catch (container::ElementExistException & exc) {
- (void) exc; // avoid warnings
- OSL_ENSURE(
- 0, OUStringToOString(
- exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
- xRootContext->replaceByName( name, Any() );
- }
- }
- }
- }
+ std::vector< css::uno::Reference< css::uno::XInterface > > factories;
+ getComponentInfo(&data, &factories, context);
+ if (!startup) {
+ that->componentLiveInsertion(data, factories);
}
-
m_registered = REG_REGISTERED;
- getMyBackend()->addDataToDb(url, data);
- }
- else // revokePackage()
- {
- // set to VOID during revocation process:
+ that->addDataToDb(url, data);
+ } else { // revoke
m_registered = REG_VOID;
-
- //get the remote context. If it does not exist then use the local one
- Reference<XComponentContext> xContext(
- that->getObject( url ), UNO_QUERY );
- bool bRemoteContext = false;
- if (!xContext.is())
- xContext = that->getComponentContext();
- else
- bRemoteContext = true;
-
- t_stringlist implNames;
- t_stringpairvec singletons;
- if (m_bRemoved)
- {
- implNames = m_registeredComponentsDb.implementationNames;
- singletons = m_registeredComponentsDb.singletons;
+ ComponentBackendDb::Data data(that->readDataFromDb(url));
+ css::uno::Reference< css::uno::XComponentContext > context(
+ that->getObject(url), css::uno::UNO_QUERY);
+ bool remoteContext = context.is();
+ if (!remoteContext) {
+ context = that->getComponentContext();
}
- else
- {
- getComponentInfo( &implNames, &singletons, xContext );
+ if (!startup) {
+ that->componentLiveRemoval(data);
}
-
- if (!startup)
- {
- // factories live removal:
- const Reference<container::XSet> xSet(
- that->getComponentContext()->getServiceManager(), UNO_QUERY_THROW );
- for ( t_stringlist::const_iterator iPos( implNames.begin() );
- iPos != implNames.end(); ++iPos )
- {
- OUString const & implName = *iPos;
- try {
- xSet->remove( Any(implName) );
- } // ignore if factory has not been live deployed:
- catch (container::NoSuchElementException &) {
- }
- }
-
- if (! singletons.empty())
- {
- // singletons live removal:
- const Reference<container::XNameContainer> xRootContext(
- that->getComponentContext()->getValueByName(
- OUSTR("_root") ), UNO_QUERY );
- if (xRootContext.is())
- {
- for ( t_stringpairvec::const_iterator iPos(
- singletons.begin() );
- iPos != singletons.end(); ++iPos )
- {
- ::std::pair<OUString, OUString> const & sp = *iPos;
- const OUString name( OUSTR("/singletons/") + sp.first );
- // arguments:
- try {
- xRootContext->removeByName( name + OUSTR("/arguments"));
- }
- catch (container::NoSuchElementException &) {}
- // used service:
- try {
- xRootContext->removeByName( name + OUSTR("/service") );
- }
- catch (container::NoSuchElementException &) {}
- // singleton entry:
- try {
- xRootContext->removeByName( name );
- }
- catch (container::NoSuchElementException & exc) {
- (void) exc; // avoid warnings
- OSL_ENSURE(
- 0, OUStringToOString(
- exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
- }
- }
- }
- }
+ css::uno::Reference< css::registry::XImplementationRegistration >(
+ context->getServiceManager()->createInstanceWithContext(
+ rtl::OUString(