[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-3' - basctl/source

[Julien Nabet]

 basctl/source/basicide/baside3.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83189bcee3235baec8f0314dada6e7e9fcd1baaf
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Apr 16 23:42:56 2016 +0200

    tdf#97380: don't destroy completely window when replace dialog
    
    0x00002aaaf64ff222 in basctl::ScriptDocument::Impl::isApplication (this=0x9999999999999999) at /home/julien/lo/libreoffice/basctl/source/basicide/scriptdocument.cxx:210
    210	        inline  bool    isApplication() const   { return m_bValid && m_bIsApplication; }
    (gdb) bt
    0  0x00002aaaf64ff222 in basctl::ScriptDocument::Impl::isApplication (this=0x9999999999999999) at /home/julien/lo/libreoffice/basctl/source/basicide/scriptdocument.cxx:210
    1  0x00002aaaf64fa12e in basctl::ScriptDocument::isApplication (this=0x576b458) at /home/julien/lo/libreoffice/basctl/source/basicide/scriptdocument.cxx:1311
    2  0x00002aaaf648f6d7 in basctl::MarkDocumentModified (rDocument=...) at /home/julien/lo/libreoffice/basctl/source/basicide/basobj3.cxx:256
    3  0x00002aaaf645e2a9 in basctl::implImportDialog (pWin=0x576b210, rCurPath=<error reading variable: Cannot access memory at address 0x999999999999999d>, rDocument=...,
        aLibName="Standard") at /home/julien/lo/libreoffice/basctl/source/basicide/baside3.cxx:1154
    4  0x00002aaaf645eda9 in basctl::DialogWindow::ImportDialog (this=0x576b210) at /home/julien/lo/libreoffice/basctl/source/basicide/baside3.cxx:1213
    
    Change-Id: I7365b2cacc8a3783fdc8e573bbc10ff574d9c4ed
    Reviewed-on: https://gerrit.libreoffice.org/24139
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 60b61b7859ca357e0a2b6953888954a46d64999d)
    Reviewed-on: https://gerrit.libreoffice.org/24140
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit e1dde79a11f85bdde52e8b4c319140234f250aad)
    Reviewed-on: https://gerrit.libreoffice.org/24589
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 09e3c87..1bef09d 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1155,7 +1155,7 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script
                 {
                     BaseWindow* pDlgWin = pShell->FindDlgWin( rDocument, aLibName, aNewDlgName, false, true );
                     if( pDlgWin != nullptr )
-                        pShell->RemoveWindow( pDlgWin, true );
+                        pShell->RemoveWindow( pDlgWin, false );
                     MarkDocumentModified( rDocument );
                 }
                 else