sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 +- sd/source/ui/remotecontrol/BufferedStreamSocket.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 0d05957cf0c38abab45030ba172025e4ef318f43 Author: Tor Lillqvist <[email protected]> Date: Tue Feb 19 19:57:12 2013 +0200 Avoid infinite recursion Change-Id: I99d26f9601ceed98d0357d8722f8cf91cf007d29 diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx index 0defa3c..c1e0287 100644 --- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx +++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx @@ -71,7 +71,7 @@ void BufferedStreamSocket::close() mSocket = -1; } else - close(); + ::osl::StreamSocket::close(); } sal_Int32 BufferedStreamSocket::readLine( OString& aLine ) commit f49b4581a0a5056a51712bcabcc66483a87a07c8 Author: Tor Lillqvist <[email protected]> Date: Tue Feb 19 19:55:12 2013 +0200 Avoid warning on non-Linux: private field 'mpImpl' is not used Change-Id: I0f7e35254ecbf604c375ccebaa58d769a51e43f1 diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 94276b5..9c271aa 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -583,12 +583,12 @@ registerWithDefaultAdapter( DBusConnection *pConnection ) BluetoothServer::BluetoothServer( std::vector<Communicator*>* pCommunicators ) : meWasDiscoverable( UNKNOWN ), - mpImpl( NULL ), mpCommunicators( pCommunicators ) { #ifdef LINUX_BLUETOOTH mpImpl = new BluetoothServerImpl(); #endif + (void) mpImpl; // Avoid warning: private field 'mpImpl' is not used } BluetoothServer::~BluetoothServer() _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
