diff options
| author | Andrzej J. R. Hunt <andrzej@ahunt.org> | 2012-07-12 17:48:29 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:22:55 +0100 |
| commit | 988fdc01fbf0341ba8989832bb77201a59292480 (patch) | |
| tree | bc20c9341a7e7005b6b81c7b719d64db97f36e43 /sd | |
| parent | dbe8d4822724ccdbbd51a94605c270579e88da0a (diff) | |
Intermediate commit for mmeeks.
Change-Id: I4e8e4322d670247bc87e1b1ac6dccaa0a79a1e4d
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/remotecontrol/Listener.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/Server.cxx | 17 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/Server.hxx | 5 |
3 files changed, 9 insertions, 14 deletions
diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index 699d7a65101e..959b69432fe2 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -57,6 +57,7 @@ void SAL_CALL Listener::resumed (void) void SAL_CALL Listener::slideEnded (sal_Bool bReverse) throw (css::uno::RuntimeException) { + (void) bReverse; JsonBuilder *aBuilder = json_builder_new(); diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index d838b6740a18..04c51bd87c95 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -7,20 +7,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include <stdlib.h> -#include <sys/socket.h> -#include <netinet/in.h> #include <vector> #include "sddll.hxx" #include "Server.hxx" -#include "Receiver.hxx" - - using namespace std; using namespace sd; -using rtl::OUString; -using rtl::OString; Server::Server() : Thread( "ServerThread" ), mSocket(), mReceiver() @@ -38,6 +31,10 @@ void Server::listenThread() while (true) { vector<char> aBuffer; + char aReadBuffer[100]; + aRet = mStreamSocket.read + + int aRet; char aTemp; while ( (aRet = mStreamSocket.read( &aTemp, 1)) && aTemp != 0x0d ) // look for newline @@ -49,7 +46,7 @@ void Server::listenThread() return; } aBuffer.push_back('\0'); - OString aTempStr( &aBuffer.front() ); + rtl::OString aTempStr( &aBuffer.front() ); const sal_Char* aLengthChar = aTempStr.getStr(); sal_Int32 aLen = strtol( aLengthChar, NULL, 10); @@ -63,7 +60,7 @@ void Server::listenThread() return; } - aTempStr = OString( aMessage ); //, (sal_Int32) aLen, CHARSET, 0u + aTempStr = rtl::OString( aMessage ); //, (sal_Int32) aLen, CHARSET, 0u const sal_Char* aCommandChar = aTempStr.getStr(); mReceiver.parseCommand( aCommandChar, aTempStr.getLength(), mStreamSocket ); @@ -96,8 +93,6 @@ void Server::execute() } - - Server *sd::Server::spServer = NULL; void Server::setup() diff --git a/sd/source/ui/remotecontrol/Server.hxx b/sd/source/ui/remotecontrol/Server.hxx index 1ee18853759e..e953ff5bb5f5 100644 --- a/sd/source/ui/remotecontrol/Server.hxx +++ b/sd/source/ui/remotecontrol/Server.hxx @@ -14,13 +14,12 @@ #include <stdlib.h> #include <unistd.h> #include <sys/types.h> -#include <netinet/in.h> + #include <osl/socket.hxx> +#include <salhelper/thread.hxx> #include <com/sun/star/presentation/XSlideShowListener.hpp> -#include <salhelper/thread.hxx> - #include "Receiver.hxx" /** |