dbaccess/source/ui/browser/unodatbr.cxx | 3 +++ 1 file changed, 3 insertions(+)
New commits: commit 52230cb62d2784a5e5eae6f9982a7d1b2d8e43e9 Author: Julien Nabet <[email protected]> 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/42601 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index c57cea8ab205..7e5a7b22eb9e 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2687,6 +2687,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) { @@ -2698,12 +2699,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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
