[Libreoffice-commits] core.git: comphelper/source include/comphelper writerperfect/qa

[Stephan Bergmann]

 comphelper/source/streaming/seqstream.cxx |    3 ++-
 include/comphelper/seqstream.hxx          |    6 ++----
 writerperfect/qa/unit/WPXSvStreamTest.cxx |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 15cbc3e54aba11fb742bef513fab6bd2d16e7aac
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 16 15:31:41 2013 +0200

    Unwind useless comphelper::ByteSequence typedef
    
    Change-Id: I59317a0d591eac188fa01636031e907357038c29

diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx
index 242af3a..bfc9ec5 100644
--- a/comphelper/source/streaming/seqstream.cxx
+++ b/comphelper/source/streaming/seqstream.cxx
@@ -33,7 +33,8 @@ using namespace ::osl;
 //---------------------------------------------------------------------------------------------
 
 //------------------------------------------------------------------
-SequenceInputStream::SequenceInputStream(const ByteSequence& rData)
+SequenceInputStream::SequenceInputStream(
+    css::uno::Sequence<sal_Int8> const & rData)
 :   m_aData(rData)
 ,   m_nPos(0)
 {
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index 4f9c938..9cb122b 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -32,8 +32,6 @@
 namespace comphelper
 {
 
-    typedef ::com::sun::star::uno::Sequence<sal_Int8> ByteSequence;
-
 //==================================================================
 // SequenceInputStream
 // stream for reading data from a sequence of bytes
@@ -44,11 +42,11 @@ class COMPHELPER_DLLPUBLIC SequenceInputStream
 : public ::cppu::WeakImplHelper2< ::com::sun::star::io::XInputStream, ::com::sun::star::io::XSeekable >
 {
     ::osl::Mutex    m_aMutex;
-    ByteSequence    m_aData;
+    css::uno::Sequence<sal_Int8> m_aData;
     sal_Int32       m_nPos;
 
 public:
-    SequenceInputStream(const ByteSequence& rData);
+    SequenceInputStream(css::uno::Sequence<sal_Int8> const & rData);
 
 // com::sun::star::io::XInputStream
     virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead )
diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx
index fb11e4e..660d69e 100644
--- a/writerperfect/qa/unit/WPXSvStreamTest.cxx
+++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx
@@ -59,7 +59,7 @@ shared_ptr<WPXInputStream> lcl_createStream()
 {
     using comphelper::SequenceInputStream;
 
-    const comphelper::ByteSequence aData(reinterpret_cast<const sal_Int8*>(aText), sizeof aText);
+    const css::uno::Sequence<sal_Int8> aData(reinterpret_cast<const sal_Int8*>(aText), sizeof aText);
     const uno::Reference<io::XInputStream> xInputStream(new SequenceInputStream(aData));
 
     shared_ptr<WPXInputStream> pInputStream;