diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-10 23:08:08 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-11 12:14:27 -0400 |
| commit | b3e35aa551fa8abc0215a0ef416fc9acbbc3c0d9 (patch) | |
| tree | 0dfeb6d94fec97f810fc90b61e689960068ff1c7 /sc/inc/compiler.hxx | |
| parent | 7333881bb7b04f7e4e2a28638024ae82a9c14e81 (diff) | |
Fix VLOOKUP calculation when the matching value is literal string.
ScRawToken needed to store a shared string value rather than the normal
unicode string array. This fixes a previously failed unit test.
Change-Id: I87164c018ace0761c40d1493f44fe25909a4499c
Diffstat (limited to 'sc/inc/compiler.hxx')
| -rw-r--r-- | sc/inc/compiler.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 0ecb2a5eeb39..28e4efebf013 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -138,6 +138,10 @@ public: bool bGlobal; sal_uInt16 nIndex; } name; + struct { + rtl_uString* mpData; + rtl_uString* mpDataIgnoreCase; + } sharedstring; ScMatrix* pMat; sal_uInt16 nError; sal_Unicode cStr[ MAXSTRLEN+1 ]; // string (up to 255 characters + 0) @@ -161,7 +165,7 @@ public: // Use these methods only on tokens that are not part of a token array, // since the reference count is cleared! void SetOpCode( OpCode eCode ); - void SetString( const sal_Unicode* pStr ); + void SetString( rtl_uString* pData, rtl_uString* pDataIgoreCase ); void SetSingleReference( const ScSingleRefData& rRef ); void SetDoubleReference( const ScComplexRefData& rRef ); void SetDouble( double fVal ); |