summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-14 09:21:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-14 12:54:25 +0000
commit22b80ac8e213ff63ce4f60e7d491f12cb42db313 (patch)
treeb00f1ed362747a05d79686a8709c3408cfdee59b /sfx2
parentd8026ad65c8d50868f0f2fc0d2bd95820cddea83 (diff)
boost->std
Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c Reviewed-on: https://gerrit.libreoffice.org/18564 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx6
1 files changed, 3 insertions, 3 deletions
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<TabBar::DeckMenuData>& rMenuData) const
{
- ::boost::shared_ptr<PopupMenu> pMenu = CreatePopupMenu(rMenuData);
+ std::shared_ptr<PopupMenu> pMenu = CreatePopupMenu(rMenuData);
pMenu->SetSelectHdl(LINK(const_cast<SidebarController*>(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<PopupMenu> SidebarController::CreatePopupMenu (
+std::shared_ptr<PopupMenu> SidebarController::CreatePopupMenu (
const ::std::vector<TabBar::DeckMenuData>& rMenuData) const
{
// Create the top level popup menu.
- ::boost::shared_ptr<PopupMenu> pMenu (new PopupMenu());
+ std::shared_ptr<PopupMenu> pMenu (new PopupMenu());
FloatingWindow* pMenuWindow = dynamic_cast<FloatingWindow*>(pMenu->GetWindow());
if (pMenuWindow != NULL)
{