[Libreoffice-commits] core.git: Branch 'feature/gsoc17-revamp-customize-dialog' - 142 commits - accessibility/source animations/source avmedia/source basctl/source basic/inc basic/source binaryurp/qa bin/distro-install-file-lists bridges/source chart2/inc chart2/source comphelper/source compilerplugins/clang config_host/config_vclplug.h.in config_host.mk.in configmgr/qa configure.ac connectivity/Configuration_tdeab.mk connectivity/Library_tdeab1.mk connectivity/Library_tdeabdrv1.mk connectivity/Module_connectivity.mk connectivity/registry connectivity/source cppuhelper/source cui/Library_cui.mk cui/source dbaccess/qa dbaccess/source desktop/inc desktop/Pagein_common.mk desktop/qa desktop/source editeng/source embeddedobj/source embedserv/source extensions/source external/clew external/harfbuzz external/hunspell external/hyphen external/libabw external/libcdr external/libebook external/libetonyek external/libfreehand external/liblangtag external/libmspub external/libmwaw external/libodfgen externa l/liborcus external/libpagemaker external/librevenge external/libstaroffice external/libvisio external/libwpd external/libwpg external/libwps external/libxmlsec external/libxslt external/libzmf external/mythes external/redland filter/source forms/source formula/source framework/inc framework/source helpcontent2 hwpfilter/source i18npool/source i18nutil/source include/basic include/comphelper include/formula include/framework include/o3tl include/osl include/sfx2 include/shell include/svl include/svtools include/svx include/tools include/unotools include/vcl include/xmloff instsetoo_native/CustomTarget_install.mk jvmfwk/plugins l10ntools/source libreofficekit/qa linguistic/source lotuswordpro/source offapi/com officecfg/registry onlineupdate/README oox/inc oox/source package/inc package/qa package/source postprocess/CustomTarget_registry.mk postprocess/Rdb_services.mk qadevOOo/tests readlicense_oo/license reportdesign/source RepositoryExternal.mk Repository.mk sal/Library_sal.mk sal/ osl sal/qa sal/textenc sax/qa sc/inc scp2/AutoInstall.mk scp2/InstallModule_tde.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source sc/qa scripting/source sc/sdi sc/source sc/uiconfig sdext/source sd/inc sd/qa sd/source sd/uiconfig sfx2/inc sfx2/source shell/Library_tdebe.mk shell/Module_shell.mk shell/source slideshow/source smoketest/smoketest.cxx solenv/CompilerTest_compilerplugins_clang.mk solenv/gbuild sot/source starmath/inc starmath/source svl/source svtools/source svx/inc svx/source sw/inc sw/PythonTest_sw_python.mk sw/qa sw/sdi sw/source sw/uiconfig sysui/CustomTarget_share.mk toolkit/source tools/source ucb/source uitest/manual_tests uitest/uitest uitest/writer_tests UnoControls/source unodevtools/source unotools/source uui/source vbahelper/source vcl/CustomTarget_tde_moc.mk vcl/Executable_tdefilepicker.mk vcl/inc vcl/Library_vclplug_tde.mk vcl/Module_vcl.mk vcl/qa vcl/source vcl/unx vcl/workben writerfilter/Library_writerfilter.mk writerfilter/source writer filter/util writerperfect/qa xmlhelp/source xmloff/inc xmloff/Library_xo.mk xmloff/source xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Thu Jun 15 08:23:16 UTC 2017
Repository.mk | 13
RepositoryExternal.mk | 22
UnoControls/source/controls/framecontrol.cxx | 1
UnoControls/source/inc/framecontrol.hxx | 4
accessibility/source/standard/vclxaccessibletoolbox.cxx | 14
animations/source/animcore/animcore.cxx | 2
avmedia/source/framework/soundhandler.hxx | 1
basctl/source/basicide/basdoc.cxx | 5
basctl/source/basicide/baside2b.cxx | 4
basctl/source/inc/docsignature.hxx | 1
basic/inc/sbxbase.hxx | 2
basic/source/basmgr/basmgr.cxx | 2
basic/source/classes/sb.cxx | 42
basic/source/classes/sbintern.cxx | 2
basic/source/classes/sbunoobj.cxx | 4
basic/source/classes/sbxmod.cxx | 3
basic/source/comp/parser.cxx | 4
basic/source/comp/scanner.cxx | 4
basic/source/comp/token.cxx | 4
basic/source/inc/iosys.hxx | 16
basic/source/inc/runtime.hxx | 28
basic/source/inc/sbintern.hxx | 2
basic/source/inc/scanner.hxx | 2
basic/source/inc/token.hxx | 6
basic/source/runtime/ddectrl.cxx | 24
basic/source/runtime/ddectrl.hxx | 14
basic/source/runtime/dllmgr-none.cxx | 6
basic/source/runtime/dllmgr-x64.cxx | 58
basic/source/runtime/dllmgr-x86.cxx | 58
basic/source/runtime/dllmgr.hxx | 2
basic/source/runtime/iosys.cxx | 18
basic/source/runtime/methods.cxx | 16
basic/source/runtime/methods1.cxx | 14
basic/source/runtime/runtime.cxx | 72
basic/source/sbx/sbxarray.cxx | 2
basic/source/sbx/sbxbase.cxx | 16
basic/source/sbx/sbxconv.hxx | 2
basic/source/sbx/sbxcurr.cxx | 54
basic/source/sbx/sbxscan.cxx | 8
basic/source/sbx/sbxvalue.cxx | 8
bin/distro-install-file-lists | 12
binaryurp/qa/test-cache.cxx | 2
bridges/source/cpp_uno/gcc3_ios_arm/helper.s | 99
bridges/source/cpp_uno/gcc3_linux_arm/share.hxx | 19
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 7
chart2/inc/ChartView.hxx | 1
chart2/source/controller/chartapiwrapper/AxisWrapper.hxx | 1
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx | 1
chart2/source/controller/inc/MultipleChartConverters.hxx | 1
chart2/source/controller/inc/MultipleItemConverter.hxx | 2
chart2/source/controller/main/ChartController.cxx | 1
chart2/source/controller/main/ControllerCommandDispatch.hxx | 2
chart2/source/controller/main/DrawCommandDispatch.cxx | 1
chart2/source/controller/main/ElementSelector.cxx | 1
chart2/source/controller/main/FeatureCommandDispatchBase.hxx | 1
chart2/source/controller/main/ShapeController.cxx | 1
chart2/source/controller/sidebar/ChartColorWrapper.hxx | 2
chart2/source/inc/chartview/ExplicitValueProvider.hxx | 1
chart2/source/tools/ExplicitCategoriesProvider.cxx | 1
chart2/source/tools/ModifyListenerHelper.cxx | 2
chart2/source/view/main/VLegend.hxx | 1
comphelper/source/misc/accimplaccess.cxx | 8
comphelper/source/misc/storagehelper.cxx | 20
comphelper/source/misc/syntaxhighlight.cxx | 4
compilerplugins/clang/redundantcopy.cxx | 14
compilerplugins/clang/test/redundantcopy.cxx | 10
config_host.mk.in | 5
config_host/config_vclplug.h.in | 1
configmgr/qa/unit/test.cxx | 4
configure.ac | 192
connectivity/Configuration_tdeab.mk | 20
connectivity/Library_tdeab1.mk | 42
connectivity/Library_tdeabdrv1.mk | 56
connectivity/Module_connectivity.mk | 8
connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu | 37
connectivity/source/commontools/ConnectionWrapper.cxx | 14
connectivity/source/commontools/TConnection.cxx | 14
connectivity/source/drivers/ado/AColumn.cxx | 14
connectivity/source/drivers/ado/AConnection.cxx | 14
connectivity/source/drivers/ado/AGroup.cxx | 14
connectivity/source/drivers/ado/AIndex.cxx | 14
connectivity/source/drivers/ado/AKey.cxx | 14
connectivity/source/drivers/ado/ATable.cxx | 14
connectivity/source/drivers/ado/AUser.cxx | 14
connectivity/source/drivers/ado/AView.cxx | 14
connectivity/source/drivers/calc/CConnection.cxx | 1
connectivity/source/drivers/calc/CTable.cxx | 14
connectivity/source/drivers/dbase/DIndex.cxx | 14
connectivity/source/drivers/dbase/DTable.cxx | 114
connectivity/source/drivers/file/FConnection.cxx | 14
connectivity/source/drivers/file/FResultSet.cxx | 14
connectivity/source/drivers/firebird/Connection.cxx | 7
connectivity/source/drivers/flat/ETable.cxx | 14
connectivity/source/drivers/hsqldb/HTable.cxx | 14
connectivity/source/drivers/hsqldb/HTerminateListener.cxx | 1
connectivity/source/drivers/kab/KCatalog.cxx | 104
connectivity/source/drivers/kab/KCatalog.hxx | 55
connectivity/source/drivers/kab/KColumns.cxx | 94
connectivity/source/drivers/kab/KColumns.hxx | 48
connectivity/source/drivers/kab/KConnection.cxx | 319 -
connectivity/source/drivers/kab/KConnection.hxx | 138
connectivity/source/drivers/kab/KDEInit.cxx | 149
connectivity/source/drivers/kab/KDEInit.h | 53
connectivity/source/drivers/kab/KDatabaseMetaData.cxx | 1069 ---
connectivity/source/drivers/kab/KDatabaseMetaData.hxx | 206
connectivity/source/drivers/kab/KDriver.cxx | 463 -
connectivity/source/drivers/kab/KDriver.hxx | 197
connectivity/source/drivers/kab/KPreparedStatement.cxx | 326 -
connectivity/source/drivers/kab/KPreparedStatement.hxx | 114
connectivity/source/drivers/kab/KResultSet.cxx | 981 ---
connectivity/source/drivers/kab/KResultSet.hxx | 220
connectivity/source/drivers/kab/KResultSetMetaData.cxx | 177
connectivity/source/drivers/kab/KResultSetMetaData.hxx | 84
connectivity/source/drivers/kab/KServices.cxx | 113
connectivity/source/drivers/kab/KStatement.cxx | 567 -
connectivity/source/drivers/kab/KStatement.hxx | 162
connectivity/source/drivers/kab/KTable.cxx | 81
connectivity/source/drivers/kab/KTable.hxx | 59
connectivity/source/drivers/kab/KTables.cxx | 80
connectivity/source/drivers/kab/KTables.hxx | 55
connectivity/source/drivers/kab/kcondition.cxx | 221
connectivity/source/drivers/kab/kcondition.hxx | 154
connectivity/source/drivers/kab/kfields.cxx | 89
connectivity/source/drivers/kab/kfields.hxx | 41
connectivity/source/drivers/kab/korder.cxx | 79
connectivity/source/drivers/kab/korder.hxx | 68
connectivity/source/drivers/kab/tdeab1.component | 15
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 2
connectivity/source/drivers/mysql/YTable.cxx | 14
connectivity/source/drivers/postgresql/pq_statics.cxx | 16
connectivity/source/inc/ado/Aolewrap.hxx | 2
connectivity/source/inc/dbase/DTable.hxx | 34
connectivity/source/sdbcx/VDescriptor.cxx | 14
cppuhelper/source/bootstrap.cxx | 6
cui/Library_cui.mk | 1
cui/source/customize/acccfg.cxx | 2
cui/source/customize/cfg.cxx | 1
cui/source/customize/cfgutil.cxx | 1
cui/source/customize/eventdlg.cxx | 2
cui/source/dialogs/cuihyperdlg.cxx | 10
cui/source/dialogs/hldocntp.cxx | 2
cui/source/dialogs/hlmailtp.cxx | 2
cui/source/dialogs/scriptdlg.cxx | 1
cui/source/inc/acccfg.hxx | 2
cui/source/inc/cfg.hxx | 2
cui/source/inc/cfgutil.hxx | 2
cui/source/inc/cuihyperdlg.hxx | 6
cui/source/inc/cuitabarea.hxx | 7
cui/source/inc/treeopt.hxx | 6
cui/source/options/doclinkdialog.cxx | 2
cui/source/options/optgdlg.cxx | 8
cui/source/options/optopencl.cxx | 1
cui/source/options/treeopt.cxx | 36
cui/source/tabpages/tabarea.cxx | 2
cui/source/tabpages/tparea.cxx | 2
cui/source/tabpages/tpbitmap.cxx | 2
cui/source/tabpages/tppattern.cxx | 10
dbaccess/qa/unit/dbtest_base.cxx | 3
dbaccess/source/core/api/RowSet.cxx | 14
dbaccess/source/core/api/TableDeco.cxx | 14
dbaccess/source/core/dataaccess/ModelImpl.hxx | 2
dbaccess/source/core/dataaccess/databasecontext.cxx | 14
dbaccess/source/core/dataaccess/databasedocument.hxx | 1
dbaccess/source/core/dataaccess/documentdefinition.cxx | 3
dbaccess/source/core/dataaccess/documentdefinition.hxx | 1
dbaccess/source/filter/xml/dbloader2.cxx | 3
dbaccess/source/filter/xml/xmlStyleImport.cxx | 1
dbaccess/source/filter/xml/xmlfilter.cxx | 10
dbaccess/source/ui/app/AppController.cxx | 1
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2
dbaccess/source/ui/app/AppDetailView.hxx | 1
dbaccess/source/ui/app/AppView.cxx | 1
dbaccess/source/ui/app/subcomponentmanager.hxx | 2
dbaccess/source/ui/browser/unodatbr.cxx | 1
dbaccess/source/ui/control/dbtreelistbox.cxx | 2
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2
dbaccess/source/ui/dlg/tablespage.cxx | 1
dbaccess/source/ui/inc/TableDesignView.hxx | 1
dbaccess/source/ui/inc/TokenWriter.hxx | 1
dbaccess/source/ui/inc/databaseobjectview.hxx | 1
dbaccess/source/ui/inc/linkeddocuments.hxx | 2
dbaccess/source/ui/misc/TableCopyHelper.cxx | 1
dbaccess/source/ui/misc/TokenWriter.cxx | 1
dbaccess/source/ui/misc/databaseobjectview.cxx | 3
dbaccess/source/ui/misc/linkeddocuments.cxx | 2
dbaccess/source/ui/querydesign/JoinController.cxx | 1
dbaccess/source/ui/querydesign/JoinExchange.cxx | 14
dbaccess/source/ui/querydesign/QueryTextView.cxx | 1
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
dbaccess/source/ui/relationdesign/RelationController.cxx | 1
dbaccess/source/ui/tabledesign/TEditControl.cxx | 1
dbaccess/source/ui/tabledesign/TableController.cxx | 2
desktop/Pagein_common.mk | 1
desktop/inc/dp_misc.h | 2
desktop/inc/lib/init.hxx | 1
desktop/qa/desktop_lib/test_desktop_lib.cxx | 1
desktop/source/app/app.cxx | 4
desktop/source/app/dispatchwatcher.cxx | 4
desktop/source/app/dispatchwatcher.hxx | 1
desktop/source/app/sofficemain.cxx | 3
desktop/source/deployment/misc/dp_misc.cxx | 2
desktop/source/deployment/registry/package/dp_package.cxx | 6
editeng/source/editeng/impedit.hxx | 2
editeng/source/editeng/impedit2.cxx | 4
editeng/source/items/bulitem.cxx | 2
editeng/source/items/textitem.cxx | 3
editeng/source/misc/unolingu.cxx | 1
embeddedobj/source/commonembedding/embedobj.cxx | 3
embeddedobj/source/commonembedding/persistence.cxx | 1
embeddedobj/source/commonembedding/specialobject.cxx | 3
embeddedobj/source/general/docholder.cxx | 2
embeddedobj/source/msole/ownview.cxx | 1
embedserv/source/embed/docholder.cxx | 3
embedserv/source/embed/ed_ioleobject.cxx | 1
embedserv/source/embed/ed_ipersiststr.cxx | 1
extensions/source/bibliography/bibbeam.cxx | 1
extensions/source/bibliography/bibcont.cxx | 3
extensions/source/dbpilots/commonpagesdbp.cxx | 2
extensions/source/dbpilots/optiongrouplayouter.hxx | 1
extensions/source/propctrlr/formcomponenthandler.cxx | 6
extensions/source/propctrlr/formcomponenthandler.hxx | 1
extensions/source/propctrlr/genericpropertyhandler.cxx | 1
extensions/source/propctrlr/propcontroller.hxx | 1
extensions/source/update/check/updatecheck.cxx | 3
external/clew/source/clew.c | 2
external/harfbuzz/ExternalProject_harfbuzz.mk | 2
external/hunspell/0001-Revert-Remove-autotools-autogenerated-files.patch | 4
external/hyphen/UnpackedTarball_hyphen.mk | 1
external/hyphen/hyphen-iOS.patch.0 | 20
external/libabw/UnpackedTarball_libabw.mk | 4
external/libabw/iOS.patch.0 | 20
external/libcdr/UnpackedTarball_libcdr.mk | 4
external/libcdr/iOS.patch.0 | 20
external/libebook/UnpackedTarball_libebook.mk | 4
external/libebook/iOS.patch.0 | 21
external/libetonyek/UnpackedTarball_libetonyek.mk | 1
external/libetonyek/iOS.patch.0 | 20
external/libfreehand/UnpackedTarball_libfreehand.mk | 4
external/libfreehand/iOS.patch.0 | 20
external/liblangtag/UnpackedTarball_langtag.mk | 1
external/liblangtag/langtag-iOS.patch.0 | 20
external/libmspub/UnpackedTarball_libmspub.mk | 3
external/libmspub/iOS.patch.0 | 21
external/libmwaw/UnpackedTarball_libmwaw.mk | 4
external/libmwaw/iOS.patch.0 | 20
external/libodfgen/UnpackedTarball_libodfgen.mk | 1
external/libodfgen/iOS.patch.0 | 21
external/liborcus/UnpackedTarball_liborcus.mk | 1
external/liborcus/iOS.patch | 20
external/libpagemaker/UnpackedTarball_libpagemaker.mk | 4
external/libpagemaker/iOS.patch.0 | 20
external/librevenge/UnpackedTarball_librevenge.mk | 1
external/librevenge/librevenge-iOS.patch.0 | 20
external/libstaroffice/UnpackedTarball_libstaroffice.mk | 1
external/libstaroffice/iOS.patch.0 | 20
external/libvisio/UnpackedTarball_libvisio.mk | 4
external/libvisio/iOS.patch.0 | 20
external/libwpd/UnpackedTarball_libwpd.mk | 4
external/libwpd/iOS.patch.0 | 21
external/libwpg/UnpackedTarball_libwpg.mk | 4
external/libwpg/iOS.patch.0 | 21
external/libwps/UnpackedTarball_libwps.mk | 4
external/libwps/iOS.patch.0 | 20
external/libxmlsec/xmlsec1-vc.patch.1 | 13
external/libxslt/UnpackedTarball_xslt.mk | 1
external/libxslt/iOS.patch.0 | 20
external/libzmf/libzmf-config-guess.patch.1 | 6
external/mythes/UnpackedTarball_mythes.mk | 1
external/mythes/iOS.patch.0 | 20
external/redland/UnpackedTarball_raptor.mk | 1
external/redland/UnpackedTarball_rasqal.mk | 1
external/redland/UnpackedTarball_redland.mk | 2
external/redland/raptor/iOS.patch.0 | 21
external/redland/rasqal/iOS.patch.0 | 21
external/redland/redland/iOS-libltdl.patch.0 | 21
external/redland/redland/iOS.patch.0 | 21
filter/source/graphic/GraphicExportDialog.cxx | 1
filter/source/graphicfilter/ieps/ieps.cxx | 6
filter/source/graphicfilter/ios2met/ios2met.cxx | 14
filter/source/msfilter/msdffimp.cxx | 8
filter/source/msfilter/mstoolbar.cxx | 1
filter/source/msfilter/svdfppt.cxx | 42
filter/source/pdf/pdfexport.cxx | 1
filter/source/svg/svgdialog.cxx | 2
filter/source/svg/svgfilter.cxx | 4
filter/source/svg/tokenmap.cxx | 2
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 3
filter/source/xslt/export/wordml/ooo2wordml_draw.xsl | 2
filter/source/xsltdialog/xmlfilterjar.cxx | 2
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 3
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 2
forms/source/component/ComboBox.cxx | 20
forms/source/component/ListBox.cxx | 29
forms/source/component/clickableimage.cxx | 2
forms/source/component/clickableimage.hxx | 1
forms/source/component/entrylisthelper.cxx | 14
forms/source/component/entrylisthelper.hxx | 11
forms/source/misc/property.cxx | 1
forms/source/richtext/richtextvclcontrol.cxx | 2
forms/source/solar/component/navbarcontrol.hxx | 1
forms/source/xforms/submission/submission_put.hxx | 1
formula/source/core/api/token.cxx | 97
framework/inc/classes/framecontainer.hxx | 1
framework/inc/classes/taskcreator.hxx | 2
framework/inc/dispatch/oxt_handler.hxx | 1
framework/inc/dispatch/popupmenudispatcher.hxx | 4
framework/inc/dispatch/startmoduledispatcher.hxx | 1
framework/inc/helper/titlebarupdate.hxx | 1
framework/inc/jobs/helponstartup.hxx | 1
framework/inc/jobs/job.hxx | 1
framework/inc/jobs/jobdata.hxx | 1
framework/inc/jobs/shelljob.hxx | 2
framework/inc/services/desktop.hxx | 5
framework/inc/services/layoutmanager.hxx | 3
framework/inc/uielement/addonstoolbarmanager.hxx | 2
framework/inc/uielement/addonstoolbarwrapper.hxx | 1
framework/inc/uielement/buttontoolbarcontroller.hxx | 3
framework/inc/uielement/comboboxtoolbarcontroller.hxx | 1
framework/inc/uielement/dropdownboxtoolbarcontroller.hxx | 1
framework/inc/uielement/edittoolbarcontroller.hxx | 1
framework/inc/uielement/fontmenucontroller.hxx | 3
framework/inc/uielement/fontsizemenucontroller.hxx | 2
framework/inc/uielement/headermenucontroller.hxx | 5
framework/inc/uielement/imagebuttontoolbarcontroller.hxx | 1
framework/inc/uielement/langselectionmenucontroller.hxx | 3
framework/inc/uielement/macrosmenucontroller.hxx | 5
framework/inc/uielement/menubarwrapper.hxx | 2
framework/inc/uielement/newmenucontroller.hxx | 5
framework/inc/uielement/notebookbarmenucontroller.hxx | 3
framework/inc/uielement/spinfieldtoolbarcontroller.hxx | 1
framework/inc/uielement/statusbarmanager.hxx | 1
framework/inc/uielement/statusbarwrapper.hxx | 1
framework/inc/uielement/togglebuttontoolbarcontroller.hxx | 1
framework/inc/uielement/toolbarmanager.hxx | 1
framework/inc/uielement/toolbarmodemenucontroller.hxx | 3
framework/inc/uielement/toolbarsmenucontroller.hxx | 4
framework/inc/uielement/toolbarwrapper.hxx | 1
framework/source/dispatch/dispatchdisabler.cxx | 1
framework/source/dispatch/popupmenudispatcher.cxx | 1
framework/source/dispatch/startmoduledispatcher.cxx | 2
framework/source/fwe/classes/addonsoptions.cxx | 2
framework/source/fwe/xml/menuconfiguration.cxx | 1
framework/source/helper/oframes.cxx | 1
framework/source/helper/titlebarupdate.cxx | 1
framework/source/inc/loadenv/loadenv.hxx | 3
framework/source/inc/pattern/frame.hxx | 3
framework/source/jobs/jobexecutor.cxx | 1
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 3
framework/source/services/desktop.cxx | 1
framework/source/uiconfiguration/uicategorydescription.cxx | 1
framework/source/uielement/addonstoolbarmanager.cxx | 2
framework/source/uielement/comboboxtoolbarcontroller.cxx | 6
framework/source/uielement/complextoolbarcontroller.cxx | 2
framework/source/uielement/controlmenucontroller.cxx | 1
framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 6
framework/source/uielement/edittoolbarcontroller.cxx | 6
framework/source/uielement/footermenucontroller.cxx | 2
framework/source/uielement/headermenucontroller.cxx | 1
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 4
framework/source/uielement/langselectionmenucontroller.cxx | 1
framework/source/uielement/langselectionstatusbarcontroller.cxx | 4
framework/source/uielement/macrosmenucontroller.cxx | 2
framework/source/uielement/menubarmanager.cxx | 4
framework/source/uielement/notebookbarmenucontroller.cxx | 1
framework/source/uielement/objectmenucontroller.cxx | 4
framework/source/uielement/popuptoolbarcontroller.cxx | 1
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 6
framework/source/uielement/subtoolbarcontroller.cxx | 1
framework/source/uielement/togglebuttontoolbarcontroller.cxx | 2
framework/source/uielement/toolbarmodemenucontroller.cxx | 1
framework/source/uifactory/statusbarfactory.cxx | 3
framework/source/uifactory/toolbarfactory.cxx | 3
framework/source/uifactory/uielementfactorymanager.cxx | 1
helpcontent2 | 2
hwpfilter/source/fontmap.cxx | 7
hwpfilter/source/hbox.cxx | 4
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 2
i18npool/source/nativenumber/nativenumbersupplier.cxx | 18
i18npool/source/textconversion/textconversion_ko.cxx | 8
i18npool/source/transliteration/numtotext_cjk.cxx | 2
i18nutil/source/utility/widthfolding.cxx | 8
include/basic/sberrors.hxx | 6
include/basic/sbstar.hxx | 24
include/basic/sbxcore.hxx | 4
include/basic/sbxdef.hxx | 3
include/basic/sbxvar.hxx | 2
include/comphelper/embeddedobjectcontainer.hxx | 1
include/comphelper/sequence.hxx | 15
include/comphelper/storagehelper.hxx | 6
include/formula/tokenarray.hxx | 9
include/framework/menuconfiguration.hxx | 1
include/o3tl/make_unique.hxx | 16
include/osl/file.h | 2
include/osl/file.hxx | 2
include/sfx2/bindings.hxx | 2
include/sfx2/notebookbar/NotebookbarTabControl.hxx | 1
include/sfx2/notebookbar/SfxNotebookBar.hxx | 1
include/sfx2/objsh.hxx | 1
include/sfx2/printer.hxx | 10
include/sfx2/recentdocsview.hxx | 2
include/sfx2/sfxbasemodel.hxx | 1
include/sfx2/shell.hxx | 2
include/sfx2/sidebar/ControlFactory.hxx | 2
include/sfx2/sidebar/SidebarPanelBase.hxx | 1
include/sfx2/sidebar/SidebarToolBox.hxx | 1
include/sfx2/tbxctrl.hxx | 1
include/sfx2/unoctitm.hxx | 6
include/sfx2/viewfrm.hxx | 3
include/shell/kde_headers.h | 94
include/shell/tde_defines.h | 96
include/shell/tde_headers.h | 84
include/svl/poolitem.hxx | 2
include/svtools/statusbarcontroller.hxx | 1
include/svx/PaletteManager.hxx | 3
include/svx/float3d.hxx | 2
include/svx/fmtools.hxx | 6
include/svx/pageitem.hxx | 6
include/svx/sdr/properties/defaultproperties.hxx | 8
include/svx/sdr/properties/properties.hxx | 6
include/svx/tbcontrl.hxx | 1
include/svx/xflasit.hxx | 6
include/svx/xlnasit.hxx | 5
include/tools/stream.hxx | 2
include/unotools/eventcfg.hxx | 1
include/vcl/syschild.hxx | 6
include/xmloff/ProgressBarHelper.hxx | 1
include/xmloff/formlayerexport.hxx | 1
include/xmloff/numehelp.hxx | 1
include/xmloff/xmlimp.hxx | 14
include/xmloff/xmlnmspe.hxx | 81
instsetoo_native/CustomTarget_install.mk | 2
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 6
jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 12
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 6
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 2
l10ntools/source/gRun.sh | 4
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 4
linguistic/source/convdicxml.cxx | 2
linguistic/source/misc.cxx | 1
lotuswordpro/source/filter/lwpfilter.cxx | 3
offapi/com/sun/star/document/LockFileCorruptRequest.idl | 2
offapi/com/sun/star/graphic/XGraphicProvider2.idl | 2
offapi/com/sun/star/ucb/Content.idl | 2
offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl | 2
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 5
onlineupdate/README | 2
oox/inc/drawingml/textrun.hxx | 1
oox/source/drawingml/chart/converterbase.cxx | 2
oox/source/drawingml/chart/objectformatter.cxx | 1
oox/source/drawingml/shape3dproperties.cxx | 1
oox/source/drawingml/textbody.cxx | 1
oox/source/drawingml/textbodyproperties.cxx | 4
oox/source/drawingml/textparagraph.cxx | 1
oox/source/drawingml/textrun.cxx | 1
oox/source/helper/graphichelper.cxx | 1
oox/source/helper/zipstorage.cxx | 4
oox/source/ppt/pptshape.cxx | 1
oox/source/ppt/timenode.cxx | 2
package/inc/ZipFile.hxx | 3
package/qa/cppunit/test_package.cxx | 4
package/source/xstor/xfactory.cxx | 3
package/source/xstor/xstorage.cxx | 3
package/source/zipapi/XBufferedThreadedStream.cxx | 8
package/source/zipapi/XUnbufferedStream.cxx | 3
package/source/zipapi/ZipFile.cxx | 10
package/source/zippackage/ZipPackage.cxx | 14
package/source/zippackage/zipfileaccess.cxx | 6
postprocess/CustomTarget_registry.mk | 3
postprocess/Rdb_services.mk | 6
qadevOOo/tests/java/ifc/util/_XMergeable.java | 2
readlicense_oo/license/CREDITS.fodt | 2979 +++++-----
reportdesign/source/core/api/ReportDefinition.cxx | 16
reportdesign/source/core/api/Section.cxx | 14
reportdesign/source/filter/xml/dbloader2.cxx | 1
reportdesign/source/filter/xml/dbloader2.hxx | 5
reportdesign/source/filter/xml/xmlExport.cxx | 1
reportdesign/source/filter/xml/xmlHelper.hxx | 1
reportdesign/source/filter/xml/xmlStyleImport.cxx | 1
reportdesign/source/ui/inc/AddField.hxx | 1
reportdesign/source/ui/inc/DesignView.hxx | 1
reportdesign/source/ui/misc/toolboxcontroller.cxx | 1
sal/Library_sal.mk | 3
sal/osl/unx/signal.cxx | 24
sal/qa/rtl/digest/rtl_digest.cxx | 19
sal/qa/rtl/oustring/rtl_OUString2.cxx | 4
sal/qa/rtl/textenc/rtl_textcvt.cxx | 2
sal/qa/rtl/uri/rtl_testuri.cxx | 3
sal/textenc/convertadobe.tab | 2
sal/textenc/convertsimple.cxx | 4
sax/qa/cppunit/xmlimport.cxx | 4
sc/inc/attarray.hxx | 7
sc/inc/column.hxx | 1
sc/inc/document.hxx | 1
sc/inc/patattr.hxx | 4
sc/inc/sc.hrc | 3
sc/inc/scmod.hxx | 2
sc/inc/table.hxx | 1
sc/qa/extras/check_data_pilot_field.cxx | 1
sc/qa/extras/check_data_pilot_table.cxx | 1
sc/qa/extras/check_xcell_ranges_query.cxx | 1
sc/qa/perf/scperfobj.cxx | 1
sc/qa/unit/copy_paste_test.cxx | 1
sc/qa/unit/subsequent_filters-test.cxx | 2
sc/qa/unit/ucalc.cxx | 2
sc/qa/unit/ucalc_formula.cxx | 3
sc/sdi/cellsh.sdi | 1
sc/sdi/scalc.sdi | 16
sc/source/core/data/attarray.cxx | 3
sc/source/core/data/clipcontext.cxx | 2
sc/source/core/data/column.cxx | 2
sc/source/core/data/column3.cxx | 2
sc/source/core/data/column4.cxx | 18
sc/source/core/data/conditio.cxx | 8
sc/source/core/data/docpool.cxx | 11
sc/source/core/data/documen8.cxx | 9
sc/source/core/data/document.cxx | 8
sc/source/core/data/patattr.cxx | 18
sc/source/core/data/table1.cxx | 11
sc/source/core/data/table2.cxx | 8
sc/source/core/inc/interpre.hxx | 1
sc/source/core/tool/autoform.cxx | 22
sc/source/core/tool/interpr1.cxx | 13
sc/source/core/tool/interpr4.cxx | 72
sc/source/core/tool/interpr5.cxx | 13
sc/source/core/tool/reftokenhelper.cxx | 3
sc/source/filter/excel/xecontent.cxx | 2
sc/source/filter/excel/xelink.cxx | 2
sc/source/filter/html/htmlexp.cxx | 2
sc/source/filter/starcalc/scflt.cxx | 48
sc/source/filter/xml/xmlimprt.hxx | 1
sc/source/filter/xml/xmlstyli.cxx | 1
sc/source/ui/app/scmod.cxx | 8
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/docshell/dbdocimp.cxx | 1
sc/source/ui/docshell/docsh4.cxx | 1
sc/source/ui/docshell/docsh6.cxx | 11
sc/source/ui/docshell/externalrefmgr.cxx | 1
sc/source/ui/docshell/tablink.cxx | 2
sc/source/ui/drawfunc/fuins2.cxx | 2
sc/source/ui/inc/tbzoomsliderctrl.hxx | 1
sc/source/ui/optdlg/calcoptionsdlg.cxx | 3
sc/source/ui/unoobj/confuno.cxx | 11
sc/source/ui/unoobj/scdetect.cxx | 3
sc/source/ui/vba/vbaapplication.cxx | 1
sc/source/ui/vba/vbaformatcondition.hxx | 1
sc/source/ui/vba/vbaworkbook.cxx | 1
sc/source/ui/vba/vbaworkbooks.cxx | 5
sc/source/ui/vba/vbaworksheet.cxx | 1
sc/source/ui/view/cellsh1.cxx | 14
sc/source/ui/view/cellsh2.cxx | 3
sc/source/ui/view/tabview3.cxx | 1
sc/source/ui/view/viewfunc.cxx | 6
sc/uiconfig/scalc/menubar/menubar.xml | 1
scp2/AutoInstall.mk | 1
scp2/InstallModule_tde.mk | 18
scp2/InstallScript_setup_osl.mk | 3
scp2/Module_scp2.mk | 3
scp2/source/tde/module_tde.scp | 24
scp2/source/tde/module_tde.ulf | 17
scripting/source/provider/MasterScriptProvider.hxx | 1
scripting/source/provider/ProviderCache.hxx | 1
sd/inc/drawdoc.hxx | 1
sd/inc/sdmod.hxx | 2
sd/inc/sdpage.hxx | 2
sd/qa/unit/dialogs-test.cxx | 2
sd/qa/unit/export-tests-ooxml2.cxx | 1
sd/qa/unit/import-tests.cxx | 4
sd/source/core/sdpage.cxx | 2
sd/source/core/sdpage2.cxx | 6
sd/source/filter/html/HtmlOptionsDialog.cxx | 2
sd/source/filter/html/pubdlg.cxx | 4
sd/source/filter/ppt/pptatom.cxx | 6
sd/source/filter/ppt/pptatom.hxx | 2
sd/source/filter/ppt/pptin.cxx | 14
sd/source/filter/sdfilter.cxx | 1
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 1
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 1
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 1
sd/source/ui/animations/CustomAnimationPane.hxx | 1
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/app/sdmod2.cxx | 5
sd/source/ui/controller/slidelayoutcontroller.cxx | 1
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/docshell/docshel4.cxx | 5
sd/source/ui/framework/factories/BasicViewFactory.hxx | 1
sd/source/ui/framework/factories/FullScreenPane.cxx | 1
sd/source/ui/framework/factories/FullScreenPane.hxx | 1
sd/source/ui/inc/ToolBarManager.hxx | 1
sd/source/ui/inc/ViewShellBase.hxx | 2
sd/source/ui/inc/tools/SlotStateListener.hxx | 1
sd/source/ui/remotecontrol/Listener.cxx | 1
sd/source/ui/remotecontrol/Listener.hxx | 1
sd/source/ui/remotecontrol/Receiver.cxx | 2
sd/source/ui/sidebar/DocumentHelper.cxx | 1
sd/source/ui/sidebar/LayoutMenu.cxx | 1
sd/source/ui/sidebar/MasterPageContainer.cxx | 1
sd/source/ui/sidebar/MasterPageContainer.hxx | 1
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 1
sd/source/ui/sidebar/SlideBackground.cxx | 50
sd/source/ui/sidebar/SlideBackground.hxx | 5
sd/source/ui/slideshow/slideshowimpl.cxx | 5
sd/source/ui/table/tablefunction.cxx | 1
sd/source/ui/tools/SlotStateListener.cxx | 1
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 16
sd/source/ui/unoidl/UnoDocumentSettings.hxx | 2
sd/source/ui/view/PresentationViewShellBase.cxx | 1
sd/source/ui/view/ViewShellBase.cxx | 3
sd/source/ui/view/drviews1.cxx | 2
sd/source/ui/view/viewoverlaymanager.cxx | 2
sd/source/ui/view/viewshe2.cxx | 8
sd/uiconfig/sdraw/toolbar/standardbar.xml | 1
sd/uiconfig/simpress/toolbar/standardbar.xml | 1
sdext/source/minimizer/configurationaccess.cxx | 1
sdext/source/minimizer/graphiccollector.cxx | 1
sdext/source/minimizer/informationdialog.hxx | 3
sdext/source/minimizer/optimizerdialog.cxx | 3
sdext/source/minimizer/optimizerdialog.hxx | 3
sdext/source/minimizer/optimizerdialogcontrols.cxx | 1
sdext/source/minimizer/unodialog.cxx | 1
sdext/source/pdfimport/pdfiadaptor.cxx | 1
sdext/source/presenter/PresenterProtocolHandler.cxx | 1
sdext/source/presenter/PresenterViewFactory.hxx | 1
sfx2/inc/bluthsndapi.hxx | 1
sfx2/source/appl/app.cxx | 5
sfx2/source/appl/appbas.cxx | 2
sfx2/source/appl/appcfg.cxx | 2
sfx2/source/appl/appmisc.cxx | 3
sfx2/source/appl/appopen.cxx | 4
sfx2/source/appl/appserv.cxx | 4
sfx2/source/appl/appuno.cxx | 2
sfx2/source/appl/childwin.cxx | 1
sfx2/source/appl/helpdispatch.cxx | 1
sfx2/source/appl/helpinterceptor.cxx | 1
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/appl/newhelp.hxx | 2
sfx2/source/appl/sfxhelp.cxx | 4
sfx2/source/appl/shutdownicon.cxx | 1
sfx2/source/bastyp/fltfnc.cxx | 17
sfx2/source/bastyp/progress.cxx | 1
sfx2/source/bastyp/sfxhtml.cxx | 2
sfx2/source/control/bindings.cxx | 9
sfx2/source/control/recentdocsview.cxx | 3
sfx2/source/control/shell.cxx | 2
sfx2/source/control/statcach.cxx | 6
sfx2/source/control/templatelocalview.cxx | 3
sfx2/source/control/unoctitm.cxx | 5
sfx2/source/dialog/backingwindow.hxx | 2
sfx2/source/dialog/bluthsnd.cxx | 1
sfx2/source/dialog/dockwin.cxx | 1
sfx2/source/dialog/recfloat.cxx | 2
sfx2/source/doc/doctempl.cxx | 1
sfx2/source/doc/graphhelp.cxx | 2
sfx2/source/doc/objcont.cxx | 1
sfx2/source/doc/objserv.cxx | 4
sfx2/source/doc/objstor.cxx | 2
sfx2/source/doc/printhelper.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 1
sfx2/source/doc/templatedlg.cxx | 1
sfx2/source/inc/appdata.hxx | 1
sfx2/source/inc/eventsupplier.hxx | 1
sfx2/source/inc/objshimp.hxx | 1
sfx2/source/inc/statcach.hxx | 4
sfx2/source/inc/workwin.hxx | 1
sfx2/source/inet/inettbc.cxx | 1
sfx2/source/notebookbar/SfxNotebookBar.cxx | 1
sfx2/source/sidebar/ControllerItem.cxx | 2
sfx2/source/sidebar/SidebarController.cxx | 1
sfx2/source/toolbox/tbxitem.cxx | 6
sfx2/source/view/frame2.cxx | 1
sfx2/source/view/impframe.hxx | 1
sfx2/source/view/printer.cxx | 22
sfx2/source/view/sfxbasecontroller.cxx | 1
sfx2/source/view/viewfrm.cxx | 4
sfx2/source/view/viewfrm2.cxx | 1
sfx2/source/view/viewprn.cxx | 4
shell/Library_tdebe.mk | 32
shell/Module_shell.mk | 6
shell/source/backends/kdebe/kdeaccess.cxx | 297
shell/source/backends/kdebe/kdeaccess.hxx | 40
shell/source/backends/kdebe/kdebackend.cxx | 181
slideshow/source/engine/opengl/TransitionerImpl.cxx | 20
slideshow/source/engine/shapes/drawshape.cxx | 1
smoketest/smoketest.cxx | 1
solenv/CompilerTest_compilerplugins_clang.mk | 2
solenv/gbuild/CppunitTest.mk | 2
sot/source/sdstor/ucbstorage.cxx | 10
starmath/inc/smmod.hxx | 2
starmath/source/document.cxx | 10
starmath/source/mathmlexport.cxx | 2
starmath/source/mathmlimport.cxx | 14
starmath/source/mathmlimport.hxx | 6
starmath/source/mathtype.cxx | 14
starmath/source/mathtype.hxx | 4
starmath/source/smdetect.cxx | 2
starmath/source/smmod.cxx | 9
starmath/source/unomodel.cxx | 9
starmath/source/view.cxx | 4
svl/source/items/sitem.cxx | 10
svl/source/misc/inettype.cxx | 2
svtools/source/config/helpopt.cxx | 12
svtools/source/control/toolbarmenuimp.hxx | 1
svtools/source/filter/SvFilterOptionsDialog.cxx | 1
svtools/source/misc/sampletext.cxx | 2
svtools/source/svhtml/htmlkywd.cxx | 16
svtools/source/svrtf/rtfkeywd.cxx | 4
svtools/source/uno/generictoolboxcontroller.cxx | 2
svtools/source/uno/statusbarcontroller.cxx | 1
svtools/source/urlobj/inetimg.cxx | 2
svx/inc/sdr/properties/attributeproperties.hxx | 2
svx/inc/sdr/properties/captionproperties.hxx | 2
svx/inc/sdr/properties/circleproperties.hxx | 2
svx/inc/sdr/properties/connectorproperties.hxx | 2
svx/inc/sdr/properties/customshapeproperties.hxx | 2
svx/inc/sdr/properties/e3dproperties.hxx | 2
svx/inc/sdr/properties/emptyproperties.hxx | 11
svx/inc/sdr/properties/graphicproperties.hxx | 2
svx/inc/sdr/properties/groupproperties.hxx | 2
svx/inc/sdr/properties/measureproperties.hxx | 2
svx/inc/sdr/properties/pageproperties.hxx | 2
svx/inc/sdr/properties/textproperties.hxx | 2
svx/source/core/graphichelper.cxx | 4
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 32
svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 4
svx/source/dialog/SafeModeDialog.cxx | 2
svx/source/dialog/docrecovery.cxx | 1
svx/source/engine3d/float3d.cxx | 10
svx/source/form/datanavi.cxx | 1
svx/source/form/fmshell.cxx | 1
svx/source/form/fmtools.cxx | 1
svx/source/form/formcontroller.cxx | 1
svx/source/form/tbxform.cxx | 1
svx/source/inc/fmpgeimp.hxx | 1
svx/source/inc/fmshimp.hxx | 1
svx/source/inc/fmtextcontrolshell.hxx | 1
svx/source/inc/formcontroller.hxx | 3
svx/source/items/pageitem.cxx | 8
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 2
svx/source/sdr/properties/attributeproperties.cxx | 27
svx/source/sdr/properties/captionproperties.cxx | 7
svx/source/sdr/properties/circleproperties.cxx | 7
svx/source/sdr/properties/connectorproperties.cxx | 7
svx/source/sdr/properties/customshapeproperties.cxx | 7
svx/source/sdr/properties/defaultproperties.cxx | 18
svx/source/sdr/properties/e3dproperties.cxx | 7
svx/source/sdr/properties/emptyproperties.cxx | 16
svx/source/sdr/properties/graphicproperties.cxx | 7
svx/source/sdr/properties/groupproperties.cxx | 10
svx/source/sdr/properties/measureproperties.cxx | 7
svx/source/sdr/properties/pageproperties.cxx | 7
svx/source/sdr/properties/textproperties.cxx | 7
svx/source/sidebar/PanelLayout.cxx | 1
svx/source/sidebar/nbdtmg.cxx | 55
svx/source/sidebar/styles/StylesPropertyPanel.hxx | 1
svx/source/svdraw/svdedxv.cxx | 9
svx/source/svdraw/svdfmtf.cxx | 14
svx/source/svdraw/svdfmtf.hxx | 11
svx/source/table/cell.cxx | 7
svx/source/table/svdotable.cxx | 27
svx/source/tbxctrls/fillctrl.cxx | 1
svx/source/tbxctrls/tbcontrl.cxx | 1
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 1
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx | 1
svx/source/unodraw/UnoGraphicExporter.cxx | 2
svx/source/unodraw/recoveryui.cxx | 1
svx/source/unodraw/unomtabl.cxx | 19
svx/source/unodraw/unoprov.cxx | 4
svx/source/xml/xmlgrhlp.cxx | 12
svx/source/xoutdev/xattr.cxx | 25
svx/source/xoutdev/xexch.cxx | 9
svx/source/xoutdev/xpool.cxx | 13
sw/PythonTest_sw_python.mk | 1
sw/inc/swabstdlg.hxx | 1
sw/inc/swmodule.hxx | 2
sw/qa/complex/writer/TextPortionEnumerationTest.java | 205
sw/qa/core/layout-test.cxx | 1
sw/qa/core/macros-test.cxx | 3
sw/qa/extras/ooxmlexport/data/tdf107618.doc |binary
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 1
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 1
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 1
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 1
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 7
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 1
sw/qa/extras/rtfexport/rtfexport.cxx | 1
sw/qa/extras/ww8export/ww8export.cxx | 2
sw/qa/python/text_portion_enumeration_test.py | 1023 +++
sw/sdi/_grfsh.sdi | 2
sw/source/core/bastyp/calc.cxx | 2
sw/source/core/doc/DocumentDeviceManager.cxx | 10
sw/source/core/doc/SwStyleNameMapper.cxx | 24
sw/source/core/doc/docbasic.cxx | 8
sw/source/core/doc/docsort.cxx | 29
sw/source/core/doc/tblafmt.cxx | 24
sw/source/core/edit/edfcol.cxx | 45
sw/source/core/inc/UndoTable.hxx | 2
sw/source/core/inc/docsort.hxx | 8
sw/source/core/inc/unoport.hxx | 2
sw/source/core/swg/SwXMLBlockExport.cxx | 2
sw/source/core/text/frmform.cxx | 8
sw/source/core/text/redlnitr.cxx | 6
sw/source/core/text/redlnitr.hxx | 2
sw/source/core/undo/untbl.cxx | 64
sw/source/core/unocore/unoport.cxx | 11
sw/source/core/unocore/unostyle.cxx | 3
sw/source/filter/ascii/parasc.cxx | 12
sw/source/filter/ascii/wrtasc.cxx | 2
sw/source/filter/html/htmlctxt.cxx | 5
sw/source/filter/html/htmlform.cxx | 2
sw/source/filter/html/swhtml.cxx | 93
sw/source/filter/html/swhtml.hxx | 8
sw/source/filter/html/wrthtml.cxx | 2
sw/source/filter/writer/writer.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 83
sw/source/filter/ww8/ww8graf2.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 11
sw/source/filter/ww8/ww8par3.cxx | 14
sw/source/filter/ww8/ww8par5.cxx | 3
sw/source/filter/ww8/ww8scan.cxx | 10
sw/source/filter/xml/xmlexp.cxx | 1
sw/source/filter/xml/xmlfmt.cxx | 52
sw/source/filter/xml/xmltbli.cxx | 1
sw/source/ui/config/optpage.cxx | 9
sw/source/ui/dbui/mmgreetingspage.cxx | 9
sw/source/ui/dialog/ascfldlg.cxx | 9
sw/source/ui/envelp/mailmrge.cxx | 1
sw/source/ui/frmdlg/cption.cxx | 1
sw/source/ui/utlui/swrenamexnameddlg.cxx | 1
sw/source/ui/vba/vbadocuments.cxx | 5
sw/source/ui/vba/vbaheaderfooterhelper.cxx | 1
sw/source/uibase/app/apphdl.cxx | 1
sw/source/uibase/app/appopt.cxx | 5
sw/source/uibase/config/dbconfig.cxx | 26
sw/source/uibase/config/fontcfg.cxx | 78
sw/source/uibase/config/uinums.cxx | 2
sw/source/uibase/dbui/dbmgr.cxx | 4
sw/source/uibase/dbui/mmconfigitem.cxx | 95
sw/source/uibase/fldui/fldmgr.cxx | 2
sw/source/uibase/inc/fontcfg.hxx | 2
sw/source/uibase/inc/formatclipboard.hxx | 11
sw/source/uibase/misc/glshell.cxx | 7
sw/source/uibase/uiview/formatclipboard.cxx | 43
sw/source/uibase/uiview/srcview.cxx | 2
sw/source/uibase/uiview/view.cxx | 8
sw/source/uibase/uiview/viewmdi.cxx | 1
sw/source/uibase/uno/SwXDocumentSettings.cxx | 9
sw/source/uibase/uno/unoatxt.cxx | 2
sw/uiconfig/swriter/menubar/menubar.xml | 2
sw/uiconfig/swriter/popupmenu/table.xml | 6
sw/uiconfig/swriter/popupmenu/text.xml | 6
sw/uiconfig/swriter/toolbar/textstylebar.xml | 2
sysui/CustomTarget_share.mk | 2
toolkit/source/awt/vclxprinter.cxx | 2
toolkit/source/awt/vclxtoolkit.cxx | 4
toolkit/source/helper/property.cxx | 2
tools/source/generic/color.cxx | 2
tools/source/rc/resmgr.cxx | 2
ucb/source/ucp/expand/ucpexpand.cxx | 4
ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 1
uitest/manual_tests/calc.py | 2
uitest/uitest/config.py | 2
uitest/uitest/test.py | 17
uitest/writer_tests/insertBreakDialog.py | 13
uitest/writer_tests/insertPageHeader.py | 72
uitest/writer_tests/pageDialog.py | 86
unodevtools/source/skeletonmaker/skeletoncommon.cxx | 2
unotools/source/config/defaultoptions.cxx | 2
unotools/source/config/eventcfg.cxx | 1
unotools/source/config/pathoptions.cxx | 13
unotools/source/config/saveopt.cxx | 2
unotools/source/misc/ZipPackageHelper.cxx | 2
uui/source/iahndl-errorhandler.cxx | 2
uui/source/lockcorrupt.src | 2
vbahelper/source/msforms/vbauserform.hxx | 1
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 1
vbahelper/source/vbahelper/vbacommandbar.cxx | 2
vbahelper/source/vbahelper/vbacommandbars.cxx | 1
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 4
vbahelper/source/vbahelper/vbaeventshelperbase.cxx | 1
vbahelper/source/vbahelper/vbahelper.cxx | 2
vcl/CustomTarget_tde_moc.mk | 21
vcl/Executable_tdefilepicker.mk | 51
vcl/Library_vclplug_tde.mk | 86
vcl/Module_vcl.mk | 7
vcl/inc/salobj.hxx | 4
vcl/inc/unx/kde/kdedata.hxx | 110
vcl/inc/unx/salobj.h | 2
vcl/qa/cppunit/graphicfilter/filters-test.cxx | 2
vcl/qa/cppunit/pdfexport/data/tdf99680-2.odt |binary
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 48
vcl/source/app/svapp.cxx | 3
vcl/source/edit/texteng.cxx | 4
vcl/source/font/fontcharmap.cxx | 4
vcl/source/fontsubset/cff.cxx | 2
vcl/source/gdi/dibtools.cxx | 12
vcl/source/gdi/impgraph.cxx | 4
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/source/gdi/print.cxx | 2
vcl/source/gdi/print3.cxx | 2
vcl/source/outdev/font.cxx | 2
vcl/source/uitest/uno/uiobject_uno.cxx | 26
vcl/source/window/syschild.cxx | 6
vcl/unx/generic/window/salobj.cxx | 39
vcl/unx/gtk/a11y/atktextattributes.cxx | 12
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 1
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 1
vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 1
vcl/unx/gtk/gtksalframe.cxx | 4
vcl/unx/kde/FPServiceInfo.hxx | 42
vcl/unx/kde/UnxCommandThread.cxx | 300 -
vcl/unx/kde/UnxCommandThread.hxx | 126
vcl/unx/kde/UnxFilePicker.cxx | 910 ---
vcl/unx/kde/UnxFilePicker.hxx | 165
vcl/unx/kde/UnxNotifyThread.cxx | 103
vcl/unx/kde/UnxNotifyThread.hxx | 77
vcl/unx/kde/fpicker/kdecommandthread.cxx | 185
vcl/unx/kde/fpicker/kdecommandthread.hxx | 103
vcl/unx/kde/fpicker/kdefilepicker.cxx | 806 --
vcl/unx/kde/fpicker/kdefilepicker.hxx | 138
vcl/unx/kde/fpicker/kdefpmain.cxx | 109
vcl/unx/kde/fpicker/kdemodalityfilter.cxx | 62
vcl/unx/kde/fpicker/kdemodalityfilter.hxx | 52
vcl/unx/kde/kdedata.cxx | 238
vcl/unx/kde/salnativewidgets-kde.cxx | 2097 -------
vcl/workben/icontest.cxx | 2
writerfilter/Library_writerfilter.mk | 1
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2
writerfilter/source/dmapper/NumberingManager.cxx | 2
writerfilter/source/filter/WriterFilterDetection.cxx | 134
writerfilter/util/writerfilter.component | 4
writerperfect/qa/unit/WpftLoader.cxx | 1
xmlhelp/source/cxxhelp/provider/databases.cxx | 1
xmlhelp/source/treeview/tvread.cxx | 2
xmloff/Library_xo.mk | 1
xmloff/inc/prstylecond.hxx | 16
xmloff/source/chart/SchXMLTableContext.cxx | 1
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 2
xmloff/source/core/xmlictxt.cxx | 12
xmloff/source/core/xmlimp.cxx | 200
xmloff/source/draw/EnhancedCustomShapeToken.cxx | 8
xmloff/source/draw/sdpropls.cxx | 2
xmloff/source/draw/sdxmlexp_impl.hxx | 1
xmloff/source/draw/sdxmlimp_impl.hxx | 1
xmloff/source/forms/formlayerexport.cxx | 1
xmloff/source/forms/officeforms.cxx | 1
xmloff/source/meta/MetaExportComponent.cxx | 1
xmloff/source/style/prstylecond.cxx | 125
xmloff/source/style/styleexp.cxx | 51
xmloff/source/style/weighhdl.cxx | 9
xmloff/source/text/XMLTextShapeImportHelper.cxx | 1
xmloff/source/text/txtflde.cxx | 1
xmloff/source/text/txtparae.cxx | 1
xmloff/source/text/txtstyli.cxx | 2
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 14
957 files changed, 5954 insertions(+), 18325 deletions(-)
New commits:
commit 1888cda3ff5f6e09b0778624fe5a4cf2aaecad50
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Jun 15 10:07:09 2017 +0200
Use unique_ptr for SwFormatClipboard members
Change-Id: I2d37be7c86481040c64de87f188320cdc3258659
diff --git a/sw/source/uibase/inc/formatclipboard.hxx b/sw/source/uibase/inc/formatclipboard.hxx
index 11e35cf1209e..d5564ed5cc69 100644
--- a/sw/source/uibase/inc/formatclipboard.hxx
+++ b/sw/source/uibase/inc/formatclipboard.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FORMATCLIPBOARD_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_FORMATCLIPBOARD_HXX
+#include <sal/config.h>
+
+#include <memory>
+
#include <wrtsh.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
@@ -31,7 +35,6 @@ class SwFormatClipboard
{
public:
SwFormatClipboard();
- ~SwFormatClipboard();
/**
* Test if the object contains text or paragraph attribute
@@ -69,13 +72,13 @@ private:
SelectionType m_nSelectionType;
/** automatic/named character attribute set */
- SfxItemSet* m_pItemSet_TextAttr;
+ std::unique_ptr<SfxItemSet> m_pItemSet_TextAttr;
/** automatic/named paragraph attribute set
* (it can be character attribute applied to the paragraph) */
- SfxItemSet* m_pItemSet_ParAttr;
+ std::unique_ptr<SfxItemSet> m_pItemSet_ParAttr;
/** table attribute set */
- SfxItemSet* m_pTableItemSet;
+ std::unique_ptr<SfxItemSet> m_pTableItemSet;
/** name of the character format (if it exist) */
OUString m_aCharStyle;
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx
index ec7cccef746d..6fe524d0fdb8 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -18,8 +18,11 @@
*/
#include <memory>
+#include <utility>
+
#include "formatclipboard.hxx"
+#include <o3tl/make_unique.hxx>
#include <svx/svxids.hrc>
#include <cmdid.h>
#include <charfmt.hxx>
@@ -59,12 +62,12 @@ RES_PARATR_BEGIN, RES_PARATR_END -1, \
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END -1, \
FORMAT_PAINTBRUSH_FRAME_IDS
-SfxItemSet* lcl_CreateEmptyItemSet( SelectionType nSelectionType, SfxItemPool& rPool, bool bNoParagraphFormats = false )
+std::unique_ptr<SfxItemSet> lcl_CreateEmptyItemSet( SelectionType nSelectionType, SfxItemPool& rPool, bool bNoParagraphFormats = false )
{
- SfxItemSet* pItemSet = nullptr;
+ std::unique_ptr<SfxItemSet> pItemSet;
if( nSelectionType & (SelectionType::Frame | SelectionType::Ole | SelectionType::Graphic) )
{
- pItemSet = new SfxItemSet(rPool,
+ pItemSet = o3tl::make_unique<SfxItemSet>(rPool,
FORMAT_PAINTBRUSH_FRAME_IDS
0);
}
@@ -75,11 +78,11 @@ SfxItemSet* lcl_CreateEmptyItemSet( SelectionType nSelectionType, SfxItemPool& r
else if( nSelectionType & SelectionType::Text )
{
if( bNoParagraphFormats )
- pItemSet = new SfxItemSet(rPool,
+ pItemSet = o3tl::make_unique<SfxItemSet>(rPool,
RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
0);
else
- pItemSet = new SfxItemSet(rPool,
+ pItemSet = o3tl::make_unique<SfxItemSet>(rPool,
RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
FORMAT_PAINTBRUSH_PARAGRAPH_IDS
0);
@@ -225,18 +228,9 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh )
SwFormatClipboard::SwFormatClipboard()
: m_nSelectionType(SelectionType::NONE)
- , m_pItemSet_TextAttr(nullptr)
- , m_pItemSet_ParAttr(nullptr)
- , m_pTableItemSet(nullptr)
, m_bPersistentCopy(false)
{
}
-SwFormatClipboard::~SwFormatClipboard()
-{
- delete m_pItemSet_TextAttr;
- delete m_pItemSet_ParAttr;
- delete m_pTableItemSet;
-}
bool SwFormatClipboard::HasContent() const
{
@@ -281,8 +275,8 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
m_bPersistentCopy = bPersistentCopy;
SelectionType nSelectionType = rWrtShell.GetSelectionType();
- SfxItemSet* pItemSet_TextAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool, true );
- SfxItemSet* pItemSet_ParAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool );
+ auto pItemSet_TextAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool, true );
+ auto pItemSet_ParAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool );
rWrtShell.StartAction();
rWrtShell.Push();
@@ -369,7 +363,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
if( pDrawView->AreObjectsMarked() )
{
bool bOnlyHardAttr = true;
- pItemSet_TextAttr = new SfxItemSet( pDrawView->GetAttrFromMarked(bOnlyHardAttr) );
+ pItemSet_TextAttr = o3tl::make_unique<SfxItemSet>( pDrawView->GetAttrFromMarked(bOnlyHardAttr) );
//remove attributes defining the type/data of custom shapes
pItemSet_TextAttr->ClearItem(SDRATTR_CUSTOMSHAPE_ENGINE);
pItemSet_TextAttr->ClearItem(SDRATTR_CUSTOMSHAPE_DATA);
@@ -381,7 +375,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
if( nSelectionType & SelectionType::TableCell )//only copy table attributes if really cells are selected (not only text in tables)
{
- m_pTableItemSet = new SfxItemSet(rPool,
+ m_pTableItemSet = o3tl::make_unique<SfxItemSet>(rPool,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, //SID_ATTR_BORDER_OUTER is inbetween
RES_BACKGROUND, RES_SHADOW, //RES_BOX is inbetween
SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE,
@@ -399,8 +393,8 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
}
m_nSelectionType = nSelectionType;
- m_pItemSet_TextAttr = pItemSet_TextAttr;
- m_pItemSet_ParAttr = pItemSet_ParAttr;
+ m_pItemSet_TextAttr = std::move(pItemSet_TextAttr);
+ m_pItemSet_ParAttr = std::move(pItemSet_ParAttr);
if( nSelectionType & SelectionType::Text )
{
@@ -584,14 +578,11 @@ void SwFormatClipboard::Erase()
{
m_nSelectionType = SelectionType::NONE;
- delete m_pItemSet_TextAttr;
- m_pItemSet_TextAttr = nullptr;
+ m_pItemSet_TextAttr.reset();
- delete m_pItemSet_ParAttr;
- m_pItemSet_ParAttr = nullptr;
+ m_pItemSet_ParAttr.reset();
- delete m_pTableItemSet;
- m_pTableItemSet = nullptr;
+ m_pTableItemSet.reset();
if( !m_aCharStyle.isEmpty() )
m_aCharStyle.clear();
commit 7aee0ea7c5a780bca5193382b6f73599c2f025eb
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jun 15 08:40:10 2017 +0200
replace SbxError typedef with ErrCode
part of a larger patch to convert ErrCode to strong_int
Change-Id: Ia56e5d6d8c4217d6f258e2113d20ce737977892f
Reviewed-on: https://gerrit.libreoffice.org/38813
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 369f7790bb5f..825d5ffc70f3 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1889,7 +1889,7 @@ void StackWindow::UpdateCalls()
if (StarBASIC::IsRunning())
{
- SbxError eOld = SbxBase::GetError();
+ ErrCode eOld = SbxBase::GetError();
aTreeListBox->SetSelectionMode( SelectionMode::Single );
sal_Int32 nScope = 0;
@@ -2382,7 +2382,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
{
SbMethod* pCurMethod = StarBASIC::GetActiveMethod();
- SbxError eOld = SbxBase::GetError();
+ ErrCode eOld = SbxBase::GetError();
setBasicWatchMode( true );
SvTreeListEntry* pEntry = First();
diff --git a/basic/inc/sbxbase.hxx b/basic/inc/sbxbase.hxx
index 12ea1267d05c..561bc77121c9 100644
--- a/basic/inc/sbxbase.hxx
+++ b/basic/inc/sbxbase.hxx
@@ -34,7 +34,7 @@ class SbxBasicFormater;
// AppData structure for SBX:
struct SbxAppData
{
- SbxError eSbxError; // Error code
+ ErrCode eErrCode; // Error code
std::vector<std::unique_ptr<SbxFactory>>
m_Factories;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 2474beb9bd48..23f6244ec28d 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -984,7 +984,7 @@ StarBASIC::~StarBASIC()
}
else if( bDocBasic )
{
- SbxError eOld = SbxBase::GetError();
+ ErrCode eOld = SbxBase::GetError();
lclRemoveDocBasicItem( *this );
@@ -1358,11 +1358,11 @@ bool StarBASIC::Call( const OUString& rName, SbxArray* pParam )
bool bRes = SbxObject::Call( rName, pParam );
if( !bRes )
{
- SbxError eErr = SbxBase::GetError();
+ ErrCode eErr = SbxBase::GetError();
SbxBase::ResetError();
if( eErr != ERRCODE_SBX_OK )
{
- RTError( (ErrCode)eErr, OUString(), 0, 0, 0 );
+ RTError( eErr, OUString(), 0, 0, 0 );
}
}
return bRes;
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 21131edbf6f8..45e1b49c9537 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -434,11 +434,11 @@ bool SbiParser::Parse()
eCurTok == SUB || eCurTok == FUNCTION )
aGen.Statement();
(this->*( p->Func ) )();
- SbxError nSbxErr = SbxBase::GetError();
+ ErrCode nSbxErr = SbxBase::GetError();
if( nSbxErr )
{
SbxBase::ResetError();
- Error( (ErrCode)nSbxErr );
+ Error( nSbxErr );
}
}
}
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 59b02467ab37..15f357c9950f 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2635,7 +2635,7 @@ RTLFUNC(IsDate)
}
else if( eType == SbxSTRING )
{
- SbxError nPrevError = SbxBase::GetError();
+ ErrCode nPrevError = SbxBase::GetError();
SbxBase::ResetError();
// force conversion of the parameter to SbxDATE
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 13244e39de7d..f43e882d87a4 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1606,7 +1606,7 @@ inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef& refVal, SbxVariableRe
if ( aAny.getValueType().getTypeClass() == TypeClass_STRUCT )
{
refVar->SetType( SbxOBJECT );
- SbxError eOldErr = SbxBase::GetError();
+ ErrCode eOldErr = SbxBase::GetError();
// There are some circumstances when calling GetObject
// will trigger an error, we need to squash those here.
// Alternatively it is possible that the same scenario
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index db4655dace63..43b970ce1ee2 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -551,7 +551,7 @@ void SbxDimArray::Clear()
void SbxDimArray::AddDimImpl32( sal_Int32 lb, sal_Int32 ub, bool bAllowSize0 )
{
- SbxError eRes = ERRCODE_SBX_OK;
+ ErrCode eRes = ERRCODE_SBX_OK;
if( ub < lb && !bAllowSize0 )
{
eRes = ERRCODE_SBX_BOUNDS;
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 6c8148e00022..2b591093d67e 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -34,7 +34,7 @@
SbxAppData::SbxAppData()
- : eSbxError(ERRCODE_SBX_OK)
+ : eErrCode(ERRCODE_SBX_OK)
, pBasicFormater(nullptr)
, eBasicFormaterLangType(LANGUAGE_DONTKNOW)
{
@@ -94,26 +94,26 @@ void SbxBase::SetModified( bool b )
ResetFlag( SbxFlagBits::Modified );
}
-SbxError SbxBase::GetError()
+ErrCode SbxBase::GetError()
{
- return GetSbxData_Impl().eSbxError;
+ return GetSbxData_Impl().eErrCode;
}
-void SbxBase::SetError( SbxError e )
+void SbxBase::SetError( ErrCode e )
{
SbxAppData& r = GetSbxData_Impl();
- if( e && r.eSbxError == ERRCODE_SBX_OK )
- r.eSbxError = e;
+ if( e && r.eErrCode == ERRCODE_SBX_OK )
+ r.eErrCode = e;
}
bool SbxBase::IsError()
{
- return GetSbxData_Impl().eSbxError != ERRCODE_SBX_OK;
+ return GetSbxData_Impl().eErrCode != ERRCODE_SBX_OK;
}
void SbxBase::ResetError()
{
- GetSbxData_Impl().eSbxError = ERRCODE_SBX_OK;
+ GetSbxData_Impl().eErrCode = ERRCODE_SBX_OK;
}
void SbxBase::AddFactory( SbxFactory* pFac )
diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx
index 08fa296f2c8f..25edf9bc2163 100644
--- a/basic/source/sbx/sbxconv.hxx
+++ b/basic/source/sbx/sbxconv.hxx
@@ -26,7 +26,7 @@ class SbxArray;
// SBXSCAN.CXX
extern void ImpCvtNum( double nNum, short nPrec, OUString& rRes, bool bCoreString=false );
-extern SbxError ImpScan
+extern ErrCode ImpScan
( const OUString& rSrc, double& nVal, SbxDataType& rType, sal_uInt16* pLen,
bool bAllowIntntl=false, bool bOnlyIntntl=false );
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 8a5d59573d2d..b39dba8a0e3e 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -82,7 +82,7 @@ bool ImpStrChr( const sal_Unicode* p, sal_Unicode c )
// but exponent may also be a D, so data type is SbxDOUBLE
// conversion error if data type is fixed and it doesn't fit
-SbxError ImpScan( const OUString& rWSrc, double& nVal, SbxDataType& rType,
+ErrCode ImpScan( const OUString& rWSrc, double& nVal, SbxDataType& rType,
sal_uInt16* pLen, bool bAllowIntntl, bool bOnlyIntntl )
{
sal_Unicode cIntntlDecSep, cIntntlGrpSep;
@@ -272,11 +272,11 @@ SbxError ImpScan( const OUString& rWSrc, double& nVal, SbxDataType& rType,
}
// port for CDbl in the Basic
-SbxError SbxValue::ScanNumIntnl( const OUString& rSrc, double& nVal, bool bSingle )
+ErrCode SbxValue::ScanNumIntnl( const OUString& rSrc, double& nVal, bool bSingle )
{
SbxDataType t;
sal_uInt16 nLen = 0;
- SbxError nRetError = ImpScan( rSrc, nVal, t, &nLen,
+ ErrCode nRetError = ImpScan( rSrc, nVal, t, &nLen,
/*bAllowIntntl*/false, /*bOnlyIntntl*/true );
// read completely?
if( nRetError == ERRCODE_SBX_OK && nLen != rSrc.getLength() )
@@ -550,7 +550,7 @@ static sal_uInt16 printfmtstr( const OUString& rStr, OUString& rRes, const OUStr
bool SbxValue::Scan( const OUString& rSrc, sal_uInt16* pLen )
{
- SbxError eRes = ERRCODE_SBX_OK;
+ ErrCode eRes = ERRCODE_SBX_OK;
if( !CanWrite() )
{
eRes = ERRCODE_SBX_PROP_READONLY;
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 7ff177d8a736..10c3e0620016 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -268,7 +268,7 @@ SbxValue* SbxValue::TheRealValue( bool bObjInObjError ) const
bool SbxValue::Get( SbxValues& rRes ) const
{
bool bRes = false;
- SbxError eOld = GetError();
+ ErrCode eOld = GetError();
if( eOld != ERRCODE_SBX_OK )
ResetError();
if( !CanRead() )
@@ -422,7 +422,7 @@ GET( GetDecimal, SbxDECIMAL, SbxDecimal*, pDecimal )
bool SbxValue::Put( const SbxValues& rVal )
{
bool bRes = false;
- SbxError eOld = GetError();
+ ErrCode eOld = GetError();
if( eOld != ERRCODE_SBX_OK )
ResetError();
if( !CanWrite() )
@@ -834,7 +834,7 @@ bool SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp )
#endif
SbxDataType eThisType = GetType();
SbxDataType eOpType = rOp.GetType();
- SbxError eOld = GetError();
+ ErrCode eOld = GetError();
if( eOld != ERRCODE_SBX_OK )
ResetError();
if( !CanWrite() )
@@ -1212,7 +1212,7 @@ bool SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const
#endif
bool bRes = false;
- SbxError eOld = GetError();
+ ErrCode eOld = GetError();
if( eOld != ERRCODE_SBX_OK )
ResetError();
if( !CanRead() || !rOp.CanRead() )
diff --git a/include/basic/sberrors.hxx b/include/basic/sberrors.hxx
index 52dc1256835a..95ccfa1c6cc3 100644
--- a/include/basic/sberrors.hxx
+++ b/include/basic/sberrors.hxx
@@ -22,7 +22,7 @@
#include <basic/sbxdef.hxx>
-// Mapping to SbxError
+// Mapping to ErrCode
#define ERRCODE_BASIC_SYNTAX ERRCODE_SBX_SYNTAX // unspecified syntax error
#define ERRCODE_BASIC_BAD_ARGUMENT ERRCODE_SBX_NOTIMP // Invalid procedure call
#define ERRCODE_BASIC_MATH_OVERFLOW ERRCODE_SBX_OVERFLOW // Overflow
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index afa7e393f56c..3c1c48fdd9c5 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -80,8 +80,8 @@ public:
bool Store( SvStream& );
virtual bool LoadCompleted();
- static SbxError GetError();
- static void SetError( SbxError );
+ static ErrCode GetError();
+ static void SetError( ErrCode );
static bool IsError();
static void ResetError();
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 9008702ac5a2..973a472640fa 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -124,9 +124,6 @@ enum class SbxNameType { // Type of the questioned name of a variable
ShortTypes, // Name%(A%,B$)
};
-// from 1996/3/20: New error messages
-typedef sal_uIntPtr SbxError; // Preserve old type
-
#endif
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 5645a6cb409f..516d0d936516 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -166,7 +166,7 @@ public:
void fillAutomationDecimal( css::bridge::oleautomation::Decimal& rAutomationDec ) const;
bool PutCurrency( sal_Int64 );
// Interface for CDbl in Basic
- static SbxError ScanNumIntnl( const OUString& rSrc, double& nVal, bool bSingle = false );
+ static ErrCode ScanNumIntnl( const OUString& rSrc, double& nVal, bool bSingle = false );
bool PutObject( SbxBase* );
commit 5ea13cb3b9ec19fe2d88f91585f433c81e6b1f2e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Jun 14 21:23:31 2017 +0200
writerfilter: remove unused WriterFilterDetector
DOCX/DOCM uses com.sun.star.comp.oox.FormatDetector for filter
detection, this one is unused.
Change-Id: I01776d130b0f8f0a75ee39a0cfbf974639c94216
Reviewed-on: https://gerrit.libreoffice.org/38800
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index cd8ea4c06cdd..e6487f4b51e4 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -119,7 +119,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/util \
writerfilter/source/filter/RtfFilter \
writerfilter/source/filter/WriterFilter \
- writerfilter/source/filter/WriterFilterDetection \
writerfilter/source/ooxml/Handler \
writerfilter/source/ooxml/OOXMLBinaryObjectReference \
writerfilter/source/ooxml/OOXMLDocumentImpl \
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
deleted file mode 100644
index 83f6024ebb0d..000000000000
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <com/sun/star/document/XExtendedFilterDetection.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/storagehelper.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <sot/storage.hxx>
-
-using namespace ::com::sun::star;
-
-/// File format detection service for DOCX.
-class WriterFilterDetection : public cppu::WeakImplHelper
- <
- document::XExtendedFilterDetection,
- lang::XServiceInfo
- >
-{
-public:
- explicit WriterFilterDetection();
-
- //XExtendedFilterDetection
- OUString SAL_CALL detect(uno::Sequence<beans::PropertyValue>& Descriptor) override;
-
- // XServiceInfo
- OUString SAL_CALL getImplementationName() override;
- sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override;
- uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-};
-
-/// @throws uno::RuntimeException
-uno::Sequence<OUString> SAL_CALL WriterFilterDetection_getSupportedServiceNames();
-
-WriterFilterDetection::WriterFilterDetection() = default;
-
-OUString WriterFilterDetection::detect(uno::Sequence<beans::PropertyValue>& rDescriptor)
-{
- OUString sTypeName;
- bool bWord = false;
- sal_Int32 nPropertyCount = rDescriptor.getLength();
- const beans::PropertyValue* pValues = rDescriptor.getConstArray();
- OUString sURL;
- uno::Reference<io::XStream> xStream;
- uno::Reference<io::XInputStream> xInputStream;
- for (sal_Int32 nProperty = 0; nProperty < nPropertyCount; ++nProperty)
- {
- if (pValues[nProperty].Name == "TypeName")
- rDescriptor[nProperty].Value >>= sTypeName;
- else if (pValues[nProperty].Name == "URL")
- pValues[nProperty].Value >>= sURL;
- else if (pValues[nProperty].Name == "Stream")
- pValues[nProperty].Value >>= xStream;
- else if (pValues[nProperty].Name == "InputStream")
- pValues[nProperty].Value >>= xInputStream;
- }
- try
- {
- uno::Reference<embed::XStorage> xDocStorage;
- if (sURL == "private:stream")
- xDocStorage = comphelper::OStorageHelper::GetStorageFromInputStream(xInputStream);
- else
- xDocStorage = comphelper::OStorageHelper::GetStorageFromURL(sURL, embed::ElementModes::READ);
- if (xDocStorage.is())
- {
- uno::Sequence<OUString> aNames = xDocStorage->getElementNames();
- const OUString* pNames = aNames.getConstArray();
- for (sal_Int32 nName = 0; nName < aNames.getLength(); ++nName)
- {
- if (pNames[nName] == "word")
- {
- bWord = true;
- if (sTypeName.isEmpty())
- sTypeName = "writer_MS_Word_2007";
- break;
- }
- }
- }
- }
- catch (const uno::Exception&)
- {
- SAL_WARN("writerfilter", "exception while opening storage");
- }
- if (!bWord)
- sTypeName.clear();
- return sTypeName;
-}
-
-uno::Sequence<OUString> WriterFilterDetection_getSupportedServiceNames()
-{
- uno::Sequence<OUString> aRet =
- {
- OUString("com.sun.star.document.ExtendedTypeDetection")
- };
- return aRet;
-}
-
-OUString WriterFilterDetection::getImplementationName()
-{
- return OUString("com.sun.star.comp.Writer.WriterFilterDetector");
-}
-
-sal_Bool WriterFilterDetection::supportsService(const OUString& rServiceName)
-{
- return cppu::supportsService(this, rServiceName);
-}
-
-uno::Sequence<OUString> WriterFilterDetection::getSupportedServiceNames()
-{
- return WriterFilterDetection_getSupportedServiceNames();
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Writer_WriterFilterDetector_get_implementation(uno::XComponentContext* /*pComp*/, uno::Sequence<css::uno::Any> const&)
-{
- return cppu::acquire(new WriterFilterDetection);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/util/writerfilter.component b/writerfilter/util/writerfilter.component
index cc035f2f603f..63e5931e850e 100644
--- a/writerfilter/util/writerfilter.component
+++ b/writerfilter/util/writerfilter.component
@@ -24,10 +24,6 @@
<service name="com.sun.star.document.ExportFilter"/>
<service name="com.sun.star.document.ImportFilter"/>
</implementation>
- <implementation name="com.sun.star.comp.Writer.WriterFilterDetector"
- constructor="com_sun_star_comp_Writer_WriterFilterDetector_get_implementation">
- <service name="com.sun.star.document.ExtendedTypeDetection"/>
- </implementation>
<implementation name="com.sun.star.comp.Writer.RtfFilter"
constructor="com_sun_star_comp_Writer_RtfFilter_get_implementation">
<service name="com.sun.star.document.ImportFilter"/>
commit 3059ede409bd8136be0397f532b644855bb9d07a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jun 14 14:16:48 2017 +0200
drop SbError typedef
in favour of ErrCode.
Part of a larger patch to convert ErrCode to strong_int
Change-Id: Ia846bfc93c58c85c6a6cec79e9d19b9ecbd1c05f
Reviewed-on: https://gerrit.libreoffice.org/38783
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index ecbf1525beea..2474beb9bd48 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -275,7 +275,7 @@ SbxVariable* StarBASIC::VBAFind( const OUString& rName, SbxClassType t )
struct SFX_VB_ErrorItem
{
sal_uInt16 nErrorVB;
- SbError nErrorSFX;
+ ErrCode nErrorSFX;
};
const SFX_VB_ErrorItem SFX_VB_ErrorTab[] =
@@ -1362,7 +1362,7 @@ bool StarBASIC::Call( const OUString& rName, SbxArray* pParam )
SbxBase::ResetError();
if( eErr != ERRCODE_SBX_OK )
{
- RTError( (SbError)eErr, OUString(), 0, 0, 0 );
+ RTError( (ErrCode)eErr, OUString(), 0, 0, 0 );
}
}
return bRes;
@@ -1469,7 +1469,7 @@ sal_uInt16 StarBASIC::GetCol1() { return GetSbData()->nCol1; }
sal_uInt16 StarBASIC::GetCol2() { return GetSbData()->nCol2; }
// Specific to error handler
-SbError StarBASIC::GetErrorCode() { return GetSbData()->nCode; }
+ErrCode StarBASIC::GetErrorCode() { return GetSbData()->nCode; }
const OUString& StarBASIC::GetErrorText() { return GetSbData()->aErrMsg; }
// From 1996-03-29:
@@ -1480,7 +1480,7 @@ const OUString& StarBASIC::GetErrorText() { return GetSbData()->aErrMsg; }
// binary search by VB Error -> Error SFX.
// Map back new error codes to old, Sbx-compatible
-sal_uInt16 StarBASIC::GetVBErrorCode( SbError nError )
+sal_uInt16 StarBASIC::GetVBErrorCode( ErrCode nError )
{
sal_uInt16 nRet = 0;
@@ -1522,9 +1522,9 @@ sal_uInt16 StarBASIC::GetVBErrorCode( SbError nError )
return nRet;
}
-SbError StarBASIC::GetSfxFromVBError( sal_uInt16 nError )
+ErrCode StarBASIC::GetSfxFromVBError( sal_uInt16 nError )
{
- SbError nRet = 0;
+ ErrCode nRet = 0;
if( SbiRuntime::isVBAEnabled() )
{
@@ -1574,7 +1574,7 @@ SbError StarBASIC::GetSfxFromVBError( sal_uInt16 nError )
}
// set Error- / Break-data
-void StarBASIC::SetErrorData( SbError nCode, sal_uInt16 nLine,
+void StarBASIC::SetErrorData( ErrCode nCode, sal_uInt16 nLine,
sal_uInt16 nCol1, sal_uInt16 nCol2 )
{
SbiGlobals& aGlobals = *GetSbData();
@@ -1584,7 +1584,7 @@ void StarBASIC::SetErrorData( SbError nCode, sal_uInt16 nLine,
aGlobals.nCol2 = nCol2;
}
-void StarBASIC::MakeErrorText( SbError nId, const OUString& aMsg )
+void StarBASIC::MakeErrorText( ErrCode nId, const OUString& aMsg )
{
SolarMutexGuard aSolarGuard;
sal_uInt16 nOldID = GetVBErrorCode( nId );
@@ -1620,7 +1620,7 @@ void StarBASIC::MakeErrorText( SbError nId, const OUString& aMsg )
}
}
-bool StarBASIC::CError( SbError code, const OUString& rMsg,
+bool StarBASIC::CError( ErrCode code, const OUString& rMsg,
sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
{
SolarMutexGuard aSolarGuard;
@@ -1646,7 +1646,7 @@ bool StarBASIC::CError( SbError code, const OUString& rMsg,
// Implementation of the code for the string transport to SFX-Error
if( !rMsg.isEmpty() )
{
- code = (SbError)*new StringErrorInfo( code, rMsg );
+ code = (ErrCode)*new StringErrorInfo( code, rMsg );
}
SetErrorData( code, l, c1, c2 );
GetSbData()->bCompilerError = true;
@@ -1663,11 +1663,11 @@ bool StarBASIC::CError( SbError code, const OUString& rMsg,
return bRet;
}
-bool StarBASIC::RTError( SbError code, const OUString& rMsg, sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
+bool StarBASIC::RTError( ErrCode code, const OUString& rMsg, sal_Int32 l, sal_Int32 c1, sal_Int32 c2 )
{
SolarMutexGuard aSolarGuard;
- SbError c = code;
+ ErrCode c = code;
if( (c & ERRCODE_CLASS_MASK) == ERRCODE_CLASS_COMPILER )
{
c = 0;
@@ -1685,11 +1685,11 @@ bool StarBASIC::RTError( SbError code, const OUString& rMsg, sal_Int32 l, sal_In
{
OUString aTmp = "\'" + OUString::number(SbxErrObject::getUnoErrObject()->getNumber()) +
"\'\n" + (!GetSbData()->aErrMsg.isEmpty() ? GetSbData()->aErrMsg : rMsg);
- code = (SbError)*new StringErrorInfo( code, aTmp );
+ code = (ErrCode)*new StringErrorInfo( code, aTmp );
}
else
{
- code = (SbError)*new StringErrorInfo( code, rMsg );
+ code = (ErrCode)*new StringErrorInfo( code, rMsg );
}
}
@@ -1704,12 +1704,12 @@ bool StarBASIC::RTError( SbError code, const OUString& rMsg, sal_Int32 l, sal_In
}
}
-void StarBASIC::Error( SbError n )
+void StarBASIC::Error( ErrCode n )
{
Error( n, OUString() );
}
-void StarBASIC::Error( SbError n, const OUString& rMsg )
+void StarBASIC::Error( ErrCode n, const OUString& rMsg )
{
if( GetSbData()->pInst )
{
@@ -1717,7 +1717,7 @@ void StarBASIC::Error( SbError n, const OUString& rMsg )
}
}
-void StarBASIC::FatalError( SbError n )
+void StarBASIC::FatalError( ErrCode n )
{
if( GetSbData()->pInst )
{
@@ -1725,7 +1725,7 @@ void StarBASIC::FatalError( SbError n )
}
}
-void StarBASIC::FatalError( SbError _errCode, const OUString& _details )
+void StarBASIC::FatalError( ErrCode _errCode, const OUString& _details )
{
if( GetSbData()->pInst )
{
@@ -1733,7 +1733,7 @@ void StarBASIC::FatalError( SbError _errCode, const OUString& _details )
}
}
-SbError StarBASIC::GetErrBasic()
+ErrCode StarBASIC::GetErrBasic()
{
if( GetSbData()->pInst )
{
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 0bd472e61394..f102e4efa694 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -364,7 +364,7 @@ OUString implGetExceptionMsg( const EXCEPTION& e )
void implHandleBasicErrorException( BasicErrorException& e )
{
- SbError nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)e.ErrorCode );
+ ErrCode nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)e.ErrorCode );
StarBASIC::Error( nError, e.ErrorMessageArgument );
}
@@ -380,7 +380,7 @@ void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
BasicErrorException aBasicError;
- SbError nError( ERRCODE_BASIC_EXCEPTION );
+ ErrCode nError( ERRCODE_BASIC_EXCEPTION );
OUStringBuffer aMessageBuf;
// strip any other WrappedTargetException instances, but this time preserve the error messages.
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index ae4baf704488..21131edbf6f8 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -438,7 +438,7 @@ bool SbiParser::Parse()
if( nSbxErr )
{
SbxBase::ResetError();
- Error( (SbError)nSbxErr );
+ Error( (ErrCode)nSbxErr );
}
}
}
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index c851384a342b..e906cfb19c52 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -68,7 +68,7 @@ void SbiScanner::UnlockColumn()
nColLock--;
}
-void SbiScanner::GenError( SbError code )
+void SbiScanner::GenError( ErrCode code )
{
if( GetSbData()->bBlockCompilerError )
{
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 65ae069fd3eb..44dcebcd95ee 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -230,13 +230,13 @@ void SbiTokenizer::Push( SbiToken t )
else ePush = t;
}
-void SbiTokenizer::Error( SbError code, const OUString &aMsg )
+void SbiTokenizer::Error( ErrCode code, const OUString &aMsg )
{
aError = aMsg;
Error( code );
}
-void SbiTokenizer::Error( SbError code, SbiToken tok )
+void SbiTokenizer::Error( ErrCode code, SbiToken tok )
{
aError = Symbol( tok );
Error( code );
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index 81d9e4e32042..d13da0ee0014 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -55,17 +55,17 @@ class SbiStream
short nLen; // buffer length
SbiStreamFlags nMode;
short nChan;
- SbError nError;
+ ErrCode nError;
void MapError();
public:
SbiStream();
~SbiStream();
- SbError Open( short, const OString&, StreamMode, SbiStreamFlags, short );
- SbError Close();
- SbError Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false);
- SbError Read( char& );
- SbError Write( const OString& );
+ ErrCode Open( short, const OString&, StreamMode, SbiStreamFlags, short );
+ ErrCode Close();
+ ErrCode Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false);
+ ErrCode Read( char& );
+ ErrCode Write( const OString& );
bool IsText() const { return !bool(nMode & SbiStreamFlags::Binary); }
bool IsRandom() const { return bool(nMode & SbiStreamFlags::Random); }
@@ -87,13 +87,13 @@ class SbiIoSystem
OString aIn;
OUString aOut;
short nChan;
- SbError nError;
+ ErrCode nError;
void ReadCon(OString&);
void WriteCon(const OUString&);
public:
SbiIoSystem();
~SbiIoSystem();
- SbError GetError();
+ ErrCode GetError();
void Shutdown();
void SetPrompt(const OString& r) { aPrompt = r; }
void SetChannel( short n ) { nChan = n; }
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index f80d07322690..4c7dfa965c9d 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -145,7 +145,7 @@ class SbiInstance
DateOrder meFormatterDateOrder;
sal_uInt32 nStdDateIdx, nStdTimeIdx, nStdDateTimeIdx;
- SbError nErr;
+ ErrCode nErr;
OUString aErrorMsg; // last error message for $ARG
sal_Int32 nErl; // current error line
bool bReschedule; // Flag: sal_True = Reschedule in main loop
@@ -164,16 +164,16 @@ public:
SbiInstance( StarBASIC* );
~SbiInstance();
- void Error( SbError ); // trappable Error
- void Error( SbError, const OUString& rMsg ); // trappable Error with message
+ void Error( ErrCode ); // trappable Error
+ void Error( ErrCode, const OUString& rMsg ); // trappable Error with message
void ErrorVB( sal_Int32 nVBNumber, const OUString& rMsg );
void setErrorVB( sal_Int32 nVBNumber );
- void FatalError( SbError ); // non-trappable Error
- void FatalError( SbError, const OUString& ); // non-trappable Error
+ void FatalError( ErrCode ); // non-trappable Error
+ void FatalError( ErrCode, const OUString& ); // non-trappable Error
void Abort(); // with current error code
void Stop();
- SbError GetErr() { return nErr; }
+ ErrCode GetErr() { return nErr; }
const OUString& GetErrorMsg() { return aErrorMsg; }
sal_Int32 GetErl() { return nErl; }
void EnableReschedule( bool bEnable ) { bReschedule = bEnable; }
@@ -250,7 +250,7 @@ class SbiRuntime
bool bBlocked; // true: blocked by next call level, #i48868
bool bVBAEnabled;
BasicDebugFlags nFlags; // Debugging-Flags
- SbError nError;
+ ErrCode nError;
sal_uInt16 nOps; // opcode counter
sal_uInt32 m_nLastTime;
@@ -260,7 +260,7 @@ class SbiRuntime
SbxVariable* FindElement
- ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, bool bLocal, bool bStatic = false );
+ ( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, ErrCode, bool bLocal, bool bStatic = false );
void SetupArgs( SbxVariable*, sal_uInt32 );
SbxVariable* CheckArray( SbxVariable* );
@@ -331,7 +331,7 @@ class SbiRuntime
// all opcodes with two operands
void StepRTL( sal_uInt32, sal_uInt32 ), StepPUBLIC( sal_uInt32, sal_uInt32 ), StepPUBLIC_P( sal_uInt32, sal_uInt32 );
void StepPUBLIC_Impl( sal_uInt32, sal_uInt32, bool bUsedForClassModule );
- void StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, SbError, bool bStatic = false );
+ void StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2, ErrCode, bool bStatic = false );
void StepFIND( sal_uInt32, sal_uInt32 ), StepELEM( sal_uInt32, sal_uInt32 );
void StepGLOBAL( sal_uInt32, sal_uInt32 ), StepLOCAL( sal_uInt32, sal_uInt32 );
void StepPARAM( sal_uInt32, sal_uInt32), StepCREATE( sal_uInt32, sal_uInt32 );
@@ -355,11 +355,11 @@ public:
SbiRuntime( SbModule*, SbMethod*, sal_uInt32 );
~SbiRuntime();
- void Error( SbError, bool bVBATranslationAlreadyDone = false ); // set error if != 0
- void Error( SbError, const OUString& ); // set error if != 0
- void FatalError( SbError ); // error handling = standard, set error
- void FatalError( SbError, const OUString& ); // error handling = standard, set error
- static sal_Int32 translateErrorToVba( SbError nError, OUString& rMsg );
+ void Error( ErrCode, bool bVBATranslationAlreadyDone = false ); // set error if != 0
+ void Error( ErrCode, const OUString& ); // set error if != 0
+ void FatalError( ErrCode ); // error handling = standard, set error
+ void FatalError( ErrCode, const OUString& ); // error handling = standard, set error
+ static sal_Int32 translateErrorToVba( ErrCode nError, OUString& rMsg );
bool Step(); // single step (one opcode)
void Stop() { bRun = false; }
void block() { bBlocked = true; }
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index 900679f7b699..7b5dd97384e7 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -91,7 +91,7 @@ struct SbiGlobals
short nInst; // number of BASICs
Link<StarBASIC*,bool> aErrHdl; // global error handler
Link<StarBASIC*,BasicDebugFlags> aBreakHdl; // global break handler
- SbError nCode;
+ ErrCode nCode;
sal_Int32 nLine;
sal_Int32 nCol1,nCol2; // from... to...
bool bCompilerError; // flag for compiler error
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index a7f1377d7bc1..15e37b25cd2e 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -63,7 +63,7 @@ protected:
bool bPrevLineExtentsComment; // true: Previous line is comment and ends on "... _"
bool bInStatement;
- void GenError( SbError );
+ void GenError( ErrCode );
public:
SbiScanner( const OUString&, StarBASIC* = nullptr );
~SbiScanner();
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index ef30d955eed1..3f265cefb83e 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -124,9 +124,9 @@ public:
SbiToken Next(); // read a token
bool MayBeLabel( bool= false );
- void Error( SbError c ) { GenError( c ); }
- void Error( SbError, SbiToken );
- void Error( SbError, const OUString &);
+ void Error( ErrCode c ) { GenError( c ); }
+ void Error( ErrCode, SbiToken );
+ void Error( ErrCode, const OUString &);
static bool IsEoln( SbiToken t )
{ return t == EOS || t == EOLN || t == REM; }
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 24484b274109..3c77fcbe26c0 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -27,7 +27,7 @@
#define DDE_FIRSTERR 0x4000
#define DDE_LASTERR 0x4011
-static const SbError nDdeErrMap[] =
+static const ErrCode nDdeErrMap[] =
{
/* DMLERR_ADVACKTIMEOUT */ 0x4000, ERRCODE_BASIC_DDE_TIMEOUT,
/* DMLERR_BUSY */ 0x4001, ERRCODE_BASIC_DDE_BUSY,
@@ -49,7 +49,7 @@ static const SbError nDdeErrMap[] =
/* DMLERR_UNFOUND_QUEUE_ID */ 0x4011, ERRCODE_BASIC_DDE_NO_CHANNEL
};
-SbError SbiDdeControl::GetLastErr( DdeConnection* pConv )
+ErrCode SbiDdeControl::GetLastErr( DdeConnection* pConv )
{
if( !pConv )
{
@@ -98,10 +98,10 @@ size_t SbiDdeControl::GetFreeChannel()
return nChannel+1;
}
-SbError SbiDdeControl::Initiate( const OUString& rService, const OUString& rTopic,
+ErrCode SbiDdeControl::Initiate( const OUString& rService, const OUString& rTopic,
size_t& rnHandle )
{
- SbError nErr;
+ ErrCode nErr;
DdeConnection* pConv = new DdeConnection( rService, rTopic );
nErr = GetLastErr( pConv );
if( nErr )
@@ -118,7 +118,7 @@ SbError SbiDdeControl::Initiate( const OUString& rService, const OUString& rTopi
return ERRCODE_NONE;
}
-SbError SbiDdeControl::Terminate( size_t nChannel )
+ErrCode SbiDdeControl::Terminate( size_t nChannel )
{
if (!nChannel || nChannel > aConvList.size())
{
@@ -136,7 +136,7 @@ SbError SbiDdeControl::Terminate( size_t nChannel )
return ERRCODE_NONE;
}
-SbError SbiDdeControl::TerminateAll()
+ErrCode SbiDdeControl::TerminateAll()
{
for (DdeConnection* conv : aConvList)
{
@@ -151,7 +151,7 @@ SbError SbiDdeControl::TerminateAll()
return ERRCODE_NONE;
}
-SbError SbiDdeControl::Request( size_t nChannel, const OUString& rItem, OUString& rResult )
+ErrCode SbiDdeControl::Request( size_t nChannel, const OUString& rItem, OUString& rResult )
{
if (!nChannel || nChannel > aConvList.size())
{
@@ -172,7 +172,7 @@ SbError SbiDdeControl::Request( size_t nChannel, const OUString& rItem, OUString
return GetLastErr( pConv );
}
-SbError SbiDdeControl::Execute( size_t nChannel, const OUString& rCommand )
+ErrCode SbiDdeControl::Execute( size_t nChannel, const OUString& rCommand )
{
if (!nChannel || nChannel > aConvList.size())
{
@@ -190,7 +190,7 @@ SbError SbiDdeControl::Execute( size_t nChannel, const OUString& rCommand )
return GetLastErr( pConv );
}
-SbError SbiDdeControl::Poke( size_t nChannel, const OUString& rItem, const OUString& rData )
+ErrCode SbiDdeControl::Poke( size_t nChannel, const OUString& rItem, const OUString& rData )
{
if (!nChannel || nChannel > aConvList.size())
{
diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx
index a961b19b405f..356fe42d684c 100644
--- a/basic/source/runtime/ddectrl.hxx
+++ b/basic/source/runtime/ddectrl.hxx
@@ -30,7 +30,7 @@ class SbiDdeControl
{
private:
DECL_LINK( Data, const DdeData*, void );
- static SbError GetLastErr( DdeConnection* );
+ static ErrCode GetLastErr( DdeConnection* );
size_t GetFreeChannel();
std::vector<DdeConnection*> aConvList;
OUString aData;
@@ -40,13 +40,13 @@ public:
SbiDdeControl();
~SbiDdeControl();
- SbError Initiate( const OUString& rService, const OUString& rTopic,
+ ErrCode Initiate( const OUString& rService, const OUString& rTopic,
size_t& rnHandle );
- SbError Terminate( size_t nChannel );
- SbError TerminateAll();
- SbError Request( size_t nChannel, const OUString& rItem, OUString& rResult );
- SbError Execute( size_t nChannel, const OUString& rCommand );
- SbError Poke( size_t nChannel, const OUString& rItem, const OUString& rData );
+ ErrCode Terminate( size_t nChannel );
+ ErrCode TerminateAll();
+ ErrCode Request( size_t nChannel, const OUString& rItem, OUString& rResult );
+ ErrCode Execute( size_t nChannel, const OUString& rCommand );
+ ErrCode Poke( size_t nChannel, const OUString& rItem, const OUString& rData );
};
#endif
diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx
index c423a95c15e6..c299a4dcdfd0 100644
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
@@ -39,7 +39,7 @@ struct SbiDllMgr::Impl {};
namespace {
// Overcome the mess of Currency vs. custom types etc.
-SbError returnInt64InOutArg(SbxArray *pArgs, SbxVariable &rRetVal,
+ErrCode returnInt64InOutArg(SbxArray *pArgs, SbxVariable &rRetVal,
sal_Int64 nValue)
{
if (!rRetVal.PutLong(1) && !rRetVal.PutInteger(1))
@@ -77,7 +77,7 @@ SbError returnInt64InOutArg(SbxArray *pArgs, SbxVariable &rRetVal,
return ERRCODE_BASIC_BAD_ARGUMENT;
}
-SbError builtin_kernel32(const OUString &aFuncName, SbxArray *pArgs,
+ErrCode builtin_kernel32(const OUString &aFuncName, SbxArray *pArgs,
SbxVariable &rRetVal)
{
sal_Int64 nNanoSecsPerSec = 1000.0*1000*1000;
@@ -96,7 +96,7 @@ SbError builtin_kernel32(const OUString &aFuncName, SbxArray *pArgs,
};
-SbError SbiDllMgr::Call(
+ErrCode SbiDllMgr::Call(
const OUString &aFuncName, const OUString &aDllName,
SbxArray *pArgs, SbxVariable &rRetVal,
SAL_UNUSED_PARAMETER bool /* bCDecl */)
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 4c8a0409a635..d9242264ae0f 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -65,7 +65,7 @@ char * address(std::vector< char > & blob) {
return blob.empty() ? nullptr : &blob[0];
}
-SbError convert(OUString const & source, OString * target) {
+ErrCode convert(OUString const & source, OString * target) {
return
source.convertToString(
target, osl_getThreadTextEncoding(),
@@ -75,7 +75,7 @@ SbError convert(OUString const & source, OString * target) {
//TODO: more specific errcode?
}
-SbError convert(char const * source, sal_Int32 length, OUString * target) {
+ErrCode convert(char const * source, sal_Int32 length, OUString * target) {
return
rtl_convertStringToUString(
&target->pData, source, length, osl_getThreadTextEncoding(),
@@ -183,16 +183,16 @@ std::size_t alignment(SbxVariable * variable) {
}
}
-SbError marshal(
+ErrCode marshal(
bool outer, SbxVariable * variable, bool special,
std::vector< char > & blob, std::size_t offset, MarshalData & data);
-SbError marshalString(
+ErrCode marshalString(
SbxVariable * variable, bool special, MarshalData & data, void ** buffer)
{
OSL_ASSERT(variable != nullptr && buffer != nullptr);
OString str;
- SbError e = convert(variable->GetOUString(), &str);
+ ErrCode e = convert(variable->GetOUString(), &str);
if (e != ERRCODE_NONE) {
return e;
}
@@ -203,7 +203,7 @@ SbError marshalString(
return ERRCODE_NONE;
}
-SbError marshalStruct(
+ErrCode marshalStruct(
SbxVariable * variable, std::vector< char > & blob, std::size_t offset,
MarshalData & data)
{
@@ -211,7 +211,7 @@ SbError marshalStruct(
SbxArray * props = dynamic_cast<SbxObject*>( variable->GetObject() )->
GetProperties();
for (sal_uInt16 i = 0; i < props->Count(); ++i) {
- SbError e = marshal(false, props->Get(i), false, blob, offset, data);
+ ErrCode e = marshal(false, props->Get(i), false, blob, offset, data);
if (e != ERRCODE_NONE) {
return e;
}
@@ -219,7 +219,7 @@ SbError marshalStruct(
return ERRCODE_NONE;
}
-SbError marshalArray(
+ErrCode marshalArray(
SbxVariable * variable, std::vector< char > & blob, std::size_t offset,
MarshalData & data)
{
@@ -232,7 +232,7 @@ SbError marshalArray(
arr->GetDim32(i + 1, low[i], up[i]);
}
for (std::vector< sal_Int32 > idx = low;;) {
- SbError e = marshal(
+ ErrCode e = marshal(
false, arr->Get32(&idx[0]), false, blob, offset, data);
if (e != ERRCODE_NONE) {
return e;
@@ -251,7 +251,7 @@ SbError marshalArray(
// 8-aligned structs are only 4-aligned on stack, so alignment of members in
// such structs must take that into account via "offset"
-SbError marshal(
+ErrCode marshal(
bool outer, SbxVariable * variable, bool special,
std::vector< char > & blob, std::size_t offset, MarshalData & data)
{
@@ -274,7 +274,7 @@ SbError marshal(
case SbxSTRING:
{
void * p;
- SbError e = marshalString(variable, special, data, &p);
+ ErrCode e = marshalString(variable, special, data, &p);
if (e != ERRCODE_NONE) {
return e;
}
@@ -284,7 +284,7 @@ SbError marshal(
case SbxOBJECT:
{
align(blob, outer ? 8 : alignment(variable), offset, 0);
- SbError e = marshalStruct(variable, blob, offset, data);
+ ErrCode e = marshalStruct(variable, blob, offset, data);
if (e != ERRCODE_NONE) {
return e;
}
@@ -301,7 +301,7 @@ SbError marshal(
break;
}
} else {
- SbError e = marshalArray(variable, blob, offset, data);
+ ErrCode e = marshalArray(variable, blob, offset, data);
if (e != ERRCODE_NONE) {
return e;
}
@@ -321,7 +321,7 @@ SbError marshal(
{
std::vector< char > * blob2 = data.newBlob();
void * p;
- SbError e = marshalString(variable, special, data, &p);
+ ErrCode e = marshalString(variable, special, data, &p);
if (e != ERRCODE_NONE) {
return e;
}
@@ -332,7 +332,7 @@ SbError marshal(
case SbxOBJECT:
{
std::vector< char > * blob2 = data.newBlob();
- SbError e = marshalStruct(variable, *blob2, 0, data);
+ ErrCode e = marshalStruct(variable, *blob2, 0, data);
if (e != ERRCODE_NONE) {
return e;
}
@@ -349,7 +349,7 @@ SbError marshal(
}
} else {
std::vector< char > * blob2 = data.newBlob();
- SbError e = marshalArray(variable, *blob2, 0, data);
+ ErrCode e = marshalArray(variable, *blob2, 0, data);
if (e != ERRCODE_NONE) {
return e;
}
@@ -436,7 +436,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
return data;
}
-SbError unmarshalString(StringData const & data, SbxVariable & result) {
+ErrCode unmarshalString(StringData const & data, SbxVariable & result) {
OUString str;
if (data.buffer != nullptr) {
char const * p = static_cast< char const * >(data.buffer);
@@ -450,7 +450,7 @@ SbError unmarshalString(StringData const & data, SbxVariable & result) {
} else {
len = rtl_str_getLength(p);
}
- SbError e = convert(p, len, &str);
+ ErrCode e = convert(p, len, &str);
if (e != ERRCODE_NONE) {
return e;
}
@@ -464,7 +464,7 @@ struct ProcData {
FARPROC proc;
};
-SbError call(
+ErrCode call(
OUString const & dll, ProcData const & proc, SbxArray * arguments,
SbxVariable & result)
{
@@ -482,7 +482,7 @@ SbError call(
dll.equalsIgnoreAsciiCase("KERNEL32.DLL") &&
(proc.name == OString("GetLogicalDriveStringsA"));
for (int i = 1; i < (arguments == nullptr ? 0 : arguments->Count()); ++i) {
- SbError e = marshal(
+ ErrCode e = marshal(
true, arguments->Get(i), special && i == 2, stack, stack.size(),
data);
if (e != ERRCODE_NONE) {
@@ -579,7 +579,7 @@ SbError call(
{
char const * s1 = reinterpret_cast< char const * >(iRetVal);
OUString s2;
- SbError e = convert(s1, rtl_str_getLength(s1), &s2);
+ ErrCode e = convert(s1, rtl_str_getLength(s1), &s2);
if (e != ERRCODE_NONE) {
return e;
}
@@ -611,7 +611,7 @@ SbError call(
for (std::vector< StringData >::iterator i(data.unmarshalStrings.begin());
i != data.unmarshalStrings.end(); ++i)
{
- SbError e = unmarshalString(*i, result);
+ ErrCode e = unmarshalString(*i, result);
if (e != ERRCODE_NONE) {
return e;
}
@@ -619,7 +619,7 @@ SbError call(
return ERRCODE_NONE;
}
-SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc)
+ErrCode getProcData(HMODULE handle, OUString const & name, ProcData * proc)
{
OSL_ASSERT(proc != nullptr);
if (name.getLength() != 0 && name[0] == '@') { //TODO: "@" vs. "#"???
@@ -635,7 +635,7 @@ SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc)
}
} else {
OString name8;
- SbError e = convert(name, &name8);
+ ErrCode e = convert(name, &name8);
if (e != ERRCODE_NONE) {
return e;
}
@@ -682,7 +682,7 @@ private:
public:
Dll(): handle(nullptr) {}
- SbError getProc(OUString const & name, ProcData * proc);
+ ErrCode getProc(OUString const & name, ProcData * proc);
HMODULE handle;
Procs procs;
@@ -694,13 +694,13 @@ Dll::~Dll() {
}
}
-SbError Dll::getProc(OUString const & name, ProcData * proc) {
+ErrCode Dll::getProc(OUString const & name, ProcData * proc) {
Procs::iterator i(procs.find(name));
if (i != procs.end()) {
*proc = i->second;
return ERRCODE_NONE;
}
- SbError e = getProcData(handle, name, proc);
+ ErrCode e = getProcData(handle, name, proc);
if (e == ERRCODE_NONE) {
procs.insert(Procs::value_type(name, *proc));
}
@@ -745,7 +745,7 @@ Dll * SbiDllMgr::Impl::getDll(OUString const & name) {
return i->second.get();
}
-SbError SbiDllMgr::Call(
+ErrCode SbiDllMgr::Call(
OUString const & function, OUString const & library,
SbxArray * arguments, SbxVariable & result, bool cdeclConvention)
{
@@ -758,7 +758,7 @@ SbError SbiDllMgr::Call(
return ERRCODE_BASIC_BAD_DLL_LOAD;
}
ProcData proc;
- SbError e = dll->getProc(function, &proc);
+ ErrCode e = dll->getProc(function, &proc);
if (e != ERRCODE_NONE) {
return e;
}
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 7cc4c91a8552..3d5e9fbcf63d 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -73,7 +73,7 @@ char * address(std::vector< char > & blob) {
return blob.empty() ? 0 : &blob[0];
}
-SbError convert(OUString const & source, OString * target) {
+ErrCode convert(OUString const & source, OString * target) {
return
source.convertToString(
target, osl_getThreadTextEncoding(),
@@ -83,7 +83,7 @@ SbError convert(OUString const & source, OString * target) {
//TODO: more specific errcode?
}
-SbError convert(char const * source, sal_Int32 length, OUString * target) {
+ErrCode convert(char const * source, sal_Int32 length, OUString * target) {
return
rtl_convertStringToUString(
&target->pData, source, length, osl_getThreadTextEncoding(),
@@ -191,16 +191,16 @@ std::size_t alignment(SbxVariable * variable) {
}
}
-SbError marshal(
+ErrCode marshal(
bool outer, SbxVariable * variable, bool special,
std::vector< char > & blob, std::size_t offset, MarshalData & data);
-SbError marshalString(
+ErrCode marshalString(
SbxVariable * variable, bool special, MarshalData & data, void ** buffer)
{
OSL_ASSERT(variable != 0 && buffer != 0);
OString str;
- SbError e = convert(variable->GetOUString(), &str);
+ ErrCode e = convert(variable->GetOUString(), &str);
if (e != ERRCODE_NONE) {
return e;
}
@@ -212,7 +212,7 @@ SbError marshalString(
return ERRCODE_NONE;
}
-SbError marshalStruct(
+ErrCode marshalStruct(
SbxVariable * variable, std::vector< char > & blob, std::size_t offset,
MarshalData & data)
{
@@ -220,7 +220,7 @@ SbError marshalStruct(
SbxArray * props = dynamic_cast<SbxObject*>( variable->GetObject() )->
GetProperties();
for (sal_uInt16 i = 0; i < props->Count(); ++i) {
- SbError e = marshal(false, props->Get(i), false, blob, offset, data);
+ ErrCode e = marshal(false, props->Get(i), false, blob, offset, data);
if (e != ERRCODE_NONE) {
return e;
}
@@ -228,7 +228,7 @@ SbError marshalStruct(
return ERRCODE_NONE;
}
-SbError marshalArray(
+ErrCode marshalArray(
SbxVariable * variable, std::vector< char > & blob, std::size_t offset,
MarshalData & data)
{
@@ -241,7 +241,7 @@ SbError marshalArray(
arr->GetDim32(i + 1, low[i], up[i]);
}
for (std::vector< sal_Int32 > idx = low;;) {
- SbError e = marshal(
+ ErrCode e = marshal(
false, arr->Get32(&idx[0]), false, blob, offset, data);
if (e != ERRCODE_NONE) {
return e;
@@ -260,7 +260,7 @@ SbError marshalArray(
// 8-aligned structs are only 4-aligned on stack, so alignment of members in
// such structs must take that into account via "offset"
-SbError marshal(
+ErrCode marshal(
bool outer, SbxVariable * variable, bool special,
std::vector< char > & blob, std::size_t offset, MarshalData & data)
{
@@ -289,7 +289,7 @@ SbError marshal(
case SbxSTRING:
{
void * p;
- SbError e = marshalString(variable, special, data, &p);
+ ErrCode e = marshalString(variable, special, data, &p);
if (e != ERRCODE_NONE) {
return e;
}
@@ -299,7 +299,7 @@ SbError marshal(
case SbxOBJECT:
{
align(blob, outer ? 4 : alignment(variable), offset, 0);
- SbError e = marshalStruct(variable, blob, offset, data);
+ ErrCode e = marshalStruct(variable, blob, offset, data);
if (e != ERRCODE_NONE) {
return e;
}
@@ -316,7 +316,7 @@ SbError marshal(
break;
}
} else {
- SbError e = marshalArray(variable, blob, offset, data);
+ ErrCode e = marshalArray(variable, blob, offset, data);
if (e != ERRCODE_NONE) {
return e;
}
@@ -336,7 +336,7 @@ SbError marshal(
{
std::vector< char > * blob2 = data.newBlob();
void * p;
- SbError e = marshalString(variable, special, data, &p);
+ ErrCode e = marshalString(variable, special, data, &p);
if (e != ERRCODE_NONE) {
return e;
}
@@ -347,7 +347,7 @@ SbError marshal(
case SbxOBJECT:
{
std::vector< char > * blob2 = data.newBlob();
- SbError e = marshalStruct(variable, *blob2, 0, data);
+ ErrCode e = marshalStruct(variable, *blob2, 0, data);
if (e != ERRCODE_NONE) {
return e;
}
@@ -364,7 +364,7 @@ SbError marshal(
}
} else {
std::vector< char > * blob2 = data.newBlob();
- SbError e = marshalArray(variable, *blob2, 0, data);
+ ErrCode e = marshalArray(variable, *blob2, 0, data);
if (e != ERRCODE_NONE) {
return e;
}
@@ -451,7 +451,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) {
return data;
}
-SbError unmarshalString(StringData const & data, SbxVariable & result) {
+ErrCode unmarshalString(StringData const & data, SbxVariable & result) {
OUString str;
if (data.buffer != 0) {
char const * p = static_cast< char const * >(data.buffer);
@@ -465,7 +465,7 @@ SbError unmarshalString(StringData const & data, SbxVariable & result) {
} else {
len = rtl_str_getLength(p);
}
- SbError e = convert(p, len, &str);
+ ErrCode e = convert(p, len, &str);
if (e != ERRCODE_NONE) {
return e;
}
@@ -479,7 +479,7 @@ struct ProcData {
FARPROC proc;
};
-SbError call(
+ErrCode call(
OUString const & dll, ProcData const & proc, SbxArray * arguments,
SbxVariable & result)
{
@@ -492,7 +492,7 @@ SbError call(
bool special = dll.equalsIgnoreAsciiCase("KERNEL32.DLL") &&
(proc.name == OString("GetLogicalDriveStringsA"));
for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) {
- SbError e = marshal(
+ ErrCode e = marshal(
true, arguments->Get(i), special && i == 2, stack, stack.size(),
data);
if (e != ERRCODE_NONE) {
@@ -528,7 +528,7 @@ SbError call(
char const * s1 = reinterpret_cast< char const * >(
DllMgr_call32(proc.proc, address(stack), stack.size()));
OUString s2;
- SbError e = convert(s1, rtl_str_getLength(s1), &s2);
+ ErrCode e = convert(s1, rtl_str_getLength(s1), &s2);
if (e != ERRCODE_NONE) {
return e;
}
@@ -565,7 +565,7 @@ SbError call(
for (std::vector< StringData >::iterator i(data.unmarshalStrings.begin());
i != data.unmarshalStrings.end(); ++i)
{
- SbError e = unmarshalString(*i, result);
+ ErrCode e = unmarshalString(*i, result);
if (e != ERRCODE_NONE) {
return e;
}
@@ -573,7 +573,7 @@ SbError call(
return ERRCODE_NONE;
}
-SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc)
+ErrCode getProcData(HMODULE handle, OUString const & name, ProcData * proc)
{
OSL_ASSERT(proc != 0);
if ( !name.isEmpty() && name[0] == '@' ) { //TODO: "@" vs. "#"???
@@ -589,7 +589,7 @@ SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc)
}
} else {
OString name8;
- SbError e = convert(name, &name8);
+ ErrCode e = convert(name, &name8);
if (e != ERRCODE_NONE) {
return e;
}
@@ -636,7 +636,7 @@ private:
public:
Dll(): handle(0) {}
- SbError getProc(OUString const & name, ProcData * proc);
+ ErrCode getProc(OUString const & name, ProcData * proc);
HMODULE handle;
Procs procs;
@@ -648,13 +648,13 @@ Dll::~Dll() {
}
}
-SbError Dll::getProc(OUString const & name, ProcData * proc) {
+ErrCode Dll::getProc(OUString const & name, ProcData * proc) {
Procs::iterator i(procs.find(name));
if (i != procs.end()) {
*proc = i->second;
return ERRCODE_NONE;
}
- SbError e = getProcData(handle, name, proc);
+ ErrCode e = getProcData(handle, name, proc);
if (e == ERRCODE_NONE) {
procs.insert(Procs::value_type(name, *proc));
}
@@ -699,7 +699,7 @@ Dll * SbiDllMgr::Impl::getDll(OUString const & name) {
return i->second.get();
}
-SbError SbiDllMgr::Call(
+ErrCode SbiDllMgr::Call(
OUString const & function, OUString const & library,
SbxArray * arguments, SbxVariable & result, bool cdeclConvention)
{
@@ -712,7 +712,7 @@ SbError SbiDllMgr::Call(
return ERRCODE_BASIC_BAD_DLL_LOAD;
}
ProcData proc;
- SbError e = dll->getProc(function, &proc);
+ ErrCode e = dll->getProc(function, &proc);
if (e != ERRCODE_NONE) {
return e;
}
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 19587b3fd088..9bd2e9c95424 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -36,7 +36,7 @@ public:
~SbiDllMgr();
- SbError Call(
+ ErrCode Call(
OUString const & function, OUString const & library,
SbxArray * arguments, SbxVariable & result, bool cdeclConvention);
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 24ea0cba4f3c..fc4868960837 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -459,7 +459,7 @@ void UCBStream::SetSize( sal_uInt64 nSize )
}
-SbError SbiStream::Open
+ErrCode SbiStream::Open
( short nCh, const OString& rName, StreamMode nStrmMode, SbiStreamFlags nFlags, short nL )
{
nMode = nFlags;
@@ -526,7 +526,7 @@ SbError SbiStream::Open
return nError;
}
-SbError SbiStream::Close()
+ErrCode SbiStream::Close()
{
if( pStrm )
{
@@ -537,7 +537,7 @@ SbError SbiStream::Close()
return nError;
}
-SbError SbiStream::Read(OString& rBuf, sal_uInt16 n, bool bForceReadingPerByte)
+ErrCode SbiStream::Read(OString& rBuf, sal_uInt16 n, bool bForceReadingPerByte)
{
nExpandOnWriteTo = 0;
if( !bForceReadingPerByte && IsText() )
@@ -569,7 +569,7 @@ SbError SbiStream::Read(OString& rBuf, sal_uInt16 n, bool bForceReadingPerByte)
return nError;
}
-SbError SbiStream::Read( char& ch )
+ErrCode SbiStream::Read( char& ch )
{
nExpandOnWriteTo = 0;
if (aLine.isEmpty())
@@ -614,7 +614,7 @@ namespace
}
}
-SbError SbiStream::Write( const OString& rBuf )
+ErrCode SbiStream::Write( const OString& rBuf )
{
ExpandFile();
if( IsAppend() )
@@ -666,9 +666,9 @@ SbiIoSystem::~SbiIoSystem()
Shutdown();
}
-SbError SbiIoSystem::GetError()
+ErrCode SbiIoSystem::GetError()
{
- SbError n = nError; nError = 0;
+ ErrCode n = nError; nError = 0;
return n;
}
@@ -723,7 +723,7 @@ void SbiIoSystem::Shutdown()
{
if( pChan[ i ] )
{
- SbError n = pChan[ i ]->Close();
+ ErrCode n = pChan[ i ]->Close();
delete pChan[ i ];
pChan[ i ] = nullptr;
if( n && !nError )
@@ -821,7 +821,7 @@ void SbiIoSystem::CloseAll()
{
if( pChan[ i ] )
{
- SbError n = pChan[ i ]->Close();
+ ErrCode n = pChan[ i ]->Close();
delete pChan[ i ];
pChan[ i ] = nullptr;
if( n && !nError )
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 396ae9e8fc26..59b02467ab37 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -206,7 +206,7 @@ RTLFUNC(Error)
else
{
OUString aErrorMsg;
- SbError nErr = ERRCODE_NONE;
+ ErrCode nErr = ERRCODE_NONE;
sal_Int32 nCode = 0;
if( rPar.Count() == 1 )
{
@@ -4025,7 +4025,7 @@ RTLFUNC(DDEInitiate)
SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl();
size_t nChannel;
- SbError nDdeErr = pDDE->Initiate( rApp, rTopic, nChannel );
+ ErrCode nDdeErr = pDDE->Initiate( rApp, rTopic, nChannel );
if( nDdeErr )
{
StarBASIC::Error( nDdeErr );
@@ -4050,7 +4050,7 @@ RTLFUNC(DDETerminate)
}
size_t nChannel = rPar.Get(1)->GetInteger();
SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl();
- SbError nDdeErr = pDDE->Terminate( nChannel );
+ ErrCode nDdeErr = pDDE->Terminate( nChannel );
if( nDdeErr )
{
StarBASIC::Error( nDdeErr );
@@ -4071,7 +4071,7 @@ RTLFUNC(DDETerminateAll)
}
SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl();
- SbError nDdeErr = pDDE->TerminateAll();
+ ErrCode nDdeErr = pDDE->TerminateAll();
if( nDdeErr )
{
StarBASIC::Error( nDdeErr );
@@ -4093,7 +4093,7 @@ RTLFUNC(DDERequest)
const OUString& rItem = rPar.Get(2)->GetOUString();
SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl();
OUString aResult;
- SbError nDdeErr = pDDE->Request( nChannel, rItem, aResult );
+ ErrCode nDdeErr = pDDE->Request( nChannel, rItem, aResult );
if( nDdeErr )
{
StarBASIC::Error( nDdeErr );
@@ -4119,7 +4119,7 @@ RTLFUNC(DDEExecute)
size_t nChannel = rPar.Get(1)->GetInteger();
const OUString& rCommand = rPar.Get(2)->GetOUString();
SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl();
- SbError nDdeErr = pDDE->Execute( nChannel, rCommand );
+ ErrCode nDdeErr = pDDE->Execute( nChannel, rCommand );
if( nDdeErr )
{
StarBASIC::Error( nDdeErr );
@@ -4142,7 +4142,7 @@ RTLFUNC(DDEPoke)
const OUString& rItem = rPar.Get(2)->GetOUString();
const OUString& rData = rPar.Get(3)->GetOUString();
SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl();
- SbError nDdeErr = pDDE->Poke( nChannel, rItem, rData );
+ ErrCode nDdeErr = pDDE->Poke( nChannel, rItem, rData );
if( nDdeErr )
{
StarBASIC::Error( nDdeErr );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 965379d7a49f..8ebcab989e08 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -333,7 +333,7 @@ RTLFUNC(CDbl) // JSM
{
// #41690
OUString aScanStr = pSbxVariable->GetOUString();
- SbError Error = SbxValue::ScanNumIntnl( aScanStr, nVal );
+ ErrCode Error = SbxValue::ScanNumIntnl( aScanStr, nVal );
if( Error != ERRCODE_SBX_OK )
{
StarBASIC::Error( Error );
@@ -402,7 +402,7 @@ RTLFUNC(CSng) // JSM
// #41690
double dVal = 0.0;
OUString aScanStr = pSbxVariable->GetOUString();
- SbError Error = SbxValue::ScanNumIntnl( aScanStr, dVal, /*bSingle=*/true );
+ ErrCode Error = SbxValue::ScanNumIntnl( aScanStr, dVal, /*bSingle=*/true );
if( SbxBase::GetError() == ERRCODE_SBX_OK && Error != ERRCODE_SBX_OK )
{
StarBASIC::Error( Error );
@@ -2283,7 +2283,7 @@ RTLFUNC(DateDiff)
double implGetDateOfFirstDayInFirstWeek
( sal_Int16 nYear, sal_Int16& nFirstDay, sal_Int16& nFirstWeek, bool* pbError = nullptr )
{
- SbError nError = ERRCODE_NONE;
+ ErrCode nError = ERRCODE_NONE;
if( nFirstDay < 0 || nFirstDay > 7 )
nError = ERRCODE_BASIC_BAD_ARGUMENT;
@@ -3256,7 +3256,7 @@ RTLFUNC(Input)
}
OString aByteBuffer;
- SbError err = pSbStrm->Read( aByteBuffer, nByteCount, true );
+ ErrCode err = pSbStrm->Read( aByteBuffer, nByteCount, true );
if( !err )
err = pIosys->GetError();
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 5054c9bf9f6a..13244e39de7d 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -460,12 +460,12 @@ void setBasicWatchMode( bool bOn )
bWatchMode = bOn;
}
-void SbiInstance::Error( SbError n )
+void SbiInstance::Error( ErrCode n )
{
Error( n, OUString() );
}
-void SbiInstance::Error( SbError n, const OUString& rMsg )
+void SbiInstance::Error( ErrCode n, const OUString& rMsg )
{
if( !bWatchMode )
{
@@ -478,7 +478,7 @@ void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const OUString& rMsg )
{
if( !bWatchMode )
{
- SbError n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
+ ErrCode n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
if ( !n )
{
n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
@@ -493,7 +493,7 @@ void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const OUString& rMsg )
void SbiInstance::setErrorVB( sal_Int32 nVBNumber )
{
- SbError n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
+ ErrCode n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
if( !n )
{
n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
@@ -505,12 +505,12 @@ void SbiInstance::setErrorVB( sal_Int32 nVBNumber )
}
-void SbiInstance::FatalError( SbError n )
+void SbiInstance::FatalError( ErrCode n )
{
pRun->FatalError( n );
}
-void SbiInstance::FatalError( SbError _errCode, const OUString& _details )
+void SbiInstance::FatalError( ErrCode _errCode, const OUString& _details )
{
pRun->FatalError( _errCode, _details );
}
@@ -774,11 +774,11 @@ bool SbiRuntime::Step()
StarBASIC::FatalError( ERRCODE_BASIC_INTERNAL_ERROR );
}
- SbError nSbError = SbxBase::GetError();
- Error( ERRCODE_TOERROR(nSbError) );
+ ErrCode nErrCode = SbxBase::GetError();
+ Error( ERRCODE_TOERROR(nErrCode) );
// from 13.2.1997, new error handling:
- // ATTENTION: nError can be set already even if !nSbError
+ // ATTENTION: nError can be set already even if !nErrCode
// since nError can now also be set from other RT-instances
if( nError )
@@ -790,7 +790,7 @@ bool SbiRuntime::Step()
// (especially not after compiler errors at the runtime)
if( nError && bRun )
{
- SbError err = nError;
+ ErrCode err = nError;
ClearExprStack();
nError = ERRCODE_NONE;
pInst->nErr = err;
@@ -873,7 +873,7 @@ bool SbiRuntime::Step()
return bRun;
}
-void SbiRuntime::Error( SbError n, bool bVBATranslationAlreadyDone )
+void SbiRuntime::Error( ErrCode n, bool bVBATranslationAlreadyDone )
{
if( n )
{
@@ -894,7 +894,7 @@ void SbiRuntime::Error( SbError n, bool bVBATranslationAlreadyDone )
}
}
-void SbiRuntime::Error( SbError _errCode, const OUString& _details )
+void SbiRuntime::Error( ErrCode _errCode, const OUString& _details )
{
if ( _errCode )
{
@@ -912,19 +912,19 @@ void SbiRuntime::Error( SbError _errCode, const OUString& _details )
}
}
-void SbiRuntime::FatalError( SbError n )
+void SbiRuntime::FatalError( ErrCode n )
{
StepSTDERROR();
Error( n );
}
-void SbiRuntime::FatalError( SbError _errCode, const OUString& _details )
+void SbiRuntime::FatalError( ErrCode _errCode, const OUString& _details )
{
StepSTDERROR();
Error( _errCode, _details );
}
-sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, OUString& rMsg )
+sal_Int32 SbiRuntime::translateErrorToVba( ErrCode nError, OUString& rMsg )
{
// If a message is defined use that ( in preference to
// the defined one for the error ) NB #TODO
@@ -935,7 +935,7 @@ sal_Int32 SbiRuntime::translateErrorToVba( SbError nError, OUString& rMsg )
{
// TEST, has to be vb here always
#ifdef DBG_UTIL
- SbError nTmp = StarBASIC::GetSfxFromVBError( (sal_uInt16)nError );
+ ErrCode nTmp = StarBASIC::GetSfxFromVBError( (sal_uInt16)nError );
SAL_WARN_IF( nTmp == 0, "basic", "No VB error!" );
#endif
@@ -1247,7 +1247,7 @@ void SbiRuntime::DllCall
SbxVariable* pRes = new SbxVariable( eResType );
SbiDllMgr* pDllMgr = pInst->GetDllMgr();
- SbError nErr = pDllMgr->Call( aFuncName, aDLLName, pArgs, *pRes, bCDecl );
+ ErrCode nErr = pDllMgr->Call( aFuncName, aDLLName, pArgs, *pRes, bCDecl );
if( nErr )
{
Error( nErr );
@@ -2406,7 +2406,7 @@ void SbiRuntime::StepINPUT()
OUStringBuffer sin;
OUString s;
char ch = 0;
- SbError err;
+ ErrCode err;
// Skip whitespace
while( ( err = pIosys->GetError() ) == ERRCODE_NONE )
{
@@ -2737,7 +2737,7 @@ void SbiRuntime::StepERROR()
{
SbxVariableRef refCode = PopVar();
sal_uInt16 n = refCode->GetUShort();
- SbError error = StarBASIC::GetSfxFromVBError( n );
+ ErrCode error = StarBASIC::GetSfxFromVBError( n );
if ( bVBAEnabled )
{
pInst->Error( error );
@@ -3120,7 +3120,7 @@ void SbiRuntime::StepRESUME( sal_uInt32 nOp1 )
// close channel (+channel, 0=all)
void SbiRuntime::StepCLOSE( sal_uInt32 nOp1 )
{
- SbError err;
+ ErrCode err;
if( !nOp1 )
pIosys->Shutdown();
else
@@ -3299,7 +3299,7 @@ void SbiRuntime::StepBASED( sal_uInt32 nOp1 )
// 0x8000 - Argv is reserved
SbxVariable* SbiRuntime::FindElement( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2,
- SbError nNotFound, bool bLocal, bool bStatic )
+ ErrCode nNotFound, bool bLocal, bool bStatic )
{
bool bIsVBAInterOp = SbiRuntime::isVBAEnabled();
if( bIsVBAInterOp )
@@ -3932,7 +3932,7 @@ void SbiRuntime::StepRTL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
}
void SbiRuntime::StepFIND_Impl( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt32 nOp2,
- SbError nNotFound, bool bStatic )
+ ErrCode nNotFound, bool bStatic )
{
if( !refLocals.is() )
{
diff --git a/include/basic/sberrors.hxx b/include/basic/sberrors.hxx
index f1e44a977754..52dc1256835a 100644
--- a/include/basic/sberrors.hxx
+++ b/include/basic/sberrors.hxx
@@ -22,10 +22,6 @@
#include <basic/sbxdef.hxx>
-#ifndef __RSC
-typedef ErrCode SbError;
-#endif
-
// Mapping to SbxError
#define ERRCODE_BASIC_SYNTAX ERRCODE_SBX_SYNTAX // unspecified syntax error
#define ERRCODE_BASIC_BAD_ARGUMENT ERRCODE_SBX_NOTIMP // Invalid procedure call
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index b48334048ef9..c625abc4820f 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -69,9 +69,9 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject
BASIC_DLLPRIVATE void implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic );
protected:
- bool CError( SbError, const OUString&, sal_Int32, sal_Int32, sal_Int32 );
+ bool CError( ErrCode, const OUString&, sal_Int32, sal_Int32, sal_Int32 );
private:
- BASIC_DLLPRIVATE bool RTError( SbError, const OUString& rMsg, sal_Int32, sal_Int32, sal_Int32 );
+ BASIC_DLLPRIVATE bool RTError( ErrCode, const OUString& rMsg, sal_Int32, sal_Int32, sal_Int32 );
BASIC_DLLPRIVATE BasicDebugFlags BreakPoint( sal_Int32 nLine, sal_Int32 nCol1, sal_Int32 nCol2 );
BASIC_DLLPRIVATE BasicDebugFlags StepPoint( sal_Int32 nLine, sal_Int32 nCol1, sal_Int32 nCol2 );
virtual bool LoadData( SvStream&, sal_uInt16 ) override;
@@ -101,12 +101,12 @@ public:
SbModule* MakeModule( const OUString& rName, const OUString& rSrc );
SbModule* MakeModule( const OUString& rName, const css::script::ModuleInfo& mInfo, const OUString& rSrc );
static void Stop();
- static void Error( SbError );
- static void Error( SbError, const OUString& rMsg );
- static void FatalError( SbError );
- static void FatalError( SbError, const OUString& rMsg );
+ static void Error( ErrCode );
+ static void Error( ErrCode, const OUString& rMsg );
+ static void FatalError( ErrCode );
+ static void FatalError( ErrCode, const OUString& rMsg );
static bool IsRunning();
- static SbError GetErrBasic();
+ static ErrCode GetErrBasic();
// #66536 make additional message accessible by RTL function Error
static OUString GetErrorMsg();
static sal_Int32 GetErl();
@@ -126,15 +126,15 @@ public:
static sal_uInt16 GetLine();
static sal_uInt16 GetCol1();
static sal_uInt16 GetCol2();
- static void SetErrorData( SbError nCode, sal_uInt16 nLine,
+ static void SetErrorData( ErrCode nCode, sal_uInt16 nLine,
sal_uInt16 nCol1, sal_uInt16 nCol2 );
// Specific to error handler
- static void MakeErrorText( SbError, const OUString& aMsg );
+ static void MakeErrorText( ErrCode, const OUString& aMsg );
static const OUString& GetErrorText();
- static SbError GetErrorCode();
- static sal_uInt16 GetVBErrorCode( SbError nError );
- static SbError GetSfxFromVBError( sal_uInt16 nError );
+ static ErrCode GetErrorCode();
+ static sal_uInt16 GetVBErrorCode( ErrCode nError );
+ static ErrCode GetSfxFromVBError( sal_uInt16 nError );
bool IsBreak() const { return bBreak; }
static Link<StarBASIC*,bool> GetGlobalErrorHdl();
commit 3f20471490c61b19fe4222f8c40df255051f6e3d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jun 14 15:58:42 2017 +0200
use std::unique_ptr in FlatFndBox
and extend o3tl::make_unique to cope with arrays
Change-Id: I84caa46ab5060f9777bfe275f229499cb0b407be
Reviewed-on: https://gerrit.libreoffice.org/38794
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/o3tl/make_unique.hxx b/include/o3tl/make_unique.hxx
index 2be03e9dc9cf..40658f5734d4 100644
--- a/include/o3tl/make_unique.hxx
+++ b/include/o3tl/make_unique.hxx
@@ -12,6 +12,7 @@
#include <memory>
#include <utility>
+#include <type_traits>
namespace o3tl
{
@@ -27,6 +28,21 @@ typename std::unique_ptr<T> make_unique(Args&& ... args)
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
+/**
+ * for arrays
+ */
+template <class T>
+typename std::enable_if
+<
+ std::is_array<T>::value,
+ std::unique_ptr<T>
+>::type
+make_unique(std::size_t n)
+{
+ typedef typename std::remove_extent<T>::type RT;
+ return std::unique_ptr<T>(new RT[n]);
+}
+
}
#endif
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index d71f9a079426..f2c02f409342 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -747,7 +747,6 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const FndBox_& rBox) :
pDoc(pDocPtr),
rBoxRef(rBox),
- pArr(nullptr),
nRow(0),
nCol(0)
{ // If the array is symmetric
@@ -760,9 +759,8 @@ FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const FndBox_& rBox) :
// Create linear array
size_t nCount = static_cast<size_t>(nRows) * nCols;
- pArr = new const FndBox_*[nCount];
- FndBox_** ppTmp = const_cast<FndBox_**>(pArr);
- memset(ppTmp, 0, sizeof(const FndBox_*) * nCount);
+ pArr = o3tl::make_unique<FndBox_ const *[]>(nCount);
+ memset(pArr.get(), 0, sizeof(const FndBox_*) * nCount);
FillFlat( rBoxRef );
}
@@ -770,8 +768,6 @@ FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const FndBox_& rBox) :
FlatFndBox::~FlatFndBox()
{
- FndBox_** ppTmp = const_cast<FndBox_**>(pArr);
- delete [] ppTmp;
}
/// All Lines of a Box need to have same number of Boxes
@@ -890,7 +886,7 @@ void FlatFndBox::FillFlat(const FndBox_& rBox, bool bLastBox)
{
// save it
sal_uInt16 nOff = nRow * nCols + nCol;
- *(pArr + nOff) = pBox;
+ pArr[nOff] = pBox;
// Save the Formula/Format/Value values
const SwFrameFormat* pFormat = pBox->GetBox()->GetFrameFormat();
@@ -931,7 +927,7 @@ void FlatFndBox::FillFlat(const FndBox_& rBox, bool bLastBox)
const FndBox_* FlatFndBox::GetBox(sal_uInt16 n_Col, sal_uInt16 n_Row) const
{
sal_uInt16 nOff = n_Row * nCols + n_Col;
- const FndBox_* pTmp = *(pArr + nOff);
+ const FndBox_* pTmp = pArr[nOff];
OSL_ENSURE(n_Col < nCols && n_Row < nRows && pTmp, "invalid array access");
return pTmp;
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index f8c1990ef9a3..b66ecd3f5159 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -140,7 +140,7 @@ private:
SwDoc* pDoc;
const FndBox_& rBoxRef;
- const FndBox_** pArr;
+ std::unique_ptr<FndBox_ const *[]> pArr;
std::vector<std::unique_ptr<SfxItemSet>> ppItemSets;
sal_uInt16 nRows;
commit 8ae592a7360d5f6a44d5ad2c34d818f638ff94b2
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jun 14 15:26:23 2017 +0200
fix bug in MenuBarManager::FillMenuManager
which appears to have been there since this function was created in
commit 635d8b5b0c2152efb80694bb27fa8df9487b108d
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Feb 25 16:51:59 2004 +0000
INTEGRATION: CWS layoutmanager (1.1.2); FILE ADDED
Change-Id: I117241152e99f1ee6ec33e32f8fdc63ae7c87043
Reviewed-on: https://gerrit.libreoffice.org/38791
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 023dc79f1332..2dcfd3a94920 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1180,8 +1180,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
VclPtr<PopupMenu> pSubMenu = AddonMenuManager::CreateAddonMenu(rFrame);
if ( pSubMenu && ( pSubMenu->GetItemCount() > 0 ))
{
- sal_uInt16 nCount = 0;
- if ( pPopup->GetItemType( nCount-1 ) != MenuItemType::SEPARATOR )
+ if ( pPopup->GetItemType( pPopup->GetItemCount() - 1 ) != MenuItemType::SEPARATOR )
pPopup->InsertSeparator();
pPopup->InsertItem( ITEMID_ADDONLIST, OUString() );
commit ec8c98f59869bee0e327d32f39480a0e4b1330bc
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jun 14 11:31:15 2017 +0200
use more SAL_N_ELEMENTS part 3
Change-Id: I82e366fefd2e31928b99840fe76649cc3521e623
Reviewed-on: https://gerrit.libreoffice.org/38789
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index 2d75b522b2f3..05b7a4747970 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -423,7 +423,7 @@ AnimationNode::AnimationNode( sal_Int16 nNodeType )
mnIterateType( css::presentation::ShapeAnimationSubType::AS_WHOLE ),
mfIterateInterval(0.0)
{
- assert((sal_uInt32)nNodeType < sizeof(mpTypes)/sizeof(Sequence<Type>*));
+ assert(nNodeType < int(SAL_N_ELEMENTS(mpTypes)));
}
AnimationNode::AnimationNode( const AnimationNode& rNode )
diff --git a/binaryurp/qa/test-cache.cxx b/binaryurp/qa/test-cache.cxx
index f14b3837629e..989b103e2e90 100644
--- a/binaryurp/qa/test-cache.cxx
+++ b/binaryurp/qa/test-cache.cxx
@@ -39,7 +39,7 @@ private:
// cf. jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java:
void Test::testNothingLostFromLruList() {
int a[8];
- for (int i = 0; i != sizeof a / sizeof a[0]; ++i) {
+ for (int i = 0; i != int(SAL_N_ELEMENTS(a)); ++i) {
for (int j = 0; j != i; ++j) {
a[j] = 0;
}
diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx
index f27a993a1c3f..3eafb4bd9391 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -694,11 +694,11 @@ SyntaxHighlighter::SyntaxHighlighter(HighlighterLanguage language):
{
case HighlighterLanguage::Basic:
m_tokenizer->setKeyWords( strListBasicKeyWords,
- sizeof( strListBasicKeyWords ) / sizeof( char* ));
+ SAL_N_ELEMENTS( strListBasicKeyWords ));
break;
case HighlighterLanguage::SQL:
m_tokenizer->setKeyWords( strListSqlKeyWords,
- sizeof( strListSqlKeyWords ) / sizeof( char* ));
+ SAL_N_ELEMENTS( strListSqlKeyWords ));
break;
default:
assert(false); // this cannot happen
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index bc3b31775b6d..2c8138abe19e 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -591,7 +591,7 @@ bool WriterThread::iteration() {
OUString("bloaters") };
test_.setKey(path_, name_, css::uno::Any(options[index_]));
- index_ = (index_ + 1) % (sizeof options / sizeof (OUString));
+ index_ = (index_ + 1) % SAL_N_ELEMENTS(options);
return true;
}
@@ -614,7 +614,7 @@ void Test::testThreads()
{ OUString("/org.openoffice.System"),
OUString("L10N/Locale") }
};
- std::size_t const numReaders = sizeof list / sizeof (Entry);
+ std::size_t const numReaders = SAL_N_ELEMENTS(list);
std::size_t const numWriters = numReaders - 2;
ReaderThread * readers[numReaders];
WriterThread * writers[numWriters];
diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 596122d16c6e..61688bd61e4f 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -201,7 +201,7 @@ Statics & getStatics()
PropertyDef( statics.TYPE , tString )
};
ist.pProps = createPropertyArrayHelper(
- tableDef, sizeof(tableDef)/sizeof(PropertyDef), READONLY );
+ tableDef, SAL_N_ELEMENTS(tableDef), READONLY );
statics.refl.tableDescriptor.implName =
"org.openoffice.comp.pq.sdbcx.TableDescriptor";
@@ -240,7 +240,7 @@ Statics & getStatics()
PropertyDefEx( statics.TYPE_NAME , tString ,READONLY)
};
statics.refl.column.pProps = createPropertyArrayHelper(
- columnDef, sizeof(columnDef)/sizeof(PropertyDefEx) );
+ columnDef, SAL_N_ELEMENTS(columnDef) );
statics.refl.columnDescriptor.implName =
"org.openoffice.comp.pq.sdbcx.ColumnDescriptor";
@@ -282,7 +282,7 @@ Statics & getStatics()
PropertyDef( statics.UPDATE_RULE, tInt )
};
statics.refl.key.pProps = createPropertyArrayHelper(
- keyDef, sizeof(keyDef)/sizeof(PropertyDef), READONLY );
+ keyDef, SAL_N_ELEMENTS(keyDef), READONLY );
// Key properties
@@ -324,7 +324,7 @@ Statics & getStatics()
PropertyDef( statics.TYPE_NAME , tString )
};
statics.refl.keycolumn.pProps = createPropertyArrayHelper(
- keycolumnDef, sizeof(keycolumnDef)/sizeof(PropertyDef), READONLY );
+ keycolumnDef, SAL_N_ELEMENTS(keycolumnDef), READONLY );
// KeyColumn props set
statics.refl.keycolumnDescriptor.implName =
@@ -353,7 +353,7 @@ Statics & getStatics()
PropertyDef( statics.SCHEMA_NAME , tString )
};
statics.refl.view.pProps = createPropertyArrayHelper(
- viewDef, sizeof(viewDef)/sizeof(PropertyDef), READONLY );
+ viewDef, SAL_N_ELEMENTS(viewDef), READONLY );
// view props set
statics.refl.viewDescriptor.implName = "org.openoffice.comp.pq.sdbcx.ViewDescriptor";
@@ -370,7 +370,7 @@ Statics & getStatics()
PropertyDef( statics.NAME , tString )
};
statics.refl.user.pProps = createPropertyArrayHelper(
- userDefRO, sizeof(userDefRO)/sizeof(PropertyDef), READONLY );
+ userDefRO, SAL_N_ELEMENTS(userDefRO), READONLY );
// user props set
statics.refl.userDescriptor.implName =
@@ -400,7 +400,7 @@ Statics & getStatics()
PropertyDef( statics.PRIVATE_COLUMN_INDEXES, tStringSequence )
};
statics.refl.index.pProps = createPropertyArrayHelper(
- indexDef, sizeof(indexDef)/sizeof(PropertyDef), READONLY );
+ indexDef, SAL_N_ELEMENTS(indexDef), READONLY );
// index props set
statics.refl.indexDescriptor.implName =
@@ -432,7 +432,7 @@ Statics & getStatics()
PropertyDef( statics.TYPE_NAME , tString )
};
statics.refl.indexColumn.pProps = createPropertyArrayHelper(
- indexColumnDef, sizeof(indexColumnDef)/sizeof(PropertyDef), READONLY );
+ indexColumnDef, SAL_N_ELEMENTS(indexColumnDef), READONLY );
// indexColumn props set
statics.refl.indexColumnDescriptor.implName =
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 0d64c56e9e62..55a0d244b724 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -42,8 +42,6 @@
#include "macro_expander.hxx"
-#define ARLEN(x) sizeof (x) / sizeof *(x)
-
using namespace ::osl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -138,7 +136,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
if ( hPool == nullptr )
throw BootstrapException( "cannot create random pool!" );
sal_uInt8 bytes[ 16 ];
- if ( rtl_random_getBytes( hPool, bytes, ARLEN( bytes ) )
+ if ( rtl_random_getBytes( hPool, bytes, SAL_N_ELEMENTS( bytes ) )
!= rtl_Random_E_None )
throw BootstrapException( "random pool error!" );
rtl_random_destroyPool( hPool );
@@ -167,7 +165,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
// start office process
oslProcess hProcess = nullptr;
oslProcessError rc = osl_executeProcess(
- OUString(path + "soffice").pData, ar_args, ARLEN( ar_args ),
+ OUString(path + "soffice").pData, ar_args, SAL_N_ELEMENTS( ar_args ),
osl_Process_DETACHED,
sec.getHandle(),
nullptr, // => current working dir
diff --git a/desktop/inc/dp_misc.h b/desktop/inc/dp_misc.h
index 365bff77338a..154a4de59543 100644
--- a/desktop/inc/dp_misc.h
+++ b/desktop/inc/dp_misc.h
@@ -32,8 +32,6 @@
#include <com/sun/star/awt/XWindow.hpp>
#include "dp_misc_api.hxx"
-#define ARLEN(x) (sizeof (x) / sizeof *(x))
-
namespace dp_misc {
const sal_Char CR = 0x0d;
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 2083075a608e..3655a4c05c13 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -428,7 +428,7 @@ OUString generateRandomPipeId()
throw RuntimeException( "cannot create random pool!?", nullptr );
sal_uInt8 bytes[ 32 ];
if (rtl_random_getBytes(
- s_hPool, bytes, ARLEN(bytes) ) != rtl_Random_E_None) {
+ s_hPool, bytes, SAL_N_ELEMENTS(bytes) ) != rtl_Random_E_None) {
throw RuntimeException( "random pool error!?", nullptr );
}
OUStringBuffer buf;
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 2c40f9e54798..cc060c4f0b31 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1511,10 +1511,8 @@ void BackendImpl::PackageImpl::scanLegacyBundle(
if (title.endsWithIgnoreAsciiCase("skip_registration") )
skip_registration = true;
- OUString ar [] = { OUString("Title"), OUString("IsFolder") };
- Reference<sdbc::XResultSet> xResultSet(
- ucbContent.createCursor(
- Sequence<OUString>( ar, ARLEN(ar) ) ) );
+ Sequence<OUString> ar { OUString("Title"), OUString("IsFolder") };
+ Reference<sdbc::XResultSet> xResultSet( ucbContent.createCursor( ar ) );
while (xResultSet->next())
{
checkAborted( abortChannel );
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 954668bdea92..133b0e666411 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -232,7 +232,7 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
oslFileHandle pErr = nullptr;
oslProcessError eErr = runProcessWithPathSearch(
"pstoedit" EXESUFFIX,
- args, sizeof(args)/sizeof(rtl_uString *),
+ args, SAL_N_ELEMENTS(args),
&aProcess, &pIn, &pOut, &pErr);
if (eErr!=osl_Process_E_None)
@@ -360,7 +360,7 @@ static bool RenderAsBMPThroughConvert(const sal_uInt8* pBuf, sal_uInt32 nBytesRe
return RenderAsBMPThroughHelper(pBuf, nBytesRead, rGraphic,
("convert" EXESUFFIX),
args,
- sizeof(args)/sizeof(rtl_uString *));
+ SAL_N_ELEMENTS(args));
}
static bool RenderAsBMPThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
@@ -390,7 +390,7 @@ static bool RenderAsBMPThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
"gs" EXESUFFIX,
#endif
args,
- sizeof(args)/sizeof(rtl_uString *));
+ SAL_N_ELEMENTS(args));
}
static bool RenderAsBMP(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &rGraphic)
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 6a3530a3cbb0..02ef2098ee3d 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -328,13 +328,13 @@ bool SVGFilter::isStreamSvg(const uno::Reference<io::XInputStream>& xInput)
const sal_Int8* pBuffer = aBuffer.getConstArray();
sal_Int8 aMagic1[] = {'<', 's', 'v', 'g'};
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list