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 /editeng/source/uno | |
| parent | fd0ecb1897cfe0e5083cd1525f3600bcd8c516fc (diff) | |
XubString->OUString
Change-Id: I32c867e43bfb50a57261414107caae60f616d703
Diffstat (limited to 'editeng/source/uno')
| -rw-r--r-- | editeng/source/uno/unoedprx.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/uno/unofored.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/uno/unoforou.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/uno/unotext.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index a91b8f3cbebf..8430cac918ba 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -663,7 +663,7 @@ SfxItemPool* SvxAccessibleTextAdapter::GetPool() const return mrTextForwarder->GetPool(); } -XubString SvxAccessibleTextAdapter::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ) +OUString SvxAccessibleTextAdapter::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ) { DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder"); diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index 39d2012be8aa..d2056e8a1a0d 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -154,7 +154,7 @@ sal_Bool SvxEditEngineForwarder::IsValid() const return rEditEngine.GetUpdateMode(); } -XubString SvxEditEngineForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ) +OUString SvxEditEngineForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ) { return rEditEngine.CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor ); } diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index f320851da662..3f37cfe5f19f 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -226,7 +226,7 @@ void SvxOutlinerForwarder::QuickSetAttribs( const SfxItemSet& rSet, const ESelec rOutliner.QuickSetAttribs( rSet, rSel ); } -XubString SvxOutlinerForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ) +OUString SvxOutlinerForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor ) { return rOutliner.CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor ); } diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index c29240d0dbe3..9a956c1390b2 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -2502,9 +2502,9 @@ void SvxDummyTextSource::QuickInsertLineBreak( const ESelection& ) { }; -XubString SvxDummyTextSource::CalcFieldValue( const SvxFieldItem&, sal_uInt16, sal_uInt16, Color*&, Color*& ) +OUString SvxDummyTextSource::CalcFieldValue( const SvxFieldItem&, sal_uInt16, sal_uInt16, Color*&, Color*& ) { - return XubString(); + return OUString(); } void SvxDummyTextSource::FieldClicked( const SvxFieldItem&, sal_uInt16, xub_StrLen ) |