[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/vba/vbaapplication.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fb797eb41bf9b26261c4d9fe7a38ba635b80a20c
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Feb 13 14:41:46 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Feb 15 11:32:34 2019 +0200

    Interpret the parameter of WordBasic.FileClose() more correctly
    
    In particular, the value 2 means "do not save".
    
    Change-Id: I9788d201f8ecfcc016a12aa2088552ee994e1c17

diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 7341bd487fbd..58234632aa3f 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -556,8 +556,8 @@ SwWordBasic::FileClose( const css::uno::Any& Save )
 {
     uno::Reference< frame::XModel > xModel( mpApp->getCurrentDocument(), uno::UNO_SET_THROW );
 
-    bool bSave = false;
-    if (Save.hasValue() && (Save >>= bSave) && bSave)
+    sal_Int16 nSave = false;
+    if (Save.hasValue() && (Save >>= nSave) && (nSave == 0 || nSave == 1))
         FileSave();
 
     // FIXME: Here I would much prefer to call VbaDocumentBase::Close() but not sure how to get at