diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-08 10:30:15 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-08 15:48:11 -0400 |
| commit | 6cfaf9b3d3194d850b52993d2f0e3dcf8e4e5bce (patch) | |
| tree | 88354b229636003551deb3ada2dda4c76301b237 /sc | |
| parent | 165a61190f103d0227f57a3f19afa144604155a9 (diff) | |
Let's not do this.
Change-Id: I93fe9f8c5edbfb08b78b6694771db2dd18d8868c
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/queryentry.hxx | 3 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 3 | ||||
| -rw-r--r-- | sc/source/core/tool/queryentry.cxx | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx index 636372e0a21f..a3baea6fd5c2 100644 --- a/sc/inc/queryentry.hxx +++ b/sc/inc/queryentry.hxx @@ -42,9 +42,8 @@ struct SC_DLLPUBLIC ScQueryEntry QueryType meType; double mfVal; OUString maString; - sal_uIntPtr mnStrId; - Item() : meType(ByValue), mfVal(0.0), mnStrId(0) {} + Item() : meType(ByValue), mfVal(0.0) {} bool operator== (const Item& r) const; }; diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 87cdc7469882..3885823c3940 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -6763,7 +6763,6 @@ bool ScInterpreter::FillEntry(ScQueryEntry& rEntry) const OUString& sStr = GetString(); rItem.meType = ScQueryEntry::ByString; rItem.maString = sStr; - rItem.mnStrId = pDok->GetSharedStringPool().getIdentifierIgnoreCase(rItem.maString); } break; case svDoubleRef : @@ -6788,7 +6787,6 @@ bool ScInterpreter::FillEntry(ScQueryEntry& rEntry) GetCellString(aStr, aCell); rItem.meType = ScQueryEntry::ByString; rItem.maString = aStr; - rItem.mnStrId = pDok->GetSharedStringPool().getIdentifierIgnoreCase(rItem.maString); } } break; @@ -6797,7 +6795,6 @@ bool ScInterpreter::FillEntry(ScQueryEntry& rEntry) OUString aStr; const ScMatValType nType = GetDoubleOrStringFromMatrix(rItem.mfVal, aStr); rItem.maString = aStr; - rItem.mnStrId = pDok->GetSharedStringPool().getIdentifierIgnoreCase(rItem.maString); rItem.meType = ScMatrix::IsNonValueType(nType) ? ScQueryEntry::ByString : ScQueryEntry::ByValue; } diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index e061d0fb938a..1ac1a899327b 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -32,7 +32,7 @@ bool ScQueryEntry::Item::operator== (const Item& r) const { - return meType == r.meType && mfVal == r.mfVal && maString.equals(r.maString) && mnStrId == r.mnStrId; + return meType == r.meType && mfVal == r.mfVal && maString.equals(r.maString); } ScQueryEntry::ScQueryEntry() : |