diff options
Diffstat (limited to 'extensions/source/propctrlr/propcontroller.cxx')
| -rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 77b518878526..dc85415a63fa 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -44,6 +44,7 @@ #include <comphelper/property.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/tabpage.hxx> #include <osl/mutex.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/component_context.hxx> @@ -374,7 +375,7 @@ namespace pcr // announcement is responsible for calling setComponent, too. Reference< XWindow > xContainerWindow = m_xFrame->getContainerWindow(); VCLXWindow* pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow); - vcl::Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL; + VclPtr<vcl::Window> pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : VclPtr<vcl::Window>(); if (!pParentWin) throw RuntimeException("The frame is invalid. Unable to extract the container window.",*this); @@ -702,7 +703,7 @@ namespace pcr DBG_ASSERT(!haveView(), "OPropertyBrowserController::Construct: already have a view!"); DBG_ASSERT(_pParentWin, "OPropertyBrowserController::Construct: invalid parent window!"); - m_pView = new OPropertyBrowserView(_pParentWin); + m_pView = VclPtr<OPropertyBrowserView>::Create(_pParentWin); m_pView->setPageActivationHandler(LINK(this, OPropertyBrowserController, OnPageActivation)); // add as dispose listener for our view. The view is disposed by the frame we're plugged into, |