impress: fix typing issue after comment save

- after saving a comment, editing was not possible in a textbox until the comment was deleted.
- textboxes are now editable.

Signed-off-by: Bayram Çiçek <bayram.cicek@collabora.com>
Change-Id: I989a18f34b0fb40c5ca46b1d9556298a89bc745e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193436
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194948
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

sd/source/ui/annotations/annotationmanager.cxx

@@ -312,6 +312,12 @@ void AnnotationManagerImpl::ShowAnnotations( bool bShow )
     }
 }
 
+bool AnnotationManagerImpl::isVisibleAnnotations()
+{
+    return (!comphelper::LibreOfficeKit::isActive()
+            || comphelper::LibreOfficeKit::isTiledAnnotations());
+}
+
 void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest const & rReq )
 {
     switch( rReq.GetSlot() )
@@ -342,7 +348,7 @@ void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest const & rReq )
 
 void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest const & rReq)
 {
-    if (!comphelper::LibreOfficeKit::isActive() || comphelper::LibreOfficeKit::isTiledAnnotations())
+    if (isVisibleAnnotations())
         ShowAnnotations(true);
 
     const SfxItemSet* pArgs = rReq.GetArgs();
@@ -563,7 +569,7 @@ void AnnotationManagerImpl::InsertAnnotation(const OUString& rText)
     LOKCommentNotifyAll(sdr::annotation::CommentNotificationType::Add, *xAnnotation);
 
     UpdateTags(true);
-    SelectAnnotation(xAnnotation, true);
+    SelectAnnotation(xAnnotation, isVisibleAnnotations());
 }
 
 void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest const & rReq )
@@ -668,7 +674,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest const & rReq )
         mpDoc->EndUndo();
 
     UpdateTags(true);
-    SelectAnnotation( xAnnotation, true );
+    SelectAnnotation( xAnnotation, isVisibleAnnotations() );
 }
 
 void AnnotationManagerImpl::DeleteAnnotation(rtl::Reference<sdr::annotation::Annotation> const& xAnnotation )

sd/source/ui/annotations/annotationmanagerimpl.hxx

@@ -103,6 +103,7 @@ public:
     SdPage* GetCurrentPage();
 
     void ShowAnnotations(bool bShow);
+    static bool isVisibleAnnotations();
 
 private:
     ViewShellBase& mrBase;