Kaydet (Commit) 2962aaa0 authored tarafından Marcos Paulo de Souza's avatar Marcos Paulo de Souza Kaydeden (comit) Michael Meeks

fdo#61513: Remove FSysFailOnErrorImpl macro

This patch removes all used of this useless macro.

Change-Id: Ib3842ef28ea676e75b18c192f8d9610dcb3c3d0c
üst 130d2776
...@@ -768,7 +768,6 @@ sal_Bool DirEntry::Exists( FSysAccess nAccess ) const ...@@ -768,7 +768,6 @@ sal_Bool DirEntry::Exists( FSysAccess nAccess ) const
return sal_True; return sal_True;
#endif #endif
FSysFailOnErrorImpl();
DirEntryKind eKind = FileStat( *this, nAccess ).GetKind(); DirEntryKind eKind = FileStat( *this, nAccess ).GetKind();
if ( eKind & ( FSYS_KIND_FILE | FSYS_KIND_DIR ) ) if ( eKind & ( FSYS_KIND_FILE | FSYS_KIND_DIR ) )
{ {
...@@ -787,8 +786,6 @@ sal_Bool DirEntry::Exists( FSysAccess nAccess ) const ...@@ -787,8 +786,6 @@ sal_Bool DirEntry::Exists( FSysAccess nAccess ) const
sal_Bool DirEntry::First() sal_Bool DirEntry::First()
{ {
FSysFailOnErrorImpl();
String aUniPathName( GetPath().GetFull() ); String aUniPathName( GetPath().GetFull() );
rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, osl_getThreadTextEncoding())); rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, osl_getThreadTextEncoding()));
...@@ -1454,7 +1451,6 @@ sal_Bool DirEntry::MakeDir( sal_Bool bSloppy ) const ...@@ -1454,7 +1451,6 @@ sal_Bool DirEntry::MakeDir( sal_Bool bSloppy ) const
return sal_True; return sal_True;
else else
{ {
FSysFailOnErrorImpl();
String aDirName(pNewDir->GetFull()); String aDirName(pNewDir->GetFull());
rtl::OString bDirName(rtl::OUStringToOString(aDirName, osl_getThreadTextEncoding())); rtl::OString bDirName(rtl::OUStringToOString(aDirName, osl_getThreadTextEncoding()));
...@@ -1518,7 +1514,6 @@ FSysError DirEntry::MoveTo( const DirEntry& rNewName ) const ...@@ -1518,7 +1514,6 @@ FSysError DirEntry::MoveTo( const DirEntry& rNewName ) const
return FSYS_ERR_ALREADYEXISTS; return FSYS_ERR_ALREADYEXISTS;
} }
FSysFailOnErrorImpl();
String aFrom( GetFull() ); String aFrom( GetFull() );
String aTo( aDest.GetFull() ); String aTo( aDest.GetFull() );
...@@ -1649,7 +1644,6 @@ FSysError DirEntry::Kill( FSysAction nActions ) const ...@@ -1649,7 +1644,6 @@ FSysError DirEntry::Kill( FSysAction nActions ) const
DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
FSysError eError = FSYS_ERR_OK; FSysError eError = FSYS_ERR_OK;
FSysFailOnErrorImpl();
// Terminate name string with two '0' // Terminate name string with two '0'
String aTmpName( GetFull() ); String aTmpName( GetFull() );
......
...@@ -289,7 +289,6 @@ sal_uInt16 Dir::Scan( sal_uInt16 nCount ) ...@@ -289,7 +289,6 @@ sal_uInt16 Dir::Scan( sal_uInt16 nCount )
{ {
sal_uInt16 nRead = 0; // Number of read entries in this round sal_uInt16 nRead = 0; // Number of read entries in this round
FSysFailOnErrorImpl();
// did not complete // did not complete
if ( pReader ) if ( pReader )
......
...@@ -71,8 +71,6 @@ inline void Unx2DateAndTime( time_t nDate, Time& rTime, Date& rDate ) ...@@ -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 ); rDate = Date( pTime->tm_mday, pTime->tm_mon + 1, pTime->tm_year + 1900 );
} }
#define FSysFailOnErrorImpl()
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -114,7 +114,6 @@ sal_Bool DirEntry::ToAbs() ...@@ -114,7 +114,6 @@ sal_Bool DirEntry::ToAbs()
char *pOld; char *pOld;
rtl::OString aFullName(rtl::OUStringToOString(GetFull(), rtl::OString aFullName(rtl::OUStringToOString(GetFull(),
osl_getThreadTextEncoding())); osl_getThreadTextEncoding()));
FSysFailOnErrorImpl();
if ( GetFullPathName(aFullName.getStr(), 256, sBuf, &pOld) > 511 ) if ( GetFullPathName(aFullName.getStr(), 256, sBuf, &pOld) > 511 )
return sal_False; return sal_False;
...@@ -143,7 +142,6 @@ String DirEntry::GetVolume() const ...@@ -143,7 +142,6 @@ String DirEntry::GetVolume() const
DWORD nMaxCompLen[2]; DWORD nMaxCompLen[2];
DWORD nFlags[2]; DWORD nFlags[2];
rtl::OString aRootDir = pTop->aName; rtl::OString aRootDir = pTop->aName;
FSysFailOnErrorImpl();
// Try network device first due to slow samba drives // Try network device first due to slow samba drives
if ( !WNetGetConnection( aRootDir.getStr(), if ( !WNetGetConnection( aRootDir.getStr(),
...@@ -169,8 +167,6 @@ sal_Bool DirEntry::SetCWD( sal_Bool bSloppy ) const ...@@ -169,8 +167,6 @@ sal_Bool DirEntry::SetCWD( sal_Bool bSloppy ) const
{ {
DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
FSysFailOnErrorImpl();
if ( eFlag == FSYS_FLAG_CURRENT && !aName.getLength() ) if ( eFlag == FSYS_FLAG_CURRENT && !aName.getLength() )
return sal_True; return sal_True;
...@@ -594,9 +590,6 @@ sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool bForceAccess ) ...@@ -594,9 +590,6 @@ sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool bForceAccess )
return sal_True; return sal_True;
} }
// Don't show error boxes
FSysFailOnErrorImpl();
// Redirect // Redirect
String aPath( rDirEntry.GetFull() ); String aPath( rDirEntry.GetFull() );
DirEntry aDirEntry( aPath ); DirEntry aDirEntry( aPath );
......
...@@ -63,8 +63,6 @@ inline sal_Bool DRIVE_EXISTS(char c) ...@@ -63,8 +63,6 @@ inline sal_Bool DRIVE_EXISTS(char c)
return GetDriveType( aDriveRoot.getStr() ) > 1; return GetDriveType( aDriveRoot.getStr() ) > 1;
} }
#define FSysFailOnErrorImpl()
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment