summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <Armin.Le.Grand@Sun.COM>2009-12-21 20:40:13 +0100
committerArmin Le Grand <Armin.Le.Grand@Sun.COM>2009-12-21 20:40:13 +0100
commita7d255a48528c749c7e7444881afdfb265b735a0 (patch)
treee40b2a8ab62a9d8ca6673d8a2e3b835ff4c8f810
parent6054dc9cd4d1c667c2a2689e2affa56c4cd464c7 (diff)
parent680e0f04cd5ffb447d9525200e7a3fadb2a760d6 (diff)
aw078: resync to DEV300m68for integration
-rw-r--r--avmedia/inc/avmedia/mediaitem.hxx2
-rw-r--r--avmedia/inc/avmedia/mediatoolbox.hxx2
-rw-r--r--avmedia/inc/helpids.hrc2
-rw-r--r--avmedia/source/framework/mediacontrol.cxx2
-rw-r--r--avmedia/source/framework/mediamisc.cxx2
-rw-r--r--avmedia/source/framework/mediaplayer.cxx2
-rw-r--r--avmedia/source/java/makefile.mk2
-rw-r--r--avmedia/source/quicktime/player.cxx81
-rw-r--r--avmedia/source/quicktime/player.hxx2
-rw-r--r--avmedia/source/viewer/mediawindow.cxx72
-rw-r--r--avmedia/source/viewer/mediawindowbase_impl.cxx4
-rw-r--r--basic/inc/basic/basmgr.hxx4
-rw-r--r--basic/inc/basic/sbdef.hxx2
-rw-r--r--basic/inc/basic/sbstar.hxx9
-rw-r--r--basic/inc/basic/sbx.hxx6
-rw-r--r--basic/inc/basic/sbxbase.hxx2
-rw-r--r--basic/inc/basic/sbxobj.hxx2
-rw-r--r--basic/inc/basic/testtool.hxx2
-rw-r--r--basic/inc/pch/precompiled_basic.hxx30
-rw-r--r--basic/inc/sb.hrc2
-rw-r--r--basic/source/app/app.cxx2
-rw-r--r--basic/source/app/app.hxx4
-rw-r--r--basic/source/app/appedit.cxx2
-rw-r--r--basic/source/app/dialogs.cxx4
-rw-r--r--basic/source/app/msgedit.cxx2
-rw-r--r--basic/source/app/textedit.hxx2
-rw-r--r--basic/source/basmgr/basicmanagerrepository.cxx6
-rw-r--r--basic/source/basmgr/basmgr.cxx14
-rw-r--r--basic/source/classes/eventatt.cxx71
-rw-r--r--basic/source/classes/propacc.cxx2
-rw-r--r--basic/source/classes/sb.cxx98
-rw-r--r--basic/source/classes/sbunoobj.cxx15
-rw-r--r--basic/source/classes/sbxmod.cxx75
-rw-r--r--basic/source/comp/codegen.cxx6
-rw-r--r--basic/source/comp/exprgen.cxx2
-rw-r--r--basic/source/comp/symtbl.cxx2
-rw-r--r--basic/source/inc/propacc.hxx2
-rw-r--r--basic/source/inc/symtbl.hxx2
-rw-r--r--basic/source/runtime/basrdll.cxx2
-rw-r--r--basic/source/runtime/ddectrl.cxx2
-rw-r--r--basic/source/runtime/dllmgr.hxx4
-rw-r--r--basic/source/runtime/methods.cxx2
-rw-r--r--basic/source/runtime/methods1.cxx2
-rw-r--r--basic/source/runtime/runtime.cxx8
-rw-r--r--basic/source/runtime/step1.cxx2
-rw-r--r--basic/source/runtime/step2.cxx53
-rw-r--r--basic/source/sbx/format.src2
-rw-r--r--basic/source/sbx/sbxdate.cxx2
-rw-r--r--basic/source/sbx/sbxobj.cxx2
-rw-r--r--basic/source/sbx/sbxscan.cxx6
-rw-r--r--basic/source/sbx/sbxvar.cxx2
-rw-r--r--basic/source/uno/dlgcont.cxx42
-rw-r--r--basic/source/uno/namecont.cxx46
-rw-r--r--basic/source/uno/scriptcont.cxx14
-rw-r--r--configmgr/qa/unit/common.hxx6
-rw-r--r--configmgr/qa/unit/makefile.mk4
-rw-r--r--configmgr/qa/unit/threading.cxx12
-rw-r--r--connectivity/inc/connectivity/FValue.hxx12
-rw-r--r--connectivity/prj/build.lst2
-rw-r--r--[-rwxr-xr-x]connectivity/qa/connectivity/tools/DbaseDatabase.java3
-rw-r--r--connectivity/qa/connectivity/tools/HsqlDatabase.java3
-rw-r--r--connectivity/source/commontools/FValue.cxx154
-rw-r--r--connectivity/source/commontools/TDatabaseMetaDataBase.cxx6
-rw-r--r--connectivity/source/commontools/formattedcolumnvalue.cxx2
-rw-r--r--connectivity/source/drivers/calc/CConnection.cxx4
-rw-r--r--connectivity/source/drivers/calc/CTable.cxx4
-rw-r--r--connectivity/source/drivers/calc/makefile.mk1
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx6
-rw-r--r--connectivity/source/drivers/evoab/LFolderList.cxx6
-rw-r--r--connectivity/source/drivers/evoab/LTable.cxx6
-rw-r--r--connectivity/source/drivers/evoab2/NResultSet.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/makefile.mk2
-rw-r--r--connectivity/source/drivers/file/FConnection.cxx4
-rw-r--r--connectivity/source/drivers/file/fcode.cxx2
-rw-r--r--connectivity/source/drivers/file/quotedstring.cxx2
-rw-r--r--connectivity/source/drivers/flat/ETable.cxx6
-rw-r--r--connectivity/source/drivers/flat/makefile.mk2
-rw-r--r--connectivity/source/drivers/hsqldb/HDriver.cxx47
-rw-r--r--connectivity/source/drivers/hsqldb/makefile.mk1
-rw-r--r--connectivity/source/drivers/kab/KConnection.cxx2
-rw-r--r--connectivity/source/drivers/kab/KDEInit.cxx2
-rw-r--r--connectivity/source/drivers/kab/KDatabaseMetaData.cxx2
-rw-r--r--connectivity/source/drivers/kab/KResultSet.hxx2
-rw-r--r--connectivity/source/drivers/kab/kcondition.hxx2
-rw-r--r--connectivity/source/drivers/kab/kfields.hxx2
-rw-r--r--connectivity/source/drivers/kab/korder.hxx2
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/makefile.mk113
-rw-r--r--connectivity/source/drivers/mozab/makefile.mk44
-rw-r--r--connectivity/source/drivers/mozab/makefile_mozab.mk128
-rw-r--r--connectivity/source/drivers/mozab/mozillasrc/makefile.mk101
-rw-r--r--connectivity/source/inc/resource/hsqldb_res.hrc1
-rw-r--r--connectivity/source/parse/sqlnode.cxx14
-rw-r--r--connectivity/source/resource/conn_shared_res.src5
-rw-r--r--desktop/inc/app.hxx1
-rw-r--r--desktop/prj/build.lst4
-rw-r--r--desktop/qa/deployment_misc/makefile.mk6
-rw-r--r--desktop/qa/deployment_misc/test_dp_version.cxx4
-rw-r--r--desktop/source/app/app.cxx98
-rw-r--r--desktop/source/app/appinit.cxx30
-rw-r--r--desktop/source/app/cmdlineargs.cxx2
-rw-r--r--desktop/source/app/copyright_ascii_ooo.c4
-rw-r--r--desktop/source/app/copyright_ascii_sun.c4
-rw-r--r--desktop/source/app/desktop.hrc2
-rw-r--r--desktop/source/app/langselect.cxx40
-rw-r--r--desktop/source/app/langselect.hxx6
-rw-r--r--desktop/source/app/makefile.mk9
-rw-r--r--desktop/source/app/officeipcthread.cxx4
-rw-r--r--desktop/source/app/userinstall.cxx4
-rw-r--r--desktop/source/deployment/dp_persmap.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx28
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx4
-rw-r--r--desktop/source/deployment/makefile.mk1
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx2
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx2
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx2
-rw-r--r--desktop/source/deployment/registry/executable/dp_executable.cxx2
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx9
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx2
-rw-r--r--desktop/source/deployment/registry/script/dp_script.cxx2
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_sfwk.cxx2
-rw-r--r--desktop/source/inc/helpid.hrc2
-rw-r--r--desktop/source/migration/makefile.mk1
-rw-r--r--desktop/source/migration/pages.cxx18
-rw-r--r--desktop/source/migration/pages.hxx2
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java7
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/Installer.java9
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java146
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/RegistrationData.java1004
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java814
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/Registry.java7
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/ServiceTag.java7
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SolarisServiceTag.java7
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java281
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SunConnection.java7
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java7
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/SystemEnvironment.java93
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/UnauthorizedAccessException.java7
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/Util.java9
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/WindowsSystemEnvironment.java100
-rw-r--r--desktop/source/registration/com/sun/star/servicetag/resources/product_registration.xsd667
-rw-r--r--drawinglayer/source/processor2d/canvasprocessor.cxx2
-rw-r--r--drawinglayer/source/processor2d/hittestprocessor2d.cxx24
-rw-r--r--drawinglayer/source/processor2d/vclpixelprocessor2d.cxx6
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx94
-rw-r--r--embeddedobj/source/general/docholder.cxx21
-rw-r--r--formula/inc/formula/opcode.hxx2
-rw-r--r--formula/inc/formula/token.hxx2
-rw-r--r--formula/inc/helpids.hrc2
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx2
-rw-r--r--formula/source/core/inc/core_resource.hrc2
-rw-r--r--formula/source/core/resource/core_resource.cxx2
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx2
-rw-r--r--formula/source/ui/dlg/formula.cxx6
-rw-r--r--formula/source/ui/dlg/funcpage.cxx4
-rw-r--r--formula/source/ui/dlg/parawin.cxx4
-rw-r--r--formula/source/ui/dlg/structpg.cxx4
-rw-r--r--formula/source/ui/inc/ForResId.hrc2
-rw-r--r--formula/source/ui/resource/ModuleHelper.cxx2
-rw-r--r--formula/util/makefile.mk2
-rw-r--r--fpicker/source/aqua/SalAquaPicker.cxx5
-rw-r--r--fpicker/source/aqua/resourceprovider.cxx2
-rw-r--r--fpicker/source/generic/fpicker.cxx2
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx14
-rw-r--r--fpicker/source/office/OfficeFilePicker.src2
-rw-r--r--fpicker/source/office/OfficeFolderPicker.cxx6
-rw-r--r--fpicker/source/office/iodlg.cxx22
-rw-r--r--fpicker/source/office/iodlg.hrc2
-rw-r--r--fpicker/source/office/iodlg.hxx6
-rw-r--r--fpicker/source/office/iodlg.src2
-rw-r--r--fpicker/source/office/iodlgimp.cxx18
-rw-r--r--fpicker/source/office/iodlgimp.hxx2
-rw-r--r--fpicker/source/unx/gnome/SalGtkPicker.cxx13
-rw-r--r--fpicker/source/unx/gnome/resourceprovider.cxx2
-rw-r--r--fpicker/source/unx/kde4/KDE4FPEntry.cxx6
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.cxx116
-rw-r--r--fpicker/source/win32/misc/resourceprovider.cxx2
-rw-r--r--framework/inc/classes/fwktabwindow.hxx1
-rw-r--r--framework/inc/classes/protocolhandlercache.hxx1
-rw-r--r--framework/inc/dispatch/basedispatcher.hxx4
-rw-r--r--framework/inc/framework.hrc2
-rw-r--r--framework/inc/helper/mischelper.hxx2
-rw-r--r--framework/inc/helper/persistentwindowstate.hxx48
-rw-r--r--framework/inc/helper/titlebarupdate.hxx34
-rw-r--r--framework/inc/helpid.hrc2
-rw-r--r--framework/inc/macros/registration.hxx6
-rw-r--r--framework/inc/pch/precompiled_framework.hxx26
-rw-r--r--framework/inc/properties.h17
-rw-r--r--framework/inc/services.h1
-rw-r--r--framework/inc/services/autorecovery.hxx7
-rw-r--r--framework/inc/services/desktop.hxx70
-rw-r--r--framework/inc/services/frame.hxx8
-rw-r--r--framework/inc/services/layoutmanager.hxx38
-rw-r--r--framework/inc/services/licensedlg.hxx2
-rw-r--r--framework/inc/services/pluginframe.hxx6
-rw-r--r--framework/inc/services/sessionlistener.hxx22
-rw-r--r--framework/inc/services/substitutepathvars.hxx1
-rw-r--r--framework/inc/services/tabwindowservice.hxx87
-rw-r--r--framework/inc/xml/eventsconfiguration.hxx2
-rw-r--r--framework/inc/xml/imagesconfiguration.hxx2
-rw-r--r--framework/inc/xml/statusbarconfiguration.hxx2
-rw-r--r--framework/inc/xml/toolboxconfiguration.hxx2
-rwxr-xr-xframework/qa/complex/api_internal/makefile.mk2
-rwxr-xr-xframework/qa/complex/broken_document/makefile.mk2
-rw-r--r--framework/qa/complex/contextMenuInterceptor/makefile.mk2
-rwxr-xr-xframework/qa/complex/disposing/makefile.mk2
-rwxr-xr-xframework/qa/complex/framework/recovery/makefile.mk2
-rwxr-xr-xframework/qa/complex/imageManager/interfaces/makefile.mk2
-rwxr-xr-xframework/qa/complex/imageManager/makefile.mk2
-rwxr-xr-xframework/qa/complex/path_settings/makefile.mk2
-rwxr-xr-xframework/qa/complex/path_substitution/makefile.mk2
-rwxr-xr-xframework/qa/complex/sequence/makefile.mk2
-rw-r--r--framework/source/classes/bmkmenu.cxx6
-rw-r--r--framework/source/classes/fwktabwindow.cxx6
-rw-r--r--framework/source/classes/menumanager.cxx42
-rw-r--r--framework/source/classes/protocolhandlercache.cxx4
-rw-r--r--framework/source/dispatch/closedispatcher.cxx20
-rw-r--r--framework/source/dispatch/startmoduledispatcher.cxx4
-rw-r--r--framework/source/helper/popupmenucontrollerbase.cxx6
-rw-r--r--framework/source/helper/titlebarupdate.cxx6
-rw-r--r--framework/source/helper/titlehelper.cxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx326
-rw-r--r--framework/source/layoutmanager/makefile.mk2
-rw-r--r--framework/source/loadenv/loadenv.cxx22
-rw-r--r--framework/source/register/makefile.mk2
-rw-r--r--framework/source/services/autorecovery.cxx167
-rw-r--r--framework/source/services/backingcomp.cxx4
-rw-r--r--framework/source/services/backingwindow.cxx129
-rw-r--r--framework/source/services/backingwindow.hxx43
-rw-r--r--framework/source/services/frame.cxx10
-rw-r--r--framework/source/services/mediatypedetectionhelper.cxx2
-rw-r--r--framework/source/services/sessionlistener.cxx179
-rw-r--r--framework/source/services/substitutepathvars.cxx5
-rw-r--r--framework/source/services/tabwindowservice.cxx32
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx2
-rw-r--r--framework/source/uielement/fontmenucontroller.cxx4
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx4
-rw-r--r--framework/source/uielement/headermenucontroller.cxx4
-rw-r--r--framework/source/uielement/langselectionmenucontroller.cxx2
-rw-r--r--framework/source/uielement/langselectionstatusbarcontroller.cxx4
-rw-r--r--framework/source/uielement/menubarmanager.cxx12
-rw-r--r--framework/source/uielement/newmenucontroller.cxx44
-rw-r--r--framework/source/uielement/objectmenucontroller.cxx4
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx52
-rw-r--r--framework/source/uielement/toolbarmanager.cxx12
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx48
-rw-r--r--framework/source/xml/menuconfiguration.cxx4
-rw-r--r--linguistic/inc/lngprops.hxx36
-rw-r--r--linguistic/inc/misc.hxx27
-rw-r--r--linguistic/prj/build.lst2
-rw-r--r--linguistic/source/convdic.cxx99
-rw-r--r--linguistic/source/convdiclist.cxx136
-rw-r--r--linguistic/source/convdiclist.hxx2
-rw-r--r--linguistic/source/convdicxml.cxx3
-rw-r--r--linguistic/source/convdicxml.hxx2
-rw-r--r--linguistic/source/defs.hxx7
-rw-r--r--linguistic/source/dicimp.cxx103
-rw-r--r--linguistic/source/dicimp.hxx7
-rw-r--r--linguistic/source/dlistimp.cxx63
-rw-r--r--linguistic/source/gciterator.cxx6
-rw-r--r--linguistic/source/grammarchecker.cxx1
-rw-r--r--linguistic/source/hhconvdic.cxx1
-rw-r--r--linguistic/source/hyphdsp.cxx16
-rw-r--r--linguistic/source/hyphdta.cxx2
-rw-r--r--linguistic/source/lngopt.cxx11
-rw-r--r--linguistic/source/lngopt.hxx12
-rw-r--r--linguistic/source/lngsvcmgr.cxx37
-rw-r--r--linguistic/source/lngsvcmgr.hxx2
-rw-r--r--linguistic/source/makefile.mk8
-rw-r--r--linguistic/source/misc.cxx23
-rw-r--r--linguistic/source/misc2.cxx40
-rw-r--r--linguistic/source/spelldsp.cxx13
-rw-r--r--linguistic/source/thesdsp.cxx10
-rw-r--r--officecfg/registry/data/org/openoffice/Inet.xcu5
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Common.xcu8
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu2
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Writer.xcu27
-rw-r--r--officecfg/registry/data/org/openoffice/Office/makefile.mk2
-rw-r--r--officecfg/registry/data/org/openoffice/VCL.xcu247
-rw-r--r--officecfg/registry/data/org/openoffice/makefile.mk1
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs41
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Recovery.xcs13
-rw-r--r--oovbaapi/genconstidl/makefile.mk6
-rw-r--r--oovbaapi/ooo/vba/ControlProvider.idl (renamed from svx/source/cui/doclinkdialog.hrc)33
-rw-r--r--oovbaapi/ooo/vba/XApplicationBase.idl66
-rw-r--r--oovbaapi/ooo/vba/XCommandBar.idl3
-rw-r--r--oovbaapi/ooo/vba/XCommandBarButton.idl52
-rw-r--r--oovbaapi/ooo/vba/XCommandBarControl.idl2
-rw-r--r--oovbaapi/ooo/vba/XCommandBarPopup.idl52
-rw-r--r--oovbaapi/ooo/vba/XControlProvider.idl (renamed from oovbaapi/ooo/vba/XGlobals.idl)37
-rw-r--r--oovbaapi/ooo/vba/XDialogBase.idl58
-rw-r--r--oovbaapi/ooo/vba/XDialogsBase.idl60
-rw-r--r--oovbaapi/ooo/vba/XDocumentBase.idl67
-rw-r--r--oovbaapi/ooo/vba/XDocumentProperties.idl71
-rw-r--r--oovbaapi/ooo/vba/XDocumentProperty.idl106
-rw-r--r--oovbaapi/ooo/vba/XDocumentsBase.idl (renamed from svx/inc/optasian.hrc)45
-rw-r--r--oovbaapi/ooo/vba/XFontBase.idl (renamed from svx/source/cui/showcols.hxx)60
-rw-r--r--oovbaapi/ooo/vba/XGlobalsBase.idl (renamed from svx/source/cui/charmap.hrc)41
-rw-r--r--oovbaapi/ooo/vba/XPageSetupBase.idl (renamed from svx/source/cui/bbdlg.hxx)48
-rw-r--r--oovbaapi/ooo/vba/XWindowBase.idl62
-rw-r--r--oovbaapi/ooo/vba/excel/Globals.idl (renamed from oovbaapi/ooo/vba/Globals.idl)12
-rw-r--r--oovbaapi/ooo/vba/excel/TextFrame.idl53
-rw-r--r--oovbaapi/ooo/vba/excel/XApplication.idl14
-rw-r--r--oovbaapi/ooo/vba/excel/XDialog.idl7
-rw-r--r--oovbaapi/ooo/vba/excel/XDialogs.idl11
-rw-r--r--oovbaapi/ooo/vba/excel/XFont.idl13
-rw-r--r--oovbaapi/ooo/vba/excel/XGlobals.idl86
-rw-r--r--oovbaapi/ooo/vba/excel/XPageSetup.idl9
-rw-r--r--oovbaapi/ooo/vba/excel/XTextFrame.idl14
-rw-r--r--oovbaapi/ooo/vba/excel/XVPageBreak.idl54
-rw-r--r--oovbaapi/ooo/vba/excel/XVPageBreaks.idl (renamed from svx/source/cui/multifil.hxx)55
-rw-r--r--oovbaapi/ooo/vba/excel/XWindow.idl9
-rw-r--r--oovbaapi/ooo/vba/excel/XWorkbook.idl17
-rw-r--r--oovbaapi/ooo/vba/excel/XWorkbooks.idl3
-rw-r--r--oovbaapi/ooo/vba/excel/XWorksheet.idl3
-rw-r--r--oovbaapi/ooo/vba/excel/makefile.mk7
-rw-r--r--oovbaapi/ooo/vba/makefile.mk17
-rw-r--r--oovbaapi/ooo/vba/msforms/XControl.idl1
-rw-r--r--oovbaapi/ooo/vba/msforms/XShape.idl17
-rw-r--r--oovbaapi/ooo/vba/msforms/XShapeRange.idl16
-rw-r--r--oovbaapi/ooo/vba/msforms/XShapes.idl1
-rw-r--r--oovbaapi/ooo/vba/msforms/XTextFrame.idl (renamed from sandbox/com/sun/star/lib/sandbox/CodeSource.java)46
-rw-r--r--oovbaapi/ooo/vba/msforms/makefile.mk1
-rw-r--r--oovbaapi/ooo/vba/word/XAddin.idl61
-rw-r--r--oovbaapi/ooo/vba/word/XAddins.idl55
-rw-r--r--oovbaapi/ooo/vba/word/XApplication.idl70
-rw-r--r--oovbaapi/ooo/vba/word/XAutoTextEntries.idl (renamed from svx/source/cui/postdlg.hrc)41
-rw-r--r--oovbaapi/ooo/vba/word/XAutoTextEntry.idl59
-rw-r--r--oovbaapi/ooo/vba/word/XBookmark.idl61
-rw-r--r--oovbaapi/ooo/vba/word/XBookmarks.idl61
-rw-r--r--oovbaapi/ooo/vba/word/XBorder.idl59
-rw-r--r--oovbaapi/ooo/vba/word/XBorders.idl (renamed from sandbox/com/sun/star/lib/sandbox/ClassContext.java)39
-rw-r--r--oovbaapi/ooo/vba/word/XDialog.idl55
-rw-r--r--oovbaapi/ooo/vba/word/XDialogs.idl54
-rw-r--r--oovbaapi/ooo/vba/word/XDocument.idl (renamed from svx/source/cui/tabstpge.hrc)71
-rw-r--r--oovbaapi/ooo/vba/word/XDocuments.idl58
-rw-r--r--oovbaapi/ooo/vba/word/XField.idl52
-rw-r--r--oovbaapi/ooo/vba/word/XFields.idl62
-rw-r--r--oovbaapi/ooo/vba/word/XFind.idl87
-rw-r--r--oovbaapi/ooo/vba/word/XFont.idl (renamed from svx/inc/connect.hrc)50
-rw-r--r--oovbaapi/ooo/vba/word/XGlobals.idl62
-rw-r--r--oovbaapi/ooo/vba/word/XHeaderFooter.idl59
-rw-r--r--oovbaapi/ooo/vba/word/XOptions.idl (renamed from svx/inc/msoleexp.hxx)53
-rw-r--r--oovbaapi/ooo/vba/word/XPageSetup.idl (renamed from svx/source/cui/internationaloptions.hxx)48
-rw-r--r--oovbaapi/ooo/vba/word/XPane.idl (renamed from svx/source/cui/iconcdlg.src)46
-rw-r--r--oovbaapi/ooo/vba/word/XPanes.idl55
-rw-r--r--oovbaapi/ooo/vba/word/XParagraph.idl (renamed from svx/inc/optpath.hrc)37
-rw-r--r--oovbaapi/ooo/vba/word/XParagraphFormat.idl70
-rw-r--r--oovbaapi/ooo/vba/word/XParagraphs.idl55
-rw-r--r--oovbaapi/ooo/vba/word/XRange.idl (renamed from svx/source/cui/optctl.hxx)71
-rw-r--r--oovbaapi/ooo/vba/word/XReplacement.idl (renamed from svx/inc/defdlgname.hxx)31
-rw-r--r--oovbaapi/ooo/vba/word/XSection.idl58
-rw-r--r--oovbaapi/ooo/vba/word/XSections.idl (renamed from svx/source/cui/srchxtra.hrc)41
-rw-r--r--oovbaapi/ooo/vba/word/XSelection.idl89
-rw-r--r--oovbaapi/ooo/vba/word/XStyle.idl58
-rw-r--r--oovbaapi/ooo/vba/word/XStyles.idl55
-rw-r--r--oovbaapi/ooo/vba/word/XSystem.idl (renamed from svx/inc/multipat.hrc)43
-rw-r--r--oovbaapi/ooo/vba/word/XTable.idl86
-rw-r--r--oovbaapi/ooo/vba/word/XTables.idl79
-rw-r--r--oovbaapi/ooo/vba/word/XTemplate.idl56
-rw-r--r--oovbaapi/ooo/vba/word/XVariable.idl (renamed from svx/source/cui/cuiexp.cxx)52
-rw-r--r--oovbaapi/ooo/vba/word/XVariables.idl57
-rw-r--r--oovbaapi/ooo/vba/word/XView.idl57
-rw-r--r--oovbaapi/ooo/vba/word/XWindow.idl (renamed from svx/source/cui/insrc.hxx)58
-rw-r--r--oovbaapi/ooo/vba/word/XWrapFormat.idl (renamed from sandbox/com/sun/star/lib/sandbox/Holder.java)26
-rw-r--r--oovbaapi/ooo/vba/word/makefile.mk (renamed from svx/source/msfilter/makefile.mk)84
-rw-r--r--oovbaapi/prj/build.lst3
-rw-r--r--oovbaapi/util/makefile.mk1
-rwxr-xr-xreadlicense_oo/util/makefile.pmk3
-rw-r--r--sandbox/com/sun/star/lib/sandbox/AudioProxy.java74
-rw-r--r--sandbox/com/sun/star/lib/sandbox/Cachable.java37
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ClassContextImpl.java356
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ClassContextProxy.java152
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ExecutionContext.java473
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ImageProducerProxy.java77
-rw-r--r--sandbox/com/sun/star/lib/sandbox/JarEntry.java95
-rw-r--r--sandbox/com/sun/star/lib/sandbox/JarInputStream.java107
-rw-r--r--sandbox/com/sun/star/lib/sandbox/Permission.java36
-rw-r--r--sandbox/com/sun/star/lib/sandbox/PermissionCollection.java86
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ProtectionDomain.java87
-rw-r--r--sandbox/com/sun/star/lib/sandbox/Resource.java52
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ResourceImpl.java317
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ResourceProxy.java217
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ResourceViewer.java101
-rw-r--r--sandbox/com/sun/star/lib/sandbox/SandboxMessageHandler.java119
-rw-r--r--sandbox/com/sun/star/lib/sandbox/SandboxSecurity.java1160
-rw-r--r--sandbox/com/sun/star/lib/sandbox/SandboxSecurityException.java71
-rw-r--r--sandbox/com/sun/star/lib/sandbox/SandboxThreadGroup.java63
-rw-r--r--sandbox/com/sun/star/lib/sandbox/WeakEntry.java46
-rw-r--r--sandbox/com/sun/star/lib/sandbox/WeakRef.java80
-rw-r--r--sandbox/com/sun/star/lib/sandbox/WeakTable.java147
-rw-r--r--sandbox/com/sun/star/lib/sandbox/XImage.java70
-rw-r--r--sandbox/com/sun/star/lib/sandbox/makefile.mk89
-rw-r--r--sandbox/prj/build.lst5
-rw-r--r--sandbox/prj/d.lst1
-rw-r--r--sandbox/test/com/sun/star/lib/sandbox/ResourceTest.java69
-rw-r--r--sandbox/util/delzip0
-rw-r--r--sfx2/inc/arrdecl.hxx2
-rw-r--r--sfx2/inc/minfitem.hxx2
-rw-r--r--sfx2/inc/msgnodei.hxx4
-rw-r--r--sfx2/inc/orgmgr.hxx2
-rw-r--r--sfx2/inc/pch/precompiled_sfx2.hxx144
-rw-r--r--sfx2/inc/sfx2/app.hxx6
-rw-r--r--sfx2/inc/sfx2/appuno.hxx4
-rw-r--r--sfx2/inc/sfx2/childwin.hxx6
-rw-r--r--sfx2/inc/sfx2/cntids.hrc4
-rw-r--r--sfx2/inc/sfx2/ctrlitem.hxx2
-rw-r--r--sfx2/inc/sfx2/dinfdlg.hxx72
-rw-r--r--sfx2/inc/sfx2/dispatch.hxx2
-rw-r--r--sfx2/inc/sfx2/docfile.hxx7
-rw-r--r--sfx2/inc/sfx2/event.hxx6
-rw-r--r--sfx2/inc/sfx2/evntconf.hxx4
-rw-r--r--sfx2/inc/sfx2/fcontnr.hxx2
-rw-r--r--sfx2/inc/sfx2/filedlghelper.hxx4
-rw-r--r--sfx2/inc/sfx2/frame.hxx4
-rw-r--r--sfx2/inc/sfx2/frmdescr.hxx4
-rw-r--r--sfx2/inc/sfx2/itemwrapper.hxx8
-rw-r--r--sfx2/inc/sfx2/linkmgr.hxx2
-rw-r--r--sfx2/inc/sfx2/macrconf.hxx2
-rw-r--r--sfx2/inc/sfx2/macropg.hxx2
-rw-r--r--sfx2/inc/sfx2/mnuitem.hxx9
-rw-r--r--sfx2/inc/sfx2/msgpool.hxx2
-rw-r--r--sfx2/inc/sfx2/objitem.hxx2
-rw-r--r--sfx2/inc/sfx2/objsh.hxx7
-rw-r--r--sfx2/inc/sfx2/objuno.hxx2
-rw-r--r--sfx2/inc/sfx2/passwd.hxx4
-rw-r--r--sfx2/inc/sfx2/querystatus.hxx2
-rw-r--r--sfx2/inc/sfx2/request.hxx4
-rw-r--r--sfx2/inc/sfx2/sfx.hrc4
-rw-r--r--sfx2/inc/sfx2/sfxbasemodel.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxhtml.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc2
-rw-r--r--sfx2/inc/sfx2/sfxstatuslistener.hxx2
-rw-r--r--sfx2/inc/sfx2/shell.hxx2
-rw-r--r--sfx2/inc/sfx2/srchitem.hxx3
-rw-r--r--sfx2/inc/sfx2/tabdlg.hxx4
-rw-r--r--sfx2/inc/sfx2/viewfrm.hxx4
-rw-r--r--sfx2/inc/sfx2/viewsh.hxx2
-rw-r--r--sfx2/inc/sorgitm.hxx2
-rw-r--r--sfx2/inc/stbitem.hxx2
-rw-r--r--sfx2/inc/tplpitem.hxx2
-rw-r--r--sfx2/prj/d.lst4
-rw-r--r--sfx2/qa/complex/DocumentMetaData.java50
-rw-r--r--sfx2/sdi/sfxitems.sdi89
-rw-r--r--sfx2/sdi/sfxslots.sdi94
-rw-r--r--sfx2/source/appl/app.cxx47
-rw-r--r--sfx2/source/appl/appbas.cxx18
-rw-r--r--sfx2/source/appl/appcfg.cxx40
-rw-r--r--sfx2/source/appl/appchild.cxx4
-rw-r--r--sfx2/source/appl/appdata.cxx9
-rw-r--r--sfx2/source/appl/appdde.cxx14
-rw-r--r--sfx2/source/appl/appinit.cxx22
-rw-r--r--sfx2/source/appl/appmain.cxx11
-rw-r--r--sfx2/source/appl/appmisc.cxx18
-rw-r--r--sfx2/source/appl/appopen.cxx18
-rw-r--r--sfx2/source/appl/appquit.cxx17
-rw-r--r--sfx2/source/appl/appserv.cxx18
-rw-r--r--sfx2/source/appl/appuno.cxx16
-rw-r--r--sfx2/source/appl/childwin.cxx4
-rw-r--r--sfx2/source/appl/impldde.cxx2
-rw-r--r--sfx2/source/appl/linkmgr2.cxx2
-rw-r--r--sfx2/source/appl/linksrc.cxx2
-rw-r--r--sfx2/source/appl/lnkbase2.cxx2
-rw-r--r--sfx2/source/appl/newhelp.cxx22
-rw-r--r--sfx2/source/appl/newhelp.hxx4
-rw-r--r--sfx2/source/appl/sfxhelp.cxx17
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx12
-rw-r--r--sfx2/source/appl/shutdownicon.cxx31
-rw-r--r--sfx2/source/appl/shutdowniconOs2.cxx12
-rw-r--r--sfx2/source/appl/shutdowniconaqua.mm6
-rw-r--r--sfx2/source/appl/shutdowniconunx.cxx8
-rw-r--r--sfx2/source/appl/shutdowniconw32.cxx10
-rw-r--r--sfx2/source/appl/workwin.cxx10
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx22
-rw-r--r--sfx2/source/bastyp/frmhtml.cxx2
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx4
-rw-r--r--sfx2/source/bastyp/progress.cxx2
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx4
-rw-r--r--sfx2/source/config/evntconf.cxx4
-rw-r--r--sfx2/source/control/bindings.cxx19
-rw-r--r--sfx2/source/control/ctrlitem.cxx2
-rw-r--r--sfx2/source/control/dispatch.cxx14
-rw-r--r--sfx2/source/control/macrconf.cxx2
-rw-r--r--sfx2/source/control/makefile.mk6
-rw-r--r--sfx2/source/control/msg.cxx4
-rw-r--r--sfx2/source/control/querystatus.cxx12
-rw-r--r--sfx2/source/control/request.cxx6
-rw-r--r--sfx2/source/control/sfxstatuslistener.cxx12
-rw-r--r--sfx2/source/control/shell.cxx12
-rw-r--r--sfx2/source/control/srchitem.cxx7
-rw-r--r--sfx2/source/control/statcach.cxx8
-rw-r--r--sfx2/source/control/unoctitm.cxx12
-rw-r--r--sfx2/source/dialog/alienwarn.cxx2
-rw-r--r--sfx2/source/dialog/basedlgs.cxx4
-rw-r--r--sfx2/source/dialog/dialog.hrc2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx377
-rw-r--r--sfx2/source/dialog/dinfdlg.hrc22
-rw-r--r--sfx2/source/dialog/dinfdlg.src222
-rw-r--r--sfx2/source/dialog/dockwin.cxx2
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx22
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx2
-rw-r--r--sfx2/source/dialog/intro.cxx4
-rw-r--r--sfx2/source/dialog/itemconnect.cxx2
-rw-r--r--sfx2/source/dialog/mailmodel.cxx102
-rw-r--r--sfx2/source/dialog/mailmodelapi.cxx32
-rw-r--r--sfx2/source/dialog/mgetempl.cxx8
-rw-r--r--sfx2/source/dialog/newstyle.cxx2
-rw-r--r--sfx2/source/dialog/passwd.cxx28
-rw-r--r--sfx2/source/dialog/printopt.cxx4
-rw-r--r--sfx2/source/dialog/recfloat.cxx2
-rw-r--r--sfx2/source/dialog/splitwin.cxx4
-rw-r--r--sfx2/source/dialog/srchdlg.cxx4
-rw-r--r--sfx2/source/dialog/styledlg.cxx4
-rw-r--r--sfx2/source/dialog/tabdlg.cxx4
-rw-r--r--sfx2/source/dialog/templdlg.cxx12
-rw-r--r--sfx2/source/dialog/tplcitem.cxx2
-rw-r--r--sfx2/source/dialog/versdlg.cxx14
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx200
-rw-r--r--sfx2/source/doc/applet.cxx14
-rw-r--r--sfx2/source/doc/doc.src2
-rw-r--r--sfx2/source/doc/docfac.cxx6
-rw-r--r--sfx2/source/doc/docfile.cxx229
-rw-r--r--sfx2/source/doc/docinsert.cxx10
-rw-r--r--sfx2/source/doc/docmacromode.cxx4
-rw-r--r--sfx2/source/doc/doctdlg.cxx2
-rw-r--r--sfx2/source/doc/doctempl.cxx4
-rw-r--r--sfx2/source/doc/doctemplates.cxx4
-rw-r--r--sfx2/source/doc/docvor.cxx20
-rw-r--r--sfx2/source/doc/frmdescr.cxx2
-rw-r--r--sfx2/source/doc/guisaveas.cxx19
-rw-r--r--sfx2/source/doc/makefile.mk8
-rw-r--r--sfx2/source/doc/new.cxx4
-rw-r--r--sfx2/source/doc/objcont.cxx70
-rw-r--r--sfx2/source/doc/objmisc.cxx41
-rw-r--r--sfx2/source/doc/objserv.cxx40
-rw-r--r--sfx2/source/doc/objstor.cxx35
-rw-r--r--sfx2/source/doc/objuno.cxx2
-rw-r--r--sfx2/source/doc/objxtor.cxx18
-rwxr-xr-xsfx2/source/doc/printhelper.cxx8
-rwxr-xr-xsfx2/source/doc/sfxacldetect.cxx108
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx6
-rw-r--r--sfx2/source/explorer/nochaos.cxx6
-rw-r--r--sfx2/source/inc/appdata.hxx4
-rw-r--r--sfx2/source/inc/applet.hxx4
-rw-r--r--sfx2/source/inc/eventsupplier.hxx50
-rw-r--r--sfx2/source/inc/helpid.hrc5
-rw-r--r--sfx2/source/inc/iframe.hxx4
-rw-r--r--sfx2/source/inc/objshimp.hxx4
-rw-r--r--sfx2/source/inc/plugin.hxx4
-rw-r--r--sfx2/source/inc/sfxlocal.hrc5
-rw-r--r--sfx2/source/inc/sfxpicklist.hxx2
-rw-r--r--sfx2/source/inc/templdgi.hxx6
-rw-r--r--sfx2/source/inc/virtmenu.hxx2
-rw-r--r--sfx2/source/inc/workwin.hxx2
-rw-r--r--sfx2/source/inet/inettbc.cxx16
-rw-r--r--sfx2/source/layout/sfxtabdialog.cxx6
-rw-r--r--sfx2/source/menu/mnuitem.cxx28
-rw-r--r--sfx2/source/menu/mnumgr.cxx4
-rw-r--r--sfx2/source/menu/objmnctl.cxx2
-rw-r--r--sfx2/source/menu/virtmenu.cxx32
-rw-r--r--sfx2/source/notify/eventsupplier.cxx46
-rw-r--r--sfx2/source/statbar/stbitem.cxx8
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx8
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx24
-rw-r--r--sfx2/source/view/frame.cxx6
-rw-r--r--sfx2/source/view/frmload.cxx10
-rw-r--r--sfx2/source/view/impframe.cxx2
-rw-r--r--sfx2/source/view/impframe.hxx2
-rw-r--r--sfx2/source/view/ipclient.cxx2
-rw-r--r--sfx2/source/view/printer.cxx4
-rw-r--r--sfx2/source/view/prnmon.cxx6
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx24
-rw-r--r--sfx2/source/view/topfrm.cxx20
-rw-r--r--sfx2/source/view/viewfrm.cxx24
-rw-r--r--sfx2/source/view/viewprn.cxx18
-rw-r--r--sfx2/source/view/viewsh.cxx62
-rw-r--r--shell/inc/internal/config.hxx5
-rw-r--r--shell/inc/internal/utilities.hxx21
-rw-r--r--shell/inc/internal/xml_parser.hxx11
-rw-r--r--shell/inc/kde_headers.h97
-rw-r--r--shell/prj/build.lst2
-rwxr-xr-x[-rw-r--r--]shell/prj/d.lst4
-rwxr-xr-xshell/qa/makefile.mk12
-rwxr-xr-xshell/qa/recent_docs.cxx132
-rw-r--r--shell/source/all/xml_parser.cxx14
-rw-r--r--shell/source/backends/gconfbe/gconfbackend.cxx3
-rw-r--r--shell/source/backends/gconfbe/gconfbackend.hxx5
-rw-r--r--shell/source/backends/kdebe/kdebecdef.cxx40
-rw-r--r--shell/source/backends/kdebe/kdecommonlayer.cxx20
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/kdeinetlayer.hxx16
-rw-r--r--shell/source/backends/kdebe/kdepathslayer.cxx16
-rw-r--r--shell/source/backends/kdebe/kdevcllayer.cxx16
-rw-r--r--shell/source/backends/kdebe/makefile.mk4
-rw-r--r--shell/source/tools/lngconvex/lngconvex.cxx44
-rw-r--r--shell/source/unix/sysshell/recently_used_file.cxx6
-rw-r--r--shell/source/unix/sysshell/recently_used_file.hxx3
-rw-r--r--shell/source/unix/sysshell/recently_used_file_handler.cxx20
-rw-r--r--shell/source/win32/shlxthandler/infotips/infotips.cxx2
-rw-r--r--shell/source/win32/shlxthandler/makefile.mk13
-rw-r--r--shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx6
-rw-r--r--shell/source/win32/shlxthandler/propsheets/propsheets.cxx3
-rw-r--r--shell/source/win32/shlxthandler/res/makefile.mk10
-rw-r--r--shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx20
-rw-r--r--shell/source/win32/shlxthandler/util/utilities.cxx15
-rw-r--r--svx/inc/bolnitem.hxx2
-rw-r--r--svx/inc/bulitem.hxx2
-rw-r--r--svx/inc/charhiddenitem.hxx4
-rw-r--r--svx/inc/chrtitem.hxx2
-rw-r--r--svx/inc/clipboardctl.hxx2
-rw-r--r--svx/inc/clipfmtitem.hxx2
-rw-r--r--svx/inc/countryid.hxx321
-rw-r--r--svx/inc/dlgutil.hxx4
-rw-r--r--svx/inc/drawitem.hxx2
-rw-r--r--svx/inc/editund2.hxx2
-rw-r--r--svx/inc/extrusioncontrols.hxx2
-rw-r--r--svx/inc/flstitem.hxx2
-rw-r--r--svx/inc/fmhelp.hrc169
-rw-r--r--svx/inc/fontitem.hxx2
-rw-r--r--svx/inc/fwdtitem.hxx2
-rw-r--r--svx/inc/galbrws2.hxx2
-rw-r--r--svx/inc/galctrl.hxx5
-rw-r--r--svx/inc/galdlg.hxx72
-rw-r--r--svx/inc/gallery.hrc55
-rw-r--r--svx/inc/galobj.hxx16
-rw-r--r--svx/inc/galtheme.hxx46
-rw-r--r--svx/inc/grafctrl.hxx4
-rw-r--r--svx/inc/helpid.hrc1043
-rw-r--r--svx/inc/hlnkitem.hxx4
-rw-r--r--svx/inc/htmlcfg.hxx3
-rw-r--r--svx/inc/linectrl.hxx2
-rw-r--r--svx/inc/mscodec.hxx343
-rw-r--r--svx/inc/nlbkitem.hxx2
-rw-r--r--svx/inc/ofaitem.hxx2
-rw-r--r--svx/inc/opaqitem.hxx2
-rw-r--r--svx/inc/optaccessibility.hrc87
-rw-r--r--svx/inc/optcolor.hrc222
-rw-r--r--svx/inc/optctl.hrc61
-rw-r--r--svx/inc/optgenrl.hrc88
-rw-r--r--svx/inc/optgrid.hxx2
-rw-r--r--svx/inc/optimprove.hrc53
-rw-r--r--svx/inc/optinet2.hrc175
-rw-r--r--svx/inc/optitems.hxx2
-rw-r--r--svx/inc/optsave.hrc84
-rw-r--r--svx/inc/pch/precompiled_svx.hxx134
-rw-r--r--svx/inc/pgrditem.hxx2
-rw-r--r--svx/inc/postattr.hxx2
-rw-r--r--svx/inc/prntitem.hxx2
-rw-r--r--svx/inc/protitem.hxx2
-rw-r--r--svx/inc/rotmodit.hxx2
-rw-r--r--svx/inc/rulritem.hxx2
-rw-r--r--svx/inc/srchdlg.hxx4
-rwxr-xr-xsvx/inc/svx/EnhancedCustomShapeFunctionParser.hxx (renamed from svx/inc/EnhancedCustomShapeFunctionParser.hxx)0
-rw-r--r--svx/inc/svx/SmartTagItem.hxx2
-rw-r--r--svx/inc/svx/adjitem.hxx2
-rw-r--r--svx/inc/svx/akrnitem.hxx2
-rw-r--r--svx/inc/svx/algitem.hxx4
-rw-r--r--svx/inc/svx/blnkitem.hxx4
-rw-r--r--svx/inc/svx/borderline.hxx2
-rw-r--r--svx/inc/svx/boxitem.hxx2
-rw-r--r--svx/inc/svx/brkitem.hxx2
-rw-r--r--svx/inc/svx/brshitem.hxx2
-rw-r--r--svx/inc/svx/charreliefitem.hxx2
-rw-r--r--svx/inc/svx/charrotateitem.hxx2
-rw-r--r--svx/inc/svx/charscaleitem.hxx2
-rw-r--r--svx/inc/svx/cmapitem.hxx2
-rw-r--r--svx/inc/svx/cntritem.hxx2
-rw-r--r--svx/inc/svx/colrctrl.hxx2
-rw-r--r--svx/inc/svx/colritem.hxx2
-rw-r--r--svx/inc/svx/crsditem.hxx2
-rw-r--r--svx/inc/svx/dialogs.hrc841
-rw-r--r--svx/inc/svx/dlgctl3d.hxx2
-rw-r--r--svx/inc/svx/dlgctrl.hxx1
-rw-r--r--svx/inc/svx/e3ditem.hxx2
-rw-r--r--svx/inc/svx/editdata.hxx2
-rw-r--r--svx/inc/svx/editobj.hxx2
-rw-r--r--svx/inc/svx/emphitem.hxx2
-rw-r--r--svx/inc/svx/escherex.hxx1513
-rw-r--r--svx/inc/svx/escpitem.hxx2
-rw-r--r--svx/inc/svx/exthelpid.hrc (renamed from svx/source/cui/bbdlg.cxx)61
-rw-r--r--svx/inc/svx/fhgtitem.hxx2
-rw-r--r--svx/inc/svx/fillctrl.hxx2
-rw-r--r--svx/inc/svx/flditem.hxx2
-rw-r--r--svx/inc/svx/fmmodel.hxx10
-rw-r--r--svx/inc/svx/fmsearch.hxx2
-rw-r--r--svx/inc/svx/fmtools.hxx (renamed from svx/source/inc/fmtools.hxx)4
-rw-r--r--svx/inc/svx/fntctl.hxx2
-rw-r--r--svx/inc/svx/forbiddenruleitem.hxx2
-rw-r--r--svx/inc/svx/frmdiritem.hxx2
-rw-r--r--svx/inc/svx/gallery1.hxx (renamed from svx/inc/gallery1.hxx)6
-rw-r--r--svx/inc/svx/galmisc.hxx (renamed from svx/inc/galmisc.hxx)36
-rw-r--r--svx/inc/svx/grfcrop.hxx2
-rw-r--r--svx/inc/svx/hngpnctitem.hxx2
-rw-r--r--svx/inc/svx/hyznitem.hxx2
-rw-r--r--svx/inc/svx/impgrf.hxx (renamed from svx/inc/impgrf.hxx)0
-rw-r--r--svx/inc/svx/itemtype.hxx2
-rw-r--r--svx/inc/svx/keepitem.hxx2
-rw-r--r--svx/inc/svx/kernitem.hxx2
-rw-r--r--svx/inc/svx/langitem.hxx2
-rw-r--r--svx/inc/svx/lrspitem.hxx2
-rw-r--r--svx/inc/svx/lspcitem.hxx2
-rw-r--r--svx/inc/svx/msdffdef.hxx93
-rw-r--r--svx/inc/svx/msdffimp.hxx773
-rw-r--r--svx/inc/svx/msfiltertracer.hxx99
-rw-r--r--svx/inc/svx/msocximex.hxx1423
-rw-r--r--svx/inc/svx/nhypitem.hxx2
-rw-r--r--svx/inc/svx/numfmtsh.hxx2
-rw-r--r--svx/inc/svx/numinf.hxx2
-rw-r--r--svx/inc/svx/numitem.hxx34
-rw-r--r--svx/inc/svx/obj3d.hxx2
-rw-r--r--svx/inc/svx/optimprove.hxx143
-rw-r--r--svx/inc/svx/optlingu.hxx185
-rw-r--r--svx/inc/svx/orphitem.hxx2
-rw-r--r--svx/inc/svx/outliner.hxx2
-rw-r--r--svx/inc/svx/pageitem.hxx2
-rw-r--r--svx/inc/svx/paravertalignitem.hxx2
-rw-r--r--svx/inc/svx/pbinitem.hxx2
-rw-r--r--svx/inc/svx/pmdlitem.hxx2
-rw-r--r--svx/inc/svx/postitem.hxx2
-rw-r--r--svx/inc/svx/prszitem.hxx2
-rw-r--r--svx/inc/svx/ruler.hxx2
-rw-r--r--svx/inc/svx/scriptspaceitem.hxx2
-rw-r--r--svx/inc/svx/scripttypeitem.hxx4
-rw-r--r--svx/inc/svx/sdangitm.hxx2
-rw-r--r--svx/inc/svx/sdasaitm.hxx2
-rw-r--r--svx/inc/svx/sdasitm.hxx2
-rw-r--r--svx/inc/svx/sdggaitm.hxx2
-rw-r--r--svx/inc/svx/sdgmoitm.hxx2
-rw-r--r--svx/inc/svx/sdmetitm.hxx2
-rw-r--r--svx/inc/svx/sdooitm.hxx2
-rw-r--r--svx/inc/svx/sdprcitm.hxx2
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx5
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx1
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx7
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx9
-rw-r--r--svx/inc/svx/sdr/properties/attributeproperties.hxx2
-rw-r--r--svx/inc/svx/sdrpagewindow.hxx2
-rw-r--r--svx/inc/svx/sdtaaitm.hxx2
-rw-r--r--svx/inc/svx/sdtacitm.hxx2
-rw-r--r--svx/inc/svx/sdtaditm.hxx2
-rw-r--r--svx/inc/svx/sdtaitm.hxx2
-rw-r--r--svx/inc/svx/sdtakitm.hxx2
-rw-r--r--svx/inc/svx/sdtayitm.hxx2
-rw-r--r--svx/inc/svx/sdtfsitm.hxx2
-rw-r--r--svx/inc/svx/sdynitm.hxx2
-rw-r--r--svx/inc/svx/selectioncontroller.hxx11
-rw-r--r--svx/inc/svx/shaditem.hxx2
-rw-r--r--svx/inc/svx/shdditem.hxx2
-rw-r--r--svx/inc/svx/sizeitem.hxx2
-rw-r--r--svx/inc/svx/spltitem.hxx2
-rw-r--r--svx/inc/svx/svdattr.hxx2
-rw-r--r--svx/inc/svx/svdedxv.hxx17
-rw-r--r--svx/inc/svx/svdfppt.hxx1445
-rw-r--r--svx/inc/svx/svdhdl.hxx2
-rw-r--r--svx/inc/svx/svdmodel.hxx6
-rw-r--r--svx/inc/svx/svdoashp.hxx2
-rw-r--r--svx/inc/svx/svdobj.hxx2
-rw-r--r--svx/inc/svx/svdpagv.hxx2
-rw-r--r--svx/inc/svx/svdpntv.hxx14
-rw-r--r--svx/inc/svx/svdundo.hxx4
-rw-r--r--svx/inc/svx/svdview.hxx5
-rw-r--r--svx/inc/svx/svx3ditems.hxx4
-rw-r--r--svx/inc/svx/svxacorr.hxx2
-rw-r--r--svx/inc/svx/svxbox.hxx2
-rw-r--r--svx/inc/svx/svxdlg.hxx75
-rw-r--r--svx/inc/svx/svxids.hrc9
-rw-r--r--svx/inc/svx/svxitems.hrc2
-rw-r--r--svx/inc/svx/sxcecitm.hxx2
-rw-r--r--svx/inc/svx/sxcikitm.hxx2
-rw-r--r--svx/inc/svx/sxctitm.hxx2
-rw-r--r--svx/inc/svx/sxekitm.hxx2
-rw-r--r--svx/inc/svx/sxfiitm.hxx2
-rw-r--r--svx/inc/svx/sxlayitm.hxx4
-rw-r--r--svx/inc/svx/sxmfsitm.hxx2
-rw-r--r--svx/inc/svx/sxmkitm.hxx2
-rw-r--r--svx/inc/svx/sxmtpitm.hxx2
-rw-r--r--svx/inc/svx/sxmuitm.hxx2
-rw-r--r--svx/inc/svx/sxonitm.hxx2
-rw-r--r--svx/inc/svx/tbcontrl.hxx2
-rw-r--r--svx/inc/svx/tstpitem.hxx2
-rw-r--r--svx/inc/svx/twolinesitem.hxx2
-rw-r--r--svx/inc/svx/udlnitem.hxx2
-rw-r--r--svx/inc/svx/ulspitem.hxx2
-rw-r--r--svx/inc/svx/unoedsrc.hxx4
-rw-r--r--svx/inc/svx/unoipset.hxx2
-rw-r--r--svx/inc/svx/unopage.hxx2
-rw-r--r--svx/inc/svx/unoprov.hxx2
-rw-r--r--svx/inc/svx/unoshape.hxx2
-rw-r--r--svx/inc/svx/unoshprp.hxx2
-rw-r--r--svx/inc/svx/unotext.hxx6
-rw-r--r--svx/inc/svx/viewlayoutitem.hxx2
-rw-r--r--svx/inc/svx/wghtitem.hxx2
-rw-r--r--svx/inc/svx/widwitem.hxx2
-rw-r--r--svx/inc/svx/writingmodeitem.hxx2
-rw-r--r--svx/inc/svx/wrlmitem.hxx2
-rw-r--r--svx/inc/svx/xfillit.hxx2
-rw-r--r--svx/inc/svx/xfillit0.hxx2
-rw-r--r--svx/inc/svx/xflasit.hxx2
-rw-r--r--svx/inc/svx/xflbckit.hxx2
-rw-r--r--svx/inc/svx/xflbmpit.hxx2
-rw-r--r--svx/inc/svx/xflbmsli.hxx2
-rw-r--r--svx/inc/svx/xflbmsxy.hxx2
-rw-r--r--svx/inc/svx/xflbmtit.hxx2
-rw-r--r--svx/inc/svx/xflboxy.hxx2
-rw-r--r--svx/inc/svx/xflbstit.hxx2
-rw-r--r--svx/inc/svx/xflbtoxy.hxx2
-rw-r--r--svx/inc/svx/xfltrit.hxx2
-rw-r--r--svx/inc/svx/xftadit.hxx2
-rw-r--r--svx/inc/svx/xftdiit.hxx2
-rw-r--r--svx/inc/svx/xftmrit.hxx2
-rw-r--r--svx/inc/svx/xftshit.hxx2
-rw-r--r--svx/inc/svx/xftshtit.hxx2
-rw-r--r--svx/inc/svx/xftshxy.hxx2
-rw-r--r--svx/inc/svx/xftstit.hxx2
-rw-r--r--svx/inc/svx/xgrscit.hxx2
-rw-r--r--svx/inc/svx/xit.hxx2
-rw-r--r--svx/inc/svx/xlineit.hxx4
-rw-r--r--svx/inc/svx/xlineit0.hxx2
-rw-r--r--svx/inc/svx/xlinjoit.hxx (renamed from svx/inc/xlinjoit.hxx)2
-rw-r--r--svx/inc/svx/xlnasit.hxx2
-rw-r--r--svx/inc/svx/xlnedcit.hxx2
-rw-r--r--svx/inc/svx/xlnedwit.hxx2
-rw-r--r--svx/inc/svx/xlnstcit.hxx2
-rw-r--r--svx/inc/svx/xlnstwit.hxx2
-rw-r--r--svx/inc/svx/xlntrit.hxx2
-rw-r--r--svx/inc/svx/xlnwtit.hxx2
-rw-r--r--svx/inc/svx/xpool.hxx2
-rw-r--r--svx/inc/svx/xsetit.hxx4
-rw-r--r--svx/inc/svx/xtextit.hxx4
-rw-r--r--svx/inc/svx/xtextit0.hxx2
-rw-r--r--svx/inc/svx/zoomitem.hxx2
-rw-r--r--svx/inc/svx/zoomslideritem.hxx2
-rw-r--r--svx/inc/svxgrahicitem.hxx2
-rw-r--r--svx/inc/svxmsbas.hxx97
-rw-r--r--svx/inc/svxrtf.hxx4
-rw-r--r--svx/inc/txtrange.hxx2
-rw-r--r--svx/inc/unoapi.hxx2
-rw-r--r--svx/inc/unoedhlp.hxx2
-rw-r--r--svx/inc/unofdesc.hxx2
-rw-r--r--svx/inc/unolingu.hxx4
-rw-r--r--svx/inc/xattr.hxx2
-rw-r--r--svx/inc/xmlcnitm.hxx2
-rw-r--r--svx/prj/build.lst6
-rw-r--r--svx/prj/d.lst289
-rw-r--r--svx/sdi/makefile.mk5
-rw-r--r--svx/sdi/svxslots.sdi7
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx2
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.hxx4
-rw-r--r--svx/source/accessibility/AccessibleStaticTextBase.cxx4
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx2
-rw-r--r--svx/source/cui/ControlFocusHelper.hxx51
-rw-r--r--svx/source/cui/SpellAttrib.cxx178
-rw-r--r--svx/source/cui/SpellAttrib.hxx176
-rw-r--r--svx/source/cui/SpellDialog.cxx2167
-rw-r--r--svx/source/cui/SpellDialog.hrc58
-rw-r--r--svx/source/cui/SpellDialog.src245
-rw-r--r--svx/source/cui/acccfg.cxx1700
-rw-r--r--svx/source/cui/acccfg.hrc78
-rw-r--r--svx/source/cui/acccfg.hxx288
-rw-r--r--svx/source/cui/acccfg.src360
-rw-r--r--svx/source/cui/align.cxx303
-rw-r--r--svx/source/cui/align.hrc87
-rw-r--r--svx/source/cui/align.hxx113
-rw-r--r--svx/source/cui/align.src251
-rw-r--r--svx/source/cui/autocdlg.cxx2780
-rw-r--r--svx/source/cui/autocdlg.hrc162
-rw-r--r--svx/source/cui/autocdlg.hxx508
-rw-r--r--svx/source/cui/autocdlg.src856
-rw-r--r--svx/source/cui/backgrnd.cxx1990
-rw-r--r--svx/source/cui/backgrnd.hrc73
-rw-r--r--svx/source/cui/backgrnd.hxx173
-rw-r--r--svx/source/cui/backgrnd.src307
-rw-r--r--svx/source/cui/bbdlg.src88
-rw-r--r--svx/source/cui/border.cxx1274
-rw-r--r--svx/source/cui/border.hrc109
-rw-r--r--svx/source/cui/border.hxx179
-rw-r--r--svx/source/cui/border.src431
-rw-r--r--svx/source/cui/borderconn.cxx318
-rw-r--r--svx/source/cui/borderconn.hxx79
-rw-r--r--svx/source/cui/cfg.cxx6059
-rw-r--r--svx/source/cui/cfg.hrc108
-rw-r--r--svx/source/cui/cfg.hxx836
-rw-r--r--svx/source/cui/cfg.src875
-rw-r--r--svx/source/cui/cfgchart.cxx327
-rw-r--r--svx/source/cui/cfgchart.hxx118
-rw-r--r--svx/source/cui/cfgutil.cxx1801
-rw-r--r--svx/source/cui/cfgutil.hxx220
-rw-r--r--svx/source/cui/chardlg.cxx4070
-rw-r--r--svx/source/cui/chardlg.h74
-rw-r--r--svx/source/cui/chardlg.hrc184
-rw-r--r--svx/source/cui/chardlg.hxx400
-rw-r--r--svx/source/cui/chardlg.src1133
-rw-r--r--svx/source/cui/charmap.src161
-rw-r--r--svx/source/cui/commonlingui.cxx294
-rw-r--r--svx/source/cui/commonlingui.hxx174
-rw-r--r--svx/source/cui/commonlingui.src156
-rw-r--r--svx/source/cui/connect.cxx569
-rw-r--r--svx/source/cui/connect.hxx133
-rw-r--r--svx/source/cui/connect.src268
-rw-r--r--svx/source/cui/connpoolconfig.cxx231
-rw-r--r--svx/source/cui/connpoolconfig.hxx57
-rw-r--r--svx/source/cui/connpooloptions.cxx516
-rw-r--r--svx/source/cui/connpooloptions.hrc52
-rw-r--r--svx/source/cui/connpooloptions.hxx95
-rw-r--r--svx/source/cui/connpooloptions.src169
-rw-r--r--svx/source/cui/connpoolsettings.cxx126
-rw-r--r--svx/source/cui/connpoolsettings.hxx111
-rw-r--r--svx/source/cui/cuicharmap.cxx593
-rw-r--r--svx/source/cui/cuicharmap.hxx146
-rw-r--r--svx/source/cui/cuifmsearch.cxx984
-rw-r--r--svx/source/cui/cuifmsearch.hxx230
-rw-r--r--svx/source/cui/cuigaldlg.cxx1290
-rw-r--r--svx/source/cui/cuigaldlg.hxx377
-rw-r--r--svx/source/cui/cuigrfflt.cxx762
-rw-r--r--svx/source/cui/cuigrfflt.hxx256
-rw-r--r--svx/source/cui/cuihyperdlg.cxx423
-rw-r--r--svx/source/cui/cuihyperdlg.hxx117
-rwxr-xr-xsvx/source/cui/cuiimapdlg.hrc50
-rwxr-xr-xsvx/source/cui/cuiimapdlg.src151
-rw-r--r--svx/source/cui/cuiimapwnd.cxx105
-rw-r--r--svx/source/cui/cuiimapwnd.hxx54
-rw-r--r--svx/source/cui/cuioptgenrl.hxx137
-rw-r--r--svx/source/cui/cuisrchdlg.cxx112
-rw-r--r--svx/source/cui/cuisrchdlg.hxx90
-rw-r--r--svx/source/cui/cuitabarea.hxx805
-rw-r--r--svx/source/cui/cuitabline.hxx433
-rw-r--r--svx/source/cui/cuitbxform.cxx84
-rw-r--r--svx/source/cui/cuitbxform.hxx29
-rw-r--r--svx/source/cui/dbregister.cxx519
-rw-r--r--svx/source/cui/dbregister.hrc45
-rw-r--r--svx/source/cui/dbregister.hxx163
-rw-r--r--svx/source/cui/dbregister.src97
-rw-r--r--svx/source/cui/dbregisterednamesconfig.cxx196
-rw-r--r--svx/source/cui/dbregisterednamesconfig.hxx57
-rw-r--r--svx/source/cui/dbregistersettings.cxx81
-rw-r--r--svx/source/cui/dbregistersettings.hxx66
-rw-r--r--svx/source/cui/dlgfact.cxx2393
-rw-r--r--svx/source/cui/dlgfact.hxx818
-rw-r--r--svx/source/cui/dlgname.cxx243
-rw-r--r--svx/source/cui/dlgname.hrc49
-rw-r--r--svx/source/cui/dlgname.hxx207
-rw-r--r--svx/source/cui/dlgname.src272
-rw-r--r--svx/source/cui/doclinkdialog.cxx235
-rw-r--r--svx/source/cui/doclinkdialog.hxx96
-rw-r--r--svx/source/cui/doclinkdialog.src154
-rw-r--r--svx/source/cui/dstribut.cxx251
-rw-r--r--svx/source/cui/dstribut.hrc58
-rw-r--r--svx/source/cui/dstribut.hxx128
-rw-r--r--svx/source/cui/dstribut.src293
-rw-r--r--svx/source/cui/eventdlg.cxx250
-rw-r--r--svx/source/cui/eventdlg.hrc46
-rw-r--r--svx/source/cui/eventdlg.src114
-rw-r--r--svx/source/cui/fontsubs.cxx625
-rw-r--r--svx/source/cui/fontsubs.hrc65
-rw-r--r--svx/source/cui/fontsubs.hxx132
-rw-r--r--svx/source/cui/fontsubs.src200
-rw-r--r--svx/source/cui/grfflt.hrc83
-rw-r--r--svx/source/cui/grfflt.src456
-rw-r--r--svx/source/cui/grfpage.cxx858
-rw-r--r--svx/source/cui/grfpage.hrc56
-rw-r--r--svx/source/cui/grfpage.hxx143
-rw-r--r--svx/source/cui/grfpage.src334
-rw-r--r--svx/source/cui/hangulhanjadlg.cxx1929
-rw-r--r--svx/source/cui/hangulhanjadlg.hrc200
-rw-r--r--svx/source/cui/hangulhanjadlg.hxx355
-rw-r--r--svx/source/cui/hangulhanjadlg.src431
-rwxr-xr-xsvx/source/cui/headertablistbox.hxx71
-rw-r--r--svx/source/cui/hldocntp.cxx525
-rw-r--r--svx/source/cui/hldocntp.hxx81
-rw-r--r--svx/source/cui/hldoctp.cxx387
-rw-r--r--svx/source/cui/hldoctp.hxx96
-rw-r--r--svx/source/cui/hlinettp.cxx550
-rw-r--r--svx/source/cui/hlinettp.hxx110
-rw-r--r--svx/source/cui/hlmailtp.cxx367
-rw-r--r--svx/source/cui/hlmailtp.hxx80
-rw-r--r--svx/source/cui/hlmarkwn.cxx549
-rw-r--r--svx/source/cui/hlmarkwn.src98
-rw-r--r--svx/source/cui/hltpbase.cxx880
-rw-r--r--svx/source/cui/hltpbase.hxx218
-rw-r--r--svx/source/cui/iconcdlg.cxx1445
-rw-r--r--svx/source/cui/iconcdlg.hxx292
-rw-r--r--svx/source/cui/init.cxx60
-rw-r--r--svx/source/cui/insdlg.cxx1064
-rw-r--r--svx/source/cui/insdlg.hxx217
-rw-r--r--svx/source/cui/insrc.cxx88
-rw-r--r--svx/source/cui/insrc.hrc43
-rw-r--r--svx/source/cui/insrc.src118
-rw-r--r--svx/source/cui/internationaloptions.cxx172
-rw-r--r--svx/source/cui/internationaloptions.hrc75
-rw-r--r--svx/source/cui/internationaloptions.src105
-rw-r--r--svx/source/cui/labdlg.cxx657
-rw-r--r--svx/source/cui/labdlg.hrc80
-rw-r--r--svx/source/cui/labdlg.hxx147
-rw-r--r--svx/source/cui/labdlg.src301
-rw-r--r--svx/source/cui/linkdlg.cxx721
-rw-r--r--svx/source/cui/linkdlg.hxx137
-rw-r--r--svx/source/cui/macroass.cxx719
-rw-r--r--svx/source/cui/macroass.hrc85
-rwxr-xr-xsvx/source/cui/macroass.hxx146
-rw-r--r--svx/source/cui/macroass.src143
-rw-r--r--svx/source/cui/macropg.cxx1062
-rw-r--r--svx/source/cui/macropg.hrc104
-rw-r--r--svx/source/cui/macropg.hxx178
-rw-r--r--svx/source/cui/macropg.src461
-rwxr-xr-xsvx/source/cui/makefile.mk234
-rw-r--r--svx/source/cui/measure.cxx881
-rw-r--r--svx/source/cui/measure.hrc56
-rw-r--r--svx/source/cui/measure.hxx132
-rw-r--r--svx/source/cui/measure.src310
-rw-r--r--svx/source/cui/multifil.cxx191
-rw-r--r--svx/source/cui/multipat.cxx367
-rw-r--r--svx/source/cui/multipat.hxx92
-rw-r--r--svx/source/cui/newtabledlg.cxx78
-rw-r--r--svx/source/cui/newtabledlg.hrc38
-rw-r--r--svx/source/cui/newtabledlg.src138
-rw-r--r--svx/source/cui/numfmt.cxx1957
-rw-r--r--svx/source/cui/numfmt.hrc77
-rw-r--r--svx/source/cui/numfmt.hxx206
-rw-r--r--svx/source/cui/numfmt.src297
-rw-r--r--svx/source/cui/numpages.cxx4046
-rw-r--r--svx/source/cui/numpages.hrc135
-rw-r--r--svx/source/cui/numpages.hxx472
-rw-r--r--svx/source/cui/numpages.src910
-rw-r--r--svx/source/cui/optHeaderTabListbox.cxx93
-rw-r--r--svx/source/cui/optHeaderTabListbox.hxx48
-rw-r--r--svx/source/cui/optaccessibility.cxx191
-rw-r--r--svx/source/cui/optaccessibility.hxx68
-rw-r--r--svx/source/cui/optasian.cxx475
-rw-r--r--svx/source/cui/optasian.hxx84
-rw-r--r--svx/source/cui/optchart.cxx244
-rw-r--r--svx/source/cui/optchart.hxx92
-rw-r--r--svx/source/cui/optcolor.cxx1642
-rw-r--r--svx/source/cui/optcolor.hxx84
-rw-r--r--svx/source/cui/optctl.cxx182
-rw-r--r--svx/source/cui/optdict.cxx817
-rw-r--r--svx/source/cui/optdict.hxx191
-rw-r--r--svx/source/cui/optfltr.cxx444
-rw-r--r--svx/source/cui/optfltr.hrc58
-rw-r--r--svx/source/cui/optfltr.hxx118
-rw-r--r--svx/source/cui/optfltr.src204
-rw-r--r--svx/source/cui/optgdlg.cxx1926
-rw-r--r--svx/source/cui/optgdlg.hrc208
-rw-r--r--svx/source/cui/optgdlg.hxx217
-rw-r--r--svx/source/cui/optgdlg.src642
-rw-r--r--svx/source/cui/optgenrl.cxx587
-rw-r--r--svx/source/cui/opthtml.cxx275
-rw-r--r--svx/source/cui/opthtml.hrc66
-rw-r--r--svx/source/cui/opthtml.hxx104
-rw-r--r--svx/source/cui/opthtml.src290
-rw-r--r--svx/source/cui/optimprove.cxx233
-rw-r--r--svx/source/cui/optimprove2.cxx276
-rw-r--r--svx/source/cui/optinet2.cxx2356
-rw-r--r--svx/source/cui/optinet2.hxx357
-rw-r--r--svx/source/cui/optjava.cxx1142
-rw-r--r--svx/source/cui/optjava.hrc86
-rw-r--r--svx/source/cui/optjava.hxx221
-rw-r--r--svx/source/cui/optjava.src290
-rw-r--r--svx/source/cui/optjsearch.cxx393
-rw-r--r--svx/source/cui/optjsearch.hxx96
-rw-r--r--svx/source/cui/optmemory.cxx287
-rw-r--r--svx/source/cui/optmemory.hrc89
-rw-r--r--svx/source/cui/optmemory.hxx92
-rw-r--r--svx/source/cui/optmemory.src210
-rw-r--r--svx/source/cui/optpath.cxx871
-rw-r--r--svx/source/cui/optpath.hxx119
-rw-r--r--svx/source/cui/optsave.cxx826
-rw-r--r--svx/source/cui/optsave.hxx108
-rw-r--r--svx/source/cui/optupdt.cxx424
-rw-r--r--svx/source/cui/optupdt.hrc52
-rw-r--r--svx/source/cui/optupdt.hxx84
-rw-r--r--svx/source/cui/optupdt.src114
-rw-r--r--svx/source/cui/page.cxx1788
-rw-r--r--svx/source/cui/page.h74
-rw-r--r--svx/source/cui/page.hrc87
-rw-r--r--svx/source/cui/page.hxx256
-rw-r--r--svx/source/cui/page.src668
-rw-r--r--svx/source/cui/paragrph.cxx2394
-rw-r--r--svx/source/cui/paragrph.hrc124
-rw-r--r--svx/source/cui/paragrph.hxx336
-rw-r--r--svx/source/cui/paragrph.src734
-rw-r--r--svx/source/cui/pastedlg.cxx314
-rw-r--r--svx/source/cui/pastedlg.hxx98
-rw-r--r--svx/source/cui/plfilter.cxx133
-rw-r--r--svx/source/cui/postdlg.cxx273
-rw-r--r--svx/source/cui/postdlg.hxx129
-rw-r--r--svx/source/cui/postdlg.src161
-rw-r--r--svx/source/cui/readonlyimage.cxx88
-rw-r--r--svx/source/cui/readonlyimage.src55
-rw-r--r--svx/source/cui/scriptdlg.cxx1695
-rw-r--r--svx/source/cui/scriptdlg.hrc83
-rw-r--r--svx/source/cui/scriptdlg.hxx251
-rw-r--r--svx/source/cui/scriptdlg.src310
-rw-r--r--svx/source/cui/sdbcdriverenum.cxx136
-rw-r--r--svx/source/cui/sdbcdriverenum.hxx79
-rw-r--r--svx/source/cui/sdrcelldlg.cxx106
-rw-r--r--svx/source/cui/sdrcelldlg.src142
-rw-r--r--svx/source/cui/securityoptions.cxx116
-rw-r--r--svx/source/cui/securityoptions.hrc83
-rw-r--r--svx/source/cui/securityoptions.hxx94
-rw-r--r--svx/source/cui/securityoptions.src168
-rw-r--r--svx/source/cui/selector.cxx1262
-rw-r--r--svx/source/cui/selector.hrc60
-rw-r--r--svx/source/cui/selector.hxx249
-rw-r--r--svx/source/cui/selector.src215
-rw-r--r--svx/source/cui/showcols.cxx144
-rw-r--r--svx/source/cui/splitcelldlg.cxx120
-rw-r--r--svx/source/cui/splitcelldlg.hrc45
-rw-r--r--svx/source/cui/splitcelldlg.src135
-rw-r--r--svx/source/cui/srchxtra.cxx306
-rw-r--r--svx/source/cui/srchxtra.hxx111
-rw-r--r--svx/source/cui/srchxtra.src281
-rw-r--r--svx/source/cui/svuidlg.hrc139
-rw-r--r--svx/source/cui/svuidlg.src711
-rw-r--r--svx/source/cui/swpossizetabpage.cxx1977
-rw-r--r--svx/source/cui/swpossizetabpage.hrc62
-rw-r--r--svx/source/cui/swpossizetabpage.hxx163
-rw-r--r--svx/source/cui/swpossizetabpage.src299
-rw-r--r--svx/source/cui/tabarea.cxx382
-rw-r--r--svx/source/cui/tabarea.hrc190
-rw-r--r--svx/source/cui/tabarea.src1541
-rw-r--r--svx/source/cui/tabline.cxx306
-rw-r--r--svx/source/cui/tabline.hrc109
-rw-r--r--svx/source/cui/tabline.src803
-rw-r--r--svx/source/cui/tabstpge.cxx755
-rw-r--r--svx/source/cui/tabstpge.hxx161
-rw-r--r--svx/source/cui/tabstpge.src234
-rw-r--r--svx/source/cui/textanim.cxx763
-rw-r--r--svx/source/cui/textanim.hrc50
-rw-r--r--svx/source/cui/textanim.hxx131
-rw-r--r--svx/source/cui/textanim.src322
-rw-r--r--svx/source/cui/textattr.cxx807
-rw-r--r--svx/source/cui/textattr.hrc49
-rw-r--r--svx/source/cui/textattr.hxx138
-rw-r--r--svx/source/cui/textattr.src247
-rw-r--r--svx/source/cui/tparea.cxx2586
-rw-r--r--svx/source/cui/tpbitmap.cxx1179
-rw-r--r--svx/source/cui/tpcolor.cxx1286
-rw-r--r--svx/source/cui/tpgradnt.cxx948
-rw-r--r--svx/source/cui/tphatch.cxx912
-rw-r--r--svx/source/cui/tpline.cxx1959
-rw-r--r--svx/source/cui/tplnedef.cxx1027
-rw-r--r--svx/source/cui/tplneend.cxx759
-rw-r--r--svx/source/cui/tpshadow.cxx620
-rw-r--r--svx/source/cui/transfrm.cxx1706
-rw-r--r--svx/source/cui/transfrm.hrc79
-rw-r--r--svx/source/cui/transfrm.hxx308
-rw-r--r--svx/source/cui/transfrm.src612
-rw-r--r--svx/source/cui/treeopt.cxx2861
-rw-r--r--svx/source/cui/treeopt.hrc103
-rw-r--r--svx/source/cui/treeopt.hxx362
-rw-r--r--svx/source/cui/treeopt.src386
-rw-r--r--svx/source/cui/webconninfo.cxx386
-rw-r--r--svx/source/cui/webconninfo.hrc65
-rw-r--r--svx/source/cui/webconninfo.hxx88
-rw-r--r--svx/source/cui/webconninfo.src106
-rw-r--r--svx/source/cui/winpluginlib.cpp233
-rw-r--r--svx/source/cui/zoom.cxx541
-rw-r--r--svx/source/cui/zoom.hrc56
-rw-r--r--svx/source/cui/zoom.hxx120
-rw-r--r--svx/source/cui/zoom.src159
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx61
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.hxx5
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.cxx4
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx2
-rwxr-xr-x[-rw-r--r--]svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx118
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx2
-rw-r--r--svx/source/dialog/_bmpmask.cxx4
-rw-r--r--svx/source/dialog/_contdlg.cxx6
-rw-r--r--svx/source/dialog/charmap.cxx2
-rw-r--r--svx/source/dialog/connctrl.cxx2
-rw-r--r--svx/source/dialog/databaseregistrationui.cxx2
-rw-r--r--svx/source/dialog/dialmgr.cxx2
-rw-r--r--svx/source/dialog/dlgctl3d.cxx2
-rw-r--r--svx/source/dialog/dlgctrl.cxx31
-rw-r--r--svx/source/dialog/dlgutil.cxx2
-rw-r--r--svx/source/dialog/docrecovery.cxx6
-rw-r--r--svx/source/dialog/fntctrl.cxx2
-rw-r--r--svx/source/dialog/fontwork.cxx4
-rw-r--r--svx/source/dialog/frmdirlbox.src96
-rw-r--r--svx/source/dialog/frmsel.cxx2
-rw-r--r--svx/source/dialog/graphctl.cxx4
-rw-r--r--svx/source/dialog/grfflt.cxx2
-rw-r--r--svx/source/dialog/hangulhanja.cxx6
-rw-r--r--svx/source/dialog/hdft.cxx4
-rw-r--r--svx/source/dialog/hyperdlg.cxx12
-rw-r--r--svx/source/dialog/hyperdlg.src971
-rw-r--r--svx/source/dialog/hyprlink.cxx53
-rw-r--r--svx/source/dialog/imapdlg.cxx14
-rw-r--r--svx/source/dialog/imapwnd.cxx4
-rw-r--r--svx/source/dialog/imapwnd.hxx2
-rw-r--r--svx/source/dialog/impgrf.cxx14
-rw-r--r--svx/source/dialog/langbox.cxx2
-rw-r--r--svx/source/dialog/makefile.mk13
-rw-r--r--svx/source/dialog/measctrl.cxx4
-rw-r--r--svx/source/dialog/opengrf.cxx6
-rw-r--r--svx/source/dialog/radiobtnbox.cxx124
-rw-r--r--svx/source/dialog/rlrcitem.cxx4
-rw-r--r--svx/source/dialog/rubydialog.cxx2
-rw-r--r--svx/source/dialog/sdstring.src209
-rw-r--r--svx/source/dialog/srchctrl.cxx2
-rw-r--r--svx/source/dialog/srchdlg.cxx60
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx16
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.src130
-rw-r--r--svx/source/dialog/svxdlg.cxx9
-rw-r--r--svx/source/dialog/svxruler.cxx11
-rw-r--r--svx/source/dialog/swframeexample.cxx2
-rw-r--r--svx/source/dialog/thesdlg.cxx2
-rw-r--r--svx/source/editeng/SvXMLAutoCorrectExport.cxx2
-rw-r--r--svx/source/editeng/SvXMLAutoCorrectImport.cxx2
-rw-r--r--svx/source/editeng/acorrcfg.cxx8
-rw-r--r--svx/source/editeng/editattr.hxx2
-rw-r--r--svx/source/editeng/editdbg.hxx2
-rw-r--r--svx/source/editeng/editdoc.cxx11
-rw-r--r--svx/source/editeng/editdoc.hxx6
-rw-r--r--svx/source/editeng/editdoc2.cxx2
-rw-r--r--svx/source/editeng/editeng.cxx6
-rw-r--r--svx/source/editeng/editeng.hrc2
-rw-r--r--svx/source/editeng/editobj.cxx4
-rw-r--r--svx/source/editeng/editobj2.hxx2
-rw-r--r--svx/source/editeng/editview.cxx18
-rw-r--r--svx/source/editeng/edtspell.cxx4
-rw-r--r--svx/source/editeng/eehtml.hxx2
-rw-r--r--svx/source/editeng/eeobj.cxx2
-rw-r--r--svx/source/editeng/eerdll.cxx4
-rw-r--r--svx/source/editeng/eertfpar.cxx2
-rw-r--r--svx/source/editeng/impedit.cxx2
-rw-r--r--svx/source/editeng/impedit.hxx2
-rw-r--r--svx/source/editeng/impedit2.cxx4
-rw-r--r--svx/source/editeng/impedit3.cxx4
-rw-r--r--svx/source/editeng/impedit5.cxx2
-rw-r--r--svx/source/editeng/svxacorr.cxx14
-rw-r--r--svx/source/editeng/txtrange.cxx2
-rw-r--r--svx/source/editeng/unolingu.cxx8
-rw-r--r--svx/source/engine3d/float3d.cxx6
-rw-r--r--svx/source/engine3d/obj3d.cxx4
-rw-r--r--svx/source/engine3d/polysc3d.cxx4
-rw-r--r--svx/source/engine3d/scene3d.cxx4
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx8
-rw-r--r--svx/source/fmcomp/fmgridif.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx8
-rw-r--r--svx/source/fmcomp/gridcols.cxx2
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
-rw-r--r--svx/source/fmcomp/makefile.mk3
-rw-r--r--svx/source/fmcomp/showcols.src106
-rw-r--r--svx/source/form/ParseContext.cxx2
-rw-r--r--svx/source/form/databaselocationinput.cxx2
-rw-r--r--svx/source/form/datanavi.cxx34
-rw-r--r--svx/source/form/filtnav.cxx2
-rw-r--r--svx/source/form/fmcontrollayout.cxx206
-rw-r--r--svx/source/form/fmctrler.cxx2
-rw-r--r--svx/source/form/fmexch.cxx4
-rw-r--r--svx/source/form/fmmodel.cxx39
-rw-r--r--svx/source/form/fmobj.cxx88
-rw-r--r--svx/source/form/fmobjfac.cxx2
-rw-r--r--svx/source/form/fmpage.cxx2
-rw-r--r--svx/source/form/fmpgeimp.cxx2
-rw-r--r--svx/source/form/fmsearch.src333
-rw-r--r--svx/source/form/fmshell.cxx18
-rw-r--r--svx/source/form/fmshimp.cxx10
-rw-r--r--svx/source/form/fmsrccfg.cxx2
-rw-r--r--svx/source/form/fmsrcimp.cxx7
-rw-r--r--svx/source/form/fmtextcontroldialogs.cxx4
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx10
-rw-r--r--svx/source/form/fmtools.cxx6
-rw-r--r--svx/source/form/fmundo.cxx4
-rw-r--r--svx/source/form/fmview.cxx18
-rw-r--r--svx/source/form/fmvwimp.cxx8
-rw-r--r--svx/source/form/formcontrolfactory.cxx109
-rw-r--r--svx/source/form/formcontrolling.cxx2
-rw-r--r--svx/source/form/makefile.mk2
-rw-r--r--svx/source/form/navigatortree.cxx1
-rw-r--r--svx/source/form/navigatortreemodel.cxx1
-rw-r--r--svx/source/form/sdbdatacolumn.cxx10
-rw-r--r--svx/source/form/tabwin.cxx2
-rw-r--r--svx/source/form/tbxform.cxx8
-rw-r--r--svx/source/form/tbxform.src69
-rw-r--r--svx/source/form/typemap.cxx4
-rw-r--r--svx/source/gallery2/galbrws.cxx22
-rw-r--r--svx/source/gallery2/galbrws1.cxx15
-rw-r--r--svx/source/gallery2/galbrws1.hxx2
-rw-r--r--svx/source/gallery2/galbrws2.cxx27
-rw-r--r--svx/source/gallery2/galctrl.cxx28
-rw-r--r--svx/source/gallery2/galexpl.cxx35
-rw-r--r--svx/source/gallery2/gallery.src456
-rw-r--r--svx/source/gallery2/gallery1.cxx41
-rw-r--r--svx/source/gallery2/galmisc.cxx12
-rw-r--r--svx/source/gallery2/galobj.cxx30
-rw-r--r--svx/source/gallery2/galtheme.cxx32
-rw-r--r--svx/source/gengal/gengal.cxx18
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx2
-rw-r--r--svx/source/inc/SpellDialog.hxx261
-rw-r--r--svx/source/inc/eventdlg.hxx81
-rw-r--r--svx/source/inc/filtnav.hxx8
-rw-r--r--svx/source/inc/fmPropBrw.hxx2
-rw-r--r--svx/source/inc/fmcontrollayout.hxx16
-rw-r--r--svx/source/inc/fmctrler.hxx2
-rw-r--r--svx/source/inc/fmexpl.hxx8
-rw-r--r--svx/source/inc/fmitems.hxx2
-rw-r--r--svx/source/inc/fmobj.hxx8
-rw-r--r--svx/source/inc/fmresids.hrc16
-rw-r--r--svx/source/inc/fmsearch.hrc72
-rw-r--r--svx/source/inc/fmshimp.hxx11
-rw-r--r--svx/source/inc/fmsrcimp.hxx2
-rw-r--r--svx/source/inc/fmundo.hxx2
-rw-r--r--svx/source/inc/gridcell.hxx2
-rw-r--r--svx/source/inc/hlmarkwn.hrc37
-rw-r--r--svx/source/inc/hlmarkwn.hxx114
-rw-r--r--svx/source/inc/hyperdlg.hrc103
-rw-r--r--svx/source/inc/macropg_impl.hxx76
-rw-r--r--svx/source/inc/optchart.hrc40
-rw-r--r--svx/source/inc/optdict.hrc68
-rw-r--r--svx/source/inc/svdoimp.hxx2
-rw-r--r--svx/source/inc/tabwin.hxx2
-rw-r--r--svx/source/inc/unoedprx.hxx2
-rw-r--r--svx/source/intro/intro_tmpl.hrc210
-rw-r--r--svx/source/intro/iso.src2
-rw-r--r--svx/source/intro/ooo.src2
-rw-r--r--svx/source/items/SmartTagItem.cxx2
-rw-r--r--svx/source/items/clipfmtitem.cxx2
-rw-r--r--svx/source/items/flditem.cxx2
-rw-r--r--svx/source/items/frmitems.cxx6
-rw-r--r--svx/source/items/makefile.mk1
-rw-r--r--svx/source/items/numfmtsh.cxx4
-rw-r--r--svx/source/items/numitem.cxx504
-rw-r--r--svx/source/items/page.src258
-rw-r--r--svx/source/items/pageitem.cxx2
-rw-r--r--svx/source/items/paraitem.cxx8
-rw-r--r--svx/source/items/textitem.cxx6
-rw-r--r--svx/source/mnuctrls/SmartTagCtl.cxx2
-rw-r--r--svx/source/mnuctrls/clipboardctl.cxx4
-rw-r--r--svx/source/mnuctrls/fntszctl.cxx2
-rw-r--r--svx/source/msfilter/countryid.cxx345
-rw-r--r--svx/source/msfilter/escherex.cxx4848
-rw-r--r--svx/source/msfilter/eschesdo.cxx1244
-rw-r--r--svx/source/msfilter/eschesdo.hxx208
-rw-r--r--svx/source/msfilter/mscodec.cxx537
-rw-r--r--svx/source/msfilter/msdffimp.cxx8194
-rw-r--r--svx/source/msfilter/msfiltertracer.cxx254
-rw-r--r--svx/source/msfilter/msocximex.cxx5975
-rw-r--r--svx/source/msfilter/msoleexp.cxx376
-rw-r--r--svx/source/msfilter/msvbasic.cxx677
-rw-r--r--svx/source/msfilter/msvbasic.hxx131
-rw-r--r--svx/source/msfilter/svxmsbas.cxx406
-rw-r--r--svx/source/msfilter/svxmsbas2.cxx88
-rw-r--r--svx/source/msfilter/viscache.hxx85
-rw-r--r--svx/source/options/asiancfg.cxx2
-rw-r--r--svx/source/options/htmlcfg.cxx5
-rw-r--r--svx/source/options/makefile.mk20
-rw-r--r--svx/source/options/multipat.src153
-rw-r--r--svx/source/options/optaccessibility.src155
-rw-r--r--svx/source/options/optasian.src177
-rw-r--r--svx/source/options/optchart.src86
-rw-r--r--svx/source/options/optcolor.src552
-rw-r--r--svx/source/options/optctl.src119
-rw-r--r--svx/source/options/optdict.src282
-rw-r--r--svx/source/options/optgenrl.src333
-rw-r--r--svx/source/options/optimprove.src123
-rw-r--r--svx/source/options/optinet2.src647
-rw-r--r--svx/source/options/optjsearch.src223
-rw-r--r--svx/source/options/optlingu.cxx2563
-rw-r--r--svx/source/options/optlingu.hrc91
-rw-r--r--svx/source/options/optlingu.src357
-rw-r--r--svx/source/options/optpath.src203
-rw-r--r--svx/source/options/optsave.src325
-rw-r--r--svx/source/options/optspell.src128
-rw-r--r--svx/source/options/srchcfg.cxx2
-rw-r--r--svx/source/outliner/outl_pch.hxx2
-rw-r--r--svx/source/outliner/outleeng.cxx2
-rw-r--r--svx/source/outliner/outlin2.cxx2
-rw-r--r--svx/source/outliner/outliner.cxx8
-rw-r--r--svx/source/outliner/outliner.hrc2
-rw-r--r--svx/source/outliner/outlvw.cxx4
-rw-r--r--svx/source/sdr/attribute/sdrformtextattribute.cxx4
-rw-r--r--svx/source/sdr/contact/viewcontactofgraphic.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrcircobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrole2obj.cxx5
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrrectobj.cxx10
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx89
-rw-r--r--svx/source/sdr/overlay/overlaymanagerbuffered.cxx36
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx8
-rw-r--r--svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx7
-rw-r--r--svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx10
-rw-r--r--svx/source/sdr/primitive3d/sdrattributecreator3d.cxx2
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx10
-rw-r--r--svx/source/sdr/properties/captionproperties.cxx4
-rw-r--r--svx/source/sdr/properties/circleproperties.cxx4
-rw-r--r--svx/source/sdr/properties/connectorproperties.cxx4
-rw-r--r--svx/source/sdr/properties/customshapeproperties.cxx10
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dcompoundproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dextrudeproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dlatheproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dproperties.cxx2
-rw-r--r--svx/source/sdr/properties/e3dsceneproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dsphereproperties.cxx2
-rw-r--r--svx/source/sdr/properties/emptyproperties.cxx2
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx4
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx4
-rw-r--r--svx/source/sdr/properties/itemsettools.cxx4
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx4
-rw-r--r--svx/source/sdr/properties/pageproperties.cxx2
-rw-r--r--svx/source/sdr/properties/properties.cxx2
-rw-r--r--svx/source/sdr/properties/textproperties.cxx8
-rw-r--r--svx/source/src/app.hrc6
-rw-r--r--svx/source/src/app.src32
-rw-r--r--svx/source/stbctrls/insctrl.cxx2
-rw-r--r--svx/source/stbctrls/modctrl.cxx2
-rw-r--r--svx/source/stbctrls/pszctrl.cxx6
-rw-r--r--svx/source/stbctrls/selctrl.cxx2
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx14
-rw-r--r--svx/source/stbctrls/zoomsliderctrl.cxx8
-rw-r--r--svx/source/svdraw/makefile.mk6
-rw-r--r--svx/source/svdraw/selectioncontroller.cxx11
-rw-r--r--svx/source/svdraw/svdattr.cxx2
-rw-r--r--svx/source/svdraw/svdedtv1.cxx6
-rw-r--r--svx/source/svdraw/svdedtv2.cxx2
-rw-r--r--svx/source/svdraw/svdedxv.cxx234
-rw-r--r--svx/source/svdraw/svdetc.cxx62
-rw-r--r--svx/source/svdraw/svdfmtf.cxx2
-rw-r--r--svx/source/svdraw/svdfppt.cxx7804
-rw-r--r--svx/source/svdraw/svdhdl.cxx2
-rw-r--r--svx/source/svdraw/svdibrow.cxx10
-rw-r--r--svx/source/svdraw/svdmark.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx10
-rw-r--r--svx/source/svdraw/svdoashp.cxx10
-rw-r--r--svx/source/svdraw/svdoattr.cxx12
-rw-r--r--svx/source/svdraw/svdobj.cxx6
-rw-r--r--svx/source/svdraw/svdocapt.cxx2
-rw-r--r--svx/source/svdraw/svdocirc.cxx2
-rw-r--r--svx/source/svdraw/svdoedge.cxx4
-rw-r--r--svx/source/svdraw/svdograf.cxx6
-rw-r--r--svx/source/svdraw/svdogrp.cxx4
-rw-r--r--svx/source/svdraw/svdomeas.cxx6
-rw-r--r--svx/source/svdraw/svdoole2.cxx6
-rw-r--r--svx/source/svdraw/svdopage.cxx2
-rw-r--r--svx/source/svdraw/svdotext.cxx6
-rw-r--r--svx/source/svdraw/svdotextdecomposition.cxx50
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx4
-rw-r--r--svx/source/svdraw/svdotxat.cxx12
-rw-r--r--svx/source/svdraw/svdotxed.cxx2
-rw-r--r--svx/source/svdraw/svdotxln.cxx2
-rw-r--r--svx/source/svdraw/svdotxtr.cxx2
-rw-r--r--svx/source/svdraw/svdoutl.cxx2
-rw-r--r--svx/source/svdraw/svdpage.cxx8
-rw-r--r--svx/source/svdraw/svdpntv.cxx22
-rw-r--r--svx/source/svdraw/svdtext.cxx2
-rw-r--r--svx/source/svdraw/svdtrans.cxx2
-rw-r--r--svx/source/svdraw/svdundo.cxx2
-rw-r--r--svx/source/svdraw/svdview.cxx16
-rw-r--r--svx/source/svdraw/svdviter.cxx2
-rw-r--r--svx/source/svdraw/svdxcgv.cxx6
-rw-r--r--svx/source/svrtf/rtfgrf.cxx4
-rw-r--r--svx/source/svrtf/rtfitem.cxx4
-rw-r--r--svx/source/svrtf/svxrtf.cxx6
-rw-r--r--svx/source/svxlink/fileobj.cxx4
-rw-r--r--svx/source/svxlink/linkmgr.cxx12
-rw-r--r--svx/source/table/cell.cxx4
-rw-r--r--svx/source/table/celleditsource.cxx6
-rw-r--r--svx/source/table/svdotable.cxx2
-rw-r--r--svx/source/table/tablecontroller.cxx84
-rw-r--r--svx/source/table/tablecontroller.hxx4
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx2
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx22
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx10
-rw-r--r--svx/source/tbxctrls/formatpaintbrushctrl.cxx2
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx6
-rw-r--r--svx/source/tbxctrls/itemwin.cxx26
-rw-r--r--svx/source/tbxctrls/layctrl.cxx2
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx8
-rw-r--r--svx/source/tbxctrls/subtoolboxcontrol.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx24
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx2
-rw-r--r--svx/source/tbxctrls/tbxcolorupdate.cxx6
-rw-r--r--svx/source/tbxctrls/tbxdrctl.cxx2
-rw-r--r--svx/source/tbxctrls/verttexttbxctrl.cxx4
-rw-r--r--svx/source/toolbars/fontworkbar.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx46
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx10
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src4
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx8
-rw-r--r--svx/source/unodraw/UnoNameItemTable.cxx6
-rw-r--r--svx/source/unodraw/UnoNameItemTable.hxx2
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx2
-rw-r--r--svx/source/unodraw/unobtabl.cxx6
-rw-r--r--svx/source/unodraw/unoctabl.cxx12
-rw-r--r--svx/source/unodraw/unodtabl.cxx4
-rw-r--r--svx/source/unodraw/unofdesc.cxx2
-rw-r--r--svx/source/unodraw/unogtabl.cxx4
-rw-r--r--svx/source/unodraw/unohtabl.cxx4
-rw-r--r--svx/source/unodraw/unoipset.cxx4
-rw-r--r--svx/source/unodraw/unomod.cxx2
-rw-r--r--svx/source/unodraw/unomtabl.cxx8
-rw-r--r--svx/source/unodraw/unonrule.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx2
-rw-r--r--svx/source/unodraw/unoshtxt.cxx9
-rw-r--r--svx/source/unodraw/unottabl.cxx4
-rw-r--r--svx/source/unoedit/unoedsrc.cxx2
-rw-r--r--svx/source/unoedit/unofored.cxx2
-rw-r--r--svx/source/unoedit/unoforou.cxx6
-rw-r--r--svx/source/unoedit/unotext.cxx8
-rw-r--r--svx/source/unoedit/unotext2.cxx2
-rw-r--r--svx/source/unogallery/unogalitem.cxx12
-rw-r--r--svx/source/unogallery/unogaltheme.cxx126
-rw-r--r--svx/source/unogallery/unogaltheme.hxx2
-rw-r--r--svx/source/unogallery/unogalthemeprovider.cxx80
-rw-r--r--svx/source/xml/xmlgrhlp.cxx2
-rw-r--r--svx/source/xml/xmltxtexp.cxx4
-rw-r--r--svx/source/xml/xmltxtimp.cxx2
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx4
-rw-r--r--svx/source/xoutdev/xattr.cxx6
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx2
-rw-r--r--svx/source/xoutdev/xexch.cxx8
-rw-r--r--svx/source/xoutdev/xpool.cxx2
-rw-r--r--svx/source/xoutdev/xtabbtmp.cxx2
-rw-r--r--svx/source/xoutdev/xtabcolr.cxx4
-rw-r--r--svx/source/xoutdev/xtabdash.cxx2
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx2
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx2
-rw-r--r--svx/source/xoutdev/xtablend.cxx2
-rw-r--r--svx/util/cui.map7
-rw-r--r--svx/util/hidother.src431
-rw-r--r--svx/util/makefile.mk86
-rw-r--r--svx/workben/edittest.cxx8
-rw-r--r--svx/workben/msview/msview.cxx2
-rwxr-xr-xucb/qa/complex/tdoc/interfaces/makefile.mk2
-rwxr-xr-xucb/qa/complex/tdoc/makefile.mk2
-rwxr-xr-xucb/qa/complex/ucb/makefile.mk2
-rw-r--r--ucb/source/ucp/gio/gio_mount.cxx2
-rw-r--r--ucb/source/ucp/odma/odma_content.cxx2
-rw-r--r--ucb/source/ucp/odma/odma_datasupplier.cxx8
-rw-r--r--ucb/source/ucp/odma/odma_provider.cxx22
-rw-r--r--ucb/source/ucp/webdav/DAVResourceAccess.cxx5
-rw-r--r--ucb/source/ucp/webdav/NeonSession.cxx7
-rw-r--r--uui/source/cookiedg.cxx2
-rw-r--r--uui/source/iahndl.cxx6
-rw-r--r--uui/source/ids.hrc2
-rw-r--r--uui/source/secmacrowarnings.hxx4
-rw-r--r--vbahelper/inc/vbahelper/helperdecl.hxx (renamed from svx/source/cui/splitcelldlg.hxx)66
-rw-r--r--vbahelper/inc/vbahelper/vbaapplicationbase.hxx64
-rw-r--r--vbahelper/inc/vbahelper/vbacollectionimpl.hxx257
-rw-r--r--vbahelper/inc/vbahelper/vbadialogbase.hxx (renamed from svx/inc/radiobtnbox.hxx)48
-rw-r--r--vbahelper/inc/vbahelper/vbadialogsbase.hxx54
-rw-r--r--vbahelper/inc/vbahelper/vbadllapi.h (renamed from svx/inc/optspell.hrc)23
-rw-r--r--vbahelper/inc/vbahelper/vbadocumentbase.hxx73
-rw-r--r--vbahelper/inc/vbahelper/vbadocumentsbase.hxx69
-rw-r--r--vbahelper/inc/vbahelper/vbafontbase.hxx99
-rw-r--r--vbahelper/inc/vbahelper/vbaglobalbase.hxx53
-rw-r--r--vbahelper/inc/vbahelper/vbahelper.hxx231
-rw-r--r--vbahelper/inc/vbahelper/vbahelperinterface.hxx121
-rw-r--r--vbahelper/inc/vbahelper/vbapagesetupbase.hxx70
-rw-r--r--vbahelper/inc/vbahelper/vbapropvalue.hxx (renamed from svx/source/cui/sdrcelldlg.hxx)50
-rw-r--r--vbahelper/inc/vbahelper/vbashape.hxx118
-rw-r--r--vbahelper/inc/vbahelper/vbashaperange.hxx89
-rw-r--r--vbahelper/inc/vbahelper/vbashapes.hxx84
-rw-r--r--vbahelper/inc/vbahelper/vbatextframe.hxx70
-rw-r--r--vbahelper/inc/vbahelper/vbawindowbase.hxx66
-rw-r--r--vbahelper/prj/build.lst6
-rw-r--r--vbahelper/prj/d.lst27
-rw-r--r--vbahelper/source/msforms/makefile.mk (renamed from sandbox/test/com/sun/star/lib/sandbox/makefile.mk)50
-rw-r--r--vbahelper/source/msforms/service.cxx83
-rw-r--r--vbahelper/source/msforms/vbabutton.cxx74
-rw-r--r--vbahelper/source/msforms/vbabutton.hxx51
-rw-r--r--vbahelper/source/msforms/vbacheckbox.cxx112
-rw-r--r--vbahelper/source/msforms/vbacheckbox.hxx61
-rw-r--r--vbahelper/source/msforms/vbacombobox.cxx183
-rw-r--r--vbahelper/source/msforms/vbacombobox.hxx80
-rw-r--r--vbahelper/source/msforms/vbacontrol.cxx539
-rw-r--r--vbahelper/source/msforms/vbacontrol.hxx114
-rw-r--r--vbahelper/source/msforms/vbacontrols.cxx232
-rw-r--r--vbahelper/source/msforms/vbacontrols.hxx62
-rw-r--r--vbahelper/source/msforms/vbaframe.cxx93
-rw-r--r--vbahelper/source/msforms/vbaframe.hxx58
-rw-r--r--vbahelper/source/msforms/vbaimage.cxx (renamed from svx/inc/optjsearch.hrc)52
-rw-r--r--vbahelper/source/msforms/vbaimage.hxx (renamed from svx/source/cui/newtabledlg.hxx)47
-rw-r--r--vbahelper/source/msforms/vbalabel.cxx88
-rw-r--r--vbahelper/source/msforms/vbalabel.hxx56
-rw-r--r--vbahelper/source/msforms/vbalistbox.cxx290
-rw-r--r--vbahelper/source/msforms/vbalistbox.hxx90
-rw-r--r--vbahelper/source/msforms/vbalistcontrolhelper.cxx146
-rw-r--r--vbahelper/source/msforms/vbalistcontrolhelper.hxx20
-rw-r--r--vbahelper/source/msforms/vbamultipage.cxx132
-rw-r--r--vbahelper/source/msforms/vbamultipage.hxx65
-rw-r--r--vbahelper/source/msforms/vbapages.cxx80
-rw-r--r--vbahelper/source/msforms/vbapages.hxx64
-rw-r--r--vbahelper/source/msforms/vbaprogressbar.cxx78
-rw-r--r--vbahelper/source/msforms/vbaprogressbar.hxx59
-rw-r--r--vbahelper/source/msforms/vbaradiobutton.cxx107
-rw-r--r--vbahelper/source/msforms/vbaradiobutton.hxx55
-rw-r--r--vbahelper/source/msforms/vbascrollbar.cxx139
-rw-r--r--vbahelper/source/msforms/vbascrollbar.hxx66
-rw-r--r--vbahelper/source/msforms/vbaspinbutton.cxx109
-rw-r--r--vbahelper/source/msforms/vbaspinbutton.hxx61
-rw-r--r--vbahelper/source/msforms/vbatextbox.cxx137
-rw-r--r--vbahelper/source/msforms/vbatextbox.hxx59
-rw-r--r--vbahelper/source/msforms/vbatogglebutton.cxx108
-rw-r--r--vbahelper/source/msforms/vbatogglebutton.hxx63
-rw-r--r--vbahelper/source/msforms/vbauserform.cxx227
-rw-r--r--vbahelper/source/msforms/vbauserform.hxx77
-rw-r--r--vbahelper/source/vbahelper/makefile.mk (renamed from sandbox/util/makefile.mk)52
-rw-r--r--vbahelper/source/vbahelper/vbaapplicationbase.cxx218
-rw-r--r--vbahelper/source/vbahelper/vbacolorformat.cxx190
-rw-r--r--vbahelper/source/vbahelper/vbacolorformat.hxx128
-rw-r--r--vbahelper/source/vbahelper/vbacommandbar.cxx212
-rw-r--r--vbahelper/source/vbahelper/vbacommandbar.hxx83
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarcontrol.cxx259
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarcontrol.hxx122
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarcontrols.cxx256
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarcontrols.hxx75
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarhelper.cxx282
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarhelper.hxx110
-rw-r--r--vbahelper/source/vbahelper/vbacommandbars.cxx238
-rw-r--r--vbahelper/source/vbahelper/vbacommandbars.hxx71
-rw-r--r--vbahelper/source/vbahelper/vbadialogbase.cxx (renamed from svx/source/cui/readonlyimage.hxx)33
-rw-r--r--vbahelper/source/vbahelper/vbadialogsbase.cxx (renamed from svx/inc/hlmarkwn_def.hxx)22
-rw-r--r--vbahelper/source/vbahelper/vbadocumentbase.cxx228
-rw-r--r--vbahelper/source/vbahelper/vbadocumentsbase.cxx305
-rw-r--r--vbahelper/source/vbahelper/vbafillformat.cxx202
-rw-r--r--vbahelper/source/vbahelper/vbafillformat.hxx74
-rw-r--r--vbahelper/source/vbahelper/vbafontbase.cxx309
-rw-r--r--vbahelper/source/vbahelper/vbaglobalbase.cxx126
-rw-r--r--vbahelper/source/vbahelper/vbahelper.cxx1198
-rw-r--r--vbahelper/source/vbahelper/vbahelper.cxx.rej45
-rw-r--r--vbahelper/source/vbahelper/vbalineformat.cxx458
-rw-r--r--vbahelper/source/vbahelper/vbalineformat.hxx85
-rw-r--r--vbahelper/source/vbahelper/vbapagesetupbase.cxx325
-rw-r--r--vbahelper/source/vbahelper/vbapictureformat.cxx147
-rw-r--r--vbahelper/source/vbahelper/vbapictureformat.hxx64
-rw-r--r--vbahelper/source/vbahelper/vbapropvalue.cxx (renamed from sandbox/com/sun/star/lib/sandbox/Disposable.java)20
-rw-r--r--vbahelper/source/vbahelper/vbashape.cxx676
-rw-r--r--vbahelper/source/vbahelper/vbashaperange.cxx382
-rw-r--r--vbahelper/source/vbahelper/vbashapes.cxx491
-rw-r--r--vbahelper/source/vbahelper/vbatextframe.cxx169
-rw-r--r--vbahelper/source/vbahelper/vbawindowbase.cxx180
-rw-r--r--vbahelper/util/makefile.mk104
-rw-r--r--vbahelper/util/msforms.map9
-rw-r--r--xmlhelp/prj/build.lst2
-rw-r--r--xmlhelp/source/com/sun/star/help/MANIFEST.MF1
-rw-r--r--xmlhelp/source/com/sun/star/help/makefile.mk19
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx130
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.cxx162
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx2
-rw-r--r--xmlhelp/source/treeview/makefile.mk3
-rw-r--r--xmlhelp/source/treeview/tvread.cxx50
-rw-r--r--xmlhelp/util/makefile.mk8
-rw-r--r--xmloff/inc/VisAreaContext.hxx2
-rw-r--r--xmloff/inc/VisAreaExport.hxx2
-rw-r--r--xmloff/inc/pch/precompiled_xmloff.hxx26
-rw-r--r--xmloff/inc/txtfldi.hxx5
-rw-r--r--xmloff/inc/xexptran.hxx2
-rw-r--r--xmloff/inc/xmlcnitm.hxx2
-rw-r--r--xmloff/inc/xmlehelp.hxx2
-rw-r--r--xmloff/inc/xmloff/ProgressBarHelper.hxx2
-rw-r--r--xmloff/inc/xmloff/maptype.hxx4
-rw-r--r--xmloff/inc/xmloff/styleexp.hxx2
-rw-r--r--xmloff/inc/xmloff/xmlcnimp.hxx4
-rw-r--r--xmloff/inc/xmloff/xmlexp.hxx8
-rw-r--r--xmloff/inc/xmloff/xmlnume.hxx2
-rw-r--r--xmloff/inc/xmloff/xmluconv.hxx2
-rw-r--r--xmloff/prj/build.lst2
-rw-r--r--xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx6
-rw-r--r--xmloff/source/core/ProgressBarHelper.cxx4
-rw-r--r--xmloff/source/core/attrlist.cxx13
-rw-r--r--xmloff/source/core/i18nmap.cxx2
-rw-r--r--xmloff/source/core/xmlehelp.cxx77
-rw-r--r--xmloff/source/core/xmlerror.cxx2
-rw-r--r--xmloff/source/core/xmlexp.cxx4
-rw-r--r--xmloff/source/core/xmlimp.cxx8
-rw-r--r--xmloff/source/core/xmltkmap.cxx2
-rw-r--r--xmloff/source/core/xmluconv.cxx2
-rw-r--r--xmloff/source/draw/shapeexport.cxx2
-rw-r--r--xmloff/source/draw/shapeexport2.cxx2
-rw-r--r--xmloff/source/draw/shapeexport3.cxx7
-rw-r--r--xmloff/source/draw/xexptran.cxx2
-rw-r--r--xmloff/source/draw/ximpstyl.cxx2
-rw-r--r--xmloff/source/forms/elementexport.cxx3
-rw-r--r--xmloff/source/forms/formenums.cxx2
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.cxx10
-rw-r--r--xmloff/source/forms/layerimport.cxx2
-rw-r--r--xmloff/source/script/XMLEventExport.cxx5
-rw-r--r--xmloff/source/style/EnumPropertyHdl.cxx14
-rw-r--r--xmloff/source/style/XMLFontAutoStylePool.cxx4
-rw-r--r--xmloff/source/style/fonthdl.cxx2
-rw-r--r--xmloff/source/style/impastpl.hxx2
-rw-r--r--xmloff/source/style/numehelp.cxx2
-rw-r--r--xmloff/source/style/postuhdl.cxx2
-rw-r--r--xmloff/source/style/styleexp.cxx2
-rw-r--r--xmloff/source/style/weighhdl.cxx49
-rw-r--r--xmloff/source/style/xmlexppr.cxx2
-rw-r--r--xmloff/source/style/xmlnume.cxx2
-rw-r--r--xmloff/source/style/xmlnumfe.cxx12
-rw-r--r--xmloff/source/style/xmlnumfi.cxx8
-rw-r--r--xmloff/source/style/xmlnumi.cxx4
-rw-r--r--xmloff/source/style/xmlstyle.cxx12
-rw-r--r--xmloff/source/style/xmltabi.cxx2
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.cxx2
-rw-r--r--xmloff/source/text/XMLSectionImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextColumnsContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextListAutoStylePool.cxx2
-rw-r--r--xmloff/source/text/txtflde.cxx13
-rw-r--r--xmloff/source/text/txtfldi.cxx33
-rw-r--r--xmloff/source/text/txtimp.cxx54
-rw-r--r--xmloff/source/text/txtimppr.cxx14
-rw-r--r--xmloff/source/text/txtparae.cxx41
-rw-r--r--xmloff/source/text/txtparai.cxx2
-rw-r--r--xmloff/source/text/txtparaimphint.hxx2
-rw-r--r--xmloff/source/text/txtprhdl.cxx2
-rw-r--r--xmloff/source/text/txtstyli.cxx60
-rw-r--r--xmloff/source/transform/StyleOOoTContext.cxx2
-rw-r--r--xmloff/source/transform/TransformerBase.cxx4
-rw-r--r--xmloff/util/makefile.mk3
1715 files changed, 28717 insertions, 202245 deletions
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index d2ac1e9ea8..3a2c43686a 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -33,7 +33,7 @@
#include <tools/rtti.hxx>
#ifndef _POOLITEM_HXX
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#endif
#include <com/sun/star/media/ZoomLevel.hpp>
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index 3dc7d2d235..6da465ee4b 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -31,7 +31,7 @@
#ifndef _AVMEDIA_MEDIATOOLBOX_HXX
#define _AVMEDIA_MEDIATOOLBOX_HXX
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
namespace avmedia
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
index d5148aeacd..4ce7f12962 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.hrc
@@ -31,7 +31,7 @@
#ifndef _AVMEDIA_HELPIDS_HRC
#define _AVMEDIA_HELPIDS_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define HID_AVMEDIA_TOOLBOXITEM_PLAY (HID_AVMEDIA_START+0)
#define HID_AVMEDIA_TOOLBOXITEM_PAUSE (HID_AVMEDIA_START+1)
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 4675da3ac3..218740f0d1 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -37,7 +37,7 @@
#include <tools/time.hxx>
#include <vcl/svapp.hxx>
#include <vcl/lstbox.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <sfx2/viewfrm.hxx>
#include <math.h>
#include <algorithm>
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 28a3598e45..f52cabf231 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -29,7 +29,7 @@
************************************************************************/
#include <tools/resmgr.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#include <vcl/svapp.hxx>
namespace avmedia {
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 1042c8e670..bb77f8602d 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -35,7 +35,7 @@
#include "mediacontrol.hrc"
#include "helpids.hrc"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <sfx2/app.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/bindings.hxx>
diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
index b445aa87d6..f207713ac4 100644
--- a/avmedia/source/java/makefile.mk
+++ b/avmedia/source/java/makefile.mk
@@ -51,7 +51,7 @@ JAVAFILES = \
FrameGrabber.java \
x11$/SystemWindowAdapter.java
-JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar jmf.jar
+JARFILES = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar jmf.jar
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class)
JARTARGET = $(TARGET).jar
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
index a66c77e3f4..aa2d86d340 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -100,8 +100,6 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
if ((result == noErr) && (mnVersion >= QT701))
{
// we have version 7.01 or later, initialize
- mpMovie = [QTMovie movie];
- [mpMovie retain];
mbInitialized = true;
}
[pool release];
@@ -111,43 +109,57 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
Player::~Player()
{
- if( mbInitialized )
+ if( mpMovie )
{
- if( mpMovie )
- {
- [mpMovie release];
- mpMovie = nil;
- }
-
+ [mpMovie release];
+ mpMovie = nil;
}
}
+// ------------------------------------------------------------------------------
+QTMovie* Player::getMovie()
+{
+ OSL_ASSERT( mpMovie );
+ return mpMovie;
+}
// ------------------------------------------------------------------------------
bool Player::create( const ::rtl::OUString& rURL )
{
bool bRet = false;
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
- NSString* aNSStr = [[[NSString alloc] initWithCharacters: rURL.getStr() length: rURL.getLength()]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] ;
-// NSString * aNSStringEscaped = [aNSStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
- NSURL* aURL = [NSURL URLWithString:aNSStr ];
-
- // create the Movie
-
+ // create the Movie
if( mbInitialized )
{
+ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
+ if( mpMovie )
+ {
+ [mpMovie release];
+ mpMovie = nil;
+ }
+
+ NSString* aNSStr = [[[NSString alloc] initWithCharacters: rURL.getStr() length: rURL.getLength()]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] ;
+ NSURL* aURL = [NSURL URLWithString:aNSStr ];
- mpMovie = [mpMovie initWithURL:aURL error:nil];
+
+ NSError* pErr = nil;
+ mpMovie = [QTMovie movieWithURL:aURL error:&pErr];
if(mpMovie)
{
[mpMovie retain];
maURL = rURL;
bRet = true;
}
+ if( pErr )
+ {
+ OSL_TRACE( "NSMovie create failed with error %ld (%s)",
+ (long)[pErr code],
+ [[pErr localizedDescription] cString]
+ );
+ }
+ [pool release];
}
-
- [pool release];
return bRet;
}
@@ -159,10 +171,10 @@ void SAL_CALL Player::start( )
{
OSL_TRACE ("Player::start");
- if ( mbInitialized && mpMovie )
- {
+ if( mpMovie )
+ {
[mpMovie play];
- }
+ }
}
// ------------------------------------------------------------------------------
@@ -171,11 +183,10 @@ void SAL_CALL Player::stop( )
throw (uno::RuntimeException)
{
OSL_TRACE ("Player::stop");
- if ( mpMovie )
+ if( mpMovie )
{
- [mpMovie stop];
+ [mpMovie stop];
}
-
}
// ------------------------------------------------------------------------------
@@ -185,7 +196,7 @@ sal_Bool SAL_CALL Player::isPlaying()
{
bool bRet = false;
- if ( mbInitialized )
+ if ( mpMovie )
{
if ([mpMovie rate] != 0)
{
@@ -219,11 +230,11 @@ void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException)
{
OSL_TRACE ("Player::setMediaTime");
-
- if ( mpMovie )
- {
- [mpMovie setCurrentTime: QTMakeTimeWithTimeInterval(fTime)];
- }
+
+ if ( mpMovie )
+ {
+ [mpMovie setCurrentTime: QTMakeTimeWithTimeInterval(fTime)];
+ }
}
// ------------------------------------------------------------------------------
@@ -243,7 +254,6 @@ double SAL_CALL Player::getMediaTime( )
{
stop();
}
-
return position;
}
@@ -256,7 +266,6 @@ void SAL_CALL Player::setStopTime( double fTime )
OSL_TRACE ("Player::setStopTime %f", fTime);
mnStopTime = fTime;
-
}
// ------------------------------------------------------------------------------
@@ -264,9 +273,7 @@ void SAL_CALL Player::setStopTime( double fTime )
double SAL_CALL Player::getStopTime( )
throw (uno::RuntimeException)
{
- double fRet = 0.0;
-
- fRet = mnStopTime;
+ double fRet = mnStopTime;
return fRet;
}
@@ -277,7 +284,7 @@ void SAL_CALL Player::setRate( double fRate )
throw (uno::RuntimeException)
{
OSL_TRACE ("Player::setRate");
-
+
// Quicktime: 0 = stop, 1 = normal speed, 2 = double speed, -1 = normal speed backwards
if ( mpMovie )
{
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 6698381e23..ccc360e5ef 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -83,7 +83,7 @@ public:
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
- QTMovie* getMovie() { return mpMovie; }
+ QTMovie* getMovie();
private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index f6ca9f0d75..4cf91bd3d1 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -28,15 +28,15 @@
*
************************************************************************/
-#include <stdio.h>
-
+#include <stdio.h>
+
#include <avmedia/mediawindow.hxx>
#include "mediawindow_impl.hxx"
#include "mediamisc.hxx"
#include "mediawindow.hrc"
#include <tools/urlobj.hxx>
#include <vcl/msgbox.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <sfx2/filedlghelper.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -77,7 +77,7 @@ void MediaWindow::setURL( const ::rtl::OUString& rURL )
}
// -------------------------------------------------------------------------
-
+
const ::rtl::OUString& MediaWindow::getURL() const
{
return mpImpl->getURL();
@@ -378,11 +378,11 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
"Quicktime Video", "mov",
"Vivo Video", "viv",
"WAVE Audio", "wav" };
-
+
unsigned int i;
for( i = 0; i < ( sizeof( pFilters ) / sizeof( char* ) ); i += 2 )
{
- rFilterNameVector.push_back( ::std::make_pair< ::rtl::OUString, ::rtl::OUString >(
+ rFilterNameVector.push_back( ::std::make_pair< ::rtl::OUString, ::rtl::OUString >(
::rtl::OUString::createFromAscii( pFilters[ i ] ),
::rtl::OUString::createFromAscii( pFilters[ i + 1 ] ) ) );
}
@@ -397,9 +397,9 @@ bool MediaWindow::executeMediaURLDialog( Window* /* pParent */, ::rtl::OUString&
FilterNameVector aFilters;
const ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
::rtl::OUString aAllTypes;
-
+
aDlg.SetTitle( AVMEDIA_RESID( bInsertDialog ? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) );
-
+
getMediaFilters( aFilters );
unsigned int i;
@@ -409,33 +409,33 @@ bool MediaWindow::executeMediaURLDialog( Window* /* pParent */, ::rtl::OUString&
{
if( aAllTypes.getLength() )
aAllTypes += aSeparator;
-
+
( aAllTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
}
}
-
+
// add filter for all media types
aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes );
-
+
for( i = 0; i < aFilters.size(); ++i )
{
::rtl::OUString aTypes;
-
+
for( sal_Int32 nIndex = 0; nIndex >= 0; )
{
if( aTypes.getLength() )
aTypes += aSeparator;
-
+
( aTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
}
-
+
// add single filters
aDlg.AddFilter( aFilters[ i ].first, aTypes );
}
// add filter for all types
aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), String( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) );
-
+
if( aDlg.Execute() == ERRCODE_NONE )
{
const INetURLObject aURL( aDlg.GetPath() );
@@ -452,7 +452,7 @@ bool MediaWindow::executeMediaURLDialog( Window* /* pParent */, ::rtl::OUString&
void MediaWindow::executeFormatErrorBox( Window* pParent )
{
ErrorBox aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_ERR_URL ) );
-
+
aErrBox.Execute();
}
@@ -462,35 +462,35 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
{
const INetURLObject aURL( rURL );
bool bRet = false;
-
+
if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
{
if( bDeep || pPreferredSizePixel )
{
uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-
+
if( xFactory.is() )
{
try
{
fprintf(stderr, "-->%s uno reference \n\n",AVMEDIA_MANAGER_SERVICE_NAME);
-
+
uno::Reference< ::com::sun::star::media::XManager > xManager(
xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),
uno::UNO_QUERY );
-
+
if( xManager.is() )
{
uno::Reference< media::XPlayer > xPlayer( xManager->createPlayer( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) );
-
+
if( xPlayer.is() )
{
bRet = true;
-
+
if( pPreferredSizePixel )
{
const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
-
+
pPreferredSizePixel->Width() = aAwtSize.Width;
pPreferredSizePixel->Height() = aAwtSize.Height;
}
@@ -506,7 +506,7 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
{
FilterNameVector aFilters;
const ::rtl::OUString aExt( aURL.getExtension() );
-
+
getMediaFilters( aFilters );
unsigned int i;
@@ -520,7 +520,7 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
}
}
}
-
+
return bRet;
}
@@ -532,7 +532,7 @@ uno::Reference< media::XPlayer > MediaWindow::createPlayer( const ::rtl::OUStrin
}
// -------------------------------------------------------------------------
-
+
uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUString& rURL,
bool bAllowToCreateReplacementGraphic,
double fMediaTime )
@@ -540,26 +540,26 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUStrin
uno::Reference< media::XPlayer > xPlayer( createPlayer( rURL ) );
uno::Reference< graphic::XGraphic > xRet;
::std::auto_ptr< Graphic > apGraphic;
-
+
if( xPlayer.is() )
{
uno::Reference< media::XFrameGrabber > xGrabber( xPlayer->createFrameGrabber() );
-
+
if( xGrabber.is() )
{
if( AVMEDIA_FRAMEGRABBER_DEFAULTFRAME == fMediaTime )
fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME;
-
+
if( fMediaTime >= xPlayer->getDuration() )
fMediaTime = ( xPlayer->getDuration() * 0.5 );
-
+
xRet = xGrabber->grabFrame( fMediaTime );
}
-
+
if( !xRet.is() && bAllowToCreateReplacementGraphic )
{
awt::Size aPrefSize( xPlayer->getPreferredPlayerWindowSize() );
-
+
if( !aPrefSize.Width && !aPrefSize.Height )
{
const BitmapEx aBmpEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) );
@@ -567,16 +567,16 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUStrin
}
}
}
-
+
if( !xRet.is() && !apGraphic.get() && bAllowToCreateReplacementGraphic )
{
const BitmapEx aBmpEx( AVMEDIA_RESID( AVMEDIA_BMP_EMPTYLOGO ) );
apGraphic.reset( new Graphic( aBmpEx ) );
}
-
+
if( apGraphic.get() )
xRet = apGraphic->GetXGraphic();
-
+
return xRet;
}
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index d7b42104ed..8fb63bdfc5 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -147,9 +147,9 @@ void MediaWindowBaseImpl::stopPlayingInternal( bool bStop )
if( isPlaying() )
{
if( bStop )
- mxPlayer->start();
- else
mxPlayer->stop();
+ else
+ mxPlayer->start();
}
}
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 3285c09527..2e0c1ea7df 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -32,7 +32,7 @@
#define _BASMGR_HXX
#include <tools/string.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
#include <basic/sbstar.hxx>
#include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
#include <com/sun/star/script/XStarBasicAccess.hpp>
@@ -231,6 +231,8 @@ public:
::com::sun::star::uno::Any
SetGlobalUNOConstant( const sal_Char* _pAsciiName, const ::com::sun::star::uno::Any& _rValue );
+ /** retrieves a global constant in the basic library, referring to some UNO object, returns true if a value is found ( value is in aOut ) false otherwise. */
+ bool GetGlobalUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
/** determines whether there are password-protected modules whose size exceedes the
legacy module size
@param _out_rModuleNames
diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx
index c13cd69378..f7367c9364 100644
--- a/basic/inc/basic/sbdef.hxx
+++ b/basic/inc/basic/sbdef.hxx
@@ -32,7 +32,7 @@
#define _SB_SBDEF_HXX
#include <basic/sbxdef.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#define _BASIC_TEXTPORTIONS
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index f71d1ff2fd..0d61e9bad6 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -74,6 +74,11 @@ class StarBASIC : public SbxObject
BOOL bDocBasic;
BasicLibInfo* pLibInfo; // Info block for basic manager
SbLanguageMode eLanguageMode; // LanguageMode of the basic object
+ BOOL bQuit;
+
+ SbxObjectRef pVBAGlobals;
+ SbxObject* getVBAGlobals( );
+
protected:
BOOL CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
private:
@@ -196,6 +201,10 @@ public:
SbxObjectRef getRTL( void ) { return pRtl; }
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; };
};
#ifndef __SB_SBSTARBASICREF_HXX
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index 0a686e5d96..70ee8a2b7f 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -32,9 +32,9 @@
#define _SBXCLASS_HXX
#include "tools/ref.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/smplhint.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/svarray.hxx"
+#include "svl/smplhint.hxx"
+#include "svl/lstner.hxx"
#include <basic/sbxdef.hxx>
#include <basic/sbxform.hxx>
diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx
index 577e509b28..e3f72c7c79 100644
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
@@ -33,7 +33,7 @@
#include <i18npool/lang.h>
#include "tools/list.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
#include <basic/sbxdef.hxx>
class SbxFactory;
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index a517b4375e..2792d6e5d4 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -31,7 +31,7 @@
#ifndef _SBX_SBXOBJECT_HXX
#define _SBX_SBXOBJECT_HXX
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <basic/sbxvar.hxx>
///////////////////////////////////////////////////////////////////////////
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index a425844ce5..f8d65bce9e 100644
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -30,7 +30,7 @@
#ifndef _BASIC_TESTTOOL_HXX_
#define _BASIC_TESTTOOL_HXX_
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
#include <tools/string.hxx>
#define TESTTOOL_DEFAULT_PORT 12479
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index cd10ee53f3..f1c120b261 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -173,35 +173,35 @@
#include "sot/storage.hxx"
#include "sot/storinfo.hxx"
-#include "svtools/brdcst.hxx"
+#include "svl/brdcst.hxx"
#include "svtools/ctrlbox.hxx"
#include "svtools/ctrltool.hxx"
#include "svtools/ehdl.hxx"
#include "svtools/filedlg.hxx"
-#include "svtools/hint.hxx"
-#include "svtools/lstner.hxx"
-#include "svtools/pathoptions.hxx"
+#include "svl/hint.hxx"
+#include "svl/lstner.hxx"
+#include "unotools/pathoptions.hxx"
#include "svtools/sfxecode.hxx"
-#include "svtools/smplhint.hxx"
-#include "svtools/solar.hrc"
+#include "svl/smplhint.hxx"
+#include "svl/solar.hrc"
#include "svtools/stringtransfer.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/svdde.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svdde.hxx"
#include "svtools/svmedit.hxx"
-#include "svtools/svstdarr.hxx"
+#include "svl/svstdarr.hxx"
#include "svtools/svtdata.hxx"
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
#include "svtools/svtreebx.hxx"
-#include "svtools/syslocale.hxx"
+#include "unotools/syslocale.hxx"
#include "svtools/taskbar.hxx"
#include "svtools/textdata.hxx"
#include "svtools/texteng.hxx"
#include "svtools/textview.hxx"
#include "svtools/transfer.hxx"
#include "svtools/txtattr.hxx"
-#include "svtools/undo.hxx"
-#include "svtools/zforlist.hxx"
-#include "svtools/zformat.hxx"
+#include "svl/undo.hxx"
+#include "svl/zforlist.hxx"
+#include "svl/zformat.hxx"
#include "tools/color.hxx"
diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc
index be03905eb0..6caf7ade5c 100644
--- a/basic/inc/sb.hrc
+++ b/basic/inc/sb.hrc
@@ -31,7 +31,7 @@
#ifndef _SB_HRC
#define _SB_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#ifndef IDS_SBERR_START
#define IDS_SBERR_START RID_BASIC_START
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 00a7877fcf..9c7f457ad4 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -80,7 +80,7 @@
#include <com/sun/star/ucb/XContentProviderManager.hpp>
#include <ucbhelper/content.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
using namespace comphelper;
using namespace cppu;
diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index f348689773..b30b7261c2 100644
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -42,8 +42,8 @@
#include <vcl/wrkwin.hxx>
#endif
#include <vcl/timer.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
class BasicFrame;
#include <basic/mybasic.hxx>
diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx
index 122aa9c7a1..b2e3942d36 100644
--- a/basic/source/app/appedit.cxx
+++ b/basic/source/app/appedit.cxx
@@ -34,7 +34,7 @@
#include <svtools/ctrltool.hxx>
#include <svtools/textview.hxx>
#include <svtools/texteng.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index fa770f985f..2fc7baffe1 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -60,13 +60,13 @@
#include <svtools/stringtransfer.hxx>
#include <vcl/splitwin.hxx>
#ifndef _ZFORLIST_HXX //autogen
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
#endif
#include <svtools/ctrltool.hxx>
// Ohne Includeschutz
#include <svtools/svtdata.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#include <basic/dispdefs.hxx>
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index 1ef046170d..beabe69afe 100644
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -48,7 +48,7 @@ Version 3 Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8
#endif
#include <tools/fsys.hxx>
#include <svtools/stringtransfer.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#ifndef _BASIC_TTRESHLP_HXX
#include <basic/ttstrhlp.hxx>
#endif
diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx
index 19efd764c2..d31d013e36 100644
--- a/basic/source/app/textedit.hxx
+++ b/basic/source/app/textedit.hxx
@@ -40,7 +40,7 @@ class BreakpointWindow;
#include <vcl/timer.hxx>
#include <tools/table.hxx>
#include <tools/debug.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <svtools/svmedit.hxx>
#include "dataedit.hxx"
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 3c4980e266..3a0be2efa4 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -44,8 +44,8 @@
/** === end UNO includes === **/
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/smplhint.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/smplhint.hxx>
#include <vcl/svapp.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 9c690f1c8d..196965e2ef 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -33,20 +33,21 @@
#include <tools/stream.hxx>
#include <sot/storage.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/msgbox.hxx>
#include <basic/sbx.hxx>
#include <sot/storinfo.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <basic/sbmod.hxx>
#include <basic/sbuno.hxx>
#include <basic/basmgr.hxx>
+#include <sbunoobj.hxx>
#include "basrid.hxx"
#include "sbintern.hxx"
#include <sb.hrc>
@@ -1767,6 +1768,15 @@ BasicError* BasicManager::GetNextError()
DBG_CHKTHIS( BasicManager, 0 );
return pErrorMgr->GetNextError();
}
+bool BasicManager::GetGlobalUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
+{
+ bool bRes = false;
+ StarBASIC* pStandardLib = GetStdLib();
+ OSL_PRECOND( pStandardLib, "BasicManager::SetGlobalUNOConstant: no lib to insert into!" );
+ if ( pStandardLib )
+ bRes = pStandardLib->GetUNOConstant( _pAsciiName, aOut );
+ return bRes;
+}
Any BasicManager::SetGlobalUNOConstant( const sal_Char* _pAsciiName, const Any& _rValue )
{
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 7776b57829..b0c8f4b3c3 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -95,53 +95,48 @@ Any sbxToUnoValue( SbxVariable* pVar );
Reference< frame::XModel > getModelFromBasic( SbxObject* pBasic )
{
- Reference< frame::XModel > xModel;
-
- SbxObject* basicChosen = pBasic;
-
- if ( basicChosen == NULL)
+ 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 )
{
- OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" );
- return xModel;
+ pThisComponent = pLookup->Find( sThisComponent, SbxCLASS_OBJECT );
+ pLookup = pLookup->GetParent();
}
- SbxObject* p = pBasic;
- SbxObject* pParent = p->GetParent();
- SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL;
-
- if( pParentParent )
+ if ( !pThisComponent )
{
- basicChosen = pParentParent;
+ OSL_TRACE("Failed to get ThisComponent");
+ // the application Basic, at the latest, should have this variable
+ return NULL;
}
- else if( pParent )
+
+ Any aThisComponent( sbxToUnoValue( pThisComponent ) );
+ Reference< frame::XModel > xModel( aThisComponent, UNO_QUERY );
+ if ( !xModel.is() )
{
- basicChosen = pParent;
+ // 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;
- Any aModel;
- SbxVariable *pCompVar = basicChosen->Find( UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT );
+#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
- if ( pCompVar )
- {
- aModel = sbxToUnoValue( pCompVar );
- if ( sal_False == ( aModel >>= xModel ) ||
- !xModel.is() )
- {
- OSL_TRACE("Failed to extract model from thisComponent ");
- return xModel;
- }
- else
- {
- OSL_TRACE("Have model ThisComponent points to url %s",
- ::rtl::OUStringToOString( xModel->getURL(),
- RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-
- }
- }
- else
- {
- OSL_TRACE("Failed to get ThisComponent");
- }
return xModel;
}
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index aed5b2b3c5..f54cdc800d 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -35,7 +35,7 @@
#include <tools/urlobj.hxx>
#include <tools/errcode.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#include <basic/sbstar.hxx>
#include <sbunoobj.hxx>
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 6b22b4f280..a217ebc49c 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -65,7 +65,29 @@ SV_IMPL_VARARR(SbTextPortions,SbTextPortion)
TYPEINIT1(StarBASIC,SbxObject)
#define RTLNAME "@SBRTL"
+// i#i68894#
+const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") );
+const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
+
+SbxObject* StarBASIC::getVBAGlobals( )
+{
+ if ( !pVBAGlobals )
+ pVBAGlobals = (SbUnoObject*)Find( aVBAHook , SbxCLASS_DONTCARE );
+ return pVBAGlobals;
+}
+
+// i#i68894#
+SbxVariable* StarBASIC::VBAFind( const String& rName, SbxClassType t )
+{
+ if( rName == aThisComponent )
+ return NULL;
+ // rename to init globals
+ if ( getVBAGlobals( ) )
+ return pVBAGlobals->Find( rName, t );
+ return NULL;
+
+}
// Create array for conversion SFX <-> VB error code
struct SFX_VB_ErrorItem
{
@@ -303,32 +325,32 @@ SbxObject* SbTypeFactory::cloneTypeObjectImpl( const SbxObject& rTypeObj )
if( pProp )
{
SbxProperty* pNewProp = new SbxProperty( *pProp );
- if( pVar->GetType() & SbxARRAY )
- {
- SbxBase* pParObj = pVar->GetObject();
- SbxDimArray* pSource = PTR_CAST(SbxDimArray,pParObj);
- SbxDimArray* pDest = new SbxDimArray( pVar->GetType() );
- INT32 lb = 0;
- INT32 ub = 0;
-
- pDest->setHasFixedSize( pSource->hasFixedSize() );
- if ( pSource->GetDims() && pSource->hasFixedSize() )
- {
- for ( INT32 j = 1 ; j <= pSource->GetDims(); ++j )
- {
- pSource->GetDim32( (INT32)j, lb, ub );
- pDest->AddDim32( lb, ub );
- }
- }
- else
- pDest->unoAddDim( 0, -1 ); // variant array
-
- USHORT nSavFlags = pVar->GetFlags();
- pNewProp->ResetFlag( SBX_FIXED );
- // need to reset the FIXED flag
- // when calling PutObject ( because the type will not match Object )
- pNewProp->PutObject( pDest );
- pNewProp->SetFlags( nSavFlags );
+ if( pVar->GetType() & SbxARRAY )
+ {
+ SbxBase* pParObj = pVar->GetObject();
+ SbxDimArray* pSource = PTR_CAST(SbxDimArray,pParObj);
+ SbxDimArray* pDest = new SbxDimArray( pVar->GetType() );
+ INT32 lb = 0;
+ INT32 ub = 0;
+
+ pDest->setHasFixedSize( pSource->hasFixedSize() );
+ if ( pSource->GetDims() && pSource->hasFixedSize() )
+ {
+ for ( INT32 j = 1 ; j <= pSource->GetDims(); ++j )
+ {
+ pSource->GetDim32( (INT32)j, lb, ub );
+ pDest->AddDim32( lb, ub );
+ }
+ }
+ else
+ pDest->unoAddDim( 0, -1 ); // variant array
+
+ USHORT nSavFlags = pVar->GetFlags();
+ pNewProp->ResetFlag( SBX_FIXED );
+ // need to reset the FIXED flag
+ // when calling PutObject ( because the type will not match Object )
+ pNewProp->PutObject( pDest );
+ pNewProp->SetFlags( nSavFlags );
}
pProps->PutDirect( pNewProp, i );
}
@@ -445,8 +467,8 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
SbProcedureProperty* pNewProp = new SbProcedureProperty
( pProcedureProp->GetName(), pProcedureProp->GetType() );
// ( pProcedureProp->GetName(), pProcedureProp->GetType(), this );
- pNewProp->SetFlags( nFlags_ ); // Copy flags
- pNewProp->ResetFlag( SBX_NO_BROADCAST ); // except the Broadcast if it was set
+ pNewProp->SetFlags( nFlags_ ); // Copy flags
+ pNewProp->ResetFlag( SBX_NO_BROADCAST ); // except the Broadcast if it was set
pProcedureProp->SetFlags( nFlags_ );
pProps->PutDirect( pNewProp, i );
StartListening( pNewProp->GetBroadcaster(), TRUE );
@@ -681,6 +703,8 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic )
pRtl = new SbiStdObject( String( RTL_CONSTASCII_USTRINGPARAM(RTLNAME) ), this );
// Search via StarBasic is always global
SetFlag( SBX_GBLSEARCH );
+ pVBAGlobals = NULL;
+ bQuit = FALSE;
}
// #51727 Override SetModified so that the modified state
@@ -995,6 +1019,12 @@ SbxVariable* StarBASIC::FindVarInCurrentScopy
return pVar;
}
+void StarBASIC::QuitAndExitApplication()
+{
+ Stop();
+ bQuit = TRUE;
+}
+
void StarBASIC::Stop()
{
SbiInstance* p = pINST;
@@ -1533,6 +1563,18 @@ BOOL StarBASIC::LoadOldModules( SvStream& )
return FALSE;
}
+bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
+{
+ bool bRes = false;
+ ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
+ SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( Find( sVarName, SbxCLASS_DONTCARE ) );
+ if ( pGlobs )
+ {
+ aOut = pGlobs->getUnoAny();
+ bRes = true;
+ }
+ return bRes;
+}
//========================================================================
// #118116 Implementation Collection object
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 8ee3df992e..06c29a5f2d 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -36,7 +36,7 @@
#ifndef _TOOLERR_HXX //autogen
#include <tools/errcode.hxx>
#endif
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/exc_hlp.hxx>
@@ -750,11 +750,11 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
// SbUnoObject instanzieren
String aName;
SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue );
- //If this is called externally e.g. from the scripting
- //framework then there is no 'active' runtime the default property will not be set up
- //only a vba object will have XDefaultProp set anyway so... this
- //test seems a bit of overkill
- //if ( SbiRuntime::isVBAEnabled() )
+ //If this is called externally e.g. from the scripting
+ //framework then there is no 'active' runtime the default property will not be set up
+ //only a vba object will have XDefaultProp set anyway so... this
+ //test seems a bit of overkill
+ //if ( SbiRuntime::isVBAEnabled() )
{
String sDfltPropName;
@@ -3377,9 +3377,10 @@ SbxVariable* SbUnoService::Find( const String& rName, SbxClassType )
// Create and insert SbUnoServiceCtor
SbxVariableRef xSbCtorRef = new SbUnoServiceCtor( aName, xCtor );
QuickInsert( (SbxVariable*)xSbCtorRef );
- pRes = xSbCtorRef;
}
}
+
+ pRes = SbxObject::Find( rName, SbxCLASS_METHOD );
}
}
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 21b31020f9..bbb529b733 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -36,7 +36,7 @@
#include <vos/macros.hxx>
#include <vcl/svapp.hxx>
#include <tools/stream.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
#include <tools/shl.hxx>
#include <basic/sbx.hxx>
#include "sb.hxx"
@@ -69,6 +69,11 @@
#endif
#include <stdio.h>
+#include <com/sun/star/frame/XDesktop.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <comphelper/processfactory.hxx>
+#include <vcl/svapp.hxx>
+ using namespace ::com::sun::star;
TYPEINIT1(SbModule,SbxObject)
@@ -84,7 +89,63 @@ SV_IMPL_VARARR(SbiBreakpoints,USHORT)
SV_IMPL_VARARR(HighlightPortions, HighlightPortion)
+class AsyncQuitHandler
+{
+ AsyncQuitHandler() {}
+ AsyncQuitHandler( const AsyncQuitHandler&);
+public:
+ static AsyncQuitHandler& instance()
+ {
+ static AsyncQuitHandler dInst;
+ return dInst;
+ }
+ void QuitApplication()
+ {
+ uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
+ if ( xFactory.is() )
+ {
+ uno::Reference< frame::XDesktop > xDeskTop( xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ) ), uno::UNO_QUERY );
+ if ( xDeskTop.is() )
+ xDeskTop->terminate();
+ }
+ }
+ DECL_LINK( OnAsyncQuit, void* );
+};
+
+IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, /*pNull*/ )
+{
+ QuitApplication();
+ return 0L;
+}
+
+#if 0
+bool UnlockControllerHack( StarBASIC* pBasic )
+{
+ bool bRes = false;
+ if ( pBasic && pBasic->IsDocBasic() )
+ {
+ uno::Any aUnoVar;
+ ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( "ThisComponent" ) );
+ SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( pBasic->Find( sVarName, 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& )
+ {
+ }
+ }
+ }
+ return bRes;
+}
+#endif
/////////////////////////////////////////////////////////////////////////////
// Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen
@@ -696,6 +757,13 @@ USHORT SbModule::Run( SbMethod* pMeth )
pINST->nCallLvl--; // Call-Level wieder runter
StarBASIC::FatalError( SbERR_STACK_OVERFLOW );
}
+
+ // VBA always ensure screenupdating is enabled after completing
+ StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
+#if 0
+ if ( pBasic && pBasic->IsDocBasic() && !pINST )
+ UnlockControllerHack( pBasic );
+#endif
if( bDelInst )
{
// #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
@@ -705,6 +773,11 @@ USHORT SbModule::Run( SbMethod* pMeth )
delete pINST;
pINST = NULL;
}
+ if ( pBasic && pBasic->IsDocBasic() && pBasic->IsQuitApplication() && !pINST )
+ {
+ Application::PostUserEvent( LINK( &AsyncQuitHandler::instance(), AsyncQuitHandler, OnAsyncQuit ), NULL );
+ }
+
return nRes;
}
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index 1b45d28502..a3ead5e305 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -83,7 +83,7 @@ void SbiCodeGen::GenStmnt()
UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( eOpcode < SbOP0_START || eOpcode > SbOP0_END )
pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE1" );
#endif
@@ -94,7 +94,7 @@ UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode )
UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( eOpcode < SbOP1_START || eOpcode > SbOP1_END )
pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE2" );
#endif
@@ -107,7 +107,7 @@ UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd )
UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd1, UINT32 nOpnd2 )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( eOpcode < SbOP2_START || eOpcode > SbOP2_END )
pParser->Error( SbERR_INTERNAL_ERROR, "OPCODE3" );
#endif
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 9afcf5262f..5da3c41b73 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -170,7 +170,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
void SbiExprNode::GenElement( SbiOpcode eOp )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( (eOp < _RTL || eOp > _CALLC) && eOp != _FIND_G && eOp != _FIND_CM )
pGen->GetParser()->Error( SbERR_INTERNAL_ERROR, "Opcode" );
#endif
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 2156756164..1d34698104 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -175,7 +175,7 @@ void SbiSymPool::Add( SbiSymDef* pDef )
{
if( pDef->pIn )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
// schon in einem anderen Pool drin!
pParser->Error( SbERR_INTERNAL_ERROR, "Dbl Pool" );
#endif
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index 663060638b..c6517459aa 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -30,7 +30,7 @@
#ifndef _SFX_PROPBAG_HXX
#define _SFX_PROPBAG_HXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_
#include <com/sun/star/beans/PropertyValue.hpp>
#endif
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 8b19aa6da6..e2510b0272 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -31,7 +31,7 @@
#ifndef _SYMTBL_HXX
#define _SYMTBL_HXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#include <tools/string.hxx>
#include <basic/sbxdef.hxx>
#include <basic/sbdef.hxx>
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index 51a1aa00b0..6933957799 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -33,7 +33,7 @@
#include <tools/shl.hxx>
#include <vcl/svapp.hxx>
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
#include <tools/debug.hxx>
#include <vcl/msgbox.hxx>
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 3a88477b5b..10a74a6748 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -31,7 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
#include <tools/errcode.hxx>
-#include <svtools/svdde.hxx>
+#include <svl/svdde.hxx>
#include "ddectrl.hxx"
#ifndef _SBERRORS_HXX
#include <basic/sberrors.hxx>
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 9cd003e858..f8689ddd10 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -32,9 +32,9 @@
#define _DLLMGR_HXX
#define _SVSTDARR_BYTESTRINGSSORT
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#ifndef _SVSTDARR_HXX //autogen
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#endif
// !!! nur zum debuggen fuer infoboxes !!!
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 5c1bae13ab..6621e6c3f0 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -43,7 +43,7 @@
#include <vcl/wintypes.hxx>
#include <vcl/msgbox.hxx>
#include <basic/sbx.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <tools/urlobj.hxx>
#include <osl/time.h>
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 08a94feefc..3f2b72af39 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -44,7 +44,7 @@
#ifndef _SBX_HXX
#include <basic/sbx.hxx>
#endif
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <tools/fsys.hxx>
#include <tools/urlobj.hxx>
#include <osl/file.hxx>
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 87f88ea9e6..a7cf7277c0 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -33,8 +33,8 @@
#include <tools/fsys.hxx>
#include <vcl/svapp.hxx>
#include <tools/wldcrd.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/zforlist.hxx>
+#include <unotools/syslocale.hxx>
#include "runtime.hxx"
#include "sbintern.hxx"
#include "opcodes.hxx"
@@ -867,7 +867,7 @@ void SbiRuntime::PushVar( SbxVariable* pVar )
SbxVariableRef SbiRuntime::PopVar()
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( !nExprLvl )
{
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
@@ -902,7 +902,7 @@ BOOL SbiRuntime::ClearExprStack()
SbxVariable* SbiRuntime::GetTOS( short n )
{
n = nExprLvl - n - 1;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
if( n < 0 )
{
StarBASIC::FatalError( SbERR_INTERNAL_ERROR );
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index 1f0914dca0..f7c1086304 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -160,7 +160,7 @@ void SbiRuntime::StepPAD( UINT32 nOp1 )
void SbiRuntime::StepJUMP( UINT32 nOp1 )
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
// #QUESTION shouln't this be
// if( (BYTE*)( nOp1+pImagGetCode() ) >= pImg->GetCodeSize() )
if( nOp1 >= pImg->GetCodeSize() )
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 2589207ac9..dbc8712063 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -56,57 +56,6 @@ using com::sun::star::uno::Reference;
SbxVariable* getVBAConstant( const String& rName );
-const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") );
-const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
-// i#i68894#
-SbxArray* getVBAGlobals( )
-{
- static SbxArrayRef pArray;
- static bool isInitialised = false;
- if ( isInitialised )
- return pArray;
- Reference < XComponentContext > xCtx;
- Reference < XPropertySet > xProps(
- ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
- xCtx.set( xProps->getPropertyValue( rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))),
- UNO_QUERY_THROW );
- SbUnoObject dGlobs( String( RTL_CONSTASCII_USTRINGPARAM("ExcelGlobals") ), xCtx->getValueByName( ::rtl::OUString::createFromAscii( "/singletons/ooo.vba.theGlobals") ) );
-
- SbxVariable *vba = dGlobs.Find( String( RTL_CONSTASCII_USTRINGPARAM("getGlobals") ) , SbxCLASS_DONTCARE );
-
- if ( vba )
- {
- pArray = static_cast<SbxArray *>(vba->GetObject());
- isInitialised = true;
- return pArray;
- }
- return NULL;
-}
-
-// i#i68894#
-SbxVariable* VBAFind( const String& rName, SbxClassType t )
-{
- if( rName == aThisComponent )
- return NULL;
-
- SbxArray *pVBAGlobals = getVBAGlobals( );
- for (USHORT i = 0; pVBAGlobals && i < pVBAGlobals->Count(); i++)
- {
- SbxVariable *pElem = pVBAGlobals->Get( i );
- if (!pElem || !pElem->IsObject())
- continue;
- SbxObject *pVba = static_cast<SbxObject *>(pElem->GetObject());
- SbxVariable *pVbaVar = pVba ? pVba->Find( rName, t ) : NULL;
- if( pVbaVar )
- {
- return pVbaVar;
- }
- }
- return NULL;
-
-}
-
// Suchen eines Elements
// Die Bits im String-ID:
// 0x8000 - Argv ist belegt
@@ -191,7 +140,7 @@ SbxVariable* SbiRuntime::FindElement
if ( bVBAEnabled )
{
// Try Find in VBA symbols space
- pElem = VBAFind( aName, SbxCLASS_DONTCARE );
+ pElem = rBasic.VBAFind( aName, SbxCLASS_DONTCARE );
if ( pElem )
bSetName = false; // don't overwrite uno name
else
diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src
index dde88272eb..afdd3f8522 100644
--- a/basic/source/sbx/format.src
+++ b/basic/source/sbx/format.src
@@ -28,7 +28,7 @@
*
************************************************************************/
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
String STR_BASICKEY_FORMAT_ON
{
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index efa5daef97..cdfeb2dd3c 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -31,7 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
#include <vcl/svapp.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <tools/errcode.hxx>
#include <tools/color.hxx>
#include <i18npool/lang.h>
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 7f8584d889..e977456814 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -35,7 +35,7 @@
#include <basic/sbx.hxx>
#include <basic/sbxbase.hxx>
#include "sbxres.hxx"
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
TYPEINIT1(SbxMethod,SbxVariable)
TYPEINIT1(SbxProperty,SbxVariable)
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 07a3012b60..041e14b983 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -34,7 +34,7 @@
#include <basic/sbx.hxx>
#include "sbxconv.hxx"
-#include "svtools/syslocale.hxx"
+#include "unotools/syslocale.hxx"
#if defined ( UNX )
#include <stdlib.h>
@@ -50,12 +50,12 @@
#include "sbxres.hxx"
#include <basic/sbxbase.hxx>
#include <basic/sbxform.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
#include "basrid.hxx"
#include "runtime.hxx"
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 1ecd20cc2b..b391023c20 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -33,7 +33,7 @@
#include <tools/stream.hxx>
-#include "svtools/brdcst.hxx"
+#include "svl/brdcst.hxx"
#include <basic/sbx.hxx>
#include <basic/sbxbase.hxx>
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index ba67d5bfa5..2ed3a5ca1f 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
#include <cppuhelper/factory.hxx>
#include <svtools/sfxecode.hxx>
@@ -104,7 +104,7 @@ SfxLibrary* SfxDialogLibraryContainer::implCreateLibrary( const ::rtl::OUString&
}
SfxLibrary* SfxDialogLibraryContainer::implCreateLibraryLink
- ( const ::rtl::OUString& aName, const OUString& aLibInfoFileURL,
+ ( const ::rtl::OUString& aName, const OUString& aLibInfoFileURL,
const OUString& StorageURL, sal_Bool ReadOnly )
{
SfxLibrary* pRet = new SfxDialogLibrary
@@ -144,7 +144,7 @@ bool writeOasis2OOoLibraryElement(
{
return FALSE;
}
-
+
Reference< xml::sax::XParser > xParser(
xSMgr->createInstanceWithContext(
OUString( RTL_CONSTASCII_USTRINGPARAM(
@@ -166,7 +166,7 @@ bool writeOasis2OOoLibraryElement(
{
return FALSE;
}
-
+
Sequence<Any> aArgs( 1 );
aArgs[0] <<= xWriter;
@@ -178,20 +178,20 @@ bool writeOasis2OOoLibraryElement(
UNO_QUERY );
xParser->setDocumentHandler( xHandler );
-
+
xml::sax::InputSource source;
source.aInputStream = xInput;
source.sSystemId = OUString::createFromAscii( "virtual file" );
-
+
xParser->parseStream( source );
return TRUE;
}
void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
-(
+(
Any aElement,
- const OUString& /*aElementName*/,
+ const OUString& /*aElementName*/,
Reference< XOutputStream > xOutput
)
throw(Exception)
@@ -319,9 +319,9 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
InputSource source;
source.aInputStream = xInput;
source.sSystemId = aFile;
-
+
try {
- // start parsing
+ // start parsing
xParser->setDocumentHandler( ::xmlscript::importDialogModel( xDialogModel, xContext ) );
xParser->parseStream( source );
}
@@ -356,7 +356,7 @@ static OUString aResourceFileNameBase = OUString::createFromAscii( "DialogString
static OUString aResourceFileCommentBase = OUString::createFromAscii( "# Strings for Dialog Library " );
// Resource handling
-Reference< ::com::sun::star::resource::XStringResourcePersistence >
+Reference< ::com::sun::star::resource::XStringResourcePersistence >
SfxDialogLibraryContainer::implCreateStringResource( SfxDialogLibrary* pDialogLibrary )
{
Reference< resource::XStringResourcePersistence > xRet;
@@ -528,7 +528,7 @@ OUString SfxDialogLibraryContainer::getImplementationName_static()
Reference< XInterface > SAL_CALL SfxDialogLibraryContainer::Create( const Reference< XComponentContext >& ) throw( Exception )
{
- Reference< XInterface > xRet =
+ Reference< XInterface > xRet =
static_cast< XInterface* >( static_cast< OWeakObject* >(new SfxDialogLibraryContainer()) );
return xRet;
}
@@ -540,8 +540,8 @@ Reference< XInterface > SAL_CALL SfxDialogLibraryContainer::Create( const Refere
// Ctor
SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable,
const ::rtl::OUString& aName,
- const Reference< XMultiServiceFactory >& xMSF,
- const Reference< XSimpleFileAccess >& xSFI,
+ const Reference< XMultiServiceFactory >& xMSF,
+ const Reference< XSimpleFileAccess >& xSFI,
SfxDialogLibraryContainer* pParent )
: SfxLibrary( _rModifiable, getCppuType( (const Reference< XInputStreamProvider > *)0 ), xMSF, xSFI )
, m_pParent( pParent )
@@ -551,10 +551,10 @@ SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable,
SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable,
const ::rtl::OUString& aName,
- const Reference< XMultiServiceFactory >& xMSF,
- const Reference< XSimpleFileAccess >& xSFI,
- const OUString& aLibInfoFileURL,
- const OUString& aStorageURL,
+ const Reference< XMultiServiceFactory >& xMSF,
+ const Reference< XSimpleFileAccess >& xSFI,
+ const OUString& aLibInfoFileURL,
+ const OUString& aStorageURL,
sal_Bool ReadOnly,
SfxDialogLibraryContainer* pParent )
: SfxLibrary( _rModifiable, getCppuType( (const Reference< XInputStreamProvider > *)0 ),
@@ -603,7 +603,7 @@ void SfxDialogLibrary::storeResourcesAsURL
}
}
-void SfxDialogLibrary::storeResourcesToURL( const OUString& URL,
+void SfxDialogLibrary::storeResourcesToURL( const OUString& URL,
const Reference< task::XInteractionHandler >& xHandler )
{
OUString aComment = aResourceFileCommentBase;
@@ -631,7 +631,7 @@ void SfxDialogLibrary::storeResourcesToStorage( const ::com::sun::star::uno::Ref
// XStringResourceSupplier
-Reference< resource::XStringResourceResolver >
+Reference< resource::XStringResourceResolver >
SAL_CALL SfxDialogLibrary::getStringResource( ) throw (RuntimeException)
{
if( !m_xStringResourcePersistence.is() )
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index c15d937f9b..71d1dc9e55 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
#include <unotools/streamwrap.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/ehdl.hxx>
#include <basic/basmgr.hxx>
@@ -101,7 +101,7 @@ using namespace osl;
using com::sun::star::uno::Reference;
-// #i34411: Flag for error handling during migration
+// #i34411: Flag for error handling during migration
static bool GbMigrationSuppressErrors = false;
//============================================================================
@@ -940,7 +940,17 @@ sal_Bool SfxLibraryContainer::init_Impl(
// #110009
if( !bStorage && meInitMode == DEFAULT )
- implScanExtensions();
+ {
+ try
+ {
+ implScanExtensions();
+ }
+ catch( uno::Exception& )
+ {
+ // TODO: error handling?
+ OSL_ASSERT( "Cannot access extensions!" );
+ }
+ }
// #110009 Preload?
{
@@ -1271,28 +1281,28 @@ SfxLibrary* SfxLibraryContainer::getImplLib( const String& rLibraryName )
// Storing with password encryption
// Empty implementation, avoids unneccesary implementation in dlgcont.cxx
-sal_Bool SfxLibraryContainer::implStorePasswordLibrary(
+sal_Bool SfxLibraryContainer::implStorePasswordLibrary(
SfxLibrary*,
- const OUString&,
+ const OUString&,
const uno::Reference< embed::XStorage >&, const uno::Reference< task::XInteractionHandler >& )
{
return sal_False;
}
-sal_Bool SfxLibraryContainer::implStorePasswordLibrary(
- SfxLibrary* /*pLib*/,
- const ::rtl::OUString& /*aName*/,
+sal_Bool SfxLibraryContainer::implStorePasswordLibrary(
+ SfxLibrary* /*pLib*/,
+ const ::rtl::OUString& /*aName*/,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& /*xStorage*/,
- const ::rtl::OUString& /*aTargetURL*/,
+ const ::rtl::OUString& /*aTargetURL*/,
const Reference< XSimpleFileAccess > /*xToUseSFI*/,
const uno::Reference< task::XInteractionHandler >& )
{
return sal_False;
}
-sal_Bool SfxLibraryContainer::implLoadPasswordLibrary(
- SfxLibrary* /*pLib*/,
- const OUString& /*Name*/,
+sal_Bool SfxLibraryContainer::implLoadPasswordLibrary(
+ SfxLibrary* /*pLib*/,
+ const OUString& /*Name*/,
sal_Bool /*bVerifyPasswordOnly*/ )
throw(WrappedTargetException, RuntimeException)
{
@@ -2000,7 +2010,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
Reference< XActiveDataSource > xSource( xHandler, UNO_QUERY );
xSource->setOutputStream( xOut );
- try
+ try
{
xmlscript::exportLibraryContainer( xHandler, pLibArray );
if ( bStorage )
@@ -2602,7 +2612,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::verifyLibraryPassword
throw IllegalArgumentException();
}
-void SAL_CALL SfxLibraryContainer::changeLibraryPassword(
+void SAL_CALL SfxLibraryContainer::changeLibraryPassword(
const OUString&, const OUString&, const OUString& )
throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
{
@@ -2627,8 +2637,8 @@ void SAL_CALL SfxLibraryContainer::removeContainerListener( const Reference< XCo
}
// Methods XLibraryContainerExport
-void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OUString& URL,
- const Reference< XInteractionHandler >& Handler )
+void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OUString& URL,
+ const Reference< XInteractionHandler >& Handler )
throw ( uno::Exception, NoSuchElementException, RuntimeException)
{
LibraryContainerMethodGuard aGuard( *this );
@@ -3051,7 +3061,7 @@ rtl::OUString ScriptExtensionIterator::nextBasicOrDialogLibrary( bool& rbPureDia
case SHARED_EXTENSIONS:
{
- Reference< deployment::XPackage > xScriptPackage =
+ Reference< deployment::XPackage > xScriptPackage =
implGetNextSharedScriptPackage( rbPureDialogLib );
if( !xScriptPackage.is() )
break;
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 2d7d8e8fc2..c744e6bc2f 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -58,7 +58,7 @@
#include <tools/urlobj.hxx>
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/ehdl.hxx>
#include <basic/basmgr.hxx>
@@ -162,7 +162,7 @@ SfxLibrary* SfxScriptLibraryContainer::implCreateLibrary( const OUString& aName
}
SfxLibrary* SfxScriptLibraryContainer::implCreateLibraryLink
- ( const OUString& aName, const OUString& aLibInfoFileURL,
+ ( const OUString& aName, const OUString& aLibInfoFileURL,
const OUString& StorageURL, sal_Bool ReadOnly )
{
(void)aName; // Only needed for SfxDialogLibrary
@@ -495,7 +495,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
return implStorePasswordLibrary( pLib, aName, xStorage, aDummyLocation, xDummySFA, xHandler );
}
-sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName,
+sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
const ::rtl::OUString& aTargetURL, const Reference< XSimpleFileAccess > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler )
{
@@ -506,7 +506,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
if ( !pBasicMgr )
return sal_False;
- // Only need to handle the export case here,
+ // Only need to handle the export case here,
// save/saveas etc are handled in sfxbasemodel::storeSelf &
// sfxbasemodel::impl_store
uno::Sequence<rtl::OUString> aNames;
@@ -516,7 +516,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
{
ModuleSizeExceeded* pReq = new ModuleSizeExceeded( aNames );
uno::Reference< task::XInteractionRequest > xReq( pReq );
- xHandler->handle( xReq );
+ xHandler->handle( xReq );
if ( pReq->isAbort() )
throw util::VetoException();
}
@@ -1136,7 +1136,7 @@ void SfxScriptLibrary::storeResources( void )
// No resources
}
-void SfxScriptLibrary::storeResourcesToURL( const ::rtl::OUString& URL,
+void SfxScriptLibrary::storeResourcesToURL( const ::rtl::OUString& URL,
const Reference< task::XInteractionHandler >& Handler )
{
(void)URL;
diff --git a/configmgr/qa/unit/common.hxx b/configmgr/qa/unit/common.hxx
index f686a43aac..7d5be65928 100644
--- a/configmgr/qa/unit/common.hxx
+++ b/configmgr/qa/unit/common.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "cppuhelper/component_context.hxx"
#include "cppuhelper/servicefactory.hxx"
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "osl/file.hxx"
#include "osl/thread.h"
#include "osl/process.h"
@@ -77,7 +77,7 @@ public:
// init
virtual void setUp();
virtual void tearDown();
-
+
// helpers
void normalizePathKey (rtl::OString &rPath, rtl::OString &rKey);
css::uno::Reference< css::uno::XInterface > createView(const sal_Char *pNodepath, bool bUpdate);
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index a6a79ebdd0..aededf799d 100644
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@ DLLPRE = # no leading "lib" on .so files
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/performance.obj $(SLO)$/threading.obj $(SLO)$/ubootstrap.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB)
SHL1VERSIONMAP = export.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
diff --git a/configmgr/qa/unit/threading.cxx b/configmgr/qa/unit/threading.cxx
index b04f7c3550..68baee1c68 100644
--- a/configmgr/qa/unit/threading.cxx
+++ b/configmgr/qa/unit/threading.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ class KeyTester : public osl::Thread
virtual ~KeyTester ()
{
}
- virtual void run ()
+ virtual void SAL_CALL run ()
{
testIteration();
while (!m_pCond->check())
@@ -96,7 +96,7 @@ class KeyWriter : public KeyTester
static const char *options[] = { "fish", "chips", "kippers", "bloaters" };
// fprintf (stderr, "set key %d\n",
// (int) osl_getThreadIdentifier(NULL));
- m_pTest->setKey (m_aPath, rtl::OUString::createFromAscii (m_aKey),
+ m_pTest->setKey (m_aPath, rtl::OUString::createFromAscii (m_aKey),
css::uno::makeAny (rtl::OUString::createFromAscii(options[(curOpt++ & 3)])));
} CATCH_FAIL ("setting keys")
}
@@ -156,7 +156,7 @@ void Test::threadTests()
}
}
stop.set();
-
+
for (i = 0; i < numReaders; i++) {
pReaders[i]->join();
delete pReaders[i];
@@ -170,7 +170,7 @@ void Test::threadTests()
}
class RecursiveListener : public cppu::WeakImplHelper1< css::beans::XPropertyChangeListener >
-{
+{
public:
sal_Int32 m_nRecurse;
css::uno::Reference< css::beans::XPropertySet > mxPropSet;
@@ -188,7 +188,7 @@ public:
{
mxPropSet = css::uno::Reference< css::beans::XPropertySet > (
pTest->createView (pPath, true), css::uno::UNO_QUERY_THROW );
-
+
CPPUNIT_ASSERT_MESSAGE ("is prop set", mxPropSet.is());
mxPropSet->addPropertyChangeListener (rtl::OUString::createFromAscii (m_pKey),
css::uno::Reference<css::beans::XPropertyChangeListener>(this));
diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index 6fdbae4389..8bcfa0eaed 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -44,9 +44,15 @@
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/sdb/XColumn.hpp>
namespace connectivity
{
+ namespace detail
+ {
+ class IValueSource;
+ }
+
class OOO_DLLPUBLIC_DBTOOLS ORowSetValue
{
union
@@ -361,6 +367,12 @@ namespace connectivity
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow);
void fill(const ::com::sun::star::uno::Any& _rValue);
+
+ void fill( const sal_Int32 _nType,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn );
+
+ private:
+ void impl_fill( const sal_Int32 _nType, sal_Bool _bNullable, const detail::IValueSource& _rValueSource );
};
/// ORowSetValueDecorator decorates a ORowSetValue so the value is "refcounted"
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 20cb27644e..87e1791ba7 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn connectivity : l10n comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL
+cn connectivity : shell l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss 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
diff --git a/connectivity/qa/connectivity/tools/DbaseDatabase.java b/connectivity/qa/connectivity/tools/DbaseDatabase.java
index be41dfae39..c97d7804df 100755..100644
--- a/connectivity/qa/connectivity/tools/DbaseDatabase.java
+++ b/connectivity/qa/connectivity/tools/DbaseDatabase.java
@@ -65,7 +65,8 @@ public class DbaseDatabase extends AbstractDatabase
private void createDBDocument() throws Exception
{
final File documentFile = File.createTempFile("dbase", ".odb");
- documentFile.deleteOnExit();
+ if ( documentFile.exists() )
+ documentFile.delete();
final File subPath = new File(documentFile.getParent() + File.separator + documentFile.getName().replaceAll(".odb", "") + File.separator );
subPath.mkdir();
//subPath.deleteOnExit();
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index b1af0c118e..036edd9a6a 100644
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -71,7 +71,8 @@ public class HsqlDatabase extends AbstractDatabase
private void createDBDocument() throws Exception
{
final File documentFile = File.createTempFile("testdb", ".odb");
- documentFile.deleteOnExit();
+ if ( documentFile.exists() )
+ documentFile.delete();
m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile);
m_databaseDocument = (XOfficeDatabaseDocument) UnoRuntime.queryInterface(
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 37e91d22c8..3068acde8b 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -40,13 +40,16 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/logfile.hxx>
-using namespace connectivity;
-using namespace dbtools;
+using namespace ::dbtools;
using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::io;
+namespace connectivity
+{
+
namespace {
static sal_Bool isStorageCompatible(sal_Int32 _eType1, sal_Int32 _eType2)
{
@@ -1809,6 +1812,107 @@ void ORowSetValue::setSigned(sal_Bool _bMod)
}
}
}
+
+// -----------------------------------------------------------------------------
+namespace detail
+{
+ class SAL_NO_VTABLE IValueSource
+ {
+ public:
+ virtual ::rtl::OUString getString() const = 0;
+ virtual sal_Bool getBoolean() const = 0;
+ virtual sal_Int8 getByte() const = 0;
+ virtual sal_Int16 getShort() const = 0;
+ virtual sal_Int32 getInt() const = 0;
+ virtual sal_Int64 getLong() const = 0;
+ virtual float getFloat() const = 0;
+ virtual double getDouble() const = 0;
+ virtual Date getDate() const = 0;
+ virtual Time getTime() const = 0;
+ virtual DateTime getTimestamp() const = 0;
+ virtual Sequence< sal_Int8 > getBytes() const = 0;
+ virtual Reference< XInputStream > getBinaryStream() const = 0;
+ virtual Reference< XInputStream > getCharacterStream() const = 0;
+ virtual sal_Bool wasNull() const = 0;
+
+ virtual ~IValueSource() { }
+ };
+
+ class RowValue : public IValueSource
+ {
+ public:
+ RowValue( const Reference< XRow >& _xRow, const sal_Int32 _nPos )
+ :m_xRow( _xRow )
+ ,m_nPos( _nPos )
+ {
+ }
+
+ // IValueSource
+ virtual ::rtl::OUString getString() const { return m_xRow->getString( m_nPos ); };
+ virtual sal_Bool getBoolean() const { return m_xRow->getBoolean( m_nPos ); };
+ virtual sal_Int8 getByte() const { return m_xRow->getByte( m_nPos ); };
+ virtual sal_Int16 getShort() const { return m_xRow->getShort( m_nPos ); }
+ virtual sal_Int32 getInt() const { return m_xRow->getInt( m_nPos ); }
+ virtual sal_Int64 getLong() const { return m_xRow->getLong( m_nPos ); }
+ virtual float getFloat() const { return m_xRow->getFloat( m_nPos ); };
+ virtual double getDouble() const { return m_xRow->getDouble( m_nPos ); };
+ virtual Date getDate() const { return m_xRow->getDate( m_nPos ); };
+ virtual Time getTime() const { return m_xRow->getTime( m_nPos ); };
+ virtual DateTime getTimestamp() const { return m_xRow->getTimestamp( m_nPos ); };
+ virtual Sequence< sal_Int8 > getBytes() const { return m_xRow->getBytes( m_nPos ); };
+ virtual Reference< XInputStream > getBinaryStream() const { return m_xRow->getBinaryStream( m_nPos ); };
+ virtual Reference< XInputStream > getCharacterStream() const { return m_xRow->getCharacterStream( m_nPos ); };
+ virtual sal_Bool wasNull() const { return m_xRow->wasNull( ); };
+
+ private:
+ const Reference< XRow > m_xRow;
+ const sal_Int32 m_nPos;
+ };
+
+ class ColumnValue : public IValueSource
+ {
+ public:
+ ColumnValue( const Reference< XColumn >& _rxColumn )
+ :m_xColumn( _rxColumn )
+ {
+ }
+
+ // IValueSource
+ virtual ::rtl::OUString getString() const { return m_xColumn->getString(); };
+ virtual sal_Bool getBoolean() const { return m_xColumn->getBoolean(); };
+ virtual sal_Int8 getByte() const { return m_xColumn->getByte(); };
+ virtual sal_Int16 getShort() const { return m_xColumn->getShort(); }
+ virtual sal_Int32 getInt() const { return m_xColumn->getInt(); }
+ virtual sal_Int64 getLong() const { return m_xColumn->getLong(); }
+ virtual float getFloat() const { return m_xColumn->getFloat(); };
+ virtual double getDouble() const { return m_xColumn->getDouble(); };
+ virtual Date getDate() const { return m_xColumn->getDate(); };
+ virtual Time getTime() const { return m_xColumn->getTime(); };
+ virtual DateTime getTimestamp() const { return m_xColumn->getTimestamp(); };
+ virtual Sequence< sal_Int8 > getBytes() const { return m_xColumn->getBytes(); };
+ virtual Reference< XInputStream > getBinaryStream() const { return m_xColumn->getBinaryStream(); };
+ virtual Reference< XInputStream > getCharacterStream() const { return m_xColumn->getCharacterStream(); };
+ virtual sal_Bool wasNull() const { return m_xColumn->wasNull( ); };
+
+ private:
+ const Reference< XColumn > m_xColumn;
+ };
+}
+
+// -----------------------------------------------------------------------------
+void ORowSetValue::fill( const sal_Int32 _nType, const Reference< XColumn >& _rxColumn )
+{
+ detail::ColumnValue aColumnValue( _rxColumn );
+ impl_fill( _nType, sal_True, aColumnValue );
+}
+
+// -----------------------------------------------------------------------------
+void ORowSetValue::fill( sal_Int32 _nPos, sal_Int32 _nType, sal_Bool _bNullable, const Reference< XRow>& _xRow )
+{
+ detail::RowValue aRowValue( _xRow, _nPos );
+ impl_fill( _nType, _bNullable, aRowValue );
+}
+
// -----------------------------------------------------------------------------
void ORowSetValue::fill(sal_Int32 _nPos,
sal_Int32 _nType,
@@ -1819,10 +1923,8 @@ void ORowSetValue::fill(sal_Int32 _nPos,
}
// -----------------------------------------------------------------------------
-void ORowSetValue::fill(sal_Int32 _nPos,
- sal_Int32 _nType,
- sal_Bool _bNullable,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow)
+void ORowSetValue::impl_fill( const sal_Int32 _nType, sal_Bool _bNullable, const detail::IValueSource& _rValueSource )
+
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::fill (2)" );
sal_Bool bReadData = sal_True;
@@ -1833,63 +1935,63 @@ void ORowSetValue::fill(sal_Int32 _nPos,
case DataType::DECIMAL:
case DataType::NUMERIC:
case DataType::LONGVARCHAR:
- (*this) = _xRow->getString(_nPos);
+ (*this) = _rValueSource.getString();
break;
case DataType::BIGINT:
if ( isSigned() )
- (*this) = _xRow->getLong(_nPos);
+ (*this) = _rValueSource.getLong();
else
- (*this) = _xRow->getString(_nPos);
+ (*this) = _rValueSource.getString();
break;
case DataType::FLOAT:
- (*this) = _xRow->getFloat(_nPos);
+ (*this) = _rValueSource.getFloat();
break;
case DataType::DOUBLE:
case DataType::REAL:
- (*this) = _xRow->getDouble(_nPos);
+ (*this) = _rValueSource.getDouble();
break;
case DataType::DATE:
- (*this) = _xRow->getDate(_nPos);
+ (*this) = _rValueSource.getDate();
break;
case DataType::TIME:
- (*this) = _xRow->getTime(_nPos);
+ (*this) = _rValueSource.getTime();
break;
case DataType::TIMESTAMP:
- (*this) = _xRow->getTimestamp(_nPos);
+ (*this) = _rValueSource.getTimestamp();
break;
case DataType::BINARY:
case DataType::VARBINARY:
case DataType::LONGVARBINARY:
- (*this) = _xRow->getBytes(_nPos);
+ (*this) = _rValueSource.getBytes();
break;
case DataType::BIT:
case DataType::BOOLEAN:
- (*this) = _xRow->getBoolean(_nPos);
+ (*this) = _rValueSource.getBoolean();
break;
case DataType::TINYINT:
if ( isSigned() )
- (*this) = _xRow->getByte(_nPos);
+ (*this) = _rValueSource.getByte();
else
- (*this) = _xRow->getShort(_nPos);
+ (*this) = _rValueSource.getShort();
break;
case DataType::SMALLINT:
if ( isSigned() )
- (*this) = _xRow->getShort(_nPos);
+ (*this) = _rValueSource.getShort();
else
- (*this) = _xRow->getInt(_nPos);
+ (*this) = _rValueSource.getInt();
break;
case DataType::INTEGER:
if ( isSigned() )
- (*this) = _xRow->getInt(_nPos);
+ (*this) = _rValueSource.getInt();
else
- (*this) = _xRow->getLong(_nPos);
+ (*this) = _rValueSource.getLong();
break;
case DataType::CLOB:
- (*this) = ::com::sun::star::uno::makeAny(_xRow->getCharacterStream(_nPos));
+ (*this) = ::com::sun::star::uno::makeAny(_rValueSource.getCharacterStream());
setTypeKind(DataType::CLOB);
break;
case DataType::BLOB:
- (*this) = ::com::sun::star::uno::makeAny(_xRow->getBinaryStream(_nPos));
+ (*this) = ::com::sun::star::uno::makeAny(_rValueSource.getBinaryStream());
setTypeKind(DataType::BLOB);
break;
default:
@@ -1897,7 +1999,7 @@ void ORowSetValue::fill(sal_Int32 _nPos,
bReadData = false;
break;
}
- if ( bReadData && _bNullable && _xRow->wasNull() )
+ if ( bReadData && _bNullable && _rValueSource.wasNull() )
setNull();
setTypeKind(_nType);
}
@@ -2043,3 +2145,5 @@ void ORowSetValue::fill(const Any& _rValue)
break;
}
}
+
+} // namespace connectivity
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 1a763b0c10..0fb5336bba 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -144,7 +144,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ
::dbtools::throwGenericSQLException(sError,*this);
}
}
-
+
+ ::connectivity::ODatabaseMetaDataResultSet::ORows aTypeInfoRows;
while( xRet->next() )
{
::connectivity::ODatabaseMetaDataResultSet::ORow aRow;
@@ -169,8 +170,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ
else
++aIter;
}
- m_aTypeInfoRows.push_back(aRow);
+ aTypeInfoRows.push_back(aRow);
}
+ m_aTypeInfoRows = aTypeInfoRows;
}
}
::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index c809892cc4..58811abc5e 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -44,7 +44,7 @@
#include <com/sun/star/sdbc/DataType.hpp>
/** === end UNO includes === **/
-#include <svtools/syslocale.hxx>
+//#include <unotools/syslocale.hxx>
#include <tools/diagnose_ex.h>
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index a515c9ddb3..b4a1a71410 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,7 @@
#include <tools/urlobj.hxx>
#include "calc/CPreparedStatement.hxx"
#include "calc/CStatement.hxx"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <connectivity/dbexception.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/logfile.hxx>
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index f108815a10..84d7054c71 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -50,7 +50,7 @@
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/text/XText.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
#include "calc/CConnection.hxx"
#include "calc/CColumns.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
@@ -58,7 +58,7 @@
#include <osl/thread.h>
#include <tools/config.hxx>
#include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <comphelper/extract.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index 620bcd6a8e..f4019564ed 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -73,6 +73,7 @@ SHL1STDLIBS=\
$(VOSLIB) \
$(SVLLIB) \
$(TOOLSLIB) \
+ $(UNOTOOLSLIB) \
$(SALLIB) \
$(DBTOOLSLIB) \
$(DBFILELIB) \
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 216dc2d9fc..171f10ccdb 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
#include "dbase/DConnection.hxx"
#include "dbase/DColumns.hxx"
#include <osl/thread.h>
@@ -44,8 +44,8 @@
#include "dbase/DIndexes.hxx"
//#include "file/FDriver.hxx"
#include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
-#include <svtools/syslocale.hxx>
+#include <svl/zforlist.hxx>
+#include <unotools/syslocale.hxx>
#include <rtl/math.hxx>
#include <stdio.h> //sprintf
#include <ucbhelper/content.hxx>
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index 577d950ca6..91dc6eb310 100644
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -36,13 +36,13 @@
#include "LFolderList.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
#include "LConnection.hxx"
#include "LColumns.hxx"
#include <osl/thread.h>
#include <tools/config.hxx>
#include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <stdio.h> //sprintf
#include <comphelper/extract.hxx>
@@ -59,7 +59,7 @@
#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX
#include "LDebug.hxx"
#endif
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
using namespace ::comphelper;
using namespace connectivity;
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index 47e8368694..959980492e 100644
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -39,13 +39,13 @@
#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_
//#include <com/sun/star/sdbc/XRow.hpp>
#endif
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
#include "LConnection.hxx"
#include "LColumns.hxx"
#include <osl/thread.h>
#include <tools/config.hxx>
#include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <stdio.h> //sprintf
#include <comphelper/extract.hxx>
@@ -56,7 +56,7 @@
#include <i18npool/mslangid.hxx>
#include "connectivity/dbconversion.hxx"
#include <comphelper/types.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX
#include "LDebug.hxx"
#endif
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index c7e6a1617d..b227b0c232 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -54,7 +54,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <rtl/string.hxx>
#include <tools/diagnose_ex.h>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <unotools/intlwrapper.hxx>
#include <cstring>
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index e9bb9fdc4d..6d7ca92fbd 100644
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -77,9 +77,7 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(VOSLIB) \
$(SVLLIB) \
- $(VCLLIB) \
$(TOOLSLIB) \
- $(SVTOOLLIB) \
$(UNOTOOLSLIB) \
$(UCBHELPERLIB) \
$(SALLIB) \
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 1894e34d91..5ec55bd4ee 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@
#include <com/sun/star/ucb/XContentIdentifier.hpp>
#include <tools/urlobj.hxx>
#include "file/FCatalog.hxx"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <ucbhelper/content.hxx>
#include <connectivity/dbcharset.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 1793cf58e3..f970646455 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -34,8 +34,8 @@
#include <osl/diagnose.h>
#include "connectivity/sqlparse.hxx"
#include <i18npool/mslangid.hxx>
-#include <vcl/svapp.hxx>
#include <tools/debug.hxx>
+#include <tools/string.hxx>
#include "TConnection.hxx"
#include <com/sun/star/sdb/SQLFilterOperator.hpp>
#include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index 2b78034b2d..e35c3c0caf 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -152,7 +152,6 @@ namespace connectivity
// Vorzeitiger Abbruch der Schleife moeglich, denn
// wir haben, was wir wollten.
nStartPos = i+1;
- *pData = 0;
break;
}
else
@@ -161,6 +160,7 @@ namespace connectivity
}
}
} // for( xub_StrLen i = nStartPos; i < nLen; ++i )
+ *pData = 0;
_rStr.ReleaseBufferAccess(xub_StrLen(pData - pStart));
}
}
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 7fbc472586..eac86a5a41 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -36,13 +36,13 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
-#include <svtools/converter.hxx>
+#include <svl/converter.hxx>
#include "flat/EConnection.hxx"
#include "flat/EColumns.hxx"
#include <osl/thread.h>
#include <tools/config.hxx>
#include <comphelper/sequence.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <rtl/math.hxx>
#include <stdio.h> //sprintf
#include <comphelper/extract.hxx>
@@ -54,7 +54,7 @@
#include "connectivity/dbconversion.hxx"
#include <comphelper/types.hxx>
#include "file/quotedstring.hxx"
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <rtl/logfile.hxx>
using namespace ::comphelper;
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index d044eab279..071c8c0cc9 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -84,7 +84,7 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(VOSLIB) \
$(TOOLSLIB) \
- $(SVTOOLLIB) \
+ $(SVLLIB) \
$(UNOTOOLSLIB) \
$(SALLIB) \
$(DBTOOLSLIB) \
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 243aa6b802..e00cb38da2 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -55,6 +55,7 @@
#include <connectivity/dbexception.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <unotools/confignode.hxx>
+#include <unotools/ucbstreamhelper.hxx>
#include "resource/hsqldb_res.hrc"
#include "resource/sharedresources.hxx"
@@ -70,6 +71,8 @@ namespace connectivity
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::embed;
+ using namespace ::com::sun::star::io;
+ using namespace ::com::sun::star::task;
using namespace ::com::sun::star::reflection;
namespace hsqldb
@@ -259,6 +262,50 @@ namespace connectivity
makeAny( lcl_getPermittedJavaMethods_nothrow( m_xFactory ) )
);
aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) );
+
+ const ::rtl::OUString sProperties( RTL_CONSTASCII_USTRINGPARAM( "properties" ) );
+ ::rtl::OUString sMessage;
+ try
+ {
+ if ( !bIsNewDatabase && xStorage->isStreamElement(sProperties) )
+ {
+ Reference<XStream > xStream = xStorage->openStreamElement(sProperties,ElementModes::READ);
+ if ( xStream.is() )
+ {
+ ::std::auto_ptr<SvStream> pStream( ::utl::UcbStreamHelper::CreateStream(xStream) );
+ if ( pStream.get() )
+ {
+ ByteString sLine;
+ while ( pStream->ReadLine(sLine) )
+ {
+ if ( sLine.Equals("version=",0,sizeof("version=")-1) )
+ {
+ 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 ) )
+ {
+ ::connectivity::SharedResources aResources;
+ sMessage = aResources.getResourceString(STR_ERROR_NEW_VERSION);
+ }
+ break;
+ }
+ }
+ }
+ } // if ( xStream.is() )
+ ::comphelper::disposeComponent(xStream);
+ }
+ }
+ catch(Exception&)
+ {
+ }
+ if ( sMessage.getLength() )
+ {
+ ::dbtools::throwGenericSQLException(sMessage ,*this);
+ }
// readonly?
Reference<XPropertySet> xProp(xStorage,UNO_QUERY);
diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk
index 9ed5acb17d..c61e4b297b 100644
--- a/connectivity/source/drivers/hsqldb/makefile.mk
+++ b/connectivity/source/drivers/hsqldb/makefile.mk
@@ -102,6 +102,7 @@ SHL1STDLIBS=\
$(DBTOOLSLIB) \
$(JVMFWKLIB) \
$(COMPHELPERLIB) \
+ $(TOOLSLIB) \
$(UNOTOOLSLIB)
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index ac381db10b..94efe2ff8d 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -39,7 +39,7 @@
#include "KCatalog.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/TransactionIsolation.hpp>
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
using namespace connectivity::kab;
using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 813e79081a..f36ad59a41 100644
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
@@ -33,7 +33,7 @@
#include "KDEInit.h"
#include <osl/diagnose.h>
#include <osl/process.h>
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
namespace connectivity
{
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index 3d40b25951..2d0ee99d4f 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -34,7 +34,7 @@
#include "KDatabaseMetaData.hxx"
#include "kfields.hxx"
#include "KDEInit.h"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
#include "FDatabaseMetaDataResultSet.hxx"
#include "OTypeInfo.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index c0d7e2c9a6..151d8606a4 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -33,7 +33,7 @@
#include "KStatement.hxx"
#include "KResultSetMetaData.hxx"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdbc/XColumnLocate.hpp>
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index d22c09ce96..bc7700adfa 100644
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
@@ -34,7 +34,7 @@
#ifndef _COMPHELPER_TYPES_H_
#include <comphelper/types.hxx>
#endif
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
#include <connectivity/dbexception.hxx>
namespace connectivity
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index e6e3efda73..5c65ea5114 100644
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
@@ -31,7 +31,7 @@
#ifndef _CONNECTIVITY_KAB_FIELDS_HXX_
#define _CONNECTIVITY_KAB_FIELDS_HXX_
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
#include <connectivity/dbexception.hxx>
#include <rtl/ustring.hxx>
diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx
index b5b2b6acf3..a990e67f99 100644
--- a/connectivity/source/drivers/kab/korder.hxx
+++ b/connectivity/source/drivers/kab/korder.hxx
@@ -32,7 +32,7 @@
#define _CONNECTIVITY_KAB_ORDER_HXX_
#include "rtl/ustring.hxx"
-#include <vcl/kde_headers.h>
+#include <shell/kde_headers.h>
#include <vector>
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index 9b4b05868c..00f76ddeb8 100644
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -30,37 +30,35 @@
#*************************************************************************
CALL_CDECL=TRUE
-#mozilla specific stuff.
-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
-#End of mozilla specific stuff.
-
PRJ=..$/..$/..$/..
PRJINC=..$/..$/..
PRJNAME=connectivity
TARGET=mozbootstrap
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
.IF "$(OS)" == "OS2"
all:
@echo " Not building under OS/2"
.ENDIF
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
+USE_DEFFILE=TRUE
+ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
+
+# --- begin of mozilla specific stuff
+MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+# --- end of mozilla specific stuff
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/version.mk
+.INCLUDE : ../makefile_mozab.mk
+
+INCPRE += -I../mozillasrc
-#mozilla specific stuff.
# --- Files -------------------------------------
SLOFILES += \
@@ -93,95 +91,6 @@ SLOFILES += \
$(SLO)$/MNSProfileDirServiceProvider.obj
.ENDIF
-CDEFS += -DMOZILLA_INTERNAL_API
-
-.IF "$(GUI)"=="UNX"
-.IF "$(COMNAME)"=="sunpro5"
-CFLAGS += -features=tmplife
-#This flag is needed to build mozilla 1.7 code
-.ENDIF # "$(COMNAME)"=="sunpro5"
-.ENDIF
-
-MOZINC = . -I.. -I..$/mozillasrc -I$(MOZ_INC) -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \
- -I$(MOZ_INC)$/string -I$(MOZ_INC)$/rdf -I$(MOZ_INC)$/msgbase \
- -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/uconv\
- -I$(MOZ_INC)$/xpcom_obsolete -I$(MOZ_INC)$/content
-
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)" == "GCC"
-INCPOST += $(MOZINC)
-CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \
- -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
- -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
- -DNS_MT_SUPPORTED -DNETLIB_THREAD \
- -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
- -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
- -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
- -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL
-CFLAGSCXX += \
- -fno-rtti -Wall -Wconversion -Wpointer-arith \
- -Wcast-align -Woverloaded-virtual -Wsynth \
- -Wno-long-long
-.ELSE
-.IF "$(DBG_LEVEL)" == "0"
-INCPRE += $(MOZINC)
-CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \
- -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
- -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
- -DDMSVC4 -DNS_MT_SUPPORTED -DNETLIB_THREAD \
- -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
- -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
- -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
- -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL \
- -UDEBUG
-CFLAGS += -GR- -W3 -Gy -MD -UDEBUG
-.ELSE
-INCPRE += $(MOZINC)
-CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \
- -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
- -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
- -DDMSVC4 -DDEVELOPER_DEBUG -DNS_MT_SUPPORTED -DNETLIB_THREAD \
- -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
- -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
- -DDEBUG_Administrator -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
- -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL \
- -UDEBUG
-CFLAGS += -Zi -GR- -W3 -Gy -MDd -UDEBUG
-.IF "$(CCNUMVER)" >= "001399999999"
-CDEFS += -D_STL_NOFORCE_MANIFEST
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-.IF "$(GUI)" == "UNX"
-INCPOST += $(MOZINC)
-CDEFS+= -DMOZILLA_CLIENT \
- -DXP_UNIX
-.IF "$(OS)" == "LINUX"
-CFLAGS += -fPIC -g
-CDEFS+= -DOJI
-
-CFLAGSCXX += \
- -fno-rtti -Wconversion -Wpointer-arith \
- -Wcast-align -Woverloaded-virtual -Wsynth \
- -Wno-long-long -pthread
-CDEFS += -DTRACING
-.ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
-CFLAGS += -fPIC
-CFLAGSCXX += \
- -fno-rtti -Wconversion -Wpointer-arith \
- -Wcast-align -Woverloaded-virtual -Wsynth \
- -Wno-long-long -Wno-deprecated
-CDEFS += -DTRACING
-.ENDIF
-
-SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
-
-.ENDIF # MACOSX
-
# --- Targets ----------------------------------
.INCLUDE : target.mk
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 677e605096..76161dc321 100644
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -43,38 +43,28 @@ all:
@echo " see http://www.mozilla.org/issues/show_bug.cgi?id=91209"
.ENDIF
-#mozilla specific stuff.
+# --- begin of mozilla specific stuff
MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
.IF "$(OS)"=="WNT"
-.IF "$(USE_SHELL)"=="4nt"
-MOZ_EMBED_LIB := $(shell @+-dir /ba:f $(MOZ_LIB)$/embed_base_s.lib 2>NUL )
-MOZ_REG_LIB := $(shell @+-dir /ba:f $(MOZ_LIB)$/mozreg_s.lib 2>NUL )
-.ELSE #"$(USE_SHELL)"=="4nt"
-MOZ_EMBED_LIB := $(shell @-test -f $(MOZ_LIB)$/embed_base_s.lib && echo $(MOZ_LIB)$/embed_base_s.lib )
-MOZ_REG_LIB := $(shell @-test -f $(MOZ_LIB)$/mozreg_s.lib && echo $(MOZ_LIB)$/mozreg_s.lib )
-.ENDIF
+ MOZ_EMBED_LIB := $(shell @-test -f $(MOZ_LIB)$/embed_base_s.lib && echo $(MOZ_LIB)$/embed_base_s.lib )
+ MOZ_REG_LIB := $(shell @-test -f $(MOZ_LIB)$/mozreg_s.lib && echo $(MOZ_LIB)$/mozreg_s.lib )
-.IF X"$(MOZ_EMBED_LIB)"=="X"
-MOZ_EMBED_LIB := $(MOZ_LIB)$/baseembed_s.lib
-.ENDIF
-.IF X"$(MOZ_REG_LIB)" == "X"
-MOZ_REG_LIB := $(MOZ_LIB)$/mozreg.lib
-.ENDIF
-.ENDIF
+ MOZ_EMBED_LIB *:= $(MOZ_LIB)$/baseembed_s.lib
+ MOZ_REG_LIB *:= $(MOZ_LIB)$/mozreg.lib
+
+ .IF "$(COM)"=="GCC"
+ MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
+ .ELSE
+ LIB += $(MOZ_LIB)
+ MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
+ .ENDIF
-.IF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
-.ELSE
-LIB += $(MOZ_LIB)
-MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
-.ENDIF
.ELSE "$(OS)"=="WNT"
-MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
+ MOZ_LIB_XPCOM = -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
.ENDIF
-#End of mozilla specific stuff.
+# --- end of mozilla specific stuff
USE_DEFFILE=TRUE
ENABLE_EXCEPTIONS=TRUE
@@ -87,10 +77,6 @@ COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
.INCLUDE : $(PRJ)$/makefile.pmk
.INCLUDE : $(PRJ)$/version.mk
@@ -121,7 +107,6 @@ DEF1NAME= $(SHL1TARGET)
DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \
$(SLB)$/$(TARGET).lib
DEFLIB1NAME=$(TARGET)
-#DEF1EXPORTFILE= exports.dxp
# --- Files -------------------------------------
@@ -165,6 +150,7 @@ DEPOBJFILES=$(SLO2FILES)
# --- MOZAB BASE Library -----------------------------------
SHL2VERSIONMAP= $(TARGET2).map
+SHL2NOCHECK=TRUE
SHL2TARGET= $(TARGET2)$(DLLPOSTFIX)
SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\
diff --git a/connectivity/source/drivers/mozab/makefile_mozab.mk b/connectivity/source/drivers/mozab/makefile_mozab.mk
new file mode 100644
index 0000000000..28b56ec2a8
--- /dev/null
+++ b/connectivity/source/drivers/mozab/makefile_mozab.mk
@@ -0,0 +1,128 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+CDEFS += -DMOZILLA_INTERNAL_API
+
+.IF "$(GUI)"=="UNX"
+ .IF "$(COMNAME)"=="sunpro5"
+ CFLAGS += -features=tmplife
+ #This flag is needed to build mozilla 1.7 code
+ .ENDIF # "$(COMNAME)"=="sunpro5"
+.ENDIF
+
+MOZINC = . \
+ -I.. \
+ -I$(MOZ_INC) \
+ -I$(MOZ_INC)$/nspr \
+ -I$(MOZ_INC)$/xpcom \
+ -I$(MOZ_INC)$/string \
+ -I$(MOZ_INC)$/rdf \
+ -I$(MOZ_INC)$/msgbase \
+ -I$(MOZ_INC)$/addrbook \
+ -I$(MOZ_INC)$/mork \
+ -I$(MOZ_INC)$/locale \
+ -I$(MOZ_INC)$/pref \
+ -I$(MOZ_INC)$/mime \
+ -I$(MOZ_INC)$/chrome \
+ -I$(MOZ_INC)$/necko \
+ -I$(MOZ_INC)$/intl \
+ -I$(MOZ_INC)$/profile \
+ -I$(MOZ_INC)$/embed_base \
+ -I$(MOZ_INC)$/mozldap \
+ -I$(MOZ_INC)$/uconv \
+ -I$(MOZ_INC)$/xpcom_obsolete \
+ -I$(MOZ_INC)$/content
+
+.IF "$(GUI)" == "WNT"
+ CDEFS += \
+ -DMOZILLA_CLIENT \
+ -DXP_PC \
+ -DXP_WIN \
+ -DXP_WIN32 \
+ -DOJI \
+ -DWIN32 \
+ -D_X86_ \
+ -D_WINDOWS \
+ -DMOZ_XUL \
+ -DMOZ_REFLOW_PERF \
+ -DMOZ_REFLOW_PERF_DSP
+ .IF "$(COM)" == "GCC"
+ INCPOST += $(MOZINC)
+ CFLAGSCXX += \
+ -fno-rtti \
+ -Wall \
+ -Wconversion \
+ -Wpointer-arith \
+ -Wcast-align \
+ -Woverloaded-virtual \
+ -Wsynth \
+ -Wno-long-long
+ .ELSE # .IF "$(COM)" == "GCC"
+ INCPRE += $(MOZINC)
+ .IF "$(DBG_LEVEL)" != "0"
+ .IF "$(CCNUMVER)" >= "001399999999"
+ CDEFS += -D_STL_NOFORCE_MANIFEST
+ .ENDIF # .IF "$(CCNUMVER)" >= "001399999999"
+ .ENDIF # .IF "$(DBG_LEVEL)" != "0"
+ .ENDIF # .IF "$(COM)" == "GCC"
+.ENDIF # .IF "$(GUI)" == "WNT"
+
+.IF "$(GUI)" == "UNX"
+ INCPOST += $(MOZINC)
+ CDEFS+= -DMOZILLA_CLIENT \
+ -DXP_UNIX
+ .IF "$(OS)" == "LINUX"
+ CFLAGS += -fPIC -g
+ CDEFS += -DOJI
+ CFLAGSCXX += \
+ -fno-rtti \
+ -Wconversion \
+ -Wpointer-arith \
+ -Wcast-align \
+ -Woverloaded-virtual \
+ -Wsynth \
+ -Wno-long-long \
+ -pthread
+ CDEFS += -DTRACING
+ .ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
+ CFLAGS += -fPIC
+ CFLAGSCXX += \
+ -fno-rtti \
+ -Wconversion \
+ -Wpointer-arith \
+ -Wcast-align \
+ -Woverloaded-virtual \
+ -Wsynth \
+ -Wno-long-long \
+ -Wno-deprecated
+ CDEFS += -DTRACING
+ .ENDIF # "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
+
+ SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
+
+.ENDIF # "$(GUI)" == "UNX"
+
diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
index e31d4c7e41..1e5b39e0f1 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
+++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
@@ -40,16 +40,12 @@ PRJINC=..$/..$/..
PRJNAME=connectivity
TARGET=mozabsrc
+# --- Settings ----------------------------------
+
USE_DEFFILE=TRUE
ENABLE_EXCEPTIONS=TRUE
VISIBILITY_HIDDEN=TRUE
-# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
-
.INCLUDE : settings.mk
.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || "$(OS)" == "OS2"
@@ -61,8 +57,10 @@ dummy:
.INCLUDE : $(PRJ)$/version.mk
+.INCLUDE : ../makefile_mozab.mk
+
+INCPRE += -I../bootstrap
-#mozilla specific stuff.
# --- Files -------------------------------------
SLOFILES = \
@@ -74,98 +72,9 @@ SLOFILES = \
$(SLO)$/MNSMozabProxy.obj \
$(SLO)$/MNSTerminateListener.obj \
$(SLO)$/MLdapAttributeMap.obj \
-
-
-CDEFS += -DMOZILLA_INTERNAL_API
-.IF "$(GUI)"=="UNX"
-.IF "$(COMNAME)"=="sunpro5"
-CFLAGS += -features=tmplife
-#This flag is needed to build mozilla 1.7 code
-.ENDIF # "$(COMNAME)"=="sunpro5"
.ENDIF
-MOZINC = . -I.. -I..$/bootstrap -I$(MOZ_INC) -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \
- -I$(MOZ_INC)$/string -I$(MOZ_INC)$/rdf -I$(MOZ_INC)$/msgbase \
- -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
- -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
- -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/uconv\
- -I$(MOZ_INC)$/xpcom_obsolete -I$(MOZ_INC)$/content
-
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-INCPOST += $(MOZINC)
-CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \
- -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
- -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
- -DNS_MT_SUPPORTED -DNETLIB_THREAD \
- -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
- -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
- -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
- -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL
-CFLAGSCXX += \
- -fno-rtti -Wall -Wconversion -Wpointer-arith \
- -Wcast-align -Woverloaded-virtual -Wsynth \
- -Wno-long-long
-.ELSE
-.IF "$(DBG_LEVEL)" == "0"
-INCPRE += $(MOZINC)
-CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \
- -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
- -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
- -DDMSVC4 -DNS_MT_SUPPORTED -DNETLIB_THREAD \
- -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
- -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
- -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
- -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL \
- -UDEBUG
-CFLAGS += -GR- -W3 -Gy -MD -UDEBUG
-.ELSE
-INCPRE += $(MOZINC)
-CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \
- -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
- -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
- -DDMSVC4 -DDEVELOPER_DEBUG -DNS_MT_SUPPORTED -DNETLIB_THREAD \
- -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
- -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
- -DDEBUG_Administrator -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
- -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL \
- -UDEBUG
-CFLAGS += -Zi -GR- -W3 -Gy -MDd -UDEBUG
-.IF "$(CCNUMVER)" >= "001399999999"
-CDEFS += -D_STL_NOFORCE_MANIFEST
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-.IF "$(GUI)" == "UNX"
-INCPOST += $(MOZINC)
-CDEFS+= -DMOZILLA_CLIENT \
- -DXP_UNIX
-.IF "$(OS)" == "LINUX"
-CFLAGS += -fPIC -g
-CDEFS+= -DOJI
-
-CFLAGSCXX += \
- -fno-rtti -Wconversion -Wpointer-arith \
- -Wcast-align -Woverloaded-virtual -Wsynth \
- -Wno-long-long -pthread
-CDEFS += -DTRACING
-.ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
-CFLAGS += -fPIC
-CFLAGSCXX += \
- -fno-rtti -Wconversion -Wpointer-arith \
- -Wcast-align -Woverloaded-virtual -Wsynth \
- -Wno-long-long -Wno-deprecated
-CDEFS += -DTRACING
-.ENDIF
-.ENDIF
-
-SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
-
-.ENDIF # MACOSX
-
# --- Targets ----------------------------------
.INCLUDE : target.mk
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc
index a56fea79e8..e649cd9786 100644
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ b/connectivity/source/inc/resource/hsqldb_res.hrc
@@ -44,6 +44,7 @@
#define STR_NO_TABLE_EDITOR_DIALOG ( STR_HSQLDB_BASE + 3 )
#define STR_NO_TABLENAME ( STR_HSQLDB_BASE + 4 )
#define STR_NO_DOCUMENTUI ( STR_HSQLDB_BASE + 5 )
+#define STR_ERROR_NEW_VERSION ( STR_HSQLDB_BASE + 6 )
#endif // CONNECTIVITY_RESOURCE_HSQLDB_HRC
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index b4da3ba026..a359c64df1 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -2074,18 +2074,18 @@ void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition)
if ( SQL_ISRULE(p2ndSearch,boolean_primary) )
p2ndSearch = p2ndSearch->getChild(1);
- if ( *p2ndSearch->getChild(0) == *pSearchCondition->getChild(2-nPos) )
+ if ( *p2ndSearch->getChild(0) == *pSearchCondition->getChild(2-nPos) ) // a and ( a or b) -> a or b
{
pNewNode = pSearchCondition->removeAt((sal_uInt32)0);
replaceAndReset(pSearchCondition,pNewNode);
}
- else if ( *p2ndSearch->getChild(2) == *pSearchCondition->getChild(2-nPos) )
+ else if ( *p2ndSearch->getChild(2) == *pSearchCondition->getChild(2-nPos) ) // a and ( b or a) -> a or b
{
pNewNode = pSearchCondition->removeAt((sal_uInt32)2);
replaceAndReset(pSearchCondition,pNewNode);
}
- else if ( p2ndSearch->getByRule(OSQLParseNode::boolean_term) )
+ else if ( p2ndSearch->getByRule(OSQLParseNode::search_condition) )
{
// a and ( b or c ) -> ( a and b ) or ( a and c )
// ( b or c ) and a -> ( a and b ) or ( a and c )
@@ -2096,7 +2096,13 @@ void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition)
OSQLParseNode* p1stAnd = MakeANDNode(pA,pB);
OSQLParseNode* p2ndAnd = MakeANDNode(new OSQLParseNode(*pA),pC);
pNewNode = MakeORNode(p1stAnd,p2ndAnd);
- replaceAndReset(pSearchCondition,pNewNode);
+ OSQLParseNode* pNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
+ pNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii("("),SQL_NODE_PUNCTUATION));
+ pNode->append(pNewNode);
+ pNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii(")"),SQL_NODE_PUNCTUATION));
+ OSQLParseNode::eraseBraces(p1stAnd);
+ OSQLParseNode::eraseBraces(p2ndAnd);
+ replaceAndReset(pSearchCondition,pNode);
}
}
// a or a and b || a or b and a
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index ea3fb4e065..bfa1b29c6d 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -645,3 +645,8 @@ String STR_NO_DOCUMENTUI
{
Text [ en-US ] = "The provided DocumentUI is not allowed to be NULL.";
};
+String STR_ERROR_NEW_VERSION
+{
+ Text = "The connection could not be established. The database was created by a newer version of %PRODUCTNAME.";
+};
+
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 432006a50a..8315658d45 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -186,6 +186,7 @@ class Desktop : public Application
static sal_Bool _bTasksSaved;
static void retrieveCrashReporterState();
+ static sal_Bool isUIOnSessionShutdownAllowed();
// on-demand acceptors
static void createAcceptor(const OUString& aDescription);
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index ce2ed07f57..d9213aed12 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,4 +1,4 @@
-dt desktop : l10n sfx2 stoc uui BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg NULL
+dt desktop : l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg NULL
dt desktop usr1 - all dt_mkout NULL
dt desktop\inc nmake - all dt_inc NULL
dt desktop\prj get - all dt_prj NULL
@@ -21,7 +21,7 @@ dt desktop\os2\source\applauncher nmake - p dt_applauncher dt_inc NULL
dt desktop\unx\source\officeloader nmake - u dt_officeloader_unx dt_inc NULL
dt desktop\source\pagein nmake - u dt_pagein dt_inc NULL
dt desktop\source\pkgchk\unopkg nmake - all dt_unopkg dt_dp_misc dt_app dt_inc dt_guiloader.w NULL
-dt desktop\source\deployment nmake - all dt_deployment dt_dp_manager dt_dp_registry dt_dp_registry_package dt_dp_registry_executable dt_dp_registry_help dt_dp_registry_script dt_dp_registry_sfwk dt_dp_registry_component dt_dp_registry_configuration dt_dp_migration dt_dp_unopkg dt_inc NULL
+dt desktop\source\deployment nmake - all dt_deployment dt_dp_manager dt_dp_registry dt_dp_registry_package dt_dp_registry_executable dt_dp_registry_help dt_dp_registry_script dt_dp_registry_sfwk dt_dp_registry_component dt_dp_registry_configuration dt_dp_migration dt_dp_unopkg dt_inc dt_dp_misc NULL
dt desktop\source\deployment\misc nmake - all dt_dp_misc dt_inc NULL
dt desktop\source\deployment\unopkg nmake - all dt_dp_unopkg dt_inc NULL
dt desktop\source\deployment\migration nmake - all dt_dp_migration dt_inc NULL
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index 39e80ddb1c..f673f27e49 100644
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,7 @@ DLLPRE = # no leading "lib" on .so files
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/test_dp_version.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
+SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) $(TESTSHL2LIB)
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
@@ -54,4 +54,4 @@ SLOFILES = $(SHL1OBJS)
ALLTAR: test
test .PHONY: $(SHL1TARGETN)
- testshl2 $(SHL1TARGETN)
+ $(TESTSHL2) $(SHL1TARGETN)
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx
index 9e0ad134de..728ed52c37 100644
--- a/desktop/qa/deployment_misc/test_dp_version.cxx
+++ b/desktop/qa/deployment_misc/test_dp_version.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
#include <cstddef>
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a8ebfee188..658212ec1d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -114,18 +114,19 @@
#include <unotools/ucbhelper.hxx>
#include <tools/tempfile.hxx>
#include <tools/urlobj.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#include <osl/module.h>
#include <osl/file.hxx>
#include <osl/signal.h>
#include <rtl/uuid.h>
-#include <svtools/pathoptions.hxx>
-#include <svtools/languageoptions.hxx>
-#include <svtools/internaloptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <svl/languageoptions.hxx>
+#include <unotools/internaloptions.hxx>
#include <svtools/miscopt.hxx>
#include <svtools/menuoptions.hxx>
-#include <svtools/syslocaleoptions.hxx>
-#include <svtools/folderrestriction.hxx>
+#include <unotools/syslocaleoptions.hxx>
+#include <unotools/syslocale.hxx>
+#include <svl/folderrestriction.hxx>
#include <unotools/tempfile.hxx>
#include <rtl/logfile.hxx>
#include <rtl/ustrbuf.hxx>
@@ -147,9 +148,9 @@
#include <svtools/fontsubstconfig.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <svtools/apearcfg.hxx>
-#include <svtools/misccfg.hxx>
+#include <unotools/misccfg.hxx>
#include <svtools/filter.hxx>
-#include <svtools/regoptions.hxx>
+#include <unotools/regoptions.hxx>
#include "langselect.hxx"
@@ -937,6 +938,29 @@ void Desktop::retrieveCrashReporterState()
_bCrashReporterEnabled = bEnabled;
}
+sal_Bool Desktop::isUIOnSessionShutdownAllowed()
+{
+ static const ::rtl::OUString CFG_PACKAGE_RECOVERY = ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery/");
+ static const ::rtl::OUString CFG_PATH_SESSION = ::rtl::OUString::createFromAscii("SessionShutdown" );
+ static const ::rtl::OUString CFG_ENTRY_UIENABLED = ::rtl::OUString::createFromAscii("DocumentStoreUIEnabled" );
+
+ css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
+
+ sal_Bool bResult = sal_False;
+ if ( xSMGR.is() )
+ {
+ css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
+ xSMGR,
+ CFG_PACKAGE_RECOVERY,
+ CFG_PATH_SESSION,
+ CFG_ENTRY_UIENABLED,
+ ::comphelper::ConfigurationHelper::E_READONLY);
+ aVal >>= bResult;
+ }
+
+ return bResult;
+}
+
//-----------------------------------------------
/** @short check if crash reporter feature is enabled or
disabled.
@@ -1323,13 +1347,15 @@ void Desktop::Main()
}
String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
delete pLabelResMgr;
-
+/*
+ // locale and UI locale in AppSettings are now retrieved from configuration or system directly via SvtSysLocale
+ // no reason to set while starting
// set UI language and locale
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ set locale settings" );
//LanguageSelection langselect;
OUString aUILocaleString = LanguageSelection::getLanguageString();
Locale aUILocale = LanguageSelection::IsoStringToLocale(aUILocaleString);
- LanguageType eLanguage = SvtSysLocaleOptions().GetLocaleLanguageType();
+ LanguageType eLanguage = SvtSysLocale().GetLanguage();
// #i39040#, do not call anything between GetSettings and SetSettings that might have
// a side effect on the settings (like, eg, SvtSysLocaleOptions().GetLocaleLanguageType(),
@@ -1339,7 +1365,7 @@ void Desktop::Main()
aSettings.SetLanguage( eLanguage );
Application::SetSettings( aSettings );
RTL_LOGFILE_CONTEXT_TRACE( aLog, "} set locale settings" );
-
+*/
// Check for StarOffice/Suite specific extensions runs also with OpenOffice installation sets
OUString aTitleString( aTitle );
@@ -1349,7 +1375,7 @@ void Desktop::Main()
else
aTitle = aTitleString;
-#ifndef PRODUCT
+#ifdef DBG_UTIL
//include version ID in non product builds
::rtl::OUString aDefault;
aTitle += DEFINE_CONST_UNICODE(" [");
@@ -1397,10 +1423,10 @@ void Desktop::Main()
if ( ! pCmdLineArgs->IsNoFirstStartWizard())
{
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ FirstStartWizard" );
-
+
if (IsFirstStartWizardNeeded())
{
- ::svt::RegOptions().removeReminder(); // remove patch registration reminder
+ ::utl::RegOptions().removeReminder(); // remove patch registration reminder
Reference< XJob > xFirstStartJob( xSMgr->createInstance(
DEFINE_CONST_UNICODE( "com.sun.star.comp.desktop.FirstStart" ) ), UNO_QUERY );
if (xFirstStartJob.is())
@@ -1411,7 +1437,7 @@ void Desktop::Main()
lArgs[0].Value <<= LicenseNeedsAcceptance();
lArgs[1].Name = ::rtl::OUString::createFromAscii("LicensePath");
lArgs[1].Value <<= GetLicensePath();
-
+
xFirstStartJob->execute(lArgs) >>= bDone;
if ( !bDone )
{
@@ -1421,7 +1447,7 @@ void Desktop::Main()
}
else if ( RegistrationPage::hasReminderDateCome() )
RegistrationPage::executeSingleMode();
-
+
RTL_LOGFILE_CONTEXT_TRACE( aLog, "} FirstStartWizard" );
}
@@ -1468,6 +1494,13 @@ void Desktop::Main()
xContainerWindow = xBackingFrame->getContainerWindow();
if (xContainerWindow.is())
{
+ // set the WB_EXT_DOCUMENT style. Normally, this is done by the TaskCreator service when a "_blank"
+ // frame/window is created. Since we do not use the TaskCreator here, we need to mimic its behavior,
+ // otherwise documents loaded into this frame will later on miss functionality depending on the style.
+ Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+ OSL_ENSURE( pContainerWindow, "Desktop::Main: no implementation access to the frame's container window!" );
+ pContainerWindow->SetExtendedStyle( pContainerWindow->GetExtendedStyle() | WB_EXT_DOCUMENT );
+
SetSplashScreenProgress(75);
Sequence< Any > lArgs(1);
lArgs[0] <<= xContainerWindow;
@@ -1738,8 +1771,15 @@ sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& r
aSeq[0] <<= bQuickstart;
// Try to instanciate quickstart service. This service is not mandatory, so
- // do nothing if service is not available.
+ // do nothing if service is not available
+
+ // #i105753# the following if was invented for performance
+ // 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
if ( bQuickstart )
+ #endif
{
Reference < XComponent > xQuickstart( rSMgr->createInstanceWithArguments(
DEFINE_CONST_UNICODE( "com.sun.star.office.Quickstart" ), aSeq ),
@@ -1820,10 +1860,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* )
hStyleSettings.SetDragFullOptions( nDragFullOptions );
rSettings.SetStyleSettings ( hStyleSettings );
-
- MiscSettings aMiscSettings( rSettings.GetMiscSettings() );
- aMiscSett