diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-09-23 14:57:37 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-26 07:16:17 +0000 |
| commit | 1ebe1d6d26857f492281fa8c2467bbb5c95c2c91 (patch) | |
| tree | d1c93888b2e590848fbabfb80b9cd0d1ed2d899d /sw/source/ui/inc | |
| parent | String to OUString (diff) | |
| download | core-1ebe1d6d26857f492281fa8c2467bbb5c95c2c91.tar.gz core-1ebe1d6d26857f492281fa8c2467bbb5c95c2c91.zip | |
String to OUString
Change-Id: I510de30ca31db0d0a6615ef500e7d03a648ca609
Reviewed-on: https://gerrit.libreoffice.org/6028
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/inc')
| -rw-r--r-- | sw/source/ui/inc/mailmergewizard.hxx | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx index 95015bb9fac3..b46d6539fd4c 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 |