From d030c4a2a54418b17e87f837092a33eae21f0588 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 17 Sep 2015 18:59:32 +0100 Subject: revert for mac and win unit case crashes after boost->std Change-Id: I82c7084f203a834c2d42f9527705288e6036019b --- sd/source/ui/view/MediaObjectBar.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sd/source/ui/view/MediaObjectBar.cxx') diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index 7c191ae057c7..64d7884823ff 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -39,7 +39,7 @@ #include "drawview.hxx" #include "sdresid.hxx" #include "drawdoc.hxx" -#include +#include using namespace sd; @@ -86,7 +86,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet ) { if( SID_AVMEDIA_TOOLBOX == nWhich ) { - std::unique_ptr pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() )); + boost::scoped_ptr pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() )); bool bDisable = true; if( 1 == pMarkList->GetMarkCount() ) @@ -123,7 +123,7 @@ void MediaObjectBar::Execute( SfxRequest& rReq ) if( pItem ) { - std::unique_ptr pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() )); + boost::scoped_ptr pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() )); if( 1 == pMarkList->GetMarkCount() ) { -- cgit