[Libreoffice-commits] core.git: dbaccess/source

[Julien Nabet]

 dbaccess/source/ui/tabledesign/TableController.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 182a62e0f199d26df0ae76ebf224c5d4b0fc3e26
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu May 25 23:17:31 2017 +0200

    Related tdf#108068: Retrieve error from Firebird engine
    
    Change-Id: If89a904740e54e81c2f2ae790ba8d05d830b0a5b
    Reviewed-on: https://gerrit.libreoffice.org/38043
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 68ec90e114b1..2da0d3c63ff3 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -1117,12 +1117,13 @@ void OTableController::alterColumns()
             }
             catch(const SQLException&)
             { // we couldn't alter the column so we have to add new columns
+                SQLExceptionInfo aError( ::cppu::getCaughtException() );
                 bReload = true;
                 if(xDrop.is() && xAppend.is())
                 {
                     OUString aMessage(ModuleRes(STR_TABLEDESIGN_ALTER_ERROR));
                     aMessage = aMessage.replaceFirst("$column$",pField->GetName());
-                    ScopedVclPtrInstance< OSQLWarningBox > aMsg( getView(), aMessage, WB_YES_NO | WB_DEF_YES );
+                    ScopedVclPtrInstance< OSQLWarningBox > aMsg( getView(), aMessage, WB_YES_NO | WB_DEF_YES, &aError);
                     if ( aMsg->Execute() != RET_YES )
                     {
                         Reference<XPropertySet> xNewColumn(xIdxColumns->getByIndex(nPos),UNO_QUERY_THROW);