[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - sd/source

[Tor Lillqvist]

 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86edaa34e8ac4c67543941ce290aa7a472d4e525
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Feb 19 19:57:12 2013 +0200

Avoid infinite recursion

(cherry picked from commit 0d05957cf0c38abab45030ba172025e4ef318f43)

Change-Id: I3085b82a80228211951b5230b7e8d3bcf535e052
Reviewed-on: https://gerrit.libreoffice.org/2269
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx 
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index e2c7a4a..dcec4e3 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -67,7 +67,7 @@ void BufferedStreamSocket::close()
 mSocket = -1;
 }
 else
-close();
+::osl::StreamSocket::close();
 }
 
 sal_Int32 BufferedStreamSocket::readLine( OString aLine )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - sd/source

[Tor Lillqvist]

 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit f602b40561a381bcde713ecce7b2340be55dbd78
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Feb 19 18:25:06 2013 +0200

Surely we want closesocket() on Windows

(cherry picked from commit 49db90342f193f31500b2717cc27bdf2f25e2d95)

Change-Id: I91461ae31c9934e6b3176402e2772ba7371f0fdb
Reviewed-on: https://gerrit.libreoffice.org/2263
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx 
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 71fec17..e2c7a4a 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -59,7 +59,11 @@ void BufferedStreamSocket::close()
 {
 if( usingCSocket )
 {
+#ifdef WIN32
+::closesocket( mSocket );
+#else
 ::close( mSocket );
+#endif
 mSocket = -1;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits