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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 4 | ||||
| -rw-r--r-- | cui/source/options/treeopt.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 54f745c29760..c646ec63b253 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -411,8 +411,8 @@ SvxConfigPage::CanConfig( const OUString& aModuleId ) OUString GetModuleName( const OUString& aModuleId ) { - if ( aModuleId.startsWith( "com.sun.star.text.TextDocument" ) || - aModuleId.startsWith( "com.sun.star.text.GlobalDocument" ) ) + if ( aModuleId == "com.sun.star.text.TextDocument" || + aModuleId == "com.sun.star.text.GlobalDocument" ) return OUString("Writer"); else if ( aModuleId == "com.sun.star.text.WebDocument" ) return OUString("Writer/Web"); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 6d5c27eeb0db..5e53d52b5627 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1613,9 +1613,9 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { // text document ResStringArray& rTextArray = aDlgResource.GetTextArray(); - if ( aFactory.startsWith( "com.sun.star.text.TextDocument" ) - || aFactory.startsWith( "com.sun.star.text.WebDocument" ) - || aFactory.startsWith( "com.sun.star.text.GlobalDocument" ) ) + if ( aFactory == "com.sun.star.text.TextDocument" + || aFactory == "com.sun.star.text.WebDocument" + || aFactory == "com.sun.star.text.GlobalDocument" ) { SfxModule* pSwMod = (*(SfxModule**) GetAppData(SHL_WRITER)); if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) ) |