CWS-TOOLING: integrate CWS cmcfixes53

2009-03-13 14:38:36 +0100 cmc  r269480 : gcc44 problems
2009-01-07 14:40:49 +0100 cmc  r265968 : #i97835# remove some long-hanging unused methods
2009-01-07 14:16:47 +0100 cmc  r265966 : #i97833# DDE_AVAILABLE is always false in binfilter
2009-01-07 14:06:40 +0100 cmc  r265965 : #i97831# DDE_AVAILABLE is always true so remove the ifdefs to de-clutter the code

7 files changed, 13 insertions, 121 deletions

diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 1069705019..63a3f5c2a7 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -187,9 +187,6 @@ extern ResMgr* pSwResMgr;			// steht in swapp0.cxx
 #define SW_RES(i)		ResId(i,*pSwResMgr)
 #define SW_RESSTR(i)	UniString(ResId(i,*pSwResMgr))
 
-#define DDE_AVAILABLE
-
-
 ::com::sun::star::uno::Reference<
     ::com::sun::star::linguistic2::XSpellChecker1 >	GetSpellChecker();
 ::com::sun::star::uno::Reference<
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 61b5729a30..aeffc4db44 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -63,6 +63,7 @@
 // --> OD 2007-10-23 #i81002#
 #include <ndtxt.hxx>
 // <--
+#include <stdio.h>
 
 SV_IMPL_OP_PTRARR_SORT(SwBookmarks, SwBookmarkPtr)
 
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index b8dd269c54..cb0a03cd4d 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -228,14 +228,12 @@ String SectRepr::GetFile() const
     String sLinkFile( aSection.GetLinkFileName() );
     if( sLinkFile.Len() )
     {
-#ifdef DDE_AVAILABLE
         if( DDE_LINK_SECTION == aSection.GetType() )
         {
             USHORT n = sLinkFile.SearchAndReplace( sfx2::cTokenSeperator, ' ' );
             sLinkFile.SearchAndReplace( sfx2::cTokenSeperator, ' ',  n );
         }
         else
-#endif
             sLinkFile = INetURLObject::decode( sLinkFile.GetToken( 0,
                                                sfx2::cTokenSeperator ),
                                         INET_HEX_ESCAPE,
@@ -270,13 +268,9 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
     aTree               ( this, SW_RES( TLB_SECTION )),
     aLinkFL             ( this, SW_RES( FL_LINK ) ),
     aFileCB             ( this, SW_RES( CB_FILE ) ),
-#ifdef DDE_AVAILABLE
     aDDECB              ( this, SW_RES( CB_DDE ) ) ,
-#endif
     aFileNameFT         ( this, SW_RES( FT_FILE ) ) ,
-#ifdef DDE_AVAILABLE
     aDDECommandFT       ( this, SW_RES( FT_DDE ) ) ,
-#endif
     aFileNameED         ( this, SW_RES( ED_FILE ) ),
     aFilePB             ( this, SW_RES( PB_FILE ) ),
     aSubRegionFT        ( this, SW_RES( FT_SUBREG ) ) ,
@@ -349,15 +343,11 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
         aPasswdCB		.Hide();
         aHideCB			.Hide();
 
-#ifdef DDE_AVAILABLE
-    aDDECB              .Hide();
-    aDDECommandFT       .Hide();
-#endif
+        aDDECB              .Hide();
+        aDDECommandFT       .Hide();
     }
 
-#ifdef DDE_AVAILABLE
     aDDECB.SetClickHdl		( LINK( this, SwEditRegionDlg, DDEHdl ));
-#endif
 
     //Ermitteln der vorhandenen Bereiche
     pCurrSect = rSh.GetCurrSection();
@@ -640,10 +630,8 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
 //        aNameFT     .Enable(FALSE);
         aCurName	.Enable(FALSE);
         aOptionsPB	.Enable(FALSE);
-#ifdef DDE_AVAILABLE
-    aDDECB   			.Enable(FALSE);
-    aDDECommandFT       .Enable(FALSE);
-#endif
+        aDDECB   			.Enable(FALSE);
+        aDDECommandFT       .Enable(FALSE);
         BOOL bPasswdEnabled = aProtectCB.GetState() == STATE_CHECK;
         aPasswdCB.Enable(bPasswdEnabled);
         aPasswdPB.Enable(bPasswdEnabled);
@@ -684,23 +672,17 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
             aFileCB.Check(TRUE);
             aFileNameED.SetText(aFile);
             aSubRegionED.SetText(sSub);
-#ifdef DDE_AVAILABLE
             aDDECB.Check(pRepr->GetSectionType() == DDE_LINK_SECTION );
-#endif
         }
         else
         {
             aFileCB.Check(FALSE);
             aFileNameED.SetText(aFile);
-#ifdef DDE_AVAILABLE
             aDDECB.Enable(FALSE);
             aDDECB.Check(FALSE);
-#endif
         }
         UseFileHdl(&aFileCB);
