diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2016-04-16 23:42:56 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-03 09:33:56 +0000 |
commit | 83189bcee3235baec8f0314dada6e7e9fcd1baaf (patch) | |
tree | 6e37fdb53907928b36781529c68071cffb43eba0 | |
parent | 3ab3ed1bd7103efe87972d33b3a0815f56546315 (diff) |
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@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 60b61b7859ca357e0a2b6953888954a46d64999d)
Reviewed-on: https://gerrit.libreoffice.org/24140
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit e1dde79a11f85bdde52e8b4c319140234f250aad)
Reviewed-on: https://gerrit.libreoffice.org/24589
Reviewed-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | basctl/source/basicide/baside3.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 09e3c873dcd3..1bef09deebef 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 |