mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use indexed getToken()

Browse Source 
Change-Id: I76b565d24a27eda62383df757f97d197c3b276a8
Reviewed-on: https://gerrit.libreoffice.org/67646
Tested-by: Jenkins
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
This commit is contained in:
Matteo Casalin
2019-02-10 16:35:30 +01:00
parent b612cf0e06
commit 2e70e02b8e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sd/source/ui/func/fuprlout.cxx
View File

@@ -211,7 +211,8 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
if (bLoad) 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 ); SdDrawDocument* pTempDoc = mpDoc->OpenBookmarkDoc( aFileName );
// #69581: If I chose the standard-template I got no filename and so I get no // #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 ) // a NULL-pointer as a Standard-template ( look at SdDrawDocument::SetMasterPage )
OUString aLayoutName; OUString aLayoutName;
if( pTempDoc ) if( pTempDoc )
aLayoutName = aFile.getToken(1, DOCUMENT_TOKEN); aLayoutName = aFile.getToken(0, DOCUMENT_TOKEN, nIdx);
for (auto nSelectedPage : aSelectedPageNums) for (auto nSelectedPage : aSelectedPageNums)
mpDoc->SetMasterPage(nSelectedPage, aLayoutName, pTempDoc, bMasterPage, bCheckMasters); mpDoc->SetMasterPage(nSelectedPage, aLayoutName, pTempDoc, bMasterPage, bCheckMasters);
mpDoc->CloseBookmarkDoc(); mpDoc->CloseBookmarkDoc();