Conflicts: avmedia/inc/avmedia/mediaitem.hxx avmedia/prj/build.lst avmedia/source/framework/mediaitem.cxx avmedia/source/gstreamer/gstcommon.hxx avmedia/source/gstreamer/gstframegrabber.cxx avmedia/source/gstreamer/gstframegrabber.hxx avmedia/source/gstreamer/gstmanager.cxx avmedia/source/gstreamer/gstmanager.hxx avmedia/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.hxx avmedia/source/gstreamer/gstuno.cxx avmedia/source/gstreamer/gstwindow.cxx avmedia/source/gstreamer/gstwindow.hxx avmedia/source/gstreamer/makefile.mk avmedia/source/quicktime/quicktimeuno.cxx avmedia/source/viewer/mediawindow.cxx avmedia/source/viewer/mediawindow_impl.cxx avmedia/source/viewer/mediawindow_impl.hxx avmedia/source/viewer/mediawindowbase_impl.cxx avmedia/source/win/winuno.cxx basic/inc/basic/basmgr.hxx basic/inc/basic/mybasic.hxx basic/inc/basic/process.hxx basic/inc/basic/sbmeth.hxx basic/inc/basic/sbmod.hxx basic/inc/basic/sbxdef.hxx basic/inc/basic/sbxvar.hxx basic/source/app/app.cxx basic/source/app/app.hxx basic/source/app/appbased.cxx basic/source/app/appedit.cxx basic/source/app/appwin.cxx basic/source/app/appwin.hxx basic/source/app/brkpnts.cxx basic/source/app/brkpnts.hxx basic/source/app/dialogs.cxx basic/source/app/dialogs.hxx basic/source/app/msgedit.cxx basic/source/app/mybasic.cxx basic/source/app/process.cxx basic/source/app/processw.hxx basic/source/app/textedit.cxx basic/source/basmgr/basicmanagerrepository.cxx basic/source/basmgr/basmgr.cxx basic/source/classes/disas.cxx basic/source/classes/eventatt.cxx basic/source/classes/image.cxx basic/source/classes/sb.cxx basic/source/classes/sbunoobj.cxx basic/source/classes/sbxmod.cxx basic/source/comp/codegen.cxx basic/source/comp/dim.cxx basic/source/comp/exprgen.cxx basic/source/comp/exprnode.cxx basic/source/comp/exprtree.cxx basic/source/comp/sbcomp.cxx basic/source/inc/expr.hxx basic/source/inc/object.hxx basic/source/inc/sbunoobj.hxx basic/source/runtime/dllmgr-x86.cxx basic/source/runtime/iosys.cxx basic/source/runtime/makefile.mk basic/source/runtime/methods.cxx basic/source/runtime/methods1.cxx basic/source/runtime/runtime.cxx basic/source/runtime/stdobj.cxx basic/source/runtime/step0.cxx basic/source/runtime/step1.cxx basic/source/runtime/step2.cxx basic/source/sbx/sbxarray.cxx basic/source/sbx/sbxbase.cxx basic/source/sbx/sbxbool.cxx basic/source/sbx/sbxbyte.cxx basic/source/sbx/sbxcoll.cxx basic/source/sbx/sbxconv.hxx basic/source/sbx/sbxcurr.cxx basic/source/sbx/sbxexec.cxx basic/source/sbx/sbxint.cxx basic/source/sbx/sbxobj.cxx basic/source/sbx/sbxscan.cxx basic/source/sbx/sbxstr.cxx basic/source/sbx/sbxvals.cxx basic/source/sbx/sbxvalue.cxx basic/source/sbx/sbxvar.cxx basic/workben/mgrtest.cxx configmgr/prj/build.lst configmgr/source/access.cxx configmgr/source/configurationprovider.cxx configmgr/source/defaultprovider.cxx configmgr/source/pad.cxx configmgr/source/services.cxx configmgr/source/update.cxx configmgr/source/xmlreader.cxx configmgr/source/xmlreader.hxx connectivity/prj/build.lst connectivity/qa/complex/connectivity/TestCase.java connectivity/source/cpool/Zregistration.cxx connectivity/source/drivers/adabas/Bservices.cxx connectivity/source/drivers/ado/Aservices.cxx connectivity/source/drivers/calc/Cservices.cxx connectivity/source/drivers/calc/makefile.mk connectivity/source/drivers/dbase/DIndex.cxx connectivity/source/drivers/dbase/DIndexIter.cxx connectivity/source/drivers/dbase/DNoException.cxx connectivity/source/drivers/dbase/DTable.cxx connectivity/source/drivers/dbase/Dservices.cxx connectivity/source/drivers/dbase/dindexnode.cxx connectivity/source/drivers/evoab/LNoException.cxx connectivity/source/drivers/evoab/LServices.cxx connectivity/source/drivers/evoab2/NServices.cxx connectivity/source/drivers/file/FNoException.cxx connectivity/source/drivers/file/FPreparedStatement.cxx connectivity/source/drivers/file/FResultSet.cxx connectivity/source/drivers/file/FStatement.cxx connectivity/source/drivers/file/quotedstring.cxx connectivity/source/drivers/flat/ETable.cxx connectivity/source/drivers/flat/Eservices.cxx connectivity/source/drivers/hsqldb/Hservices.cxx connectivity/source/drivers/jdbc/jservices.cxx connectivity/source/drivers/kab/KServices.cxx connectivity/source/drivers/macab/MacabServices.cxx connectivity/source/drivers/mozab/MResultSet.cxx connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx connectivity/source/drivers/mysql/Yservices.cxx connectivity/source/drivers/odbc/OFunctions.cxx connectivity/source/drivers/odbc/oservices.cxx connectivity/source/inc/dbase/DIndexPage.hxx connectivity/source/inc/file/FTable.hxx connectivity/source/manager/mregistration.cxx connectivity/source/parse/PColumn.cxx desktop/prj/build.lst desktop/qa/deployment_misc/test_dp_version.cxx desktop/source/app/app.cxx desktop/source/app/appfirststart.cxx desktop/source/app/cmdlineargs.cxx desktop/source/app/cmdlineargs.hxx desktop/source/app/sofficemain.cxx desktop/source/deployment/gui/dp_gui.hrc desktop/source/deployment/gui/dp_gui_dialog2.cxx desktop/source/deployment/gui/dp_gui_dialog2.hxx desktop/source/deployment/gui/dp_gui_updatedialog.cxx desktop/source/deployment/gui/dp_gui_updatedialog.hxx desktop/source/deployment/manager/dp_extensionmanager.cxx desktop/source/deployment/manager/dp_extensionmanager.hxx desktop/source/deployment/misc/dp_misc.src desktop/source/deployment/registry/component/dp_component.cxx desktop/source/deployment/registry/configuration/dp_configuration.cxx desktop/source/deployment/registry/dp_backend.cxx desktop/source/deployment/registry/help/dp_help.cxx desktop/source/deployment/registry/script/dp_script.cxx desktop/source/migration/pages.cxx desktop/source/migration/pages.hxx desktop/source/migration/wizard.cxx desktop/source/migration/wizard.hrc desktop/source/migration/wizard.hxx desktop/source/migration/wizard.src desktop/source/pkgchk/unopkg/unopkg_shared.h desktop/source/so_comp/services.cxx desktop/source/splash/makefile.mk desktop/source/splash/services_spl.cxx desktop/source/splash/splash.cxx drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx editeng/inc/editeng/adjitem.hxx editeng/inc/editeng/bolnitem.hxx editeng/inc/editeng/borderline.hxx editeng/inc/editeng/boxitem.hxx editeng/inc/editeng/brkitem.hxx editeng/inc/editeng/brshitem.hxx editeng/inc/editeng/bulitem.hxx editeng/inc/editeng/charreliefitem.hxx editeng/inc/editeng/charrotateitem.hxx editeng/inc/editeng/charscaleitem.hxx editeng/inc/editeng/cmapitem.hxx editeng/inc/editeng/colritem.hxx editeng/inc/editeng/crsditem.hxx editeng/inc/editeng/editdata.hxx editeng/inc/editeng/editeng.hxx editeng/inc/editeng/editobj.hxx editeng/inc/editeng/editstat.hxx editeng/inc/editeng/editview.hxx editeng/inc/editeng/emphitem.hxx editeng/inc/editeng/escpitem.hxx editeng/inc/editeng/fhgtitem.hxx editeng/inc/editeng/flstitem.hxx editeng/inc/editeng/fontitem.hxx editeng/inc/editeng/frmdiritem.hxx editeng/inc/editeng/fwdtitem.hxx editeng/inc/editeng/hyznitem.hxx editeng/inc/editeng/kernitem.hxx editeng/inc/editeng/langitem.hxx editeng/inc/editeng/lrspitem.hxx editeng/inc/editeng/lspcitem.hxx editeng/inc/editeng/numitem.hxx editeng/inc/editeng/outliner.hxx editeng/inc/editeng/paravertalignitem.hxx editeng/inc/editeng/pmdlitem.hxx editeng/inc/editeng/postitem.hxx editeng/inc/editeng/protitem.hxx editeng/inc/editeng/shaditem.hxx editeng/inc/editeng/sizeitem.hxx editeng/inc/editeng/svxacorr.hxx editeng/inc/editeng/svxfont.hxx editeng/inc/editeng/svxrtf.hxx editeng/inc/editeng/swafopt.hxx editeng/inc/editeng/tstpitem.hxx editeng/inc/editeng/twolinesitem.hxx editeng/inc/editeng/txtrange.hxx editeng/inc/editeng/udlnitem.hxx editeng/inc/editeng/ulspitem.hxx editeng/inc/editeng/wghtitem.hxx editeng/inc/editeng/writingmodeitem.hxx editeng/inc/editeng/xmlcnitm.hxx editeng/inc/helpid.hrc editeng/inc/pch/precompiled_editeng.hxx editeng/source/editeng/editdbg.cxx editeng/source/editeng/editdoc.cxx editeng/source/editeng/editdoc.hxx editeng/source/editeng/editdoc2.cxx editeng/source/editeng/editeng.cxx editeng/source/editeng/editobj.cxx editeng/source/editeng/editobj2.hxx editeng/source/editeng/editsel.cxx editeng/source/editeng/editundo.cxx editeng/source/editeng/editundo.hxx editeng/source/editeng/editview.cxx editeng/source/editeng/edtspell.hxx editeng/source/editeng/eehtml.cxx editeng/source/editeng/eehtml.hxx editeng/source/editeng/eeobj.cxx editeng/source/editeng/eerdll.cxx editeng/source/editeng/eertfpar.cxx editeng/source/editeng/impedit.cxx editeng/source/editeng/impedit.hxx editeng/source/editeng/impedit2.cxx editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit4.cxx editeng/source/editeng/impedit5.cxx editeng/source/editeng/makefile.mk editeng/source/items/bulitem.cxx editeng/source/items/charhiddenitem.cxx editeng/source/items/flditem.cxx editeng/source/items/frmitems.cxx editeng/source/items/makefile.mk editeng/source/items/numitem.cxx editeng/source/items/paraitem.cxx editeng/source/items/svxfont.cxx editeng/source/items/textitem.cxx editeng/source/items/writingmodeitem.cxx editeng/source/items/xmlcnitm.cxx editeng/source/misc/SvXMLAutoCorrectImport.cxx editeng/source/misc/svxacorr.cxx editeng/source/misc/txtrange.cxx editeng/source/misc/unolingu.cxx editeng/source/outliner/outleeng.cxx editeng/source/outliner/outliner.cxx editeng/source/outliner/outlundo.hxx editeng/source/outliner/outlvw.cxx editeng/source/outliner/paralist.cxx editeng/source/outliner/paralist.hxx editeng/source/rtf/rtfgrf.cxx editeng/source/rtf/rtfitem.cxx editeng/source/rtf/svxrtf.cxx editeng/source/uno/unoipset.cxx editeng/util/makefile.mk embeddedobj/prj/build.lst embeddedobj/source/commonembedding/miscobj.cxx eventattacher/prj/build.lst fileaccess/source/FileAccess.cxx formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/token.hxx formula/inc/formula/tokenarray.hxx formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/token.cxx formula/source/ui/dlg/FormulaHelper.cxx formula/source/ui/dlg/formula.cxx formula/source/ui/dlg/parawin.cxx formula/source/ui/dlg/structpg.cxx fpicker/prj/d.lst fpicker/source/aqua/FPentry.cxx fpicker/source/office/OfficeControlAccess.cxx fpicker/source/office/iodlg.cxx fpicker/source/office/iodlg.hxx fpicker/source/office/iodlg.src fpicker/source/office/iodlgimp.cxx fpicker/source/unx/gnome/FPentry.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkPicker.cxx fpicker/source/unx/kde4/KDE4FPEntry.cxx fpicker/source/win32/filepicker/FPentry.cxx framework/AllLangResTarget_fwe.mk framework/inc/dispatch/interaction.hxx framework/inc/framework/addonmenu.hxx framework/inc/framework/addonsoptions.hxx framework/inc/framework/bmkmenu.hxx framework/inc/framework/imageproducer.hxx framework/inc/framework/sfxhelperfunctions.hxx framework/inc/framework/statusbarconfiguration.hxx framework/inc/framework/titlehelper.hxx framework/inc/framework/toolboxconfiguration.hxx framework/inc/threadhelp/lockhelper.hxx framework/inc/xml/eventsdocumenthandler.hxx framework/inc/xml/statusbardocumenthandler.hxx framework/inc/xml/toolboxconfiguration.hxx framework/inc/xml/toolboxconfigurationdefines.hxx framework/inc/xml/toolboxdocumenthandler.hxx framework/prj/build.lst framework/qa/complex/ModuleManager/makefile.mk framework/qa/complex/accelerators/makefile.mk framework/qa/complex/framework/recovery/makefile.mk framework/qa/complex/imageManager/_XInitialization.java framework/source/classes/menumanager.cxx framework/source/dispatch/interaction.cxx framework/source/fwe/classes/bmkmenu.cxx framework/source/fwe/helper/actiontriggerhelper.cxx framework/source/fwe/helper/imageproducer.cxx framework/source/fwe/xml/menuconfiguration.cxx framework/source/fwe/xml/toolboxdocumenthandler.cxx framework/source/helper/uiconfigelementwrapperbase.cxx framework/source/helper/uielementwrapperbase.cxx framework/source/inc/pattern/window.hxx framework/source/jobs/jobdata.cxx framework/source/layoutmanager/layoutmanager.cxx framework/source/layoutmanager/panel.hxx framework/source/loadenv/loadenv.cxx framework/source/register/registerservices.cxx framework/source/services/menudocumenthandler.cxx framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx framework/source/uiconfiguration/uiconfigurationmanager.cxx framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx framework/source/uielement/addonstoolbarmanager.cxx framework/source/uielement/controlmenucontroller.cxx framework/source/uielement/fontsizemenucontroller.cxx framework/source/uielement/imagebuttontoolbarcontroller.cxx framework/source/uielement/macrosmenucontroller.cxx framework/source/uielement/menubarmanager.cxx framework/source/uielement/newmenucontroller.cxx framework/source/uielement/togglebuttontoolbarcontroller.cxx framework/source/uielement/toolbarmanager.cxx framework/source/uielement/toolbarsmenucontroller.cxx framework/test/makefile.mk framework/test/threadtest/makefile.mk framework/test/typecfg/makefile.mk framework/util/guiapps/makefile.mk framework/util/makefile.mk idl/inc/bastype.hxx idl/inc/hash.hxx idl/inc/lex.hxx idl/inc/module.hxx idl/inc/object.hxx idl/inc/slot.hxx idl/inc/types.hxx idl/source/cmptools/hash.cxx idl/source/cmptools/lex.cxx idl/source/objects/basobj.cxx idl/source/objects/bastype.cxx idl/source/objects/module.cxx idl/source/objects/object.cxx idl/source/objects/slot.cxx idl/source/objects/types.cxx idl/source/prj/command.cxx idl/source/prj/database.cxx idl/source/prj/globals.cxx idl/source/prj/svidl.cxx linguistic/inc/linguistic/misc.hxx linguistic/prj/build.lst linguistic/source/convdic.cxx linguistic/source/convdiclist.cxx linguistic/source/dicimp.cxx linguistic/source/dlistimp.cxx linguistic/source/gciterator.cxx linguistic/source/iprcache.cxx linguistic/source/lngopt.cxx linguistic/source/lngprophelp.cxx linguistic/source/lngsvcmgr.cxx linguistic/source/lngsvcmgr.hxx linguistic/source/misc2.cxx linguistic/workben/sprophelp.cxx officecfg/registry/data/org/openoffice/VCL.xcu officecfg/util/makefile.mk oovbaapi/ooo/vba/XApplicationBase.idl oovbaapi/ooo/vba/XVBAAppService.idl oovbaapi/ooo/vba/XVBADocService.idl oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/excel/XRange.idl oovbaapi/ooo/vba/excel/XWorkbook.idl oovbaapi/ooo/vba/excel/XWorksheet.idl oovbaapi/ooo/vba/word/XApplication.idl oovbaapi/ooo/vba/word/XGlobals.idl oovbaapi/ooo/vba/word/XTableOfContents.idl readlicense_oo/prj/build.lst scripting/prj/build.lst scripting/prj/d.lst scripting/source/basprov/basprov.cxx scripting/source/basprov/basscript.cxx scripting/source/basprov/basscript.hxx scripting/source/dlgprov/dlgprov.cxx scripting/source/inc/util/util.hxx scripting/source/protocolhandler/scripthandler.cxx scripting/source/provider/ProviderCache.cxx scripting/source/pyprov/makefile.mk scripting/source/runtimemgr/ScriptNameResolverImpl.cxx scripting/source/runtimemgr/ScriptRuntimeManager.cxx scripting/source/runtimemgr/StorageBridge.cxx scripting/source/storage/ScriptMetadataImporter.cxx scripting/source/storage/ScriptSecurityManager.cxx scripting/source/storage/ScriptStorage.cxx scripting/source/storage/ScriptStorageManager.cxx sfx2/inc/about.hxx sfx2/inc/brokenpackageint.hxx sfx2/inc/docvor.hxx sfx2/inc/pch/precompiled_sfx2.hxx sfx2/inc/sfx2/app.hxx sfx2/inc/sfx2/basmgr.hxx sfx2/inc/sfx2/bindings.hxx sfx2/inc/sfx2/childwin.hxx sfx2/inc/sfx2/ctrlitem.hxx sfx2/inc/sfx2/dinfdlg.hxx sfx2/inc/sfx2/dispatch.hxx sfx2/inc/sfx2/docfilt.hxx sfx2/inc/sfx2/evntconf.hxx sfx2/inc/sfx2/fcontnr.hxx sfx2/inc/sfx2/frame.hxx sfx2/inc/sfx2/imagemgr.hxx sfx2/inc/sfx2/imgmgr.hxx sfx2/inc/sfx2/linksrc.hxx sfx2/inc/sfx2/macrconf.hxx sfx2/inc/sfx2/macropg.hxx sfx2/inc/sfx2/mnuitem.hxx sfx2/inc/sfx2/mnumgr.hxx sfx2/inc/sfx2/module.hxx sfx2/inc/sfx2/msg.hxx sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/passwd.hxx sfx2/inc/sfx2/prnmon.hxx sfx2/inc/sfx2/request.hxx sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfxbasemodel.hxx sfx2/inc/sfx2/sfxhtml.hxx sfx2/inc/sfx2/sfxresid.hxx sfx2/inc/sfx2/sfxsids.hrc sfx2/inc/sfx2/sfxuno.hxx sfx2/inc/sfx2/shell.hxx sfx2/inc/sfx2/stbitem.hxx sfx2/inc/sfx2/styfitem.hxx sfx2/inc/sfx2/tabdlg.hxx sfx2/inc/sfx2/tbxctrl.hxx sfx2/inc/sfx2/tplpitem.hxx sfx2/inc/sfx2/viewfrm.hxx sfx2/inc/sfx2/viewsh.hxx sfx2/inc/sfxbasic.hxx sfx2/inc/sorgitm.hxx sfx2/prj/build.lst sfx2/qa/complex/docinfo/makefile.mk sfx2/qa/cppunit/makefile.mk sfx2/sdi/makefile.mk sfx2/source/appl/app.cxx sfx2/source/appl/app.hrc sfx2/source/appl/app.src sfx2/source/appl/appbas.cxx sfx2/source/appl/appcfg.cxx sfx2/source/appl/appchild.cxx sfx2/source/appl/appmain.cxx sfx2/source/appl/appmisc.cxx sfx2/source/appl/appopen.cxx sfx2/source/appl/appquit.cxx sfx2/source/appl/appserv.cxx sfx2/source/appl/appuno.cxx sfx2/source/appl/childwin.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/helpinterceptor.cxx sfx2/source/appl/imagemgr.cxx sfx2/source/appl/impldde.cxx sfx2/source/appl/impldde.hxx sfx2/source/appl/linkmgr2.cxx sfx2/source/appl/lnkbase2.cxx sfx2/source/appl/makefile.mk sfx2/source/appl/module.cxx sfx2/source/appl/newhelp.cxx sfx2/source/appl/opengrf.cxx sfx2/source/appl/sfxdll.cxx sfx2/source/appl/sfxhelp.cxx sfx2/source/appl/shutdownicon.cxx sfx2/source/appl/shutdowniconunx.cxx sfx2/source/appl/workwin.cxx sfx2/source/bastyp/fltfnc.cxx sfx2/source/bastyp/frmhtml.cxx sfx2/source/bastyp/frmhtmlw.cxx sfx2/source/bastyp/helper.cxx sfx2/source/bastyp/minarray.cxx sfx2/source/bastyp/progress.cxx sfx2/source/bastyp/sfxhtml.cxx sfx2/source/config/evntconf.cxx sfx2/source/control/bindings.cxx sfx2/source/control/ctrlitem.cxx sfx2/source/control/dispatch.cxx sfx2/source/control/macrconf.cxx sfx2/source/control/macro.cxx sfx2/source/control/makefile.mk sfx2/source/control/minfitem.cxx sfx2/source/control/msg.cxx sfx2/source/control/msgpool.cxx sfx2/source/control/objface.cxx sfx2/source/control/request.cxx sfx2/source/control/shell.cxx sfx2/source/control/sorgitm.cxx sfx2/source/dialog/about.cxx sfx2/source/dialog/basedlgs.cxx sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dinfedt.cxx sfx2/source/dialog/dockwin.cxx sfx2/source/dialog/filedlghelper.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodelapi.cxx sfx2/source/dialog/makefile.mk sfx2/source/dialog/mgetempl.cxx sfx2/source/dialog/passwd.cxx sfx2/source/dialog/passwd.hrc sfx2/source/dialog/printopt.cxx sfx2/source/dialog/securitypage.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/styfitem.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/taskpane.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/dialog/versdlg.cxx sfx2/source/doc/QuerySaveDocument.cxx sfx2/source/doc/SfxDocumentMetaData.cxx sfx2/source/doc/applet.cxx sfx2/source/doc/doc.hrc sfx2/source/doc/doc.src sfx2/source/doc/docfile.cxx sfx2/source/doc/docinf.cxx sfx2/source/doc/doctempl.cxx sfx2/source/doc/doctemplates.cxx sfx2/source/doc/docvor.cxx sfx2/source/doc/guisaveas.cxx sfx2/source/doc/makefile.mk sfx2/source/doc/objcont.cxx sfx2/source/doc/objitem.cxx sfx2/source/doc/objmisc.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/printhelper.cxx sfx2/source/doc/sfxacldetect.cxx sfx2/source/doc/sfxbasemodel.cxx sfx2/source/inc/applet.hxx sfx2/source/inc/fltoptint.hxx sfx2/source/inc/sfxlocal.hrc sfx2/source/inc/virtmenu.hxx sfx2/source/inc/workwin.hxx sfx2/source/menu/mnuitem.cxx sfx2/source/menu/objmnctl.cxx sfx2/source/menu/virtmenu.cxx sfx2/source/notify/eventsupplier.cxx sfx2/source/notify/makefile.mk sfx2/source/toolbox/imgmgr.cxx sfx2/source/toolbox/tbxitem.cxx sfx2/source/view/frame.cxx sfx2/source/view/orgmgr.cxx sfx2/source/view/printer.cxx sfx2/source/view/prnmon.cxx sfx2/source/view/viewfrm.cxx sfx2/source/view/viewprn.cxx sfx2/source/view/viewsh.cxx sfx2/util/makefile.mk sfx2/workben/custompanel/makefile.mk shell/source/backends/desktopbe/desktopbackend.cxx shell/source/backends/gconfbe/gconfbackend.cxx shell/source/backends/kde4be/kde4backend.cxx shell/source/backends/kdebe/kdebackend.cxx shell/source/win32/SysShentry.cxx shell/source/win32/shlxthandler/propsheets/propsheets.cxx shell/source/win32/simplemail/smplmailentry.cxx svx/inc/float3d.hrc svx/inc/fmhelp.hrc svx/inc/globlmn_tmpl.hrc svx/inc/helpid.hrc svx/inc/pch/precompiled_svx.hxx svx/inc/sjctrl.hxx svx/inc/srchitem.hxx svx/inc/svdibrow.hxx svx/inc/svx/SmartTagItem.hxx svx/inc/svx/algitem.hxx svx/inc/svx/camera3d.hxx svx/inc/svx/chrtitem.hxx svx/inc/svx/clipfmtitem.hxx svx/inc/svx/ctredlin.hxx svx/inc/svx/dbtoolsclient.hxx svx/inc/svx/deflt3d.hxx svx/inc/svx/dialogs.hrc svx/inc/svx/drawitem.hxx svx/inc/svx/e3ditem.hxx svx/inc/svx/extrud3d.hxx svx/inc/svx/flagsdef.hxx svx/inc/svx/float3d.hxx svx/inc/svx/frmsel.hxx svx/inc/svx/gallery.hxx svx/inc/svx/gallery1.hxx svx/inc/svx/galtheme.hxx svx/inc/svx/grfcrop.hxx svx/inc/svx/hdft.hxx svx/inc/svx/hlnkitem.hxx svx/inc/svx/hyprlink.hxx svx/inc/svx/itemwin.hxx svx/inc/svx/lathe3d.hxx svx/inc/svx/linkwarn.hxx svx/inc/svx/modctrl.hxx svx/inc/svx/msdffdef.hxx svx/inc/svx/obj3d.hxx svx/inc/svx/optgenrl.hxx svx/inc/svx/optgrid.hxx svx/inc/svx/pageitem.hxx svx/inc/svx/paraprev.hxx svx/inc/svx/postattr.hxx svx/inc/svx/rotmodit.hxx svx/inc/svx/ruler.hxx svx/inc/svx/rulritem.hxx svx/inc/svx/scene3d.hxx svx/inc/svx/sdasaitm.hxx svx/inc/svx/sdasitm.hxx svx/inc/svx/sdggaitm.hxx svx/inc/svx/sdmetitm.hxx svx/inc/svx/sdtaaitm.hxx svx/inc/svx/sdtaditm.hxx svx/inc/svx/sdtaitm.hxx svx/inc/svx/sdtakitm.hxx svx/inc/svx/sdtfchim.hxx svx/inc/svx/sdtfsitm.hxx svx/inc/svx/srchdlg.hxx svx/inc/svx/svddrag.hxx svx/inc/svx/svdetc.hxx svx/inc/svx/svdglue.hxx svx/inc/svx/svdhlpln.hxx svx/inc/svx/svdlayer.hxx svx/inc/svx/svdmark.hxx svx/inc/svx/svdmodel.hxx svx/inc/svx/svdoashp.hxx svx/inc/svx/svdobj.hxx svx/inc/svx/svdocirc.hxx svx/inc/svx/svdoedge.hxx svx/inc/svx/svdogrp.hxx svx/inc/svx/svdomeas.hxx svx/inc/svx/svdoole2.hxx svx/inc/svx/svdorect.hxx svx/inc/svx/svdotable.hxx svx/inc/svx/svdotext.hxx svx/inc/svx/svdovirt.hxx svx/inc/svx/svdpage.hxx svx/inc/svx/svdsnpv.hxx svx/inc/svx/svdtrans.hxx svx/inc/svx/svdundo.hxx svx/inc/svx/svimbase.hxx svx/inc/svx/svx3ditems.hxx svx/inc/svx/svxdlg.hxx svx/inc/svx/sxcikitm.hxx svx/inc/svx/sxekitm.hxx svx/inc/svx/sxelditm.hxx svx/inc/svx/sxenditm.hxx svx/inc/svx/sxmkitm.hxx svx/inc/svx/sxmtpitm.hxx svx/inc/svx/sxmuitm.hxx svx/inc/svx/tabarea.hxx svx/inc/svx/tabline.hxx svx/inc/svx/unoprov.hxx svx/inc/svx/viewlayoutitem.hxx svx/inc/svx/xbitmap.hxx svx/inc/svx/xbtmpit.hxx svx/inc/svx/xcolit.hxx svx/inc/svx/xfillit0.hxx svx/inc/svx/xflclit.hxx svx/inc/svx/xflftrit.hxx svx/inc/svx/xflgrit.hxx svx/inc/svx/xflhtit.hxx svx/inc/svx/xftadit.hxx svx/inc/svx/xftsfit.hxx svx/inc/svx/xftshit.hxx svx/inc/svx/xlineit0.hxx svx/inc/svx/xlinjoit.hxx svx/inc/svx/xlnclit.hxx svx/inc/svx/xlndsit.hxx svx/inc/svx/xlnedcit.hxx svx/inc/svx/xlnedit.hxx svx/inc/svx/xlnedwit.hxx svx/inc/svx/xlnstcit.hxx svx/inc/svx/xlnstit.hxx svx/inc/svx/xlnstwit.hxx svx/inc/svx/xlnwtit.hxx svx/inc/svx/xtextit0.hxx svx/inc/svx/zoomitem.hxx svx/inc/svx/zoomslideritem.hxx svx/inc/xpolyimp.hxx svx/inc/zoom_def.hxx svx/prj/d.lst svx/source/accessibility/AccessibleShape.cxx svx/source/accessibility/DescriptionGenerator.cxx svx/source/customshapes/EnhancedCustomShapeEngine.cxx svx/source/customshapes/EnhancedCustomShapeFontWork.cxx svx/source/dialog/_bmpmask.cxx svx/source/dialog/_contdlg.cxx svx/source/dialog/connctrl.cxx svx/source/dialog/contwnd.cxx svx/source/dialog/ctredlin.cxx svx/source/dialog/ctredlin.hrc svx/source/dialog/ctredlin.src svx/source/dialog/dialcontrol.cxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/docrecovery.cxx svx/source/dialog/fntctrl.cxx svx/source/dialog/fontwork.cxx svx/source/dialog/frmsel.cxx svx/source/dialog/graphctl.cxx svx/source/dialog/grfflt.cxx svx/source/dialog/hdft.cxx svx/source/dialog/hyperdlg.cxx svx/source/dialog/hyprdlg.hxx svx/source/dialog/hyprlink.cxx svx/source/dialog/hyprlink.hxx svx/source/dialog/hyprlink.src svx/source/dialog/imapdlg.cxx svx/source/dialog/imapwnd.cxx svx/source/dialog/linkwarn.hrc svx/source/dialog/makefile.mk svx/source/dialog/optgrid.cxx svx/source/dialog/orienthelper.cxx svx/source/dialog/pagectrl.cxx svx/source/dialog/prtqry.cxx svx/source/dialog/rlrcitem.cxx svx/source/dialog/rubydialog.cxx svx/source/dialog/rulritem.cxx svx/source/dialog/simptabl.cxx svx/source/dialog/srchdlg.cxx svx/source/dialog/svxbmpnumvalueset.cxx svx/source/dialog/svxruler.cxx svx/source/dialog/swframeexample.cxx svx/source/engine3d/float3d.cxx svx/source/engine3d/float3d.src svx/source/engine3d/svx3ditems.cxx svx/source/fmcomp/gridctrl.cxx svx/source/fmcomp/trace.cxx svx/source/form/ParseContext.cxx svx/source/form/datanavi.cxx svx/source/form/filtnav.cxx svx/source/form/fmexch.cxx svx/source/form/fmexpl.cxx svx/source/form/fmobjfac.cxx svx/source/form/fmpage.cxx svx/source/form/fmshell.cxx svx/source/form/fmshimp.cxx svx/source/form/fmsrcimp.cxx svx/source/form/fmvwimp.cxx svx/source/form/makefile.mk svx/source/form/tabwin.cxx svx/source/form/tbxform.cxx svx/source/form/typemap.cxx svx/source/gallery2/galbrws1.cxx svx/source/gallery2/galbrws2.cxx svx/source/gallery2/galexpl.cxx svx/source/gallery2/gallery1.cxx svx/source/gallery2/galtheme.cxx svx/source/gallery2/makefile.mk svx/source/gengal/gengal.cxx svx/source/gengal/makefile.mk svx/source/inc/fmgroup.hxx svx/source/intro/about_ooo.hrc svx/source/intro/iso.src svx/source/intro/ooo.src svx/source/items/SmartTagItem.cxx svx/source/items/algitem.cxx svx/source/items/chrtitem.cxx svx/source/items/clipfmtitem.cxx svx/source/items/customshapeitem.cxx svx/source/items/drawitem.cxx svx/source/items/e3ditem.cxx svx/source/items/grfitem.cxx svx/source/items/hlnkitem.cxx svx/source/items/makefile.mk svx/source/items/pageitem.cxx svx/source/items/rotmodit.cxx svx/source/items/viewlayoutitem.cxx svx/source/items/zoomitem.cxx svx/source/items/zoomslideritem.cxx svx/source/src/app.hrc svx/source/stbctrls/makefile.mk svx/source/stbctrls/modctrl.cxx svx/source/stbctrls/xmlsecctrl.cxx svx/source/stbctrls/zoomctrl.cxx svx/source/svdraw/clonelist.cxx svx/source/svdraw/svdattr.cxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdedtv2.cxx svx/source/svdraw/svdedxv.cxx svx/source/svdraw/svdetc.cxx svx/source/svdraw/svdfmtf.cxx svx/source/svdraw/svdfmtf.hxx svx/source/svdraw/svdglue.cxx svx/source/svdraw/svdhdl.cxx svx/source/svdraw/svdhlpln.cxx svx/source/svdraw/svdibrow.cxx svx/source/svdraw/svdlayer.cxx svx/source/svdraw/svdmodel.cxx svx/source/svdraw/svdoashp.cxx svx/source/svdraw/svdobj.cxx svx/source/svdraw/svdocapt.cxx svx/source/svdraw/svdocirc.cxx svx/source/svdraw/svdoedge.cxx svx/source/svdraw/svdograf.cxx svx/source/svdraw/svdogrp.cxx svx/source/svdraw/svdomeas.cxx svx/source/svdraw/svdomedia.cxx svx/source/svdraw/svdopath.cxx svx/source/svdraw/svdotext.cxx svx/source/svdraw/svdotxdr.cxx svx/source/svdraw/svdotxed.cxx svx/source/svdraw/svdotxfl.cxx svx/source/svdraw/svdotxln.cxx svx/source/svdraw/svdotxtr.cxx svx/source/svdraw/svdoutl.cxx svx/source/svdraw/svdpage.cxx svx/source/svdraw/svdpagv.cxx svx/source/svdraw/svdpntv.cxx svx/source/svdraw/svdpoev.cxx svx/source/svdraw/svdsnpv.cxx svx/source/svdraw/svdstr.src svx/source/svdraw/svdtrans.cxx svx/source/svdraw/svdundo.cxx svx/source/svdraw/svdview.cxx svx/source/svdraw/svdxcgv.cxx svx/source/table/svdotable.cxx svx/source/tbxctrls/colorwindow.hxx svx/source/tbxctrls/extrusioncontrols.cxx svx/source/tbxctrls/fillctrl.cxx svx/source/tbxctrls/grafctrl.cxx svx/source/tbxctrls/itemwin.cxx svx/source/tbxctrls/layctrl.cxx svx/source/tbxctrls/lboxctrl.cxx svx/source/tbxctrls/linectrl.cxx svx/source/tbxctrls/tbcontrl.cxx svx/source/tbxctrls/verttexttbxctrl.cxx svx/source/unodraw/unomod.cxx svx/source/unodraw/unopage.cxx svx/source/unodraw/unoprov.cxx svx/source/unodraw/unoshape.cxx svx/source/unodraw/unoshtxt.cxx svx/source/xml/xmlxtexp.cxx svx/source/xoutdev/_xpoly.cxx svx/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr2.cxx svx/source/xoutdev/xattrbmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/util/makefile.mk svx/workben/edittest.cxx sysui/desktop/productversion.mk ucb/prj/build.lst ucb/source/cacher/cacheserv.cxx ucb/source/core/ucb1.component ucb/source/core/ucbserv.cxx ucb/source/core/ucbstore.cxx ucb/source/core/ucbstore.hxx ucb/source/sorter/sortmain.cxx ucb/source/ucp/file/prov.cxx ucb/source/ucp/file/shell.cxx ucb/source/ucp/ftp/ftpservices.cxx ucb/source/ucp/gio/gio_provider.cxx ucb/source/ucp/gvfs/gvfs_provider.cxx ucb/source/ucp/hierarchy/hierarchyservices.cxx ucb/source/ucp/odma/odma_lib.cxx ucb/source/ucp/odma/odma_services.cxx ucb/source/ucp/package/pkgservices.cxx ucb/source/ucp/tdoc/tdoc_services.cxx ucb/source/ucp/webdav/ContentProperties.cxx ucb/source/ucp/webdav/NeonHeadRequest.cxx ucb/source/ucp/webdav/webdavcontent.cxx ucb/source/ucp/webdav/webdavservices.cxx uui/source/iahndl.cxx uui/source/iahndl.hxx uui/source/loginerr.hxx uui/source/nameclashdlg.hxx uui/source/passcrtdlg.cxx uui/source/passworddlg.cxx uui/source/passworddlg.hxx uui/source/services.cxx vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/prj/build.lst vbahelper/prj/d.lst vbahelper/source/msforms/makefile.mk vbahelper/source/msforms/vbauserform.cxx vbahelper/source/vbahelper/makefile.mk vbahelper/source/vbahelper/vbaapplicationbase.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbadocumentbase.cxx vbahelper/source/vbahelper/vbadocumentsbase.cxx vbahelper/source/vbahelper/vbahelper.cxx vbahelper/util/makefile.mk xmlhelp/source/cxxhelp/provider/databases.cxx xmlhelp/source/cxxhelp/provider/services.cxx xmlhelp/source/treeview/tvfactory.cxx xmloff/JunitTest_xmloff_unoapi.mk xmloff/inc/functional.hxx xmloff/inc/xmloff/formlayerexport.hxx xmloff/inc/xmloff/formlayerimport.hxx xmloff/inc/xmloff/functional.hxx xmloff/inc/xmloff/shapeimport.hxx xmloff/inc/xmloff/xmlcnitm.hxx xmloff/inc/xmloff/xmlnumfi.hxx xmloff/prj/build.lst xmloff/source/chart/SchXMLChartContext.cxx xmloff/source/chart/SchXMLExport.cxx xmloff/source/chart/SchXMLImport.cxx xmloff/source/chart/SchXMLLegendContext.hxx xmloff/source/chart/SchXMLPlotAreaContext.cxx xmloff/source/core/xmluconv.cxx xmloff/source/draw/sdxmlexp.cxx xmloff/source/draw/shapeexport4.cxx xmloff/source/draw/ximp3dobject.cxx xmloff/source/draw/ximp3dscene.cxx xmloff/source/forms/formlayerexport.cxx xmloff/source/forms/formlayerimport.cxx xmloff/source/forms/handler/vcl_time_handler.hxx xmloff/source/forms/layerimport.cxx xmloff/source/forms/layerimport.hxx xmloff/source/forms/property_meta_data.hxx xmloff/source/style/PageHeaderFooterContext.cxx xmloff/source/style/PageMasterStyleMap.cxx xmloff/source/style/prstylei.cxx xmloff/source/style/xmlimppr.cxx xmloff/source/style/xmlnumfi.cxx xmloff/source/style/xmlstyle.cxx xmloff/source/table/tabledesignsimporter.cxx xmloff/source/text/XMLTextNumRuleInfo.cxx xmloff/source/text/XMLTextShapeStyleContext.cxx xmloff/source/text/txtstyle.cxx xmloff/source/transform/ChartOOoTContext.cxx xmloff/source/transform/EventOOoTContext.cxx xmloff/source/transform/TransformerBase.cxx xmloff/util/makefile.mk xmlscript/util/xcr.component
995 lines
34 KiB
C++
Executable File
995 lines
34 KiB
C++
Executable File
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*************************************************************************
|
|
*
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
*
|
|
************************************************************************/
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
#include "precompiled_basic.hxx"
|
|
/*************************************************************************
|
|
File Versions so far:
|
|
No Version Initial Implementation without Version Information
|
|
Version 2 changed order of entries(New Entries at the end)
|
|
Version 3 Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8
|
|
|
|
*************************************************************************/
|
|
#include <cstdio>
|
|
#include <tools/time.hxx>
|
|
#include <tools/stream.hxx>
|
|
#include <vcl/msgbox.hxx>
|
|
#include <vcl/sound.hxx>
|
|
#include <tools/fsys.hxx>
|
|
#include <svtools/stringtransfer.hxx>
|
|
#include <unotools/syslocale.hxx>
|
|
#include <basic/ttstrhlp.hxx>
|
|
#include "basic.hrc"
|
|
#include "msgedit.hxx"
|
|
#include "app.hxx"
|
|
#include "apperror.hxx"
|
|
#include "appbased.hxx"
|
|
#include "basmsg.hrc"
|
|
#include "basrid.hxx"
|
|
|
|
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: ")
|
|
#define THIS_VERSION 2
|
|
|
|
#define LOGTYPE( pEntry ) ((pEntry && pEntry->GetUserData())?((TTDebugData*)pEntry->GetUserData())->aLogType:LOG_ERROR)
|
|
|
|
MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits )
|
|
: pBasicFrame(pBF)
|
|
, pCurrentRun(NULL)
|
|
, pCurrentTestCase(NULL)
|
|
, pCurrentAssertion( NULL )
|
|
, pCurrentError(NULL)
|
|
, bModified(sal_False)
|
|
, bFileLoading(sal_False)
|
|
, nVersion(0)
|
|
, pAppError( pParent )
|
|
, aEditTree( pParent, pBF, aBits | WB_HASBUTTONS | WB_HASLINES | WB_HASBUTTONSATROOT )
|
|
{
|
|
// SetFont( aEditTree.GetDefaultFont( DEFAULTFONT_FIXED, aEditTree.GetSettings().GetLanguage(), 0, &aEditTree ) );
|
|
aEditTree.SetNodeBitmaps( Bitmap( SttResId (MBP_PLUS) ), Bitmap( SttResId (MBP_MINUS) ) );
|
|
aEditTree.SetSelectionMode( MULTIPLE_SELECTION );
|
|
if ( aEditTree.GetModel()->GetSortMode() != SortNone )
|
|
aEditTree.GetModel()->SetSortMode( SortNone );
|
|
|
|
if ( !bPrintLogToStdoutSet )
|
|
{
|
|
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 = sal_True;
|
|
}
|
|
}
|
|
}
|
|
|
|
MsgEdit::~MsgEdit()
|
|
{}
|
|
|
|
// set the LogType since calling the add method can be from other add methods
|
|
#define COPY_TTDEBUGDATA( LOGTYPE ) \
|
|
TTDebugData *pTTDebugData = new TTDebugData; \
|
|
*pTTDebugData = aDebugData; \
|
|
pTTDebugData->aLogType = LOGTYPE; \
|
|
|
|
|
|
void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg )
|
|
{
|
|
if ( LogMsg->aDebugData.aFilename.Copy(0,2).CompareToAscii( "--" ) == COMPARE_EQUAL )
|
|
LogMsg->aDebugData.aFilename.Erase(0,2);
|
|
|
|
if ( LogMsg->aDebugData.aFilename.Len() && LogMsg->aDebugData.aFilename.GetChar(0) != '~' ) // do we want to convert
|
|
{
|
|
DirEntry aConvert( LogMsg->aDebugData.aFilename );
|
|
if ( pAppError->aBaseDir.Contains( aConvert ) )
|
|
{
|
|
aConvert.ToRel( pAppError->aBaseDir );
|
|
LogMsg->aDebugData.aFilename = CUniString("~"); // mark as converted
|
|
LogMsg->aDebugData.aFilename += aConvert.GetFull( FSYS_STYLE_VFAT );
|
|
}
|
|
else if ( !bFileLoading )
|
|
{
|
|
LogMsg->aDebugData.aFilename.Insert( CUniString("~-"), 0); // mark as unconvertable
|
|
}
|
|
}
|
|
xub_StrLen nPos;
|
|
LogMsg->aDebugData.aMsg.ConvertLineEnd();
|
|
// does the message have several lines -> repeat the call for each line
|
|
if ( (nPos = LogMsg->aDebugData.aMsg.Search( CUniString("\n").ConvertLineEnd() )) != STRING_NOTFOUND )
|
|
{
|
|
String aOriginalMsg = LogMsg->aDebugData.aMsg;
|
|
xub_StrLen nSysLineEndLen = CUniString("\n").ConvertLineEnd().Len();
|
|
String aLastPart = LogMsg->aDebugData.aMsg.Copy( nPos+nSysLineEndLen );
|
|
LogMsg->aDebugData.aMsg.Erase( nPos );
|
|
AddAnyMsg( LogMsg );
|
|
if ( aLastPart.Len() )
|
|
{
|
|
LogMsg->aDebugData.aMsg = aLastPart;
|
|
AddAnyMsg( LogMsg );
|
|
}
|
|
LogMsg->aDebugData.aMsg = aOriginalMsg;
|
|
}
|
|
else
|
|
{
|
|
String aUILogMsg( pBasicFrame->GenRealString( LogMsg->aDebugData.aMsg ) );
|
|
switch ( LogMsg->aDebugData.aLogType )
|
|
{
|
|
case LOG_RUN:
|
|
{
|
|
if ( LogMsg->aDebugData.aMsg.Len() == 0 )
|
|
{
|
|
SvtSysLocale aLocale;
|
|
LogMsg->aDebugData.aMsg = GEN_RES_STR2( S_PROG_START,
|
|
aLocale.GetLocaleData().getDate(Date()),
|
|
aLocale.GetLocaleData().getTime(Time()) );
|
|
aUILogMsg = pBasicFrame->GenRealString( LogMsg->aDebugData.aMsg );
|
|
}
|
|
AddRun( aUILogMsg, LogMsg->aDebugData ); break;
|
|
}
|
|
case LOG_TEST_CASE: AddTestCase( aUILogMsg, LogMsg->aDebugData ); break;
|
|
case LOG_ERROR: AddError( aUILogMsg, LogMsg->aDebugData ); break;
|
|
case LOG_CALL_STACK:AddCallStack( aUILogMsg, LogMsg->aDebugData ); break;
|
|
case LOG_MESSAGE: AddMessage( aUILogMsg, LogMsg->aDebugData ); break;
|
|
case LOG_WARNING: AddWarning( aUILogMsg, LogMsg->aDebugData ); break;
|
|
case LOG_ASSERTION: AddAssertion( aUILogMsg, LogMsg->aDebugData ); break;
|
|
case LOG_ASSERTION_STACK: AddAssertionStack( aUILogMsg, LogMsg->aDebugData ); break;
|
|
case LOG_QA_ERROR: AddQAError( aUILogMsg, LogMsg->aDebugData ); break;
|
|
default:OSL_FAIL("Unbekannter Typ in ResultFile. Speichern des ResultFile resultiert in Informationsverlust");
|
|
}
|
|
|
|
if ( !bFileLoading )
|
|
{ // Comes from Testtool and must be written immediately
|
|
sal_Bool bFileWasChanged = pAppError->DiskFileChanged( SINCE_LAST_LOAD );
|
|
|
|
DBG_ASSERT( aLogFileName == LogMsg->aLogFileName, "Logging to different logfile as before" );
|
|
DirEntry aEntry( LogMsg->aLogFileName );
|
|
sal_Bool bNewFile = !aEntry.Exists();
|
|
SvFileStream aStrm( LogMsg->aLogFileName, STREAM_STD_WRITE );
|
|
if ( bNewFile )
|
|
{
|
|
String aSave = VERSION_STRING.Append( UniString::CreateFromInt32( 3 ) ).AppendAscii("\n"); // Version 3
|
|
aSave.ConvertLineEnd(LINEEND_CRLF);
|
|
aStrm << ByteString( aSave, RTL_TEXTENCODING_IBM_850 ).GetBuffer();
|
|
}
|
|
|
|
String aLogMsg = Impl_MakeSaveText( LogMsg->aDebugData ).AppendAscii("\n");
|
|
|
|
if( aStrm.IsOpen() )
|
|
{
|
|
aLogMsg.ConvertLineEnd(LINEEND_CRLF);
|
|
aStrm.Seek(STREAM_SEEK_TO_END);
|
|
aStrm << ByteString( aLogMsg, RTL_TEXTENCODING_UTF8 ).GetBuffer();
|
|
aStrm.Close();
|
|
}
|
|
if ( !bFileWasChanged )
|
|
pAppError->UpdateFileInfo( HAS_BEEN_LOADED );
|
|
|
|
|
|
// now write to stdout
|
|
if ( bPrintLogToStdout )
|
|
{
|
|
String aPrintMsg, aOriginalMsg;
|
|
|
|
aOriginalMsg = LogMsg->aDebugData.aMsg;
|
|
// converting to human readable string for adding errors to list in testobject
|
|
LogMsg->aDebugData.aMsg = pBasicFrame->GenRealString( LogMsg->aDebugData.aMsg );
|
|
|
|
aPrintMsg = Impl_MakeSaveText( LogMsg->aDebugData ).AppendAscii("\n");
|
|
|
|
// restore Original Msg
|
|
LogMsg->aDebugData.aMsg = aOriginalMsg;
|
|
|
|
printf( "%s", ByteString( aPrintMsg, RTL_TEXTENCODING_UTF8 ).GetBuffer() );
|
|
}
|
|
}
|
|
}
|
|
// converting to human readable string for adding errors to list in testobject
|
|
LogMsg->aDebugData.aMsg = pBasicFrame->GenRealString( LogMsg->aDebugData.aMsg );
|
|
}
|
|
|
|
void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
|
|
{
|
|
if ( !bFileLoading && bLimitLogLen )
|
|
{
|
|
sal_uInt16 nSkip = nMaxLogLen;
|
|
SvLBoxEntry *pRun = aEditTree.First();
|
|
while ( nSkip-- && pRun )
|
|
pRun = aEditTree.NextSibling( pRun );
|
|
// Remove all Entries thereafter
|
|
if ( pRun )
|
|
{
|
|
while ( pRun && aEditTree.NextSibling( pRun ) )
|
|
aEditTree.GetModel()->Remove( aEditTree.NextSibling( pRun ) );
|
|
|
|
aEditTree.GetModel()->Remove( pRun );
|
|
bModified = sal_True;
|
|
lModify.Call( NULL );
|
|
Save( aLogFileName );
|
|
pAppError->UpdateFileInfo( HAS_BEEN_LOADED );
|
|
}
|
|
}
|
|
|
|
COPY_TTDEBUGDATA( LOG_RUN );
|
|
if ( !bFileLoading || ( bFileLoading && nVersion >= 2 ) )
|
|
pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, sal_False, 0, pTTDebugData );
|
|
else // First file format
|
|
pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, sal_False, LIST_APPEND, pTTDebugData ); // and therefor at the end
|
|
|
|
aEditTree.ShowEntry( pCurrentRun );
|
|
pCurrentTestCase = NULL;
|
|
pCurrentAssertion = NULL;
|
|
pCurrentError = NULL;
|
|
}
|
|
|
|
void MsgEdit::AddTestCase( String aMsg, TTDebugData aDebugData )
|
|
{
|
|
if ( pCurrentRun )
|
|
{
|
|
if ( aMsg.Len() == 0 ) // End of Testcase
|
|
{
|
|
pCurrentTestCase = NULL;
|
|
}
|
|
else
|
|
{
|
|
COPY_TTDEBUGDATA( LOG_TEST_CASE );
|
|
pCurrentTestCase = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pCurrentTestCase );
|
|
}
|
|
}
|
|
pCurrentAssertion = NULL;
|
|
pCurrentError = NULL;
|
|
}
|
|
|
|
void MsgEdit::AddError( String aMsg, TTDebugData aDebugData )
|
|
{
|
|
if ( !pCurrentTestCase )
|
|
{
|
|
TTLogMsg aLogMsg;
|
|
aLogMsg.aDebugData = aDebugData;
|
|
aLogMsg.aDebugData.aMsg = GEN_RES_STR0( S_ERROR_OUTSIDE_TESTCASE );
|
|
aLogMsg.aDebugData.aLogType = LOG_TEST_CASE;
|
|
aLogMsg.aLogFileName = aLogFileName;
|
|
AddAnyMsg( &aLogMsg );
|
|
}
|
|
if ( pCurrentTestCase )
|
|
{
|
|
COPY_TTDEBUGDATA( LOG_ERROR );
|
|
pCurrentError = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pCurrentError );
|
|
}
|
|
}
|
|
|
|
void MsgEdit::AddCallStack( String aMsg, TTDebugData aDebugData )
|
|
{
|
|
DBG_ASSERT( pCurrentError, "Callstack ohne CurrentError im Journal" );
|
|
if ( pCurrentError )
|
|
{
|
|
COPY_TTDEBUGDATA( LOG_CALL_STACK );
|
|
aEditTree.InsertEntry( aMsg, pCurrentError, sal_False, LIST_APPEND, pTTDebugData );
|
|
}
|
|
}
|
|
|
|
void MsgEdit::AddMessage( String aMsg, TTDebugData aDebugData )
|
|
{
|
|
SvLBoxEntry *pThisEntry = NULL;
|
|
COPY_TTDEBUGDATA( LOG_MESSAGE );
|
|
if ( pCurrentTestCase )
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
|
|
else if ( pCurrentRun )
|
|
{
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pThisEntry );
|
|
}
|
|
else
|
|
{
|
|
AddRun( aMsg, aDebugData );
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pThisEntry );
|
|
}
|
|
}
|
|
|
|
void MsgEdit::AddWarning( String aMsg, TTDebugData aDebugData )
|
|
{
|
|
SvLBoxEntry *pThisEntry = NULL;
|
|
String aCompleteMsg;
|
|
aCompleteMsg = WARNING_PREFIX.Append( aMsg );
|
|
COPY_TTDEBUGDATA( LOG_WARNING );
|
|
|
|
if ( pCurrentTestCase )
|
|
pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
|
|
else if ( pCurrentRun )
|
|
{
|
|
pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pThisEntry );
|
|
}
|
|
else
|
|
{
|
|
AddRun( aMsg, aDebugData );
|
|
pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pThisEntry );
|
|
}
|
|
|
|
while ( !aEditTree.IsEntryVisible( pThisEntry ) && ( pThisEntry = aEditTree.GetParent( pThisEntry ) ) != NULL )
|
|
aEditTree.InvalidateEntry( pThisEntry );
|
|
}
|
|
|
|
void MsgEdit::AddAssertion( String aMsg, TTDebugData aDebugData )
|
|
{
|
|
const String aAssertionStackPrefix( CUniString(ASSERTION_STACK_PREFIX) );
|
|
if ( aMsg.Match( aAssertionStackPrefix ) == aAssertionStackPrefix.Len() )
|
|
{
|
|
AddAssertionStack( aMsg, aDebugData );
|
|
return;
|
|
}
|
|
SvLBoxEntry *pThisEntry = NULL;
|
|
COPY_TTDEBUGDATA( LOG_ASSERTION );
|
|
if ( pCurrentTestCase )
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
|
|
else if ( pCurrentRun )
|
|
{
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pThisEntry );
|
|
}
|
|
else
|
|
{
|
|
AddRun( aMsg, aDebugData );
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pThisEntry );
|
|
}
|
|
|
|
pCurrentAssertion = pThisEntry;
|
|
|
|
while ( !aEditTree.IsEntryVisible( pThisEntry ) && ( pThisEntry = aEditTree.GetParent( pThisEntry ) ) != NULL )
|
|
aEditTree.InvalidateEntry( pThisEntry );
|
|
}
|
|
|
|
void MsgEdit::AddAssertionStack( String aMsg, TTDebugData aDebugData )
|
|
{
|
|
SvLBoxEntry *pThisEntry = NULL;
|
|
COPY_TTDEBUGDATA( LOG_ASSERTION_STACK );
|
|
if ( pCurrentAssertion )
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentAssertion, sal_False, LIST_APPEND, pTTDebugData );
|
|
else if ( pCurrentTestCase )
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
|
|
else if ( pCurrentRun )
|
|
{
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pThisEntry );
|
|
}
|
|
else
|
|
{
|
|
AddRun( aMsg, aDebugData );
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pThisEntry );
|
|
}
|
|
|
|
while ( !aEditTree.IsEntryVisible( pThisEntry ) && ( pThisEntry = aEditTree.GetParent( pThisEntry ) ) != NULL )
|
|
aEditTree.InvalidateEntry( pThisEntry );
|
|
}
|
|
|
|
void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
|
|
{
|
|
SvLBoxEntry *pThisEntry = NULL;
|
|
COPY_TTDEBUGDATA( LOG_QA_ERROR );
|
|
if ( pCurrentTestCase )
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
|
|
else if ( pCurrentRun )
|
|
{
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pThisEntry );
|
|
}
|
|
else
|
|
{
|
|
AddRun( aMsg, aDebugData );
|
|
pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
|
|
aEditTree.ShowEntry( pThisEntry );
|
|
}
|
|
|
|
while ( !aEditTree.IsEntryVisible( pThisEntry ) && ( pThisEntry = aEditTree.GetParent( pThisEntry ) ) != NULL )
|
|
aEditTree.InvalidateEntry( pThisEntry );
|
|
}
|
|
|
|
/*
|
|
SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
|
|
SvLBoxEntry* GetEntry( sal_uIntPtr nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
|
|
|
|
|
|
|
|
SvLBoxEntry* FirstChild(SvLBoxEntry* pParent ) const { return (SvLBoxEntry*)(pModel->FirstChild(pParent)); }
|
|
SvLBoxEntry* NextSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->NextSibling( pEntry )); }
|
|
SvLBoxEntry* PrevSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->PrevSibling( pEntry )); }
|
|
|
|
SvLBoxEntry* FirstSelected() const { return (SvLBoxEntry*)SvListView::FirstSelected(); }
|
|
SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::NextSelected(pEntry)); }
|
|
SvLBoxEntry* PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); }
|
|
SvLBoxEntry* LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); }
|
|
|
|
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 ));}
|
|
|
|
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;
|
|
*/
|
|
|
|
//#define CHECK( pMemo ) if ( pMemo && !aEditTree.GetViewData( pMemo ) ) pMemo = NULL
|
|
#define CHECK( pMemo ) if ( pMemo && !aEditTree.GetModel()->IsInChildList( NULL, pMemo ) ) pMemo = NULL
|
|
void MsgEdit::Delete()
|
|
{
|
|
aEditTree.RemoveSelection();
|
|
CHECK( pCurrentRun );
|
|
CHECK( pCurrentTestCase );
|
|
CHECK( pCurrentAssertion );
|
|
CHECK( pCurrentError );
|
|
bModified = sal_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(); }
|
|
void MsgEdit::Redo(){ Sound::Beep(); }
|
|
|
|
|
|
String MsgEdit::Impl_MakeText( SvLBoxEntry *pEntry ) const
|
|
{
|
|
String aRet;
|
|
TTDebugData *aData = (TTDebugData*)pEntry->GetUserData();
|
|
switch ( aData->aLogType )
|
|
{
|
|
case LOG_RUN: aRet.AppendAscii("\n"); break;
|
|
case LOG_TEST_CASE: break;
|
|
case LOG_ERROR: break;
|
|
case LOG_CALL_STACK:aRet.AppendAscii("--> "); break;
|
|
case LOG_MESSAGE: break;
|
|
case LOG_WARNING: break;
|
|
case LOG_ASSERTION: break;
|
|
case LOG_ASSERTION_STACK:aRet.AppendAscii("--> "); break;
|
|
case LOG_QA_ERROR: break;
|
|
default:OSL_FAIL("Unknown type in ResultWindow!");
|
|
}
|
|
aRet += aEditTree.GetEntryText( pEntry );
|
|
return aRet;
|
|
}
|
|
|
|
String MsgEdit::Impl_MakeSaveText( TTDebugData aData ) const
|
|
{
|
|
// LogType;Filename;Line;Col1;Col2;Message
|
|
String aRet;
|
|
aRet += String::CreateFromInt32( (int)aData.aLogType );
|
|
aRet += ';';
|
|
aRet += aData.aFilename;
|
|
aRet += ';';
|
|
aRet += String::CreateFromInt32( aData.nLine );
|
|
aRet += ';';
|
|
aRet += String::CreateFromInt32( aData.nCol1 );
|
|
aRet += ';';
|
|
aRet += String::CreateFromInt32( aData.nCol2 );
|
|
aRet += ';';
|
|
aRet += '"';
|
|
aRet += aData.aMsg;
|
|
aRet += '"';
|
|
return aRet;
|
|
}
|
|
|
|
String MsgEdit::Impl_MakeSaveText( SvLBoxEntry *pEntry ) const
|
|
{
|
|
// LogType;Filename;Line;Col1;Col2;Message
|
|
String aRet;
|
|
TTDebugData *aData = (TTDebugData*)pEntry->GetUserData();
|
|
|
|
if ( aEditTree.PrevSibling( pEntry ) && LOGTYPE( aEditTree.PrevSibling( pEntry ) ) == LOG_TEST_CASE )
|
|
{ // To properly finish cases and warnings/msgs are in correct hierarchie
|
|
aRet += String::CreateFromInt32( (int)LOG_TEST_CASE );
|
|
aRet.AppendAscii(";;0;0;0;\"\"\n");
|
|
}
|
|
aRet += Impl_MakeSaveText( *aData );
|
|
return aRet;
|
|
}
|
|
|
|
String MsgEdit::GetSelected()
|
|
{
|
|
String aRet;
|
|
SvLBoxEntry *pEntry = aEditTree.FirstSelected();
|
|
while ( pEntry )
|
|
{
|
|
aRet += Impl_MakeText( pEntry );
|
|
aRet += '\n';
|
|
pEntry = aEditTree.NextSelected( pEntry );
|
|
}
|
|
aRet.ConvertLineEnd();
|
|
return aRet;
|
|
}
|
|
|
|
TextSelection MsgEdit::GetSelection() const
|
|
{
|
|
if ( aEditTree.FirstSelected() )
|
|
{
|
|
sal_uIntPtr nStart=0,nEnd=0;
|
|
nStart = aEditTree.GetModel()->GetAbsPos(aEditTree.FirstSelected() );
|
|
if ( aEditTree.LastSelected() )
|
|
nEnd = aEditTree.GetModel()->GetAbsPos(aEditTree.LastSelected() );
|
|
return TextSelection( TextPaM( nStart, 0 ), TextPaM( nEnd, STRING_MAXLEN ) );
|
|
}
|
|
else
|
|
return TextSelection();
|
|
}
|
|
|
|
void MsgEdit::SetSelection( const TextSelection& rSelection )
|
|
{
|
|
sal_uIntPtr nStart,nEnd;
|
|
|
|
while ( aEditTree.GetSelectionCount() )
|
|
aEditTree.Select( aEditTree.FirstSelected(), sal_False );
|
|
|
|
if ( rSelection.HasRange() )
|
|
{
|
|
nStart = rSelection.GetStart().GetPara();
|
|
nEnd = rSelection.GetEnd().GetPara();
|
|
|
|
for ( sal_uIntPtr i = nStart ; i <= nEnd ; i++ )
|
|
aEditTree.Select( aEditTree.GetModel()->GetEntryAtAbsPos( i ), sal_True );
|
|
}
|
|
}
|
|
|
|
sal_uInt16 MsgEdit::GetLineNr() const
|
|
{
|
|
if ( aEditTree.GetCurEntry() )
|
|
return (sal_uInt16)aEditTree.GetModel()->GetAbsPos(aEditTree.GetCurEntry() ) + 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
void MsgEdit::ReplaceSelected( const String& rStr )
|
|
{
|
|
(void) rStr; /* avoid warning about unused parameter */
|
|
Sound::Beep();
|
|
OSL_FAIL("Not Implemented");
|
|
}
|
|
|
|
sal_Bool MsgEdit::IsModified(){ return bModified; }
|
|
void MsgEdit::SetModifyHdl( Link l ){ lModify = l; }
|
|
|
|
String MsgEdit::GetText() const
|
|
{
|
|
String aRet;
|
|
SvLBoxEntry *pEntry = aEditTree.First();
|
|
while ( pEntry )
|
|
{
|
|
aRet += Impl_MakeText( pEntry );
|
|
aRet += '\n';
|
|
pEntry = aEditTree.Next( pEntry );
|
|
}
|
|
aRet.ConvertLineEnd();
|
|
return aRet;
|
|
}
|
|
|
|
void MsgEdit::SetText( const String& rStr )
|
|
{
|
|
(void) rStr; /* avoid warning about unused parameter */
|
|
Sound::Beep();
|
|
OSL_FAIL("Not Implemented");
|
|
}
|
|
|
|
sal_Bool MsgEdit::HasText() const
|
|
{
|
|
return aEditTree.First() != NULL;
|
|
}
|
|
|
|
// Search from the beginning or mark start + 1
|
|
sal_Bool MsgEdit::Find( const String& s )
|
|
{
|
|
TextSelection r = GetSelection();
|
|
sal_uInt16 bgn = (sal_uInt16) r.GetStart().GetPara() + 1;
|
|
if ( r.GetStart().GetPara() == 0 )
|
|
bgn = 0; // Search from the beginning
|
|
|
|
SvLBoxEntry *pEntry = aEditTree.GetModel()->GetEntryAtAbsPos( bgn );
|
|
while ( pEntry )
|
|
{
|
|
if( aEditTree.GetEntryText( pEntry ).Search( s, 0 ) != STRING_NOTFOUND )
|
|
{
|
|
aEditTree.SetCurEntry( pEntry );
|
|
return sal_True;
|
|
}
|
|
pEntry = aEditTree.Next( pEntry );
|
|
}
|
|
return sal_False;
|
|
}
|
|
|
|
/******************************************************************
|
|
|
|
Fileformat of *.res file:
|
|
Information are stored as semicolon separated strings
|
|
Order:
|
|
|
|
LogType;Filename;Line;Col1;Col2;Message
|
|
|
|
******************************************************************/
|
|
|
|
sal_Bool MsgEdit::Load( const String& aName )
|
|
{
|
|
aLogFileName = aName;
|
|
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 = sal_True; // To avoid logging to disk
|
|
TTLogMsg *pLogMsg = new TTLogMsg;
|
|
while( !aStrm.IsEof() && bOk )
|
|
{
|
|
if ( nVersion >= 3 ) // utf8
|
|
aStrm.ReadByteStringLine( aLine, RTL_TEXTENCODING_UTF8 );
|
|
else
|
|
aStrm.ReadByteStringLine( aLine, RTL_TEXTENCODING_IBM_850 );
|
|
|
|
if( aStrm.GetError() != SVSTREAM_OK )
|
|
bOk = sal_False;
|
|
|
|
#define TOKEN( n ) aLine.GetToken( n )
|
|
|
|
if ( aLine.GetTokenCount() >= 6 )
|
|
{
|
|
// LogType;Filename;Line;Col1;Col2;Message
|
|
TTDebugData aDebugData;
|
|
aDebugData.aLogType = TTLogType( TOKEN(0).ToInt32() );
|
|
aDebugData.aFilename = TOKEN(1);
|
|
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
|
|
aDebugData.aMsg.Erase(0,1);
|
|
aDebugData.aMsg.Erase(aDebugData.aMsg.Len()-1,1);
|
|
|
|
pLogMsg->aLogFileName.Erase();
|
|
pLogMsg->aDebugData = aDebugData;
|
|
|
|
AddAnyMsg( pLogMsg );
|
|
}
|
|
else if ( bFirstLine && (aLine.Search( VERSION_STRING ) == 0) )
|
|
nVersion = sal_uInt16( aLine.Copy( VERSION_STRING.Len() ).ToInt32() );
|
|
else if ( aLine.Len() )
|
|
bLoadError = sal_True;
|
|
|
|
bFirstLine = sal_False;
|
|
}
|
|
bFileLoading = sal_False;
|
|
delete pLogMsg;
|
|
aStrm.Close();
|
|
if ( nVersion < 2 && !bLoadError )
|
|
Save( aName ); // Necessary to avoid mess
|
|
|
|
}
|
|
else
|
|
bOk = sal_False;
|
|
return bOk;
|
|
}
|
|
|
|
sal_Bool MsgEdit::Save( const String& aName )
|
|
{
|
|
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 sal_False;
|
|
SvFileStream aStrm( aName, STREAM_STD_WRITE | STREAM_TRUNC );
|
|
if( aStrm.IsOpen() )
|
|
{
|
|
if ( bIsText )
|
|
{
|
|
String aSave = GetText();
|
|
aSave.ConvertLineEnd(LINEEND_CRLF);
|
|
aStrm << ByteString( aSave, RTL_TEXTENCODING_UTF8 ).GetBuffer();
|
|
}
|
|
else
|
|
{
|
|
// LogType;Filename;Line;Col1;Col2;Message
|
|
String aSave = VERSION_STRING.Append( UniString::CreateFromInt32( 3 ) ).AppendAscii("\n"); // Version 3
|
|
SvLBoxEntry *pRun = aEditTree.First();
|
|
while ( pRun && aEditTree.NextSibling( pRun ) )
|
|
pRun = aEditTree.NextSibling( pRun );
|
|
|
|
aSave.ConvertLineEnd(LINEEND_CRLF);
|
|
aStrm << ByteString( aSave, RTL_TEXTENCODING_IBM_850 ).GetBuffer();
|
|
|
|
SvLBoxEntry *pEntry;
|
|
while ( pRun )
|
|
{
|
|
pEntry = pRun;
|
|
while ( pEntry && ( pEntry == pRun || LOGTYPE( pEntry ) != LOG_RUN ) )
|
|
{
|
|
aSave = Impl_MakeSaveText( pEntry );
|
|
aSave += '\n';
|
|
aSave.ConvertLineEnd(LINEEND_CRLF);
|
|
aStrm << ByteString( aSave, RTL_TEXTENCODING_UTF8 ).GetBuffer();
|
|
pEntry = aEditTree.Next( pEntry );
|
|
}
|
|
pRun = aEditTree.PrevSibling( pRun );
|
|
|
|
}
|
|
}
|
|
if( aStrm.GetError() != SVSTREAM_OK )
|
|
bOk = sal_False;
|
|
else
|
|
{
|
|
bModified = sal_False;
|
|
lModify.Call( NULL );
|
|
}
|
|
|
|
}
|
|
else
|
|
bOk = sal_False;
|
|
return bOk;
|
|
}
|
|
|
|
|
|
TTTreeListBox::TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinStyle )
|
|
: SvTreeListBox( pParent, nWinStyle )
|
|
, pBasicFrame(pBF)
|
|
, pAppError( pParent )
|
|
//, nDeselectParent(0)
|
|
{}
|
|
|
|
sal_Bool TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
|
|
{
|
|
if ( pThisEntry && pThisEntry->GetUserData() && ((TTDebugData*)pThisEntry->GetUserData())->aFilename.Len() > 0 )
|
|
{
|
|
TTDebugData *aData = (TTDebugData*)pThisEntry->GetUserData();
|
|
String aFilename = aData->aFilename;
|
|
if ( aData->aFilename.GetChar(0) == '~' )
|
|
{
|
|
if ( aData->aFilename.GetChar(1) == '-' )
|
|
{
|
|
aFilename.Erase( 0,2 );
|
|
}
|
|
else
|
|
{
|
|
aFilename.Erase( 0,1 );
|
|
DirEntry aConvert( pAppError->aBaseDir );
|
|
aConvert += DirEntry( aFilename, FSYS_STYLE_VFAT );
|
|
aFilename = aConvert.GetFull();
|
|
}
|
|
}
|
|
|
|
if ( pBasicFrame->FindModuleWin( aFilename ) )
|
|
{
|
|
AppWin *pWin = pBasicFrame->FindModuleWin( aFilename );
|
|
pWin->ToTop();
|
|
}
|
|
else if ( pBasicFrame->Basic().FindModule( CUniString( "--" ).Append( aFilename ) ) )
|
|
{
|
|
SbModule* pMod = pBasicFrame->Basic().FindModule( CUniString( "--" ).Append( aFilename ) );
|
|
pBasicFrame->CreateModuleWin( pMod );
|
|
}
|
|
else
|
|
pBasicFrame->LoadFile( aFilename );
|
|
|
|
if ( pBasicFrame->pWork && pBasicFrame->pWork->ISA(AppEdit) )
|
|
((AppEdit*)pBasicFrame->pWork)->Highlight( aData->nLine, aData->nCol1, aData->nCol2 );
|
|
return sal_False;
|
|
}
|
|
return sal_True;
|
|
}
|
|
|
|
sal_Bool TTTreeListBox::DoubleClickHdl()
|
|
{
|
|
return JumpToSourcecode( GetHdlEntry() );
|
|
}
|
|
|
|
/*sal_uIntPtr TTTreeListBox::SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect )
|
|
{
|
|
SvLBoxEntry *pEntry = FirstChild( pParent );
|
|
sal_uIntPtr nRet = 0;
|
|
while ( pEntry )
|
|
{
|
|
nRet++;
|
|
Select( pEntry, bSelect );
|
|
pEntry = NextSibling( pEntry );
|
|
}
|
|
return nRet;
|
|
}
|
|
|
|
|
|
void TTTreeListBox::SelectHdl()
|
|
{
|
|
SvLBoxEntry* pHdlEntry = GetHdlEntry();
|
|
|
|
SelectChildren( pHdlEntry, sal_True );
|
|
Select( pHdlEntry, sal_True );
|
|
// InitMenu(pApp->GetAppMenu()->GetPopupMenu( RID_APPEDIT )); // so that delete works correct
|
|
}
|
|
|
|
void TTTreeListBox::DeselectHdl()
|
|
{
|
|
SvLBoxEntry* pHdlEntry = GetHdlEntry();
|
|
if ( GetParent( pHdlEntry ) )
|
|
{
|
|
nDeselectParent++;
|
|
Select( GetParent( pHdlEntry ), sal_False );
|
|
nDeselectParent--;
|
|
}
|
|
if ( !nDeselectParent )
|
|
{
|
|
SelectChildren( pHdlEntry, sal_False );
|
|
Select( pHdlEntry, sal_False );
|
|
}
|
|
Invalidate();
|
|
} */
|
|
|
|
|
|
void TTTreeListBox::KeyInput( const KeyEvent& rKEvt )
|
|
{
|
|
switch ( rKEvt.GetKeyCode().GetFunction() )
|
|
{
|
|
case KEYFUNC_CUT:
|
|
Control::GetParent()->Command( CommandEvent( Point(), RID_EDITCUT ) );
|
|
break;
|
|
case KEYFUNC_COPY:
|
|
Control::GetParent()->Command( CommandEvent( Point(), RID_EDITCOPY ) );
|
|
break;
|
|
case KEYFUNC_PASTE:
|
|
Control::GetParent()->Command( CommandEvent( Point(), RID_EDITPASTE ) );
|
|
break;
|
|
case KEYFUNC_DELETE:
|
|
Control::GetParent()->Command( CommandEvent( Point(), RID_EDITDEL ) );
|
|
break;
|
|
default:
|
|
if ( rKEvt.GetKeyCode().GetCode() == KEY_RETURN )
|
|
JumpToSourcecode( GetCurEntry() );
|
|
else
|
|
SvTreeListBox::KeyInput( rKEvt );
|
|
}
|
|
}
|
|
|
|
|
|
TTFeatures TTTreeListBox::GetFeatures( SvLBoxEntry* pEntry )
|
|
{
|
|
switch ( LOGTYPE( pEntry ) )
|
|
{
|
|
case LOG_MESSAGE:
|
|
return HasNothing;
|
|
case LOG_WARNING :
|
|
return HasWarning;
|
|
case LOG_ERROR:
|
|
case LOG_CALL_STACK:
|
|
return HasError;
|
|
case LOG_RUN:
|
|
case LOG_TEST_CASE:
|
|
{
|
|
SvLBoxEntry* pThisEntry = FirstChild( pEntry );
|
|
TTFeatures aResult = HasNothing;
|
|
while ( pThisEntry && !( (aResult & HasError) == HasError ) )
|
|
{
|
|
if ( !IsEntryVisible( pThisEntry ) )
|
|
aResult |= GetFeatures( pThisEntry );
|
|
pThisEntry = NextSibling( pThisEntry );
|
|
}
|
|
return aResult;
|
|
}
|
|
case LOG_ASSERTION:
|
|
case LOG_ASSERTION_STACK:
|
|
return HasAssertion;
|
|
case LOG_QA_ERROR:
|
|
return HasQAError;
|
|
default:
|
|
OSL_FAIL("Unknown type in ResultWindow");
|
|
}
|
|
return HasNothing;
|
|
}
|
|
|
|
|
|
class TTLBoxString : public SvLBoxString
|
|
{
|
|
public:
|
|
|
|
TTLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags,
|
|
const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {}
|
|
|
|
virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
|
|
SvLBoxEntry* pEntry);
|
|
};
|
|
|
|
|
|
void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
|
|
SvLBoxEntry* pEntry )
|
|
{
|
|
TTFeatures aFeatures = ((TTTreeListBox*)&rDev)->GetFeatures( pEntry );
|
|
|
|
Font aOldFont( rDev.GetFont());
|
|
Font aFont( aOldFont );
|
|
if ( aFeatures != HasNothing )
|
|
{
|
|
Color aCol;
|
|
if ( ( aFeatures & HasError ) == HasError )
|
|
aCol = Color( 255, 130, 130 ); // Red
|
|
else if ( ( aFeatures & HasWarning ) == HasWarning )
|
|
aCol = Color( 255, 200, 120 ); // Ochre or so
|
|
else if ( ( aFeatures & HasAssertion ) == HasAssertion )
|
|
aCol = Color( 0xd0, 0xd0, 0xff ); // blueish
|
|
else
|
|
aCol = Color( 0xd0, 0xff, 0xd0 ); // greenish
|
|
|
|
if( rDev.IsSelected(pEntry) )
|
|
aFont.SetColor( aCol );
|
|
else
|
|
{
|
|
aFont.SetFillColor( aCol );
|
|
aFont.SetTransparent( sal_False );
|
|
Color aCol2( COL_BLACK );
|
|
aFont.SetColor( aCol2 );
|
|
}
|
|
|
|
rDev.SetFont( aFont );
|
|
rDev.DrawText( rPos, GetText() );
|
|
}
|
|
else
|
|
{
|
|
if( !rDev.IsSelected(pEntry) )
|
|
{
|
|
Color aCol( COL_BLACK );
|
|
aFont.SetColor( aCol );
|
|
}
|
|
rDev.SetFont( aFont );
|
|
SvLBoxString::Paint( rPos, rDev, nFlags, pEntry );
|
|
}
|
|
rDev.SetFont( aOldFont );
|
|
}
|
|
|
|
|
|
void TTTreeListBox::InitEntry(SvLBoxEntry* pEntry,
|
|
const String& rStr ,const Image& rImg1, const Image& rImg2,
|
|
SvLBoxButtonKind eButtonKind )
|
|
{
|
|
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() );
|
|
pEntry->ReplaceItem( pStr, nColToHilite );
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|