[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - cui/source

[Katarina Behrens]

Rebased ref, commits from common ancestor:
commit d981691c56759d779d617d749f5b9f6a18ae8a8f
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Mon Oct 24 15:16:37 2016 +0200

    screenshot annotation: put back removed fields
    
    I hate you loplugin !!!
    
    Change-Id: I01067b04005a59b7ecb10a5a72ab6090b7f040a8

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index ca56d1f..5c58660 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -92,8 +92,11 @@ namespace
 class ControlDataEntry
 {
 public:
-    ControlDataEntry(const basegfx::B2IRange& rB2IRange)
-        : maB2IRange(rB2IRange)
+    ControlDataEntry(
+        const vcl::Window& rControl,
+        const basegfx::B2IRange& rB2IRange)
+        : mrControl(rControl),
+        maB2IRange(rB2IRange)
     {
     }
 
@@ -102,9 +105,15 @@ public:
         return maB2IRange;
     }
 
+    const vcl::Window& getControl() const
+    {
+        return mrControl;
+    }
+
     const OString GetHelpId() const { return mrControl.GetHelpId(); }
 
 private:
+    const vcl::Window&  mrControl;
     basegfx::B2IRange   maB2IRange;
 };
 
@@ -275,7 +284,7 @@ void ScreenshotAnnotationDlg_Impl::CollectChildren(
 
         if (!aCurrentRange.isEmpty())
         {
-            rControlDataCollection.push_back(ControlDataEntry(aCurrentRange));
+            rControlDataCollection.push_back(ControlDataEntry(rCurrent, aCurrentRange));
         }
 
         for (sal_uInt16 a(0); a < rCurrent.GetChildCount(); a++)