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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 2 | ||||
| -rw-r--r-- | filter/source/placeware/filter.cxx | 6 | ||||
| -rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index a164591b9629..25efbad47d8b 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -1051,7 +1051,7 @@ basegfx::B2DRange getUnrotatedGroupBoundRange(const Reference< XShape >& rxShape { if(rxShape.is()) { - if(rxShape->getShapeType().startsWith("com.sun.star.drawing.GroupShape")) + if(rxShape->getShapeType() == "com.sun.star.drawing.GroupShape") { // it's a group shape, iterate over children const Reference< XIndexAccess > xXIndexAccess(rxShape, UNO_QUERY); diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index b2f7c98e905a..28e55c7c3568 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -88,15 +88,15 @@ sal_Bool SAL_CALL PlaceWareExportFilter::filter( const ::com::sun::star::uno::Se Reference < XStatusIndicator > xStatusIndicator; for ( sal_Int32 i = 0 ; i < nLength; i++) { - if ( pValue[i].Name.startsWith( "OutputStream" ) ) + if ( pValue[i].Name == "OutputStream" ) { pValue[i].Value >>= xOutputStream; } - else if( pValue[i].Name.startsWith( "URL" ) ) + else if( pValue[i].Name == "URL" ) { pValue[i].Value >>= sURL; } - else if( pValue[i].Name.startsWith( "InteractionHandler" ) ) + else if( pValue[i].Name == "InteractionHandler" ) { pValue[i].Value >>= xInteractionHandler; } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index deea834a4732..17095fa8603e 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1115,7 +1115,7 @@ void XMLFilterSettingsDialog::initFilterList() } // if this is not a XmlFilterAdaptor entry, skip it - if( !aFilterService.startsWith( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) ) + if( aFilterService != "com.sun.star.comp.Writer.XmlFilterAdaptor" ) continue; |