sc/source/ui/Accessibility/AccessibleCell.cxx | 4 +-- sc/source/ui/Accessibility/AccessibleCellBase.cxx | 12 ++++----- sc/source/ui/Accessibility/AccessibleContextBase.cxx | 6 ++-- sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 14 +++++------ sc/source/ui/Accessibility/AccessibleDocument.cxx | 6 ++-- sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 4 +-- sc/source/ui/Accessibility/AccessibleEditObject.cxx | 2 - sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 4 +-- sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 4 +-- sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 4 +-- sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 4 +-- sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 2 - sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 4 +-- sc/source/ui/Accessibility/AccessibleTableBase.cxx | 2 - 14 files changed, 36 insertions(+), 36 deletions(-)
New commits: commit c2a2eb189c45b4eaf53bd2b5656185fa72512322 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed May 22 09:34:38 2024 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Wed May 22 12:42:07 2024 +0200 loplugin:ostr in sc/../Accessibility Change-Id: Ibf9981ee800054c10b663d9fc91602d326175a68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167919 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index b27fbb90671a..3d1fb315965c 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -300,13 +300,13 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL OUString SAL_CALL ScAccessibleCell::getImplementationName() { - return "ScAccessibleCell"; + return u"ScAccessibleCell"_ustr; } uno::Sequence< OUString> SAL_CALL ScAccessibleCell::getSupportedServiceNames() { - const css::uno::Sequence<OUString> vals { "com.sun.star.sheet.AccessibleCell" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.sheet.AccessibleCell"_ustr }; return comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(), vals); } diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index d8b84fabafc1..ebff91c101e2 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -269,7 +269,7 @@ uno::Any SAL_CALL OUString SAL_CALL ScAccessibleCellBase::getImplementationName() { - return "ScAccessibleCellBase"; + return u"ScAccessibleCellBase"_ustr; } //===== XTypeProvider =================================================== @@ -374,9 +374,9 @@ OUString ScAccessibleCellBase::getShadowAttrs() const } } //construct shadow attributes string - OUString sShadowAttrs("Shadow:"); - OUString sInnerSplit(","); - OUString sOuterSplit(";"); + OUString sShadowAttrs(u"Shadow:"_ustr); + OUString sInnerSplit(u","_ustr); + OUString sOuterSplit(u";"_ustr); sal_Int32 nLocationVal = 0; switch( aShadowFmt.Location ) { @@ -479,8 +479,8 @@ OUString ScAccessibleCellBase::getBorderAttrs() //construct border attributes string OUString sBorderAttrs; - OUString sInnerSplit(","); - OUString sOuterSplit(";"); + OUString sInnerSplit(u","_ustr); + OUString sOuterSplit(u";"_ustr); //top border //if top of the cell has no border if ( aTopBorder.InnerLineWidth == 0 && aTopBorder.OuterLineWidth == 0 ) diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 59f2f399032e..34826eb80e9d 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -416,7 +416,7 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL ScAccessibleContextBase::getImplementationName() { - return "ScAccessibleContextBase"; + return u"ScAccessibleContextBase"_ustr; } sal_Bool SAL_CALL ScAccessibleContextBase::supportsService(const OUString& sServiceName) @@ -427,8 +427,8 @@ sal_Bool SAL_CALL ScAccessibleContextBase::supportsService(const OUString& sServ uno::Sequence< OUString> SAL_CALL ScAccessibleContextBase::getSupportedServiceNames() { - return {"com.sun.star.accessibility.Accessible", - "com.sun.star.accessibility.AccessibleContext"}; + return {u"com.sun.star.accessibility.Accessible"_ustr, + u"com.sun.star.accessibility.AccessibleContext"_ustr}; } //===== internal ============================================================ diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index c6dc50dc011a..166e1482b057 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -237,13 +237,13 @@ static void lcl_FillFontAttributes( Sequence< PropertyValue >& rSeq, const vcl:: sal_Int32 nIndex = lcl_ExpandSequence( rSeq, 7 ); auto pSeq = rSeq.getArray(); - lcl_FillProperty( pSeq[ nIndex++ ], "CharFontName", aFontItem, MID_FONT_FAMILY_NAME ); - lcl_FillProperty( pSeq[ nIndex++ ], "CharFontFamily", aFontItem, MID_FONT_FAMILY ); - lcl_FillProperty( pSeq[ nIndex++ ], "CharFontStyleName", aFontItem, MID_FONT_STYLE_NAME ); - lcl_FillProperty( pSeq[ nIndex++ ], "CharFontCharSet", aFontItem, MID_FONT_PITCH ); - lcl_FillProperty( pSeq[ nIndex++ ], "CharFontPitch", aFontItem, MID_FONT_CHAR_SET ); - lcl_FillProperty( pSeq[ nIndex++ ], "CharHeight", aHeightItem, MID_FONTHEIGHT ); - lcl_FillProperty( pSeq[ nIndex++ ], "CharLocale", aLangItem, MID_LANG_LOCALE ); + lcl_FillProperty( pSeq[ nIndex++ ], u"CharFontName"_ustr, aFontItem, MID_FONT_FAMILY_NAME ); + lcl_FillProperty( pSeq[ nIndex++ ], u"CharFontFamily"_ustr, aFontItem, MID_FONT_FAMILY ); + lcl_FillProperty( pSeq[ nIndex++ ], u"CharFontStyleName"_ustr, aFontItem, MID_FONT_STYLE_NAME ); + lcl_FillProperty( pSeq[ nIndex++ ], u"CharFontCharSet"_ustr, aFontItem, MID_FONT_PITCH ); + lcl_FillProperty( pSeq[ nIndex++ ], u"CharFontPitch"_ustr, aFontItem, MID_FONT_CHAR_SET ); + lcl_FillProperty( pSeq[ nIndex++ ], u"CharHeight"_ustr, aHeightItem, MID_FONTHEIGHT ); + lcl_FillProperty( pSeq[ nIndex++ ], u"CharLocale"_ustr, aLangItem, MID_LANG_LOCALE ); } ScAccessibleCsvRuler::ScAccessibleCsvRuler(ScCsvRuler& rRuler) diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index e8010b387393..12b8d8c88014 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1181,7 +1181,7 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, b uno::Reference< beans::XPropertySet > xShapeProp(xShape, uno::UNO_QUERY); if (xShapeProp.is()) { - uno::Any aPropAny = xShapeProp->getPropertyValue("LayerID"); + uno::Any aPropAny = xShapeProp->getPropertyValue(u"LayerID"_ustr); sal_Int16 nLayerID = 0; if( aPropAny >>= nLayerID ) { @@ -1947,13 +1947,13 @@ void SAL_CALL OUString SAL_CALL ScAccessibleDocument::getImplementationName() { - return "ScAccessibleDocument"; + return u"ScAccessibleDocument"_ustr; } uno::Sequence< OUString> SAL_CALL ScAccessibleDocument::getSupportedServiceNames() { - const css::uno::Sequence<OUString> vals { "com.sun.star.AccessibleSpreadsheetDocumentView" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.AccessibleSpreadsheetDocumentView"_ustr }; return comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(), vals); } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 7af737b48c8b..f2010156ef1a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1451,12 +1451,12 @@ sal_Int64 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet() OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName() { - return "ScAccessibleDocumentPagePreview"; + return u"ScAccessibleDocumentPagePreview"_ustr; } uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames() { - const css::uno::Sequence<OUString> vals { "com.sun.star.AccessibleSpreadsheetPageView" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.AccessibleSpreadsheetPageView"_ustr }; return comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(), vals); } diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index ceb07cb662aa..06244da2b41e 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -328,7 +328,7 @@ void SAL_CALL OUString SAL_CALL ScAccessibleEditObject::getImplementationName() { - return "ScAccessibleEditObject"; + return u"ScAccessibleEditObject"_ustr; } //===== XTypeProvider ======================================================= diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 1c82cfac7542..dab5f2f89b3c 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -278,12 +278,12 @@ sal_Int64 SAL_CALL ScAccessiblePageHeader::getAccessibleStateSet() OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() { - return "ScAccessiblePageHeader"; + return u"ScAccessiblePageHeader"_ustr; } uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames() { - const css::uno::Sequence<OUString> vals { "com.sun.star.text.AccessibleHeaderFooterView" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.text.AccessibleHeaderFooterView"_ustr }; return comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(), vals); } diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index ec1fbf3add1b..75f67e2ed302 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -161,13 +161,13 @@ sal_Int64 SAL_CALL ScAccessiblePageHeaderArea::getAccessibleStateSet() OUString SAL_CALL ScAccessiblePageHeaderArea::getImplementationName() { - return "ScAccessiblePageHeaderArea"; + return u"ScAccessiblePageHeaderArea"_ustr; } uno::Sequence< OUString> SAL_CALL ScAccessiblePageHeaderArea::getSupportedServiceNames() { - const css::uno::Sequence<OUString> vals { "com.sun.star.sheet.AccessiblePageHeaderFooterAreasView" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.sheet.AccessiblePageHeaderFooterAreasView"_ustr }; return comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(), vals); } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 3c4d33430552..93df6a503837 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -172,12 +172,12 @@ sal_Int64 SAL_CALL ScAccessiblePreviewCell::getAccessibleStateSet() OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() { - return "ScAccessiblePreviewCell"; + return u"ScAccessiblePreviewCell"_ustr; } uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames() { - const css::uno::Sequence<OUString> vals { "com.sun.star.table.AccessibleCellView" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.table.AccessibleCellView"_ustr }; return comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(), vals); } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index d772db890a59..6112d13c7377 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -258,12 +258,12 @@ sal_Int64 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleStateSet() OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() { - return "ScAccessiblePreviewHeaderCell"; + return u"ScAccessiblePreviewHeaderCell"_ustr; } uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames() { - const css::uno::Sequence<OUString> vals { "com.sun.star.table.AccessibleCellView" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.table.AccessibleCellView"_ustr }; return comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(), vals); } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 925ad1075c6f..5dfc06ca063b 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -526,7 +526,7 @@ sal_Int64 SAL_CALL ScAccessiblePreviewTable::getAccessibleStateSet() OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() { - return "ScAccessiblePreviewTable"; + return u"ScAccessiblePreviewTable"_ustr; } uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames() diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 7aaa7237ccac..fdeea8d7579a 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1282,13 +1282,13 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange) OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName() { - return "ScAccessibleSpreadsheet"; + return u"ScAccessibleSpreadsheet"_ustr; } uno::Sequence< OUString> SAL_CALL ScAccessibleSpreadsheet::getSupportedServiceNames() { - const css::uno::Sequence<OUString> vals { "com.sun.star.AccessibleSpreadsheet" }; + const css::uno::Sequence<OUString> vals { u"com.sun.star.AccessibleSpreadsheet"_ustr }; return comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(), vals); } diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 5ce54fad56df..993370ccc5a8 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -410,7 +410,7 @@ void SAL_CALL ScAccessibleTableBase::deselectAccessibleChild( sal_Int64 /* nSele OUString SAL_CALL ScAccessibleTableBase::getImplementationName() { - return "ScAccessibleTableBase"; + return u"ScAccessibleTableBase"_ustr; } //===== XTypeProvider ===================================================