dbaccess/source/ui/browser/unodatbr.cxx | 3 +++ 1 file changed, 3 insertions(+)
New commits: commit 0297d9cc3b3fb990956cc2f8021a645d3c4fb86f Author: Julien Nabet <serval2...@yahoo.fr> Date: Wed Sep 20 22:04:19 2017 +0200 Related tdf#112423: avoid crash when calling procedure twice (dbaccess) Since SbaTableQueryBrowser::implSelect returns a bool to indicate if everything is ok, should return false when we entered in a catch Change-Id: I9ae3ff3bf082278edb16a9b91701d6cf457e7179 Reviewed-on: https://gerrit.libreoffice.org/42564 Tested-by: Julien Nabet <serval2...@yahoo.fr> Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 020a71ecb8de..193bb6a625ac 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2685,6 +2685,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry ) // reset the values xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any()); xRowSetProps->setPropertyValue(PROPERTY_ACTIVE_CONNECTION,Any()); + bSuccess = false; } catch(WrappedTargetException& e) { @@ -2696,12 +2697,14 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry ) // reset the values xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any()); xRowSetProps->setPropertyValue(PROPERTY_ACTIVE_CONNECTION,Any()); + bSuccess = false; } catch(const Exception&) { // reset the values xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any()); xRowSetProps->setPropertyValue(PROPERTY_ACTIVE_CONNECTION,Any()); + bSuccess = false; } } return bSuccess; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits