Kaydet (Commit) 416435e1 authored tarafından Ocke Janssen [oj]'s avatar Ocke Janssen [oj] Kaydeden (comit) Thorsten Behrens

impress210: check readonly

# HG changeset patch
# User Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
# Date 1299656309 -3600
# Node ID de61efa884c2a12ae9e88e9919c297b1b9676443
# Parent  c65bb4f46738b43bd506f1a75b634c6bd6fb6bfe

impress210: chekc readonly
üst dc7d25dd
...@@ -638,9 +638,24 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) ...@@ -638,9 +638,24 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); 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->MouseButtonUp(rMEvt, mpWindow)) || rMEvt.GetClicks() == 2 )
{
if ( mpView && mpView->GetTextEditOutlinerView() )
mpView->GetTextEditOutlinerView()->SetReadOnly(bOldReadOnly);
return (sal_True); // Event von der SdrView ausgewertet return (sal_True); // Event von der SdrView ausgewertet
}
if ( mpView && mpView->GetTextEditOutlinerView() )
mpView->GetTextEditOutlinerView()->SetReadOnly(bOldReadOnly);
sal_Bool bEmptyTextObj = sal_False; sal_Bool bEmptyTextObj = sal_False;
......
...@@ -184,6 +184,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq) ...@@ -184,6 +184,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
} }
} }
GetParentWindow()->GrabFocus();
if( pPickObj ) if( pPickObj )
mpView->ReplaceObjectAtView(pPickObj, *pPV, pObj, sal_True ); mpView->ReplaceObjectAtView(pPickObj, *pPV, pObj, sal_True );
else else
...@@ -191,6 +192,10 @@ void DrawViewShell::FuTable(SfxRequest& rReq) ...@@ -191,6 +192,10 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
Invalidate(SID_DRAWTBX_INSERT); Invalidate(SID_DRAWTBX_INSERT);
rReq.Ignore(); rReq.Ignore();
SfxViewShell* pViewShell = GetViewShell();
OSL_ASSERT (pViewShell!=NULL);
SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings();
rBindings.Invalidate( SID_INSERT_TABLE, sal_True, sal_False );
break; break;
} }
case SID_TABLEDESIGN: case SID_TABLEDESIGN:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment