Kaydet (Commit) c28055eb authored tarafından Eike Rathke's avatar Eike Rathke

remove bIsFormula parameter, it was always false

Change-Id: Ie1554cf59e0aff3e0975941fad7f99b4aba9ba7d
üst 7d116f64
...@@ -279,7 +279,7 @@ void ScXMLConverter::GetStringFromDetOpType( ...@@ -279,7 +279,7 @@ void ScXMLConverter::GetStringFromDetOpType(
ScRangeStringConverter::AssignString( rString, sTypeStr, bAppendStr ); ScRangeStringConverter::AssignString( rString, sTypeStr, bAppendStr );
} }
void ScXMLConverter::ConvertCellRangeAddress(OUString& sFormula, const bool bIsFormula) void ScXMLConverter::ConvertCellRangeAddress(OUString& sFormula)
{ {
OUStringBuffer sBuffer(sFormula.getLength()); OUStringBuffer sBuffer(sFormula.getLength());
bool bInQuotationMarks(false); bool bInQuotationMarks(false);
...@@ -300,7 +300,6 @@ void ScXMLConverter::ConvertCellRangeAddress(OUString& sFormula, const bool bIsF ...@@ -300,7 +300,6 @@ void ScXMLConverter::ConvertCellRangeAddress(OUString& sFormula, const bool bIsF
else if (sFormula[i] == ']') else if (sFormula[i] == ']')
nCountBraces--; nCountBraces--;
else if ((sFormula[i] != '.') || else if ((sFormula[i] != '.') ||
((nCountBraces == 0) && bIsFormula) ||
!((chPrevious == '[') || (chPrevious == ':') || (chPrevious == ' ') || (chPrevious == '='))) !((chPrevious == '[') || (chPrevious == ':') || (chPrevious == ' ') || (chPrevious == '=')))
sBuffer.append(sFormula[i]); sBuffer.append(sFormula[i]);
chPrevious = sFormula[i]; chPrevious = sFormula[i];
......
...@@ -92,8 +92,7 @@ public: ...@@ -92,8 +92,7 @@ public:
// IMPORT: Formulas // IMPORT: Formulas
static void ConvertCellRangeAddress( static void ConvertCellRangeAddress(
OUString& sFormula, OUString& sFormula);
const bool bIsFormula = true);
// EXPORT: Core Date Time // EXPORT: Core Date Time
static void ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate); static void ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate);
......
...@@ -3126,7 +3126,7 @@ public: ...@@ -3126,7 +3126,7 @@ public:
{ {
OUString aContent = p->sContent; OUString aContent = p->sContent;
if (!p->bIsExpression) if (!p->bIsExpression)
ScXMLConverter::ConvertCellRangeAddress(aContent, false); ScXMLConverter::ConvertCellRangeAddress(aContent);
ScRangeData* pData = new ScRangeData( ScRangeData* pData = new ScRangeData(
mpDoc, p->sName, aContent, aPos, nNewType, p->eGrammar); mpDoc, p->sName, aContent, aPos, nNewType, p->eGrammar);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment