summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx2
-rw-r--r--accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx3
-rw-r--r--automation/source/server/statemnt.cxx3
-rw-r--r--automation/source/server/statemnt.hxx2
-rwxr-xr-x[-rw-r--r--]automation/util/manually_added_ids.hid0
-rw-r--r--basctl/source/basicide/basicprint.src2
-rw-r--r--basctl/source/basicide/basicrenderable.cxx14
-rw-r--r--basic/inc/pch/precompiled_basic.hxx2
-rw-r--r--basic/source/runtime/methods.cxx2
-rw-r--r--canvas/source/vcl/backbuffer.cxx2
-rw-r--r--canvas/source/vcl/bitmapbackbuffer.cxx2
-rw-r--r--canvas/source/vcl/spritedevicehelper.cxx2
-rwxr-xr-x[-rw-r--r--]chart2/inc/pch/precompiled_chart2.hxx2
-rw-r--r--chart2/source/controller/inc/ConfigurationAccess.hxx2
-rw-r--r--[-rwxr-xr-x]comphelper/inc/comphelper/docpasswordrequest.hxx0
-rw-r--r--comphelper/inc/comphelper/sequenceasvector.hxx11
-rw-r--r--[-rwxr-xr-x]comphelper/source/misc/docpasswordrequest.cxx0
-rw-r--r--cppu/inc/com/sun/star/uno/Sequence.h2
-rw-r--r--cppuhelper/inc/cppuhelper/factory.hxx4
-rwxr-xr-x[-rw-r--r--]cui/source/dialogs/hyphen.cxx0
-rwxr-xr-x[-rw-r--r--]cui/source/dialogs/hyphen.hrc0
-rwxr-xr-x[-rw-r--r--]cui/source/dialogs/thesdlg.hrc0
-rw-r--r--[-rwxr-xr-x]cui/source/dialogs/thesdlg_impl.hxx0
-rw-r--r--[-rwxr-xr-x]cui/source/factory/dlgfact.cxx0
-rwxr-xr-x[-rw-r--r--]cui/source/inc/hyphen.hxx0
-rwxr-xr-x[-rw-r--r--]cui/source/inc/macroass.hxx0
-rwxr-xr-x[-rw-r--r--]cui/source/inc/thesdlg.hxx0
-rw-r--r--cui/source/options/optcolor.cxx4
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.src1
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.src1
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.src2
-rw-r--r--dbaccess/source/ui/dlg/dbadminsetup.src1
-rwxr-xr-xdefault_images/res/commandimagelist/lc_showannotations.png (renamed from default_images/res/commandimagelist/lc_showannotation.png)bin4154 -> 4154 bytes
-rwxr-xr-xdefault_images/res/commandimagelist/lch_showannotations.png (renamed from default_images/res/commandimagelist/lch_showannotation.png)bin3628 -> 3628 bytes
-rwxr-xr-xdefault_images/res/commandimagelist/sc_showannotations.png (renamed from default_images/res/commandimagelist/sc_showannotation.png)bin3879 -> 3879 bytes
-rwxr-xr-xdefault_images/res/commandimagelist/sch_showannotations.png (renamed from default_images/res/commandimagelist/sch_showannotation.png)bin3611 -> 3611 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_01.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_01.png)bin441 -> 441 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_02.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_02.png)bin436 -> 436 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_03.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_03.png)bin435 -> 435 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_04.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_04.png)bin435 -> 435 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_05.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_05.png)bin439 -> 439 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_06.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_06.png)bin443 -> 443 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_07.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_07.png)bin444 -> 444 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_08.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_08.png)bin439 -> 439 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_09.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_09.png)bin427 -> 427 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_10.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_10.png)bin429 -> 429 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_11.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_11.png)bin429 -> 429 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-32-hc_12.png (renamed from default_images/toolkit/source/awt/spinner03-32-hc_12.png)bin435 -> 435 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_01.png (renamed from default_images/toolkit/source/awt/spinner03-grey_01.png)bin666 -> 666 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_02.png (renamed from default_images/toolkit/source/awt/spinner03-grey_02.png)bin668 -> 668 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_03.png (renamed from default_images/toolkit/source/awt/spinner03-grey_03.png)bin678 -> 678 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_04.png (renamed from default_images/toolkit/source/awt/spinner03-grey_04.png)bin680 -> 680 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_05.png (renamed from default_images/toolkit/source/awt/spinner03-grey_05.png)bin671 -> 671 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_06.png (renamed from default_images/toolkit/source/awt/spinner03-grey_06.png)bin676 -> 676 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_07.png (renamed from default_images/toolkit/source/awt/spinner03-grey_07.png)bin692 -> 692 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_08.png (renamed from default_images/toolkit/source/awt/spinner03-grey_08.png)bin682 -> 682 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_09.png (renamed from default_images/toolkit/source/awt/spinner03-grey_09.png)bin675 -> 675 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_10.png (renamed from default_images/toolkit/source/awt/spinner03-grey_10.png)bin673 -> 673 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_11.png (renamed from default_images/toolkit/source/awt/spinner03-grey_11.png)bin679 -> 679 bytes
-rw-r--r--default_images/toolkit/tk/spinner03-grey_12.png (renamed from default_images/toolkit/source/awt/spinner03-grey_12.png)bin676 -> 676 bytes
-rw-r--r--desktop/inc/app.hxx2
-rw-r--r--desktop/scripts/unopkg.sh15
-rw-r--r--desktop/source/app/app.cxx147
-rwxr-xr-xdesktop/source/deployment/gui/dp_gui_updatedialog.cxx4
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx129
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.hxx17
-rw-r--r--desktop/source/deployment/manager/dp_informationprovider.cxx33
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx33
-rw-r--r--desktop/source/deployment/registry/component/dp_compbackenddb.cxx43
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx33
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx128
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx13
-rwxr-xr-xdesktop/source/deployment/registry/dp_backend.cxx6
-rw-r--r--desktop/source/deployment/registry/dp_backenddb.cxx108
-rw-r--r--desktop/source/deployment/registry/dp_registry.cxx18
-rw-r--r--desktop/source/deployment/registry/executable/dp_executable.cxx38
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx427
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.cxx11
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.hxx2
-rwxr-xr-xdesktop/source/deployment/registry/inc/dp_backend.h20
-rw-r--r--desktop/source/deployment/registry/inc/dp_backenddb.hxx12
-rw-r--r--desktop/source/deployment/registry/package/dp_extbackenddb.cxx22
-rw-r--r--[-rwxr-xr-x]desktop/source/deployment/registry/package/dp_package.cxx26
-rw-r--r--desktop/source/deployment/registry/script/dp_script.cxx45
-rwxr-xr-xdesktop/source/deployment/registry/sfwk/dp_sfwk.cxx17
-rw-r--r--[-rwxr-xr-x]desktop/source/migration/migration.cxx0
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_app.cxx36
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_misc.cxx3
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_shared.h18
-rw-r--r--drawinglayer/source/processor2d/vclhelperbitmaprender.cxx39
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/editeng.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/splwrap.hxx0
-rwxr-xr-x[-rw-r--r--]editeng/inc/pch/precompiled_editeng.hxx4
-rwxr-xr-x[-rw-r--r--]editeng/source/editeng/impedit.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outlvw.cxx0
-rwxr-xr-x[-rw-r--r--]extensions/inc/pch/precompiled_extensions.hxx2
-rw-r--r--extensions/source/oooimprovement/onlogrotate_job.cxx33
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.hxx2
-rwxr-xr-x[-rw-r--r--]extensions/source/update/check/download.cxx0
-rwxr-xr-x[-rw-r--r--]extensions/source/update/check/updatecheck.cxx0
-rw-r--r--extras/source/palettes/standard.soc1
-rw-r--r--filter/inc/filter/msfilter/msvbahelper.hxx94
-rw-r--r--filter/prj/build.lst2
-rw-r--r--filter/prj/d.lst1
-rw-r--r--filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu2
-rw-r--r--filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu2
-rw-r--r--filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu2
-rw-r--r--filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu2
-rw-r--r--filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu2
-rw-r--r--filter/source/config/fragments/types/calc_MS_Excel_40.xcu2
-rw-r--r--filter/source/config/fragments/types/calc_MS_Excel_40_VorlageTemplate.xcu2
-rw-r--r--filter/source/config/fragments/types/calc_MS_Excel_5095.xcu2
-rw-r--r--filter/source/config/fragments/types/calc_MS_Excel_5095_VorlageTemplate.xcu2
-rw-r--r--filter/source/config/fragments/types/calc_MS_Excel_95.xcu2
-rw-r--r--filter/source/config/fragments/types/calc_MS_Excel_95_VorlageTemplate.xcu2
-rw-r--r--filter/source/config/fragments/types/calc_MS_Excel_97.xcu2
-rw-r--r--filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu2
-rw-r--r--filter/source/graphicfilter/ipict/ipict.cxx560
-rw-r--r--filter/source/graphicfilter/ipict/makefile.mk6
-rwxr-xr-xfilter/source/graphicfilter/ipict/shape.cxx266
-rwxr-xr-xfilter/source/graphicfilter/ipict/shape.hxx60
-rw-r--r--filter/source/msfilter/makefile.mk24
-rwxr-xr-xfilter/source/msfilter/msfilter.component34
-rw-r--r--filter/source/msfilter/msvbahelper.cxx346
-rwxr-xr-xfilter/source/msfilter/services.cxx75
-rwxr-xr-x[-rw-r--r--]forms/inc/pch/precompiled_forms.hxx4
-rw-r--r--forms/source/component/Edit.cxx2
-rw-r--r--forms/source/component/Filter.cxx2
-rw-r--r--forms/source/component/FormattedField.cxx2
-rw-r--r--forms/source/richtext/richtextcontrol.hxx2
-rw-r--r--forms/source/richtext/richtextengine.cxx2
-rw-r--r--forms/source/richtext/richtextimplcontrol.cxx2
-rw-r--r--forms/source/richtext/rtattributehandler.cxx2
-rw-r--r--forms/source/solar/component/navbarcontrol.hxx2
-rw-r--r--fpicker/source/office/OfficeFilePicker.hxx2
-rw-r--r--fpicker/source/unx/gnome/SalGtkFilePicker.cxx2
-rw-r--r--framework/inc/pch/precompiled_framework.hxx4
-rw-r--r--framework/inc/services/layoutmanager.hxx2
-rw-r--r--framework/source/helper/tagwindowasmodified.cxx2
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx2
-rw-r--r--[-rwxr-xr-x]i18npool/source/localedata/data/makefile.mk0
-rw-r--r--jvmfwk/source/elements.cxx93
-rw-r--r--jvmfwk/source/elements.hxx28
-rw-r--r--libxmlsec/xmlsec1-olderlibxml2.patch2
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx0
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/lingutil/lingutil.cxx0
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx0
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/spellcheck/spell/sspellimp.hxx0
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/thesaurus/libnth/nthesdta.hxx0
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/thesaurus/libnth/nthesimp.cxx0
-rw-r--r--[-rwxr-xr-x]lingucomponent/source/thesaurus/libnth/nthesimp.hxx0
-rw-r--r--offapi/com/sun/star/deployment/XExtensionManager.idl21
-rw-r--r--offapi/com/sun/star/deployment/XPackageRegistry.idl7
-rwxr-xr-x[-rw-r--r--]offapi/com/sun/star/script/vba/VBAMacroResolver.idl (renamed from vcl/inc/vcl/salctrlhandle.hxx)31
-rwxr-xr-xoffapi/com/sun/star/script/vba/XVBAMacroResolver.idl94
-rwxr-xr-xoffapi/com/sun/star/script/vba/makefile.mk2
-rw-r--r--offapi/com/sun/star/sheet/FormulaMapGroupSpecialOffset.idl4
-rw-r--r--offapi/com/sun/star/sheet/SheetFilterDescriptor.idl27
-rwxr-xr-xoffapi/com/sun/star/sheet/SpreadsheetViewObjectsMode.idl61
-rw-r--r--offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl10
-rw-r--r--offapi/com/sun/star/sheet/TableFilterField.idl11
-rw-r--r--offapi/com/sun/star/sheet/TableFilterField2.idl12
-rw-r--r--offapi/com/sun/star/sheet/XDatabaseRange.idl12
-rw-r--r--offapi/com/sun/star/sheet/XSheetFilterDescriptor.idl14
-rw-r--r--offapi/com/sun/star/sheet/XSheetFilterDescriptor2.idl12
-rw-r--r--offapi/com/sun/star/sheet/makefile.mk1
-rw-r--r--[-rwxr-xr-x]offapi/com/sun/star/text/PrintPreviewSettings.idl0
-rwxr-xr-x[-rw-r--r--]offapi/com/sun/star/text/TextFrame.idl0
-rw-r--r--[-rwxr-xr-x]officecfg/registry/data/org/openoffice/Office/Accelerators.xcu16
-rwxr-xr-xofficecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu2
-rw-r--r--[-rwxr-xr-x]officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu0
-rw-r--r--[-rwxr-xr-x]officecfg/registry/data/org/openoffice/Setup.xcu0
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs55
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Draw.xcs8
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Impress.xcs49
-rw-r--r--oox/inc/oox/core/binarycodec.hxx1
-rw-r--r--oox/inc/oox/core/binaryfilterbase.hxx4
-rw-r--r--oox/inc/oox/core/contexthandler.hxx13
-rw-r--r--oox/inc/oox/core/contexthandler2.hxx145
-rwxr-xr-xoox/inc/oox/core/fastparser.hxx93
-rw-r--r--oox/inc/oox/core/fasttokenhandler.hxx14
-rw-r--r--oox/inc/oox/core/filterbase.hxx46
-rw-r--r--oox/inc/oox/core/filterdetect.hxx11
-rw-r--r--oox/inc/oox/core/fragmenthandler.hxx1
-rw-r--r--oox/inc/oox/core/fragmenthandler2.hxx14
-rw-r--r--oox/inc/oox/core/recordparser.hxx2
-rwxr-xr-x[-rw-r--r--]oox/inc/oox/core/relations.hxx14
-rw-r--r--oox/inc/oox/core/relationshandler.hxx1
-rw-r--r--oox/inc/oox/core/xmlfilterbase.hxx24
-rw-r--r--oox/inc/oox/drawingml/chart/axiscontext.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/axisconverter.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/axismodel.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/chartcontextbase.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/chartconverter.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx4
-rw-r--r--oox/inc/oox/drawingml/chart/chartspaceconverter.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/chartspacefragment.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/chartspacemodel.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/converterbase.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/datasourcecontext.hxx5
-rw-r--r--oox/inc/oox/drawingml/chart/datasourceconverter.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/datasourcemodel.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/modelbase.hxx5
-rw-r--r--oox/inc/oox/drawingml/chart/objectformatter.hxx2
-rw-r--r--oox/inc/oox/drawingml/chart/plotareacontext.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/plotareaconverter.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/plotareamodel.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/seriescontext.hxx7
-rw-r--r--oox/inc/oox/drawingml/chart/seriesconverter.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/seriesmodel.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/titlecontext.hxx3
-rw-r--r--oox/inc/oox/drawingml/chart/titleconverter.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/titlemodel.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/typegroupcontext.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/typegroupconverter.hxx1
-rw-r--r--oox/inc/oox/drawingml/chart/typegroupmodel.hxx1
-rw-r--r--oox/inc/oox/drawingml/clrscheme.hxx1
-rw-r--r--oox/inc/oox/drawingml/customshapeproperties.hxx14
-rw-r--r--oox/inc/oox/drawingml/graphicshapecontext.hxx4
-rw-r--r--oox/inc/oox/drawingml/shape.hxx79
-rw-r--r--oox/inc/oox/drawingml/textbody.hxx1
-rw-r--r--oox/inc/oox/drawingml/textliststyle.hxx6
-rw-r--r--oox/inc/oox/drawingml/textparagraph.hxx1
-rw-r--r--oox/inc/oox/drawingml/textparagraphproperties.hxx4
-rw-r--r--oox/inc/oox/drawingml/theme.hxx1
-rw-r--r--oox/inc/oox/dump/biffdumper.hxx5
-rw-r--r--oox/inc/oox/dump/oledumper.hxx12
-rw-r--r--oox/inc/oox/dump/xlsbdumper.hxx5
-rw-r--r--oox/inc/oox/helper/attributelist.hxx7
-rw-r--r--oox/inc/oox/helper/binaryinputstream.hxx1
-rw-r--r--oox/inc/oox/helper/binaryoutputstream.hxx1
-rw-r--r--oox/inc/oox/helper/binarystreambase.hxx1
-rw-r--r--oox/inc/oox/helper/containerhelper.hxx473
-rw-r--r--oox/inc/oox/helper/graphichelper.hxx4
-rw-r--r--oox/inc/oox/helper/helper.hxx1
-rw-r--r--oox/inc/oox/helper/modelobjecthelper.hxx55
-rw-r--r--oox/inc/oox/helper/progressbar.hxx1
-rw-r--r--oox/inc/oox/helper/propertymap.hxx13
-rw-r--r--oox/inc/oox/helper/propertyset.hxx6
-rwxr-xr-xoox/inc/oox/helper/refmap.hxx181
-rwxr-xr-xoox/inc/oox/helper/refvector.hxx201
-rw-r--r--oox/inc/oox/helper/storagebase.hxx4
-rwxr-xr-xoox/inc/oox/helper/textinputstream.hxx1
-rw-r--r--[-rwxr-xr-x]oox/inc/oox/ole/axbinaryreader.hxx6
-rw-r--r--oox/inc/oox/ole/axcontrol.hxx155
-rw-r--r--oox/inc/oox/ole/axcontrolfragment.hxx1
-rw-r--r--oox/inc/oox/ole/olehelper.hxx5
-rw-r--r--oox/inc/oox/ole/oleobjecthelper.hxx3
-rw-r--r--[-rwxr-xr-x]oox/inc/oox/ole/olestorage.hxx2
-rwxr-xr-xoox/inc/oox/ole/vbacontrol.hxx20
-rw-r--r--oox/inc/oox/ole/vbahelper.hxx1
-rw-r--r--oox/inc/oox/ole/vbainputstream.hxx1
-rw-r--r--oox/inc/oox/ole/vbamodule.hxx2
-rw-r--r--oox/inc/oox/ole/vbaproject.hxx70
-rwxr-xr-x[-rw-r--r--]oox/inc/oox/ole/vbaprojectfilter.hxx (renamed from oox/source/helper/recordinputstream.cxx)65
-rw-r--r--oox/inc/oox/ppt/pptimport.hxx5
-rw-r--r--oox/inc/oox/ppt/pptshape.hxx2
-rw-r--r--oox/inc/oox/ppt/slidepersist.hxx3
-rwxr-xr-x[-rw-r--r--]oox/inc/oox/token/namespacemap.hxx (renamed from oox/source/token/propertylist.cxx)29
-rw-r--r--oox/inc/oox/token/propertynames.hxx (renamed from oox/inc/oox/token/propertylist.hxx)15
-rw-r--r--oox/inc/oox/token/tokenmap.hxx1
-rw-r--r--oox/inc/oox/vml/vmldrawing.hxx71
-rw-r--r--oox/inc/oox/vml/vmldrawingfragment.hxx1
-rw-r--r--oox/inc/oox/vml/vmlformatting.hxx31
-rw-r--r--oox/inc/oox/vml/vmlinputstream.hxx1
-rw-r--r--oox/inc/oox/vml/vmlshape.hxx69
-rw-r--r--oox/inc/oox/vml/vmlshapecontainer.hxx7
-rw-r--r--oox/inc/oox/vml/vmlshapecontext.hxx51
-rwxr-xr-xoox/inc/oox/vml/vmltextbox.hxx95
-rwxr-xr-xoox/inc/oox/vml/vmltextboxcontext.hxx82
-rw-r--r--oox/inc/oox/xls/addressconverter.hxx15
-rwxr-xr-xoox/inc/oox/xls/autofilterbuffer.hxx279
-rw-r--r--oox/inc/oox/xls/autofiltercontext.hxx130
-rw-r--r--oox/inc/oox/xls/biffcodec.hxx1
-rw-r--r--oox/inc/oox/xls/biffdetector.hxx14
-rw-r--r--oox/inc/oox/xls/biffhelper.hxx476
-rw-r--r--oox/inc/oox/xls/biffinputstream.hxx1
-rw-r--r--oox/inc/oox/xls/biffoutputstream.hxx1
-rw-r--r--oox/inc/oox/xls/chartsheetfragment.hxx19
-rw-r--r--oox/inc/oox/xls/commentsbuffer.hxx3
-rw-r--r--oox/inc/oox/xls/commentsfragment.hxx16
-rw-r--r--oox/inc/oox/xls/condformatbuffer.hxx18
-rw-r--r--oox/inc/oox/xls/condformatcontext.hxx13
-rwxr-xr-xoox/inc/oox/xls/connectionsbuffer.hxx186
-rw-r--r--oox/inc/oox/xls/connectionsfragment.hxx37
-rw-r--r--oox/inc/oox/xls/defnamesbuffer.hxx80
-rw-r--r--oox/inc/oox/xls/drawingfragment.hxx152
-rw-r--r--oox/inc/oox/xls/excelchartconverter.hxx1
-rw-r--r--oox/inc/oox/xls/excelfilter.hxx26
-rw-r--r--oox/inc/oox/xls/excelhandlers.hxx191
-rwxr-xr-xoox/inc/oox/xls/excelvbaproject.hxx5
-rw-r--r--oox/inc/oox/xls/externallinkbuffer.hxx53
-rw-r--r--oox/inc/oox/xls/externallinkfragment.hxx76
-rw-r--r--oox/inc/oox/xls/formulabase.hxx110
-rw-r--r--oox/inc/oox/xls/formulaparser.hxx18
-rw-r--r--oox/inc/oox/xls/numberformatsbuffer.hxx4
-rw-r--r--oox/inc/oox/xls/ooxformulaparser.hxx1
-rw-r--r--oox/inc/oox/xls/pagesettings.hxx17
-rw-r--r--oox/inc/oox/xls/pivotcachebuffer.hxx55
-rw-r--r--oox/inc/oox/xls/pivotcachefragment.hxx31
-rw-r--r--oox/inc/oox/xls/pivottablebuffer.hxx49
-rw-r--r--oox/inc/oox/xls/pivottablefragment.hxx31
-rw-r--r--oox/inc/oox/xls/querytablebuffer.hxx109
-rw-r--r--oox/inc/oox/xls/querytablefragment.hxx31
-rw-r--r--oox/inc/oox/xls/richstring.hxx19
-rw-r--r--oox/inc/oox/xls/richstringcontext.hxx15
-rw-r--r--oox/inc/oox/xls/scenariobuffer.hxx10
-rw-r--r--oox/inc/oox/xls/scenariocontext.hxx17
-rw-r--r--oox/inc/oox/xls/sharedformulabuffer.hxx5
-rw-r--r--oox/inc/oox/xls/sharedstringsbuffer.hxx2
-rw-r--r--oox/inc/oox/xls/sharedstringsfragment.hxx12
-rw-r--r--oox/inc/oox/xls/sheetdatacontext.hxx76
-rw-r--r--oox/inc/oox/xls/stylesbuffer.hxx126
-rw-r--r--oox/inc/oox/xls/stylesfragment.hxx47
-rw-r--r--oox/inc/oox/xls/tablebuffer.hxx24
-rw-r--r--oox/inc/oox/xls/tablefragment.hxx16
-rw-r--r--oox/inc/oox/xls/themebuffer.hxx1
-rw-r--r--oox/inc/oox/xls/unitconverter.hxx3
-rw-r--r--oox/inc/oox/xls/viewsettings.hxx17
-rw-r--r--oox/inc/oox/xls/webquerybuffer.hxx127
-rw-r--r--oox/inc/oox/xls/workbookfragment.hxx17
-rw-r--r--oox/inc/oox/xls/workbookhelper.hxx91
-rw-r--r--oox/inc/oox/xls/workbooksettings.hxx11
-rw-r--r--oox/inc/oox/xls/worksheetbuffer.hxx14
-rw-r--r--oox/inc/oox/xls/worksheetfragment.hxx90
-rw-r--r--oox/inc/oox/xls/worksheethelper.hxx42
-rw-r--r--oox/inc/oox/xls/worksheetsettings.hxx15
-rw-r--r--oox/prj/d.lst10
-rw-r--r--oox/source/core/binarycodec.cxx2
-rw-r--r--oox/source/core/binaryfilterbase.cxx24
-rw-r--r--oox/source/core/contexthandler.cxx21
-rw-r--r--oox/source/core/contexthandler2.cxx120
-rw-r--r--oox/source/core/facreg.cxx137
-rwxr-xr-xoox/source/core/fastparser.cxx136
-rw-r--r--oox/source/core/fasttokenhandler.cxx61
-rw-r--r--oox/source/core/filterbase.cxx167
-rw-r--r--oox/source/core/filterdetect.cxx179
-rw-r--r--oox/source/core/fragmenthandler.cxx19
-rw-r--r--oox/source/core/fragmenthandler2.cxx38
-rw-r--r--oox/source/core/makefile.mk3
-rw-r--r--oox/source/core/recordparser.cxx23
-rw-r--r--oox/source/core/relations.cxx14
-rw-r--r--oox/source/core/relationshandler.cxx19
-rw-r--r--oox/source/core/services.cxx97
-rw-r--r--oox/source/core/xmlfilterbase.cxx161
-rw-r--r--oox/source/docprop/docprophandler.cxx138
-rw-r--r--oox/source/docprop/docprophandler.hxx10
-rw-r--r--oox/source/docprop/ooxmldocpropimport.cxx260
-rw-r--r--oox/source/docprop/ooxmldocpropimport.hxx40
-rw-r--r--oox/source/drawingml/chart/axiscontext.cxx12
-rw-r--r--oox/source/drawingml/chart/axisconverter.cxx31
-rw-r--r--oox/source/drawingml/chart/axismodel.cxx1
-rw-r--r--oox/source/drawingml/chart/chartcontextbase.cxx12
-rw-r--r--oox/source/drawingml/chart/chartconverter.cxx24
-rw-r--r--oox/source/drawingml/chart/chartdrawingfragment.cxx57
-rw-r--r--oox/source/drawingml/chart/chartspaceconverter.cxx27
-rw-r--r--oox/source/drawingml/chart/chartspacefragment.cxx12
-rw-r--r--oox/source/drawingml/chart/chartspacemodel.cxx1
-rw-r--r--oox/source/drawingml/chart/converterbase.cxx48
-rw-r--r--oox/source/drawingml/chart/datasourcecontext.cxx16
-rw-r--r--oox/source/drawingml/chart/datasourceconverter.cxx14
-rw-r--r--oox/source/drawingml/chart/datasourcemodel.cxx1
-rw-r--r--oox/source/drawingml/chart/modelbase.cxx8
-rw-r--r--oox/source/drawingml/chart/objectformatter.cxx42
-rw-r--r--oox/source/drawingml/chart/plotareacontext.cxx10
-rw-r--r--oox/source/drawingml/chart/plotareaconverter.cxx27
-rw-r--r--oox/source/drawingml/chart/seriescontext.cxx50
-rw-r--r--oox/source/drawingml/chart/seriesconverter.cxx27
-rw-r--r--oox/source/drawingml/chart/seriesmodel.cxx1
-rw-r--r--oox/source/drawingml/chart/titlecontext.cxx124
-rw-r--r--oox/source/drawingml/chart/titleconverter.cxx28
-rw-r--r--oox/source/drawingml/chart/titlemodel.cxx1
-rw-r--r--oox/source/drawingml/chart/typegroupcontext.cxx10
-rw-r--r--oox/source/drawingml/chart/typegroupconverter.cxx29
-rw-r--r--oox/source/drawingml/chart/typegroupmodel.cxx1
-rw-r--r--oox/source/drawingml/clrscheme.cxx2
-rw-r--r--oox/source/drawingml/clrschemecontext.cxx4
-rw-r--r--oox/source/drawingml/color.cxx8
-rw-r--r--oox/source/drawingml/colorchoicecontext.cxx1
-rw-r--r--oox/source/drawingml/connectorshapecontext.cxx4
-rw-r--r--oox/source/drawingml/customshapegeometry.cxx57
-rw-r--r--oox/source/drawingml/customshapeproperties.cxx3
-rw-r--r--oox/source/drawingml/diagram/datamodelcontext.cxx43
-rw-r--r--oox/source/drawingml/diagram/diagram.cxx2
-rw-r--r--oox/source/drawingml/diagram/diagramdefinitioncontext.cxx18
-rw-r--r--oox/source/drawingml/diagram/diagramfragmenthandler.cxx10
-rw-r--r--oox/source/drawingml/diagram/layoutnodecontext.cxx41
-rw-r--r--oox/source/drawingml/drawingmltypes.cxx2
-rw-r--r--oox/source/drawingml/embeddedwavaudiofile.cxx5
-rw-r--r--oox/source/drawingml/fillproperties.cxx3
-rw-r--r--oox/source/drawingml/fillpropertiesgroupcontext.cxx19
-rw-r--r--oox/source/drawingml/graphicshapecontext.cxx160
-rw-r--r--oox/source/drawingml/guidcontext.cxx3
-rw-r--r--oox/source/drawingml/hyperlinkcontext.cxx15
-rw-r--r--oox/source/drawingml/lineproperties.cxx5
-rw-r--r--oox/source/drawingml/linepropertiescontext.cxx4
-rw-r--r--oox/source/drawingml/objectdefaultcontext.cxx8
-rw-r--r--oox/source/drawingml/shape.cxx163
-rw-r--r--oox/source/drawingml/shapecontext.cxx4
-rw-r--r--oox/source/drawingml/shapegroupcontext.cxx6
-rw-r--r--oox/source/drawingml/shapepropertiescontext.cxx20
-rw-r--r--oox/source/drawingml/shapestylecontext.cxx12
-rw-r--r--oox/source/drawingml/spdefcontext.cxx10
-rw-r--r--oox/source/drawingml/table/tablebackgroundstylecontext.cxx11
-rw-r--r--oox/source/drawingml/table/tablecell.cxx3
-rw-r--r--oox/source/drawingml/table/tablecellcontext.cxx21
-rw-r--r--oox/source/drawingml/table/tablecontext.cxx16
-rw-r--r--oox/source/drawingml/table/tablepartstylecontext.cxx7
-rw-r--r--oox/source/drawingml/table/tableproperties.cxx2
-rw-r--r--oox/source/drawingml/table/tablerow.cxx2
-rw-r--r--oox/source/drawingml/table/tablerowcontext.cxx6
-rw-r--r--oox/source/drawingml/table/tablestylecellstylecontext.cxx33
-rw-r--r--oox/source/drawingml/table/tablestylecontext.cxx33
-rw-r--r--oox/source/drawingml/table/tablestylelistfragmenthandler.cxx4
-rw-r--r--oox/source/drawingml/table/tablestylepart.cxx2
-rw-r--r--oox/source/drawingml/table/tablestyletextstylecontext.cxx17
-rw-r--r--oox/source/drawingml/textbodycontext.cxx28
-rw-r--r--oox/source/drawingml/textbodyproperties.cxx3
-rw-r--r--oox/source/drawingml/textbodypropertiescontext.cxx19
-rw-r--r--oox/source/drawingml/textcharacterproperties.cxx3
-rw-r--r--oox/source/drawingml/textcharacterpropertiescontext.cxx52
-rw-r--r--oox/source/drawingml/textfieldcontext.cxx10
-rw-r--r--oox/source/drawingml/textfont.cxx1
-rw-r--r--oox/source/drawingml/textliststyle.cxx11
-rw-r--r--oox/source/drawingml/textliststylecontext.cxx26
-rw-r--r--oox/source/drawingml/textparagraphproperties.cxx3
-rw-r--r--oox/source/drawingml/textparagraphpropertiescontext.cxx35
-rw-r--r--oox/source/drawingml/textrun.cxx1
-rw-r--r--oox/source/drawingml/textspacingcontext.cxx9
-rw-r--r--oox/source/drawingml/texttabstoplistcontext.cxx4
-rw-r--r--oox/source/drawingml/theme.cxx1
-rw-r--r--oox/source/drawingml/themeelementscontext.cxx46
-rw-r--r--oox/source/drawingml/themefragmenthandler.cxx14
-rw-r--r--oox/source/drawingml/transform2dcontext.cxx9
-rw-r--r--oox/source/dump/biffdumper.cxx255
-rw-r--r--oox/source/dump/biffdumper.ini178
-rw-r--r--oox/source/dump/dffdumper.cxx7
-rw-r--r--oox/source/dump/dffdumper.ini1
-rw-r--r--oox/source/dump/dumperbase.cxx54
-rw-r--r--oox/source/dump/dumperbase.ini1
-rw-r--r--oox/source/dump/oledumper.cxx163
-rw-r--r--oox/source/dump/oledumper.ini1
-rw-r--r--oox/source/dump/pptxdumper.cxx23
-rw-r--r--oox/source/dump/pptxdumper.ini1
-rw-r--r--oox/source/dump/xlsbdumper.cxx440
-rw-r--r--oox/source/dump/xlsbdumper.ini123
-rw-r--r--oox/source/export/drawingml.cxx1
-rw-r--r--oox/source/export/shapes.cxx1
-rw-r--r--oox/source/helper/attributelist.cxx22
-rw-r--r--oox/source/helper/binaryinputstream.cxx18
-rw-r--r--oox/source/helper/binaryoutputstream.cxx16
-rw-r--r--oox/source/helper/binarystreambase.cxx11
-rw-r--r--oox/source/helper/containerhelper.cxx83
-rwxr-xr-x[-rw-r--r--]oox/source/helper/graphichelper.cxx83
-rw-r--r--oox/source/helper/makefile.mk1
-rw-r--r--oox/source/helper/modelobjecthelper.cxx79
-rw-r--r--oox/source/helper/progressbar.cxx11
-rw-r--r--oox/source/helper/propertymap.cxx120
-rw-r--r--oox/source/helper/propertyset.cxx28
-rw-r--r--oox/source/helper/storagebase.cxx21
-rwxr-xr-xoox/source/helper/textinputstream.cxx8
-rw-r--r--oox/source/helper/zipstorage.cxx26
-rw-r--r--[-rwxr-xr-x]oox/source/ole/axbinaryreader.cxx15
-rw-r--r--oox/source/ole/axcontrol.cxx419
-rw-r--r--oox/source/ole/axcontrolfragment.cxx26
-rw-r--r--oox/source/ole/makefile.mk3
-rw-r--r--oox/source/ole/olehelper.cxx25
-rw-r--r--oox/source/ole/oleobjecthelper.cxx33
-rw-r--r--[-rwxr-xr-x]oox/source/ole/olestorage.cxx38
-rw-r--r--oox/source/ole/vbacontrol.cxx63
-rw-r--r--oox/source/ole/vbahelper.cxx5
-rw-r--r--oox/source/ole/vbainputstream.cxx2
-rw-r--r--oox/source/ole/vbamodule.cxx12
-rw-r--r--oox/source/ole/vbaproject.cxx156
-rwxr-xr-xoox/source/ole/vbaprojectfilter.cxx106
-rw-r--r--oox/source/ppt/animationspersist.cxx4
-rw-r--r--oox/source/ppt/animationtypes.cxx2
-rw-r--r--oox/source/ppt/animvariantcontext.cxx12
-rw-r--r--oox/source/ppt/backgroundproperties.cxx4
-rw-r--r--oox/source/ppt/buildlistcontext.cxx15
-rw-r--r--oox/source/ppt/commonbehaviorcontext.cxx18
-rw-r--r--oox/source/ppt/commontimenodecontext.cxx20
-rw-r--r--oox/source/ppt/conditioncontext.cxx12
-rw-r--r--oox/source/ppt/customshowlistcontext.cxx9
-rw-r--r--oox/source/ppt/headerfootercontext.cxx2
-rw-r--r--oox/source/ppt/layoutfragmenthandler.cxx6
-rw-r--r--oox/source/ppt/pptimport.cxx29
-rw-r--r--oox/source/ppt/pptshape.cxx4
-rw-r--r--oox/source/ppt/pptshapecontext.cxx15
-rw-r--r--oox/source/ppt/pptshapegroupcontext.cxx22
-rw-r--r--oox/source/ppt/pptshapepropertiescontext.cxx5
-rw-r--r--oox/source/ppt/presentationfragmenthandler.cxx38
-rw-r--r--oox/source/ppt/slidefragmenthandler.cxx45
-rw-r--r--oox/source/ppt/slidemastertextstylescontext.cxx10
-rw-r--r--oox/source/ppt/slidepersist.cxx4
-rw-r--r--oox/source/ppt/slidetimingcontext.cxx8
-rw-r--r--oox/source/ppt/slidetransition.cxx45
-rw-r--r--oox/source/ppt/slidetransitioncontext.cxx49
-rw-r--r--oox/source/ppt/soundactioncontext.cxx11
-rw-r--r--oox/source/ppt/timeanimvaluecontext.cxx10
-rw-r--r--oox/source/ppt/timenode.cxx2
-rw-r--r--oox/source/ppt/timenodelistcontext.cxx122
-rw-r--r--oox/source/ppt/timetargetelementcontext.cxx28
-rw-r--r--oox/source/shape/FastTokenHandlerService.cxx116
-rw-r--r--oox/source/shape/FastTokenHandlerService.hxx81
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx73
-rw-r--r--oox/source/shape/ShapeContextHandler.hxx22
-rw-r--r--oox/source/shape/ShapeFilterBase.cxx14
-rw-r--r--oox/source/shape/ShapeFilterBase.hxx8
-rw-r--r--oox/source/shape/makefile.mk3
-rw-r--r--oox/source/token/gennamespaces.pl66
-rw-r--r--oox/source/token/genproperties.pl46
-rw-r--r--oox/source/token/gentoken.pl61
-rw-r--r--oox/source/token/makefile.mk44
-rwxr-xr-x[-rw-r--r--]oox/source/token/namespacemap.cxx (renamed from vcl/inc/vcl/impbmpconv.hxx)24
-rwxr-xr-x[-rw-r--r--]oox/source/token/namespaces.hxx.head (renamed from vcl/inc/vcl/wintypes.hxx)11
-rwxr-xr-xoox/source/token/namespaces.hxx.tail35
-rw-r--r--oox/source/token/namespaces.pl79
-rw-r--r--oox/source/token/namespaces.txt101
-rw-r--r--oox/source/token/parsexsd.pl27
-rwxr-xr-x[-rw-r--r--]oox/source/token/properties.hxx.head (renamed from vcl/inc/vcl/fldunit.hxx)13
-rwxr-xr-xoox/source/token/properties.hxx.tail6
-rw-r--r--oox/source/token/properties.pl (renamed from udkapi/prj/makefile.mk)62
-rw-r--r--oox/source/token/properties.txt22
-rw-r--r--oox/source/token/propertynames.cxx51
-rw-r--r--oox/source/token/tokenmap.cxx45
-rwxr-xr-x[-rw-r--r--]oox/source/token/tokens.hxx.head (renamed from vcl/inc/vcl/mapunit.hxx)11
-rwxr-xr-xoox/source/token/tokens.hxx.tail8
-rw-r--r--oox/source/token/tokens.pl80
-rw-r--r--oox/source/token/tokens.txt15
-rw-r--r--oox/source/vml/makefile.mk16
-rw-r--r--oox/source/vml/vmldrawing.cxx146
-rw-r--r--oox/source/vml/vmldrawingfragment.cxx23
-rw-r--r--oox/source/vml/vmlformatting.cxx112
-rw-r--r--oox/source/vml/vmlinputstream.cxx65
-rw-r--r--oox/source/vml/vmlshape.cxx237
-rw-r--r--oox/source/vml/vmlshapecontainer.cxx15
-rw-r--r--oox/source/vml/vmlshapecontext.cxx148
-rwxr-xr-x[-rw-r--r--]oox/source/vml/vmltextbox.cxx (renamed from oox/inc/oox/helper/recordinputstream.hxx)57
-rwxr-xr-xoox/source/vml/vmltextboxcontext.cxx146
-rw-r--r--oox/source/xls/addressconverter.cxx41
-rwxr-xr-xoox/source/xls/autofilterbuffer.cxx853
-rw-r--r--oox/source/xls/autofiltercontext.cxx734
-rw-r--r--oox/source/xls/biffcodec.cxx51
-rw-r--r--oox/source/xls/biffdetector.cxx88
-rw-r--r--oox/source/xls/biffhelper.cxx59
-rw-r--r--oox/source/xls/biffinputstream.cxx10
-rw-r--r--oox/source/xls/biffoutputstream.cxx1
-rw-r--r--oox/source/xls/chartsheetfragment.cxx163
-rw-r--r--oox/source/xls/commentsbuffer.cxx34
-rw-r--r--oox/source/xls/commentsfragment.cxx93
-rw-r--r--oox/source/xls/condformatbuffer.cxx283
-rw-r--r--oox/source/xls/condformatcontext.cxx41
-rwxr-xr-xoox/source/xls/connectionsbuffer.cxx501
-rw-r--r--oox/source/xls/connectionsfragment.cxx142
-rw-r--r--oox/source/xls/defnamesbuffer.cxx244
-rw-r--r--oox/source/xls/drawingfragment.cxx687
-rw-r--r--oox/source/xls/excelchartconverter.cxx27
-rw-r--r--oox/source/xls/excelfilter.cxx136
-rw-r--r--oox/source/xls/excelhandlers.cxx174
-rwxr-xr-xoox/source/xls/excelvbaproject.cxx18
-rw-r--r--oox/source/xls/externallinkbuffer.cxx186
-rw-r--r--oox/source/xls/externallinkfragment.cxx357
-rwxr-xr-x[-rw-r--r--]oox/source/xls/formulabase.cxx107
-rw-r--r--oox/source/xls/formulaparser.cxx406
-rw-r--r--oox/source/xls/makefile.mk6
-rw-r--r--oox/source/xls/numberformatsbuffer.cxx47
-rw-r--r--oox/source/xls/ooxformulaparser.cxx30
-rw-r--r--oox/source/xls/pagesettings.cxx161
-rw-r--r--oox/source/xls/pivotcachebuffer.cxx339
-rw-r--r--oox/source/xls/pivotcachefragment.cxx189
-rw-r--r--oox/source/xls/pivottablebuffer.cxx414
-rw-r--r--oox/source/xls/pivottablefragment.cxx190
-rw-r--r--oox/source/xls/querytablebuffer.cxx390
-rw-r--r--oox/source/xls/querytablefragment.cxx68
-rw-r--r--oox/source/xls/richstring.cxx55
-rw-r--r--oox/source/xls/richstringcontext.cxx50
-rw-r--r--oox/source/xls/scenariobuffer.cxx35
-rw-r--r--oox/source/xls/scenariocontext.cxx42
-rw-r--r--oox/source/xls/sharedformulabuffer.cxx27
-rw-r--r--oox/source/xls/sharedstringsbuffer.cxx10
-rw-r--r--oox/source/xls/sharedstringsfragment.cxx40
-rw-r--r--oox/source/xls/sheetdatacontext.cxx460
-rw-r--r--oox/source/xls/stylesbuffer.cxx460
-rw-r--r--oox/source/xls/stylesfragment.cxx158
-rw-r--r--oox/source/xls/tablebuffer.cxx81
-rw-r--r--oox/source/xls/tablefragment.cxx56
-rw-r--r--oox/source/xls/themebuffer.cxx11
-rw-r--r--oox/source/xls/unitconverter.cxx27
-rw-r--r--oox/source/xls/viewsettings.cxx223
-rw-r--r--oox/source/xls/webquerybuffer.cxx199
-rw-r--r--oox/source/xls/workbookfragment.cxx335
-rw-r--r--oox/source/xls/workbookhelper.cxx236
-rw-r--r--oox/source/xls/workbooksettings.cxx80
-rw-r--r--oox/source/xls/worksheetbuffer.cxx33
-rw-r--r--oox/source/xls/worksheetfragment.cxx692
-rw-r--r--oox/source/xls/worksheethelper.cxx326
-rw-r--r--oox/source/xls/worksheetsettings.cxx66
-rw-r--r--oox/util/oox.component41
-rw-r--r--postprocess/packcomponents/makefile.mk1
-rw-r--r--postprocess/packregistry/makefile.mk4
-rw-r--r--[-rwxr-xr-x]reportbuilder/util/makefile.pmk0
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx2
-rw-r--r--reportdesign/source/ui/inspection/ReportComponentHandler.cxx2
-rw-r--r--rsc/inc/rscdb.hxx1
-rw-r--r--rsc/inc/vclrsc.hxx181
-rw-r--r--rsc/source/parser/rscicpx.cxx1
-rw-r--r--rsc/source/parser/rscinit.cxx2
-rw-r--r--sax/source/tools/fshelper.cxx11
-rw-r--r--sc/inc/addruno.hxx2
-rw-r--r--sc/inc/document.hxx2
-rw-r--r--sc/inc/docuno.hxx2
-rw-r--r--sc/inc/fmtuno.hxx6
-rwxr-xr-x[-rw-r--r--]sc/inc/pch/precompiled_sc.hxx4
-rw-r--r--sc/inc/sc.hrc1
-rw-r--r--sc/inc/unonames.hxx1
-rw-r--r--sc/source/core/data/conditio.cxx2
-rw-r--r--sc/source/core/data/documen3.cxx3
-rw-r--r--sc/source/core/data/documen8.cxx11
-rw-r--r--[-rwxr-xr-x]sc/source/core/data/drwlayer.cxx0
-rw-r--r--[-rwxr-xr-x]sc/source/core/data/makefile.mk1
-rw-r--r--sc/source/core/data/postit.cxx7
-rw-r--r--sc/source/core/data/stlsheet.cxx7
-rw-r--r--sc/source/core/data/table1.cxx6
-rw-r--r--sc/source/core/inc/core_pch.hxx2
-rw-r--r--sc/source/core/tool/formulaparserpool.cxx21
-rw-r--r--sc/source/filter/excel/excdoc.cxx5
-rw-r--r--sc/source/filter/excel/excel.cxx2
-rw-r--r--sc/source/filter/excel/excimp8.cxx72
-rw-r--r--sc/source/filter/excel/excrecds.cxx4
-rw-r--r--sc/source/filter/excel/xecontent.cxx2
-rw-r--r--sc/source/filter/excel/xeescher.cxx2
-rw-r--r--sc/source/filter/excel/xeformula.cxx6
-rw-r--r--sc/source/filter/excel/xename.cxx3
-rw-r--r--sc/source/filter/excel/xepage.cxx2
-rw-r--r--sc/source/filter/excel/xepivot.cxx2
-rw-r--r--sc/source/filter/excel/xerecord.cxx2
-rw-r--r--sc/source/filter/excel/xestream.cxx79
-rw-r--r--sc/source/filter/excel/xestring.cxx2
-rw-r--r--sc/source/filter/excel/xestyle.cxx2
-rw-r--r--sc/source/filter/excel/xetable.cxx2
-rw-r--r--sc/source/filter/excel/xeview.cxx2
-rwxr-xr-x[-rw-r--r--]sc/source/filter/excel/xichart.cxx0
-rw-r--r--sc/source/filter/excel/xicontent.cxx5
-rw-r--r--sc/source/filter/excel/xistyle.cxx13
-rwxr-xr-x[-rw-r--r--]sc/source/filter/excel/xlchart.cxx0
-rwxr-xr-x[-rw-r--r--]sc/source/filter/excel/xlformula.cxx2
-rw-r--r--sc/source/filter/excel/xltools.cxx6
-rw-r--r--sc/source/filter/inc/filt_pch.hxx6
-rw-r--r--sc/source/filter/inc/xestream.hxx4
-rw-r--r--sc/source/filter/inc/xistyle.hxx3
-rwxr-xr-x[-rw-r--r--]sc/source/filter/inc/xlchart.hxx0
-rw-r--r--sc/source/filter/inc/xlescher.hxx2
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx2
-rw-r--r--[-rwxr-xr-x]sc/source/filter/xml/XMLCodeNameProvider.cxx2
-rwxr-xr-xsc/source/ui/app/inputwin.cxx4
-rw-r--r--sc/source/ui/cctrl/dpcontrol.cxx2
-rw-r--r--sc/source/ui/docshell/docfunc.cxx11
-rw-r--r--sc/source/ui/docshell/docsh.cxx1
-rw-r--r--sc/source/ui/docshell/docsh4.cxx368
-rw-r--r--sc/source/ui/inc/docsh.hxx8
-rw-r--r--sc/source/ui/inc/prevwsh.hxx4
-rw-r--r--sc/source/ui/inc/tabvwsh.hxx6
-rw-r--r--sc/source/ui/inc/ui_pch.hxx3
-rw-r--r--sc/source/ui/inc/viewfunc.hxx5
-rw-r--r--sc/source/ui/src/scstring.src14
-rw-r--r--sc/source/ui/unoobj/addruno.cxx27
-rw-r--r--sc/source/ui/unoobj/docuno.cxx63
-rw-r--r--sc/source/ui/unoobj/fmtuno.cxx41
-rw-r--r--sc/source/ui/vba/vbasheetobject.cxx6
-rw-r--r--sc/source/ui/view/drawview.cxx12
-rw-r--r--sc/source/ui/view/formatsh.cxx8
-rw-r--r--sc/source/ui/view/prevwsh.cxx95
-rw-r--r--[-rwxr-xr-x]sc/source/ui/view/printfun.cxx0
-rw-r--r--sc/source/ui/view/tabview3.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx124
-rw-r--r--sc/source/ui/view/viewfun4.cxx4
-rw-r--r--sc/source/ui/view/viewfunc.cxx4
-rw-r--r--scp2/source/ooo/common_brand.scp8
-rw-r--r--scp2/source/ooo/profileitem_ooo.scp18
-rwxr-xr-xsd/inc/pch/precompiled_sd.hxx3
-rw-r--r--[-rwxr-xr-x]sd/qa/unoapi/sd.sce0
-rwxr-xr-xsd/source/core/drawdoc4.cxx21
-rw-r--r--[-rwxr-xr-x]sd/source/core/glob.src0
-rwxr-xr-xsd/source/core/stlpool.cxx11
-rw-r--r--[-rwxr-xr-x]sd/source/filter/ppt/propread.cxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationDialog.cxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/animations/CustomAnimationPane.cxx10
-rwxr-xr-x[-rw-r--r--]sd/source/ui/annotations/annotations.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/menuids3_tmpl.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/menuids4_tmpl.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/menuids_tmpl.src0
-rw-r--r--[-rwxr-xr-x]sd/source/ui/app/optsitem.cxx39
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/popup.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/popup2_tmpl.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/strings.src2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/toolbox.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/dlg/LayerTabBar.cxx0
-rwxr-xr-xsd/source/ui/dlg/dlgass.cxx2
-rwxr-xr-xsd/source/ui/func/fuconstr.cxx92
-rwxr-xr-xsd/source/ui/func/fudraw.cxx30
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fusel.cxx8
-rwxr-xr-xsd/source/ui/func/futext.cxx11
-rwxr-xr-xsd/source/ui/inc/ViewShellBase.hxx14
-rwxr-xr-xsd/source/ui/inc/optsitem.hxx9
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/makefile.mk3
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/showwin.cxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/slideshow.hrc33
-rwxr-xr-x[-rw-r--r--]sd/source/ui/slideshow/slideshow.src70
-rwxr-xr-xsd/source/ui/slideshow/slideshowimpl.cxx544
-rwxr-xr-xsd/source/ui/slideshow/slideshowimpl.hxx11
-rwxr-xr-x[-rw-r--r--]sd/source/ui/table/tableobjectbar.cxx0
-rwxr-xr-xsd/source/ui/view/DocumentRenderer.cxx52
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/DocumentRenderer.hrc15
-rwxr-xr-xsd/source/ui/view/DocumentRenderer.src94
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx46
-rwxr-xr-xsd/source/ui/view/drviews1.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviewsb.cxx0
-rwxr-xr-xsd/source/ui/view/drviewse.cxx10
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/sdruler.cxx0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/tabcontr.cxx0
-rw-r--r--set_soenv.in10
-rw-r--r--setup_native/scripts/admin.pl2
-rwxr-xr-xsetup_native/source/packinfo/shellscripts_extensions.txt168
-rw-r--r--setup_native/source/win32/customactions/shellextensions/registerextensions.cxx208
-rw-r--r--sfx2/inc/pch/precompiled_sfx2.hxx2
-rw-r--r--sfx2/inc/sfx2/event.hxx1
-rw-r--r--sfx2/inc/sfx2/mnumgr.hxx2
-rw-r--r--sfx2/inc/sfx2/module.hxx2
-rw-r--r--sfx2/inc/sfx2/printer.hxx60
-rw-r--r--sfx2/inc/sfx2/viewsh.hxx5
-rw-r--r--sfx2/source/appl/appmain.cxx15
-rw-r--r--[-rwxr-xr-x]sfx2/source/dialog/securitypage.src0
-rwxr-xr-xsfx2/source/doc/printhelper.cxx74
-rwxr-xr-x[-rw-r--r--]sfx2/source/doc/syspath.cxx0
-rw-r--r--[-rwxr-xr-x]sfx2/source/inc/helpid.hrc0
-rw-r--r--[-rwxr-xr-x]sfx2/source/menu/thessubmenu.hxx0
-rw-r--r--sfx2/source/view/printer.cxx314
-rw-r--r--sfx2/source/view/viewprn.cxx155
-rw-r--r--slideshow/source/engine/color.cxx4
-rw-r--r--slideshow/source/engine/makefile.mk2
-rw-r--r--slideshow/source/engine/shapes/shapeimporter.cxx7
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx50
-rw-r--r--slideshow/source/engine/slide/userpaintoverlay.cxx91
-rw-r--r--slideshow/source/engine/slide/userpaintoverlay.hxx9
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx54
-rw-r--r--slideshow/source/inc/slide.hxx7
-rw-r--r--slideshow/util/makefile.pmk2
-rw-r--r--soldep/inc/soldep/soldlg.hxx2
-rw-r--r--solenv/config/sdev300.ini12
-rw-r--r--solenv/gbuild/AllLangResTarget.mk17
-rw-r--r--solenv/gbuild/TargetLocations.mk4
-rwxr-xr-xsolenv/gbuild/platform/macosx.mk4
-rwxr-xr-xsolenv/gbuild/platform/solaris.mk9
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--solenv/inc/unxmacx.mk5
-rw-r--r--[-rwxr-xr-x]solenv/src/reg-component.map0
-rw-r--r--[-rwxr-xr-x]starmath/inc/starmath.hrc0
-rw-r--r--[-rwxr-xr-x]starmath/inc/toolbox.hxx0
-rw-r--r--starmath/inc/view.hxx2
-rw-r--r--[-rwxr-xr-x]starmath/sdi/smath.sdi0
-rw-r--r--[-rwxr-xr-x]starmath/sdi/smslots.sdi0
-rw-r--r--[-rwxr-xr-x]starmath/source/dialog.cxx0
-rw-r--r--starmath/source/document.cxx2
-rw-r--r--starmath/source/math_pch.cxx833
-rwxr-xr-x[-rw-r--r--]starmath/source/smres.src6
-rw-r--r--[-rwxr-xr-x]starmath/source/toolbox.hrc0
-rw-r--r--[-rwxr-xr-x]starmath/source/toolbox.src0
-rwxr-xr-xstarmath/source/unomodel.cxx36
-rwxr-xr-xstarmath/source/view.cxx2
-rw-r--r--[-rwxr-xr-x]starmath/uiconfig/smath/menubar/menubar.xml0
-rw-r--r--[-rwxr-xr-x]stoc/source/simpleregistry/simpleregistry.cxx0
-rw-r--r--svtools/AllLangResTarget_svt.mk1
-rw-r--r--svtools/Library_svt.mk1
-rw-r--r--svtools/Package_inc.mk1
-rw-r--r--svtools/inc/pch/precompiled_svtools.hxx4
-rw-r--r--svtools/inc/svtools/apearcfg.hxx20
-rw-r--r--svtools/inc/svtools/embedhlp.hxx4
-rw-r--r--svtools/inc/svtools/printdlg.hxx297
-rw-r--r--svtools/inc/svtools/svmedit.hxx2
-rw-r--r--svtools/source/config/apearcfg.cxx87
-rwxr-xr-x[-rw-r--r--]svtools/source/control/headbar.cxx0
-rw-r--r--svtools/source/dialogs/printdlg.cxx791
-rw-r--r--svtools/source/dialogs/printdlg.hrc74
-rw-r--r--svtools/source/dialogs/printdlg.src349
-rw-r--r--svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx2
-rw-r--r--svtools/source/misc/ehdl.cxx2
-rw-r--r--svtools/source/misc/embedtransfer.cxx2
-rw-r--r--svx/inc/pch/precompiled_svx.hxx4
-rw-r--r--svx/inc/svx/fmgridif.hxx2
-rw-r--r--svx/inc/svx/fmtools.hxx2
-rw-r--r--svx/inc/svx/xdef.hxx3
-rw-r--r--svx/prj/makefile.mk2
-rw-r--r--svx/source/dialog/bmpmask.src4
-rw-r--r--svx/source/dialog/contdlg.src2
-rw-r--r--svx/source/dialog/optgrid.cxx12
-rw-r--r--svx/source/dialog/optgrid.src4
-rw-r--r--svx/source/fmcomp/gridcell.cxx11
-rw-r--r--svx/source/gallery2/gallery1.cxx2
-rw-r--r--svx/source/items/customshapeitem.cxx2
-rw-r--r--svx/source/sdr/contact/objectcontactofobjlistpainter.cxx2
-rw-r--r--svx/source/sdr/contact/objectcontactofpageview.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofgraphic.cxx2
-rw-r--r--[-rwxr-xr-x]svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx0
-rw-r--r--svx/source/sdr/overlay/overlaymanager.cxx2
-rw-r--r--svx/source/svdraw/svddrgmt.cxx38
-rw-r--r--svx/source/svdraw/svdobj.cxx6
-rw-r--r--svx/source/svdraw/svdotxtr.cxx2
-rw-r--r--svx/source/svdraw/svdview.cxx2
-rw-r--r--svx/source/unodraw/unoprov.cxx2
-rw-r--r--svx/source/xoutdev/xpool.cxx4
-rwxr-xr-x[-rw-r--r--]sw/inc/dochdl.hrc0
-rw-r--r--[-rwxr-xr-x]sw/inc/docsh.hxx0
-rw-r--r--sw/inc/modcfg.hxx2
-rwxr-xr-x[-rw-r--r--]sw/inc/pch/precompiled_sw.hxx5
-rw-r--r--sw/inc/swmodule.hxx2
-rw-r--r--sw/source/core/view/printdata.cxx162
-rw-r--r--[-rwxr-xr-x]sw/source/core/view/viewsh.cxx0
-rw-r--r--sw/source/filter/ascii/parasc.cxx20
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx3
-rw-r--r--sw/source/filter/ww8/docxexport.cxx3
-rw-r--r--sw/source/filter/ww8/docxfootnotes.hxx1
-rw-r--r--sw/source/filter/xml/xmliteme.cxx2
-rw-r--r--sw/source/ui/app/docshini.cxx41
-rw-r--r--sw/source/ui/config/optdlg.src15
-rw-r--r--sw/source/ui/config/optpage.cxx62
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx20
-rwxr-xr-x[-rw-r--r--]sw/source/ui/dochdl/dochdl.src0
-rwxr-xr-x[-rw-r--r--]sw/source/ui/dochdl/gloshdl.cxx0
-rw-r--r--sw/source/ui/inc/pview.hxx1
-rw-r--r--sw/source/ui/inc/uitool.hxx2
-rw-r--r--sw/source/ui/inc/usrpref.hxx2
-rw-r--r--sw/source/ui/inc/view.hxx2
-rw-r--r--[-rwxr-xr-x]sw/source/ui/lingu/olmenu.cxx0
-rw-r--r--[-rwxr-xr-x]sw/source/ui/shells/langhelper.cxx0
-rw-r--r--sw/source/ui/uiview/pview.cxx13
-rw-r--r--sw/source/ui/uiview/view.cxx3
-rw-r--r--[-rwxr-xr-x]sw/source/ui/uiview/view.hrc0
-rw-r--r--sw/source/ui/uiview/viewfunc.hxx2
-rwxr-xr-x[-rw-r--r--]sw/source/ui/uiview/viewling.cxx0
-rw-r--r--sw/source/ui/uiview/viewprt.cxx37
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-base-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-calc-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-calc-tem.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-chart-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-draw-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-draw-tem.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-impress-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-impress-tem.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-master-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-math-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-writer-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so7-writer-tem.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-base-app.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-base-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-calc-app.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-calc-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-calc-tem.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-chart-doc.icobin10134 -> 10134 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-configuration.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-draw-app.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-draw-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-draw-tem.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-empty-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-empty-tem.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-image-doc.icobin10134 -> 10134 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-impress-app.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-impress-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-impress-tem.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-macro-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-main-app.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-master-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-math-app.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-math-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-open.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-printer.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-web-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-writer-app.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-writer-doc.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so8-writer-tem.icobin25214 -> 25214 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_base_doc.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_calc_doc.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_calc_tem.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_chart_doc.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_draw_doc.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_draw_tem.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_empty_doc.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_empty_tem.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_global_doc.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_html_doc.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_impress_doc.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_impress_tem.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_macro_doc.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_math_doc.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_writer_doc.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]sysui/desktop/icons/so9_writer_tem.icobin295606 -> 295606 bytes
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/optional/ch2_flexible_source_range_selection.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/optional/ch2_xml_format.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/optional/includes/loadsave/ch2_losa.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/ch2_updt_calc.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_file.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_format.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_format1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_insert.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_insert_ctl.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_menu.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_ole.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_toolbars.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_view.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_window.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/required/includes/ch2_wizard.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/tools/ch_tools_axes.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/tools/ch_tools_chart_type.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/tools/ch_tools_data_labels.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/tools/ch_tools_grids.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/tools/ch_tools_legend.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/tools/ch_tools_select.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/tools/ch_tools_statistics.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/tools/ch_tools_tab_borders_lines.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/tools/ch_tools_tab_pages.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/chart2/tools/ch_tools_titles.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/dbaccess/optional/dba_misc_Macros.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_Grid.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_Several1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_TextControl.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_ADOAccess.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_AdabasD.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Dbase.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_DbaseFunction.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_IndexDesign.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Query.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Relations.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Spreadsheet.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Text.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_Windows.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_hsqldb.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/misc_Macros.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_DateTime.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_Grouping.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_PageNumber.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_FormWizard.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_TableWizard.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/DatabaseTypes.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/Forms.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/MainApp.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/Query.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/ReportBuilder01.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/Table.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/TableDesign.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/Wizards.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/Xforms01.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/controltools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/dbinit.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/dbtools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/formtools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/querytools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/tabletools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/display_name.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/fileopen.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/help.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/identifiers.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/meta-inf.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/includes/options.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/config.properties0
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/input/issues/Logging.xcu0
-rw-r--r--[-rwxr-xr-x]testautomation/extensions/required/e_update.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_delete_modules.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_documents.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_eventbinding.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_ide.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_library_export.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_library_import.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_macros.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_modulehide.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_modulenames.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_modules.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_package_export.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_protected_libraries.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_usertemplate.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_vba_compat_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/configuration.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/extras_file_open.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/extras_preview.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/extras_table_autoformat.inc0
-rw-r--r--testautomation/framework/optional/includes/f_usage_tracking.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_allowed_names.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_autocomplete.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_cjk_files.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_cjk_folders.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_document_properties.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_filternames.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders3.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders4.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders5.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders6.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_folders7.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_multiselection.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_passwords.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/filedlg_triggers.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/fontworkgallery.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/help_bookmarks.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/help_compare_applications.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/help_compare_content.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/help_compare_topics.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/help_search.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/help_view_topics.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/loadsave_files.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/loadsave_new.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/menuentries.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/ole_1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/ole_2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/ole_3.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/ole_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_asia.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_data.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_int1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_lan1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_loadsave_html.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_loadsave_msoffice.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_loadsave_vba.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_accessibility.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_appearance.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_fontreplacement.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_java.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_memory.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_paths.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_print.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_security.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_userdata.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/options_ooo_view.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/scripting_organizers.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/security_broken_signature.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/security_evilmacro1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/security_evilmacro2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/security_evilmacro3.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/security_recommend_password.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/security_trusted_path.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/standardbar2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/toolbar_behavior.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/basic_dialog_export.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/basic_dialog_i18n_import.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/basic_macroassignment.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/basic_organizer.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/first.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/help_browser.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/printer_administration.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/security_dialogs.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/standard_toolbar_1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/standard_toolbar_3.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/standard_toolbar_4.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/standard_toolbar_5.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/standard_toolbar_6.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/tools_customize.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/tools_options.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/wizard_mailmerge.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/wizard_webpage.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/CJK_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/customize_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/fileoperations.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/formcontrols.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/help_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/i18n_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/options_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/pbrowser_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/private_environment.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/scriptorganizer_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/spadmin_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/webtools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/framework/tools/includes/window_tools.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/input/empty/please_do_not_delete_this_file0
-rwxr-xr-x[-rw-r--r--]testautomation/global/required/includes/g_001.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/required/includes/g_009.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/required/includes/g_customize.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/required/includes/g_numberformatter1.inc0
-rw-r--r--testautomation/global/required/includes/g_option.inc11
-rwxr-xr-x[-rw-r--r--]testautomation/global/required/includes/g_option_application.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/sid/bars.sid0
-rwxr-xr-x[-rw-r--r--]testautomation/global/sid/context.sid0
-rwxr-xr-x[-rw-r--r--]testautomation/global/sid/others.sid0
-rwxr-xr-x[-rw-r--r--]testautomation/global/system/includes/declare.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/system/includes/iniinfo.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/system/includes/inivalue.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/system/includes/status.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/system/includes/sysinfo.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/global/tools/closeoffice.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_accels.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_basic_ide_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_docfuncs.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_extension_manager_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_key_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_locale_strings1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_locale_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_ole.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_security_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_set_standard_controls.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_stringtools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_toolbar_tools1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_toolbar_writer.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_ui_filters.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_user_info.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_xml1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_xml2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_xml_filter1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/required/t_lists.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/required/t_option.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/required/t_option2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/required/t_tools1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/required/t_tools3.inc0
-rwxr-xr-xtestautomation/global/win/edia_p_s.win168
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_accessability.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_area.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_arrangealign.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_autocorrection.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_character.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_clipboard.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_clipexport.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_convertto.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_crossfading.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_customshapes.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_demoguide.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_dimensions.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_edit.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_export_html.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_findreplace.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_format.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_group.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_imagemap.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_insert.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_line.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_load_save.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_mediaplayer.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_navigator.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_ole.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_paneview.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_paragraph.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_savepictureas.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_shaddow.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_slidelayer.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_stylist.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_tables.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_toolbars.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_tools.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/g_zoom.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/gallery.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/gallery2.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_animation.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_headerfooter.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_pengine.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_saveloadlayout.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_shape.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_slidecopy.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/optional/i_view.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/required/d_opt.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/required/d_updt.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/required/i_opt.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/required/i_updt_1.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/graphics/required/i_updt_2.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/math/optional/includes/m_106_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_002_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_003_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_004_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_006_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_007_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_010_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/math/required/includes/m_020_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_editmenu.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/tools/includes/c_cell_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/tools/includes/c_select_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/tools/includes/c_tool_options.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/autotext/w_autotext.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/calculate/w_calculate.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/filter/w_filter.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/fontwork/w_fontwork1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/option/wh_o_3.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/option/wr_o_5.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/redlining/w_redlining2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/section/w_section_1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/section/w_section_2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/section/w_section_tools.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/stylist/w_stylist.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/table/w_204_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/table/w_204a_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/table/w_204b_.inc0
-rw-r--r--testautomation/writer/optional/includes/textframes/w_textframes2.inc4
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/input/import/dostext.txt0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_CJKCTLDependency.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_alternative_text.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_autotext.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_calculate.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_chinesetranslate.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_drawing_tools.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_dropdownLB.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_fields.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_fontwork.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_formatpage.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_formatparagraph.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_hhConversion.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_hyphenation.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_insertgraphic.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_loadsave.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_navigator.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_redlining.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_section.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_sorting.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_spellcheck.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_stylist.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_textframes.bas0
-rw-r--r--[-rwxr-xr-x]testautomation/writer/optional/w_undo.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_001a_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_002_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_003_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_005_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_005b_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_006_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_008_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_009_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_010_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_010_1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/required/includes/w_011_.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_get_locale_strings.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_locale_strings2.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_tool1.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_tool4.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_tool5.inc0
-rw-r--r--testautomation/writer/tools/includes/w_tool6.inc4
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_tool7.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_tools_autocorrection.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_tools_drawing.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_tools_hyphenation.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/writer/tools/includes/w_tools_undo.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/docbook_losa.bas0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/c_datapilot_pagefields.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/ch_xml_japanese_candlestick.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/docbook_001.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/f_xml_save_ms_ole.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxd7_01.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxd7_02.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxd7_03.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxd7_04.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxd7_05.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxi7_01.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxm7_01.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxw7_01.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxw7_01a.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxw7_02.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/sxw7_03.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/optional/includes/w_xml_vertical_alignment.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/required/includes/oasis_graphics_01.inc0
-rwxr-xr-x[-rw-r--r--]testautomation/xml/tools/includes/itools1.inc0
-rwxr-xr-x[-rw-r--r--]testgraphical/prj/d.lst0
-rw-r--r--toolkit/AllLangResTarget_tk.mk2
-rw-r--r--toolkit/inc/layout/layout.hxx4
-rw-r--r--toolkit/inc/pch/precompiled_toolkit.hxx2
-rw-r--r--toolkit/inc/toolkit/awt/vclxtoolkit.hxx2
-rw-r--r--toolkit/inc/toolkit/helper/vclunohelper.hxx4
-rw-r--r--toolkit/source/awt/vclxplugin.hxx2
-rw-r--r--toolkit/source/awt/vclxwindows.cxx18
-rw-r--r--toolkit/source/controls/grid/defaultgriddatamodel.cxx4
-rw-r--r--tools/inc/tools/fldunit.hxx1
-rw-r--r--tools/inc/tools/mapunit.hxx1
-rw-r--r--tools/inc/tools/wintypes.hxx6
-rwxr-xr-x[-rw-r--r--]ucb/source/core/cmdenv.cxx0
-rwxr-xr-x[-rw-r--r--]unotools/inc/unotools/lingucfg.hxx0
-rwxr-xr-x[-rw-r--r--]unotools/source/config/lingucfg.cxx0
-rw-r--r--[-rwxr-xr-x]uui/source/iahndl.cxx0
-rwxr-xr-xuui/source/iahndl.hxx2
-rw-r--r--[-rwxr-xr-x]uui/source/ids.hrc0
-rw-r--r--[-rwxr-xr-x]uui/source/logindlg.src0
-rw-r--r--[-rwxr-xr-x]uui/source/loginerr.hxx0
-rw-r--r--[-rwxr-xr-x]uui/source/masterpasscrtdlg.cxx0
-rw-r--r--[-rwxr-xr-x]uui/source/passworddlg.cxx0
-rw-r--r--[-rwxr-xr-x]uui/source/passworddlg.hrc0
-rw-r--r--[-rwxr-xr-x]uui/source/passworddlg.hxx0
-rw-r--r--[-rwxr-xr-x]uui/source/passworderrs.src0
-rw-r--r--vbahelper/source/vbahelper/vbaapplicationbase.cxx6
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarcontrol.cxx6
-rwxr-xr-xvbahelper/source/vbahelper/vbaeventshelperbase.cxx4
-rwxr-xr-xvcl/aqua/source/app/vclnsapp.mm73
-rw-r--r--vcl/aqua/source/gdi/aquaprintaccessoryview.mm3
-rw-r--r--vcl/aqua/source/gdi/salgdi.cxx2
-rwxr-xr-xvcl/aqua/source/window/salframeview.mm4
-rw-r--r--vcl/inc/vcl/button.hxx1
-rw-r--r--vcl/inc/vcl/field.hxx2
-rw-r--r--vcl/inc/vcl/lazydelete.hxx39
-rw-r--r--vcl/inc/vcl/mapmod.hxx2
-rw-r--r--vcl/inc/vcl/outfont.hxx16
-rw-r--r--vcl/inc/vcl/print.hxx37
-rw-r--r--vcl/inc/vcl/prndlg.hxx4
-rw-r--r--vcl/inc/vcl/salatype.hxx47
-rw-r--r--vcl/inc/vcl/salctype.hxx12
-rw-r--r--vcl/inc/vcl/salgdi.hxx1
-rwxr-xr-x[-rw-r--r--]vcl/inc/vcl/salnativewidgets.hxx19
-rw-r--r--vcl/inc/vcl/settings.hxx54
-rw-r--r--vcl/inc/vcl/svids.hrc6
-rw-r--r--vcl/inc/vcl/symbol.hxx3
-rw-r--r--vcl/inc/vcl/tabctrl.hxx12
-rw-r--r--vcl/inc/vcl/windata.hxx49
-rw-r--r--vcl/inc/vcl/window.h14
-rwxr-xr-xvcl/inc/vcl/window.hxx2
-rw-r--r--vcl/os2/source/app/salinst.cxx2
-rw-r--r--vcl/os2/source/window/salframe.cxx51
-rw-r--r--vcl/prj/d.lst3
-rw-r--r--vcl/source/app/salvtables.cxx4
-rw-r--r--vcl/source/app/settings.cxx46
-rw-r--r--vcl/source/app/svapp.cxx1
-rw-r--r--vcl/source/control/button.cxx178
-rw-r--r--vcl/source/control/menubtn.cxx9
-rw-r--r--vcl/source/control/scrbar.cxx57
-rw-r--r--vcl/source/control/slider.cxx7
-rw-r--r--vcl/source/control/tabctrl.cxx149
-rw-r--r--vcl/source/gdi/bmpconv.cxx16
-rw-r--r--vcl/source/gdi/outdev3.cxx6
-rwxr-xr-x[-rw-r--r--]vcl/source/gdi/outdevnative.cxx63
-rw-r--r--vcl/source/gdi/print.cxx105
-rwxr-xr-xvcl/source/gdi/print3.cxx86
-rw-r--r--vcl/source/src/btntext.src64
-rw-r--r--vcl/source/src/images.src39
-rw-r--r--vcl/source/src/print.src85
-rw-r--r--vcl/source/window/decoview.cxx100
-rwxr-xr-x[-rw-r--r--]vcl/source/window/menu.cxx60
-rw-r--r--vcl/source/window/printdlg.cxx162
-rw-r--r--[-rwxr-xr-x]vcl/source/window/window.cxx61
-rw-r--r--vcl/source/window/winproc.cxx1
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx7
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx2
-rw-r--r--vcl/unx/headless/svpinst.cxx2
-rw-r--r--vcl/unx/inc/i18n_im.hxx4
-rw-r--r--vcl/unx/inc/saldisp.hxx18
-rw-r--r--vcl/unx/inc/salgdi.h24
-rw-r--r--vcl/unx/inc/xfont.hxx162
-rw-r--r--vcl/unx/source/app/saldisp.cxx10
-rw-r--r--vcl/unx/source/app/salinst.cxx2
-rw-r--r--vcl/unx/source/gdi/makefile.mk10
-rw-r--r--vcl/unx/source/gdi/salgdi.cxx9
-rw-r--r--vcl/unx/source/gdi/salgdi3.cxx578
-rw-r--r--vcl/unx/source/gdi/xfont.cxx780
-rw-r--r--vcl/unx/source/gdi/xlfd_attr.cxx686
-rw-r--r--vcl/unx/source/gdi/xlfd_attr.hxx228
-rw-r--r--vcl/unx/source/gdi/xlfd_extd.cxx1001
-rw-r--r--vcl/unx/source/gdi/xlfd_extd.hxx272
-rw-r--r--vcl/unx/source/gdi/xlfd_smpl.cxx268
-rw-r--r--vcl/unx/source/gdi/xlfd_smpl.hxx92
-rw-r--r--vcl/unx/source/window/salframe.cxx2
-rw-r--r--vcl/util/makefile.mk1
-rw-r--r--vcl/util/target.pmk5
-rwxr-xr-x[-rw-r--r--]vcl/win/inc/saldata.hxx8
-rw-r--r--vcl/win/source/app/saldata.cxx37
-rwxr-xr-x[-rw-r--r--]vcl/win/source/app/salinst.cxx53
-rwxr-xr-x[-rw-r--r--]vcl/win/source/gdi/salgdi3.cxx480
-rwxr-xr-xvcl/win/source/gdi/salnativewidgets-luna.cxx143
-rwxr-xr-x[-rw-r--r--]vcl/win/source/gdi/winlayout.cxx93
-rwxr-xr-xvcl/win/source/window/salframe.cxx257
-rw-r--r--vcl/win/source/window/salobj.cxx12
-rw-r--r--writerfilter/source/filter/ImportFilter.cxx3
-rw-r--r--writerfilter/source/ooxml/model.xml26
-rw-r--r--writerfilter/source/ooxml/namespaceids.xsl2
-rw-r--r--writerfilter/source/resourcemodel/namespace_preprocess.pl25
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx22
-rw-r--r--[-rwxr-xr-x]xmloff/source/forms/handler/property_handler_base.cxx0
-rw-r--r--[-rwxr-xr-x]xmloff/source/forms/handler/vcl_date_handler.cxx0
-rw-r--r--[-rwxr-xr-x]xmloff/source/forms/handler/vcl_date_handler.hxx0
-rw-r--r--[-rwxr-xr-x]xmloff/source/forms/handler/vcl_time_handler.cxx0
-rw-r--r--[-rwxr-xr-x]xmloff/source/forms/handler/vcl_time_handler.hxx0
-rw-r--r--[-rwxr-xr-x]xmloff/source/forms/property_group.hxx0
-rw-r--r--[-rwxr-xr-x]xmloff/source/forms/property_meta_data.hxx0
-rw-r--r--[-rwxr-xr-x]xmlreader/prj/d.lst0
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx14
1417 files changed, 19195 insertions, 23674 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index 5ab160535aa0..c2526cbec18d 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -34,7 +34,7 @@
#include "accessibility/extended/accessiblebrowseboxcell.hxx"
#endif
#include <cppuhelper/implbase2.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
// ============================================================================
namespace accessibility
{
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index 847896a14588..f5320c2fd20f 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -29,8 +29,7 @@
#include <tools/gen.hxx>
#include <tools/string.hxx>
-#include <vcl/wintypes.hxx>
-#include <tools/gen.hxx>
+#include <tools/wintypes.hxx>
namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {
class XClipboard;
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index a288c3d4d3a7..1b22b32388ec 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -34,7 +34,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/uieventslogger.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
#endif
@@ -79,7 +79,6 @@
#include <vcl/fixed.hxx>
#include <vcl/wrkwin.hxx>
#include <osl/diagnose.h>
-#include <vcl/wintypes.hxx>
#include <svtools/valueset.hxx>
#include <svtools/roadmap.hxx>
#include <svtools/table/tablecontrol.hxx>
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index ada6c60a6b35..61f3ad52309e 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -40,7 +40,7 @@
#ifndef _STATEMNT_HXX
#define _STATEMNT_HXX
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
#include <tools/string.hxx>
#include <tools/debug.hxx>
#include <tools/time.hxx>
diff --git a/automation/util/manually_added_ids.hid b/automation/util/manually_added_ids.hid
index 7372dc0d9879..7372dc0d9879 100644..100755
--- a/automation/util/manually_added_ids.hid
+++ b/automation/util/manually_added_ids.hid
diff --git a/basctl/source/basicide/basicprint.src b/basctl/source/basicide/basicprint.src
index 1f301d3461a9..06bb6b057150 100644
--- a/basctl/source/basicide/basicprint.src
+++ b/basctl/source/basicide/basicprint.src
@@ -33,8 +33,6 @@ StringArray RID_PRINTDLG_STRLIST
{
< "Print range"; >;
< "All ~Pages"; >;
- < "Print all pages of the printable content."; >;
< "Pa~ges"; >;
- < "Print only some pages of the printable content."; >;
};
};
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index e2042d49876c..1f8fe51c21dd 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -45,8 +45,8 @@ BasicRenderable::BasicRenderable( IDEBaseWindow* pWin )
, mpWindow( pWin )
{
ResStringArray aStrings( IDEResId( RID_PRINTDLG_STRLIST ) );
- DBG_ASSERT( aStrings.Count() >= 5, "resource incomplete" );
- if( aStrings.Count() < 5 ) // bad resource ?
+ DBG_ASSERT( aStrings.Count() >= 3, "resource incomplete" );
+ if( aStrings.Count() < 3 ) // bad resource ?
return;
m_aUIProperties.realloc( 3 );
@@ -63,13 +63,13 @@ BasicRenderable::BasicRenderable( IDEBaseWindow* pWin )
// create a choice for the range to print
rtl::OUString aPrintContentName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) );
Sequence< rtl::OUString > aChoices( 2 );
- Sequence< rtl::OUString > aHelpTexts( 2 );
+ Sequence< rtl::OUString > aHelpIds( 2 );
aChoices[0] = aStrings.GetString( 1 );
- aHelpTexts[0] = aStrings.GetString( 2 );
- aChoices[1] = aStrings.GetString( 3 );
- aHelpTexts[1] = aStrings.GetString( 4 );
+ aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) );
+ aChoices[1] = aStrings.GetString( 2 );
+ aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) );
m_aUIProperties[1].Value = getChoiceControlOpt( rtl::OUString(),
- aHelpTexts,
+ aHelpIds,
aPrintContentName,
aChoices,
0 );
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx
index e8f9e004ca6a..ae45c383c74d 100644
--- a/basic/inc/pch/precompiled_basic.hxx
+++ b/basic/inc/pch/precompiled_basic.hxx
@@ -272,7 +272,7 @@
#include "vcl/timer.hxx"
#include "vcl/toolbox.hxx"
#include "vcl/window.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
#include "vcl/wrkwin.hxx"
#include "vos/diagnose.hxx"
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 97f6ed227d47..cfd84567644a 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -37,7 +37,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/sound.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
#include <vcl/msgbox.hxx>
#include <basic/sbx.hxx>
#include <svl/zforlist.hxx>
diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 3820c4e42657..36888d038ceb 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.cxx
@@ -48,7 +48,7 @@ namespace vclcanvas
// switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
// is not required to do AA. It would need to be adapted to use it correctly
// (especially gradient painting). This will need extra work.
- maVDev->SetAntialiasing( maVDev->GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
+ maVDev->SetAntialiasing( maVDev->GetAntialiasing() & ~ANTIALIASING_ENABLE_B2DDRAW);
#endif
}
}
diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx
index 31c78283a128..c09721a5cfaf 100644
--- a/canvas/source/vcl/bitmapbackbuffer.cxx
+++ b/canvas/source/vcl/bitmapbackbuffer.cxx
@@ -138,7 +138,7 @@ namespace vclcanvas
// switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
// is not required to do AA. It would need to be adapted to use it correctly
// (especially gradient painting). This will need extra work.
- mpVDev->SetAntialiasing(mpVDev->GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
+ mpVDev->SetAntialiasing(mpVDev->GetAntialiasing() & ~ANTIALIASING_ENABLE_B2DDRAW);
#endif
}
}
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 4c0ea4fd6d3b..46561bc3f835 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -67,7 +67,7 @@ namespace vclcanvas
// switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
// is not required to do AA. It would need to be adapted to use it correctly
// (especially gradient painting). This will need extra work.
- mpBackBuffer->getOutDev().SetAntialiasing(mpBackBuffer->getOutDev().GetAntialiasing() & !ANTIALIASING_ENABLE_B2DDRAW);
+ mpBackBuffer->getOutDev().SetAntialiasing(mpBackBuffer->getOutDev().GetAntialiasing() & ~ANTIALIASING_ENABLE_B2DDRAW);
#endif
}
diff --git a/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx
index 199564a9f024..fed813c55c76 100644..100755
--- a/chart2/inc/pch/precompiled_chart2.hxx
+++ b/chart2/inc/pch/precompiled_chart2.hxx
@@ -268,7 +268,7 @@
#include "unotools/configitem.hxx"
#include "unotools/eventlisteneradapter.hxx"
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
#include "vos/mutex.hxx"
//---MARKER---
diff --git a/chart2/source/controller/inc/ConfigurationAccess.hxx b/chart2/source/controller/inc/ConfigurationAccess.hxx
index 0cc8180b3dd2..4b5196e7f902 100644
--- a/chart2/source/controller/inc/ConfigurationAccess.hxx
+++ b/chart2/source/controller/inc/ConfigurationAccess.hxx
@@ -29,7 +29,7 @@
#define _CHART2_CONFIGURATIONACCESS_HXX
// header for enum FieldUnit
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
//.............................................................................
namespace chart
diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx
index effc47392078..effc47392078 100755..100644
--- a/comphelper/inc/comphelper/docpasswordrequest.hxx
+++ b/comphelper/inc/comphelper/docpasswordrequest.hxx
diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx
index 263b68b24c7c..48dfe50b1645 100644
--- a/comphelper/inc/comphelper/sequenceasvector.hxx
+++ b/comphelper/inc/comphelper/sequenceasvector.hxx
@@ -86,6 +86,17 @@ class SequenceAsVector : public ::std::vector< TElementType >
{}
//---------------------------------------
+ /** @short creates a new vector with the given length.
+
+ @param nLength
+ the number of elements for the new vector.
+ */
+ explicit SequenceAsVector(sal_Int32 nLength) :
+ ::std::vector< TElementType >( static_cast< size_t >( nLength ) )
+ {
+ }
+
+ //---------------------------------------
/** @short creates a new deque from the given uno sequence.
@param lSource
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index 15c2e09ba0f3..15c2e09ba0f3 100755..100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.cxx
diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h
index da9906533583..71bb42c7413b 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.h
+++ b/cppu/inc/com/sun/star/uno/Sequence.h
@@ -125,7 +125,7 @@ public:
@param len initial sequence length
*/
- inline Sequence( sal_Int32 len );
+ inline explicit Sequence( sal_Int32 len );
/** Destructor: Releases sequence handle. Last handle will destruct
elements and free memory.
diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx
index 579ee876cb39..2f1afcab1726 100644
--- a/cppuhelper/inc/cppuhelper/factory.hxx
+++ b/cppuhelper/inc/cppuhelper/factory.hxx
@@ -27,9 +27,7 @@
#ifndef _CPPUHELPER_FACTORY_HXX_
#define _CPPUHELPER_FACTORY_HXX_
-#ifndef _RTL_STRING_HXX_
#include <rtl/ustring.hxx>
-#endif
#include <uno/dispatcher.h>
#include <rtl/unload.h>
@@ -54,7 +52,7 @@ typedef struct _uno_Environment uno_Environment;
compiled it. If the environment is NOT session specific (needs no additional context),
then this function should return the environment type name and leave ppEnv (to 0).
- @paramppEnvTypeName environment type name; string must be constant
+ @param ppEnvTypeName environment type name; string must be constant
@param ppEnv function returns its environment if the environment is session specific,
i.e. has special context
*/
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 16026aaff6d1..16026aaff6d1 100644..100755
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
diff --git a/cui/source/dialogs/hyphen.hrc b/cui/source/dialogs/hyphen.hrc
index f76e2aa75770..f76e2aa75770 100644..100755
--- a/cui/source/dialogs/hyphen.hrc
+++ b/cui/source/dialogs/hyphen.hrc
diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc
index 994c933246de..994c933246de 100644..100755
--- a/cui/source/dialogs/thesdlg.hrc
+++ b/cui/source/dialogs/thesdlg.hrc
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index b682c8d0c129..b682c8d0c129 100755..100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 1f441d728d63..1f441d728d63 100755..100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index 502b212c8a91..502b212c8a91 100644..100755
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 45cf2fdbf79e..45cf2fdbf79e 100644..100755
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 99b292b560a5..99b292b560a5 100644..100755
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index ff10e2744533..bcc4dbf54dcb 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -945,12 +945,14 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
aColorBoxes[0]->SetHelpId( aColorLBHids[0] );
+ OSL_ENSURE( nCount < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])), "too few helpIDs for color listboxes" );
for( sal_Int32 i = 1; i < nCount; i++ )
{
if(aColorBoxes[i])
{
aColorBoxes[i]->CopyEntries( *aColorBoxes[0] );
- aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
+ if( i < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])) )
+ aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
}
}
}
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src
index faa7f33302d7..d3a59a511deb 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.src
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.src
@@ -49,7 +49,6 @@ TabDialog DLG_DATABASE_USERADMIN
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
- SingleLine=TRUE;
};
String STR_PAGETITLE_USERADMIN
{
diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src
index f37c67148e18..7a94c0dafb4c 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.src
+++ b/dbaccess/source/ui/dlg/advancedsettings.src
@@ -351,7 +351,6 @@ TabDialog DLG_DATABASE_ADVANCED
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
- SingleLine=TRUE;
};
String STR_GENERATED_VALUE
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 1d8744f07b53..f16edc83a761 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -113,7 +113,6 @@ TabDialog DLG_DATABASE_ADMINISTRATION
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
- SingleLine=TRUE;
};
//.........................................................................
@@ -147,7 +146,6 @@ ModalDialog DLG_DATABASE_TYPE_CHANGE
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
- SingleLine=TRUE;
};
Text [ en-US ] = "Database properties" ;
};
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 5fc9cdc12f23..4d6812143598 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -56,7 +56,6 @@ ModalDialog DLG_DATABASE_WIZARD
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
- SingleLine=TRUE;
};
String STR_DBWIZARDTITLE
diff --git a/default_images/res/commandimagelist/lc_showannotation.png b/default_images/res/commandimagelist/lc_showannotations.png
index dd3d968a8faf..dd3d968a8faf 100755
--- a/default_images/res/commandimagelist/lc_showannotation.png
+++ b/default_images/res/commandimagelist/lc_showannotations.png
Binary files differ
diff --git a/default_images/res/commandimagelist/lch_showannotation.png b/default_images/res/commandimagelist/lch_showannotations.png
index b298f8cf843d..b298f8cf843d 100755
--- a/default_images/res/commandimagelist/lch_showannotation.png
+++ b/default_images/res/commandimagelist/lch_showannotations.png
Binary files differ
diff --git a/default_images/res/commandimagelist/sc_showannotation.png b/default_images/res/commandimagelist/sc_showannotations.png
index 4b987016b68b..4b987016b68b 100755
--- a/default_images/res/commandimagelist/sc_showannotation.png
+++ b/default_images/res/commandimagelist/sc_showannotations.png
Binary files differ
diff --git a/default_images/res/commandimagelist/sch_showannotation.png b/default_images/res/commandimagelist/sch_showannotations.png
index cd3155082eed..cd3155082eed 100755
--- a/default_images/res/commandimagelist/sch_showannotation.png
+++ b/default_images/res/commandimagelist/sch_showannotations.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_01.png b/default_images/toolkit/tk/spinner03-32-hc_01.png
index c3596c19f276..c3596c19f276 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_01.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_01.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_02.png b/default_images/toolkit/tk/spinner03-32-hc_02.png
index e2ca6b965d23..e2ca6b965d23 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_02.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_02.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_03.png b/default_images/toolkit/tk/spinner03-32-hc_03.png
index 6609d3a6d300..6609d3a6d300 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_03.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_03.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_04.png b/default_images/toolkit/tk/spinner03-32-hc_04.png
index e70a393be204..e70a393be204 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_04.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_04.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_05.png b/default_images/toolkit/tk/spinner03-32-hc_05.png
index 63eb3e10375c..63eb3e10375c 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_05.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_05.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_06.png b/default_images/toolkit/tk/spinner03-32-hc_06.png
index c072e397cc00..c072e397cc00 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_06.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_06.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_07.png b/default_images/toolkit/tk/spinner03-32-hc_07.png
index 801ea3b36f9e..801ea3b36f9e 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_07.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_07.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_08.png b/default_images/toolkit/tk/spinner03-32-hc_08.png
index 60635b1e47e1..60635b1e47e1 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_08.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_08.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_09.png b/default_images/toolkit/tk/spinner03-32-hc_09.png
index 0a4513daa636..0a4513daa636 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_09.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_09.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_10.png b/default_images/toolkit/tk/spinner03-32-hc_10.png
index 06fbd02faf7f..06fbd02faf7f 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_10.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_10.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_11.png b/default_images/toolkit/tk/spinner03-32-hc_11.png
index 89e14cd33786..89e14cd33786 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_11.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_11.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_12.png b/default_images/toolkit/tk/spinner03-32-hc_12.png
index 2ced9380408e..2ced9380408e 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_12.png
+++ b/default_images/toolkit/tk/spinner03-32-hc_12.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_01.png b/default_images/toolkit/tk/spinner03-grey_01.png
index 2c6b6937f8b2..2c6b6937f8b2 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_01.png
+++ b/default_images/toolkit/tk/spinner03-grey_01.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_02.png b/default_images/toolkit/tk/spinner03-grey_02.png
index 4662ddf54924..4662ddf54924 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_02.png
+++ b/default_images/toolkit/tk/spinner03-grey_02.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_03.png b/default_images/toolkit/tk/spinner03-grey_03.png
index 8c1a0be53da5..8c1a0be53da5 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_03.png
+++ b/default_images/toolkit/tk/spinner03-grey_03.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_04.png b/default_images/toolkit/tk/spinner03-grey_04.png
index ba323f36244d..ba323f36244d 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_04.png
+++ b/default_images/toolkit/tk/spinner03-grey_04.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_05.png b/default_images/toolkit/tk/spinner03-grey_05.png
index f733dd17266c..f733dd17266c 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_05.png
+++ b/default_images/toolkit/tk/spinner03-grey_05.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_06.png b/default_images/toolkit/tk/spinner03-grey_06.png
index bbaebc36f565..bbaebc36f565 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_06.png
+++ b/default_images/toolkit/tk/spinner03-grey_06.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_07.png b/default_images/toolkit/tk/spinner03-grey_07.png
index d005cb55b4eb..d005cb55b4eb 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_07.png
+++ b/default_images/toolkit/tk/spinner03-grey_07.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_08.png b/default_images/toolkit/tk/spinner03-grey_08.png
index bda1e7192809..bda1e7192809 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_08.png
+++ b/default_images/toolkit/tk/spinner03-grey_08.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_09.png b/default_images/toolkit/tk/spinner03-grey_09.png
index 3e688421d95e..3e688421d95e 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_09.png
+++ b/default_images/toolkit/tk/spinner03-grey_09.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_10.png b/default_images/toolkit/tk/spinner03-grey_10.png
index d43e8866e10e..d43e8866e10e 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_10.png
+++ b/default_images/toolkit/tk/spinner03-grey_10.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_11.png b/default_images/toolkit/tk/spinner03-grey_11.png
index d67c895a2c7d..d67c895a2c7d 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_11.png
+++ b/default_images/toolkit/tk/spinner03-grey_11.png
Binary files differ
diff --git a/default_images/toolkit/source/awt/spinner03-grey_12.png b/default_images/toolkit/tk/spinner03-grey_12.png
index 9c3c4a849c6f..9c3c4a849c6f 100644
--- a/default_images/toolkit/source/awt/spinner03-grey_12.png
+++ b/default_images/toolkit/tk/spinner03-grey_12.png
Binary files differ
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 8eb4dd3cc25b..b64327bd7232 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -65,6 +65,8 @@ class Desktop : public Application
{
friend class UserInstall;
+ void doShutdown();
+
public:
enum BootstrapError
{
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 77172e549534..5020b89194d1 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -44,16 +44,27 @@ cd "$sd_cwd"
#collect all bootstrap variables specified on the command line
#so that they can be passed as arguments to javaldx later on
+#Recognize the "sync" option. sync must be applied without any other
+#options except bootstrap variables or the verbose option
for arg in $@
do
case "$arg" in
-env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";;
+ sync) OPTSYNC=true;;
+ -v) VERBOSE=true;;
+ --verbose) VERBOSE=true;;
+ *) OPTOTHER=$arg;;
esac
done
+if [ "$OPTSYNC" = "true" ] && [ -z "$OPTOTHER" ]
+then
+ JVMFWKPARAMS='-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
+fi
+
# extend the ld_library_path for java: javaldx checks the sofficerc for us
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
- my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+ my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
@@ -70,6 +81,6 @@ unset XENVIRONMENT
# SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
# execute binary
-exec "$sd_prog/unopkg.bin" "$@" \
+exec "$sd_prog/unopkg.bin" "$@" "$JVMFWKPARAMS" \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a49cabc90bed..82af26653b84 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -202,6 +202,7 @@ static const ::rtl::OUString CFG_PATH_REG ( RTL_CONSTASCII_USTRINGP
static const ::rtl::OUString CFG_ENTRY_REGURL ( RTL_CONSTASCII_USTRINGPARAM( "URL" ));
static const ::rtl::OUString CFG_ENTRY_TEMPLATEREGURL ( RTL_CONSTASCII_USTRINGPARAM( "TemplateURL" ));
+static ::rtl::OUString getBrandSharePreregBundledPathURL();
// ----------------------------------------------------------------------------
ResMgr* Desktop::GetDesktopResManager()
@@ -578,6 +579,44 @@ static ::rtl::OUString getLastSyncFileURLFromUserInstallation()
return aTmp.makeStringAndClear();
}
+//Checks if the argument src is the folder of the help or configuration
+//backend in the prereg folder
+static bool excludeTmpFilesAndFolders(const rtl::OUString & src)
+{
+ const char helpBackend[] = "com.sun.star.comp.deployment.help.PackageRegistryBackend";
+ const char configBackend[] = "com.sun.star.comp.deployment.configuration.PackageRegistryBackend";
+ if (src.endsWithAsciiL(helpBackend, sizeof(helpBackend) - 1 )
+ || src.endsWithAsciiL(configBackend, sizeof(configBackend) - 1))
+ {
+ return true;
+ }
+ return false;
+}
+
+//If we are about to copy the contents of some special folder as determined
+//by excludeTmpFilesAndFolders, then we omit those files or folders with a name
+//derived from temporary folders.
+static bool isExcludedFileOrFolder( const rtl::OUString & name)
+{
+ char const * allowed[] = {
+ "backenddb.xml",
+ "configmgr.ini",
+ "registered_packages.db"
+ };
+
+ const unsigned int size = sizeof(allowed) / sizeof (char const *);
+ bool bExclude = true;
+ for (unsigned int i= 0; i < size; i ++)
+ {
+ ::rtl::OUString allowedName = ::rtl::OUString::createFromAscii(allowed[i]);
+ if (allowedName.equals(name))
+ {
+ bExclude = false;
+ break;
+ }
+ }
+ return bExclude;
+}
static osl::FileBase::RC copy_bundled_recursive(
const rtl::OUString& srcUnqPath,
@@ -605,6 +644,7 @@ throw()
sal_Int32 n_Mask = FileStatusMask_FileURL | FileStatusMask_FileName | FileStatusMask_Type;
osl::DirectoryItem aDirItem;
+ bool bExcludeFiles = excludeTmpFilesAndFolders(srcUnqPath);
while( err == osl::FileBase::E_None && ( next = aDir.getNextItem( aDirItem ) ) == osl::FileBase::E_None )
{
@@ -634,7 +674,12 @@ throw()
// Special treatment for "lastsychronized" file. Must not be
// copied from the bundled folder!
- if ( IsDoc && aFileName.equalsAscii( pLastSyncFileName ))
+ //Also do not copy *.tmp files and *.tmp_ folders. This affects the files/folders
+ //from the help and configuration backend
+ if ( IsDoc && (aFileName.equalsAscii( pLastSyncFileName )
+ || bExcludeFiles && isExcludedFileOrFolder(aFileName)))
+ bFilter = true;
+ else if (!IsDoc && bExcludeFiles && isExcludedFileOrFolder(aFileName))
bFilter = true;
}
@@ -1486,8 +1531,26 @@ void Desktop::AppEvent( const ApplicationEvent& rAppEvent )
HandleAppEvent( rAppEvent );
}
+struct ExecuteGlobals
+{
+ Reference < css::document::XEventListener > xGlobalBroadcaster;
+ sal_Bool bRestartRequested;
+ sal_Bool bUseSystemFileDialog;
+ std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
+ std::auto_ptr<SvtPathOptions> pPathOptions;
+
+ ExecuteGlobals()
+ : bRestartRequested( sal_False )
+ , bUseSystemFileDialog( sal_True )
+ {}
+};
+
+static ExecuteGlobals* pExecGlobals = NULL;
+
void Desktop::Main()
{
+ pExecGlobals = new ExecuteGlobals();
+
RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Main" );
// Remember current context object
@@ -1545,14 +1608,8 @@ void Desktop::Main()
Reference< XMultiServiceFactory > xSMgr =
::comphelper::getProcessServiceFactory();
- std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
- std::auto_ptr<SvtPathOptions> pPathOptions;
-
Reference< ::com::sun::star::task::XRestartManager > xRestartManager;
- sal_Bool bRestartRequested( sal_False );
- sal_Bool bUseSystemFileDialog(sal_True);
int nAcquireCount( 0 );
- Reference < css::document::XEventListener > xGlobalBroadcaster;
try
{
RegisterServices( xSMgr );
@@ -1638,7 +1695,7 @@ void Desktop::Main()
SetDisplayName( aTitle );
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ create SvtPathOptions and SvtLanguageOptions" );
- pPathOptions.reset( new SvtPathOptions);
+ pExecGlobals->pPathOptions.reset( new SvtPathOptions);
SetSplashScreenProgress(40);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and SvtLanguageOptions" );
@@ -1655,7 +1712,7 @@ void Desktop::Main()
}
// create service for loadin SFX (still needed in startup)
- xGlobalBroadcaster = Reference < css::document::XEventListener >
+ pExecGlobals->xGlobalBroadcaster = Reference < css::document::XEventListener >
( xSMgr->createInstance(
DEFINE_CONST_UNICODE( "com.sun.star.frame.GlobalEventBroadcaster" ) ), UNO_QUERY );
@@ -1711,13 +1768,13 @@ void Desktop::Main()
}
// keep a language options instance...
- pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
+ pExecGlobals->pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
- if (xGlobalBroadcaster.is())
+ if (pExecGlobals->xGlobalBroadcaster.is())
{
css::document::EventObject aEvent;
aEvent.EventName = ::rtl::OUString::createFromAscii("OnStartApp");
- xGlobalBroadcaster->notifyEvent(aEvent);
+ pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
}
SetSplashScreenProgress(50);
@@ -1737,7 +1794,7 @@ void Desktop::Main()
}
// check whether the shutdown is caused by restart
- bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
+ pExecGlobals->bRestartRequested = ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
if ( pCmdLineArgs->IsHeadless() )
{
@@ -1745,11 +1802,11 @@ void Desktop::Main()
// headless mode relies on Application::EnableHeadlessMode()
// which does only work for VCL dialogs!!
SvtMiscOptions aMiscOptions;
- bUseSystemFileDialog = aMiscOptions.UseSystemFileDialog();
+ pExecGlobals->bUseSystemFileDialog = aMiscOptions.UseSystemFileDialog();
aMiscOptions.SetUseSystemFileDialog( sal_False );
}
- if ( !bRestartRequested )
+ if ( !pExecGlobals->bRestartRequested )
{
if ((!pCmdLineArgs->WantsToLoadDocument() ) &&
(SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) &&
@@ -1821,10 +1878,9 @@ void Desktop::Main()
SvtAccessibilityOptions aOptions;
aOptions.SetVCLSettings();
- if ( !bRestartRequested )
+ if ( !pExecGlobals->bRestartRequested )
{
Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
-
sal_Bool bTerminateRequested = sal_False;
// Preload function depends on an initialized sfx application!
@@ -1880,9 +1936,9 @@ void Desktop::Main()
new svt::JavaContext( com::sun::star::uno::getCurrentContext() ) );
// check whether the shutdown is caused by restart just before entering the Execute
- bRestartRequested = bRestartRequested || ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
+ pExecGlobals->bRestartRequested = pExecGlobals->bRestartRequested || ( xRestartManager.is() && xRestartManager->isRestartRequested( sal_True ) );
- if ( !bRestartRequested )
+ if ( !pExecGlobals->bRestartRequested )
{
// if this run of the office is triggered by restart, some additional actions should be done
DoRestartActionsIfNecessary( !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsNoQuickstart() );
@@ -1901,44 +1957,57 @@ void Desktop::Main()
FatalError( MakeStartupErrorMessage(exAnyCfg.Message) );
}
}
+ // CAUTION: you do not necessarily get here e.g. on the Mac.
+ // please put all deinitialization code into doShutdown
+ doShutdown();
+}
- if ( bRestartRequested )
+void Desktop::doShutdown()
+{
+ if( ! pExecGlobals )
+ return;
+
+ if ( pExecGlobals->bRestartRequested )
SetRestartState();
- if (xGlobalBroadcaster.is())
+ if (pExecGlobals->xGlobalBroadcaster.is())
{
css::document::EventObject aEvent;
aEvent.EventName = ::rtl::OUString::createFromAscii("OnCloseApp");
- xGlobalBroadcaster->notifyEvent(aEvent);
+ pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
}
- delete pResMgr;
+ delete pResMgr, pResMgr = NULL;
// Restore old value
+ CommandLineArgs* pCmdLineArgs = GetCommandLineArgs();
if ( pCmdLineArgs->IsHeadless() )
- SvtMiscOptions().SetUseSystemFileDialog( bUseSystemFileDialog );
+ SvtMiscOptions().SetUseSystemFileDialog( pExecGlobals->bUseSystemFileDialog );
// remove temp directory
RemoveTemporaryDirectory();
FlushConfiguration();
// The acceptors in the AcceptorMap must be released (in DeregisterServices)
// with the solar mutex unlocked, to avoid deadlock:
- nAcquireCount = Application::ReleaseSolarMutex();
+ ULONG nAcquireCount = Application::ReleaseSolarMutex();
DeregisterServices();
Application::AcquireSolarMutex(nAcquireCount);
tools::DeInitTestToolLib();
// be sure that path/language options gets destroyed before
// UCB is deinitialized
RTL_LOGFILE_CONTEXT_TRACE( aLog, "-> dispose path/language options" );
- pLanguageOptions.reset( 0 );
- pPathOptions.reset( 0 );
+ pExecGlobals->pLanguageOptions.reset( 0 );
+ pExecGlobals->pPathOptions.reset( 0 );
RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- dispose path/language options" );
RTL_LOGFILE_CONTEXT_TRACE( aLog, "-> deinit ucb" );
::ucbhelper::ContentBroker::deinitialize();
RTL_LOGFILE_CONTEXT_TRACE( aLog, "<- deinit ucb" );
+ sal_Bool bRR = pExecGlobals->bRestartRequested;
+ delete pExecGlobals, pExecGlobals = NULL;
+
RTL_LOGFILE_CONTEXT_TRACE( aLog, "FINISHED WITH Destop::Main" );
- if ( bRestartRequested )
+ if ( bRR )
{
restartOnMac(true);
// wouldn't the solution be more clean if SalMain returns the exit code to the system?
@@ -2053,9 +2122,9 @@ sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& r
// unfortunately this broke the QUARTZ behavior which is to always run
// in quickstart mode since Mac applications do not usually quit
// when the last document closes
- #ifndef QUARTZ
+ //#ifndef QUARTZ
if ( bQuickstart )
- #endif
+ //#endif
{
Reference < XComponent > xQuickstart( rSMgr->createInstanceWithArguments(
DEFINE_CONST_UNICODE( "com.sun.star.office.Quickstart" ), aSeq ),
@@ -2123,17 +2192,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* )
}
hStyleSettings.SetUseImagesInMenus(bUseImagesInMenus);
- sal_uInt16 nTabStyle = hStyleSettings.GetTabControlStyle();
- nTabStyle &= ~STYLE_TABCONTROL_SINGLELINE;
- if( aAppearanceCfg.IsSingleLineTabCtrl() )
- nTabStyle |=STYLE_TABCONTROL_SINGLELINE;
-
- nTabStyle &= ~STYLE_TABCONTROL_COLOR;
- if( aAppearanceCfg.IsColoredTabCtrl() )
- nTabStyle |= STYLE_TABCONTROL_COLOR;
-
- hStyleSettings.SetTabControlStyle(nTabStyle);
-
hStyleSettings.SetDragFullOptions( nDragFullOptions );
rSettings.SetStyleSettings ( hStyleSettings );
}
@@ -3135,6 +3193,13 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
catch(const css::uno::Exception&)
{}
}
+ else if( rAppEvent.GetEvent() == "PRIVATE:DOSHUTDOWN" )
+ {
+ Desktop* pD = dynamic_cast<Desktop*>(GetpApp());
+ OSL_ENSURE( pD, "no desktop ?!?" );
+ if( pD )
+ pD->doShutdown();
+ }
}
void Desktop::OpenSplashScreen()
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 44f335dd509d..b1dbcdf861e9 100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -388,6 +388,10 @@ void UpdateDialog::Thread::execute()
uno::Reference<ucb::XCommandEnvironment>());
} catch (lang::IllegalArgumentException& ) {
OSL_ASSERT(0);
+ continue;
+ } catch (css::ucb::CommandFailedException& ) {
+ OSL_ASSERT(0);
+ continue;
}
OSL_ASSERT(extensions.getLength() == 3);
if (extensions[0].is() )
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 709cca86c631..6eb547c4e98a 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -183,12 +183,8 @@ ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& x
::cppu::WeakComponentImplHelper1< css::deployment::XExtensionManager >(getMutex()),
m_xContext( xContext )
{
- Reference<deploy::XPackageManagerFactory> xPackageManagerFactory(
- deploy::thePackageManagerFactory::get(m_xContext));
- m_userRepository = xPackageManagerFactory->getPackageManager(OUSTR("user"));
- m_sharedRepository = xPackageManagerFactory->getPackageManager(OUSTR("shared"));
- m_bundledRepository = xPackageManagerFactory->getPackageManager(OUSTR("bundled"));
- m_tmpRepository = xPackageManagerFactory->getPackageManager(OUSTR("tmp"));
+ m_xPackageManagerFactory = deploy::thePackageManagerFactory::get(m_xContext);
+ OSL_ASSERT(m_xPackageManagerFactory.is());
m_repositoryNames.push_back(OUSTR("user"));
m_repositoryNames.push_back(OUSTR("shared"));
@@ -201,6 +197,23 @@ ExtensionManager::~ExtensionManager()
{
}
+Reference<deploy::XPackageManager> ExtensionManager::getUserRepository()
+{
+ return m_xPackageManagerFactory->getPackageManager(OUSTR("user"));
+}
+Reference<deploy::XPackageManager> ExtensionManager::getSharedRepository()
+{
+ return m_xPackageManagerFactory->getPackageManager(OUSTR("shared"));
+}
+Reference<deploy::XPackageManager> ExtensionManager::getBundledRepository()
+{
+ return m_xPackageManagerFactory->getPackageManager(OUSTR("bundled"));
+}
+Reference<deploy::XPackageManager> ExtensionManager::getTmpRepository()
+{
+ return m_xPackageManagerFactory->getPackageManager(OUSTR("tmp"));
+}
+
Reference<task::XAbortChannel> ExtensionManager::createAbortChannel()
throw (uno::RuntimeException)
{
@@ -213,11 +226,11 @@ ExtensionManager::getPackageManager(::rtl::OUString const & repository)
{
Reference<deploy::XPackageManager> xPackageManager;
if (repository.equals(OUSTR("user")))
- xPackageManager = m_userRepository;
+ xPackageManager = getUserRepository();
else if (repository.equals(OUSTR("shared")))
- xPackageManager = m_sharedRepository;
+ xPackageManager = getSharedRepository();
else if (repository.equals(OUSTR("bundled")))
- xPackageManager = m_bundledRepository;
+ xPackageManager = getBundledRepository();
else
throw lang::IllegalArgumentException(
OUSTR("No valid repository name provided."),
@@ -288,7 +301,7 @@ void ExtensionManager::addExtensionsToMap(
::std::list<Reference<deploy::XPackage> > extensionList;
try
{ //will throw an exception if the extension does not exist
- extensionList.push_back(m_userRepository->getDeployedPackage(
+ extensionList.push_back(getUserRepository()->getDeployedPackage(
identifier, fileName, Reference<ucb::XCommandEnvironment>()));
} catch(lang::IllegalArgumentException &)
{
@@ -296,7 +309,7 @@ void ExtensionManager::addExtensionsToMap(
}
try
{
- extensionList.push_back(m_sharedRepository->getDeployedPackage(
+ extensionList.push_back(getSharedRepository()->getDeployedPackage(
identifier, fileName, Reference<ucb::XCommandEnvironment>()));
} catch (lang::IllegalArgumentException &)
{
@@ -304,7 +317,7 @@ void ExtensionManager::addExtensionsToMap(
}
try
{
- extensionList.push_back(m_bundledRepository->getDeployedPackage(
+ extensionList.push_back(getBundledRepository()->getDeployedPackage(
identifier, fileName, Reference<ucb::XCommandEnvironment>()));
} catch (lang::IllegalArgumentException &)
{
@@ -508,7 +521,7 @@ Reference<deploy::XPackage> ExtensionManager::backupExtension(
if (xOldExtension.is())
{
- xBackup = m_tmpRepository->addPackage(
+ xBackup = getTmpRepository()->addPackage(
xOldExtension->getURL(), uno::Sequence<beans::NamedValue>(),
OUString(), Reference<task::XAbortChannel>(), tmpCmdEnv);
@@ -529,7 +542,7 @@ uno::Sequence< Reference<deploy::XPackageTypeInfo> >
ExtensionManager::getSupportedPackageTypes()
throw (uno::RuntimeException)
{
- return m_userRepository->getSupportedPackageTypes();
+ return getUserRepository()->getSupportedPackageTypes();
}
//Do some necessary checks and user interaction. This function does not
//aquire the extension manager mutex and that mutex must not be aquired
@@ -649,9 +662,9 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
//Determine the repository to use
Reference<deploy::XPackageManager> xPackageManager;
if (repository.equals(OUSTR("user")))
- xPackageManager = m_userRepository;
+ xPackageManager = getUserRepository();
else if (repository.equals(OUSTR("shared")))
- xPackageManager = m_sharedRepository;
+ xPackageManager = getSharedRepository();
else
throw lang::IllegalArgumentException(
OUSTR("No valid repository name provided."),
@@ -664,7 +677,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
getTempExtension(url, xAbortChannel, xCmdEnv);
//Make sure the extension is removed from the tmp repository in case
//of an exception
- ExtensionRemoveGuard tmpExtensionRemoveGuard(xTmpExtension, m_tmpRepository);
+ ExtensionRemoveGuard tmpExtensionRemoveGuard(xTmpExtension, getTmpRepository());
const OUString sIdentifier = dp_misc::getIdentifier(xTmpExtension);
const OUString sFileName = xTmpExtension->getName();
Reference<deploy::XPackage> xOldExtension;
@@ -708,7 +721,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
//the xTmpExtension
//no command environment supplied, only this class shall interact
//with the user!
- xExtensionBackup = m_tmpRepository->importExtension(
+ xExtensionBackup = getTmpRepository()->importExtension(
xOldExtension, Reference<task::XAbortChannel>(),
Reference<ucb::XCommandEnvironment>());
tmpExtensionRemoveGuard.reset(xExtensionBackup);
@@ -857,9 +870,9 @@ void ExtensionManager::removeExtension(
{
//Determine the repository to use
if (repository.equals(OUSTR("user")))
- xPackageManager = m_userRepository;
+ xPackageManager = getUserRepository();
else if (repository.equals(OUSTR("shared")))
- xPackageManager = m_sharedRepository;
+ xPackageManager = getSharedRepository();
else
throw lang::IllegalArgumentException(
OUSTR("No valid repository name provided."),
@@ -919,7 +932,7 @@ void ExtensionManager::removeExtension(
Reference<task::XAbortChannel>(),
tmpCmdEnv);
- m_tmpRepository->removePackage(
+ getTmpRepository()->removePackage(
dp_misc::getIdentifier(xExtensionBackup),
xExtensionBackup->getName(), xAbortChannel, xCmdEnv);
fireModified();
@@ -932,7 +945,7 @@ void ExtensionManager::removeExtension(
}
if (xExtensionBackup.is())
- m_tmpRepository->removePackage(
+ getTmpRepository()->removePackage(
dp_misc::getIdentifier(xExtensionBackup),
xExtensionBackup->getName(), xAbortChannel, xCmdEnv);
}
@@ -1160,13 +1173,13 @@ uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > >
id2extensions mapExt;
uno::Sequence<Reference<deploy::XPackage> > userExt =
- m_userRepository->getDeployedPackages(xAbort, xCmdEnv);
+ getUserRepository()->getDeployedPackages(xAbort, xCmdEnv);
addExtensionsToMap(mapExt, userExt, OUSTR("user"));
uno::Sequence<Reference<deploy::XPackage> > sharedExt =
- m_sharedRepository->getDeployedPackages(xAbort, xCmdEnv);
+ getSharedRepository()->getDeployedPackages(xAbort, xCmdEnv);
addExtensionsToMap(mapExt, sharedExt, OUSTR("shared"));
uno::Sequence<Reference<deploy::XPackage> > bundledExt =
- m_bundledRepository->getDeployedPackages(xAbort, xCmdEnv);
+ getBundledRepository()->getDeployedPackages(xAbort, xCmdEnv);
addExtensionsToMap(mapExt, bundledExt, OUSTR("bundled"));
//copy the values of the map to a vector for sorting
@@ -1236,7 +1249,7 @@ void ExtensionManager::reinstallDeployedExtensions(
const OUString id = dp_misc::getIdentifier(extensions[ pos ]);
const OUString fileName = extensions[ pos ]->getName();
OSL_ASSERT(id.getLength());
- activateExtension(id, fileName, false, false, xAbortChannel, xCmdEnv );
+ activateExtension(id, fileName, false, true, xAbortChannel, xCmdEnv );
}
catch (lang::DisposedException &)
{
@@ -1260,6 +1273,64 @@ void ExtensionManager::reinstallDeployedExtensions(
}
}
+/** Works on the bundled repository. That is using the variables
+ BUNDLED_EXTENSIONS and BUNDLED_EXTENSIONS_USER.
+ */
+void ExtensionManager::synchronizeBundledPrereg(
+ Reference<task::XAbortChannel> const & xAbortChannel,
+ Reference<ucb::XCommandEnvironment> const & xCmdEnv )
+ throw (deploy::DeploymentException,
+ uno::RuntimeException)
+{
+ try
+ {
+ String sSynchronizingBundled(StrSyncRepository::get());
+ sSynchronizingBundled.SearchAndReplaceAllAscii( "%NAME", OUSTR("bundled"));
+ dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled);
+
+ Reference<deploy::XPackageManagerFactory> xPackageManagerFactory(
+ deploy::thePackageManagerFactory::get(m_xContext));
+
+ Reference<deploy::XPackageManager> xMgr =
+ xPackageManagerFactory->getPackageManager(OUSTR("bundled_prereg"));
+ xMgr->synchronize(xAbortChannel, xCmdEnv);
+ progressBundled.update(OUSTR("\n\n"));
+
+ uno::Sequence<Reference<deploy::XPackage> > extensions = xMgr->getDeployedPackages(
+ xAbortChannel, xCmdEnv);
+ try
+ {
+ for (sal_Int32 i = 0; i < extensions.getLength(); i++)
+ {
+ extensions[i]->registerPackage(true, xAbortChannel, xCmdEnv);
+ }
+ }
+ catch (...)
+ {
+ OSL_ASSERT(0);
+ }
+ OUString lastSyncBundled(RTL_CONSTASCII_USTRINGPARAM(
+ "$BUNDLED_EXTENSIONS_PREREG/lastsynchronized"));
+ writeLastModified(lastSyncBundled, xCmdEnv);
+
+ } catch (deploy::DeploymentException& ) {
+ throw;
+ } catch (ucb::CommandFailedException & ) {
+ throw;
+ } catch (ucb::CommandAbortedException & ) {
+ throw;
+ } catch (lang::IllegalArgumentException &) {
+ throw;
+ } catch (uno::RuntimeException &) {
+ throw;
+ } catch (...) {
+ uno::Any exc = ::cppu::getCaughtException();
+ throw deploy::DeploymentException(
+ OUSTR("Extension Manager: exception in synchronize"),
+ static_cast<OWeakObject*>(this), exc);
+ }
+}
+
sal_Bool ExtensionManager::synchronize(
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
@@ -1277,13 +1348,13 @@ sal_Bool ExtensionManager::synchronize(
String sSynchronizingShared(StrSyncRepository::get());
sSynchronizingShared.SearchAndReplaceAllAscii( "%NAME", OUSTR("shared"));
dp_misc::ProgressLevel progressShared(xCmdEnv, sSynchronizingShared);
- bModified = m_sharedRepository->synchronize(xAbortChannel, xCmdEnv);
+ bModified = getSharedRepository()->synchronize(xAbortChannel, xCmdEnv);
progressShared.update(OUSTR("\n\n"));
String sSynchronizingBundled(StrSyncRepository::get());
sSynchronizingBundled.SearchAndReplaceAllAscii( "%NAME", OUSTR("bundled"));
dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled);
- bModified |= m_bundledRepository->synchronize(xAbortChannel, xCmdEnv);
+ bModified |= getBundledRepository()->synchronize(xAbortChannel, xCmdEnv);
progressBundled.update(OUSTR("\n\n"));
//Always determine the active extension. This is necessary for the
@@ -1410,7 +1481,7 @@ Reference<deploy::XPackage> ExtensionManager::getTempExtension(
{
Reference<ucb::XCommandEnvironment> tmpCmdEnvA(new TmpRepositoryCommandEnv());
- Reference<deploy::XPackage> xTmpPackage = m_tmpRepository->addPackage(
+ Reference<deploy::XPackage> xTmpPackage = getTmpRepository()->addPackage(
url, uno::Sequence<beans::NamedValue>(),OUString(), xAbortChannel, tmpCmdEnvA);
if (!xTmpPackage.is())
{
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 683f45a1bd6e..e7a180a05de1 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -205,6 +205,12 @@ public:
css::lang::IllegalArgumentException,
css::uno::RuntimeException);
+ virtual void SAL_CALL synchronizeBundledPrereg(
+ css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
+ css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
+ throw (css::deployment::DeploymentException,
+ css::uno::RuntimeException);
+
virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL
getExtensionsWithUnacceptedLicenses(
::rtl::OUString const & repository,
@@ -229,11 +235,7 @@ private:
};
css::uno::Reference< css::uno::XComponentContext> m_xContext;
-
- css::uno::Reference<css::deployment::XPackageManager> m_userRepository;
- css::uno::Reference<css::deployment::XPackageManager> m_sharedRepository;
- css::uno::Reference<css::deployment::XPackageManager> m_bundledRepository;
- css::uno::Reference<css::deployment::XPackageManager> m_tmpRepository;
+ css::uno::Reference<css::deployment::XPackageManagerFactory> m_xPackageManagerFactory;
//only to be used within addExtension
::osl::Mutex m_addMutex;
@@ -243,6 +245,11 @@ private:
*/
::std::list< ::rtl::OUString > m_repositoryNames;
+ css::uno::Reference<css::deployment::XPackageManager> getUserRepository();
+ css::uno::Reference<css::deployment::XPackageManager> getSharedRepository();
+ css::uno::Reference<css::deployment::XPackageManager> getBundledRepository();
+ css::uno::Reference<css::deployment::XPackageManager> getTmpRepository();
+
bool isUserDisabled(::rtl::OUString const & identifier,
::rtl::OUString const & filename);
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 4cc43a8386d8..6d4750bb2447 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -40,9 +40,8 @@
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/registry/XRegistryKey.hpp"
#include "com/sun/star/task/XAbortChannel.hpp"
-#include "com/sun/star/ucb/CommandFailedException.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
#include "com/sun/star/xml/dom/XElement.hpp"
#include "com/sun/star/xml/dom/XNode.hpp"
@@ -71,9 +70,8 @@ namespace xml = com::sun::star::xml ;
namespace dp_info {
class PackageInformationProvider :
- public ::cppu::WeakImplHelper3< deployment::XPackageInformationProvider,
- css_ucb::XCommandEnvironment,
- task::XInteractionHandler >
+ public ::cppu::WeakImplHelper1< deployment::XPackageInformationProvider >
+
{
public:
PackageInformationProvider( uno::Reference< uno::XComponentContext >const& xContext);
@@ -82,16 +80,6 @@ class PackageInformationProvider :
static uno::Sequence< rtl::OUString > getServiceNames();
static rtl::OUString getImplName();
- // XInteractionHandler
- virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& Request )
- throw( uno::RuntimeException );
- // XCommandEnvironment
- virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler()
- throw ( uno::RuntimeException ) { return static_cast<task::XInteractionHandler*>(this); };
-
- virtual uno::Reference< css_ucb::XProgressHandler > SAL_CALL getProgressHandler()
- throw ( uno::RuntimeException ) { return uno::Reference< css_ucb::XProgressHandler >(); };
-
// XPackageInformationProvider
virtual rtl::OUString SAL_CALL getPackageLocation( const rtl::OUString& extensionId )
throw ( uno::RuntimeException );
@@ -125,17 +113,6 @@ PackageInformationProvider::~PackageInformationProvider()
}
//------------------------------------------------------------------------------
-void SAL_CALL PackageInformationProvider::handle( uno::Reference< task::XInteractionRequest > const & rRequest)
- throw (uno::RuntimeException)
-{
- uno::Sequence< uno::Reference< task::XInteractionContinuation > > xContinuations = rRequest->getContinuations();
- if ( xContinuations.getLength() == 1 )
- {
- xContinuations[0]->select();
- }
-}
-
-//------------------------------------------------------------------------------
rtl::OUString PackageInformationProvider::getPackageLocation(
const rtl::OUString & repository,
const rtl::OUString& _rExtensionId )
@@ -150,7 +127,7 @@ rtl::OUString PackageInformationProvider::getPackageLocation(
xManager->getDeployedExtensions(
repository,
uno::Reference< task::XAbortChannel >(),
- static_cast < XCommandEnvironment *> (this) ) );
+ uno::Reference< css_ucb::XCommandEnvironment > () ) );
for ( int pos = packages.getLength(); pos--; )
{
@@ -320,7 +297,7 @@ uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL PackageInformationProvi
const uno::Sequence< uno::Sequence< uno::Reference<deployment::XPackage > > >
allExt = mgr->getAllExtensions(
uno::Reference< task::XAbortChannel >(),
- static_cast < XCommandEnvironment *> (this) );
+ uno::Reference< css_ucb::XCommandEnvironment > () );
uno::Sequence< uno::Sequence< rtl::OUString > > retList;
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 44bc4d469f2f..2e2c5e2a2f53 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -370,6 +370,24 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
//No stamp file. We assume that bundled is always readonly. It must not be
//modified from ExtensionManager but only by the installer
}
+ else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled_prereg") )) {
+ //This is a bundled repository but the registration data
+ //is in the brand layer: share/prereg
+ //It is special because the registration data are copied at the first startup
+ //into the user installation. The processed help and xcu files are not
+ //copied. Instead the backenddb.xml for the help backend references the help
+ //by using $BUNDLED_EXTENSION_PREREG instead $BUNDLED_EXTENSIONS_USER. The
+ //configmgr.ini also used $BUNDLED_EXTENSIONS_PREREG to refer to the xcu file
+ //which contain the replacement for %origin%.
+ that->m_activePackages = OUSTR(
+ "vnd.sun.star.expand:$BUNDLED_EXTENSIONS");
+ that->m_registrationData = OUSTR(
+ "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG");
+ that->m_registryCache = OUSTR(
+ "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/registry");
+ logFile = OUSTR(
+ "vnd.sun.star.expand:$BUNDLED_EXTENSIONS_PREREG/log.txt");
+ }
else if (context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("tmp") )) {
that->m_activePackages = OUSTR(
"vnd.sun.star.expand:$TMP_EXTENSIONS/extensions");
@@ -949,6 +967,8 @@ void PackageManagerImpl::removePackage(
contentRemoved.writeStream( xData, true /* replace existing */ );
}
m_activePackagesDB->erase( id, fileName ); // to be removed upon next start
+ //remove any cached data hold by the backend
+ m_xRegistry->packageRemoved(xPackage->getURL(), xPackage->getPackageType()->getMediaType());
}
try_dispose( xPackage );
@@ -989,7 +1009,8 @@ OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data )
//The bundled extensions are not contained in an additional folder
//with a unique name. data.temporaryName contains already the
//UTF8 encoded folder name. See PackageManagerImpl::synchronize
- if (!m_context.equals(OUSTR("bundled")))
+ if (!m_context.equals(OUSTR("bundled"))
+ && !m_context.equals(OUSTR("bundled_prereg")))
{
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("_/") );
buf.append( ::rtl::Uri::encode( data.fileName, rtl_UriCharClassPchar,
@@ -1341,6 +1362,8 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
Reference<css::ucb::XCommandEnvironment> const & xCmdEnv)
{
bool bModified = false;
+ OSL_ASSERT(!m_context.equals(OUSTR("user")));
+
ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() );
//check if the folder exist at all. The shared extension folder
//may not exist for a normal user.
@@ -1366,8 +1389,8 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
//The temporary folders of user and shared have an '_' at then end.
//But the name in ActivePackages.temporaryName is saved without.
OUString title2 = title;
- bool bNotBundled = !m_context.equals(OUSTR("bundled"));
- if (bNotBundled)
+ bool bShared = m_context.equals(OUSTR("shared"));
+ if (bShared)
{
OSL_ASSERT(title2[title2.getLength() -1] == '_');
title2 = title2.copy(0, title2.getLength() -1);
@@ -1389,7 +1412,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
// an added extension
OUString url(m_activePackages_expanded + OUSTR("/") + titleEncoded);
OUString sExtFolder;
- if (bNotBundled) //that is, shared
+ if (bShared) //that is, shared
{
//Check if the extension was not "deleted" already which is indicated
//by a xxx.tmpremoved file
@@ -1411,7 +1434,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
ActivePackages::Data dbData;
dbData.temporaryName = titleEncoded;
- if (bNotBundled)
+ if (bShared)
dbData.fileName = sExtFolder;
else
dbData.fileName = title;
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index 898e7c931f6d..458ece3d0bd8 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -82,26 +82,29 @@ OUString ComponentBackendDb::getKeyElementName()
void ComponentBackendDb::addEntry(::rtl::OUString const & url, Data const & data)
{
try{
- Reference<css::xml::dom::XNode> componentNode = writeKeyElement(url);
- writeSimpleElement(OUSTR("java-type-library"),
- OUString::valueOf((sal_Bool) data.javaTypeLibrary),
- componentNode);
-
- writeSimpleList(
- data.implementationNames,
- OUSTR("implementation-names"),
- OUSTR("name"),
- componentNode);
-
- writeVectorOfPair(
- data.singletons,
- OUSTR("singletons"),
- OUSTR("item"),
- OUSTR("key"),
- OUSTR("value"),
- componentNode);
-
- save();
+ if (!activateEntry(url))
+ {
+ Reference<css::xml::dom::XNode> componentNode = writeKeyElement(url);
+ writeSimpleElement(OUSTR("java-type-library"),
+ OUString::valueOf((sal_Bool) data.javaTypeLibrary),
+ componentNode);
+
+ writeSimpleList(
+ data.implementationNames,
+ OUSTR("implementation-names"),
+ OUSTR("name"),
+ componentNode);
+
+ writeVectorOfPair(
+ data.singletons,
+ OUSTR("singletons"),
+ OUSTR("item"),
+ OUSTR("key"),
+ OUSTR("value"),
+ componentNode);
+
+ save();
+ }
}
catch(css::uno::Exception &)
{
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index d1511952a92a..650a7585d929 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -270,8 +270,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
std::auto_ptr<ComponentBackendDb> m_backendDb;
void addDataToDb(OUString const & url, ComponentBackendDb::Data const & data);
- void deleteDataFromDb(OUString const & url);
ComponentBackendDb::Data readDataFromDb(OUString const & url);
+ void revokeEntryFromDb(OUString const & url);
//These rdbs are for writing new service entries. The rdb files are copies
@@ -327,6 +327,10 @@ public:
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
getSupportedPackageTypes() throw (RuntimeException);
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException);
+
using PackageRegistryBackend::disposing;
//Will be called from ComponentPackageImpl
@@ -660,12 +664,6 @@ void BackendImpl::addDataToDb(
m_backendDb->addEntry(url, data);
}
-void BackendImpl::deleteDataFromDb(OUString const & url)
-{
- if (m_backendDb.get())
- m_backendDb->removeEntry(url);
-}
-
ComponentBackendDb::Data BackendImpl::readDataFromDb(OUString const & url)
{
ComponentBackendDb::Data data;
@@ -674,6 +672,12 @@ ComponentBackendDb::Data BackendImpl::readDataFromDb(OUString const & url)
return data;
}
+void BackendImpl::revokeEntryFromDb(OUString const & url)
+{
+ if (m_backendDb.get())
+ m_backendDb->revokeEntry(url);
+}
+
// XPackageRegistry
//______________________________________________________________________________
Sequence< Reference<deployment::XPackageTypeInfo> >
@@ -682,6 +686,14 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
return m_typeInfos;
}
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException)
+{
+ if (m_backendDb.get())
+ m_backendDb->removeEntry(url);
+}
+
// PackageRegistryBackend
//______________________________________________________________________________
Reference<deployment::XPackage> BackendImpl::bindPackage_(
@@ -1437,6 +1449,9 @@ void BackendImpl::ComponentPackageImpl::getComponentInfo(
// Package
//______________________________________________________________________________
+//We could use here BackendImpl::hasActiveEntry. However, this check is just as well.
+//And it also shows the problem if another extension has overwritten an implementation
+//entry, because it contains the same service implementation
beans::Optional< beans::Ambiguous<sal_Bool> >
BackendImpl::ComponentPackageImpl::isRegistered_(
::osl::ResettableMutexGuard &,
@@ -1590,7 +1605,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_(
that->releaseObject(url);
}
m_registered = REG_NOT_REGISTERED;
- that->deleteDataFromDb(url);
+ getMyBackend()->revokeEntryFromDb(url);
}
}
@@ -1803,7 +1818,7 @@ void BackendImpl::ComponentsPackageImpl::processPackage_(
that->componentLiveRemoval(that->readDataFromDb(url));
}
that->releaseObject(url);
- that->deleteDataFromDb(url);
+ that->revokeEntryFromDb(url);
}
}
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 1e7ee5bfac8a..24e5587cd0cc 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -132,15 +132,21 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
Reference<XCommandEnvironment> const & xCmdEnv );
void configmgrini_flush( Reference<XCommandEnvironment> const & xCmdEnv );
- bool addToConfigmgrIni( bool isSchema, OUString const & url,
+ /* The paramter isURL is false in the case of adding the conf:ini-entry
+ value from the backend db. This entry already contains the path as it
+ is used in the configmgr.ini.
+ */
+ bool addToConfigmgrIni( bool isSchema, bool isURL, OUString const & url,
Reference<XCommandEnvironment> const & xCmdEnv );
bool removeFromConfigmgrIni( bool isSchema, OUString const & url,
Reference<XCommandEnvironment> const & xCmdEnv );
void addDataToDb(OUString const & url, ConfigurationBackendDb::Data const & data);
::boost::optional<ConfigurationBackendDb::Data> readDataFromDb(OUString const & url);
- OUString deleteDataFromDb(OUString const & url);
+ void revokeEntryFromDb(OUString const & url);
::std::list<OUString> getAllIniEntries();
+ bool hasActiveEntry(OUString const & url);
+ bool activateEntry(OUString const & url);
public:
BackendImpl( Sequence<Any> const & args,
@@ -149,6 +155,9 @@ public:
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
getSupportedPackageTypes() throw (RuntimeException);
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException);
using PackageRegistryBackend::disposing;
};
@@ -240,18 +249,10 @@ void BackendImpl::addDataToDb(
return data;
}
-OUString BackendImpl::deleteDataFromDb(OUString const & url)
+void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- OUString url2(url);
- if (m_backendDb.get()) {
- boost::optional< ConfigurationBackendDb::Data > data(
- m_backendDb->getEntry(url));
- if (data) {
- url2 = expandUnoRcTerm(data->iniEntry);
- }
- m_backendDb->removeEntry(url);
- }
- return url2;
+ if (m_backendDb.get())
+ m_backendDb->revokeEntry(url);
}
::std::list<OUString> BackendImpl::getAllIniEntries()
@@ -262,6 +263,20 @@ OUString BackendImpl::deleteDataFromDb(OUString const & url)
return ::std::list<OUString>();
}
+bool BackendImpl::hasActiveEntry(OUString const & url)
+{
+ if (m_backendDb.get())
+ return m_backendDb->hasActiveEntry(url);
+ return false;
+}
+
+bool BackendImpl::activateEntry(OUString const & url)
+{
+ if (m_backendDb.get())
+ return m_backendDb->activateEntry(url);
+ return false;
+}
+
// XPackageRegistry
@@ -271,6 +286,13 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
{
return m_typeInfos;
}
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException)
+{
+ if (m_backendDb.get())
+ m_backendDb->removeEntry(url);
+}
// PackageRegistryBackend
//______________________________________________________________________________
@@ -457,10 +479,10 @@ void BackendImpl::configmgrini_flush(
}
//______________________________________________________________________________
-bool BackendImpl::addToConfigmgrIni( bool isSchema, OUString const & url_,
+bool BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const & url_,
Reference<XCommandEnvironment> const & xCmdEnv )
{
- const OUString rcterm( dp_misc::makeRcTerm(url_) );
+ const OUString rcterm( isURL ? dp_misc::makeRcTerm(url_) : url_ );
const ::osl::MutexGuard guard( getMutex() );
configmgrini_verify_init( xCmdEnv );
t_stringlist & rSet = getFiles(isSchema);
@@ -509,6 +531,7 @@ bool BackendImpl::removeFromConfigmgrIni(
// Package
//______________________________________________________________________________
+
BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
{
BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get());
@@ -534,7 +557,7 @@ BackendImpl::PackageImpl::isRegistered_(
const rtl::OUString url(getURL());
bool bReg = false;
- if (that->readDataFromDb(getURL()))
+ if (that->hasActiveEntry(getURL()))
bReg = true;
if (!bReg)
//fallback for user extension registered in berkeley DB
@@ -677,38 +700,48 @@ void BackendImpl::PackageImpl::processPackage_(
if (doRegisterPackage)
{
- ConfigurationBackendDb::Data data;
- if (!m_isSchema)
+ if (getMyBackend()->activateEntry(getURL()))
{
- const OUString sModFolder = that->createFolder(OUString(), xCmdEnv);
- bool out_replaced = false;
- url = replaceOrigin(url, sModFolder, xCmdEnv, out_replaced);
- if (out_replaced)
- data.dataUrl = sModFolder;
- else
- deleteTempFolder(sModFolder);
+ ::boost::optional<ConfigurationBackendDb::Data> data = that->readDataFromDb(url);
+ OSL_ASSERT(data);
+ that->addToConfigmgrIni( m_isSchema, false, data->iniEntry, xCmdEnv );
}
- //No need for live-deployment for bundled extension, because OOo
- //restarts after installation
- if (that->m_eContext != CONTEXT_BUNDLED
- && !startup)
+ else
{
- if (m_isSchema)
+ ConfigurationBackendDb::Data data;
+ if (!m_isSchema)
{
- com::sun::star::configuration::Update::get(
- that->m_xComponentContext)->insertExtensionXcsFile(
- that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
+ const OUString sModFolder = that->createFolder(OUString(), xCmdEnv);
+ bool out_replaced = false;
+ url = replaceOrigin(url, sModFolder, xCmdEnv, out_replaced);
+ if (out_replaced)
+ data.dataUrl = sModFolder;
+ else
+ deleteTempFolder(sModFolder);
}
- else
+ //No need for live-deployment for bundled extension, because OOo
+ //restarts after installation
+ if (that->m_eContext != CONTEXT_BUNDLED
+ && that->m_eContext != CONTEXT_BUNDLED_PREREG
+ && !startup)
{
- com::sun::star::configuration::Update::get(
- that->m_xComponentContext)->insertExtensionXcuFile(
- that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
+ if (m_isSchema)
+ {
+ com::sun::star::configuration::Update::get(
+ that->m_xComponentContext)->insertExtensionXcsFile(
+ that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
+ }
+ else
+ {
+ com::sun::star::configuration::Update::get(
+ that->m_xComponentContext)->insertExtensionXcuFile(
+ that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url));
+ }
}
+ that->addToConfigmgrIni( m_isSchema, true, url, xCmdEnv );
+ data.iniEntry = dp_misc::makeRcTerm(url);
+ that->addDataToDb(getURL(), data);
}
- that->addToConfigmgrIni( m_isSchema, url, xCmdEnv );
- data.iniEntry = dp_misc::makeRcTerm(url);
- that->addDataToDb(getURL(), data);
}
else // revoke
{
@@ -741,7 +774,7 @@ void BackendImpl::PackageImpl::processPackage_(
else
deleteTempFolder(sModFolder);
}
- that->addToConfigmgrIni(schema, url_replaced, xCmdEnv);
+ that->addToConfigmgrIni(schema, true, url_replaced, xCmdEnv);
data.iniEntry = dp_misc::makeRcTerm(url_replaced);
that->addDataToDb(url2, data);
}
@@ -759,12 +792,17 @@ void BackendImpl::PackageImpl::processPackage_(
OSL_ASSERT(0);
}
}
- url = that->deleteDataFromDb(url);
- if (!m_isSchema) {
+
+ ::boost::optional<ConfigurationBackendDb::Data> data = that->readDataFromDb(url);
+ //If an xcu file was life deployed then always a data entry is written.
+ //If the xcu file was already in the configmr.ini then there is also
+ //a data entry
+ if (!m_isSchema && data)
+ {
com::sun::star::configuration::Update::get(
- that->m_xComponentContext)->removeExtensionXcuFile(
- expandUnoRcUrl(url));
+ that->m_xComponentContext)->removeExtensionXcuFile(expandUnoRcTerm(data->iniEntry));
}
+ that->revokeEntryFromDb(url);
}
}
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index 2a02c6d8efa0..2437c54ec734 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -83,12 +83,15 @@ OUString ConfigurationBackendDb::getKeyElementName()
void ConfigurationBackendDb::addEntry(::rtl::OUString const & url, Data const & data)
{
try{
- Reference<css::xml::dom::XNode> helpNode
- = writeKeyElement(url);
+ if (!activateEntry(url))
+ {
+ Reference<css::xml::dom::XNode> helpNode
+ = writeKeyElement(url);
- writeSimpleElement(OUSTR("data-url"), data.dataUrl, helpNode);
- writeSimpleElement(OUSTR("ini-entry"), data.iniEntry, helpNode);
- save();
+ writeSimpleElement(OUSTR("data-url"), data.dataUrl, helpNode);
+ writeSimpleElement(OUSTR("ini-entry"), data.iniEntry, helpNode);
+ save();
+ }
}
catch (css::deployment::DeploymentException& )
{
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index fa53d4e78a15..266d4406cfde 100755
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -39,6 +39,7 @@
#include "ucbhelper/content.hxx"
#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
#include "com/sun/star/deployment/InvalidRemovedParameterException.hpp"
+#include "com/sun/star/deployment/thePackageManagerFactory.hpp"
#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp"
#include "com/sun/star/ucb/IOErrorCode.hpp"
#include "com/sun/star/beans/StringPair.hpp"
@@ -99,6 +100,8 @@ PackageRegistryBackend::PackageRegistryBackend(
m_eContext = CONTEXT_BUNDLED;
else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("tmp") ))
m_eContext = CONTEXT_TMP;
+ else if (m_context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bundled_prereg") ))
+ m_eContext = CONTEXT_BUNDLED_PREREG;
else if (m_context.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.tdoc:/") ))
m_eContext = CONTEXT_DOCUMENT;
@@ -121,6 +124,9 @@ void PackageRegistryBackend::check()
void PackageRegistryBackend::disposing()
{
try {
+ for ( t_string2ref::const_iterator i = m_bound.begin(); i != m_bound.end(); i++)
+ i->second->removeEventListener(this);
+ m_bound.clear();
m_xComponentContext.clear();
WeakComponentImplHelperBase::disposing();
}
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index 14b4f2374c5b..9629855aaf11 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -187,6 +187,74 @@ void BackendDb::removeEntry(::rtl::OUString const & url)
removeElement(sExpression.makeStringAndClear());
}
+void BackendDb::revokeEntry(::rtl::OUString const & url)
+{
+ try
+ {
+ Reference<css::xml::dom::XElement> entry = Reference<css::xml::dom::XElement>(getKeyElement(url), UNO_QUERY);
+ if (entry.is())
+ {
+ entry->setAttribute(OUSTR("revoked"), OUSTR("true"));
+ save();
+ }
+ }
+ catch(css::uno::Exception &)
+ {
+ Any exc( ::cppu::getCaughtException() );
+ throw css::deployment::DeploymentException(
+ OUSTR("Extension Manager: failed to revoke data entry in backend db: ") +
+ m_urlDb, 0, exc);
+ }
+}
+
+bool BackendDb::activateEntry(::rtl::OUString const & url)
+{
+ try
+ {
+ bool ret = false;
+ Reference<css::xml::dom::XElement> entry = Reference<css::xml::dom::XElement>(getKeyElement(url), UNO_QUERY);
+ if (entry.is())
+ {
+ //no attribute "active" means it is active, that is, registered.
+ entry->removeAttribute(OUSTR("revoked"));
+ save();
+ ret = true;
+ }
+ return ret;
+ }
+ catch(css::uno::Exception &)
+ {
+ Any exc( ::cppu::getCaughtException() );
+ throw css::deployment::DeploymentException(
+ OUSTR("Extension Manager: failed to revoke data entry in backend db: ") +
+ m_urlDb, 0, exc);
+ }
+}
+
+bool BackendDb::hasActiveEntry(::rtl::OUString const & url)
+{
+ try
+ {
+ bool ret = false;
+ Reference<css::xml::dom::XElement> entry = Reference<css::xml::dom::XElement>(getKeyElement(url), UNO_QUERY);
+ if (entry.is())
+ {
+ OUString sActive = entry->getAttribute(OUSTR("revoked"));
+ if (!sActive.equals(OUSTR("true")))
+ ret = true;
+ }
+ return ret;
+
+ }
+ catch(css::uno::Exception &)
+ {
+ Any exc( ::cppu::getCaughtException() );
+ throw css::deployment::DeploymentException(
+ OUSTR("Extension Manager: failed to determine an active entry in backend db: ") +
+ m_urlDb, 0, exc);
+ }
+}
+
Reference<css::xml::dom::XNode> BackendDb::getKeyElement(
::rtl::OUString const & url)
{
@@ -577,32 +645,34 @@ RegisteredDb::RegisteredDb(
void RegisteredDb::addEntry(::rtl::OUString const & url)
{
try{
+ if (!activateEntry(url))
+ {
+ const OUString sNameSpace = getDbNSName();
+ const OUString sPrefix = getNSPrefix();
+ const OUString sEntry = getKeyElementName();
- const OUString sNameSpace = getDbNSName();
- const OUString sPrefix = getNSPrefix();
- const OUString sEntry = getKeyElementName();
-
- Reference<css::xml::dom::XDocument> doc = getDocument();
- Reference<css::xml::dom::XNode> root = doc->getFirstChild();
+ Reference<css::xml::dom::XDocument> doc = getDocument();
+ Reference<css::xml::dom::XNode> root = doc->getFirstChild();
#if OSL_DEBUG_LEVEL > 0
- //There must not be yet an entry with the same url
- OUString sExpression(
- sPrefix + OUSTR(":") + sEntry + OUSTR("[@url = \"") + url + OUSTR("\"]"));
- Reference<css::xml::dom::XNode> _extensionNode =
- getXPathAPI()->selectSingleNode(root, sExpression);
- OSL_ASSERT(! _extensionNode.is());
+ //There must not be yet an entry with the same url
+ OUString sExpression(
+ sPrefix + OUSTR(":") + sEntry + OUSTR("[@url = \"") + url + OUSTR("\"]"));
+ Reference<css::xml::dom::XNode> _extensionNode =
+ getXPathAPI()->selectSingleNode(root, sExpression);
+ OSL_ASSERT(! _extensionNode.is());
#endif
- Reference<css::xml::dom::XElement> helpElement(
- doc->createElementNS(sNameSpace, sPrefix + OUSTR(":") + sEntry));
+ Reference<css::xml::dom::XElement> helpElement(
+ doc->createElementNS(sNameSpace, sPrefix + OUSTR(":") + sEntry));
- helpElement->setAttribute(OUSTR("url"), url);
+ helpElement->setAttribute(OUSTR("url"), url);
- Reference<css::xml::dom::XNode> helpNode(
- helpElement, UNO_QUERY_THROW);
- root->appendChild(helpNode);
+ Reference<css::xml::dom::XNode> helpNode(
+ helpElement, UNO_QUERY_THROW);
+ root->appendChild(helpNode);
- save();
+ save();
+ }
}
catch(css::uno::Exception &)
{
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 0f309a5b729f..eecae4e391b7 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -135,6 +135,10 @@ public:
lang::IllegalArgumentException, RuntimeException);
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
getSupportedPackageTypes() throw (RuntimeException);
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+ throw (deployment::DeploymentException,
+ RuntimeException);
+
};
//______________________________________________________________________________
@@ -185,6 +189,20 @@ OUString normalizeMediaType( OUString const & mediaType )
//______________________________________________________________________________
+void PackageRegistryImpl::packageRemoved(
+ ::rtl::OUString const & url, ::rtl::OUString const & mediaType)
+ throw (css::deployment::DeploymentException,
+ css::uno::RuntimeException)
+{
+ const t_string2registry::const_iterator i =
+ m_mediaType2backend.find(mediaType);
+
+ if (i != m_mediaType2backend.end())
+ {
+ i->second->packageRemoved(url, mediaType);
+ }
+}
+
void PackageRegistryImpl::insertBackend(
Reference<deployment::XPackageRegistry> const & xBackend )
{
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 968ee7297b0f..5ec739153831 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -71,6 +71,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
bool getFileAttributes(sal_uInt64& out_Attributes);
bool isUrlTargetInExtension();
+
public:
inline ExecutablePackageImpl(
::rtl::Reference<PackageRegistryBackend> const & myBackend,
@@ -92,8 +93,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv );
void addDataToDb(OUString const & url);
- bool isRegisteredInDb(OUString const & url);
- void deleteDataFromDb(OUString const & url);
+ bool hasActiveEntry(OUString const & url);
+ void revokeEntryFromDb(OUString const & url);
Reference<deployment::XPackageTypeInfo> m_xExecutableTypeInfo;
std::auto_ptr<ExecutableBackendDb> m_backendDb;
@@ -104,6 +105,9 @@ public:
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
getSupportedPackageTypes() throw (RuntimeException);
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException);
using PackageRegistryBackend::disposing;
};
@@ -134,20 +138,20 @@ void BackendImpl::addDataToDb(OUString const & url)
m_backendDb->addEntry(url);
}
-bool BackendImpl::isRegisteredInDb(OUString const & url)
+void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- bool ret = false;
if (m_backendDb.get())
- ret = m_backendDb->getEntry(url);
- return ret;
+ m_backendDb->revokeEntry(url);
}
-void BackendImpl::deleteDataFromDb(OUString const & url)
+bool BackendImpl::hasActiveEntry(OUString const & url)
{
if (m_backendDb.get())
- m_backendDb->removeEntry(url);
+ return m_backendDb->hasActiveEntry(url);
+ return false;
}
+
// XPackageRegistry
Sequence< Reference<deployment::XPackageTypeInfo> >
BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
@@ -156,6 +160,14 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
& m_xExecutableTypeInfo, 1);
}
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException)
+{
+ if (m_backendDb.get())
+ m_backendDb->removeEntry(url);
+}
+
// PackageRegistryBackend
Reference<deployment::XPackage> BackendImpl::bindPackage_(
OUString const & url, OUString const & mediaType, sal_Bool bRemoved,
@@ -217,7 +229,7 @@ BackendImpl::ExecutablePackageImpl::isRegistered_(
::rtl::Reference<dp_misc::AbortChannel> const &,
Reference<XCommandEnvironment> const & )
{
- bool registered = getMyBackend()->isRegisteredInDb(getURL());
+ bool registered = getMyBackend()->hasActiveEntry(getURL());
return beans::Optional< beans::Ambiguous<sal_Bool> >(
sal_True /* IsPresent */,
beans::Ambiguous<sal_Bool>(
@@ -248,7 +260,8 @@ void BackendImpl::ExecutablePackageImpl::processPackage_(
else if (getMyBackend()->m_context.equals(OUSTR("shared")))
attributes |= (osl_File_Attribute_OwnExe | osl_File_Attribute_GrpExe
| osl_File_Attribute_OthExe);
- else if (!getMyBackend()->m_context.equals(OUSTR("bundled")))
+ else if (!getMyBackend()->m_context.equals(OUSTR("bundled"))
+ && !getMyBackend()->m_context.equals(OUSTR("bundled_prereg")))
//Bundled extension are required to be in the properly
//installed. That is an executable must have the right flags
OSL_ASSERT(0);
@@ -261,7 +274,7 @@ void BackendImpl::ExecutablePackageImpl::processPackage_(
}
else
{
- getMyBackend()->deleteDataFromDb(getURL());
+ getMyBackend()->revokeEntryFromDb(getURL());
}
}
@@ -277,7 +290,8 @@ bool BackendImpl::ExecutablePackageImpl::isUrlTargetInExtension()
sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$UNO_USER_PACKAGES_CACHE"));
else if (getMyBackend()->m_context.equals(OUSTR("shared")))
sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$UNO_SHARED_PACKAGES_CACHE"));
- else if (getMyBackend()->m_context.equals(OUSTR("bundled")))
+ else if (getMyBackend()->m_context.equals(OUSTR("bundled"))
+ || getMyBackend()->m_context.equals(OUSTR("bundled_prereg")))
sExtensionDir = dp_misc::expandUnoRcTerm(OUSTR("$BUNDLED_EXTENSIONS"));
else
OSL_ASSERT(0);
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 53a7ba1c316d..0adb63614828 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -80,7 +80,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
::rtl::Reference<AbortChannel> const & abortChannel,
Reference<XCommandEnvironment> const & xCmdEnv );
- bool extensionContainsCompiledHelp();
+
public:
PackageImpl(
::rtl::Reference<PackageRegistryBackend> const & myBackend,
@@ -88,6 +88,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
Reference<deployment::XPackageTypeInfo> const & xPackageType,
bool bRemoved, OUString const & identifier);
+ bool extensionContainsCompiledHelp();
+
//XPackage
virtual css::beans::Optional< ::rtl::OUString > SAL_CALL getRegistrationDataURL()
throw (deployment::ExtensionRemovedException, css::uno::RuntimeException);
@@ -100,14 +102,16 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
sal_Bool bRemoved, OUString const & identifier,
Reference<XCommandEnvironment> const & xCmdEnv );
- void implProcessHelp( Reference< deployment::XPackage > xPackage, bool doRegisterPackage,
- bool compiledHelp, Reference<ucb::XCommandEnvironment> const & xCmdEnv);
+ void implProcessHelp( PackageImpl * package, bool doRegisterPackage,
+ Reference<ucb::XCommandEnvironment> const & xCmdEnv);
void implCollectXhpFiles( const rtl::OUString& aDir,
std::vector< rtl::OUString >& o_rXhpFileVector );
void addDataToDb(OUString const & url, HelpBackendDb::Data const & data);
::boost::optional<HelpBackendDb::Data> readDataFromDb(OUString const & url);
- void deleteDataFromDb(OUString const & url);
+ bool hasActiveEntry(OUString const & url);
+ void revokeEntryFromDb(OUString const & url);
+ bool activateEntry(OUString const & url);
Reference< ucb::XSimpleFileAccess > getFileAccess( void );
Reference< ucb::XSimpleFileAccess > m_xSFA;
@@ -123,6 +127,10 @@ public:
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
getSupportedPackageTypes() throw (RuntimeException);
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException);
+
};
//______________________________________________________________________________
@@ -162,6 +170,14 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
return m_typeInfos;
}
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException)
+{
+ if (m_backendDb.get())
+ m_backendDb->removeEntry(url);
+}
+
// PackageRegistryBackend
//______________________________________________________________________________
Reference<deployment::XPackage> BackendImpl::bindPackage_(
@@ -220,12 +236,27 @@ void BackendImpl::addDataToDb(
return data;
}
-void BackendImpl::deleteDataFromDb(OUString const & url)
+bool BackendImpl::hasActiveEntry(OUString const & url)
{
if (m_backendDb.get())
- m_backendDb->removeEntry(url);
+ return m_backendDb->hasActiveEntry(url);
+ return false;
+}
+
+void BackendImpl::revokeEntryFromDb(OUString const & url)
+{
+ if (m_backendDb.get())
+ m_backendDb->revokeEntry(url);
}
+bool BackendImpl::activateEntry(OUString const & url)
+{
+ if (m_backendDb.get())
+ return m_backendDb->activateEntry(url);
+ return false;
+}
+
+
//##############################################################################
BackendImpl::PackageImpl::PackageImpl(
::rtl::Reference<PackageRegistryBackend> const & myBackend,
@@ -235,13 +266,6 @@ BackendImpl::PackageImpl::PackageImpl(
: Package( myBackend, url, name, name, xPackageType, bRemoved,
identifier)
{
-// if (bRemoved)
-// {
-// ::boost::optional<HelpBackendDb::Data> opt =
-// getMyBackend()->readDataFromDb(url);
-// if (opt)
-// m_dbData = *opt;
-// }
}
// Package
@@ -260,7 +284,6 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
return pBackend;
}
-
bool BackendImpl::PackageImpl::extensionContainsCompiledHelp()
{
bool bCompiled = true;
@@ -311,6 +334,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp()
}
return bCompiled;
}
+
//______________________________________________________________________________
beans::Optional< beans::Ambiguous<sal_Bool> >
BackendImpl::PackageImpl::isRegistered_(
@@ -321,7 +345,7 @@ BackendImpl::PackageImpl::isRegistered_(
BackendImpl * that = getMyBackend();
bool bReg = false;
- if (that->readDataFromDb(getURL()))
+ if (that->hasActiveEntry(getURL()))
bReg = true;
return beans::Optional< beans::Ambiguous<sal_Bool> >( true, beans::Ambiguous<sal_Bool>( bReg, false ) );
@@ -340,9 +364,7 @@ void BackendImpl::PackageImpl::processPackage_(
(void)xCmdEnv;
BackendImpl* that = getMyBackend();
- Reference< deployment::XPackage > xThisPackage( this );
- that->implProcessHelp( xThisPackage, doRegisterPackage,
- extensionContainsCompiledHelp(), xCmdEnv);
+ that->implProcessHelp( this, doRegisterPackage, xCmdEnv);
}
beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
@@ -355,7 +377,7 @@ beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
::boost::optional<HelpBackendDb::Data> data =
getMyBackend()->readDataFromDb(getURL());
- if (data)
+ if (data && getMyBackend()->hasActiveEntry(getURL()))
return beans::Optional<OUString>(true, data->dataUrl);
return beans::Optional<OUString>(true, OUString());
@@ -368,224 +390,225 @@ static rtl::OUString aSlash( rtl::OUString::createFromAscii( "/" ) );
static rtl::OUString aHelpStr( rtl::OUString::createFromAscii( "help" ) );
-void BackendImpl::implProcessHelp
-( Reference< deployment::XPackage > xPackage, bool doRegisterPackage, bool compiledHelp,
- Reference<ucb::XCommandEnvironment> const & xCmdEnv)
+void BackendImpl::implProcessHelp(
+ PackageImpl * package, bool doRegisterPackage,
+ Reference<ucb::XCommandEnvironment> const & xCmdEnv)
{
+ Reference< deployment::XPackage > xPackage(package);
OSL_ASSERT(xPackage.is());
if (doRegisterPackage)
{
- HelpBackendDb::Data data;
-
- if (compiledHelp)
+ //revive already processed help if possible
+ if ( !activateEntry(xPackage->getURL()))
{
+ HelpBackendDb::Data data;
data.dataUrl = xPackage->getURL();
- }
- else
- {
- const OUString sHelpFolder = createFolder(OUString(), xCmdEnv);
- data.dataUrl = sHelpFolder;
-
- Reference< ucb::XSimpleFileAccess > xSFA = getFileAccess();
- rtl::OUString aHelpURL = xPackage->getURL();
- rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL );
- rtl::OUString aName = xPackage->getName();
- if( !xSFA->isFolder( aExpandedHelpURL ) )
+ if (!package->extensionContainsCompiledHelp())
{
- rtl::OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR );
- aErrStr += rtl::OUString::createFromAscii( "No help folder" );
- OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
- throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
- makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
- }
-
- Reference<XComponentContext> const & xContext = getComponentContext();
- Reference< script::XInvocation > xInvocation;
- if( xContext.is() )
- {
- try
+ const OUString sHelpFolder = createFolder(OUString(), xCmdEnv);
+ data.dataUrl = sHelpFolder;
+
+ Reference< ucb::XSimpleFileAccess > xSFA = getFileAccess();
+ rtl::OUString aHelpURL = xPackage->getURL();
+ rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL );
+ rtl::OUString aName = xPackage->getName();
+ if( !xSFA->isFolder( aExpandedHelpURL ) )
{
- xInvocation = Reference< script::XInvocation >(
- xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii(
- "com.sun.star.help.HelpIndexer" ), xContext ) , UNO_QUERY );
+ rtl::OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR );
+ aErrStr += rtl::OUString::createFromAscii( "No help folder" );
+ OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
+ throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
+ makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
}
- catch (Exception &)
+
+ Reference<XComponentContext> const & xContext = getComponentContext();
+ Reference< script::XInvocation > xInvocation;
+ if( xContext.is() )
{
- // i98680: Survive missing lucene
+ try
+ {
+ xInvocation = Reference< script::XInvocation >(
+ xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii(
+ "com.sun.star.help.HelpIndexer" ), xContext ) , UNO_QUERY );
+ }
+ catch (Exception &)
+ {
+ // i98680: Survive missing lucene
+ }
}
- }
- // Scan languages
- Sequence< rtl::OUString > aLanguageFolderSeq = xSFA->getFolderContents( aExpandedHelpURL, true );
- sal_Int32 nLangCount = aLanguageFolderSeq.getLength();
- const rtl::OUString* pSeq = aLanguageFolderSeq.getConstArray();
- for( sal_Int32 iLang = 0 ; iLang < nLangCount ; ++iLang )
- {
- rtl::OUString aLangURL = pSeq[iLang];
- if( xSFA->isFolder( aLangURL ) )
+ // Scan languages
+ Sequence< rtl::OUString > aLanguageFolderSeq = xSFA->getFolderContents( aExpandedHelpURL, true );
+ sal_Int32 nLangCount = aLanguageFolderSeq.getLength();
+ const rtl::OUString* pSeq = aLanguageFolderSeq.getConstArray();
+ for( sal_Int32 iLang = 0 ; iLang < nLangCount ; ++iLang )
{
- std::vector< rtl::OUString > aXhpFileVector;
-
- // calculate jar file URL
- sal_Int32 indexStartSegment = aLangURL.lastIndexOf('/');
- // for example "/en"
- OUString langFolderURLSegment(
- aLangURL.copy(
- indexStartSegment + 1, aLangURL.getLength() - indexStartSegment - 1));
-
- //create the folder in the "temporary folder"
- ::ucbhelper::Content langFolderContent;
- const OUString langFolderDest = makeURL(sHelpFolder, langFolderURLSegment);
- const OUString langFolderDestExpanded = ::dp_misc::expandUnoRcUrl(langFolderDest);
- ::dp_misc::create_folder(
- &langFolderContent,
- langFolderDest, xCmdEnv);
-
- rtl::OUString aJarFile(
- makeURL(sHelpFolder, langFolderURLSegment + aSlash + aHelpStr +
- OUSTR(".jar")));
- aJarFile = ::dp_misc::expandUnoRcUrl(aJarFile);
-
- rtl::OUString aEncodedJarFilePath = rtl::Uri::encode(
- aJarFile, rtl_UriCharClassPchar,
- rtl_UriEncodeIgnoreEscapes,
- RTL_TEXTENCODING_UTF8 );
- rtl::OUString aDestBasePath = rtl::OUString::createFromAscii( "vnd.sun.star.zip://" );
- aDestBasePath += aEncodedJarFilePath;
- aDestBasePath += rtl::OUString::createFromAscii( "/" );
-
- sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1;
-
- Sequence< rtl::OUString > aSubLangSeq = xSFA->getFolderContents( aLangURL, true );
- sal_Int32 nSubLangCount = aSubLangSeq.getLength();
- const rtl::OUString* pSubLangSeq = aSubLangSeq.getConstArray();
- for( sal_Int32 iSubLang = 0 ; iSubLang < nSubLangCount ; ++iSubLang )
+ rtl::OUString aLangURL = pSeq[iLang];
+ if( xSFA->isFolder( aLangURL ) )
{
- rtl::OUString aSubFolderURL = pSubLangSeq[iSubLang];
- if( !xSFA->isFolder( aSubFolderURL ) )
- continue;
-
- implCollectXhpFiles( aSubFolderURL, aXhpFileVector );
+ std::vector< rtl::OUString > aXhpFileVector;
+
+ // calculate jar file URL
+ sal_Int32 indexStartSegment = aLangURL.lastIndexOf('/');
+ // for example "/en"
+ OUString langFolderURLSegment(
+ aLangURL.copy(
+ indexStartSegment + 1, aLangURL.getLength() - indexStartSegment - 1));
+
+ //create the folder in the "temporary folder"
+ ::ucbhelper::Content langFolderContent;
+ const OUString langFolderDest = makeURL(sHelpFolder, langFolderURLSegment);
+ const OUString langFolderDestExpanded = ::dp_misc::expandUnoRcUrl(langFolderDest);
+ ::dp_misc::create_folder(
+ &langFolderContent,
+ langFolderDest, xCmdEnv);
+
+ rtl::OUString aJarFile(
+ makeURL(sHelpFolder, langFolderURLSegment + aSlash + aHelpStr +
+ OUSTR(".jar")));
+ aJarFile = ::dp_misc::expandUnoRcUrl(aJarFile);
+
+ rtl::OUString aEncodedJarFilePath = rtl::Uri::encode(
+ aJarFile, rtl_UriCharClassPchar,
+ rtl_UriEncodeIgnoreEscapes,
+ RTL_TEXTENCODING_UTF8 );
+ rtl::OUString aDestBasePath = rtl::OUString::createFromAscii( "vnd.sun.star.zip://" );
+ aDestBasePath += aEncodedJarFilePath;
+ aDestBasePath += rtl::OUString::createFromAscii( "/" );
+
+ sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1;
+
+ Sequence< rtl::OUString > aSubLangSeq = xSFA->getFolderContents( aLangURL, true );
+ sal_Int32 nSubLangCount = aSubLangSeq.getLength();
+ const rtl::OUString* pSubLangSeq = aSubLangSeq.getConstArray();
+ for( sal_Int32 iSubLang = 0 ; iSubLang < nSubLangCount ; ++iSubLang )
+ {
+ rtl::OUString aSubFolderURL = pSubLangSeq[iSubLang];
+ if( !xSFA->isFolder( aSubFolderURL ) )
+ continue;
- // Copy to package (later: move?)
- rtl::OUString aDestPath = aDestBasePath;
- rtl::OUString aPureFolderName = aSubFolderURL.copy( nLenLangFolderURL );
- aDestPath += aPureFolderName;
- xSFA->copy( aSubFolderURL, aDestPath );
- }
+ implCollectXhpFiles( aSubFolderURL, aXhpFileVector );
- // Call compiler
- sal_Int32 nXhpFileCount = aXhpFileVector.size();
- rtl::OUString* pXhpFiles = new rtl::OUString[nXhpFileCount];
- for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp )
- {
- rtl::OUString aXhpFile = aXhpFileVector[iXhp];
- rtl::OUString aXhpRelFile = aXhpFile.copy( nLenLangFolderURL );
- pXhpFiles[iXhp] = aXhpRelFile;
- }
+ // Copy to package (later: move?)
+ rtl::OUString aDestPath = aDestBasePath;
+ rtl::OUString aPureFolderName = aSubFolderURL.copy( nLenLangFolderURL );
+ aDestPath += aPureFolderName;
+ xSFA->copy( aSubFolderURL, aDestPath );
+ }
- rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() );
- rtl::OUString aOfficeHelpPathFileURL;
- ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL );
+ // Call compiler
+ sal_Int32 nXhpFileCount = aXhpFileVector.size();
+ rtl::OUString* pXhpFiles = new rtl::OUString[nXhpFileCount];
+ for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp )
+ {
+ rtl::OUString aXhpFile = aXhpFileVector[iXhp];
+ rtl::OUString aXhpRelFile = aXhpFile.copy( nLenLangFolderURL );
+ pXhpFiles[iXhp] = aXhpRelFile;
+ }
- HelpProcessingErrorInfo aErrorInfo;
- bool bSuccess = compileExtensionHelp(
- aOfficeHelpPathFileURL, aHelpStr, aLangURL,
- nXhpFileCount, pXhpFiles,
- langFolderDestExpanded, aErrorInfo );
+ rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() );
+ rtl::OUString aOfficeHelpPathFileURL;
+ ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL );
- if( bSuccess && xInvocation.is() )
- {
- Sequence<uno::Any> aParamsSeq( 6 );
-
- aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
-
- rtl::OUString aLang;
- sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' );
- if( nLastSlash != -1 )
- aLang = aLangURL.copy( nLastSlash + 1 );
- else
- aLang = rtl::OUString::createFromAscii( "en" );
- aParamsSeq[1] = uno::makeAny( aLang );
-
- aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-mod" ) );
- aParamsSeq[3] = uno::makeAny( rtl::OUString::createFromAscii( "help" ) );
-
- aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-zipdir" ) );
- rtl::OUString aSystemPath;
- osl::FileBase::getSystemPathFromFileURL(
- langFolderDestExpanded, aSystemPath );
- aParamsSeq[5] = uno::makeAny( aSystemPath );
-
- Sequence< sal_Int16 > aOutParamIndex;
- Sequence< uno::Any > aOutParam;
- uno::Any aRet = xInvocation->invoke( rtl::OUString::createFromAscii( "createIndex" ),
- aParamsSeq, aOutParamIndex, aOutParam );
- }
+ HelpProcessingErrorInfo aErrorInfo;
+ bool bSuccess = compileExtensionHelp(
+ aOfficeHelpPathFileURL, aHelpStr, aLangURL,
+ nXhpFileCount, pXhpFiles,
+ langFolderDestExpanded, aErrorInfo );
- if( !bSuccess )
- {
- USHORT nErrStrId = 0;
- switch( aErrorInfo.m_eErrorClass )
+ if( bSuccess && xInvocation.is() )
{
- case HELPPROCESSING_GENERAL_ERROR:
- case HELPPROCESSING_INTERNAL_ERROR: nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break;
- case HELPPROCESSING_XMLPARSING_ERROR: nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break;
- default: ;
- };
-
- rtl::OUString aErrStr;
- if( nErrStrId != 0 )
+ Sequence<uno::Any> aParamsSeq( 6 );
+
+ aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
+
+ rtl::OUString aLang;
+ sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' );
+ if( nLastSlash != -1 )
+ aLang = aLangURL.copy( nLastSlash + 1 );
+ else
+ aLang = rtl::OUString::createFromAscii( "en" );
+ aParamsSeq[1] = uno::makeAny( aLang );
+
+ aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-mod" ) );
+ aParamsSeq[3] = uno::makeAny( rtl::OUString::createFromAscii( "help" ) );
+
+ aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-zipdir" ) );
+ rtl::OUString aSystemPath;
+ osl::FileBase::getSystemPathFromFileURL(
+ langFolderDestExpanded, aSystemPath );
+ aParamsSeq[5] = uno::makeAny( aSystemPath );
+
+ Sequence< sal_Int16 > aOutParamIndex;
+ Sequence< uno::Any > aOutParam;
+ uno::Any aRet = xInvocation->invoke( rtl::OUString::createFromAscii( "createIndex" ),
+ aParamsSeq, aOutParamIndex, aOutParam );
+ }
+
+ if( !bSuccess )
{
- aErrStr = getResourceString( nErrStrId );
-
- // Remoce CR/LF
- rtl::OUString aErrMsg( aErrorInfo.m_aErrorMsg );
- sal_Unicode nCR = 13, nLF = 10;
- sal_Int32 nSearchCR = aErrMsg.indexOf( nCR );
- sal_Int32 nSearchLF = aErrMsg.indexOf( nLF );
- sal_Int32 nCopy;
- if( nSearchCR != -1 || nSearchLF != -1 )
+ USHORT nErrStrId = 0;
+ switch( aErrorInfo.m_eErrorClass )
{
- if( nSearchCR == -1 )
- nCopy = nSearchLF;
- else if( nSearchLF == -1 )
- nCopy = nSearchCR;
- else
- nCopy = ( nSearchCR < nSearchLF ) ? nSearchCR : nSearchLF;
-
- aErrMsg = aErrMsg.copy( 0, nCopy );
- }
- aErrStr += aErrMsg;
- if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && aErrorInfo.m_aXMLParsingFile.getLength() )
+ case HELPPROCESSING_GENERAL_ERROR:
+ case HELPPROCESSING_INTERNAL_ERROR: nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break;
+ case HELPPROCESSING_XMLPARSING_ERROR: nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break;
+ default: ;
+ };
+
+ rtl::OUString aErrStr;
+ if( nErrStrId != 0 )
{
- aErrStr += rtl::OUString::createFromAscii( " in " );
-
- rtl::OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile,
- rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
- aErrStr += aDecodedFile;
- if( aErrorInfo.m_nXMLParsingLine != -1 )
+ aErrStr = getResourceString( nErrStrId );
+
+ // Remoce CR/LF
+ rtl::OUString aErrMsg( aErrorInfo.m_aErrorMsg );
+ sal_Unicode nCR = 13, nLF = 10;
+ sal_Int32 nSearchCR = aErrMsg.indexOf( nCR );
+ sal_Int32 nSearchLF = aErrMsg.indexOf( nLF );
+ sal_Int32 nCopy;
+ if( nSearchCR != -1 || nSearchLF != -1 )
+ {
+ if( nSearchCR == -1 )
+ nCopy = nSearchLF;
+ else if( nSearchLF == -1 )
+ nCopy = nSearchCR;
+ else
+ nCopy = ( nSearchCR < nSearchLF ) ? nSearchCR : nSearchLF;
+
+ aErrMsg = aErrMsg.copy( 0, nCopy );
+ }
+ aErrStr += aErrMsg;
+ if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && aErrorInfo.m_aXMLParsingFile.getLength() )
{
- aErrStr += rtl::OUString::createFromAscii( ", line " );
- aErrStr += ::rtl::OUString::valueOf( aErrorInfo.m_nXMLParsingLine );
+ aErrStr += rtl::OUString::createFromAscii( " in " );
+
+ rtl::OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile,
+ rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
+ aErrStr += aDecodedFile;
+ if( aErrorInfo.m_nXMLParsingLine != -1 )
+ {
+ aErrStr += rtl::OUString::createFromAscii( ", line " );
+ aErrStr += ::rtl::OUString::valueOf( aErrorInfo.m_nXMLParsingLine );
+ }
}
}
- }
- OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
- throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
- makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
+ OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
+ throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
+ makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
+ }
}
}
}
+ //Writing the data entry replaces writing the flag file. If we got to this
+ //point the registration was successful.
+ addDataToDb(xPackage->getURL(), data);
}
- //Writing the data entry replaces writing the flag file. If we got to this
- //point the registration was successful.
- addDataToDb(xPackage->getURL(), data);
} //if (doRegisterPackage)
else
{
- deleteDataFromDb(xPackage->getURL());
+ revokeEntryFromDb(xPackage->getURL());
}
}
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index 8ec9a39d5050..81057f744640 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -83,11 +83,14 @@ OUString HelpBackendDb::getKeyElementName()
void HelpBackendDb::addEntry(::rtl::OUString const & url, Data const & data)
{
try{
- Reference<css::xml::dom::XNode> helpNode
- = writeKeyElement(url);
+ if (!activateEntry(url))
+ {
+ Reference<css::xml::dom::XNode> helpNode
+ = writeKeyElement(url);
- writeSimpleElement(OUSTR("data-url"), data.dataUrl, helpNode);
- save();
+ writeSimpleElement(OUSTR("data-url"), data.dataUrl, helpNode);
+ save();
+ }
}
catch (css::deployment::DeploymentException& )
{
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index c7b730fd1b99..bcff008c00ae 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -76,6 +76,8 @@ public:
void addEntry(::rtl::OUString const & url, Data const & data);
::boost::optional<Data> getEntry(::rtl::OUString const & url);
+ //must also return the data urls for entries with @activ="false". That is,
+ //those are currently revoked.
::std::list< ::rtl::OUString> getAllDataUrls();
};
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 20fc2a8dc7e1..80aec2402a59 100755
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -299,7 +299,7 @@ protected:
// currently only for library containers:
enum {
CONTEXT_UNKNOWN,
- CONTEXT_USER, CONTEXT_SHARED,CONTEXT_BUNDLED, CONTEXT_TMP,
+ CONTEXT_USER, CONTEXT_SHARED,CONTEXT_BUNDLED, CONTEXT_TMP, CONTEXT_BUNDLED_PREREG,
CONTEXT_DOCUMENT
} m_eContext;
bool m_readOnly;
@@ -345,6 +345,18 @@ protected:
static void deleteTempFolder(
::rtl::OUString const & folderUrl);
+ ::rtl::OUString getSharedRegistrationDataURL(
+ css::uno::Reference<css::deployment::XPackage> const & extension,
+ css::uno::Reference<css::deployment::XPackage> const & item);
+
+ /* The backends must implement this function, which is called
+ from XPackageRegistry::packageRemoved (also implemented here).
+ This ensure that the backends clean up their registration data
+ when an extension was removed.
+ */
+// virtual void deleteDbEntry( ::rtl::OUString const & url) = 0;
+
+
public:
struct StrRegisteringPackage : public ::dp_misc::StaticResourceString<
@@ -373,6 +385,12 @@ public:
css::deployment::InvalidRemovedParameterException,
css::ucb::CommandFailedException,
css::lang::IllegalArgumentException, css::uno::RuntimeException);
+
+// virtual void SAL_CALL packageRemoved(
+// ::rtl::OUString const & url, ::rtl::OUString const & mediaType)
+// throw (css::deployment::DeploymentException,
+// css::uno::RuntimeException);
+
};
}
diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
index a0e477979f8c..299a6ec328ce 100644
--- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx
+++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
@@ -147,6 +147,18 @@ public:
virtual ~BackendDb() {};
void removeEntry(::rtl::OUString const & url);
+
+ /* This is called to write the "revoked" attribute to the entry.
+ This is done when XPackage::revokePackage is called.
+ */
+ void revokeEntry(::rtl::OUString const & url);
+
+ /* returns false if the entry does not exist yet.
+ */
+ bool activateEntry(::rtl::OUString const & url);
+
+ bool hasActiveEntry(::rtl::OUString const & url);
+
};
class RegisteredDb: public BackendDb
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
index 2e92a907f8fb..660d6bb374c3 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
@@ -82,15 +82,19 @@ OUString ExtensionBackendDb::getKeyElementName()
void ExtensionBackendDb::addEntry(::rtl::OUString const & url, Data const & data)
{
try{
- Reference<css::xml::dom::XNode> extensionNodeNode = writeKeyElement(url);
- writeVectorOfPair(
- data.items,
- OUSTR("extension-items"),
- OUSTR("item"),
- OUSTR("url"),
- OUSTR("media-type"),
- extensionNodeNode);
- save();
+ //reactive revoked entry if possible.
+ if (!activateEntry(url))
+ {
+ Reference<css::xml::dom::XNode> extensionNodeNode = writeKeyElement(url);
+ writeVectorOfPair(
+ data.items,
+ OUSTR("extension-items"),
+ OUSTR("item"),
+ OUSTR("url"),
+ OUSTR("media-type"),
+ extensionNodeNode);
+ save();
+ }
}
catch(css::uno::Exception &)
{
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 262bbef420f2..d247597a808f 100755..100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -250,7 +250,7 @@ class BackendImpl : public ImplBaseT
void addDataToDb(OUString const & url, ExtensionBackendDb::Data const & data);
ExtensionBackendDb::Data readDataFromDb(OUString const & url);
- void deleteDataFromDb(OUString const & url);
+ void revokeEntryFromDb(OUString const & url);
// PackageRegistryBackend
virtual Reference<deployment::XPackage> bindPackage_(
@@ -276,6 +276,9 @@ public:
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
getSupportedPackageTypes() throw (RuntimeException);
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException);
using ImplBaseT::disposing;
};
@@ -360,6 +363,21 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
return m_typeInfos;
}
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException)
+{
+ //Notify the backend responsible for processing the different media
+ //types that this extension was removed.
+ ExtensionBackendDb::Data data = readDataFromDb(url);
+ for (ExtensionBackendDb::Data::ITC_ITEMS i = data.items.begin(); i != data.items.end(); i++)
+ {
+ m_xRootRegistry->packageRemoved(i->first, i->second);
+ }
+
+ if (m_backendDb.get())
+ m_backendDb->removeEntry(url);
+}
// PackageRegistryBackend
@@ -460,10 +478,10 @@ ExtensionBackendDb::Data BackendImpl::readDataFromDb(
return data;
}
-void BackendImpl::deleteDataFromDb(OUString const & url)
+void BackendImpl::revokeEntryFromDb(OUString const & url)
{
if (m_backendDb.get())
- m_backendDb->removeEntry(url);
+ m_backendDb->revokeEntry(url);
}
@@ -973,7 +991,7 @@ void BackendImpl::PackageImpl::processPackage_(
// selected
}
}
- getMyBackend()->deleteDataFromDb(getURL());
+ getMyBackend()->revokeEntryFromDb(getURL());
}
}
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index edeae256cbaf..dddf82e09790 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -101,13 +101,8 @@ class BackendImpl : public t_helper
Reference<XCommandEnvironment> const & xCmdEnv );
void addDataToDb(OUString const & url);
- void deleteDataFromDb(OUString const & url);
- bool isRegisteredInDb(OUString const & url);
-
-
-
-// Reference< ucb::XSimpleFileAccess > getFileAccess( void );
-// Reference< ucb::XSimpleFileAccess > m_xSFA;
+ bool hasActiveEntry(OUString const & url);
+ void revokeEntryFromDb(OUString const & url);
const Reference<deployment::XPackageTypeInfo> m_xBasicLibTypeInfo;
const Reference<deployment::XPackageTypeInfo> m_xDialogLibTypeInfo;
@@ -123,6 +118,10 @@ public:
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
getSupportedPackageTypes() throw (RuntimeException);
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException);
+
};
//______________________________________________________________________________
@@ -191,18 +190,11 @@ void BackendImpl::addDataToDb(OUString const & url)
m_backendDb->addEntry(url);
}
-bool BackendImpl::isRegisteredInDb(OUString const & url)
+bool BackendImpl::hasActiveEntry(OUString const & url)
{
- bool registered = false;
if (m_backendDb.get())
- registered = m_backendDb->getEntry(url);
- return registered;
-}
-
-void BackendImpl::deleteDataFromDb(OUString const & url)
-{
- if (m_backendDb.get())
- m_backendDb->removeEntry(url);
+ return m_backendDb->hasActiveEntry(url);
+ return false;
}
// XUpdatable
@@ -219,6 +211,19 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
{
return m_typeInfos;
}
+void BackendImpl::revokeEntryFromDb(OUString const & url)
+{
+ if (m_backendDb.get())
+ m_backendDb->revokeEntry(url);
+}
+
+void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException)
+{
+ if (m_backendDb.get())
+ m_backendDb->removeEntry(url);
+}
// PackageRegistryBackend
//______________________________________________________________________________
@@ -321,7 +326,7 @@ BackendImpl::PackageImpl::isRegistered_(
BackendImpl * that = getMyBackend();
Reference< deployment::XPackage > xThisPackage( this );
- bool registered = that->isRegisteredInDb(getURL());
+ bool registered = that->hasActiveEntry(getURL());
return beans::Optional< beans::Ambiguous<sal_Bool> >(
true /* IsPresent */,
beans::Ambiguous<sal_Bool>( registered, false /* IsAmbiguous */ ) );
@@ -367,7 +372,7 @@ void BackendImpl::PackageImpl::processPackage_(
xComponentContext ), UNO_QUERY_THROW );
}
}
- bool bRegistered = getMyBackend()->isRegisteredInDb(getURL());
+ bool bRegistered = getMyBackend()->hasActiveEntry(getURL());
if( !doRegisterPackage )
{
//We cannot just call removeLibrary(name) because this could remove a
@@ -399,7 +404,7 @@ void BackendImpl::PackageImpl::processPackage_(
xDialogLibs->removeLibrary(m_dialogName);
}
}
- getMyBackend()->deleteDataFromDb(getURL());
+ getMyBackend()->revokeEntryFromDb(getURL());
return;
}
}
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index f3195701fc7c..7e4be0f4e35a 100755
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -100,6 +100,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
const Reference<deployment::XPackageTypeInfo> m_xTypeInfo;
+
public:
BackendImpl(
Sequence<Any> const & args,
@@ -108,6 +109,9 @@ public:
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
getSupportedPackageTypes() throw (RuntimeException);
+ virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException);
};
BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
@@ -218,6 +222,8 @@ BackendImpl::BackendImpl(
}
}
+
+
// XPackageRegistry
//______________________________________________________________________________
Sequence< Reference<deployment::XPackageTypeInfo> >
@@ -226,6 +232,12 @@ BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
return Sequence< Reference<deployment::XPackageTypeInfo> >(&m_xTypeInfo, 1);
}
+void BackendImpl::packageRemoved(OUString const & /*url*/, OUString const & /*mediaType*/)
+ throw (deployment::DeploymentException,
+ uno::RuntimeException)
+{
+}
+
// PackageRegistryBackend
//______________________________________________________________________________
Reference<deployment::XPackage> BackendImpl::bindPackage_(
@@ -338,6 +350,11 @@ void BackendImpl::PackageImpl:: initPackageHandler()
{
aContext <<= OUSTR("bundled");
}
+ else if ( that->m_eContext == CONTEXT_BUNDLED_PREREG )
+ {
+ aContext <<= OUSTR("bundled_prereg");
+ }
+
else
{
OSL_ASSERT( 0 );
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 314537836921..314537836921 100755..100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 4545ed862271..83552cb7c4c6 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -380,7 +380,12 @@ extern "C" int unopkg_main()
}
else if (subCommand.equals(OUSTR("sync")))
{
- //sync is private!!!! Only for bundled extensions!!!
+ //sync is private!!!! Only to be called from setup!!!
+ //The UserInstallation is diverted to the prereg folder. But only
+ //the lock file is written! This requires that
+ //-env:UNO_JAVA_JFW_INSTALL_DATA is passed to javaldx and unopkg otherwise the
+ //javasettings file is written to the prereg folder.
+ //
//For performance reasons unopkg sync is called during the setup and
//creates the registration data for the repository of the bundled
//extensions. It is then copied to the user installation during
@@ -395,10 +400,21 @@ extern "C" int unopkg_main()
//$BUNDLED_EXTENSIONS_USER
if (hasNoFolder(OUSTR("$BRAND_BASE_DIR/share/extensions")))
{
- removeFolder(OUSTR("$BUNDLED_EXTENSIONS_USER"));
+ removeFolder(OUSTR("$BUNDLED_EXTENSIONS_PREREG"));
//return otherwise we create the registration data again
return 0;
}
+ //redirect the UserInstallation, so we do not create a
+ //user installation for the admin and we also do not need
+ //to call unopkg with -env:UserInstallation
+ ::rtl::Bootstrap::set(OUSTR("UserInstallation"),
+ OUSTR("$BUNDLED_EXTENSIONS_PREREG/.."));
+ //Setting UNO_JAVA_JFW_INSTALL_DATA causes the javasettings to be written
+ //in the office installation. We do not want to create the user data folder
+ //for the admin. The value must also be set in the unopkg script (Linux, etc.)
+ //when calling javaldx
+ ::rtl::Bootstrap::set(OUSTR("UNO_JAVA_JFW_INSTALL_DATA"),
+ OUSTR("$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml"));
}
@@ -418,6 +434,7 @@ extern "C" int unopkg_main()
//prevent the deletion of the registry data folder
//synching is done in XExtensionManager.reinstall
if (!subcmd_gui && ! subCommand.equals(OUSTR("reinstall"))
+ && ! subCommand.equals(OUSTR("sync"))
&& ! dp_misc::office_is_running())
dp_misc::syncRepositories(xCmdEnv);
@@ -613,12 +630,15 @@ extern "C" int unopkg_main()
}
else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("sync")))
{
- //This sub command may be removed later and is only there to have a
- //possibility to start extension synching without any output.
- //This is just here so we do not get an error, because of an unknown
- //sub-command. We do synching before
- //the sub-commands are processed.
-
+ if (! dp_misc::office_is_running())
+ {
+ xExtensionManager->synchronizeBundledPrereg(
+ Reference<task::XAbortChannel>(), xCmdEnv);
+ }
+ else
+ {
+ dp_misc::writeConsoleError(OUSTR("\nError: office is running"));
+ }
}
else
{
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index d7b6e1ca2336..f6773b768062 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -396,6 +396,7 @@ Reference<XComponentContext> bootstrapStandAlone(
if (! ::ucbhelper::ContentBroker::initialize( xServiceManager, ucb_args ))
throw RuntimeException( OUSTR("cannot initialize UCB!"), 0 );
+ disposeGuard.setDeinitUCB();
return xContext;
}
@@ -627,7 +628,7 @@ void removeFolder(OUString const & folderUrl)
dir.close();
::osl::Directory::remove(url);
}
- else
+ else if (rc != osl::File::E_NOENT)
{
dp_misc::writeConsole(
OUSTR("unopkg: Error while removing ") + url + OUSTR("\n"));
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index 4975cc4c087b..55c86260ca8f 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -34,6 +34,7 @@
#include "tools/resmgr.hxx"
#include "rtl/ustring.hxx"
#include "unotools/configmgr.hxx"
+#include "ucbhelper/contentbroker.hxx"
#define APP_NAME "unopkg"
@@ -137,15 +138,14 @@ bool isBootstrapVariable(sal_uInt32 * pIndex);
class DisposeGuard
{
css::uno::Reference<css::lang::XComponent> m_xComp;
-
+ bool m_bDeinitUCB;
public:
- inline DisposeGuard() {}
- inline DisposeGuard(
- css::uno::Reference<css::lang::XComponent> const & xComp )
- : m_xComp( xComp ) {}
-
+ DisposeGuard(): m_bDeinitUCB(false) {}
inline ~DisposeGuard()
{
+ if (m_bDeinitUCB)
+ ::ucbhelper::ContentBroker::deinitialize();
+
if (m_xComp.is())
m_xComp->dispose();
}
@@ -155,6 +155,12 @@ public:
{
m_xComp = xComp;
}
+
+ inline void setDeinitUCB()
+ {
+ m_bDeinitUCB = true;
+ }
+
};
//==============================================================================
diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
index 80e34ba27701..752bf6d13849 100644
--- a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
@@ -84,19 +84,18 @@ namespace drawinglayer
aOutlineRange.transform(aSimpleObjectMatrix);
}
- // prepare dest coor
- const sal_uInt32 nDiscreteWidth(basegfx::fround(aOutlineRange.getMaxX()));
- const sal_uInt32 nDiscreteHeight(basegfx::fround(aOutlineRange.getMaxY()));
- const Rectangle aDestRectPixel(
- basegfx::fround(aOutlineRange.getMinX()),
- basegfx::fround(aOutlineRange.getMinY()),
- nDiscreteWidth > 0 ? nDiscreteWidth - 1 : 0,
- nDiscreteHeight > 0 ? nDiscreteHeight - 1 : 0);
+ // prepare dest coordinates
+ const Point aPoint(
+ basegfx::fround(aOutlineRange.getMinX()),
+ basegfx::fround(aOutlineRange.getMinY()));
+ const Size aSize(
+ basegfx::fround(aOutlineRange.getWidth()),
+ basegfx::fround(aOutlineRange.getHeight()));
// paint it using GraphicManager
Graphic aGraphic(rBitmapEx);
GraphicObject aGraphicObject(aGraphic);
- aGraphicObject.Draw(&rOutDev, aDestRectPixel.TopLeft(), aDestRectPixel.GetSize(), &aAttributes);
+ aGraphicObject.Draw(&rOutDev, aPoint, aSize, &aAttributes);
}
void RenderBitmapPrimitive2D_BitmapEx(
@@ -110,13 +109,13 @@ namespace drawinglayer
// prepare dest coor. Necessary to expand since vcl's DrawBitmapEx draws one pix less
basegfx::B2DRange aOutlineRange(0.0, 0.0, 1.0, 1.0);
aOutlineRange.transform(rTransform);
- const sal_uInt32 nDiscreteWidth(basegfx::fround(aOutlineRange.getMaxX()));
- const sal_uInt32 nDiscreteHeight(basegfx::fround(aOutlineRange.getMaxY()));
- const Rectangle aDestRectPixel(
- basegfx::fround(aOutlineRange.getMinX()),
- basegfx::fround(aOutlineRange.getMinY()),
- nDiscreteWidth > 0 ? nDiscreteWidth - 1 : 0,
- nDiscreteHeight > 0 ? nDiscreteHeight - 1 : 0);
+ // prepare dest coordinates
+ const Point aPoint(
+ basegfx::fround(aOutlineRange.getMinX()),
+ basegfx::fround(aOutlineRange.getMinY()));
+ const Size aSize(
+ basegfx::fround(aOutlineRange.getWidth()),
+ basegfx::fround(aOutlineRange.getHeight()));
// decompose matrix to check for shear, rotate and mirroring
basegfx::B2DVector aScale, aTranslate;
@@ -142,7 +141,7 @@ namespace drawinglayer
}
// draw bitmap
- rOutDev.DrawBitmapEx(aDestRectPixel.TopLeft(), aDestRectPixel.GetSize(), aContent);
+ rOutDev.DrawBitmapEx(aPoint, aSize, aContent);
}
void RenderBitmapPrimitive2D_self(
@@ -153,13 +152,11 @@ namespace drawinglayer
// process self with free transformation (containing shear and rotate). Get dest rect in pixels.
basegfx::B2DRange aOutlineRange(0.0, 0.0, 1.0, 1.0);
aOutlineRange.transform(rTransform);
- const sal_uInt32 nDiscreteWidth(basegfx::fround(aOutlineRange.getMaxX()));
- const sal_uInt32 nDiscreteHeight(basegfx::fround(aOutlineRange.getMaxY()));
const Rectangle aDestRectLogic(
basegfx::fround(aOutlineRange.getMinX()),
basegfx::fround(aOutlineRange.getMinY()),
- nDiscreteWidth > 0 ? nDiscreteWidth - 1 : 0,
- nDiscreteHeight > 0 ? nDiscreteHeight - 1 : 0);
+ basegfx::fround(aOutlineRange.getMaxX()),
+ basegfx::fround(aOutlineRange.getMaxY()));
const Rectangle aDestRectPixel(rOutDev.LogicToPixel(aDestRectLogic));
// #i96708# check if Metafile is recorded
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 84f4802e7b44..84f4802e7b44 100644..100755
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx
index 5e46a96adb9f..5e46a96adb9f 100644..100755
--- a/editeng/inc/editeng/splwrap.hxx
+++ b/editeng/inc/editeng/splwrap.hxx
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index d53bfcf1aaf2..83f0ab6c54e8 100644..100755
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -853,7 +853,7 @@
#include "vcl/cursor.hxx"
#include "vcl/decoview.hxx"
#include "vcl/dndhelp.hxx"
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
#include "vcl/fntstyle.hxx"
#include "unotools/fontcvt.hxx"
#include "vcl/gdimtf.hxx"
@@ -872,7 +872,7 @@
#include "vcl/unohelp.hxx"
#include "vcl/unohelp2.hxx"
#include "vcl/wall.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
#include "vos/mutex.hxx"
#include "vos/ref.hxx"
#include "vos/refernce.hxx"
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 9ac7de8e2b7d..9ac7de8e2b7d 100644..100755
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index e2a1fabea0ba..e2a1fabea0ba 100644..100755
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index 676418c6729f..bed9dd749349 100644..100755
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -533,7 +533,7 @@
#include "unotools/processfactory.hxx"
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
#include "vos/conditn.hxx"
#include "vos/diagnose.hxx"
diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx
index c5f6b56be31a..d83c43bfcfd8 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -128,17 +128,21 @@ namespace
}
{
::osl::Guard< ::osl::Mutex> service_factory_guard(m_ServiceFactoryMutex);
- if(m_ServiceFactory.is())
+ try
{
- if(Config(m_ServiceFactory).getInvitationAccepted())
+ if(m_ServiceFactory.is())
{
- packLogs(m_ServiceFactory);
- uploadLogs(m_ServiceFactory);
+ if(Config(m_ServiceFactory).getInvitationAccepted())
+ {
+ packLogs(m_ServiceFactory);
+ uploadLogs(m_ServiceFactory);
+ }
+ else
+ LogStorage(m_ServiceFactory).clear();
}
- else
- LogStorage(m_ServiceFactory).clear();
+ m_ServiceFactory.clear();
}
- m_ServiceFactory.clear();
+ catch(...) {}
}
}
@@ -158,16 +162,25 @@ namespace
m_Thread->create();
}
virtual ~OnLogRotateThreadWatcher()
- { m_Thread->disposing()->terminate(); };
+ {
+ m_Thread->disposing()->terminate();
+ m_Thread->join();
+ };
// XTerminateListener
virtual void SAL_CALL queryTermination(const EventObject&) throw(RuntimeException)
{ };
virtual void SAL_CALL notifyTermination(const EventObject&) throw(RuntimeException)
- { m_Thread->disposing()->terminate(); };
+ {
+ m_Thread->disposing()->terminate();
+ m_Thread->join();
+ };
// XEventListener
virtual void SAL_CALL disposing(const EventObject&) throw(RuntimeException)
- { m_Thread->disposing()->terminate(); };
+ {
+ m_Thread->disposing()->terminate();
+ m_Thread->join();
+ };
private:
::std::auto_ptr<OnLogRotateThread> m_Thread;
};
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index ea724c61828c..01f56bd7ac0d 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -41,7 +41,7 @@
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/form/XForm.hpp>
/** === end UNO includes === **/
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
#include <vcl/waitobj.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index 09d90f1eaa83..09d90f1eaa83 100644..100755
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 8419569bd949..8419569bd949 100644..100755
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc
index b275e95f2cdb..83cffa5d8edd 100644
--- a/extras/source/palettes/standard.soc
+++ b/extras/source/palettes/standard.soc
@@ -49,6 +49,7 @@
<draw:color draw:name="Blue 6" draw:color="#0099ff"/>
<draw:color draw:name="Blue 7" draw:color="#00b8ff"/>
<draw:color draw:name="Blue 8" draw:color="#99ccff"/>
+ <draw:color draw:name="Blue 9" draw:color="#CFE7E5"/>
<draw:color draw:name="Turquoise 1" draw:color="#00dcff"/>
<draw:color draw:name="Turquoise 2" draw:color="#00cccc"/>
<draw:color draw:name="Turquoise 3" draw:color="#23b8dc"/>
diff --git a/filter/inc/filter/msfilter/msvbahelper.hxx b/filter/inc/filter/msfilter/msvbahelper.hxx
index 81607c9b296c..94ece293ee20 100644
--- a/filter/inc/filter/msfilter/msvbahelper.hxx
+++ b/filter/inc/filter/msfilter/msvbahelper.hxx
@@ -28,29 +28,81 @@
#define _MSVBAHELPER_HXX
#include <sfx2/objsh.hxx>
+#include <cppuhelper/implbase3.hxx>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/script/vba/XVBAMacroResolver.hpp>
#include "filter/msfilter/msfilterdllapi.h"
-namespace ooo { namespace vba
+namespace ooo {
+namespace vba {
+
+// ============================================================================
+
+struct MSFILTER_DLLPUBLIC MacroResolvedInfo
+{
+ SfxObjectShell* mpDocContext;
+ String msResolvedMacro;
+ bool mbFound;
+
+ inline explicit MacroResolvedInfo( SfxObjectShell* pDocContext = 0 ) : mpDocContext( pDocContext ), mbFound( false ) {}
+};
+
+MSFILTER_DLLPUBLIC String makeMacroURL( const String& sMacroName );
+MSFILTER_DLLPUBLIC ::rtl::OUString extractMacroName( const ::rtl::OUString& rMacroUrl );
+MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const ::rtl::OUString& rMacroName, bool bSearchGlobalTemplates = false );
+MSFILTER_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
+
+// ============================================================================
+
+typedef ::cppu::WeakImplHelper3<
+ ::com::sun::star::lang::XServiceInfo,
+ ::com::sun::star::lang::XInitialization,
+ ::com::sun::star::script::vba::XVBAMacroResolver > VBAMacroResolverBase;
+
+class VBAMacroResolver : public VBAMacroResolverBase
{
- class MSFILTER_DLLPUBLIC VBAMacroResolvedInfo
- {
- SfxObjectShell* mpDocContext;
- bool mbFound;
- String msResolvedMacro;
- public:
- VBAMacroResolvedInfo() : mpDocContext(NULL), mbFound( false ){}
- void SetResolved( bool bRes ) { mbFound = bRes; }
- bool IsResolved() { return mbFound; }
- void SetMacroDocContext(SfxObjectShell* pShell ) { mpDocContext = pShell; }
- SfxObjectShell* MacroDocContext() { return mpDocContext; }
- String ResolvedMacro() { return msResolvedMacro; }
- void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; }
- };
-
- MSFILTER_DLLPUBLIC String makeMacroURL( const String& sMacroName );
- MSFILTER_DLLPUBLIC ::rtl::OUString extractMacroName( const ::rtl::OUString& rMacroUrl );
- MSFILTER_DLLPUBLIC VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false );
- MSFILTER_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
-} }
+public:
+ explicit VBAMacroResolver();
+ virtual ~VBAMacroResolver();
+
+ // com.sun.star.lang.XServiceInfo interface -------------------------------
+
+ virtual ::rtl::OUString SAL_CALL
+ getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+
+ virtual sal_Bool SAL_CALL
+ supportsService( const ::rtl::OUString& rService )
+ throw (::com::sun::star::uno::RuntimeException);
+
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+ // com.sun.star.lang.XInitialization interface ----------------------------
+
+ virtual void SAL_CALL initialize(
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs )
+ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+ // com.sun.star.script.vba.XVBAMacroResolver interface --------------------
+
+ virtual ::rtl::OUString SAL_CALL
+ resolveVBAMacroToScriptURL( const ::rtl::OUString& rVBAMacroName )
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+
+ virtual ::rtl::OUString SAL_CALL
+ resolveScriptURLtoVBAMacro( const ::rtl::OUString& rScriptURL )
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+
+private:
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
+ SfxObjectShell* mpObjShell;
+ ::rtl::OUString maProjectName;
+};
+
+// ============================================================================
+
+} // namespace vba
+} // namespace ooo
#endif
diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index 065b4313c57b..5617d28856f7 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -1,4 +1,4 @@
-fl filter : l10n svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt NULL
+fl filter : l10n svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx NULL
fl filter usr1 - all fl_mkout NULL
fl filter\prj get - all fl_prj NULL
fl filter\inc nmake - all fl_inc NULL
diff --git a/filter/prj/d.lst b/filter/prj/d.lst
index 037bef1a3765..52d96f64cdf5 100644
--- a/filter/prj/d.lst
+++ b/filter/prj/d.lst
@@ -60,6 +60,7 @@ mkdir: %_DEST%\inc%_EXT%\filter\msfilter
..\%__SRC%\misc\XSLTValidate.component %_DEST%\xml%_EXT%\XSLTValidate.component
..\%__SRC%\misc\filterconfig1.component %_DEST%\xml%_EXT%\filterconfig1.component
..\%__SRC%\misc\flash.component %_DEST%\xml%_EXT%\flash.component
+..\%__SRC%\misc\msfilter.component %_DEST%\xml%_EXT%\msfilter.component
..\%__SRC%\misc\pdffilter.component %_DEST%\xml%_EXT%\pdffilter.component
..\%__SRC%\misc\placeware.component %_DEST%\xml%_EXT%\placeware.component
..\%__SRC%\misc\svgfilter.component %_DEST%\xml%_EXT%\svgfilter.component
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu
index 650c0cf980fb..2402d74084e3 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu
@@ -1,7 +1,7 @@
<node oor:name="Calc MS Excel 2007 Binary" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ExcelFilter</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.xls.ExcelFilter</value></prop>
<prop oor:name="UserData"/>
<prop oor:name="FileFormatVersion"/>
<prop oor:name="Type"><value>MS Excel 2007 Binary</value></prop>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
index 508927802621..73c9e1be54df 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
@@ -1,7 +1,7 @@
<node oor:name="Calc MS Excel 2007 XML" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ExcelFilter</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.xls.ExcelFilter</value></prop>
<prop oor:name="UserData"/>
<prop oor:name="FileFormatVersion"/>
<prop oor:name="Type"><value>MS Excel 2007 XML</value></prop>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
index 46f1eca86085..d5a14a27d0e2 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
@@ -1,7 +1,7 @@
<node oor:name="Calc MS Excel 2007 XML Template" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ExcelFilter</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.xls.ExcelFilter</value></prop>
<prop oor:name="UserData"/>
<prop oor:name="FileFormatVersion"/>
<prop oor:name="Type"><value>MS Excel 2007 XML Template</value></prop>
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
index 7fdcbd702a54..254ba468b6eb 100644
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
+++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
@@ -1,7 +1,7 @@
<node oor:name="Impress MS PowerPoint 2007 XML" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"/>
<prop oor:name="FileFormatVersion"/>
<prop oor:name="Type"><value>MS PowerPoint 2007 XML</value></prop>
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
index 4fad96fc0521..01fd72086d6b 100644
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
@@ -1,7 +1,7 @@
<node oor:name="Impress MS PowerPoint 2007 XML Template" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH PREFERRED</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"/>
<prop oor:name="FileFormatVersion"/>
<prop oor:name="Type"><value>MS PowerPoint 2007 XML Template</value></prop>
diff --git a/filter/source/config/fragments/types/calc_MS_Excel_40.xcu b/filter/source/config/fragments/types/calc_MS_Excel_40.xcu
index b45c21fa33bd..939a0a4025ad 100644
--- a/filter/source/config/fragments/types/calc_MS_Excel_40.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Excel_40.xcu
@@ -1,5 +1,5 @@
<node oor:name="calc_MS_Excel_40" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.xls.BiffDetector</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>xls xlw xlc xlm</value></prop>
<prop oor:name="MediaType"><value>application/vnd.ms-excel</value></prop>
diff --git a/filter/source/config/fragments/types/calc_MS_Excel_40_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_MS_Excel_40_VorlageTemplate.xcu
index 42bb10ed09c8..291382df43b6 100644
--- a/filter/source/config/fragments/types/calc_MS_Excel_40_VorlageTemplate.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Excel_40_VorlageTemplate.xcu
@@ -1,5 +1,5 @@
<node oor:name="calc_MS_Excel_40_VorlageTemplate" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.xls.BiffDetector</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>xlt</value></prop>
<prop oor:name="MediaType"><value>application/vnd.ms-excel</value></prop>
diff --git a/filter/source/config/fragments/types/calc_MS_Excel_5095.xcu b/filter/source/config/fragments/types/calc_MS_Excel_5095.xcu
index 3f450f0cb85f..5656b73f57dd 100644
--- a/filter/source/config/fragments/types/calc_MS_Excel_5095.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Excel_5095.xcu
@@ -1,5 +1,5 @@
<node oor:name="calc_MS_Excel_5095" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.xls.BiffDetector</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>xls xlc xlm xlw</value></prop>
<prop oor:name="MediaType"><value>application/vnd.ms-excel</value></prop>
diff --git a/filter/source/config/fragments/types/calc_MS_Excel_5095_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_MS_Excel_5095_VorlageTemplate.xcu
index 8dbb02c0170e..9c1799dfe405 100644
--- a/filter/source/config/fragments/types/calc_MS_Excel_5095_VorlageTemplate.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Excel_5095_VorlageTemplate.xcu
@@ -1,5 +1,5 @@
<node oor:name="calc_MS_Excel_5095_VorlageTemplate" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.xls.BiffDetector</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>xlt</value></prop>
<prop oor:name="MediaType"><value>application/vnd.ms-excel</value></prop>
diff --git a/filter/source/config/fragments/types/calc_MS_Excel_95.xcu b/filter/source/config/fragments/types/calc_MS_Excel_95.xcu
index 0ea10dddc31e..8e02ea8f088d 100644
--- a/filter/source/config/fragments/types/calc_MS_Excel_95.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Excel_95.xcu
@@ -1,5 +1,5 @@
<node oor:name="calc_MS_Excel_95" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.xls.BiffDetector</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>xls xlc xlm xlw</value></prop>
<prop oor:name="MediaType"><value>application/vnd.ms-excel</value></prop>
diff --git a/filter/source/config/fragments/types/calc_MS_Excel_95_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_MS_Excel_95_VorlageTemplate.xcu
index fb3e41014f85..bc80367624f3 100644
--- a/filter/source/config/fragments/types/calc_MS_Excel_95_VorlageTemplate.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Excel_95_VorlageTemplate.xcu
@@ -1,5 +1,5 @@
<node oor:name="calc_MS_Excel_95_VorlageTemplate" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.xls.BiffDetector</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>xlt</value></prop>
<prop oor:name="MediaType"><value>application/vnd.ms-excel</value></prop>
diff --git a/filter/source/config/fragments/types/calc_MS_Excel_97.xcu b/filter/source/config/fragments/types/calc_MS_Excel_97.xcu
index 9f1949d9f413..ab71bc304247 100644
--- a/filter/source/config/fragments/types/calc_MS_Excel_97.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Excel_97.xcu
@@ -1,5 +1,5 @@
<node oor:name="calc_MS_Excel_97" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.xls.BiffDetector</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>xls xlc xlm xlw</value></prop>
<prop oor:name="MediaType"><value>application/vnd.ms-excel</value></prop>
diff --git a/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu b/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu
index 26f4bca3a725..ff390ce3d376 100644
--- a/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Excel_97_VorlageTemplate.xcu
@@ -1,5 +1,5 @@
<node oor:name="calc_MS_Excel_97_VorlageTemplate" oor:op="replace" >
- <prop oor:name="DetectService"><value>com.sun.star.comp.calc.FormatDetector</value></prop>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.xls.BiffDetector</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>xlt</value></prop>
<prop oor:name="MediaType"><value>application/vnd.ms-excel</value></prop>
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 244ca56971be..2a1992e246a3 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -36,6 +36,8 @@
#include <svtools/fltcall.hxx>
#include <math.h>
+#include "shape.hxx"
+
namespace PictReaderInternal {
//! utilitary class to store a pattern, ...
class Pattern {
@@ -165,7 +167,7 @@ private:
Pattern eActPenPattern;
Pattern eActFillPattern;
Pattern eActBackPattern;
- USHORT nActPenSize;
+ Size nActPenSize;
// Note: Postscript mode is stored by setting eActRop to ROP_1
RasterOp eActROP;
PictDrawingMethod eActMethod;
@@ -220,6 +222,12 @@ private:
ULONG ReadAndDrawRgn(PictDrawingMethod eMethod);
ULONG ReadAndDrawSameRgn(PictDrawingMethod eMethod);
+ // returns true, if we do not need to print the shape/text/frame
+ bool IsInvisible(PictDrawingMethod eMethod) const {
+ if (eActROP == ROP_1) return true;
+ if (eMethod==PDM_FRAME && (nActPenSize.Width() == 0 || nActPenSize.Height() == 0)) return true;
+ return false;
+ }
void DrawingMethod(PictDrawingMethod eMethod);
ULONG ReadAndDrawText();
@@ -455,8 +463,6 @@ void PictReader::ReadRectangle(Rectangle & rRect)
aTopLeft=ReadPoint();
aBottomRight=ReadPoint();
- aBottomRight.X() -= 1;
- aBottomRight.Y() -= 1;
rRect=Rectangle(aTopLeft,aBottomRight);
}
@@ -510,92 +516,69 @@ ULONG PictReader::ReadPixPattern(PictReader::Pattern &pattern)
ULONG PictReader::ReadAndDrawRect(PictDrawingMethod eMethod)
{
ReadRectangle(aLastRect);
- DrawingMethod(eMethod);
- pVirDev->DrawRect(aLastRect);
+ ReadAndDrawSameRect(eMethod);
return 8;
}
ULONG PictReader::ReadAndDrawSameRect(PictDrawingMethod eMethod)
{
+ if (IsInvisible(eMethod)) return 0;
DrawingMethod(eMethod);
- pVirDev->DrawRect(aLastRect);
+ PictReaderShape::drawRectangle(pVirDev, eMethod==PDM_FRAME, aLastRect, nActPenSize);
return 0;
}
ULONG PictReader::ReadAndDrawRoundRect(PictDrawingMethod eMethod)
{
ReadRectangle(aLastRoundRect);
- DrawingMethod(eMethod);
- // Osnola: the corner's size is equal to aActOvalSize/2, see Quickdraw Drawing Reference 3-63
- pVirDev->DrawRect(aLastRoundRect,(aActOvalSize.Width()+1)/2,(aActOvalSize.Height()+1)/2);
+ ReadAndDrawSameRoundRect(eMethod);
return 8;
}
ULONG PictReader::ReadAndDrawSameRoundRect(PictDrawingMethod eMethod)
{
+ if (IsInvisible(eMethod)) return 0;
DrawingMethod(eMethod);
- pVirDev->DrawRect(aLastRoundRect,(aActOvalSize.Width()+1)/2,(aActOvalSize.Height()+1)/2);
+ PictReaderShape::drawRoundRectangle(pVirDev, eMethod==PDM_FRAME, aLastRoundRect, aActOvalSize, nActPenSize);
return 0;
}
ULONG PictReader::ReadAndDrawOval(PictDrawingMethod eMethod)
{
ReadRectangle(aLastOval);
- DrawingMethod(eMethod);
- pVirDev->DrawEllipse(aLastOval);
+ ReadAndDrawSameOval(eMethod);
return 8;
}
ULONG PictReader::ReadAndDrawSameOval(PictDrawingMethod eMethod)
{
+ if (IsInvisible(eMethod)) return 0;
DrawingMethod(eMethod);
- pVirDev->DrawEllipse(aLastOval);
+ PictReaderShape::drawEllipse(pVirDev, eMethod==PDM_FRAME, aLastOval, nActPenSize);
return 0;
}
ULONG PictReader::ReadAndDrawPolygon(PictDrawingMethod eMethod)
{
ULONG nDataSize;
-
nDataSize=ReadPolygon(aLastPolygon);
- DrawingMethod(eMethod);
- if (eMethod==PDM_FRAME) pVirDev->DrawPolyLine(aLastPolygon);
- else pVirDev->DrawPolygon(aLastPolygon);
+ ReadAndDrawSamePolygon(eMethod);
return nDataSize;
}
ULONG PictReader::ReadAndDrawSamePolygon(PictDrawingMethod eMethod)
{
+ if (IsInvisible(eMethod)) return 0;
DrawingMethod(eMethod);
- if (eMethod==PDM_FRAME) pVirDev->DrawPolyLine(aLastPolygon);
- else pVirDev->DrawPolygon(aLastPolygon);
+ PictReaderShape::drawPolygon(pVirDev, eMethod==PDM_FRAME, aLastPolygon, nActPenSize);
return 0;
}
ULONG PictReader::ReadAndDrawArc(PictDrawingMethod eMethod)
{
- short nstartAngle, narcAngle;
- double fAng1, fAng2;
- Point aStartPt, aEndPt, aCenter;
-
ReadRectangle(aLastArcRect);
- *pPict >> nstartAngle >> narcAngle;
- if (narcAngle<0) {
- nstartAngle = nstartAngle + narcAngle;
- narcAngle=-narcAngle;
- }
- fAng1=((double)nstartAngle)/180.0*3.14159265359;
- fAng2=((double)(nstartAngle+narcAngle))/180.0*3.14159265359;
- aCenter=Point((aLastArcRect.Left()+aLastArcRect.Right())/2,
- (aLastArcRect.Top()+aLastArcRect.Bottom())/2);
- aStartPt=Point(aCenter.X()+(long)( sin(fAng2)*256.0),
- aCenter.Y()+(long)(-cos(fAng2)*256.0));
- aEndPt= Point(aCenter.X()+(long)( sin(fAng1)*256.0),
- aCenter.Y()+(long)(-cos(fAng1)*256.0));
- DrawingMethod(eMethod);
- if (eMethod==PDM_FRAME) pVirDev->DrawArc(aLastArcRect,aStartPt,aEndPt);
- else pVirDev->DrawPie(aLastArcRect,aStartPt,aEndPt);
+ ReadAndDrawSameArc(eMethod);
return 12;
}
@@ -603,24 +586,18 @@ ULONG PictReader::ReadAndDrawSameArc(PictDrawingMethod eMethod)
{
short nstartAngle, narcAngle;
double fAng1, fAng2;
- Point aStartPt, aEndPt, aCenter;
*pPict >> nstartAngle >> narcAngle;
+ if (IsInvisible(eMethod)) return 4;
+ DrawingMethod(eMethod);
+
if (narcAngle<0) {
nstartAngle = nstartAngle + narcAngle;
narcAngle=-narcAngle;
}
fAng1=((double)nstartAngle)/180.0*3.14159265359;
fAng2=((double)(nstartAngle+narcAngle))/180.0*3.14159265359;
- aCenter=Point((aLastArcRect.Left()+aLastArcRect.Right())/2,
- (aLastArcRect.Top()+aLastArcRect.Bottom())/2);
- aStartPt=Point(aCenter.X()+(long)( sin(fAng2)*256.0),
- aCenter.Y()+(long)(-cos(fAng2)*256.0));
- aEndPt= Point(aCenter.X()+(long)( sin(fAng1)*256.0),
- aCenter.Y()+(long)(-cos(fAng1)*256.0));
- DrawingMethod(eMethod);
- if (eMethod==PDM_FRAME) pVirDev->DrawArc(aLastArcRect,aStartPt,aEndPt);
- else pVirDev->DrawPie(aLastArcRect,aStartPt,aEndPt);
+ PictReaderShape::drawArc(pVirDev, eMethod==PDM_FRAME, aLastArcRect,fAng1,fAng2, nActPenSize);
return 4;
}
@@ -628,42 +605,42 @@ ULONG PictReader::ReadAndDrawRgn(PictDrawingMethod eMethod)
{
USHORT nSize;
- DrawingMethod(eMethod);
*pPict >> nSize;
- // ...???...
+ // read the DATA
+ //
+ // a region data is a mask and is probably coded as
+ // - the first 8 bytes: bdbox ( which can be read by ReadRectangle )
+ // - then a list of line modifiers: y_i, a_0, b_0, a_1, b_1, ..., a_{n_i}, b_{n_i}, 0x7fff
+ // - 0x7fff
+ // where y_i is the increasing sequences of line coordinates
+ // and on each line: a0 < b0 < a1 < b1 < ... < a_{n_i} < b_{n_i}
+
+ // it can be probably decoded as :
+ // M=an empty mask: ie. (0, 0, ... ) with (left_box-right_box+1) zeroes
+ // then for each line (y_i):
+ // - takes M and inverts all values in [a_0,b_0-1], in [a_1,b_1-1] ...
+ // - sets M = new y_i line mask
+ ReadAndDrawSameRgn(eMethod);
return (ULONG)nSize;
}
ULONG PictReader::ReadAndDrawSameRgn(PictDrawingMethod eMethod)
{
- DrawingMethod(eMethod);
- // ...???...
+ if (IsInvisible(eMethod)) return 0;
+ DrawingMethod(eMethod);
+ // DISPLAY: ...???...
return 0;
}
void PictReader::DrawingMethod(PictDrawingMethod eMethod)
{
if( eActMethod==eMethod ) return;
- if (eActROP == ROP_1) {
- // Osnola: ignore postscript command
- if (eMethod == PDM_TEXT) {
- Font invisibleFont;
- invisibleFont.SetColor(Color(COL_TRANSPARENT));
- invisibleFont.SetFillColor(Color(COL_TRANSPARENT));
- invisibleFont.SetTransparent(TRUE);
- pVirDev->SetFont(invisibleFont);
- }
- else {
- SetLineColor( Color(COL_TRANSPARENT) );
- SetFillColor( Color(COL_TRANSPARENT) );
- }
- pVirDev->SetRasterOp(ROP_OVERPAINT);
- eActMethod=eMethod;
- return;
- }
switch (eMethod) {
case PDM_FRAME:
- SetLineColor( aActForeColor );
+ if (eActPenPattern.isDefault())
+ SetLineColor( aActForeColor );
+ else
+ SetLineColor(eActPenPattern.getColor(aActBackColor, aActForeColor));
SetFillColor( Color(COL_TRANSPARENT) );
pVirDev->SetRasterOp(eActROP);
break;
@@ -715,16 +692,18 @@ ULONG PictReader::ReadAndDrawText()
sal_uInt32 nLen, nDataLen;
sal_Char sText[256];
- DrawingMethod(PDM_TEXT);
*pPict >> nByteLen; nLen=((ULONG)nByteLen)&0x000000ff;
nDataLen = nLen + 1;
pPict->Read( &sText, nLen );
+ if (IsInvisible(PDM_TEXT)) return nDataLen;
+ DrawingMethod(PDM_TEXT);
+
// Stoerende Steuerzeuichen wegnehmen:
while ( nLen > 0 && ( (unsigned char)sText[ nLen - 1 ] ) < 32 )
nLen--;
sText[ nLen ] = 0;
- String aString( (const sal_Char*)&sText, aActFont.GetCharSet());// OSNOLA: gsl_getSystemTextEncoding() );
+ String aString( (const sal_Char*)&sText, aActFont.GetCharSet());
pVirDev->DrawText( Point( aTextPosition.X(), aTextPosition.Y() ), aString );
return nDataLen;
}
@@ -1101,114 +1080,148 @@ ULONG PictReader::ReadPixMapEtc( Bitmap &rBitmap, BOOL bBaseAddr, BOOL bColorTab
void PictReader::ReadHeader()
{
- char nC;
short y1,x1,y2,x2;
- sal_Char sBuf[ 3 ];
- pPict->SeekRel( 10 );
- pPict->Read( sBuf, 3 );
- if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && ( sBuf[ 2 ] == 0x01 || sBuf[ 2 ] == 0x02 ) )
- pPict->SeekRel( -13 ); // this maybe a pict from a ms document
- else
- pPict->SeekRel( 512 - 13 ); // 512 Bytes Muell am Anfang
-
- pPict->SeekRel(2); // Lo-16-bits von "picture size"
- *pPict >> y1 >> x1 >> y2 >> x2; // Rahmen-Rechteck des Bildes
- aBoundingRect=Rectangle( x1,y1, --x2, --y2 );
-
- // Jetzt kommen x-beliebig viele Nullen
- // (in manchen Dateien tatsaechlich mehr als eine):
- do { *pPict >> nC; } while (nC==0 && pPict->IsEof()==FALSE);
-
- // dann sollte der Versions-Opcode 0x11 folgen, dann die Versionsnummer:
- if (nC==0x11)
- {
- *pPict >> nC;
- if ( nC == 0x01 )
- IsVersion2 = FALSE; // Version 1
- else // Version 2 oder hoeher
- {
- short nExtVer;
- // 3 Bytes ueberspringen, um auf
- // ExtVersion2 oder Version2 zu kommen
- pPict->SeekRel( 3 );
- *pPict >> nExtVer;
-
- // nachsehen, ob wir einen Extended-Version2-Header (==-2) haben
- // oder einen einfachen Version2-Header (==-1);
- // dementsprechend Aufloesung einlesen oder nicht
- if ( nExtVer == -2 )
- {
- sal_Int16 nReserved;
- sal_Int32 nHResFixed, nVResFixed;
- *pPict >> nReserved >> nHResFixed >> nVResFixed;
- double fHRes = nHResFixed;
- fHRes /= 65536;
- double fVRes = nVResFixed;
- fVRes /= 65536;
- aHRes /= fHRes;
- aVRes /= fVRes;
- *pPict >> y1 >> x1 >> y2 >> x2; // reading the optimal bounding rect
- aBoundingRect=Rectangle( x1,y1, --x2, --y2 );
- pPict->SeekRel( -22 );
- }
- else
- {
- pPict->SeekRel( -4 );
- }
- IsVersion2=TRUE;
+ sal_Char sBuf[ 2 ];
+ // previous code considers pPict->Tell() as the normal starting position,
+ // can we have nStartPos != 0 ?
+ ULONG nStartPos = pPict->Tell();
+ // Standard:
+ // a picture file begins by 512 bytes (reserved to the application) followed by the picture data
+ // while clipboard, pictures stored in a document often contain only the picture data.
+
+ // Special cases:
+ // - some Pict v.1 use 0x00 0x11 0x01 ( instead of 0x11 0x01) to store the version op
+ // (we consider here this as another standard for Pict. v.1 )
+ // - some files seem to contain extra garbage data at the beginning
+ // - some picture data seem to contain extra NOP opcode(0x00) between the bounding box and the version opcode
+
+ // This code looks hard to find a picture header, ie. it looks at positions
+ // - nStartPos+0, nStartPos+512 with potential extra NOP codes between bdbox and version (at most 9 extra NOP)
+ // - 512..1024 with more strict bdbox checking and no extra NOP codes
+
+ // Notes:
+ // - if the header can begin at nStartPos+0 and at nStartPos+512, we try to choose the more
+ // <<probable>> ( using the variable confidence)
+ // - svtools/source/filter.vcl/filter/{filter.cxx,filter2.cxx} only check for standard Pict,
+ // this may cause future problems
+ int st;
+ sal_uInt32 nOffset;
+ int confidence[2] = { 0, 0};
+ for ( st = 0; st < 3 + 513; st++ )
+ {
+ int actualConfid = 20; // the actual confidence
+ pPict->ResetError();
+ if (st < 2) nOffset = nStartPos+st*512;
+ else if (st == 2) {
+ // choose nStartPos+0 or nStartPos+512 even if there are a little dubious
+ int actPos = -1, actConf=0;
+ if (confidence[0] > 0) { actPos = 0; actConf = confidence[0]; }
+ if (confidence[1] > 0 && confidence[1] >= actConf) actPos = 1;
+ if (actPos < 0) continue;
+ nOffset = nStartPos+actPos*512;
}
- }
- else {
- // Eigentlich ist dies wohl kein Pict-File, aber es gibt tatsaechlich
- // Dateien, bei denen mehr als 512 Bytes "Muell" am Anfang stehen.
- // Somit koennte es theoretisch folgende Art von Header geben:
- // <beliebig viele Bytes Muell> <Picture-Size (Lo-Bytes)> <BoundingRect>
- // <beliebig viele Nullen> <0x11> ..
- // Da aber in so einem Fall die Position von <BoundingRect> kaum auszumachen ist,
- // gehen wir nun davon aus, dass in einer Datei immer entweder genau 512 Bytes Muell
- // am Anfang sind (wie oben versucht), oder (wie normalerweise ueblich) genau eine 0 zwischen
- // Bounding-Rectangle und 0x11. Des weiteren mag es hoechstens 1024 Bytes Muell geben,
- // und das Ganze nur fuer Version 1 oder 2.
- // Somit suchen wir nun nach der Folge 0x00,0x11,0x01 oder 0x00,0x11,0x02 innerhalb der
- // "zweiten" 512 Bytes, und nehmen an, dass davor das Bounding-Rect steht, und hoffen
- // dass das alles so seine Richtigkeit hat.
- BYTE n1,n2,n3;
- USHORT i,Found;
- pPict->Seek(522);
- Found=0;
- *pPict >> n1 >> n2 >> n3;
- for (i=0; i<512; i++) {
- if (n1==0x00 && n2==0x11 && (n3==0x01 || n3==0x02)) { Found=1; break; }
- n1=n2; n2=n3; *pPict >> n3;
+ else {
+ nOffset = 509+st; // illogical : more logical will be nStartPos+509+st or to consider that nStartPos=0
+ // a small test to check if versionOp code exists after the bdbox ( with no extra NOP codes)
+ pPict->Seek(nOffset+10);
+ pPict->Read( sBuf, 2 );
+ if (pPict->IsEof() || pPict->GetError()) break;
+ if (sBuf[0] == 0x11 || (sBuf[0] == 0x00 && sBuf[1] == 0x11)) ; // maybe ok
+ else continue;
}
- if (Found!=0) {
- pPict->SeekRel(-11);
- *pPict >> y1 >> x1 >> y2 >> x2;
- // Lieber nochmal nachsehen, ob das Bounding-Rectangle gut zu sein scheint:
- if (x1+10<x2 && y1+10<y2 && y1>=-2048 && x1>=-2048 && x2<=2048 && y2<=2048) {
- aBoundingRect=Rectangle( x1, y1, --x2, --y2 );
- if (n3==0x01) {
- pPict->SeekRel(3);
- IsVersion2=FALSE;
- }
- else {
- pPict->SeekRel(4);
- IsVersion2=TRUE;
- }
- }
- else pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
+ pPict->Seek(nOffset);
+
+ // 2 bytes to store size ( version 1 ) ignored
+ pPict->SeekRel( 2 );
+ *pPict >> y1 >> x1 >> y2 >> x2; // Rahmen-Rechteck des Bildes
+ if (x1 > x2 || y1 > y2) continue; // bad bdbox
+ if (x1 < -2048 || x2 > 2048 || y1 < -2048 || y2 > 2048 || // origin|dest is very small|large
+ (x1 == x2 && y1 == y2) ) // 1 pixel pict is dubious
+ actualConfid-=3;
+ else if (x2 < x1+8 || y2 < y1+8) // a little dubious
+ actualConfid-=1;
+ if (st >= 3 && actualConfid != 20) continue;
+ aBoundingRect=Rectangle( x1,y1, x2, y2 );
+
+ if (pPict->IsEof() || pPict->GetError()) continue;
+ // read version
+ pPict->Read( sBuf, 2 );
+ // version 1 file
+ if ( sBuf[ 0 ] == 0x11 && sBuf[ 1 ] == 0x01 ) {
+ // pict v1 must be rare and we do only few tests
+ if (st < 2) { confidence[st] = --actualConfid; continue; }
+ IsVersion2 = FALSE; return;
}
- else pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
- }
+ if (sBuf[0] != 0x00) continue; // unrecovable error
+ int numZero = 0;
+ do
+ {
+ numZero++;
+ pPict->SeekRel(-1);
+ pPict->Read( sBuf, 2 );
+ }