diff options
Diffstat (limited to 'sfx2/source/doc')
| -rw-r--r-- | sfx2/source/doc/DocumentMetadataAccess.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/doc/Metadatable.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index 894a4d2666..347fdb938d 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -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)); } //////////////////////////////////////////////////////////////////////////// diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 7a3c0db970..d095509ba1 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -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; |