diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 22:55:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-22 09:07:47 +0000 |
| commit | 80a11f0d43309f336d9ca4723f06b8e49ac1d7d7 (patch) | |
| tree | 578b3cf8a2cbfd180e69295aeba9b7eff6e9631f /linguistic | |
| parent | 1c1961786a519101bbf34c62542542c8a56e0328 (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'linguistic')
| -rw-r--r-- | linguistic/source/dicimp.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 3f6257cc2bc9..1af7d36be92f 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -339,8 +339,7 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL) // Paste in dictionary without converting if(*aWordBuf) { - ByteString aDummy( aWordBuf ); - String aText( aDummy, eEnc ); + rtl::OUString aText(aWordBuf, rtl_str_getLength(aWordBuf), eEnc); uno::Reference< XDictionaryEntry > xEntry = new DicEntry( aText, bNegativ ); addEntry_Impl( xEntry , sal_True ); //! don't launch events here @@ -440,11 +439,11 @@ sal_uLong DictionaryNeo::saveEntries(const OUString &rURL) // Always write as the latest version, i.e. DIC_VERSION_7 // rtl_TextEncoding eEnc = RTL_TEXTENCODING_UTF8; - pStream->WriteLine(ByteString (pVerOOo7)); + pStream->WriteLine(rtl::OString(pVerOOo7)); if (0 != (nErr = pStream->GetError())) return nErr; if (nLanguage == LANGUAGE_NONE) - pStream->WriteLine(ByteString("lang: <none>")); + pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("lang: <none>"))); else { rtl::OStringBuffer aLine(RTL_CONSTASCII_STRINGPARAM("lang: ")); @@ -454,12 +453,12 @@ sal_uLong DictionaryNeo::saveEntries(const OUString &rURL) if (0 != (nErr = pStream->GetError())) return nErr; if (eDicType == DictionaryType_POSITIVE) - pStream->WriteLine(ByteString("type: positive")); + pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("type: positive"))); else - pStream->WriteLine(ByteString("type: negative")); + pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("type: negative"))); if (0 != (nErr = pStream->GetError())) return nErr; - pStream->WriteLine(ByteString("---")); + pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("---"))); if (0 != (nErr = pStream->GetError())) return nErr; const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray(); |