diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:59 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:59 +0200 |
| commit | 9ba466ac25b2abb45f1de8a2785552949f007572 (patch) | |
| tree | b5aab7e747c91ac026f38727f78b72bf08f57345 | |
| parent | a04ab6817fd70c73efa6f792d446936bc0531480 (diff) | |
| parent | a814b12a68cc60a3bb7bff4336aae3665b048148 (diff) | |
Merge branch 'master' into feature/gnumake4
| -rw-r--r-- | automation/inc/automation/simplecm.hxx | 1 | ||||
| -rw-r--r-- | automation/source/simplecm/simplecm.cxx | 11 | ||||
| -rw-r--r-- | cui/source/dialogs/winpluginlib.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/activex/main/makefile.mk | 4 |
4 files changed, 2 insertions, 18 deletions
diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx index f46cb22572a5..9a5211b1ad37 100644 --- a/automation/inc/automation/simplecm.hxx +++ b/automation/inc/automation/simplecm.hxx @@ -321,7 +321,6 @@ protected: SvStream *pReceiveStream; sal_Bool DoReceiveDataStream(); /// Recieve DataPacket from Socket virtual sal_Bool SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL); - bool IsReceiveReady(); sal_Bool bIsRequestShutdownPending; virtual void WaitForShutdown()=0; void SetNewPacketAsCurrent(); diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx index ae4a0659c2a0..39f86436a9a3 100644 --- a/automation/source/simplecm/simplecm.cxx +++ b/automation/source/simplecm/simplecm.cxx @@ -343,17 +343,6 @@ sal_Bool SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandsha return !bWasError; } -bool SimpleCommunicationLinkViaSocket::IsReceiveReady() -{ - if ( !IsCommunicationError() ) - { - TimeValue aTime = {30, 0}; // 30 seconds - return pStreamSocket->isRecvReady( &aTime ); - } - - return false; -} - CommunicationManager::CommunicationManager( sal_Bool bUseMultiChannel ) : nInfoType( CM_NONE ) , bIsCommunicationRunning( sal_False ) diff --git a/cui/source/dialogs/winpluginlib.cxx b/cui/source/dialogs/winpluginlib.cxx index 242607952c99..25fa4a3c5f41 100644 --- a/cui/source/dialogs/winpluginlib.cxx +++ b/cui/source/dialogs/winpluginlib.cxx @@ -33,8 +33,8 @@ #if defined _MSC_VER #pragma warning(pop) #endif -#include <Winreg.h> -#include <Shlwapi.h> +#include <winreg.h> +#include <shlwapi.h> #include <stdio.h> #define SO_PATH_SIZE 4096 diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index e4770180886c..bdfe30642730 100644 --- a/extensions/source/activex/main/makefile.mk +++ b/extensions/source/activex/main/makefile.mk @@ -32,10 +32,6 @@ TARGET=so_activex use_shl_versions= # --- Settings ---------------------------------- -.IF "$(GUI)" == "WNT" && "$(DISABLE_ACTIVEX)"=="" -PROF_EDITION=TRUE -.ENDIF - .INCLUDE : settings.mk .IF "$(GUI)" == "WNT" && "$(DISABLE_ACTIVEX)"=="" |