diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-26 12:06:09 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-27 09:27:44 +0200 |
commit | 62f6d6ee8bca918e17ae167582095f4302203bed (patch) | |
tree | 976279a87d1aca3b24cb37dcf6c4b6378f6d6fdd /idl | |
parent | bde131ad18620dea03531c59893c99be09e3ce4e (diff) |
use more string_view in tools/stream
Change-Id: I2a957cd72d71fea717734488cdb3670e0bcdd6f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114657
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'idl')
-rw-r--r-- | idl/inc/object.hxx | 4 | ||||
-rw-r--r-- | idl/inc/slot.hxx | 8 | ||||
-rw-r--r-- | idl/inc/types.hxx | 2 | ||||
-rw-r--r-- | idl/source/objects/object.cxx | 4 | ||||
-rw-r--r-- | idl/source/objects/slot.cxx | 8 | ||||
-rw-r--r-- | idl/source/objects/types.cxx | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 822e562c26e1..6beb837688c2 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -57,14 +57,14 @@ public: SvMetaAttribute & rAttr ) const; private: - static void WriteSlotStubs( const OString& rShellName, + static void WriteSlotStubs( std::string_view rShellName, SvSlotElementList & rSlotList, std::vector<OString> & rList, SvStream & rOutStm ); static sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase, SvSlotElementList & rSlotList, SvStream & rOutStm ); - static sal_uInt16 WriteSlots( const OString& rShellName, + static sal_uInt16 WriteSlots( std::string_view rShellName, SvSlotElementList & rSlotList, SvIdlDataBase & rBase, SvStream & rOutStm ); diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 16c273e3efea..1b8eec2ab66a 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -50,8 +50,8 @@ public: sal_uLong nListPos; SvBOOL aReadOnlyDoc; - void WriteSlot( const OString& rShellName, - sal_uInt16 nCount, const OString& rSlotId, + void WriteSlot( std::string_view rShellName, + sal_uInt16 nCount, std::string_view rSlotId, SvSlotElementList &rList, size_t nStart, SvIdlDataBase & rBase, SvStream & rOutStm ); @@ -115,10 +115,10 @@ public: SvTokenStream & rInStm ) override; virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; virtual void Insert( SvSlotElementList& ) override; - void WriteSlotStubs( const OString& rShellName, + void WriteSlotStubs( std::string_view rShellName, std::vector<OString> & rList, SvStream & rOutStm ) const; - sal_uInt16 WriteSlotMap( const OString& rShellName, + sal_uInt16 WriteSlotMap( std::string_view rShellName, sal_uInt16 nCount, SvSlotElementList&, size_t nStart, diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 298e863c6663..1648efc3d56a 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -56,7 +56,7 @@ class SvMetaType : public SvMetaReference MetaTypeType nType; bool bIsItem; - void WriteSfxItem( const OString& rItemName, SvIdlDataBase const & rBase, + void WriteSfxItem( std::string_view rItemName, SvIdlDataBase const & rBase, SvStream & rOutStm ); protected: bool ReadHeaderSvIdl( SvTokenStream & rInStm ); diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 1c8299b132d4..627b158b3da4 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -148,7 +148,7 @@ sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase, return nCount; } -sal_uInt16 SvMetaClass::WriteSlots( const OString& rShellName, +sal_uInt16 SvMetaClass::WriteSlots( std::string_view rShellName, SvSlotElementList & rSlotList, SvIdlDataBase & rBase, SvStream & rOutStm ) @@ -250,7 +250,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList ) } -void SvMetaClass::WriteSlotStubs( const OString& rShellName, +void SvMetaClass::WriteSlotStubs( std::string_view rShellName, SvSlotElementList & rSlotList, std::vector<OString> & rList, SvStream & rOutStm ) diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index fcdbbb8e95d0..df4cebf9c8e0 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -333,7 +333,7 @@ static OString MakeSlotName( SvStringHashEntry const * pEntry ) return "SfxSlotMode::" + pEntry->GetName().toAsciiUpperCase(); }; -void SvMetaSlot::WriteSlotStubs( const OString& rShellName, +void SvMetaSlot::WriteSlotStubs( std::string_view rShellName, std::vector<OString> & rList, SvStream & rOutStm ) const { @@ -387,8 +387,8 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName, } } -void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, - const OString& rSlotId, +void SvMetaSlot::WriteSlot( std::string_view rShellName, sal_uInt16 nCount, + std::string_view rSlotId, SvSlotElementList& rSlotList, size_t nStart, SvIdlDataBase & rBase, SvStream & rOutStm ) @@ -599,7 +599,7 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO return 0; } -sal_uInt16 SvMetaSlot::WriteSlotMap( const OString& rShellName, sal_uInt16 nCount, +sal_uInt16 SvMetaSlot::WriteSlotMap( std::string_view rShellName, sal_uInt16 nCount, SvSlotElementList& rSlotList, size_t nStart, SvIdlDataBase & rBase, diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index a0238d9b4c78..9622d85aebf5 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -218,10 +218,10 @@ size_t SvMetaType::MakeSfx( OStringBuffer& rAttrArray ) } void SvMetaType::WriteSfxItem( - const OString& rItemName, SvIdlDataBase const & rBase, SvStream& rOutStm ) + std::string_view rItemName, SvIdlDataBase const & rBase, SvStream& rOutStm ) { WriteStars( rOutStm ); - OString aVarName = " a" + rItemName + "_Impl"; + OString aVarName = OString::Concat(" a") + rItemName + "_Impl"; OStringBuffer aAttrArray(1024); size_t nAttrCount = MakeSfx( aAttrArray ); |