diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-23 13:12:59 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-23 13:46:50 +0200 |
| commit | 2f7f1fd079f7430db3c2de4945829a9623f10863 (patch) | |
| tree | 6534ae6b70454c778fcd6f995511cec741dc5214 /vcl | |
| parent | 7c1aa21e95e9eae2fbac78c3061ed1be3c70d103 (diff) | |
Simplify this code a bit
Change-Id: I591484788c5bcb9b9cde9696b149ede7298015a5
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 57307c26a51d..e4ce2155385c 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -903,20 +903,14 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, :: fprintf( stderr, "ttc: %s contains %d fonts\n", aFullPath.getStr(), nLength ); #endif - sal_uInt64 fileSize; + sal_uInt64 fileSize = 0; OUString aURL; - if (!osl::File::getFileURLFromSystemPath(OStringToOUString(aFullPath, osl_getThreadTextEncoding()), + if (osl::File::getFileURLFromSystemPath(OStringToOUString(aFullPath, osl_getThreadTextEncoding()), aURL)) { - fileSize = 0; - } - else - { osl::File aFile(aURL); - if (aFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_NoLock) != osl::File::E_None) - fileSize = 0; - else + if (aFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_NoLock) == osl::File::E_None) { osl::DirectoryItem aItem; osl::DirectoryItem::get( aURL, aItem ); |