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 /sc/source/ui/view/tabvwsh3.cxx | |
| parent | silence warning when not a warning (diff) | |
| download | core-d030c4a2a54418b17e87f837092a33eae21f0588.tar.gz core-d030c4a2a54418b17e87f837092a33eae21f0588.zip | |
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sc/source/ui/view/tabvwsh3.cxx')
| -rw-r--r-- | sc/source/ui/view/tabvwsh3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 569f578cbdb9..436f569414ed 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -67,7 +67,7 @@ #include <comphelper/string.hxx> #include "scabstdlg.hxx" -#include <memory> +#include <boost/scoped_ptr.hpp> static sal_uInt16 lcl_ParseRange(ScRange& rScRange, const OUString& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */) { @@ -659,7 +659,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM ); - std::unique_ptr<AbstractSvxZoomDialog> pDlg; + boost::scoped_ptr<AbstractSvxZoomDialog> pDlg; ScMarkData& rMark = GetViewData().GetMarkData(); SvxZoomEnableFlags nBtnFlags = SvxZoomEnableFlags::N50 | SvxZoomEnableFlags::N75 @@ -802,7 +802,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - std::unique_ptr<AbstractScShowTabDlg> pDlg(pFact->CreateScShowTabDlg(GetDialogParent())); + boost::scoped_ptr<AbstractScShowTabDlg> pDlg(pFact->CreateScShowTabDlg(GetDialogParent())); OSL_ENSURE(pDlg, "Dialog create fail!"); pDlg->SetDescription( OUString( ScResId( STR_DLG_SELECTTABLES_TITLE ) ), |