summaryrefslogtreecommitdiff
path: root/sc/source/filter/oox/formulabuffer.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-18 09:08:35 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-18 09:28:59 +0000
commitc8204ba5b86d080aa5ac3ec71dc6aaea1384b9a0 (patch)
treec4ae951328f359fb4f6fdee62bb0f276a9034579 /sc/source/filter/oox/formulabuffer.cxx
parentc722e9e728ec6c9df0285f5dd2041aa58f66f686 (diff)
boost->std
Change-Id: I7f3bb094f116103c1146a7d60e3af94c0b37d9ea Reviewed-on: https://gerrit.libreoffice.org/18677 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/filter/oox/formulabuffer.cxx')
-rw-r--r--sc/source/filter/oox/formulabuffer.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 39a7d3e4b7fe..293551cb2c45 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -36,8 +36,8 @@ using namespace ::com::sun::star::table;
using namespace ::com::sun::star::sheet;
using namespace ::com::sun::star::container;
-#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
+#include <memory>
namespace oox { namespace xls {
@@ -250,7 +250,7 @@ void applyArrayFormulas(
ScCompiler aComp(&rDoc.getDoc(), aPos);
aComp.SetNumberFormatter(&rFormatter);
aComp.SetGrammar(formula::FormulaGrammar::GRAM_OOXML);
- boost::scoped_ptr<ScTokenArray> pArray(aComp.CompileString(it->maTokenAndAddress.maTokenStr));
+ std::unique_ptr<ScTokenArray> pArray(aComp.CompileString(it->maTokenAndAddress.maTokenStr));
if (pArray)
rDoc.setMatrixCells(aRange, *pArray, formula::FormulaGrammar::GRAM_OOXML);
}
@@ -318,7 +318,7 @@ class WorkerThread: public salhelper::Thread, private boost::noncopyable
{
ScDocumentImport& mrDoc;
FormulaBuffer::SheetItem& mrItem;
- boost::scoped_ptr<SvNumberFormatter> mpFormatter;
+ std::unique_ptr<SvNumberFormatter> mpFormatter;
const uno::Sequence<sheet::ExternalLinkInfo>& mrExternalLinks;
public: