[Libreoffice-commits] .: Branch 'feature/rb15' - sd/source

[Libreoffice Gerrit user]

 sd/source/ui/func/futext.cxx         |   15 ---------------
 sd/source/ui/table/tablefunction.cxx |    5 -----
 2 files changed, 20 deletions(-)

New commits:
commit 047adef5efbc23d73922df5d864478ab3b89982d
Author: Michael Meeks <michael.me...@suse.com>
Date:   Tue Nov 27 15:39:41 2012 +0000

    Revert "impress210: check readonly"
    
    This reverts commit 416435e1dcbc175787a5a9e03142f7f766b6a648.

diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 99ce662..d187e01 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -639,24 +639,9 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
     mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
 
     Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
-    sal_Bool bOldReadOnly = sal_False;
-    if ( mpView && mpDocSh->IsReadOnly() )
-    {
-        if ( mpView &&  mpView->GetTextEditOutlinerView() )
-        {
-            bOldReadOnly = mpView->GetTextEditOutlinerView()->IsReadOnly();
-            mpView->GetTextEditOutlinerView()->SetReadOnly(sal_True);
-        }
-    }
 
     if( (mpView && mpView->MouseButtonUp(rMEvt, mpWindow)) || 
rMEvt.GetClicks() == 2 )
-    {
-        if ( mpView &&  mpView->GetTextEditOutlinerView() )
-            mpView->GetTextEditOutlinerView()->SetReadOnly(bOldReadOnly);
         return (sal_True); // Event von der SdrView ausgewertet
-    }
-    if ( mpView &&  mpView->GetTextEditOutlinerView() )
-        mpView->GetTextEditOutlinerView()->SetReadOnly(bOldReadOnly);
 
     sal_Bool bEmptyTextObj = sal_False;
 
diff --git a/sd/source/ui/table/tablefunction.cxx 
b/sd/source/ui/table/tablefunction.cxx
index 0e11eaa..28cafc6 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -182,7 +182,6 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
             }
         }
 
-        GetParentWindow()->GrabFocus();
         if( pPickObj )
             mpView->ReplaceObjectAtView(pPickObj, *pPV, pObj, sal_True );
         else
@@ -190,10 +189,6 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
 
         Invalidate(SID_DRAWTBX_INSERT);
         rReq.Ignore();
-        SfxViewShell* pViewShell = GetViewShell();
-        OSL_ASSERT (pViewShell!=NULL);
-        SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings();
-        rBindings.Invalidate( SID_INSERT_TABLE, sal_True, sal_False );
         break;
     }
     case SID_TABLEDESIGN:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits