Tag: cws_src680_dba203c User: oj Date: 06/04/24 06:46:55 Modified: /dba/dbaccess/source/ui/tabledesign/ TableController.cxx
Log: RESYNC: (1.101-1.102); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableController.cxx?r1=1.101.2.1&r2=1.101.2.2 Delta lines: +10 -6 -------------------- --- TableController.cxx 13 Apr 2006 13:57:19 -0000 1.101.2.1 +++ TableController.cxx 24 Apr 2006 13:46:53 -0000 1.101.2.2 @@ -702,6 +702,8 @@ vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard(m_aMutex); + if ( getView() && getView()->IsInModalMode() ) + return sal_False; sal_Bool bCheck = sal_True; if ( isModified() ) { @@ -1170,15 +1172,17 @@ // ----------------------------------------------------------------------------- void OTableController::alterColumns() { - Reference<XColumnsSupplier> xColSup(m_xTable,UNO_QUERY); + Reference<XColumnsSupplier> xColSup(m_xTable,UNO_QUERY_THROW); OSL_ENSURE(xColSup.is(),"What happen here?!"); Reference<XNameAccess> xColumns = xColSup->getColumns(); - Reference<XIndexAccess> xIdxColumns(xColumns,UNO_QUERY); + Reference<XIndexAccess> xIdxColumns(xColumns,UNO_QUERY_THROW); OSL_ENSURE(xColumns.is(),"No columns"); + if ( !xColumns.is() ) + return; Reference<XAlterTable> xAlter(m_xTable,UNO_QUERY); // can be null - sal_Int32 nColumnCount = xColumns->getElementNames().getLength(); + sal_Int32 nColumnCount = xIdxColumns->getCount(); Reference<XDrop> xDrop(xColumns,UNO_QUERY); // can be null Reference<XAppend> xAppend(xColumns,UNO_QUERY); // can be null Reference<XDataDescriptorFactory> xColumnFactory(xColumns,UNO_QUERY); // can be null --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
