use more string_view

Change-Id: Ie826234aa9064b08b8f0647738b57c47ac0ed91a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141369
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 32 insertions, 31 deletions

diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx
index 1e020bc027a2..c21880edd8f3 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -163,7 +163,7 @@ const TokenTable pTokenTableArray[] =
     { "NotFound",           TK_NotFound }
 };
 
-PPPOptimizerTokenEnum TKGet( const OUString& rToken )
+PPPOptimizerTokenEnum TKGet( std::u16string_view rToken )
 {
     if ( !pHashMap )
     {   // init hash map
@@ -179,7 +179,7 @@ PPPOptimizerTokenEnum TKGet( const OUString& rToken )
         }
     }
     PPPOptimizerTokenEnum eRetValue = TK_NotFound;
-    int i, nLen = rToken.getLength();
+    size_t i, nLen = rToken.size();
     std::unique_ptr<char[]> pBuf(new char[ nLen + 1 ]);
     for ( i = 0; i < nLen; i++ )
         pBuf[ i ] = static_cast<char>(rToken[ i ]);
diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx
index d0ae65ed74ab..3f946fcc0b08 100644
--- a/sdext/source/minimizer/pppoptimizertoken.hxx
+++ b/sdext/source/minimizer/pppoptimizertoken.hxx
@@ -140,7 +140,7 @@ enum PPPOptimizerTokenEnum
     TK_NotFound
 };
 
-PPPOptimizerTokenEnum TKGet(const OUString&);
+PPPOptimizerTokenEnum TKGet(std::u16string_view);
 OUString TKGet(const PPPOptimizerTokenEnum);
 
 #endif
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index cbce18d17d22..bdfa1ab37fb9 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -88,7 +88,7 @@ namespace {
         const OUString msText;
         std::shared_ptr<vector<LineDescriptor> > mpLineDescriptors;
 
-        static void SplitText (const OUString& rsText, vector<OUString>& rTextParts);
+        static void SplitText (std::u16string_view rsText, vector<OUString>& rTextParts);
         void FormatText (
             const vector<OUString>& rTextParts,
             const css::uno::Reference<css::rendering::XCanvasFont>& rxFont,
@@ -601,21 +601,22 @@ void LineDescriptorList::Update (
 }
 
 void LineDescriptorList::SplitText (
-    const OUString& rsText,
+    std::u16string_view rsText,
     vector<OUString>& rTextParts)
 {
     const char cQuote ('\'');
     const char cSeparator (',');
 
-    sal_Int32 nIndex (0);
-    sal_Int32 nStart (0);
-    sal_Int32 nLength (rsText.getLength());
+    size_t nIndex (0);
+    size_t nStart (0);
+    size_t nLength (rsText.size());
     bool bIsQuoted (false);
     while (nIndex < nLength)
     {
-        const sal_Int32 nQuoteIndex (rsText.indexOf(cQuote, nIndex));
-        const sal_Int32 nSeparatorIndex (rsText.indexOf(cSeparator, nIndex));
-        if (nQuoteIndex>=0 && (nSeparatorIndex==-1 || nQuoteIndex<nSeparatorIndex))
+        const size_t nQuoteIndex (rsText.find(cQuote, nIndex));
+        const size_t nSeparatorIndex (rsText.find(cSeparator, nIndex));
+        if (nQuoteIndex != std::u16string_view::npos &&
+            (nSeparatorIndex == std::u16string_view::npos || nQuoteIndex<nSeparatorIndex))
         {
             bIsQuoted = !bIsQuoted;
             nIndex = nQuoteIndex+1;
@@ -629,13 +630,13 @@ void LineDescriptorList::SplitText (
         }
         else if ( ! bIsQuoted)
         {
-            rTextParts.push_back(rsText.copy(nStart, nNextIndex-nStart));
+            rTextParts.push_back(OUString(rsText.substr(nStart, nNextIndex-nStart)));
             nStart = nNextIndex + 1;
         }
         nIndex = nNextIndex+1;
     }
     if (nStart < nLength)
-        rTextParts.push_back(rsText.copy(nStart, nLength-nStart));
+        rTextParts.push_back(OUString(rsText.substr(nStart, nLength-nStart)));
 }
 
 void LineDescriptorList::FormatText (
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index e3cdb67f9fea..a32a73b6180e 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -197,7 +197,7 @@ public:
 
     void SAL_CALL disposing() override;
     static Command* CreateCommand (
-        const OUString& rsURLPath,
+        std::u16string_view rsURLPath,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
 
     // XDispatch
@@ -363,41 +363,41 @@ PresenterProtocolHandler::Dispatch::Dispatch (
 }
 
 Command* PresenterProtocolHandler::Dispatch::CreateCommand (
-    const OUString& rsURLPath,
+    std::u16string_view rsURLPath,
     const ::rtl::Reference<PresenterController>& rpPresenterController)
 {
-    if (rsURLPath.getLength() <= 5)
+    if (rsURLPath.size() <= 5)
         return nullptr;
 
-    if (rsURLPath == "CloseNotes")
+    if (rsURLPath == u"CloseNotes")
         return new SetNotesViewCommand(false, rpPresenterController);
-    if (rsURLPath == "CloseSlideSorter")
+    if (rsURLPath == u"CloseSlideSorter")
         return new SetSlideSorterCommand(false, rpPresenterController);
-    if (rsURLPath == "CloseHelp")
+    if (rsURLPath == u"CloseHelp")
         return new SetHelpViewCommand(false, rpPresenterController);
-    if (rsURLPath == "GrowNotesFont")
+    if (rsURLPath == u"GrowNotesFont")
         return new NotesFontSizeCommand(rpPresenterController, +1);
-    if (rsURLPath == "NextEffect")
+    if (rsURLPath == u"NextEffect")
         return new GotoNextEffectCommand(rpPresenterController);
-    if (rsURLPath == "NextSlide")
+    if (rsURLPath == u"NextSlide")
         return new GotoNextSlideCommand(rpPresenterController);
-    if (rsURLPath == "PrevSlide")
+    if (rsURLPath == u"PrevSlide")
         return new GotoPreviousSlideCommand(rpPresenterController);
-    if (rsURLPath == "SwitchMonitor")
+    if (rsURLPath == u"SwitchMonitor")
         return new SwitchMonitorCommand(rpPresenterController);
-    if (rsURLPath == "PauseResumeTimer")
+    if (rsURLPath == u"PauseResumeTimer")
         return new PauseResumeCommand(rpPresenterController);
-    if (rsURLPath == "RestartTimer")
+    if (rsURLPath == u"RestartTimer")
         return new RestartTimerCommand(rpPresenterController);
-    if (rsURLPath == "ShowNotes")
+    if (rsURLPath == u"ShowNotes")
         return new SetNotesViewCommand(true, rpPresenterController);
-    if (rsURLPath == "ShowSlideSorter")
+    if (rsURLPath == u"ShowSlideSorter")
         return new SetSlideSorterCommand(true, rpPresenterController);
-    if (rsURLPath == "ShowHelp")
+    if (rsURLPath == u"ShowHelp")
         return new SetHelpViewCommand(true, rpPresenterController);
-    if (rsURLPath == "ShrinkNotesFont")
+    if (rsURLPath == u"ShrinkNotesFont")
         return new NotesFontSizeCommand(rpPresenterController, -1);
-    if (rsURLPath == "ExitPresenter")
+    if (rsURLPath == u"ExitPresenter")
         return new ExitPresenterCommand(rpPresenterController);
 
     return nullptr;