diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-14 08:34:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-14 14:34:09 +0100 |
| commit | c182a752412aab354aaf02ee0c75b7cb1ee35d66 (patch) | |
| tree | e4ee080ed6a7c5f665a33c52ad9d1e3a56b6031b /reportdesign | |
| parent | 28062c62818ce40c17fb67b480612f8bb9bcd522 (diff) | |
convert GetComment family to rtl::OUString
Change-Id: I563ab83a24ca4f839892548b350486e83dd071d3
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/inc/UndoActions.hxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/UndoActions.cxx | 5 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/RptUndo.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/RptUndo.cxx | 7 |
4 files changed, 9 insertions, 9 deletions
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index f63613ac6473..fbdb23843d10 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -186,7 +186,7 @@ namespace rptui ,sal_uInt16 nCommentID); virtual ~OCommentUndoAction(); - virtual UniString GetComment() const { return m_strComment; } + virtual rtl::OUString GetComment() const { return m_strComment; } virtual void Undo(); virtual void Redo(); }; @@ -292,7 +292,7 @@ namespace rptui virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; //================================================================== diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 36873ea80522..26bbb70b78ed 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -401,15 +401,14 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld) } } -//------------------------------------------------------------------------------ -String ORptUndoPropertyAction::GetComment() const +rtl::OUString ORptUndoPropertyAction::GetComment() const { String aStr(ModuleRes(RID_STR_UNDO_PROPERTY)); aStr.SearchAndReplace( '#', m_aPropertyName ); return aStr; } -// ----------------------------------------------------------------------------- + OUndoPropertyGroupSectionAction::OUndoPropertyGroupSectionAction(SdrModel& _rMod ,const PropertyChangeEvent& evt ,::std::mem_fun_t< uno::Reference< report::XSection > diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index 504de5216457..81d887860beb 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -132,7 +132,7 @@ namespace rptui ,Action _eAction ,sal_uInt16 nCommentID); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; /** /class OGroupUndo diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index ee5e01aad9c1..a57002bc7c2f 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -287,7 +287,7 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot } } //---------------------------------------------------------------------------- -String OGroupSectionUndo::GetComment() const +rtl::OUString OGroupSectionUndo::GetComment() const { if ( m_sName.isEmpty() ) { @@ -298,8 +298,9 @@ String OGroupSectionUndo::GetComment() const if ( xSection.is() ) m_sName = xSection->getName(); } - catch(uno::Exception&) - {} + catch (const uno::Exception&) + { + } } return m_strComment + m_sName; } |