tdf#164529 support annotation selection with edit (trigger pop-up)

In some instances we want to select the annotation and edit them
at the same time - trigger pop-up. This change adds back support
for that.

Also properly close the pop-ups when the view shell and window
are destroyed.

Change-Id: I17abeb39a7500001b148b8923eb9028d297a40a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179664
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/include/svx/annotation/ObjectAnnotationData.hxx b/include/svx/annotation/ObjectAnnotationData.hxx
index f7dc220d789d..bedbb1a0da29 100644
--- a/include/svx/annotation/ObjectAnnotationData.hxx
+++ b/include/svx/annotation/ObjectAnnotationData.hxx
@@ -19,6 +19,8 @@ namespace sdr::annotation
 class ObjectAnnotationData
 {
 public:
+    ~ObjectAnnotationData() { closePopup(); }
+
     /// The annotation
     rtl::Reference<sdr::annotation::Annotation> mxAnnotation;
 
@@ -31,6 +33,13 @@ public:
         if (mpAnnotationPopup)
             mpAnnotationPopup->openPopup();
     }
+
+    /// Close popup for the annotation
+    void closePopup()
+    {
+        if (mpAnnotationPopup)
+            mpAnnotationPopup->closePopup();
+    }
 };
 }