diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-10 20:24:21 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-11 12:14:27 -0400 |
| commit | 7333881bb7b04f7e4e2a28638024ae82a9c14e81 (patch) | |
| tree | 97548f94ab918d502b45a5dda40ece5ad4117617 /sc/source/core/data/conditio.cxx | |
| parent | 6255be7ca294d350143290c343673f264f42220c (diff) | |
Formula tokens, formula cells and formula interpreters to use shared strings.
Change-Id: I5da99869fc7f61ce698180fa5daa9be9db9ac132
Diffstat (limited to 'sc/source/core/data/conditio.cxx')
| -rw-r--r-- | sc/source/core/data/conditio.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 418b30379e78..3ab133c3ddb7 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -280,7 +280,7 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, else if ( pToken->GetType() == svString ) { bIsStr1 = true; - aStrVal1 = pToken->GetString(); + aStrVal1 = pToken->GetString().getString(); DELETEZ(pFormula1); // nicht als Formel merken } } @@ -304,7 +304,7 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, else if ( pToken->GetType() == svString ) { bIsStr2 = true; - aStrVal2 = pToken->GetString(); + aStrVal2 = pToken->GetString().getString(); DELETEZ(pFormula2); // nicht als Formel merken } } @@ -360,7 +360,7 @@ void ScConditionEntry::Compile( const OUString& rExpr1, const OUString& rExpr2, else if ( pToken->GetType() == svString ) { bIsStr1 = true; - aStrVal1 = pToken->GetString(); + aStrVal1 = pToken->GetString().getString(); DELETEZ(pFormula1); // nicht als Formel merken } } @@ -397,7 +397,7 @@ void ScConditionEntry::Compile( const OUString& rExpr1, const OUString& rExpr2, else if ( pToken->GetType() == svString ) { bIsStr2 = true; - aStrVal2 = pToken->GetString(); + aStrVal2 = pToken->GetString().getString(); DELETEZ(pFormula2); // nicht als Formel merken } } @@ -649,7 +649,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) else { bIsStr1 = true; - aStrVal1 = pEff1->GetString(); + aStrVal1 = pEff1->GetString().getString(); nVal1 = 0.0; } } @@ -678,7 +678,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) else { bIsStr2 = true; - aStrVal2 = pEff2->GetString(); + aStrVal2 = pEff2->GetString().getString(); nVal2 = 0.0; } } @@ -717,7 +717,7 @@ static bool lcl_GetCellContent( ScRefCellValue& rCell, bool bIsStr1, double& rAr if (bVal) rArg = rCell.mpFormula->GetValue(); else - rArgStr = rCell.mpFormula->GetString(); + rArgStr = rCell.mpFormula->GetString().getString(); } break; case CELLTYPE_STRING: |