diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-13 11:46:47 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-13 11:46:47 +0200 |
| commit | dd0bece80712ce30736515e55e1f732ff1ab392e (patch) | |
| tree | 2e6d2fd923e46e86bb52c84d869bf944f3b0b8c1 /desktop | |
| parent | aa371639ee0d3255af474e605eea665125ecd3e2 (diff) | |
loplugin:oncevar: empty strings: desktop
Change-Id: I8c88b295d797a98f0374e3ce57b9c875b72c7bd3
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/migration/migration.cxx | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 2c067883e358..d39a8564366b 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1257,8 +1257,7 @@ void Desktop::Exception(ExceptionCategory nCategory) Application::SetSystemWindowMode( nOldMode & ~SystemWindowFlags::NOAUTOMODE ); if ( bInException ) { - OUString aDoubleExceptionString; - Application::Abort( aDoubleExceptionString ); + Application::Abort( OUString() ); } bInException = true; @@ -1288,8 +1287,7 @@ void Desktop::Exception(ExceptionCategory nCategory) { case ExceptionCategory::ResourceNotLoaded: { - OUString aResExceptionString; - Application::Abort( aResExceptionString ); + Application::Abort( OUString() ); break; } diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index e30e26f7a4a1..807e335dc386 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -260,8 +260,7 @@ bool MigrationImpl::doMigration() if (i.bHasMenubar) { uno::Reference< container::XIndexContainer > xOldVersionMenuSettings(xOldCfgManager->getSettings(sMenubarResourceURL, true), uno::UNO_QUERY); uno::Reference< container::XIndexContainer > xNewVersionMenuSettings = aNewVersionUIInfo.getNewMenubarSettings(i.sModuleShortName); - OUString sParent; - compareOldAndNewConfig(sParent, xOldVersionMenuSettings, xNewVersionMenuSettings, sMenubarResourceURL); + compareOldAndNewConfig(OUString(), xOldVersionMenuSettings, xNewVersionMenuSettings, sMenubarResourceURL); mergeOldToNewVersion(xCfgManager, xNewVersionMenuSettings, sModuleIdentifier, sMenubarResourceURL); } @@ -273,8 +272,7 @@ bool MigrationImpl::doMigration() uno::Reference< container::XIndexContainer > xOldVersionToolbarSettings(xOldCfgManager->getSettings(sToolbarResourceURL, true), uno::UNO_QUERY); uno::Reference< container::XIndexContainer > xNewVersionToolbarSettings = aNewVersionUIInfo.getNewToolbarSettings(i.sModuleShortName, sToolbarName); - OUString sParent; - compareOldAndNewConfig(sParent, xOldVersionToolbarSettings, xNewVersionToolbarSettings, sToolbarResourceURL); + compareOldAndNewConfig(OUString(), xOldVersionToolbarSettings, xNewVersionToolbarSettings, sToolbarResourceURL); mergeOldToNewVersion(xCfgManager, xNewVersionToolbarSettings, sModuleIdentifier, sToolbarResourceURL); } } |