summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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/viewer/mediawindow.cxx72
-rw-r--r--basic/inc/basic/basmgr.hxx2
-rw-r--r--basic/inc/basic/sbdef.hxx2
-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.cxx4
-rw-r--r--basic/source/classes/propacc.cxx2
-rw-r--r--basic/source/classes/sbunoobj.cxx15
-rw-r--r--basic/source/classes/sbxmod.cxx2
-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/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/prj/build.lst2
-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/flat/ETable.cxx6
-rw-r--r--connectivity/source/drivers/flat/makefile.mk2
-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--desktop/inc/app.hxx1
-rw-r--r--desktop/prj/build.lst2
-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.cxx82
-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/license_dialog.cxx2
-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.cxx7
-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.cxx16
-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/vclprocessor2d.cxx2
-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/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.cxx18
-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.cxx14
-rw-r--r--fpicker/source/office/iodlgimp.hxx2
-rw-r--r--fpicker/source/unx/gnome/resourceprovider.cxx2
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.cxx2
-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/pch/precompiled_framework.hxx26
-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/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/titlebarupdate.cxx6
-rw-r--r--framework/source/helper/titlehelper.cxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx24
-rw-r--r--framework/source/loadenv/loadenv.cxx22
-rw-r--r--framework/source/services/autorecovery.cxx167
-rw-r--r--framework/source/services/backingcomp.cxx4
-rw-r--r--framework/source/services/backingwindow.cxx122
-rw-r--r--framework/source/services/backingwindow.hxx42
-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/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/recentfilesmenucontroller.cxx52
-rw-r--r--framework/source/uielement/toolbarmanager.cxx12
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx48
-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.cxx2
-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.cxx2
-rw-r--r--linguistic/source/thesdsp.cxx2
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu2
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Recovery.xcs13
-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/ClassContext.java58
-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/CodeSource.java52
-rw-r--r--sandbox/com/sun/star/lib/sandbox/Disposable.java36
-rw-r--r--sandbox/com/sun/star/lib/sandbox/ExecutionContext.java473
-rw-r--r--sandbox/com/sun/star/lib/sandbox/Holder.java38
-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/test/com/sun/star/lib/sandbox/makefile.mk55
-rw-r--r--sandbox/util/delzip0
-rw-r--r--sandbox/util/makefile.mk48
-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/cntids.hrc4
-rw-r--r--sfx2/inc/sfx2/ctrlitem.hxx2
-rw-r--r--sfx2/inc/sfx2/dinfdlg.hxx68
-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/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/msgpool.hxx2
-rw-r--r--sfx2/inc/sfx2/objitem.hxx2
-rw-r--r--sfx2/inc/sfx2/objsh.hxx2
-rw-r--r--sfx2/inc/sfx2/objuno.hxx2
-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.cxx16
-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.cxx14
-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.cxx363
-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.cxx18
-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/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.cxx8
-rw-r--r--sfx2/source/dialog/tplcitem.cxx2
-rw-r--r--sfx2/source/dialog/versdlg.cxx14
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx132
-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.cxx218
-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.cxx14
-rw-r--r--sfx2/source/doc/frmdescr.cxx2
-rw-r--r--sfx2/source/doc/guisaveas.cxx19
-rw-r--r--sfx2/source/doc/new.cxx4
-rw-r--r--sfx2/source/doc/objcont.cxx20
-rw-r--r--sfx2/source/doc/objmisc.cxx34
-rw-r--r--sfx2/source/doc/objserv.cxx24
-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.cxx216
-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.cxx4
-rw-r--r--sfx2/source/menu/mnumgr.cxx4
-rw-r--r--sfx2/source/menu/objmnctl.cxx2
-rw-r--r--sfx2/source/menu/virtmenu.cxx6
-rw-r--r--sfx2/source/notify/eventsupplier.cxx46
-rw-r--r--sfx2/source/statbar/stbitem.cxx8
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx4
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx18
-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/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/utilities.hxx1
-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.lst1
-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/tools/lngconvex/lngconvex.cxx13
-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--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/connect.hrc48
-rw-r--r--svx/inc/countryid.hxx321
-rw-r--r--svx/inc/defdlgname.hxx43
-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.hrc12
-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/hlmarkwn_def.hxx39
-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/msoleexp.hxx63
-rw-r--r--svx/inc/multipat.hrc47
-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/optasian.hrc52
-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/optjsearch.hrc53
-rw-r--r--svx/inc/optpath.hrc46
-rw-r--r--svx/inc/optsave.hrc84
-rw-r--r--svx/inc/optspell.hrc45
-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/radiobtnbox.hxx66
-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/multifil.hxx)46
-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/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/msvbahelper.hxx58
-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.hxx4
-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/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/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/svdfppt.hxx1445
-rw-r--r--svx/inc/svx/svdhdl.hxx2
-rw-r--r--svx/inc/svx/svdmodel.hxx6
-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.lst288
-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.cxx79
-rw-r--r--svx/source/cui/bbdlg.hxx59
-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.cxx6056
-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.hrc54
-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.cxx594
-rw-r--r--svx/source/cui/cuicharmap.hxx146
-rw-r--r--svx/source/cui/cuiexp.cxx58
-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.hrc53
-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/iconcdlg.src63
-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.hxx72
-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.hxx61
-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.cxx1060
-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.hxx65
-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.cxx4087
-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/optctl.hxx73
-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.hrc54
-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.hxx46
-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.hxx66
-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/showcols.hxx69
-rw-r--r--svx/source/cui/splitcelldlg.cxx120
-rw-r--r--svx/source/cui/splitcelldlg.hrc45
-rw-r--r--svx/source/cui/splitcelldlg.hxx72
-rw-r--r--svx/source/cui/splitcelldlg.src135
-rw-r--r--svx/source/cui/srchxtra.cxx306
-rw-r--r--svx/source/cui/srchxtra.hrc54
-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.hrc66
-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.cxx762
-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.cxx1
-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.cxx2
-rw-r--r--svx/source/dialog/_contdlg.cxx4
-rw-r--r--svx/source/dialog/charmap.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.cxx25
-rw-r--r--svx/source/dialog/dlgutil.cxx2
-rw-r--r--svx/source/dialog/docrecovery.cxx2
-rw-r--r--svx/source/dialog/fntctrl.cxx2
-rw-r--r--svx/source/dialog/frmdirlbox.src96
-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.cxx6
-rw-r--r--svx/source/dialog/hyperdlg.src971
-rw-r--r--svx/source/dialog/hyprlink.cxx48
-rw-r--r--svx/source/dialog/imapdlg.cxx12
-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/makefile.mk13
-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/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.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.cxx4
-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.cxx28
-rw-r--r--svx/source/form/filtnav.cxx2
-rw-r--r--svx/source/form/fmcontrollayout.cxx3
-rw-r--r--svx/source/form/fmctrler.cxx2
-rw-r--r--svx/source/form/fmexch.cxx4
-rw-r--r--svx/source/form/fmobj.cxx2
-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.cxx6
-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.cxx2
-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.cxx6
-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.cxx25
-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/fmctrler.hxx2
-rw-r--r--svx/source/inc/fmexpl.hxx8
-rw-r--r--svx/source/inc/fmitems.hxx2
-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/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/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/makefile.mk78
-rw-r--r--svx/source/msfilter/mscodec.cxx537
-rw-r--r--svx/source/msfilter/msdffimp.cxx8197
-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/msvbahelper.cxx384
-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/viewcontactofsdrrectobj.cxx2
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx8
-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.cxx6
-rw-r--r--svx/source/svdraw/makefile.mk6
-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.cxx8
-rw-r--r--svx/source/svdraw/svdetc.cxx62
-rw-r--r--svx/source/svdraw/svdfmtf.cxx2
-rw-r--r--svx/source/svdraw/svdfppt.cxx7813
-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.cxx4
-rw-r--r--svx/source/svdraw/svdoattr.cxx12
-rw-r--r--svx/source/svdraw/svdobj.cxx4
-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.cxx2
-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/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.cxx2
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx2
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx4
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx2
-rw-r--r--svx/source/tbxctrls/formatpaintbrushctrl.cxx2
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx6
-rw-r--r--svx/source/tbxctrls/itemwin.cxx22
-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.cxx22
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx2
-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.src424
-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--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/prj/build.lst2
-rw-r--r--vbahelper/source/vbahelper/vbaapplicationbase.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarcontrol.cxx2
-rw-r--r--vbahelper/source/vbahelper/vbahelper.cxx9
-rw-r--r--vbahelper/util/makefile.mk2
-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.mk12
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx114
-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/layerimport.cxx2
-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.cxx2
-rw-r--r--xmloff/source/text/txtimppr.cxx14
-rw-r--r--xmloff/source/text/txtparae.cxx10
-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/transform/StyleOOoTContext.cxx2
-rw-r--r--xmloff/source/transform/TransformerBase.cxx4
-rw-r--r--xmloff/util/makefile.mk3
1466 files changed, 8564 insertions, 202150 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/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/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 7230d2cee1..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>
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/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 284177b61b..196965e2ef 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -33,14 +33,14 @@
#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>
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/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 c96f55c981..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"
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/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/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/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/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/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/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 3f51d13cec..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
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 aadf6bc625..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" );
}
@@ -1834,10 +1860,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* )
hStyleSettings.SetDragFullOptions( nDragFullOptions );
rSettings.SetStyleSettings ( hStyleSettings );
-
- MiscSettings aMiscSettings( rSettings.GetMiscSettings() );
- aMiscSettings.SetTwoDigitYearStart( (USHORT) SfxMiscCfg().GetYear2000() );
- rSettings.SetMiscSettings( aMiscSettings );
}
// ========================================================================
@@ -2458,7 +2480,15 @@ void Desktop::OpenClients()
{
xSessionListener = Reference< XInitialization >(::comphelper::getProcessServiceFactory()->createInstance(
OUString::createFromAscii("com.sun.star.frame.SessionListener")), UNO_QUERY_THROW);
- xSessionListener->initialize(Sequence< Any >(0));
+
+ // specifies whether the UI-interaction on Session shutdown is allowed
+ sal_Bool bAllowUI = isUIOnSessionShutdownAllowed();
+ css::beans::NamedValue aProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AllowUserInteractionOnQuit" ) ),
+ css::uno::makeAny( bAllowUI ) );
+ css::uno::Sequence< css::uno::Any > aArgs( 1 );
+ aArgs[0] <<= aProperty;
+
+ xSessionListener->initialize( aArgs );
}
catch(const com::sun::star::uno::Exception& e)
{
@@ -2486,7 +2516,7 @@ void Desktop::OpenClients()
}
}
}
-
+
OfficeIPCThread::EnableRequests();
sal_Bool bShutdown( sal_False );
@@ -2823,11 +2853,11 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >
xDesktop( xSMGR->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ),
::com::sun::star::uno::UNO_QUERY );
-
+
// check provider ... we know it's weak reference only
if ( ! xDesktop.is())
return;
-
+
css::uno::Reference< css::util::XURLTransformer > xParser(xSMGR->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), css::uno::UNO_QUERY_THROW);
css::util::URL aCommand;
if( rAppEvent.GetData().EqualsAscii( "PREFERENCES" ) )
@@ -2837,7 +2867,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
if( aCommand.Complete.getLength() )
{
xParser->parseStrict(aCommand);
-
+
css::uno::Reference< css::frame::XDispatch > xDispatch = xDesktop->queryDispatch(aCommand, rtl::OUString(), 0);
if (xDispatch.is())
xDispatch->dispatch(aCommand, css::uno::Sequence< css::beans::PropertyValue >());
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index a477eb2ad4..94bd3c55b3 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.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
@@ -75,9 +75,9 @@
#include <unotools/tempfile.hxx>
#include <ucbhelper/contentbroker.hxx>
#include <vcl/svapp.hxx>
-#include <svtools/startoptions.hxx>
-#include <svtools/pathoptions.hxx>
-#include <svtools/internaloptions.hxx>
+#include <unotools/startoptions.hxx>
+#include <unotools/pathoptions.hxx>
+#include <unotools/internaloptions.hxx>
#define DEFINE_CONST_OUSTRING(CONSTASCII) OUString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
@@ -131,7 +131,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
aArgs[4] <<= rtl::OUString::createFromAscii("PORTAL");
aArgs[5] <<= aPortal.makeStringAndClear();
- bool ret =
+ bool ret =
::ucbhelper::ContentBroker::initialize( xServiceFactory, aArgs ) != false;
#ifdef GNOME_VFS_ENABLED
@@ -178,7 +178,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
// Workaround for P1 #124597#. Instanciate GNOME-VFS-UCP in the thread that initialized
// GNOME in order to avoid a deadlock that may occure in case UCP gets initialized from
- // a different thread. The latter may happen when calling the Office remotely via UNO.
+ // a different thread. The latter may happen when calling the Office remotely via UNO.
// THIS IS NOT A FIX, JUST A WORKAROUND!
try
@@ -201,16 +201,16 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
}
} catch (RuntimeException e) {
}
- }
+ }
#endif // GNOME_VFS_ENABLED
-
+
return ret;;
}
Reference< XMultiServiceFactory > Desktop::CreateApplicationServiceManager()
{
RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::createApplicationServiceManager" );
-
+
try
{
Reference<XComponentContext> xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
@@ -332,7 +332,7 @@ void Desktop::createAcceptor(const OUString& aAcceptString)
Sequence< Any > aSeq( 2 );
aSeq[0] <<= aAcceptString;
aSeq[1] <<= bAccept;
- Reference<XInitialization> rAcceptor(
+ Reference<XInitialization> rAcceptor(
::comphelper::getProcessServiceFactory()->createInstance(
OUString::createFromAscii( "com.sun.star.office.Acceptor" )), UNO_QUERY );
if ( rAcceptor.is() ) {
@@ -366,7 +366,7 @@ class enable
}
}
};
-
+
void Desktop::enableAcceptors()
{
RTL_LOGFILE_CONTEXT(aLog, "desktop (lo119109) Desktop::enableAcceptors");
@@ -389,14 +389,14 @@ void Desktop::destroyAcceptor(const OUString& aAcceptString)
AcceptorMap &rMap = acceptorMap::get();
if (aAcceptString.compareToAscii("all") == 0) {
rMap.clear();
-
+
} else {
// try to remove acceptor from map
AcceptorMap::const_iterator pIter = rMap.find(aAcceptString);
if (pIter != rMap.end() ) {
// remove reference from map
// this is the last reference and the acceptor will be destructed
- rMap.erase(aAcceptString);
+ rMap.erase(aAcceptString);
} else {
OSL_ENSURE(sal_False, "Found no acceptor to remove");
}
@@ -407,7 +407,7 @@ void Desktop::destroyAcceptor(const OUString& aAcceptString)
void Desktop::DeregisterServices()
{
// stop all acceptors by clearing the map
- acceptorMap::get().clear();
+ acceptorMap::get().clear();
}
void Desktop::CreateTemporaryDirectory()
@@ -434,7 +434,7 @@ void Desktop::CreateTemporaryDirectory()
e.Message = aMsg + e.Message;
throw e;
}
-
+
// remove possible old directory and base directory
SvtInternalOptions aInternalOpt;
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 84bb6cd7b2..e2a8558372 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -41,7 +41,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include "tools/getprocessworkingdir.hxx"
-#include <svtools/documentlockfile.hxx>
+#include <svl/documentlockfile.hxx>
using namespace rtl;
using namespace com::sun::star::lang;
diff --git a/desktop/source/app/copyright_ascii_ooo.c b/desktop/source/app/copyright_ascii_ooo.c
index f5b5cfa2ca..8d9d821e19 100644
--- a/desktop/source/app/copyright_ascii_ooo.c
+++ b/desktop/source/app/copyright_ascii_ooo.c
@@ -9,8 +9,8 @@ extern const char copyright_text_2[];
extern const char copyright_text_21[];
extern const char copyright_text_22[];
-const char copyright_text_1[] = "Copyright © 2008 Sun Microsystems, Inc., All rights reserved.";
+const char copyright_text_1[] = "Copyright © 2010 Sun Microsystems, Inc., All rights reserved.";
const char copyright_text_2[] = "Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and in other countries.";
-const char copyright_text_21[] = "Copyright © 2008 Sun Microsystems, Tous droits réservés.";
+const char copyright_text_21[] = "Copyright © 2010 Sun Microsystems, Tous droits réservés.";
const char copyright_text_22[] = "Sun Microsystems, Inc. a les droits de propriété intellectuels relatants à la technologie incorporée dans ce produit. En particulier, et sans la limitation, ces droits de propriété intellectuels peuvent inclure un ou plus des brevets américains énumérés à http://www.sun.com/patents et un ou les brevets plus supplémentaires ou les applications de brevet en attente dans les États - Unis et les autres pays.";
diff --git a/desktop/source/app/copyright_ascii_sun.c b/desktop/source/app/copyright_ascii_sun.c
index d120e81c04..3d437af856 100644
--- a/desktop/source/app/copyright_ascii_sun.c
+++ b/desktop/source/app/copyright_ascii_sun.c
@@ -4,12 +4,12 @@
*
*/
-const char copyright_text_1[] = "Copyright © 2008 Sun Microsystems, Inc., All rights reserved.";
+const char copyright_text_1[] = "Copyright © 2010 Sun Microsystems, Inc., All rights reserved.";
const char copyright_text_2[] = "Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and in other countries.";
const char copyright_text_3[] = "U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its supplements. Use is subject to license terms.";
const char copyright_text_4[] = "This distribution may include materials developed by third parties.Sun, Sun Microsystems, the Sun logo, Java, Solaris and StarOffice are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries.";
const char copyright_text_5[] = "UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd.";
-const char copyright_text_21[] = "Copyright © 2008 Sun Microsystems, Tous droits réservés.";
+const char copyright_text_21[] = "Copyright © 2010 Sun Microsystems, Tous droits réservés.";
const char copyright_text_22[] = "Sun Microsystems, Inc. a les droits de propriété intellectuels relatants à la technologie incorporée dans ce produit. En particulier, et sans la limitation, ces droits de propriété intellectuels peuvent inclure un ou plus des brevets américains énumérés à http://www.sun.com/patents et un ou les brevets plus supplémentaires ou les applications de brevet en attente dans les États - Unis et les autres pays.";
const char copyright_text_23[] = "Ce produit ou document est protégé par un copyright et distribué avec des licences qui en restreignent l'utilisation, la copie, la distribution, et la décompilation. Aucune partie de ce produit ou document ne peut être reproduite sous aucune forme, par quelque moyen que ce soit, sans l'autorisation préalable et écrite de Sun et de ses bailleurs de licence, s'il y ena.";
const char copyright_text_24[] = "L'utilisation est soumise aux termes du contrat de licence.";
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 76d6710ba0..0a67c2017f 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -32,7 +32,7 @@
#define _DESKTOP_HRC_
#ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#endif
#define RID_DESKTOP_DIALOG_START 2000
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 2ad0b382e4..e8b50cdd29 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.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
@@ -39,7 +39,7 @@
#include <rtl/string.hxx>
#endif
#ifndef _SVTOOLS_PATHOPTIONS_HXX
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#endif
#include <tools/resid.hxx>
#include <i18npool/mslangid.hxx>
@@ -84,7 +84,7 @@ bool LanguageSelection::prepareLanguage()
OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
Reference< XMultiServiceFactory > theMSF = comphelper::getProcessServiceFactory();
Reference< XLocalizable > theConfigProvider;
- try
+ try
{
theConfigProvider = Reference< XLocalizable >(theMSF->createInstance( sConfigSrvc ),UNO_QUERY_THROW );
}
@@ -95,7 +95,7 @@ bool LanguageSelection::prepareLanguage()
return false;
sal_Bool bSuccess = sal_False;
-
+
// #i42730#get the windows 16Bit locale - it should be preferred over the UI language
try
{
@@ -109,17 +109,17 @@ bool LanguageSelection::prepareLanguage()
catch(const Exception&)
{
}
-
+
// #i32939# use system locale to set document default locale
- try
+ try
{
OUString usLocale;
Reference< XPropertySet > xLocaleProp(getConfigAccess(
"org.openoffice.System/L10N", sal_True), UNO_QUERY_THROW);
- xLocaleProp->getPropertyValue(OUString::createFromAscii("Locale")) >>= usLocale;
+ xLocaleProp->getPropertyValue(OUString::createFromAscii("Locale")) >>= usLocale;
setDefaultLanguage(usLocale);
- }
- catch (Exception&)
+ }
+ catch (Exception&)
{
}
// get the selected UI language as string
@@ -138,11 +138,23 @@ bool LanguageSelection::prepareLanguage()
Reference< XFlushable >(theConfigProvider, UNO_QUERY_THROW)->
flush();
theConfigProvider->setLocale(loc);
-
+
Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Setup/L10N/", sal_True), UNO_QUERY_THROW);
xProp->setPropertyValue(OUString::createFromAscii("ooLocale"), makeAny(aLocaleString));
Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
+ MsLangId::setConfiguredSystemUILanguage( MsLangId::convertLocaleToLanguage(loc) );
+
+ OUString sLocale;
+ xProp->getPropertyValue(OUString::createFromAscii("ooSetupSystemLocale")) >>= sLocale;
+ if ( sLocale.getLength() )
+ {
+ loc = LanguageSelection::IsoStringToLocale(aLocaleString);
+ MsLangId::setConfiguredSystemLanguage( MsLangId::convertLocaleToLanguage(loc) );
+ }
+ else
+ MsLangId::setConfiguredSystemLanguage( MsLangId::getSystemLanguage() );
+
bSuccess = sal_True;
}
catch ( PropertyVetoException& )
@@ -289,7 +301,7 @@ static Sequence< OUString > _getFallbackLocales(const OUString& aIsoLang)
if (aIsoLang.equalsAscii("zh-HK")) {
seqFallbacks = Sequence< OUString >(1);
seqFallbacks[0] = OUString::createFromAscii("zh-TW");
- }
+ }
return seqFallbacks;
}
@@ -305,8 +317,8 @@ sal_Bool LanguageSelection::isInstalledLanguage(OUString& usLocale, sal_Bool bEx
break;
}
}
-
- if (!bInstalled && !bExact)
+
+ if (!bInstalled && !bExact)
{
// try fallback locales
Sequence< OUString > seqFallbacks = _getFallbackLocales(usLocale);
@@ -330,7 +342,7 @@ sal_Bool LanguageSelection::isInstalledLanguage(OUString& usLocale, sal_Bool bEx
OUString aInstalledLocale;
for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
{
- if (usLocale.indexOf(seqLanguages[i]) == 0)
+ if (usLocale.indexOf(seqLanguages[i]) == 0)
{
// requested locale starts with the installed locale
// (i.e. installed locale has index 0 in requested locale)
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index 3418b80caf..7d233c2d58 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -33,14 +33,10 @@
#include <tools/string.hxx>
#include <rtl/ustring.hxx>
#include <tools/resid.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
namespace desktop
{
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk
index 238685649c..ffaf68c0fb 100644
--- a/desktop/source/app/makefile.mk
+++ b/desktop/source/app/makefile.mk
@@ -50,7 +50,6 @@ SHL1OBJS = \
$(SLO)$/appfirststart.obj \
$(SLO)$/appinit.obj \
$(SLO)$/appsys.obj \
- $(SLO)$/cfgfilter.obj \
$(SLO)$/checkinstall.obj \
$(SLO)$/check_ext_deps.obj \
$(SLO)$/cmdlineargs.obj \
@@ -62,12 +61,12 @@ SHL1OBJS = \
$(SLO)$/langselect.obj \
$(SLO)$/lockfile.obj \
$(SLO)$/lockfile2.obj \
- $(SLO)$/migration.obj \
$(SLO)$/officeipcthread.obj \
- $(SLO)$/pages.obj \
$(SLO)$/sofficemain.obj \
- $(SLO)$/userinstall.obj \
- $(SLO)$/wizard.obj
+ $(SLO)$/userinstall.obj
+
+SHL1LIBS = $(SLB)$/mig.lib
+
SHL1STDLIBS = \
$(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 9e158b7030..650a73ea3f 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.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
@@ -47,7 +47,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/instance.hxx>
#include <osl/conditn.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/strbuf.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 920da56133..ccdeadbd7c 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -50,9 +50,9 @@
#include <tools/resmgr.hxx>
#endif
#include <unotools/bootstrap.hxx>
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
#ifndef _SVTOOLS_SYSLOCALEOPTIONSOPTIONS_HXX
-#include <svtools/syslocaleoptions.hxx>
+#include <unotools/syslocaleoptions.hxx>
#endif
#include <comphelper/processfactory.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 43fe8b87f3..04f3f19d2e 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -104,7 +104,7 @@ PersistentMap::PersistentMap( OUString const & url_, bool readOnly )
OSL_ASSERT( false );
}
OString cstr_sysPath(
- OUStringToOString( m_sysPath, osl_getThreadTextEncoding() ) );
+ OUStringToOString( m_sysPath, RTL_TEXTENCODING_UTF8 ) );
char const * pcstr_sysPath = cstr_sysPath.getStr();
u_int32_t flags = DB_CREATE;
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
index af99601334..dc9ea6fea8 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
@@ -33,7 +33,7 @@
#include "svtools/svmedit2.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
#include "svtools/xtextedt.hxx"
#include "vcl/scrbar.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
index c73a4df82c..6ed3d3c723 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx
@@ -31,7 +31,7 @@
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_AUTOSCROLLEDIT_HXX
#include "svtools/svmedit2.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
namespace dp_gui {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 4430b5b444..e8acd11e45 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -34,7 +34,7 @@
#include "dp_gui.hrc"
#include "svtools/controldims.hrc"
-#include "svtools/svtools.hrc"
+#include "svl/svtools.hrc"
#include "dp_gui.h"
#include "dp_gui_dialog2.hxx"
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index e2dab99af7..21e0671a39 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -43,7 +43,7 @@
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/task/XJobExecutor.hpp"
#include "svtools/svmedit.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
#include "svtools/xtextedt.hxx"
#include <vcl/scrbar.hxx>
#include "vcl/threadex.hxx"
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index aff8ada634..f940366e06 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -49,7 +49,7 @@
#include "comphelper/servicedecl.hxx"
#include "comphelper/sequence.hxx"
#include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
#include "com/sun/star/lang/DisposedException.hpp"
#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
#include "com/sun/star/beans/UnknownPropertyException.hpp"
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 3f2def05d7..1da716513a 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -45,7 +45,7 @@
#include "comphelper/servicedecl.hxx"
#include "comphelper/sequence.hxx"
#include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
#include "com/sun/star/container/XNameContainer.hpp"
#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index bf63a338ee..e13d580e2b 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -45,7 +45,7 @@
#include "comphelper/anytostring.hxx"
#include "comphelper/servicedecl.hxx"
#include "xmlscript/xml_helper.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
#include "com/sun/star/ucb/NameClash.hpp"
#include "com/sun/star/io/XActiveDataSink.hpp"
#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 902d9f6645..5ecfab8b34 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -38,7 +38,7 @@
#include "osl/file.hxx"
#include "ucbhelper/content.hxx"
#include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
#include "cppuhelper/implbase1.hxx"
using namespace ::com::sun::star;
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 8ef0a7141a..9b532d68e4 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -39,6 +39,7 @@
#include "ucbhelper/content.hxx"
#include "comphelper/servicedecl.hxx"
#include "svtools/inettype.hxx"
+#include "svtools/pathoptions.hxx"
#include <transex3/compilehelp.hxx>
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
@@ -350,8 +351,12 @@ void BackendImpl::implProcessHelp
pXhpFiles[iXhp] = aXhpRelFile;
}
+ rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() );
+ rtl::OUString aOfficeHelpPathFileURL;
+ ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL );
+
HelpProcessingErrorInfo aErrorInfo;
- bool bSuccess = compileExtensionHelp( aHelpStr, aLangURL,
+ bool bSuccess = compileExtensionHelp( aOfficeHelpPathFileURL, aHelpStr, aLangURL,
nXhpFileCount, pXhpFiles, aErrorInfo );
if( bSuccess && xInvocation.is() )
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 98f80df964..b4042d1969 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -44,7 +44,7 @@
#include "cppuhelper/exc_hlp.hxx"
#include "cppuhelper/implbase1.hxx"
#include "ucbhelper/content.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
#include "comphelper/anytostring.hxx"
#include "comphelper/makesequence.hxx"
#include "comphelper/sequence.hxx"
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 1a8a0e4d1b..f5c2ee3e3e 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -40,7 +40,7 @@
#include "cppuhelper/exc_hlp.hxx"
#include "cppuhelper/implbase1.hxx"
#include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
#include "com/sun/star/util/XUpdatable.hpp"
#include "com/sun/star/script/XLibraryContainer.hpp"
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index c460409890..953cdb8901 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -38,7 +38,7 @@
#include "ucbhelper/content.hxx"
#include "cppuhelper/exc_hlp.hxx"
#include "comphelper/servicedecl.hxx"
-#include "svtools/inettype.hxx"
+#include "svl/inettype.hxx"
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
#include <memory>
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index 6532e1687e..7bbc194670 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -31,7 +31,7 @@
#if ! defined INCLUDED_DESKTOP_HELPID_HRC
#define INCLUDED_DESKTOP_HELPID_HRC
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
#define HID_GLOBAL_FALLBACK 0xFFFFFFFF
diff --git a/desktop/source/migration/makefile.mk b/desktop/source/migration/makefile.mk
index d5aaf884ac..31af71f83f 100644
--- a/desktop/source/migration/makefile.mk
+++ b/desktop/source/migration/makefile.mk
@@ -33,7 +33,6 @@ PRJ=..$/..
PRJNAME=desktop
TARGET=mig
-LIBTARGET=NO
AUTOSEG=true
ENABLE_EXCEPTIONS=TRUE
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 544ea04dee..1840ed8997 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.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
@@ -43,8 +43,8 @@
#include <osl/file.hxx>
#include <unotools/bootstrap.hxx>
#include <unotools/configmgr.hxx>
-#include <svtools/regoptions.hxx>
-#include <svtools/useroptions.hxx>
+#include <unotools/regoptions.hxx>
+#include <unotools/useroptions.hxx>
#include <sfx2/basedlgs.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -334,7 +334,7 @@ MigrationPage::MigrationPage( svt::OWizardMachine* parent, const ResId& resid)
sal_Bool MigrationPage::commitPage( CommitPageReason _eReason )
{
if (_eReason == eTravelForward && m_cbMigration.IsChecked() && !m_bMigrationDone)
- {
+ {
EnterWait();
Migration::doMigration();
LeaveWait();
@@ -421,7 +421,7 @@ UpdateCheckPage::UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resi
sal_Bool UpdateCheckPage::commitPage( CommitPageReason _eReason )
{
if ( _eReason == eTravelForward )
- {
+ {
try {
Reference < XNameReplace > xUpdateAccess;
Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
@@ -548,7 +548,7 @@ sal_Bool RegistrationPage::commitPage( CommitPageReason _eReason )
{
if ( _eReason == eFinish )
{
- ::svt::RegOptions aOptions;
+ ::utl::RegOptions aOptions;
rtl::OUString aEvent;
if ( m_rbNow.IsChecked())
@@ -605,7 +605,7 @@ void RegistrationPage::prepareSingleMode()
bool RegistrationPage::hasReminderDateCome()
{
- return ::svt::RegOptions().hasReminderDateCome();
+ return ::utl::RegOptions().hasReminderDateCome();
}
void RegistrationPage::executeSingleMode()
@@ -622,7 +622,7 @@ void RegistrationPage::executeSingleMode()
if ( eMode == RegistrationPage::rmNow || eMode == RegistrationPage::rmLater )
pPage->commitPage( IWizardPage::eFinish );
if ( eMode != RegistrationPage::rmLater )
- ::svt::RegOptions().removeReminder();
+ ::utl::RegOptions().removeReminder();
}
// -----------------------------------------------------------------------
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index c5ab388687..f243fff61f 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -38,7 +38,7 @@
#include <vcl/scrbar.hxx>
#include <svtools/wizardmachine.hxx>
#include <svtools/svmedit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <svtools/xtextedt.hxx>
namespace desktop
diff --git a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
index 7623e7f2f6..b0e944a0f8 100644
--- a/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
+++ b/desktop/source/registration/com/sun/star/servicetag/BrowserSupport.java
@@ -1,14 +1,13 @@
/*************************************************************************
*
* 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
*
- * $RCSfile: BrowserSupport.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
*
* This file is part of OpenOffice.org.
*
diff --git a/desktop/source/registration/com/sun/star/servicetag/Installer.java b/desktop/source/registration/com/sun/star/servicetag/Installer.java
index b8e6e34dfd..f3b0b9c3c3 100644
--- a/desktop/source/registration/com/sun/star/servicetag/Installer.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Installer.java
@@ -1,14 +1,13 @@
/*************************************************************************
*
* 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
*
- * $RCSfile: Installer.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
*
* This file is part of OpenOffice.org.
*
@@ -794,7 +793,7 @@ public class Installer {
reader.close();
}
- String resourceFilename = "/com/sun/star/servicetag/resources/register";
+ String resourceFilename = "/com/sun/servicetag/resources/register";
for (Locale locale : supportedLocales) {
String name = REGISTRATION_HTML_NAME;
String resource = resourceFilename;
diff --git a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
index 88ccd453a1..a58072d363 100644
--- a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
@@ -1,14 +1,13 @@
/*************************************************************************
*
* 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
*
- * $RCSfile: LinuxSystemEnvironment.java,v $
- *
- * $Revision: 1.2 $
+ * $RCSfile: Registration.java,v $
+ * $Revision: 1.3 $
*
* This file is part of OpenOffice.org.
*
@@ -29,6 +28,7 @@
*
************************************************************************/
+
package com.sun.star.servicetag;
// The Service Tags team maintains the latest version of the implementation
@@ -40,6 +40,7 @@ package com.sun.star.servicetag;
// (e.g. NetBeans and SunStudio) will use the version in JDK.
import java.io.*;
+import java.util.*;
/**
* Linux implementation of the SystemEnvironment class.
@@ -47,16 +48,25 @@ import java.io.*;
class LinuxSystemEnvironment extends SystemEnvironment {
LinuxSystemEnvironment() {
setHostId(getLinuxHostId());
- setSystemModel(getCommandOutput("/bin/uname", "-i"));
+
+ setSystemModel(getLinuxModel());
setSystemManufacturer(getLinuxSystemManufacturer());
setCpuManufacturer(getLinuxCpuManufacturer());
setSerialNumber(getLinuxSN());
+ setPhysMem(getLinuxPhysMem());
+ setSockets(getLinuxSockets());
+ setCores(getLinuxCores());
+ setVirtCpus(getLinuxVirtCpus());
+ setCpuName(getLinuxCpuName());
+ setClockRate(getLinuxClockRate());
}
private String dmiInfo = null;
+ private String kstatCpuInfo = null;
- private static final int SN = 1;
+ private static final int SN = 1;
private static final int SYS = 2;
private static final int CPU = 3;
+ private static final int MODEL = 4;
private String getLinuxHostId() {
String output = getCommandOutput("/usr/bin/hostid");
@@ -91,6 +101,21 @@ class LinuxSystemEnvironment extends SystemEnvironment {
return getLinuxDMIInfo("dmi type 4", "manufacturer");
}
+ private String getLinuxModel() {
+ String tmp = getLinuxPSNInfo(MODEL);
+ if (tmp.length() > 0) {
+ return tmp + "::" + getCommandOutput("/bin/uname","-v");
+ }
+
+ tmp = getLinuxDMIInfo("dmi type 1", "product name");
+ if (tmp.length() > 0) {
+ return tmp + "::" + getCommandOutput("/bin/uname","-v");
+ }
+
+ return getCommandOutput("/bin/uname","-i")
+ + "::" + getCommandOutput("/bin/uname","-v");
+ }
+
/**
* Tries to obtain and return the system manufacturer.
@@ -158,7 +183,7 @@ class LinuxSystemEnvironment extends SystemEnvironment {
dmidecodeThread.start();
try {
- dmidecodeThread.join(2000);
+ dmidecodeThread.join(3000);
if (dmidecodeThread.isAlive()) {
dmidecodeThread.interrupt();
dmiInfo = "";
@@ -191,4 +216,111 @@ class LinuxSystemEnvironment extends SystemEnvironment {
return "";
}
+ private String getLinuxClockRate() {
+ String contents = getFileContent("/proc/cpuinfo");
+ String token = "cpu MHz";
+ for (String line : contents.split("\n")) {
+ if (line.contains(token)) {
+ String[] key = line.split(":", 2);
+ if (key.length > 1) {
+ return key[1].trim();
+ }
+ }
+ }
+ return "";
+ }
+
+ private String getLinuxCpuName() {
+ String contents = getFileContent("/proc/cpuinfo");
+ String token = "model name";
+ for (String line : contents.split("\n")) {
+ if (line.contains(token)) {
+ String[] key = line.split(":", 2);
+ if (key.length > 1) {
+ return key[1].trim();
+ }
+ }
+ }
+ return "";
+ }
+
+ private String getLinuxVirtCpus() {
+ Set<String> set = new HashSet<String>();
+ String contents = getFileContent("/proc/cpuinfo");
+ String token = "processor";
+ for (String line : contents.split("\n")) {
+ if (line.contains(token)) {
+ String[] key = line.split(":", 2);
+ if (key.length > 1) {
+ set.add(key[1].trim());
+ }
+ }
+ }
+ return "" + set.size();
+ }
+
+ private String getLinuxCores() {
+ Set<String> set = new HashSet<String>();
+ String contents = getFileContent("/proc/cpuinfo");
+ String token = "core id";
+ for (String line : contents.split("\n")) {
+ if (line.contains(token)) {
+ String[] key = line.split(":", 2);
+ if (key.length > 1) {
+ set.add(key[1].trim());
+ }
+ }
+ }
+ if (set.size() == 0) {
+ return "1";
+ }
+ return "" + set.size();
+ }
+
+ private String getLinuxPhysMem() {
+ String contents = getFileContent("/proc/meminfo");
+ for (String line : contents.split("\n")) {
+ if (line.contains("MemTotal")) {
+ String[] total = line.split(":", 2);
+ if (total.length > 1) {
+ String[] mem = total[1].trim().split(" ");
+ if (mem.length >= 1) {
+ return mem[0].trim();
+ } else {
+ return total[1].trim();
+ }
+ }
+ }
+ }
+
+ return "";
+ }
+
+ private String getLinuxSockets() {
+ Set<String> physIdSet = new HashSet<String>();
+ Set<String> procSet = new HashSet<String>();
+ String contents = getFileContent("/proc/cpuinfo");
+ String physIdToken = "physical id";
+ String procToken = "processor";
+
+ for (String line : contents.split("\n")) {
+ if (line.contains(physIdToken)) {
+ String[] key = line.split(":", 2);
+ if (key.length > 1) {
+ physIdSet.add(key[1].trim());
+ }
+ }
+
+ if (line.contains(procToken)) {
+ String[] key = line.split(":", 2);
+ if (key.length > 1) {
+ procSet.add(key[1].trim());
+ }
+ }
+ }
+ if (physIdSet.size() != 0) {
+ return "" + physIdSet.size();
+ }
+ return "" + procSet.size();
+ }
}
diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
index 44ce33dece..c58d83a33d 100644
--- a/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationData.java
@@ -1,473 +1,531 @@
-/*************************************************************************
- *
- * 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
- *
- * $RCSfile: RegistrationData.java,v $
- *
- * $Revision: 1.2 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.servicetag;
-
-import java.io.*;
-import java.net.UnknownHostException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import static com.sun.star.servicetag.RegistrationDocument.*;
-
-/**
- * A {@code RegistrationData} object is a container of one or more
- * {@link #getServiceTags service tags} that identify the
- * components for product registration.
- * Each {@code RegistrationData} object has a {@link #getRegistrationURN
- * uniform resource name} (URN) as its identifier.
- * <a name="EnvMap"></a>
- * It also has an <i>environment map</i> with
- * the following elements:
- * <blockquote>
- * <table border=0>
- * <tr>
- * <td><tt>hostname</tt></td>
- * <td>Hostname of the system</td>
- * <td>e.g. woody</td>
- * </tr>
- * <tr>
- * <td><tt>hostId</tt></td>
- * <td>Host ID of the system</td>
- * <td>e.g. 83abc1ab</td>
- * </tr>
- * <tr>
- * <td><tt>osName</tt></td>
- * <td>Operating system name</td>
- * <td> e.g. SunOS</td>
- * </tr>
- * <tr>
- * <td><tt>osVersion</tt></td>
- * <td>Operating system version</td>
- * <td> e.g. 5.10</td>
- * </tr>
- * <tr>
- * <td><tt>osArchitecture</tt></td>
- * <td>Operating system architecture</td>
- * <td> e.g. sparc</td>
- * </tr>
- * <tr>
- * <td><tt>systemModel</tt></td>
- * <td>System model</td>
- * <td> e.g. SUNW,Sun-Fire-V440</td>
- * </tr>
- * <tr>
- * <td><tt>systemManufacturer</tt></td>
- * <td>System manufacturer</td>
- * <td> e.g. Sun Microsystems</td>
- * </tr>
- * <tr>
- * <td><tt>cpuManufacturer</tt></td>
- * <td>CPU manufacturer</td>
- * <td> e.g. Sun Microsystems</td>
- * </tr>
- * <tr>
- * <td><tt>serialNumber</tt></td>
- * <td>System serial number</td>
- * <td> e.g. BEL078932</td>
- * </tr>
- * </table>
- * </blockquote>
- * The <tt>hostname</tt> and <tt>osName</tt> element must have a non-empty value.
- * If an element is not available on a system and their value will be
- * empty.
- * <p>
- * <a name="XMLSchema">
- * <b>Registration XML Schema</b></a>
- * <p>
- * A {@code RegistrationData} object can be {@link #loadFromXML loaded} from
- * and {@link #storeToXML stored} into an XML file in the format described
- * by the
- * <a href="https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/product_registration.xsd">
- * registration data schema</a>. The registration data schema is defined by the
- * Service Tags Technology.
- * <p>
- * Typically the registration data is constructed at installation time
- * and stored in an XML file for later service tag lookup or registration.
- *
- * <p>
- * <b>Example Usage</b>
- * <p>
- * The examples below show how the {@code RegistrationData} can be
- * used for product registration.
- * Exception handling is not shown in these examples for clarity.
- * <ol>
- * <li>This example shows how the JDK creates a JDK service tag, installs it
- * in the system service tag registry and adds it to the registration data.
- * <br>
- * <blockquote><pre>
- * // create a service tag object with an instance_urn
- * ServiceTag st = ServiceTag.newInstance(ServiceTag.generateInstanceURN(),
- * ....);
- * // Adds to the system service tag registry if supported
- * if (Registry.isSupported()) {
- * Registry.getSystemRegistry().addServiceTag(st);
- * }
- *
- * // add to the registration data
- * RegistrationData registration = new RegistrationData();
- * registration.addServiceTag(st);
- * </pre></blockquote>
- * </li>
- * <li>At this point, the registration data is ready to
- * send to Sun Connection for registration. This example shows how to register
- * the JDK via the <i>Registration Relay Service</i>.
- * <p>
- * There are several registration services for Sun Connection. For example,
- * the <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/RegistrationRelayService">
- * Registration Relay Service</a> is a web application interface that
- * processes the registration data payload sent via HTTP post
- * and hosts the registration user interface for a specified
- * registration URL. Refer to the
- * Registration Relay Service Specification for details.
- * <p>
- * <blockquote><pre>
- * // Open the connection to the URL of the registration service
- * HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
- * con.setDoInput(true);
- * con.setDoOutput(true);
- * con.setUseCaches(false);
- * con.setAllowUserInteraction(false);
- * con.setRequestMethod("POST");
- * con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");
- * con.connect();
- *
- * // send the registration data to the registration service
- * OutputStream out = con.getOutputStream();
- * registration.storeToXML(out);
- * out.close();
- * </pre></blockquote>
- * </li>
- * <li>This example shows how to store the registration data in an XML file.
- * for later service tag lookup or registration.
- * <br>
- * <blockquote><pre>
- * BufferedOutputStream out = new BufferedOutputStream(
- * new FileOutputStream(""&lt;JAVA_HOME&gt;/lib/servicetag/registration.xml"));
- * registration.storeToXML(out);
- * out.close();
- * </pre></blockquote>
- * </li>
- * <li>This example shows how to install service tags that are in the
- * registration data in the system service tag registry when determined
- * to be available. The system service tag registry might not have existed
- * when the registration data was constructed.
- * <br>
- * <blockquote><pre>
- * if (Registry.isSupported()) {
- * Set&lt;ServiceTag&gt; svctags = registration.getServiceTags();
- * for (ServiceTag st : svctags) {
- * Registry.getSystemRegistry().addServiceTag(st);
- * }
- * }
- * </pre></blockquote>
- * </li>
- * </ol>
- *
- * @see <a href="https://sunconnection.sun.com/inventory">Sun Connection Inventory Channel</a>
- */
-public class RegistrationData {
- private final Map<String, String> environment;
- private final Map<String, ServiceTag> svcTagMap;
- private final String urn;
-
- /**
- * Creates a {@code RegistrationData} object with a generated
- * {@link #getRegistrationURN registration URN}.
- * The following keys in the {@link #getEnvironmentMap environment map}
- * will be initialized for the configuration of the
- * running system:
- * <blockquote>
- * <tt>hostname</tt>, <tt>osName</tt>, <tt>osVersion</tt> and
- * <tt>osArchitecture</tt>
- * </blockquote>
- * and the value of other keys may be empty.
- */
- public RegistrationData() {
- this(Util.generateURN());
- }
-
- // package private
- RegistrationData(String urn) {
- this.urn = urn;
- this.environment = initEnvironment();
- this.svcTagMap = new LinkedHashMap<String, ServiceTag>();
- }
-
- private Map<String, String> initEnvironment() {
- Map<String, String> map = new LinkedHashMap<String, String>();
- SystemEnvironment sysEnv = SystemEnvironment.getSystemEnvironment();
- map.put(ST_NODE_HOSTNAME, sysEnv.getHostname());
- map.put(ST_NODE_HOST_ID, sysEnv.getHostId());
- map.put(ST_NODE_OS_NAME, sysEnv.getOsName());
- map.put(ST_NODE_OS_VERSION, sysEnv.getOsVersion());
- map.put(ST_NODE_OS_ARCH, sysEnv.getOsArchitecture());
- map.put(ST_NODE_SYSTEM_MODEL, sysEnv.getSystemModel());
- map.put(ST_NODE_SYSTEM_MANUFACTURER, sysEnv.getSystemManufacturer());
- map.put(ST_NODE_CPU_MANUFACTURER, sysEnv.getCpuManufacturer());
- map.put(ST_NODE_SERIAL_NUMBER, sysEnv.getSerialNumber());
- return map;
- }
-
- /**
- * Returns the uniform resource name of this registration data
- * in this format:
- * <tt>urn:st:&lt;32-char {@link java.util.UUID uuid}&gt;</tt>
- *
- * @return the URN of this registration data.
- */
- public String getRegistrationURN() {
- return urn;
- }
-
- /**
- * Returns a map containing the environment information for this
- * registration data. See the set of <a href="#EnvMap">keys</a>
- * in the environment map. Subsequent update to the environment
- * map via the {@link #setEnvironment setEnvironment} method will not be reflected
- * in the returned map.
- *
- * @return an environment map for this registration data.
- */
- public Map<String, String> getEnvironmentMap() {
- return new LinkedHashMap<String,String>(environment);
- }
-
- /**
- * Sets an element of the specified {@code name} in the environment map
- * with the given {@code value}.
- *
- * @throws IllegalArgumentException if {@code name} is not a valid key
- * in the environment map, or {@code value} is not valid.
- */
- public void setEnvironment(String name, String value) {
- if (name == null) {
- throw new NullPointerException("name is null");
- }
- if (value == null) {
- throw new NullPointerException("value is null");
- }
- if (environment.containsKey(name)) {
- if (name.equals(ST_NODE_HOSTNAME) || name.equals(ST_NODE_OS_NAME)) {
- if (value.length() == 0) {
- throw new IllegalArgumentException("\"" +
- name + "\" requires non-empty value.");
- }
- }
- environment.put(name, value);
- } else {
- throw new IllegalArgumentException("\"" +
- name + "\" is not an environment element.");
- }
- }
-
- /**
- * Returns all service tags in this registration data.
- *
- * @return a {@link Set Set} of the service tags
- * in this registration data.
- */
- public Set<ServiceTag> getServiceTags() {
- return new HashSet<ServiceTag>(svcTagMap.values());
- }
-
- /**
- * Adds a service tag to this registration data.
- * If the given service tag has an empty <tt>instance_urn</tt>,
- * this method will generate a URN and place it in the copy
- * of the service tag in this registration data.
- * This method will return the {@code ServiceTag} object
- * added to this registration data.
- *
- * @param st {@code ServiceTag} object to be added.
- * @return a {@code ServiceTag} object added to this registration data.
- *
- * @throws IllegalArgumentException if
- * a service tag of the same {@link ServiceTag#getInstanceURN
- * <tt>instance_urn</tt>} already exists in the registry.
- */
- public synchronized ServiceTag addServiceTag(ServiceTag st) {
- ServiceTag svcTag = ServiceTag.newInstanceWithUrnTimestamp(st);
-
- String instanceURN = svcTag.getInstanceURN();
- if (svcTagMap.containsKey(instanceURN)) {
- throw new IllegalArgumentException("Instance_urn = " + instanceURN +
- " already exists in the registration data.");
- } else {
- svcTagMap.put(instanceURN, svcTag);
- }
- return svcTag;
- }
-
- /**
- * Returns a service tag of the given <tt>instance_urn</tt> in this registration
- * data.
- *
- * @param instanceURN the <tt>instance_urn</tt> of the service tag
- * @return the {@code ServiceTag} object of the given <tt>instance_urn</tt>
- * if exists; otherwise return {@code null}.
- */
- public synchronized ServiceTag getServiceTag(String instanceURN) {
- if (instanceURN == null) {
- throw new NullPointerException("instanceURN is null");
- }
- return svcTagMap.get(instanceURN);
- }
-
- /**
- * Removes a service tag of the given <tt>instance_urn</tt> from this
- * registration data.
- *
- * @param instanceURN the <tt>instance_urn</tt> of
- * the service tag to be removed.
- *
- * @return the removed {@code ServiceTag} object;
- * or {@code null} if the service tag does not exist in this
- * registration data.
- */
- public synchronized ServiceTag removeServiceTag(String instanceURN) {
- if (instanceURN == null) {
- throw new NullPointerException("instanceURN is null");
- }
-
- ServiceTag svcTag = null;
- if (svcTagMap.containsKey(instanceURN)) {
- svcTag = svcTagMap.remove(instanceURN);
- }
- return svcTag;
- }
-
- /**
- * Updates the <tt>product_defined_instance_id</tt> in the service tag
- * of the given <tt>instance_urn</tt> in this registration data.
- *
- * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated.
- * @param productDefinedInstanceID the value of the
- * <tt>product_defined_instance_id</tt> to be set.
- *
- * @return the updated {@code ServiceTag} object;
- * or {@code null} if the service tag does not exist in this
- * registration data.
- */
- public synchronized ServiceTag updateServiceTag(String instanceURN,
- String productDefinedInstanceID) {
- ServiceTag svcTag = getServiceTag(instanceURN);
- if (svcTag == null) {
- return null;
- }
-
- svcTag = ServiceTag.newInstanceWithUrnTimestamp(svcTag);
- // update the product defined instance ID field
- svcTag.setProductDefinedInstanceID(productDefinedInstanceID);
- svcTagMap.put(instanceURN, svcTag);
- return svcTag;
- }
-
- /**
- * Reads the registration data from the XML document on the
- * specified input stream. The XML document must be
- * in the format described by the <a href="#XMLSchema">
- * registration data schema</a>.
- * The specified stream is closed after this method returns.
- *
- * @param in the input stream from which to read the XML document.
- * @return a {@code RegistrationData} object read from the input
- * stream.
- *
- * @throws IllegalArgumentException if the input stream
- * contains an invalid registration data.
- *
- * @throws IOException if an error occurred when reading from the input stream.
- */
- public static RegistrationData loadFromXML(InputStream in) throws IOException {
- try {
- return RegistrationDocument.load(in);
- } finally {
- in.close();
- }
- }
-
- /**
- * Writes the registration data to the specified output stream
- * in the format described by the <a href="#XMLSchema">
- * registration data schema</a> with "UTF-8" encoding.
- * The specified stream remains open after this method returns.
- *
- * @param os the output stream on which to write the XML document.
- *
- * @throws IOException if an error occurred when writing to the output stream.
- */
- public void storeToXML(OutputStream os) throws IOException {
- RegistrationDocument.store(os, this);
- os.flush();
- }
-
- /**
- * Returns a newly allocated byte array containing the registration
- * data in XML format.
- *
- * @return a newly allocated byte array containing the registration
- * data in XML format.
- */
- public byte[] toXML() {
- try {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- storeToXML(out);
- return out.toByteArray();
- } catch (IOException e) {
- // should not reach here
- return new byte[0];
- }
- }
-
- /**
- * Returns a string representation of this registration data in XML
- * format.
- *
- * @return a string representation of this registration data in XML
- * format.
- */
- @Override
- public String toString() {
- try {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- storeToXML(out);
- return out.toString("UTF-8");
- } catch (IOException e) {
- // should not reach here
- return "Error creating the return string.";
- }
- }
-}
+
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can obtain
+ * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+ * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ * Sun designates this particular file as subject to the "Classpath" exception
+ * as provided by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License
+ * Header, with the fields enclosed by brackets [] replaced by your own
+ * identifying information: "Portions Copyrighted [year]
+ * [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.star.servicetag;
+
+import java.io.*;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import static com.sun.star.servicetag.RegistrationDocument.*;
+
+/**
+ * A {@code RegistrationData} object is a container of one or more
+ * {@link #getServiceTags service tags} that identify the
+ * components for product registration.
+ * Each {@code RegistrationData} object has a {@link #getRegistrationURN
+ * uniform resource name} (URN) as its identifier.
+ * <a name="EnvMap"></a>
+ * It also has an <i>environment map</i> with
+ * the following elements:
+ * <blockquote>
+ * <table border=0>
+ * <tr>
+ * <td><tt>hostname</tt></td>
+ * <td>Hostname of the system</td>
+ * <td>e.g. woody</td>
+ * </tr>
+ * <tr>
+ * <td><tt>hostId</tt></td>
+ * <td>Host ID of the system</td>
+ * <td>e.g. 83abc1ab</td>
+ * </tr>
+ * <tr>
+ * <td><tt>osName</tt></td>
+ * <td>Operating system name</td>
+ * <td> e.g. SunOS</td>
+ * </tr>
+ * <tr>
+ * <td><tt>osVersion</tt></td>
+ * <td>Operating system version</td>
+ * <td> e.g. 5.10</td>
+ * </tr>
+ * <tr>
+ * <td><tt>osArchitecture</tt></td>
+ * <td>Operating system architecture</td>
+ * <td> e.g. sparc</td>
+ * </tr>
+ * <tr>
+ * <td><tt>systemModel</tt></td>
+ * <td>System model</td>
+ * <td> e.g. SUNW,Sun-Fire-V440</td>
+ * </tr>
+ * <tr>
+ * <td><tt>systemManufacturer</tt></td>
+ * <td>System manufacturer</td>
+ * <td> e.g. Sun Microsystems</td>
+ * </tr>
+ * <tr>
+ * <td><tt>cpuManufacturer</tt></td>
+ * <td>CPU manufacturer</td>
+ * <td> e.g. Sun Microsystems</td>
+ * </tr>
+ * <tr>
+ * <td><tt>serialNumber</tt></td>
+ * <td>System serial number</td>
+ * <td> e.g. BEL078932</td>
+ * </tr>
+ * <tr>
+ * <td><tt>physmem</tt></td>
+ * <td>Physical memory for the system (in MB)</td>
+ * <td> e.g. 4096</td>
+ * </tr>
+ * </table>
+ * </blockquote>
+ * The <tt>hostname</tt> and <tt>osName</tt> element must have a non-empty value.
+ * If an element is not available on a system and their value will be
+ * empty.
+ * <p>
+ * <a name="XMLSchema">
+ * <b>Registration XML Schema</b></a>
+ * <p>
+ * A {@code RegistrationData} object can be {@link #loadFromXML loaded} from
+ * and {@link #storeToXML stored} into an XML file in the format described
+ * by the
+ * <a href="https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/product_registration.xsd">
+ * registration data schema</a>. The registration data schema is defined by the
+ * Service Tags Technology.
+ * <p>
+ * Typically the registration data is constructed at installation time
+ * and stored in an XML file for later service tag lookup or registration.
+ *
+ * <p>
+ * <b>Example Usage</b>
+ * <p>
+ * The examples below show how the {@code RegistrationData} can be
+ * used for product registration.
+ * Exception handling is not shown in these examples for clarity.
+ * <ol>
+ * <li>This example shows how the JDK creates a JDK service tag, installs it
+ * in the system service tag registry and adds it to the registration data.
+ * <br>
+ * <blockquote><pre>
+ * // create a service tag object with an instance_urn
+ * ServiceTag st = ServiceTag.newInstance(ServiceTag.generateInstanceURN(),
+ * ....);
+ * // Adds to the system service tag registry if supported
+ * if (Registry.isSupported()) {
+ * Registry.getSystemRegistry().addServiceTag(st);
+ * }
+ *
+ * // add to the registration data
+ * RegistrationData registration = new RegistrationData();
+ * registration.addServiceTag(st);
+ * </pre></blockquote>
+ * </li>
+ * <li>At this point, the registration data is ready to
+ * send to Sun Connection for registration. This example shows how to register
+ * the JDK via the <i>Registration Relay Service</i>.
+ * <p>
+ * There are several registration services for Sun Connection. For example,
+ * the <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/RegistrationRelayService">
+ * Registration Relay Service</a> is a web application interface that
+ * processes the registration data payload sent via HTTP post
+ * and hosts the registration user interface for a specified
+ * registration URL. Refer to the
+ * Registration Relay Service Specification for details.
+ * <p>
+ * <blockquote><pre>
+ * // Open the connection to the URL of the registration service
+ * HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
+ * con.setDoInput(true);
+ * con.setDoOutput(true);
+ * con.setUseCaches(false);
+ * con.setAllowUserInteraction(false);
+ * con.setRequestMethod("POST");
+ * con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");
+ * con.connect();
+ *
+ * // send the registration data to the registration service
+ * OutputStream out = con.getOutputStream();
+ * registration.storeToXML(out);
+ * out.close();
+ * </pre></blockquote>
+ * </li>
+ * <li>This example shows how to store the registration data in an XML file.
+ * for later service tag lookup or registration.
+ * <br>
+ * <blockquote><pre>
+ * BufferedOutputStream out = new BufferedOutputStream(
+ * new FileOutputStream(""&lt;JAVA_HOME&gt;/lib/servicetag/registration.xml"));
+ * registration.storeToXML(out);
+ * out.close();
+ * </pre></blockquote>
+ * </li>
+ * <li>This example shows how to install service tags that are in the
+ * registration data in the system service tag registry when determined
+ * to be available. The system service tag registry might not have existed
+ * when the registration data was constructed.
+ * <br>
+ * <blockquote><pre>
+ * if (Registry.isSupported()) {
+ * Set&lt;ServiceTag&gt; svctags = registration.getServiceTags();
+ * for (ServiceTag st : svctags) {
+ * Registry.getSystemRegistry().addServiceTag(st);
+ * }
+ * }
+ * </pre></blockquote>
+ * </li>
+ * </ol>
+ *
+ * @see <a href="https://sunconnection.sun.com/inventory">Sun Connection Inventory Channel</a>
+ */
+public class RegistrationData {
+ private final Map<String, String> environment;
+ private final Map<String, String> cpuInfo;
+ private final Map<String, ServiceTag> svcTagMap;
+ private final String urn;
+
+ /**
+ * Creates a {@code RegistrationData} object with a generated
+ * {@link #getRegistrationURN registration URN}.
+ * The following keys in the {@link #getEnvironmentMap environment map}
+ * will be initialized for the configuration of the
+ * running system:
+ * <blockquote>
+ * <tt>hostname</tt>, <tt>osName</tt>, <tt>osVersion</tt> and
+ * <tt>osArchitecture</tt>
+ * </blockquote>
+ * and the value of other keys may be empty.
+ */
+ public RegistrationData() {
+ this(Util.generateURN());
+ }
+
+ // package private
+ RegistrationData(String urn) {
+ this.urn = urn;
+ SystemEnvironment sysEnv = SystemEnvironment.getSystemEnvironment();
+ this.environment = initEnvironment(sysEnv);
+ this.cpuInfo = initCpuInfo(sysEnv);
+ this.svcTagMap = new LinkedHashMap<String, ServiceTag>();
+ }
+
+ private Map<String, String> initEnvironment(SystemEnvironment sysEnv) {
+ Map<String, String> map = new LinkedHashMap<String, String>();
+ map.put(ST_NODE_HOSTNAME, sysEnv.getHostname());
+ map.put(ST_NODE_HOST_ID, sysEnv.getHostId());
+ map.put(ST_NODE_OS_NAME, sysEnv.getOsName());
+ map.put(ST_NODE_OS_VERSION, sysEnv.getOsVersion());
+ map.put(ST_NODE_OS_ARCH, sysEnv.getOsArchitecture());
+ map.put(ST_NODE_SYSTEM_MODEL, sysEnv.getSystemModel());
+ map.put(ST_NODE_SYSTEM_MANUFACTURER, sysEnv.getSystemManufacturer());
+ map.put(ST_NODE_CPU_MANUFACTURER, sysEnv.getCpuManufacturer());
+ map.put(ST_NODE_SERIAL_NUMBER, sysEnv.getSerialNumber());
+ map.put(ST_NODE_PHYS_MEM, sysEnv.getPhysMem());
+ return map;
+ }
+
+ private Map<String, String> initCpuInfo(SystemEnvironment sysEnv) {
+ Map<String, String> map = new LinkedHashMap<String, String>();
+ map.put(ST_NODE_SOCKETS, sysEnv.getSockets());
+ map.put(ST_NODE_CORES, sysEnv.getCores());
+ map.put(ST_NODE_VIRT_CPUS, sysEnv.getVirtCpus());
+ map.put(ST_NODE_CPU_NAME, sysEnv.getCpuName());
+ map.put(ST_NODE_CLOCK_RATE, sysEnv.getClockRate());
+ return map;
+ }
+
+ /**
+ * Returns the uniform resource name of this registration data
+ * in this format:
+ * <tt>urn:st:&lt;32-char {@link java.util.UUID uuid}&gt;</tt>
+ *
+ * @return the URN of this registration data.
+ */
+ public String getRegistrationURN() {
+ return urn;
+ }
+
+ /**
+ * Returns a map containing the environment information for this
+ * registration data. See the set of <a href="#EnvMap">keys</a>
+ * in the environment map. Subsequent update to the environment
+ * map via the {@link #setEnvironment setEnvironment} method will not be reflected
+ * in the returned map.
+ *
+ * @return an environment map for this registration data.
+ */
+ public Map<String, String> getEnvironmentMap() {
+ return new LinkedHashMap<String,String>(environment);
+ }
+
+ /**
+ * Returns a map containing the cpu information for this
+ * registration data. Subsequent update to the cpu info
+ * map via the {@link #setCpuInfo setCpuInfo} method will not be reflected
+ * in the returned map.
+ *
+ * @return a cpu info map for this registration data.
+ */
+ public Map<String, String> getCpuInfoMap() {
+ return new LinkedHashMap<String,String>(cpuInfo);
+ }
+
+ /**
+ * Sets an element of the specified {@code name} in the environment map
+ * with the given {@code value}.
+ *
+ * @throws IllegalArgumentException if {@code name} is not a valid key
+ * in the environment map, or {@code value} is not valid.
+ */
+ public void setEnvironment(String name, String value) {
+ if (name == null) {
+ throw new NullPointerException("name is null");
+ }
+ if (value == null) {
+ throw new NullPointerException("value is null");
+ }
+ if (environment.containsKey(name)) {
+ if (name.equals(ST_NODE_HOSTNAME) || name.equals(ST_NODE_OS_NAME)) {
+ if (value.length() == 0) {
+ throw new IllegalArgumentException("\"" +
+ name + "\" requires non-empty value.");
+ }
+ }
+ environment.put(name, value);
+ } else {
+ throw new IllegalArgumentException("\"" +
+ name + "\" is not an environment element.");
+ }
+ }
+
+ /**
+ * Sets an element of the specified {@code name} in the cpu info map
+ * with the given {@code value}.
+ *
+ * @throws IllegalArgumentException if {@code name} is not a valid key
+ * in the cpu info map, or {@code value} is not valid.
+ */
+ public void setCpuInfo(String name, String value) {
+ if (name == null) {
+ throw new NullPointerException("name is null");
+ }
+ if (value == null) {
+ throw new NullPointerException("value is null");
+ }
+ if (cpuInfo.containsKey(name)) {
+ cpuInfo.put(name, value);
+ } else {
+ throw new IllegalArgumentException("\"" +
+ name + "\" is not an cpuinfo element.");
+ }
+ }
+
+ /**
+ * Returns all service tags in this registration data.
+ *
+ * @return a {@link Set Set} of the service tags
+ * in this registration data.
+ */
+ public Set<ServiceTag> getServiceTags() {
+ return new HashSet<ServiceTag>(svcTagMap.values());
+ }
+
+ /**
+ * Adds a service tag to this registration data.
+ * If the given service tag has an empty <tt>instance_urn</tt>,
+ * this method will generate a URN and place it in the copy
+ * of the service tag in this registration data.
+ * This method will return the {@code ServiceTag} object
+ * added to this registration data.
+ *
+ * @param st {@code ServiceTag} object to be added.
+ * @return a {@code ServiceTag} object added to this registration data.
+ *
+ * @throws IllegalArgumentException if
+ * a service tag of the same {@link ServiceTag#getInstanceURN
+ * <tt>instance_urn</tt>} already exists in the registry.
+ */
+ public synchronized ServiceTag addServiceTag(ServiceTag st) {
+ ServiceTag svcTag = ServiceTag.newInstanceWithUrnTimestamp(st);
+
+ String instanceURN = svcTag.getInstanceURN();
+ if (svcTagMap.containsKey(instanceURN)) {
+ throw new IllegalArgumentException("Instance_urn = " + instanceURN +
+ " already exists in the registration data.");
+ } else {
+ svcTagMap.put(instanceURN, svcTag);
+ }
+ return svcTag;
+ }
+
+ /**
+ * Returns a service tag of the given <tt>instance_urn</tt> in this registration
+ * data.
+ *
+ * @param instanceURN the <tt>instance_urn</tt> of the service tag
+ * @return the {@code ServiceTag} object of the given <tt>instance_urn</tt>
+ * if exists; otherwise return {@code null}.
+ */
+ public synchronized ServiceTag getServiceTag(String instanceURN) {
+ if (instanceURN == null) {
+ throw new NullPointerException("instanceURN is null");
+ }
+ return svcTagMap.get(instanceURN);
+ }
+
+ /**
+ * Removes a service tag of the given <tt>instance_urn</tt> from this
+ * registration data.
+ *
+ * @param instanceURN the <tt>instance_urn</tt> of
+ * the service tag to be removed.
+ *
+ * @return the removed {@code ServiceTag} object;
+ * or {@code null} if the service tag does not exist in this
+ * registration data.
+ */
+ public synchronized ServiceTag removeServiceTag(String instanceURN) {
+ if (instanceURN == null) {
+ throw new NullPointerException("instanceURN is null");
+ }
+
+ ServiceTag svcTag = null;
+ if (svcTagMap.containsKey(instanceURN)) {
+ svcTag = svcTagMap.remove(instanceURN);
+ }
+ return svcTag;
+ }
+
+ /**
+ * Updates the <tt>product_defined_instance_id</tt> in the service tag
+ * of the given <tt>instance_urn</tt> in this registration data.
+ *
+ * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated.
+ * @param productDefinedInstanceID the value of the
+ * <tt>product_defined_instance_id</tt> to be set.
+ *
+ * @return the updated {@code ServiceTag} object;
+ * or {@code null} if the service tag does not exist in this
+ * registration data.
+ */
+ public synchronized ServiceTag updateServiceTag(String instanceURN,
+ String productDefinedInstanceID) {
+ ServiceTag svcTag = getServiceTag(instanceURN);
+ if (svcTag == null) {
+ return null;
+ }
+
+ svcTag = ServiceTag.newInstanceWithUrnTimestamp(svcTag);
+ // update the product defined instance ID field
+ svcTag.setProductDefinedInstanceID(productDefinedInstanceID);
+ svcTagMap.put(instanceURN, svcTag);
+ return svcTag;
+ }
+
+ /**
+ * Reads the registration data from the XML document on the
+ * specified input stream. The XML document must be
+ * in the format described by the <a href="#XMLSchema">
+ * registration data schema</a>.
+ * The specified stream is closed after this method returns.
+ *
+ * @param in the input stream from which to read the XML document.
+ * @return a {@code RegistrationData} object read from the input
+ * stream.
+ *
+ * @throws IllegalArgumentException if the input stream
+ * contains an invalid registration data.
+ *
+ * @throws IOException if an error occurred when reading from the input stream.
+ */
+ public static RegistrationData loadFromXML(InputStream in) throws IOException {
+ try {
+ return RegistrationDocument.load(in);
+ } finally {
+ in.close();
+ }
+ }
+
+ /**
+ * Writes the registration data to the specified output stream
+ * in the format described by the <a href="#XMLSchema">
+ * registration data schema</a> with "UTF-8" encoding.
+ * The specified stream remains open after this method returns.
+ *
+ * @param os the output stream on which to write the XML document.
+ *
+ * @throws IOException if an error occurred when writing to the output stream.
+ */
+ public void storeToXML(OutputStream os) throws IOException {
+ RegistrationDocument.store(os, this);
+ os.flush();
+ }
+
+ /**
+ * Returns a newly allocated byte array containing the registration
+ * data in XML format.
+ *
+ * @return a newly allocated byte array containing the registration
+ * data in XML format.
+ */
+ public byte[] toXML() {
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ storeToXML(out);
+ return out.toByteArray();
+ } catch (IOException e) {
+ // should not reach here
+ return new byte[0];
+ }
+ }
+
+ /**
+ * Returns a string representation of this registration data in XML
+ * format.
+ *
+ * @return a string representation of this registration data in XML
+ * format.
+ */
+ @Override
+ public String toString() {
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ storeToXML(out);
+ return out.toString("UTF-8");
+ } catch (IOException e) {
+ // should not reach here
+ return "Error creating the return string.";
+ }
+ }
+}
diff --git a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
index ae810d205f..93a1f25a6c 100644
--- a/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
+++ b/desktop/source/registration/com/sun/star/servicetag/RegistrationDocument.java
@@ -1,374 +1,440 @@
-/*************************************************************************
- *
- * 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
- *
- * $RCSfile: RegistrationDocument.java,v $
- *
- * $Revision: 1.2 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.servicetag;
-
-import java.io.*;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-
-// For write operation
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-/**
- * XML Support Class for Product Registration.
- */
-class RegistrationDocument {
-
- private static final String REGISTRATION_DATA_SCHEMA =
- "/com/sun/star/servicetag/resources/product_registration.xsd";
- private static final String REGISTRATION_DATA_VERSION = "1.0";
- private static final String SERVICE_TAG_VERSION = "1.0";
- final static String ST_NODE_REGISTRATION_DATA = "registration_data";
- final static String ST_ATTR_REGISTRATION_VERSION = "version";
- final static String ST_NODE_ENVIRONMENT = "environment";
- final static String ST_NODE_HOSTNAME = "hostname";
- final static String ST_NODE_HOST_ID = "hostId";
- final static String ST_NODE_OS_NAME = "osName";
- final static String ST_NODE_OS_VERSION = "osVersion";
- final static String ST_NODE_OS_ARCH = "osArchitecture";
- final static String ST_NODE_SYSTEM_MODEL = "systemModel";
- final static String ST_NODE_SYSTEM_MANUFACTURER = "systemManufacturer";
- final static String ST_NODE_CPU_MANUFACTURER = "cpuManufacturer";
- final static String ST_NODE_SERIAL_NUMBER = "serialNumber";
- final static String ST_NODE_REGISTRY = "registry";
- final static String ST_ATTR_REGISTRY_URN = "urn";
- final static String ST_ATTR_REGISTRY_VERSION = "version";
- final static String ST_NODE_SERVICE_TAG = "service_tag";
- final static String ST_NODE_INSTANCE_URN = "instance_urn";
- final static String ST_NODE_PRODUCT_NAME = "product_name";
- final static String ST_NODE_PRODUCT_VERSION = "product_version";
- final static String ST_NODE_PRODUCT_URN = "product_urn";
- final static String ST_NODE_PRODUCT_PARENT_URN = "product_parent_urn";
- final static String ST_NODE_PRODUCT_PARENT = "product_parent";
- final static String ST_NODE_PRODUCT_DEFINED_INST_ID = "product_defined_inst_id";
- final static String ST_NODE_PRODUCT_VENDOR = "product_vendor";
- final static String ST_NODE_PLATFORM_ARCH = "platform_arch";
- final static String ST_NODE_TIMESTAMP = "timestamp";
- final static String ST_NODE_CONTAINER = "container";
- final static String ST_NODE_SOURCE = "source";
- final static String ST_NODE_INSTALLER_UID = "installer_uid";
-
- static RegistrationData load(InputStream in) throws IOException {
- Document document = initializeDocument(in);
-
- // Gets the registration URN
- Element root = getRegistrationDataRoot(document);
- Element registryRoot =
- getSingletonElementFromRoot(root, ST_NODE_REGISTRY);
- String urn = registryRoot.getAttribute(ST_ATTR_REGISTRY_URN);
-
- // Construct a new RegistrationData object from the DOM tree
- // Initialize the environment map and service tags
- RegistrationData regData = new RegistrationData(urn);
- addServiceTags(registryRoot, regData);
-
- Element envRoot = getSingletonElementFromRoot(root, ST_NODE_ENVIRONMENT);
- buildEnvironmentMap(envRoot, regData);
- return regData;
- }
-
- static void store(OutputStream os, RegistrationData registration)
- throws IOException {
- // create a new document with the root node
- Document document = initializeDocument();
-
- // create the nodes for the environment map and the service tags
- // in the registration data
- addEnvironmentNodes(document,
- registration.getEnvironmentMap());
- addServiceTagRegistry(document,
- registration.getRegistrationURN(),
- registration.getServiceTags());
- transform(document, os);
- }
-
- // initialize a document from an input stream
- private static Document initializeDocument(InputStream in) throws IOException {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- try {
- // XML schema for validation
- SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- URL xsdUrl = RegistrationDocument.class.getResource(REGISTRATION_DATA_SCHEMA);
- Schema schema = sf.newSchema(xsdUrl);
- Validator validator = schema.newValidator();
-
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document doc = builder.parse(new InputSource(in));
- validator.validate(new DOMSource(doc));
- return doc;
- } catch (SAXException sxe) {
- IllegalArgumentException e = new IllegalArgumentException("Error generated in parsing");
- e.initCause(sxe);
- throw e;
- } catch (ParserConfigurationException pce) {
- // Parser with specific options can't be built
- // should not reach here
- InternalError x = new InternalError("Error in creating the new document");
- x.initCause(pce);
- throw x;
- }
- }
-
- // initialize a new document for the registration data
- private static Document initializeDocument() throws IOException {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- try {
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document doc = builder.newDocument();
-
- // initialize the document with the registration_data root
- Element root = doc.createElement(ST_NODE_REGISTRATION_DATA);
- doc.appendChild(root);
- root.setAttribute(ST_ATTR_REGISTRATION_VERSION, REGISTRATION_DATA_VERSION);
-
- return doc;
- } catch (ParserConfigurationException pce) {
- // Parser with specified options can't be built
- // should not reach here
- InternalError x = new InternalError("Error in creating the new document");
- x.initCause(pce);
- throw x;
- }
- }
-
- // Transform the current DOM tree with the given output stream.
- private static void transform(Document document, OutputStream os) {
- try {
- // Use a Transformer for output
- TransformerFactory tFactory = TransformerFactory.newInstance();
- tFactory.setAttribute("indent-number", new Integer(3));
-
- Transformer transformer = tFactory.newTransformer();
-
- transformer.setOutputProperty(OutputKeys.INDENT, "yes");
- transformer.setOutputProperty(OutputKeys.METHOD, "xml");
- transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
- transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");
- transformer.transform(new DOMSource(document),
- new StreamResult(new BufferedWriter(new OutputStreamWriter(os, "UTF-8"))));
- } catch (UnsupportedEncodingException ue) {
- // Should not reach here
- InternalError x = new InternalError("Error generated during transformation");
- x.initCause(ue);
- throw x;
- } catch (TransformerConfigurationException tce) {
- // Error generated by the parser
- // Should not reach here
- InternalError x = new InternalError("Error in creating the new document");
- x.initCause(tce);
- throw x;
- } catch (TransformerException te) {
- // Error generated by the transformer
- InternalError x = new InternalError("Error generated during transformation");
- x.initCause(te);
- throw x;
- }
- }
-
- private static void addServiceTagRegistry(Document document,
- String registryURN,
- Set<ServiceTag> svcTags) {
- // add service tag registry node and its attributes
- Element reg = document.createElement(ST_NODE_REGISTRY);
- reg.setAttribute(ST_ATTR_REGISTRY_URN, registryURN);
- reg.setAttribute(ST_ATTR_REGISTRY_VERSION, SERVICE_TAG_VERSION);
-
- Element root = getRegistrationDataRoot(document);
- root.appendChild(reg);
-
- // adds the elements for the service tags
- for (ServiceTag st : svcTags) {
- addServiceTagElement(document, reg, st);
- }
- }
-
- private static void addServiceTagElement(Document document,
- Element registryRoot,
- ServiceTag st) {
- Element svcTag = document.createElement(ST_NODE_SERVICE_TAG);
- registryRoot.appendChild(svcTag);
- addChildElement(document, svcTag,
- ST_NODE_INSTANCE_URN, st.getInstanceURN());
- addChildElement(document, svcTag,
- ST_NODE_PRODUCT_NAME, st.getProductName());
- addChildElement(document, svcTag,
- ST_NODE_PRODUCT_VERSION, st.getProductVersion());
- addChildElement(document, svcTag,
- ST_NODE_PRODUCT_URN, st.getProductURN());
- addChildElement(document, svcTag,
- ST_NODE_PRODUCT_PARENT_URN, st.getProductParentURN());
- addChildElement(document, svcTag,
- ST_NODE_PRODUCT_PARENT, st.getProductParent());
- addChildElement(document, svcTag,
- ST_NODE_PRODUCT_DEFINED_INST_ID,
- st.getProductDefinedInstanceID());
- addChildElement(document, svcTag,
- ST_NODE_PRODUCT_VENDOR, st.getProductVendor());
- addChildElement(document, svcTag,
- ST_NODE_PLATFORM_ARCH, st.getPlatformArch());
- addChildElement(document, svcTag,
- ST_NODE_TIMESTAMP, Util.formatTimestamp(st.getTimestamp()));
- addChildElement(document, svcTag,
- ST_NODE_CONTAINER, st.getContainer());
- addChildElement(document, svcTag,
- ST_NODE_SOURCE, st.getSource());
- addChildElement(document, svcTag,
- ST_NODE_INSTALLER_UID,
- String.valueOf(st.getInstallerUID()));
- }
-
- private static void addChildElement(Document document, Element root,
- String element, String text) {
- Element node = document.createElement(element);
- node.appendChild(document.createTextNode(text));
- root.appendChild(node);
- }
-
- // Constructs service tags from the document
- private static void addServiceTags(Element registryRoot,
- RegistrationData registration) {
- NodeList children = registryRoot.getElementsByTagName(ST_NODE_SERVICE_TAG);
- int length = (children == null ? 0 : children.getLength());
- for (int i = 0; i < length; i++) {
- Element svcTagElement = (Element) children.item(i);
- ServiceTag st = getServiceTag(svcTagElement);
- registration.addServiceTag(st);
- }
- }
-
- // build environment map from the document
- private static void buildEnvironmentMap(Element envRoot,
- RegistrationData registration) {
- registration.setEnvironment(ST_NODE_HOSTNAME, getTextValue(envRoot, ST_NODE_HOSTNAME));
- registration.setEnvironment(ST_NODE_HOST_ID, getTextValue(envRoot, ST_NODE_HOST_ID));
- registration.setEnvironment(ST_NODE_OS_NAME, getTextValue(envRoot, ST_NODE_OS_NAME));
- registration.setEnvironment(ST_NODE_OS_VERSION, getTextValue(envRoot, ST_NODE_OS_VERSION));
- registration.setEnvironment(ST_NODE_OS_ARCH, getTextValue(envRoot, ST_NODE_OS_ARCH));
- registration.setEnvironment(ST_NODE_SYSTEM_MODEL, getTextValue(envRoot, ST_NODE_SYSTEM_MODEL));
- registration.setEnvironment(ST_NODE_SYSTEM_MANUFACTURER, getTextValue(envRoot, ST_NODE_SYSTEM_MANUFACTURER));
- registration.setEnvironment(ST_NODE_CPU_MANUFACTURER, getTextValue(envRoot, ST_NODE_CPU_MANUFACTURER));
- registration.setEnvironment(ST_NODE_SERIAL_NUMBER, getTextValue(envRoot, ST_NODE_SERIAL_NUMBER));
- }
-
- // add the nodes representing the environment map in the document
- private static void addEnvironmentNodes(Document document,
- Map<String, String> envMap) {
- Element root = getRegistrationDataRoot(document);
- Element env = document.createElement(ST_NODE_ENVIRONMENT);
- root.appendChild(env);
- Set<Map.Entry<String, String>> keys = envMap.entrySet();
- for (Map.Entry<String, String> entry : keys) {
- addChildElement(document, env, entry.getKey(), entry.getValue());
- }
- }
-
- private static Element getRegistrationDataRoot(Document doc) {
- Element root = doc.getDocumentElement();
- if (!root.getNodeName().equals(ST_NODE_REGISTRATION_DATA)) {
- throw new IllegalArgumentException("Not a " +
- ST_NODE_REGISTRATION_DATA +
- " node \"" + root.getNodeName() + "\"");
- }
- return root;
- }
-
- private static Element getSingletonElementFromRoot(Element root, String name) {
- NodeList children = root.getElementsByTagName(name);
- int length = (children == null ? 0 : children.getLength());
- if (length != 1) {
- throw new IllegalArgumentException("Invalid number of " + name +
- " nodes = " + length);
- }
- Element e = (Element) children.item(0);
- if (!e.getNodeName().equals(name)) {
- throw new IllegalArgumentException("Not a " + name +
- " node \"" + e.getNodeName() + "\"");
- }
- return e;
- }
-
- // Constructs one ServiceTag instance from a service tag element root
- private static ServiceTag getServiceTag(Element svcTagElement) {
- return new ServiceTag(
- getTextValue(svcTagElement, ST_NODE_INSTANCE_URN),
- getTextValue(svcTagElement, ST_NODE_PRODUCT_NAME),
- getTextValue