equalsAscii -> equalsAsciiL

This commit is contained in:
Caolán McNamara 2011-01-30 17:55:59 +00:00
parent c5baac73f6
commit 27429c46db
3 changed files with 10 additions and 10 deletions

View file

@ -190,13 +190,13 @@ static void add_ugly_db_item( GtkMenuShell *pMenuShell, const char *pAsciiURL,
Sequence < PropertyValue >& aEntry = aMenu[n];
for ( sal_Int32 m=0; m<aEntry.getLength(); m++ )
{
if ( aEntry[m].Name.equalsAsciiL( "URL", 3 ) )
if ( aEntry[m].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) )
aEntry[m].Value >>= aURL;
if ( aEntry[m].Name.equalsAsciiL( "Title", 5 ) )
if ( aEntry[m].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title")) )
aEntry[m].Value >>= aDescription;
}
if ( aURL.equalsAscii( BASE_URL ) && aDescription.getLength() )
if ( aURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(BASE_URL)) && aDescription.getLength() )
{
add_item (pMenuShell, pAsciiURL, &aDescription, nResId, pFnCallback);
break;

View file

@ -112,20 +112,20 @@ static const char s_odfmime [] = "application/vnd.oasis.opendocument.";
static bool isContentFile(::rtl::OUString const & i_rPath)
{
return i_rPath.equalsAscii(s_content);
return i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_content));
}
static bool isStylesFile (::rtl::OUString const & i_rPath)
{
return i_rPath.equalsAscii(s_styles);
return i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_styles));
}
static bool isReservedFile(::rtl::OUString const & i_rPath)
{
return isContentFile(i_rPath)
|| isStylesFile(i_rPath)
|| i_rPath.equalsAscii(s_meta)
|| i_rPath.equalsAscii(s_settings);
|| i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_meta))
|| i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_settings));
}
////////////////////////////////////////////////////////////////////////////

View file

@ -127,12 +127,12 @@ static const char s_prefix [] = "id"; // prefix for generated xml:id
static bool isContentFile(::rtl::OUString const & i_rPath)
{
return i_rPath.equalsAscii(s_content);
return i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_content));
}
static bool isStylesFile (::rtl::OUString const & i_rPath)
{
return i_rPath.equalsAscii(s_styles);
return i_rPath.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_styles));
}
@ -405,7 +405,7 @@ template< typename T >
::std::hash_map< ::rtl::OUString, T, ::rtl::OUStringHash > & i_rXmlIdMap)
{
static rtlRandomPool s_Pool( rtl_random_createPool() );
const ::rtl::OUString prefix( ::rtl::OUString::createFromAscii(s_prefix) );
const ::rtl::OUString prefix(RTL_CONSTASCII_USTRINGPARAM(s_prefix));
typename ::std::hash_map< ::rtl::OUString, T, ::rtl::OUStringHash >
::const_iterator iter;
::rtl::OUString id;