diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-04 09:15:18 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-04 15:03:06 +0200 |
commit | 1a049bc17c5f5ca524289efb73981292c32c58a1 (patch) | |
tree | a81d757bd824f63dda8e6609b2b67c36e2294708 /writerperfect | |
parent | e607f1da329a2d4dd91904053d7ff86ac05c77bf (diff) |
drop SvMemoryStream::GetBuffer
since it does the same thing as GetData()
Change-Id: I18d35aa4e67ad7775987160c021863d0de90179b
Reviewed-on: https://gerrit.libreoffice.org/61350
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerperfect')
-rw-r--r-- | writerperfect/qa/unit/EPUBExportTest.cxx | 5 | ||||
-rw-r--r-- | writerperfect/source/writer/exp/XMLBase64ImportContext.cxx | 2 | ||||
-rw-r--r-- | writerperfect/source/writer/exp/xmlimp.cxx | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index 90e97ba77799..ecca84410866 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -286,8 +286,7 @@ void EPUBExportTest::testMimetype() OString aExpected("application/epub+zip"); CPPUNIT_ASSERT(aMemoryStream.GetSize() > static_cast<sal_uInt64>(38 + aExpected.getLength())); - OString aActual(static_cast<const char*>(aMemoryStream.GetBuffer()) + 38, - aExpected.getLength()); + OString aActual(static_cast<const char*>(aMemoryStream.GetData()) + 38, aExpected.getLength()); // This failed: actual data was some garbage, not the uncompressed mime type. CPPUNIT_ASSERT_EQUAL(aExpected, aActual); @@ -907,7 +906,7 @@ void EPUBExportTest::testSVG() // This failed, there was a '<!DOCTYPE' line between the xml and the svg // one, causing a validation error. - OString aActual(static_cast<const char*>(aMemoryStream.GetBuffer()), aExpected.getLength()); + OString aActual(static_cast<const char*>(aMemoryStream.GetData()), aExpected.getLength()); CPPUNIT_ASSERT_EQUAL(aExpected, aActual); // This failed, we used the xlink attribute namespace, but we did not diff --git a/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx b/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx index e7161e5295cf..0835bc20e0ad 100644 --- a/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx +++ b/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx @@ -30,7 +30,7 @@ void XMLBase64ImportContext::startElement( void XMLBase64ImportContext::endElement(const OUString& /*rName*/) { - m_aBinaryData.append(static_cast<const unsigned char*>(m_aStream.GetBuffer()), + m_aBinaryData.append(static_cast<const unsigned char*>(m_aStream.GetData()), m_aStream.GetSize()); } diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx index 6e647ccdadf8..f3a12c761f44 100644 --- a/writerperfect/source/writer/exp/xmlimp.cxx +++ b/writerperfect/source/writer/exp/xmlimp.cxx @@ -335,7 +335,7 @@ void XMLOfficeDocContext::HandleFixedLayoutPage(const FixedLayoutPage& rPage, bo librevenge::RVNGPropertyList aImageProperties; aImageProperties.insert("librevenge:mime-type", "image/svg+xml"); librevenge::RVNGBinaryData aBinaryData; - aBinaryData.append(static_cast<const unsigned char*>(aMemoryStream.GetBuffer()), + aBinaryData.append(static_cast<const unsigned char*>(aMemoryStream.GetData()), aMemoryStream.GetSize()); aImageProperties.insert("office:binary-data", aBinaryData); mrImport.GetGenerator().insertBinaryObject(aImageProperties); @@ -372,7 +372,7 @@ XMLImport::XMLImport(const uno::Reference<uno::XComponentContext>& xContext, SvFileStream aStream(aCoverImage, StreamMode::READ); SvMemoryStream aMemoryStream; aMemoryStream.WriteStream(aStream); - aBinaryData.append(static_cast<const unsigned char*>(aMemoryStream.GetBuffer()), + aBinaryData.append(static_cast<const unsigned char*>(aMemoryStream.GetData()), aMemoryStream.GetSize()); librevenge::RVNGPropertyList aCoverImageProperties; aCoverImageProperties.insert("office:binary-data", aBinaryData); @@ -433,7 +433,7 @@ PopupState XMLImport::FillPopupData(const OUString& rURL, librevenge::RVNGProper librevenge::RVNGBinaryData aBinaryData; SvMemoryStream aMemoryStream; aMemoryStream.WriteStream(aStream); - aBinaryData.append(static_cast<const unsigned char*>(aMemoryStream.GetBuffer()), + aBinaryData.append(static_cast<const unsigned char*>(aMemoryStream.GetData()), aMemoryStream.GetSize()); rPropList.insert("office:binary-data", aBinaryData); |