-#ifdef DDE_AVAILABLE
         DDEHdl( &aDDECB );
-#endif
         aProtectCB.SetState(pRepr->IsProtect() ? STATE_CHECK : STATE_NOCHECK);
         aProtectCB.Enable();
 
@@ -740,15 +722,11 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox )
         aSubRegionED .Enable(FALSE);
 //        aNameFT      .Enable(FALSE);
         aCurName	 .Enable(FALSE);
-#ifdef DDE_AVAILABLE
-    aDDECB   			.Enable(FALSE);
-    aDDECommandFT       .Enable(FALSE);
-#endif
+        aDDECB   			.Enable(FALSE);
+        aDDECommandFT       .Enable(FALSE);
 
         UseFileHdl(&aFileCB);
-#ifdef DDE_AVAILABLE
         DDEHdl( &aDDECB );
-#endif
     }
     return 0;
 }
@@ -1025,10 +1003,8 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
         aFilePB.Enable(bFile && ! bMulti);
         aSubRegionED.Enable(bFile && ! bMulti);
         aSubRegionFT.Enable(bFile && ! bMulti);
-#ifdef DDE_AVAILABLE
         aDDECommandFT.Enable(bFile && ! bMulti);
         aDDECB.Enable(bFile && ! bMulti);
-#endif
         if( bFile )
         {
             aProtectCB.SetState(STATE_CHECK);
@@ -1037,10 +1013,8 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
         }
         else
         {
-#ifdef DDE_AVAILABLE
             aDDECB.Check(FALSE);
             DDEHdl(&aDDECB);
-#endif
 //			aFileNameED.SetText(aEmptyStr);
             aSubRegionED.SetText(aEmptyStr);
         }
@@ -1054,11 +1028,9 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
         aFileNameFT.Enable(FALSE);
         aSubRegionED.Enable(FALSE);
         aSubRegionFT.Enable(FALSE);
-#ifdef DDE_AVAILABLE
         aDDECB.Check(FALSE);
         aDDECB.Enable(FALSE);
         aDDECommandFT.Enable(FALSE);
-#endif
     }
     return 0;
 }
@@ -1202,11 +1174,7 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit )
     SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData();
     if(pEdit == &aFileNameED)
     {
-        BOOL bDDe = FALSE;
-#ifdef DDE_AVAILABLE
-        bDDe = aDDECB.IsChecked();
-#endif
-        if( bDDe )
+        if( aDDECB.IsChecked() )
         {
             String sLink( pEdit->GetText() );
             USHORT nPos = 0;
@@ -1244,7 +1212,6 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit )
 /*---------------------------------------------------------------------
     Beschreibung:
 ---------------------------------------------------------------------*/
-#ifdef DDE_AVAILABLE
 
 IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox )
 {
@@ -1293,7 +1260,6 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox )
     }
     return 0;
 }
-#endif
 /*---------------------------------------------------------------------
 
 ---------------------------------------------------------------------*/
