diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
| commit | d030c4a2a54418b17e87f837092a33eae21f0588 (patch) | |
| tree | dd80ff3ba78eaa03e98efeb87e9160c6cd7524c5 /sd/source/ui/view/MediaObjectBar.cxx | |
| parent | 558b08d55f69b04eea42a37abd97fbb4dbe3602f (diff) | |
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sd/source/ui/view/MediaObjectBar.cxx')
| -rw-r--r-- | sd/source/ui/view/MediaObjectBar.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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 <memory> +#include <boost/scoped_ptr.hpp> using namespace sd; @@ -86,7 +86,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet ) { if( SID_AVMEDIA_TOOLBOX == nWhich ) { - std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() )); + boost::scoped_ptr<SdrMarkList> 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<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() )); + boost::scoped_ptr<SdrMarkList> pMarkList(new SdrMarkList( mpView->GetMarkedObjectList() )); if( 1 == pMarkList->GetMarkCount() ) { |