summaryrefslogtreecommitdiff
path: root/reportdesign/source/filter/xml
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-01-20 10:27:06 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-01-20 10:27:06 +0100
commitba7e0d7574aa8e4d1d79e9a82082c06d7dfdc1ba (patch)
tree1639f9ffbb8b1c2d077fc999e46c6448235f71af /reportdesign/source/filter/xml
parent9a063d325fbaa4677146e8cdd7641e7d10148551 (diff)
Replace suitable equalsAscii calls with equalsAsciiL.
Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.
Diffstat (limited to 'reportdesign/source/filter/xml')
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx36
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx36
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx8
4 files changed, 41 insertions, 41 deletions
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 6e717557aca8..c156b7ffd58e 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -82,7 +82,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
switch( rTokenMap.Get( nPrefix, sLocalName ) )
{
case XML_TOK_LIST_PROPERTY:
- m_bIsList = sValue.equalsAscii("true");
+ m_bIsList = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true"));
break;
case XML_TOK_VALUE_TYPE:
{
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index d02795d61123..166ba87db540 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -159,7 +159,7 @@ void SAL_CALL ExportDocumentHandler::endDocument() throw (uno::RuntimeException,
void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException)
{
bool bExport = true;
- if ( _sName.equalsAscii("office:chart") )
+ if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:chart")) )
{
SvXMLAttributeList* pList = new SvXMLAttributeList();
uno::Reference< xml::sax::XAttributeList > xNewAttribs = pList;
@@ -202,20 +202,20 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
m_xDelegatee->endElement(sTableCalc);
bExport = false;
}
- else if ( _sName.equalsAscii("table:table") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table")) )
{
m_xDelegatee->startElement(lcl_createAttribute(XML_NP_RPT,XML_DETAIL),NULL);
lcl_exportPrettyPrinting(m_xDelegatee);
}
- else if ( _sName.equalsAscii("table:table-header-rows") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-header-rows")) )
{
m_bCountColumnHeader = true;
}
- else if ( m_bCountColumnHeader && _sName.equalsAscii("table:table-cell") )
+ else if ( m_bCountColumnHeader && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell")) )
{
++m_nColumnCount;
}
- else if ( _sName.equalsAscii("table:table-rows") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-rows")) )
{
m_xDelegatee->startElement(_sName,xAttribs);
exportTableRows();
@@ -223,30 +223,30 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
m_bTableRowsStarted = true;
m_bFirstRowExported = true;
}
- else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAscii("table:table-row") || _sName.equalsAscii("table:table-cell")) )
+ else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) )
bExport = false;
- else if ( _sName.equalsAscii("chart:plot-area"))
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:plot-area")))
{
SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
pList->RemoveAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")));
}
- else if ( _sName.equalsAscii("chart:categories"))
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:categories")))
{
static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_TABLE,XML_CELL_RANGE_ADDRESS));
lcl_correctCellAddress(s_sCellAddress,xAttribs);
}
- else if ( _sName.equalsAscii("chart:series"))
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:series")))
{
static ::rtl::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.equalsAscii("table:table-cell") )
+ else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell")) )
{
SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
static ::rtl::OUString s_sValue(lcl_createAttribute(XML_NP_OFFICE,XML_VALUE));
pList->RemoveAttribute(s_sValue);
}
- else if ( m_bTableRowsStarted && _sName.equalsAscii("text:p") )
+ else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text:p")) )
{
bExport = false;
}
@@ -258,27 +258,27 @@ void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName)
{
bool bExport = true;
::rtl::OUString sNewName = _sName;
- if ( _sName.equalsAscii("office:chart") )
+ if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:chart")) )
{
sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_REPORT);
}
- else if ( _sName.equalsAscii("table:table") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table")) )
{
m_xDelegatee->endElement(_sName);
lcl_exportPrettyPrinting(m_xDelegatee);
sNewName = lcl_createAttribute(XML_NP_RPT,XML_DETAIL);
}
- else if ( _sName.equalsAscii("table:table-header-rows") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-header-rows")) )
{
m_bCountColumnHeader = false;
}
- else if ( _sName.equalsAscii("table:table-rows") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-rows")) )
m_bTableRowsStarted = false;
- else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAscii("table:table-row") || _sName.equalsAscii("table:table-cell")) )
+ else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) || _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-cell"))) )
bExport = false;
- else if ( m_bTableRowsStarted && _sName.equalsAscii("table:table-row") )
+ else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("table:table-row")) )
m_bFirstRowExported = true;
- else if ( m_bTableRowsStarted && _sName.equalsAscii("text:p") )
+ else if ( m_bTableRowsStarted && _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text:p")) )
{
bExport = !m_bFirstRowExported;
}
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 6d7237b60b6d..a0f883c8ad2a 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -149,7 +149,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
{
uno::Reference< xml::sax::XAttributeList > xNewAttribs = _xAttrList;
bool bExport = true;
- if ( _sName.equalsAscii("office:report") )
+ if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:report")) )
{
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
@@ -197,7 +197,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
bExport = false;
m_bImportedChart = true;
}
- else if ( _sName.equalsAscii("rpt:master-detail-field") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-field")) )
{
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
@@ -237,13 +237,13 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
}
bExport = false;
}
- else if ( _sName.equalsAscii("rpt:detail")
- || _sName.equalsAscii("rpt:formatted-text")
- || _sName.equalsAscii("rpt:master-detail-fields")
- || _sName.equalsAscii("rpt:report-component")
- || _sName.equalsAscii("rpt:report-element"))
+ 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")))
bExport = false;
- else if ( _sName.equalsAscii("chart:plot-area"))
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("chart:plot-area")))
{
sal_Bool bHasCategories = sal_True;
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
@@ -257,10 +257,10 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
sLocalName = sAttrName;
else
sLocalName = sAttrName.copy( nColonPos + 1L );
- if ( sLocalName.equalsAscii("data-source-has-labels") )
+ if ( sLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("data-source-has-labels")) )
{
const rtl::OUString sValue = _xAttrList->getValueByIndex( i );
- bHasCategories = sValue.equalsAscii("both");
+ bHasCategories = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("both"));
break;
}
}
@@ -268,7 +268,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
beans::PropertyValue* pArgEnd = pArgIter + m_aArguments.getLength();
for(;pArgIter != pArgEnd;++pArgIter)
{
- if ( pArgIter->Name.equalsAscii("HasCategories") )
+ if ( pArgIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HasCategories")) )
{
pArgIter->Value <<= bHasCategories;
break;
@@ -290,11 +290,11 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName)
{
bool bExport = true;
::rtl::OUString sNewName = _sName;
- if ( _sName.equalsAscii("office:report") )
+ if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:report")) )
{
sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_CHART);
}
- else if ( _sName.equalsAscii("rpt:master-detail-fields") )
+ else if ( _sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("rpt:master-detail-fields")) )
{
if ( !m_aMasterFields.empty() )
m_xDatabaseDataProvider->setMasterFields(uno::Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
@@ -302,11 +302,11 @@ void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName)
m_xDatabaseDataProvider->setDetailFields(uno::Sequence< ::rtl::OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
bExport = false;
}
- else if ( _sName.equalsAscii("rpt:detail")
- || _sName.equalsAscii("rpt:formatted-text")
- || _sName.equalsAscii("rpt:master-detail-field")
- || _sName.equalsAscii("rpt:report-component")
- || _sName.equalsAscii("rpt:report-element"))
+ 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")))
bExport = false;
if ( bExport )
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 9d1b2fd717f4..a7a756ecc3f0 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -482,11 +482,11 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
const PropertyValue* pEnd = pIter + rDescriptor.getLength();
for(;pIter != pEnd;++pIter)
{
- if( pIter->Name.equalsAscii( "FileName" ) )
+ if( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileName" ) ) )
pIter->Value >>= sFileName;
- else if( pIter->Name.equalsAscii( "Storage" ) )
+ else if( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Storage" ) ) )
pIter->Value >>= xStorage;
- else if( pIter->Name.equalsAscii( "ComponentData" ) )
+ else if( pIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ComponentData" ) ) )
{
Sequence< PropertyValue > aComponent;
pIter->Value >>= aComponent;
@@ -494,7 +494,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
const PropertyValue* pComponentEnd = pComponentIter + aComponent.getLength();
for(;pComponentIter != pComponentEnd;++pComponentIter)
{
- if( pComponentIter->Name.equalsAscii( "ActiveConnection" ) )
+ if( pComponentIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ActiveConnection" ) ) )
{
uno::Reference<sdbc::XConnection> xCon(pComponentIter->Value,uno::UNO_QUERY);
xNumberFormatsSupplier = ::dbtools::getNumberFormats(xCon);