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

Tor Lillqvist tml at iki.fi
Fri Feb 22 09:30:53 PST 2013


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

New commits:
commit 86edaa34e8ac4c67543941ce290aa7a472d4e525
Author: Tor Lillqvist <tml at 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 <erack at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at 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 )


More information about the Libreoffice-commits mailing list