[libreoffice] 01/01: git update; update rsc-no-error-about-unknown-switch.diff

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit 9ad6c1432eed12012cdc94f9f0905b4fd2e08e94
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 16 23:17:19 2016 +0200

    git update; update rsc-no-error-about-unknown-switch.diff
---
 changelog                                      | 2 +-
 patches/rsc-no-error-about-unknown-switch.diff | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 13ed2d3..bcd18b9 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.3.0~alpha0~git20161013-1) UNRELEASED; urgency=medium
+libreoffice (1:5.3.0~alpha0~git20161016-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot 
     - fixes typo in VCL.xcu; s/Tino/Tinos/ (closes: #834580)
diff --git a/patches/rsc-no-error-about-unknown-switch.diff b/patches/rsc-no-error-about-unknown-switch.diff
index d8b839d..c0677e4 100644
--- a/patches/rsc-no-error-about-unknown-switch.diff
+++ b/patches/rsc-no-error-about-unknown-switch.diff
@@ -6,8 +6,8 @@ index c5a9fd7..62aa8ab 100644
  void RscError::FatalError( const ERRTYPE& rError, const RscId &aId,
                             const char * pMessage )
  {
--    if( ERR_USAGE != rError ){
-+    if( ERR_USAGE != rError && ERR_UNKNOWNSW != rError ){
+-    if( ERR_USAGE != rError.GetError() ){
++    if( ERR_USAGE != rError.GetError() && ERR_UNKNOWNSW != rError.GetError() ){
          nErrors++;
          ErrorFormat( rError, nullptr, aId );
          WriteError( rError, pMessage );
@@ -16,7 +16,7 @@ index c5a9fd7..62aa8ab 100644
          WriteError( rError, pMessage );
  
 -    exit( 1 );
-+    if( ERR_UNKNOWNSW != rError )
++    if( ERR_UNKNOWNSW != rError.GetError() )
 + 	   exit( 1 );
  }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git