1 files changed, 16 insertions, 12 deletions
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 1945557c2999..89cdc855a0cd 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -84,8 +84,9 @@ 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);
+    OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController();
+    rController.InvalidateFeature(SID_CUT);
+    rController.InvalidateFeature(SID_COPY);
 
     // Ist dies ein Cut, Copy, Paste Event?
     KeyFuncType aKeyFunc = rKEvt.GetKeyCode().GetFunction();
@@ -124,14 +125,15 @@ IMPL_LINK(OSqlEdit, OnUndoActionTimer, void*, EMPTYARG)
     String aText  =GetText();
     if(aText != m_strOrigText)
     {
-        SfxUndoManager* pUndoMgr = m_pView->getContainerWindow()->getDesignView()->getController().getUndoMgr();
+        OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController();
+        SfxUndoManager* pUndoMgr = rController.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);
+        rController.InvalidateFeature(SID_UNDO);
+        rController.InvalidateFeature(SID_REDO);
 
         m_strOrigText  =aText;
     }
@@ -141,8 +143,9 @@ 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);
+    OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController();
+    rController.InvalidateFeature(SID_CUT);
+    rController.InvalidateFeature(SID_COPY);
     if(!m_bStopTimer)
         m_timerInvalidate.Start();
     return 0L;
@@ -154,12 +157,13 @@ 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 );
+    OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController();
+    if (!rController.isModified())
+        rController.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);
+    rController.InvalidateFeature(SID_SBA_QRY_EXECUTE);
+    rController.InvalidateFeature(SID_CUT);
+    rController.InvalidateFeature(SID_COPY);
 
     m_lnkTextModifyHdl.Call(NULL);
     return 0;