diff options
| author | Eike Rathke <erack@redhat.com> | 2012-07-05 16:16:04 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-07-05 16:18:52 +0200 |
| commit | 3bdaf6168dc304b5a01bf196f3c695540a72537b (patch) | |
| tree | 22d9d7fdb9cddf0c9306fa90cda525a1e16d1722 /sc | |
| parent | b6cfbd08c2a9b686cfe024a63469cbcd10d9a4bd (diff) | |
changes to "Replaced deprecated tools/String with OUString in ScMatrix"
Errors during compile:
* sc/source/core/tool/interpr1.cxx: In member function ‘const String& {anonymous}::VectorMatrixAccessor::GetString(SCSIZE) const’:
sc/source/core/tool/interpr1.cxx:4629:71: error: returning reference to temporary [-Werror]
* with --enable-werror
* sc/source/core/tool/interpr1.cxx: In function ‘void {anonymous}::lcl_GetLastMatch(SCSIZE&, const {anonymous}::VectorMatrixAccessor&, SCSIZE, bool)’:
sc/source/core/tool/interpr1.cxx:4724:52: error: ambiguous overload for ‘operator==’ in ‘aStr == (& rMat)->{anonymous}::VectorMatrixAccessor::GetString((rIndex + -1u))’
sc/source/core/tool/interpr1.cxx:4728:52: error: ambiguous overload for ‘operator==’ in ‘aStr == (& rMat)->{anonymous}::VectorMatrixAccessor::GetString((rIndex + 1u))’
Change-Id: I28eb3d23f4d5c08a30534abdf940597923cbb68c
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index b65d93056447..58e3cbd99526 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -4622,7 +4622,7 @@ public: return mbColVec ? mrMat.GetDouble(0, i) : mrMat.GetDouble(i, 0); } - const String& GetString(SCSIZE i) const + const rtl::OUString& GetString(SCSIZE i) const { return mbColVec ? mrMat.GetString(0, i) : mrMat.GetString(i, 0); } @@ -4716,7 +4716,7 @@ static void lcl_GetLastMatch( SCSIZE& rIndex, const VectorMatrixAccessor& rMat, } else if (rMat.IsString(rIndex)) { - String aStr( rMat.GetString(rIndex)); + rtl::OUString aStr( rMat.GetString(rIndex)); if (bReverse) while (rIndex > 0 && rMat.IsString(rIndex-1) && aStr == rMat.GetString(rIndex-1)) |