include/svx/ClassificationField.hxx | 2 include/svx/hdft.hxx | 8 include/svx/svxdlg.hxx | 2 svx/inc/sdr/primitive2d/primitivefactory2d.hxx | 4 svx/qa/unit/XTableImportExportTest.cxx | 8 svx/qa/unit/classicshapes.cxx | 6 svx/qa/unit/core.cxx | 11 svx/qa/unit/customshapes.cxx | 51 +- svx/qa/unit/gallery/test_gallery.cxx | 8 svx/qa/unit/gluepointTest.cxx | 4 svx/qa/unit/sdr.cxx | 42 - svx/qa/unit/svdraw.cxx | 154 +++--- svx/qa/unit/svdraw/test_SdrTextObject.cxx | 2 svx/qa/unit/table.cxx | 40 - svx/qa/unit/unodraw.cxx | 53 +- svx/qa/unit/xml.cxx | 4 svx/qa/unit/xoutdev.cxx | 14 svx/source/accessibility/AccessibleControlShape.cxx | 6 svx/source/accessibility/AccessibleGraphicShape.cxx | 4 svx/source/accessibility/AccessibleOLEShape.cxx | 4 svx/source/accessibility/AccessibleShape.cxx | 22 svx/source/accessibility/AccessibleTextHelper.cxx | 26 - svx/source/accessibility/DescriptionGenerator.cxx | 2 svx/source/accessibility/GraphCtlAccessibleContext.cxx | 10 svx/source/accessibility/SvxShapeTypes.cxx | 62 +- svx/source/accessibility/charmapacc.cxx | 2 svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 4 svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2 svx/source/core/graphichelper.cxx | 18 svx/source/customshapes/EnhancedCustomShape2d.cxx | 16 svx/source/customshapes/EnhancedCustomShape3d.cxx | 60 +- svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 6 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 4 svx/source/diagram/IDiagramHelper.cxx | 2 svx/source/dialog/ClassificationCommon.cxx | 4 svx/source/dialog/ClassificationDialog.cxx | 44 - svx/source/dialog/FileExportedDialog.cxx | 7 svx/source/dialog/GenericCheckDialog.cxx | 15 svx/source/dialog/SafeModeDialog.cxx | 48 - svx/source/dialog/SafeModeUI.cxx | 4 svx/source/dialog/ThemeColorEditDialog.cxx | 32 - svx/source/dialog/ThemeDialog.cxx | 6 svx/source/dialog/_bmpmask.cxx | 56 +- svx/source/dialog/_contdlg.cxx | 98 ++-- svx/source/dialog/charmap.cxx | 8 svx/source/dialog/compressgraphicdialog.cxx | 54 +- svx/source/dialog/contwnd.cxx | 4 svx/source/dialog/ctredlin.cxx | 66 +- svx/source/dialog/cuicharmap.cxx | 42 - svx/source/dialog/dialcontrol.cxx | 2 svx/source/dialog/dlgctl3d.cxx | 2 svx/source/dialog/dlgctrl.cxx | 16 svx/source/dialog/docrecovery.cxx | 36 - svx/source/dialog/fontwork.cxx | 50 +- svx/source/dialog/gotodlg.cxx | 8 svx/source/dialog/hdft.cxx | 60 +- svx/source/dialog/imapdlg.cxx | 142 ++--- svx/source/dialog/imapwnd.cxx | 50 +- svx/source/dialog/langbox.cxx | 4 svx/source/dialog/linkwarn.cxx | 5 svx/source/dialog/optgrid.cxx | 78 +-- svx/source/dialog/pagectrl.cxx | 2 svx/source/dialog/pagenumberlistbox.cxx | 2 svx/source/dialog/passwd.cxx | 20 svx/source/dialog/rubydialog.cxx | 46 - svx/source/dialog/signaturelinehelper.cxx | 14 svx/source/dialog/srchdlg.cxx | 130 ++--- svx/source/dialog/svxbmpnumvalueset.cxx | 2 svx/source/dialog/svxruler.cxx | 8 svx/source/dialog/weldeditview.cxx | 20 svx/source/engine3d/float3d.cxx | 242 +++++----- svx/source/fmcomp/dbaexchange.cxx | 6 svx/source/fmcomp/dbaobjectex.cxx | 6 svx/source/fmcomp/fmgridcl.cxx | 92 +-- svx/source/fmcomp/fmgridif.cxx | 12 svx/source/fmcomp/gridcell.cxx | 4 svx/source/fmcomp/gridctrl.cxx | 36 - svx/source/fmcomp/xmlexchg.cxx | 2 svx/source/form/ParseContext.cxx | 2 svx/source/form/dataaccessdescriptor.cxx | 28 - svx/source/form/databaselocationinput.cxx | 14 svx/source/form/datanavi.cxx | 224 ++++----- svx/source/form/filtnav.cxx | 24 svx/source/form/fmPropBrw.cxx | 26 - svx/source/form/fmcontrollayout.cxx | 20 svx/source/form/fmexch.cxx | 6 svx/source/form/fmexpl.cxx | 4 svx/source/form/fmobj.cxx | 4 svx/source/form/fmpgeimp.cxx | 4 svx/source/form/fmscriptingenv.cxx | 2 svx/source/form/fmshell.cxx | 8 svx/source/form/fmshimp.cxx | 22 svx/source/form/fmsrcimp.cxx | 4 svx/source/form/fmtextcontroldialogs.cxx | 20 svx/source/form/fmtextcontrolshell.cxx | 6 svx/source/form/fmtools.cxx | 2 svx/source/form/fmundo.cxx | 4 svx/source/form/fmview.cxx | 2 svx/source/form/fmvwimp.cxx | 6 svx/source/form/formcontrolfactory.cxx | 6 svx/source/form/formcontroller.cxx | 28 - svx/source/form/formtoolbars.cxx | 4 svx/source/form/labelitemwindow.cxx | 8 svx/source/form/legacyformcontroller.cxx | 4 svx/source/form/navigatortree.cxx | 38 - svx/source/form/tabwin.cxx | 4 svx/source/form/tbxform.cxx | 6 svx/source/form/xfm_addcondition.cxx | 12 svx/source/gallery2/GalleryControl.cxx | 2 svx/source/gallery2/galbrws1.cxx | 112 ++-- svx/source/gallery2/galctrl.cxx | 4 svx/source/gallery2/gallery1.cxx | 2 svx/source/gallery2/galleryfilestorage.cxx | 8 svx/source/gallery2/galmisc.cxx | 16 svx/source/gallery2/galobj.cxx | 4 svx/source/gallery2/galtheme.cxx | 2 svx/source/gengal/gengal.cxx | 4 svx/source/items/numinf.cxx | 4 svx/source/mnuctrls/clipboardctl.cxx | 10 svx/source/mnuctrls/smarttagmenu.cxx | 4 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 6 svx/source/sdr/overlay/overlaymanager.cxx | 2 svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 2 svx/source/sidebar/EmptyPanel.cxx | 2 svx/source/sidebar/PanelFactory.cxx | 18 svx/source/sidebar/area/AreaPropertyPanel.cxx | 6 svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 34 - svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx | 22 svx/source/sidebar/effect/EffectPropertyPanel.cxx | 19 svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx | 12 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 14 svx/source/sidebar/inspector/InspectorTextPanel.cxx | 10 svx/source/sidebar/line/LinePropertyPanel.cxx | 6 svx/source/sidebar/line/LinePropertyPanelBase.cxx | 24 svx/source/sidebar/line/LineWidthPopup.cxx | 11 svx/source/sidebar/lists/ListsPropertyPanel.cxx | 12 svx/source/sidebar/media/MediaPlaybackPanel.cxx | 22 svx/source/sidebar/nbdtmg.cxx | 2 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 24 svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx | 4 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 44 - svx/source/sidebar/paragraph/ParaSpacingControl.cxx | 4 svx/source/sidebar/paragraph/ParaSpacingWindow.cxx | 30 - svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 66 +- svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 30 - svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 26 - svx/source/sidebar/styles/StylesPropertyPanel.cxx | 10 svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 18 svx/source/sidebar/text/TextCharacterSpacingPopup.cxx | 4 svx/source/sidebar/text/TextPropertyPanel.cxx | 26 - svx/source/sidebar/text/TextUnderlineControl.cxx | 26 - svx/source/sidebar/text/TextUnderlinePopup.cxx | 4 svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx | 12 svx/source/smarttags/SmartTagMgr.cxx | 16 svx/source/stbctrls/insctrl.cxx | 4 svx/source/stbctrls/modctrl.cxx | 2 svx/source/stbctrls/pszctrl.cxx | 38 - svx/source/stbctrls/selctrl.cxx | 16 svx/source/stbctrls/xmlsecctrl.cxx | 6 svx/source/stbctrls/zoomctrl.cxx | 20 svx/source/stbctrls/zoomsliderctrl.cxx | 6 svx/source/styles/ColorSets.cxx | 14 svx/source/svdraw/charthelper.cxx | 6 svx/source/svdraw/sdrpagewindow.cxx | 4 svx/source/svdraw/svdattr.cxx | 18 svx/source/svdraw/svdedtv.cxx | 4 svx/source/svdraw/svdedtv1.cxx | 2 svx/source/svdraw/svdedtv2.cxx | 10 svx/source/svdraw/svdedxv.cxx | 4 svx/source/svdraw/svdhdl.cxx | 52 +- svx/source/svdraw/svdlayer.cxx | 4 svx/source/svdraw/svdmodel.cxx | 36 - svx/source/svdraw/svdoashp.cxx | 28 - svx/source/svdraw/svdobj.cxx | 4 svx/source/svdraw/svdograf.cxx | 2 svx/source/svdraw/svdomeas.cxx | 2 svx/source/svdraw/svdomedia.cxx | 12 svx/source/svdraw/svdoole2.cxx | 8 svx/source/svdraw/svdotextdecomposition.cxx | 2 svx/source/svdraw/svdotxed.cxx | 2 svx/source/svdraw/svdotxln.cxx | 2 svx/source/svdraw/svdouno.cxx | 6 svx/source/svdraw/svdpage.cxx | 6 svx/source/svdraw/svdpntv.cxx | 2 svx/source/svdraw/svdtrans.cxx | 52 +- svx/source/svdraw/svdview.cxx | 8 svx/source/table/accessiblecell.cxx | 6 svx/source/table/accessibletableshape.cxx | 6 svx/source/table/cell.cxx | 2 svx/source/table/svdotable.cxx | 6 svx/source/table/tablecontroller.cxx | 2 svx/source/table/tabledesign.cxx | 30 - svx/source/tbxctrls/Palette.cxx | 4 svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx | 24 svx/source/tbxctrls/StylesPreviewWindow.cxx | 31 - svx/source/tbxctrls/SvxColorValueSet.cxx | 2 svx/source/tbxctrls/SvxPresetListBox.cxx | 4 svx/source/tbxctrls/bulletsnumbering.cxx | 30 - svx/source/tbxctrls/colrctrl.cxx | 10 svx/source/tbxctrls/extrusioncontrols.cxx | 80 +-- svx/source/tbxctrls/fillctrl.cxx | 38 - svx/source/tbxctrls/fontworkgallery.cxx | 50 +- svx/source/tbxctrls/formatpaintbrushctrl.cxx | 4 svx/source/tbxctrls/grafctrl.cxx | 14 svx/source/tbxctrls/itemwin.cxx | 20 svx/source/tbxctrls/layctrl.cxx | 28 - svx/source/tbxctrls/lboxctrl.cxx | 16 svx/source/tbxctrls/linectrl.cxx | 36 - svx/source/tbxctrls/linewidthctrl.cxx | 2 svx/source/tbxctrls/tbcontrl.cxx | 178 +++---- svx/source/tbxctrls/tbunocontroller.cxx | 18 svx/source/tbxctrls/tbunosearchcontrollers.cxx | 50 +- svx/source/tbxctrls/tbxcolor.cxx | 4 svx/source/tbxctrls/tbxcolorupdate.cxx | 6 svx/source/tbxctrls/verttexttbxctrl.cxx | 10 svx/source/toolbars/extrusionbar.cxx | 24 svx/source/toolbars/fontworkbar.cxx | 8 svx/source/uitest/sdrobject.cxx | 120 ++-- svx/source/uitest/uiobject.cxx | 28 - svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 28 - svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 4 svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx | 12 svx/source/unodraw/SvxXTextColumns.cxx | 7 svx/source/unodraw/UnoGraphicExporter.cxx | 12 svx/source/unodraw/UnoNamespaceMap.cxx | 4 svx/source/unodraw/XPropertyTable.cxx | 24 svx/source/unodraw/recoveryui.cxx | 6 svx/source/unodraw/tableshape.cxx | 2 svx/source/unodraw/unobtabl.cxx | 4 svx/source/unodraw/unoctabl.cxx | 6 svx/source/unodraw/unodtabl.cxx | 4 svx/source/unodraw/unogtabl.cxx | 7 svx/source/unodraw/unohtabl.cxx | 4 svx/source/unodraw/unomod.cxx | 56 +- svx/source/unodraw/unomtabl.cxx | 4 svx/source/unodraw/unopage.cxx | 6 svx/source/unodraw/unopool.cxx | 8 svx/source/unodraw/unoprov.cxx | 2 svx/source/unodraw/unoshap2.cxx | 64 +- svx/source/unodraw/unoshap4.cxx | 30 - svx/source/unodraw/unoshape.cxx | 16 svx/source/unodraw/unoshcol.cxx | 4 svx/source/unodraw/unoshtxt.cxx | 2 svx/source/unodraw/unottabl.cxx | 4 svx/source/unogallery/unogalitem.cxx | 16 svx/source/unogallery/unogaltheme.cxx | 4 svx/source/unogallery/unogalthemeprovider.cxx | 4 svx/source/xml/xmleohlp.cxx | 8 svx/source/xml/xmlgrhlp.cxx | 30 - svx/source/xml/xmlxtexp.cxx | 8 svx/source/xml/xmlxtimp.cxx | 14 svx/source/xoutdev/_xoutbmp.cxx | 4 svx/source/xoutdev/xattr.cxx | 12 svx/source/xoutdev/xattrbmp.cxx | 4 svx/source/xoutdev/xtabcolr.cxx | 2 svx/source/xoutdev/xtable.cxx | 4 256 files changed, 2636 insertions(+), 2597 deletions(-)
New commits: commit bc91cc47505c448ded7297074ccff809b59e8ed1 Author: Noel Grandin <[email protected]> AuthorDate: Fri May 10 13:18:59 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat May 11 12:41:09 2024 +0200 loplugin:ostr in svx Change-Id: Ia765a03e033acb82e367873380d289587ea87d6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167449 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/include/svx/ClassificationField.hxx b/include/svx/ClassificationField.hxx index e2b5a71ab775..4e2633d0392b 100644 --- a/include/svx/ClassificationField.hxx +++ b/include/svx/ClassificationField.hxx @@ -36,7 +36,7 @@ public: OUString msIdentifier; //< The identifier of this entry (from example.xml). ClassificationResult(ClassificationType eType, OUString sName, - OUString sAbbreviatedName, OUString sIdentifier = "") + OUString sAbbreviatedName, OUString sIdentifier = u""_ustr) : meType(eType) , msName(std::move(sName)) , msAbbreviatedName(std::move(sAbbreviatedName)) diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 8eadfa366e66..6890e23fc78b 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -113,8 +113,8 @@ class SVX_DLLPUBLIC DeleteHeaderDialog final : public weld::MessageDialogControl { public: DeleteHeaderDialog(weld::Widget* pParent) - : MessageDialogController(pParent, "svx/ui/deleteheaderdialog.ui", - "DeleteHeaderDialog") + : MessageDialogController(pParent, u"svx/ui/deleteheaderdialog.ui"_ustr, + u"DeleteHeaderDialog"_ustr) { } }; @@ -123,8 +123,8 @@ class SVX_DLLPUBLIC DeleteFooterDialog final : public weld::MessageDialogControl { public: DeleteFooterDialog(weld::Widget* pParent) - : MessageDialogController(pParent, "svx/ui/deletefooterdialog.ui", - "DeleteFooterDialog") + : MessageDialogController(pParent, u"svx/ui/deletefooterdialog.ui"_ustr, + u"DeleteFooterDialog"_ustr) { } }; diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index f775c1099917..aa73fb57e5c2 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -377,7 +377,7 @@ public: virtual VclPtr<AbstractSvxNewDictionaryDialog> CreateSvxNewDictionaryDialog(weld::Window* pParent) = 0; virtual VclPtr<VclAbstractDialog> CreateSvxEditDictionaryDialog(weld::Window* pParent, const OUString& rName) = 0; virtual VclPtr<AbstractSvxNameDialog> CreateSvxNameDialog(weld::Window* pParent, - const OUString& rName, const OUString& rDesc, const OUString& rTitle = "" ) = 0; + const OUString& rName, const OUString& rDesc, const OUString& rTitle = u""_ustr ) = 0; // #i68101# virtual VclPtr<AbstractSvxObjectNameDialog> CreateSvxObjectNameDialog(weld::Window* pParent, const OUString& rName) = 0; diff --git a/svx/inc/sdr/primitive2d/primitivefactory2d.hxx b/svx/inc/sdr/primitive2d/primitivefactory2d.hxx index eb1c8fd9b92f..ab0b6d783f1f 100644 --- a/svx/inc/sdr/primitive2d/primitivefactory2d.hxx +++ b/svx/inc/sdr/primitive2d/primitivefactory2d.hxx @@ -51,7 +51,7 @@ public: OUString SAL_CALL getImplementationName() override { - return "com.sun.star.comp.graphic.PrimitiveFactory2D"; + return u"com.sun.star.comp.graphic.PrimitiveFactory2D"_ustr; } sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override @@ -61,7 +61,7 @@ public: css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { - return { "com.sun.star.graphic.PrimitiveFactory2D" }; + return { u"com.sun.star.graphic.PrimitiveFactory2D"_ustr }; } }; diff --git a/svx/qa/unit/XTableImportExportTest.cxx b/svx/qa/unit/XTableImportExportTest.cxx index cfab5c47c58f..a1d5673b096e 100644 --- a/svx/qa/unit/XTableImportExportTest.cxx +++ b/svx/qa/unit/XTableImportExportTest.cxx @@ -41,7 +41,7 @@ CPPUNIT_TEST_FIXTURE(XTableImportExportTest, testImportExport) BitmapChecksum aChecksum(0); { - rtl::Reference<XBitmapList> xBitmapList = new XBitmapList(aTempURL, "REF"); + rtl::Reference<XBitmapList> xBitmapList = new XBitmapList(aTempURL, u"REF"_ustr); uno::Reference<container::XNameContainer> xNameContainer(xBitmapList->createInstance()); CPPUNIT_ASSERT(xNameContainer.is()); @@ -51,20 +51,20 @@ CPPUNIT_TEST_FIXTURE(XTableImportExportTest, testImportExport) Graphic aGraphic(aBitmapEx); uno::Reference<awt::XBitmap> xBitmap(aGraphic.GetXGraphic(), css::uno::UNO_QUERY); - xNameContainer->insertByName("SomeBitmap", uno::Any(xBitmap)); + xNameContainer->insertByName(u"SomeBitmap"_ustr, uno::Any(xBitmap)); xBitmapList->Save(); aChecksum = aBitmap.GetChecksum(); } { - rtl::Reference<XBitmapList> xBitmapList = new XBitmapList(aTempURL, "REF"); + rtl::Reference<XBitmapList> xBitmapList = new XBitmapList(aTempURL, u"REF"_ustr); bool bResult = xBitmapList->Load(); CPPUNIT_ASSERT(bResult); uno::Reference<container::XNameContainer> xNameContainer(xBitmapList->createInstance()); CPPUNIT_ASSERT(xNameContainer.is()); - uno::Any aAny = xNameContainer->getByName("SomeBitmap"); + uno::Any aAny = xNameContainer->getByName(u"SomeBitmap"_ustr); CPPUNIT_ASSERT(aAny.has<uno::Reference<awt::XBitmap>>()); auto xBitmap = aAny.get<uno::Reference<awt::XBitmap>>(); CPPUNIT_ASSERT(xBitmap.is()); diff --git a/svx/qa/unit/classicshapes.cxx b/svx/qa/unit/classicshapes.cxx index 477a331a870d..07a4b9f916ab 100644 --- a/svx/qa/unit/classicshapes.cxx +++ b/svx/qa/unit/classicshapes.cxx @@ -27,7 +27,7 @@ class ClassicshapesTest : public UnoApiTest { public: ClassicshapesTest() - : UnoApiTest("svx/qa/unit/data/") + : UnoApiTest(u"svx/qa/unit/data/"_ustr) { } @@ -173,8 +173,8 @@ CPPUNIT_TEST_FIXTURE(ClassicshapesTest, testTdf130076Flip) uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); uno::Reference<drawing::XShape> xShape2(getShape(2, nPageIndex)); uno::Reference<beans::XPropertySet> xShapeProps2(xShape2, uno::UNO_QUERY); - CPPUNIT_ASSERT(xShapeProps->getPropertyValue("CircleStartAngle") >>= nAngle1); - CPPUNIT_ASSERT(xShapeProps2->getPropertyValue("CircleStartAngle") >>= nAngle2); + CPPUNIT_ASSERT(xShapeProps->getPropertyValue(u"CircleStartAngle"_ustr) >>= nAngle1); + CPPUNIT_ASSERT(xShapeProps2->getPropertyValue(u"CircleStartAngle"_ustr) >>= nAngle2); CPPUNIT_ASSERT_EQUAL_MESSAGE(OUString("Incorrect vertical flip starting angle on page " + OUString::number(nPageIndex)) .toUtf8() diff --git a/svx/qa/unit/core.cxx b/svx/qa/unit/core.cxx index d7055993ca94..6349397c7d33 100644 --- a/svx/qa/unit/core.cxx +++ b/svx/qa/unit/core.cxx @@ -27,7 +27,7 @@ class Test : public UnoApiTest { public: Test() - : UnoApiTest("svx/qa/unit/data/") + : UnoApiTest(u"svx/qa/unit/data/"_ustr) { } }; @@ -42,7 +42,7 @@ CPPUNIT_TEST_FIXTURE(Test, testChartExportToPdf) uno::Reference<drawing::XShape> xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY); // When exporting that chart to PDF: - GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, "application/pdf", + GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, u"application/pdf"_ustr, maTempFile.GetURL()); // Then make sure we get a valid, non-empty PDF: @@ -71,14 +71,15 @@ CPPUNIT_TEST_FIXTURE(Test, testGraphicObjectResolver) // Test name in root folder { - uno::Reference<graphic::XGraphic> xGraphic = xGraphicHelper->loadGraphic("SomeImage.png"); + uno::Reference<graphic::XGraphic> xGraphic + = xGraphicHelper->loadGraphic(u"SomeImage.png"_ustr); CPPUNIT_ASSERT_EQUAL(true, xGraphic.is()); } // Test name in sub-folder { uno::Reference<graphic::XGraphic> xGraphic - = xGraphicHelper->loadGraphic("Pictures/SomeOtherImage.png"); + = xGraphicHelper->loadGraphic(u"Pictures/SomeOtherImage.png"_ustr); CPPUNIT_ASSERT_EQUAL(true, xGraphic.is()); } @@ -87,7 +88,7 @@ CPPUNIT_TEST_FIXTURE(Test, testGraphicObjectResolver) uno::Reference<graphic::XGraphic> xGraphic; try { - xGraphic = xGraphicHelper->loadGraphic("NoneExistent.png"); + xGraphic = xGraphicHelper->loadGraphic(u"NoneExistent.png"_ustr); } catch (const uno::Exception&) { diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx index 27848c6a23c0..304ae64f23b2 100644 --- a/svx/qa/unit/customshapes.cxx +++ b/svx/qa/unit/customshapes.cxx @@ -50,7 +50,7 @@ class CustomshapesTest : public UnoApiTest { public: CustomshapesTest() - : UnoApiTest("svx/qa/unit/data/") + : UnoApiTest(u"svx/qa/unit/data/"_ustr) { } @@ -90,7 +90,8 @@ sal_uInt8 CustomshapesTest::countShapes() Color CustomshapesTest::getColor(uno::Reference<drawing::XShape> xShape, const double& fX, const double& fY) { - GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, "image/png", maTempFile.GetURL()); + GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, u"image/png"_ustr, + maTempFile.GetURL()); SvFileStream aFileStream(maTempFile.GetURL(), StreamMode::READ); vcl::PngImageReader aPNGReader(aFileStream); Bitmap aBMP = aPNGReader.read().GetBitmap(); @@ -113,7 +114,7 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf150302) const SdrCustomShapeGeometryItem& rGeometryItem( pSdrCustomShape->GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY)); const css::uno::Any* pAny - = rGeometryItem.GetPropertyValueByName("TextPath", "SameLetterHeights"); + = rGeometryItem.GetPropertyValueByName(u"TextPath"_ustr, u"SameLetterHeights"_ustr); if (pAny) *pAny >>= bSameHeights; @@ -124,11 +125,11 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf150302) SdrView* pSdrView = pViewShell->GetDrawView(); pSdrView->MarkObj(pSdrCustomShape, pSdrView->GetSdrPageView()); - dispatchCommand(mxComponent, ".uno:FontworkSameLetterHeights", {}); + dispatchCommand(mxComponent, u".uno:FontworkSameLetterHeights"_ustr, {}); const SdrCustomShapeGeometryItem& rGeometryItem1 = pSdrCustomShape->GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY); - pAny = rGeometryItem1.GetPropertyValueByName("TextPath", "SameLetterHeights"); + pAny = rGeometryItem1.GetPropertyValueByName(u"TextPath"_ustr, u"SameLetterHeights"_ustr); if (pAny) *pAny >>= bSameHeights; @@ -136,11 +137,11 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf150302) pSdrView->MarkObj(pSdrCustomShape, pSdrView->GetSdrPageView()); - dispatchCommand(mxComponent, ".uno:FontworkSameLetterHeights", {}); + dispatchCommand(mxComponent, u".uno:FontworkSameLetterHeights"_ustr, {}); const SdrCustomShapeGeometryItem& rGeometryItem2 = pSdrCustomShape->GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY); - pAny = rGeometryItem2.GetPropertyValueByName("TextPath", "SameLetterHeights"); + pAny = rGeometryItem2.GetPropertyValueByName(u"TextPath"_ustr, u"SameLetterHeights"_ustr); if (pAny) *pAny >>= bSameHeights; @@ -161,7 +162,7 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf147409_GeomItemHash) // Apply FontworkSameLetterHeights toggle // Without patch a debug build fails assert in SfxItemPool::DirectPutItemInPoolImpl and so crashes. - dispatchCommand(mxComponent, ".uno:FontworkSameLetterHeights", {}); + dispatchCommand(mxComponent, u".uno:FontworkSameLetterHeights"_ustr, {}); } CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf146866_GeomItemHash) @@ -178,7 +179,7 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf146866_GeomItemHash) // Apply extrusion toggle // Without patch a debug build fails assert in SfxItemPool::DirectPutItemInPoolImpl and so crashes. - dispatchCommand(mxComponent, ".uno:ExtrusionToggle", {}); + dispatchCommand(mxComponent, u".uno:ExtrusionToggle"_ustr, {}); } CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf145700_3D_NonUI) @@ -190,7 +191,8 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf145700_3D_NonUI) // Generate bitmap from shape uno::Reference<drawing::XShape> xShape = getShape(0); - GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, "image/png", maTempFile.GetURL()); + GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, u"image/png"_ustr, + maTempFile.GetURL()); // Read bitmap and test color // The expected values are taken from an image generated by Word @@ -226,7 +228,8 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf145700_3D_FrontLightDim) // Generate bitmap from shape uno::Reference<drawing::XShape> xShape = getShape(0); - GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, "image/png", maTempFile.GetURL()); + GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, u"image/png"_ustr, + maTempFile.GetURL()); // Read bitmap and test color // The expected values are taken from an image generated by Word @@ -255,7 +258,8 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf145700_3D_FirstLightHarsh) // Generate bitmap from shape uno::Reference<drawing::XShape> xShape = getShape(0); - GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, "image/png", maTempFile.GetURL()); + GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, u"image/png"_ustr, + maTempFile.GetURL()); // Read bitmap and test color in center SvFileStream aFileStream(maTempFile.GetURL(), StreamMode::READ); @@ -309,7 +313,7 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf145904_Extrusion_CenterZ_odt) awt::Rectangle aBoundRect; xPropSet->getPropertyValue(UNO_NAME_MISC_OBJ_BOUNDRECT) >>= aBoundRect; awt::Point aAnchorPosition; - xPropSet->getPropertyValue("AnchorPosition") >>= aAnchorPosition; + xPropSet->getPropertyValue(u"AnchorPosition"_ustr) >>= aAnchorPosition; sal_Int32 nActualLeft = aBoundRect.X - aAnchorPosition.X; // Without the fix it would have failed with left = 7731. @@ -334,7 +338,7 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf145904_Extrusion_CenterY_odt) awt::Rectangle aBoundRect; xPropSet->getPropertyValue(UNO_NAME_MISC_OBJ_BOUNDRECT) >>= aBoundRect; awt::Point aAnchorPosition; - xPropSet->getPropertyValue("AnchorPosition") >>= aAnchorPosition; + xPropSet->getPropertyValue(u"AnchorPosition"_ustr) >>= aAnchorPosition; sal_Int32 nActualTop = aBoundRect.Y - aAnchorPosition.Y; // Without the fix it would have failed with top = 2252. @@ -359,7 +363,7 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf145904_Extrusion_CenterY_doc) awt::Rectangle aBoundRect; xPropSet->getPropertyValue(UNO_NAME_MISC_OBJ_BOUNDRECT) >>= aBoundRect; awt::Point aAnchorPosition; - xPropSet->getPropertyValue("AnchorPosition") >>= aAnchorPosition; + xPropSet->getPropertyValue(u"AnchorPosition"_ustr) >>= aAnchorPosition; sal_Int32 nActualTop = aBoundRect.Y - aAnchorPosition.Y; // Without the fix it would have failed with top = 2330 @@ -799,10 +803,10 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf115813_OOXML_XY_handle) uno::Reference<drawing::XShape> xShape(getShape(i)); SdrObjCustomShape& rSdrObjCustomShape( static_cast<SdrObjCustomShape&>(*SdrObject::getSdrObjectFromXShape(xShape))); - OUString sShapeType("non-primitive"); // default for ODF + OUString sShapeType(u"non-primitive"_ustr); // default for ODF const SdrCustomShapeGeometryItem& rGeometryItem( rSdrObjCustomShape.GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY)); - const uno::Any* pAny = rGeometryItem.GetPropertyValueByName("Type"); + const uno::Any* pAny = rGeometryItem.GetPropertyValueByName(u"Type"_ustr); if (pAny) *pAny >>= sShapeType; @@ -869,10 +873,10 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf126512_OOXML_handle_in_ODP) uno::Reference<drawing::XShape> xShape(getShape(i)); SdrObjCustomShape& rSdrObjCustomShape( static_cast<SdrObjCustomShape&>(*SdrObject::getSdrObjectFromXShape(xShape))); - OUString sShapeType("non-primitive"); // only to initialize, value not used here + OUString sShapeType(u"non-primitive"_ustr); // only to initialize, value not used here const SdrCustomShapeGeometryItem& rGeometryItem( rSdrObjCustomShape.GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY)); - const uno::Any* pAny = rGeometryItem.GetPropertyValueByName("Type"); + const uno::Any* pAny = rGeometryItem.GetPropertyValueByName(u"Type"_ustr); if (pAny) *pAny >>= sShapeType; @@ -1178,7 +1182,7 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf136176) } // Save and reload - saveAndReload("draw8"); + saveAndReload(u"draw8"_ustr); // Expected values of point 4 of the shape polygon const OString sTestCase[] = { "FlipH"_ostr, "FlipV"_ostr, "FlipHV"_ostr }; @@ -1213,7 +1217,8 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf148501_OctagonBevel) // Generate bitmap from shape uno::Reference<drawing::XShape> xShape = getShape(0); - GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, "image/png", maTempFile.GetURL()); + GraphicHelper::SaveShapeAsGraphicToPath(mxComponent, xShape, u"image/png"_ustr, + maTempFile.GetURL()); // Read bitmap and test color // expected in order top-left, top, top-right, right, bottom-right: @@ -1246,7 +1251,7 @@ bool lcl_getShapeSegments(uno::Sequence<drawing::EnhancedCustomShapeSegment>& rS const uno::Reference<drawing::XShape>& xShape) { uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY_THROW); - uno::Any anotherAny = xShapeProps->getPropertyValue("CustomShapeGeometry"); + uno::Any anotherAny = xShapeProps->getPropertyValue(u"CustomShapeGeometry"_ustr); uno::Sequence<beans::PropertyValue> aCustomShapeGeometry; if (!(anotherAny >>= aCustomShapeGeometry)) return false; @@ -1338,7 +1343,7 @@ bool lcl_getShapeCoordinates(uno::Sequence<drawing::EnhancedCustomShapeParameter const uno::Reference<drawing::XShape>& xShape) { uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY_THROW); - uno::Any anotherAny = xShapeProps->getPropertyValue("CustomShapeGeometry"); + uno::Any anotherAny = xShapeProps->getPropertyValue(u"CustomShapeGeometry"_ustr); uno::Sequence<beans::PropertyValue> aCustomShapeGeometry; if (!(anotherAny >>= aCustomShapeGeometry)) return false; diff --git a/svx/qa/unit/gallery/test_gallery.cxx b/svx/qa/unit/gallery/test_gallery.cxx index 6fb033e5f880..7e2df25e14cb 100644 --- a/svx/qa/unit/gallery/test_gallery.cxx +++ b/svx/qa/unit/gallery/test_gallery.cxx @@ -309,7 +309,8 @@ void GalleryObjTest::TestInsertGalleryObject() CPPUNIT_ASSERT_EQUAL_MESSAGE("Object count inconsistent", sal_uInt32(0), pGalleryTheme->GetObjectCount()); - std::vector<OUString> imageList{ "galtest1.png", "galtest2.png", "galtest3.jpg" }; + std::vector<OUString> imageList{ u"galtest1.png"_ustr, u"galtest2.png"_ustr, + u"galtest3.jpg"_ustr }; for (sal_uInt32 i = 0; i < static_cast<sal_uInt32>(imageList.size()); i++) { @@ -354,7 +355,8 @@ void GalleryObjTest::TestRemoveGalleryObject() CPPUNIT_ASSERT_EQUAL_MESSAGE("Object count inconsistent", sal_uInt32(0), pGalleryTheme->GetObjectCount()); - std::vector<OUString> imageList{ "galtest1.png", "galtest2.png", "galtest3.jpg" }; + std::vector<OUString> imageList{ u"galtest1.png"_ustr, u"galtest2.png"_ustr, + u"galtest3.jpg"_ustr }; for (sal_uInt32 i = 0; i < static_cast<sal_uInt32>(imageList.size()); i++) { @@ -409,7 +411,7 @@ void GalleryObjTest::TestChangePositionGalleryObject() CPPUNIT_ASSERT_EQUAL_MESSAGE("Object count inconsistent", sal_uInt32(0), pGalleryTheme->GetObjectCount()); - OUString imageList[] = { "galtest1.png", "galtest2.png", "galtest3.jpg" }; + OUString imageList[] = { u"galtest1.png"_ustr, u"galtest2.png"_ustr, u"galtest3.jpg"_ustr }; for (sal_uInt32 i = 0; i < (sizeof(imageList) / sizeof(imageList[0])); i++) { diff --git a/svx/qa/unit/gluepointTest.cxx b/svx/qa/unit/gluepointTest.cxx index fbade68c3558..b77d16919acb 100644 --- a/svx/qa/unit/gluepointTest.cxx +++ b/svx/qa/unit/gluepointTest.cxx @@ -28,7 +28,7 @@ class GluePointTest : public UnoApiTest { public: GluePointTest() - : UnoApiTest("svx/qa/unit/data/") + : UnoApiTest(u"svx/qa/unit/data/"_ustr) { } @@ -57,7 +57,7 @@ bool lcl_getGeometryGluePoints( const uno::Reference<drawing::XShape>& xShape) { uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY_THROW); - uno::Any anotherAny = xShapeProps->getPropertyValue("CustomShapeGeometry"); + uno::Any anotherAny = xShapeProps->getPropertyValue(u"CustomShapeGeometry"_ustr); uno::Sequence<beans::PropertyValue> aCustomShapeGeometry; if (!(anotherAny >>= aCustomShapeGeometry)) return false; diff --git a/svx/qa/unit/sdr.cxx b/svx/qa/unit/sdr.cxx index 681e3100aca1..ef90c753421a 100644 --- a/svx/qa/unit/sdr.cxx +++ b/svx/qa/unit/sdr.cxx @@ -31,7 +31,7 @@ class SdrTest : public UnoApiXmlTest { public: SdrTest() - : UnoApiXmlTest("svx/qa/unit/data/") + : UnoApiXmlTest(u"svx/qa/unit/data/"_ustr) { } @@ -101,32 +101,32 @@ CPPUNIT_TEST_FIXTURE(SdrTest, testShadowAlignment) // - Actual : 162 // - In <>, attribute 'xy13' of '(//shadow/transform)[1]' incorrect value. // i.e. shadow alignment was ignored while scaling the shadow. - assertXPath(pDocument, "(//shadow/transform)[1]"_ostr, "xy13"_ostr, "-568"); - assertXPath(pDocument, "(//shadow/transform)[1]"_ostr, "xy23"_ostr, "162"); + assertXPath(pDocument, "(//shadow/transform)[1]"_ostr, "xy13"_ostr, u"-568"_ustr); + assertXPath(pDocument, "(//shadow/transform)[1]"_ostr, "xy23"_ostr, u"162"_ustr); - assertXPath(pDocument, "(//shadow/transform)[2]"_ostr, "xy13"_ostr, "-1795"); - assertXPath(pDocument, "(//shadow/transform)[2]"_ostr, "xy23"_ostr, "162"); + assertXPath(pDocument, "(//shadow/transform)[2]"_ostr, "xy13"_ostr, u"-1795"_ustr); + assertXPath(pDocument, "(//shadow/transform)[2]"_ostr, "xy23"_ostr, u"162"_ustr); - assertXPath(pDocument, "(//shadow/transform)[3]"_ostr, "xy13"_ostr, "-3021"); - assertXPath(pDocument, "(//shadow/transform)[3]"_ostr, "xy23"_ostr, "161"); + assertXPath(pDocument, "(//shadow/transform)[3]"_ostr, "xy13"_ostr, u"-3021"_ustr); + assertXPath(pDocument, "(//shadow/transform)[3]"_ostr, "xy23"_ostr, u"161"_ustr); - assertXPath(pDocument, "(//shadow/transform)[4]"_ostr, "xy13"_ostr, "-568"); - assertXPath(pDocument, "(//shadow/transform)[4]"_ostr, "xy23"_ostr, "-749"); + assertXPath(pDocument, "(//shadow/transform)[4]"_ostr, "xy13"_ostr, u"-568"_ustr); + assertXPath(pDocument, "(//shadow/transform)[4]"_ostr, "xy23"_ostr, u"-749"_ustr); - assertXPath(pDocument, "(//shadow/transform)[5]"_ostr, "xy13"_ostr, "-3021"); - assertXPath(pDocument, "(//shadow/transform)[5]"_ostr, "xy23"_ostr, "-750"); + assertXPath(pDocument, "(//shadow/transform)[5]"_ostr, "xy13"_ostr, u"-3021"_ustr); + assertXPath(pDocument, "(//shadow/transform)[5]"_ostr, "xy23"_ostr, u"-750"_ustr); - assertXPath(pDocument, "(//shadow/transform)[6]"_ostr, "xy13"_ostr, "-567"); - assertXPath(pDocument, "(//shadow/transform)[6]"_ostr, "xy23"_ostr, "-1692"); + assertXPath(pDocument, "(//shadow/transform)[6]"_ostr, "xy13"_ostr, u"-567"_ustr); + assertXPath(pDocument, "(//shadow/transform)[6]"_ostr, "xy23"_ostr, u"-1692"_ustr); - assertXPath(pDocument, "(//shadow/transform)[7]"_ostr, "xy13"_ostr, "-1795"); - assertXPath(pDocument, "(//shadow/transform)[7]"_ostr, "xy23"_ostr, "-1693"); + assertXPath(pDocument, "(//shadow/transform)[7]"_ostr, "xy13"_ostr, u"-1795"_ustr); + assertXPath(pDocument, "(//shadow/transform)[7]"_ostr, "xy23"_ostr, u"-1693"_ustr); - assertXPath(pDocument, "(//shadow/transform)[8]"_ostr, "xy13"_ostr, "-3023"); - assertXPath(pDocument, "(//shadow/transform)[8]"_ostr, "xy23"_ostr, "-1692"); + assertXPath(pDocument, "(//shadow/transform)[8]"_ostr, "xy13"_ostr, u"-3023"_ustr); + assertXPath(pDocument, "(//shadow/transform)[8]"_ostr, "xy23"_ostr, u"-1692"_ustr); - assertXPath(pDocument, "(//shadow/transform)[9]"_ostr, "xy13"_ostr, "-1795"); - assertXPath(pDocument, "(//shadow/transform)[9]"_ostr, "xy23"_ostr, "-750"); + assertXPath(pDocument, "(//shadow/transform)[9]"_ostr, "xy13"_ostr, u"-1795"_ustr); + assertXPath(pDocument, "(//shadow/transform)[9]"_ostr, "xy23"_ostr, u"-750"_ustr); } { // Page 2 contains a table with shadow alignment center @@ -143,8 +143,8 @@ CPPUNIT_TEST_FIXTURE(SdrTest, testShadowAlignment) // - Expected: -5196 // - Actual : 0 // - In<>, attribute 'xy13' of '//shadow/transform' incorrect value. - assertXPath(pDocument, "//shadow/transform"_ostr, "xy13"_ostr, "-5196"); - assertXPath(pDocument, "//shadow/transform"_ostr, "xy23"_ostr, "-2290"); + assertXPath(pDocument, "//shadow/transform"_ostr, "xy13"_ostr, u"-5196"_ustr); + assertXPath(pDocument, "//shadow/transform"_ostr, "xy23"_ostr, u"-2290"_ustr); } } diff --git a/svx/qa/unit/svdraw.cxx b/svx/qa/unit/svdraw.cxx index 3254e64161fb..9b2b0036ac6f 100644 --- a/svx/qa/unit/svdraw.cxx +++ b/svx/qa/unit/svdraw.cxx @@ -47,7 +47,7 @@ class SvdrawTest : public UnoApiXmlTest { public: SvdrawTest() - : UnoApiXmlTest("svx/qa/unit/data/") + : UnoApiXmlTest(u"svx/qa/unit/data/"_ustr) { } @@ -89,10 +89,10 @@ xmlDocUniquePtr lcl_dumpAndParseFirstObjectWithAssert(SdrPage* pSdrPage) CPPUNIT_TEST_FIXTURE(SvdrawTest, testSemiTransparentText) { // Create a new Draw document with a rectangle. - mxComponent = loadFromDesktop("private:factory/sdraw"); + mxComponent = loadFromDesktop(u"private:factory/sdraw"_ustr); uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XShape> xShape( - xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); xShape->setSize(awt::Size(10000, 10000)); xShape->setPosition(awt::Point(1000, 1000)); @@ -103,12 +103,12 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testSemiTransparentText) // Add semi-transparent text on the rectangle. uno::Reference<text::XTextRange> xShapeText(xShape, uno::UNO_QUERY); - xShapeText->getText()->setString("hello"); + xShapeText->getText()->setString(u"hello"_ustr); uno::Reference<beans::XPropertySet> xShapeProperties(xShape, uno::UNO_QUERY); - xShapeProperties->setPropertyValue("CharColor", uno::Any(COL_RED)); + xShapeProperties->setPropertyValue(u"CharColor"_ustr, uno::Any(COL_RED)); sal_Int16 nTransparence = 75; - xShapeProperties->setPropertyValue("CharTransparence", uno::Any(nTransparence)); + xShapeProperties->setPropertyValue(u"CharTransparence"_ustr, uno::Any(nTransparence)); // Generates drawinglayer primitives for the page. auto pDrawPage = dynamic_cast<SvxDrawPage*>(xDrawPage.get()); @@ -130,19 +130,19 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testSemiTransparentText) CPPUNIT_TEST_FIXTURE(SvdrawTest, testHandlePathObjScale) { // Given a path object: - mxComponent = loadFromDesktop("private:factory/sdraw"); + mxComponent = loadFromDesktop(u"private:factory/sdraw"_ustr); uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XShape> xShape( - xFactory->createInstance("com.sun.star.drawing.ClosedBezierShape"), uno::UNO_QUERY); + xFactory->createInstance(u"com.sun.star.drawing.ClosedBezierShape"_ustr), uno::UNO_QUERY); // When setting its scale by both using setSize() and scaling in a transform matrix: // Set size and basic properties. xShape->setPosition(awt::Point(2512, 6062)); xShape->setSize(awt::Size(112, 112)); uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); - xShapeProps->setPropertyValue("FillStyle", uno::Any(drawing::FillStyle_SOLID)); - xShapeProps->setPropertyValue("LineStyle", uno::Any(drawing::LineStyle_SOLID)); - xShapeProps->setPropertyValue("FillColor", uno::Any(static_cast<sal_Int32>(0))); + xShapeProps->setPropertyValue(u"FillStyle"_ustr, uno::Any(drawing::FillStyle_SOLID)); + xShapeProps->setPropertyValue(u"LineStyle"_ustr, uno::Any(drawing::LineStyle_SOLID)); + xShapeProps->setPropertyValue(u"FillColor"_ustr, uno::Any(static_cast<sal_Int32>(0))); // Add it to the draw page. uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), @@ -184,7 +184,7 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testHandlePathObjScale) drawing::PolygonFlags_NORMAL, }, }; - xShapeProps->setPropertyValue("PolyPolygonBezier", uno::Any(aPolyPolygonBezierCoords)); + xShapeProps->setPropertyValue(u"PolyPolygonBezier"_ustr, uno::Any(aPolyPolygonBezierCoords)); drawing::HomogenMatrix3 aMatrix; aMatrix.Line1.Column1 = 56; aMatrix.Line2.Column1 = -97; @@ -195,7 +195,7 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testHandlePathObjScale) aMatrix.Line1.Column3 = 3317; aMatrix.Line2.Column3 = 5583; aMatrix.Line3.Column3 = 1; - xShapeProps->setPropertyValue("Transformation", uno::Any(aMatrix)); + xShapeProps->setPropertyValue(u"Transformation"_ustr, uno::Any(aMatrix)); // Then make sure the scaling is only applied once: // Without the accompanying fix in place, this test would have failed with: @@ -208,18 +208,18 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testHandlePathObjScale) CPPUNIT_TEST_FIXTURE(SvdrawTest, testTextEditEmptyGrabBag) { // Given a document with a groupshape, which has 2 children. - mxComponent = loadFromDesktop("private:factory/sdraw"); + mxComponent = loadFromDesktop(u"private:factory/sdraw"_ustr); uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XShape> xRect1( - xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); xRect1->setPosition(awt::Point(1000, 1000)); xRect1->setSize(awt::Size(10000, 10000)); uno::Reference<drawing::XShape> xRect2( - xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xFactory->createInstance(u"com.sun.star.drawing.RectangleShape"_ustr), uno::UNO_QUERY); xRect2->setPosition(awt::Point(1000, 1000)); xRect2->setSize(awt::Size(10000, 10000)); uno::Reference<drawing::XShapes> xGroup( - xFactory->createInstance("com.sun.star.drawing.GroupShape"), uno::UNO_QUERY); + xFactory->createInstance(u"com.sun.star.drawing.GroupShape"_ustr), uno::UNO_QUERY); uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), uno::UNO_QUERY); @@ -228,12 +228,12 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testTextEditEmptyGrabBag) xGroup->add(xRect1); xGroup->add(xRect2); uno::Reference<text::XTextRange> xRect2Text(xRect2, uno::UNO_QUERY); - xRect2Text->setString("x"); + xRect2Text->setString(u"x"_ustr); uno::Sequence<beans::PropertyValue> aGrabBag = { - comphelper::makePropertyValue("OOXLayout", true), + comphelper::makePropertyValue(u"OOXLayout"_ustr, true), }; uno::Reference<beans::XPropertySet> xGroupProps(xGroup, uno::UNO_QUERY); - xGroupProps->setPropertyValue("InteropGrabBag", uno::Any(aGrabBag)); + xGroupProps->setPropertyValue(u"InteropGrabBag"_ustr, uno::Any(aGrabBag)); // When editing the shape text of the 2nd rectangle (insert a char at the start). SfxViewShell* pViewShell = SfxViewShell::Current(); @@ -241,11 +241,11 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testTextEditEmptyGrabBag) SdrObject* pObject = SdrObject::getSdrObjectFromXShape(xRect2); pSdrView->SdrBeginTextEdit(pObject); EditView& rEditView = pSdrView->GetTextEditOutlinerView()->GetEditView(); - rEditView.InsertText("y"); + rEditView.InsertText(u"y"_ustr); pSdrView->SdrEndTextEdit(); // Then make sure that grab-bag is empty to avoid losing the new text. - xGroupProps->getPropertyValue("InteropGrabBag") >>= aGrabBag; + xGroupProps->getPropertyValue(u"InteropGrabBag"_ustr) >>= aGrabBag; // Without the accompanying fix in place, this test would have failed with: // assertion failed // - Expression: !aGrabBag.hasElements() @@ -289,39 +289,39 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testRectangleObject) assertXPath(pXmlDoc, "/primitive2D"_ostr, 1); OString aBasePath("/primitive2D/sdrrectangle/group/polypolygoncolor"_ostr); - assertXPath(pXmlDoc, aBasePath, "color"_ostr, "#729fcf"); + assertXPath(pXmlDoc, aBasePath, "color"_ostr, u"#729fcf"_ustr); assertXPath(pXmlDoc, aBasePath + "/polypolygon", "height"_ostr, - "99"); // weird Rectangle is created with size 100 - assertXPath(pXmlDoc, aBasePath + "/polypolygon", "width"_ostr, "99"); - assertXPath(pXmlDoc, aBasePath + "/polypolygon", "minx"_ostr, "0"); - assertXPath(pXmlDoc, aBasePath + "/polypolygon", "miny"_ostr, "0"); - assertXPath(pXmlDoc, aBasePath + "/polypolygon", "maxx"_ostr, "99"); - assertXPath(pXmlDoc, aBasePath + "/polypolygon", "maxy"_ostr, "99"); + u"99"_ustr); // weird Rectangle is created with size 100 + assertXPath(pXmlDoc, aBasePath + "/polypolygon", "width"_ostr, u"99"_ustr); + assertXPath(pXmlDoc, aBasePath + "/polypolygon", "minx"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, aBasePath + "/polypolygon", "miny"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, aBasePath + "/polypolygon", "maxx"_ostr, u"99"_ustr); + assertXPath(pXmlDoc, aBasePath + "/polypolygon", "maxy"_ostr, u"99"_ustr); aBasePath = "/primitive2D/sdrrectangle/group/polypolygoncolor/polypolygon/polygon"_ostr; assertXPath(pXmlDoc, aBasePath + "/point", 5); - assertXPath(pXmlDoc, aBasePath + "/point[1]", "x"_ostr, "49.5"); // hmm, weird, why? - assertXPath(pXmlDoc, aBasePath + "/point[1]", "y"_ostr, "99"); - assertXPath(pXmlDoc, aBasePath + "/point[2]", "x"_ostr, "0"); - assertXPath(pXmlDoc, aBasePath + "/point[2]", "y"_ostr, "99"); - assertXPath(pXmlDoc, aBasePath + "/point[3]", "x"_ostr, "0"); - assertXPath(pXmlDoc, aBasePath + "/point[3]", "y"_ostr, "0"); - assertXPath(pXmlDoc, aBasePath + "/point[4]", "x"_ostr, "99"); - assertXPath(pXmlDoc, aBasePath + "/point[4]", "y"_ostr, "0"); - assertXPath(pXmlDoc, aBasePath + "/point[5]", "x"_ostr, "99"); - assertXPath(pXmlDoc, aBasePath + "/point[5]", "y"_ostr, "99"); + assertXPath(pXmlDoc, aBasePath + "/point[1]", "x"_ostr, u"49.5"_ustr); // hmm, weird, why? + assertXPath(pXmlDoc, aBasePath + "/point[1]", "y"_ostr, u"99"_ustr); + assertXPath(pXmlDoc, aBasePath + "/point[2]", "x"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, aBasePath + "/point[2]", "y"_ostr, u"99"_ustr); + assertXPath(pXmlDoc, aBasePath + "/point[3]", "x"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, aBasePath + "/point[3]", "y"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, aBasePath + "/point[4]", "x"_ostr, u"99"_ustr); + assertXPath(pXmlDoc, aBasePath + "/point[4]", "y"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, aBasePath + "/point[5]", "x"_ostr, u"99"_ustr); + assertXPath(pXmlDoc, aBasePath + "/point[5]", "y"_ostr, u"99"_ustr); aBasePath = "/primitive2D/sdrrectangle/group/polygonstroke"_ostr; assertXPath(pXmlDoc, aBasePath, 1); - assertXPath(pXmlDoc, aBasePath + "/line", "color"_ostr, "#3465a4"); - assertXPath(pXmlDoc, aBasePath + "/line", "width"_ostr, "0"); - assertXPath(pXmlDoc, aBasePath + "/line", "linejoin"_ostr, "Round"); - assertXPath(pXmlDoc, aBasePath + "/line", "linecap"_ostr, "BUTT"); + assertXPath(pXmlDoc, aBasePath + "/line", "color"_ostr, u"#3465a4"_ustr); + assertXPath(pXmlDoc, aBasePath + "/line", "width"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, aBasePath + "/line", "linejoin"_ostr, u"Round"_ustr); + assertXPath(pXmlDoc, aBasePath + "/line", "linecap"_ostr, u"BUTT"_ustr); - assertXPathContent(pXmlDoc, aBasePath + "/polygon", "49.5,99 0,99 0,0 99,0 99,99"); + assertXPathContent(pXmlDoc, aBasePath + "/polygon", u"49.5,99 0,99 0,0 99,0 99,99"_ustr); // If solid line, then there is no line stroke information assertXPath(pXmlDoc, aBasePath + "/stroke", 0); @@ -373,13 +373,13 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testFontWorks) assertXPath(pXmlDoc, "/primitive2D"_ostr, 1); - assertXPath(pXmlDoc, "//scene"_ostr, "projectionMode"_ostr, "Perspective"); - assertXPath(pXmlDoc, "//scene/extrude3D[1]/fill"_ostr, "color"_ostr, "#ff0000"); + assertXPath(pXmlDoc, "//scene"_ostr, "projectionMode"_ostr, u"Perspective"_ustr); + assertXPath(pXmlDoc, "//scene/extrude3D[1]/fill"_ostr, "color"_ostr, u"#ff0000"_ustr); assertXPath(pXmlDoc, "//scene/extrude3D[1]/object3Dattributes/material"_ostr, "color"_ostr, - "#ff0000"); + u"#ff0000"_ustr); // ODF default 50% is represented by Specular Intensity = 2^5. The relationship is not linear. assertXPath(pXmlDoc, "//scene/extrude3D[1]/object3Dattributes/material"_ostr, - "specularIntensity"_ostr, "32"); + "specularIntensity"_ostr, u"32"_ustr); } CPPUNIT_TEST_FIXTURE(SvdrawTest, testTdf148000_EOLinCurvedText) @@ -475,9 +475,9 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testSurfaceMetal) // ODF specifies for metal = true specular color as rgb(200,200,200) and adding 15 to specularity // Together with extrusion-first-light-level 67% and extrusion-specularity 80% factor is // 0.67*0.8 * 200/255 = 0.42 and color #6b6b6b - assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specular"_ostr, "#6b6b6b"); + assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specular"_ostr, u"#6b6b6b"_ustr); // 3D specularIntensity = 2^(50/10) + 15 = 47, with default extrusion-shininess 50% - assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specularIntensity"_ostr, "47"); + assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specularIntensity"_ostr, u"47"_ustr); } CPPUNIT_TEST_FIXTURE(SvdrawTest, testExtrusionPhong) @@ -489,8 +489,8 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testExtrusionPhong) xmlDocUniquePtr pXmlDoc = lcl_dumpAndParseFirstObjectWithAssert(pSdrPage); // The rendering method and normals kind were always 'Flat' without the patch. - assertXPath(pXmlDoc, "//scene"_ostr, "shadeMode"_ostr, "Phong"); - assertXPath(pXmlDoc, "//object3Dattributes"_ostr, "normalsKind"_ostr, "Specific"); + assertXPath(pXmlDoc, "//scene"_ostr, "shadeMode"_ostr, u"Phong"_ustr); + assertXPath(pXmlDoc, "//object3Dattributes"_ostr, "normalsKind"_ostr, u"Specific"_ustr); } CPPUNIT_TEST_FIXTURE(SvdrawTest, testSurfaceMattePPT) @@ -507,14 +507,14 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testSurfaceMattePPT) // to forth light, as only first light is specular. Because first and third lights are off, the // forth light is the second one in the dump. The gray color corresponding to // FirstLightLevel = 38000/2^16 is #949494. - assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specular"_ostr, "#000000"); - assertXPath(pXmlDoc, "(//light)[2]"_ostr, "color"_ostr, "#949494"); + assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specular"_ostr, u"#000000"_ustr); + assertXPath(pXmlDoc, "(//light)[2]"_ostr, "color"_ostr, u"#949494"_ustr); // To make the second light soft, part of its intensity is moved to lights 5,6,7 and 8. - assertXPath(pXmlDoc, "(//light)[1]"_ostr, "color"_ostr, "#1e1e1e"); - assertXPath(pXmlDoc, "(//light)[3]"_ostr, "color"_ostr, "#3b3b3b"); + assertXPath(pXmlDoc, "(//light)[1]"_ostr, "color"_ostr, u"#1e1e1e"_ustr); + assertXPath(pXmlDoc, "(//light)[3]"_ostr, "color"_ostr, u"#3b3b3b"_ustr); // The 3D property specularIntensity is not related to 'extrusion-specularity' but to // 'extrusion-shininess'. specularIntensity = 2^(shininess/10), here default 32. - assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specularIntensity"_ostr, "32"); + assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specularIntensity"_ostr, u"32"_ustr); } CPPUNIT_TEST_FIXTURE(SvdrawTest, testMaterialSpecular) @@ -530,11 +530,11 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testMaterialSpecular) // -level'. 3D specularIntensity is derived from property 'draw:extrusion-shininess'. Both are // object properties, not scene properties. Those were wrong in various forms before the patch. // Specularity = 77% * first-light-level 67% = 0.5159, which corresponds to gray color #848484. - assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specular"_ostr, "#848484"); + assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specular"_ostr, u"#848484"_ustr); // extrusion-shininess 50% corresponds to 3D specularIntensity 32, use 2^(50/10). - assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specularIntensity"_ostr, "32"); + assertXPath(pXmlDoc, "(//material)[1]"_ostr, "specularIntensity"_ostr, u"32"_ustr); // extrusion-first-light-level 67% corresponds to gray color #ababab, use 255 * 0.67. - assertXPath(pXmlDoc, "(//light)[1]"_ostr, "color"_ostr, "#ababab"); + assertXPath(pXmlDoc, "(//light)[1]"_ostr, "color"_ostr, u"#ababab"_ustr); // The first light is harsh, the second light soft. So the 3D scene should have 6 lights (1+1+4). assertXPath(pXmlDoc, "//light"_ostr, 6); } @@ -572,7 +572,7 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testPageViewDrawLayerClip) loadFromFile(u"page-view-draw-layer-clip.docx"); // When saving that document to PDF: - save("writer_pdf_Export"); + save(u"writer_pdf_Export"_ustr); // Then make sure that line shape gets clipped: std::unique_ptr<vcl::pdf::PDFiumDocument> pDoc = parsePDFExport(); @@ -726,27 +726,35 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testClipVerticalTextOverflow) // - In <>, XPath contents of child does not match // i.e. the vertically overflowing text wasn't clipped & overflowing text // was drawn anyways. - assertXPathContent(pDocument, "count((//sdrblocktext)[4]//textsimpleportion)"_ostr, "6"); + assertXPathContent(pDocument, "count((//sdrblocktext)[4]//textsimpleportion)"_ostr, u"6"_ustr); // make sure text is aligned correctly after the overflowing text is clipped - assertXPath(pDocument, "((//sdrblocktext)[4]//textsimpleportion)[1]"_ostr, "y"_ostr, "3749"); - assertXPath(pDocument, "((//sdrblocktext)[4]//textsimpleportion)[6]"_ostr, "y"_ostr, "7559"); + assertXPath(pDocument, "((//sdrblocktext)[4]//textsimpleportion)[1]"_ostr, "y"_ostr, + u"3749"_ustr); + assertXPath(pDocument, "((//sdrblocktext)[4]//textsimpleportion)[6]"_ostr, "y"_ostr, + u"7559"_ustr); // make sure the text that isn't overflowing is still aligned properly - assertXPathContent(pDocument, "count((//sdrblocktext)[5]//textsimpleportion)"_ostr, "3"); - assertXPath(pDocument, "((//sdrblocktext)[5]//textsimpleportion)[1]"_ostr, "y"_ostr, "5074"); - assertXPath(pDocument, "((//sdrblocktext)[5]//textsimpleportion)[3]"_ostr, "y"_ostr, "6598"); + assertXPathContent(pDocument, "count((//sdrblocktext)[5]//textsimpleportion)"_ostr, u"3"_ustr); + assertXPath(pDocument, "((//sdrblocktext)[5]//textsimpleportion)[1]"_ostr, "y"_ostr, + u"5074"_ustr); + assertXPath(pDocument, "((//sdrblocktext)[5]//textsimpleportion)[3]"_ostr, "y"_ostr, + u"6598"_ustr); // Test vertically overflowing text, with vertical text direction - assertXPathContent(pDocument, "count((//sdrblocktext)[6]//textsimpleportion)"_ostr, "12"); + assertXPathContent(pDocument, "count((//sdrblocktext)[6]//textsimpleportion)"_ostr, u"12"_ustr); // make sure text is aligned correctly after the overflowing text is clipped - assertXPath(pDocument, "((//sdrblocktext)[6]//textsimpleportion)[1]"_ostr, "x"_ostr, "13093"); - assertXPath(pDocument, "((//sdrblocktext)[6]//textsimpleportion)[12]"_ostr, "x"_ostr, "4711"); + assertXPath(pDocument, "((//sdrblocktext)[6]//textsimpleportion)[1]"_ostr, "x"_ostr, + u"13093"_ustr); + assertXPath(pDocument, "((//sdrblocktext)[6]//textsimpleportion)[12]"_ostr, "x"_ostr, + u"4711"_ustr); // make sure the text that isn't overflowing is still aligned properly - assertXPathContent(pDocument, "count((//sdrblocktext)[7]//textsimpleportion)"_ostr, "3"); - assertXPath(pDocument, "((//sdrblocktext)[7]//textsimpleportion)[1]"_ostr, "x"_ostr, "25417"); - assertXPath(pDocument, "((//sdrblocktext)[7]//textsimpleportion)[3]"_ostr, "x"_ostr, "23893"); + assertXPathContent(pDocument, "count((//sdrblocktext)[7]//textsimpleportion)"_ostr, u"3"_ustr); + assertXPath(pDocument, "((//sdrblocktext)[7]//textsimpleportion)[1]"_ostr, "x"_ostr, + u"25417"_ustr); + assertXPath(pDocument, "((//sdrblocktext)[7]//textsimpleportion)[3]"_ostr, "x"_ostr, + u"23893"_ustr); } } diff --git a/svx/qa/unit/svdraw/test_SdrTextObject.cxx b/svx/qa/unit/svdraw/test_SdrTextObject.cxx index 218db2a52f0e..8de4937c63ea 100644 --- a/svx/qa/unit/svdraw/test_SdrTextObject.cxx +++ b/svx/qa/unit/svdraw/test_SdrTextObject.cxx @@ -32,7 +32,7 @@ void SdrTextObjTest::AllFamiliesCanBeRestoredFromSavedString() for (SfxStyleFamily family : allFamilies) { - OUString styleName = "styleName"; + OUString styleName = u"styleName"_ustr; SdrTextObj::AppendFamilyToStyleName(styleName, family); SfxStyleFamily readFamily = SdrTextObj::ReadFamilyFromStyleName(styleName); CPPUNIT_ASSERT_EQUAL(static_cast<int>(family), static_cast<int>(readFamily)); diff --git a/svx/qa/unit/table.cxx b/svx/qa/unit/table.cxx index aa862e0e33a4..6331a23cbe98 100644 --- a/svx/qa/unit/table.cxx +++ b/svx/qa/unit/table.cxx @@ -36,7 +36,7 @@ class Test : public UnoApiXmlTest { public: Test() - : UnoApiXmlTest("svx/qa/unit/data/") + : UnoApiXmlTest(u"svx/qa/unit/data/"_ustr) { } @@ -81,36 +81,36 @@ CPPUNIT_TEST_FIXTURE(Test, testTableShadowBlur) //- Actual : 2 //- In <>, XPath contents of child does not match // i.e. the shadow's transparency was miscalculated. - assertXPathContent(pDocument, "count(//objectinfo/unifiedtransparence)"_ostr, "0"); - - assertXPath(pDocument, "//objectinfo/shadow[1]"_ostr, "color"_ostr, "#ff0000"); - assertXPath(pDocument, "//objectinfo/shadow[1]"_ostr, "blur"_ostr, "141"); - assertXPath(pDocument, "//objectinfo/shadow[2]"_ostr, "color"_ostr, "#ff0000"); - assertXPath(pDocument, "//objectinfo/shadow[2]"_ostr, "blur"_ostr, "141"); - assertXPath(pDocument, "//objectinfo/shadow[3]"_ostr, "color"_ostr, "#ff0000"); - assertXPath(pDocument, "//objectinfo/shadow[3]"_ostr, "blur"_ostr, "141"); - assertXPath(pDocument, "//objectinfo/shadow[4]"_ostr, "color"_ostr, "#ff0000"); - assertXPath(pDocument, "//objectinfo/shadow[4]"_ostr, "blur"_ostr, "141"); - assertXPath(pDocument, "//objectinfo/shadow[5]"_ostr, "color"_ostr, "#ff0000"); - assertXPath(pDocument, "//objectinfo/shadow[5]"_ostr, "blur"_ostr, "141"); + assertXPathContent(pDocument, "count(//objectinfo/unifiedtransparence)"_ostr, u"0"_ustr); + + assertXPath(pDocument, "//objectinfo/shadow[1]"_ostr, "color"_ostr, u"#ff0000"_ustr); + assertXPath(pDocument, "//objectinfo/shadow[1]"_ostr, "blur"_ostr, u"141"_ustr); + assertXPath(pDocument, "//objectinfo/shadow[2]"_ostr, "color"_ostr, u"#ff0000"_ustr); + assertXPath(pDocument, "//objectinfo/shadow[2]"_ostr, "blur"_ostr, u"141"_ustr); + assertXPath(pDocument, "//objectinfo/shadow[3]"_ostr, "color"_ostr, u"#ff0000"_ustr); + assertXPath(pDocument, "//objectinfo/shadow[3]"_ostr, "blur"_ostr, u"141"_ustr); + assertXPath(pDocument, "//objectinfo/shadow[4]"_ostr, "color"_ostr, u"#ff0000"_ustr); + assertXPath(pDocument, "//objectinfo/shadow[4]"_ostr, "blur"_ostr, u"141"_ustr); + assertXPath(pDocument, "//objectinfo/shadow[5]"_ostr, "color"_ostr, u"#ff0000"_ustr); + assertXPath(pDocument, "//objectinfo/shadow[5]"_ostr, "blur"_ostr, u"141"_ustr); assertXPath(pDocument, "//objectinfo/group/sdrCell[1]/unifiedtransparence"_ostr, 0); assertXPath(pDocument, "//objectinfo/group/sdrCell[2]/unifiedtransparence"_ostr, 0); assertXPath(pDocument, "//objectinfo/group/sdrCell[3]/group/unifiedtransparence"_ostr, - "transparence"_ostr, "80"); + "transparence"_ostr, u"80"_ustr); assertXPath(pDocument, "//objectinfo/group/sdrCell[4]/group/unifiedtransparence"_ostr, - "transparence"_ostr, "80"); + "transparence"_ostr, u"80"_ustr); } CPPUNIT_TEST_FIXTURE(Test, testSvxTableControllerSetAttrToSelectedShape) { // Given a document with a table shape, editing cell text: - mxComponent = loadFromDesktop("private:factory/simpress", - "com.sun.star.presentation.PresentationDocument"); + mxComponent = loadFromDesktop(u"private:factory/simpress"_ustr, + u"com.sun.star.presentation.PresentationDocument"_ustr); uno::Sequence<beans::PropertyValue> aArgs - = { comphelper::makePropertyValue("Rows", sal_Int32(2)), - comphelper::makePropertyValue("Columns", sal_Int32(2)) }; - dispatchCommand(mxComponent, ".uno:InsertTable", aArgs); + = { comphelper::makePropertyValue(u"Rows"_ustr, sal_Int32(2)), + comphelper::makePropertyValue(u"Columns"_ustr, sal_Int32(2)) }; + dispatchCommand(mxComponent, u".uno:InsertTable"_ustr, aArgs); uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), uno::UNO_QUERY); diff --git a/svx/qa/unit/unodraw.cxx b/svx/qa/unit/unodraw.cxx index 0d6f35e5c9cd..e65ec6528832 100644 --- a/svx/qa/unit/unodraw.cxx +++ b/svx/qa/unit/unodraw.cxx @@ -45,7 +45,7 @@ class UnodrawTest : public UnoApiXmlTest { public: UnodrawTest() - : UnoApiXmlTest("svx/qa/unit/data/") + : UnoApiXmlTest(u"svx/qa/unit/data/"_ustr) { } }; @@ -67,7 +67,7 @@ CPPUNIT_TEST_FIXTURE(UnodrawTest, testWriterGraphicExport) uno::Sequence<beans::PropertyValue> aProperties( comphelper::InitPropertySequence({ { "URL", uno::Any(maTempFile.GetURL()) }, - { "MediaType", uno::Any(OUString("image/jpeg")) } })); + { "MediaType", uno::Any(u"image/jpeg"_ustr) } })); CPPUNIT_ASSERT(xExportFilter->filter(aProperties)); } @@ -86,7 +86,7 @@ CPPUNIT_TEST_FIXTURE(UnodrawTest, testTdf93998) uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory(); uno::Reference<awt::XControlModel> xModel( - xFactory->createInstance("com.sun.star.awt.UnoControlDialogModel"), uno::UNO_QUERY); + xFactory->createInstance(u"com.sun.star.awt.UnoControlDialogModel"_ustr), uno::UNO_QUERY); CPPUNIT_ASSERT(xModel.is()); uno::Reference<beans::XPropertySet> xModelProps(xModel, uno::UNO_QUERY); @@ -94,20 +94,20 @@ CPPUNIT_TEST_FIXTURE(UnodrawTest, testTdf93998) // This resulted in a uno::RuntimeException, assigning a shape to a dialog model's image was // broken. - xModelProps->setPropertyValue("ImageURL", xShape->getPropertyValue("GraphicURL")); + xModelProps->setPropertyValue(u"ImageURL"_ustr, xShape->getPropertyValue(u"GraphicURL"_ustr)); uno::Reference<graphic::XGraphic> xGraphic; - xModelProps->getPropertyValue("Graphic") >>= xGraphic; + xModelProps->getPropertyValue(u"Graphic"_ustr) >>= xGraphic; CPPUNIT_ASSERT(xGraphic.is()); } CPPUNIT_TEST_FIXTURE(UnodrawTest, testTableShadowDirect) { // Create an Impress document an insert a table shape. - mxComponent = loadFromDesktop("private:factory/simpress", - "com.sun.star.presentation.PresentationDocument"); + mxComponent = loadFromDesktop(u"private:factory/simpress"_ustr, + u"com.sun.star.presentation.PresentationDocument"_ustr); uno::Reference<lang::XMultiServiceFactory> xFactory(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XShape> xShape( - xFactory->createInstance("com.sun.star.drawing.TableShape"), uno::UNO_QUERY); + xFactory->createInstance(u"com.sun.star.drawing.TableShape"_ustr), uno::UNO_QUERY); xShape->setPosition(awt::Point(1000, 1000)); xShape->setSize(awt::Size(10000, 10000)); uno::Reference<drawing::XDrawPagesSupplier> xSupplier(mxComponent, uno::UNO_QUERY); @@ -119,17 +119,17 @@ CPPUNIT_TEST_FIXTURE(UnodrawTest, testTableShadowDirect) uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); // Without the accompanying fix in place, this test would have failed with throwing a // beans.UnknownPropertyException, as shadow-as-direct-formatting on tables were not possible. - xShapeProps->setPropertyValue("Shadow", uno::Any(true)); + xShapeProps->setPropertyValue(u"Shadow"_ustr, uno::Any(true)); Color nRed = COL_LIGHTRED; - xShapeProps->setPropertyValue("ShadowColor", uno::Any(nRed)); - CPPUNIT_ASSERT(xShapeProps->getPropertyValue("ShadowColor") >>= nRed); + xShapeProps->setPropertyValue(u"ShadowColor"_ustr, uno::Any(nRed)); + CPPUNIT_ASSERT(xShapeProps->getPropertyValue(u"ShadowColor"_ustr) >>= nRed); CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, nRed); // Add text. - uno::Reference<table::XCellRange> xTable(xShapeProps->getPropertyValue("Model"), + uno::Reference<table::XCellRange> xTable(xShapeProps->getPropertyValue(u"Model"_ustr), uno::UNO_QUERY); uno::Reference<text::XTextRange> xCell(xTable->getCellByPosition(0, 0), uno::UNO_QUERY); - xCell->setString("A1"); + xCell->setString(u"A1"_ustr); // Generates drawinglayer primitives for the shape. auto pDrawPage = dynamic_cast<SvxDrawPage*>(xDrawPage.get()); @@ -160,22 +160,23 @@ CPPUNIT_TEST_FIXTURE(UnodrawTest, testTableShadowDirect) CPPUNIT_TEST_FIXTURE(UnodrawTest, testTitleShapeBullets) { // Create a title shape with 2 paragraphs in it. - mxComponent = loadFromDesktop("private:factory/simpress", - "com.sun.star.presentation.PresentationDocument"); + mxComponent = loadFromDesktop(u"private:factory/simpress"_ustr, + u"com.sun.star.presentation.PresentationDocument"_ustr); uno::Reference<drawing::XDrawPagesSupplier> xSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XDrawPages> xDrawPages = xSupplier->getDrawPages(); uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPages->getByIndex(0), uno::UNO_QUERY); // A default document contains a title shape and a text shape on the first slide. uno::Reference<drawing::XShape> xTitleShape(xDrawPage->getByIndex(0), uno::UNO_QUERY); uno::Reference<lang::XServiceInfo> xTitleShapeInfo(xTitleShape, uno::UNO_QUERY); - CPPUNIT_ASSERT(xTitleShapeInfo->supportsService("com.sun.star.presentation.TitleTextShape")); + CPPUNIT_ASSERT( + xTitleShapeInfo->supportsService(u"com.sun.star.presentation.TitleTextShape"_ustr)); uno::Reference<text::XTextRange> xTitleShapeText(xTitleShape, uno::UNO_QUERY); uno::Reference<text::XText> xText = xTitleShapeText->getText(); uno::Reference<text::XTextRange> xCursor = xText->createTextCursor(); - xText->insertString(xCursor, "foo", /*bAbsorb=*/false); + xText->insertString(xCursor, u"foo"_ustr, /*bAbsorb=*/false); xText->insertControlCharacter(xCursor, text::ControlCharacter::APPEND_PARAGRAPH, /*bAbsorb=*/false); - xText->insertString(xCursor, "bar", /*bAbsorb=*/false); + xText->insertString(xCursor, u"bar"_ustr, /*bAbsorb=*/false); // Check that the title shape has 2 paragraphs. uno::Reference<container::XEnumerationAccess> xTextEA(xText, uno::UNO_QUERY); @@ -192,20 +193,20 @@ CPPUNIT_TEST_FIXTURE(UnodrawTest, testTitleShapeBullets) CPPUNIT_TEST_FIXTURE(UnodrawTest, testPngExport) { // Given an empty Impress document: - mxComponent = loadFromDesktop("private:factory/simpress", - "com.sun.star.presentation.PresentationDocument"); + mxComponent = loadFromDesktop(u"private:factory/simpress"_ustr, + u"com.sun.star.presentation.PresentationDocument"_ustr); // When exporting that document to PNG with a JSON size: uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY_THROW); SvMemoryStream aStream; uno::Reference<io::XOutputStream> xOut = new utl::OOutputStreamWrapper(aStream); utl::MediaDescriptor aMediaDescriptor; - aMediaDescriptor["FilterName"] <<= OUString("impress_png_Export"); - aMediaDescriptor["FilterOptions"] - <<= OUString("{\"PixelHeight\":{\"type\":\"long\",\"value\":\"192\"}," - "\"PixelWidth\":{\"type\":\"long\",\"value\":\"192\"}}"); - aMediaDescriptor["OutputStream"] <<= xOut; - xStorable->storeToURL("private:stream", aMediaDescriptor.getAsConstPropertyValueList()); + aMediaDescriptor[u"FilterName"_ustr] <<= u"impress_png_Export"_ustr; + aMediaDescriptor[u"FilterOptions"_ustr] + <<= u"{\"PixelHeight\":{\"type\":\"long\",\"value\":\"192\"}," + "\"PixelWidth\":{\"type\":\"long\",\"value\":\"192\"}}"_ustr; + aMediaDescriptor[u"OutputStream"_ustr] <<= xOut; + xStorable->storeToURL(u"private:stream"_ustr, aMediaDescriptor.getAsConstPropertyValueList()); // Then make sure that the size request is handled: aStream.Seek(STREAM_SEEK_TO_BEGIN); diff --git a/svx/qa/unit/xml.cxx b/svx/qa/unit/xml.cxx index 673113467fbb..95c158fa1f3c 100644 --- a/svx/qa/unit/xml.cxx +++ b/svx/qa/unit/xml.cxx @@ -25,7 +25,7 @@ class Test : public UnoApiTest { public: Test() - : UnoApiTest("svx/qa/unit/data/") + : UnoApiTest(u"svx/qa/unit/data/"_ustr) { } }; @@ -39,7 +39,7 @@ CPPUNIT_TEST_FIXTURE(Test, test3DObjectFallback) uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY); uno::Reference<graphic::XGraphic> xGraphic; - xShape->getPropertyValue("Graphic") >>= xGraphic; + xShape->getPropertyValue(u"Graphic"_ustr) >>= xGraphic; // Without the accompanying fix in place, this test would have failed, we could not read // Models/Fallbacks/duck.png, as we assumed a format like Pictures/something.png, i.e. a single // slash in the path. diff --git a/svx/qa/unit/xoutdev.cxx b/svx/qa/unit/xoutdev.cxx index c2bce82b9cf5..781835069985 100644 --- a/svx/qa/unit/xoutdev.cxx +++ b/svx/qa/unit/xoutdev.cxx @@ -27,7 +27,7 @@ class XOutdevTest : public UnoApiTest { public: XOutdevTest() - : UnoApiTest("svx/qa/unit/data/") + : UnoApiTest(u"svx/qa/unit/data/"_ustr) { } }; @@ -51,7 +51,7 @@ CPPUNIT_TEST_FIXTURE(XOutdevTest, testPdfGraphicExport) XOutFlags const eFlags = XOutFlags::DontExpandFilename | XOutFlags::DontAddExtension | XOutFlags::UseNativeIfPossible; OUString aTempURL = maTempFile.GetURL(); - XOutBitmap::WriteGraphic(aGraphic, aTempURL, "pdf", eFlags); + XOutBitmap::WriteGraphic(aGraphic, aTempURL, u"pdf"_ustr, eFlags); // Assert that the output looks like a PDF. SvStream* pStream = maTempFile.GetStream(StreamMode::READ); @@ -77,7 +77,7 @@ CPPUNIT_TEST_FIXTURE(XOutdevTest, testTdf60684) XOutFlags const eFlags = XOutFlags::DontExpandFilename | XOutFlags::DontAddExtension | XOutFlags::UseNativeIfPossible; OUString aTempURL = maTempFile.GetURL(); - XOutBitmap::WriteGraphic(aGraphic, aTempURL, "png", eFlags); + XOutBitmap::WriteGraphic(aGraphic, aTempURL, u"png"_ustr, eFlags); SvStream* pStream = maTempFile.GetStream(StreamMode::READ); CPPUNIT_ASSERT(pStream->TellEnd() > 4); @@ -93,8 +93,8 @@ CPPUNIT_TEST_FIXTURE(XOutdevTest, testTdf60684) CPPUNIT_TEST_FIXTURE(XOutdevTest, testFillColorThemeUnoApi) { // Given an empty Impress document with a (title) shape: - mxComponent = loadFromDesktop("private:factory/simpress", - "com.sun.star.presentation.PresentationDocument"); + mxComponent = loadFromDesktop(u"private:factory/simpress"_ustr, + u"com.sun.star.presentation.PresentationDocument"_ustr); // When setting the theme index of the shape's fill color: uno::Reference<drawing::XDrawPagesSupplier> xPagesSupplier(mxComponent, uno::UNO_QUERY); @@ -107,14 +107,14 @@ CPPUNIT_TEST_FIXTURE(XOutdevTest, testFillColorThemeUnoApi) aComplexColor.setThemeColor(model::ThemeColorType::Accent1); aComplexColor.addTransformation({ model::TransformationType::LumMod, 2000 }); aComplexColor.addTransformation({ model::TransformationType::LumOff, 8000 }); - xShape->setPropertyValue("FillComplexColor", + xShape->setPropertyValue(u"FillComplexColor"_ustr, uno::Any(model::color::createXComplexColor(aComplexColor))); } // Then make sure the value we read back is the expected one: { uno::Reference<util::XComplexColor> xComplexColor; - CPPUNIT_ASSERT(xShape->getPropertyValue("FillComplexColor") >>= xComplexColor); + CPPUNIT_ASSERT(xShape->getPropertyValue(u"FillComplexColor"_ustr) >>= xComplexColor); CPPUNIT_ASSERT(xComplexColor.is()); auto aComplexColor = model::color::getFromXComplexColor(xComplexColor); CPPUNIT_ASSERT_EQUAL(model::ThemeColorType::Accent1, aComplexColor.getThemeColorType()); diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 2f59e302bb73..28d2cdf3a001 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -282,7 +282,7 @@ void SAL_CALL AccessibleControlShape::grabFocus() OUString SAL_CALL AccessibleControlShape::getImplementationName() { - return "com.sun.star.comp.accessibility.AccessibleControlShape"; + return u"com.sun.star.comp.accessibility.AccessibleControlShape"_ustr; } OUString AccessibleControlShape::CreateAccessibleBaseName() @@ -318,8 +318,8 @@ OUString if ( sDesc.isEmpty() ) { // no -> use the default aDG.Initialize (STR_ObjNameSingulUno); - aDG.AddProperty ("ControlBackground", DescriptionGenerator::PropertyType::Color); - aDG.AddProperty ( "ControlBorder", DescriptionGenerator::PropertyType::Integer); + aDG.AddProperty (u"ControlBackground"_ustr, DescriptionGenerator::PropertyType::Color); + aDG.AddProperty ( u"ControlBorder"_ustr, DescriptionGenerator::PropertyType::Integer); } // ensure that we are listening to the Name property m_bListeningForDesc = ensureListeningState( m_bListeningForDesc, true, DESC_PROPERTY_NAME ); diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index d94ce4886add..ff5e92e95527 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -96,7 +96,7 @@ void SAL_CALL OUString SAL_CALL AccessibleGraphicShape::getImplementationName() { - return "AccessibleGraphicShape"; + return u"AccessibleGraphicShape"_ustr; } @@ -104,7 +104,7 @@ css::uno::Sequence< OUString> SAL_CALL AccessibleGraphicShape::getSupportedServiceNames() { ThrowIfDisposed (); - const css::uno::Sequence<OUString> vals { "com.sun.star.drawing.AccessibleGraphicShape" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.drawing.AccessibleGraphicShape"_ustr }; return comphelper::concatSequences(AccessibleShape::getSupportedServiceNames(), vals); } diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 9275ad1803f2..33cce7ac3b90 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -103,7 +103,7 @@ void SAL_CALL OUString SAL_CALL AccessibleOLEShape::getImplementationName() { - return "AccessibleOLEShape"; + return u"AccessibleOLEShape"_ustr; } @@ -111,7 +111,7 @@ css::uno::Sequence< OUString> SAL_CALL AccessibleOLEShape::getSupportedServiceNames() { ThrowIfDisposed(); - const css::uno::Sequence<OUString> vals { "com.sun.star.drawing.AccessibleOLEShape" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.drawing.AccessibleOLEShape"_ustr }; return comphelper::concatSequences(AccessibleShape::getSupportedServiceNames(), vals); } diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 1504c6869e75..91dc32a2ec48 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -190,7 +190,7 @@ void AccessibleShape::UpdateStates() try { drawing::FillStyle aFillStyle; - bShapeIsOpaque = ( xSet->getPropertyValue ("FillStyle") >>= aFillStyle) + bShapeIsOpaque = ( xSet->getPropertyValue (u"FillStyle"_ustr) >>= aFillStyle) && aFillStyle == drawing::FillStyle_SOLID; } catch (css::beans::UnknownPropertyException&) @@ -290,7 +290,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleDescription() if( m_pShape && !m_pShape->GetDescription().isEmpty()) return m_pShape->GetDescription() ; else - return " "; + return u" "_ustr; } // XAccessibleContext @@ -533,7 +533,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds() // Transform coordinates from internal to pixel. if (maShapeTreeInfo.GetViewForwarder() == nullptr) throw uno::RuntimeException ( - "AccessibleShape has no valid view forwarder", + u"AccessibleShape has no valid view forwarder"_ustr, getXWeak()); ::Size aPixelSize = maShapeTreeInfo.GetViewForwarder()->LogicToPixel ( ::Size (aBoundingBox.Width, aBoundingBox.Height)); @@ -624,7 +624,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground() if (aSet.is()) { uno::Any aColor; - aColor = aSet->getPropertyValue ("LineColor"); + aColor = aSet->getPropertyValue (u"LineColor"_ustr); aColor >>= nColor; } } @@ -647,9 +647,9 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground() if (aSet.is()) { uno::Any aColor; - aColor = aSet->getPropertyValue ("FillColor"); + aColor = aSet->getPropertyValue (u"FillColor"_ustr); aColor >>= nColor; - aColor = aSet->getPropertyValue ("FillTransparence"); + aColor = aSet->getPropertyValue (u"FillTransparence"_ustr); short nTrans=0; aColor >>= nTrans; Color crBk(nColor); @@ -832,7 +832,7 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes() OUString SAL_CALL AccessibleShape::getImplementationName() { - return "AccessibleShape"; + return u"AccessibleShape"_ustr; } @@ -840,7 +840,7 @@ uno::Sequence<OUString> SAL_CALL AccessibleShape::getSupportedServiceNames() { ThrowIfDisposed (); - const css::uno::Sequence<OUString> vals { "com.sun.star.drawing.AccessibleShape" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.drawing.AccessibleShape"_ustr }; return comphelper::concatSequences(AccessibleContextBase::getSupportedServiceNames(), vals); } @@ -1043,20 +1043,20 @@ void AccessibleShape::UpdateNameAndDescription() Reference<beans::XPropertySet> xSet (mxShape, uno::UNO_QUERY_THROW); // Get the accessible name. - OUString sString = GetOptionalProperty(xSet, "Title"); + OUString sString = GetOptionalProperty(xSet, u"Title"_ustr); if (!sString.isEmpty()) { SetAccessibleName(sString, AccessibleContextBase::FromShape); } else { - sString = GetOptionalProperty(xSet, "Name"); + sString = GetOptionalProperty(xSet, u"Name"_ustr); if (!sString.isEmpty()) SetAccessibleName(sString, AccessibleContextBase::FromShape); } // Get the accessible description. - sString = GetOptionalProperty(xSet, "Description"); + sString = GetOptionalProperty(xSet, u"Description"_ustr); if (!sString.isEmpty()) SetAccessibleDescription(sString, AccessibleContextBase::FromShape); } diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 8dddb606876d..c486ab8ccd86 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -258,15 +258,15 @@ namespace accessibility SvxTextForwarder& AccessibleTextHelper_Impl::GetTextForwarder() const { if( !maEditSource.IsValid() ) - throw uno::RuntimeException("Unknown edit source", mxFrontEnd); + throw uno::RuntimeException(u"Unknown edit source"_ustr, mxFrontEnd); SvxTextForwarder* pTextForwarder = maEditSource.GetTextForwarder(); if( !pTextForwarder ) - throw uno::RuntimeException("Unable to fetch text forwarder, model might be dead", mxFrontEnd); + throw uno::RuntimeException(u"Unable to fetch text forwarder, model might be dead"_ustr, mxFrontEnd); if( !pTextForwarder->IsValid() ) - throw uno::RuntimeException("Text forwarder is invalid, model might be dead", mxFrontEnd); + throw uno::RuntimeException(u"Text forwarder is invalid, model might be dead"_ustr, mxFrontEnd); return *pTextForwarder; } @@ -274,15 +274,15 @@ namespace accessibility SvxViewForwarder& AccessibleTextHelper_Impl::GetViewForwarder() const { if( !maEditSource.IsValid() ) - throw uno::RuntimeException("Unknown edit source", mxFrontEnd); + throw uno::RuntimeException(u"Unknown edit source"_ustr, mxFrontEnd); SvxViewForwarder* pViewForwarder = maEditSource.GetViewForwarder(); if( !pViewForwarder ) - throw uno::RuntimeException("Unable to fetch view forwarder, model might be dead", mxFrontEnd); + throw uno::RuntimeException(u"Unable to fetch view forwarder, model might be dead"_ustr, mxFrontEnd); if( !pViewForwarder->IsValid() ) - throw uno::RuntimeException("View forwarder is invalid, model might be dead", mxFrontEnd); + throw uno::RuntimeException(u"View forwarder is invalid, model might be dead"_ustr, mxFrontEnd); return *pViewForwarder; } @@ -290,18 +290,18 @@ namespace accessibility SvxEditViewForwarder& AccessibleTextHelper_Impl::GetEditViewForwarder() const { if( !maEditSource.IsValid() ) - throw uno::RuntimeException("Unknown edit source", mxFrontEnd); + throw uno::RuntimeException(u"Unknown edit source"_ustr, mxFrontEnd); SvxEditViewForwarder* pViewForwarder = maEditSource.GetEditViewForwarder(); if( !pViewForwarder ) { - throw uno::RuntimeException("No edit view forwarder, object not in edit mode", mxFrontEnd); + throw uno::RuntimeException(u"No edit view forwarder, object not in edit mode"_ustr, mxFrontEnd); } if( !pViewForwarder->IsValid() ) { - throw uno::RuntimeException("View forwarder is invalid, object not in edit mode", mxFrontEnd); + throw uno::RuntimeException(u"View forwarder is invalid, object not in edit mode"_ustr, mxFrontEnd); } return *pViewForwarder; @@ -310,7 +310,7 @@ namespace accessibility SvxEditSourceAdapter& AccessibleTextHelper_Impl::GetEditSource() const { if( !maEditSource.IsValid() ) - throw uno::RuntimeException("AccessibleTextHelper_Impl::GetEditSource: no edit source", mxFrontEnd ); + throw uno::RuntimeException(u"AccessibleTextHelper_Impl::GetEditSource: no edit source"_ustr, mxFrontEnd ); return maEditSource; } @@ -1435,7 +1435,7 @@ namespace accessibility if( 0 > i || i >= getAccessibleChildCount() || GetTextForwarder().GetParagraphCount() <= i ) { - throw lang::IndexOutOfBoundsException("Invalid child index", mxFrontEnd); + throw lang::IndexOutOfBoundsException(u"Invalid child index"_ustr, mxFrontEnd); } DBG_ASSERT(mxFrontEnd.is(), "AccessibleTextHelper_Impl::UpdateVisibleChildren: no frontend set"); @@ -1474,12 +1474,12 @@ namespace accessibility { // make given position relative if( !mxFrontEnd.is() ) - throw uno::RuntimeException("AccessibleTextHelper_Impl::getAccessibleAt: frontend invalid", mxFrontEnd ); + throw uno::RuntimeException(u"AccessibleTextHelper_Impl::getAccessibleAt: frontend invalid"_ustr, mxFrontEnd ); uno::Reference< XAccessibleContext > xFrontEndContext = mxFrontEnd->getAccessibleContext(); if( !xFrontEndContext.is() ) - throw uno::RuntimeException("AccessibleTextHelper_Impl::getAccessibleAt: frontend invalid", mxFrontEnd ); + throw uno::RuntimeException(u"AccessibleTextHelper_Impl::getAccessibleAt: frontend invalid"_ustr, mxFrontEnd ); uno::Reference< XAccessibleComponent > xFrontEndComponent( xFrontEndContext, uno::UNO_QUERY_THROW ); diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index ad133fa8f4bf..3bb2a2db0dea 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -79,7 +79,7 @@ void DescriptionGenerator::Initialize(std::u16string_view sPrefix) { if (mxSet.is()) { - uno::Any aValue = mxSet->getPropertyValue("Style"); + uno::Any aValue = mxSet->getPropertyValue(u"Style"_ustr); uno::Reference<container::XNamed> xStyle(aValue, uno::UNO_QUERY); if (xStyle.is()) msDescription.append(xStyle->getName()); diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 1287f7e9ea2f..a3a3e76d616c 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -487,7 +487,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground() // XServiceInfo OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName() { - return "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext"; + return u"com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext"_ustr; } sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName ) @@ -497,9 +497,9 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames() { - return { "com.sun.star.accessibility.Accessible", - "com.sun.star.accessibility.AccessibleContext", - "com.sun.star.drawing.AccessibleGraphControl" }; + return { u"com.sun.star.accessibility.Accessible"_ustr, + u"com.sun.star.accessibility.AccessibleContext"_ustr, + u"com.sun.star.drawing.AccessibleGraphControl"_ustr }; } // XTypeProvider @@ -511,7 +511,7 @@ Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId() // XServiceName OUString SvxGraphCtrlAccessibleContext::getServiceName() { - return "com.sun.star.accessibility.AccessibleContext"; + return u"com.sun.star.accessibility.AccessibleContext"_ustr; } // XAccessibleSelection diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index b02a153a4cdb..1ef37dcb504f 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -91,67 +91,67 @@ void RegisterDrawShapeTypes() <type>SvxShapeTypes</type> enum. */ static ShapeTypeDescriptor const aSvxShapeTypeList[] = { - ShapeTypeDescriptor ( DRAWING_TEXT, "com.sun.star.drawing.TextShape", + ShapeTypeDescriptor ( DRAWING_TEXT, u"com.sun.star.drawing.TextShape"_ustr, CreateSvxAccessibleShape), - ShapeTypeDescriptor (DRAWING_RECTANGLE, "com.sun.star.drawing.RectangleShape", + ShapeTypeDescriptor (DRAWING_RECTANGLE, u"com.sun.star.drawing.RectangleShape"_ustr, CreateSvxAccessibleShape), - ShapeTypeDescriptor ( DRAWING_ELLIPSE, "com.sun.star.drawing.EllipseShape", + ShapeTypeDescriptor ( DRAWING_ELLIPSE, u"com.sun.star.drawing.EllipseShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CONTROL, "com.sun.star.drawing.ControlShape", + ShapeTypeDescriptor ( DRAWING_CONTROL, u"com.sun.star.drawing.ControlShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CONNECTOR, "com.sun.star.drawing.ConnectorShape", + ShapeTypeDescriptor ( DRAWING_CONNECTOR, u"com.sun.star.drawing.ConnectorShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_MEASURE, "com.sun.star.drawing.MeasureShape", + ShapeTypeDescriptor ( DRAWING_MEASURE, u"com.sun.star.drawing.MeasureShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_LINE, "com.sun.star.drawing.LineShape", + ShapeTypeDescriptor ( DRAWING_LINE, u"com.sun.star.drawing.LineShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_POLY_POLYGON, "com.sun.star.drawing.PolyPolygonShape", + ShapeTypeDescriptor ( DRAWING_POLY_POLYGON, u"com.sun.star.drawing.PolyPolygonShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_POLY_LINE, "com.sun.star.drawing.PolyLineShape", + ShapeTypeDescriptor ( DRAWING_POLY_LINE, u"com.sun.star.drawing.PolyLineShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_OPEN_BEZIER, "com.sun.star.drawing.OpenBezierShape", + ShapeTypeDescriptor ( DRAWING_OPEN_BEZIER, u"com.sun.star.drawing.OpenBezierShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CLOSED_BEZIER, "com.sun.star.drawing.ClosedBezierShape", + ShapeTypeDescriptor ( DRAWING_CLOSED_BEZIER, u"com.sun.star.drawing.ClosedBezierShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_OPEN_FREEHAND, "com.sun.star.drawing.OpenFreeHandShape", + ShapeTypeDescriptor ( DRAWING_OPEN_FREEHAND, u"com.sun.star.drawing.OpenFreeHandShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CLOSED_FREEHAND, "com.sun.star.drawing.ClosedFreeHandShape", + ShapeTypeDescriptor ( DRAWING_CLOSED_FREEHAND, u"com.sun.star.drawing.ClosedFreeHandShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_POLY_POLYGON_PATH, "com.sun.star.drawing.PolyPolygonPathShape", + ShapeTypeDescriptor ( DRAWING_POLY_POLYGON_PATH, u"com.sun.star.drawing.PolyPolygonPathShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_POLY_LINE_PATH, "com.sun.star.drawing.PolyLinePathShape", + ShapeTypeDescriptor ( DRAWING_POLY_LINE_PATH, u"com.sun.star.drawing.PolyLinePathShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_GRAPHIC_OBJECT, "com.sun.star.drawing.GraphicObjectShape", + ShapeTypeDescriptor ( DRAWING_GRAPHIC_OBJECT, u"com.sun.star.drawing.GraphicObjectShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_GROUP, "com.sun.star.drawing.GroupShape", + ShapeTypeDescriptor ( DRAWING_GROUP, u"com.sun.star.drawing.GroupShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_OLE, "com.sun.star.drawing.OLE2Shape", + ShapeTypeDescriptor ( DRAWING_OLE, u"com.sun.star.drawing.OLE2Shape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_PAGE, "com.sun.star.drawing.PageShape", + ShapeTypeDescriptor ( DRAWING_PAGE, u"com.sun.star.drawing.PageShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CAPTION, "com.sun.star.drawing.CaptionShape", + ShapeTypeDescriptor ( DRAWING_CAPTION, u"com.sun.star.drawing.CaptionShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_FRAME, "com.sun.star.drawing.FrameShape", + ShapeTypeDescriptor ( DRAWING_FRAME, u"com.sun.star.drawing.FrameShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_PLUGIN, "com.sun.star.drawing.PluginShape", + ShapeTypeDescriptor ( DRAWING_PLUGIN, u"com.sun.star.drawing.PluginShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_APPLET, "com.sun.star.drawing.AppletShape", + ShapeTypeDescriptor ( DRAWING_APPLET, u"com.sun.star.drawing.AppletShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_3D_SCENE, "com.sun.star.drawing.Shape3DSceneObject", + ShapeTypeDescriptor ( DRAWING_3D_SCENE, u"com.sun.star.drawing.Shape3DSceneObject"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_3D_CUBE, "com.sun.star.drawing.Shape3DCubeObject", + ShapeTypeDescriptor ( DRAWING_3D_CUBE, u"com.sun.star.drawing.Shape3DCubeObject"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_3D_SPHERE, "com.sun.star.drawing.Shape3DSphereObject", + ShapeTypeDescriptor ( DRAWING_3D_SPHERE, u"com.sun.star.drawing.Shape3DSphereObject"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_3D_LATHE, "com.sun.star.drawing.Shape3DLatheObject", + ShapeTypeDescriptor ( DRAWING_3D_LATHE, u"com.sun.star.drawing.Shape3DLatheObject"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_3D_EXTRUDE, "com.sun.star.drawing.Shape3DExtrudeObject", + ShapeTypeDescriptor ( DRAWING_3D_EXTRUDE, u"com.sun.star.drawing.Shape3DExtrudeObject"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_CUSTOM, "com.sun.star.drawing.CustomShape", + ShapeTypeDescriptor ( DRAWING_CUSTOM, u"com.sun.star.drawing.CustomShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_TABLE, "com.sun.star.drawing.TableShape", + ShapeTypeDescriptor ( DRAWING_TABLE, u"com.sun.star.drawing.TableShape"_ustr, CreateSvxAccessibleShape ), - ShapeTypeDescriptor ( DRAWING_MEDIA, "com.sun.star.drawing.MediaShape", + ShapeTypeDescriptor ( DRAWING_MEDIA, u"com.sun.star.drawing.MediaShape"_ustr, CreateSvxAccessibleShape ), }; diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index fb65752d67d8..191f71efc4ad 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -519,7 +519,7 @@ sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex ) OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nIndex ) { if( nIndex == 0 ) - return "press"; + return u"press"_ustr; throw IndexOutOfBoundsException(); } diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 8c0e0ca1c0c1..81a4ac0344c5 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -86,13 +86,13 @@ OUString SvxPixelCtlAccessible::getAccessibleDescription( ) { ::osl::MutexGuard aGuard( m_aMutex ); - return mpPixelCtl ? mpPixelCtl->GetAccessibleDescription() : ""; + return mpPixelCtl ? mpPixelCtl->GetAccessibleDescription() : u""_ustr; } OUString SvxPixelCtlAccessible::getAccessibleName( ) { ::osl::MutexGuard aGuard( m_aMutex ); - return mpPixelCtl ? mpPixelCtl->GetAccessibleName() : ""; + return mpPixelCtl ? mpPixelCtl->GetAccessibleName() : u""_ustr; } Reference< XAccessibleRelationSet > SAL_CALL SvxPixelCtlAccessible::getAccessibleRelationSet() diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 80efbc4bd319..1acd58e6a35d 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -578,7 +578,7 @@ OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_ if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); - return "select"; + return u"select"_ustr; } diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index e52594b15c31..8e73d20ee164 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -145,7 +145,7 @@ bool lcl_ExecuteFilterDialog(const uno::Sequence<beans::PropertyValue>& rPropsFo try { uno::Reference<ui::dialogs::XExecutableDialog> xFilterDialog( - comphelper::getProcessServiceFactory()->createInstance( "com.sun.star.svtools.SvFilterOptionsDialog" ), uno::UNO_QUERY); + comphelper::getProcessServiceFactory()->createInstance( u"com.sun.star.svtools.SvFilterOptionsDialog"_ustr ), uno::UNO_QUERY); uno::Reference<beans::XPropertyAccess> xFilterProperties( xFilterDialog, uno::UNO_QUERY); if( xFilterDialog.is() && xFilterProperties.is() ) @@ -280,8 +280,8 @@ OUString GraphicHelper::ExportGraphic(weld::Window* pParent, const Graphic& rGra uno::Sequence<beans::PropertyValue> aPropsForDialog { - comphelper::makePropertyValue("Graphic", xGraphic), - comphelper::makePropertyValue("FilterName", aExportFilter) + comphelper::makePropertyValue(u"Graphic"_ustr, xGraphic), + comphelper::makePropertyValue(u"FilterName"_ustr, aExportFilter) }; uno::Sequence<beans::PropertyValue> aFilterData; @@ -353,21 +353,21 @@ void GraphicHelper::SaveShapeAsGraphicToPath( { uno::Reference<lang::XMultiServiceFactory> xMSF(xContext->getServiceManager(), uno::UNO_QUERY); uno::Reference<document::XExporter> xExporter( - xMSF->createInstance("com.sun.star.comp.PDF.PDFFilter"), uno::UNO_QUERY); + xMSF->createInstance(u"com.sun.star.comp.PDF.PDFFilter"_ustr), uno::UNO_QUERY); xExporter->setSourceDocument(xComponent); uno::Reference<drawing::XShapes> xShapes = drawing::ShapeCollection::create(comphelper::getProcessComponentContext()); xShapes->add(xShape); uno::Sequence<beans::PropertyValue> aFilterData{ - comphelper::makePropertyValue("Selection", xShapes), + comphelper::makePropertyValue(u"Selection"_ustr, xShapes), }; SvFileStream aStream(sPath, StreamMode::READWRITE | StreamMode::TRUNC); uno::Reference<io::XOutputStream> xStream(new utl::OStreamWrapper(aStream)); uno::Sequence<beans::PropertyValue> aDescriptor { - comphelper::makePropertyValue("FilterData", aFilterData), - comphelper::makePropertyValue("OutputStream", xStream) + comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData), + comphelper::makePropertyValue(u"OutputStream"_ustr, xStream) }; uno::Reference<document::XFilter> xFilter(xExporter, uno::UNO_QUERY); xFilter->filter(aDescriptor); @@ -376,9 +376,9 @@ void GraphicHelper::SaveShapeAsGraphicToPath( { uno::Reference<drawing::XGraphicExportFilter> xGraphicExporter = drawing::GraphicExportFilter::create(xContext); - uno::Sequence<beans::PropertyValue> aDescriptor{ comphelper::makePropertyValue("MediaType", + uno::Sequence<beans::PropertyValue> aDescriptor{ comphelper::makePropertyValue(u"MediaType"_ustr, aExportMimeType), - comphelper::makePropertyValue("URL", sPath) }; + comphelper::makePropertyValue(u"URL"_ustr, sPath) }; uno::Reference<lang::XComponent> xSourceDocument(xShape, uno::UNO_QUERY_THROW); xGraphicExporter->setSourceDocument(xSourceDocument); diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 082532d75f2d..b8b6d04e4cf4 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1506,9 +1506,9 @@ bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nIndex // For ooxml-foo shapes, the way to calculate the adjustment value from the handle position depends on // the type of the shape, therefore need 'Type'. - OUString sShapeType("non-primitive"); // default for ODF + OUString sShapeType(u"non-primitive"_ustr); // default for ODF const SdrCustomShapeGeometryItem& rGeometryItem(mrSdrObjCustomShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); - const Any* pAny = rGeometryItem.GetPropertyValueByName("Type"); + const Any* pAny = rGeometryItem.GetPropertyValueByName(u"Type"_ustr); if (pAny) *pAny >>= sShapeType; @@ -2174,7 +2174,7 @@ void EnhancedCustomShape2d::CreateSubPath( // Some shapes will need special handling, decide on property 'Type'. OUString sShpType; SdrCustomShapeGeometryItem& rGeometryItem = const_cast<SdrCustomShapeGeometryItem&>(mrSdrObjCustomShape.GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY)); - Any* pAny = rGeometryItem.GetPropertyValueByName("Type"); + Any* pAny = rGeometryItem.GetPropertyValueByName(u"Type"_ustr); if (pAny) *pAny >>= sShpType; // User defined shapes in MS binary format, which contain command U or T after import @@ -2183,8 +2183,8 @@ void EnhancedCustomShape2d::CreateSubPath( // The only own or imported preset shapes with U command are those listed below. // Command T is not used in preset shapes. const std::unordered_set<OUString> aPresetShapesWithU = - { "ellipse", "ring", "smiley", "sun", "forbidden", "flowchart-connector", - "flowchart-summing-junction", "flowchart-or", "cloud-callout"}; + { u"ellipse"_ustr, u"ring"_ustr, u"smiley"_ustr, u"sun"_ustr, u"forbidden"_ustr, u"flowchart-connector"_ustr, + u"flowchart-summing-junction"_ustr, u"flowchart-or"_ustr, u"cloud-callout"_ustr}; std::unordered_set<OUString>::const_iterator aIter = aPresetShapesWithU.find(sShpType); const bool bIsPresetShapeWithU(aIter != aPresetShapesWithU.end()); @@ -2805,7 +2805,7 @@ void EnhancedCustomShape2d::AdaptObjColor( rCustomShapeSet.Get( XATTR_FILLCOLOR ).GetColorValue(), std::min(nColorIndex, nColorCount-1), dBrightness ); - rObj.SetMergedItem( XFillColorItem( "", aFillColor ) ); + rObj.SetMergedItem( XFillColorItem( u""_ustr, aFillColor ) ); } break; } @@ -2828,7 +2828,7 @@ void EnhancedCustomShape2d::AdaptObjColor( aBGradient.SetColorStops(aColorStops); } - rObj.SetMergedItem( XFillGradientItem( "", aBGradient ) ); + rObj.SetMergedItem( XFillGradientItem( u""_ustr, aBGradient ) ); break; } case drawing::FillStyle_HATCH: @@ -2844,7 +2844,7 @@ void EnhancedCustomShape2d::AdaptObjColor( dBrightness )); } - rObj.SetMergedItem( XFillHatchItem( "", aXHatch ) ); + rObj.SetMergedItem( XFillHatchItem( u""_ustr, aXHatch ) ); break; } case drawing::FillStyle_BITMAP: diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index eadc201c7ae6..56dd2a18337a 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -68,7 +68,7 @@ namespace { void GetOrigin( const SdrCustomShapeGeometryItem& rItem, double& rOriginX, double& rOriginY ) { css::drawing::EnhancedCustomShapeParameterPair aOriginParaPair; - const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Origin" ); + const Any* pAny = rItem.GetPropertyValueByName( u"Extrusion"_ustr, u"Origin"_ustr ); if ( ! ( pAny && ( *pAny >>= aOriginParaPair ) && ( aOriginParaPair.First.Value >>= rOriginX ) && ( aOriginParaPair.Second.Value >>= rOriginY ) ) ) { rOriginX = 0.50; @@ -79,7 +79,7 @@ void GetOrigin( const SdrCustomShapeGeometryItem& rItem, double& rOriginX, doubl void GetRotateAngle( const SdrCustomShapeGeometryItem& rItem, double& rAngleX, double& rAngleY ) { css::drawing::EnhancedCustomShapeParameterPair aRotateAngleParaPair; - const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "RotateAngle" ); + const Any* pAny = rItem.GetPropertyValueByName( u"Extrusion"_ustr, u"RotateAngle"_ustr ); if ( ! ( pAny && ( *pAny >>= aRotateAngleParaPair ) && ( aRotateAngleParaPair.First.Value >>= rAngleX ) && ( aRotateAngleParaPair.Second.Value >>= rAngleY ) ) ) { rAngleX = 0.0; @@ -92,7 +92,7 @@ void GetRotateAngle( const SdrCustomShapeGeometryItem& rItem, double& rAngleX, d void GetSkew( const SdrCustomShapeGeometryItem& rItem, double& rSkewAmount, double& rSkewAngle ) { css::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; - const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Skew" ); + const Any* pAny = rItem.GetPropertyValueByName( u"Extrusion"_ustr, u"Skew"_ustr ); if ( ! ( pAny && ( *pAny >>= aSkewParaPair ) && ( aSkewParaPair.First.Value >>= rSkewAmount ) && ( aSkewParaPair.Second.Value >>= rSkewAngle ) ) ) { rSkewAmount = 50; @@ -108,7 +108,7 @@ void GetExtrusionDepth( const SdrCustomShapeGeometryItem& rItem, const double* p { css::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; double fDepth = 0, fFraction = 0; - const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Depth" ); + const Any* pAny = rItem.GetPropertyValueByName( u"Extrusion"_ustr, u"Depth"_ustr ); if ( pAny && ( *pAny >>= aDepthParaPair ) && ( aDepthParaPair.First.Value >>= fDepth ) && ( aDepthParaPair.Second.Value >>= fFraction ) ) { rForwardDepth = fDepth * fFraction; @@ -130,7 +130,7 @@ void GetExtrusionDepth( const SdrCustomShapeGeometryItem& rItem, const double* p double GetDouble( const SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, double fDefault ) { double fRetValue = fDefault; - const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", rPropertyName ); + const Any* pAny = rItem.GetPropertyValueByName( u"Extrusion"_ustr, rPropertyName ); if ( pAny ) *pAny >>= fRetValue; return fRetValue; @@ -139,7 +139,7 @@ double GetDouble( const SdrCustomShapeGeometryItem& rItem, const OUString& rProp drawing::ShadeMode GetShadeMode( const SdrCustomShapeGeometryItem& rItem, const drawing::ShadeMode eDefault ) { drawing::ShadeMode eRet( eDefault ); - const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "ShadeMode" ); + const Any* pAny = rItem.GetPropertyValueByName( u"Extrusion"_ustr, u"ShadeMode"_ustr ); if ( pAny ) { if (!(*pAny >>= eRet)) @@ -157,7 +157,7 @@ drawing::ShadeMode GetShadeMode( const SdrCustomShapeGeometryItem& rItem, const bool GetBool( const SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, const bool bDefault ) { bool bRetValue = bDefault; - const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", rPropertyName ); + const Any* pAny = rItem.GetPropertyValueByName( u"Extrusion"_ustr, rPropertyName ); if ( pAny ) *pAny >>= bRetValue; return bRetValue; @@ -167,7 +167,7 @@ drawing::Position3D GetPosition3D( const SdrCustomShapeGeometryItem& rItem, cons const drawing::Position3D& rDefault, const double* pMap ) { drawing::Position3D aRetValue( rDefault ); - const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", rPropertyName ); + const Any* pAny = rItem.GetPropertyValueByName( u"Extrusion"_ustr, rPropertyName ); if ( pAny ) *pAny >>= aRetValue; if ( pMap ) -e ... etc. - the rest is truncated
