summaryrefslogtreecommitdiff
path: root/tools/source
diff options
context:
space:
mode:
authorJiri Blecha <blechji4@fel.cvut.cz>2013-03-02 17:25:06 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-03-04 10:33:40 +0000
commit66f426b8fa1ceff10ac26319796af73ab0ef198d (patch)
tree30019be2448fb5e19529e9f7282b27feefc57dfe /tools/source
parent8f113d08cebd7529e62f928fbf71f36df9ec748e (diff)
The macro FEAT_FSYS_DOUBLESPEED has been removed and the related #if / #endif have been removed too.
Bug: 61516 Change-Id: Id347e87a8789ddbe550dde7d7281d9c1cad0c199
Diffstat (limited to 'tools/source')
-rw-r--r--tools/source/fsys/dirent.cxx26
-rw-r--r--tools/source/fsys/fstat.cxx3
-rw-r--r--tools/source/fsys/wntmsc.cxx4
3 files changed, 10 insertions, 23 deletions
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index d00ed7c9afad..e0231d4c8f58 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -547,9 +547,7 @@ void DirEntry::ImpTrim()
}
DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag ) :
-#ifdef FEAT_FSYS_DOUBLESPEED
pStat( 0 ),
-#endif
aName( rName )
{
DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -562,9 +560,7 @@ DirEntry::DirEntry( const rtl::OString& rName, DirEntryFlag eDirFlag ) :
}
DirEntry::DirEntry( const DirEntry& rOrig ) :
-#ifdef FEAT_FSYS_DOUBLESPEED
pStat( rOrig.pStat ? new FileStat(*rOrig.pStat) : 0 ),
-#endif
aName( rOrig.aName )
{
DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -582,10 +578,8 @@ DirEntry::DirEntry( const DirEntry& rOrig ) :
}
}
-DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle )
-#ifdef FEAT_FSYS_DOUBLESPEED
- : pStat( 0 )
-#endif
+DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle ) :
+ pStat( 0 )
{
DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -636,10 +630,8 @@ DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle )
eFlag = FSYS_FLAG_INVALID;
}
-DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle )
-#ifdef FEAT_FSYS_DOUBLESPEED
- : pStat( 0 )
-#endif
+DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle ) :
+ pStat( 0 )
{
DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -682,10 +674,8 @@ DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle )
eFlag = FSYS_FLAG_INVALID;
}
-DirEntry::DirEntry( DirEntryFlag eDirFlag )
-#ifdef FEAT_FSYS_DOUBLESPEED
- : pStat( 0 )
-#endif
+DirEntry::DirEntry( DirEntryFlag eDirFlag ) :
+ pStat( 0 )
{
DBG_CTOR( DirEntry, ImpCheckDirEntry );
@@ -699,10 +689,8 @@ DirEntry::~DirEntry()
DBG_DTOR( DirEntry, ImpCheckDirEntry );
delete pParent;
-#ifdef FEAT_FSYS_DOUBLESPEED
- delete pStat;
-#endif
+ delete pStat;
}
const DirEntry* DirEntry::ImpGetTopPtr() const
diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx
index bf1c6b788f41..a0bbae1159d7 100644
--- a/tools/source/fsys/fstat.cxx
+++ b/tools/source/fsys/fstat.cxx
@@ -39,7 +39,6 @@ FileStat::FileStat( const DirEntry& rDirEntry, FSysAccess nAccess )
sal_Bool bCached = FSYS_ACCESS_CACHED == (nAccess & FSYS_ACCESS_CACHED);
sal_Bool bFloppy = FSYS_ACCESS_FLOPPY == (nAccess & FSYS_ACCESS_FLOPPY);
-#ifdef FEAT_FSYS_DOUBLESPEED
const FileStat *pStatFromDir = bCached ? rDirEntry.ImpGetStat() : 0;
if ( pStatFromDir )
{
@@ -56,7 +55,7 @@ FileStat::FileStat( const DirEntry& rDirEntry, FSysAccess nAccess )
aTimeAccessed = pStatFromDir->aTimeAccessed;
}
else
-#endif
+
Update( rDirEntry, bFloppy );
}
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index f6c9e0e85c09..b1c416c13277 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -275,9 +275,9 @@ USHORT DirReader_Impl::Read()
: FSYS_FLAG_NORMAL;
DirEntry *pTemp = new DirEntry( rtl::OString(pDosEntry->d_name),
eFlag );
-#ifdef FEAT_FSYS_DOUBLESPEED
+
pTemp->ImpSetStat( new FileStat( (void*) pDosDir ) );
-#endif
+
if ( pParent )
pTemp->ImpChangeParent( new DirEntry( *pParent ), sal_False );
if ( pDir->pStatLst ) // Status required by sorting criteria?