diff options
Diffstat (limited to 'svx/source/sidebar/tools/Popup.cxx')
-rw-r--r-- | svx/source/sidebar/tools/Popup.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index 8647fb398b16..c1a04c3bc177 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -36,7 +36,7 @@ Popup::Popup ( msAccessibleName(rsAccessibleName), mxContainer() { - OSL_ASSERT(mpParent!=NULL); + OSL_ASSERT(mpParent!=nullptr); OSL_ASSERT(maControlCreator); } @@ -94,8 +94,8 @@ void Popup::SetPopupModeEndHandler (const ::boost::function<void()>& rCallback) void Popup::ProvideContainerAndControl() { if ( ! (mxContainer && mxControl) - && mpParent!=NULL - && maControlCreator) + && mpParent != nullptr + && maControlCreator) { CreateContainerAndControl(); } @@ -103,7 +103,7 @@ void Popup::ProvideContainerAndControl() void Popup::CreateContainerAndControl() { - mxContainer.reset(new PopupContainer(mpParent)); + mxContainer.reset(VclPtr<PopupContainer>::Create(mpParent)); mxContainer->SetAccessibleName(msAccessibleName); mxContainer->SetPopupModeEndHdl(LINK(this, Popup, PopupModeEndHandler)); mxContainer->SetBorderStyle(mxContainer->GetBorderStyle() | WindowBorderStyle::MENU); |