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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/source/editeng/edtspell.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit4.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/items/paraitem.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 3ec1a921cf3e..68628f77e081 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -651,7 +651,7 @@ sal_Bool EdtAutoCorrDoc::SetAttr( sal_uInt16 nStt, sal_uInt16 nEnd, { SfxItemPool* pPool = &mpEditEngine->GetEditDoc().GetItemPool(); while ( pPool->GetSecondaryPool() && - !pPool->GetName().startsWith("EditEngineItemPool") ) + pPool->GetName() != "EditEngineItemPool" ) { pPool = pPool->GetSecondaryPool(); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index f9adc4c5da1c..a0f54dfd66ab 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -158,13 +158,13 @@ EditPaM ImpEditEngine::ReadRTF( SvStream& rInput, EditSelection aSel ) // The SvRTF parser expects the Which-mapping passed on in the pool, not // dependant on a secondary. SfxItemPool* pPool = &aEditDoc.GetItemPool(); - while (pPool->GetSecondaryPool() && !pPool->GetName().startsWith("EditEngineItemPool")) - { + while (pPool->GetSecondaryPool() && pPool->GetName() != "EditEngineItemPool") + { pPool = pPool->GetSecondaryPool(); } - DBG_ASSERT(pPool && pPool->GetName().startsWith("EditEngineItemPool"), + DBG_ASSERT(pPool && pPool->GetName() == "EditEngineItemPool", "ReadRTF: no EditEnginePool!"); EditRTFParserRef xPrsr = new EditRTFParser(rInput, aSel, *pPool, pEditEngine); diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 5f11920eb39b..39a2e698ce43 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -1164,7 +1164,7 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const SfxItemPool *pPool = SfxItemPool::GetStoringPool(); const bool bStoreDefTabs = pPool - && pPool->GetName().startsWith("SWG") + && pPool->GetName() == "SWG" && ::IsDefaultItem( this ); const short nTabs = Count(); |