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 /svx | |
| parent | fd0ecb1897cfe0e5083cd1525f3600bcd8c516fc (diff) | |
XubString->OUString
Change-Id: I32c867e43bfb50a57261414107caae60f616d703
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/accessibility/AccessibleEmptyEditSource.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdoutl.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 778f67fda9c6..43b952c1dcee 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -128,9 +128,9 @@ namespace accessibility //XTextCopy void CopyText(const SvxTextForwarder& ){} - XubString CalcFieldValue( const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ ) + OUString CalcFieldValue( const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ ) { - return XubString(); + return OUString(); } void FieldClicked( const SvxFieldItem&, sal_uInt16, xub_StrLen ) {;} diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index f7bd33e70725..da979b29b67c 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -74,7 +74,7 @@ void SdrOutliner::SetTextObjNoInit( const SdrTextObj* pObj ) mpTextObj.reset( const_cast< SdrTextObj* >(pObj) ); } -XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, +OUString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor) { bool bOk = false; |