[Libreoffice-commits] .: comphelper/inc comphelper/source

[Stephan Bergmann]

 comphelper/inc/comphelper/oslfile2streamwrap.hxx   |   11 +++++++----
 comphelper/source/streaming/oslfile2streamwrap.cxx |    7 +++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit a90d4d5f036ab7785ba72038936c6c8427b74ba8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 3 16:11:26 2012 +0100

    Do not export whole class to avoid MS C++ implicitly exporting base template.

diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
index e817be9..754be72 100644
--- a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
+++ b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
@@ -65,17 +65,20 @@ public:
 // FmUnoOutStream,
 // Datensenke fuer Files
 //==================================================================
-class COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XOutputStream>
+class OSLOutputStreamWrapper : public ::cppu::WeakImplHelper1<stario::XOutputStream>
 {
-    ::osl::File&        rFile;
-
 public:
-    OSLOutputStreamWrapper(::osl::File& _rFile) :rFile(_rFile) { }
+    COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper(::osl::File& _rFile);
+
+private:
+    virtual ~OSLOutputStreamWrapper();
 
 // stario::XOutputStream
     virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
     virtual void SAL_CALL flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
     virtual void SAL_CALL closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException);
+
+    ::osl::File&        rFile;
 };
 
 }   // namespace comphelper
diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx
index 06bac1d..bf93a8e 100644
--- a/comphelper/source/streaming/oslfile2streamwrap.cxx
+++ b/comphelper/source/streaming/oslfile2streamwrap.cxx
@@ -145,6 +145,13 @@ void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedExc
 /*************************************************************************/
 // stario::XOutputStream
 //------------------------------------------------------------------------------
+
+OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile):
+    rFile(_rFile)
+{}
+
+OSLOutputStreamWrapper::~OSLOutputStreamWrapper() {}
+
 void SAL_CALL OSLOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
     sal_uInt64 nWritten;