INTEGRATION: CWS dba30d (1.11.30); FILE MERGED

2008/05/29 11:27:49 fs 1.11.30.1: during #i80943#: refactoring: IController now passed around as reference, not as pointer

dbaccess/source/ui/control/sqledit.cxx

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sqledit.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -90,8 +90,8 @@ OSqlEdit::~OSqlEdit()
 void OSqlEdit::KeyInput( const KeyEvent& rKEvt )
 {
     DBG_CHKTHIS(OSqlEdit,NULL);
-    m_pView->getContainerWindow()->getDesignView()->getController()->InvalidateFeature(SID_CUT);
-    m_pView->getContainerWindow()->getDesignView()->getController()->InvalidateFeature(SID_COPY);
+    m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_CUT);
+    m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_COPY);
 
     // Ist dies ein Cut, Copy, Paste Event?
     KeyFuncType aKeyFunc = rKEvt.GetKeyCode().GetFunction();
@@ -130,14 +130,14 @@ IMPL_LINK(OSqlEdit, OnUndoActionTimer, void*, EMPTYARG)
     String aText  =GetText();
     if(aText != m_strOrigText)
     {
-        SfxUndoManager* pUndoMgr = m_pView->getContainerWindow()->getDesignView()->getController()->getUndoMgr();
+        SfxUndoManager* pUndoMgr = m_pView->getContainerWindow()->getDesignView()->getController().getUndoMgr();
         OSqlEditUndoAct* pUndoAct = new OSqlEditUndoAct( this );
 
         pUndoAct->SetOriginalText( m_strOrigText );
         pUndoMgr->AddUndoAction( pUndoAct );
 
-        m_pView->getContainerWindow()->getDesignView()->getController()->InvalidateFeature(SID_UNDO);
-        m_pView->getContainerWindow()->getDesignView()->getController()->InvalidateFeature(SID_REDO);
+        m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_UNDO);
+        m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_REDO);
 
         m_strOrigText  =aText;
     }
@@ -147,8 +147,8 @@ IMPL_LINK(OSqlEdit, OnUndoActionTimer, void*, EMPTYARG)
 //------------------------------------------------------------------------------
 IMPL_LINK(OSqlEdit, OnInvalidateTimer, void*, EMPTYARG)
 {
-    m_pView->getContainerWindow()->getDesignView()->getController()->InvalidateFeature(SID_CUT);
-    m_pView->getContainerWindow()->getDesignView()->getController()->InvalidateFeature(SID_COPY);
+    m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_CUT);
+    m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_COPY);
     if(!m_bStopTimer)
         m_timerInvalidate.Start();
     return 0L;
@@ -160,12 +160,12 @@ IMPL_LINK(OSqlEdit, ModifyHdl, void*, /*EMPTYTAG*/)
         m_timerUndoActionCreation.Stop();
     m_timerUndoActionCreation.Start();
 
-    if (!m_pView->getContainerWindow()->getDesignView()->getController()->isModified())
-        m_pView->getContainerWindow()->getDesignView()->getController()->setModified( sal_True );
+    if (!m_pView->getContainerWindow()->getDesignView()->getController().isModified())
+        m_pView->getContainerWindow()->getDesignView()->getController().setModified( sal_True );
 
-    m_pView->getContainerWindow()->getDesignView()->getController()->InvalidateFeature(SID_SBA_QRY_EXECUTE);
-    m_pView->getContainerWindow()->getDesignView()->getController()->InvalidateFeature(SID_CUT);
-    m_pView->getContainerWindow()->getDesignView()->getController()->InvalidateFeature(SID_COPY);
+    m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_SBA_QRY_EXECUTE);
+    m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_CUT);
+    m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_COPY);
 
     m_lnkTextModifyHdl.Call(NULL);
     return 0;