From 705c48d32eec0aa5180e60ca157daca4b154e4a3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 3 Nov 2014 14:03:54 +0200 Subject: fdo#38835 strip out OUString globals they are largely unnecessary these days, since our OUString infrastructure gained optimised handling for static char constants. Change-Id: I07f73484f82d0582252cb4324d4107c998432c37 --- reportdesign/source/core/api/ReportDefinition.cxx | 2 +- reportdesign/source/core/api/ReportEngineJFree.cxx | 6 ++--- reportdesign/source/core/misc/reportformula.cxx | 31 +++++++--------------- reportdesign/source/filter/xml/xmlCell.cxx | 11 ++++---- reportdesign/source/filter/xml/xmlExport.cxx | 16 +++++------ .../source/filter/xml/xmlExportDocumentHandler.cxx | 12 ++++----- reportdesign/source/filter/xml/xmlFixedContent.cxx | 11 ++++---- .../source/filter/xml/xmlFormattedField.cxx | 4 +-- reportdesign/source/filter/xml/xmlGroup.cxx | 8 +++--- .../source/filter/xml/xmlImportDocumentHandler.cxx | 2 +- reportdesign/source/filter/xml/xmlfilter.cxx | 10 +++---- 11 files changed, 49 insertions(+), 64 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 571095a3ac66..6deca0ae05f4 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1455,7 +1455,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS uno::Reference< beans::XPropertySet> xProp(_xStorageToSaveTo,uno::UNO_QUERY); if ( xProp.is() ) { - static const OUString sPropName("MediaType"); + static const char sPropName[] = "MediaType"; OUString sOldMediaType; xProp->getPropertyValue(sPropName) >>= sOldMediaType; if ( !xProp->getPropertyValue(sPropName).hasValue() || sOldMediaType.isEmpty() || MIMETYPE_OASIS_OPENDOCUMENT_REPORT != sOldMediaType ) diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 924f146ac95c..304dee782c75 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -163,7 +163,7 @@ OUString OReportEngineJFree::getNewOutputName() if ( !m_xReport.is() || !m_xActiveConnection.is() ) throw lang::IllegalArgumentException(); - static const OUString s_sMediaType("MediaType"); + static const char s_sMediaType[] = "MediaType"; try { MimeConfigurationHelper aConfighelper(m_xContext); @@ -229,11 +229,11 @@ OUString OReportEngineJFree::getNewOutputName() OUStringBuffer sAuthor(aUserOpts.GetFirstName()); sAuthor.appendAscii(" "); sAuthor.append(aUserOpts.GetLastName()); - static const OUString s_sAuthor("Author"); + static const char s_sAuthor[] = "Author"; aConvertedProperties[nPos].Name = s_sAuthor; aConvertedProperties[nPos++].Value <<= sAuthor.makeStringAndClear(); - static const OUString s_sTitle("Title"); + static const char s_sTitle[] = "Title"; aConvertedProperties[nPos].Name = s_sTitle; aConvertedProperties[nPos++].Value <<= m_xReport->getCaption(); diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index 0b53d279f1a1..77d24b853751 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -31,22 +31,8 @@ namespace rptui namespace { - const OUString& lcl_getExpressionPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) - { - static OUString s_sPrefix( "rpt:" ); - if ( _pTakeLengthOrNull ) - *_pTakeLengthOrNull = s_sPrefix.getLength(); - return s_sPrefix; - } - - - const OUString& lcl_getFieldPrefix( sal_Int32* _pTakeLengthOrNull = NULL ) - { - static OUString s_sPrefix( "field:" ); - if ( _pTakeLengthOrNull ) - *_pTakeLengthOrNull = s_sPrefix.getLength(); - return s_sPrefix; - } + static const char sExpressionPrefix[] = "rpt:"; + static const char sFieldPrefix[] = "field:"; } @@ -67,17 +53,17 @@ namespace rptui { case Expression: { - if ( _rFieldOrExpression.startsWith( lcl_getExpressionPrefix() ) ) + if ( _rFieldOrExpression.startsWith( sExpressionPrefix ) ) m_sCompleteFormula = _rFieldOrExpression; else - m_sCompleteFormula = lcl_getExpressionPrefix() + _rFieldOrExpression; + m_sCompleteFormula = sExpressionPrefix + _rFieldOrExpression; } break; case Field: { OUStringBuffer aBuffer; - aBuffer.append( lcl_getFieldPrefix() ); + aBuffer.append( sFieldPrefix ); aBuffer.appendAscii( "[" ); aBuffer.append( _rFieldOrExpression ); aBuffer.appendAscii( "]" ); @@ -100,18 +86,19 @@ namespace rptui { m_sCompleteFormula = _rFormula; - sal_Int32 nPrefixLen( -1 ); // is it an ordinary expression? - if ( m_sCompleteFormula.startsWith( lcl_getExpressionPrefix( &nPrefixLen ) ) ) + if ( m_sCompleteFormula.startsWith( sExpressionPrefix ) ) { + sal_Int32 nPrefixLen = strlen(sExpressionPrefix); m_eType = Expression; m_sUndecoratedContent = m_sCompleteFormula.copy( nPrefixLen ); return; } /// does it refer to a field? - if ( m_sCompleteFormula.startsWith( lcl_getFieldPrefix( &nPrefixLen ) ) ) + if ( m_sCompleteFormula.startsWith( sFieldPrefix ) ) { + sal_Int32 nPrefixLen = strlen(sFieldPrefix); if ( ( m_sCompleteFormula.getLength() >= nPrefixLen + 2 ) && ( m_sCompleteFormula[ nPrefixLen ] == '[' ) && ( m_sCompleteFormula[ m_sCompleteFormula.getLength() - 1 ] == ']' ) diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index d7e7c8df4d41..a5f4a436ce7c 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -105,7 +105,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( ORptFilter& rImport = GetOwnImport(); const SvXMLTokenMap& rTokenMap = rImport.GetCellElemTokenMap(); Reference xFactor(rImport.GetModel(),uno::UNO_QUERY); - static const OUString s_sStringConcat(" & "); + static const char s_sStringConcat[] = " & "; const sal_uInt16 nToken = rTokenMap.Get( _nPrefix, _rLocalName ); switch( nToken ) @@ -117,10 +117,10 @@ SvXMLImportContext* OXMLCell::CreateChildContext( } break; case XML_TOK_PAGE_NUMBER: - m_sText += s_sStringConcat + " PageNumber()"; + m_sText += OUString(s_sStringConcat) + " PageNumber()"; break; case XML_TOK_PAGE_COUNT: - m_sText += s_sStringConcat + " PageCount()"; + m_sText += OUString(s_sStringConcat) + " PageCount()"; break; case XML_TOK_FORMATTED_TEXT: { @@ -257,11 +257,10 @@ void OXMLCell::Characters( const OUString& rChars ) { if ( !rChars.isEmpty() ) { - static const OUString s_Quote("\""); + static const char s_Quote[] = "\""; if ( !m_sText.isEmpty() ) { - static const OUString s_sStringConcat(" & "); - m_sText += s_sStringConcat; + m_sText += " & "; } m_sText += s_Quote + rChars + s_Quote; diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index fd844617d6dc..b89d68715722 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1010,8 +1010,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("PageNumber()"); - static const OUString s_sPageCount("PageCount()"); + static const char s_sPageNumber[] = "PageNumber()"; + static const char s_sPageCount[] = "PageCount()"; sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); sal_Int32 nPageCountIndex = sFieldData.indexOf(s_sPageCount); bool bRet = nPageNumberIndex != -1 || nPageCountIndex != -1; @@ -1069,7 +1069,7 @@ bool ORptExport::exportGroup(const Reference& _xReportDefinit OUString sExpression = sField; if ( !sExpression.isEmpty() ) { - static OUString s_sQuote("\"\""); + static const char s_sQuote[] = "\"\""; sal_Int32 nIndex = sExpression.indexOf('"'); while ( nIndex > -1 ) { @@ -1407,10 +1407,10 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor if ( Reference(_xReportElement,uno::UNO_QUERY).is() ) { OUString sFieldData = _xReportElement->getDataField(); - 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()); + static const char s_sPageNumber[] = "PageNumber()"; + static const char s_sPageCount[] = "PageCount()"; + static const char s_sReportPrefix[] = "rpt:"; + sFieldData = sFieldData.copy(strlen(s_sReportPrefix), sFieldData.getLength() - strlen(s_sReportPrefix)); sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); if ( nPageNumberIndex != -1 ) { @@ -1423,7 +1423,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor { if ( sToken == s_sPageNumber ) { - static const OUString s_sCurrent("current"); + static const char s_sCurrent[] = "current"; AddAttribute(XML_NAMESPACE_TEXT, XML_SELECT_PAGE, s_sCurrent ); SvXMLElementExport aPageNumber(*this,XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, false, false); Characters(OUString("1")); diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 7973b073286c..6742e34bf82d 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -43,7 +43,7 @@ void lcl_exportPrettyPrinting(const uno::Reference< xml::sax::XDocumentHandler > SvtSaveOptions aSaveOpt; if ( aSaveOpt.IsPrettyPrinting() ) { - static const OUString s_sWhitespaces(" "); + static const char s_sWhitespaces[] = " "; _xDelegatee->ignorableWhitespace(s_sWhitespaces); } } @@ -279,7 +279,7 @@ void SAL_CALL ExportDocumentHandler::characters(const OUString & aChars) throw ( } else if ( m_bExportChar ) { - static const OUString s_sZero("0"); + static const char s_sZero[] = "0"; m_xDelegatee->characters(s_sZero); } } @@ -367,16 +367,16 @@ void ExportDocumentHandler::exportTableRows() const OUString sValueType( lcl_createAttribute(XML_NP_OFFICE, XML_VALUE_TYPE) ); - const static OUString s_sFieldPrefix("field:["); - const static OUString s_sFieldPostfix("]"); + static const char s_sFieldPrefix[] = "field:["; + static const char s_sFieldPostfix[] = "]"; const OUString sCell( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_CELL) ); const OUString sP( lcl_createAttribute(XML_NP_TEXT, XML_P) ); const OUString sFtext(lcl_createAttribute(XML_NP_RPT,XML_FORMATTED_TEXT) ); const OUString sRElement(lcl_createAttribute(XML_NP_RPT,XML_REPORT_ELEMENT) ); const OUString sRComponent( lcl_createAttribute(XML_NP_RPT,XML_REPORT_COMPONENT) ) ; const OUString sFormulaAttrib( lcl_createAttribute(XML_NP_RPT,XML_FORMULA) ); - const static OUString s_sString("string"); - const static OUString s_sFloat("float"); + static const char s_sString[] = "string"; + static const char s_sFloat[] = "float"; SvXMLAttributeList* pCellAtt = new SvXMLAttributeList(); uno::Reference< xml::sax::XAttributeList > xCellAtt = pCellAtt; diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 34bd41f2abec..5cc8fe1b0774 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -135,7 +135,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext( if ( pContext ) return pContext; - static const OUString s_sStringConcat(" & "); + static const char s_sStringConcat[] = " & "; const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap(); Reference xContext = m_rImport.GetComponentContext(); @@ -164,11 +164,11 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext( 0x0020, true ); break; case XML_TOK_PAGE_NUMBER: - m_sPageText += s_sStringConcat + " PageNumber()"; + m_sPageText += OUString(s_sStringConcat) + " PageNumber()"; m_bFormattedField = true; break; case XML_TOK_PAGE_COUNT: - m_sPageText += s_sStringConcat + " PageCount()"; + m_sPageText += OUString(s_sStringConcat) + " PageCount()"; m_bFormattedField = true; break; default: @@ -212,11 +212,10 @@ void OXMLFixedContent::Characters( const OUString& rChars ) m_sLabel += rChars; if ( !rChars.isEmpty() ) { - static const OUString s_Quote("\""); + static const char s_Quote[] = "\""; if ( !m_sPageText.isEmpty() ) { - static const OUString s_sStringConcat(" & "); - m_sPageText += s_sStringConcat; + m_sPageText += " & "; } m_sPageText += s_Quote + rChars + s_Quote; diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index cc0a95a1d00e..47053d3a8137 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -64,7 +64,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, break; case XML_TOK_SELECT_PAGE: { - static const OUString s_sPageNumber("rpt:PageNumber()"); + static const char s_sPageNumber[] = "rpt:PageNumber()"; _xComponent->setDataField(s_sPageNumber); } break; @@ -74,7 +74,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, } if ( _bPageCount ) { - static const OUString s_sPageNumber("rpt:PageCount()"); + static const char 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 3670a4ab9f2d..ec34bb5749b8 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -92,15 +92,15 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport if ( nLen ) { - const static OUString s_sChanged("rpt:HASCHANGED(\""); + static const char 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("\"\""); - static OUString s_sSingleQuote("\""); + nPos = strlen(s_sChanged); + static const char s_sQuote[] = "\"\""; + static const char s_sSingleQuote[] = "\""; sal_Int32 nIndex = sValue.indexOf(s_sQuote,nPos); while ( nIndex > -1 ) { diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 193279a31300..0dde198e802e 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -355,7 +355,7 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY); if ( !m_xDatabaseDataProvider.is() ) { - const static OUString s_sDatabaseDataProvider("com.sun.star.chart2.data.DatabaseDataProvider"); + static const char s_sDatabaseDataProvider[] = "com.sun.star.chart2.data.DatabaseDataProvider"; m_xDatabaseDataProvider.set(m_xContext->getServiceManager()->createInstanceWithContext(s_sDatabaseDataProvider ,m_xContext),uno::UNO_QUERY); if ( !m_xDatabaseDataProvider.is() ) diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 316dd66f8c37..364c784e41f0 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -505,7 +505,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) aArgs[0] <<= beans::NamedValue(OUString("Storage"),uno::makeAny(xStorage)); xEmbeddedObjectResolver.set( xReportServiceFactory->createInstanceWithArguments(OUString("com.sun.star.document.ImportEmbeddedObjectResolver"),aArgs) , uno::UNO_QUERY); - static const OUString s_sOld("OldFormat"); + static const char s_sOld[] = "OldFormat"; static comphelper::PropertyMapEntry const pMap[] = { { OUString("OldFormat") , 1, cppu::UnoType::get(), beans::PropertyAttribute::BOUND, 0 }, @@ -523,9 +523,9 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) xProp->setPropertyValue("StreamRelPath", uno::makeAny(sHierarchicalDocumentName)); uno::Reference xModel(GetModel(),UNO_QUERY); - static const OUString s_sMeta("meta.xml"); - static const OUString s_sStreamName("StreamName"); - xProp->setPropertyValue(s_sStreamName, uno::makeAny(s_sMeta)); + static const char s_sMeta[] = "meta.xml"; + static const char s_sStreamName[] = "StreamName"; + xProp->setPropertyValue(s_sStreamName, uno::makeAny(OUString(s_sMeta))); sal_Int32 nRet = ReadThroughComponent( xStorage ,xModel ,"meta.xml" @@ -1047,7 +1047,7 @@ bool ORptFilter::isOldFormat() const uno::Reference xProp = getImportInfo(); if ( xProp.is() ) { - const static OUString s_sOld("OldFormat"); + static const char s_sOld[] = "OldFormat"; if ( xProp->getPropertySetInfo()->hasPropertyByName(s_sOld)) { xProp->getPropertyValue(s_sOld) >>= bOldFormat; -- cgit