Tag: cws_dev300_dba30d User: fs Date: 2008-05-29 11:27:04+0000 Modified: dba/dbaccess/source/ui/tabledesign/TEditControl.cxx dba/dbaccess/source/ui/tabledesign/TableController.cxx dba/dbaccess/source/ui/tabledesign/TableDesignControl.cxx dba/dbaccess/source/ui/tabledesign/TableDesignView.cxx dba/dbaccess/source/ui/tabledesign/TableFieldControl.cxx dba/dbaccess/source/ui/tabledesign/TableUndo.cxx
Log: during #i80943#: refactoring: IController now passed around as reference, not as pointer File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TEditControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TEditControl.cxx?r1=1.59&r2=1.59.30.1 Delta lines: +53 -52 --------------------- --- TEditControl.cxx 2008-04-10 16:39:03+0000 1.59 +++ TEditControl.cxx 2008-05-29 11:27:01+0000 1.59.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TEditControl.cxx,v $ - * $Revision: 1.59 $ + * $Revision: 1.59.30.1 $ * * This file is part of OpenOffice.org. * @@ -181,9 +181,9 @@ //------------------------------------------------------------------ IMPL_LINK(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, void*, EMPTYARG) { - m_pOwner->GetView()->getController()->InvalidateFeature(SID_CUT); - m_pOwner->GetView()->getController()->InvalidateFeature(SID_COPY); - m_pOwner->GetView()->getController()->InvalidateFeature(SID_PASTE); + m_pOwner->GetView()->getController().InvalidateFeature(SID_CUT); + m_pOwner->GetView()->getController().InvalidateFeature(SID_COPY); + m_pOwner->GetView()->getController().InvalidateFeature(SID_PASTE); return 0L; } @@ -195,7 +195,7 @@ ////////////////////////////////////////////////////////////////////// // Soll der Entwurf ReadOnly geoeffnet werden ? - sal_Bool bRead(GetView()->getController()->isReadOnly()); + sal_Bool bRead(GetView()->getController().isReadOnly()); SetReadOnly( bRead ); @@ -252,14 +252,14 @@ SetHelpId(HID_TABDESIGN_BACKGROUND); GetDataWindow().SetHelpId(HID_CTL_TABLEEDIT); - m_pRowList = GetView()->getController()->getRows(); + m_pRowList = GetView()->getController().getRows(); m_nDataPos = 0; } //------------------------------------------------------------------------------ SfxUndoManager* OTableEditorCtrl::GetUndoManager() const { - return GetView()->getController()->getUndoMgr(); + return GetView()->getController().getUndoMgr(); } //------------------------------------------------------------------------------ @@ -315,7 +315,7 @@ Reference<XConnection> xCon; try { - xCon = GetView()->getController()->getConnection(); + xCon = GetView()->getController().getConnection(); Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>(); nMaxTextLen = ((xub_StrLen)xMetaData.is() ? static_cast<xub_StrLen>(xMetaData->getMaxColumnNameLength()) : 0); @@ -443,7 +443,7 @@ DBG_CHKTHIS(OTableEditorCtrl,NULL); ////////////////////////////////////////////////////////////////////// // Wenn EditorCtrl ReadOnly ist, darf nicht editiert werden - Reference<XPropertySet> xTable = GetView()->getController()->getTable(); + Reference<XPropertySet> xTable = GetView()->getController().getTable(); if (IsReadOnly() || ( xTable.is() && xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) @@ -500,7 +500,7 @@ if( !pActFieldDescr ) break; - const OTypeInfoMap* pTypeInfo = GetView()->getController()->getTypeInfo(); + const OTypeInfoMap* pTypeInfo = GetView()->getController().getTypeInfo(); OTypeInfoMap::const_iterator aIter = pTypeInfo->begin(); for(;aIter != pTypeInfo->end();++aIter) pTypeCell->InsertEntry( aIter->second->aUIName ); @@ -604,7 +604,7 @@ { DBG_CHKTHIS(OTableEditorCtrl,NULL); - Reference<XConnection> xCon = GetView()->getController()->getConnection(); + Reference<XConnection> xCon = GetView()->getController().getConnection(); Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>(); ::comphelper::UStringMixEqual bCase(xMetaData.is() ? xMetaData->supportsMixedCaseQuotedIdentifiers() : sal_True); @@ -798,7 +798,7 @@ GetUndoManager()->EnterListAction( sActionDescription, String() ); if (!pActFieldDescr) { - const OTypeInfoMap* pTypeInfoMap = GetView()->getController()->getTypeInfo(); + const OTypeInfoMap* pTypeInfoMap = GetView()->getController().getTypeInfo(); if ( !pTypeInfoMap->empty() ) { OTypeInfoMap::const_iterator aTypeIter = pTypeInfoMap->find(DataType::VARCHAR); @@ -807,7 +807,7 @@ pActRow->SetFieldType( aTypeIter->second ); } else - pActRow->SetFieldType( GetView()->getController()->getTypeInfoFallBack() ); + pActRow->SetFieldType( GetView()->getController().getTypeInfoFallBack() ); nInvalidateTypeEvent = Application::PostUserEvent( LINK(this, OTableEditorCtrl, InvalidateFieldType) ); pActFieldDescr = pActRow->GetActFieldDescr(); @@ -833,7 +833,7 @@ ////////////////////////////////////////////////////////////////////// // Das ModifyFlag setzen - GetView()->getController()->setModified( sal_True ); + GetView()->getController().setModified( sal_True ); InvalidateFeatures(); } // ----------------------------------------------------------------------------- @@ -841,7 +841,7 @@ { USHORT nPos = pTypeCell->GetSelectEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) - SwitchType( GetView()->getController()->getTypeInfo(nPos) ); + SwitchType( GetView()->getController().getTypeInfo(nPos) ); else SwitchType(TOTypeInfoSP()); } @@ -854,9 +854,9 @@ // ----------------------------------------------------------------------------- void OTableEditorCtrl::InvalidateFeatures() { - GetView()->getController()->InvalidateFeature(SID_UNDO); - GetView()->getController()->InvalidateFeature(SID_REDO); - GetView()->getController()->InvalidateFeature(SID_SAVEDOC); + GetView()->getController().InvalidateFeature(SID_UNDO); + GetView()->getController().InvalidateFeature(SID_REDO); + GetView()->getController().InvalidateFeature(SID_SAVEDOC); } //------------------------------------------------------------------------------ void OTableEditorCtrl::Undo() @@ -913,7 +913,7 @@ ////////////////////////////////////////////////////////////////////// // Basisnamen zum Anhaengen einer Numerierung erstellen String aBaseName; - Reference<XConnection> xCon = GetView()->getController()->getConnection(); + Reference<XConnection> xCon = GetView()->getController().getConnection(); Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>(); xub_StrLen nMaxTextLen((xub_StrLen)( xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0)); @@ -967,7 +967,7 @@ pRow->SetReadOnly( sal_False ); sal_Int32 nType = pRow->GetActFieldDescr()->GetType(); if ( pRow->GetActFieldDescr() ) - pRow->GetActFieldDescr()->SetType(GetView()->getController()->getTypeInfoByType(nType)); + pRow->GetActFieldDescr()->SetType(GetView()->getController().getTypeInfoByType(nType)); ////////////////////////////////////////////////////////////////////// // Anpassen des Feldnamens aFieldName = GenerateName( pRow->GetActFieldDescr()->GetName() ); @@ -989,7 +989,7 @@ ////////////////////////////////////////////////////////////////////// // Undo-Action erzeugen GetUndoManager()->AddUndoAction( new OTableEditorInsUndoAct(this, nRow,vInsertedUndoRedoRows) ); - GetView()->getController()->setModified( sal_True ); + GetView()->getController().setModified( sal_True ); InvalidateFeatures(); } @@ -997,7 +997,7 @@ void OTableEditorCtrl::DeleteRows() { DBG_CHKTHIS(OTableEditorCtrl,NULL); - OSL_ENSURE(GetView()->getController()->isDropAllowed(),"Call of DeleteRows not valid here. Please check isDropAllowed!"); + OSL_ENSURE(GetView()->getController().isDropAllowed(),"Call of DeleteRows not valid here. Please check isDropAllowed!"); ////////////////////////////////////////////////////////////////////// // Undo-Action erzeugen GetUndoManager()->AddUndoAction( new OTableEditorDelUndoAct(this) ); @@ -1034,7 +1034,7 @@ SetDataPtr( m_nDataPos ); ActivateCell(); pDescrWin->DisplayData( pActRow->GetActFieldDescr() ); - GetView()->getController()->setModified( sal_True ); + GetView()->getController().setModified( sal_True ); InvalidateFeatures(); } @@ -1042,7 +1042,7 @@ void OTableEditorCtrl::InsertNewRows( long nRow ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); - OSL_ENSURE(GetView()->getController()->isAddAllowed(),"Call of InsertNewRows not valid here. Please check isAppendAllowed!"); + OSL_ENSURE(GetView()->getController().isAddAllowed(),"Call of InsertNewRows not valid here. Please check isAppendAllowed!"); ////////////////////////////////////////////////////////////////////// // Undo-Action erzeugen long nInsertRows = GetSelectRowCount(); @@ -1055,7 +1055,7 @@ m_pRowList->insert( m_pRowList->begin()+i ,::boost::shared_ptr<OTableRow>(new OTableRow())); RowInserted( nRow, nInsertRows, sal_True ); - GetView()->getController()->setModified( sal_True ); + GetView()->getController().setModified( sal_True ); InvalidateFeatures(); } @@ -1322,8 +1322,8 @@ sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); - sal_Bool bIsCutAllowed = (GetView()->getController()->isAddAllowed() && GetView()->getController()->isDropAllowed()) || - GetView()->getController()->isAlterAllowed(); + sal_Bool bIsCutAllowed = (GetView()->getController().isAddAllowed() && GetView()->getController().isDropAllowed()) || + GetView()->getController().isAlterAllowed(); if(bIsCutAllowed) { @@ -1339,7 +1339,7 @@ bIsCutAllowed = sal_False; } -// Reference<XPropertySet> xTable = GetView()->getController()->getTable(); +// Reference<XPropertySet> xTable = GetView()->getController().getTable(); // if( !IsCopyAllowed(nRow) || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) // return sal_False; @@ -1358,7 +1358,7 @@ bIsCopyAllowed = pNameCell->GetSelected().Len() != 0; else if(m_eChildFocus == ROW) { - Reference<XPropertySet> xTable = GetView()->getController()->getTable(); + Reference<XPropertySet> xTable = GetView()->getController().getTable(); if( !GetSelectRowCount() || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) return sal_False; @@ -1385,7 +1385,7 @@ sal_Bool OTableEditorCtrl::IsPasteAllowed( long /*nRow*/ ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); - sal_Bool bAllowed = GetView()->getController()->isAddAllowed(); + sal_Bool bAllowed = GetView()->getController().isAddAllowed(); if ( bAllowed ) { TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent())); @@ -1404,7 +1404,7 @@ { if(m_eChildFocus == NAME) { - if(GetView()->getController()->isAlterAllowed()) + if(GetView()->getController().isAlterAllowed()) { SaveData(-1,FIELD_NAME); pNameCell->Cut(); @@ -1413,7 +1413,7 @@ } else if(m_eChildFocus == DESCRIPTION) { - if(GetView()->getController()->isAlterAllowed()) + if(GetView()->getController().isAlterAllowed()) { SaveData(-1,FIELD_DESCR); pDescrCell->Cut(); @@ -1451,7 +1451,7 @@ } else if(m_eChildFocus == NAME) { - if(GetView()->getController()->isAlterAllowed()) + if(GetView()->getController().isAlterAllowed()) { pNameCell->Paste(); CellModified(); @@ -1459,7 +1459,7 @@ } else if(m_eChildFocus == DESCRIPTION) { - if(GetView()->getController()->isAlterAllowed()) + if(GetView()->getController().isAlterAllowed()) { pDescrCell->Paste(); CellModified(); @@ -1472,13 +1472,13 @@ { DBG_CHKTHIS(OTableEditorCtrl,NULL); - return GetSelectRowCount() != 0 && GetView()->getController()->isDropAllowed(); -// Reference<XPropertySet> xTable = GetView()->getController()->getTable(); + return GetSelectRowCount() != 0 && GetView()->getController().isDropAllowed(); +// Reference<XPropertySet> xTable = GetView()->getController().getTable(); // if( !GetSelectRowCount() || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) // return sal_False; // // // Wenn nur Felder hinzugefuegt werden duerfen, Delete nur auf neuen Feldern -// Reference<XConnection> xCon = GetView()->getController()->getConnection(); +// Reference<XConnection> xCon = GetView()->getController().getConnection(); // Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : NULL; // // return !(xTable.is() && xTable->getPropertySetInfo()->getPropertyByName(PROPERTY_NAME).Attributes & PropertyAttribute::READONLY) || @@ -1490,10 +1490,10 @@ { DBG_CHKTHIS(OTableEditorCtrl,NULL); - sal_Bool bInsertNewAllowed = GetView()->getController()->isAddAllowed(); + sal_Bool bInsertNewAllowed = GetView()->getController().isAddAllowed(); ////////////////////////////////////////////////////////////// // Wenn nur Felder hinzugefuegt werden duerfen, Paste nur in neue Felder - if (bInsertNewAllowed && !GetView()->getController()->isDropAllowed()) + if (bInsertNewAllowed && !GetView()->getController().isDropAllowed()) { SetDataPtr(nRow); if( GetActRow()->IsReadOnly() ) @@ -1510,10 +1510,10 @@ if( !GetSelectRowCount() ) return sal_False; - OTableController* pController = GetView()->getController(); + OTableController& rController = GetView()->getController(); try { - Reference<XConnection> xCon = pController->getConnection(); + Reference<XConnection> xCon = rController.getConnection(); Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>(); if(!xMetaData.is() || !xMetaData->supportsCoreSQLGrammar()) @@ -1525,7 +1525,7 @@ OSL_ASSERT(!"supportsCoreSQLGrammar"); } - Reference<XPropertySet> xTable = pController->getTable(); + Reference<XPropertySet> xTable = rController.getTable(); ////////////////////////////////////////////////////////////// // Key darf nicht veraendert werden // Dies gilt jedoch nur, wenn die Tabelle nicht neu ist und keine ::com::sun::star::sdbcx::View. Ansonsten wird kein DROP ausgeführt @@ -1698,8 +1698,8 @@ { nPasteEvent = 0; - sal_Int32 nPastePosition = GetView()->getController()->getFirstEmptyRowPosition(); - if ( !GetView()->getController()->getTable().is() ) + sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition(); + if ( !GetView()->getController().getTable().is() ) nPastePosition = GetSelectRowCount() ? FirstSelectedRow() : GetCurRow(); if (!IsInsertNewAllowed(nPastePosition)) @@ -1736,8 +1736,8 @@ { DBG_CHKTHIS(OTableEditorCtrl,NULL); nInsNewRowsEvent = 0; - sal_Int32 nPastePosition = GetView()->getController()->getFirstEmptyRowPosition(); - if ( !GetView()->getController()->getTable().is() ) + sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition(); + if ( !GetView()->getController().getTable().is() ) nPastePosition = GetSelectRowCount() ? FirstSelectedRow() : m_nDataPos; InsertNewRows( nPastePosition ); @@ -1816,7 +1816,7 @@ ////////////////////////////////////////////////////////////////////// // Das ModifyFlag der TableDocSh setzen - GetView()->getController()->setModified( sal_True ); + GetView()->getController().setModified( sal_True ); InvalidateFeatures(); } @@ -1863,12 +1863,13 @@ if ( _pType.get() ) { sal_uInt16 nCurrentlySelected = pTypeCell->GetSelectEntryPos(); - OTableController* pController = GetView()->getController(); - if ((LISTBOX_ENTRY_NOTFOUND == nCurrentlySelected) || (pController->getTypeInfo(nCurrentlySelected) != _pType)) + if ( ( LISTBOX_ENTRY_NOTFOUND == nCurrentlySelected ) + || ( GetView()->getController().getTypeInfo( nCurrentlySelected ) != _pType ) + ) { USHORT nEntryPos = 0; - const OTypeInfoMap* pTypeInfo = GetView()->getController()->getTypeInfo(); + const OTypeInfoMap* pTypeInfo = GetView()->getController().getTypeInfo(); OTypeInfoMap::const_iterator aIter = pTypeInfo->begin(); for(;aIter != pTypeInfo->end();++aIter,++nEntryPos) { @@ -1886,7 +1887,7 @@ sal_Int32 nFormatKey = ::dbtools::getDefaultNumberFormat( pActFieldDescr->GetType(), pActFieldDescr->GetScale(), pActFieldDescr->IsCurrency(), - Reference< XNumberFormatTypes>(GetView()->getController()->getNumberFormatter()->getNumberFormatsSupplier()->getNumberFormats(),UNO_QUERY), + Reference< XNumberFormatTypes>(GetView()->getController().getNumberFormatter()->getNumberFormatsSupplier()->getNumberFormats(),UNO_QUERY), GetView()->getLocale()); pActFieldDescr->SetFormatKey(nFormatKey); File [changed]: TableController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableController.cxx?r1=1.120&r2=1.120.8.1 Delta lines: +3 -3 ------------------- --- TableController.cxx 2008-05-05 16:09:55+0000 1.120 +++ TableController.cxx 2008-05-29 11:27:01+0000 1.120.8.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableController.cxx,v $ - * $Revision: 1.120 $ + * $Revision: 1.120.8.1 $ * * This file is part of OpenOffice.org. * @@ -645,7 +645,7 @@ // ----------------------------------------------------------------------------- sal_Bool OTableController::Construct(Window* pParent) { - m_pView = new OTableDesignView(pParent,getORB(),this); + m_pView = new OTableDesignView( pParent, getORB(), *this ); OTableController_BASE::Construct(pParent); // m_pView->Construct(); // m_pView->Show(); File [changed]: TableDesignControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableDesignControl.cxx?r1=1.12&r2=1.12.30.1 Delta lines: +3 -3 ------------------- --- TableDesignControl.cxx 2008-04-10 16:40:47+0000 1.12 +++ TableDesignControl.cxx 2008-05-29 11:27:01+0000 1.12.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableDesignControl.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.30.1 $ * * This file is part of OpenOffice.org. * @@ -132,7 +132,7 @@ { ::com::sun::star::util::URL aUrl; aUrl.Complete =::rtl::OUString::createFromAscii(".uno:DSBEditDoc"); - GetView()->getController()->dispatch( aUrl,Sequence< PropertyValue >() ); + GetView()->getController().dispatch( aUrl,Sequence< PropertyValue >() ); } } EditBrowseBox::KeyInput(rEvt); File [changed]: TableDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableDesignView.cxx?r1=1.31&r2=1.31.30.1 Delta lines: +6 -8 ------------------- --- TableDesignView.cxx 2008-04-10 16:41:37+0000 1.31 +++ TableDesignView.cxx 2008-05-29 11:27:01+0000 1.31.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableDesignView.cxx,v $ - * $Revision: 1.31 $ + * $Revision: 1.31.30.1 $ * * This file is part of OpenOffice.org. * @@ -224,10 +224,10 @@ //------------------------------------------------------------------------------ OTableDesignView::OTableDesignView( Window* pParent, const Reference< XMultiServiceFactory >& _rxOrb, - OTableController* _pController + OTableController& _rController ) : - ODataView( pParent ,_pController,_rxOrb ) - ,m_pController( _pController ) + ODataView( pParent, _rController,_rxOrb ) + ,m_rController( _rController ) ,m_eChildFocus(NONE) { DBG_CTOR(OTableDesignView,NULL); @@ -254,8 +254,6 @@ ::std::auto_ptr<Window> aTemp(m_pWin); m_pWin = NULL; } - - m_pController = NULL; } // ----------------------------------------------------------------------------- @@ -285,7 +283,7 @@ //------------------------------------------------------------------------------ IMPL_LINK( OTableDesignView, SwitchHdl, Accelerator*, /*pAcc*/ ) { - if( getController()->isReadOnly() ) + if( getController().isReadOnly() ) return 0; if( GetDescWin()->HasChildPathFocus() ) File [changed]: TableFieldControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableFieldControl.cxx?r1=1.12&r2=1.12.30.1 Delta lines: +11 -11 --------------------- --- TableFieldControl.cxx 2008-04-10 16:41:56+0000 1.12 +++ TableFieldControl.cxx 2008-05-29 11:27:01+0000 1.12.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableFieldControl.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.30.1 $ * * This file is part of OpenOffice.org. * @@ -89,7 +89,7 @@ if( !bRead ) { // Die Spalten einer ::com::sun::star::sdbcx::View können nicht verändert werden - Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController()->getTable(); + Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController().getTable(); if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW")) bRead = sal_True; else @@ -128,17 +128,17 @@ // ----------------------------------------------------------------------------- void OTableFieldControl::SetModified(BOOL bModified) { - GetCtrl()->GetView()->getController()->setModified(bModified); + GetCtrl()->GetView()->getController().setModified(bModified); } // ----------------------------------------------------------------------------- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> OTableFieldControl::getConnection() { - return GetCtrl()->GetView()->getController()->getConnection(); + return GetCtrl()->GetView()->getController().getConnection(); } // ----------------------------------------------------------------------------- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> OTableFieldControl::getMetaData() { - Reference<XConnection> xCon = GetCtrl()->GetView()->getController()->getConnection(); + Reference<XConnection> xCon = GetCtrl()->GetView()->getController().getConnection(); if(!xCon.is()) return NULL; return xCon->getMetaData(); @@ -146,17 +146,17 @@ // ----------------------------------------------------------------------------- Reference< XNumberFormatter > OTableFieldControl::GetFormatter() const { - return GetCtrl()->GetView()->getController()->getNumberFormatter(); + return GetCtrl()->GetView()->getController().getNumberFormatter(); } // ----------------------------------------------------------------------------- TOTypeInfoSP OTableFieldControl::getTypeInfo(sal_Int32 _nPos) { - return GetCtrl()->GetView()->getController()->getTypeInfo(_nPos); + return GetCtrl()->GetView()->getController().getTypeInfo(_nPos); } // ----------------------------------------------------------------------------- const OTypeInfoMap* OTableFieldControl::getTypeInfo() const { - return const_cast<OTableFieldControl*>(this)->GetCtrl()->GetView()->getController()->getTypeInfo(); + return const_cast<OTableFieldControl*>(this)->GetCtrl()->GetView()->getController().getTypeInfo(); } // ----------------------------------------------------------------------------- Locale OTableFieldControl::GetLocale() const @@ -166,12 +166,12 @@ // ----------------------------------------------------------------------------- sal_Bool OTableFieldControl::isAutoIncrementValueEnabled() const { - return const_cast<OTableFieldControl*>(this)->GetCtrl()->GetView()->getController()->isAutoIncrementValueEnabled(); + return const_cast<OTableFieldControl*>(this)->GetCtrl()->GetView()->getController().isAutoIncrementValueEnabled(); } // ----------------------------------------------------------------------------- ::rtl::OUString OTableFieldControl::getAutoIncrementValue() const { - return const_cast<OTableFieldControl*>(this)->GetCtrl()->GetView()->getController()->getAutoIncrementValue(); + return const_cast<OTableFieldControl*>(this)->GetCtrl()->GetView()->getController().getAutoIncrementValue(); } // ----------------------------------------------------------------------------- File [changed]: TableUndo.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableUndo.cxx?r1=1.20&r2=1.20.30.1 Delta lines: +7 -7 ------------------- --- TableUndo.cxx 2008-04-10 16:43:43+0000 1.20 +++ TableUndo.cxx 2008-05-29 11:27:02+0000 1.20.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableUndo.cxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.20.30.1 $ * * This file is part of OpenOffice.org. * @@ -97,8 +97,8 @@ // Wenn erstes Undo zurueckgenommen wurde, ist Doc nicht modifiziert worden if( m_pTabDgnCtrl->m_nCurUndoActId == 0 ) { - m_pTabDgnCtrl->GetView()->getController()->setModified(sal_False); - m_pTabDgnCtrl->GetView()->getController()->InvalidateFeature(SID_SAVEDOC); + m_pTabDgnCtrl->GetView()->getController().setModified(sal_False); + m_pTabDgnCtrl->GetView()->getController().InvalidateFeature(SID_SAVEDOC); } } @@ -111,8 +111,8 @@ // Wenn Redo fuer erste Undo-Action, muss Modified-Flag wieder gesetzt werden if( m_pTabDgnCtrl->m_nCurUndoActId > 0 ) { - m_pTabDgnCtrl->GetView()->getController()->setModified(sal_True); - m_pTabDgnCtrl->GetView()->getController()->InvalidateFeature(SID_SAVEDOC); + m_pTabDgnCtrl->GetView()->getController().setModified(sal_True); + m_pTabDgnCtrl->GetView()->getController().InvalidateFeature(SID_SAVEDOC); } } //============================================================================== @@ -151,7 +151,7 @@ CellControllerRef xController = m_pTabDgnCtrl->Controller(); if ( xController.Is() ) xController->ClearModified(); - m_pTabDgnCtrl->GetView()->getController()->setModified(sal_False); + m_pTabDgnCtrl->GetView()->getController().setModified(sal_False); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
