diff options
Diffstat (limited to 'hwpfilter/source/hwpreader.cxx')
| -rw-r--r-- | hwpfilter/source/hwpreader.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index ba4c0f0b5821..71fd82d5e5f8 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -128,12 +128,12 @@ throw(SAXException, IOException, RuntimeException) Reference< XInputStream> rInputStream; for ( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ ) { - if ( aDescriptor[i].Name == OUString::createFromAscii( "InputStream" ) ) + if ( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) ) { aDescriptor[i].Value >>= rInputStream; break; } - else if ( aDescriptor[i].Name == OUString::createFromAscii( "URL" ) ) + else if ( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ) { OUString sURL; aDescriptor[i].Value >>= sURL; @@ -3208,25 +3208,25 @@ void HwpReader::makeFieldCode(FieldCode *hbox) /* ???????? */ else if( hbox->type[0] == 3 && hbox->type[1] == 0 ) { - if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("title"))) + if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("title")))) { rstartEl( ascii("text:title"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:title") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("subject"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("subject")))) { rstartEl( ascii("text:subject"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:subject") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("author"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("author")))) { rstartEl( ascii("text:author-name"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:author-name") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("keywords"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("keywords")))) { rstartEl( ascii("text:keywords"), rList ); rchars( hconv(hbox->str2, gstr) ); @@ -3236,61 +3236,61 @@ void HwpReader::makeFieldCode(FieldCode *hbox) /* ???????? */ else if( hbox->type[0] == 3 && hbox->type[1] == 1 ) { - if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("User"))) + if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("User")))) { rstartEl( ascii("text:sender-lastname"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:sender-lastname") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Company"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Company")))) { rstartEl( ascii("text:sender-company"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:sender-company") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Position"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Position")))) { rstartEl( ascii("text:sender-title"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:sender-title") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Division"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Division")))) { rstartEl( ascii("text:sender-position"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:sender-position") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Fax"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Fax")))) { rstartEl( ascii("text:sender-fax"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:sender-fax") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Pager"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Pager")))) { rstartEl( ascii("text:phone-private"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:phone-private") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("E-mail"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("E-mail")))) { rstartEl( ascii("text:sender-email"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:sender-email") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Zipcode(office)"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Zipcode(office)")))) { rstartEl( ascii("text:sender-postal-code"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:sender-postal-code") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Phone(office)"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Phone(office)")))) { rstartEl( ascii("text:sender-phone-work"), rList ); rchars( hconv(hbox->str2, gstr) ); rendEl( ascii("text:sender-phone-work") ); } - else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Address(office)"))) + else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Address(office)")))) { rstartEl( ascii("text:sender-street"), rList ); rchars( hconv(hbox->str2, gstr) ); |