Kaydet (Commit) a92cea7e authored tarafından Michael Meeks's avatar Michael Meeks

Windows compilation fixes.

Change-Id: Id04ff9302893654ae1f62db9f5005517c90e5db2
üst 85b01322
...@@ -93,6 +93,7 @@ namespace sfx2 ...@@ -93,6 +93,7 @@ namespace sfx2
vcl::Window& i_rParentWindow, vcl::Window& i_rParentWindow,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame 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 /** determines whether a given module has any registered tool panels
*/ */
......
...@@ -84,6 +84,7 @@ class SVX_DLLPUBLIC FrameSelector : public Control ...@@ -84,6 +84,7 @@ class SVX_DLLPUBLIC FrameSelector : public Control
{ {
public: public:
FrameSelector(vcl::Window* pParent); FrameSelector(vcl::Window* pParent);
virtual ~FrameSelector();
/** Initializes the control, enables/disables frame borders according to flags. */ /** Initializes the control, enables/disables frame borders according to flags. */
void Initialize( FrameSelFlags nFlags ); void Initialize( FrameSelFlags nFlags );
......
...@@ -34,6 +34,7 @@ class SVX_DLLPUBLIC PopupContainer ...@@ -34,6 +34,7 @@ class SVX_DLLPUBLIC PopupContainer
{ {
public: public:
PopupContainer (vcl::Window* pParent); PopupContainer (vcl::Window* pParent);
virtual ~PopupContainer ();
virtual bool Notify (NotifyEvent& rNEvt) SAL_OVERRIDE; virtual bool Notify (NotifyEvent& rNEvt) SAL_OVERRIDE;
}; };
......
...@@ -709,6 +709,10 @@ namespace sfx2 ...@@ -709,6 +709,10 @@ namespace sfx2
{ {
} }
ModuleTaskPane::~ModuleTaskPane()
{
disposeOnce();
}
bool ModuleTaskPane::ModuleHasToolPanels( const Reference< XFrame >& i_rDocumentFrame ) bool ModuleTaskPane::ModuleHasToolPanels( const Reference< XFrame >& i_rDocumentFrame )
{ {
......
...@@ -515,7 +515,7 @@ namespace svt ...@@ -515,7 +515,7 @@ namespace svt
// this mode requires the NWF framework to be able to render those items onto a virtual // 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. // device. For some frameworks (some GTK themes, in particular), this is known to fail.
// So, be on the safe side for the moment. // 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 else
#endif #endif
if ( m_aRenderDevice->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) ) if ( m_aRenderDevice->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) )
......
...@@ -791,6 +791,11 @@ FrameSelector::FrameSelector(vcl::Window* pParent) ...@@ -791,6 +791,11 @@ FrameSelector::FrameSelector(vcl::Window* pParent)
EnableRTL( false ); // #107808# don't mirror the mouse handling 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 &) extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFrameSelector(vcl::Window *pParent, VclBuilder::stringmap &)
{ {
return new FrameSelector(pParent); return new FrameSelector(pParent);
......
...@@ -27,8 +27,10 @@ PopupContainer::PopupContainer (vcl::Window* pParent) ...@@ -27,8 +27,10 @@ PopupContainer::PopupContainer (vcl::Window* pParent)
{ {
} }
PopupContainer::~PopupContainer()
{
disposeOnce();
}
bool PopupContainer::Notify (NotifyEvent& rEvent) bool PopupContainer::Notify (NotifyEvent& rEvent)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment