diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-04-26 10:08:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-26 10:36:48 +0100 |
| commit | e22825fe361f89a40758a0e34ee844c141bdb273 (patch) | |
| tree | 550e3d87af0243935245bb0be69b4abecdfbc32c /sc | |
| parent | fd0ecb1897cfe0e5083cd1525f3600bcd8c516fc (diff) | |
XubString->OUString
Change-Id: I32c867e43bfb50a57261414107caae60f616d703
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/editutil.hxx | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/editutil.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/fielduno.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index f18c094a9079..6734ff741f2c 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -213,7 +213,7 @@ public: void SetExecuteURL(bool bSet) { bExecuteURL = bSet; } virtual void FieldClicked( const SvxFieldItem& rField, sal_uInt16, sal_uInt16 ); - virtual String CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); }; @@ -225,7 +225,7 @@ private: public: ScHeaderEditEngine( SfxItemPool* pEnginePool, sal_Bool bDeleteEnginePool = false ); - virtual String CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; } void SetData(const ScHeaderFieldData& rNew) { aData = rNew; } diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 790fc7de0f68..2659625db59b 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -679,7 +679,7 @@ ScHeaderEditEngine::ScHeaderEditEngine( SfxItemPool* pEnginePoolP, sal_Bool bDel { } -String ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, +OUString ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 /* nPara */, sal_uInt16 /* nPos */, Color*& /* rTxtColor */, Color*& /* rFldColor */ ) { @@ -749,7 +749,7 @@ ScFieldEditEngine::ScFieldEditEngine( SetControlWord( (GetControlWord() | EE_CNTRL_MARKFIELDS) & ~EE_CNTRL_RTFSTYLESHEETS ); } -String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, +OUString ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 /* nPara */, sal_uInt16 /* nPos */, Color*& rTxtColor, Color*& /* rFldColor */ ) { diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 9fd7f1c81fb3..40ea98353f88 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -182,7 +182,7 @@ public: ~ScUnoEditEngine(); //! nPos should be xub_StrLen - virtual String CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, + virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ); sal_uInt16 CountFields(); @@ -213,10 +213,10 @@ ScUnoEditEngine::~ScUnoEditEngine() delete pFound; } -String ScUnoEditEngine::CalcFieldValue( const SvxFieldItem& rField, +OUString ScUnoEditEngine::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor ) { - String aRet(EditEngine::CalcFieldValue( rField, nPara, nPos, rTxtColor, rFldColor )); + OUString aRet(EditEngine::CalcFieldValue( rField, nPara, nPos, rTxtColor, rFldColor )); if (eMode != SC_UNO_COLLECT_NONE) { const SvxFieldData* pFieldData = rField.GetField(); |