diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-23 13:29:32 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-04 08:06:10 +0200 |
commit | 0e6a2601b39cbadaff7f7506ba9e804f108060db (patch) | |
tree | ffd6bb4970f689d20087b721eb8dfd4bc86cd53f /connectivity/source/commontools/predicateinput.cxx | |
parent | 457b349edbaf6d9dc747f3a631fee70e0c035bae (diff) |
Convert code that calls OUString::getStr()[] to use the [] operator
This also means that this code now gets bounds checked in debug builds.
Change-Id: Id777f85eaee6a737bbcb84625e6e110abe0e0f27
Diffstat (limited to 'connectivity/source/commontools/predicateinput.cxx')
-rw-r--r-- | connectivity/source/commontools/predicateinput.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 82d170266684..f27bc142da55 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -67,7 +67,7 @@ namespace dbtools sal_Unicode nReturn( _nFallback ); if ( !_rSeparator.isEmpty() ) - nReturn = static_cast< sal_Char >( _rSeparator.getStr()[0] ); + nReturn = static_cast< sal_Char >( _rSeparator[0] ); return nReturn; } @@ -150,8 +150,8 @@ namespace dbtools { // yes -> force a quoted text and try again OUString sQuoted( _rStatement ); if ( !sQuoted.isEmpty() - && ( (sQuoted.getStr()[0] != '\'') - || (sQuoted.getStr()[ sQuoted.getLength() - 1 ] != '\'' ) + && ( !sQuoted.startsWith("'") + || !sQuoted.endsWith("'") ) ) { @@ -296,9 +296,7 @@ namespace dbtools // '-characters to the text. If we would give this to predicateTree this would add // two additional '-characters which we don't want. So check the field format. // FS - 06.01.00 - 71532 - sal_Bool bValidQuotedText = ( sValue.getLength() >= 2 ) - && ( sValue.getStr()[0] == '\'' ) - && ( sValue.getStr()[ sValue.getLength() - 1 ] == '\'' ); + sal_Bool bValidQuotedText = sValue.startsWith("'") && sValue.endsWith("'"); // again : as normalizePredicateString always did a conversion on the value text, // bValidQuotedText == sal_True implies that we have a text field, as no other field // values will be formatted with the quote characters |