[PATCH] String=>OUString virtual getStateDisplayName
Norbert Thiebaud (via Code Review)
gerrit at gerrit.libreoffice.org
Thu Jun 13 06:19:56 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4257
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/4257/1
String=>OUString virtual getStateDisplayName
Change-Id: I14263ef9acc64f7738e0532ed8425db30ac5e890
---
M chart2/source/controller/dialogs/dlg_CreationWizard.cxx
M chart2/source/controller/inc/dlg_CreationWizard.hxx
M dbaccess/source/ui/dlg/dbwizsetup.cxx
M dbaccess/source/ui/inc/dbwizsetup.hxx
M extensions/source/abpilot/abspilot.cxx
M extensions/source/abpilot/abspilot.hxx
M include/svtools/roadmapwizard.hxx
M svtools/source/dialogs/roadmapwizard.cxx
M svtools/source/uno/wizard/wizardshell.cxx
M svtools/source/uno/wizard/wizardshell.hxx
M sw/source/ui/dbui/mailmergewizard.cxx
M sw/source/ui/inc/mailmergewizard.hxx
12 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index fd7feb19..d3d8726 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -199,7 +199,7 @@
m_bCanTravel = true;
}
-String CreationWizard::getStateDisplayName( WizardState nState ) const
+OUString CreationWizard::getStateDisplayName( WizardState nState ) const
{
sal_uInt16 nResId = 0;
switch( nState )
@@ -219,7 +219,7 @@
default:
break;
}
- return String(SchResId(nResId));
+ return OUString(SchResId(nResId));
}
//.............................................................................
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index fb394ff..d77e155 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -65,7 +65,7 @@
virtual WizardState determineNextState(WizardState nCurrentState) const;
virtual void enterState(WizardState nState);
- virtual String getStateDisplayName( WizardState nState ) const;
+ virtual OUString getStateDisplayName( WizardState nState ) const;
private:
//no default constructor
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index e14fedf..0b1b85f 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -218,7 +218,7 @@
::svt::RoadmapWizard::declarePath( _nPathId, aPath );
}
-String ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const
+OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const
{
String sRoadmapItem;
switch( _nState )
@@ -281,7 +281,7 @@
default:
break;
}
- return sRoadmapItem;
+ return OUString(sRoadmapItem);
}
//-------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index f9360c8..431d1b8 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -121,7 +121,7 @@
virtual void setTitle(const OUString& _sTitle);
virtual void enableConfirmSettings( bool _bEnable );
virtual sal_Bool saveDatasource();
- virtual String getStateDisplayName( WizardState _nState ) const;
+ virtual OUString getStateDisplayName( WizardState _nState ) const;
/** returns <TRUE/> if the database should be opened, otherwise <FALSE/>.
*/
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 96f1b59..298c24d 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -133,7 +133,7 @@
}
//---------------------------------------------------------------------
- String OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const
+ OUString OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const
{
sal_uInt16 nResId = 0;
switch ( _nState )
@@ -146,11 +146,11 @@
}
DBG_ASSERT( nResId, "OAddessBookSourcePilot::getStateDisplayName: don't know this state!" );
- String sDisplayName;
+ OUString sDisplayName;
if ( nResId )
{
svt::OLocalResourceAccess aAccess( ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ), RSC_MODALDIALOG );
- sDisplayName = String( ModuleRes( nResId ) );
+ sDisplayName = OUString( ModuleRes( nResId ) );
}
return sDisplayName;
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 8982e71..12bc60b 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -75,7 +75,7 @@
virtual sal_Bool onFinish();
// RoadmapWizard
- virtual String getStateDisplayName( WizardState _nState ) const;
+ virtual OUString getStateDisplayName( WizardState _nState ) const;
virtual sal_Bool Close();
diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx
index 35067f1..f92aa08 100644
--- a/include/svtools/roadmapwizard.hxx
+++ b/include/svtools/roadmapwizard.hxx
@@ -203,7 +203,7 @@
this is worth an assertion in a non-product build, and then an empty string is
returned.
*/
- virtual String getStateDisplayName( WizardState _nState ) const;
+ virtual OUString getStateDisplayName( WizardState _nState ) const;
/** creates a page for a given state
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 3b785a0..1c21296 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -581,9 +581,9 @@
}
//--------------------------------------------------------------------
- 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 8250361..8054e4b 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -216,7 +216,7 @@
}
//------------------------------------------------------------------------------------------------------------------
- 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 ae8edcd..a2d1605 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -58,7 +58,7 @@
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*
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index bb7875a..2168766 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -174,9 +174,9 @@
UpdateRoadmap();
}
-String SwMailMergeWizard::getStateDisplayName( WizardState _nState ) const
+OUString SwMailMergeWizard::getStateDisplayName( WizardState _nState ) const
{
- String sRet;
+ OUString sRet;
switch(_nState)
{
case MM_DOCUMENTSELECTPAGE :sRet = m_sStarting; break;
diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/ui/inc/mailmergewizard.hxx
index cb929bb..7ebf669 100644
--- a/sw/source/ui/inc/mailmergewizard.hxx
+++ b/sw/source/ui/inc/mailmergewizard.hxx
@@ -62,7 +62,7 @@
// 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);
--
To view, visit https://gerrit.libreoffice.org/4257
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I14263ef9acc64f7738e0532ed8425db30ac5e890
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud <nthiebaud at gmail.com>
More information about the LibreOffice
mailing list