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/StatisticsDialogs | |
parent | 558b08d55f69b04eea42a37abd97fbb4dbe3602f (diff) |
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sc/source/ui/StatisticsDialogs')
4 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index 1a3420650edb..3eb3ba010983 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -79,7 +79,7 @@ OUString lclCreateMultiParameterFormula( void lclMakeSubRangesList(ScRangeList& rRangeList, ScRange& rInputRange, ScStatisticsInputOutputDialog::GroupedBy aGroupedBy) { - std::unique_ptr<DataRangeIterator> pIterator; + boost::scoped_ptr<DataRangeIterator> pIterator; if (aGroupedBy == ScStatisticsInputOutputDialog::BY_COLUMN) pIterator.reset(new DataRangeByColumnIterator(rInputRange)); else diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx index e023d45accf9..9acf9ed6f1d7 100644 --- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx @@ -78,7 +78,7 @@ ScRange ScExponentialSmoothingDialog::ApplyOutput(ScDocShell* pDocShell) // Exponential Smoothing output.push(); - std::unique_ptr<DataRangeIterator> pIterator; + boost::scoped_ptr<DataRangeIterator> pIterator; if (mGroupedBy == BY_COLUMN) pIterator.reset(new DataRangeByColumnIterator(mInputRange)); else diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx index 4bebec6c547b..8514dfc1342b 100644 --- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx @@ -63,7 +63,7 @@ ScRange ScMovingAverageDialog::ApplyOutput(ScDocShell* pDocShell) formula::FormulaGrammar::mergeToGrammar( formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv)); FormulaTemplate aTemplate(mDocument); - std::unique_ptr<DataRangeIterator> pIterator; + boost::scoped_ptr<DataRangeIterator> pIterator; if (mGroupedBy == BY_COLUMN) pIterator.reset(new DataRangeByColumnIterator(mInputRange)); else diff --git a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx index fe746d92c26d..b7128e277560 100644 --- a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx +++ b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx @@ -8,7 +8,7 @@ * */ -#include <memory> +#include <boost/scoped_ptr.hpp> #include <editeng/editobj.hxx> #include <editeng/wghtitem.hxx> @@ -192,7 +192,7 @@ void AddressWalkerWriter::writeBoldString(const OUString& aString) SvxWeightItem aWeight(WEIGHT_BOLD, EE_CHAR_WEIGHT); aItemSet.Put(aWeight); rEngine.QuickSetAttribs(aItemSet, ESelection(0, 0, 0, aString.getLength()) ); - std::unique_ptr<EditTextObject> pEditText(rEngine.CreateTextObject()); + boost::scoped_ptr<EditTextObject> pEditText(rEngine.CreateTextObject()); mpDocShell->GetDocFunc().SetEditCell(mCurrentAddress, *pEditText, true); } |