diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-01-20 10:27:06 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-01-20 10:27:06 +0100 |
commit | ba7e0d7574aa8e4d1d79e9a82082c06d7dfdc1ba (patch) | |
tree | 1639f9ffbb8b1c2d077fc999e46c6448235f71af /dbaccess/source/core/recovery | |
parent | 9a063d325fbaa4677146e8cdd7641e7d10148551 (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 'dbaccess/source/core/recovery')
-rw-r--r-- | dbaccess/source/core/recovery/dbdocrecovery.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/recovery/settingsimport.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/core/recovery/subcomponentrecovery.cxx | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index f1e897764457..8dbf2c77fe19 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -232,7 +232,7 @@ namespace dbaccess continue; // the only section we support so far is "storages" - if ( !sCurrentSection.equalsAscii( "storages" ) ) + if ( !sCurrentSection.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "storages" ) ) ) { bCurrentSectionIsKnownToBeUnsupported = true; continue; diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx index 8ef984f585ee..931ea295f750 100644 --- a/dbaccess/source/core/recovery/settingsimport.cxx +++ b/dbaccess/source/core/recovery/settingsimport.cxx @@ -118,7 +118,7 @@ namespace dbaccess o_rLocalName = i_rElementName.copy( nSeparatorPos + 1 ); } - OSL_ENSURE( o_rNamespace.equalsAscii( "config" ), "SettingsImport::split: unexpected namespace!" ); + OSL_ENSURE( o_rNamespace.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config" ) ), "SettingsImport::split: unexpected namespace!" ); // our recovery file is kind of hand-made, so there shouldn't be anything else than "config". // If there is, then just ignore it ... } @@ -155,7 +155,7 @@ namespace dbaccess ::rtl::OUString sLocalName; split( i_rElementName, sNamespace, sLocalName ); - if ( sLocalName.equalsAscii( "config-item-set" ) ) + if ( sLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config-item-set" ) ) ) return new ConfigItemSetImport( m_rSettings ); #if OSL_DEBUG_LEVEL > 0 @@ -270,9 +270,9 @@ namespace dbaccess ::rtl::OUString sLocalName; split( i_rElementName, sNamespace, sLocalName ); - if ( sLocalName.equalsAscii( "config-item-set" ) ) + if ( sLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config-item-set" ) ) ) return new ConfigItemSetImport( m_aChildSettings ); - if ( sLocalName.equalsAscii( "config-item" ) ) + if ( sLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "config-item" ) ) ) return new ConfigItemImport( m_aChildSettings ); #if OSL_DEBUG_LEVEL > 0 diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index c8c594a6f9cb..88a8f2ef26ad 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -335,7 +335,7 @@ namespace dbaccess if ( m_aStates.empty() ) { - if ( i_Name.equalsAscii( "office:settings" ) ) + if ( i_Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "office:settings" ) ) ) { pNewState = new OfficeSettingsImport( m_aSettings ); } @@ -496,15 +496,15 @@ namespace dbaccess switch ( m_eType ) { case TABLE: - m_aCompDesc.bForEditing = sModuleIdentifier.equalsAscii( "com.sun.star.sdb.TableDesign" ); + m_aCompDesc.bForEditing = sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.TableDesign" ) ); break; case QUERY: - m_aCompDesc.bForEditing = sModuleIdentifier.equalsAscii( "com.sun.star.sdb.QueryDesign" ); + m_aCompDesc.bForEditing = sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.QueryDesign" ) ); break; case REPORT: - if ( sModuleIdentifier.equalsAscii( "com.sun.star.report.ReportDefinition" ) ) + if ( sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.report.ReportDefinition" ) ) ) { // it's an SRB report designer m_aCompDesc.bForEditing = true; @@ -517,7 +517,7 @@ namespace dbaccess break; default: - if ( sModuleIdentifier.equalsAscii( "com.sun.star.sdb.RelationDesign" ) ) + if ( sModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sdb.RelationDesign" ) ) ) { m_eType = RELATION_DESIGN; m_aCompDesc.bForEditing = true; |