diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-04 23:58:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-09 12:16:56 +0100 |
| commit | 104261010aa5ccbb7df4a82a3a3cafcfb0591fa7 (patch) | |
| tree | b8db79d2707ff5925ad01dba8a41bd8ab6d66847 /reportdesign | |
| parent | 1a1e953ee33c213dc8b88dd96a69ca9fc5e42d50 (diff) | |
some UniString->rtl::OUString
Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/sdr/UndoActions.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/SectionWindow.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index eb278b75beb5..d986f47ea1ba 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -401,9 +401,9 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld) rtl::OUString ORptUndoPropertyAction::GetComment() const { - String aStr(ModuleRes(RID_STR_UNDO_PROPERTY)); + String aStr(ModuleRes(RID_STR_UNDO_PROPERTY).toString()); - aStr.SearchAndReplace( '#', m_aPropertyName ); + aStr.SearchAndReplace(rtl::OUString('#'), m_aPropertyName); return aStr; } diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 91f122dc0ac6..9f3ce57bf259 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -300,7 +300,7 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1 m_xParaPropMapper = new OSpecialHanldeXMLExportPropertyMapper( xPropMapper); ::rtl::OUString sFamily( GetXMLToken(XML_PARAGRAPH) ); - ::rtl::OUString aPrefix( String( 'P' ) ); + ::rtl::OUString aPrefix( 'P'); GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_TEXT_PARAGRAPH, sFamily, m_xParaPropMapper, aPrefix ); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 49c21d3803b2..1633f61ae79b 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -366,7 +366,7 @@ void OFieldExpressionControl::lateInit() aFont.SetWeight( WEIGHT_LIGHT ); SetFont(aFont); - InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth('0') * 4)/*, sal_True */); + InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(rtl::OUString('0')) * 4)/*, sal_True */); InsertDataColumn( FIELD_EXPRESSION, String(ModuleRes(STR_RPT_EXPRESSION)), 100); m_pComboCell = new ComboBoxControl( &GetDataWindow() ); diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index cadea38eafcf..5b6c0ad6c54c 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -195,8 +195,8 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& sExpression = sLabel; } - String sTitle = String(ModuleRes(_nResId)); - sTitle.SearchAndReplace('#',sExpression); + String sTitle = ModuleRes(_nResId).toString(); + sTitle.SearchAndReplace(rtl::OUString('#') ,sExpression); m_aStartMarker.setTitle(sTitle); m_aStartMarker.Invalidate(INVALIDATE_CHILDREN); } |