include/svx/nbdtmg.hxx | 2 +-
sc/source/filter/excel/xestream.cxx | 6 +++---
sc/source/filter/inc/xestream.hxx | 2 +-
svx/source/sidebar/nbdtmg.cxx | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 193a8f64b4019391f7ad1c0418ddc52a094f2b6a
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Dec 23 19:59:49 2024 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Wed Dec 25 07:40:27 2024 +0100
avoid some OUString <-> string_view conversion
Change-Id: Iae4466aafb71cfe9b35dcd5b00c0aae9ccab7e0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179261
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index bccb905a21a2..dcba2e89d1f6 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -161,7 +161,7 @@ class SVX_DLLPUBLIC BulletsTypeMgr final : public
NBOTypeMgrBase
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16
mLevel,sal_uInt16 nFromIndex=0) override;
virtual void ReplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel) override;
virtual void ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex,
sal_uInt16 mLevel, bool isDefault=false,bool isResetSize=false) override;
- void ApplyCustomRule(SvxNumRule& aNum, std::u16string_view sBullet,
std::u16string_view sFont, sal_uInt16 mLevel);
+ void ApplyCustomRule(SvxNumRule& aNum, std::u16string_view sBullet,
const OUString& sFont, sal_uInt16 mLevel);
virtual OUString GetDescription(sal_uInt16 nIndex, bool isDefault)
override;
virtual bool IsCustomized(sal_uInt16 nIndex) override;
static BulletsTypeMgr& GetInstance();
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index d9e7a6cf57ea..b97720902f15 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -955,14 +955,14 @@ sax_fastparser::FSHelperPtr
XclExpXmlStream::CreateOutputStream (
std::u16string_view sRelativeStream,
const uno::Reference< XOutputStream >& xParentRelation,
const char* sContentType,
- std::u16string_view sRelationshipType,
+ const OUString& sRelationshipType,
OUString* pRelationshipId )
{
OUString sRelationshipId;
if (xParentRelation.is())
- sRelationshipId = addRelation( xParentRelation,
OUString(sRelationshipType), sRelativeStream );
+ sRelationshipId = addRelation( xParentRelation, sRelationshipType,
sRelativeStream );
else
- sRelationshipId = addRelation( OUString(sRelationshipType),
sRelativeStream );
+ sRelationshipId = addRelation( sRelationshipType, sRelativeStream );
if( pRelationshipId )
*pRelationshipId = sRelationshipId;
diff --git a/sc/source/filter/inc/xestream.hxx
b/sc/source/filter/inc/xestream.hxx
index 202e70a0e65d..d0318848ecba 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -312,7 +312,7 @@ public:
std::u16string_view sRelativeStream,
const css::uno::Reference<
css::io::XOutputStream >& xParentRelation,
const char* sContentType,
- std::u16string_view sRelationshipType,
+ const OUString& sRelationshipType,
OUString* pRelationshipId = nullptr );
// ignore
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index a2eb811c4ffd..c3aa9bce4324 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -349,11 +349,11 @@ void BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,
sal_uInt16 nIndex, sal_uInt1
}
void BulletsTypeMgr::ApplyCustomRule(SvxNumRule& aNum, std::u16string_view
sBullet,
- std::u16string_view sFont, sal_uInt16
mLevel)
+ const OUString& sFont, sal_uInt16 mLevel)
{
sal_uInt16 nMask = 1;
OUString sBulletCharFormatName = GetBulletCharFmtName();
- const vcl::Font aFont(OUString(sFont), Size(1, 1));
+ const vcl::Font aFont(sFont, Size(1, 1));
for (sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
{
if (mLevel & nMask)
