vclwidget: convert lots more sites to use VclPtr

seems there was a lot of shared_ptr usage floating around...

Change-Id: Icd05243170eb8493709275fc36bf986fc194b781

4 files changed, 12 insertions, 6 deletions

diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 001576a732df..c8408c0eb249 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -390,6 +390,7 @@ namespace pcr
         Clear();
         m_aLinesPlayground.disposeAndClear();
         m_aVScroll.disposeAndClear();
+        m_pHelpWindow.disposeAndClear();
         Control::dispose();
     }
 
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index a1ea45939fe6..b40f45aa9c09 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -95,8 +95,7 @@ namespace pcr
     protected:
         VclPtr<Window>              m_aLinesPlayground;
         VclPtr<ScrollBar>           m_aVScroll;
-        ::std::unique_ptr< InspectorHelpWindow >
-                                    m_pHelpWindow;
+        VclPtr<InspectorHelpWindow> m_pHelpWindow;
         ListBoxLines                m_aLines;
         IPropertyLineListener*      m_pLineListener;
         IPropertyControlObserver*   m_pControlObserver;
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 91ed73b2b460..fc7b2293906e 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -216,6 +216,12 @@ namespace pcr
         m_pMasterLabel.clear();
         m_pOK.clear();
         m_pSuggest.clear();
+
+        m_aRow1.disposeAndClear();
+        m_aRow2.disposeAndClear();
+        m_aRow3.disposeAndClear();
+        m_aRow4.disposeAndClear();
+
         ModalDialog::dispose();
     }
 
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 7f563a2dafaf..e1c250eb0f48 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -47,10 +47,10 @@ namespace pcr
         VclPtr<FixedText>                      m_pExplanation;
         VclPtr<FixedText>                      m_pDetailLabel;
         VclPtr<FixedText>                      m_pMasterLabel;
-        ::std::unique_ptr< FieldLinkRow > m_aRow1;
-        ::std::unique_ptr< FieldLinkRow > m_aRow2;
-        ::std::unique_ptr< FieldLinkRow > m_aRow3;
-        ::std::unique_ptr< FieldLinkRow > m_aRow4;
+        VclPtr<FieldLinkRow>                   m_aRow1;
+        VclPtr<FieldLinkRow>                   m_aRow2;
+        VclPtr<FieldLinkRow>                   m_aRow3;
+        VclPtr<FieldLinkRow>                   m_aRow4;
         VclPtr<OKButton>                       m_pOK;
         VclPtr<PushButton>                     m_pSuggest;