summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/inc/scabstdlg.hxx14
-rw-r--r--sc/inc/scextopt.hxx6
-rw-r--r--sc/inc/scmod.hxx6
-rw-r--r--sc/inc/strload.hxx4
-rw-r--r--sc/inc/styleuno.hxx4
-rw-r--r--sc/source/ui/app/scmod.cxx6
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx14
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx14
-rw-r--r--sc/source/ui/unoobj/styleuno.cxx4
-rw-r--r--sc/source/ui/view/cellsh1.cxx2
-rw-r--r--sc/source/ui/view/scextopt.cxx8
11 files changed, 41 insertions, 41 deletions
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index acfa824c821e..03bc58dcb8d7 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -66,7 +66,7 @@ class AbstractScAutoFormatDlg : public VclAbstractDialog
{
public:
virtual sal_uInt16 GetIndex() const = 0 ;
- virtual String GetCurrFormatName() = 0;
+ virtual OUString GetCurrFormatName() = 0;
};
class AbstractScColRowLabelDlg : public VclAbstractDialog
@@ -103,11 +103,11 @@ public:
class AbstractScDataPilotServiceDlg : public VclAbstractDialog
{
public:
- virtual String GetServiceName() const = 0;
- virtual String GetParSource() const = 0 ;
- virtual String GetParName() const = 0 ;
- virtual String GetParUser() const = 0;
- virtual String GetParPass() const = 0;
+ virtual OUString GetServiceName() const = 0;
+ virtual OUString GetParSource() const = 0 ;
+ virtual OUString GetParName() const = 0 ;
+ virtual OUString GetParUser() const = 0;
+ virtual OUString GetParPass() const = 0;
};
class AbstractScDeleteCellDlg : public VclAbstractDialog
@@ -138,7 +138,7 @@ public:
virtual double GetStart() const = 0;
virtual double GetStep() const = 0;
virtual double GetMax() const = 0;
- virtual String GetStartStr() const = 0;
+ virtual OUString GetStartStr() const = 0;
virtual void SetEdStartValEnabled(sal_Bool bFlag=false) = 0;
};
diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx
index 33e5a268b693..a4893cf17309 100644
--- a/sc/inc/scextopt.hxx
+++ b/sc/inc/scextopt.hxx
@@ -28,7 +28,7 @@
/** Extended settings for the document, used in import/export filters. */
struct ScExtDocSettings
{
- String maGlobCodeName; ///< Global codename (VBA module name).
+ OUString maGlobCodeName; ///< Global codename (VBA module name).
double mfTabBarWidth; ///< Width of the tabbar, relative to frame window width (0.0 ... 1.0).
sal_uInt32 mnLinkCnt; ///< Recursive counter for loading external documents.
SCTAB mnDisplTab; ///< Index of displayed sheet.
@@ -102,9 +102,9 @@ public:
/** @return the number of sheet codenames. */
SCTAB GetCodeNameCount() const;
/** @return the specified codename (empty string = no codename). */
- const String& GetCodeName( SCTAB nTab ) const;
+ const OUString& GetCodeName( SCTAB nTab ) const;
/** Appends a codename for a sheet. */
- void SetCodeName( SCTAB nTab, const String& rCodeName );
+ void SetCodeName( SCTAB nTab, const OUString& rCodeName );
private:
::std::auto_ptr< ScExtDocOptionsImpl > mxImpl;
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index f15b054a70b0..a2ae5ec2d1a9 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -216,9 +216,9 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO
// communication with function-autopilot
void InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd );
void InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd );
- void InputReplaceSelection( const String& rStr );
- String InputGetFormulaStr();
- void ActivateInputWindow( const String* pStr = NULL,
+ void InputReplaceSelection( const OUString& rStr );
+ OUString InputGetFormulaStr();
+ void ActivateInputWindow( const OUString* pStr = NULL,
sal_Bool bMatrix = false );
void InitFormEditData();
diff --git a/sc/inc/strload.hxx b/sc/inc/strload.hxx
index 85273ee7b734..9607dc86e9af 100644
--- a/sc/inc/strload.hxx
+++ b/sc/inc/strload.hxx
@@ -32,10 +32,10 @@ public:
FreeResource();
}
- const String& GetString() const { return theStr; }
+ const OUString& GetString() const { return theStr; }
private:
- String theStr;
+ OUString theStr;
};
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 29ab960a1515..a3c894553b34 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -218,13 +218,13 @@ private:
ScStyleObj(); // disabled
public:
- ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName);
+ ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rName);
virtual ~ScStyleObj();
// created by getImplementation:
sal_Bool IsInserted() const { return pDocShell != NULL; }
SfxStyleFamily GetFamily() const { return eFamily; }
- void InitDoc( ScDocShell* pNewDocSh, const String& rNewName );
+ void InitDoc( ScDocShell* pNewDocSh, const OUString& rNewName );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 6c2cd27dd214..146c4df26633 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1536,14 +1536,14 @@ void ScModule::InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd )
pHdl->InputSetSelection( nStart, nEnd );
}
-void ScModule::InputReplaceSelection( const String& rStr )
+void ScModule::InputReplaceSelection( const OUString& rStr )
{
ScInputHandler* pHdl = GetInputHdl();
if (pHdl)
pHdl->InputReplaceSelection( rStr );
}
-String ScModule::InputGetFormulaStr()
+OUString ScModule::InputGetFormulaStr()
{
ScInputHandler* pHdl = GetInputHdl();
String aStr;
@@ -1552,7 +1552,7 @@ String ScModule::InputGetFormulaStr()
return aStr;
}
-void ScModule::ActivateInputWindow( const String* pStrFormula, sal_Bool bMatrix )
+void ScModule::ActivateInputWindow( const OUString* pStrFormula, sal_Bool bMatrix )
{
ScInputHandler* pHdl = GetInputHdl();
if ( pHdl )
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 7a4529d37e01..494204719505 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -165,7 +165,7 @@ sal_uInt16 AbstractScAutoFormatDlg_Impl::GetIndex() const
return pDlg->GetIndex();
}
-String AbstractScAutoFormatDlg_Impl::GetCurrFormatName()
+OUString AbstractScAutoFormatDlg_Impl::GetCurrFormatName()
{
return pDlg->GetCurrFormatName();
}
@@ -210,27 +210,27 @@ void AbstractScDataPilotSourceTypeDlg_Impl::AppendNamedRange(const OUString& rNa
pDlg->AppendNamedRange(rName);
}
-String AbstractScDataPilotServiceDlg_Impl::GetServiceName() const
+OUString AbstractScDataPilotServiceDlg_Impl::GetServiceName() const
{
return pDlg->GetServiceName();
}
-String AbstractScDataPilotServiceDlg_Impl::GetParSource() const
+OUString AbstractScDataPilotServiceDlg_Impl::GetParSource() const
{
return pDlg->GetParSource();
}
-String AbstractScDataPilotServiceDlg_Impl::GetParName() const
+OUString AbstractScDataPilotServiceDlg_Impl::GetParName() const
{
return pDlg->GetParName();
}
-String AbstractScDataPilotServiceDlg_Impl::GetParUser() const
+OUString AbstractScDataPilotServiceDlg_Impl::GetParUser() const
{
return pDlg->GetParUser();
}
-String AbstractScDataPilotServiceDlg_Impl::GetParPass() const
+OUString AbstractScDataPilotServiceDlg_Impl::GetParPass() const
{
return pDlg->GetParPass();
}
@@ -280,7 +280,7 @@ double AbstractScFillSeriesDlg_Impl::GetMax() const
return pDlg->GetMax();
}
-String AbstractScFillSeriesDlg_Impl::GetStartStr() const
+OUString AbstractScFillSeriesDlg_Impl::GetStartStr() const
{
return pDlg->GetStartStr();
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 134ae403bd6a..49d328c71319 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -116,7 +116,7 @@ class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg
{
DECL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl, ScAutoFormatDlg)
virtual sal_uInt16 GetIndex() const;
- virtual String GetCurrFormatName();
+ virtual OUString GetCurrFormatName();
};
class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg
@@ -154,11 +154,11 @@ class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTy
class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg
{
DECL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl, ScDataPilotServiceDlg)
- virtual String GetServiceName() const;
- virtual String GetParSource() const;
- virtual String GetParName() const;
- virtual String GetParUser() const;
- virtual String GetParPass() const;
+ virtual OUString GetServiceName() const;
+ virtual OUString GetParSource() const;
+ virtual OUString GetParName() const;
+ virtual OUString GetParUser() const;
+ virtual OUString GetParPass() const;
};
class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg
@@ -189,7 +189,7 @@ class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg
virtual double GetStart() const;
virtual double GetStep() const;
virtual double GetMax() const;
- virtual String GetStartStr() const;
+ virtual OUString GetStartStr() const;
virtual void SetEdStartValEnabled(sal_Bool bFlag=false);
};
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index eaf2c0562b75..88af941cc8a6 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -940,7 +940,7 @@ void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, c
// Default-ctor wird fuer die Reflection gebraucht
-ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName) :
+ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rName) :
pPropSet( (eFam == SFX_STYLE_FAMILY_PARA) ? lcl_GetCellStyleSet() : lcl_GetPageStyleSet() ),
pDocShell( pDocSh ),
eFamily( eFam ),
@@ -952,7 +952,7 @@ ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rN
pDocShell->GetDocument()->AddUnoObject(*this);
}
-void ScStyleObj::InitDoc( ScDocShell* pNewDocSh, const String& rNewName )
+void ScStyleObj::InitDoc( ScDocShell* pNewDocSh, const OUString& rNewName )
{
if ( pNewDocSh && !pDocShell )
{
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 933cf6e5863b..03f969de7bc4 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1779,7 +1779,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if ( pOkItem->GetValue() ) // OK
{
- String aFormula;
+ OUString aFormula;
const SfxStringItem* pSItem = (const SfxStringItem*)&pReqArgs->Get( SCITEM_STRING );
const SfxBoolItem* pMatrixItem = (const SfxBoolItem*) &pReqArgs->Get( SID_DLG_MATRIX );
diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
index 39670cae829c..4390d4604e31 100644
--- a/sc/source/ui/view/scextopt.cxx
+++ b/sc/source/ui/view/scextopt.cxx
@@ -121,7 +121,7 @@ void ScExtTabSettingsCont::CopyFromMap( const ScExtTabSettingsMap& rMap )
/** Implementation struct for ScExtDocOptions containing all members. */
struct ScExtDocOptionsImpl
{
- typedef ::std::vector< String > StringVec;
+ typedef ::std::vector< OUString > StringVec;
ScExtDocSettings maDocSett; /// Global document settings.
ScExtTabSettingsCont maTabSett; /// Settings for all sheets.
@@ -193,13 +193,13 @@ SCTAB ScExtDocOptions::GetCodeNameCount() const
return static_cast< SCTAB >( mxImpl->maCodeNames.size() );
}
-const String& ScExtDocOptions::GetCodeName( SCTAB nTab ) const
+const OUString& ScExtDocOptions::GetCodeName( SCTAB nTab ) const
{
OSL_ENSURE( (0 <= nTab) && (nTab < GetCodeNameCount()), "ScExtDocOptions::GetCodeName - invalid sheet index" );
- return ((0 <= nTab) && (nTab < GetCodeNameCount())) ? mxImpl->maCodeNames[ static_cast< size_t >( nTab ) ] : EMPTY_STRING;
+ return ((0 <= nTab) && (nTab < GetCodeNameCount())) ? mxImpl->maCodeNames[ static_cast< size_t >( nTab ) ] : EMPTY_OUSTRING;
}
-void ScExtDocOptions::SetCodeName( SCTAB nTab, const String& rCodeName )
+void ScExtDocOptions::SetCodeName( SCTAB nTab, const OUString& rCodeName )
{
OSL_ENSURE( nTab >= 0, "ScExtDocOptions::SetCodeName - invalid sheet index" );
if( nTab >= 0 )
generated by cgit (git 2.34.1) at 2025-02-27 01:16:47 +0000