From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Tue, 29 Aug 2017 16:39:44 +0000 (+0100)
Subject: rsc-no-error-about-unknown-switch
X-Git-Tag: archive/raspbian/1%5.4.1-1+rpi1^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ef527b3242013e20e1ff8a3a84b8913a9f444471;p=libreoffice.git

rsc-no-error-about-unknown-switch


Gbp-Pq: Name rsc-no-error-about-unknown-switch.diff
---

diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index a6dcb46cf22..8d22aee8018 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -388,7 +388,7 @@ void RscError::Error( const ERRTYPE& rError, RscTop * pClass,
 void RscError::FatalError( const ERRTYPE& rError, const RscId &aId,
                            const char * pMessage )
 {
-    if( ERR_USAGE != rError.GetError() ){
+    if( ERR_USAGE != rError.GetError() && ERR_UNKNOWNSW != rError.GetError() ){
         nErrors++;
         ErrorFormat( rError, nullptr, aId );
         WriteError( rError, pMessage );
@@ -397,7 +397,8 @@ void RscError::FatalError( const ERRTYPE& rError, const RscId &aId,
     else
         WriteError( rError, pMessage );
 
-    exit( 1 );
+    if( ERR_UNKNOWNSW != rError.GetError() )
+ 	   exit( 1 );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */