summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/appl/linkmgr2.cxx2
-rw-r--r--sfx2/source/appl/newhelp.cxx12
-rw-r--r--sfx2/source/appl/newhelp.hxx6
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx10
-rw-r--r--sfx2/source/doc/DocumentMetadataAccess.cxx4
-rw-r--r--sfx2/source/view/lokhelper.cxx2
6 files changed, 18 insertions, 18 deletions
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index ed980af3d90a..8d1882c2057a 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -450,7 +450,7 @@ void LinkManager::LinkServerShell(const OUString& rPath, SfxObjectShell& rServer
}
void LinkManager::InsertFileLink(
- sfx2::SvBaseLink& rLink, SvBaseLinkObjectType nFileType, const OUString& rFileNm,
+ sfx2::SvBaseLink& rLink, SvBaseLinkObjectType nFileType, std::u16string_view rFileNm,
const OUString* pFilterNm, const OUString* pRange)
{
if (!isClientType(rLink.GetObjType()))
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index c57522ad55e5..61e15c22abfd 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1223,16 +1223,16 @@ void BookmarksTabPage_Impl::AddBookmarks(const OUString& rTitle, const OUString&
m_xBookmarksBox->append(rURL, rTitle, SvFileInformationManager::GetImageId(INetURLObject(aImageURL)));
}
-OUString SfxHelpWindow_Impl::buildHelpURL(const OUString& sFactory ,
- const OUString& sContent ,
- const OUString& sAnchor)
+OUString SfxHelpWindow_Impl::buildHelpURL(std::u16string_view sFactory ,
+ std::u16string_view sContent ,
+ std::u16string_view sAnchor)
{
OUStringBuffer sHelpURL(256);
sHelpURL.append(HELP_URL);
sHelpURL.append(sFactory);
sHelpURL.append(sContent);
AppendConfigToken(sHelpURL, true/*bUseQuestionMark*/);
- if (!sAnchor.isEmpty())
+ if (!sAnchor.empty())
sHelpURL.append(sAnchor);
return sHelpURL.makeStringAndClear();
}
@@ -2303,7 +2303,7 @@ void SfxHelpWindow_Impl::SaveConfig()
void SfxHelpWindow_Impl::ShowStartPage()
{
- loadHelpContent(SfxHelpWindow_Impl::buildHelpURL(xIndexWin->GetFactory(), "/start", OUString()));
+ loadHelpContent(SfxHelpWindow_Impl::buildHelpURL(xIndexWin->GetFactory(), u"/start", u""));
}
IMPL_LINK(SfxHelpWindow_Impl, SelectHdl, const OString&, rCurItem, void)
@@ -2339,7 +2339,7 @@ IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl, LinkParamNone*, void)
else
aId = aEntry;
- sHelpURL = SfxHelpWindow_Impl::buildHelpURL(xIndexWin->GetFactory(), "/" + aId, aAnchor);
+ sHelpURL = SfxHelpWindow_Impl::buildHelpURL(xIndexWin->GetFactory(), OUString("/" + aId), aAnchor);
}
loadHelpContent(sHelpURL);
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 26266a6ee747..c7458b248e3c 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -483,9 +483,9 @@ public:
void openDone(const OUString& sURL ,
bool bSuccess);
- static OUString buildHelpURL(const OUString& sFactory ,
- const OUString& sContent ,
- const OUString& sAnchor);
+ static OUString buildHelpURL(std::u16string_view sFactory ,
+ std::u16string_view sContent ,
+ std::u16string_view sAnchor);
void loadHelpContent(const OUString& sHelpURL ,
bool bAddToHistory = true);
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 7d45c06ba176..bd48141ac7f5 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -839,14 +839,14 @@ std::shared_ptr<const SfxFilter> SfxFilterMatcherIter::Next()
---------------------------------------------------------------*/
static OUString implc_convertStringlistToString( const uno::Sequence< OUString >& lList ,
sal_Unicode cSeparator,
- const OUString& sPrefix )
+ std::u16string_view sPrefix )
{
OUStringBuffer sString ( 1000 ) ;
sal_Int32 nCount = lList.getLength();
sal_Int32 nItem = 0 ;
for( nItem=0; nItem<nCount; ++nItem )
{
- if( !sPrefix.isEmpty() )
+ if( !sPrefix.empty() )
{
sString.append( sPrefix );
}
@@ -925,7 +925,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
{
uno::Sequence< OUString > lUserData;
rFilterProperty.Value >>= lUserData;
- sUserData = implc_convertStringlistToString( lUserData, ',', OUString() );
+ sUserData = implc_convertStringlistToString( lUserData, ',', u"" );
}
else if ( rFilterProperty.Name == "DocumentService" )
{
@@ -972,14 +972,14 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
{
uno::Sequence< OUString > lExtensions;
rTypeProperty.Value >>= lExtensions;
- sExtension = implc_convertStringlistToString( lExtensions, ';', "*." );
+ sExtension = implc_convertStringlistToString( lExtensions, ';', u"*." );
}
}
else if ( rTypeProperty.Name == "URLPattern" )
{
uno::Sequence< OUString > lPattern;
rTypeProperty.Value >>= lPattern;
- sPattern = implc_convertStringlistToString( lPattern, ';', OUString() );
+ sPattern = implc_convertStringlistToString( lPattern, ';', u"" );
}
}
}
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 13e4d0bde45b..e030a0dc111b 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -117,7 +117,7 @@ static bool isReservedFile(std::u16string_view i_rPath)
uno::Reference<rdf::XURI> createBaseURI(
uno::Reference<uno::XComponentContext> const & i_xContext,
uno::Reference<frame::XModel> const & i_xModel,
- OUString const & i_rPkgURI, OUString const & i_rSubDocument)
+ OUString const & i_rPkgURI, std::u16string_view i_rSubDocument)
{
if (!i_xContext.is() || (!i_xModel.is() && i_rPkgURI.isEmpty())) {
throw uno::RuntimeException();
@@ -192,7 +192,7 @@ uno::Reference<rdf::XURI> createBaseURI(
}
buf.append('/');
}
- if (!i_rSubDocument.isEmpty())
+ if (!i_rSubDocument.empty())
{
buf.append(i_rSubDocument);
buf.append('/');
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 7c7511fbfbd4..cdd6030a7c8f 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -486,7 +486,7 @@ void SfxLokHelper::notifyWindow(const SfxViewShell* pThisView,
pThisView->libreOfficeKitViewCallback(LOK_CALLBACK_WINDOW, s.getStr());
}
-void SfxLokHelper::notifyInvalidation(SfxViewShell const* pThisView, const OString& rPayload)
+void SfxLokHelper::notifyInvalidation(SfxViewShell const* pThisView, std::string_view rPayload)
{
OStringBuffer aBuf(32);
generated by cgit (git 2.34.1) at 2024-07-16 22:43:06 +0000