summaryrefslogtreecommitdiffstats
path: root/sw/source/ui/inc/mailmergewizard.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-13 13:47:59 +0200
committerNoel Grandin <noel@peralex.com>2013-08-15 09:11:35 +0200
commit00f5fde6c4520afe08650c257b8d2c279635eb09 (patch)
treeee50e7d6aab6101410813638aa71b20360e4b032 /sw/source/ui/inc/mailmergewizard.hxx
parentconvert include/svtools/rtfout.hxx from String to OUString (diff)
downloadcore-00f5fde6c4520afe08650c257b8d2c279635eb09.tar.gz
core-00f5fde6c4520afe08650c257b8d2c279635eb09.zip
convert include/svtools/roadmapwizard.hxx from String to OUString
Change-Id: I1b5a0c3f5946aac9d353550091616cf5a31e6f82
Diffstat (limited to 'sw/source/ui/inc/mailmergewizard.hxx')
-rw-r--r--sw/source/ui/inc/mailmergewizard.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx
index cb929bbc3d24..5cbe040ddd5f 100644
--- a/sw/source/ui/inc/mailmergewizard.hxx
+++ b/sw/source/ui/inc/mailmergewizard.hxx
@@ -62,7 +62,7 @@ protected:
// roadmap feature ??
// virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason );
- virtual String getStateDisplayName( WizardState _nState ) const;
+ virtual OUString getStateDisplayName( WizardState _nState ) const;
public:
SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem);