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

[Matteo Casalin]

 sw/inc/swabstdlg.hxx                 |    2 +-
 sw/source/ui/dialog/swdlgfact.cxx    |    2 +-
 sw/source/ui/dialog/swdlgfact.hxx    |    2 +-
 sw/source/ui/inc/mailmergewizard.hxx |   27 ++++++++++++++-------------
 4 files changed, 17 insertions(+), 16 deletions(-)

New commits:
commit 1ebe1d6d26857f492281fa8c2467bbb5c95c2c91
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Mon Sep 23 14:57:37 2013 +0200

    String to OUString
    
    Change-Id: I510de30ca31db0d0a6615ef500e7d03a648ca609
    Reviewed-on: https://gerrit.libreoffice.org/6028
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index cc8baed..2e03953 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -311,7 +311,7 @@ class AbstractMailMergeWizard : public VclAbstractDialog2
 {
 public:
     virtual void                SetReloadDocument(const OUString& rURL) = 0;
-    virtual const OUString&     GetReloadDocument() const = 0;
+    virtual OUString            GetReloadDocument() const = 0;
     virtual sal_Bool            ShowPage( sal_uInt16 nLevel ) = 0;
     virtual sal_uInt16          GetRestartPage() const = 0;
 };
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index e8c0b88..eb6722e 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -620,7 +620,7 @@ void AbstractMailMergeWizard_Impl::SetReloadDocument(const OUString& rURL)
     pDlg->SetReloadDocument(rURL);
 }
 
-const OUString&     AbstractMailMergeWizard_Impl::GetReloadDocument() const
+OUString AbstractMailMergeWizard_Impl::GetReloadDocument() const
 {
     return pDlg->GetReloadDocument();
 }
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 342d81b..8f3dd72 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -362,7 +362,7 @@ public:
     virtual long    GetResult();
 
     virtual void                SetReloadDocument(const OUString& rURL);
-    virtual const OUString&     GetReloadDocument() const;
+    virtual OUString            GetReloadDocument() const;
     virtual sal_Bool            ShowPage( sal_uInt16 nLevel );
     virtual sal_uInt16          GetRestartPage() const;
 };
diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx
index 95015bb..b46d653 100644
--- a/sw/source/ui/inc/mailmergewizard.hxx
+++ b/sw/source/ui/inc/mailmergewizard.hxx
@@ -20,6 +20,7 @@
 #define _MAILMERGEWIZARD_HXX
 
 #include <svtools/roadmapwizard.hxx>
+#include "rtl/ustring.hxx"
 
 class SwView;
 class SwMailMergeConfigItem;
@@ -41,16 +42,16 @@ class SwMailMergeWizard : public ::svt::RoadmapWizard
 
     SwMailMergeConfigItem&  m_rConfigItem;
 
-    String                  m_sStarting;
-    String                  m_sDocumentType;
-    String                  m_sAddressBlock;
-    String                  m_sAddressList;
-    String                  m_sGreetingsLine;
-    String                  m_sLayout;
-    String                  m_sPrepareMerge;
-    String                  m_sMerge;
-    String                  m_sOutput;
-    String                  m_sFinish;
+    OUString                m_sStarting;
+    OUString                m_sDocumentType;
+    OUString                m_sAddressBlock;
+    OUString                m_sAddressList;
+    OUString                m_sGreetingsLine;
+    OUString                m_sLayout;
+    OUString                m_sPrepareMerge;
+    OUString                m_sMerge;
+    OUString                m_sOutput;
+    OUString                m_sFinish;
 
     sal_uInt16              m_nRestartPage;
 
@@ -71,8 +72,8 @@ public:
     SwView*                     GetSwView() {return m_pSwView;}
     SwMailMergeConfigItem&      GetConfigItem() { return m_rConfigItem;}
 
-    void                    SetReloadDocument(const String& rURL){sDocumentURL = rURL;}
-    const OUString&         GetReloadDocument() const {return sDocumentURL;}
+    void                    SetReloadDocument(const OUString& rURL) {sDocumentURL = rURL;}
+    OUString                GetReloadDocument() const {return sDocumentURL;}
 
     //next step requires loading of document
     void                    SetDocumentLoad(bool bSet) {m_bDocumentLoad = bSet;}
@@ -88,7 +89,7 @@ public:
 
     void                    updateRoadmapItemLabel( WizardState _nState );
 
-     virtual short          Execute();
+    virtual short           Execute();
     virtual void            StartExecuteModal( const Link& rEndDialogHdl );
 };
 #endif