Kaydet (Commit) 8b110102 authored tarafından Caolán McNamara's avatar Caolán McNamara

drop toString

Change-Id: I0f67c8931523bbe90bfbc8cc7d9a5bd523758ee5
üst 19e3af45
......@@ -383,7 +383,7 @@ void ORptUndoPropertyAction::setProperty(bool _bOld)
OUString ORptUndoPropertyAction::GetComment() const
{
OUString aStr( ModuleRes(RID_STR_UNDO_PROPERTY).toString() );
OUString aStr( ModuleRes(RID_STR_UNDO_PROPERTY) );
return aStr.replaceFirst("#", m_aPropertyName);
}
......
......@@ -1751,7 +1751,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out
else if ( xSection == xReportDefinition->getDetail() )
nPos = xGroups->getCount()-1;
const OUString sGroup = ModuleRes(RID_STR_SCOPE_GROUP).toString();
const OUString sGroup = ModuleRes(RID_STR_SCOPE_GROUP);
for (sal_Int32 i = 0 ; i <= nPos ; ++i)
{
xGroup.set(xGroups->getByIndex(i),uno::UNO_QUERY_THROW);
......@@ -1778,7 +1778,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS
const uno::Reference< report::XGroup> xGroup(xSection->getGroup(),uno::UNO_QUERY);
if ( xGroup.is() )
{
OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP).toString();
OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
_rsNamePostfix = xGroup->getExpression();
m_sScope = sGroupName.replaceFirst("%1",_rsNamePostfix);
xReturn = xGroup.get();
......
......@@ -2906,7 +2906,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
// our first message says: we caught an exception
sdb::SQLContext aFirstMessage;
OUString sInfo(ModuleRes(RID_STR_CAUGHT_FOREIGN_EXCEPTION).toString());
OUString sInfo(ModuleRes(RID_STR_CAUGHT_FOREIGN_EXCEPTION));
sInfo = sInfo.replaceAll("$type$", aCaughtException.getValueTypeName());
aFirstMessage.Message = sInfo;
......@@ -3261,12 +3261,12 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
SequenceAsHashMap aMap(_aArgs);
bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE, false);
OUString sFunction( ModuleRes(STR_RPT_PN_PAGE).toString() );
OUString sFunction( ModuleRes(STR_RPT_PN_PAGE) );
sFunction = sFunction.replaceFirst("#PAGENUMBER#", "PageNumber()");
if ( bStateOfPage )
{
sFunction += ModuleRes(STR_RPT_PN_PAGE_OF).toString();
sFunction += ModuleRes(STR_RPT_PN_PAGE_OF);
sFunction = sFunction.replaceFirst("#PAGECOUNT#", "PageCount()");
}
......
......@@ -191,7 +191,8 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>&
sExpression = sLabel;
}
OUString sTitle( ModuleRes(_nResId).toString() );
ModuleRes aRes(_nResId);
OUString sTitle(aRes);
sTitle = sTitle.replaceFirst("#", sExpression);
m_aStartMarker->setTitle( sTitle );
m_aStartMarker->Invalidate(InvalidateFlags::Children);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment