diff options
author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-03-03 22:42:16 -0300 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-03-04 10:01:46 +0000 |
commit | 2962aaa0087e093a9541b4a4372f6c09fe3f8424 (patch) | |
tree | f4990201ba2d6d2506b48dc5c4e0d9251bd34e50 /tools | |
parent | 130d2776830fa37df9a42cefb911ef9f87ff789e (diff) |
fdo#61513: Remove FSysFailOnErrorImpl macro
This patch removes all used of this useless macro.
Change-Id: Ib3842ef28ea676e75b18c192f8d9610dcb3c3d0c
Diffstat (limited to 'tools')
-rw-r--r-- | tools/source/fsys/dirent.cxx | 6 | ||||
-rw-r--r-- | tools/source/fsys/tdir.cxx | 1 | ||||
-rw-r--r-- | tools/source/fsys/unx.hxx | 2 | ||||
-rw-r--r-- | tools/source/fsys/wntmsc.cxx | 7 | ||||
-rw-r--r-- | tools/source/fsys/wntmsc.hxx | 2 |
5 files changed, 0 insertions, 18 deletions
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index c4ae7a98dc27..d00ed7c9afad 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -768,7 +768,6 @@ sal_Bool DirEntry::Exists( FSysAccess nAccess ) const return sal_True; #endif - FSysFailOnErrorImpl(); DirEntryKind eKind = FileStat( *this, nAccess ).GetKind(); if ( eKind & ( FSYS_KIND_FILE | FSYS_KIND_DIR ) ) { @@ -787,8 +786,6 @@ sal_Bool DirEntry::Exists( FSysAccess nAccess ) const sal_Bool DirEntry::First() { - FSysFailOnErrorImpl(); - String aUniPathName( GetPath().GetFull() ); rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, osl_getThreadTextEncoding())); @@ -1454,7 +1451,6 @@ sal_Bool DirEntry::MakeDir( sal_Bool bSloppy ) const return sal_True; else { - FSysFailOnErrorImpl(); String aDirName(pNewDir->GetFull()); rtl::OString bDirName(rtl::OUStringToOString(aDirName, osl_getThreadTextEncoding())); @@ -1518,7 +1514,6 @@ FSysError DirEntry::MoveTo( const DirEntry& rNewName ) const return FSYS_ERR_ALREADYEXISTS; } - FSysFailOnErrorImpl(); String aFrom( GetFull() ); String aTo( aDest.GetFull() ); @@ -1649,7 +1644,6 @@ FSysError DirEntry::Kill( FSysAction nActions ) const DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); FSysError eError = FSYS_ERR_OK; - FSysFailOnErrorImpl(); // Terminate name string with two '0' String aTmpName( GetFull() ); diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx index b33c9cf8e3ef..5e6ed052f819 100644 --- a/tools/source/fsys/tdir.cxx +++ b/tools/source/fsys/tdir.cxx @@ -289,7 +289,6 @@ sal_uInt16 Dir::Scan( sal_uInt16 nCount ) { sal_uInt16 nRead = 0; // Number of read entries in this round - FSysFailOnErrorImpl(); // did not complete if ( pReader ) diff --git a/tools/source/fsys/unx.hxx b/tools/source/fsys/unx.hxx index 9728d71f4d19..8a3ee3b2064a 100644 --- a/tools/source/fsys/unx.hxx +++ b/tools/source/fsys/unx.hxx @@ -71,8 +71,6 @@ inline void Unx2DateAndTime( time_t nDate, Time& rTime, Date& rDate ) rDate = Date( pTime->tm_mday, pTime->tm_mon + 1, pTime->tm_year + 1900 ); } -#define FSysFailOnErrorImpl() - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx index 7c74ed459bf0..f6c9e0e85c09 100644 --- a/tools/source/fsys/wntmsc.cxx +++ b/tools/source/fsys/wntmsc.cxx @@ -114,7 +114,6 @@ sal_Bool DirEntry::ToAbs() char *pOld; rtl::OString aFullName(rtl::OUStringToOString(GetFull(), osl_getThreadTextEncoding())); - FSysFailOnErrorImpl(); if ( GetFullPathName(aFullName.getStr(), 256, sBuf, &pOld) > 511 ) return sal_False; @@ -143,7 +142,6 @@ String DirEntry::GetVolume() const DWORD nMaxCompLen[2]; DWORD nFlags[2]; rtl::OString aRootDir = pTop->aName; - FSysFailOnErrorImpl(); // Try network device first due to slow samba drives if ( !WNetGetConnection( aRootDir.getStr(), @@ -169,8 +167,6 @@ sal_Bool DirEntry::SetCWD( sal_Bool bSloppy ) const { DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); - FSysFailOnErrorImpl(); - if ( eFlag == FSYS_FLAG_CURRENT && !aName.getLength() ) return sal_True; @@ -594,9 +590,6 @@ sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool bForceAccess ) return sal_True; } - // Don't show error boxes - FSysFailOnErrorImpl(); - // Redirect String aPath( rDirEntry.GetFull() ); DirEntry aDirEntry( aPath ); diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx index bb1dbac93793..bf83941033ac 100644 --- a/tools/source/fsys/wntmsc.hxx +++ b/tools/source/fsys/wntmsc.hxx @@ -63,8 +63,6 @@ inline sal_Bool DRIVE_EXISTS(char c) return GetDriveType( aDriveRoot.getStr() ) > 1; } -#define FSysFailOnErrorImpl() - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |