summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.cxx2
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard.hxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx4
-rw-r--r--dbaccess/source/ui/inc/dbwizsetup.hxx2
-rw-r--r--extensions/source/abpilot/abspilot.cxx4
-rw-r--r--extensions/source/abpilot/abspilot.hxx2
-rw-r--r--include/svtools/roadmapwizard.hxx4
-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
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx2
-rw-r--r--sw/source/ui/inc/mailmergewizard.hxx2
12 files changed, 17 insertions, 17 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 4a8a2c180323..74c069501f69 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -196,7 +196,7 @@ void CreationWizard::setValidPage( TabPage * /* pTabPage */ )
m_bCanTravel = true;
}
-String CreationWizard::getStateDisplayName( WizardState nState ) const
+OUString CreationWizard::getStateDisplayName( WizardState nState ) const
{
sal_uInt16 nResId = 0;
switch( nState )
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index ecc84a169cb0..d5d1b9dee23e 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -63,7 +63,7 @@ protected:
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 86b2c998354c..3b52da5bd7ab 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -218,9 +218,9 @@ void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _n
::svt::RoadmapWizard::declarePath( _nPathId, aPath );
}
-String ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const
+OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const
{
- String sRoadmapItem;
+ OUString sRoadmapItem;
switch( _nState )
{
case PAGE_DBSETUPWIZARD_INTRO:
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 706abdc56b9a..fa35c499ad2e 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -121,7 +121,7 @@ public:
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 c213b7b1dd8b..a20ca1c4dd7b 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -133,7 +133,7 @@ namespace abp
}
//---------------------------------------------------------------------
- String OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const
+ OUString OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const
{
sal_uInt16 nResId = 0;
switch ( _nState )
@@ -146,7 +146,7 @@ namespace abp
}
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 );
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 8982e71010cb..12bc60be5d4c 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -75,7 +75,7 @@ namespace abp
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 27ad86bcf16b..d93cb742b949 100644
--- a/include/svtools/roadmapwizard.hxx
+++ b/include/svtools/roadmapwizard.hxx
@@ -123,7 +123,7 @@ protected:
The given display name is used in the default implementation of getStateDisplayName,
and the given factory is used in the default implementation of createPage.
*/
- void describeState( WizardState _nState, const String& _rStateDisplayName, RoadmapPageFactory _pPageFactory );
+ void describeState( WizardState _nState, const OUString& _rStateDisplayName, RoadmapPageFactory _pPageFactory );
/** activates a path which has previously been declared with <member>declarePath</member>
@@ -203,7 +203,7 @@ protected:
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 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*
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index bb7875a80d75..e5cc3b9cd94c 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -174,7 +174,7 @@ void SwMailMergeWizard::enterState( WizardState _nState )
UpdateRoadmap();
}
-String SwMailMergeWizard::getStateDisplayName( WizardState _nState ) const
+OUString SwMailMergeWizard::getStateDisplayName( WizardState _nState ) const
{
String sRet;
switch(_nState)
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);
generated by cgit (git 2.34.1) at 2025-02-15 04:01:23 +0000