diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-19 00:24:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-19 09:30:44 +0100 |
| commit | 6b28a77e1b5d68f6e1bd1b473c66e4743651211d (patch) | |
| tree | 7d6e4ec0f5f00f71453ca13ee8f7672822b57023 /sw | |
| parent | 8d4b87b7b294d5538a539a9640a19a5b13c6da4f (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 12 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 6a7e9d9ade4c..01dc77dac24f 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1419,9 +1419,9 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nSh Graphic aGraphic(pGrfNd->GetGrf()); GraphicObject aGraphicObject( aGraphic ); - ByteString aUniqueId = aGraphicObject.GetUniqueID(); + rtl::OString aUniqueId = aGraphicObject.GetUniqueID(); - if ( aUniqueId.Len() ) + if (!aUniqueId.isEmpty()) { const MapMode aMap100mm( MAP_100TH_MM ); Size aSize( aGraphic.GetPrefSize() ); @@ -1628,8 +1628,8 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush, sal_uInt32 nOpaque = 0; if (const GraphicObject *pGraphicObject = rBrush.GetGraphicObject()) { - ByteString aUniqueId = pGraphicObject->GetUniqueID(); - if (aUniqueId.Len()) + rtl::OString aUniqueId = pGraphicObject->GetUniqueID(); + if (!aUniqueId.isEmpty()) { const Graphic &rGraphic = pGraphicObject->GetGraphic(); Size aSize(rGraphic.GetPrefSize()); @@ -2671,8 +2671,8 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt, AddShape(ESCHER_ShpInst_PictureFrame, nShapeFlags, nShapeId); GraphicObject aGraphicObject(rGraphic); - ByteString aId = aGraphicObject.GetUniqueID(); - if (aId.Len()) + rtl::OString aId = aGraphicObject.GetUniqueID(); + if (!aId.getLength()) { Rectangle aRect = rObj.GetLogicRect(); aRect.SetPos(Point(0,0)); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 9dac88544b93..9f7eb841f16e 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1548,10 +1548,10 @@ void SwWW8Writer::InsAsString16(ww::bytes &rO, const String& rStr) void SwWW8Writer::InsAsString8(ww::bytes &rO, const String& rStr, rtl_TextEncoding eCodeSet) { - ByteString sTmp(rStr, eCodeSet); - const sal_Char *pStart = sTmp.GetBuffer(); - const sal_Char *pEnd = pStart + sTmp.Len(); - rO.reserve(rO.size() + sTmp.Len()); + rtl::OString sTmp(rtl::OUStringToOString(rStr, eCodeSet)); + const sal_Char *pStart = sTmp.getStr(); + const sal_Char *pEnd = pStart + sTmp.getLength(); + rO.reserve(rO.size() + sTmp.getLength()); std::copy(pStart, pEnd, std::inserter(rO, rO.end())); } @@ -1594,8 +1594,8 @@ void SwWW8Writer::InsAsString16( WW8Bytes& rO, const String& rStr ) void SwWW8Writer::InsAsString8( WW8Bytes& rO, const String& rStr, rtl_TextEncoding eCodeSet ) { - ByteString sTmp( rStr, eCodeSet ); - rO.Insert( (sal_uInt8*)sTmp.GetBuffer(), sTmp.Len(), rO.Count() ); + rtl::OString sTmp(rtl::OUStringToOString(rStr, eCodeSet)); + rO.Insert((sal_uInt8*)sTmp.getStr(), sTmp.getLength(), rO.Count()); } void SwWW8Writer::WriteString16(SvStream& rStrm, const String& rStr, |