[Libreoffice-commits] core.git: sw/source

[Matteo Casalin]

 sw/source/ui/dbui/mailmergewizard.cxx |   32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

New commits:
commit 29aceccf1da7164660a430229c4ac937897e64de
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Mon Sep 23 23:27:53 2013 +0200

    String to OUString
    
    Change-Id: Id01c7e85b1d458e13ec4bb843e7fe0976bec9b9f
    Reviewed-on: https://gerrit.libreoffice.org/6030
    Reviewed-by: Andrzej J.R. Hunt <andrzej at ahunt.org>
    Tested-by: Andrzej J.R. Hunt <andrzej at ahunt.org>

diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index e5cc3b9..527dee0 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -176,23 +176,27 @@ void SwMailMergeWizard::enterState( WizardState _nState )
 
 OUString SwMailMergeWizard::getStateDisplayName( WizardState _nState ) const
 {
-    String sRet;
     switch(_nState)
     {
-        case MM_DOCUMENTSELECTPAGE :sRet = m_sStarting;      break;
-        case MM_OUTPUTTYPETPAGE :   sRet = m_sDocumentType;  break;
-        case MM_ADDRESSBLOCKPAGE  :
-            sRet =  m_rConfigItem.IsOutputToLetter() ?
-                    m_sAddressBlock : m_sAddressList;
-
-        break;
-        case MM_GREETINGSPAGE     : sRet = m_sGreetingsLine; break;
-        case MM_LAYOUTPAGE        : sRet = m_sLayout;        break;
-        case MM_PREPAREMERGEPAGE  : sRet = m_sPrepareMerge;  break;
-        case MM_MERGEPAGE         : sRet = m_sMerge;         break;
-        case MM_OUTPUTPAGE       : sRet = m_sOutput;        break;
+        case MM_DOCUMENTSELECTPAGE:
+            return m_sStarting;
+        case MM_OUTPUTTYPETPAGE:
+            return m_sDocumentType;
+        case MM_ADDRESSBLOCKPAGE:
+            return m_rConfigItem.IsOutputToLetter() ?
+                   m_sAddressBlock : m_sAddressList;
+        case MM_GREETINGSPAGE:
+            return m_sGreetingsLine;
+        case MM_LAYOUTPAGE:
+            return m_sLayout;
+        case MM_PREPAREMERGEPAGE:
+            return m_sPrepareMerge;
+        case MM_MERGEPAGE:
+            return m_sMerge;
+        case MM_OUTPUTPAGE:
+            return m_sOutput;
     }
-    return sRet;
+    return OUString();
 }
 /*----------------------------------------------------------------------
     enables/disables pages in the roadmap depending on the current