diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/linkmgr2.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/doc/objcont.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/inc/appopen.hxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 3dd2383c1074..b3b11d626362 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -101,7 +101,7 @@ using namespace ::com::sun::star::container; using namespace ::cppu; using namespace ::sfx2; -void SetTemplate_Impl( const OUString &rFileName, +void SetTemplate_Impl( std::u16string_view rFileName, const OUString &rLongName, SfxObjectShell *pDoc) { diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index aeefbf10da20..6a3e0c7e8821 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -506,7 +506,7 @@ SotClipboardFormatId LinkManager::RegisterStatusInfoId() return nFormat; } -bool LinkManager::GetGraphicFromAny(const OUString& rMimeType, +bool LinkManager::GetGraphicFromAny(std::u16string_view rMimeType, const css::uno::Any & rValue, Graphic& rGraphic, weld::Window* pParentWin) diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 06f125ec9e15..e51e49481d89 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -271,7 +271,7 @@ private: Content& aNewFolder ); static OUString CreateNewUniqueFileWithPrefix( std::u16string_view aPath, const OUString& aPrefix, - const OUString& aExt ); + std::u16string_view aExt ); std::vector< beans::StringPair > ReadUINamesForTemplateDir_Impl( std::u16string_view aUserPath ); bool UpdateUINamesForTemplateDir_Impl( std::u16string_view aUserPath, @@ -841,7 +841,7 @@ bool SfxDocTplService::CreateNewUniqueFolderWithPrefix( std::u16string_view aPat OUString SfxDocTplService::CreateNewUniqueFileWithPrefix( std::u16string_view aPath, const OUString& aPrefix, - const OUString& aExt ) + std::u16string_view aExt ) { OUString aNewFileURL; INetURLObject aDirPath( aPath ); @@ -858,7 +858,7 @@ OUString SfxDocTplService::CreateNewUniqueFileWithPrefix( std::u16string_view aP OUString aTryName = aPrefix; if ( nInd ) aTryName += OUString::number( nInd ); - if ( aExt.toChar() != '.' ) + if ( aExt.empty() || aExt[0] != '.' ) aTryName += "."; aTryName += aExt; diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index caf222c61d2d..77622105a215 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -569,7 +569,7 @@ bool SfxObjectShell::IsHelpDocument() const return (pFilter && pFilter->GetFilterName() == "writer_web_HTML_help"); } -void SfxObjectShell::ResetFromTemplate( const OUString& rTemplateName, const OUString& rFileName ) +void SfxObjectShell::ResetFromTemplate( const OUString& rTemplateName, std::u16string_view rFileName ) { // only care about resetting this data for LibreOffice formats otherwise if ( !IsOwnStorageFormat( *GetMedium()) ) diff --git a/sfx2/source/inc/appopen.hxx b/sfx2/source/inc/appopen.hxx index df9057bfa197..5e32a249047a 100644 --- a/sfx2/source/inc/appopen.hxx +++ b/sfx2/source/inc/appopen.hxx @@ -29,7 +29,7 @@ class SfxObjectShell; ErrCode CheckPasswd_Impl(SfxObjectShell* pDoc, SfxMedium* pFile); -void SetTemplate_Impl(const OUString&, const OUString&, SfxObjectShell*); +void SetTemplate_Impl(std::u16string_view, const OUString&, SfxObjectShell*); #endif |