Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/2535 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2535/1 fdo#61513: Remove FSysFailOnErrorImpl macro This patch removes all used of this useless macro. Change-Id: Ib3842ef28ea676e75b18c192f8d9610dcb3c3d0c --- M tools/source/fsys/dirent.cxx M tools/source/fsys/tdir.cxx M tools/source/fsys/unx.hxx M tools/source/fsys/wntmsc.cxx M tools/source/fsys/wntmsc.hxx 5 files changed, 0 insertions(+), 18 deletions(-) diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index c4ae7a9..d00ed7c 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -768,7 +768,6 @@ 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::First() { - FSysFailOnErrorImpl(); - String aUniPathName( GetPath().GetFull() ); rtl::OString aPathName(rtl::OUStringToOString(aUniPathName, osl_getThreadTextEncoding())); @@ -1454,7 +1451,6 @@ return sal_True; else { - FSysFailOnErrorImpl(); String aDirName(pNewDir->GetFull()); rtl::OString bDirName(rtl::OUStringToOString(aDirName, osl_getThreadTextEncoding())); @@ -1518,7 +1514,6 @@ return FSYS_ERR_ALREADYEXISTS; } - FSysFailOnErrorImpl(); String aFrom( GetFull() ); String aTo( aDest.GetFull() ); @@ -1649,7 +1644,6 @@ 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 b33c9cf..5e6ed05 100644 --- a/tools/source/fsys/tdir.cxx +++ b/tools/source/fsys/tdir.cxx @@ -289,7 +289,6 @@ { 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 9728d71..8a3ee3b 100644 --- a/tools/source/fsys/unx.hxx +++ b/tools/source/fsys/unx.hxx @@ -71,8 +71,6 @@ 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 7c74ed4..f6c9e0e 100644 --- a/tools/source/fsys/wntmsc.cxx +++ b/tools/source/fsys/wntmsc.cxx @@ -114,7 +114,6 @@ 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 @@ 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(), @@ -168,8 +166,6 @@ sal_Bool DirEntry::SetCWD( sal_Bool bSloppy ) const { DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); - - FSysFailOnErrorImpl(); if ( eFlag == FSYS_FLAG_CURRENT && !aName.getLength() ) return sal_True; @@ -593,9 +589,6 @@ nError = FSYS_ERR_OK; return sal_True; } - - // Don't show error boxes - FSysFailOnErrorImpl(); // Redirect String aPath( rDirEntry.GetFull() ); diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx index bb1dbac..bf83941 100644 --- a/tools/source/fsys/wntmsc.hxx +++ b/tools/source/fsys/wntmsc.hxx @@ -63,8 +63,6 @@ return GetDriveType( aDriveRoot.getStr() ) > 1; } -#define FSysFailOnErrorImpl() - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- To view, visit https://gerrit.libreoffice.org/2535 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3842ef28ea676e75b18c192f8d9610dcb3c3d0c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza <marcos.souza....@gmail.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice