diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/glob.hxx | 4 | ||||
| -rw-r--r-- | sd/inc/sdmod.hxx | 3 | ||||
| -rw-r--r-- | sd/inc/sdpage.hxx | 2 | ||||
| -rw-r--r-- | sd/source/core/sdpage.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/app/sdmod.cxx | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index 884d16032719..b4560c0a8a5a 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -48,8 +48,8 @@ #define SD_LT_SEPARATOR "~LT~" // option-stream identifier -#define SD_OPTION_MORPHING "Morph" -#define SD_OPTION_VECTORIZE "Vectorize" +#define SD_OPTION_MORPHING u"Morph" +#define SD_OPTION_VECTORIZE u"Vectorize" #endif // _ INCLUDED_SD_INC_GLOB_HXX diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 42c4ea4e85bc..7789b896b871 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -33,6 +33,7 @@ #include <vcl/virdev.hxx> #include <map> #include <memory> +#include <string_view> class SdOptions; class SvxSearchItem; @@ -92,7 +93,7 @@ public: void GetState(SfxItemSet&); SdOptions* GetSdOptions(DocumentType eDocType); - SD_DLLPUBLIC tools::SvRef<SotStorageStream> GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode ); + SD_DLLPUBLIC tools::SvRef<SotStorageStream> GetOptionStream( std::u16string_view rOptionName, SdOptionStreamMode eMode ); bool GetWaterCan() const { return bWaterCan; } void SetWaterCan( bool bWC ) { bWaterCan = bWC; } diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 56398c331cfd..cca449bcce8d 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -200,7 +200,7 @@ public: objects are removed with this mechanism instead of RemoveObject*/ virtual SdrObject* ReplaceObject(SdrObject* pNewObj, size_t nObjNum) override; - void SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const OUString& rStr ); + void SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, std::u16string_view rStr ); void SetPageKind(PageKind ePgType) { mePageKind = ePgType; } PageKind GetPageKind() const { return mePageKind; } diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 798d48b2543e..bc876afdac0a 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2374,7 +2374,7 @@ void SdPage::InsertPresObj(SdrObject* pObj, PresObjKind eKind ) |* \************************************************************************/ -void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const OUString& rString ) +void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, std::u16string_view rString ) { if ( !pObj ) return; @@ -2414,7 +2414,7 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO { pOutl->Init( OutlinerMode::OutlineObject ); - aString += "\t" + rString; + aString += OUString::Concat("\t") + rString; if (mbMaster) { diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 27fea87ae28b..482a6d6bca4f 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -162,7 +162,7 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType) * if the stream is opened for reading but does not exist, an 'empty' * RefObject is returned */ -tools::SvRef<SotStorageStream> SdModule::GetOptionStream( const OUString& rOptionName, +tools::SvRef<SotStorageStream> SdModule::GetOptionStream( std::u16string_view rOptionName, SdOptionStreamMode eMode ) { ::sd::DrawDocShell* pDocSh = dynamic_cast< ::sd::DrawDocShell *>( SfxObjectShell::Current() ); |