[Libreoffice-commits] .: Branch 'feature/gnumake4' - 4 commits - automation/inc automation/source cui/source extensions/source

[Bjoern Michaelsen]

 automation/inc/automation/simplecm.hxx     |    1 -
 automation/source/simplecm/simplecm.cxx    |   11 -----------
 cui/source/dialogs/winpluginlib.cxx        |    4 ++--
 extensions/source/activex/main/makefile.mk |    4 ----
 4 files changed, 2 insertions(+), 18 deletions(-)

New commits:
commit 01eada93cfc3abd68f4cf6070a848438ef68c7d8
Merge: 06ed8bf... 6567385...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Jul 24 19:22:59 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit 6567385ff037ad3e20c168a07362b2a478686afe
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 22 14:09:40 2011 +0300

    Bin PROF_EDITION, not defined in configury, not tested anywhere

diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk
index e477018..bdfe306 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)"==""
commit 490a746553ca7b45f9a65d8241a7b58f014b4be6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 22 09:20:22 2011 +0100

    callcatcher: remove unused methods

diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx
index 69c75cb..5e4d19a 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 1322968..e90be4a 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 )
commit e605861101743f5b8c1cb3ef2bc2da3b47ce965a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 22 11:37:56 2011 +0300

    Header filename case sensitivity fixes

diff --git a/cui/source/dialogs/winpluginlib.cxx b/cui/source/dialogs/winpluginlib.cxx
index c42c734..40b6e41 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