From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 18 Apr 2018 15:17:55 +0000 (+0100)
Subject: rsc-no-error-about-unknown-switch
X-Git-Tag: archive/raspbian/1%5.2.7-1+rpi1+deb9u4^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2d48c12dc7318a544c03e860a694dcdc6504184f;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 761dedbfaa9..6d3324aec74 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -389,7 +389,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 ){
+    if( ERR_USAGE != rError && ERR_UNKNOWNSW != rError ){
         nErrors++;
         ErrorFormat( rError, nullptr, aId );
         WriteError( rError, pMessage );
@@ -398,7 +398,8 @@ void RscError::FatalError( const ERRTYPE& rError, const RscId &aId,
     else
         WriteError( rError, pMessage );
 
-    exit( 1 );
+    if( ERR_UNKNOWNSW != rError )
+ 	   exit( 1 );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */