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

Simplify code

Browse Source 
Change-Id: I28cff254d2cc1e2abe6fc893d918bd84bfc8645c
This commit is contained in:
Stephan Bergmann 2016-01-04 17:49:08 +01:00
parent ce3dd82ca8
commit e9aa3c99d2
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xmlhelp/source/cxxhelp/provider/databases.cxx
View File

@ -316,8 +316,6 @@ const std::vector< OUString >& Databases::getModuleList( const OUString& Languag
osl::DirectoryItem aDirItem;
osl::FileStatus aStatus( osl_FileStatus_Mask_FileName );
sal_Int32 idx;
if( osl::FileBase::E_None != dirFile.open() )
return m_avModules;
@ -330,22 +328,17 @@ const std::vector< OUString >& Databases::getModuleList( const OUString& Languag
fileName = aStatus.getFileName();
// Check, whether fileName is of the form *.cfg
idx = fileName.lastIndexOf( '.' );
if( idx == -1 )
if (!fileName.endsWithIgnoreAsciiCase(".cfg", &fileName)) {
continue;
const sal_Unicode* str = fileName.getStr();
if( fileName.getLength() == idx + 4 &&
( str[idx + 1] == 'c' || str[idx + 1] == 'C' ) &&
( str[idx + 2] == 'f' || str[idx + 2] == 'F' ) &&
( str[idx + 3] == 'g' || str[idx + 3] == 'G' ) &&
( fileName = fileName.copy(0,idx).toAsciiLowerCase() ) != "picture" ) {
if(! m_bShowBasic && fileName == "sbasic" )
continue;
m_avModules.push_back( fileName );
}
fileName = fileName.toAsciiLowerCase();
if (fileName == "picture"
|| (!m_bShowBasic && fileName == "sbasic"))
{
continue;
}
m_avModules.push_back( fileName );
}
}
return m_avModules;