[Libreoffice-commits] core.git: avmedia/source basctl/qa basctl/source basic/qa basic/source canvas/source chart2/qa chart2/source codemaker/source comphelper/source compilerplugins/clang configmgr/source connectivity/qa connectivity/source cppuhelper/source cppu/source cui/qa cui/source dbaccess/qa dbaccess/source desktop/inc desktop/qa desktop/source editeng/source embeddedobj/qa embeddedobj/source emfio/qa extensions/qa extensions/source filter/qa filter/source forms/source formula/qa fpicker/qa fpicker/source framework/inc framework/source helpcompiler/source hwpfilter/qa i18nlangtag/source i18npool/inc i18npool/source include/avmedia include/codemaker include/comphelper include/connectivity include/filter include/helpcompiler include/i18nlangtag include/oox include/sfx2 include/svl include/svtools include/svx include/test include/unotest include/unotools include/vbahelper include/vcl include/xmloff io/source jvmfwk/plugins l10ntools/inc l10ntools/source linguistic/source lotuswordpro/qa oox/ qa oox/source opencl/inc opencl/source package/inc package/qa package/source pyuno/source registry/source reportdesign/qa reportdesign/source sax/qa sax/source sccomp/qa sc/inc sc/qa sc/source sdext/source sd/inc sd/qa sd/source sfx2/inc sfx2/qa sfx2/source smoketest/smoketest.cxx sot/qa starmath/qa starmath/source stoc/source svgio/qa svl/qa svl/source svtools/qa svtools/source svx/qa svx/source sw/inc sw/qa sw/source test/source tools/qa ucb/source unodevtools/source unoidl/source unotest/source unotools/source uui/qa vbahelper/source vcl/inc vcl/qa vcl/source vcl/unx writerfilter/qa writerfilter/source writerperfect/qa writerperfect/source xmlhelp/source xmloff/inc xmloff/qa xmloff/source xmlsecurity/qa xmlsecurity/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Tue Dec 29 15:43:59 UTC 2020
avmedia/source/framework/mediaitem.cxx | 4
basctl/qa/unit/basctl-dialogs-test.cxx | 2
basctl/source/basicide/bastype3.cxx | 4
basctl/source/basicide/bastypes.cxx | 18
basctl/source/basicide/localizationmgr.cxx | 37
basctl/source/basicide/moduldlg.cxx | 4
basctl/source/basicide/moduldlg.hxx | 6
basctl/source/inc/basidesh.hxx | 3
basctl/source/inc/bastypes.hxx | 13
basctl/source/inc/localizationmgr.hxx | 24
basic/qa/cppunit/basic_coverage.cxx | 2
basic/qa/cppunit/test_vba.cxx | 2
basic/source/classes/sbunoobj.cxx | 10
basic/source/inc/sbunoobj.hxx | 2
basic/source/uno/namecont.cxx | 7
canvas/source/tools/propertysethelper.cxx | 10
chart2/qa/extras/PivotChartTest.cxx | 4
chart2/qa/extras/chart2_trendcalculators.cxx | 2
chart2/qa/extras/chart2dump/chart2dump.cxx | 21
chart2/qa/extras/chart2export.cxx | 304 +++---
chart2/qa/extras/chart2geometry.cxx | 28
chart2/qa/extras/chart2import.cxx | 222 ++--
chart2/qa/extras/charttest.hxx | 13
chart2/qa/extras/xshape/chart2xshape.cxx | 28
chart2/qa/unit/chart2-dialogs-test.cxx | 2
chart2/source/inc/ObjectIdentifier.hxx | 6
chart2/source/tools/ObjectIdentifier.cxx | 2
codemaker/source/codemaker/typemanager.cxx | 2
codemaker/source/commoncpp/commoncpp.cxx | 4
codemaker/source/commonjava/commonjava.cxx | 4
codemaker/source/cppumaker/cpputype.cxx | 54 -
codemaker/source/cppumaker/dependencies.cxx | 6
codemaker/source/cppumaker/dependencies.hxx | 3
codemaker/source/javamaker/javatype.cxx | 57 -
comphelper/source/misc/DirectoryHelper.cxx | 7
comphelper/source/misc/backupfilehelper.cxx | 95 +-
comphelper/source/misc/configuration.cxx | 7
comphelper/source/property/propertystatecontainer.cxx | 8
comphelper/source/xml/ofopxmlhelper.cxx | 4
compilerplugins/clang/stringviewparam.cxx | 5
configmgr/source/components.cxx | 4
configmgr/source/components.hxx | 3
configmgr/source/writemodfile.cxx | 6
configmgr/source/xcuparser.cxx | 6
configmgr/source/xcuparser.hxx | 3
connectivity/qa/connectivity/ado/DriverTest.cxx | 2
connectivity/source/commontools/TColumnsHelper.cxx | 2
connectivity/source/commontools/dbtools2.cxx | 6
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 6
connectivity/source/drivers/firebird/DatabaseMetaData.hxx | 6
connectivity/source/drivers/firebird/Table.cxx | 2
connectivity/source/drivers/firebird/Table.hxx | 6
connectivity/source/drivers/hsqldb/HTable.cxx | 2
connectivity/source/drivers/mysql_jdbc/YTable.cxx | 2
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 8
connectivity/source/drivers/postgresql/pq_statement.cxx | 2
connectivity/source/drivers/postgresql/pq_statement.hxx | 7
connectivity/source/drivers/postgresql/pq_tools.cxx | 4
connectivity/source/drivers/postgresql/pq_tools.hxx | 2
connectivity/source/inc/hsqldb/HTable.hxx | 6
connectivity/source/inc/mysql/YTable.hxx | 6
connectivity/source/parse/sqlnode.cxx | 4
cppu/source/uno/lbenv.cxx | 4
cppuhelper/source/servicemanager.cxx | 12
cppuhelper/source/servicemanager.hxx | 5
cppuhelper/source/shlib.cxx | 7
cui/qa/unit/cui-dialogs-test.cxx | 2
cui/qa/unit/cui-dialogs-test_2.cxx | 2
cui/qa/unit/cui-dialogs-test_3.cxx | 2
cui/qa/unit/cui-dialogs-test_4.cxx | 2
cui/source/customize/cfg.cxx | 4
cui/source/customize/cfgutil.cxx | 9
cui/source/dialogs/SignatureLineDialogBase.cxx | 4
cui/source/dialogs/cuigaldlg.cxx | 4
cui/source/dialogs/postdlg.cxx | 4
cui/source/dialogs/screenshotannotationdlg.cxx | 10
cui/source/dialogs/scriptdlg.cxx | 13
cui/source/inc/SignatureLineDialogBase.hxx | 6
cui/source/inc/cfg.hxx | 3
cui/source/inc/cfgutil.hxx | 6
cui/source/inc/cuigaldlg.hxx | 4
cui/source/inc/postdlg.hxx | 6
cui/source/options/optsave.cxx | 16
dbaccess/qa/extras/dialog-save.cxx | 2
dbaccess/qa/extras/empty-stdlib-save.cxx | 2
dbaccess/qa/extras/macros-test.cxx | 2
dbaccess/qa/extras/nolib-save.cxx | 2
dbaccess/qa/extras/rowsetclones.cxx | 2
dbaccess/qa/unit/dbaccess-dialogs-test.cxx | 2
dbaccess/qa/unit/dbtest_base.cxx | 10
dbaccess/qa/unit/embeddeddb_performancetest.cxx | 2
dbaccess/qa/unit/firebird-regression.cxx | 4
dbaccess/qa/unit/firebird.cxx | 4
dbaccess/qa/unit/hsql_binary_import.cxx | 2
dbaccess/qa/unit/hsqldb.cxx | 2
dbaccess/qa/unit/tdf119625.cxx | 2
dbaccess/qa/unit/tdf126268.cxx | 2
dbaccess/source/core/api/KeySet.cxx | 8
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 2
dbaccess/source/filter/hsqldb/parseschema.cxx | 8
dbaccess/source/ui/app/DocumentInfoPreview.cxx | 4
dbaccess/source/ui/app/DocumentInfoPreview.hxx | 5
dbaccess/source/ui/dlg/directsql.cxx | 11
dbaccess/source/ui/inc/directsql.hxx | 5
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 5
desktop/inc/app.hxx | 3
desktop/inc/lib/init.hxx | 3
desktop/qa/desktop_lib/test_desktop_lib.cxx | 63 -
desktop/qa/unit/desktop-dialogs-test.cxx | 2
desktop/source/app/app.cxx | 7
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 9
desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 6
desktop/source/deployment/gui/license_dialog.cxx | 5
desktop/source/deployment/inc/dp_descriptioninfoset.hxx | 6
desktop/source/deployment/inc/dp_identifier.hxx | 6
desktop/source/deployment/manager/dp_extensionmanager.cxx | 3
desktop/source/deployment/manager/dp_manager.cxx | 2
desktop/source/deployment/manager/dp_manager.h | 4
desktop/source/deployment/manager/dp_properties.cxx | 8
desktop/source/deployment/manager/dp_properties.hxx | 5
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 18
desktop/source/deployment/misc/dp_identifier.cxx | 6
desktop/source/deployment/registry/component/dp_compbackenddb.cxx | 22
desktop/source/deployment/registry/component/dp_compbackenddb.hxx | 4
desktop/source/deployment/registry/component/dp_component.cxx | 8
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 23
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx | 10
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx | 4
desktop/source/deployment/registry/dp_backenddb.cxx | 40
desktop/source/deployment/registry/executable/dp_executable.cxx | 10
desktop/source/deployment/registry/help/dp_help.cxx | 13
desktop/source/deployment/registry/help/dp_helpbackenddb.cxx | 8
desktop/source/deployment/registry/help/dp_helpbackenddb.hxx | 4
desktop/source/deployment/registry/inc/dp_backenddb.hxx | 41
desktop/source/deployment/registry/package/dp_extbackenddb.cxx | 10
desktop/source/deployment/registry/package/dp_extbackenddb.hxx | 5
desktop/source/deployment/registry/package/dp_package.cxx | 9
desktop/source/deployment/registry/script/dp_script.cxx | 10
desktop/source/lib/init.cxx | 24
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 7
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 18
editeng/source/lookuptree/Trie.cxx | 14
embeddedobj/qa/cppunit/general.cxx | 6
embeddedobj/source/msole/oleembed.cxx | 2
embeddedobj/source/msole/ownview.cxx | 6
embeddedobj/source/msole/ownview.hxx | 6
emfio/qa/cppunit/emf/EmfImportTest.cxx | 23
emfio/qa/cppunit/wmf/wmfimporttest.cxx | 18
extensions/qa/update/test_update.cxx | 14
extensions/source/propctrlr/eformshelper.cxx | 6
extensions/source/propctrlr/eventhandler.cxx | 3
extensions/source/update/check/updateprotocol.cxx | 8
extensions/source/update/check/updateprotocol.hxx | 10
extensions/source/update/feed/updatefeed.cxx | 14
filter/qa/cppunit/filters-dxf-test.cxx | 2
filter/qa/cppunit/filters-eps-test.cxx | 2
filter/qa/cppunit/filters-met-test.cxx | 2
filter/qa/cppunit/filters-pcd-test.cxx | 2
filter/qa/cppunit/filters-pcx-test.cxx | 2
filter/qa/cppunit/filters-pict-test.cxx | 2
filter/qa/cppunit/filters-ppm-test.cxx | 4
filter/qa/cppunit/filters-psd-test.cxx | 2
filter/qa/cppunit/filters-ras-test.cxx | 2
filter/qa/cppunit/filters-tga-test.cxx | 2
filter/qa/cppunit/filters-tiff-test.cxx | 2
filter/qa/cppunit/xslt-test.cxx | 12
filter/qa/unit/filter-dialogs-test.cxx | 2
filter/qa/unit/svg.cxx | 16
filter/source/msfilter/mstoolbar.cxx | 5
filter/source/msfilter/msvbahelper.cxx | 2
filter/source/pdf/impdialog.cxx | 4
filter/source/pdf/pdffilter.cxx | 2
filter/source/svg/svgexport.cxx | 11
filter/source/svg/svgfilter.hxx | 3
filter/source/xsltdialog/typedetectionexport.cxx | 7
filter/source/xsltdialog/xmlfiltercommon.hxx | 3
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 6
forms/source/component/DatabaseForm.cxx | 12
forms/source/component/DatabaseForm.hxx | 6
forms/source/xforms/submission.cxx | 11
formula/qa/unit/formula-dialogs-test.cxx | 2
fpicker/qa/unit/fpicker-dialogs-test.cxx | 2
fpicker/source/office/iodlg.cxx | 16
fpicker/source/office/iodlg.hxx | 4
fpicker/source/office/iodlgimp.cxx | 8
framework/inc/helper/persistentwindowstate.hxx | 4
framework/inc/jobs/helponstartup.hxx | 10
framework/inc/jobs/jobdata.hxx | 3
framework/inc/uifactory/configurationaccessfactorymanager.hxx | 7
framework/inc/uifactory/factoryconfiguration.hxx | 10
framework/source/accelerators/acceleratorconfiguration.cxx | 10
framework/source/accelerators/presethandler.cxx | 16
framework/source/fwe/classes/addonsoptions.cxx | 68 -
framework/source/helper/persistentwindowstate.cxx | 8
framework/source/inc/accelerators/presethandler.hxx | 12
framework/source/jobs/helponstartup.cxx | 8
framework/source/jobs/jobdata.cxx | 4
framework/source/services/pathsettings.cxx | 15
framework/source/uiconfiguration/ImageList.cxx | 4
framework/source/uiconfiguration/ImageList.hxx | 4
framework/source/uiconfiguration/uicategorydescription.cxx | 8
framework/source/uiconfiguration/windowstateconfiguration.cxx | 8
framework/source/uielement/uicommanddescription.cxx | 16
framework/source/uifactory/factoryconfiguration.cxx | 31
framework/source/uifactory/uicontrollerfactory.cxx | 19
framework/source/uifactory/uielementfactorymanager.cxx | 19
helpcompiler/source/HelpIndexer.cxx | 6
helpcompiler/source/HelpLinker.cxx | 4
hwpfilter/qa/cppunit/test_hwpfilter.cxx | 2
i18nlangtag/source/languagetag/languagetag.cxx | 4
i18npool/inc/indexentrysupplier.hxx | 6
i18npool/source/indexentry/indexentrysupplier.cxx | 12
i18npool/source/nativenumber/nativenumbersupplier.cxx | 8
include/avmedia/mediaitem.hxx | 4
include/codemaker/commoncpp.hxx | 2
include/codemaker/commonjava.hxx | 4
include/codemaker/typemanager.hxx | 2
include/comphelper/DirectoryHelper.hxx | 3
include/comphelper/backupfilehelper.hxx | 19
include/comphelper/configuration.hxx | 4
include/comphelper/ofopxmlhelper.hxx | 6
include/connectivity/dbtools.hxx | 4
include/filter/msfilter/mstoolbar.hxx | 3
include/filter/msfilter/msvbahelper.hxx | 6
include/helpcompiler/HelpIndexer.hxx | 3
include/helpcompiler/compilehelp.hxx | 2
include/i18nlangtag/languagetag.hxx | 3
include/oox/core/contexthandler.hxx | 3
include/oox/core/relations.hxx | 5
include/oox/core/xmlfilterbase.hxx | 3
include/oox/drawingml/shape.hxx | 3
include/oox/dump/dumperbase.hxx | 4
include/oox/export/drawingml.hxx | 3
include/oox/export/vmlexport.hxx | 6
include/oox/ole/vbaproject.hxx | 5
include/sfx2/linkmgr.hxx | 6
include/sfx2/lokhelper.hxx | 4
include/sfx2/notebookbar/SfxNotebookBar.hxx | 7
include/sfx2/objsh.hxx | 4
include/svl/lockfilecommon.hxx | 4
include/svtools/HtmlWriter.hxx | 2
include/svtools/parhtml.hxx | 3
include/svx/SmartTagMgr.hxx | 5
include/svx/xmlgrhlp.hxx | 5
include/test/helper/form.hxx | 7
include/test/helper/shape.hxx | 10
include/test/screenshot_test.hxx | 2
include/test/unoapi_test.hxx | 5
include/test/xmltesttools.hxx | 3
include/unotest/directories.hxx | 10
include/unotest/filters-test.hxx | 6
include/unotest/gettestargument.hxx | 6
include/unotools/optionsdlg.hxx | 16
include/vbahelper/vbahelper.hxx | 5
include/vbahelper/vbashapes.hxx | 3
include/vcl/FilterConfigItem.hxx | 10
include/vcl/embeddedfontshelper.hxx | 5
include/vcl/formatter.hxx | 3
include/vcl/opengl/OpenGLHelper.hxx | 7
include/xmloff/xmlimp.hxx | 3
io/source/acceptor/acceptor.cxx | 5
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 8
l10ntools/inc/common.hxx | 4
l10ntools/inc/export.hxx | 11
l10ntools/inc/helper.hxx | 5
l10ntools/inc/helpmerge.hxx | 6
l10ntools/inc/po.hxx | 10
l10ntools/inc/xrmmerge.hxx | 4
l10ntools/source/common.cxx | 2
l10ntools/source/helper.cxx | 4
l10ntools/source/helpmerge.cxx | 2
l10ntools/source/merge.cxx | 12
l10ntools/source/po.cxx | 18
l10ntools/source/xrmmerge.cxx | 4
linguistic/source/convdiclist.cxx | 6
linguistic/source/misc2.cxx | 17
lotuswordpro/qa/cppunit/test_lotuswordpro.cxx | 2
oox/qa/unit/shape.cxx | 12
oox/qa/unit/vba_compression.cxx | 28
oox/qa/unit/vml.cxx | 14
oox/source/core/contexthandler.cxx | 3
oox/source/core/relations.cxx | 18
oox/source/core/xmlfilterbase.cxx | 11
oox/source/drawingml/diagram/diagram.cxx | 2
oox/source/drawingml/graphicshapecontext.cxx | 8
oox/source/drawingml/shape.cxx | 6
oox/source/dump/dumperbase.cxx | 7
oox/source/export/drawingml.cxx | 9
oox/source/export/vmlexport.cxx | 7
oox/source/ole/vbaproject.cxx | 8
oox/source/ppt/pptimport.cxx | 8
oox/source/ppt/presentationfragmenthandler.cxx | 10
oox/source/ppt/slidefragmenthandler.cxx | 4
oox/source/shape/ShapeContextHandler.cxx | 4
oox/source/shape/ShapeFilterBase.cxx | 2
opencl/inc/opencl_device.hxx | 6
opencl/source/opencl_device.cxx | 9
package/inc/ZipPackageFolder.hxx | 4
package/qa/cppunit/test_package.cxx | 4
package/source/xstor/owriteablestream.cxx | 14
package/source/xstor/owriteablestream.hxx | 5
package/source/xstor/xstorage.cxx | 23
package/source/xstor/xstorage.hxx | 8
package/source/zippackage/ZipPackage.cxx | 3
package/source/zippackage/ZipPackageFolder.cxx | 8
pyuno/source/module/pyuno_impl.hxx | 6
pyuno/source/module/pyuno_util.cxx | 12
registry/source/keyimpl.cxx | 37
registry/source/keyimpl.hxx | 22
reportdesign/qa/unit/reportdesign-dialogs-test.cxx | 2
reportdesign/source/ui/inc/GeometryHandler.hxx | 4
reportdesign/source/ui/inspection/GeometryHandler.cxx | 6
sax/qa/cppunit/xmlimport.cxx | 2
sax/source/expatwrap/sax_expat.cxx | 5
sc/inc/addincol.hxx | 3
sc/inc/calcconfig.hxx | 3
sc/inc/chartlis.hxx | 3
sc/inc/dpdimsave.hxx | 4
sc/inc/global.hxx | 5
sc/inc/unitconv.hxx | 7
sc/qa/extras/anchor.cxx | 16
sc/qa/extras/htmlexporttest.cxx | 8
sc/qa/extras/macros-test.cxx | 30
sc/qa/extras/new_cond_format.cxx | 2
sc/qa/extras/recordchanges-test.cxx | 2
sc/qa/extras/scannotationobj.cxx | 2
sc/qa/extras/scannotationsobj.cxx | 2
sc/qa/extras/scarealinkobj.cxx | 4
sc/qa/extras/sccellcursorobj.cxx | 2
sc/qa/extras/sccellrangeobj.cxx | 2
sc/qa/extras/scdatabaserangeobj.cxx | 2
sc/qa/extras/scdatapilotfieldobj.cxx | 2
sc/qa/extras/scdatapilottableobj.cxx | 2
sc/qa/extras/scddelinkobj.cxx | 2
sc/qa/extras/scddelinksobj.cxx | 6
sc/qa/extras/scmodelobj.cxx | 2
sc/qa/extras/scnamedrangeobj.cxx | 2
sc/qa/extras/scnamedrangesobj.cxx | 2
sc/qa/extras/scoutlineobj.cxx | 2
sc/qa/extras/scsheetlinkobj.cxx | 4
sc/qa/extras/scsheetlinksobj.cxx | 4
sc/qa/extras/scstylefamiliesobj.cxx | 2
sc/qa/extras/sctablesheetobj.cxx | 2
sc/qa/unit/bugfix-test.cxx | 55 -
sc/qa/unit/chart2dataprovider.cxx | 2
sc/qa/unit/cond_format_merge.cxx | 2
sc/qa/unit/copy_paste_test.cxx | 29
sc/qa/unit/dataproviders_test.cxx | 8
sc/qa/unit/filters-test.cxx | 66 -
sc/qa/unit/functions_addin.cxx | 2
sc/qa/unit/functions_array.cxx | 2
sc/qa/unit/functions_database.cxx | 2
sc/qa/unit/functions_datetime.cxx | 2
sc/qa/unit/functions_financial.cxx | 2
sc/qa/unit/functions_information.cxx | 2
sc/qa/unit/functions_logical.cxx | 2
sc/qa/unit/functions_mathematical.cxx | 2
sc/qa/unit/functions_spreadsheet.cxx | 2
sc/qa/unit/functions_statistical.cxx | 2
sc/qa/unit/functions_test_old.cxx | 2
sc/qa/unit/functions_text.cxx | 2
sc/qa/unit/helper/qahelper.cxx | 4
sc/qa/unit/helper/qahelper.hxx | 6
sc/qa/unit/jumbosheets-test.cxx | 2
sc/qa/unit/opencl-test.cxx | 453 +++++-----
sc/qa/unit/pivottable_filters_test.cxx | 96 +-
sc/qa/unit/screenshots/screenshots.cxx | 2
sc/qa/unit/scshapetest.cxx | 52 -
sc/qa/unit/subsequent_export-test.cxx | 315 +++---
sc/qa/unit/subsequent_filters-test.cxx | 331 +++----
sc/source/core/data/dpdimsave.cxx | 2
sc/source/core/data/dpoutput.cxx | 4
sc/source/core/data/global2.cxx | 6
sc/source/core/tool/addincol.cxx | 4
sc/source/core/tool/calcconfig.cxx | 4
sc/source/core/tool/chartlis.cxx | 2
sc/source/core/tool/unitconv.cxx | 6
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/xecontent.cxx | 8
sc/source/filter/excel/xehelper.cxx | 2
sc/source/filter/excel/xelink.cxx | 4
sc/source/filter/ftools/ftools.cxx | 2
sc/source/filter/inc/ftools.hxx | 4
sc/source/filter/inc/xehelper.hxx | 4
sc/source/filter/oox/excelfilter.cxx | 2
sc/source/filter/oox/excelvbaproject.cxx | 2
sc/source/filter/oox/workbookfragment.cxx | 8
sc/source/filter/oox/worksheetfragment.cxx | 8
sc/source/filter/xml/XMLTableShapeResizer.cxx | 2
sc/source/ui/app/inputwin.cxx | 5
sc/source/ui/dbgui/PivotLayoutTreeListData.cxx | 4
sc/source/ui/docshell/docsh4.cxx | 2
sc/source/ui/inc/hfedtdlg.hxx | 26
sc/source/ui/inc/optsolver.hxx | 3
sc/source/ui/miscdlgs/optsolver.cxx | 2
sc/source/ui/navipi/content.cxx | 4
sc/source/ui/pagedlg/hfedtdlg.cxx | 22
sc/source/ui/unoobj/cellsuno.cxx | 2
sc/source/ui/unoobj/linkuno.cxx | 5
sc/source/ui/vba/vbachartobjects.cxx | 4
sc/source/ui/vba/vbaformatconditions.cxx | 2
sc/source/ui/vba/vbaworksheet.cxx | 10
sc/source/ui/view/colrowba.cxx | 8
sc/source/ui/view/dbfunc3.cxx | 3
sccomp/qa/unit/SwarmSolverTest.cxx | 10
sd/inc/drawdoc.hxx | 6
sd/inc/sdpage.hxx | 3
sd/inc/stlpool.hxx | 17
sd/qa/unit/HtmlExportTest.cxx | 2
sd/qa/unit/SVGExportTests.cxx | 8
sd/qa/unit/SdrPdfImportTest.cxx | 4
sd/qa/unit/activex-controls-tests.cxx | 26
sd/qa/unit/dialogs-test.cxx | 2
sd/qa/unit/export-tests-ooxml1.cxx | 92 +-
sd/qa/unit/export-tests-ooxml2.cxx | 233 ++---
sd/qa/unit/export-tests.cxx | 71 -
sd/qa/unit/filters-test.cxx | 10
sd/qa/unit/import-tests-smartart.cxx | 88 -
sd/qa/unit/import-tests.cxx | 201 ++--
sd/qa/unit/layout-tests.cxx | 6
sd/qa/unit/misc-tests.cxx | 32
sd/qa/unit/sdmodeltestbase.hxx | 2
sd/qa/unit/uiimpress.cxx | 14
sd/source/core/drawdoc2.cxx | 4
sd/source/core/drawdoc3.cxx | 7
sd/source/core/sdpage2.cxx | 4
sd/source/core/stlpool.cxx | 32
sd/source/filter/eppt/pptx-epptooxml.cxx | 2
sd/source/filter/html/htmlex.cxx | 8
sd/source/filter/html/htmlex.hxx | 8
sd/source/filter/html/pubdlg.cxx | 2
sd/source/ui/docshell/docshell.cxx | 4
sd/source/ui/sidebar/DocumentHelper.cxx | 2
sd/source/ui/sidebar/DocumentHelper.hxx | 3
sd/source/ui/unoidl/sddetect.cxx | 2
sd/source/ui/view/ToolBarManager.cxx | 6
sdext/source/pdfimport/test/tests.cxx | 12
sdext/source/presenter/PresenterScreen.cxx | 4
sdext/source/presenter/PresenterScreen.hxx | 3
sfx2/inc/guisaveas.hxx | 6
sfx2/qa/cppunit/test_misc.cxx | 8
sfx2/qa/unit/sfx2-dialogs-test.cxx | 2
sfx2/source/appl/linkmgr2.cxx | 4
sfx2/source/doc/graphhelp.cxx | 6
sfx2/source/doc/graphhelp.hxx | 6
sfx2/source/doc/guisaveas.cxx | 25
sfx2/source/doc/objmisc.cxx | 4
sfx2/source/notebookbar/SfxNotebookBar.cxx | 6
sfx2/source/view/ipclient.cxx | 2
sfx2/source/view/lokhelper.cxx | 10
sfx2/source/view/viewfrm.cxx | 4
smoketest/smoketest.cxx | 2
sot/qa/cppunit/test_sot.cxx | 5
starmath/qa/extras/mmlimport-test.cxx | 16
starmath/qa/unit/starmath-dialogs-test.cxx | 2
starmath/source/cfgitem.cxx | 8
starmath/source/cfgitem.hxx | 7
stoc/source/implementationregistration/implreg.cxx | 5
stoc/source/security/file_policy.cxx | 25
stoc/source/servicemanager/servicemanager.cxx | 11
svgio/qa/cppunit/SvgImportTest.cxx | 73 -
svl/qa/unit/lockfiles/test_lockfiles.cxx | 70 -
svl/source/misc/documentlockfile.cxx | 2
svl/source/misc/lockfilecommon.cxx | 3
svl/source/misc/sharecontrolfile.cxx | 2
svtools/qa/unit/svtools-dialogs-test.cxx | 2
svtools/qa/unit/testHtmlReader.cxx | 2
svtools/source/config/extcolorcfg.cxx | 9
svtools/source/dialogs/prnsetup.cxx | 6
svtools/source/misc/langtab.cxx | 8
svtools/source/svhtml/HtmlWriter.cxx | 6
svtools/source/svhtml/parhtml.cxx | 4
svx/qa/unit/customshapes.cxx | 19
svx/qa/unit/gallery/test_gallery.cxx | 6
svx/qa/unit/sdr.cxx | 2
svx/qa/unit/svx-dialogs-test.cxx | 2
svx/qa/unit/xoutdev.cxx | 2
svx/source/form/fmview.cxx | 2
svx/source/form/fmvwimp.cxx | 4
svx/source/inc/fmvwimp.hxx | 5
svx/source/smarttags/SmartTagMgr.cxx | 7
svx/source/svdraw/svdomedia.cxx | 2
svx/source/xml/xmlgrhlp.cxx | 7
sw/inc/docstyle.hxx | 7
sw/inc/unocrsrhelper.hxx | 7
sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx | 2
sw/qa/core/filters-test.cxx | 24
sw/qa/core/filters-test2.cxx | 2
sw/qa/core/macros-test.cxx | 13
sw/qa/extras/globalfilter/globalfilter.cxx | 36
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 7
sw/qa/extras/rtfexport/rtfexport2.cxx | 12
sw/qa/extras/rtfexport/rtfexport5.cxx | 6
sw/qa/extras/rtfimport/rtfimport.cxx | 8
sw/qa/extras/uiwriter/uiwriter.cxx | 21
sw/qa/extras/uiwriter/uiwriter2.cxx | 2
sw/qa/inc/swmodeltestbase.hxx | 9
sw/qa/unit/sw-dialogs-test.cxx | 2
sw/qa/unit/sw-dialogs-test_2.cxx | 2
sw/qa/unit/swmodeltestbase.cxx | 8
sw/source/core/bastyp/SwSmartTagMgr.cxx | 2
sw/source/core/crsr/annotationmark.cxx | 2
sw/source/core/crsr/bookmrk.cxx | 10
sw/source/core/crsr/crossrefbookmark.cxx | 4
sw/source/core/doc/docnew.cxx | 3
sw/source/core/edit/edfcol.cxx | 2
sw/source/core/graphic/ndgrf.cxx | 6
sw/source/core/inc/bookmrk.hxx | 4
sw/source/core/inc/crossrefbookmark.hxx | 6
sw/source/core/text/porfld.cxx | 2
sw/source/core/text/porfld.hxx | 6
sw/source/core/text/porhyph.hxx | 10
sw/source/core/text/txthyph.cxx | 2
sw/source/core/undo/unbkmk.cxx | 6
sw/source/core/unocore/unochart.cxx | 17
sw/source/core/unocore/unoobj.cxx | 15
sw/source/filter/html/htmlcss1.cxx | 6
sw/source/filter/html/htmlform.cxx | 6
sw/source/filter/html/swcss1.hxx | 6
sw/source/filter/html/wrthtml.cxx | 4
sw/source/filter/html/wrthtml.hxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 4
sw/source/filter/ww8/docxattributeoutput.hxx | 4
sw/source/filter/ww8/wrtww8.hxx | 4
sw/source/filter/ww8/ww8atr.cxx | 6
sw/source/filter/ww8/ww8graf.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/ww8/ww8par.hxx | 2
sw/source/filter/xml/xmlexp.hxx | 4
sw/source/filter/xml/xmltble.cxx | 27
sw/source/ui/dbui/dbinsdlg.cxx | 42
sw/source/ui/dialog/uiregionsw.cxx | 15
sw/source/ui/dochdl/selglos.cxx | 2
sw/source/uibase/app/docsh.cxx | 2
sw/source/uibase/app/docstyle.cxx | 6
sw/source/uibase/inc/inputwin.hxx | 6
sw/source/uibase/inc/selglos.hxx | 10
sw/source/uibase/misc/glosdoc.cxx | 5
sw/source/uibase/ribbar/inputwin.cxx | 4
test/source/bootstrapfixture.cxx | 8
test/source/helper/form.cxx | 11
test/source/helper/shape.cxx | 16
test/source/screenshot_test.cxx | 2
test/source/unoapi_test.cxx | 2
test/source/view/xcontrolaccess.cxx | 2
test/source/xmltesttools.cxx | 2
tools/qa/cppunit/test_config.cxx | 2
tools/qa/cppunit/test_xmlwalker.cxx | 2
ucb/source/core/ucb.cxx | 13
ucb/source/ucp/file/filglob.cxx | 4
ucb/source/ucp/file/filglob.hxx | 2
ucb/source/ucp/package/pkgcontent.cxx | 4
ucb/source/ucp/package/pkgcontent.hxx | 5
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 15
unodevtools/source/skeletonmaker/cpptypemaker.cxx | 7
unodevtools/source/skeletonmaker/javatypemaker.cxx | 6
unodevtools/source/skeletonmaker/skeletoncommon.cxx | 13
unodevtools/source/skeletonmaker/skeletoncpp.hxx | 3
unodevtools/source/skeletonmaker/skeletonjava.hxx | 3
unoidl/source/unoidl-check.cxx | 13
unoidl/source/unoidl-read.cxx | 7
unotest/source/cpp/directories.cxx | 8
unotest/source/cpp/filters-test.cxx | 8
unotest/source/cpp/getargument.cxx | 4
unotest/source/cpp/getargument.hxx | 4
unotest/source/cpp/gettestargument.cxx | 4
unotest/source/cpp/macros_test.cxx | 5
unotest/source/cpp/officeconnection.cxx | 6
unotools/source/config/bootstrap.cxx | 12
unotools/source/config/dynamicmenuoptions.cxx | 10
unotools/source/config/moduleoptions.cxx | 12
unotools/source/config/optionsdlg.cxx | 42
uui/qa/unit/uui-dialogs-test.cxx | 2
vbahelper/source/vbahelper/vbahelper.cxx | 4
vbahelper/source/vbahelper/vbashapes.cxx | 10
vcl/inc/unx/printerjob.hxx | 5
vcl/qa/api/XGraphicTest.cxx | 8
vcl/qa/cppunit/BitmapFilterTest.cxx | 19
vcl/qa/cppunit/GraphicFormatDetectorTest.cxx | 40
vcl/qa/cppunit/GraphicNativeMetadataTest.cxx | 18
vcl/qa/cppunit/GraphicTest.cxx | 2
vcl/qa/cppunit/PDFiumLibraryTest.cxx | 18
vcl/qa/cppunit/VectorGraphicSearchTest.cxx | 16
vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx | 14
vcl/qa/cppunit/blocklistparsertest.cxx | 6
vcl/qa/cppunit/graphicfilter/filters-test.cxx | 18
vcl/qa/cppunit/jpeg/JpegReaderTest.cxx | 14
vcl/qa/cppunit/jpeg/JpegWriterTest.cxx | 10
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 39
vcl/qa/cppunit/png/PngFilterTest.cxx | 6
vcl/qa/cppunit/svm/svmtest.cxx | 91 +-
vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx | 17
vcl/qa/unit/vcl-dialogs-test.cxx | 2
vcl/source/app/brand.cxx | 12
vcl/source/control/fmtfield.cxx | 6
vcl/source/control/notebookbar.cxx | 8
vcl/source/filter/FilterConfigItem.cxx | 8
vcl/source/filter/graphicfilter.cxx | 2
vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 10
vcl/source/gdi/embeddedfontshelper.cxx | 4
vcl/source/image/ImplImageTree.cxx | 13
vcl/source/opengl/OpenGLHelper.cxx | 36
vcl/unx/generic/print/glyphset.cxx | 6
vcl/unx/generic/print/glyphset.hxx | 3
vcl/unx/generic/print/printerjob.cxx | 12
vcl/unx/gtk3/gtk3gtkinst.cxx | 2
writerfilter/qa/cppunittests/filters-test/filters-test.cxx | 2
writerfilter/source/filter/WriterFilter.cxx | 2
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 4
writerperfect/qa/unit/EPUBExportTest.cxx | 107 +-
writerperfect/qa/unit/ImportTest.cxx | 17
writerperfect/qa/unit/WpftCalcFilterTest.cxx | 8
writerperfect/qa/unit/WpftDrawFilterTest.cxx | 21
writerperfect/qa/unit/WpftFilterTestBase.cxx | 4
writerperfect/qa/unit/WpftFilterTestBase.hxx | 5
writerperfect/qa/unit/WpftImpressFilterTest.cxx | 4
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 14
writerperfect/qa/unit/writerperfect-dialogs-test.cxx | 2
writerperfect/source/common/WPXSvInputStream.cxx | 12
xmlhelp/source/cxxhelp/provider/databases.cxx | 25
xmlhelp/source/cxxhelp/provider/databases.hxx | 7
xmloff/inc/txtflde.hxx | 2
xmloff/qa/unit/style.cxx | 10
xmloff/source/core/xmlimp.cxx | 6
xmloff/source/style/xmlnumfi.cxx | 3
xmloff/source/text/XMLTextFrameContext.cxx | 3
xmloff/source/text/txtflde.cxx | 4
xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx | 12
xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx | 2
xmlsecurity/source/helper/documentsignaturehelper.cxx | 27
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 4
631 files changed, 4168 insertions(+), 3491 deletions(-)
New commits:
commit 042033f1e6da22616cb76c8d950c20c9efecbad5
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Dec 28 17:56:40 2020 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Dec 29 16:42:33 2020 +0100
loplugin:stringviewparam: operator +
Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 3b83f3853ce8..f42065e8e81e 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -478,7 +478,7 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
}
bool CreateMediaTempFile(uno::Reference<io::XInputStream> const& xInStream,
- OUString& o_rTempFileURL, const OUString& rDesiredExtension)
+ OUString& o_rTempFileURL, std::u16string_view rDesiredExtension)
{
OUString tempFileURL;
::osl::FileBase::RC const err =
@@ -489,7 +489,7 @@ bool CreateMediaTempFile(uno::Reference<io::XInputStream> const& xInStream,
return false;
}
- if (!rDesiredExtension.isEmpty())
+ if (!rDesiredExtension.empty())
{
OUString newTempFileURL = tempFileURL + rDesiredExtension;
if (osl::File::move(tempFileURL, newTempFileURL) != osl::FileBase::E_None)
diff --git a/basctl/qa/unit/basctl-dialogs-test.cxx b/basctl/qa/unit/basctl-dialogs-test.cxx
index b907681f629d..3b58757f38dc 100644
--- a/basctl/qa/unit/basctl-dialogs-test.cxx
+++ b/basctl/qa/unit/basctl-dialogs-test.cxx
@@ -51,7 +51,7 @@ VclPtr<VclAbstractDialog> BasctlDialogsTest::createDialogByID(sal_uInt32 /*nID*/
void BasctlDialogsTest::openAnyDialog()
{
/// process input file containing the UXMLDescriptions of the dialogs to dump
- processDialogBatchFile("basctl/qa/unit/data/basctl-dialogs-test.txt");
+ processDialogBatchFile(u"basctl/qa/unit/data/basctl-dialogs-test.txt");
}
CPPUNIT_TEST_SUITE_REGISTRATION(BasctlDialogsTest);
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 4318ad803306..5e409a267423 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -429,9 +429,9 @@ bool SbTreeListBox::FindRootEntry( const ScriptDocument& rDocument, LibraryLocat
return false;
}
-OUString CreateMgrAndLibStr( const OUString& rMgrName, const OUString& rLibName )
+OUString CreateMgrAndLibStr( std::u16string_view rMgrName, std::u16string_view rLibName )
{
- return "[" + rMgrName + "]." + rLibName;
+ return OUString::Concat("[") + rMgrName + "]." + rLibName;
}
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 99a54894a3e8..0a4f2efc62cf 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <strings.hrc>
#include <helpids.h>
#include <iderid.hxx>
@@ -692,36 +696,36 @@ LibInfo::Item::Item (
m_eCurrentType(eCurrentType)
{ }
-static bool QueryDel(const OUString& rName, const OUString &rStr, weld::Widget* pParent)
+static bool QueryDel(std::u16string_view rName, const OUString &rStr, weld::Widget* pParent)
{
- OUString aName = "\'" + rName + "\'";
+ OUString aName = OUString::Concat("\'") + rName + "\'";
OUString aQuery = rStr.replaceAll("XX", aName);
std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(pParent,
VclMessageType::Question, VclButtonsType::YesNo, aQuery));
return (xQueryBox->run() == RET_YES);
}
-bool QueryDelMacro( const OUString& rName, weld::Widget* pParent )
+bool QueryDelMacro( std::u16string_view rName, weld::Widget* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent );
}
-bool QueryReplaceMacro( const OUString& rName, weld::Widget* pParent )
+bool QueryReplaceMacro( std::u16string_view rName, weld::Widget* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent );
}
-bool QueryDelDialog( const OUString& rName, weld::Widget* pParent )
+bool QueryDelDialog( std::u16string_view rName, weld::Widget* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent );
}
-bool QueryDelLib( const OUString& rName, bool bRef, weld::Widget* pParent )
+bool QueryDelLib( std::u16string_view rName, bool bRef, weld::Widget* pParent )
{
return QueryDel( rName, IDEResId( bRef ? RID_STR_QUERYDELLIBREF : RID_STR_QUERYDELLIB ), pParent );
}
-bool QueryDelModule( const OUString& rName, weld::Widget* pParent )
+bool QueryDelModule( std::u16string_view rName, weld::Widget* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYDELMODULE ), pParent );
}
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 1e31f8a47d0f..72408cd61ac0 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <localizationmgr.hxx>
#include <basidesh.hxx>
@@ -146,7 +150,7 @@ void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResou
Any aDialogCtrl;
aDialogCtrl <<= xDialog;
implHandleControlResourceProperties( aDialogCtrl, aDlgName,
- OUString(), m_xStringResourceManager, xDummyStringResolver, eMode );
+ std::u16string_view(), m_xStringResourceManager, xDummyStringResolver, eMode );
// Handle all controls
Sequence< OUString > aNames = xDialog->getElementNames();
@@ -166,7 +170,7 @@ void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResou
static OUString implCreatePureResourceId
- ( const OUString& aDialogName, const OUString& aCtrlName,
+ ( std::u16string_view aDialogName, std::u16string_view aCtrlName,
const OUString& aPropName,
const Reference< XStringResourceManager >& xStringResourceManager )
{
@@ -175,7 +179,7 @@ static OUString implCreatePureResourceId
+ aDot
+ aDialogName
+ aDot;
- if( !aCtrlName.isEmpty() )
+ if( !aCtrlName.empty() )
{
aPureIdStr += aCtrlName + aDot;
}
@@ -187,7 +191,7 @@ static OUString implCreatePureResourceId
// anyway only one language should exist when calling this method then,
// either the first one for mode SET_IDS or the last one for mode RESET_IDS
sal_Int32 LocalizationMgr::implHandleControlResourceProperties
- (const Any& rControlAny, const OUString& aDialogName, const OUString& aCtrlName,
+ (const Any& rControlAny, std::u16string_view aDialogName, std::u16string_view aCtrlName,
const Reference< XStringResourceManager >& xStringResourceManager,
const Reference< XStringResourceResolver >& xSourceStringResolver, HandleResourceMode eMode )
{
@@ -791,7 +795,7 @@ static DialogWindow* FindDialogWindowForEditor( DlgEditor const * pEditor )
void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor const * pEditor,
- const Any& rControlAny, const OUString& aCtrlName )
+ const Any& rControlAny, std::u16string_view aCtrlName )
{
// Get library for DlgEditor
DialogWindow* pDlgWin = FindDialogWindowForEditor( pEditor );
@@ -821,7 +825,7 @@ void LocalizationMgr::setControlResourceIDsForNewEditorObject( DlgEditor const *
}
void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor const * pEditor,
- const css::uno::Any& rControlAny, const OUString& aNewCtrlName )
+ const css::uno::Any& rControlAny, std::u16string_view aNewCtrlName )
{
// Get library for DlgEditor
DialogWindow* pDlgWin = FindDialogWindowForEditor( pEditor );
@@ -849,7 +853,7 @@ void LocalizationMgr::renameControlResourceIDsForEditorObject( DlgEditor const *
void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor const * pEditor,
- const Any& rControlAny, const OUString& aCtrlName )
+ const Any& rControlAny, std::u16string_view aCtrlName )
{
// Get library for DlgEditor
DialogWindow* pDlgWin = FindDialogWindowForEditor( pEditor );
@@ -875,7 +879,7 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor
}
void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument, const OUString& aLibName,
- const OUString& aDlgName, const Reference< container::XNameContainer >& xDialogModel )
+ std::u16string_view aDlgName, const Reference< container::XNameContainer >& xDialogModel )
{
// Get library
Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, true ) );
@@ -894,7 +898,7 @@ void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument
aDialogCtrl <<= xDialogModel;
Reference< XStringResourceResolver > xDummyStringResolver;
implHandleControlResourceProperties( aDialogCtrl, aDlgName,
- OUString(), xStringResourceManager,
+ std::u16string_view(), xStringResourceManager,
xDummyStringResolver, SET_IDS );
}
@@ -903,7 +907,7 @@ void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument
}
void LocalizationMgr::renameStringResourceIDs( const ScriptDocument& rDocument, const OUString& aLibName,
- const OUString& aDlgName, const Reference< container::XNameContainer >& xDialogModel )
+ std::u16string_view aDlgName, const Reference< container::XNameContainer >& xDialogModel )
{
// Get library
Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, true ) );
@@ -916,7 +920,7 @@ void LocalizationMgr::renameStringResourceIDs( const ScriptDocument& rDocument,
aDialogCtrl <<= xDialogModel;
Reference< XStringResourceResolver > xDummyStringResolver;
implHandleControlResourceProperties( aDialogCtrl, aDlgName,
- OUString(), xStringResourceManager,
+ std::u16string_view(), xStringResourceManager,
xDummyStringResolver, RENAME_DIALOG_IDS );
// Handle all controls
@@ -934,7 +938,7 @@ void LocalizationMgr::renameStringResourceIDs( const ScriptDocument& rDocument,
}
void LocalizationMgr::removeResourceForDialog( const ScriptDocument& rDocument, const OUString& aLibName,
- const OUString& aDlgName, const Reference< container::XNameContainer >& xDialogModel )
+ std::u16string_view aDlgName, const Reference< container::XNameContainer >& xDialogModel )
{
// Get library
Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, true ) );
@@ -947,7 +951,7 @@ void LocalizationMgr::removeResourceForDialog( const ScriptDocument& rDocument,
aDialogCtrl <<= xDialogModel;
Reference< XStringResourceResolver > xDummyStringResolver;
implHandleControlResourceProperties( aDialogCtrl, aDlgName,
- OUString(), xStringResourceManager,
+ std::u16string_view(), xStringResourceManager,
xDummyStringResolver, REMOVE_IDS_FROM_RESOURCE );
// Handle all controls
@@ -1019,7 +1023,7 @@ void LocalizationMgr::setResourceIDsForDialog( const Reference< container::XName
}
void LocalizationMgr::copyResourcesForPastedEditorObject( DlgEditor const * pEditor,
- const Any& rControlAny, const OUString& aCtrlName,
+ const Any& rControlAny, std::u16string_view aCtrlName,
const Reference< XStringResourceResolver >& xSourceStringResolver )
{
// Get library for DlgEditor
@@ -1046,7 +1050,8 @@ void LocalizationMgr::copyResourcesForPastedEditorObject( DlgEditor const * pEdi
}
void LocalizationMgr::copyResourceForDroppedDialog( const Reference< container::XNameContainer >& xDialogModel,
- const OUString& aDialogName, const Reference< XStringResourceManager >& xStringResourceManager,
+ std::u16string_view aDialogName,
+ const Reference< XStringResourceManager >& xStringResourceManager,
const Reference< XStringResourceResolver >& xSourceStringResolver )
{
if( !xStringResourceManager.is() )
@@ -1056,7 +1061,7 @@ void LocalizationMgr::copyResourceForDroppedDialog( const Reference< container::
Any aDialogCtrl;
aDialogCtrl <<= xDialogModel;
implHandleControlResourceProperties( aDialogCtrl, aDialogName,
- OUString(), xStringResourceManager, xSourceStringResolver, MOVE_RESOURCES );
+ std::u16string_view(), xStringResourceManager, xSourceStringResolver, MOVE_RESOURCES );
// Handle all controls
Sequence< OUString > aNames = xDialogModel->getElementNames();
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 92c3ee9654ff..9f5daa34d644 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -133,7 +133,7 @@ void Shell::CopyDialogResources(
OUString const& rSourceLibName,
ScriptDocument const& rDestDoc,
OUString const& rDestLibName,
- OUString const& rDlgName
+ std::u16string_view rDlgName
)
{
if ( !io_xISP.is() )
@@ -906,7 +906,7 @@ LibDialog::~LibDialog()
{
}
-void LibDialog::SetStorageName( const OUString& rName )
+void LibDialog::SetStorageName( std::u16string_view rName )
{
OUString aName = IDEResId(RID_STR_FILENAME) + rName;
m_xStorageFrame->set_label(aName);
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 37e3d9556185..b7fb13d8901e 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -19,6 +19,10 @@
#pragma once
+#include <sal/config.h>
+
+#include <string_view>
+
#include <bastype2.hxx>
#include <tools/solar.h>
#include <vcl/weld.hxx>
@@ -94,7 +98,7 @@ public:
explicit LibDialog(weld::Window* pParent);
virtual ~LibDialog() override;
- void SetStorageName( const OUString& rName );
+ void SetStorageName( std::u16string_view rName );
weld::TreeView& GetLibBox() { return *m_xLibBox; }
bool IsReference() const { return m_xReferenceBox->get_active(); }
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index d8fe56feb43c..f3127186ce93 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -29,6 +29,7 @@
#include <vcl/scrbar.hxx>
#include <map>
#include <memory>
+#include <string_view>
class SfxViewFactory;
class SdrView;
@@ -197,7 +198,7 @@ public:
static void CopyDialogResources(
css::uno::Reference< css::io::XInputStreamProvider >& io_xISP,
const ScriptDocument& rSourceDoc, const OUString& rSourceLibName, const ScriptDocument& rDestDoc,
- const OUString& rDestLibName, const OUString& rDlgName );
+ const OUString& rDestLibName, std::u16string_view rDlgName );
static void InvalidateControlSlots();
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 21e6c0227a9c..fecebced52ee 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -26,6 +26,7 @@
#include <vcl/dockwin.hxx>
#include <vcl/weld.hxx>
+#include <string_view>
#include <unordered_map>
class SbModule;
@@ -288,14 +289,14 @@ private:
};
void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines );
-OUString CreateMgrAndLibStr( const OUString& rMgrName, const OUString& rLibName );
+OUString CreateMgrAndLibStr( std::u16string_view rMgrName, std::u16string_view rLibName );
sal_uInt32 CalcLineCount( SvStream& rStream );
-bool QueryReplaceMacro( const OUString& rName, weld::Widget* pParent );
-bool QueryDelMacro( const OUString& rName, weld::Widget* pParent );
-bool QueryDelDialog( const OUString& rName, weld::Widget* pParent );
-bool QueryDelModule( const OUString& rName, weld::Widget* pParent );
-bool QueryDelLib( const OUString& rName, bool bRef, weld::Widget* pParent );
+bool QueryReplaceMacro( std::u16string_view rName, weld::Widget* pParent );
+bool QueryDelMacro( std::u16string_view rName, weld::Widget* pParent );
+bool QueryDelDialog( std::u16string_view rName, weld::Widget* pParent );
+bool QueryDelModule( std::u16string_view rName, weld::Widget* pParent );
+bool QueryDelLib( std::u16string_view rName, bool bRef, weld::Widget* pParent );
bool QueryPassword(weld::Widget* pDialogParent, const css::uno::Reference< css::script::XLibraryContainer >& xLibContainer, const OUString& rLibName, OUString& rPassword, bool bRepeat = false, bool bNewTitle = false);
class ModuleInfoHelper
diff --git a/basctl/source/inc/localizationmgr.hxx b/basctl/source/inc/localizationmgr.hxx
index 4b72a7d8e58d..847ef0f75729 100644
--- a/basctl/source/inc/localizationmgr.hxx
+++ b/basctl/source/inc/localizationmgr.hxx
@@ -19,6 +19,10 @@
#pragma once
+#include <sal/config.h>
+
+#include <string_view>
+
#include "scriptdocument.hxx"
#include <com/sun/star/resource/XStringResourceManager.hpp>
@@ -51,8 +55,8 @@ class LocalizationMgr
COPY_RESOURCES
};
static sal_Int32 implHandleControlResourceProperties(const css::uno::Any& rControlAny,
- const OUString& aDialogName,
- const OUString& aCtrlName,
+ std::u16string_view aDialogName,
+ std::u16string_view aCtrlName,
const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager,
const css::uno::Reference< css::resource::XStringResourceResolver >& xSourceStringResolver,
HandleResourceMode eMode );
@@ -95,21 +99,21 @@ public:
void handleBasicStopped();
static void setControlResourceIDsForNewEditorObject(DlgEditor const * pEditor,
- const css::uno::Any& rControlAny, const OUString& aCtrlName);
+ const css::uno::Any& rControlAny, std::u16string_view aCtrlName);
static void renameControlResourceIDsForEditorObject(DlgEditor const * pEditor,
- const css::uno::Any& rControlAny, const OUString& aNewCtrlName);
+ const css::uno::Any& rControlAny, std::u16string_view aNewCtrlName);
static void deleteControlResourceIDsForDeletedEditorObject(DlgEditor const * pEditor,
- const css::uno::Any& rControlAny, const OUString& aCtrlName);
+ const css::uno::Any& rControlAny, std::u16string_view aCtrlName);
- static void setStringResourceAtDialog( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName,
+ static void setStringResourceAtDialog( const ScriptDocument& rDocument, const OUString& aLibName, std::u16string_view aDlgName,
const css::uno::Reference< css::container::XNameContainer >& xDialogModel );
- static void renameStringResourceIDs( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName,
+ static void renameStringResourceIDs( const ScriptDocument& rDocument, const OUString& aLibName, std::u16string_view aDlgName,
const css::uno::Reference< css::container::XNameContainer >& xDialogModel );
- static void removeResourceForDialog( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName,
+ static void removeResourceForDialog( const ScriptDocument& rDocument, const OUString& aLibName, std::u16string_view aDlgName,
const css::uno::Reference< css::container::XNameContainer >& xDialogModel );
static css::uno::Reference< css::resource::XStringResourceManager >
@@ -125,12 +129,12 @@ public:
const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager );
static void copyResourcesForPastedEditorObject( DlgEditor const * pEditor,
- const css::uno::Any& rControlAny, const OUString& aCtrlName,
+ const css::uno::Any& rControlAny, std::u16string_view aCtrlName,
const css::uno::Reference< css::resource::XStringResourceResolver >& xSourceStringResolver );
static void copyResourceForDroppedDialog(
const css::uno::Reference< css::container::XNameContainer >& xDialogModel,
- const OUString& aDialogName,
+ std::u16string_view aDialogName,
const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager,
const css::uno::Reference< css::resource::XStringResourceResolver >& xSourceStringResolver );
diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx
index effda584dee7..856736b293be 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -130,7 +130,7 @@ void Coverage::process_directory(const OUString& sDirName)
void Coverage::Coverage_Iterator()
{
- OUString sDirName = m_directories.getURLFromSrc("/basic/qa/basic_coverage/");
+ OUString sDirName = m_directories.getURLFromSrc(u"/basic/qa/basic_coverage/");
CPPUNIT_ASSERT(!sDirName.isEmpty());
process_directory(sDirName); // any files in the root test dir are run in test harness default locale ( en-US )
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 3f0818424a70..a38e4ceaab16 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -145,7 +145,7 @@ void VBATest::testMiscVBAFunctions()
#endif
"win32compatb.vb" // same methods, different signatures.
};
- OUString sMacroPathURL = m_directories.getURLFromSrc("/basic/qa/vba_tests/");
+ OUString sMacroPathURL = m_directories.getURLFromSrc(u"/basic/qa/vba_tests/");
OUString sMacroUtilsURL = sMacroPathURL + "_test_asserts.vb";
// Some test data expects the uk locale
LanguageTag aLocale(LANGUAGE_ENGLISH_UK);
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 82ffb8c11699..af9ca9e73da1 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -83,6 +83,7 @@
#include <algorithm>
#include <math.h>
#include <memory>
+#include <string_view>
#include <unordered_map>
#include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.hpp>
#include <com/sun/star/reflection/XConstantsTypeDescription.hpp>
@@ -4179,7 +4180,7 @@ class ModuleInvocationProxy : public WeakImplHelper< XInvocation, XComponent >
::comphelper::OInterfaceContainerHelper2 m_aListeners;
public:
- ModuleInvocationProxy( OUString const & aPrefix, SbxObjectRef const & xScopeObj );
+ ModuleInvocationProxy( std::u16string_view aPrefix, SbxObjectRef const & xScopeObj );
// XInvocation
virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() override;
@@ -4201,9 +4202,9 @@ public:
}
-ModuleInvocationProxy::ModuleInvocationProxy( OUString const & aPrefix, SbxObjectRef const & xScopeObj )
+ModuleInvocationProxy::ModuleInvocationProxy( std::u16string_view aPrefix, SbxObjectRef const & xScopeObj )
: m_aMutex()
- , m_aPrefix( aPrefix + "_" )
+ , m_aPrefix( OUString::Concat(aPrefix) + "_" )
, m_xScopeObj( xScopeObj )
, m_aListeners( m_aMutex )
{
@@ -4381,7 +4382,8 @@ void SAL_CALL ModuleInvocationProxy::removeEventListener( const Reference< XEven
Reference< XInterface > createComListener( const Any& aControlAny, const OUString& aVBAType,
- const OUString& aPrefix, const SbxObjectRef& xScopeObj )
+ std::u16string_view aPrefix,
+ const SbxObjectRef& xScopeObj )
{
Reference< XInterface > xRet;
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 6476c3f65c01..47081b7633f3 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -379,7 +379,7 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
css::uno::Reference< css::uno::XInterface > createComListener( const css::uno::Any& aControlAny,
const OUString& aVBAType,
- const OUString& aPrefix,
+ std::u16string_view aPrefix,
const SbxObjectRef& xScopeObj );
bool checkUnoObjectType(SbUnoObject& refVal, const OUString& aClass);
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index ec112b466f3f..dc83ae5a3546 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -66,6 +66,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <memory>
+#include <string_view>
namespace basic
{
@@ -571,8 +572,8 @@ static void checkAndCopyFileImpl( const INetURLObject& rSourceFolderInetObj,
}
}
-static void createVariableURL( OUString& rStr, const OUString& rLibName,
- const OUString& rInfoFileName, bool bUser )
+static void createVariableURL( OUString& rStr, std::u16string_view rLibName,
+ std::u16string_view rInfoFileName, bool bUser )
{
if( bUser )
{
@@ -582,7 +583,7 @@ static void createVariableURL( OUString& rStr, const OUString& rLibName,
{
rStr = "$(INST)/" LIBO_SHARE_FOLDER "/basic/";
}
- rStr += rLibName + "/" + rInfoFileName + ".xlb/";
+ rStr += OUString::Concat(rLibName) + "/" + rInfoFileName + ".xlb/";
}
void SfxLibraryContainer::init( const OUString& rInitialDocumentURL, const uno::Reference< embed::XStorage >& rxInitialStorage )
diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx
index e7880fe4bd83..92f2e3bd28e4 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.cxx
@@ -19,6 +19,8 @@
#include <sal/config.h>
+#include <string_view>
+
#include <propertysethelper.hxx>
#include <com/sun/star/beans/PropertyVetoException.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
@@ -29,18 +31,18 @@ namespace canvas
{
namespace
{
- void throwUnknown( const OUString& aPropertyName )
+ void throwUnknown( std::u16string_view aPropertyName )
{
throw beans::UnknownPropertyException(
- "PropertySetHelper: property " +
+ OUString::Concat("PropertySetHelper: property ") +
aPropertyName + " not found."
);
}
- void throwVeto( const OUString& aPropertyName )
+ void throwVeto( std::u16string_view aPropertyName )
{
throw beans::PropertyVetoException(
- "PropertySetHelper: property " +
+ OUString::Concat("PropertySetHelper: property ") +
aPropertyName + " access was vetoed." );
}
diff --git a/chart2/qa/extras/PivotChartTest.cxx b/chart2/qa/extras/PivotChartTest.cxx
index 44998835dbcc..cda42a2bd632 100644
--- a/chart2/qa/extras/PivotChartTest.cxx
+++ b/chart2/qa/extras/PivotChartTest.cxx
@@ -316,7 +316,7 @@ void PivotChartTest::testRoundtrip()
std::vector<double> aReference2 { 101879.458079, 178636.929704, 314626.484864 };
- load("/chart2/qa/extras/data/ods/", "PivotChartRoundTrip.ods");
+ load(u"/chart2/qa/extras/data/ods/", "PivotChartRoundTrip.ods");
xChartDoc = getPivotChartDocFromSheet(1, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -371,7 +371,7 @@ void PivotChartTest::testChangePivotTable()
uno::Sequence<uno::Any> xSequence;
Reference<chart2::XChartDocument> xChartDoc;
- load("/chart2/qa/extras/data/ods/", "PivotTableExample.ods");
+ load(u"/chart2/qa/extras/data/ods/", "PivotTableExample.ods");
// Check we have the Pivot Table
OUString sPivotTableName("DataPilot1");
diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx b/chart2/qa/extras/chart2_trendcalculators.cxx
index 42dce791d83b..b8eb367524bb 100644
--- a/chart2/qa/extras/chart2_trendcalculators.cxx
+++ b/chart2/qa/extras/chart2_trendcalculators.cxx
@@ -64,7 +64,7 @@ private:
void Chart2TrendCalculators::setUp()
{
ChartTest::setUp();
- load("/chart2/qa/extras/data/ods/", "trend_calculators.ods");
+ load(u"/chart2/qa/extras/data/ods/", "trend_calculators.ods");
}
void Chart2TrendCalculators::tearDown()
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 77739fb67034..838234f7c78c 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -22,6 +22,7 @@
#include <rtl/ustrbuf.hxx>
#include <fstream>
+#include <string_view>
#if defined(X86)
#define INT_EPS 2.1
@@ -50,7 +51,7 @@
else \
{ \
OString sTestFileName = OUStringToOString(getTestFileName(), RTL_TEXTENCODING_UTF8); \
- CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpected(#aActual), OUString(OUString::number(aActual))); \
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpected(u ## #aActual), OUString(OUString::number(aActual))); \
}
#define CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aActual, EPS_) \
@@ -59,7 +60,7 @@
else \
{ \
OString sTestFileName = OUStringToOString(getTestFileName(), RTL_TEXTENCODING_UTF8); \
- CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpectedDouble(#aActual), aActual, EPS_); \
+ CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpectedDouble(u ## #aActual), aActual, EPS_); \
}
#define CPPUNIT_DUMP_ASSERT_STRINGS_EQUAL(aActual) \
@@ -68,7 +69,7 @@
else \
{ \
OString sTestFileName = OUStringToOString(getTestFileName(), RTL_TEXTENCODING_UTF8); \
- CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpected(#aActual), aActual.trim()); \
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpected(u ## #aActual), aActual.trim()); \
}
#define CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aActual, EPS_) \
@@ -77,7 +78,7 @@
else \
{ \
OUString expectedTransform; \
- if (!readAndCheckTransformation (aActual, #aActual, EPS_, expectedTransform)) \
+ if (!readAndCheckTransformation (aActual, u ## #aActual, EPS_, expectedTransform)) \
{ \
OString sTestFileName = OUStringToOString(getTestFileName(), RTL_TEXTENCODING_UTF8); \
CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), expectedTransform, transformationToOneLineString(aActual)); \
@@ -143,7 +144,7 @@ protected:
CPPUNIT_FAIL("verify method must be overridden");
}
- OUString readExpected(const OUString& sCheck)
+ OUString readExpected(std::u16string_view sCheck)
{
assert(!m_bDumpMode);
assert(m_aReferenceFile.is_open());
@@ -152,7 +153,7 @@ protected:
OString sAssertMessage =
"The reference file does not contain the right content. Maybe it needs an update:"
+ OUStringToOString(m_sTestFileName, RTL_TEXTENCODING_UTF8);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sAssertMessage.getStr(), OUString("// " + sCheck), OUString(sTemp.data(), sTemp.length(), RTL_TEXTENCODING_UTF8));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sAssertMessage.getStr(), OUString(OUString::Concat("// ") + sCheck), OUString(sTemp.data(), sTemp.length(), RTL_TEXTENCODING_UTF8));
getline(m_aReferenceFile, sTemp);
return OUString(sTemp.data(), sTemp.length(), RTL_TEXTENCODING_UTF8);
}
@@ -165,7 +166,7 @@ protected:
m_aDumpFile << sActualValue.trim() << "\n"; // Write out the checked value, will be used as reference later
}
- void readNote(const OUString& sNote)
+ void readNote(std::u16string_view sNote)
{
assert(!m_bDumpMode);
assert(m_aReferenceFile.is_open());
@@ -174,7 +175,7 @@ protected:
OString sAssertMessage =
"The reference file does not contain the right content. Maybe it needs an update:"
+ OUStringToOString(m_sTestFileName, RTL_TEXTENCODING_UTF8);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sAssertMessage.getStr(), OUString("/// " + sNote), OUString(sTemp.data(), sTemp.length(), RTL_TEXTENCODING_UTF8));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sAssertMessage.getStr(), OUString(OUString::Concat("/// ") + sNote), OUString(sTemp.data(), sTemp.length(), RTL_TEXTENCODING_UTF8));
}
void writeNote(const OUString& sNote)
@@ -184,7 +185,7 @@ protected:
m_aDumpFile << "/// " << sNote << "\n";
}
- double readExpectedDouble(const OUString& sCheck)
+ double readExpectedDouble(std::u16string_view sCheck)
{
OUString sExpected = readExpected(sCheck);
return sExpected.toDouble();
@@ -195,7 +196,7 @@ protected:
writeActual(transformationToOneLineString(rTransform), sCheck);
}
- bool readAndCheckTransformation(const drawing::HomogenMatrix3& rTransform, const OUString& sCheck, const double fEPS, OUString& rExpectedTransform)
+ bool readAndCheckTransformation(const drawing::HomogenMatrix3& rTransform, std::u16string_view sCheck, const double fEPS, OUString& rExpectedTransform)
{
rExpectedTransform = readExpected(sCheck); // Reference transformation string
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index d0cd3be67d66..a702d5113b13 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -580,7 +580,7 @@ void checkTrendlinesInChart(uno::Reference< chart2::XChartDocument > const & xCh
// improve the test
void Chart2ExportTest::testErrorBarXLSX()
{
- load("/chart2/qa/extras/data/ods/", "error_bar.ods");
+ load(u"/chart2/qa/extras/data/ods/", "error_bar.ods");
{
// make sure the ODS import was successful
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
@@ -616,7 +616,7 @@ void Chart2ExportTest::testErrorBarXLSX()
void Chart2ExportTest::testErrorBarPropXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testErrorBarProp.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testErrorBarProp.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -636,7 +636,7 @@ void Chart2ExportTest::testErrorBarPropXLSX()
void Chart2ExportTest::testTrendline()
{
mbSkipValidation = true;
- load("/chart2/qa/extras/data/ods/", "trendline.ods");
+ load(u"/chart2/qa/extras/data/ods/", "trendline.ods");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
reload("calc8");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -644,7 +644,7 @@ void Chart2ExportTest::testTrendline()
void Chart2ExportTest::testTrendlineOOXML()
{
- load("/chart2/qa/extras/data/ods/", "trendline.ods");
+ load(u"/chart2/qa/extras/data/ods/", "trendline.ods");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
reload("Calc Office Open XML");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -653,7 +653,7 @@ void Chart2ExportTest::testTrendlineOOXML()
void Chart2ExportTest::testTrendlineXLS()
{
mbSkipValidation = true;
- load("/chart2/qa/extras/data/ods/", "trendline.ods");
+ load(u"/chart2/qa/extras/data/ods/", "trendline.ods");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
reload("MS Excel 97");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -668,7 +668,7 @@ void Chart2ExportTest::testStockChart()
* an attribute val of index should start from 1 and not from 0.
* Which was problem area.
*/
- load("/chart2/qa/extras/data/docx/", "testStockChart.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testStockChart.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -683,7 +683,7 @@ void Chart2ExportTest::testStockChart()
void Chart2ExportTest::testBarChart()
{
- load("/chart2/qa/extras/data/docx/", "testBarChart.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testBarChart.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -692,7 +692,7 @@ void Chart2ExportTest::testBarChart()
void Chart2ExportTest::testCrosses()
{
- load("/chart2/qa/extras/data/docx/", "Bar_horizontal_cone.docx");
+ load(u"/chart2/qa/extras/data/docx/", "Bar_horizontal_cone.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses", "val", "autoZero");
@@ -700,7 +700,7 @@ void Chart2ExportTest::testCrosses()
void Chart2ExportTest::testScatterChartTextXValues()
{
- load("/chart2/qa/extras/data/docx/", "scatter-chart-text-x-values.docx");
+ load(u"/chart2/qa/extras/data/docx/", "scatter-chart-text-x-values.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -748,7 +748,7 @@ void Chart2ExportTest::testScatterChartTextXValues()
void Chart2ExportTest::testScatterXAxisValues()
{
- load("/chart2/qa/extras/data/odt/", "tdf114657.odt");
+ load(u"/chart2/qa/extras/data/odt/", "tdf114657.odt");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -762,7 +762,7 @@ void Chart2ExportTest::testScatterXAxisValues()
void Chart2ExportTest::testScatterXAxisCategories()
{
- load("/chart2/qa/extras/data/odt/", "tdf131143.odt");
+ load(u"/chart2/qa/extras/data/odt/", "tdf131143.odt");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -773,7 +773,7 @@ void Chart2ExportTest::testScatterXAxisCategories()
void Chart2ExportTest::testChartDataTable()
{
- load("/chart2/qa/extras/data/docx/", "testChartDataTable.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testChartDataTable.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -784,7 +784,7 @@ void Chart2ExportTest::testChartDataTable()
void Chart2ExportTest::testChartExternalData()
{
- load("/chart2/qa/extras/data/docx/", "testMultipleChart.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testMultipleChart.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -799,7 +799,7 @@ void Chart2ExportTest::testEmbeddingsGrabBag()
// after saving file.
// This test case tests whether embeddings files grabbagged properly in correct object.
- load("/chart2/qa/extras/data/docx/", "testMultiplechartembeddings.docx" );
+ load(u"/chart2/qa/extras/data/docx/", "testMultiplechartembeddings.docx" );
uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aGrabBag(0);
@@ -834,7 +834,7 @@ void Chart2ExportTest::testEmbeddingsGrabBag()
void Chart2ExportTest::testAreaChartLoad()
{
- load ("/chart2/qa/extras/data/docx/", "testAreaChartLoad.docx");
+ load (u"/chart2/qa/extras/data/docx/", "testAreaChartLoad.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:showVal", "val", "1");
@@ -853,7 +853,7 @@ void Chart2ExportTest::testUpDownBars()
void Chart2ExportTest::testDoughnutChart()
{
- load("/chart2/qa/extras/data/docx/", "doughnutChart.docx");
+ load(u"/chart2/qa/extras/data/docx/", "doughnutChart.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -862,7 +862,7 @@ void Chart2ExportTest::testDoughnutChart()
void Chart2ExportTest::testDisplayUnits()
{
- load("/chart2/qa/extras/data/docx/", "DisplayUnits.docx");
+ load(u"/chart2/qa/extras/data/docx/", "DisplayUnits.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -880,7 +880,7 @@ void Chart2ExportTest::testDisplayUnits()
void Chart2ExportTest::testFdo74115WallBitmapFill()
{
- load("/chart2/qa/extras/data/docx/", "fdo74115_WallBitmapFill.docx");
+ load(u"/chart2/qa/extras/data/docx/", "fdo74115_WallBitmapFill.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:blipFill");
@@ -888,7 +888,7 @@ void Chart2ExportTest::testFdo74115WallBitmapFill()
void Chart2ExportTest::testPieChartWallLineStyle()
{
- load("/chart2/qa/extras/data/odt/", "testPieChartWallLineStyle.odt");
+ load(u"/chart2/qa/extras/data/odt/", "testPieChartWallLineStyle.odt");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:ln/a:noFill");
@@ -898,7 +898,7 @@ void Chart2ExportTest::testPieChartWallLineStyle()
void Chart2ExportTest::testFdo78290LineChartMarkerX()
{
- load("/chart2/qa/extras/data/docx/", "fdo78290_Line_Chart_Marker_x.docx");
+ load(u"/chart2/qa/extras/data/docx/", "fdo78290_Line_Chart_Marker_x.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val","x");
@@ -909,7 +909,7 @@ void Chart2ExportTest::testFdo78290LineChartMarkerX()
void Chart2ExportTest::testFdo78290ScatterChartMarkerX()
{
- load("/chart2/qa/extras/data/docx/", "fdo78290_Scatter_Chart_Marker_x.docx");
+ load(u"/chart2/qa/extras/data/docx/", "fdo78290_Scatter_Chart_Marker_x.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val","x");
@@ -921,7 +921,7 @@ void Chart2ExportTest::testFdo78290ScatterChartMarkerX()
void Chart2ExportTest::testFdo78290CombinationChartMarkerX()
{
- load("/chart2/qa/extras/data/docx/", "fdo78290_Combination_Chart_Marker_x.docx");
+ load(u"/chart2/qa/extras/data/docx/", "fdo78290_Combination_Chart_Marker_x.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val","x");
@@ -931,7 +931,7 @@ void Chart2ExportTest::testFdo78290CombinationChartMarkerX()
void Chart2ExportTest::testTdf126115IndividualMarker()
{
// Check individual marker properties.
- load("/chart2/qa/extras/data/xlsx/", "tdf126115.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf126115.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// 1. series
@@ -981,7 +981,7 @@ void Chart2ExportTest::testAxisNumberFormatODS()
} aTest;
- load("/chart2/qa/extras/data/ods/", "axis-numformats-linked.ods");
+ load(u"/chart2/qa/extras/data/ods/", "axis-numformats-linked.ods");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
aTest.check(xChartDoc);
@@ -1037,7 +1037,7 @@ void Chart2ExportTest::testAxisNumberFormatXLS()
} aTest;
- load( "/chart2/qa/extras/data/xls/", "axis_sourceformatting.xls" );
+ load( u"/chart2/qa/extras/data/xls/", "axis_sourceformatting.xls" );
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet( 0, mxComponent );
aTest.check( xChartDoc, true, util::NumberFormat::PERCENT );
@@ -1136,7 +1136,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX()
} aTest;
- load("/chart2/qa/extras/data/docx/", "data-label-borders.docx");
+ load(u"/chart2/qa/extras/data/docx/", "data-label-borders.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
@@ -1164,7 +1164,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX()
void Chart2ExportTest::testDataLabel3DChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "3d-bar-label.docx");
+ load(u"/chart2/qa/extras/data/docx/", "3d-bar-label.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1180,7 +1180,7 @@ void Chart2ExportTest::testDataLabel3DChartDOCX()
void Chart2ExportTest::testDataLabelBarChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "bar-chart-labels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "bar-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1195,7 +1195,7 @@ void Chart2ExportTest::testDataLabelBarChartDOCX()
void Chart2ExportTest::testDataLabelClusteredBarChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "clustered-bar-chart-labels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "clustered-bar-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1209,7 +1209,7 @@ void Chart2ExportTest::testDataLabelClusteredBarChartDOCX()
void Chart2ExportTest::testDataLabelRadarChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "radar-chart-labels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "radar-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1224,7 +1224,7 @@ void Chart2ExportTest::testDataLabelRadarChartDOCX()
void Chart2ExportTest::testDataLabelDoughnutChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "doughnut-chart-labels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "doughnut-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1239,7 +1239,7 @@ void Chart2ExportTest::testDataLabelDoughnutChartDOCX()
void Chart2ExportTest::testDataLabelAreaChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "area-chart-labels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "area-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1258,7 +1258,7 @@ void Chart2ExportTest::testDataLabelDefaultLineChartDOCX()
// label position (2010 does). Make sure its default data label position
// is RIGHT when exporting.
- load("/chart2/qa/extras/data/docx/", "line-chart-label-default-placement.docx");
+ load(u"/chart2/qa/extras/data/docx/", "line-chart-label-default-placement.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1277,7 +1277,7 @@ void Chart2ExportTest::testDataLabelDefaultLineChartDOCX()
void Chart2ExportTest::testIndividualDataLabelProps()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf122915.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf122915.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr", "b", "1");
@@ -1288,7 +1288,7 @@ void Chart2ExportTest::testIndividualDataLabelProps()
void Chart2ExportTest::testTdf108107()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf108107.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf108107.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx", "val", "1");
@@ -1298,7 +1298,7 @@ void Chart2ExportTest::testTdf108107()
void Chart2ExportTest::testTdf114139()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf114139.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf114139.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1310,7 +1310,7 @@ void Chart2ExportTest::testTdf114139()
void Chart2ExportTest::testTdf64224()
{
- load("/chart2/qa/extras/data/ods/", "tdf64224.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf64224.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1321,7 +1321,7 @@ void Chart2ExportTest::testTdf64224()
void Chart2ExportTest::testChartTitlePropertiesColorFillDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testChartTitlePropertiesColorFill.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesColorFill.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000");
@@ -1330,7 +1330,7 @@ void Chart2ExportTest::testChartTitlePropertiesColorFillDOCX()
void Chart2ExportTest::testChartTitlePropertiesGradientFillDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testChartTitlePropertiesGradientFill.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesGradientFill.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "cccccc");
@@ -1340,7 +1340,7 @@ void Chart2ExportTest::testChartTitlePropertiesGradientFillDOCX()
void Chart2ExportTest::testChartTitlePropertiesBitmapFillDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testChartTitlePropertiesBitmapFill.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesBitmapFill.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", "rId1");
@@ -1350,7 +1350,7 @@ void Chart2ExportTest::testChartTitlePropertiesBitmapFillDOCX()
void Chart2ExportTest::testColorGradientWithTransparencyDOCX()
{
// Test color gradient (two color) with gradient transparency
- load("/chart2/qa/extras/data/docx/", "testColorGradientWithTransparency.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testColorGradientWithTransparency.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
// Test the transparency of the first color
@@ -1362,7 +1362,7 @@ void Chart2ExportTest::testColorGradientWithTransparencyDOCX()
void Chart2ExportTest::testColorGradientWithTransparencyODS()
{
// Test color gradient (two color) with simple transparency
- load("/chart2/qa/extras/data/ods/", "testColorGradientWithTransparency.ods");
+ load(u"/chart2/qa/extras/data/ods/", "testColorGradientWithTransparency.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// Test the transparency of the first color
@@ -1374,7 +1374,7 @@ void Chart2ExportTest::testColorGradientWithTransparencyODS()
void Chart2ExportTest::testColorGradientStopXLSX()
{
// Test color gradient (two color) stop of the first color
- load("/chart2/qa/extras/data/xlsx/", "tdf128619.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf128619.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// Test the position of the first color
@@ -1385,7 +1385,7 @@ void Chart2ExportTest::testColorGradientStopXLSX()
void Chart2ExportTest::testRadialColorGradientDOCX()
{
- load("/chart2/qa/extras/data/docx/", "tdf128794.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf128794.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
// Test the gradient style (if there is no 'a:path' attribute, it is a linear gradient)
@@ -1396,7 +1396,7 @@ void Chart2ExportTest::testRadialColorGradientDOCX()
void Chart2ExportTest::testBarChartDataPointPropDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testBarChartDataPointPropDOCX.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testBarChartDataPointPropDOCX.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1414,7 +1414,7 @@ void Chart2ExportTest::testBarChartDataPointPropDOCX()
void Chart2ExportTest::testBarChartRotation()
{
- load ("/chart2/qa/extras/data/docx/", "barChartRotation.docx");
+ load (u"/chart2/qa/extras/data/docx/", "barChartRotation.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1429,7 +1429,7 @@ void Chart2ExportTest::testShapeFollowedByChart()
docPr Id is being repeated, ECMA 20.4.2.5 says that the
docPr Id should be unique, ensuring the same here.
*/
- load("/chart2/qa/extras/data/docx/", "FDO74430.docx");
+ load(u"/chart2/qa/extras/data/docx/", "FDO74430.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/document", "Office Open XML Text" );
CPPUNIT_ASSERT(pXmlDoc);
@@ -1441,7 +1441,7 @@ void Chart2ExportTest::testShapeFollowedByChart()
void Chart2ExportTest::testPieChartDataLabels()
{
- load("/chart2/qa/extras/data/docx/", "PieChartDataLabels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "PieChartDataLabels.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos", "val", "outEnd");
@@ -1449,7 +1449,7 @@ void Chart2ExportTest::testPieChartDataLabels()
void Chart2ExportTest::testSeriesIdxOrder()
{
- load("/chart2/qa/extras/data/docx/", "testSeriesIdxOrder.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testSeriesIdxOrder.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:idx[1]", "val", "1");
@@ -1458,7 +1458,7 @@ void Chart2ExportTest::testSeriesIdxOrder()
void Chart2ExportTest::testScatterPlotLabels()
{
- load("/chart2/qa/extras/data/odt/", "scatter-plot-labels.odt");
+ load(u"/chart2/qa/extras/data/odt/", "scatter-plot-labels.odt");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1490,7 +1490,7 @@ void Chart2ExportTest::testScatterPlotLabels()
void Chart2ExportTest::testErrorBarDataRangeODS()
{
- load("/chart2/qa/extras/data/ods/", "ErrorBarRange.ods");
+ load(u"/chart2/qa/extras/data/ods/", "ErrorBarRange.ods");
reload("calc8");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
@@ -1519,14 +1519,14 @@ void Chart2ExportTest::testErrorBarDataRangeODS()
void Chart2ExportTest::testChartCrash()
{
- load("/chart2/qa/extras/data/docx/", "FDO75975.docx");
+ load(u"/chart2/qa/extras/data/docx/", "FDO75975.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
}
void Chart2ExportTest::testPieChartRotation()
{
- load ("/chart2/qa/extras/data/docx/", "pieChartRotation.docx");
+ load (u"/chart2/qa/extras/data/docx/", "pieChartRotation.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX", "val", "40");
@@ -1539,7 +1539,7 @@ void Chart2ExportTest::testEmbeddingsOleObjectGrabBag()
// after saving file.
// This test case tests whether embeddings files grabbagged properly in correct object.
- load("/chart2/qa/extras/data/docx/", "testchartoleobjectembeddings.docx" );
+ load(u"/chart2/qa/extras/data/docx/", "testchartoleobjectembeddings.docx" );
uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aGrabBag(0);
@@ -1610,7 +1610,7 @@ void checkSheetForGapWidthAndOverlap(uno::Reference< chart2::XChartDocument > co
void Chart2ExportTest::testGapWidthXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "gapWidth.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "gapWidth.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
checkSheetForGapWidthAndOverlap(xChartDoc, 120, -60);
@@ -1629,7 +1629,7 @@ void Chart2ExportTest::testGapWidthXLSX()
void Chart2ExportTest::testSmoothedLines()
{
- load("/chart2/qa/extras/data/ods/", "smoothedLines.ods");
+ load(u"/chart2/qa/extras/data/ods/", "smoothedLines.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:smooth", "val", "0");
@@ -1637,7 +1637,7 @@ void Chart2ExportTest::testSmoothedLines()
void Chart2ExportTest::testLabelStringODS()
{
- load("/chart2/qa/extras/data/ods/", "labelString.ods");
+ load(u"/chart2/qa/extras/data/ods/", "labelString.ods");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
Reference< chart2::data::XDataSequence > xLabelSeq =
@@ -1659,7 +1659,7 @@ void Chart2ExportTest::testLabelStringODS()
void Chart2ExportTest::testFdo83058dlblPos()
{
- load ("/chart2/qa/extras/data/docx/", "fdo83058_dlblPos.docx");
+ load (u"/chart2/qa/extras/data/docx/", "fdo83058_dlblPos.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[2]/c:dLblPos", "val", "outEnd");
@@ -1670,7 +1670,7 @@ void Chart2ExportTest::testFdo83058dlblPos()
void Chart2ExportTest::testAutoTitleDelXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "autotitledel_2007.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "autotitledel_2007.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", "0");
@@ -1678,7 +1678,7 @@ void Chart2ExportTest::testAutoTitleDelXLSX()
void Chart2ExportTest::testDispBlanksAsXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2007.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2007.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", "gap");
@@ -1686,7 +1686,7 @@ void Chart2ExportTest::testDispBlanksAsXLSX()
void Chart2ExportTest::testMarkerColorXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "markerColor.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "markerColor.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", "92d050");
@@ -1694,7 +1694,7 @@ void Chart2ExportTest::testMarkerColorXLSX()
void Chart2ExportTest::testRoundedCornersXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "markerColor.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "markerColor.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:roundedCorners", "val", "0");
@@ -1702,7 +1702,7 @@ void Chart2ExportTest::testRoundedCornersXLSX()
void Chart2ExportTest::testAxisNumberFormatXLSX()
{
- load("/chart2/qa/extras/data/ods/", "axis_number_format.ods");
+ load(u"/chart2/qa/extras/data/ods/", "axis_number_format.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx", 2);
@@ -1715,7 +1715,7 @@ void Chart2ExportTest::testAxisNumberFormatXLSX()
void Chart2ExportTest::testDataPointLabelNumberFormatXLSX()
{
- load("/chart2/qa/extras/data/ods/", "tdf123774.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf123774.ods");
{
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1726,7 +1726,7 @@ void Chart2ExportTest::testDataPointLabelNumberFormatXLSX()
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt", "sourceLinked", "0");
}
- load("/chart2/qa/extras/data/xlsx/", "tdf130986.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf130986.xlsx");
{
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1738,7 +1738,7 @@ void Chart2ExportTest::testDataPointLabelNumberFormatXLSX()
void Chart2ExportTest::testDataLabelDefaultValuesXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "data_label.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "data_label.xlsx");
Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent);
Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0);
Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW);
@@ -1755,7 +1755,7 @@ void Chart2ExportTest::testDataLabelDefaultValuesXLSX()
void Chart2ExportTest::testDataLabelFillColor()
{
- load("/chart2/qa/extras/data/xlsx/", "data_labels_fill_color.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "data_labels_fill_color.xlsx");
Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent);
Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0);
Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW);
@@ -1770,7 +1770,7 @@ void Chart2ExportTest::testDataLabelFillColor()
void Chart2ExportTest::testTitleOverlayXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "chart_title.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "chart_title.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:overlay", "val", "0");
@@ -1778,7 +1778,7 @@ void Chart2ExportTest::testTitleOverlayXLSX()
void Chart2ExportTest::testInvertIfNegativeXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "bar_chart_simple.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "bar_chart_simple.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:invertIfNegative", "val", "0");
@@ -1786,7 +1786,7 @@ void Chart2ExportTest::testInvertIfNegativeXLSX()
void Chart2ExportTest::testBubble3DXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "bubble_chart_simple.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "bubble_chart_simple.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[1]/c:bubble3D", "val", "0");
@@ -1796,7 +1796,7 @@ void Chart2ExportTest::testBubble3DXLSX()
void Chart2ExportTest::testNoMarkerXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "no_marker.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "no_marker.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:marker/c:symbol", "val", "none");
@@ -1806,7 +1806,7 @@ void Chart2ExportTest::testNoMarkerXLSX()
void Chart2ExportTest::testTitleManualLayoutXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "title_manual_layout.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "title_manual_layout.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:layoutTarget", 0);
@@ -1827,7 +1827,7 @@ void Chart2ExportTest::testTitleManualLayoutXLSX()
void Chart2ExportTest::testPlotAreaManualLayoutXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "plot_area_manual_layout.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "plot_area_manual_layout.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1856,7 +1856,7 @@ void Chart2ExportTest::testPlotAreaManualLayoutXLSX()
void Chart2ExportTest::testLegendManualLayoutXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "legend_manual_layout.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "legend_manual_layout.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1888,7 +1888,7 @@ void Chart2ExportTest::testLegendManualLayoutXLSX()
void Chart2ExportTest::testChartSubTitle()
{
- load("/chart2/qa/extras/data/ods/", "testChartSubTitle.ods");
+ load(u"/chart2/qa/extras/data/ods/", "testChartSubTitle.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// test properties of subtitle
@@ -1902,7 +1902,7 @@ void Chart2ExportTest::testChartSubTitle()
void Chart2ExportTest::testChartMainWithSubTitle()
{
- load("/chart2/qa/extras/data/ods/", "testChartMainWithSubTitle.ods");
+ load(u"/chart2/qa/extras/data/ods/", "testChartMainWithSubTitle.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// test properties of title
@@ -1917,7 +1917,7 @@ void Chart2ExportTest::testChartMainWithSubTitle()
void Chart2ExportTest::testAutoTitleDeleted()
{
- load("/chart2/qa/extras/data/xlsx/", "testAutoTitleDeleted.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testAutoTitleDeleted.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", "1");
@@ -1925,7 +1925,7 @@ void Chart2ExportTest::testAutoTitleDeleted()
void Chart2ExportTest::testChartTitlePropertiesColorFillXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesColorFill.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesColorFill.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000");
@@ -1934,7 +1934,7 @@ void Chart2ExportTest::testChartTitlePropertiesColorFillXLSX()
void Chart2ExportTest::testChartTitlePropertiesGradientFillXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesGradientFill.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesGradientFill.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "cccccc");
@@ -1944,7 +1944,7 @@ void Chart2ExportTest::testChartTitlePropertiesGradientFillXLSX()
void Chart2ExportTest::testChartTitlePropertiesBitmapFillXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesBitmapFill.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesBitmapFill.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", "rId1");
@@ -1953,7 +1953,7 @@ void Chart2ExportTest::testChartTitlePropertiesBitmapFillXLSX()
void Chart2ExportTest::testBarChartDataPointPropXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testBarChartDataPointPropXLSX.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testBarChartDataPointPropXLSX.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1971,7 +1971,7 @@ void Chart2ExportTest::testBarChartDataPointPropXLSX()
void Chart2ExportTest::testDataseriesOverlapStackedChartXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testDataseriesOverlapStackedChart.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testDataseriesOverlapStackedChart.xlsx");
// test the overlap value of a simple Stacked Column Chart
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
@@ -1992,7 +1992,7 @@ void Chart2ExportTest::testDataseriesOverlapStackedChartXLSX()
void Chart2ExportTest::testAxisCharacterPropertiesXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "axis_character_properties.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "axis_character_properties.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2009,7 +2009,7 @@ void Chart2ExportTest::testAxisCharacterPropertiesXLSX()
void Chart2ExportTest::testTitleCharacterPropertiesXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "title_character_properties.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "title_character_properties.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2022,7 +2022,7 @@ void Chart2ExportTest::testTitleCharacterPropertiesXLSX()
void Chart2ExportTest::testPlotVisOnlyXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "hidden_cells.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "hidden_cells.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2031,7 +2031,7 @@ void Chart2ExportTest::testPlotVisOnlyXLSX()
void Chart2ExportTest::testBarChartVaryColorsXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf90876.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf90876.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2040,7 +2040,7 @@ void Chart2ExportTest::testBarChartVaryColorsXLSX()
void Chart2ExportTest::testMultipleAxisXLSX()
{
- load("/chart2/qa/extras/data/ods/", "multiple_axis.ods");
+ load(u"/chart2/qa/extras/data/ods/", "multiple_axis.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2055,7 +2055,7 @@ void Chart2ExportTest::testMultipleAxisXLSX()
void Chart2ExportTest::testSecondaryAxisXLSX()
{
- load("/chart2/qa/extras/data/ods/", "secondary_axis.ods");
+ load(u"/chart2/qa/extras/data/ods/", "secondary_axis.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2071,7 +2071,7 @@ void Chart2ExportTest::testSecondaryAxisXLSX()
void Chart2ExportTest::testSetSeriesToSecondaryAxisXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "add_series_secondary_axis.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "add_series_secondary_axis.xlsx");
Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
// Second series
Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xChartDoc, 1);
@@ -2091,7 +2091,7 @@ void Chart2ExportTest::testSetSeriesToSecondaryAxisXLSX()
void Chart2ExportTest::testCombinedChartSecondaryAxisXLSX()
{
// Original file was created with MS Office
- load("/chart2/qa/extras/data/xlsx/", "combined_chart_secondary_axis.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "combined_chart_secondary_axis.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// Collect barchart axID on secondary Axis
@@ -2110,7 +2110,7 @@ void Chart2ExportTest::testCombinedChartSecondaryAxisXLSX()
void Chart2ExportTest::testCombinedChartSecondaryAxisODS()
{
// Original file was created with LibreOffice
- load("/chart2/qa/extras/data/ods/", "combined_chart_secondary_axis.ods");
+ load(u"/chart2/qa/extras/data/ods/", "combined_chart_secondary_axis.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// Collect barchart axID on secondary Axis
@@ -2132,13 +2132,13 @@ void Chart2ExportTest::testCrossBetweenXLSX()
{
// Original files were created with MS Office
{
- load("/chart2/qa/extras/data/xlsx/", "tdf127777.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf127777.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
}
{
- load("/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
@@ -2148,7 +2148,7 @@ void Chart2ExportTest::testCrossBetweenXLSX()
void Chart2ExportTest::testCrossBetweenWithDeletedAxis()
{
// Original file was created with MS Office (the category axis is deleted in the file)
- load("/chart2/qa/extras/data/xlsx/", "tdf128633.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf128633.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
@@ -2157,7 +2157,7 @@ void Chart2ExportTest::testCrossBetweenWithDeletedAxis()
void Chart2ExportTest::testCrossBetweenODS()
{
// Original file was created with LibreOffice
- load("/chart2/qa/extras/data/ods/", "test_CrossBetween.ods");
+ load(u"/chart2/qa/extras/data/ods/", "test_CrossBetween.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
@@ -2165,7 +2165,7 @@ void Chart2ExportTest::testCrossBetweenODS()
void Chart2ExportTest::testAxisTitleRotationXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "axis_title_rotation.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "axis_title_rotation.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2174,7 +2174,7 @@ void Chart2ExportTest::testAxisTitleRotationXLSX()
void Chart2ExportTest::testAxisTitlePositionDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testAxisTitlePosition.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testAxisTitlePosition.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2198,14 +2198,14 @@ void Chart2ExportTest::testAxisTitlePositionDOCX()
void Chart2ExportTest::testAxisCrossBetweenDOCX()
{
- load("/chart2/qa/extras/data/odt/", "axis-position.odt");
+ load(u"/chart2/qa/extras/data/odt/", "axis-position.odt");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", "midCat");
}
void Chart2ExportTest::testPieChartDataPointExplosionXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "pie_chart_datapoint_explosion.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "pie_chart_datapoint_explosion.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2214,7 +2214,7 @@ void Chart2ExportTest::testPieChartDataPointExplosionXLSX()
void Chart2ExportTest::testCustomDataLabel()
{
- load("/chart2/qa/extras/data/pptx/", "tdf115107.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf115107.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
// Check the data labels font color for the complete data series
@@ -2312,7 +2312,7 @@ void Chart2ExportTest::testCustomDataLabel()
void Chart2ExportTest::testCustomPositionofDataLabel()
{
- load("/chart2/qa/extras/data/xlsx/", "testCustomPosDataLabels.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testCustomPosDataLabels.xlsx");
{
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2328,7 +2328,7 @@ void Chart2ExportTest::testCustomPositionofDataLabel()
CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.0742140311063737, nY, 1e-7);
}
- load("/chart2/qa/extras/data/docx/", "testTdf108110.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testTdf108110.docx");
{
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2344,7 +2344,7 @@ void Chart2ExportTest::testCustomPositionofDataLabel()
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.172648731408574, nY, 1e-7);
}
- load("/chart2/qa/extras/data/ods/", "tdf136024.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf136024.ods");
{
reload("calc8");
// tdf#136024: test custom position of pie chart data label after an ods export
@@ -2364,7 +2364,7 @@ void Chart2ExportTest::testCustomPositionofDataLabel()
void Chart2ExportTest::testCustomDataLabelMultipleSeries()
{
- load("/chart2/qa/extras/data/pptx/", "tdf115107-2.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf115107-2.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart2", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2421,14 +2421,14 @@ void Chart2ExportTest::testCustomDataLabelMultipleSeries()
void Chart2ExportTest::testLeaderLines()
{
- load("/chart2/qa/extras/data/xlsx/", "testTdf90749.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testTdf90749.xlsx");
{
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines", "val", "1");
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines", "val", "0");
}
- load("/chart2/qa/extras/data/docx/", "MSO_Custom_Leader_Line.docx");
+ load(u"/chart2/qa/extras/data/docx/", "MSO_Custom_Leader_Line.docx");
{
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2439,7 +2439,7 @@ void Chart2ExportTest::testLeaderLines()
void Chart2ExportTest::testNumberFormatExportPPTX()
{
- load("/chart2/qa/extras/data/pptx/", "tdf115859.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf115859.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2449,7 +2449,7 @@ void Chart2ExportTest::testNumberFormatExportPPTX()
void Chart2ExportTest::testLabelSeparatorExportDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testLabelSeparator.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testLabelSeparator.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2467,7 +2467,7 @@ void Chart2ExportTest::testLabelSeparatorExportDOCX()
void Chart2ExportTest::testChartTitlePropertiesColorFillPPTX()
{
- load("/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesColorFill.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesColorFill.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000");
@@ -2476,7 +2476,7 @@ void Chart2ExportTest::testChartTitlePropertiesColorFillPPTX()
void Chart2ExportTest::testChartTitlePropertiesGradientFillPPTX()
{
- load("/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesGradientFill.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesGradientFill.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "f6f8fc");
@@ -2486,7 +2486,7 @@ void Chart2ExportTest::testChartTitlePropertiesGradientFillPPTX()
void Chart2ExportTest::testChartTitlePropertiesBitmapFillPPTX()
{
- load("/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesBitmapFill.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesBitmapFill.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", "rId1");
@@ -2495,7 +2495,7 @@ void Chart2ExportTest::testChartTitlePropertiesBitmapFillPPTX()
void Chart2ExportTest::testxAxisLabelsRotation()
{
- load ("/chart2/qa/extras/data/xlsx/", "xAxisLabelsRotation.xlsx");
+ load (u"/chart2/qa/extras/data/xlsx/", "xAxisLabelsRotation.xlsx");
xmlDocUniquePtr pXmlDoc1 = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc1);
@@ -2505,7 +2505,7 @@ void Chart2ExportTest::testxAxisLabelsRotation()
void Chart2ExportTest::testMultipleCategoryAxisLablesXLSX()
{
- load("/chart2/qa/extras/data/ods/", "multilevelcat.ods");
+ load(u"/chart2/qa/extras/data/ods/", "multilevelcat.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// check category axis labels number of first level
@@ -2522,7 +2522,7 @@ void Chart2ExportTest::testMultipleCategoryAxisLablesXLSX()
void Chart2ExportTest::testMultipleCategoryAxisLablesDOCX()
{
- load("/chart2/qa/extras/data/odt/", "multilevelcat.odt");
+ load(u"/chart2/qa/extras/data/odt/", "multilevelcat.odt");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
// check category axis labels number of first level
@@ -2539,7 +2539,7 @@ void Chart2ExportTest::testMultipleCategoryAxisLablesDOCX()
void Chart2ExportTest::testTdf116163()
{
- load("/chart2/qa/extras/data/pptx/", "tdf116163.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf116163.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2548,7 +2548,7 @@ void Chart2ExportTest::testTdf116163()
void Chart2ExportTest::testTdf111824()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf111824.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf111824.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2560,7 +2560,7 @@ void Chart2ExportTest::testTdf111824()
void Chart2ExportTest::test3DAreaChartZAxis()
{
- load("/chart2/qa/extras/data/xlsx/", "test3DAreaChartZAxis.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "test3DAreaChartZAxis.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2572,7 +2572,7 @@ void Chart2ExportTest::test3DAreaChartZAxis()
void Chart2ExportTest::testTdf119029()
{
- load("/chart2/qa/extras/data/odp/", "tdf119029.odp");
+ load(u"/chart2/qa/extras/data/odp/", "tdf119029.odp");
// Only use "chart", without number, because the number depends on the previous tests
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2584,7 +2584,7 @@ void Chart2ExportTest::testTdf119029()
void Chart2ExportTest::testTdf108022()
{
- load("/chart2/qa/extras/data/odt/", "tdf108022.odt");
+ load(u"/chart2/qa/extras/data/odt/", "tdf108022.odt");
reload("Office Open XML Text");
// assert we really have two charts
@@ -2596,7 +2596,7 @@ void Chart2ExportTest::testTdf108022()
void Chart2ExportTest::testTdf121744()
{
- load("/chart2/qa/extras/data/docx/", "tdf121744.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf121744.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2609,7 +2609,7 @@ void Chart2ExportTest::testTdf121744()
void Chart2ExportTest::testTdf121189()
{
- load("/chart2/qa/extras/data/odp/", "tdf121189.odp");
+ load(u"/chart2/qa/extras/data/odp/", "tdf121189.odp");
reload("Impress Office Open XML");
uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent, uno::UNO_QUERY_THROW);
@@ -2623,7 +2623,7 @@ void Chart2ExportTest::testTdf122031()
{
//Checks pie chart data label format.
- load("/chart2/qa/extras/data/xlsx/", "tdf122031.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf122031.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2635,7 +2635,7 @@ void Chart2ExportTest::testTdf122031()
void Chart2ExportTest::testTdf115012()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf115012.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf115012.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// workaround: use-zero instead of leave-gap to show the original line chart
@@ -2644,7 +2644,7 @@ void Chart2ExportTest::testTdf115012()
void Chart2ExportTest::testTdf134118()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf134118.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf134118.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// workaround: use leave-gap instead of zero to show the original line chart
@@ -2653,7 +2653,7 @@ void Chart2ExportTest::testTdf134118()
void Chart2ExportTest::testTdf123206_customLabelText()
{
- load("/chart2/qa/extras/data/docx/", "tdf123206.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf123206.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2666,7 +2666,7 @@ void Chart2ExportTest::testTdf123206_customLabelText()
void Chart2ExportTest::testCustomLabelText()
{
- load("/chart2/qa/extras/data/docx/", "testCustomlabeltext.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testCustomlabeltext.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2685,7 +2685,7 @@ void Chart2ExportTest::testCustomLabelText()
void Chart2ExportTest::testDeletedLegendEntries()
{
- load("/chart2/qa/extras/data/xlsx/", "deleted_legend_entry.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "deleted_legend_entry.xlsx");
{
reload("Calc Office Open XML");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -2698,7 +2698,7 @@ void Chart2ExportTest::testDeletedLegendEntries()
CPPUNIT_ASSERT(!bShowLegendEntry);
}
- load("/chart2/qa/extras/data/xlsx/", "deleted_legend_entry2.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "deleted_legend_entry2.xlsx");
{
reload("Calc Office Open XML");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -2723,7 +2723,7 @@ void Chart2ExportTest::testDeletedLegendEntries()
void Chart2ExportTest::testTdf60316()
{
- load("/chart2/qa/extras/data/pptx/", "tdf60316.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf60316.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2734,7 +2734,7 @@ void Chart2ExportTest::testTdf60316()
void Chart2ExportTest::testTdf130225()
{
- load("/chart2/qa/extras/data/docx/", "piechart_deleted_legend_entry.docx");
+ load(u"/chart2/qa/extras/data/docx/", "piechart_deleted_legend_entry.docx");
reload("Office Open XML Text");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2748,7 +2748,7 @@ void Chart2ExportTest::testTdf130225()
void Chart2ExportTest::testTdf59857()
{
- load("/chart2/qa/extras/data/ods/", "tdf59857.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf59857.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2760,7 +2760,7 @@ void Chart2ExportTest::testTdf59857()
void Chart2ExportTest::testTdf126076()
{
- load("/chart2/qa/extras/data/xlsx/", "auto_marker_excel10.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "auto_marker_excel10.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2772,7 +2772,7 @@ void Chart2ExportTest::testTdf126076()
void Chart2ExportTest::testTdf75330()
{
- load("/chart2/qa/extras/data/ods/", "legend_overlay.ods");
+ load(u"/chart2/qa/extras/data/ods/", "legend_overlay.ods");
reload("calc8");
{
uno::Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0, mxComponent);
@@ -2797,7 +2797,7 @@ void Chart2ExportTest::testTdf75330()
void Chart2ExportTest::testTdf127792()
{
- load("/chart2/qa/extras/data/docx/", "MSO_axis_position.docx");
+ load(u"/chart2/qa/extras/data/docx/", "MSO_axis_position.docx");
{
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2812,7 +2812,7 @@ void Chart2ExportTest::testTdf127792()
void Chart2ExportTest::testTdf131979()
{
- load("/chart2/qa/extras/data/ods/", "tdf131115.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf131115.ods");
{
reload("calc8");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -2826,7 +2826,7 @@ void Chart2ExportTest::testTdf131979()
CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to false.", !blinknumberformattosource);
}
- load("/chart2/qa/extras/data/ods/", "tdf131979.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf131979.ods");
{
reload("calc8");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -2844,14 +2844,14 @@ void Chart2ExportTest::testTdf131979()
void Chart2ExportTest::testTdf132076()
{
{
- load("/chart2/qa/extras/data/ods/", "tdf132076.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf132076.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt", "formatCode", "dd");
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt", "sourceLinked", "0");
}
{
- load("/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt", "formatCode", "dd");
@@ -2861,7 +2861,7 @@ void Chart2ExportTest::testTdf132076()
void Chart2ExportTest::testTdf125812()
{
- load("/chart2/qa/extras/data/odp/", "ellipticalGradientFill.odp");
+ load(u"/chart2/qa/extras/data/odp/", "ellipticalGradientFill.odp");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path", "path", "circle");
@@ -2873,7 +2873,7 @@ void Chart2ExportTest::testTdf125812()
void Chart2ExportTest::testTdf133190()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2884,7 +2884,7 @@ void Chart2ExportTest::testTdf133190()
void Chart2ExportTest::testTdf133191()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2894,7 +2894,7 @@ void Chart2ExportTest::testTdf133191()
void Chart2ExportTest::testTdf132594()
{
- load("/chart2/qa/extras/data/xlsx/", "chart_pie2007.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "chart_pie2007.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2903,7 +2903,7 @@ void Chart2ExportTest::testTdf132594()
void Chart2ExportTest::testTdf134255()
{
- load("/chart2/qa/extras/data/docx/", "tdf134255.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf134255.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2923,7 +2923,7 @@ void Chart2ExportTest::testTdf134255()
void Chart2ExportTest::testTdf134977()
{
- load("/chart2/qa/extras/data/xlsx/", "custom_data_label.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "custom_data_label.xlsx");
//import test
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -2945,7 +2945,7 @@ void Chart2ExportTest::testTdf134977()
void Chart2ExportTest::testTdf123647()
{
- load("/chart2/qa/extras/data/xlsx/", "empty_chart.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "empty_chart.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2954,7 +2954,7 @@ void Chart2ExportTest::testTdf123647()
void Chart2ExportTest::testTdf136267()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf136267.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf136267.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2963,7 +2963,7 @@ void Chart2ExportTest::testTdf136267()
void Chart2ExportTest::testDataLabelPlacementPieChart()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf134978.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf134978.xlsx");
reload("calc8");
uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent),
UNO_QUERY_THROW);
@@ -2980,7 +2980,7 @@ void Chart2ExportTest::testDataLabelPlacementPieChart()
void Chart2ExportTest::testTdf137917()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf137917.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf137917.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2993,7 +2993,7 @@ void Chart2ExportTest::testTdf137917()
void Chart2ExportTest::testTdf138204()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf138204.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf138204.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -3018,7 +3018,7 @@ void Chart2ExportTest::testTdf138204()
void Chart2ExportTest::testTdf138181()
{
- load("/chart2/qa/extras/data/xlsx/", "piechart_deleted_legendentry.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "piechart_deleted_legendentry.xlsx");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
UNO_QUERY_THROW);
Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
@@ -3044,7 +3044,7 @@ void Chart2ExportTest::testTdf138181()
void Chart2ExportTest::testCustomShapeText()
{
- load("/chart2/qa/extras/data/ods/", "tdf72776.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf72776.ods");
reload("calc8");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
UNO_QUERY_THROW);
@@ -3060,7 +3060,7 @@ void Chart2ExportTest::testCustomShapeText()
void Chart2ExportTest::testuserShapesXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf128621.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf128621.xlsx");
reload("Calc Office Open XML");
Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
diff --git a/chart2/qa/extras/chart2geometry.cxx b/chart2/qa/extras/chart2geometry.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list