summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-04-17 21:23:04 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-04-17 21:23:04 +0100
commita92cea7e6c07f4f122addd324f6f25616443f3ed (patch)
tree60827356a79f2319bb2e8cd9d477bc6b6bc85927
parent85b01322b6384ae13818c22659b99bfcc94e06fe (diff)
Windows compilation fixes.
Change-Id: Id04ff9302893654ae1f62db9f5005517c90e5db2
-rw-r--r--include/sfx2/taskpane.hxx1
-rw-r--r--include/svx/frmsel.hxx1
-rw-r--r--include/svx/sidebar/PopupContainer.hxx1
-rw-r--r--sfx2/source/dialog/taskpane.cxx4
-rw-r--r--svtools/source/toolpanel/paneltabbar.cxx2
-rw-r--r--svx/source/dialog/frmsel.cxx5
-rw-r--r--svx/source/sidebar/tools/PopupContainer.cxx6
7 files changed, 17 insertions, 3 deletions
diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx
index 9768716adb51..21556961e85f 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 61b361503e99..391bff150b4c 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 ff3c40881977..cf920a7e982d 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 e782af1cd985..a032f1569690 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 8f3ef5bd8fc0..22fa770eedca 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 8e937fca5906..5897a876200f 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 f869c160af75..efb478dfa764 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)
{