@@ -1574,10 +1540,8 @@ SwInsertSectionTabPage::SwInsertSectionTabPage(
     aCurName            ( this, SW_RES( ED_RNAME ) ),
     aLinkFL             ( this, SW_RES( FL_LINK ) ),
     aFileCB             ( this, SW_RES( CB_FILE ) ),
-#ifdef DDE_AVAILABLE
     aDDECB              ( this, SW_RES( CB_DDE ) ) ,
     aDDECommandFT       ( this, SW_RES( FT_DDE ) ) ,
-#endif
     aFileNameFT         ( this, SW_RES( FT_FILE ) ) ,
     aFileNameED         ( this, SW_RES( ED_FILE ) ),
     aFilePB             ( this, SW_RES( PB_FILE ) ),
@@ -1614,9 +1578,7 @@ SwInsertSectionTabPage::SwInsertSectionTabPage(
     aFileCB.SetClickHdl     ( LINK( this, SwInsertSectionTabPage, UseFileHdl ));
     aFilePB.SetClickHdl     ( LINK( this, SwInsertSectionTabPage, FileSearchHdl ));
     aCurName.SetModifyHdl	( LINK( this, SwInsertSectionTabPage, NameEditHdl));
-#ifdef DDE_AVAILABLE
     aDDECB.SetClickHdl		( LINK( this, SwInsertSectionTabPage, DDEHdl ));
-#endif
     ChangeProtectHdl(&aProtectCB);
 }
 /* -----------------21.05.99 10:31-------------------
@@ -1639,10 +1601,8 @@ void	SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh)
         aHideCB    		.Hide();
         aConditionED    .Hide();
         aConditionFT    .Hide();
-#ifdef DDE_AVAILABLE
         aDDECB           .Hide();
         aDDECommandFT    .Hide();
-#endif
     }
 
     FillList();
@@ -1687,10 +1647,7 @@ BOOL SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
         aSection.SetPasswd(m_aNewPasswd);
     String sFileName = aFileNameED.GetText();
     String sSubRegion = aSubRegionED.GetText();
-    BOOL bDDe = FALSE;
-#ifdef DDE_AVAILABLE
-    bDDe = aDDECB.IsChecked();
-#endif
+    BOOL bDDe = aDDECB.IsChecked();
     if(aFileCB.IsChecked() && (sFileName.Len() || sSubRegion.Len() || bDDe))
     {
         String aLinkFile;
@@ -1727,13 +1684,9 @@ BOOL SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
         aSection.SetLinkFileName(aLinkFile);
         if(aLinkFile.Len())
         {
-#ifdef DDE_AVAILABLE
             aSection.SetType( aDDECB.IsChecked() ?
                                     DDE_LINK_SECTION :
                                         FILE_LINK_SECTION);
-#else
-            aSection.SetType( FILE_LINK_SECTION);
-#endif
         }
     }
     ((SwInsertSectionTabDialog*)GetTabDialog())->SetSection(aSection);
@@ -1847,10 +1800,8 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
     aFilePB.Enable(bFile);
     aSubRegionFT.Enable(bFile);
     aSubRegionED.Enable(bFile);
-#ifdef DDE_AVAILABLE
     aDDECommandFT.Enable(bFile);
     aDDECB.Enable(bFile);
-#endif
     if( bFile )
     {
 //		aFileNameED.SetText( aFileName );
@@ -1859,10 +1810,8 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
     }
     else
     {
-#ifdef DDE_AVAILABLE
         aDDECB.Check(FALSE);
         DDEHdl(&aDDECB);
-#endif
 //		aFileNameED.SetText(aEmptyStr);
     }
     return 0;
@@ -1886,7 +1835,6 @@ IMPL_LINK( SwInsertSectionTabPage, FileSearchHdl, PushButton *, EMPTYARG )
 /*---------------------------------------------------------------------
 
 ---------------------------------------------------------------------*/
-#ifdef DDE_AVAILABLE
 
 IMPL_LINK( SwInsertSectionTabPage, DDEHdl, CheckBox*, pBox )
 {
@@ -1912,7 +1860,6 @@ IMPL_LINK( SwInsertSectionTabPage, DDEHdl, CheckBox*, pBox )
     }
     return 0;
 }
-#endif
 
 IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg )
 {
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index a884943554..f1a513853e 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -183,8 +183,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::datatransfer;
 using namespace nsTransferBufferType;
 
-#ifdef DDE_AVAILABLE
-
 #define DDE_TXT_ENCODING 	gsl_getSystemTextEncoding()
 
 //---------------------------------------------
@@ -234,8 +232,6 @@ public:
     void Disconnect( BOOL bRemoveDataAdvise );
 };
 
