summaryrefslogtreecommitdiff
path: root/svtools
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 /svtools
parentd3c008fb7e5d604bc09a23b79598734a7e506489 (diff)
convert include/svtools/roadmapwizard.hxx from String to OUString
Change-Id: I1b5a0c3f5946aac9d353550091616cf5a31e6f82
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/dialogs/roadmapwizard.cxx6
-rw-r--r--svtools/source/uno/wizard/wizardshell.cxx2
-rw-r--r--svtools/source/uno/wizard/wizardshell.hxx2
3 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index fdf9d89f2d6b..12ab9887d47c 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -273,7 +273,7 @@ namespace svt
}
//--------------------------------------------------------------------
- void RoadmapWizard::describeState( WizardState _nState, const String& _rStateDisplayName, RoadmapPageFactory _pPageFactory )
+ void RoadmapWizard::describeState( WizardState _nState, const OUString& _rStateDisplayName, RoadmapPageFactory _pPageFactory )
{
OSL_ENSURE( m_pImpl->aStateDescriptors.find( _nState ) == m_pImpl->aStateDescriptors.end(),
"RoadmapWizard::describeState: there already is a descriptor for this state!" );
@@ -581,9 +581,9 @@ namespace svt
}
//--------------------------------------------------------------------
- String RoadmapWizard::getStateDisplayName( WizardState _nState ) const
+ OUString RoadmapWizard::getStateDisplayName( WizardState _nState ) const
{
- String sDisplayName;
+ OUString sDisplayName;
StateDescriptions::const_iterator pos = m_pImpl->aStateDescriptors.find( _nState );
OSL_ENSURE( pos != m_pImpl->aStateDescriptors.end(),
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index 82503616390b..8054e4bf86fe 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -216,7 +216,7 @@ namespace svt { namespace uno
}
//------------------------------------------------------------------------------------------------------------------
- String WizardShell::getStateDisplayName( WizardState i_nState ) const
+ OUString WizardShell::getStateDisplayName( WizardState i_nState ) const
{
try
{
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index ae8edcddf22e..a2d1605e8620 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -58,7 +58,7 @@ namespace svt { namespace uno
virtual TabPage* createPage( WizardState i_nState );
virtual void enterState( WizardState i_nState );
virtual sal_Bool leaveState( WizardState i_nState );
- virtual String getStateDisplayName( WizardState i_nState ) const;
+ virtual OUString getStateDisplayName( WizardState i_nState ) const;
virtual bool canAdvance() const;
virtual sal_Bool onFinish();
virtual IWizardPageController*