diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-09-27 15:15:18 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-09-28 08:42:01 +0200 |
commit | ceaff89c973953e283aa881292206c593e5f9c7c (patch) | |
tree | 35394077d755495ad8dc4a08ce5649ae77bc99bb /include/oox | |
parent | 3c3f41dc11957c1ee8e8e06fbf197cae28d7671b (diff) |
use more string_view in oox
Change-Id: Ib0d7015a898073d51ac2638d62a19eadcba37685
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140653
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/oox')
-rw-r--r-- | include/oox/crypto/Standard2007Engine.hxx | 2 | ||||
-rw-r--r-- | include/oox/drawingml/theme.hxx | 2 | ||||
-rw-r--r-- | include/oox/dump/dumperbase.hxx | 26 | ||||
-rw-r--r-- | include/oox/dump/oledumper.hxx | 2 | ||||
-rw-r--r-- | include/oox/ole/axcontrol.hxx | 2 | ||||
-rw-r--r-- | include/oox/vml/vmldrawing.hxx | 2 | ||||
-rw-r--r-- | include/oox/vml/vmlformatting.hxx | 2 |
7 files changed, 19 insertions, 19 deletions
diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index 8a7aec3e66af..17ebbccd2556 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -29,7 +29,7 @@ class OOX_DLLPUBLIC Standard2007Engine final : public CryptoEngine msfilter::StandardEncryptionInfo mInfo; bool generateVerifier(); - bool calculateEncryptionKey(const OUString& rPassword); + bool calculateEncryptionKey(std::u16string_view rPassword); public: Standard2007Engine() = default; diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx index 6222a4264451..34347923b669 100644 --- a/include/oox/drawingml/theme.hxx +++ b/include/oox/drawingml/theme.hxx @@ -84,7 +84,7 @@ public: /** Returns theme font properties by scheme type (major/minor). */ const TextCharacterProperties* getFontStyle( sal_Int32 nSchemeType ) const; /** Returns theme font by placeholder name, e.g. the major latin theme font for the font name '+mj-lt'. */ - const TextFont* resolveFont( const OUString& rName ) const; + const TextFont* resolveFont( std::u16string_view rName ) const; Shape& getSpDef() { return maSpDef; } const Shape& getSpDef() const { return maSpDef; } diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index dffca1540c3c..04a41e92a964 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -236,7 +236,7 @@ struct ItemFormat @return List containing remaining unhandled format strings. */ - OUStringVector parse( const OUString& rFormatStr ); + OUStringVector parse( std::u16string_view rFormatStr ); }; @@ -247,7 +247,7 @@ public: // append string to string ------------------------------------------------ static void appendChar( OUStringBuffer& rStr, sal_Unicode cChar, sal_Int32 nCount ); - static void appendString( OUStringBuffer& rStr, const OUString& rData, sal_Int32 nWidth, sal_Unicode cFill = ' ' ); + static void appendString( OUStringBuffer& rStr, std::u16string_view rData, sal_Int32 nWidth, sal_Unicode cFill = ' ' ); // append decimal --------------------------------------------------------- @@ -312,7 +312,7 @@ public: static void appendCChar( OUStringBuffer& rStr, sal_Unicode cChar, bool bPrefix = true ); static void appendEncChar( OUStringBuffer& rStr, sal_Unicode cChar, sal_Int32 nCount, bool bPrefix = true ); - static void appendEncString( OUStringBuffer& rStr, const OUString& rData, bool bPrefix = true ); + static void appendEncString( OUStringBuffer& rStr, std::u16string_view rData, bool bPrefix = true ); // token list ------------------------------------------------------------- @@ -345,8 +345,8 @@ public: // string to list conversion ---------------------------------------------- - static void convertStringToStringList( OUStringVector& orVec, const OUString& rData, bool bIgnoreEmpty ); - static void convertStringToIntList( Int64Vector& orVec, const OUString& rData, bool bIgnoreEmpty ); + static void convertStringToStringList( OUStringVector& orVec, std::u16string_view rData, bool bIgnoreEmpty ); + static void convertStringToIntList( Int64Vector& orVec, std::u16string_view rData, bool bIgnoreEmpty ); }; @@ -572,9 +572,9 @@ protected: private: /** Includes name lists, given in a comma separated list of names of the lists. */ - void include( const OUString& rListKeys ); + void include( std::u16string_view rListKeys ); /** Excludes names from the list, given in a comma separated list of their keys. */ - void exclude( const OUString& rKeys ); + void exclude( std::u16string_view rKeys ); private: OUStringMap maMap; @@ -789,8 +789,8 @@ private: bool readConfigFile( const OUString& rFileUrl ); template< typename ListType > void readNameList( TextInputStream& rStrm, const OUString& rListName ); - void createShortList( const OUString& rData ); - void createUnitConverter( const OUString& rData ); + void createShortList( std::u16string_view rData ); + void createUnitConverter( std::u16string_view rData ); private: typedef ::std::set< OUString > ConfigFileSet; @@ -955,7 +955,7 @@ public: void writeChar( sal_Unicode cChar, sal_Int32 nCount = 1 ); void writeAscii( const char* pcStr ); - void writeString( const OUString& rStr ); + void writeString( std::u16string_view rStr ); void writeArray( const sal_uInt8* pnData, std::size_t nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP ); void writeBool( bool bData ); void writeDateTime( const css::util::DateTime& rDateTime ); @@ -1159,7 +1159,7 @@ protected: private: static OUString getSysFileName( - const OUString& rStrmName, + std::u16string_view rStrmName, std::u16string_view rSysOutPath ); void extractStream( @@ -1219,7 +1219,7 @@ protected: void writeEmptyItem( const String& rName ); void writeInfoItem( const String& rName, const String& rData ); void writeCharItem( const String& rName, sal_Unicode cData ); - void writeStringItem( const String& rName, const OUString& rData ); + void writeStringItem( const String& rName, std::u16string_view rData ); void writeArrayItem( const String& rName, const sal_uInt8* pnData, std::size_t nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP ); void writeDateTimeItem( const String& rName, const css::util::DateTime& rDateTime ); void writeGuidItem( const String& rName, const OUString& rGuid ); @@ -1620,7 +1620,7 @@ public: private: virtual void implDumpText( TextInputStream& rTextStrm ) override; - void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); + void implDumpLine( std::u16string_view rLine, sal_uInt32 nLine ); }; diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index 116956eaf879..585e9e5226eb 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -696,7 +696,7 @@ protected: const OUString& rSysPath ) override; private: - bool isFormStorage( const OUString& rStrgPath ) const; + bool isFormStorage( std::u16string_view rStrgPath ) const; private: VbaFormSharedData maFormData; diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 55dca6804e73..28559ecbd1b9 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -312,7 +312,7 @@ public: properties. */ static void convertAxState( PropertyMap& rPropMap, - const OUString& rValue, + std::u16string_view rValue, sal_Int32 nMultiSelect, ApiDefaultStateMode eDefStateMode, bool bAwtModel ); diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx index a11bfef0d328..da1933eb60c8 100644 --- a/include/oox/vml/vmldrawing.hxx +++ b/include/oox/vml/vmldrawing.hxx @@ -129,7 +129,7 @@ public: void convertAndInsert() const; /** Returns the local shape index from the passed global shape identifier. */ - sal_Int32 getLocalShapeIndex( const OUString& rShapeId ) const; + sal_Int32 getLocalShapeIndex( std::u16string_view rShapeId ) const; /** Returns the registered info structure for an OLE object, if extant. */ const OleObjectInfo* getOleObjectInfo( const OUString& rShapeId ) const; /** Returns the registered info structure for a form control, if extant. */ diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx index f35ab118aec8..37414eb9e1cf 100644 --- a/include/oox/vml/vmlformatting.hxx +++ b/include/oox/vml/vmlformatting.hxx @@ -186,7 +186,7 @@ OOX_DLLPUBLIC sal_Int32 decodeMeasureToTwip(const GraphicHelper& rGraphicHelper, OOX_DLLPUBLIC void decodeVmlPath( ::std::vector< ::std::vector< css::awt::Point > >& rPoints, ::std::vector< ::std::vector< css::drawing::PolygonFlags > >& rFlags, - const OUString& rPath ); + std::u16string_view rPath ); } |