diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-08-06 10:53:19 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-06 10:23:12 +0100 |
| commit | b2fd8230172641edbd2a4f67e214c44ce740b4b2 (patch) | |
| tree | 7489efa7fdeda666b8d5034b6d2e67ad79ae3cc0 /sd | |
| parent | c56b0a2fe8a54aef8229a7b32a8d62cc23bbd9e6 (diff) | |
Some minor fixes.
Change-Id: Id405b97440efc7160e76d535bddfd5580923fe24
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 6 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/Server.cxx | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 8737ba0273e1..ca00b1987963 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -35,7 +35,6 @@ $(eval $(call gb_SdiTarget_set_include,sd/sdi/sdslots,\ $$(INCLUDE) \ )) - $(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdgslots,sd/sdi/sdgslots)) $(eval $(call gb_SdiTarget_set_include,sd/sdi/sdgslots,\ @@ -61,6 +60,10 @@ $(eval $(call gb_Library_set_include,sd,\ -I$(WORKDIR)/SdiTarget/sd/sdi \ )) +$(eval $(call gb_Library_use_externals,sd,\ + libxml2 \ +)) + $(eval $(call gb_Library_add_defs,sd,\ -DSD_DLLIMPLEMENTATION \ )) @@ -102,6 +105,7 @@ $(eval $(call gb_Library_use_libraries,sd,\ ucbhelper \ utl \ vcl \ + xmlsecurity \ $(gb_STDLIBS) \ )) diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 372103e16328..8371728a1323 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -58,9 +58,6 @@ void RemoteServer::listenThread() { } - - // TODO: decryption - sal_uInt64 aRet, aRead; vector<char> aBuffer; vector<OString> aCommand; @@ -86,7 +83,7 @@ void RemoteServer::listenThread() aReceiver.parseCommand( aCommand ); aCommand.clear(); } - aBuffer.erase( aBuffer.begin(), aIt + 1 ); // Also delete the newline + aBuffer.erase( aBuffer.begin(), aIt + 1 ); // Also delete the empty line aRead -= (aLocation + 1); } } |