User: hr Date: 06/04/19 06:24:40 Modified: /dba/dbaccess/source/ui/tabledesign/ TableController.cxx
Log: INTEGRATION: CWS oj17 (1.100.40); FILE MERGED 2006/04/10 07:40:04 oj 1.100.40.3: RESYNC: (1.100-1.101); FILE MERGED 2006/03/10 11:28:19 oj 1.100.40.2: #131297# do not suspend when we are in dialog mode 2006/03/09 10:30:07 oj 1.100.40.1: #133019# ensure that the columns are not null 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&r2=1.102 Delta lines: +7 -3 ------------------- --- TableController.cxx 29 Mar 2006 12:40:09 -0000 1.101 +++ TableController.cxx 19 Apr 2006 13:24:38 -0000 1.102 @@ -700,6 +700,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]
