summaryrefslogtreecommitdiff
path: root/reportdesign/source
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/source')
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx36
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlFormattedField.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.cxx8
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx14
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx8
9 files changed, 46 insertions, 46 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 85940c1605fc..e715ed56bc08 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1799,7 +1799,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue
aStorageSource <<= sURL;
else
throw lang::IllegalArgumentException(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "No input source (URL or InputStream) found." ) ),
+ OUString( "No input source (URL or InputStream) found." ),
// TODO: resource
*this,
1
@@ -2112,7 +2112,7 @@ void SAL_CALL OReportDefinition::setMimeType( const OUString& _mimetype ) throw
uno::Sequence< OUString > aList = getAvailableMimeTypes();
const OUString* pEnd = aList.getConstArray()+aList.getLength();
if ( ::std::find(aList.getConstArray(),pEnd,_mimetype) == pEnd )
- throwIllegallArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("getAvailableMimeTypes()"))
+ throwIllegallArgumentException(OUString("getAvailableMimeTypes()")
,*this
,1
,m_aProps->m_xContext);
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 57ac5aaecbff..6a7ad00e66e3 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -120,10 +120,10 @@ SvXMLImportContext* OXMLCell::CreateChildContext(
}
break;
case XML_TOK_PAGE_NUMBER:
- m_sText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()"));
+ m_sText += s_sStringConcat + OUString(" PageNumber()");
break;
case XML_TOK_PAGE_COUNT:
- m_sText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()"));
+ m_sText += s_sStringConcat + OUString(" PageCount()");
break;
case XML_TOK_FORMATTED_TEXT:
{
@@ -258,7 +258,7 @@ void OXMLCell::Characters( const OUString& rChars )
{
if ( !rChars.isEmpty() )
{
- static const OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\""));
+ static const OUString s_Quote("\"");
if ( !m_sText.isEmpty() )
{
static const OUString s_sStringConcat(" & ");
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 713611fbe1ba..60a93cbf3d89 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -293,14 +293,14 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext,sal_uInt
GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_TEXT_PARAGRAPH, sFamily,
m_xParaPropMapper, aPrefix );
- GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)),
- m_xCellStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)));
- GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)),
- m_xColumnStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)));
- GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)),
- m_xRowStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)));
- GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)),
- m_xTableStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX)));
+ GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME),
+ m_xCellStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX));
+ GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME),
+ m_xColumnStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX));
+ GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME),
+ m_xRowStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX));
+ GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME),
+ m_xTableStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX));
}
// -----------------------------------------------------------------------------
Reference< XInterface > ORptExport::create(Reference< XComponentContext > const & xContext)
@@ -1027,8 +1027,8 @@ OUString ORptExport::convertFormula(const OUString& _sFormula)
bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula)
{
const OUString sFieldData = convertFormula(_sFormula);
- static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()"));
- static const OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()"));
+ static const OUString s_sPageNumber("PageNumber()");
+ static const OUString s_sPageCount("PageCount()");
sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber);
sal_Int32 nPageCountIndex = sFieldData.indexOf(s_sPageCount);
bool bRet = nPageNumberIndex != -1 || nPageCountIndex != -1;
@@ -1086,20 +1086,20 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef
OUString sExpression = sField;
if ( !sExpression.isEmpty() )
{
- static OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\""));
+ static OUString s_sQuote("\"\"");
sal_Int32 nIndex = sExpression.indexOf('"');
while ( nIndex > -1 )
{
sExpression = sExpression.replaceAt(nIndex,1,s_sQuote);
nIndex = sExpression.indexOf('"',nIndex+2);
}
- OUString sFormula(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\""));
+ OUString sFormula("rpt:HASCHANGED(\"");
TGroupFunctionMap::iterator aGroupFind = m_aGroupFunctionMap.find(xGroup);
if ( aGroupFind != m_aGroupFunctionMap.end() )
sExpression = aGroupFind->second->getName();
sFormula += sExpression;
- sFormula += OUString(RTL_CONSTASCII_USTRINGPARAM("\")"));
+ sFormula += OUString("\")");
sExpression = sFormula;
}
AddAttribute(XML_NAMESPACE_REPORT, XML_SORT_EXPRESSION, sField);
@@ -1425,8 +1425,8 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor
if ( Reference<XFormattedField>(_xReportElement,uno::UNO_QUERY).is() )
{
OUString sFieldData = _xReportElement->getDataField();
- static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()"));
- static const OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()"));
+ static const OUString s_sPageNumber("PageNumber()");
+ static const OUString s_sPageCount("PageCount()");
static const OUString s_sReportPrefix("rpt:");
sFieldData = sFieldData.copy(s_sReportPrefix.getLength(),sFieldData.getLength() - s_sReportPrefix.getLength());
sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber);
@@ -1543,7 +1543,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
break;
case report::GroupOn::QUARTAL:
sFunction = OUString("INT((MONTH");
- sPostfix = OUString(RTL_CONSTASCII_USTRINGPARAM("-1)/3)+1"));
+ sPostfix = OUString("-1)/3)+1");
sFunctionName = OUString("QUARTAL_") + sExpression;
break;
case report::GroupOn::MONTH:
@@ -1573,7 +1573,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
sExpression = sCountName;
// The reference to sCountName in the formula of sFunctionName refers to the *old* value
// so we need to expand the the formula of sCountName
- sPrefix = OUString(RTL_CONSTASCII_USTRINGPARAM(" + 1) / ")) + OUString::valueOf(xGroup->getGroupInterval());
+ sPrefix = OUString(" + 1) / ") + OUString::valueOf(xGroup->getGroupInterval());
sFunctionName = sFunction + OUString("_") + sExpression;
sFunction = sFunction + OUString("(");
sInitialFormula = OUString("rpt:0");
@@ -1600,7 +1600,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
if ( !sPrefix.isEmpty() )
sFunction += sPrefix;
- sFunction += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
+ sFunction += OUString(")");
if ( !sPostfix.isEmpty() )
sFunction += sPostfix;
xFunction->setFormula(sFunction);
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 2a89840d0a7b..ba3bab90cb01 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -167,11 +167,11 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
0x0020, sal_True );
break;
case XML_TOK_PAGE_NUMBER:
- m_sPageText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()"));
+ m_sPageText += s_sStringConcat + OUString(" PageNumber()");
m_bFormattedField = true;
break;
case XML_TOK_PAGE_COUNT:
- m_sPageText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()"));
+ m_sPageText += s_sStringConcat + OUString(" PageCount()");
m_bFormattedField = true;
break;
default:
@@ -215,7 +215,7 @@ void OXMLFixedContent::Characters( const OUString& rChars )
m_sLabel += rChars;
if ( !rChars.isEmpty() )
{
- static const OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\""));
+ static const OUString s_Quote("\"");
if ( !m_sPageText.isEmpty() )
{
static const OUString s_sStringConcat(" & ");
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 7e074d05c0e5..31c262ffa13f 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -66,7 +66,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
break;
case XML_TOK_SELECT_PAGE:
{
- static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageNumber()"));
+ static const OUString s_sPageNumber("rpt:PageNumber()");
_xComponent->setDataField(s_sPageNumber);
}
break;
@@ -76,7 +76,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
}
if ( _bPageCount )
{
- static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageCount()"));
+ static const OUString s_sPageNumber("rpt:PageCount()");
_xComponent->setDataField(s_sPageNumber);
}
}
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 9a521952b0c5..6fc2f92018e0 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -94,15 +94,15 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
if ( nLen )
{
- const static OUString s_sChanged(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\""));
+ const static OUString s_sChanged("rpt:HASCHANGED(\"");
sal_Int32 nPos = sValue.indexOf(s_sChanged);
if ( nPos == -1 )
nPos = 5;
else
{
nPos = s_sChanged.getLength();
- static OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\""));
- static OUString s_sSingleQuote(RTL_CONSTASCII_USTRINGPARAM("\""));
+ static OUString s_sQuote("\"\"");
+ static OUString s_sSingleQuote("\"");
sal_Int32 nIndex = sValue.indexOf(s_sQuote,nPos);
while ( nIndex > -1 )
{
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 1898e502ce1b..4b80bcf1bbea 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -167,10 +167,10 @@ OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
const Reference< XAttributeList > & xAttrList,
const sal_Bool bTempAutoStyles ) :
SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ),
- m_sTableStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))),
- m_sColumnStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))),
- m_sRowStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))),
- m_sCellStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ))),
+ m_sTableStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )),
+ m_sColumnStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )),
+ m_sRowStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME )),
+ m_sCellStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME )),
m_rImport(rImport),
m_nNumberFormatIndex(-1),
bAutoStyles(bTempAutoStyles)
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index b469499f6f7c..ece222b96789 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1875,7 +1875,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference<
xub_StrLen end = sFormula.Len();
if ( aTextSearch.SearchFrwrd(sFormula,&start,&end) && start == 0 && end == sFormula.Len()) // default function found
{
- aSearchOptions.searchString = OUString(RTL_CONSTASCII_USTRINGPARAM("\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"));
+ aSearchOptions.searchString = OUString("\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]");
utl::TextSearch aDataSearch(aSearchOptions);
aDataSearch.SearchFrwrd(sFormula,&start,&end );
++start;
@@ -1902,7 +1902,7 @@ void GeometryHandler::loadDefaultFunctions()
m_aCounterFunction.m_bDeepTraversing = sal_False;
m_aCounterFunction.m_sName = String(ModuleRes(RID_STR_F_COUNTER));
m_aCounterFunction.m_sFormula = OUString("rpt:[%FunctionName] + 1");
- m_aCounterFunction.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*"));
+ m_aCounterFunction.m_sSearchString = OUString("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*");
m_aCounterFunction.m_sInitialFormula.IsPresent = sal_True;
m_aCounterFunction.m_sInitialFormula.Value = OUString("rpt:1");
@@ -1913,21 +1913,21 @@ void GeometryHandler::loadDefaultFunctions()
aDefault.m_sName = String(ModuleRes(RID_STR_F_ACCUMULATION));
aDefault.m_sFormula = OUString("rpt:[%Column] + [%FunctionName]");
- aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"));
+ aDefault.m_sSearchString = OUString("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]");
aDefault.m_sInitialFormula.IsPresent = sal_True;
aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]");
m_aDefaultFunctions.push_back(aDefault);
aDefault.m_sName = String(ModuleRes(RID_STR_F_MINIMUM));
- aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])"));
- aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"));
+ aDefault.m_sFormula = OUString("rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])");
+ aDefault.m_sSearchString = OUString("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)");
aDefault.m_sInitialFormula.IsPresent = sal_True;
aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]");
m_aDefaultFunctions.push_back(aDefault);
aDefault.m_sName = String(ModuleRes(RID_STR_F_MAXIMUM));
- aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])"));
- aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"));
+ aDefault.m_sFormula = OUString("rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])");
+ aDefault.m_sSearchString = OUString("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)");
aDefault.m_sInitialFormula.IsPresent = sal_True;
aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]");
m_aDefaultFunctions.push_back(aDefault);
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index aa56679522ec..66fe96caffa3 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3253,13 +3253,13 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs)
sal_Bool bDate = aMap.getUnpackedValueOrDefault(PROPERTY_DATE_STATE,sal_False);
if ( bDate )
{
- sFunction = OUString (RTL_CONSTASCII_USTRINGPARAM("TODAY()"));
+ sFunction = OUString ("TODAY()");
createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction);
}
sal_Bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE,sal_False);
if ( bTime )
{
- sFunction = OUString (RTL_CONSTASCII_USTRINGPARAM("TIMEVALUE(NOW())"));
+ sFunction = OUString ("TIMEVALUE(NOW())");
aMap[PROPERTY_FORMATKEY] <<= aMap.getUnpackedValueOrDefault(PROPERTY_FORMATKEYTIME,sal_Int32(0));
createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction);
}
@@ -3282,12 +3282,12 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
sal_Bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False);
String sFunction = String(ModuleRes(STR_RPT_PN_PAGE));
- OUString sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()"));
+ OUString sPageNumber("PageNumber()");
sFunction.SearchAndReplace(OUString("#PAGENUMBER#"),sPageNumber);
if ( bStateOfPage )
{
- OUString sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()"));
+ OUString sPageCount("PageCount()");
sFunction += String(ModuleRes(STR_RPT_PN_PAGE_OF));
sFunction.SearchAndReplace(OUString("#PAGECOUNT#"),sPageCount);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 09:50:41 +0000