From dd0bece80712ce30736515e55e1f732ff1ab392e Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 13 Jul 2017 11:46:47 +0200
Subject: loplugin:oncevar: empty strings: desktop

Change-Id: I8c88b295d797a98f0374e3ce57b9c875b72c7bd3
---
 desktop/source/app/app.cxx             | 6 ++----
 desktop/source/migration/migration.cxx | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'desktop')

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);
                 }
             }
-- 
cgit