-#endif
-
 // helper class for Action and Undo enclosing
 class SwTrnsfrActionAndUndo
 {
@@ -298,14 +294,12 @@ SwTransferable::~SwTransferable()
 {
     Application::GetSolarMutex().acquire();
 
-#ifdef DDE_AVAILABLE
     // der DDELink braucht noch die WrtShell!
     if( refDdeLink.Is() )
     {
         ((SwTrnsfrDdeLink*)&refDdeLink)->Disconnect( TRUE );
         refDdeLink.Clear();
     }
-#endif
 
     pWrtShell = 0;
 
@@ -545,13 +539,12 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
     {
         switch( nFormat )
         {
-#ifdef DDE_AVAILABLE
         case SOT_FORMATSTR_ID_LINK:
             if( refDdeLink.Is() )
                 bOK = SetObject( &refDdeLink,
                                     SWTRANSFER_OBJECTTYPE_DDE, rFlavor );
             break;
-#endif
+
         case SOT_FORMATSTR_ID_OBJECTDESCRIPTOR:
         case SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR:
             bOK = SetTransferableObjectDescriptor( aObjDesc, rFlavor );
@@ -734,7 +727,6 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
 
 
     case SWTRANSFER_OBJECTTYPE_DDE:
-#ifdef DDE_AVAILABLE
         {
             xStream->SetBufferSize( 1024 );
             SwTrnsfrDdeLink* pDdeLnk = (SwTrnsfrDdeLink*)pObject;
@@ -744,7 +736,6 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
                 bRet = ERRCODE_NONE == xStream->GetError();
             }
         }
-#endif
         break;
 
     case SWTRANSFER_OBJECTTYPE_HTML:
@@ -891,7 +882,6 @@ int SwTransferable::PrepareForCopy( BOOL bIsCut )
         pTmpDoc->LockExpFlds(); 	// nie die Felder updaten - Text so belassen
         pWrtShell->Copy( pTmpDoc );
 
-#ifdef DDE_AVAILABLE
         {
             // remove all DDE-Bookmarks, they are invalid inside the clipdoc!
             const SwBookmarks& rBkmk = pTmpDoc->getBookmarks();
@@ -899,7 +889,6 @@ int SwTransferable::PrepareForCopy( BOOL bIsCut )
                 if( IDocumentBookmarkAccess::DDE_BOOKMARK == rBkmk[ --n ]->GetType() )
                     pTmpDoc->deleteBookmark( n );
         }
-#endif
 
         // es wurde in der CORE eine neu angelegt (OLE-Objekte kopiert!)
         if( aDocShellRef.Is() )
@@ -967,7 +956,6 @@ int SwTransferable::PrepareForCopy( BOOL bIsCut )
             }
         }
 
-#ifdef DDE_AVAILABLE
         // beim Cut hat DDE-Link keinen Sinn!!
         SwDocShell* pDShell;
         if( !bIsCut && bDDELink &&
@@ -977,7 +965,7 @@ int SwTransferable::PrepareForCopy( BOOL bIsCut )
             AddFormat( SOT_FORMATSTR_ID_LINK );
             refDdeLink = new SwTrnsfrDdeLink( *this, *pWrtShell );
         }
-#endif
+
         //ObjectDescriptor wurde bereits aus der alten DocShell gefuellt.
         //Jetzt noch anpassen. Dadurch kann im GetData die erste Anfrage
         //auch noch mit delayed rendering beantwortet werden.
@@ -1455,12 +1443,10 @@ ASSERT( pPt, "EXCHG_OUT_ACTION_MOVE_PRIVATE: was soll hier passieren?" );
             break;
 
         case EXCHG_OUT_ACTION_INSERT_DDE:
-#ifdef DDE_AVAILABLE
             {
                 BOOL bReRead = 0 != CNT_HasGrf( rSh.GetCntType() );
                 nRet = SwTransferable::_PasteDDE( rData, rSh, bReRead, bMsg );
             }
-#endif
             break;
 
         case EXCHG_OUT_ACTION_INSERT_HYPERLINK:
@@ -2106,7 +2092,6 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
                                 SwWrtShell& rWrtShell, BOOL bReReadGrf,
                                 BOOL bMsg )
 {
-#ifdef DDE_AVAILABLE
     // Daten aus dem Clipboardformat
     String aApp, aTopic, aItem;
 
@@ -2265,9 +2250,6 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
     }
 
     return 1;
-#else
-    return 0;
-#endif
 }
 
 // -----------------------------------------------------------------------
@@ -2953,13 +2935,9 @@ int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData
             pDlg->Insert( SOT_FORMATSTR_ID_LINK_SOURCE, aEmptyStr );
     }
 
-#ifdef DDE_AVAILABLE
-
     if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_LINK, nDest ))
         pDlg->Insert( SOT_FORMATSTR_ID_LINK, SW_RES(STR_DDEFORMAT) );
 
-#endif
-
     for( USHORT* pIds = aPasteSpecialIds; *pIds; ++pIds )
         if( SwTransferable::_TestAllowedFormat( rData, *pIds, nDest ))
             pDlg->Insert( *pIds, aEmptyStr );
@@ -3021,13 +2999,9 @@ void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh,
         }
     }
 
-#ifdef DDE_AVAILABLE
-
     if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_LINK, nDest ))
         rToFill.AddClipbrdFormat( SOT_FORMATSTR_ID_LINK, SW_RES(STR_DDEFORMAT) );
 
-#endif
-
     for( USHORT* pIds = aPasteSpecialIds; *pIds; ++pIds )
         if( SwTransferable::_TestAllowedFormat( rData, *pIds, nDest ))
             rToFill.AddClipbrdFormat( *pIds, aEmptyStr );
@@ -3644,8 +3618,6 @@ sal_Int64 SwTransferable::getSomething( const Sequence< sal_Int8 >& rId ) throw(
 
 /*  */
 
-#ifdef DDE_AVAILABLE
-
 // -----------------------------------------------------------------------
 
 SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
@@ -3855,8 +3827,3 @@ void SwTrnsfrDdeLink::Closed()
         refObj.Clear();
     }
 }
-
-#endif
-
-
-
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 6ff1d17ac2..0c3a3e070a 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -143,14 +143,8 @@ void SwFldVarPage::Reset(const SfxItemSet& )
         for (short i = rRg.nStart; i < rRg.nEnd; ++i)
         {
             nTypeId = GetFldMgr().GetTypeId(i);
-
-#ifndef DDE_AVAILABLE
-            if (nTypeId != TYP_DDEFLD)
-#endif
-            {	// Nur unter WIN, WNT und OS/2 DDE-Fields
-                nPos = aTypeLB.InsertEntry(GetFldMgr().GetTypeStr(i));
-                aTypeLB.SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
-            }
+            nPos = aTypeLB.InsertEntry(GetFldMgr().GetTypeStr(i));
+            aTypeLB.SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
         }
     }
     else
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx
index 891d8fad50..0d9e77616b 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/ui/inc/regionsw.hxx
@@ -172,13 +172,9 @@ class SwEditRegionDlg : public SfxModalDialog
 
     FixedLine       aLinkFL;
     TriStateBox     aFileCB;
-#ifdef DDE_AVAILABLE
     CheckBox		aDDECB;
-#endif
     FixedText		aFileNameFT;
-#ifdef DDE_AVAILABLE
     FixedText		aDDECommandFT;
-#endif
     Edit 			aFileNameED;
     PushButton      aFilePB;
     FixedText       aSubRegionFT;
@@ -241,9 +237,7 @@ class SwEditRegionDlg : public SfxModalDialog
     DECL_LINK( FileSearchHdl, PushButton* );
     DECL_LINK( OptionsHdl, PushButton* );
     DECL_LINK( FileNameHdl, Edit* );
-#ifdef DDE_AVAILABLE
     DECL_LINK( DDEHdl, CheckBox* );
-#endif
     DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper* );
 
     BOOL CheckPasswd(CheckBox* pBox = 0);
@@ -269,10 +263,8 @@ class SwInsertSectionTabPage : public SfxTabPage
 
     FixedLine       aLinkFL;
     CheckBox        aFileCB;
-#ifdef DDE_AVAILABLE
     CheckBox		aDDECB;
     FixedText		aDDECommandFT;
-#endif
     FixedText		aFileNameFT;
     Edit 			aFileNameED;
     PushButton      aFilePB;
@@ -313,9 +305,7 @@ class SwInsertSectionTabPage : public SfxTabPage
     DECL_LINK( NameEditHdl, Edit * );
     DECL_LINK( UseFileHdl, CheckBox* );
     DECL_LINK( FileSearchHdl, PushButton* );
-#ifdef DDE_AVAILABLE
     DECL_LINK( DDEHdl, CheckBox* );
-#endif
     DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper* );
 
     void 			FillList(  const SwSectionFmt* pFmt = 0 );
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index c7bdddccea..b5346a8cc3 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -137,10 +137,6 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                 {
                     case TYP_DDEFLD:
                     {
-#if !defined(DDE_AVAILABLE)
-                        return;
-#endif
-
                         ::sfx2::SvBaseLink& rLink = ((SwDDEFieldType*)pFld->GetTyp())->
                                                 GetBaseLink();
                         if(rLink.IsVisible())