INTEGRATION: CWS vclcleanup02 (1.2.406); FILE MERGED

2003/12/04 17:04:08 mt 1.2.406.1: #i23061# Removed/Changed old StarView stuff

1 files changed, 2 insertions, 61 deletions

diff --git a/svtools/source/svdde/ddeml2.cxx b/svtools/source/svdde/ddeml2.cxx
index baf7f19fb4f8..0f78be15dd14 100644
--- a/svtools/source/svdde/ddeml2.cxx
+++ b/svtools/source/svdde/ddeml2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ddeml2.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pl $ $Date: 2001-09-04 17:05:08 $
+ *  last change: $Author: vg $ $Date: 2004-01-06 19:34:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,11 +68,6 @@
 #define DDEDATAFILE
 #include "ddemldeb.hxx"
 
-#ifndef _SV_SVAPP_HXX
-#include <vcl/svapp.hxx> // fuer IsRemoteServer
-#endif
-
-
 #if defined (OS2) && defined (__BORLANDC__)
 #pragma option -w-par
 #endif
@@ -856,8 +851,6 @@ BOOL ImpDdeMgr::OwnsConversationHandles()
 USHORT DdeInitialize(ULONG* pidInst, PFNCALLBACK pfnCallback,
     ULONG afCmd, ULONG ulRes)
 {
-    if( Application::IsRemoteServer() )
-        return DMLERR_UNFOUND_QUEUE_ID;
     if( (*pidInst)!=0 )
     {
         // Reinitialize wird noch nicht unterstuetzt
@@ -872,8 +865,6 @@ USHORT DdeInitialize(ULONG* pidInst, PFNCALLBACK pfnCallback,
 
 BOOL DdeUninitialize(ULONG idInst)
 {
-    if( Application::IsRemoteServer() )
-        return TRUE;
     if( !idInst )
         return FALSE;
     ImpDdeMgr* pMgr = (ImpDdeMgr*)idInst;
@@ -892,8 +883,6 @@ BOOL DdeUninitialize(ULONG idInst)
 HCONVLIST DdeConnectList(ULONG idInst, HSZ hszService, HSZ hszTopic,
     HCONVLIST hConvList, CONVCONTEXT* pCC)
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     if( !idInst )
         return 0;
     return ((ImpDdeMgr*)idInst)->DdeConnectList(hszService,hszTopic,
@@ -902,23 +891,17 @@ HCONVLIST DdeConnectList(ULONG idInst, HSZ hszService, HSZ hszTopic,
 
 HCONV DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev)
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     return ImpDdeMgr::DdeQueryNextServer( hConvList, hConvPrev );
 }
 
 BOOL DdeDisconnectList(HCONVLIST hConvList)
 {
-    if( Application::IsRemoteServer() )
-        return FALSE;
     return ImpDdeMgr::DdeDisconnectList( hConvList );
 }
 
 HCONV DdeConnect(ULONG idInst, HSZ hszService, HSZ hszTopic,
     CONVCONTEXT* pCC)
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     if( !idInst )
         return 0;
     return ((ImpDdeMgr*)idInst)->DdeConnect( hszService, hszTopic, pCC );
@@ -926,37 +909,27 @@ HCONV DdeConnect(ULONG idInst, HSZ hszService, HSZ hszTopic,
 
 BOOL DdeDisconnect(HCONV hConv)
 {
-    if( Application::IsRemoteServer() )
-        return FALSE;
     return ImpDdeMgr::DdeDisconnect( hConv );
 }
 
 HCONV DdeReconnect(HCONV hConv)
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     return ImpDdeMgr::DdeReconnect( hConv );
 }
 
 
 USHORT DdeQueryConvInfo(HCONV hConv, ULONG idTransact, CONVINFO* pCI )
 {
-    if( Application::IsRemoteServer() )
-        return DMLERR_DLL_NOT_INITIALIZED;
     return ImpDdeMgr::DdeQueryConvInfo( hConv, idTransact, pCI );
 }
 
 BOOL DdeSetUserHandle(HCONV hConv, ULONG id, ULONG hUser)
 {
-    if( Application::IsRemoteServer() )
-        return DMLERR_DLL_NOT_INITIALIZED;
     return ImpDdeMgr::DdeSetUserHandle( hConv, id, hUser );
 }
 
 BOOL DdeAbandonTransaction(ULONG idInst, HCONV hConv, ULONG idTransaction)
 {
-    if( Application::IsRemoteServer() )
-        return FALSE;
     if( !idInst )
         return FALSE;
     return ((ImpDdeMgr*)idInst)->DdeAbandonTransaction(hConv,idTransaction);
@@ -964,8 +937,6 @@ BOOL DdeAbandonTransaction(ULONG idInst, HCONV hConv, ULONG idTransaction)
 
 BOOL DdePostAdvise(ULONG idInst, HSZ hszTopic, HSZ hszItem)
 {
-    if( Application::IsRemoteServer() )
-        return FALSE;
     if( !idInst )
         return FALSE;
     return ((ImpDdeMgr*)idInst)->DdePostAdvise( hszTopic, hszItem );
@@ -973,8 +944,6 @@ BOOL DdePostAdvise(ULONG idInst, HSZ hszTopic, HSZ hszItem)
 
 BOOL DdeEnableCallback(ULONG idInst, HCONV hConv, USHORT wCmd)
 {
-    if( Application::IsRemoteServer() )
-        return FALSE;
     if( !idInst )
         return FALSE;
     return ((ImpDdeMgr*)idInst)->DdeEnableCallback( hConv, wCmd );
@@ -984,8 +953,6 @@ HDDEDATA DdeClientTransaction(void* pData, ULONG cbData,
         HCONV hConv, HSZ hszItem, USHORT wFmt, USHORT wType,
         ULONG dwTimeout, ULONG* pdwResult)
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     return ImpDdeMgr::DdeClientTransaction( pData, cbData,
         hConv, hszItem, wFmt, wType, dwTimeout, pdwResult );
 }
@@ -993,8 +960,6 @@ HDDEDATA DdeClientTransaction(void* pData, ULONG cbData,
 HDDEDATA DdeCreateDataHandle(ULONG idInst, void* pSrc, ULONG cb,
     ULONG cbOff, HSZ hszItem, USHORT wFmt, USHORT afCmd)
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     if( !idInst )
         return 0;
     return ((ImpDdeMgr*)idInst)->DdeCreateDataHandle( pSrc, cb,
@@ -1003,43 +968,31 @@ HDDEDATA DdeCreateDataHandle(ULONG idInst, void* pSrc, ULONG cb,
 
 HDDEDATA DdeAddData(HDDEDATA hData, void* pSrc, ULONG cb, ULONG cbOff)
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     return ImpDdeMgr::DdeAddData( hData, pSrc, cb, cbOff );
 }
 
 ULONG DdeGetData(HDDEDATA hData, void* pDst, ULONG cbMax, ULONG cbOff)
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     return ImpDdeMgr::DdeGetData( hData, pDst, cbMax, cbOff );
 }
 
 BYTE* DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize)
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     return ImpDdeMgr::DdeAccessData( hData, pcbDataSize );
 }
 
 BOOL DdeUnaccessData(HDDEDATA hData)
 {
-    if( Application::IsRemoteServer() )
-        return FALSE;
     return ImpDdeMgr::DdeUnaccessData( hData );
 }
 
 BOOL DdeFreeDataHandle(HDDEDATA hData)
 {
-    if( Application::IsRemoteServer() )
-        return FALSE;
     return ImpDdeMgr::DdeFreeDataHandle( hData );
 }
 
 USHORT DdeGetLastError(ULONG idInst)
 {
-    if( Application::IsRemoteServer() )
-        return DMLERR_DLL_NOT_INITIALIZED;
     if( !idInst )
         return DMLERR_DLL_NOT_INITIALIZED;
     return ((ImpDdeMgr*)idInst)->DdeGetLastError();
@@ -1047,8 +1000,6 @@ USHORT DdeGetLastError(ULONG idInst)
 
 HSZ DdeCreateStringHandle(ULONG idInst, PSZ pszString,int iCodePage )
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     if( !idInst )
         return 0;
     return ((ImpDdeMgr*)idInst)->DdeCreateStringHandle(pszString,iCodePage);
@@ -1057,8 +1008,6 @@ HSZ DdeCreateStringHandle(ULONG idInst, PSZ pszString,int iCodePage )
 ULONG DdeQueryString( ULONG idInst, HSZ hsz, PSZ pBuf,
     ULONG cchMax, int iCodePage )
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     if( !idInst )
         return 0;
     return ((ImpDdeMgr*)idInst)->DdeQueryString( hsz,pBuf,cchMax,iCodePage);
@@ -1066,8 +1015,6 @@ ULONG DdeQueryString( ULONG idInst, HSZ hsz, PSZ pBuf,
 
 BOOL DdeFreeStringHandle( ULONG idInst, HSZ hsz)
 {
-    if( Application::IsRemoteServer() )
-        return FALSE;
     if( !idInst )
         return FALSE;
     return ((ImpDdeMgr*)idInst)->DdeFreeStringHandle( hsz );
@@ -1075,8 +1022,6 @@ BOOL DdeFreeStringHandle( ULONG idInst, HSZ hsz)
 
 BOOL DdeKeepStringHandle( ULONG idInst, HSZ hsz )
 {
-    if( Application::IsRemoteServer() )
-        return FALSE;
     if( !idInst )
         return FALSE;
     return ((ImpDdeMgr*)idInst)->DdeKeepStringHandle( hsz );
@@ -1084,15 +1029,11 @@ BOOL DdeKeepStringHandle( ULONG idInst, HSZ hsz )
 
 int DdeCmpStringHandles(HSZ hsz1, HSZ hsz2)
 {
-    if( Application::IsRemoteServer() )
-        return -1;
     return ImpDdeMgr::DdeCmpStringHandles( hsz1, hsz2 );
 }
 
 HDDEDATA DdeNameService( ULONG idInst, HSZ hsz1, HSZ hszRes, USHORT afCmd )
 {
-    if( Application::IsRemoteServer() )
-        return 0;
     if( !idInst )
         return 0;
     return ((ImpDdeMgr*)idInst)->DdeNameService( hsz1, afCmd );