diff options
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 16 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index e0029d9ed91f..471964a8f136 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1649,14 +1649,14 @@ void SwWW8Writer::InsUInt32(ww::bytes &rO, sal_uInt32 n) rO.push_back(nL[3]); } -void SwWW8Writer::InsAsString16(ww::bytes &rO, const String& rStr) +void SwWW8Writer::InsAsString16(ww::bytes &rO, const OUString& rStr) { - const sal_Unicode* pStr = rStr.GetBuffer(); - for( xub_StrLen n = 0, nLen = rStr.Len(); n < nLen; ++n, ++pStr ) + const sal_Unicode* pStr = rStr.getStr(); + for (sal_Int32 n = 0, nLen = rStr.getLength(); n < nLen; ++n, ++pStr) SwWW8Writer::InsUInt16( rO, *pStr ); } -void SwWW8Writer::InsAsString8(ww::bytes &rO, const String& rStr, +void SwWW8Writer::InsAsString8(ww::bytes &rO, const OUString& rStr, rtl_TextEncoding eCodeSet) { OString sTmp(OUStringToOString(rStr, eCodeSet)); @@ -1667,7 +1667,7 @@ void SwWW8Writer::InsAsString8(ww::bytes &rO, const String& rStr, std::copy(pStart, pEnd, std::inserter(rO, rO.end())); } -void SwWW8Writer::WriteString16(SvStream& rStrm, const String& rStr, +void SwWW8Writer::WriteString16(SvStream& rStrm, const OUString& rStr, bool bAddZero) { ww::bytes aBytes; @@ -1680,10 +1680,10 @@ void SwWW8Writer::WriteString16(SvStream& rStrm, const String& rStr, rStrm.Write(&aBytes[0], aBytes.size()); } -void SwWW8Writer::WriteString_xstz(SvStream& rStrm, const String& rStr, bool bAddZero) +void SwWW8Writer::WriteString_xstz(SvStream& rStrm, const OUString& rStr, bool bAddZero) { ww::bytes aBytes; - SwWW8Writer::InsUInt16(aBytes, rStr.Len()); + SwWW8Writer::InsUInt16(aBytes, rStr.getLength()); SwWW8Writer::InsAsString16(aBytes, rStr); if (bAddZero) SwWW8Writer::InsUInt16(aBytes, 0); @@ -1691,7 +1691,7 @@ void SwWW8Writer::WriteString_xstz(SvStream& rStrm, const String& rStr, bool bAd } -void SwWW8Writer::WriteString8(SvStream& rStrm, const String& rStr, +void SwWW8Writer::WriteString8(SvStream& rStrm, const OUString& rStr, bool bAddZero, rtl_TextEncoding eCodeSet) { ww::bytes aBytes; diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 8d4534937ad5..b7f4c5cb6050 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -871,8 +871,8 @@ public: public: static void InsUInt16(ww::bytes &rO, sal_uInt16 n); static void InsUInt32(ww::bytes &rO, sal_uInt32 n); - static void InsAsString16(ww::bytes &rO, const String& rStr); - static void InsAsString8(ww::bytes & O, const String& rStr, + static void InsAsString16(ww::bytes &rO, const OUString& rStr); + static void InsAsString8(ww::bytes & O, const OUString& rStr, rtl_TextEncoding eCodeSet); static sal_uLong FillUntil( SvStream& rStrm, sal_uLong nEndPos = 0 ); @@ -884,12 +884,12 @@ public: static void WriteLong( SvStream& rStrm, sal_Int32 nVal ) { rStrm << nVal; } static void WriteLong( SvStream& rStrm, sal_uLong nPos, sal_Int32 nVal ); - static void WriteString16(SvStream& rStrm, const String& rStr, + static void WriteString16(SvStream& rStrm, const OUString& rStr, bool bAddZero); - static void WriteString8(SvStream& rStrm, const String& rStr, + static void WriteString8(SvStream& rStrm, const OUString& rStr, bool bAddZero, rtl_TextEncoding eCodeSet); - static void WriteString_xstz(SvStream& rStrm, const String& rStr, bool bAddZero); + static void WriteString_xstz(SvStream& rStrm, const OUString& rStr, bool bAddZero); bool InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec ); |