[Libreoffice-commits] .: 2 commits - sc/inc sd/source

[Libreoffice Gerrit user]

 sc/inc/dpcache.hxx                                  |    1 +
 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b1932b7a182d99a52b8c2fb71d2d48a61ce47423
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Aug 23 10:43:37 2012 +0300

    send()/recv() on sockets (instead of write()/read()) for Windows portability
    
    Change-Id: Ifaa890d87021c7786c7392f52d4f29b0779a7668

diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 2b65970..0733db4 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -52,7 +52,7 @@ sal_Int32 BufferedStreamSocket::write( const void* pBuffer, sal_uInt32 n )
     if ( !usingCSocket )
         return StreamSocket::write( pBuffer, n );
     else
-        return ::write( mSocket, pBuffer, (size_t) n );
+        return ::send( mSocket, pBuffer, (size_t) n, 0 );
 }
 
 sal_Int32 BufferedStreamSocket::readLine( OString& aLine )
@@ -79,7 +79,7 @@ sal_Int32 BufferedStreamSocket::readLine( OString& aLine )
         if ( !usingCSocket)
             aRet = StreamSocket::recv( &aBuffer[aRead], 100 );
         else
-            aRet = ::read( mSocket, &aBuffer[aRead], 100 );
+            aRet = ::recv( mSocket, &aBuffer[aRead], 100, 0 );
 
         if ( aRet == 0 )
         {
commit c439fad7d6802ae6df8b91ffaf964f083a6d7eea
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Aug 23 10:40:27 2012 +0300

    WaE: class has virtual functions and accessible non-virtual destructor
    
    Change-Id: I0fdc966a1dab68fb642ab581ad3f4eb6762363e0

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index d68f348..7f996e0 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -108,6 +108,7 @@ public:
         virtual bool next() = 0;
         virtual void finish() = 0;
         virtual void getValue(long nCol, ScDPItemData& rData, short& rNumType) const = 0;
+        virtual ~DBConnector() { };
     };
 
 private: