[Libreoffice-commits] core.git: Branch 'feature/vclptr' - include/sfx2 include/svx sfx2/source svtools/source svx/source

[Michael Meeks]

 include/sfx2/taskpane.hxx                   |    1 +
 include/svx/frmsel.hxx                      |    1 +
 include/svx/sidebar/PopupContainer.hxx      |    1 +
 sfx2/source/dialog/taskpane.cxx             |    4 ++++
 svtools/source/toolpanel/paneltabbar.cxx    |    2 +-
 svx/source/dialog/frmsel.cxx                |    5 +++++
 svx/source/sidebar/tools/PopupContainer.cxx |    6 ++++--
 7 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit a92cea7e6c07f4f122addd324f6f25616443f3ed
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Apr 17 21:23:04 2015 +0100

    Windows compilation fixes.
    
    Change-Id: Id04ff9302893654ae1f62db9f5005517c90e5db2

diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx
index 9768716..2155696 100644
--- a/include/sfx2/taskpane.hxx
+++ b/include/sfx2/taskpane.hxx
@@ -93,6 +93,7 @@ namespace sfx2
             vcl::Window& i_rParentWindow,
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame
         );
+        virtual ~ModuleTaskPane();
 
         /** determines whether a given module has any registered tool panels
         */
diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx
index 61b3615..391bff1 100644
--- a/include/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
@@ -84,6 +84,7 @@ class SVX_DLLPUBLIC FrameSelector : public Control
 {
 public:
     FrameSelector(vcl::Window* pParent);
+    virtual ~FrameSelector();
 
     /** Initializes the control, enables/disables frame borders according to flags. */
     void                Initialize( FrameSelFlags nFlags );
diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx
index ff3c408..cf920a7 100644
--- a/include/svx/sidebar/PopupContainer.hxx
+++ b/include/svx/sidebar/PopupContainer.hxx
@@ -34,6 +34,7 @@ class SVX_DLLPUBLIC PopupContainer
 {
 public:
     PopupContainer (vcl::Window* pParent);
+    virtual ~PopupContainer ();
 
     virtual bool Notify (NotifyEvent& rNEvt) SAL_OVERRIDE;
 };
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index e782af1..a032f15 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -709,6 +709,10 @@ namespace sfx2
     {
     }
 
+    ModuleTaskPane::~ModuleTaskPane()
+    {
+        disposeOnce();
+    }
 
     bool ModuleTaskPane::ModuleHasToolPanels( const Reference< XFrame >& i_rDocumentFrame )
     {
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 8f3ef5b..22fa770 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -515,7 +515,7 @@ namespace svt
             // this mode requires the NWF framework to be able to render those items onto a virtual
             // device. For some frameworks (some GTK themes, in particular), this is known to fail.
             // So, be on the safe side for the moment.
-            m_pRenderer.reset( new NWFTabItemRenderer( m_aRenderDevice ) );
+            m_pRenderer.reset( new NWFTabItemRenderer( *m_aRenderDevice.get() ) );
         else
 #endif
         if ( m_aRenderDevice->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) )
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 8e937fc..5897a87 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -791,6 +791,11 @@ FrameSelector::FrameSelector(vcl::Window* pParent)
     EnableRTL( false ); // #107808# don't mirror the mouse handling
 }
 
+FrameSelector::~FrameSelector()
+{
+    disposeOnce();
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFrameSelector(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new FrameSelector(pParent);
diff --git a/svx/source/sidebar/tools/PopupContainer.cxx b/svx/source/sidebar/tools/PopupContainer.cxx
index f869c16..efb478d 100644
--- a/svx/source/sidebar/tools/PopupContainer.cxx
+++ b/svx/source/sidebar/tools/PopupContainer.cxx
@@ -27,8 +27,10 @@ PopupContainer::PopupContainer (vcl::Window* pParent)
 {
 }
 
-
-
+PopupContainer::~PopupContainer()
+{
+    disposeOnce();
+}
 
 bool PopupContainer::Notify (NotifyEvent& rEvent)
 {