Skip to content

C
core
Kaydet (Commit) 57c0ca2e authored tarafından Matteo Casalin's avatar Matteo Casalin
Dosyalara gözat
Seçenekler

Avoid getTokenCount in StandardHdl_Impl link (2) 

Change-Id: I0164f81e6308c5a5c1b4d93e8df55aa911ea8b4c
üst 261471af
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
cui/source/options/optpath.cxx
Dosyayı görüntüle @ 57c0ca2e
...@@ -419,12 +419,11 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void) ...@@ -419,12 +419,11 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void)
bool bReadOnly = false; bool bReadOnly = false;
GetPathList( pPathImpl->nRealId, sInternal, sUser, sWritable, bReadOnly ); GetPathList( pPathImpl->nRealId, sInternal, sUser, sWritable, bReadOnly );
sal_uInt16 i; sal_Int32 nOldPos = 0;
sal_uInt16 nOldCount = comphelper::string::getTokenCount(aOldPath, MULTIPATH_DELIMITER); do
for ( i = 0; i < nOldCount; ++i )
{ {
bool bFound = false; bool bFound = false;
OUString sOnePath = aOldPath.getToken( i, MULTIPATH_DELIMITER ); const OUString sOnePath = aOldPath.getToken( 0, MULTIPATH_DELIMITER, nOldPos );
if ( !sInternal.isEmpty() ) if ( !sInternal.isEmpty() )
{ {
sal_Int32 nInternalPos = 0; sal_Int32 nInternalPos = 0;
...@@ -442,9 +441,11 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void) ...@@ -442,9 +441,11 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void)
sTemp += sOnePath; sTemp += sOnePath;
} }
} }
while ( nOldPos >= 0 );
OUString sUserPath, sWritablePath; OUString sUserPath, sWritablePath;
nOldCount = comphelper::string::getTokenCount(sTemp, MULTIPATH_DELIMITER); sal_uInt16 nOldCount = comphelper::string::getTokenCount(sTemp, MULTIPATH_DELIMITER);
sal_uInt16 i;
for ( i = 0; nOldCount > 0 && i < nOldCount - 1; ++i ) for ( i = 0; nOldCount > 0 && i < nOldCount - 1; ++i )
{ {
if ( !sUserPath.isEmpty() ) if ( !sUserPath.isEmpty() )
......
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