diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:52:37 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:52:37 +0000 |
commit | 61134f22a1d81fe38a7560a6a612290f59e12d06 (patch) | |
tree | 72e5aa633cbd163fb83c349911027627f9aec629 /dbaccess/source/ui/tabledesign/TableController.cxx | |
parent | 37edb30ceb847cfec33f637ac4d70dd02968e39c (diff) |
INTEGRATION: CWS dba24e_SRC680 (1.114.22); FILE MERGED
2008/01/06 11:30:31 fs 1.114.22.2: #i10000#
2007/12/19 13:45:18 oj 1.114.22.1: #152043# catch exception
Diffstat (limited to 'dbaccess/source/ui/tabledesign/TableController.cxx')
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableController.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 6d3f0bcd2a0e..c2646505e864 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TableController.cxx,v $ * - * $Revision: 1.114 $ + * $Revision: 1.115 $ * - * last change: $Author: hr $ $Date: 2007-11-02 11:28:34 $ + * last change: $Author: vg $ $Date: 2008-01-29 08:52:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,6 +45,7 @@ #ifndef _STRING_HXX #include <tools/string.hxx> #endif +#include <tools/diagnose_ex.h> #ifndef _SFXSIDS_HRC #include <sfx2/sfxsids.hrc> #endif @@ -1560,8 +1561,16 @@ sal_Bool OTableController::isAddAllowed() const if(xColsSup.is()) bAddAllowed = Reference<XAppend>(xColsSup->getColumns(),UNO_QUERY).is(); - Reference< XDatabaseMetaData > xMetaData = getMetaData( ); - bAddAllowed = bAddAllowed || ( xMetaData.is() && xMetaData->supportsAlterTableWithAddColumn()); + try + { + Reference< XDatabaseMetaData > xMetaData = getMetaData( ); + bAddAllowed = bAddAllowed || ( xMetaData.is() && xMetaData->supportsAlterTableWithAddColumn()); + } + catch(Exception&) + { + DBG_UNHANDLED_EXCEPTION(); + bAddAllowed = sal_False; + } return bAddAllowed; } |