diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-12 12:43:11 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-13 08:38:53 +0200 |
commit | fdfd517a6f75e394ddcb1e195decbfed33ba56b9 (patch) | |
tree | e3bff14e5531affcd908415b4e85d7ceac4aa1fd /writerfilter/source | |
parent | e568c9dca8b93b96a8a130a8fb6f1bba1a33d6ea (diff) |
loplugin:stringviewparam whitelist some more functions
for which we have o3tl:: equivalents
Change-Id: I4670fd8b703ac47214be213f41e88d1c6ede7032
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132913
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/dmapper/ConversionHelper.cxx | 10 | ||||
-rw-r--r-- | writerfilter/source/dmapper/ConversionHelper.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 16 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.hxx | 6 |
5 files changed, 21 insertions, 21 deletions
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index afc8acf72d00..357f4878c5b9 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -660,27 +660,27 @@ sal_Int16 ConvertCustomNumberFormat(std::u16string_view rFormat) return nRet; } -util::DateTime ConvertDateStringToDateTime( const OUString& rDateTime ) +util::DateTime ConvertDateStringToDateTime( std::u16string_view rDateTime ) { util::DateTime aDateTime; //xsd::DateTime in the format [-]CCYY-MM-DDThh:mm:ss[Z|(+|-)hh:mm] example: 2008-01-21T10:42:00Z //OUString getToken( sal_Int32 token, sal_Unicode cTok, sal_Int32& index ) const sal_Int32 nIndex = 0; - OUString sDate = rDateTime.getToken( 0, 'T', nIndex ); + std::u16string_view sDate = o3tl::getToken(rDateTime, 0, 'T', nIndex ); // HACK: this is broken according to the spec, but MSOffice always treats the time as local, // and writes it as Z (=UTC+0) - OUString sTime = rDateTime.getToken( 0, 'Z', nIndex ); + std::u16string_view sTime = o3tl::getToken(rDateTime, 0, 'Z', nIndex ); nIndex = 0; aDateTime.Year = sal_uInt16( o3tl::toInt32(o3tl::getToken(sDate, 0, '-', nIndex )) ); aDateTime.Month = sal_uInt16( o3tl::toInt32(o3tl::getToken(sDate, 0, '-', nIndex )) ); if (nIndex != -1) - aDateTime.Day = sal_uInt16( o3tl::toInt32(sDate.subView( nIndex )) ); + aDateTime.Day = sal_uInt16( o3tl::toInt32(sDate.substr( nIndex )) ); nIndex = 0; aDateTime.Hours = sal_uInt16( o3tl::toInt32(o3tl::getToken(sTime, 0, ':', nIndex )) ); aDateTime.Minutes = sal_uInt16( o3tl::toInt32(o3tl::getToken(sTime, 0, ':', nIndex )) ); if (nIndex != -1) - aDateTime.Seconds = sal_uInt16( o3tl::toInt32(sTime.subView( nIndex )) ); + aDateTime.Seconds = sal_uInt16( o3tl::toInt32(sTime.substr( nIndex )) ); return aDateTime; } diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx b/writerfilter/source/dmapper/ConversionHelper.hxx index 4ca441d169fa..c14c8033ea58 100644 --- a/writerfilter/source/dmapper/ConversionHelper.hxx +++ b/writerfilter/source/dmapper/ConversionHelper.hxx @@ -54,7 +54,7 @@ namespace writerfilter::dmapper::ConversionHelper{ sal_Int16 ConvertNumberingType(const sal_Int32 nFmt, const sal_Int16 nDefault = css::style::NumberingType::ARABIC); sal_Int16 ConvertCustomNumberFormat(std::u16string_view rFormat); - css::util::DateTime ConvertDateStringToDateTime(const OUString& rDateTime); + css::util::DateTime ConvertDateStringToDateTime(std::u16string_view rDateTime); } // namespace writerfilter::dmapper::ConversionHelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index fbd75c2ef34d..d7d9be2bc10c 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4052,7 +4052,7 @@ void DomainMapper_Impl::HandleLineBreak(const PropertyMapPtr& pPropertyMap) m_oLineBreakClear.reset(); } -static sal_Int16 lcl_ParseNumberingType( const OUString& rCommand ) +static sal_Int16 lcl_ParseNumberingType( std::u16string_view rCommand ) { sal_Int16 nRet = style::NumberingType::PAGE_DESCRIPTOR; @@ -4060,10 +4060,10 @@ static sal_Int16 lcl_ParseNumberingType( const OUString& rCommand ) // tdf#132185: but may as well be "PAGE \* Arabic" OUString sNumber; constexpr OUStringLiteral rSeparator(u"\\* "); - if (sal_Int32 nStartIndex = rCommand.indexOf(rSeparator); nStartIndex >= 0) + if (size_t nStartIndex = rCommand.find(rSeparator); nStartIndex != std::u16string_view::npos) { - nStartIndex += rSeparator.getLength(); - sNumber = rCommand.getToken(0, ' ', nStartIndex); + sal_Int32 nStartIndex2 = nStartIndex + rSeparator.getLength(); + sNumber = o3tl::getToken(rCommand, 0, ' ', nStartIndex2); } if( !sNumber.isEmpty() ) diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 6d03ac396664..aa35c03351db 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -190,7 +190,7 @@ void RTFSdrImport::resolveFLine(uno::Reference<beans::XPropertySet> const& xProp } void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape, - std::u16string_view aKey, const OUString& aValue) const + std::u16string_view aKey, std::u16string_view aValue) const { uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY); sal_Int16 nHoriOrient = 0; @@ -200,7 +200,7 @@ void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape, if (aKey == u"posh") { - switch (aValue.toInt32()) + switch (o3tl::toInt32(aValue)) { case 1: nHoriOrient = text::HoriOrientation::LEFT; @@ -223,7 +223,7 @@ void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape, } else if (aKey == u"posv") { - switch (aValue.toInt32()) + switch (o3tl::toInt32(aValue)) { case 1: nVertOrient = text::VertOrientation::TOP; @@ -239,14 +239,14 @@ void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape, } } else if (aKey == u"fFitShapeToText") - obFitShapeToText = aValue.toInt32() == 1; + obFitShapeToText = o3tl::toInt32(aValue) == 1; else if (aKey == u"fFilled") - bFilled = aValue.toInt32() == 1; + bFilled = o3tl::toInt32(aValue) == 1; else if (aKey == u"rotation") { // See DffPropertyReader::Fix16ToAngle(): in RTF, positive rotation angles are clockwise, we have them as counter-clockwise. // Additionally, RTF type is 0..360*2^16, our is 0..360*100. - sal_Int32 nRotation = aValue.toInt32() * 100 / RTF_MULTIPLIER; + sal_Int32 nRotation = o3tl::toInt32(aValue) * 100 / RTF_MULTIPLIER; uno::Reference<lang::XServiceInfo> xServiceInfo(xShape, uno::UNO_QUERY); if (!xServiceInfo->supportsService("com.sun.star.text.TextFrame")) xPropertySet->setPropertyValue( @@ -1166,12 +1166,12 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap void RTFSdrImport::close() { m_rImport.Mapper().endShape(); } -void RTFSdrImport::append(std::u16string_view aKey, const OUString& aValue) +void RTFSdrImport::append(std::u16string_view aKey, std::u16string_view aValue) { applyProperty(m_xShape, aKey, aValue); } -void RTFSdrImport::appendGroupProperty(std::u16string_view aKey, const OUString& aValue) +void RTFSdrImport::appendGroupProperty(std::u16string_view aKey, std::u16string_view aValue) { if (m_aParents.empty()) return; diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx index c9bfd6ffa216..16f7f9c319ac 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.hxx +++ b/writerfilter/source/rtftok/rtfsdrimport.hxx @@ -53,9 +53,9 @@ public: }; void resolve(RTFShape& rShape, bool bClose, ShapeOrPict shapeOrPict); void close(); - void append(std::u16string_view aKey, const OUString& aValue); + void append(std::u16string_view aKey, std::u16string_view aValue); /// Append property on the current parent. - void appendGroupProperty(std::u16string_view aKey, const OUString& aValue); + void appendGroupProperty(std::u16string_view aKey, std::u16string_view aValue); void resolveDhgt(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nZOrder, bool bOldStyle); /// Set line color and line width on the shape, using the relevant API depending on if the shape is a text frame or not. @@ -82,7 +82,7 @@ private: void createShape(const OUString& rService, css::uno::Reference<css::drawing::XShape>& xShape, css::uno::Reference<css::beans::XPropertySet>& xPropertySet); void applyProperty(css::uno::Reference<css::drawing::XShape> const& xShape, - std::u16string_view aKey, const OUString& aValue) const; + std::u16string_view aKey, std::u16string_view aValue) const; int initShape(css::uno::Reference<css::drawing::XShape>& o_xShape, css::uno::Reference<css::beans::XPropertySet>& o_xPropSet, bool& o_rIsCustomShape, RTFShape const& rShape, bool bClose, ShapeOrPict shapeOrPict); |