summaryrefslogtreecommitdiff
path: root/sc/source/ui/pagedlg
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-17 18:59:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-17 18:59:32 +0100
commitd030c4a2a54418b17e87f837092a33eae21f0588 (patch)
treedd80ff3ba78eaa03e98efeb87e9160c6cd7524c5 /sc/source/ui/pagedlg
parent558b08d55f69b04eea42a37abd97fbb4dbe3602f (diff)
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sc/source/ui/pagedlg')
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx12
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx4
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx4
3 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index b043dc4ba9cd..ccd9167799ad 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -47,7 +47,7 @@
#include "AccessibleEditObject.hxx"
#include "scuitphfedit.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
// STATIC DATA -----------------------------------------------------------
@@ -327,9 +327,9 @@ void ScHFEditPage::SetSelectDefinedList()
// default to customized
ScHFEntryId eSelectEntry = eEntryCount;
- std::unique_ptr< EditTextObject > pLeftObj;
- std::unique_ptr< EditTextObject > pCenterObj;
- std::unique_ptr< EditTextObject > pRightObj;
+ boost::scoped_ptr< EditTextObject > pLeftObj;
+ boost::scoped_ptr< EditTextObject > pCenterObj;
+ boost::scoped_ptr< EditTextObject > pRightObj;
OUString aLeftEntry;
OUString aCenterEntry;
@@ -524,7 +524,7 @@ bool ScHFEditPage::IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj)
{
aSel.nStartPos = aSel.nEndPos;
aSel.nEndPos++;
- std::unique_ptr< EditTextObject > pPageObj;
+ boost::scoped_ptr< EditTextObject > pPageObj;
pPageObj.reset(pEngine->CreateTextObject(aSel));
if(pPageObj.get() && pPageObj->IsFieldObject() )
{
@@ -582,7 +582,7 @@ bool ScHFEditPage::IsExtFileNameEntry(EditTextObject* pTextObj)
void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
{
SvtUserOptions aUserOpt;
- std::unique_ptr< EditTextObject > pTextObj;
+ boost::scoped_ptr< EditTextObject > pTextObj;
switch(eSel)
{
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index b8bb332aeee4..f629e8bc5bc9 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -36,7 +36,7 @@
#include "styledlg.hxx"
#include "scresid.hxx"
#include "scuitphfedit.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
// class ScHFPage
@@ -186,7 +186,7 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, HFEditHdl, void*, void)
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg(
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScHFEditDlg(
pViewSh->GetViewFrame(), this, aDataSet, aStrPageStyle, nResId));
OSL_ENSURE(pDlg, "Dialog create fail!");
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 968886e1f1d7..4d907e0c2230 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -45,7 +45,7 @@
#include "AccessibleEditObject.hxx"
#include "scabstdlg.hxx"
-#include <memory>
+#include <boost/scoped_ptr.hpp>
// STATIC DATA -----------------------------------------------------------
static VclPtr<ScEditWindow> pActiveEdWnd = NULL;
@@ -205,7 +205,7 @@ void ScEditWindow::SetCharAttributes()
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg(
+ boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateScCharDlg(
GetParent(), &aSet, pDocSh));
OSL_ENSURE(pDlg, "Dialog create fail!");
pDlg->SetText( ScGlobal::GetRscString( STR_TEXTATTRS ) );