diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-11 13:52:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-11 14:31:44 +0100 |
| commit | cf6a74af5340c2c4fbf270a95bad12479524d9d4 (patch) | |
| tree | 5d9bdbbdf54f15d0649c66009d86c08aeef27bb7 /reportdesign | |
| parent | 8197518497ce5c538ea5db85168614f6025de2b5 (diff) | |
XubString->OUString
Change-Id: I1049249741f445ad7bd9c070f99812c4404597c9
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 201093267276..4db90b4ab878 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -138,7 +138,7 @@ protected: virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const; virtual sal_Bool SeekRow( long nRow ); virtual sal_Bool SaveModified(); - virtual String GetCellText( long nRow, sal_uInt16 nColId ) const; + virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const; virtual RowStatus GetRowStatus(long nRow) const; virtual void KeyInput(const KeyEvent& rEvt); @@ -490,10 +490,10 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow) return sal_True; } //------------------------------------------------------------------------------ -String OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) const +OUString OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) const { DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL); - String sText; + OUString sText; if ( nRow != BROWSER_ENDOFSELECTION && m_aGroupPositions[nRow] != NO_GROUP ) { try @@ -510,9 +510,9 @@ String OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) break; } } - sText = sExpression; + sText = sExpression; } - catch(uno::Exception&) + catch (const uno::Exception&) { OSL_FAIL("Exception caught while getting expression value from the group"); } |