[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sc/source

[Marco Cecchetti]

 sc/source/ui/drawfunc/futext3.cxx |    5 +++++
 sc/source/ui/view/viewfun6.cxx    |    1 +
 2 files changed, 6 insertions(+)

New commits:
commit d7fde891671ce68dee663af5f9664c20dbc5c828
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Wed Oct 19 22:08:06 2016 +0200

    LOK: Calc: notes: on edit mode starts/ends: missing tiles invalidation
    
    On edit mode starts/ends, when a note is hidden, tiles, only the note
    tail belongs to, are not invalidated.
    
    Change-Id: I69487f428a121fc05da99d3b06786afd4f834766
    Reviewed-on: https://gerrit.libreoffice.org/30094
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>

diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index b5837e7..11fa3a4 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -120,6 +120,11 @@ void FuText::StopEditMode(bool /*bTextDirection*/)
 
     if( pNote )
     {
+        pViewShell->OnLOKNoteStateChanged(aNotePos);
+    }
+
+    if( pNote )
+    {
         // hide the caption object if it is in hidden state
         pNote->ShowCaptionTemp( aNotePos, false );
 
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 07bffd2..d5513cf 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -509,6 +509,7 @@ void ScViewFunc::EditNote()
             {
                 ScrollToObject( pCaption );         // make object fully visible
                 static_cast< FuText* >( pPoor )->SetInEditMode( pCaption );
+                GetViewData().GetViewShell()->OnLOKNoteStateChanged(aPos);
             }
         }
     }