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

The macro FEAT_FSYS_DOUBLESPEED has been removed and the related #if / #endif have been removed too.

Browse Source 
Bug: 61516
Change-Id: Id347e87a8789ddbe550dde7d7281d9c1cad0c199
This commit is contained in:
Jiri Blecha
2013-03-02 17:25:06 +01:00
committed by Michael Meeks
parent 8f113d08ce
commit 66f426b8fa
4 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/inc/tools/fsys.hxx
View File

@@ -30,8 +30,6 @@
#include <cstdarg> #include <cstdarg>
#include <vector> #include <vector>
#define FEAT_FSYS_DOUBLESPEED
// FSys-Types // FSys-Types
class DirEntry; class DirEntry;
class FileStat; class FileStat;
@@ -188,9 +186,8 @@ class TOOLS_DLLPUBLIC DirEntry
friend struct DirReader_Impl; friend struct DirReader_Impl;
friend class FileCopier; friend class FileCopier;
#ifdef FEAT_FSYS_DOUBLESPEED
FileStat* pStat; // optional FileStat* pStat; // optional
#endif
rtl::OString aName; rtl::OString aName;
DirEntry* pParent; DirEntry* pParent;
sal_uIntPtr nError; sal_uIntPtr nError;
@@ -214,10 +211,9 @@ protected:
DirEntryFlag ImpTheFlag() const { return eFlag; }; DirEntryFlag ImpTheFlag() const { return eFlag; };
DirEntry* ImpChangeParent( DirEntry* pNewParent, sal_Bool bNormalize = sal_True ); DirEntry* ImpChangeParent( DirEntry* pNewParent, sal_Bool bNormalize = sal_True );
DirEntry* ImpGetParent() { return pParent; } DirEntry* ImpGetParent() { return pParent; }
#ifdef FEAT_FSYS_DOUBLESPEED
FileStat* ImpGetStat() const { return pStat; } FileStat* ImpGetStat() const { return pStat; }
void ImpSetStat( FileStat *p ) { pStat = p; } void ImpSetStat( FileStat *p ) { pStat = p; }
#endif
protected: protected:
void SetError( sal_uIntPtr nErr ) { nError = nErr; } void SetError( sal_uIntPtr nErr ) { nError = nErr; }

26
tools/source/fsys/dirent.cxx
View File

@@ -547,9 +547,7 @@ void DirEntry::ImpTrim()
} }
DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag ) : DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag ) :
#ifdef FEAT_FSYS_DOUBLESPEED
pStat( 0 ), pStat( 0 ),
#endif
aName( rName ) aName( rName )
{ {
DBG_CTOR( DirEntry, ImpCheckDirEntry ); DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -562,9 +560,7 @@ DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag ) :
} }
DirEntry::DirEntry( const DirEntry& rOrig ) : DirEntry::DirEntry( const DirEntry& rOrig ) :
#ifdef FEAT_FSYS_DOUBLESPEED
pStat( rOrig.pStat ? new FileStat(*rOrig.pStat) : 0 ), pStat( rOrig.pStat ? new FileStat(*rOrig.pStat) : 0 ),
#endif
aName( rOrig.aName ) aName( rOrig.aName )
{ {
DBG_CTOR( DirEntry, ImpCheckDirEntry ); DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -582,10 +578,8 @@ DirEntry::DirEntry( const DirEntry& rOrig ) :
} }
} }
DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle ) DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle ) :
#ifdef FEAT_FSYS_DOUBLESPEED pStat( 0 )
: pStat( 0 )
#endif
{ {
DBG_CTOR( DirEntry, ImpCheckDirEntry ); DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -636,10 +630,8 @@ DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle )
eFlag = FSYS_FLAG_INVALID; eFlag = FSYS_FLAG_INVALID;
} }
DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle ) DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle ) :
#ifdef FEAT_FSYS_DOUBLESPEED pStat( 0 )
: pStat( 0 )
#endif
{ {
DBG_CTOR( DirEntry, ImpCheckDirEntry ); DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -682,10 +674,8 @@ DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle )
eFlag = FSYS_FLAG_INVALID; eFlag = FSYS_FLAG_INVALID;
} }
DirEntry::DirEntry( DirEntryFlag eDirFlag ) DirEntry::DirEntry( DirEntryFlag eDirFlag ) :
#ifdef FEAT_FSYS_DOUBLESPEED pStat( 0 )
: pStat( 0 )
#endif
{ {
DBG_CTOR( DirEntry, ImpCheckDirEntry ); DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -699,10 +689,8 @@ DirEntry::~DirEntry()
DBG_DTOR( DirEntry, ImpCheckDirEntry ); DBG_DTOR( DirEntry, ImpCheckDirEntry );
delete pParent; delete pParent;
#ifdef FEAT_FSYS_DOUBLESPEED
delete pStat;
#endif
delete pStat;
} }
const DirEntry* DirEntry::ImpGetTopPtr() const const DirEntry* DirEntry::ImpGetTopPtr() const

3
tools/source/fsys/fstat.cxx
View File

@@ -39,7 +39,6 @@ FileStat::FileStat( const DirEntry& rDirEntry, FSysAccess nAccess )
sal_Bool bCached = FSYS_ACCESS_CACHED == (nAccess & FSYS_ACCESS_CACHED); sal_Bool bCached = FSYS_ACCESS_CACHED == (nAccess & FSYS_ACCESS_CACHED);
sal_Bool bFloppy = FSYS_ACCESS_FLOPPY == (nAccess & FSYS_ACCESS_FLOPPY); sal_Bool bFloppy = FSYS_ACCESS_FLOPPY == (nAccess & FSYS_ACCESS_FLOPPY);
#ifdef FEAT_FSYS_DOUBLESPEED
const FileStat *pStatFromDir = bCached ? rDirEntry.ImpGetStat() : 0; const FileStat *pStatFromDir = bCached ? rDirEntry.ImpGetStat() : 0;
if ( pStatFromDir ) if ( pStatFromDir )
{ {
@@ -56,7 +55,7 @@ FileStat::FileStat( const DirEntry& rDirEntry, FSysAccess nAccess )
aTimeAccessed = pStatFromDir->aTimeAccessed; aTimeAccessed = pStatFromDir->aTimeAccessed;
} }
else else
#endif
Update( rDirEntry, bFloppy ); Update( rDirEntry, bFloppy );
} }

4
tools/source/fsys/wntmsc.cxx
View File

@@ -275,9 +275,9 @@ USHORT DirReader_Impl::Read()
: FSYS_FLAG_NORMAL; : FSYS_FLAG_NORMAL;
DirEntry *pTemp = new DirEntry( rtl::OString(pDosEntry->d_name), DirEntry *pTemp = new DirEntry( rtl::OString(pDosEntry->d_name),
eFlag ); eFlag );
#ifdef FEAT_FSYS_DOUBLESPEED
pTemp->ImpSetStat( new FileStat( (void*) pDosDir ) ); pTemp->ImpSetStat( new FileStat( (void*) pDosDir ) );
#endif
if ( pParent ) if ( pParent )
pTemp->ImpChangeParent( new DirEntry( *pParent ), sal_False ); pTemp->ImpChangeParent( new DirEntry( *pParent ), sal_False );
if ( pDir->pStatLst ) // Status required by sorting criteria? if ( pDir->pStatLst ) // Status required by sorting criteria?