Kaydet (Commit) ffbe5d9e authored tarafından Dennis Francis's avatar Dennis Francis

Use format-table from the interpreter context

Change-Id: I7ed243de18e1127d0ed7c60a0db76bf2a3043530
Reviewed-on: https://gerrit.libreoffice.org/53968Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst ff592615
...@@ -1069,7 +1069,7 @@ ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, const ScInterpre ...@@ -1069,7 +1069,7 @@ ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, const ScInterpre
ScQueryEntry& rEntry = mpParam->GetEntry(i); ScQueryEntry& rEntry = mpParam->GetEntry(i);
ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
sal_uInt32 nIndex = 0; sal_uInt32 nIndex = 0;
bool bNumber = pDoc->GetFormatTable()->IsNumberFormat( bool bNumber = mrContext.GetFormatTable()->IsNumberFormat(
rItem.maString.getString(), nIndex, rItem.mfVal); rItem.maString.getString(), nIndex, rItem.mfVal);
rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString; rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString;
} }
...@@ -1665,7 +1665,7 @@ bool ScQueryCellIterator::BinarySearch() ...@@ -1665,7 +1665,7 @@ bool ScQueryCellIterator::BinarySearch()
CollatorWrapper* pCollator = (mpParam->bCaseSens ? ScGlobal::GetCaseCollator() : CollatorWrapper* pCollator = (mpParam->bCaseSens ? ScGlobal::GetCaseCollator() :
ScGlobal::GetCollator()); ScGlobal::GetCollator());
SvNumberFormatter& rFormatter = *(pDoc->GetFormatTable()); SvNumberFormatter& rFormatter = *(mrContext.GetFormatTable());
const ScQueryEntry& rEntry = mpParam->GetEntry(0); const ScQueryEntry& rEntry = mpParam->GetEntry(0);
const ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); const ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
bool bLessEqual = rEntry.eOp == SC_LESS_EQUAL; bool bLessEqual = rEntry.eOp == SC_LESS_EQUAL;
......
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