Kaydet (Commit) 153fad53 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

revert accidently commited code

Change-Id: I3158762e7da10eacaf2616a7d868531ad7fa7a51
üst 1d4e66a7
......@@ -272,26 +272,6 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const
return pEntry;
}
namespace {
bool containsOnlyColumnLabel(Edit* pEdit, ScTokenArray* pArr)
{
formula::FormulaToken* token = pArr->First();
formula::StackVar t = token->GetType();
OpCode op = token->GetOpCode();
if( ( op == ocColRowName ) ||
( ( op == ocBad ) && ( t == formula::svString ) )
)
{
pEdit->SetControlBackground(COL_YELLOW);
return true;
}
return false;
}
}
IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit)
{
OUString aFormula = pEdit->GetText();
......@@ -315,27 +295,14 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit)
}
// Recognized col/row name or string token, warn the user
bool bContainsColumnLabel = containsOnlyColumnLabel(pEdit, ta.get());;
if (!bContainsColumnLabel)
{
ScCompiler aComp2( mpDoc, maPos );
aComp2.SetGrammar( mpDoc->GetGrammar() );
if (&maEdVal1 == pEdit)
{
OUString aFormula2 = maEdVal2.GetText();
boost::scoped_ptr<ScTokenArray> pArr2(aComp2.CompileString(aFormula2));
bContainsColumnLabel = containsOnlyColumnLabel(&maEdVal2, pArr2.get());
}
else
{
OUString aFormula1 = maEdVal1.GetText();
boost::scoped_ptr<ScTokenArray> pArr1(aComp2.CompileString(aFormula1));
bContainsColumnLabel = containsOnlyColumnLabel(&maEdVal1, pArr1.get());
}
}
if (bContainsColumnLabel)
formula::FormulaToken* token = ta->First();
formula::StackVar t = token->GetType();
OpCode op = token->GetOpCode();
if( ( op == ocColRowName ) ||
( ( op == ocBad ) && ( t == formula::svString ) )
)
{
pEdit->SetControlBackground(COL_YELLOW);
maFtVal.SetText(ScGlobal::GetRscString(STR_UNQUOTED_STRING));
return 0;
}
......
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