diff options
author | Noel Grandin <noel@peralex.com> | 2013-11-19 15:58:58 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-20 10:07:31 +0200 |
commit | 3af99e4d59d89c343965a928681a30f36b1007d2 (patch) | |
tree | 2389765131bdb92817e98bc922ffecbf0184d69b /reportdesign | |
parent | d665e058246631c8a838c3a731bdd0c56be27903 (diff) |
convert equalsAsciiL calls to startsWith calls
Convert code like:
aStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ActiveConnection" ) )
to
aStr.startsWith( "ActiveConnection" )
which compiles down to the same machine code.
Change-Id: Id4b0c5e0f9afe716a468d3afc70374699848dc33
Diffstat (limited to 'reportdesign')
3 files changed, 19 insertions, 19 deletions
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 6e91557511f1..1136de1e4ea9 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -195,7 +195,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const { m_bCountColumnHeader = true; } - else if ( m_bCountColumnHeader && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell")) ) + else if ( m_bCountColumnHeader && _sName.startsWith("table:table-cell") ) { ++m_nColumnCount; } @@ -207,7 +207,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const m_bTableRowsStarted = true; m_bFirstRowExported = true; } - else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) ) + else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.startsWith("table:table-row") || _sName.startsWith("table:table-cell")) ) bExport = false; else if ( _sName == "chart:plot-area" ) { @@ -224,13 +224,13 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const static OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS)); lcl_correctCellAddress(s_sCellAddress,xAttribs); } - else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell")) ) + else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.startsWith("table:table-cell") ) { SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs); static OUString s_sValue(lcl_createAttribute(XML_NP_OFFICE,XML_VALUE)); pList->RemoveAttribute(s_sValue); } - else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text:p")) ) + else if ( m_bTableRowsStarted && _sName.startsWith("text:p") ) { bExport = false; } @@ -258,11 +258,11 @@ void SAL_CALL ExportDocumentHandler::endElement(const OUString & _sName) throw ( } else if ( _sName == "table:table-rows" ) m_bTableRowsStarted = false; - else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) ) + else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.startsWith("table:table-row") || _sName.startsWith("table:table-cell")) ) bExport = false; - else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) ) + else if ( m_bTableRowsStarted && _sName.startsWith("table:table-row") ) m_bFirstRowExported = true; - else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text:p")) ) + else if ( m_bTableRowsStarted && _sName.startsWith("text:p") ) { bExport = !m_bFirstRowExported; } diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index ddad2e36e02f..88fe4339e7a3 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -249,11 +249,11 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const } bExport = false; } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:detail")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:formatted-text")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-fields")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-component")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-element"))) + else if ( _sName.startsWith("rpt:detail") + || _sName.startsWith("rpt:formatted-text") + || _sName.startsWith("rpt:master-detail-fields") + || _sName.startsWith("rpt:report-component") + || _sName.startsWith("rpt:report-element")) bExport = false; else if ( _sName == "chart:plot-area" ) { @@ -274,7 +274,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const if ( sLocalName == "data-source-has-labels" ) { const OUString sValue = _xAttrList->getValueByIndex( i ); - bHasCategories = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("both")); + bHasCategories = sValue.startsWith("both"); break; } } @@ -316,11 +316,11 @@ void SAL_CALL ImportDocumentHandler::endElement(const OUString & _sName) throw ( m_xDatabaseDataProvider->setDetailFields(uno::Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size())); bExport = false; } - else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:detail")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:formatted-text")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-field")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-component")) - || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:report-element"))) + else if ( _sName.startsWith("rpt:detail") + || _sName.startsWith("rpt:formatted-text") + || _sName.startsWith("rpt:master-detail-field") + || _sName.startsWith("rpt:report-component") + || _sName.startsWith("rpt:report-element")) bExport = false; if ( bExport ) diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index e0dd8c8ed262..a81f390d8a6e 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -180,7 +180,7 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments m_aStates.insert(TCommandState::value_type(OUString(".uno:CharFontName"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox)); } - else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FontColor")) || m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Color")) ) + else if ( m_aCommandURL.startsWith(".uno:FontColor") || m_aCommandURL.startsWith(".uno:Color") ) { m_aStates.insert(TCommandState::value_type(OUString(".uno:FontColor"),sal_True)); m_aStates.insert(TCommandState::value_type(OUString(".uno:Color"),sal_True)); |