From 22b80ac8e213ff63ce4f60e7d491f12cb42db313 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 14 Sep 2015 09:21:33 +0100 Subject: boost->std MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c Reviewed-on: https://gerrit.libreoffice.org/18564 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sfx2/source/sidebar/SidebarController.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 7d68b37b2348..08279d741c23 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -885,7 +885,7 @@ void SidebarController::ShowPopupMenu ( const Rectangle& rButtonBox, const ::std::vector& rMenuData) const { - ::boost::shared_ptr pMenu = CreatePopupMenu(rMenuData); + std::shared_ptr pMenu = CreatePopupMenu(rMenuData); pMenu->SetSelectHdl(LINK(const_cast(this), SidebarController, OnMenuItemSelected)); // pass toolbox button rect so the menu can stay open on button up @@ -894,11 +894,11 @@ void SidebarController::ShowPopupMenu ( pMenu->Execute(mpParentWindow, aBox, PopupMenuFlags::ExecuteDown); } -::boost::shared_ptr SidebarController::CreatePopupMenu ( +std::shared_ptr SidebarController::CreatePopupMenu ( const ::std::vector& rMenuData) const { // Create the top level popup menu. - ::boost::shared_ptr pMenu (new PopupMenu()); + std::shared_ptr pMenu (new PopupMenu()); FloatingWindow* pMenuWindow = dynamic_cast(pMenu->GetWindow()); if (pMenuWindow != NULL) { -- cgit