diff options
Diffstat (limited to 'reportdesign/source/ui')
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index ed0944ac4668..6e5a30947a1b 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -702,8 +702,8 @@ void Condition::fillFormatCondition(const uno::Reference< report::XFormatConditi void Condition::setConditionIndex( size_t _nCondIndex, size_t _nCondCount ) { m_nCondIndex = _nCondIndex; - String sHeader( ModuleRes( STR_NUMBERED_CONDITION ) ); - sHeader.SearchAndReplaceAscii( "$number$", String::CreateFromInt32( _nCondIndex + 1 ) ); + OUString sHeader( ModuleRes( STR_NUMBERED_CONDITION ) ); + sHeader = sHeader.replaceFirst( "$number$", OUString::number( _nCondIndex + 1) ); m_aHeader.SetText( sHeader ); m_aMoveUp.Enable( _nCondIndex > 0 ); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index fe4c5cd19279..c60bd113567f 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -157,7 +157,7 @@ ODesignView::~ODesignView() } if ( m_pReportExplorer ) { - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_NAVIGATOR ) ); + SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_NAVIGATOR) ); aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -508,7 +508,7 @@ void ODesignView::toggleReportExplorer() { OReportController& rReportController = getController(); m_pReportExplorer = new ONavigator(this,rReportController); - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_NAVIGATOR ) ); + SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_NAVIGATOR) ); if ( aDlgOpt.Exists() ) m_pReportExplorer->SetWindowState(rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pReportExplorer->AddEventListener(LINK(&rReportController,OReportController,EventLstHdl)); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index e8ab953af5a2..79fb2890483f 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -342,7 +342,7 @@ void OReportController::disposing() } if ( m_pGroupsFloater ) { - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_GROUPS_SORTING ) ); + SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_GROUPS_SORTING ) ); aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<FloatingWindow> aTemp(m_pGroupsFloater); @@ -2546,7 +2546,7 @@ void OReportController::openSortingAndGroupingDialog() if ( !m_pGroupsFloater ) { m_pGroupsFloater = new OGroupsSortingDialog(getView(),!isEditable(),this); - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_GROUPS_SORTING ) ); + SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_GROUPS_SORTING) ); if ( aDlgOpt.Exists() ) m_pGroupsFloater->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pGroupsFloater->AddEventListener(LINK(this,OReportController,EventLstHdl)); @@ -2752,7 +2752,7 @@ uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeExcept ::std::vector<sal_uInt16>::iterator aEnd = aCollapsedPositions.end(); for (sal_Int32 i = 1; aIter != aEnd ; ++aIter,++pCollapsedIter,++i) { - pCollapsedIter->Name = PROPERTY_SECTION + ::rtl::OUString::valueOf(i); + pCollapsedIter->Name = PROPERTY_SECTION + OUString::number(i); pCollapsedIter->Value <<= static_cast<sal_Int32>(*aIter); } |