Kaydet (Commit) 52154a7f authored tarafından Matteo Casalin's avatar Matteo Casalin

Use index to get consecutive OUString tokens

Change-Id: I7dc854444d6176f99fd9b79445e643a2bb464020
üst 699f5229
...@@ -259,9 +259,10 @@ void SectRepr::SetFilter( const OUString& rFilter ) ...@@ -259,9 +259,10 @@ void SectRepr::SetFilter( const OUString& rFilter )
void SectRepr::SetSubRegion(const OUString& rSubRegion) void SectRepr::SetSubRegion(const OUString& rSubRegion)
{ {
OUString sNewFile; OUString sNewFile;
OUString sOldFileName( m_SectionData.GetLinkFileName() ); sal_Int32 n;
const OUString sFilter( sOldFileName.getToken( 1, sfx2::cTokenSeparator ) ); const OUString sLinkFileName(m_SectionData.GetLinkFileName());
sOldFileName = sOldFileName.getToken( 0, sfx2::cTokenSeparator ); const OUString sOldFileName( sLinkFileName.getToken( 0, sfx2::cTokenSeparator, n ) );
const OUString sFilter( sLinkFileName.getToken( 0, sfx2::cTokenSeparator, n ) );
if( !rSubRegion.isEmpty() || !sOldFileName.isEmpty() ) if( !rSubRegion.isEmpty() || !sOldFileName.isEmpty() )
sNewFile = sOldFileName + OUString(sfx2::cTokenSeparator) + sNewFile = sOldFileName + OUString(sfx2::cTokenSeparator) +
...@@ -1517,9 +1518,10 @@ short SwInsertSectionTabDialog::Ok() ...@@ -1517,9 +1518,10 @@ short SwInsertSectionTabDialog::Ok()
m_pSectionData->IsEditInReadonlyFlag())); m_pSectionData->IsEditInReadonlyFlag()));
const OUString sLinkFileName( m_pSectionData->GetLinkFileName() ); const OUString sLinkFileName( m_pSectionData->GetLinkFileName() );
aRequest.AppendItem(SfxStringItem( FN_PARAM_1, sLinkFileName.getToken( 0, sfx2::cTokenSeparator ))); sal_Int32 n = 0;
aRequest.AppendItem(SfxStringItem( FN_PARAM_2, sLinkFileName.getToken( 1, sfx2::cTokenSeparator ))); aRequest.AppendItem(SfxStringItem( FN_PARAM_1, sLinkFileName.getToken( 0, sfx2::cTokenSeparator, n )));
aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.getToken( 2, sfx2::cTokenSeparator ))); aRequest.AppendItem(SfxStringItem( FN_PARAM_2, sLinkFileName.getToken( 0, sfx2::cTokenSeparator, n )));
aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.getToken( 0, sfx2::cTokenSeparator, n )));
aRequest.Done(); aRequest.Done();
} }
return nRet; return nRet;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment