wrap vcl::window* pointer members in VclPtr, tdf#97344 follow-up

Trying to satisfy loplugin:vclwidgets

sc/source/ui/inc/checklistmenu.hxx:199:28: error: OutputDevice subclass 'ScCheckListMenuWindow *' declared as a pointer member, should be wrapped in VclPtr [loplugin:vclwidgets]
    ScCheckListMenuWindow* mpMenuWindow;
    ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~
sc/source/ui/inc/checklistmenu.hxx:200:21: error: OutputDevice subclass 'ControlToPosMap' (aka 'unordered_map<vcl::Window *, size_t>') declared as a pointer member, should be wrapped in VclPtr [loplugin:vclwidgets]
    ControlToPosMap maControlToPos;
    ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~
sc/source/ui/inc/checklistmenu.hxx:201:31: error: OutputDevice subclass 'std::vector<vcl::Window *>' declared as a pointer member, should be wrapped in VclPtr [loplugin:vclwidgets]
    std::vector<vcl::Window*> maControls;
    ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~

Change-Id: I47ba432fd76899681ec0afd852c71b584629eeb9

sc/source/ui/cctrl/checklistmenu.cxx

@@ -916,6 +916,7 @@ ScCheckListMenuWindow::~ScCheckListMenuWindow()
 
 void ScCheckListMenuWindow::dispose()
 {
+    maTabStops.clear();
     maEdSearch.disposeAndClear();
     maChecks.disposeAndClear();
     maChkToggleAll.disposeAndClear();
@@ -923,7 +924,6 @@ void ScCheckListMenuWindow::dispose()
     maBtnUnselectSingle.disposeAndClear();
     maBtnOk.disposeAndClear();
     maBtnCancel.disposeAndClear();
-    maTabStops.clear();
     ScMenuFloatingWindow::dispose();
 }
 

sc/source/ui/inc/checklistmenu.hxx

@@ -192,13 +192,22 @@ private:
 
 class ScCheckListMenuWindow;
 
+template <class T> struct VclPtr_hash;
+template <> struct VclPtr_hash< VclPtr<vcl::Window> >
+{
+    size_t operator()( const VclPtr<vcl::Window>& r ) const
+    {
+        return reinterpret_cast<size_t>(r.get());
+    }
+};
+
 class ScTabStops
 {
 private:
-    typedef std::unordered_map<vcl::Window*, size_t> ControlToPosMap;
-    ScCheckListMenuWindow* mpMenuWindow;
+    typedef std::unordered_map< VclPtr<vcl::Window>, size_t, VclPtr_hash<VclPtr<vcl::Window>> > ControlToPosMap;
+    VclPtr<ScCheckListMenuWindow> mpMenuWindow;
     ControlToPosMap maControlToPos;
-    std::vector<vcl::Window*> maControls;
+    std::vector<VclPtr<vcl::Window>> maControls;
     size_t mnCurTabStop;
 public:
     ScTabStops( ScCheckListMenuWindow* mpMenuWin );