diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-21 15:53:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-21 16:01:07 +0000 |
| commit | 523ad9696c9135a29393a0c4d147ab206b6de4f5 (patch) | |
| tree | fe30ff35cc11890a2345d75495c455f792a4bf56 /sal | |
| parent | 7713dfc9b50b88cf2548d49e65b099a6a81e9d65 (diff) | |
Fix bogus mass-conversion equalsAsciiL -> startsWith
3af99e4d59d89c343965a928681a30f36b1007d2 "convert equalsAsciiL calls to
startsWith calls" should rather have converted to oprator ==.
(cherry picked from commit a3f32769fc4bb23c64168b412dd10ec769a3854d)
Conflicts:
sc/source/ui/unoobj/nameuno.cxx
sc/source/ui/unoobj/styleuno.cxx
sfx2/source/appl/sfxhelp.cxx
stoc/source/security/permissions.cxx
sw/source/core/unocore/unocrsrhelper.cxx
(None of those bogus startsWith calls seem problematic enough to warrant
backporting also to libreoffice-4-2-0.)
Change-Id: Id4a8836c5d6d570e54661c40be7214632e202b21
Reviewed-on: https://gerrit.libreoffice.org/7578
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/bootstrap.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 0d47a7b6ef72..e72ea6832468 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -483,9 +483,7 @@ bool Bootstrap_Impl::getValue( LookupMode mode, bool override, ExpandRequestLink const * requestStack) const { - if (mode == LOOKUP_MODE_NORMAL && - key.startsWith("URE_BOOTSTRAP")) - { + if (mode == LOOKUP_MODE_NORMAL && key == "URE_BOOTSTRAP") { mode = LOOKUP_MODE_URE_BOOTSTRAP; } if (override && getDirectValue(key, value, mode, requestStack)) { |