Kaydet (Commit) 80509950 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Eike Rathke

Resolves: tdf#100761 after insert note, focus cannot return to inputbar

suspected regression from.

commit 11d605cc
Date:   Mon Feb 1 18:39:51 2016 +0200

    tdf#84843 Stop using PseudoSlots for drawing slots

Change-Id: I64aba363f7562c6b16ae1d679968149fea1ba763
Reviewed-on: https://gerrit.libreoffice.org/26909Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: 's avatarEike Rathke <erack@redhat.com>
üst a2278241
......@@ -354,8 +354,7 @@ void ScTabView::DrawDeselectAll()
if (pDrawView)
{
ScTabViewShell* pViewSh = aViewData.GetViewShell();
if ( pDrawActual &&
( pViewSh->IsDrawTextShell() || pDrawActual->GetSlotID() == SID_DRAW_NOTEEDIT ) )
if (pDrawActual && pViewSh->IsDrawTextShell())
{
// end text edit (as if escape pressed, in FuDraw)
aViewData.GetDispatcher().Execute( pDrawActual->GetSlotID(),
......
......@@ -282,7 +282,7 @@ bool ScTabViewShell::PrepareClose(bool bUI)
// draw text edit mode must be closed
FuPoor* pPoor = GetDrawFuncPtr();
if ( pPoor && ( IsDrawTextShell() || pPoor->GetSlotID() == SID_DRAW_NOTEEDIT ) )
if (pPoor && IsDrawTextShell())
{
// "clean" end of text edit, including note handling, subshells and draw func switching,
// as in FuDraw and ScTabView::DrawDeselectAll
......
......@@ -503,11 +503,11 @@ void ScViewFunc::EditNote()
// activate object (as in FuSelection::TestComment)
GetViewData().GetDispatcher().Execute( SID_DRAW_NOTEEDIT, SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
// now get the created FuText and set into EditMode
FuPoor* pPoor = GetDrawFuncPtr();
if ( pPoor && (pPoor->GetSlotID() == SID_DRAW_NOTEEDIT) ) // has no RTTI
FuText* pFuText = dynamic_cast<FuText*>(GetDrawFuncPtr());
if (pFuText)
{
ScrollToObject( pCaption ); // make object fully visible
static_cast< FuText* >( pPoor )->SetInEditMode( pCaption );
pFuText->SetInEditMode( pCaption );
}
}
}
......
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