[Libreoffice-commits] core.git: sd/source

[Libreoffice Gerrit user]

 sd/source/ui/func/fuprlout.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2e70e02b8eff25b1abcfac125a46724793a6b8dd
Author:     Matteo Casalin <matteo.casalin at yahoo.com>
AuthorDate: Sun Feb 10 16:35:30 2019 +0100
Commit:     Matteo Casalin <matteo.casalin at yahoo.com>
CommitDate: Tue Mar 5 22:26:33 2019 +0100

    Use indexed getToken()
    
    Change-Id: I76b565d24a27eda62383df757f97d197c3b276a8
    Reviewed-on: https://gerrit.libreoffice.org/67646
    Tested-by: Jenkins
    Reviewed-by: Matteo Casalin <matteo.casalin at yahoo.com>

diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 13548e66b6d5..9e9eb7721596 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -211,7 +211,8 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
 
     if (bLoad)
     {
-        OUString aFileName = aFile.getToken(0, DOCUMENT_TOKEN);
+        sal_Int32 nIdx{ 0 };
+        OUString aFileName = aFile.getToken(0, DOCUMENT_TOKEN, nIdx);
         SdDrawDocument* pTempDoc = mpDoc->OpenBookmarkDoc( aFileName );
 
         // #69581: If I chose the standard-template I got no filename and so I get no
@@ -219,7 +220,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
         //         a NULL-pointer as a Standard-template ( look at SdDrawDocument::SetMasterPage )
         OUString aLayoutName;
         if( pTempDoc )
-            aLayoutName = aFile.getToken(1, DOCUMENT_TOKEN);
+            aLayoutName = aFile.getToken(0, DOCUMENT_TOKEN, nIdx);
         for (auto nSelectedPage : aSelectedPageNums)
             mpDoc->SetMasterPage(nSelectedPage, aLayoutName, pTempDoc, bMasterPage, bCheckMasters);
         mpDoc->CloseBookmarkDoc();