summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx3
-rw-r--r--accessibility/source/extended/makefile.mk3
-rw-r--r--accessibility/source/helper/acc_factory.cxx2
-rw-r--r--accessibility/source/standard/vclxaccessibleedit.cxx52
-rw-r--r--basctl/source/basicide/basdoc.cxx7
-rw-r--r--basctl/source/basicide/basdoc.hxx2
-rw-r--r--basctl/source/basicide/basides1.cxx6
-rw-r--r--basctl/source/basicide/basidesh.cxx2
-rw-r--r--basctl/source/basicide/localizationmgr.cxx2
-rw-r--r--basctl/source/basicide/makefile.mk2
-rw-r--r--basegfx/inc/basegfx/numeric/ftools.hxx2
-rw-r--r--basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx8
-rw-r--r--basegfx/inc/basegfx/polygon/b2dpolygontools.hxx4
-rw-r--r--basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx132
-rw-r--r--basegfx/inc/basegfx/tuple/b2dtuple.hxx10
-rw-r--r--basegfx/inc/basegfx/tuple/b2i64tuple.hxx2
-rw-r--r--basegfx/inc/basegfx/tuple/b2ituple.hxx2
-rw-r--r--basegfx/inc/basegfx/tuple/b3dtuple.hxx10
-rw-r--r--basegfx/inc/basegfx/tuple/b3i64tuple.hxx2
-rw-r--r--basegfx/inc/basegfx/tuple/b3ituple.hxx2
-rw-r--r--basegfx/prj/d.lst1
-rw-r--r--basegfx/source/polygon/b2dpolygoncutandtouch.cxx90
-rw-r--r--basegfx/source/polygon/b2dpolygontools.cxx18
-rw-r--r--basegfx/source/polygon/b2dtrapezoid.cxx1227
-rw-r--r--basegfx/source/polygon/makefile.mk1
-rw-r--r--basic/source/uno/namecont.cxx157
-rwxr-xr-xcanvas/source/directx/dx_5rm.cxx2
-rwxr-xr-xcanvas/source/directx/dx_9rm.cxx2
-rwxr-xr-xcanvas/source/directx/dx_canvashelper_texturefill.cxx2
-rw-r--r--canvas/source/vcl/canvashelper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx19
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx4
-rw-r--r--chart2/source/controller/dialogs/ChangingResource.cxx4
-rw-r--r--chart2/source/controller/dialogs/ChangingResource.hxx1
-rw-r--r--chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx1
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx8
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx33
-rw-r--r--chart2/source/inc/AxisHelper.hxx3
-rw-r--r--chart2/source/inc/ChartModelHelper.hxx2
-rw-r--r--chart2/source/inc/DiagramHelper.hxx3
-rw-r--r--chart2/source/model/main/Axis.cxx2
-rw-r--r--[-rwxr-xr-x]chart2/source/model/main/ChartModel.cxx3
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx2
-rw-r--r--chart2/source/model/main/DataSeries.cxx2
-rw-r--r--chart2/source/model/main/Legend.cxx2
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.cxx40
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.cxx29
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.cxx1
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx12
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.cxx11
-rw-r--r--chart2/source/tools/AxisHelper.cxx20
-rw-r--r--chart2/source/tools/ChartModelHelper.cxx7
-rw-r--r--chart2/source/tools/ChartTypeHelper.cxx41
-rw-r--r--chart2/source/tools/DataSeriesHelper.cxx2
-rw-r--r--chart2/source/tools/DiagramHelper.cxx8
-rw-r--r--chart2/source/tools/LineProperties.cxx2
-rw-r--r--chart2/source/tools/WrappedIgnoreProperty.cxx2
-rw-r--r--chart2/source/view/axes/VAxisProperties.cxx5
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx2
-rwxr-xr-x[-rw-r--r--]chart2/source/view/charttypes/BarChart.cxx22
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx8
-rw-r--r--chart2/source/view/diagram/VDiagram.cxx83
-rw-r--r--chart2/source/view/inc/ShapeFactory.hxx11
-rw-r--r--chart2/source/view/inc/Stripe.hxx14
-rw-r--r--chart2/source/view/inc/ViewDefines.hxx1
-rw-r--r--chart2/source/view/main/ChartView.cxx81
-rw-r--r--chart2/source/view/main/PropertyMapper.cxx2
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx425
-rw-r--r--chart2/source/view/main/Stripe.cxx161
-rw-r--r--chart2/source/view/main/VDataSeries.cxx4
-rw-r--r--chart2/source/view/main/VLegend.cxx108
-rw-r--r--chart2/source/view/main/VLegendSymbolFactory.cxx14
-rw-r--r--chart2/source/view/main/VTitle.cxx15
-rw-r--r--cli_ure/version/version.txt24
-rw-r--r--comphelper/inc/comphelper/namedvaluecollection.hxx7
-rw-r--r--comphelper/source/misc/namedvaluecollection.cxx9
-rw-r--r--connectivity/inc/connectivity/TTableHelper.hxx9
-rw-r--r--connectivity/inc/connectivity/dbtools.hxx27
-rw-r--r--connectivity/inc/connectivity/formattedcolumnvalue.hxx14
-rw-r--r--connectivity/source/commontools/TIndexes.cxx154
-rw-r--r--connectivity/source/commontools/TKeys.cxx154
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx119
-rw-r--r--connectivity/source/commontools/dbtools.cxx4
-rw-r--r--connectivity/source/commontools/dbtools2.cxx32
-rw-r--r--connectivity/source/commontools/formattedcolumnvalue.cxx90
-rwxr-xr-xconnectivity/source/drivers/ado/ado.xcu5
-rw-r--r--connectivity/source/drivers/hsqldb/HTable.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/JStatement.cxx68
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx6
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx1
-rw-r--r--connectivity/source/drivers/mysql/YTable.cxx4
-rw-r--r--connectivity/source/drivers/mysql/YTables.cxx19
-rw-r--r--connectivity/source/drivers/odbcbase/OResultSet.cxx28
-rw-r--r--connectivity/source/inc/mysql/YTables.hxx5
-rw-r--r--connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx2
-rw-r--r--connectivity/source/inc/odbc/OResultSet.hxx1
-rw-r--r--connectivity/source/manager/mdrivermanager.cxx2
-rw-r--r--connectivity/source/parse/sqlflex.l2
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx10
-rw-r--r--cui/source/customize/cfg.cxx2
-rw-r--r--cui/source/dialogs/hlmailtp.cxx2
-rw-r--r--cui/source/dialogs/hltpbase.cxx2
-rw-r--r--cui/source/factory/init.cxx2
-rw-r--r--cui/source/inc/cuioptgenrl.hxx3
-rw-r--r--cui/source/inc/dbregister.hxx3
-rw-r--r--cui/source/inc/optpath.hxx2
-rw-r--r--cui/source/options/dbregister.cxx2
-rw-r--r--cui/source/options/optgenrl.cxx3
-rw-r--r--cui/source/options/optpath.cxx3
-rw-r--r--curl/curl-7.19.7_mingw.patch24
-rw-r--r--curl/makefile.mk5
-rw-r--r--dbaccess/inc/documentcontroller.hxx118
-rw-r--r--dbaccess/inc/genericcontroller.hxx11
-rw-r--r--dbaccess/inc/singledoccontroller.hxx22
-rw-r--r--dbaccess/prj/build.lst11
-rw-r--r--dbaccess/qa/complex/dbaccess/DatabaseDocument.java2
-rw-r--r--dbaccess/source/core/api/RowSet.cxx16
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx22
-rw-r--r--dbaccess/source/core/api/View.cxx161
-rw-r--r--dbaccess/source/core/api/column.cxx19
-rw-r--r--dbaccess/source/core/api/definitioncolumn.cxx11
-rw-r--r--dbaccess/source/core/api/makefile.mk1
-rw-r--r--dbaccess/source/core/api/query.cxx27
-rw-r--r--dbaccess/source/core/api/resultcolumn.cxx22
-rw-r--r--dbaccess/source/core/api/table.cxx177
-rw-r--r--dbaccess/source/core/api/viewcontainer.cxx82
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx172
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.hxx48
-rw-r--r--dbaccess/source/core/dataaccess/connection.cxx30
-rw-r--r--dbaccess/source/core/dataaccess/connection.hxx50
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx355
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.hxx49
-rw-r--r--dbaccess/source/core/dataaccess/datasource.cxx22
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.cxx132
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.hxx14
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.cxx405
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.hxx115
-rw-r--r--dbaccess/source/core/dataaccess/makefile.mk2
-rw-r--r--dbaccess/source/core/inc/ContentHelper.hxx8
-rw-r--r--dbaccess/source/core/inc/View.hxx91
-rw-r--r--dbaccess/source/core/inc/definitioncolumn.hxx3
-rw-r--r--dbaccess/source/core/inc/recovery/dbdocrecovery.hxx92
-rw-r--r--dbaccess/source/core/inc/sdbcoretools.hxx46
-rw-r--r--dbaccess/source/core/inc/table.hxx34
-rw-r--r--dbaccess/source/core/misc/DatabaseDataProvider.cxx10
-rw-r--r--dbaccess/source/core/misc/dbastrings.cxx5
-rw-r--r--dbaccess/source/core/misc/sdbcoretools.cxx76
-rw-r--r--dbaccess/source/core/recovery/dbdocrecovery.cxx436
-rw-r--r--dbaccess/source/core/recovery/makefile.mk (renamed from sdext/source/minimizer/registry/data/org/openoffice/Office/UI/makefile.mk)41
-rw-r--r--dbaccess/source/core/recovery/settingsimport.cxx294
-rw-r--r--dbaccess/source/core/recovery/settingsimport.hxx190
-rw-r--r--dbaccess/source/core/recovery/storagestream.cxx126
-rw-r--r--dbaccess/source/core/recovery/storagestream.hxx109
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.cxx130
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.hxx66
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.cxx197
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.hxx113
-rw-r--r--dbaccess/source/core/recovery/subcomponentloader.cxx200
-rw-r--r--dbaccess/source/core/recovery/subcomponentloader.hxx87
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.cxx702
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.hxx126
-rw-r--r--dbaccess/source/core/recovery/subcomponents.hxx88
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx20
-rw-r--r--dbaccess/source/filter/xml/xmlDatabase.cxx66
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx112
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx114
-rw-r--r--dbaccess/source/inc/dbastrings.hrc4
-rw-r--r--dbaccess/source/inc/stringconstants.hrc3
-rw-r--r--dbaccess/source/inc/stringconstants.inc1
-rw-r--r--dbaccess/source/ui/app/AppController.cxx194
-rw-r--r--dbaccess/source/ui/app/AppController.hxx24
-rw-r--r--dbaccess/source/ui/app/AppControllerDnD.cxx2
-rw-r--r--dbaccess/source/ui/app/AppControllerGen.cxx82
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx14
-rw-r--r--dbaccess/source/ui/app/subcomponentmanager.cxx271
-rw-r--r--dbaccess/source/ui/app/subcomponentmanager.hxx25
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx338
-rw-r--r--dbaccess/source/ui/browser/dataview.cxx23
-rw-r--r--dbaccess/source/ui/browser/dsEntriesNoExp.cxx14
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx14
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx178
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx9
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.hxx1
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx11
-rw-r--r--dbaccess/source/ui/inc/JoinController.hxx15
-rw-r--r--dbaccess/source/ui/inc/QueryDesignView.hxx4
-rw-r--r--dbaccess/source/ui/inc/QueryViewSwitch.hxx5
-rw-r--r--dbaccess/source/ui/inc/RelationController.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableController.hxx2
-rw-r--r--dbaccess/source/ui/inc/TableFieldDescription.hxx18
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx71
-rw-r--r--dbaccess/source/ui/inc/databaseobjectview.hxx27
-rw-r--r--dbaccess/source/ui/inc/linkeddocuments.hxx47
-rw-r--r--dbaccess/source/ui/inc/querycontainerwindow.hxx1
-rw-r--r--dbaccess/source/ui/inc/querycontroller.hxx41
-rw-r--r--dbaccess/source/ui/inc/unodatbr.hxx5
-rw-r--r--dbaccess/source/ui/misc/HtmlReader.cxx4
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx4
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx2
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx2
-rw-r--r--dbaccess/source/ui/misc/databaseobjectview.cxx129
-rw-r--r--dbaccess/source/ui/misc/datasourceconnector.cxx4
-rw-r--r--dbaccess/source/ui/misc/documentcontroller.cxx137
-rw-r--r--dbaccess/source/ui/misc/linkeddocuments.cxx197
-rw-r--r--dbaccess/source/ui/misc/makefile.mk1
-rw-r--r--dbaccess/source/ui/misc/singledoccontroller.cxx75
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx154
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx47
-rw-r--r--dbaccess/source/ui/querydesign/QueryViewSwitch.cxx87
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx27
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldDescription.cxx162
-rw-r--r--dbaccess/source/ui/querydesign/querycontainerwindow.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx237
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx17
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx14
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx2
-rw-r--r--dbaccess/source/ui/uno/dbinteraction.cxx102
-rw-r--r--dbaccess/source/ui/uno/dbinteraction.hxx102
-rw-r--r--dbaccess/util/makefile.mk4
-rw-r--r--default_images/framework/res/addtemplate_32.pngbin939 -> 4077 bytes
-rw-r--r--default_images/framework/res/backing.pngbin95249 -> 15255 bytes
-rw-r--r--default_images/framework/res/backing_hc.pngbin121327 -> 6358 bytes
-rw-r--r--default_images/framework/res/backing_right.pngbin9041 -> 23733 bytes
-rw-r--r--default_images/framework/res/backing_right_hc.pngbin6338 -> 7922 bytes
-rw-r--r--default_images/framework/res/backing_rtl_left.pngbin8647 -> 15255 bytes
-rw-r--r--default_images/framework/res/backing_rtl_left_hc.pngbin6339 -> 6358 bytes
-rw-r--r--default_images/framework/res/backing_rtl_right.pngbin94007 -> 23733 bytes
-rw-r--r--default_images/framework/res/backing_rtl_right_hc.pngbin117825 -> 7922 bytes
-rw-r--r--default_images/framework/res/backing_space.pngbin2794 -> 3703 bytes
-rw-r--r--default_images/framework/res/backing_space_hc.pngbin2752 -> 3613 bytes
-rw-r--r--default_images/framework/res/extension.pngbin0 -> 4076 bytes
-rw-r--r--default_images/framework/res/extension_hc.pngbin0 -> 3755 bytes
-rw-r--r--default_images/framework/res/folder_32.pngbin0 -> 1012 bytes
-rw-r--r--default_images/framework/res/info_26.pngbin2012 -> 4016 bytes
-rw-r--r--default_images/framework/res/info_hc.pngbin0 -> 3649 bytes
-rw-r--r--default_images/framework/res/register_32.pngbin1685 -> 4175 bytes
-rw-r--r--default_images/framework/res/register_hc.pngbin0 -> 3729 bytes
-rw-r--r--default_images/framework/res/template_hc.pngbin0 -> 3703 bytes
-rwxr-xr-xdefault_images/introabout/about.pngbin0 -> 11174 bytes
-rwxr-xr-xdefault_images/introabout/intro.pngbin0 -> 28663 bytes
-rw-r--r--default_images/minimizer/aboutlogo.pngbin43076 -> 0 bytes
-rw-r--r--default_images/minimizer/minimizepresi_80.pngbin4090 -> 6716 bytes
-rw-r--r--default_images/minimizer/minimizepresi_80_h.pngbin1156 -> 4233 bytes
-rw-r--r--default_images/minimizer/opt_16.pngbin612 -> 4033 bytes
-rw-r--r--default_images/minimizer/opt_16_h.pngbin166 -> 3683 bytes
-rw-r--r--default_images/minimizer/opt_26.pngbin1288 -> 4401 bytes
-rw-r--r--default_images/minimizer/opt_26_h.pngbin264 -> 3845 bytes
-rw-r--r--default_images/res/commandimagelist/lc_stop.pngbin885 -> 0 bytes
-rw-r--r--default_images/res/commandimagelist/lch_stop.pngbin144 -> 0 bytes
-rw-r--r--default_images/res/commandimagelist/sc_stop.pngbin592 -> 0 bytes
-rw-r--r--default_images/res/commandimagelist/sch_stop.pngbin123 -> 0 bytes
-rw-r--r--default_images/res/lx03123.pngbin330 -> 982 bytes
-rw-r--r--default_images/res/lx03126.pngbin315 -> 692 bytes
-rw-r--r--default_images/res/lx03127.pngbin323 -> 919 bytes
-rw-r--r--default_images/res/lx03128.pngbin314 -> 749 bytes
-rw-r--r--default_images/res/lx03129.pngbin440 -> 1319 bytes
-rw-r--r--default_images/res/lx03130.pngbin337 -> 1166 bytes
-rw-r--r--default_images/res/lx03131.pngbin551 -> 919 bytes
-rw-r--r--default_images/res/lx03132.pngbin547 -> 919 bytes
-rw-r--r--default_images/res/lx03139.pngbin2908 -> 755 bytes
-rw-r--r--default_images/res/lx03144.pngbin332 -> 1172 bytes
-rw-r--r--default_images/res/lx03156.pngbin401 -> 903 bytes
-rw-r--r--default_images/res/lx03161.pngbin448 -> 903 bytes
-rw-r--r--default_images/res/lx03162.pngbin349 -> 903 bytes
-rw-r--r--default_images/res/lx03163.pngbin353 -> 941 bytes
-rw-r--r--default_images/res/lx03188.pngbin315 -> 692 bytes
-rw-r--r--default_images/res/lx03217.pngbin1315 -> 1363 bytes
-rw-r--r--default_images/res/lx03218.pngbin1315 -> 1363 bytes
-rw-r--r--default_images/res/lx03220.pngbin1315 -> 1363 bytes
-rw-r--r--default_images/res/lx03221.pngbin1315 -> 1363 bytes
-rw-r--r--default_images/res/lx03222.pngbin1315 -> 1363 bytes
-rw-r--r--default_images/res/lx03226.pngbin350 -> 909 bytes
-rw-r--r--default_images/res/lx03227.pngbin360 -> 1363 bytes
-rw-r--r--default_images/res/lx03228.pngbin364 -> 1307 bytes
-rw-r--r--default_images/res/lx03241.pngbin315 -> 749 bytes
-rw-r--r--default_images/res/lx03242.pngbin2510 -> 966 bytes
-rw-r--r--default_images/res/lx03243.pngbin403 -> 982 bytes
-rw-r--r--default_images/res/lx03244.pngbin381 -> 1166 bytes
-rw-r--r--default_images/res/lx03245.pngbin2922 -> 1497 bytes
-rw-r--r--default_images/res/lx03246.pngbin2828 -> 1548 bytes
-rw-r--r--default_images/res/lx03247.pngbin2622 -> 1346 bytes
-rw-r--r--default_images/res/lx03248.pngbin2338 -> 1110 bytes
-rw-r--r--default_images/res/lx03249.pngbin2623 -> 1180 bytes
-rw-r--r--default_images/res/lx03250.pngbin2618 -> 917 bytes
-rw-r--r--default_images/res/lx03251.pngbin2311 -> 1106 bytes
-rw-r--r--default_images/res/lx03252.pngbin2957 -> 1506 bytes
-rw-r--r--default_images/res/lx03253.pngbin2812 -> 1370 bytes
-rw-r--r--default_images/res/lx03254.pngbin2856 -> 1130 bytes
-rw-r--r--default_images/res/lx03255.pngbin2575 -> 1153 bytes
-rw-r--r--default_images/res/lxh03123.pngbin355 -> 3742 bytes
-rw-r--r--default_images/res/lxh03126.pngbin313 -> 3706 bytes
-rw-r--r--default_images/res/lxh03127.pngbin205 -> 3780 bytes
-rw-r--r--default_images/res/lxh03128.pngbin392 -> 126 bytes
-rw-r--r--default_images/res/lxh03129.pngbin374 -> 3807 bytes
-rw-r--r--default_images/res/lxh03130.pngbin243 -> 3798 bytes
-rw-r--r--default_images/res/lxh03131.pngbin244 -> 3780 bytes
-rw-r--r--default_images/res/lxh03132.pngbin255 -> 3780 bytes
-rw-r--r--default_images/res/lxh03139.pngbin239 -> 3735 bytes
-rw-r--r--default_images/res/lxh03144.pngbin333 -> 3822 bytes
-rw-r--r--default_images/res/lxh03156.pngbin146 -> 3771 bytes
-rw-r--r--default_images/res/lxh03161.pngbin221 -> 3771 bytes
-rw-r--r--default_images/res/lxh03162.pngbin306 -> 3771 bytes
-rw-r--r--default_images/res/lxh03163.pngbin192 -> 3774 bytes
-rw-r--r--default_images/res/lxh03188.pngbin170 -> 3706 bytes
-rw-r--r--default_images/res/lxh03217.pngbin220 -> 3892 bytes
-rw-r--r--default_images/res/lxh03218.pngbin220 -> 3892 bytes
-rw-r--r--default_images/res/lxh03220.pngbin220 -> 3892 bytes
-rw-r--r--default_images/res/lxh03221.pngbin220 -> 3892 bytes
-rw-r--r--default_images/res/lxh03222.pngbin220 -> 3892 bytes
-rw-r--r--default_images/res/lxh03226.pngbin371 -> 3763 bytes
-rw-r--r--default_images/res/lxh03227.pngbin427 -> 3892 bytes
-rw-r--r--default_images/res/lxh03228.pngbin303 -> 3886 bytes
-rw-r--r--default_images/res/lxh03241.pngbin170 -> 126 bytes
-rw-r--r--default_images/res/lxh03242.pngbin223 -> 3784 bytes
-rw-r--r--default_images/res/lxh03243.pngbin200 -> 3742 bytes
-rw-r--r--default_images/res/lxh03244.pngbin225 -> 3798 bytes
-rw-r--r--default_images/res/lxh03245.pngbin246 -> 3867 bytes
-rw-r--r--default_images/res/lxh03246.pngbin254 -> 3955 bytes
-rw-r--r--default_images/res/lxh03247.pngbin227 -> 3880 bytes
-rw-r--r--default_images/res/lxh03248.pngbin219 -> 3816 bytes
-rw-r--r--default_images/res/lxh03249.pngbin238 -> 3805 bytes
-rw-r--r--default_images/res/lxh03250.pngbin219 -> 3778 bytes
-rw-r--r--default_images/res/lxh03251.pngbin219 -> 3831 bytes
-rw-r--r--default_images/res/lxh03252.pngbin263 -> 3945 bytes
-rw-r--r--default_images/res/lxh03253.pngbin260 -> 3856 bytes
-rw-r--r--default_images/res/lxh03254.pngbin244 -> 3850 bytes
-rw-r--r--default_images/res/lxh03255.pngbin249 -> 3835 bytes
-rw-r--r--default_images/res/odb_16_8.pngbin1026 -> 574 bytes
-rw-r--r--default_images/res/odb_32.pngbin2922 -> 1497 bytes
-rw-r--r--default_images/res/odb_32_8.pngbin2950 -> 1497 bytes
-rw-r--r--default_images/res/odb_48_8.pngbin4949 -> 2430 bytes
-rw-r--r--default_images/res/odf_16_8.pngbin1012 -> 580 bytes
-rw-r--r--default_images/res/odf_32.pngbin2622 -> 1346 bytes
-rw-r--r--default_images/res/odf_32_8.pngbin2450 -> 1346 bytes
-rw-r--r--default_images/res/odf_48_8.pngbin4247 -> 2171 bytes
-rw-r--r--default_images/res/odg_16_8.pngbin1042 -> 572 bytes
-rw-r--r--default_images/res/odg_32.pngbin2828 -> 1548 bytes
-rw-r--r--default_images/res/odg_32_8.pngbin2682 -> 1548 bytes
-rw-r--r--default_images/res/odg_48_8.pngbin4744 -> 2518 bytes
-rw-r--r--default_images/res/odm_16_8.pngbin943 -> 472 bytes
-rw-r--r--default_images/res/odm_32_8.pngbin2241 -> 1110 bytes
-rw-r--r--default_images/res/odm_48_8.pngbin3846 -> 1741 bytes
-rw-r--r--default_images/res/odp_16_8.pngbin1001 -> 441 bytes
-rw-r--r--default_images/res/odp_32.pngbin2623 -> 1180 bytes
-rw-r--r--default_images/res/odp_32_8.pngbin2674 -> 1180 bytes
-rw-r--r--default_images/res/odp_48_8.pngbin4515 -> 2125 bytes
-rw-r--r--default_images/res/ods_16_8.pngbin992 -> 436 bytes
-rw-r--r--default_images/res/ods_32.pngbin2618 -> 917 bytes
-rw-r--r--default_images/res/ods_32_8.pngbin2531 -> 917 bytes
-rw-r--r--default_images/res/ods_48_8.pngbin4305 -> 2079 bytes
-rw-r--r--default_images/res/odt_16_8.pngbin954 -> 420 bytes
-rw-r--r--default_images/res/odt_32.pngbin2311 -> 1106 bytes
-rw-r--r--default_images/res/odt_32_8.pngbin2222 -> 1106 bytes
-rw-r--r--default_images/res/odt_48_8.pngbin3770 -> 2094 bytes
-rw-r--r--default_images/res/otg_16_8.pngbin1011 -> 554 bytes
-rw-r--r--default_images/res/otg_32_8.pngbin2415 -> 1506 bytes
-rw-r--r--default_images/res/otg_48_8.pngbin4222 -> 2482 bytes
-rw-r--r--default_images/res/oth_16_8.pngbin1020 -> 436 bytes
-rw-r--r--default_images/res/oth_32_8.pngbin2771 -> 966 bytes
-rw-r--r--default_images/res/oth_48_8.pngbin4709 -> 1537 bytes
-rw-r--r--default_images/res/otp_16_8.pngbin984 -> 532 bytes
-rw-r--r--default_images/res/otp_32_8.pngbin2405 -> 1370 bytes
-rw-r--r--default_images/res/otp_48_8.pngbin4027 -> 2376 bytes
-rw-r--r--default_images/res/ots_16_8.pngbin968 -> 538 bytes
-rw-r--r--default_images/res/ots_32_8.pngbin2302 -> 1130 bytes
-rw-r--r--default_images/res/ots_48_8.pngbin3835 -> 2400 bytes
-rw-r--r--default_images/res/ott_16_8.pngbin923 -> 444 bytes
-rw-r--r--default_images/res/ott_32_8.pngbin1988 -> 1153 bytes
-rw-r--r--default_images/res/ott_48_8.pngbin3320 -> 2125 bytes
-rw-r--r--default_images/res/sx03123.pngbin227 -> 425 bytes
-rw-r--r--default_images/res/sx03126.pngbin200 -> 412 bytes
-rw-r--r--default_images/res/sx03127.pngbin213 -> 513 bytes
-rw-r--r--default_images/res/sx03128.pngbin228 -> 525 bytes
-rw-r--r--default_images/res/sx03129.pngbin228 -> 555 bytes
-rw-r--r--default_images/res/sx03130.pngbin233 -> 515 bytes
-rw-r--r--default_images/res/sx03131.pngbin314 -> 513 bytes
-rw-r--r--default_images/res/sx03132.pngbin280 -> 513 bytes
-rw-r--r--default_images/res/sx03139.pngbin1023 -> 366 bytes
-rw-r--r--default_images/res/sx03144.pngbin195 -> 562 bytes
-rw-r--r--default_images/res/sx03156.pngbin286 -> 392 bytes
-rw-r--r--default_images/res/sx03161.pngbin317 -> 392 bytes
-rw-r--r--default_images/res/sx03162.pngbin192 -> 392 bytes
-rw-r--r--default_images/res/sx03163.pngbin198 -> 413 bytes
-rw-r--r--default_images/res/sx03188.pngbin468 -> 412 bytes
-rw-r--r--default_images/res/sx03217.pngbin701 -> 555 bytes
-rw-r--r--default_images/res/sx03218.pngbin701 -> 555 bytes
-rw-r--r--default_images/res/sx03220.pngbin701 -> 555 bytes
-rw-r--r--default_images/res/sx03221.pngbin701 -> 555 bytes
-rw-r--r--default_images/res/sx03222.pngbin701 -> 555 bytes
-rw-r--r--default_images/res/sx03226.pngbin235 -> 450 bytes
-rw-r--r--default_images/res/sx03227.pngbin238 -> 555 bytes
-rw-r--r--default_images/res/sx03228.pngbin243 -> 522 bytes
-rw-r--r--default_images/res/sx03241.pngbin202 -> 525 bytes
-rw-r--r--default_images/res/sx03242.pngbin947 -> 436 bytes
-rw-r--r--default_images/res/sx03243.pngbin272 -> 425 bytes
-rw-r--r--default_images/res/sx03244.pngbin254 -> 515 bytes
-rw-r--r--default_images/res/sx03245.pngbin1009 -> 574 bytes
-rw-r--r--default_images/res/sx03246.pngbin1082 -> 572 bytes
-rw-r--r--default_images/res/sx03247.pngbin1014 -> 580 bytes
-rw-r--r--default_images/res/sx03248.pngbin929 -> 472 bytes
-rw-r--r--default_images/res/sx03249.pngbin960 -> 441 bytes
-rw-r--r--default_images/res/sx03250.pngbin961 -> 436 bytes
-rw-r--r--default_images/res/sx03251.pngbin923 -> 420 bytes
-rw-r--r--default_images/res/sx03252.pngbin1094 -> 554 bytes
-rw-r--r--default_images/res/sx03253.pngbin1025 -> 532 bytes
-rw-r--r--default_images/res/sx03254.pngbin1018 -> 538 bytes
-rw-r--r--default_images/res/sx03255.pngbin986 -> 444 bytes
-rw-r--r--default_images/res/sxh03123.pngbin236 -> 3679 bytes
-rw-r--r--default_images/res/sxh03126.pngbin217 -> 3662 bytes
-rw-r--r--default_images/res/sxh03127.pngbin224 -> 3704 bytes
-rw-r--r--default_images/res/sxh03128.pngbin261 -> 109 bytes
-rw-r--r--default_images/res/sxh03129.pngbin285 -> 3681 bytes
-rw-r--r--default_images/res/sxh03130.pngbin244 -> 3701 bytes
-rw-r--r--default_images/res/sxh03131.pngbin175 -> 3704 bytes
-rw-r--r--default_images/res/sxh03132.pngbin177 -> 3704 bytes
-rw-r--r--default_images/res/sxh03139.pngbin140 -> 3655 bytes
-rw-r--r--default_images/res/sxh03144.pngbin231 -> 3682 bytes
-rw-r--r--default_images/res/sxh03156.pngbin127 -> 3664 bytes
-rw-r--r--default_images/res/sxh03161.pngbin162 -> 3664 bytes
-rw-r--r--default_images/res/sxh03162.pngbin216 -> 3664 bytes
-rw-r--r--default_images/res/sxh03163.pngbin224 -> 3660 bytes
-rw-r--r--default_images/res/sxh03188.pngbin108 -> 3662 bytes
-rw-r--r--default_images/res/sxh03217.pngbin140 -> 3705 bytes
-rw-r--r--default_images/res/sxh03218.pngbin140 -> 3705 bytes
-rw-r--r--default_images/res/sxh03220.pngbin140 -> 3705 bytes
-rw-r--r--default_images/res/sxh03221.pngbin140 -> 3705 bytes
-rw-r--r--default_images/res/sxh03222.pngbin140 -> 3705 bytes
-rw-r--r--default_images/res/sxh03226.pngbin259 -> 3668 bytes
-rw-r--r--default_images/res/sxh03227.pngbin276 -> 3705 bytes
-rw-r--r--default_images/res/sxh03228.pngbin274 -> 3678 bytes
-rw-r--r--default_images/res/sxh03241.pngbin122 -> 109 bytes
-rw-r--r--default_images/res/sxh03242.pngbin163 -> 3648 bytes
-rw-r--r--default_images/res/sxh03243.pngbin160 -> 3679 bytes
-rw-r--r--default_images/res/sxh03244.pngbin161 -> 3701 bytes
-rw-r--r--default_images/res/sxh03245.pngbin151 -> 3687 bytes
-rw-r--r--default_images/res/sxh03246.pngbin144 -> 3706 bytes
-rw-r--r--default_images/res/sxh03247.pngbin146 -> 3695 bytes
-rw-r--r--default_images/res/sxh03248.pngbin143 -> 3666 bytes
-rw-r--r--default_images/res/sxh03249.pngbin141 -> 3679 bytes
-rw-r--r--default_images/res/sxh03250.pngbin139 -> 3666 bytes
-rw-r--r--default_images/res/sxh03251.pngbin138 -> 3667 bytes
-rw-r--r--default_images/res/sxh03252.pngbin150 -> 3694 bytes
-rw-r--r--default_images/res/sxh03253.pngbin146 -> 3698 bytes
-rw-r--r--default_images/res/sxh03254.pngbin150 -> 3709 bytes
-rw-r--r--default_images/res/sxh03255.pngbin143 -> 3662 bytes
-rw-r--r--default_images/svtools/res/new_doc.pngbin2215 -> 950 bytes
-rw-r--r--default_images/svtools/res/new_doc_h.pngbin241 -> 3785 bytes
-rw-r--r--default_images/svtools/res/template.pngbin2510 -> 966 bytes
-rw-r--r--default_images/svtools/res/template_h.pngbin236 -> 3784 bytes
-rw-r--r--default_images/svx/res/tr10432.pngbin2375 -> 2429 bytes
-rw-r--r--default_images/svx/res/tr10433.pngbin2485 -> 2158 bytes
-rw-r--r--default_images/svx/res/tr10434.pngbin2903 -> 2576 bytes
-rw-r--r--default_images/svx/res/tr10435.pngbin2731 -> 2258 bytes
-rw-r--r--default_images/svx/res/tr10436.pngbin2715 -> 2371 bytes
-rw-r--r--default_images/svx/res/tr10437.pngbin2440 -> 4703 bytes
-rw-r--r--default_images/svx/res/tr10439.pngbin2485 -> 2158 bytes
-rw-r--r--default_images/svx/res/tr10447.pngbin3147 -> 2491 bytes
-rw-r--r--default_images/svx/res/tr10450.pngbin3153 -> 2594 bytes
-rw-r--r--default_images/svx/res/trh10432.pngbin239 -> 3859 bytes
-rw-r--r--default_images/svx/res/trh10433.pngbin223 -> 3905 bytes
-rw-r--r--default_images/svx/res/trh10434.pngbin244 -> 3962 bytes
-rw-r--r--default_images/svx/res/trh10435.pngbin224 -> 3919 bytes
-rw-r--r--default_images/svx/res/trh10436.pngbin236 -> 3911 bytes
-rw-r--r--default_images/svx/res/trh10437.pngbin212 -> 3857 bytes
-rw-r--r--default_images/svx/res/trh10439.pngbin223 -> 3905 bytes
-rw-r--r--default_images/svx/res/trh10447.pngbin248 -> 3946 bytes
-rw-r--r--default_images/svx/res/trh10450.pngbin246 -> 3953 bytes
-rw-r--r--desktop/prj/d.lst4
-rw-r--r--desktop/source/app/cmdlineargs.cxx84
-rw-r--r--desktop/source/app/cmdlineargs.hxx2
-rw-r--r--desktop/source/app/langselect.cxx133
-rw-r--r--desktop/source/app/langselect.hxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx3
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.hxx5
-rw-r--r--desktop/source/deployment/inc/dp_descriptioninfoset.hxx16
-rw-r--r--desktop/source/deployment/misc/dp_descriptioninfoset.cxx44
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx66
-rw-r--r--desktop/source/migration/migration.cxx134
-rw-r--r--desktop/source/migration/migration_impl.hxx38
-rw-r--r--desktop/source/migration/pages.cxx63
-rw-r--r--desktop/source/migration/pages.hxx5
-rwxr-xr-x[-rw-r--r--]desktop/source/migration/services/cexportsoo3.cxx (renamed from rsc/source/parser/parser.cxx)74
-rw-r--r--desktop/source/migration/services/makefile.mk48
-rwxr-xr-xdesktop/source/migration/services/migrationoo3.map8
-rwxr-xr-xdesktop/source/migration/services/oo3extensionmigration.cxx656
-rwxr-xr-xdesktop/source/migration/services/oo3extensionmigration.hxx171
-rw-r--r--desktop/source/migration/wizard.cxx122
-rw-r--r--desktop/source/migration/wizard.hrc1
-rw-r--r--desktop/source/migration/wizard.hxx6
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_app.cxx11
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx34
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_shared.h3
-rw-r--r--desktop/source/splash/splash.cxx65
-rw-r--r--desktop/source/splash/splash.hxx5
-rwxr-xr-xdesktop/test/deployment/simple_license/suppress_license.oxtbin0 -> 2143 bytes
-rw-r--r--desktop/test/deployment/simple_license/tests_simple_license.odtbin15621 -> 16629 bytes
-rw-r--r--desktop/util/ooverinfo.rc65
-rw-r--r--desktop/util/ooverinfo2.rc61
-rw-r--r--desktop/util/verinfo.rc8
-rw-r--r--desktop/zipintro/makefile.mk35
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/fillattribute.hxx130
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx42
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx121
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx112
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx81
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx61
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx47
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx12
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx66
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrattribute.hxx215
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrattribute3d.hxx209
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx99
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx61
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx96
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx99
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx104
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx102
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx111
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx94
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx93
-rw-r--r--drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx54
-rw-r--r--drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx6
-rw-r--r--drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx6
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx95
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx8
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx20
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx3
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx79
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/hittestprimitive2d.hxx78
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx6
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx4
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx85
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx21
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx103
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx80
-rw-r--r--drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx91
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx38
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx1
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx81
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/hittestprimitive3d.hxx80
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx11
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx8
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx2
-rw-r--r--drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx26
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx177
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx13
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx9
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx37
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx9
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx8
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx56
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx23
-rw-r--r--drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx13
-rw-r--r--drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx27
-rw-r--r--drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx37
-rw-r--r--drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx52
-rw-r--r--drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx19
-rw-r--r--drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx35
-rw-r--r--drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx41
-rw-r--r--drawinglayer/prj/d.lst22
-rw-r--r--drawinglayer/source/attribute/fillattribute.cxx94
-rw-r--r--drawinglayer/source/attribute/fillbitmapattribute.cxx153
-rw-r--r--drawinglayer/source/attribute/fillgradientattribute.cxx250
-rw-r--r--drawinglayer/source/attribute/fillhatchattribute.cxx219
-rw-r--r--drawinglayer/source/attribute/fontattribute.cxx220
-rw-r--r--drawinglayer/source/attribute/lineattribute.cxx142
-rw-r--r--drawinglayer/source/attribute/linestartendattribute.cxx148
-rw-r--r--drawinglayer/source/attribute/makefile.mk27
-rw-r--r--drawinglayer/source/attribute/materialattribute3d.cxx93
-rw-r--r--drawinglayer/source/attribute/sdrallattribute3d.cxx169
-rw-r--r--drawinglayer/source/attribute/sdrattribute.cxx285
-rw-r--r--drawinglayer/source/attribute/sdrattribute3d.cxx211
-rw-r--r--drawinglayer/source/attribute/sdrfillattribute.cxx221
-rw-r--r--drawinglayer/source/attribute/sdrfillbitmapattribute.cxx259
-rw-r--r--drawinglayer/source/attribute/sdrlightattribute3d.cxx196
-rw-r--r--drawinglayer/source/attribute/sdrlightingattribute3d.cxx235
-rw-r--r--drawinglayer/source/attribute/sdrlineattribute.cxx250
-rw-r--r--drawinglayer/source/attribute/sdrlinestartendattribute.cxx254
-rw-r--r--drawinglayer/source/attribute/sdrobjectattribute3d.cxx292
-rw-r--r--drawinglayer/source/attribute/sdrsceneattribute3d.cxx218
-rw-r--r--drawinglayer/source/attribute/sdrshadowattribute.cxx193
-rw-r--r--drawinglayer/source/attribute/strokeattribute.cxx139
-rw-r--r--drawinglayer/source/geometry/viewinformation2d.cxx47
-rw-r--r--drawinglayer/source/geometry/viewinformation3d.cxx47
-rw-r--r--drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx78
-rw-r--r--drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx38
-rw-r--r--drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx108
-rw-r--r--drawinglayer/source/primitive2d/graphicprimitive2d.cxx6
-rw-r--r--drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx75
-rw-r--r--drawinglayer/source/primitive2d/makefile.mk89
-rw-r--r--drawinglayer/source/primitive2d/mediaprimitive2d.cxx17
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx207
-rw-r--r--drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/polygonprimitive2d.cxx31
-rw-r--r--drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx105
-rw-r--r--drawinglayer/source/primitive2d/sceneprimitive2d.cxx14
-rw-r--r--drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx130
-rw-r--r--drawinglayer/source/primitive2d/shadowprimitive2d.cxx4
-rw-r--r--drawinglayer/source/primitive2d/textlayoutdevice.cxx69
-rw-r--r--drawinglayer/source/primitive2d/transparenceprimitive2d.cxx78
-rw-r--r--drawinglayer/source/primitive2d/unifiedalphaprimitive2d.cxx121
-rw-r--r--drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx136
-rw-r--r--drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx3
-rw-r--r--drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx76
-rw-r--r--drawinglayer/source/primitive3d/hittestprimitive3d.cxx68
-rw-r--r--drawinglayer/source/primitive3d/makefile.mk2
-rw-r--r--drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx4
-rw-r--r--drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx37
-rw-r--r--drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx88
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx45
-rw-r--r--drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx47
-rw-r--r--drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx44
-rw-r--r--drawinglayer/source/primitive3d/sdrprimitive3d.cxx16
-rw-r--r--drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx38
-rw-r--r--drawinglayer/source/primitive3d/textureprimitive3d.cxx28
-rw-r--r--drawinglayer/source/processor2d/canvasprocessor.cxx139
-rw-r--r--drawinglayer/source/processor2d/contourextractor2d.cxx10
-rw-r--r--drawinglayer/source/processor2d/hittestprocessor2d.cxx73
-rw-r--r--drawinglayer/source/processor2d/vclhelperbufferdevice.cxx4
-rw-r--r--drawinglayer/source/processor2d/vclhelperbufferdevice.hxx2
-rw-r--r--drawinglayer/source/processor2d/vclhelpergradient.cxx2
-rw-r--r--drawinglayer/source/processor2d/vclhelpergradient.hxx3
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx260
-rw-r--r--drawinglayer/source/processor2d/vclpixelprocessor2d.cxx74
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx197
-rw-r--r--drawinglayer/source/processor3d/cutfindprocessor3d.cxx50
-rw-r--r--drawinglayer/source/processor3d/defaultprocessor3d.cxx64
-rw-r--r--drawinglayer/source/processor3d/geometry2dextractor.cxx4
-rw-r--r--drawinglayer/source/processor3d/shadow3dextractor.cxx4
-rw-r--r--drawinglayer/source/processor3d/zbufferprocessor3d.cxx333
-rw-r--r--drawinglayer/source/texture/texture3d.cxx1
-rw-r--r--editeng/inc/editeng/AccessibleEditableTextPara.hxx11
-rw-r--r--editeng/inc/editeng/unoedprx.hxx7
-rw-r--r--editeng/inc/editeng/unoedsrc.hxx1
-rw-r--r--editeng/inc/editeng/unofored.hxx1
-rw-r--r--editeng/inc/editeng/unoforou.hxx2
-rw-r--r--editeng/inc/editeng/unotext.hxx2
-rw-r--r--editeng/source/accessibility/AccessibleEditableTextPara.cxx96
-rw-r--r--editeng/source/accessibility/AccessibleHyperlink.cxx146
-rw-r--r--editeng/source/accessibility/AccessibleHyperlink.hxx82
-rw-r--r--[-rwxr-xr-x]editeng/source/accessibility/makefile.mk1
-rw-r--r--editeng/source/uno/unoedprx.cxx27
-rw-r--r--editeng/source/uno/unofored.cxx5
-rw-r--r--editeng/source/uno/unoforou.cxx5
-rw-r--r--editeng/source/uno/unotext.cxx4
-rw-r--r--embeddedobj/source/commonembedding/embedobj.cxx2
-rw-r--r--embeddedobj/source/commonembedding/miscobj.cxx5
-rw-r--r--embeddedobj/source/commonembedding/persistence.cxx235
-rw-r--r--embeddedobj/source/inc/commonembobj.hxx31
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx2
-rw-r--r--extensions/source/bibliography/datman.cxx2
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx2
-rw-r--r--extensions/source/dbpilots/controlwizard.hxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx32
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.hxx9
-rw-r--r--extensions/source/propctrlr/propres.src5
-rw-r--r--extensions/source/propctrlr/propresid.hrc3
-rw-r--r--extensions/source/propctrlr/usercontrol.cxx58
-rw-r--r--extensions/source/propctrlr/usercontrol.hxx3
-rw-r--r--external/mingwheaders/makefile.mk3
-rw-r--r--external/mingwheaders/mingw_headers.patch131
-rw-r--r--extras/source/palettes/standard.soc4
-rw-r--r--extras/source/palettes/sun-color.soc55
-rw-r--r--filter/source/config/cache/lateinitlistener.cxx14
-rw-r--r--filter/source/config/fragments/filters/HTML__StarCalc_.xcu4
-rw-r--r--filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu4
-rw-r--r--filter/source/msfilter/msdffimp.cxx1
-rw-r--r--filter/source/msfilter/svdfppt.cxx10
-rw-r--r--filter/source/pdf/makefile.mk1
-rw-r--r--filter/source/pdf/pdfexport.cxx23
-rw-r--r--forms/qa/integration/forms/DocumentHelper.java23
-rw-r--r--forms/source/component/Filter.cxx245
-rw-r--r--forms/source/component/Filter.hxx5
-rw-r--r--forms/source/component/clickableimage.cxx6
-rw-r--r--forms/source/xforms/submission/serialization_multi_form.hxx27
-rw-r--r--forms/source/xforms/submission/serialization_multi_related.hxx27
-rw-r--r--formula/source/ui/dlg/formula.cxx1
-rw-r--r--fpicker/source/aqua/FilterHelper.cxx28
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.cxx10
-rw-r--r--fpicker/source/win32/filepicker/makefile.mk1
-rw-r--r--framework/inc/classes/checkediterator.hxx2
-rw-r--r--framework/inc/framework.hrc9
-rw-r--r--framework/inc/interaction/preventduplicateinteraction.hxx28
-rw-r--r--framework/inc/jobs/jobdata.hxx2
-rw-r--r--framework/inc/services/autorecovery.hxx25
-rw-r--r--framework/source/inc/loadenv/loaddispatchlistener.hxx165
-rw-r--r--framework/source/inc/loadenv/loadenv.hxx11
-rw-r--r--framework/source/inc/loadenv/loadenvexception.hxx8
-rw-r--r--framework/source/interaction/preventduplicateinteraction.cxx73
-rw-r--r--framework/source/jobs/jobdata.cxx8
-rw-r--r--framework/source/jobs/jobresult.cxx4
-rw-r--r--framework/source/loadenv/loaddispatchlistener.cxx141
-rw-r--r--framework/source/loadenv/loadenv.cxx70
-rw-r--r--framework/source/loadenv/makefile.mk1
-rw-r--r--framework/source/services/autorecovery.cxx416
-rw-r--r--framework/source/services/backingwindow.cxx244
-rw-r--r--framework/source/services/backingwindow.hxx11
-rw-r--r--framework/source/services/frame.cxx16
-rw-r--r--framework/source/services/fwk_services.src56
-rw-r--r--framework/util/makefile.mk1
-rw-r--r--i18npool/inc/i18npool/lang.h18
-rw-r--r--i18npool/source/isolang/isolang.cxx13
-rwxr-xr-xi18npool/source/isolang/langid.pl2
-rw-r--r--i18npool/source/localedata/LocaleNode.cxx4
-rw-r--r--i18npool/source/localedata/data/en_CA.xml24
-rw-r--r--i18npool/source/localedata/data/fr_CA.xml8
-rw-r--r--i18npool/source/localedata/data/hsb_DE.xml350
-rw-r--r--i18npool/source/localedata/data/locale.dtd128
-rw-r--r--i18npool/source/localedata/data/localedata_euro.map34
-rw-r--r--i18npool/source/localedata/data/localedata_others.map17
-rw-r--r--i18npool/source/localedata/data/ltg_LV.xml350
-rw-r--r--i18npool/source/localedata/data/lv_LV.xml869
-rw-r--r--i18npool/source/localedata/data/makefile.mk6
-rw-r--r--i18npool/source/localedata/data/plt_MG.xml358
-rw-r--r--i18npool/source/localedata/data/ro_RO.xml3
-rw-r--r--i18npool/source/localedata/data/shs_CA.xml20
-rw-r--r--i18npool/source/localedata/localedata.cxx3
-rw-r--r--i18npool/source/textconversion/data/stc_char.dic378
-rw-r--r--i18npool/source/textconversion/data/stc_word.dic1
-rw-r--r--idlc/source/astdump.cxx4
-rw-r--r--idlc/source/idlcproduce.cxx22
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmpbin7112 -> 6400 bytes
-rw-r--r--instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmpbin52248 -> 52248 bytes
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmpbin7112 -> 6400 bytes
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmpbin52248 -> 52248 bytes
-rw-r--r--instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmpbin7112 -> 6400 bytes
-rw-r--r--instsetoo_native/res/DS_Storebin12292 -> 12292 bytes
-rw-r--r--instsetoo_native/res/osxdndinstall.pngbin65495 -> 14383 bytes
-rw-r--r--instsetoo_native/util/openoffice.lst22
-rw-r--r--mysqlc/images/sun_extension.pngbin1965 -> 5448 bytes
-rw-r--r--mysqlc/images/sun_extension_hc.pngbin1160 -> 3182 bytes
-rw-r--r--mysqlc/source/description.xml4
-rw-r--r--mysqlc/source/description/description_en-US.txt2
-rw-r--r--mysqlc/source/makefile.mk4
-rw-r--r--mysqlc/version.mk2
-rw-r--r--odk/examples/CLI/CSharp/Spreadsheet/SpreadsheetSample.cs2
-rw-r--r--odk/examples/DevelopersGuide/Forms/GridFieldValidator.java2
-rw-r--r--odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java2
-rw-r--r--offapi/com/sun/star/deployment/LicenseException.idl8
-rw-r--r--offapi/com/sun/star/deployment/LicenseIndividualAgreementException.idl7
-rw-r--r--offapi/com/sun/star/document/XDocumentRecovery.idl127
-rw-r--r--offapi/com/sun/star/document/makefile.mk1
-rw-r--r--offapi/com/sun/star/embed/EmbeddedObjectDescriptor.idl15
-rw-r--r--offapi/com/sun/star/frame/XController2.idl11
-rw-r--r--offapi/com/sun/star/report/XReportDefinition.idl6
-rw-r--r--offapi/com/sun/star/sdb/DatabaseInteractionHandler.idl71
-rw-r--r--offapi/com/sun/star/sdb/DefinitionContent.idl8
-rw-r--r--offapi/com/sun/star/sdb/DocumentDefinition.idl6
-rw-r--r--offapi/com/sun/star/sdb/InteractionHandler.idl55
-rw-r--r--offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl86
-rw-r--r--offapi/com/sun/star/sdb/makefile.mk1
-rw-r--r--offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl67
-rw-r--r--offapi/com/sun/star/sdb/tools/XIndexAlteration.idl96
-rw-r--r--offapi/com/sun/star/sdb/tools/XKeyAlteration.idl96
-rw-r--r--offapi/com/sun/star/sdb/tools/XTableAlteration.idl115
-rw-r--r--offapi/com/sun/star/sdb/tools/XTableRename.idl78
-rw-r--r--offapi/com/sun/star/sdb/tools/XViewAccess.idl88
-rw-r--r--offapi/com/sun/star/sdb/tools/makefile.mk8
-rw-r--r--offapi/com/sun/star/task/DocumentMacroConfirmationRequest.idl7
-rw-r--r--offapi/com/sun/star/task/DocumentMacroConfirmationRequest2.idl80
-rw-r--r--offapi/com/sun/star/task/InteractionHandler.idl32
-rw-r--r--offapi/com/sun/star/task/makefile.mk1
-rwxr-xr-xoffapi/com/sun/star/text/textfield/MetadataField.idl11
-rw-r--r--offapi/com/sun/star/util/Duration.idl4
-rw-r--r--officecfg/registry/data/org/openoffice/Interaction.xcu56
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Office/Accelerators.xcu14
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Common.xcu3
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu2
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu3
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/Setup.xcu342
-rwxr-xr-x[-rw-r--r--]officecfg/registry/data/org/openoffice/makefile.mk3
-rw-r--r--officecfg/registry/schema/org/openoffice/Interaction.xcs86
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Calc.xcs91
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs17
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Recovery.xcs39
-rw-r--r--officecfg/registry/schema/org/openoffice/Setup.xcs158
-rw-r--r--officecfg/registry/schema/org/openoffice/makefile.mk3
-rw-r--r--officecfg/registry/schema/org/openoffice/ucb/InteractionHandler.xcs59
-rw-r--r--ooo_custom_images/broffice/introabout/about.bmpbin40600 -> 0 bytes
-rwxr-xr-xooo_custom_images/broffice/introabout/about.pngbin0 -> 14722 bytes
-rw-r--r--ooo_custom_images/broffice/introabout/intro.bmpbin126920 -> 0 bytes
-rwxr-xr-xooo_custom_images/broffice/introabout/intro.pngbin0 -> 42384 bytes
-rw-r--r--ooo_custom_images/dev/introabout/intro.bmpbin378718 -> 0 bytes
-rwxr-xr-xooo_custom_images/dev/introabout/intro.pngbin0 -> 30991 bytes
-rw-r--r--ooo_custom_images/dev_broffice/introabout/intro.bmpbin126920 -> 0 bytes
-rwxr-xr-xooo_custom_images/dev_broffice/introabout/intro.pngbin0 -> 49847 bytes
-rw-r--r--ooo_custom_images/dev_nologo/introabout/intro.bmpbin378718 -> 0 bytes
-rwxr-xr-xooo_custom_images/dev_nologo/introabout/intro.pngbin0 -> 29323 bytes
-rw-r--r--ooo_custom_images/dev_nologo_broffice/introabout/intro.bmpbin126920 -> 0 bytes
-rwxr-xr-xooo_custom_images/dev_nologo_broffice/introabout/intro.pngbin0 -> 47367 bytes
-rw-r--r--ooo_custom_images/industrial/res/commandimagelist/lc_stop.pngbin1302 -> 0 bytes
-rw-r--r--ooo_custom_images/industrial/res/commandimagelist/sc_stop.pngbin590 -> 0 bytes
-rw-r--r--ooo_custom_images/nologo/introabout/intro.bmpbin378718 -> 0 bytes
-rwxr-xr-xooo_custom_images/nologo/introabout/intro.pngbin0 -> 27123 bytes
-rw-r--r--ooo_custom_images/nologo_broffice/introabout/intro.bmpbin126920 -> 0 bytes
-rwxr-xr-xooo_custom_images/nologo_broffice/introabout/intro.pngbin0 -> 40062 bytes
-rw-r--r--padmin/source/fontentry.cxx2
-rw-r--r--postprocess/packregistry/makefile.mk10
-rw-r--r--registry/inc/registry/registry.hxx36
-rw-r--r--registry/source/keyimpl.cxx164
-rw-r--r--registry/source/keyimpl.hxx74
-rw-r--r--registry/source/regimpl.cxx281
-rw-r--r--registry/source/regimpl.hxx62
-rw-r--r--registry/source/registry.cxx201
-rw-r--r--registry/source/regkey.cxx545
-rw-r--r--registry/tools/checksingleton.cxx9
-rw-r--r--registry/tools/regcompare.cxx9
-rw-r--r--registry/tools/regmerge.cxx31
-rw-r--r--reportbuilder/images/em42.pngbin1965 -> 0 bytes
-rw-r--r--reportbuilder/images/em42_hc.pngbin1160 -> 0 bytes
-rw-r--r--reportbuilder/images/em47.pngbin0 -> 5448 bytes
-rw-r--r--reportbuilder/images/em47_hc.pngbin0 -> 3182 bytes
-rw-r--r--reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java270
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java7
-rwxr-xr-xreportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java2
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java4
-rw-r--r--reportbuilder/util/component.txt2
-rw-r--r--reportbuilder/util/description.xml13
-rw-r--r--reportbuilder/util/makefile.mk10
-rw-r--r--reportbuilder/util/manifest.xml2
-rw-r--r--reportdesign/inc/ReportDefinition.hxx5
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx138
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx1
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx7
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx15
-rw-r--r--reportdesign/source/ui/inc/DesignView.hxx4
-rw-r--r--reportdesign/source/ui/inc/ReportController.hxx7
-rw-r--r--reportdesign/source/ui/inc/ReportWindow.hxx4
-rw-r--r--reportdesign/source/ui/inc/ScrollHelper.hxx4
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx4
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx4
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx394
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx4
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx4
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx10
-rw-r--r--rsc/source/parser/makefile.mk11
-rw-r--r--rsc/source/parser/parser.hxx26
-rw-r--r--rsc/source/prj/start.cxx2
-rw-r--r--sal/osl/w32/file_dirvol.cxx8
-rw-r--r--sal/osl/w32/file_url.cxx28
-rw-r--r--sal/osl/w32/module.cxx8
-rw-r--r--sal/osl/w32/path_helper.hxx3
-rw-r--r--sal/osl/w32/process.cxx12
-rw-r--r--sal/osl/w32/profile.cxx105
-rw-r--r--sal/osl/w32/tempfile.cxx2
-rw-r--r--sax/source/expatwrap/saxwriter.cxx2
-rw-r--r--sax/source/tools/converter.cxx580
-rw-r--r--sc/inc/attarray.hxx2
-rw-r--r--sc/inc/charthelper.hxx13
-rw-r--r--sc/inc/collect.hxx14
-rw-r--r--sc/inc/column.hxx6
-rw-r--r--sc/inc/document.hxx33
-rw-r--r--sc/inc/dpcachetable.hxx134
-rwxr-xr-xsc/inc/dpglobal.hxx209
-rw-r--r--sc/inc/dpgroup.hxx52
-rw-r--r--sc/inc/dpobject.hxx42
-rw-r--r--sc/inc/dpsave.hxx19
-rw-r--r--sc/inc/dpsdbtab.hxx18
-rw-r--r--sc/inc/dpshttab.hxx33
-rw-r--r--sc/inc/dptabdat.hxx81
-rw-r--r--sc/inc/dptablecache.hxx122
-rw-r--r--sc/inc/dptabres.hxx261
-rw-r--r--sc/inc/dptabsrc.hxx53
-rw-r--r--sc/inc/filter.hxx8
-rw-r--r--sc/inc/global.hxx55
-rw-r--r--sc/inc/globstr.hrc5
-rw-r--r--sc/inc/optutil.hxx7
-rw-r--r--sc/inc/pivot.hxx1
-rw-r--r--sc/inc/rangelst.hxx4
-rw-r--r--sc/inc/sc.hrc5
-rw-r--r--sc/inc/scabstdlg.hxx12
-rw-r--r--sc/inc/scmatrix.hxx7
-rw-r--r--sc/inc/stringutil.hxx (renamed from sfx2/source/view/impframe.cxx)51
-rw-r--r--sc/inc/table.hxx5
-rw-r--r--sc/source/core/data/attarray.cxx40
-rw-r--r--sc/source/core/data/column.cxx2
-rw-r--r--sc/source/core/data/column3.cxx103
-rw-r--r--[-rwxr-xr-x]sc/source/core/data/dociter.cxx6
-rw-r--r--sc/source/core/data/documen3.cxx118
-rw-r--r--sc/source/core/data/documen5.cxx414
-rw-r--r--sc/source/core/data/documen9.cxx84
-rw-r--r--sc/source/core/data/document.cxx17
-rw-r--r--sc/source/core/data/dpcachetable.cxx534
-rwxr-xr-xsc/source/core/data/dpglobal.cxx150
-rw-r--r--sc/source/core/data/dpgroup.cxx655
-rwxr-xr-x[-rw-r--r--]sc/source/core/data/dpobject.cxx229
-rwxr-xr-x[-rw-r--r--]sc/source/core/data/dpoutput.cxx142
-rw-r--r--sc/source/core/data/dpsave.cxx335
-rw-r--r--sc/source/core/data/dpsdbtab.cxx243
-rwxr-xr-x[-rw-r--r--]sc/source/core/data/dpshttab.cxx224
-rwxr-xr-x[-rw-r--r--]sc/source/core/data/dptabdat.cxx194
-rwxr-xr-xsc/source/core/data/dptablecache.cxx1093
-rwxr-xr-x[-rw-r--r--]sc/source/core/data/dptabres.cxx704
-rw-r--r--sc/source/core/data/dptabresmember.cxx831
-rw-r--r--sc/source/core/data/dptabresmember.hxx161
-rwxr-xr-x[-rw-r--r--]sc/source/core/data/dptabsrc.cxx202
-rwxr-xr-x[-rw-r--r--]sc/source/core/data/drwlayer.cxx186
-rw-r--r--sc/source/core/data/global2.cxx92
-rwxr-xr-x[-rw-r--r--]sc/source/core/data/makefile.mk8
-rw-r--r--sc/source/core/data/scdpoutputimpl.cxx187
-rwxr-xr-xsc/source/core/data/scdpoutputimpl.hxx79
-rw-r--r--sc/source/core/data/table2.cxx10
-rw-r--r--sc/source/core/inc/core_pch.hxx1
-rw-r--r--sc/source/core/tool/address.cxx4
-rw-r--r--sc/source/core/tool/charthelper.cxx195
-rw-r--r--sc/source/core/tool/collect.cxx18
-rw-r--r--sc/source/core/tool/doubleref.cxx4
-rw-r--r--sc/source/core/tool/interpr1.cxx4
-rw-r--r--sc/source/core/tool/makefile.mk3
-rw-r--r--sc/source/core/tool/optutil.cxx4
-rw-r--r--sc/source/core/tool/rangelst.cxx31
-rw-r--r--sc/source/core/tool/scmatrix.cxx13
-rw-r--r--sc/source/core/tool/stringutil.cxx131
-rw-r--r--sc/source/filter/excel/excform.cxx6
-rw-r--r--sc/source/filter/excel/excform8.cxx5
-rw-r--r--sc/source/filter/excel/makefile.mk1
-rw-r--r--sc/source/filter/excel/tokstack.cxx5
-rw-r--r--sc/source/filter/excel/xepivot.cxx17
-rw-r--r--sc/source/filter/excel/xicontent.cxx24
-rw-r--r--sc/source/filter/html/htmlimp.cxx10
-rw-r--r--sc/source/filter/inc/eeimport.hxx4
-rw-r--r--sc/source/filter/inc/ftools.hxx4
-rw-r--r--sc/source/filter/inc/htmlimp.hxx3
-rw-r--r--sc/source/filter/inc/tokstack.hxx2
-rw-r--r--sc/source/filter/rtf/eeimpars.cxx14
-rw-r--r--sc/source/filter/xml/xmldpimp.cxx1
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx18
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx36
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx11
-rw-r--r--sc/source/ui/dbgui/asciiopt.cxx50
-rw-r--r--sc/source/ui/dbgui/asciiopt.hrc71
-rw-r--r--sc/source/ui/dbgui/asciiopt.src230
-rw-r--r--sc/source/ui/dbgui/csvgrid.cxx3
-rw-r--r--sc/source/ui/dbgui/csvruler.cxx76
-rw-r--r--sc/source/ui/dbgui/dapidata.cxx2
-rw-r--r--sc/source/ui/dbgui/makefile.mk2
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx9
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx217
-rw-r--r--sc/source/ui/dbgui/textimportoptions.cxx121
-rw-r--r--sc/source/ui/dbgui/textimportoptions.src112
-rw-r--r--sc/source/ui/docshell/dbdocimp.cxx4
-rw-r--r--sc/source/ui/docshell/docsh.cxx63
-rw-r--r--sc/source/ui/docshell/docsh4.cxx3
-rw-r--r--sc/source/ui/docshell/impex.cxx84
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/fudraw.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx3
-rw-r--r--sc/source/ui/drawfunc/fusel.cxx2
-rw-r--r--sc/source/ui/formdlg/formula.cxx5
-rw-r--r--sc/source/ui/inc/asciiopt.hxx11
-rw-r--r--sc/source/ui/inc/csvruler.hxx1
-rw-r--r--sc/source/ui/inc/dbfunc.hxx8
-rw-r--r--sc/source/ui/inc/docsh.hxx7
-rwxr-xr-x[-rw-r--r--]sc/source/ui/inc/fieldwnd.hxx1
-rw-r--r--sc/source/ui/inc/gridwin.hxx2
-rw-r--r--sc/source/ui/inc/hdrcont.hxx2
-rw-r--r--sc/source/ui/inc/impex.hxx2
-rw-r--r--sc/source/ui/inc/scuiasciiopt.hxx12
-rw-r--r--[-rwxr-xr-x]sc/source/ui/inc/textimportoptions.hrc (renamed from vcl/aqua/source/gdi/salpixmaputils.cxx)22
-rw-r--r--[-rwxr-xr-x]sc/source/ui/inc/textimportoptions.hxx (renamed from vcl/aqua/inc/salpixmaputils.hxx)59
-rw-r--r--sc/source/ui/inc/ui_pch.hxx1
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx7
-rw-r--r--sc/source/ui/miscdlgs/autofmt.cxx2
-rw-r--r--sc/source/ui/src/globstr.src12
-rw-r--r--sc/source/ui/undo/makefile.mk2
-rw-r--r--sc/source/ui/unoobj/chartuno.cxx15
-rwxr-xr-x[-rw-r--r--]sc/source/ui/unoobj/dapiuno.cxx20
-rw-r--r--sc/source/ui/unoobj/dispuno.cxx7
-rw-r--r--sc/source/ui/unoobj/filtuno.cxx35
-rw-r--r--sc/source/ui/unoobj/unodoc.cxx4
-rw-r--r--sc/source/ui/vba/vbahelper.cxx2
-rw-r--r--sc/source/ui/vba/vbawindow.cxx42
-rw-r--r--sc/source/ui/view/cellsh.cxx2
-rw-r--r--sc/source/ui/view/cellsh1.cxx2
-rw-r--r--sc/source/ui/view/cellsh2.cxx2
-rw-r--r--sc/source/ui/view/cellsh3.cxx2
-rwxr-xr-x[-rw-r--r--]sc/source/ui/view/dbfunc3.cxx55
-rw-r--r--sc/source/ui/view/drawview.cxx17
-rw-r--r--sc/source/ui/view/gridwin.cxx58
-rw-r--r--sc/source/ui/view/hdrcont.cxx61
-rw-r--r--sc/source/ui/view/makefile.mk3
-rw-r--r--sc/source/ui/view/prevwsh.cxx3
-rw-r--r--sc/source/ui/view/tabview.cxx19
-rw-r--r--sc/source/ui/view/tabview3.cxx14
-rw-r--r--sc/source/ui/view/tabview5.cxx14
-rw-r--r--sc/source/ui/view/tabvwsh2.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx8
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx36
-rw-r--r--sc/source/ui/view/tabvwsha.cxx2
-rw-r--r--sc/source/ui/view/tabvwshb.cxx2
-rw-r--r--sc/source/ui/view/tabvwshd.cxx2
-rw-r--r--sc/source/ui/view/viewfun2.cxx5
-rw-r--r--sc/source/ui/view/viewutil.cxx2
-rw-r--r--sc/util/makefile.mk1
-rw-r--r--[-rwxr-xr-x]scp2/inc/macros.inc25
-rw-r--r--scp2/source/binfilter/registryitem_binfilter.scp26
-rw-r--r--[-rwxr-xr-x]scp2/source/calc/registryitem_calc.scp78
-rw-r--r--[-rwxr-xr-x]scp2/source/draw/registryitem_draw.scp20
-rw-r--r--[-rwxr-xr-x]scp2/source/impress/registryitem_impress.scp35
-rw-r--r--[-rwxr-xr-x]scp2/source/math/registryitem_math.scp29
-rw-r--r--scp2/source/ooo/common_brand.scp23
-rwxr-xr-x[-rw-r--r--]scp2/source/ooo/file_ooo.scp13
-rw-r--r--scp2/source/ooo/folderitem_ooo.ulf2
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp1
-rw-r--r--scp2/source/ooo/module_systemint.scp2
-rw-r--r--scp2/source/ooo/profileitem_ooo.scp11
-rw-r--r--scp2/source/ooo/registryitem_ooo.scp7
-rw-r--r--[-rwxr-xr-x]scp2/source/writer/registryitem_writer.scp116
-rw-r--r--scripting/source/pyprov/pythonscript.py51
-rw-r--r--sd/inc/pch/precompiled_sd.hxx1
-rw-r--r--sd/inc/pres.hxx1
-rw-r--r--sd/inc/sdmod.hxx9
-rw-r--r--sd/inc/sdpage.hxx4
-rw-r--r--sd/res/buttons/glas-blue.zipbin25629 -> 22010 bytes
-rw-r--r--sd/res/buttons/glas-green.zipbin27086 -> 25032 bytes
-rw-r--r--sd/res/buttons/glas-red.zipbin26476 -> 24325 bytes
-rw-r--r--sd/res/buttons/round-gorilla.zipbin23118 -> 19208 bytes
-rw-r--r--sd/res/buttons/round-white.zipbin16899 -> 10533 bytes
-rw-r--r--sd/res/buttons/simple.zipbin7880 -> 4046 bytes
-rw-r--r--sd/res/buttons/square-blue.zipbin16160 -> 15123 bytes
-rw-r--r--sd/res/buttons/square-gray.zipbin14332 -> 8919 bytes
-rw-r--r--sd/res/buttons/square-green.zipbin16646 -> 15750 bytes
-rw-r--r--sd/res/buttons/square-red.zipbin16522 -> 15319 bytes
-rw-r--r--sd/res/buttons/square-yellow.zipbin16105 -> 15185 bytes
-rw-r--r--sd/source/core/drawdoc.cxx25
-rw-r--r--sd/source/core/sdpage.cxx138
-rw-r--r--sd/source/filter/cgm/sdcgmfilter.cxx14
-rw-r--r--sd/source/filter/html/buttonset.cxx2
-rw-r--r--sd/source/filter/ppt/pptin.cxx45
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx6
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx2
-rw-r--r--sd/source/ui/app/menuportal_tmpl.src1
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/optsitem.cxx5
-rw-r--r--sd/source/ui/app/sdmod1.cxx75
-rw-r--r--sd/source/ui/dlg/dlgass.cxx9
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx3
-rw-r--r--sd/source/ui/docshell/docshell.cxx41
-rw-r--r--sd/source/ui/docshell/grdocsh.cxx12
-rw-r--r--sd/source/ui/framework/factories/FullScreenPane.cxx2
-rw-r--r--sd/source/ui/func/fubullet.cxx2
-rw-r--r--sd/source/ui/func/fupage.cxx80
-rw-r--r--sd/source/ui/func/undoback.cxx28
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx8
-rw-r--r--sd/source/ui/inc/GraphicDocShell.hxx8
-rw-r--r--sd/source/ui/inc/drawview.hxx2
-rw-r--r--sd/source/ui/inc/undoback.hxx9
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx7
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx8
-rw-r--r--sd/source/ui/slidesorter/controller/SlideSorterController.cxx3
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx10
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObject.hxx3
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObject.cxx2
-rw-r--r--sd/source/ui/toolpanel/controls/DocumentHelper.cxx9
-rw-r--r--sd/source/ui/tools/EventMultiplexer.cxx2
-rw-r--r--sd/source/ui/tools/IdleDetection.cxx19
-rw-r--r--sd/source/ui/unoidl/unodoc.cxx10
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx30
-rw-r--r--sd/source/ui/unoidl/unopage.cxx104
-rw-r--r--sd/source/ui/unoidl/unopage.hxx1
-rw-r--r--sd/source/ui/unoidl/unopback.cxx21
-rw-r--r--sd/source/ui/unoidl/unopback.hxx5
-rw-r--r--sd/source/ui/view/PresentationViewShellBase.cxx4
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx4
-rw-r--r--sd/source/ui/view/UpdateLockManager.cxx5
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx10
-rw-r--r--sd/source/ui/view/drawview.cxx14
-rw-r--r--sd/source/ui/view/drviews3.cxx21
-rw-r--r--sd/source/ui/view/drviews5.cxx2
-rw-r--r--sd/source/ui/view/drviews7.cxx4
-rw-r--r--sd/source/ui/view/drviewse.cxx1
-rw-r--r--sd/source/ui/view/drviewsf.cxx1
-rw-r--r--sd/source/ui/view/frmview.cxx8
-rw-r--r--sd/source/ui/view/outlnvsh.cxx1
-rw-r--r--sd/source/ui/view/outlview.cxx2
-rw-r--r--sd/source/ui/view/presvish.cxx1
-rw-r--r--sd/source/ui/view/sdview.cxx8
-rw-r--r--sdext/prj/build.lst3
-rw-r--r--sdext/prj/d.lst2
-rw-r--r--sdext/source/minimizer/description.xml11
-rw-r--r--sdext/source/minimizer/fileopendialog.cxx14
-rwxr-xr-xsdext/source/minimizer/help/component.txt5
-rw-r--r--sdext/source/minimizer/images/em47.pngbin0 -> 5448 bytes
-rw-r--r--sdext/source/minimizer/images/em47_hc.pngbin0 -> 3182 bytes
-rw-r--r--sdext/source/minimizer/makefile.mk22
-rw-r--r--sdext/source/minimizer/manifest.xml2
-rw-r--r--sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu48
-rw-r--r--sdext/source/minimizer/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu27
-rw-r--r--sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu4
-rw-r--r--sdext/source/pdfimport/config/description.xml6
-rwxr-xr-xsdext/source/pdfimport/help/component.txt4
-rw-r--r--sdext/source/pdfimport/images/pdfiext.pngbin1965 -> 5448 bytes
-rw-r--r--sdext/source/pdfimport/images/pdfiext_hc.pngbin1160 -> 3182 bytes
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfentries.cxx27
-rwxr-xr-xsdext/source/pdfimport/wrapper/wrapper.cxx63
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx53
-rw-r--r--sdext/source/presenter/bitmaps/em47.pngbin0 -> 5448 bytes
-rw-r--r--sdext/source/presenter/bitmaps/em47_hc.pngbin0 -> 3182 bytes
-rw-r--r--sdext/source/presenter/description.xml9
-rwxr-xr-xsdext/source/presenter/help/component.txt5
-rw-r--r--sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp14
-rw-r--r--sdext/source/presenter/makefile.mk4
-rw-r--r--setup_native/scripts/admin.pl2
-rw-r--r--setup_native/scripts/register_extensions2
-rw-r--r--setup_native/source/java/openofficeorg_setup.gifbin13549 -> 6641 bytes
-rw-r--r--setup_native/source/packinfo/package_names.txt60
-rw-r--r--setup_native/source/packinfo/packinfo_brand.txt60
-rwxr-xr-xsetup_native/source/packinfo/packinfo_office.txt390
-rwxr-xr-xsetup_native/source/packinfo/shellscripts_extensions.txt8
-rw-r--r--setup_native/source/packinfo/spellchecker_selection.txt60
-rw-r--r--setup_native/source/win32/customactions/relnotes/relnotes.cxx28
-rw-r--r--setup_native/source/win32/customactions/shellextensions/registerextensions.cxx2
-rw-r--r--setup_native/source/win32/nsis/ooobanner.bmpbin9744 -> 9044 bytes
-rw-r--r--setup_native/source/win32/nsis/ooobitmap.bmpbin154542 -> 52576 bytes
-rw-r--r--setup_native/source/win32/nsis/ooosdkbanner.bmpbin25818 -> 9044 bytes
-rwxr-xr-xsetup_native/source/win32/nsis/ooosetup.icobin295606 -> 295606 bytes
-rw-r--r--sfx2/inc/about.hxx10
-rw-r--r--sfx2/inc/frmload.hxx150
-rw-r--r--sfx2/inc/inettbc.hxx13
-rw-r--r--sfx2/inc/pch/precompiled_sfx2.hxx1
-rw-r--r--sfx2/inc/sfx2/app.hxx4
-rw-r--r--sfx2/inc/sfx2/bindings.hxx3
-rw-r--r--sfx2/inc/sfx2/docfac.hxx5
-rw-r--r--sfx2/inc/sfx2/docfile.hxx15
-rw-r--r--sfx2/inc/sfx2/frame.hxx148
-rw-r--r--sfx2/inc/sfx2/linkmgr.hxx2
-rw-r--r--sfx2/inc/sfx2/objsh.hxx35
-rw-r--r--sfx2/inc/sfx2/sfx.hrc1
-rw-r--r--sfx2/inc/sfx2/sfxbasecontroller.hxx170
-rw-r--r--sfx2/inc/sfx2/sfxbasemodel.hxx72
-rw-r--r--sfx2/inc/sfx2/sfxmodelfactory.hxx2
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc215
-rw-r--r--sfx2/inc/sfx2/shell.hxx1
-rw-r--r--sfx2/inc/sfx2/topfrm.hxx122
-rw-r--r--sfx2/inc/sfx2/viewfrm.hxx142
-rw-r--r--sfx2/inc/sfx2/viewsh.hxx28
-rw-r--r--sfx2/inc/viewfac.hxx3
-rw-r--r--sfx2/qa/complex/DocumentMetaData.java10
-rw-r--r--sfx2/sdi/frmslots.sdi30
-rw-r--r--sfx2/sdi/makefile.mk1
-rw-r--r--sfx2/sdi/mdislots.sdi44
-rw-r--r--sfx2/sdi/sfx.sdi639
-rw-r--r--sfx2/sdi/sfxitems.sdi1
-rw-r--r--sfx2/sdi/sfxslots.sdi1
-rw-r--r--sfx2/source/appl/app.cxx21
-rw-r--r--sfx2/source/appl/app.src5
-rw-r--r--sfx2/source/appl/appbas.cxx12
-rw-r--r--sfx2/source/appl/appcfg.cxx15
-rw-r--r--sfx2/source/appl/appchild.cxx4
-rw-r--r--sfx2/source/appl/appdata.cxx2
-rw-r--r--sfx2/source/appl/appdde.cxx9
-rw-r--r--sfx2/source/appl/appmisc.cxx9
-rw-r--r--sfx2/source/appl/appopen.cxx268
-rw-r--r--sfx2/source/appl/appquit.cxx3
-rw-r--r--sfx2/source/appl/appreg.cxx4
-rw-r--r--sfx2/source/appl/appserv.cxx129
-rw-r--r--sfx2/source/appl/appuno.cxx142
-rw-r--r--sfx2/source/appl/fileobj.cxx10
-rw-r--r--sfx2/source/appl/fileobj.hxx1
-rw-r--r--sfx2/source/appl/linkmgr2.cxx10
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx2
-rw-r--r--sfx2/source/appl/workwin.cxx6
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx2
-rw-r--r--sfx2/source/bastyp/progress.cxx35
-rw-r--r--sfx2/source/control/bindings.cxx20
-rw-r--r--[-rwxr-xr-x]sfx2/source/control/dispatch.cxx112
-rw-r--r--sfx2/source/control/request.cxx2
-rw-r--r--sfx2/source/control/statcach.cxx2
-rw-r--r--sfx2/source/control/unoctitm.cxx12
-rw-r--r--sfx2/source/dialog/about.cxx80
-rw-r--r--sfx2/source/dialog/basedlgs.cxx4
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx17
-rw-r--r--sfx2/source/dialog/dinfdlg.hrc4
-rw-r--r--sfx2/source/dialog/dinfdlg.src8
-rw-r--r--sfx2/source/dialog/dockwin.cxx4
-rw-r--r--sfx2/source/dialog/mailmodelapi.cxx16
-rw-r--r--sfx2/source/dialog/partwnd.cxx2
-rw-r--r--sfx2/source/dialog/tabdlg.cxx2
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx17
-rw-r--r--sfx2/source/doc/docfac.cxx38
-rw-r--r--sfx2/source/doc/docfile.cxx119
-rw-r--r--sfx2/source/doc/objcont.cxx275
-rw-r--r--sfx2/source/doc/objembed.cxx2
-rw-r--r--sfx2/source/doc/objmisc.cxx45
-rw-r--r--sfx2/source/doc/objserv.cxx55
-rw-r--r--sfx2/source/doc/objstor.cxx47
-rw-r--r--sfx2/source/doc/objxtor.cxx266
-rwxr-xr-xsfx2/source/doc/printhelper.cxx6
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx1066
-rw-r--r--sfx2/source/doc/sfxmodelfactory.cxx9
-rw-r--r--sfx2/source/inc/appdata.hxx2
-rw-r--r--sfx2/source/inc/objshimp.hxx31
-rw-r--r--sfx2/source/inet/inettbc.cxx100
-rw-r--r--sfx2/source/menu/mnuitem.cxx2
-rw-r--r--sfx2/source/menu/virtmenu.cxx10
-rw-r--r--sfx2/source/notify/eventsupplier.cxx2
-rw-r--r--sfx2/source/view/frame.cxx684
-rw-r--r--sfx2/source/view/frame2.cxx484
-rw-r--r--sfx2/source/view/frmload.cxx998
-rw-r--r--sfx2/source/view/impframe.hxx67
-rw-r--r--sfx2/source/view/impviewframe.hxx94
-rw-r--r--sfx2/source/view/ipclient.cxx20
-rw-r--r--sfx2/source/view/makefile.mk6
-rw-r--r--sfx2/source/view/prnmon.cxx2
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx456
-rw-r--r--sfx2/source/view/topfrm.cxx1643
-rw-r--r--sfx2/source/view/viewfac.cxx12
-rw-r--r--sfx2/source/view/viewfrm.cxx1411
-rw-r--r--sfx2/source/view/viewfrm2.cxx523
-rw-r--r--sfx2/source/view/viewimp.hxx2
-rw-r--r--sfx2/source/view/viewsh.cxx91
-rw-r--r--sfx2/util/hidother.src30
-rw-r--r--shell/source/backends/wininetbe/wininetbackend.cxx5
-rw-r--r--[-rwxr-xr-x]shell/source/win32/shlxthandler/makefile.mk10
-rw-r--r--[-rwxr-xr-x]shell/source/win32/shlxthandler/ooofilt/makefile.mk7
-rw-r--r--[-rwxr-xr-x]shell/source/win32/shlxthandler/prophdl/makefile.mk6
-rw-r--r--[-rwxr-xr-x]shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx4
-rw-r--r--shell/source/win32/shlxthandler/propsheets/makefile.mk11
-rw-r--r--slideshow/source/engine/animationfactory.cxx8
-rw-r--r--slideshow/source/engine/animationnodes/animationnodefactory.cxx12
-rw-r--r--slideshow/source/engine/animationnodes/basenode.cxx2
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx4
-rw-r--r--slideshow/source/engine/eventqueue.cxx6
-rw-r--r--slideshow/source/engine/shapeattributelayer.cxx2
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.cxx2
-rw-r--r--slideshow/source/engine/shapes/drawshape.cxx4
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx4
-rw-r--r--slideshow/source/engine/shapes/viewappletshape.cxx2
-rw-r--r--slideshow/source/engine/shapes/viewbackgroundshape.cxx6
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx2
-rw-r--r--slideshow/source/engine/shapes/viewshape.cxx8
-rw-r--r--slideshow/source/engine/slide/shapemanagerimpl.cxx2
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx12
-rw-r--r--slideshow/source/engine/slidebitmap.cxx2
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx6
-rw-r--r--slideshow/source/engine/slideview.cxx8
-rw-r--r--slideshow/source/engine/transitions/shapetransitionfactory.cxx2
-rw-r--r--slideshow/source/engine/usereventqueue.cxx2
-rw-r--r--solenv/bin/make_installer.pl5
-rw-r--r--solenv/bin/modules/installer/globals.pm4
-rw-r--r--solenv/bin/modules/installer/setupscript.pm49
-rw-r--r--solenv/bin/modules/installer/simplepackage.pm4
-rw-r--r--solenv/bin/modules/installer/windows/directory.pm1
-rw-r--r--solenv/bin/modules/installer/windows/msiglobal.pm2
-rw-r--r--solenv/bin/modules/installer/windows/property.pm2
-rw-r--r--solenv/bin/modules/installer/windows/shortcut.pm37
-rw-r--r--solenv/bin/modules/installer/windows/sign.pm2
-rw-r--r--solenv/bin/modules/installer/windows/upgrade.pm2
-rw-r--r--solenv/bin/modules/installer/worker.pm41
-rw-r--r--solenv/bin/modules/installer/ziplist.pm5
-rw-r--r--solenv/config/sdev300.ini33
-rw-r--r--solenv/inc/_tg_shl.mk120
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--solenv/inc/rules.mk8
-rw-r--r--solenv/inc/settings.mk2
-rw-r--r--solenv/inc/shlinfo.rc4
-rw-r--r--solenv/inc/tg_shl.mk12
-rw-r--r--solenv/inc/unitools.mk1
-rw-r--r--[-rwxr-xr-x]solenv/inc/wntgcci.mk2
-rw-r--r--solenv/inc/wntmsci10.mk3
-rw-r--r--[-rwxr-xr-x]solenv/inc/wntmsci11.mk4
-rw-r--r--starmath/inc/document.hxx2
-rw-r--r--starmath/source/accessibility.cxx4
-rw-r--r--starmath/source/accessibility.hxx1
-rw-r--r--starmath/source/document.cxx11
-rw-r--r--starmath/source/makefile.mk1
-rw-r--r--starmath/source/unodoc.cxx5
-rw-r--r--starmath/source/view.cxx8
-rw-r--r--stoc/source/javavm/javavm.cxx33
-rw-r--r--store/inc/store/store.hxx424
-rw-r--r--store/inc/store/store.inl451
-rw-r--r--store/source/lockbyte.cxx34
-rw-r--r--store/source/lockbyte.hxx30
-rw-r--r--store/source/storbase.hxx17
-rw-r--r--store/source/storbios.cxx863
-rw-r--r--store/source/storbios.hxx47
-rw-r--r--store/source/stordata.cxx102
-rw-r--r--store/source/stordata.hxx2
-rw-r--r--store/source/storpage.cxx8
-rw-r--r--store/source/stortree.cxx125
-rw-r--r--store/workben/makefile.mk2
-rw-r--r--store/workben/t_base.cxx11
-rw-r--r--svl/inc/svl/smplhint.hxx10
-rw-r--r--svl/source/notify/makefile.mk1
-rw-r--r--svtools/inc/svtools/grfmgr.hxx5
-rw-r--r--svtools/source/contnr/templwin.cxx21
-rw-r--r--svtools/source/control/inettbc.cxx1
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx2
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx1
-rw-r--r--svtools/source/graphic/grfmgr.cxx66
-rw-r--r--svtools/source/misc/imagemgr.cxx69
-rw-r--r--svtools/source/misc/langtab.src12
-rw-r--r--svx/inc/globlmn_tmpl.hrc6
-rw-r--r--svx/inc/pch/precompiled_svx.hxx1
-rw-r--r--svx/inc/svx/cube3d.hxx5
-rw-r--r--svx/inc/svx/extrud3d.hxx7
-rw-r--r--svx/inc/svx/lathe3d.hxx7
-rw-r--r--svx/inc/svx/obj3d.hxx10
-rw-r--r--svx/inc/svx/polygn3d.hxx6
-rw-r--r--svx/inc/svx/scene3d.hxx11
-rw-r--r--svx/inc/svx/sdr/attribute/sdrallattribute.hxx198
-rw-r--r--svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx80
-rw-r--r--svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx66
-rw-r--r--svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx30
-rw-r--r--svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx81
-rw-r--r--svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx79
-rw-r--r--svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx76
-rw-r--r--svx/inc/svx/sdr/attribute/sdrtextattribute.hxx108
-rw-r--r--svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx23
-rw-r--r--svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx63
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx2
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx18
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx2
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx3
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx5
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/properties/oleproperties.hxx (renamed from drawinglayer/source/primitive2d/alphaprimitive2d.cxx)59
-rw-r--r--svx/inc/svx/sdrmasterpagedescriptor.hxx9
-rw-r--r--svx/inc/svx/sphere3d.hxx7
-rw-r--r--svx/inc/svx/svdoashp.hxx9
-rw-r--r--svx/inc/svx/svdoattr.hxx5
-rw-r--r--svx/inc/svx/svdobj.hxx7
-rw-r--r--svx/inc/svx/svdocapt.hxx7
-rw-r--r--svx/inc/svx/svdocirc.hxx9
-rw-r--r--svx/inc/svx/svdoedge.hxx7
-rw-r--r--svx/inc/svx/svdograf.hxx10
-rw-r--r--svx/inc/svx/svdogrp.hxx8
-rw-r--r--svx/inc/svx/svdomeas.hxx7
-rw-r--r--svx/inc/svx/svdomedia.hxx3
-rw-r--r--svx/inc/svx/svdoole2.hxx5
-rw-r--r--svx/inc/svx/svdopage.hxx11
-rw-r--r--svx/inc/svx/svdopath.hxx5
-rw-r--r--svx/inc/svx/svdorect.hxx11
-rw-r--r--svx/inc/svx/svdotable.hxx8
-rw-r--r--svx/inc/svx/svdotext.hxx8
-rw-r--r--svx/inc/svx/svdovirt.hxx4
-rw-r--r--svx/inc/svx/svdpage.hxx111
-rw-r--r--svx/inc/svx/unomodel.hxx12
-rw-r--r--svx/prj/d.lst3
-rw-r--r--svx/sdi/svx.sdi25
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx2
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx4
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx13
-rw-r--r--svx/source/dialog/dlgctl3d.cxx21
-rw-r--r--svx/source/dialog/hyprlink.cxx4
-rw-r--r--svx/source/dialog/rubydialog.cxx2
-rw-r--r--svx/source/dialog/srchdlg.src8
-rw-r--r--svx/source/engine3d/dragmt3d.cxx27
-rw-r--r--svx/source/engine3d/scene3d.cxx6
-rw-r--r--svx/source/engine3d/view3d.cxx6
-rw-r--r--svx/source/form/datanavi.cxx2
-rw-r--r--svx/source/form/fmPropBrw.cxx2
-rw-r--r--svx/source/form/fmobj.cxx15
-rw-r--r--svx/source/form/fmshell.cxx11
-rw-r--r--svx/source/form/fmshimp.cxx477
-rw-r--r--svx/source/form/fmstring.src4
-rw-r--r--svx/source/form/formcontroller.cxx2
-rw-r--r--svx/source/inc/fmresids.hrc2
-rw-r--r--svx/source/inc/fmservs.hxx1
-rw-r--r--svx/source/inc/fmshimp.hxx167
-rw-r--r--svx/source/intro/iso.src16
-rw-r--r--svx/source/intro/ooo.src18
-rw-r--r--svx/source/items/svxitems.src4
-rw-r--r--svx/source/sdr/attribute/makefile.mk5
-rw-r--r--svx/source/sdr/attribute/sdrallattribute.cxx408
-rw-r--r--svx/source/sdr/attribute/sdrfilltextattribute.cxx92
-rw-r--r--svx/source/sdr/attribute/sdrformtextattribute.cxx335
-rw-r--r--svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx143
-rw-r--r--svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx95
-rw-r--r--svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx93
-rw-r--r--svx/source/sdr/attribute/sdrshadowtextattribute.cxx85
-rw-r--r--svx/source/sdr/attribute/sdrtextattribute.cxx461
-rw-r--r--svx/source/sdr/contact/viewcontact.cxx3
-rw-r--r--svx/source/sdr/contact/viewcontactofe3d.cxx30
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dcube.cxx17
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dextrude.cxx22
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dlathe.cxx24
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dpolygon.cxx18
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dscene.cxx117
-rw-r--r--svx/source/sdr/contact/viewcontactofe3dsphere.cxx20
-rw-r--r--svx/source/sdr/contact/viewcontactofgraphic.cxx236
-rw-r--r--svx/source/sdr/contact/viewcontactofgroup.cxx26
-rw-r--r--svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx65
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx194
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrcircobj.cxx91
-rw-r--r--svx/source/sdr/contact/viewcontactofsdredgeobj.cxx43
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx149
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx13
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx189
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrole2obj.cxx93
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrpage.cxx68
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrpathobj.cxx163
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrrectobj.cxx105
-rw-r--r--svx/source/sdr/contact/viewcontactofunocontrol.cxx45
-rw-r--r--svx/source/sdr/contact/viewcontactofvirtobj.cxx41
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofe3d.cxx1
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx11
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofgroup.cxx14
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx8
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofpageobj.cxx25
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx4
-rw-r--r--svx/source/sdr/overlay/overlayobjectcell.cxx8
-rw-r--r--svx/source/sdr/overlay/overlayselection.cxx10
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx417
-rw-r--r--svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx65
-rw-r--r--svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx44
-rw-r--r--svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx27
-rw-r--r--svx/source/sdr/primitive2d/sdrdecompositiontools.cxx58
-rw-r--r--svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx116
-rw-r--r--svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx66
-rw-r--r--svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx130
-rw-r--r--svx/source/sdr/primitive2d/sdrole2primitive2d.cxx72
-rw-r--r--svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx2
-rw-r--r--svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx63
-rw-r--r--svx/source/sdr/primitive2d/sdrprimitivetools.cxx17
-rw-r--r--svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx55
-rw-r--r--svx/source/sdr/primitive3d/sdrattributecreator3d.cxx5
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx16
-rw-r--r--svx/source/sdr/properties/makefile.mk1
-rw-r--r--svx/source/sdr/properties/oleproperties.cxx (renamed from drawinglayer/source/primitive2d/hittestprimitive2d.cxx)56
-rw-r--r--svx/source/svdraw/sdrmasterpagedescriptor.cxx47
-rw-r--r--svx/source/svdraw/svddrgmt.cxx57
-rw-r--r--svx/source/svdraw/svdedtv.cxx97
-rw-r--r--svx/source/svdraw/svdhdl.cxx4
-rw-r--r--svx/source/svdraw/svdobj.cxx71
-rw-r--r--svx/source/svdraw/svdocapt.cxx2
-rw-r--r--svx/source/svdraw/svdogrp.cxx8
-rw-r--r--svx/source/svdraw/svdoole2.cxx9
-rw-r--r--svx/source/svdraw/svdopath.cxx12
-rw-r--r--svx/source/svdraw/svdorect.cxx79
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx78
-rw-r--r--svx/source/svdraw/svdpage.cxx215
-rwxr-xr-x[-rw-r--r--]svx/source/svdraw/svdpntv.cxx20
-rw-r--r--svx/source/table/tablehandles.cxx7
-rw-r--r--svx/source/table/viewcontactoftableobj.cxx125
-rw-r--r--svx/source/tbxctrls/tbxcolor.cxx2
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx74
-rw-r--r--svx/source/xml/xmlexport.cxx84
-rw-r--r--svx/xml/AccessibleEditableTextPara.xml1
-rw-r--r--sw/inc/dcontact.hxx2
-rwxr-xr-x[-rw-r--r--]sw/inc/docsh.hxx3
-rw-r--r--sw/inc/fesh.hxx8
-rw-r--r--sw/inc/ndgrf.hxx4
-rw-r--r--sw/inc/ndtxt.hxx4
-rw-r--r--sw/inc/pch/precompiled_sw.hxx1
-rwxr-xr-x[-rw-r--r--]sw/inc/viewsh.hxx7
-rw-r--r--sw/sdi/_docsh.sdi4
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx19
-rw-r--r--sw/source/core/crsr/crsrsh.cxx21
-rw-r--r--sw/source/core/crsr/crstrvl.cxx6
-rw-r--r--sw/source/core/doc/doccomp.cxx52
-rw-r--r--sw/source/core/doc/docglbl.cxx4
-rw-r--r--sw/source/core/doc/doclay.cxx29
-rw-r--r--sw/source/core/doc/docnew.cxx4
-rw-r--r--sw/source/core/doc/notxtfrm.cxx21
-rw-r--r--sw/source/core/draw/dflyobj.cxx26
-rw-r--r--sw/source/core/frmedt/fefly1.cxx73
-rw-r--r--sw/source/core/frmedt/feshview.cxx86
-rw-r--r--sw/source/core/graphic/ndgrf.cxx9
-rw-r--r--sw/source/core/inc/dflyobj.hxx6
-rw-r--r--sw/source/core/inc/layact.hxx6
-rw-r--r--sw/source/core/inc/scrrect.hxx125
-rw-r--r--sw/source/core/inc/txtfrm.hxx3
-rw-r--r--sw/source/core/inc/viewimp.hxx63
-rw-r--r--sw/source/core/layout/atrfrm.cxx40
-rw-r--r--sw/source/core/layout/flowfrm.cxx10
-rw-r--r--sw/source/core/layout/layact.cxx485
-rw-r--r--sw/source/core/layout/paintfrm.cxx4
-rw-r--r--sw/source/core/layout/tabfrm.cxx3
-rw-r--r--sw/source/core/text/frmpaint.cxx68
-rw-r--r--sw/source/core/text/txtfrm.cxx25
-rw-r--r--sw/source/core/txtnode/fntcache.cxx16
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx45
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx8
-rw-r--r--sw/source/core/view/makefile.mk7
-rw-r--r--sw/source/core/view/scrrect.cxx1192
-rw-r--r--sw/source/core/view/viewimp.cxx19
-rw-r--r--sw/source/core/view/viewsh.cxx58
-rw-r--r--sw/source/filter/html/htmlform.cxx2
-rw-r--r--sw/source/filter/html/htmlgrin.cxx1
-rw-r--r--sw/source/ui/app/appenv.cxx4
-rw-r--r--sw/source/ui/app/apphdl.cxx27
-rw-r--r--sw/source/ui/app/applab.cxx26
-rw-r--r--sw/source/ui/app/docsh.cxx7
-rw-r--r--sw/source/ui/app/docsh2.cxx22
-rw-r--r--sw/source/ui/app/docshini.cxx24
-rw-r--r--sw/source/ui/app/docst.cxx16
-rw-r--r--sw/source/ui/app/makefile.mk1
-rw-r--r--sw/source/ui/app/swmodul1.cxx2
-rw-r--r--sw/source/ui/app/swwait.cxx8
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx4
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx20
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx10
-rw-r--r--sw/source/ui/dialog/macassgn.cxx2
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx6
-rw-r--r--sw/source/ui/docvw/docvw.hrc2
-rw-r--r--sw/source/ui/docvw/docvw.src6
-rw-r--r--sw/source/ui/docvw/edtdd.cxx2
-rw-r--r--sw/source/ui/docvw/edtwin.cxx13
-rw-r--r--sw/source/ui/docvw/postit.cxx1
-rw-r--r--sw/source/ui/docvw/romenu.cxx4
-rw-r--r--sw/source/ui/fldui/fldedt.cxx2
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx2
-rw-r--r--sw/source/ui/lingu/olmenu.cxx6
-rw-r--r--sw/source/ui/misc/glossary.cxx2
-rw-r--r--sw/source/ui/misc/glshell.cxx4
-rw-r--r--sw/source/ui/misc/insfnote.cxx2
-rw-r--r--sw/source/ui/misc/srtdlg.cxx2
-rwxr-xr-xsw/source/ui/shells/annotsh.cxx2
-rw-r--r--sw/source/ui/shells/basesh.cxx8
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx2
-rw-r--r--sw/source/ui/shells/frmsh.cxx2
-rw-r--r--sw/source/ui/shells/grfsh.cxx2
-rw-r--r--sw/source/ui/shells/grfshex.cxx2
-rw-r--r--sw/source/ui/shells/makefile.mk1
-rw-r--r--sw/source/ui/shells/tabsh.cxx2
-rw-r--r--sw/source/ui/shells/textsh.cxx2
-rw-r--r--sw/source/ui/shells/txtattr.cxx2
-rw-r--r--sw/source/ui/uiview/pview.cxx24
-rw-r--r--sw/source/ui/uiview/srcview.cxx4
-rw-r--r--sw/source/ui/uiview/view.cxx31
-rw-r--r--sw/source/ui/uiview/view2.cxx3
-rw-r--r--sw/source/ui/uiview/viewdraw.cxx4
-rw-r--r--sw/source/ui/uiview/viewling.cxx5
-rw-r--r--sw/source/ui/uiview/viewmdi.cxx6
-rw-r--r--sw/source/ui/uiview/viewport.cxx8
-rw-r--r--sw/source/ui/uno/unodispatch.cxx3
-rw-r--r--sw/source/ui/uno/unodoc.cxx4
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx4
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx10
-rw-r--r--sw/source/ui/uno/unotxvw.cxx2
-rw-r--r--sw/source/ui/utlui/navipi.cxx2
-rw-r--r--sw/source/ui/utlui/numfmtlb.cxx2
-rw-r--r--sw/source/ui/utlui/uitool.cxx2
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx13
-rwxr-xr-xswext/mediawiki/help/component.txt4
-rw-r--r--swext/mediawiki/src/description.xml4
-rw-r--r--sysui/desktop/icons/database.icnsbin0 -> 48416 bytes
-rw-r--r--sysui/desktop/icons/database.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/drawing-template.icnsbin10935 -> 48006 bytes
-rw-r--r--sysui/desktop/icons/drawing-template.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/drawing.icnsbin11290 -> 46878 bytes
-rw-r--r--sysui/desktop/icons/drawing.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/empty-document.icnsbin50465 -> 37502 bytes
-rw-r--r--sysui/desktop/icons/empty-document.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/empty-template.icnsbin47059 -> 39059 bytes
-rw-r--r--sysui/desktop/icons/empty-template.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/formula.icnsbin10380 -> 41940 bytes
-rw-r--r--sysui/desktop/icons/formula.icobin0 -> 295606 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/base.pngbin16745 -> 17674 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/apps/calc.pngbin12968 -> 15582 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/draw.pngbin16732 -> 16479 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/impress.pngbin14614 -> 17785 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/main.pngbin12442 -> 15601 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/math.pngbin12934 -> 15536 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/apps/writer.pngbin11861 -> 14510 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/database.pngbin0 -> 5874 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/drawing-template.pngbin0 -> 6217 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/drawing.pngbin0 -> 6387 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/formula.pngbin0 -> 4353 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/master-document.pngbin0 -> 2662 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.pngbin15854 -> 6845 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.pngbin16120 -> 7206 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.pngbin16063 -> 7373 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.pngbin12936 -> 5370 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.pngbin11992 -> 3703 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.pngbin13955 -> 6193 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.pngbin13654 -> 5434 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.pngbin12792 -> 5753 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.pngbin12338 -> 4617 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.pngbin12100 -> 6763 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.pngbin11770 -> 6847 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.pngbin17754 -> 3493 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/presentation-template.pngbin0 -> 5212 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/presentation.pngbin0 -> 4459 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet-template.pngbin0 -> 4764 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet.pngbin0 -> 3598 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/text-template.pngbin0 -> 5772 bytes
-rw-r--r--sysui/desktop/icons/hicolor/128x128/mimetypes/text.pngbin0 -> 5817 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/base.pngbin3618 -> 869 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/calc.pngbin3629 -> 779 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/draw.pngbin3606 -> 875 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/impress.pngbin3608 -> 837 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/16x16/apps/main.pngbin0 -> 893 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/math.pngbin3607 -> 791 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/apps/writer.pngbin3586 -> 776 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/database.pngbin291 -> 555 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.pngbin348 -> 522 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.pngbin354 -> 555 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/formula.pngbin252 -> 562 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.pngbin310 -> 450 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.pngbin1009 -> 574 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.pngbin1094 -> 554 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.pngbin1082 -> 572 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.pngbin1014 -> 580 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.pngbin929 -> 472 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.pngbin1025 -> 532 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.pngbin960 -> 441 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.pngbin1018 -> 538 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.pngbin961 -> 436 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.pngbin986 -> 444 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.pngbin923 -> 420 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.pngbin1023 -> 436 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.pngbin303 -> 515 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.pngbin302 -> 425 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.pngbin287 -> 513 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.pngbin271 -> 412 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.pngbin240 -> 413 bytes
-rw-r--r--sysui/desktop/icons/hicolor/16x16/mimetypes/text.pngbin245 -> 392 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/base.pngbin3153 -> 2594 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/calc.pngbin2731 -> 2258 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/draw.pngbin3147 -> 2491 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/impress.pngbin2903 -> 2576 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/32x32/apps/main.pngbin0 -> 2429 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/math.pngbin2715 -> 2371 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/apps/writer.pngbin2485 -> 2158 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/database.pngbin529 -> 1319 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.pngbin1344 -> 1307 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.pngbin1483 -> 1363 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/formula.pngbin1349 -> 1172 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.pngbin1559 -> 909 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.pngbin2922 -> 1497 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.pngbin2957 -> 1506 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.pngbin2828 -> 1548 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.pngbin2622 -> 1346 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.pngbin2338 -> 1110 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.pngbin2812 -> 1370 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.pngbin2623 -> 1180 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.pngbin2856 -> 1130 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.pngbin2618 -> 917 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.pngbin2575 -> 1153 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.pngbin2311 -> 1106 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.pngbin2908 -> 966 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.pngbin1403 -> 1166 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.pngbin1515 -> 982 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.pngbin1211 -> 919 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.pngbin1301 -> 692 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.pngbin1211 -> 941 bytes
-rw-r--r--sysui/desktop/icons/hicolor/32x32/mimetypes/text.pngbin1406 -> 903 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/base.pngbin5196 -> 4740 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/calc.pngbin4319 -> 4298 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/draw.pngbin5207 -> 4415 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/impress.pngbin4974 -> 4672 bytes
-rwxr-xr-xsysui/desktop/icons/hicolor/48x48/apps/main.pngbin0 -> 4184 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/math.pngbin4489 -> 4263 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/apps/writer.pngbin3938 -> 3983 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/database.pngbin652 -> 1862 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.pngbin1819 -> 1923 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.pngbin1913 -> 1962 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/formula.pngbin1803 -> 1589 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.pngbin2003 -> 1160 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.pngbin5032 -> 2430 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.pngbin4919 -> 2482 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.pngbin4935 -> 2518 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.pngbin4422 -> 2171 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.pngbin3808 -> 1741 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.pngbin4650 -> 2376 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.pngbin4611 -> 2125 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.pngbin4409 -> 2400 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.pngbin4211 -> 2079 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.pngbin4023 -> 2125 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.pngbin3785 -> 2094 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.pngbin4854 -> 1537 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.pngbin2044 -> 1792 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.pngbin2043 -> 1551 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.pngbin1599 -> 1829 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.pngbin1684 -> 1476 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.pngbin1687 -> 1552 bytes
-rw-r--r--sysui/desktop/icons/hicolor/48x48/mimetypes/text.pngbin1764 -> 1525 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/main.icnsbin45712 -> 51889 bytes
-rw-r--r--sysui/desktop/icons/makefile.mk27
-rw-r--r--sysui/desktop/icons/master-document.icnsbin11003 -> 41443 bytes
-rw-r--r--sysui/desktop/icons/master-document.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-database.icnsbin53983 -> 51503 bytes
-rw-r--r--sysui/desktop/icons/oasis-database.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-drawing-template.icnsbin53400 -> 51093 bytes
-rw-r--r--sysui/desktop/icons/oasis-drawing-template.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-drawing.icnsbin52603 -> 49965 bytes
-rw-r--r--sysui/desktop/icons/oasis-drawing.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-empty-document.icnsbin0 -> 40589 bytes
-rw-r--r--sysui/desktop/icons/oasis-empty-document.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-empty-template.icnsbin0 -> 42146 bytes
-rw-r--r--sysui/desktop/icons/oasis-empty-template.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-formula.icnsbin50335 -> 45027 bytes
-rw-r--r--sysui/desktop/icons/oasis-formula.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-master-document.icnsbin48904 -> 44531 bytes
-rw-r--r--sysui/desktop/icons/oasis-master-document.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-presentation-template.icnsbin51890 -> 47163 bytes
-rw-r--r--sysui/desktop/icons/oasis-presentation-template.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-presentation.icnsbin51073 -> 43638 bytes
-rw-r--r--sysui/desktop/icons/oasis-presentation.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-spreadsheet-template.icnsbin51919 -> 52924 bytes
-rw-r--r--sysui/desktop/icons/oasis-spreadsheet-template.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-spreadsheet.icnsbin50953 -> 51578 bytes
-rw-r--r--sysui/desktop/icons/oasis-spreadsheet.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-text-template.icnsbin49196 -> 49722 bytes
-rw-r--r--sysui/desktop/icons/oasis-text-template.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-text.icnsbin47545 -> 48791 bytes
-rw-r--r--sysui/desktop/icons/oasis-text.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/oasis-web-template.icnsbin55853 -> 42146 bytes
-rw-r--r--sysui/desktop/icons/oasis-web-template.icobin0 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_base_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_calc_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_draw_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_impress_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_main_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_math_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/ooo3_writer_app.icobin295606 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/presentation-template.icnsbin10690 -> 44076 bytes
-rw-r--r--sysui/desktop/icons/presentation-template.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/presentation.icnsbin10947 -> 40551 bytes
-rw-r--r--sysui/desktop/icons/presentation.icobin0 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-base-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-calc-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-calc-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-chart-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-draw-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-draw-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-impress-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-impress-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-master-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-math-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-writer-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so7-writer-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-base-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-base-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-calc-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-calc-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-calc-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-chart-doc.icobin10134 -> 10134 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-configuration.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-draw-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-draw-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-draw-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-empty-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-empty-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-image-doc.icobin10134 -> 10134 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-impress-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-impress-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-impress-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-macro-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-main-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-master-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-math-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-math-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-open.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-printer.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-web-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-writer-app.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-writer-doc.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so8-writer-tem.icobin25214 -> 25214 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_base_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_base_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_calc_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_calc_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_calc_tem.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_chart_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_draw_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_draw_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_draw_tem.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_empty_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_empty_tem.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_global_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_html_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_impress_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_impress_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_impress_tem.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_macro_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_main_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_math_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_math_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_writer_app.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_writer_doc.icobin295606 -> 295606 bytes
-rwxr-xr-x[-rw-r--r--]sysui/desktop/icons/so9_writer_tem.icobin295606 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/spreadsheet-template.icnsbin10085 -> 49837 bytes
-rw-r--r--sysui/desktop/icons/spreadsheet-template.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/spreadsheet.icnsbin10457 -> 48491 bytes
-rw-r--r--sysui/desktop/icons/spreadsheet.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/text-template.icnsbin10095 -> 46635 bytes
-rw-r--r--sysui/desktop/icons/text-template.icobin0 -> 295606 bytes
-rw-r--r--sysui/desktop/icons/text.icnsbin10401 -> 45704 bytes
-rw-r--r--sysui/desktop/icons/text.icobin0 -> 295606 bytes
-rw-r--r--sysui/prj/d.lst2
-rw-r--r--sysui/source/win32/QuickStart/OOQuickStart.rc8
-rw-r--r--sysui/source/win32/QuickStart/so/QuickStart.rc10
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_General.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/ctrl_Wizards.inc23
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc122
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/frm_FormFilter.inc18
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/misc_Macros.inc12
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc71
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/DatabaseTypes.inc23
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/required/includes/MainApp.inc6
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/dbcreatetools.inc66
-rwxr-xr-x[-rw-r--r--]testautomation/dbaccess/tools/dbtools.inc68
-rwxr-xr-xtestautomation/framework/optional/f_security_incorrect_password.bas6
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_shared_modules.inc15
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc9
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc10
-rwxr-xr-x[-rw-r--r--]testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc11
-rw-r--r--testautomation/framework/optional/includes/security_incorrect_password.inc116
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/input/filternames/Oracle Open Office_Filternames_add_en-US.txt (renamed from testautomation/framework/optional/input/filternames/StarOffice_Filternames_add_en-US.txt)52
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/input/filternames/Oracle Open Office_Filternames_en-US.txt (renamed from testautomation/framework/optional/input/filternames/StarOffice_Filternames_en-US.txt)55
-rwxr-xr-xtestautomation/framework/optional/input/filternames/StarSuite_Filternames_en-US.txt122
-rw-r--r--testautomation/framework/optional/input/help_browser/Oracle Open Office_help_applications_en-US.txt8
-rw-r--r--testautomation/framework/optional/input/help_browser/Oracle Open Office_help_topics_en-US.txt22002
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/input/help_browser/Oracle Open Office_search_headings_and_whole_words_en-US.txt (renamed from testautomation/framework/optional/input/help_browser/StarOffice_search_headings_and_whole_words_en-US.txt)6
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/input/help_browser/Oracle Open Office_search_headings_only_en-US.txt (renamed from testautomation/framework/optional/input/help_browser/StarOffice_search_headings_only_en-US.txt)8
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/input/help_browser/Oracle Open Office_search_whole_words_only_en-US.txt (renamed from testautomation/framework/optional/input/help_browser/StarOffice_search_whole_words_only_en-US.txt)26
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/input/help_browser/Oracle Open Office_search_without_filter_en-US.txt (renamed from testautomation/framework/optional/input/help_browser/StarOffice_search_without_filter_en-US.txt)34
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarOffice_help_applications_en-US.txt8
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarOffice_help_content_en-US.txt868
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarOffice_help_topics_en-US.txt21964
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarSuite_help_applications_en-US.txt8
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarSuite_help_content_en-US.txt869
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarSuite_help_topics_en-US.txt21949
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarSuite_search_headings_and_whole_words_en-US.txt6
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarSuite_search_headings_only_en-US.txt7
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarSuite_search_whole_words_only_en-US.txt16
-rwxr-xr-xtestautomation/framework/optional/input/help_browser/StarSuite_search_without_filter_en-US.txt22
-rwxr-xr-xtestautomation/framework/required/f_script_organizers.bas1
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/script_organizers.inc15
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/window_functions.inc26
-rwxr-xr-x[-rw-r--r--]testautomation/framework/required/includes/wizard_firsttime.inc18
-rwxr-xr-x[-rw-r--r--]testautomation/global/sid/all.sid2
-rwxr-xr-xtestautomation/global/sid/bars.sid10
-rwxr-xr-xtestautomation/global/sid/e_all.sid1
-rwxr-xr-x[-rw-r--r--]testautomation/global/system/includes/gvariabl.inc1
-rwxr-xr-x[-rw-r--r--]testautomation/global/system/includes/iniinfo.inc3
-rwxr-xr-x[-rw-r--r--]testautomation/global/system/includes/master.inc2
-rw-r--r--testautomation/global/system/includes/status.inc2
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/optional/t_security_tools.inc8
-rwxr-xr-x[-rw-r--r--]testautomation/global/tools/includes/required/t_menu.inc324
-rwxr-xr-xtestautomation/global/win/bars.win1
-rwxr-xr-xtestautomation/global/win/dial_t_z.win16
-rwxr-xr-xtestautomation/global/win/edia_d_h.win15
-rwxr-xr-xtestautomation/global/win/edia_i_o.win9
-rwxr-xr-xtestautomation/global/win/edia_t_z.win19
-rwxr-xr-x[-rw-r--r--]testautomation/graphics/optional/includes/global/export_graphic_2.inc41
-rwxr-xr-x[-rw-r--r--]testautomation/spreadsheet/required/includes/c_upd_filemenu.inc93
-rw-r--r--testautomation/spreadsheet/required/input/HTML_Doc_Numberformats_in_table.html107
-rwxr-xr-xtestautomation/tools/run_tests/run_tests.vbs90
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/clipboard/clipbrd_func.inc6
-rwxr-xr-x[-rw-r--r--]testautomation/writer/optional/includes/regexp/search.inc2
-rwxr-xr-xtesttools/source/cliversioning/version_libs/version_3_2.dllbin0 -> 11776 bytes
-rw-r--r--toolkit/inc/toolkit/helper/property.hxx1
-rw-r--r--toolkit/source/awt/vclxaccessiblecomponent.cxx8
-rw-r--r--toolkit/source/awt/vclxwindow.cxx4
-rw-r--r--toolkit/source/helper/property.cxx1
-rw-r--r--tools/inc/tools/diagnose_ex.h23
-rw-r--r--tools/inc/tools/wintypes.hxx5
-rw-r--r--unoil/climaker/version.txt6
-rw-r--r--unotools/inc/unotools/saveopt.hxx4
-rw-r--r--unotools/source/config/saveopt.cxx60
-rw-r--r--uui/source/iahndl.cxx211
-rw-r--r--uui/source/iahndl.hxx26
-rw-r--r--vbahelper/source/vbahelper/vbahelper.cxx2
-rw-r--r--vcl/aqua/inc/salbmp.h1
-rw-r--r--vcl/aqua/source/dtrans/DataFlavorMapping.cxx60
-rw-r--r--vcl/aqua/source/dtrans/DataFlavorMapping.hxx5
-rw-r--r--vcl/aqua/source/dtrans/OSXTransferable.cxx5
-rw-r--r--vcl/aqua/source/dtrans/PictToBmpFlt.cxx91
-rw-r--r--vcl/aqua/source/dtrans/PictToBmpFlt.hxx15
-rw-r--r--vcl/aqua/source/gdi/makefile.mk1
-rw-r--r--vcl/aqua/source/gdi/salnativewidgets.cxx93
-rw-r--r--vcl/inc/vcl/decoview.hxx2
-rw-r--r--vcl/inc/vcl/fontmanager.hxx2
-rw-r--r--vcl/inc/vcl/introwin.hxx2
-rw-r--r--vcl/inc/vcl/outdev.hxx23
-rw-r--r--vcl/inc/vcl/pdfwriter.hxx7
-rw-r--r--vcl/inc/vcl/region.hxx4
-rw-r--r--vcl/inc/vcl/salnativewidgets.hxx16
-rw-r--r--vcl/inc/vcl/status.hxx1
-rw-r--r--vcl/inc/vcl/tabctrl.hxx6
-rw-r--r--vcl/inc/vcl/tabdlg.hxx2
-rw-r--r--vcl/source/control/button.cxx36
-rw-r--r--vcl/source/control/fixed.cxx28
-rw-r--r--vcl/source/control/slider.cxx71
-rw-r--r--vcl/source/control/tabctrl.cxx100
-rw-r--r--vcl/source/fontsubset/cff.cxx128
-rw-r--r--vcl/source/gdi/bitmapex.cxx2
-rw-r--r--vcl/source/gdi/outdev3.cxx12
-rw-r--r--vcl/source/gdi/outmap.cxx210
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx15
-rw-r--r--vcl/source/gdi/pdfwriter.cxx4
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx596
-rw-r--r--vcl/source/gdi/pdfwriter_impl.hxx47
-rw-r--r--vcl/source/gdi/pngwrite.cxx1
-rw-r--r--vcl/source/gdi/region.cxx27
-rw-r--r--vcl/source/gdi/salgdilayout.cxx6
-rwxr-xr-xvcl/source/gdi/sallayout.cxx6
-rw-r--r--vcl/source/window/decoview.cxx33
-rw-r--r--vcl/source/window/dlgctrl.cxx64
-rw-r--r--vcl/source/window/introwin.cxx9
-rw-r--r--vcl/source/window/mnemonic.cxx68
-rw-r--r--vcl/source/window/status.cxx104
-rw-r--r--vcl/source/window/tabdlg.cxx17
-rw-r--r--vcl/source/window/window.cxx7
-rw-r--r--vcl/source/window/window3.cxx6
-rw-r--r--vcl/source/window/winproc.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkbridge.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkutil.cxx8
-rw-r--r--vcl/unx/gtk/app/gtkdata.cxx6
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx210
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx18
-rw-r--r--vcl/unx/headless/svpframe.cxx27
-rw-r--r--vcl/unx/inc/plugins/gtk/gtkgdi.hxx5
-rw-r--r--vcl/unx/inc/saldisp.hxx1
-rw-r--r--vcl/unx/kde4/KDESalGraphics.cxx479
-rw-r--r--vcl/unx/kde4/KDESalGraphics.hxx10
-rw-r--r--vcl/unx/source/app/saldisp.cxx58
-rw-r--r--vcl/unx/source/fontmanager/fontconfig.cxx7
-rw-r--r--vcl/unx/source/fontmanager/fontmanager.cxx8
-rw-r--r--vcl/unx/source/fontmanager/parseAFM.cxx254
-rw-r--r--vcl/unx/source/gdi/gcach_xpeer.cxx2
-rw-r--r--vcl/unx/source/gdi/salgdi3.cxx2
-rw-r--r--vcl/unx/source/gdi/xrender_peer.cxx22
-rw-r--r--vcl/unx/source/gdi/xrender_peer.hxx9
-rw-r--r--vcl/win/source/gdi/salnativewidgets-luna.cxx68
-rw-r--r--vcl/win/source/window/MAKEFILE.MK7
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java7
-rw-r--r--wizards/com/sun/star/wizards/common/NamedValueCollection.java90
-rw-r--r--wizards/com/sun/star/wizards/db/CommandMetaData.java88
-rw-r--r--wizards/com/sun/star/wizards/db/DBMetaData.java101
-rw-r--r--wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java75
-rw-r--r--wizards/com/sun/star/wizards/db/RecordParser.java2
-rw-r--r--wizards/com/sun/star/wizards/db/SQLQueryComposer.java2
-rw-r--r--wizards/com/sun/star/wizards/db/TableDescriptor.java11
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java6
-rw-r--r--wizards/com/sun/star/wizards/form/CallFormWizard.java30
-rw-r--r--wizards/com/sun/star/wizards/form/Finalizer.java9
-rw-r--r--wizards/com/sun/star/wizards/form/FormWizard.java88
-rw-r--r--wizards/com/sun/star/wizards/form/XCallFormWizard.java37
-rw-r--r--wizards/com/sun/star/wizards/form/makefile.mk1
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java6
-rw-r--r--wizards/com/sun/star/wizards/makefile.mk2
-rw-r--r--wizards/com/sun/star/wizards/query/CallQueryWizard.java38
-rw-r--r--wizards/com/sun/star/wizards/query/Finalizer.java93
-rw-r--r--wizards/com/sun/star/wizards/query/QueryWizard.java87
-rw-r--r--wizards/com/sun/star/wizards/query/XCallQueryWizard.java38
-rw-r--r--wizards/com/sun/star/wizards/query/makefile.mk1
-rw-r--r--wizards/com/sun/star/wizards/report/CallReportWizard.java63
-rw-r--r--wizards/com/sun/star/wizards/report/Dataimport.java8
-rw-r--r--wizards/com/sun/star/wizards/report/IReportDocument.java18
-rw-r--r--wizards/com/sun/star/wizards/report/ReportTextImplementation.java106
-rw-r--r--wizards/com/sun/star/wizards/report/ReportWizard.java482
-rw-r--r--wizards/com/sun/star/wizards/report/XCallReportWizard.java38
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java385
-rw-r--r--wizards/com/sun/star/wizards/table/CallTableWizard.java43
-rw-r--r--wizards/com/sun/star/wizards/table/TableWizard.java82
-rw-r--r--wizards/com/sun/star/wizards/table/XCallTableWizard.java38
-rw-r--r--wizards/com/sun/star/wizards/table/makefile.mk1
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java16
-rw-r--r--wizards/com/sun/star/wizards/web/WWD_Events.java3
-rw-r--r--wizards/source/formwizard/DBMeta.xba2
-rw-r--r--xmlhelp/source/com/sun/star/help/makefile.mk28
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx45
-rw-r--r--xmloff/inc/xmloff/SettingsExportHelper.hxx16
-rw-r--r--xmloff/inc/xmloff/XMLSettingsExportContext.hxx66
-rw-r--r--xmloff/prj/d.lst1
-rw-r--r--xmloff/source/core/SettingsExportHelper.cxx131
-rw-r--r--xmloff/source/core/xmlexp.cxx74
-rw-r--r--xmloff/source/style/styleexp.cxx22
-rw-r--r--xmloff/source/text/XMLTextNumRuleInfo.cxx9
-rw-r--r--xmlsecurity/prj/d.lst8
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx2
1989 files changed, 69773 insertions, 79367 deletions
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
index fe4bd8389d09..1e5bb36ec03d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
@@ -53,13 +53,12 @@ class VCLXAccessibleEdit : public VCLXAccessibleTextComponent,
friend class VCLXAccessibleBox;
private:
+ sal_Int32 m_nSelectionStart;
sal_Int32 m_nCaretPosition;
protected:
virtual ~VCLXAccessibleEdit();
- void UpdateCaretPosition();
-
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
diff --git a/accessibility/source/extended/makefile.mk b/accessibility/source/extended/makefile.mk
index bafd2b40c334..446ec73ec1b7 100644
--- a/accessibility/source/extended/makefile.mk
+++ b/accessibility/source/extended/makefile.mk
@@ -37,6 +37,9 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
+.IF "$(OS)$(COM)"=="SOLARISI"
+NOOPTFILES=$(SLO)$/accessibletabbarpagelist.obj
+.ENDIF # "$(OS)$(COM)"=="SOLARISI"
SLOFILES=\
$(SLO)$/AccessibleBrowseBoxCheckBoxCell.obj \
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 8fe463d00c05..50d3ac682377 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -395,7 +395,7 @@ inline bool hasFloatingChild(Window *pWindow)
else
xContext = new FloatingWindowAccessible( _pXWindow );
}
- else if ( nType == WINDOW_HELPTEXTWINDOW )
+ else if ( ( nType == WINDOW_HELPTEXTWINDOW ) || ( nType == WINDOW_FIXEDLINE ) )
{
xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleFixedText( _pXWindow );
}
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 0dd8376580ec..07378c0ea42f 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -67,6 +67,7 @@ using namespace ::comphelper;
VCLXAccessibleEdit::VCLXAccessibleEdit( VCLXWindow* pVCLWindow )
:VCLXAccessibleTextComponent( pVCLWindow )
{
+ m_nSelectionStart = getSelectionStart();
m_nCaretPosition = getCaretPosition();
}
@@ -78,22 +79,6 @@ VCLXAccessibleEdit::~VCLXAccessibleEdit()
// -----------------------------------------------------------------------------
-void VCLXAccessibleEdit::UpdateCaretPosition()
-{
- sal_Int32 nCaretPosition = getCaretPosition();
-
- if ( m_nCaretPosition != nCaretPosition )
- {
- Any aOldValue, aNewValue;
- aOldValue <<= (sal_Int32) m_nCaretPosition;
- aNewValue <<= (sal_Int32) nCaretPosition;
- m_nCaretPosition = nCaretPosition;
- NotifyAccessibleEvent( AccessibleEventId::CARET_CHANGED, aOldValue, aNewValue );
- }
-}
-
-// -----------------------------------------------------------------------------
-
void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
{
switch ( rVclWindowEvent.GetId() )
@@ -105,11 +90,31 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
break;
case VCLEVENT_EDIT_SELECTIONCHANGED:
{
+ sal_Int32 nOldCaretPosition = m_nCaretPosition;
+ sal_Int32 nOldSelectionStart = m_nSelectionStart;
+
+ m_nCaretPosition = getCaretPosition();
+ m_nSelectionStart = getSelectionStart();
+
Window* pWindow = GetWindow();
if ( pWindow && pWindow->HasChildPathFocus() )
{
- NotifyAccessibleEvent( AccessibleEventId::TEXT_SELECTION_CHANGED, Any(), Any() );
- UpdateCaretPosition();
+ if ( m_nCaretPosition != nOldCaretPosition )
+ {
+ Any aOldValue, aNewValue;
+ aOldValue <<= (sal_Int32) nOldCaretPosition;
+ aNewValue <<= (sal_Int32) m_nCaretPosition;
+ NotifyAccessibleEvent( AccessibleEventId::CARET_CHANGED, aOldValue, aNewValue );
+ }
+
+ // #i104470# VCL only has SELECTION_CHANGED, but UAA distinguishes between SELECTION_CHANGED and CARET_CHANGED
+ sal_Bool bHasSelection = ( m_nSelectionStart != m_nCaretPosition );
+ sal_Bool bHadSelection = ( nOldSelectionStart != nOldCaretPosition );
+ if ( ( bHasSelection != bHadSelection ) || ( bHasSelection && ( ( m_nCaretPosition != nOldCaretPosition ) || ( m_nSelectionStart != nOldSelectionStart ) ) ) )
+ {
+ NotifyAccessibleEvent( AccessibleEventId::TEXT_SELECTION_CHANGED, Any(), Any() );
+ }
+
}
}
break;
@@ -305,22 +310,13 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBin
sal_Int32 VCLXAccessibleEdit::getCaretPosition( ) throw (RuntimeException)
{
- OExternalLockGuard aGuard( this );
-
- awt::Selection aSelection;
- VCLXEdit* pVCLXEdit = static_cast< VCLXEdit* >( GetVCLXWindow() );
- if ( pVCLXEdit )
- aSelection = pVCLXEdit->getSelection();
-
- return aSelection.Max;
+ return getSelectionEnd();
}
// -----------------------------------------------------------------------------
sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
- OExternalLockGuard aGuard( this );
-
return setSelection( nIndex, nIndex );
}
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index e56dcda81a9f..cdf4c58015ba 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -35,6 +35,7 @@
#define GLOBALOVERFLOW2
#include <sfx2/docfac.hxx>
+#include <sfx2/sfxmodelfactory.hxx>
#include <vcl/status.hxx>
#include <svx/xmlsecctrl.hxx>
@@ -57,12 +58,12 @@ SFX_IMPL_INTERFACE( BasicDocShell, SfxObjectShell, IDEResId( 0 ) )
SFX_STATUSBAR_REGISTRATION( IDEResId( SID_BASICIDE_STATUSBAR ) );
}
-BasicDocShell::BasicDocShell( SfxObjectCreateMode eMode ) : SfxObjectShell( eMode )
+BasicDocShell::BasicDocShell()
+ :SfxObjectShell( SFXMODEL_DISABLE_EMBEDDED_SCRIPTS | SFXMODEL_DISABLE_DOCUMENT_RECOVERY )
{
pPrinter = 0;
SetPool( &SFX_APP()->GetPool() );
- SetHasNoBasic();
- SetModel( new SIDEModel(this) );
+ SetBaseModel( new SIDEModel(this) );
}
__EXPORT BasicDocShell::~BasicDocShell()
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index e1832a27521a..1ef5991cfab4 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -56,7 +56,7 @@ public:
using SotObject::GetInterface;
SFX_DECL_OBJECTFACTORY();
SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_DOCSH )
- BasicDocShell( SfxObjectCreateMode eMode = SFX_CREATE_MODE_STANDARD );
+ BasicDocShell();
~BasicDocShell();
SfxPrinter* GetPrinter( BOOL bCreate );
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 909a28543fae..4432de9aa282 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -299,10 +299,10 @@ void __EXPORT BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
{
// get statusindicator
SfxViewFrame *pFrame_ = GetFrame();
- if ( pFrame_ && pFrame_->GetFrame() )
+ if ( pFrame_ )
{
uno::Reference< task::XStatusIndicatorFactory > xStatFactory(
- pFrame_->GetFrame()->GetFrameInterface(),
+ pFrame_->GetFrame().GetFrameInterface(),
uno::UNO_QUERY );
if( xStatFactory.is() )
xStatusIndicator = xStatFactory->createStatusIndicator();
@@ -1153,7 +1153,7 @@ void BasicIDEShell::ManageToolbars()
return;
Reference< beans::XPropertySet > xFrameProps
- ( GetViewFrame()->GetFrame()->GetFrameInterface(), uno::UNO_QUERY );
+ ( GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY );
if ( xFrameProps.is() )
{
Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 2c3ccc4eb678..23978f4df10b 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -104,7 +104,7 @@ SFX_IMPL_INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
-#define IDE_VIEWSHELL_FLAGS SFX_VIEW_MAXIMIZE_FIRST|SFX_VIEW_CAN_PRINT|SFX_VIEW_NO_NEWWINDOW
+#define IDE_VIEWSHELL_FLAGS SFX_VIEW_CAN_PRINT|SFX_VIEW_NO_NEWWINDOW
// Hack for #101048
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 996a4e772be1..95c27c65acdb 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -77,7 +77,7 @@ void LocalizationMgr::handleTranslationbar( void )
::rtl::OUString::createFromAscii( "private:resource/toolbar/translationbar" );
Reference< beans::XPropertySet > xFrameProps
- ( m_pIDEShell->GetViewFrame()->GetFrame()->GetFrameInterface(), uno::UNO_QUERY );
+ ( m_pIDEShell->GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY );
if ( xFrameProps.is() )
{
Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk
index 70681b50f35a..6a08349b0979 100644
--- a/basctl/source/basicide/makefile.mk
+++ b/basctl/source/basicide/makefile.mk
@@ -66,6 +66,7 @@ EXCEPTIONSFILES=$(SLO)$/basicrenderable.obj \
$(SLO)$/moduldl2.obj \
$(SLO)$/unomodel.obj \
$(SLO)$/register.obj \
+ $(SLO)$/basdoc.obj \
$(SLO)$/tbxctl.obj \
$(SLO)$/basidectrlr.obj \
$(SLO)$/localizationmgr.obj \
@@ -74,7 +75,6 @@ EXCEPTIONSFILES=$(SLO)$/basicrenderable.obj \
$(SLO)$/documentenumeration.obj
SLOFILES = $(EXCEPTIONSFILES) \
- $(SLO)$/basdoc.obj \
$(SLO)$/basicbox.obj \
$(SLO)$/baside2b.obj \
$(SLO)$/brkdlg.obj \
diff --git a/basegfx/inc/basegfx/numeric/ftools.hxx b/basegfx/inc/basegfx/numeric/ftools.hxx
index b973adb8650b..0a4cdfcffdaa 100644
--- a/basegfx/inc/basegfx/numeric/ftools.hxx
+++ b/basegfx/inc/basegfx/numeric/ftools.hxx
@@ -175,7 +175,7 @@ namespace basegfx
static bool equal(const double& rfValA, const double& rfValB, const double& rfSmallValue)
{
- return (fabs(rfValA) - fabs(rfValB) <= rfSmallValue);
+ return (fabs(rfValA - rfValB) <= rfSmallValue);
}
static bool less(const double& rfValA, const double& rfValB)
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
index 538baa89aa81..a9d6e0a1b6fe 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
@@ -65,6 +65,14 @@ namespace basegfx
B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPolyPolygon& rMask);
B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rMask);
+ // look for self-intersections in given polygon and add extra points there. Result will have no
+ // intersections on an edge
+ B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate);
+
+ // add points at all self-intersections of single polygons (depends on bSelfIntersections)
+ // and at polygon-polygon intersections
+ B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, bool bSelfIntersections = true);
+
} // end of namespace tools
} // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
index bea0de5c98d6..7d1d0bc9660c 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
@@ -271,6 +271,10 @@ namespace basegfx
*/
B2DPolygon createPolygonFromRect( const B2DRectangle& rRect );
+ /** Create the unit polygon
+ */
+ B2DPolygon createUnitPolygon();
+
/** Create a circle polygon with given radius.
This method creates a circle approximation consisting of
diff --git a/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx b/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx
new file mode 100644
index 000000000000..70ffdf2b7339
--- /dev/null
+++ b/basegfx/inc/basegfx/polygon/b2dtrapezoid.hxx
@@ -0,0 +1,132 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: b2dpolygontriangulator.hxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _BGFX_POLYGON_B2DTRAPEZOID_HXX
+#define _BGFX_POLYGON_B2DTRAPEZOID_HXX
+
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <vector>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+ // class to hold a single trapezoid
+ class B2DTrapezoid
+ {
+ private:
+ // Geometry data. YValues are down-oriented, this means bottom should
+ // be bigger than top to be below it. The constructor implementation
+ // guarantees:
+ //
+ // - mfBottomY >= mfTopY
+ // - mfTopXRight >= mfTopXLeft
+ // - mfBottomXRight >= mfBottomXLeft
+ double mfTopXLeft;
+ double mfTopXRight;
+ double mfTopY;
+ double mfBottomXLeft;
+ double mfBottomXRight;
+ double mfBottomY;
+
+ public:
+ // constructor
+ B2DTrapezoid(
+ const double& rfTopXLeft,
+ const double& rfTopXRight,
+ const double& rfTopY,
+ const double& rfBottomXLeft,
+ const double& rfBottomXRight,
+ const double& rfBottomY);
+
+ // data read access
+ const double& getTopXLeft() const { return mfTopXLeft; }
+ const double& getTopXRight() const { return mfTopXRight; }
+ const double& getTopY() const { return mfTopY; }
+ const double& getBottomXLeft() const { return mfBottomXLeft; }
+ const double& getBottomXRight() const { return mfBottomXRight; }
+ const double& getBottomY() const { return mfBottomY; }
+
+ // convenience method to get content as Polygon
+ B2DPolygon getB2DPolygon() const;
+ };
+
+ typedef ::std::vector< B2DTrapezoid > B2DTrapezoidVector;
+
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+ namespace tools
+ {
+ // convert SourcePolyPolygon to trapezoids. The trapezoids will be appended to
+ // ro_Result. ro_Result will not be cleared. If SourcePolyPolygon contains curves,
+ // it's default AdaptiveSubdivision will be used.
+ // CAUTION: Trapezoids are oreintation-dependent in the sense that the upper and lower
+ // lines have to be parallel to the X-Axis, thus this subdivision is NOT simply usable
+ // for primitive decompositions. To use it, the shear and rotate parts of the
+ // involved transformations HAVE to be taken into account.
+ void trapezoidSubdivide(
+ B2DTrapezoidVector& ro_Result,
+ const B2DPolyPolygon& rSourcePolyPolygon);
+
+ // directly create trapezoids from given edge. Depending on the given geometry,
+ // none up to three trapezoids will be created
+ void createLineTrapezoidFromEdge(
+ B2DTrapezoidVector& ro_Result,
+ const B2DPoint& rPointA,
+ const B2DPoint& rPointB,
+ double fLineWidth = 1.0);
+
+ // create trapezoids for all edges of the given polygon. The closed state of
+ // the polygon is taken into account. If curves are contaned, the default
+ // AdaptiveSubdivision will be used.
+ void createLineTrapezoidFromB2DPolygon(
+ B2DTrapezoidVector& ro_Result,
+ const B2DPolygon& rPolygon,
+ double fLineWidth = 1.0);
+
+ // create trapezoids for all edges of the given polyPolygon. The closed state of
+ // the PolyPolygon is taken into account. If curves are contaned, the default
+ // AdaptiveSubdivision will be used.
+ void createLineTrapezoidFromB2DPolyPolygon(
+ B2DTrapezoidVector& ro_Result,
+ const B2DPolyPolygon& rPolyPolygon,
+ double fLineWidth = 1.0);
+
+ } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BGFX_POLYGON_B2DTRAPEZOID_HXX */
diff --git a/basegfx/inc/basegfx/tuple/b2dtuple.hxx b/basegfx/inc/basegfx/tuple/b2dtuple.hxx
index e0e2438307e4..71dd227ac736 100644
--- a/basegfx/inc/basegfx/tuple/b2dtuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2dtuple.hxx
@@ -155,15 +155,17 @@ namespace basegfx
bool equal(const B2DTuple& rTup) const
{
return (
- fTools::equal(mfX, rTup.mfX) &&
- fTools::equal(mfY, rTup.mfY));
+ this == &rTup ||
+ (fTools::equal(mfX, rTup.mfX) &&
+ fTools::equal(mfY, rTup.mfY)));
}
bool equal(const B2DTuple& rTup, const double& rfSmallValue) const
{
return (
- fTools::equal(mfX, rTup.mfX, rfSmallValue) &&
- fTools::equal(mfY, rTup.mfY, rfSmallValue));
+ this == &rTup ||
+ (fTools::equal(mfX, rTup.mfX, rfSmallValue) &&
+ fTools::equal(mfY, rTup.mfY, rfSmallValue)));
}
// operators
diff --git a/basegfx/inc/basegfx/tuple/b2i64tuple.hxx b/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
index 1bd81dc0e374..9c813c07a994 100644
--- a/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
@@ -182,7 +182,7 @@ namespace basegfx
bool operator==( const B2I64Tuple& rTup ) const
{
- return rTup.mnX == mnX && rTup.mnY == mnY;
+ return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY);
}
bool operator!=( const B2I64Tuple& rTup ) const
diff --git a/basegfx/inc/basegfx/tuple/b2ituple.hxx b/basegfx/inc/basegfx/tuple/b2ituple.hxx
index 9fa6e7119ee7..da29b5509dec 100644
--- a/basegfx/inc/basegfx/tuple/b2ituple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2ituple.hxx
@@ -181,7 +181,7 @@ namespace basegfx
bool operator==( const B2ITuple& rTup ) const
{
- return rTup.mnX == mnX && rTup.mnY == mnY;
+ return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY);
}
bool operator!=( const B2ITuple& rTup ) const
diff --git a/basegfx/inc/basegfx/tuple/b3dtuple.hxx b/basegfx/inc/basegfx/tuple/b3dtuple.hxx
index 6ad063d124a0..11fb797ff0ff 100644
--- a/basegfx/inc/basegfx/tuple/b3dtuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b3dtuple.hxx
@@ -179,17 +179,19 @@ namespace basegfx
bool equal(const B3DTuple& rTup) const
{
return (
- ::basegfx::fTools::equal(mfX, rTup.mfX) &&
+ this == &rTup ||
+ (::basegfx::fTools::equal(mfX, rTup.mfX) &&
::basegfx::fTools::equal(mfY, rTup.mfY) &&
- ::basegfx::fTools::equal(mfZ, rTup.mfZ));
+ ::basegfx::fTools::equal(mfZ, rTup.mfZ)));
}
bool equal(const B3DTuple& rTup, const double& rfSmallValue) const
{
return (
- ::basegfx::fTools::equal(mfX, rTup.mfX, rfSmallValue) &&
+ this == &rTup ||
+ (::basegfx::fTools::equal(mfX, rTup.mfX, rfSmallValue) &&
::basegfx::fTools::equal(mfY, rTup.mfY, rfSmallValue) &&
- ::basegfx::fTools::equal(mfZ, rTup.mfZ, rfSmallValue));
+ ::basegfx::fTools::equal(mfZ, rTup.mfZ, rfSmallValue)));
}
// operators
diff --git a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx b/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
index 13a7cb87ace3..a2d754fe4f79 100644
--- a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
@@ -212,7 +212,7 @@ namespace basegfx
bool operator==( const B3I64Tuple& rTup ) const
{
- return rTup.mnX == mnX && rTup.mnY == mnY && rTup.mnZ == mnZ;
+ return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY && rTup.mnZ == mnZ);
}
bool operator!=( const B3I64Tuple& rTup ) const
diff --git a/basegfx/inc/basegfx/tuple/b3ituple.hxx b/basegfx/inc/basegfx/tuple/b3ituple.hxx
index 4df462bf3f22..644ae07b6545 100644
--- a/basegfx/inc/basegfx/tuple/b3ituple.hxx
+++ b/basegfx/inc/basegfx/tuple/b3ituple.hxx
@@ -212,7 +212,7 @@ namespace basegfx
bool operator==( const B3ITuple& rTup ) const
{
- return rTup.mnX == mnX && rTup.mnY == mnY && rTup.mnZ == mnZ;
+ return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY && rTup.mnZ == mnZ);
}
bool operator!=( const B3ITuple& rTup ) const
diff --git a/basegfx/prj/d.lst b/basegfx/prj/d.lst
index a58cd33e4f9c..68ab880eef62 100644
--- a/basegfx/prj/d.lst
+++ b/basegfx/prj/d.lst
@@ -73,6 +73,7 @@ mkdir: %_DEST%\inc%_EXT%\basegfx\polygon
..\inc\basegfx\polygon\b2dpolygontriangulator.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygontriangulator.hxx
..\inc\basegfx\polygon\b2dpolygoncutandtouch.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygoncutandtouch.hxx
..\inc\basegfx\polygon\b2dpolypolygoncutter.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygoncutter.hxx
+..\inc\basegfx\polygon\b2dtrapezoid.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dtrapezoid.hxx
..\inc\basegfx\polygon\b3dpolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolygon.hxx
..\inc\basegfx\polygon\b3dpolypolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolypolygon.hxx
..\inc\basegfx\polygon\b3dpolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolygontools.hxx
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 9eab4b26c8b3..11955ceb22f9 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -1200,6 +1200,96 @@ namespace basegfx
return aRetval;
}
+ B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate)
+ {
+ if(rCandidate.count())
+ {
+ temporaryPointVector aTempPoints;
+
+ findCuts(rCandidate, aTempPoints);
+
+ return mergeTemporaryPointsAndPolygon(rCandidate, aTempPoints);
+ }
+ else
+ {
+ return rCandidate;
+ }
+ }
+
+ B2DPolyPolygon addPointsAtCuts(const B2DPolyPolygon& rCandidate, bool bSelfIntersections)
+ {
+ const sal_uInt32 nCount(rCandidate.count());
+
+ if(nCount)
+ {
+ B2DPolyPolygon aRetval;
+
+ if(1 == nCount)
+ {
+ if(bSelfIntersections)
+ {
+ // remove self intersections
+ aRetval.append(addPointsAtCuts(rCandidate.getB2DPolygon(0)));
+ }
+ else
+ {
+ // copy source
+ aRetval = rCandidate;
+ }
+ }
+ else
+ {
+ // first solve self cuts for all contained single polygons
+ temporaryPolygonData *pTempData = new temporaryPolygonData[nCount];
+ sal_uInt32 a, b;
+
+ for(a = 0; a < nCount; a++)
+ {
+ if(bSelfIntersections)
+ {
+ // use polygons with solved self intersections
+ pTempData[a].setPolygon(addPointsAtCuts(rCandidate.getB2DPolygon(a)));
+ }
+ else
+ {
+ // copy given polygons
+ pTempData[a].setPolygon(rCandidate.getB2DPolygon(a));
+ }
+ }
+
+ // now cuts and touches between the polygons
+ for(a = 0; a < nCount; a++)
+ {
+ for(b = 0; b < nCount; b++)
+ {
+ if(a < b)
+ {
+ // look for cuts, compare each edge polygon to following ones
+ if(pTempData[a].getRange().overlaps(pTempData[b].getRange()))
+ {
+ findCuts(pTempData[a].getPolygon(), pTempData[b].getPolygon(), pTempData[a].getTemporaryPointVector(), pTempData[b].getTemporaryPointVector());
+ }
+ }
+ }
+ }
+
+ // consolidate the result
+ for(a = 0L; a < nCount; a++)
+ {
+ aRetval.append(mergeTemporaryPointsAndPolygon(pTempData[a].getPolygon(), pTempData[a].getTemporaryPointVector()));
+ }
+
+ delete[] pTempData;
+ }
+
+ return aRetval;
+ }
+ else
+ {
+ return rCandidate;
+ }
+ }
+
////////////////////////////////////////////////////////////////////////////////
} // end of namespace tools
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index 28e5bb1f430d..e54a5e2707c9 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -1835,6 +1835,24 @@ namespace basegfx
return aRetval;
}
+ B2DPolygon createUnitPolygon()
+ {
+ static B2DPolygon aRetval;
+
+ if(!aRetval.count())
+ {
+ aRetval.append( B2DPoint( 0.0, 0.0 ) );
+ aRetval.append( B2DPoint( 1.0, 0.0 ) );
+ aRetval.append( B2DPoint( 1.0, 1.0 ) );
+ aRetval.append( B2DPoint( 0.0, 1.0 ) );
+
+ // close
+ aRetval.setClosed( true );
+ }
+
+ return aRetval;
+ }
+
B2DPolygon createPolygonFromCircle( const B2DPoint& rCenter, double fRadius )
{
return createPolygonFromEllipse( rCenter, fRadius, fRadius );
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
new file mode 100644
index 000000000000..4cd63f938114
--- /dev/null
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -0,0 +1,1227 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: b2dpolygontriangulator.cxx,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_basegfx.hxx"
+#include <basegfx/polygon/b2dtrapezoid.hxx>
+#include <basegfx/range/b1drange.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <list>
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+ namespace trapezoidhelper
+ {
+ //////////////////////////////////////////////////////////////////////////////
+ // helper class to hold a simple ege. This is only used for horizontal edges
+ // currently, thus the YPositions will be equal. I did not create a special
+ // class for this since holdingthe pointers is more effective and also can be
+ // used as baseclass for the traversing edges
+
+ class TrDeSimpleEdge
+ {
+ protected:
+ // pointers to start and end point
+ const B2DPoint* mpStart;
+ const B2DPoint* mpEnd;
+
+ public:
+ // constructor
+ TrDeSimpleEdge(
+ const B2DPoint* pStart,
+ const B2DPoint* pEnd)
+ : mpStart(pStart),
+ mpEnd(pEnd)
+ {
+ }
+
+ // data read access
+ const B2DPoint& getStart() const { return *mpStart; }
+ const B2DPoint& getEnd() const { return *mpEnd; }
+ };
+
+ //////////////////////////////////////////////////////////////////////////////
+ // define vector of simple edges
+
+ typedef ::std::vector< TrDeSimpleEdge > TrDeSimpleEdges;
+
+ //////////////////////////////////////////////////////////////////////////////
+ // helper class for holding a traversing edge. It will always have some
+ // distance in YPos. The slope (in a numerically useful form, see comments) is
+ // hold and used in SortValue to allow sorting traversing edges by Y, X and slope
+ // (in that order)
+
+ class TrDeEdgeEntry : public TrDeSimpleEdge
+ {
+ private:
+ // the slope in a numerical useful form for sorting
+ sal_uInt32 mnSortValue;
+
+ public:
+ // convenience data read access
+ double getDeltaX() const { return mpEnd->getX() - mpStart->getX(); }
+ double getDeltaY() const { return mpEnd->getY() - mpStart->getY(); }
+
+ // convenience data read access. SortValue is created on demand since
+ // it is not always used
+ sal_uInt32 getSortValue() const
+ {
+ if(0 != mnSortValue)
+ return mnSortValue;
+
+ // get radiant; has to be in the range ]0.0 .. pi[, thus scale to full
+ // sal_uInt32 range for maximum precision
+ const double fRadiant(atan2(getDeltaY(), getDeltaX()) * (SAL_MAX_UINT32 / F_PI));
+
+ // convert to sal_uInt32 value
+ const_cast< TrDeEdgeEntry* >(this)->mnSortValue = sal_uInt32(fRadiant);
+
+ return mnSortValue;
+ }
+
+ // constructor. SortValue can be given when known, use zero otherwise
+ TrDeEdgeEntry(
+ const B2DPoint* pStart,
+ const B2DPoint* pEnd,
+ sal_uInt32 nSortValue = 0)
+ : TrDeSimpleEdge(pStart, pEnd),
+ mnSortValue(nSortValue)
+ {
+ // force traversal of deltaY downward
+ if(mpEnd->getY() < mpStart->getY())
+ {
+ std::swap(mpStart, mpEnd);
+ }
+
+ // no horizontal edges allowed, all neeed to traverse vertically
+ OSL_ENSURE(mpEnd->getY() > mpStart->getY(), "Illegal TrDeEdgeEntry constructed (!)");
+ }
+
+ // data write access to StartPoint
+ void setStart( const B2DPoint* pNewStart)
+ {
+ OSL_ENSURE(0 != pNewStart, "No null pointer allowed here (!)");
+
+ if(mpStart != pNewStart)
+ {
+ mpStart = pNewStart;
+
+ // no horizontal edges allowed, all neeed to traverse vertivally
+ OSL_ENSURE(mpEnd->getY() > mpStart->getY(), "Illegal TrDeEdgeEntry constructed (!)");
+ }
+ }
+
+ // data write access to EndPoint
+ void setEnd( const B2DPoint* pNewEnd)
+ {
+ OSL_ENSURE(0 != pNewEnd, "No null pointer allowed here (!)");
+
+ if(mpEnd != pNewEnd)
+ {
+ mpEnd = pNewEnd;
+
+ // no horizontal edges allowed, all neeed to traverse vertivally
+ OSL_ENSURE(mpEnd->getY() > mpStart->getY(), "Illegal TrDeEdgeEntry constructed (!)");
+ }
+ }
+
+ // operator for sort support. Sort by Y, X and slope (in that order)
+ bool operator<(const TrDeEdgeEntry& rComp) const
+ {
+ if(fTools::equal(getStart().getY(), rComp.getStart().getY(), fTools::getSmallValue()))
+ {
+ if(fTools::equal(getStart().getX(), rComp.getStart().getX(), fTools::getSmallValue()))
+ {
+ // when start points are equal, use the direction the edge is pointing
+ // to. That value is created on demand and derived from atan2 in the
+ // range ]0.0 .. pi[ (without extremas, we always have a deltaY in this
+ // class) and scaled to sal_uInt32 range for best precision. 0 means no angle,
+ // while SAL_MAX_UINT32 means pi. Thus, the higher the value, the more left
+ // the edge traverses.
+ return (getSortValue() > rComp.getSortValue());
+ }
+ else
+ {
+ return fTools::less(getStart().getX(), rComp.getStart().getX());
+ }
+ }
+ else
+ {
+ return fTools::less(getStart().getY(), rComp.getStart().getY());
+ }
+ }
+
+ // method for cut support
+ B2DPoint getCutPointForGivenY(double fGivenY)
+ {
+ // Calculate cut point locally (do not use interpolate) since it is numerically
+ // necessary to guarantee the new, equal Y-coordinate
+ const double fFactor((fGivenY - getStart().getY()) / getDeltaY());
+ const double fDeltaXNew(fFactor * getDeltaX());
+
+ return B2DPoint(getStart().getX() + fDeltaXNew, fGivenY);
+ }
+ };
+
+ //////////////////////////////////////////////////////////////////////////////
+ // define double linked list of edges (for fast random insert)
+
+ typedef ::std::list< TrDeEdgeEntry > TrDeEdgeEntries;
+
+ } // end of anonymous namespace
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+ namespace trapezoidhelper
+ {
+ // helper class to handle the complete trapezoid subdivision of a PolyPolygon
+ class TrapezoidSubdivider
+ {
+ private:
+ // local data
+ sal_uInt32 mnInitialEdgeEntryCount;
+ TrDeEdgeEntries maTrDeEdgeEntries;
+ ::std::vector< B2DPoint > maPoints;
+ ::std::vector< B2DPoint* > maNewPoints;
+
+ void addEdgeSorted(
+ TrDeEdgeEntries::iterator aCurrent,
+ const TrDeEdgeEntry& rNewEdge)
+ {
+ // Loop while new entry is bigger, use operator<
+ while(aCurrent != maTrDeEdgeEntries.end() && (*aCurrent) < rNewEdge)
+ {
+ aCurrent++;
+ }
+
+ // Insert before first which is smaller or equal or at end
+ maTrDeEdgeEntries.insert(aCurrent, rNewEdge);
+ }
+
+ bool splitEdgeAtGivenPoint(
+ TrDeEdgeEntries::reference aEdge,
+ const B2DPoint& rCutPoint,
+ TrDeEdgeEntries::iterator aCurrent)
+ {
+ // do not create edges without deltaY: do not split when start is identical
+ if(aEdge.getStart().equal(rCutPoint, fTools::getSmallValue()))
+ {
+ return false;
+ }
+
+ // do not create edges without deltaY: do not split when end is identical
+ if(aEdge.getEnd().equal(rCutPoint, fTools::getSmallValue()))
+ {
+ return false;
+ }
+
+ const double fOldDeltaYStart(rCutPoint.getY() - aEdge.getStart().getY());
+
+ if(fTools::lessOrEqual(fOldDeltaYStart, 0.0))
+ {
+ // do not split: the resulting edge would be horizontal
+ // correct it to new start point
+ aEdge.setStart(&rCutPoint);
+ return false;
+ }
+
+ const double fNewDeltaYStart(aEdge.getEnd().getY() - rCutPoint.getY());
+
+ if(fTools::lessOrEqual(fNewDeltaYStart, 0.0))
+ {
+ // do not split: the resulting edge would be horizontal
+ // correct it to new end point
+ aEdge.setEnd(&rCutPoint);
+ return false;
+ }
+
+ // Create new entry
+ const TrDeEdgeEntry aNewEdge(
+ &rCutPoint,
+ &aEdge.getEnd(),
+ aEdge.getSortValue());
+
+ // Correct old entry
+ aEdge.setEnd(&rCutPoint);
+
+ // Insert sorted (to avoid new sort)
+ addEdgeSorted(aCurrent, aNewEdge);
+
+ return true;
+ }
+
+ bool testAndCorrectEdgeIntersection(
+ TrDeEdgeEntries::reference aEdgeA,
+ TrDeEdgeEntries::reference aEdgeB,
+ TrDeEdgeEntries::iterator aCurrent)
+ {
+ // Exclude simple cases: same start or end point
+ if(aEdgeA.getStart().equal(aEdgeB.getStart(), fTools::getSmallValue()))
+ {
+ return false;
+ }
+
+ if(aEdgeA.getStart().equal(aEdgeB.getEnd(), fTools::getSmallValue()))
+ {
+ return false;
+ }
+
+ if(aEdgeA.getEnd().equal(aEdgeB.getStart(), fTools::getSmallValue()))
+ {
+ return false;
+ }
+
+ if(aEdgeA.getEnd().equal(aEdgeB.getEnd(), fTools::getSmallValue()))
+ {
+ return false;
+ }
+
+ // Exclude simple cases: one of the edges has no length anymore
+ if(aEdgeA.getStart().equal(aEdgeA.getEnd(), fTools::getSmallValue()))
+ {
+ return false;
+ }
+
+ if(aEdgeB.getStart().equal(aEdgeB.getEnd(), fTools::getSmallValue()))
+ {
+ return false;
+ }
+
+ // check if one point is on the other edge (a touch, not a cut)
+ const B2DVector aDeltaB(aEdgeB.getDeltaX(), aEdgeB.getDeltaY());
+
+ if(tools::isPointOnEdge(aEdgeA.getStart(), aEdgeB.getStart(), aDeltaB))
+ {
+ return splitEdgeAtGivenPoint(aEdgeB, aEdgeA.getStart(), aCurrent);
+ }
+
+ if(tools::isPointOnEdge(aEdgeA.getEnd(), aEdgeB.getStart(), aDeltaB))
+ {
+ return splitEdgeAtGivenPoint(aEdgeB, aEdgeA.getEnd(), aCurrent);
+ }
+
+ const B2DVector aDeltaA(aEdgeA.getDeltaX(), aEdgeA.getDeltaY());
+
+ if(tools::isPointOnEdge(aEdgeB.getStart(), aEdgeA.getStart(), aDeltaA))
+ {
+ return splitEdgeAtGivenPoint(aEdgeA, aEdgeB.getStart(), aCurrent);
+ }
+
+ if(tools::isPointOnEdge(aEdgeB.getEnd(), aEdgeA.getStart(), aDeltaA))
+ {
+ return splitEdgeAtGivenPoint(aEdgeA, aEdgeB.getEnd(), aCurrent);
+ }
+
+ // check for cut inside edges. Use both t-values to choose the more precise
+ // one later
+ double fCutA(0.0);
+ double fCutB(0.0);
+
+ if(tools::findCut(
+ aEdgeA.getStart(), aDeltaA,
+ aEdgeB.getStart(), aDeltaB,
+ CUTFLAG_LINE,
+ &fCutA,
+ &fCutB))
+ {
+ // use a simple metric (length criteria) for choosing the numerically
+ // better cut
+ const double fSimpleLengthA(aDeltaA.getX() + aDeltaA.getY());
+ const double fSimpleLengthB(aDeltaB.getX() + aDeltaB.getY());
+ const bool bAIsLonger(fSimpleLengthA > fSimpleLengthB);
+ B2DPoint* pNewPoint = bAIsLonger
+ ? new B2DPoint(aEdgeA.getStart() + (fCutA * aDeltaA))
+ : new B2DPoint(aEdgeB.getStart() + (fCutB * aDeltaB));
+ bool bRetval(false);
+
+ // try to split both edges
+ bRetval = splitEdgeAtGivenPoint(aEdgeA, *pNewPoint, aCurrent);
+ bRetval |= splitEdgeAtGivenPoint(aEdgeB, *pNewPoint, aCurrent);
+
+ if(bRetval)
+ {
+ maNewPoints.push_back(pNewPoint);
+ }
+ else
+ {
+ delete pNewPoint;
+ }
+
+ return bRetval;
+ }
+
+ return false;
+ }
+
+ void solveHorizontalEdges(TrDeSimpleEdges& rTrDeSimpleEdges)
+ {
+ if(rTrDeSimpleEdges.size() && maTrDeEdgeEntries.size())
+ {
+ // there were horizontal edges. These can be excluded, but
+ // cuts with other edges need to be solved and added before
+ // ignoring them
+ sal_uInt32 a(0);
+
+ for(a = 0; a < rTrDeSimpleEdges.size(); a++)
+ {
+ // get horizontal edge as candidate; prepare it's range and fixed Y
+ const TrDeSimpleEdge& rHorEdge = rTrDeSimpleEdges[a];
+ const B1DRange aRange(rHorEdge.getStart().getX(), rHorEdge.getEnd().getX());
+ const double fFixedY(rHorEdge.getStart().getY());
+
+ // loop over traversing edges
+ TrDeEdgeEntries::iterator aCurrent(maTrDeEdgeEntries.begin());
+
+ do
+ {
+ // get compare edge
+ TrDeEdgeEntries::reference aCompare(*aCurrent++);
+
+ if(fTools::lessOrEqual(aCompare.getEnd().getY(), fFixedY))
+ {
+ // edge ends above horizontal edge, continue
+ continue;
+ }
+
+ if(fTools::moreOrEqual(aCompare.getStart().getY(), fFixedY))
+ {
+ // edge starts below horizontal edge, continue
+ continue;
+ }
+
+ // vertical overlap, get horizontal range
+ const B1DRange aCompareRange(aCompare.getStart().getX(), aCompare.getEnd().getX());
+
+ if(aRange.overlaps(aCompareRange))
+ {
+ // possible cut, get cut point
+ const B2DPoint aSplit(aCompare.getCutPointForGivenY(fFixedY));
+
+ if(fTools::more(aSplit.getX(), aRange.getMinimum())
+ && fTools::less(aSplit.getX(), aRange.getMaximum()))
+ {
+ // cut is in XRange of horizontal edge, potenitally needed cut
+ B2DPoint* pNewPoint = new B2DPoint(aSplit);
+
+ if(splitEdgeAtGivenPoint(aCompare, *pNewPoint, aCurrent))
+ {
+ maNewPoints.push_back(pNewPoint);
+ }
+ else
+ {
+ delete pNewPoint;
+ }
+ }
+ }
+ }
+ while(aCurrent != maTrDeEdgeEntries.end()
+ && fTools::less(aCurrent->getStart().getY(), fFixedY));
+ }
+ }
+ }
+
+ public:
+ TrapezoidSubdivider(
+ const B2DPolyPolygon& rSourcePolyPolygon)
+ : mnInitialEdgeEntryCount(0),
+ maTrDeEdgeEntries(),
+ maPoints(),
+ maNewPoints()
+ {
+ B2DPolyPolygon aSource(rSourcePolyPolygon);
+ const sal_uInt32 nPolygonCount(rSourcePolyPolygon.count());
+ TrDeSimpleEdges aTrDeSimpleEdges;
+ sal_uInt32 a(0), b(0);
+ sal_uInt32 nAllPointCount(0);
+
+ // ensure there are no curves used
+ if(aSource.areControlPointsUsed())
+ {
+ aSource = aSource.getDefaultAdaptiveSubdivision();
+ }
+
+ for(a = 0; a < nPolygonCount; a++)
+ {
+ // 1st run: count points
+ const B2DPolygon aPolygonCandidate(aSource.getB2DPolygon(a));
+ const sal_uInt32 nCount(aPolygonCandidate.count());
+
+ if(nCount > 2)
+ {
+ nAllPointCount += nCount;
+ }
+ }
+
+ if(nAllPointCount)
+ {
+ // reserve needed points. CAUTION: maPoints size is NOT to be changed anymore
+ // after 2nd loop since pointers to it are used in the edges
+ maPoints.reserve(nAllPointCount);
+
+ for(a = 0; a < nPolygonCount; a++)
+ {
+ // 2nd run: add points
+ const B2DPolygon aPolygonCandidate(aSource.getB2DPolygon(a));
+ const sal_uInt32 nCount(aPolygonCandidate.count());
+
+ if(nCount > 2)
+ {
+ for(b = 0; b < nCount; b++)
+ {
+ maPoints.push_back(aPolygonCandidate.getB2DPoint(b));
+ }
+ }
+ }
+
+ // Moved the edge construction to a 3rd run: doing it in the 2nd run is
+ // possible(and i used it), but requires a working vector::reserve()
+ // implementation, else the vector will be reallocated and the pointers
+ // in the edges may be wrong. Security first here.
+ sal_uInt32 nStartIndex(0);
+
+ for(a = 0; a < nPolygonCount; a++)
+ {
+ const B2DPolygon aPolygonCandidate(aSource.getB2DPolygon(a));
+ const sal_uInt32 nCount(aPolygonCandidate.count());
+
+ if(nCount > 2)
+ {
+ // get the last point of the current polygon
+ B2DPoint* pPrev(&maPoints[nCount + nStartIndex - 1]);
+
+ for(b = 0; b < nCount; b++)
+ {
+ // get next point
+ B2DPoint* pCurr(&maPoints[nStartIndex++]);
+
+ if(fTools::equal(pPrev->getY(), pCurr->getY(), fTools::getSmallValue()))
+ {
+ // horizontal edge, check for single point
+ if(!fTools::equal(pPrev->getX(), pCurr->getX(), fTools::getSmallValue()))
+ {
+ // X-order not needed, just add
+ aTrDeSimpleEdges.push_back(TrDeSimpleEdge(pPrev, pCurr));
+
+ const double fMiddle((pPrev->getY() + pCurr->getY()) * 0.5);
+ pPrev->setY(fMiddle);
+ pCurr->setY(fMiddle);
+ }
+ }
+ else
+ {
+ // vertical edge. Positive Y-direction is guaranteed by the
+ // TrDeEdgeEntry constructor
+ maTrDeEdgeEntries.push_back(TrDeEdgeEntry(pPrev, pCurr, 0));
+ mnInitialEdgeEntryCount++;
+ }
+
+ // prepare next step
+ pPrev = pCurr;
+ }
+ }
+ }
+ }
+
+ if(maTrDeEdgeEntries.size())
+ {
+ // single and initial sort of traversing edges
+ maTrDeEdgeEntries.sort();
+
+ // solve horizontal edges if there are any detected
+ solveHorizontalEdges(aTrDeSimpleEdges);
+ }
+ }
+
+ ~TrapezoidSubdivider()
+ {
+ // delete the extra points created for cuts
+ const sal_uInt32 nCount(maNewPoints.size());
+
+ for(sal_uInt32 a(0); a < nCount; a++)
+ {
+ delete maNewPoints[a];
+ }
+ }
+
+ void Subdivide(B2DTrapezoidVector& ro_Result)
+ {
+ // This is the central subdivider. The strategy is to use the first two entries
+ // from the traversing edges as a potential trapezoid and do the needed corrections
+ // and adaptions on the way.
+ //
+ // There always must be two edges with the same YStart value: When adding the polygons
+ // in the constructor, there is always a topmost point from which two edges start; when
+ // the topmost is an edge, there is a start and end of this edge from which two edges
+ // start. All cases have two edges with same StartY (QED).
+ //
+ // Based on this these edges get corrected when:
+ // - one is longer than the other
+ // - they intersect
+ // - they intersect with other edges
+ // - another edge starts inside the thought trapezoid
+ //
+ // All this cases again produce a valid state so that the first two edges have a common
+ // Ystart again. Some cases lead to a restart of the process, some allow consuming the
+ // edges and create the intended trapezoid.
+ //
+ // Be careful when doing chages here: It is essential to keep all possible paths
+ // in valid states and to be numerically correct. This is especially needed e.g.
+ // by using fTools::equal(..) in the more robust small-value incarnation.
+ B1DRange aLeftRange;
+ B1DRange aRightRange;
+
+ if(!maTrDeEdgeEntries.empty())
+ {
+ // measuring shows that the relation between edges and created trapezoids is
+ // mostly in the 1:1 range, thus reserve as much trapezoids as edges exist. Do
+ // not use maTrDeEdgeEntries.size() since that may be a non-constant time
+ // operation for Lists. Instead, use mnInitialEdgeEntryCount which will contain
+ // the roughly counted adds to the List
+ ro_Result.reserve(ro_Result.size() + mnInitialEdgeEntryCount);
+ }
+
+ while(!maTrDeEdgeEntries.empty())
+ {
+ // Prepare current operator and get first edge
+ TrDeEdgeEntries::iterator aCurrent(maTrDeEdgeEntries.begin());
+ TrDeEdgeEntries::reference aLeft(*aCurrent++);
+
+ if(aCurrent == maTrDeEdgeEntries.end())
+ {
+ // Should not happen: No 2nd edge; consume the single edge
+ // to not have an endless loop and start next. During development
+ // i constantly had breakpoints here, so i am sure enough to add an
+ // assertion here
+ OSL_ENSURE(false, "Trapeziod decomposer in illegal state (!)");
+ maTrDeEdgeEntries.pop_front();
+ continue;
+ }
+
+ // get second edge
+ TrDeEdgeEntries::reference aRight(*aCurrent++);
+
+ if(!fTools::equal(aLeft.getStart().getY(), aRight.getStart().getY(), fTools::getSmallValue()))
+ {
+ // Should not happen: We have a 2nd edge, but YStart is on another
+ // line; consume the single edge to not have an endless loop and start
+ // next. During development i constantly had breakpoints here, so i am
+ // sure enough to add an assertion here
+ OSL_ENSURE(false, "Trapeziod decomposer in illegal state (!)");
+ maTrDeEdgeEntries.pop_front();
+ continue;
+ }
+
+ // aLeft and aRight build a thought trapezoid now. They have a common
+ // start line (same Y for start points). Potentially, one of the edges
+ // is longer than the other. It is only needed to look at the shorter
+ // length which build the potential trapezoid. To do so, get the end points
+ // locally and adapt the evtl. longer one. Use only aLeftEnd and aRightEnd
+ // from here on, not the aLeft.getEnd() or aRight.getEnd() accesses.
+ B2DPoint aLeftEnd(aLeft.getEnd());
+ B2DPoint aRightEnd(aRight.getEnd());
+
+ // check if end points are on the same line. If yes, no adaption
+ // needs to be prepared. Also remember which one actually is longer.
+ const bool bEndOnSameLine(fTools::equal(aLeftEnd.getY(), aRightEnd.getY(), fTools::getSmallValue()));
+ bool bLeftIsLonger(false);
+
+ if(!bEndOnSameLine)
+ {
+ // check which edge is longer and correct accordingly
+ bLeftIsLonger = fTools::more(aLeftEnd.getY(), aRightEnd.getY());
+
+ if(bLeftIsLonger)
+ {
+ aLeftEnd = aLeft.getCutPointForGivenY(aRightEnd.getY());
+ }
+ else
+ {
+ aRightEnd = aRight.getCutPointForGivenY(aLeftEnd.getY());
+ }
+ }
+
+ // check for same start and end points
+ const bool bSameStartPoint(aLeft.getStart().equal(aRight.getStart(), fTools::getSmallValue()));
+ const bool bSameEndPoint(aLeftEnd.equal(aRightEnd, fTools::getSmallValue()));
+
+ // check the simple case that the edges form a 'blind' edge (deadend)
+ if(bSameStartPoint && bSameEndPoint)
+ {
+ // correct the longer edge if prepared
+ if(!bEndOnSameLine)
+ {
+ if(bLeftIsLonger)
+ {
+ B2DPoint* pNewPoint = new B2DPoint(aLeftEnd);
+
+ if(splitEdgeAtGivenPoint(aLeft, *pNewPoint, aCurrent))
+ {
+ maNewPoints.push_back(pNewPoint);
+ }
+ else
+ {
+ delete pNewPoint;
+ }
+ }
+ else
+ {
+ B2DPoint* pNewPoint = new B2DPoint(aRightEnd);
+
+ if(splitEdgeAtGivenPoint(aRight, *pNewPoint, aCurrent))
+ {
+ maNewPoints.push_back(pNewPoint);
+ }
+ else
+ {
+ delete pNewPoint;
+ }
+ }
+ }
+
+ // consume both edges and start next run
+ maTrDeEdgeEntries.pop_front();
+ maTrDeEdgeEntries.pop_front();
+
+ continue;
+ }
+
+ // check if the edges self-intersect. This can only happen when
+ // start and end point are different
+ bool bRangesSet(false);
+
+ if(!(bSameStartPoint || bSameEndPoint))
+ {
+ // get XRanges of edges
+ aLeftRange = B1DRange(aLeft.getStart().getX(), aLeftEnd.getX());
+ aRightRange = B1DRange(aRight.getStart().getX(), aRightEnd.getX());
+ bRangesSet = true;
+
+ // use fast range test first
+ if(aLeftRange.overlaps(aRightRange))
+ {
+ // real cut test and correction. If correction was needed,
+ // start new run
+ if(testAndCorrectEdgeIntersection(aLeft, aRight, aCurrent))
+ {
+ continue;
+ }
+ }
+ }
+
+ // now we need to check if there are intersections with other edges
+ // or if other edges start inside the candidate trapezoid
+ if(aCurrent != maTrDeEdgeEntries.end()
+ && fTools::less(aCurrent->getStart().getY(), aLeftEnd.getY()))
+ {
+ // get XRanges of edges
+ if(!bRangesSet)
+ {
+ aLeftRange = B1DRange(aLeft.getStart().getX(), aLeftEnd.getX());
+ aRightRange = B1DRange(aRight.getStart().getX(), aRightEnd.getX());
+ }
+
+ // build full XRange for fast check
+ B1DRange aAllRange(aLeftRange);
+ aAllRange.expand(aRightRange);
+
+ // prepare loop iterator; aCurrent needs to stay unchanged for
+ // eventual sorted insertions of new EdgeNodes. Also prepare stop flag
+ TrDeEdgeEntries::iterator aLoop(aCurrent);
+ bool bDone(false);
+
+ do
+ {
+ // get compare edge and it's XRange
+ TrDeEdgeEntries::reference aCompare(*aLoop++);
+
+ // avoid edges using the same start point as one of
+ // the edges. These can neither have their start point
+ // in the thought trapezoid nor cut with one of the edges
+ if(aCompare.getStart().equal(aRight.getStart(), fTools::getSmallValue()))
+ {
+ continue;
+ }
+
+ // get compare XRange
+ const B1DRange aCompareRange(aCompare.getStart().getX(), aCompare.getEnd().getX());
+
+ // use fast range test first
+ if(aAllRange.overlaps(aCompareRange))
+ {
+ // check for start point inside thought trapezoid
+ if(fTools::more(aCompare.getStart().getY(), aLeft.getStart().getY()))
+ {
+ // calculate the two possible split points at compare's Y
+ const B2DPoint aSplitLeft(aLeft.getCutPointForGivenY(aCompare.getStart().getY()));
+ const B2DPoint aSplitRight(aRight.getCutPointForGivenY(aCompare.getStart().getY()));
+
+ // check for start point of aCompare being inside thought
+ // trapezoid
+ if(aCompare.getStart().getX() >= aSplitLeft.getX() &&
+ aCompare.getStart().getX() <= aSplitRight.getX())
+ {
+ // is inside, correct and restart loop
+ B2DPoint* pNewLeft = new B2DPoint(aSplitLeft);
+
+ if(splitEdgeAtGivenPoint(aLeft, *pNewLeft, aCurrent))
+ {
+ maNewPoints.push_back(pNewLeft);
+ }
+ else
+ {
+ delete pNewLeft;
+ }
+
+ B2DPoint* pNewRight = new B2DPoint(aSplitRight);
+
+ if(splitEdgeAtGivenPoint(aRight, *pNewRight, aCurrent))
+ {
+ maNewPoints.push_back(pNewRight);
+ }
+ else
+ {
+ delete pNewRight;
+ }
+
+ bDone = true;
+ }
+ }
+
+ if(!bDone && aLeftRange.overlaps(aCompareRange))
+ {
+ // test for concrete cut of compare edge with left edge
+ bDone = testAndCorrectEdgeIntersection(aLeft, aCompare, aCurrent);
+ }
+
+ if(!bDone && aRightRange.overlaps(aCompareRange))
+ {
+ // test for concrete cut of compare edge with Right edge
+ bDone = testAndCorrectEdgeIntersection(aRight, aCompare, aCurrent);
+ }
+ }
+ }
+ while(!bDone
+ && aLoop != maTrDeEdgeEntries.end()
+ && fTools::less(aLoop->getStart().getY(), aLeftEnd.getY()));
+
+ if(bDone)
+ {
+ // something needed to be changed; start next loop
+ continue;
+ }
+ }
+
+ // when we get here, the intended trapezoid can be used. It needs to
+ // be corrected, eventually (if prepared); but this is no reason not to
+ // use it in the same loop iteration
+ if(!bEndOnSameLine)
+ {
+ if(bLeftIsLonger)
+ {
+ B2DPoint* pNewPoint = new B2DPoint(aLeftEnd);
+
+ if(splitEdgeAtGivenPoint(aLeft, *pNewPoint, aCurrent))
+ {
+ maNewPoints.push_back(pNewPoint);
+ }
+ else
+ {
+ delete pNewPoint;
+ }
+ }
+ else
+ {
+ B2DPoint* pNewPoint = new B2DPoint(aRightEnd);
+
+ if(splitEdgeAtGivenPoint(aRight, *pNewPoint, aCurrent))
+ {
+ maNewPoints.push_back(pNewPoint);
+ }
+ else
+ {
+ delete pNewPoint;
+ }
+ }
+ }
+
+ // the two edges start at the same Y, they use the same DeltaY, they
+ // do not cut themselves and not any other edge in range. Create a
+ // B2DTrapezoid and consume both edges
+ ro_Result.push_back(
+ B2DTrapezoid(
+ aLeft.getStart().getX(),
+ aRight.getStart().getX(),
+ aLeft.getStart().getY(),
+ aLeftEnd.getX(),
+ aRightEnd.getX(),
+ aLeftEnd.getY()));
+
+ maTrDeEdgeEntries.pop_front();
+ maTrDeEdgeEntries.pop_front();
+ }
+ }
+ };
+ } // end of anonymous namespace
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+ B2DTrapezoid::B2DTrapezoid(
+ const double& rfTopXLeft,
+ const double& rfTopXRight,
+ const double& rfTopY,
+ const double& rfBottomXLeft,
+ const double& rfBottomXRight,
+ const double& rfBottomY)
+ : mfTopXLeft(rfTopXLeft),
+ mfTopXRight(rfTopXRight),
+ mfTopY(rfTopY),
+ mfBottomXLeft(rfBottomXLeft),
+ mfBottomXRight(rfBottomXRight),
+ mfBottomY(rfBottomY)
+ {
+ // guarantee mfTopXRight >= mfTopXLeft
+ if(mfTopXLeft > mfTopXRight)
+ {
+ std::swap(mfTopXLeft, mfTopXRight);
+ }
+
+ // guarantee mfBottomXRight >= mfBottomXLeft
+ if(mfBottomXLeft > mfBottomXRight)
+ {
+ std::swap(mfBottomXLeft, mfBottomXRight);
+ }
+
+ // guarantee mfBottomY >= mfTopY
+ if(mfTopY > mfBottomY)
+ {
+ std::swap(mfTopY, mfBottomY);
+ std::swap(mfTopXLeft, mfBottomXLeft);
+ std::swap(mfTopXRight, mfBottomXRight);
+ }
+ }
+
+ B2DPolygon B2DTrapezoid::getB2DPolygon() const
+ {
+ B2DPolygon aRetval;
+
+ aRetval.append(B2DPoint(getTopXLeft(), getTopY()));
+ aRetval.append(B2DPoint(getTopXRight(), getTopY()));
+ aRetval.append(B2DPoint(getBottomXRight(), getBottomY()));
+ aRetval.append(B2DPoint(getBottomXLeft(), getBottomY()));
+ aRetval.setClosed(true);
+
+ return aRetval;
+ }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+ namespace tools
+ {
+ // convert Source PolyPolygon to trapezoids
+ void trapezoidSubdivide(B2DTrapezoidVector& ro_Result, const B2DPolyPolygon& rSourcePolyPolygon)
+ {
+ trapezoidhelper::TrapezoidSubdivider aTrapezoidSubdivider(rSourcePolyPolygon);
+
+ aTrapezoidSubdivider.Subdivide(ro_Result);
+ }
+
+ void createLineTrapezoidFromEdge(
+ B2DTrapezoidVector& ro_Result,
+ const B2DPoint& rPointA,
+ const B2DPoint& rPointB,
+ double fLineWidth)
+ {
+ if(fTools::lessOrEqual(fLineWidth, 0.0))
+ {
+ // no line witdh
+ return;
+ }
+
+ if(rPointA.equal(rPointB, fTools::getSmallValue()))
+ {
+ // points are equal, no edge
+ return;
+ }
+
+ const double fHalfLineWidth(0.5 * fLineWidth);
+
+ if(fTools::equal(rPointA.getX(), rPointB.getX(), fTools::getSmallValue()))
+ {
+ // vertical line
+ const double fLeftX(rPointA.getX() - fHalfLineWidth);
+ const double fRightX(rPointA.getX() + fHalfLineWidth);
+
+ ro_Result.push_back(
+ B2DTrapezoid(
+ fLeftX,
+ fRightX,
+ std::min(rPointA.getY(), rPointB.getY()),
+ fLeftX,
+ fRightX,
+ std::max(rPointA.getY(), rPointB.getY())));
+ }
+ else if(fTools::equal(rPointA.getY(), rPointB.getY(), fTools::getSmallValue()))
+ {
+ // horizontal line
+ const double fLeftX(std::min(rPointA.getX(), rPointB.getX()));
+ const double fRightX(std::max(rPointA.getX(), rPointB.getX()));
+
+ ro_Result.push_back(
+ B2DTrapezoid(
+ fLeftX,
+ fRightX,
+ rPointA.getY() - fHalfLineWidth,
+ fLeftX,
+ fRightX,
+ rPointA.getY() + fHalfLineWidth));
+ }
+ else
+ {
+ // diagonal line
+ // create perpendicular vector
+ const B2DVector aDelta(rPointB - rPointA);
+ B2DVector aPerpendicular(-aDelta.getY(), aDelta.getX());
+ aPerpendicular.setLength(fHalfLineWidth);
+
+ // create StartLow, StartHigh, EndLow and EndHigh
+ const B2DPoint aStartLow(rPointA + aPerpendicular);
+ const B2DPoint aStartHigh(rPointA - aPerpendicular);
+ const B2DPoint aEndHigh(rPointB - aPerpendicular);
+ const B2DPoint aEndLow(rPointB + aPerpendicular);
+
+ // create EdgeEntries
+ basegfx::trapezoidhelper::TrDeEdgeEntries aTrDeEdgeEntries;
+
+ aTrDeEdgeEntries.push_back(basegfx::trapezoidhelper::TrDeEdgeEntry(&aStartLow, &aStartHigh, 0));
+ aTrDeEdgeEntries.push_back(basegfx::trapezoidhelper::TrDeEdgeEntry(&aStartHigh, &aEndHigh, 0));
+ aTrDeEdgeEntries.push_back(basegfx::trapezoidhelper::TrDeEdgeEntry(&aEndHigh, &aEndLow, 0));
+ aTrDeEdgeEntries.push_back(basegfx::trapezoidhelper::TrDeEdgeEntry(&aEndLow, &aStartLow, 0));
+ aTrDeEdgeEntries.sort();
+
+ // here we know we have exactly four edges, and they do not cut, touch or
+ // intersect. This makes processing much easier. Get the first two as start
+ // edges for the thought trapezoid
+ basegfx::trapezoidhelper::TrDeEdgeEntries::iterator aCurrent(aTrDeEdgeEntries.begin());
+ basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft(*aCurrent++);
+ basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight(*aCurrent++);
+ const bool bEndOnSameLine(fTools::equal(aLeft.getEnd().getY(), aRight.getEnd().getY(), fTools::getSmallValue()));
+
+ if(bEndOnSameLine)
+ {
+ // create two triangle trapezoids
+ ro_Result.push_back(
+ B2DTrapezoid(
+ aLeft.getStart().getX(),
+ aRight.getStart().getX(),
+ aLeft.getStart().getY(),
+ aLeft.getEnd().getX(),
+ aRight.getEnd().getX(),
+ aLeft.getEnd().getY()));
+
+ basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft2(*aCurrent++);
+ basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight2(*aCurrent++);
+
+ ro_Result.push_back(
+ B2DTrapezoid(
+ aLeft2.getStart().getX(),
+ aRight2.getStart().getX(),
+ aLeft2.getStart().getY(),
+ aLeft2.getEnd().getX(),
+ aRight2.getEnd().getX(),
+ aLeft2.getEnd().getY()));
+ }
+ else
+ {
+ // create three trapezoids. Check which edge is longer and
+ // correct accordingly
+ const bool bLeftIsLonger(fTools::more(aLeft.getEnd().getY(), aRight.getEnd().getY()));
+
+ if(bLeftIsLonger)
+ {
+ basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight2(*aCurrent++);
+ basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft2(*aCurrent++);
+ const B2DPoint aSplitLeft(aLeft.getCutPointForGivenY(aRight.getEnd().getY()));
+ const B2DPoint aSplitRight(aRight2.getCutPointForGivenY(aLeft.getEnd().getY()));
+
+ ro_Result.push_back(
+ B2DTrapezoid(
+ aLeft.getStart().getX(),
+ aRight.getStart().getX(),
+ aLeft.getStart().getY(),
+ aSplitLeft.getX(),
+ aRight.getEnd().getX(),
+ aRight.getEnd().getY()));
+
+ ro_Result.push_back(
+ B2DTrapezoid(
+ aSplitLeft.getX(),
+ aRight.getEnd().getX(),
+ aRight.getEnd().getY(),
+ aLeft2.getStart().getX(),
+ aSplitRight.getX(),
+ aLeft2.getStart().getY()));
+
+ ro_Result.push_back(
+ B2DTrapezoid(
+ aLeft2.getStart().getX(),
+ aSplitRight.getX(),
+ aLeft2.getStart().getY(),
+ aLeft2.getEnd().getX(),
+ aRight2.getEnd().getX(),
+ aLeft2.getEnd().getY()));
+ }
+ else
+ {
+ basegfx::trapezoidhelper::TrDeEdgeEntries::reference aLeft2(*aCurrent++);
+ basegfx::trapezoidhelper::TrDeEdgeEntries::reference aRight2(*aCurrent++);
+ const B2DPoint aSplitRight(aRight.getCutPointForGivenY(aLeft.getEnd().getY()));
+ const B2DPoint aSplitLeft(aLeft2.getCutPointForGivenY(aRight.getEnd().getY()));
+
+ ro_Result.push_back(
+ B2DTrapezoid(
+ aLeft.getStart().getX(),
+ aRight.getStart().getX(),
+ aLeft.getStart().getY(),
+ aLeft.getEnd().getX(),
+ aSplitRight.getX(),
+ aLeft.getEnd().getY()));
+
+ ro_Result.push_back(
+ B2DTrapezoid(
+ aLeft.getEnd().getX(),
+ aSplitRight.getX(),
+ aLeft.getEnd().getY(),
+ aSplitLeft.getX(),
+ aRight.getEnd().getX(),
+ aRight2.getStart().getY()));
+
+ ro_Result.push_back(
+ B2DTrapezoid(
+ aSplitLeft.getX(),
+ aRight.getEnd().getX(),
+ aRight2.getStart().getY(),
+ aLeft2.getEnd().getX(),
+ aRight2.getEnd().getX(),
+ aLeft2.getEnd().getY()));
+ }
+ }
+ }
+ }
+
+ void createLineTrapezoidFromB2DPolygon(
+ B2DTrapezoidVector& ro_Result,
+ const B2DPolygon& rPolygon,
+ double fLineWidth)
+ {
+ if(fTools::lessOrEqual(fLineWidth, 0.0))
+ {
+ return;
+ }
+
+ // ensure there are no curves used
+ B2DPolygon aSource(rPolygon);
+
+ if(aSource.areControlPointsUsed())
+ {
+ aSource = aSource.getDefaultAdaptiveSubdivision();
+ }
+
+ const sal_uInt32 nPointCount(aSource.count());
+
+ if(!nPointCount)
+ {
+ return;
+ }
+
+ const sal_uInt32 nEdgeCount(aSource.isClosed() ? nPointCount : nPointCount - 1);
+ B2DPoint aCurrent(aSource.getB2DPoint(0));
+
+ ro_Result.reserve(ro_Result.size() + (3 * nEdgeCount));
+
+ for(sal_uInt32 a(0); a < nEdgeCount; a++)
+ {
+ const sal_uInt32 nNextIndex((a + 1) % nPointCount);
+ const B2DPoint aNext(aSource.getB2DPoint(nNextIndex));
+
+ createLineTrapezoidFromEdge(ro_Result, aCurrent, aNext, fLineWidth);
+ aCurrent = aNext;
+ }
+ }
+
+ void createLineTrapezoidFromB2DPolyPolygon(
+ B2DTrapezoidVector& ro_Result,
+ const B2DPolyPolygon& rPolyPolygon,
+ double fLineWidth)
+ {
+ if(fTools::lessOrEqual(fLineWidth, 0.0))
+ {
+ return;
+ }
+
+ // ensure there are no curves used
+ B2DPolyPolygon aSource(rPolyPolygon);
+
+ if(aSource.areControlPointsUsed())
+ {
+ aSource = aSource.getDefaultAdaptiveSubdivision();
+ }
+
+ const sal_uInt32 nCount(aSource.count());
+
+ if(!nCount)
+ {
+ return;
+ }
+
+ for(sal_uInt32 a(0); a < nCount; a++)
+ {
+ createLineTrapezoidFromB2DPolygon(
+ ro_Result,
+ aSource.getB2DPolygon(a),
+ fLineWidth);
+ }
+ }
+
+ } // end of namespace tools
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/basegfx/source/polygon/makefile.mk b/basegfx/source/polygon/makefile.mk
index aeb0af6c5d1b..7ac71ada5e8e 100644
--- a/basegfx/source/polygon/makefile.mk
+++ b/basegfx/source/polygon/makefile.mk
@@ -51,6 +51,7 @@ SLOFILES= \
$(SLO)$/b2dpolygonclipper.obj \
$(SLO)$/b2dpolygontriangulator.obj \
$(SLO)$/b2dpolygoncutandtouch.obj \
+ $(SLO)$/b2dtrapezoid.obj \
$(SLO)$/b3dpolygon.obj \
$(SLO)$/b3dpolygontools.obj \
$(SLO)$/b3dpolypolygon.obj \
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 6ccb7e81d2c4..14c84420dad6 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1744,7 +1744,7 @@ void SfxLibraryContainer::implImportLibDescriptor
// Methods of new XLibraryStorage interface?
-void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XStorage >& xStorage, sal_Bool bComplete )
+void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XStorage >& i_rStorage, sal_Bool bComplete )
{
const Sequence< OUString > aNames = maNameContainer.getElementNames();
sal_Int32 nNameCount = aNames.getLength();
@@ -1765,35 +1765,13 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
::xmlscript::LibDescriptorArray* pLibArray = new ::xmlscript::LibDescriptorArray( nLibsToSave );
// Write to storage?
- sal_Bool bStorage = xStorage.is();
- uno::Reference< embed::XStorage > xLibrariesStor;
+ sal_Bool bStorage = i_rStorage.is();
uno::Reference< embed::XStorage > xSourceLibrariesStor;
- if( bStorage )
+ uno::Reference< embed::XStorage > xTargetLibrariesStor;
+ ::rtl::OUString sTempTargetStorName;
+ const bool bInplaceStorage = bStorage && ( i_rStorage == mxStorage );
+ if ( bStorage )
{
- // when we save to our root storage, ensure the libs are all loaded. Else the below cleaning
- // of the target storage will loose them.
- if ( xStorage == mxStorage )
- {
- pName = aNames.getConstArray();
- for ( ; pName != pNamesEnd; ++pName )
- {
- if ( !isLibraryLoaded( *pName ) )
- loadLibrary( *pName );
- }
- }
-
- // first of all, clean the target library storage, since the storing procedure must do overwrite
- try
- {
- if ( xStorage->hasByName( maLibrariesDir ) )
- xStorage->removeElement( maLibrariesDir );
- }
- catch( const uno::Exception& )
- {
- DBG_UNHANDLED_EXCEPTION();
- return;
- }
-
// Don't write if only empty standard lib exists
if ( ( nNameCount == 1 ) && ( aNames[0].equalsAscii( "Standard" ) ) )
{
@@ -1804,29 +1782,54 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
return;
}
- try {
- xLibrariesStor.set( xStorage->openStorageElement( maLibrariesDir, embed::ElementModes::READWRITE ), UNO_QUERY_THROW );
+ // create the empty target storage
+ try
+ {
+ ::rtl::OUString sTargetLibrariesStoreName;
+ if ( bInplaceStorage )
+ {
+ // create a temporary target storage
+ const ::rtl::OUStringBuffer aTempTargetNameBase = maLibrariesDir + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_temp_" ) );
+ sal_Int32 index = 0;
+ do
+ {
+ ::rtl::OUStringBuffer aTempTargetName( aTempTargetNameBase );
+ aTempTargetName.append( index++ );
+
+ sTargetLibrariesStoreName = aTempTargetName.makeStringAndClear();
+ if ( !i_rStorage->hasByName( sTargetLibrariesStoreName ) )
+ break;
+ }
+ while ( true );
+ sTempTargetStorName = sTargetLibrariesStoreName;
+ }
+ else
+ {
+ sTargetLibrariesStoreName = maLibrariesDir;
+ if ( i_rStorage->hasByName( sTargetLibrariesStoreName ) )
+ i_rStorage->removeElement( sTargetLibrariesStoreName );
+ }
+
+ xTargetLibrariesStor.set( i_rStorage->openStorageElement( sTargetLibrariesStoreName, embed::ElementModes::READWRITE ), UNO_QUERY_THROW );
}
- catch( uno::Exception& )
+ catch( const uno::Exception& )
{
- #if OSL_DEBUG_LEVEL > 0
- Any aError( ::cppu::getCaughtException() );
- ::rtl::OStringBuffer aMessage;
- aMessage.append( "couln't open source library storage.\n\nException:" );
- aMessage.append( ::rtl::OUStringToOString( ::comphelper::anyToString( aError ), osl_getThreadTextEncoding() ) );
- OSL_ENSURE( false, aMessage.makeStringAndClear().getStr() );
- #endif
+ DBG_UNHANDLED_EXCEPTION();
return;
}
+ // open the source storage which might be used to copy yet-unmodified libraries
try
{
- if ( ( mxStorage != xStorage ) && ( mxStorage->hasByName( maLibrariesDir ) ) )
- xSourceLibrariesStor = mxStorage->openStorageElement( maLibrariesDir, embed::ElementModes::READ );
+ if ( mxStorage->hasByName( maLibrariesDir ) )
+ xSourceLibrariesStor = mxStorage->openStorageElement( maLibrariesDir, bInplaceStorage ? embed::ElementModes::READWRITE : embed::ElementModes::READ );
+ else if ( bInplaceStorage )
+ xSourceLibrariesStor = mxStorage->openStorageElement( maLibrariesDir, embed::ElementModes::READWRITE );
}
catch( const uno::Exception& )
{
DBG_UNHANDLED_EXCEPTION();
+ return;
}
}
@@ -1838,7 +1841,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
SfxLibrary* pImplLib = getImplLib( *pName );
if( pImplLib->mbSharedIndexFile )
continue;
- bool bExtensionLib = pImplLib->mbExtension;
+ const bool bExtensionLib = pImplLib->mbExtension;
::xmlscript::LibDescriptor& rLib = bExtensionLib ?
aLibDescriptorForExtensionLibs : pLibArray->mpLibs[iArray];
if( !bExtensionLib )
@@ -1858,12 +1861,14 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
if( pImplLib->implIsModified() || bComplete )
{
- // Can we copy the storage?
+ // Can we simply copy the storage?
if( !mbOldInfoFormat && !pImplLib->implIsModified() && !mbOasis2OOoFormat && xSourceLibrariesStor.is() )
{
- try {
- xSourceLibrariesStor->copyElementTo( rLib.aName, xLibrariesStor, rLib.aName );
- } catch( uno::Exception& )
+ try
+ {
+ xSourceLibrariesStor->copyElementTo( rLib.aName, xTargetLibrariesStor, rLib.aName );
+ }
+ catch( const uno::Exception& )
{
DBG_UNHANDLED_EXCEPTION();
// TODO: error handling?
@@ -1876,7 +1881,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
{
try
{
- xLibraryStor = xLibrariesStor->openStorageElement(
+ xLibraryStor = xTargetLibrariesStor->openStorageElement(
rLib.aName,
embed::ElementModes::READWRITE );
}
@@ -1908,7 +1913,8 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
implStoreLibraryIndexFile( pImplLib, rLib, xLibraryStor );
if( bStorage )
{
- try {
+ try
+ {
uno::Reference< embed::XTransactedObject > xTransact( xLibraryStor, uno::UNO_QUERY_THROW );
xTransact->commit();
}
@@ -1928,6 +1934,59 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
rLib.bReadOnly = pImplLib->mbReadOnlyLink;
}
+ // if we did an in-place save into a storage (i.e. a save into the storage we were already based on),
+ // then we need to clean up the temporary storage we used for this
+ if ( bInplaceStorage && sTempTargetStorName.getLength() )
+ {
+ OSL_ENSURE( xSourceLibrariesStor.is(), "SfxLibrariesContainer::storeLibraries_impl: unexpected: we should have a source storage here!" );
+ try
+ {
+ // for this, we first remove everything from the source storage, then copy the complete content
+ // from the temporary target storage. From then on, what used to be the "source storage" becomes
+ // the "targt storage" for all subsequent operations.
+
+ // (We cannot simply remove the storage, denoted by maLibrariesDir, from i_rStorage - there might be
+ // open references to it.)
+
+ if ( xSourceLibrariesStor.is() )
+ {
+ // remove
+ const Sequence< ::rtl::OUString > aRemoveNames( xSourceLibrariesStor->getElementNames() );
+ for ( const ::rtl::OUString* pRemoveName = aRemoveNames.getConstArray();
+ pRemoveName != aRemoveNames.getConstArray() + aRemoveNames.getLength();
+ ++pRemoveName
+ )
+ {
+ xSourceLibrariesStor->removeElement( *pRemoveName );
+ }
+
+ // copy
+ const Sequence< ::rtl::OUString > aCopyNames( xTargetLibrariesStor->getElementNames() );
+ for ( const ::rtl::OUString* pCopyName