summaryrefslogtreecommitdiff
path: root/sc/source/core/data/conditio.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-01-09 14:00:48 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-01-10 11:22:25 +0100
commit60a66bd57d17a2f72fbf852faf1eaad87eac6dec (patch)
tree6b9e514c3422fdf2ef436533db48ee6fbb68c663 /sc/source/core/data/conditio.cxx
parent612941b64970b3e1f246652a8661fbaa56373242 (diff)
pass ScTokenArray around by unique_ptr
Change-Id: I611554b1c4cbc506dbfc32748e9f14c9e8eb5156 Reviewed-on: https://gerrit.libreoffice.org/66022 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/core/data/conditio.cxx')
-rw-r--r--sc/source/core/data/conditio.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index cb00a2329924..e4c669052467 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -224,9 +224,9 @@ ScConditionEntry::ScConditionEntry( ScDocument* pDocument, const ScConditionEntr
{
// Real copy of the formulas (for Ref Undo)
if (r.pFormula1)
- pFormula1.reset( r.pFormula1->Clone() );
+ pFormula1 = r.pFormula1->Clone();
if (r.pFormula2)
- pFormula2.reset( r.pFormula2->Clone() );
+ pFormula2 = r.pFormula2->Clone();
// Formula cells are created at IsValid
// TODO: But not in the Clipboard! So interpret beforehand!
@@ -352,7 +352,7 @@ void ScConditionEntry::Compile( const OUString& rExpr1, const OUString& rExpr2,
}
else
{
- pFormula1.reset( aComp.CompileString( rExpr1, rExprNmsp1 ) );
+ pFormula1 = aComp.CompileString( rExpr1, rExprNmsp1 );
SimplifyCompiledFormula( pFormula1, nVal1, bIsStr1, aStrVal1 );
bRelRef1 = lcl_HasRelRef( mpDoc, pFormula1.get() );
}
@@ -371,7 +371,7 @@ void ScConditionEntry::Compile( const OUString& rExpr1, const OUString& rExpr2,
}
else
{
- pFormula2.reset( aComp.CompileString( rExpr2, rExprNmsp2 ) );
+ pFormula2 = aComp.CompileString( rExpr2, rExprNmsp2 );
SimplifyCompiledFormula( pFormula2, nVal2, bIsStr2, aStrVal2 );
bRelRef2 = lcl_HasRelRef( mpDoc, pFormula2.get() );
}