remove non-compiled code

21 files changed, 11 insertions, 836 deletions

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 897ffd7d7c..d439f97579 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -235,9 +235,6 @@ class SwPostItMgr: public SfxListener
             void Delete(String aAuthor);
             void Delete();
 
-#if 0            
-            void Hide( SwPostItField* pPostItField );
-#endif
             void Hide( const String& rAuthor );
             void Hide();
             void Show();
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index e4c65d0cc4..981b1a7dfa 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -147,9 +147,6 @@ class SwSidebarWin : public Window
         void            SetFollow( bool bIsFollow) { mbIsFollow = bIsFollow; };
         virtual bool    CalcFollow() = 0;
 
-#if 0
-#endif
-
         sal_Int32		GetMetaHeight();
         sal_Int32		GetMinimumSizeWithMeta();
         sal_Int32		GetMinimumSizeWithoutMeta();
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 3a9aaa22cb..0e760816ae 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -305,10 +305,6 @@ Verhalten von Delete-Redline:
 
 bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
 {
-#if 0
-// #i93179# disabled: ASSERT in ~SwIndexReg     #ifdef DBG_UTIL 
-    SwRedline aCopy( *pNewRedl );
-#endif
     bool bError = true;
     _CHECK_REDLINE( this )
 
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index f5e8879eec..f11e7681bc 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -164,24 +164,6 @@ SwXFootnote::GetXFootnote(
     // to do this properly requires the SwXFootnote to register at the
     // SwFmtFtn directly, not at the unocallback
     // also this function must return a uno Reference!
-#if 0
-    SwClientIter aIter( rUnoCB );
-    SwXFootnote::Impl * pXFootnote = static_cast<SwXFootnote::Impl*>(
-            aIter.First( TYPE( SwXFootnote::Impl )));
-    while (pXFootnote)
-    {
-        SwDoc *const pDoc = pXFootnote->m_rThis.GetDoc();
-        if (pDoc)
-        {
-            SwFmtFtn const*const pFtn = pXFootnote->GetFootnoteFormat();
-            if (pFtn == &rFootnoteFmt)
-            {
-                return & pXFootnote->m_rThis;
-            }
-        }
-        pXFootnote = static_cast<SwXFootnote::Impl*>(aIter.Next());
-    }
-#endif
     return 0;
 }
 
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index e99226875e..43fbe0b922 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -139,20 +139,6 @@ SwXReferenceMark::GetReferenceMark(
     // #i105557#: do not iterate over the registered clients: race condition
     // to do this properly requires the SwXReferenceMark to register at the
     // SwFmtRefMark directly, not at the unocallback
-#if 0
-    SwClientIter aIter( rUnoCB );
-    SwXReferenceMark::Impl * pXMark =
-        static_cast<SwXReferenceMark::Impl*>(
-            aIter.First( TYPE( SwXReferenceMark::Impl ) ));
-    while (pXMark)
-    {
-        if (pXMark->m_pMarkFmt == &rMarkFmt)
-        {
-            return &pXMark->m_rThis;
-        }
-        pXMark = static_cast<SwXReferenceMark::Impl*>(aIter.Next());
-    }
-#endif
     return 0;
 }
 
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 88ff0475f6..213dc19e66 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -1074,361 +1074,4 @@ NUMATTR_SETUNDERLINE:
     return pCurRule;
 }
 
-
-/*  */
-
-// dann noch die Ausgabe-Funktionen (nur fuer WinWord 97)
-
-BOOL lcl_IsExportNumRule( const SwNumRule& rRule, BYTE* pEnd = 0 )
-{
-    BYTE nEnd = MAXLEVEL;
-    while( nEnd-- && !rRule.GetNumFmt( nEnd ))
-        ;
-    ++nEnd;
-
-    const SwNumFmt* pNFmt;
-    BYTE nLvl;
-
-    for( nLvl = 0; nLvl < nEnd; ++nLvl )
-        if( SVX_NUM_NUMBER_NONE != ( pNFmt = &rRule.Get( nLvl ))
-            ->GetNumberingType() || pNFmt->GetPrefix().Len() ||
-            (pNFmt->GetSuffix().Len() && pNFmt->GetSuffix() != aDotStr ))
-            break;
-
-    if( pEnd )
-        *pEnd = nEnd;
-    return nLvl != nEnd;
-}
-
-#if 0
-void SwRTFWriter::OutRTFListTab()
-{
-    ByteString sOverrideList;
-    USHORT nId = 1, nTmplId = 1, n;
-
-    // prepare the NodeNum to generate the NumString
-    SwNumberTree::tNumberVector aNumVector;
-    for( n = 0; n < MAXLEVEL; ++n )
-        aNumVector.push_back(n);
-    BYTE aNumLvlPos[ MAXLEVEL ];
-
-    if( !pNumRuleTbl )
-        BuildNumRuleTbl();
-
-    for( n = 0; n < pNumRuleTbl->Count(); ++n )
-    {
-        const SwNumRule* pRule = (*pNumRuleTbl)[ n ];
-
-        // mit der ersten Rule wird auch die ListTable geschrieben
-        if( !sOverrideList.Len() )
-            OutComment( *this, OOO_STRING_SVTOOLS_RTF_LISTTABLE );
-
-        Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LIST << OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID;
-        OutULong( nTmplId );
-        ByteString sTmp;
-
-        if( pRule->IsContinusNum() )
-            Strm() << OOO_STRING_SVTOOLS_RTF_LISTSIMPLE;
-
-        BYTE nLvl, nEnd;
-        lcl_IsExportNumRule( *pRule, &nEnd );
-
-        for( nLvl = 0; nLvl < nEnd; ++nLvl )
-        {
-            const SwNumFmt& rFmt = pRule->Get( nLvl );
-            Strm() << sNewLine;
-            if( nLvl > 8 )			// RTF-kennt nur 9 Ebenen
-                OutComment( *this, OOO_STRING_SVTOOLS_RTF_SOUTLVL );
-
-            Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTLEVEL << OOO_STRING_SVTOOLS_RTF_LEVELNFC;
-
-            USHORT nVal = 0;
-            switch( rFmt.GetNumberingType() )
-            {
-            case SVX_NUM_ROMAN_UPPER:			nVal = 1;	break;
-            case SVX_NUM_ROMAN_LOWER:			nVal = 2;	break;
-            case SVX_NUM_CHARS_UPPER_LETTER:
-            case SVX_NUM_CHARS_UPPER_LETTER_N:	nVal = 3;	break;
-            case SVX_NUM_CHARS_LOWER_LETTER:
-            case SVX_NUM_CHARS_LOWER_LETTER_N:	nVal = 4;	break;
-
-            case SVX_NUM_BITMAP:
-            case SVX_NUM_CHAR_SPECIAL:			nVal = 23;	break;
-            }
-            OutLong( nVal ) << OOO_STRING_SVTOOLS_RTF_LEVELJC;
-
-            switch( rFmt.GetNumAdjust() )
-            {
-            case SVX_ADJUST_CENTER:		nVal = 1;	break;
-            case SVX_ADJUST_RIGHT:		nVal = 2;	break;
-            default:					nVal = 0;	break;
-            }
-            OutLong( nVal ) << OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT;
-            OutLong( rFmt.GetStart() )
-                << OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW << "0{" << OOO_STRING_SVTOOLS_RTF_LEVELTEXT << ' ';
-
-            BOOL bWriteBulletFont = FALSE;
-            memset( aNumLvlPos, 0, MAXLEVEL );
-            if( SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType() ||
-                SVX_NUM_BITMAP == rFmt.GetNumberingType() )
-            {
-                Strm() << "\\'01";
-                ByteString sNo( ByteString::CreateFromInt32( rFmt.GetBulletChar()));
-                Strm() << "\\u" << sNo.GetBuffer() << " ?";
-                bWriteBulletFont = TRUE;
-            }
-            else if( SVX_NUM_NUMBER_NONE == rFmt.GetNumberingType() )
-            {
-                String sOut( rFmt.GetPrefix() ); sOut += rFmt.GetSuffix();
-                if( sOut.Len() )
-                {
-                    Strm() << "\\'";
-                    OutHex( sOut.Len() );
-                    RTFOutFuncs::Out_String( Strm(), sOut,
-                                            eDefaultEncoding, bWriteHelpFmt );
-                }
-            }
-            else
-            {
-                memset( aNumLvlPos, 0, MAXLEVEL );
-                BYTE* pLvlPos = aNumLvlPos;
-                // --> OD 2005-11-18 #128056#
-                // correction of refactoring done by cws swnumtree:
-                // - the numbering string has to be restrict to the level
-                //   currently working on.
-                String sNumStr( pRule->MakeNumString( aNumVector, FALSE, TRUE, nLvl ));
-                // <--
-
-                // now search the nums in the string
-                for( BYTE i = 0; i <= nLvl; ++i )
-                {
-                    String sSrch( String::CreateFromInt32( i ));
-                    xub_StrLen nFnd = sNumStr.Search( sSrch );
-                    if( STRING_NOTFOUND != nFnd )
-                    {
-                        *pLvlPos = (BYTE)(nFnd + rFmt.GetPrefix().Len() + 1 );
-                        ++pLvlPos;
-                        sNumStr.SetChar( nFnd, (sal_Unicode)i );
-                    }
-                }
-
-                Strm() << "\\'";
-                OutHex( sNumStr.Len() + rFmt.GetPrefix().Len() +
-                                        rFmt.GetSuffix().Len() );
-
-                if( rFmt.GetPrefix().Len() )
-                    RTFOutFuncs::Out_String( Strm(), rFmt.GetPrefix(),
-                                            eDefaultEncoding, bWriteHelpFmt );
-
-
-                for( xub_StrLen x = 0; x < sNumStr.Len(); ++x )
-                    if( sNumStr.GetChar( x ) < 0x20 ||
-                        sNumStr.GetChar( x ) > 0xFF )
-                    {
-                        Strm() << "\\'"; OutHex( sNumStr.GetChar( x ) );
-                    }
-                    else
-                        Strm() << (sal_Char)sNumStr.GetChar( x );
-
-                if( rFmt.GetSuffix().Len() )
-                    RTFOutFuncs::Out_String( Strm(), rFmt.GetSuffix(),
-                                            eDefaultEncoding, bWriteHelpFmt );
-            }
-
-            // write the levelnumbers
-            Strm() << ";}{" << OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS;
-            for( BYTE i = 0; i <= nLvl && aNumLvlPos[ i ]; ++i )
-            {
-                Strm() << "\\'"; OutHex( aNumLvlPos[ i ] );
-            }
-            Strm() << ";}";
-
-            if( rFmt.GetCharFmt() )
-                Out_SfxItemSet( aRTFAttrFnTab, *this,
-                                rFmt.GetCharFmt()->GetAttrSet(), TRUE );
-
-            if( bWriteBulletFont )
-            {
-                Strm() << OOO_STRING_SVTOOLS_RTF_F;
-                const Font* pFont = rFmt.GetBulletFont();
-                if( !pFont )
-                    // --> OD 2006-06-27 #b6440955#
-                    pFont = &numfunc::GetDefBulletFont();
-                    // <--
-                OutULong( GetId( *pFont ));
-            }
-
-            Strm() << OOO_STRING_SVTOOLS_RTF_FI;
-            OutLong( rFmt.GetFirstLineIndent() ) << OOO_STRING_SVTOOLS_RTF_LI;
-            OutLong( rFmt.GetIndentAt() );
-
-            Strm() << '}';
-
-            if( nLvl > 8 )		// RTF-kennt nur 9 Ebenen
-                Strm() << '}';
-        }
-
-        if( !pRule->IsAutoRule() )
-        {
-            Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTNAME << ' ';
-            RTFOutFuncs::Out_String( Strm(), pRule->GetName(), eDefaultEncoding,
-                                    bWriteHelpFmt ) << ";}" ;
-        }
-        Strm() << OOO_STRING_SVTOOLS_RTF_LISTID;
-        OutULong( nId ) << '}' << sNewLine;
-
-        sTmp = '{';
-        ((((((( sTmp += OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE ) +=
-                    OOO_STRING_SVTOOLS_RTF_LISTID ) += ByteString::CreateFromInt32( nId )) +=
-                    OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT ) += '0' ) +=
-                    OOO_STRING_SVTOOLS_RTF_LS ) += ByteString::CreateFromInt32( n )) += '}';
-        sOverrideList += sTmp;
-
-        ++nId, ++nTmplId;
-    }
-
-    if( sOverrideList.Len() )
-        Strm() << "}{" << OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE
-               << sOverrideList.GetBuffer() << '}' << sNewLine;
-}
-
-USHORT SwRTFWriter::GetId( const SwNumRuleItem& rItem ) const
-{
-    USHORT n, nId = USHRT_MAX;
-    if( !pNumRuleTbl )
-    {
-        SwRTFWriter* pThis = (SwRTFWriter*)this;
-        pThis->BuildNumRuleTbl();
-    }
-    const String& rNm = rItem.GetValue();
-    for( n = pNumRuleTbl->Count(); n; )
-        if( (*pNumRuleTbl)[ --n ]->GetName() == rNm )
-        {
-            nId = n;
-            break;
-        }
-
-    return nId;
-}
-
-USHORT SwRTFWriter::GetNumRuleId( const SwNumRule& rRule )
-{
-    if( !pNumRuleTbl )
-        BuildNumRuleTbl();
-    SwNumRulePtr pR = (SwNumRulePtr)&rRule;
-    return pNumRuleTbl->GetPos( pR );
-}
-
-void SwRTFWriter::BuildNumRuleTbl()
-{
-    const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl();
-    if( !pNumRuleTbl )
-        pNumRuleTbl = new SwNumRuleTbl( (BYTE)rListTbl.Count() );
-    for( USHORT n = rListTbl.Count()+1; n; )
-    {
-        SwNumRule* pRule;
-        --n;
-        if( n == rListTbl.Count() )
-            pRule = (SwNumRule*)pDoc->GetOutlineNumRule();
-        else
-        {
-            pRule = rListTbl[ n ];
-            if( !pDoc->IsUsed( *pRule ))
-                continue;
-        }
-
-        if( lcl_IsExportNumRule( *pRule ))
-            pNumRuleTbl->Insert( pRule, pNumRuleTbl->Count() );
-    }
-}
-
-BOOL SwRTFWriter::OutListNum( const SwTxtNode& rNd )
-{
-    BOOL bRet = FALSE;
-    const SwNumRule* pRule = rNd.GetNumRule();
-
-    // --> OD 2008-03-18 #refactorlists#
-//    if( pRule && MAXLEVEL > rNd.GetActualListLevel() )
-    if( pRule && rNd.IsInList() )
-    // <--
-    {
-        // --> OD 2008-03-18 #refactorlists#
-        ASSERT( rNd.GetActualListLevel() >= 0 && rNd.GetActualListLevel() < MAXLEVEL,
-                "<SwRTFWriter::OutListNum(..)> - text node does not have valid list level. Serious defect -> please inform OD" );
-        // <--
-
-        bOutFmtAttr = FALSE;
-        bOutListNumTxt = TRUE;
-        bRet = TRUE;
-
-        const bool bExportNumRule = USHRT_MAX != GetNumRuleId( *pRule );
-        const BYTE nLvl = static_cast< BYTE >(rNd.GetActualListLevel());
-        const SwNumFmt* pFmt = pRule->GetNumFmt( nLvl );
-        if( !pFmt )
-            pFmt = &pRule->Get( nLvl );
-
-        const SfxItemSet& rNdSet = rNd.GetSwAttrSet();
-
-        SfxItemSet aSet( *rNdSet.GetPool(), rNdSet.GetRanges() );
-        aSet.SetParent( &rNdSet );
-        SvxLRSpaceItem aLR( (SvxLRSpaceItem&)rNdSet.Get( RES_LR_SPACE ) );
-        aLR.SetTxtLeft( aLR.GetTxtLeft() + pFmt->GetIndentAt() );
-
-        aLR.SetTxtFirstLineOfst( pFmt->GetFirstLineIndent() );
-        if ( bExportNumRule )
-            Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTTEXT << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << ' ';
-
-        aSet.Put( aLR );
-        Out_SfxItemSet( aRTFAttrFnTab, *this, aSet, TRUE );
-
-        if( pFmt->GetCharFmt() )
-            Out_SfxItemSet( aRTFAttrFnTab, *this,
-                        pFmt->GetCharFmt()->GetAttrSet(), TRUE );
-
-        {
-            String sTxt;
-            if( SVX_NUM_CHAR_SPECIAL == pFmt->GetNumberingType() || SVX_NUM_BITMAP == pFmt->GetNumberingType() )
-                sTxt = pFmt->GetBulletChar();
-            else
-                sTxt = rNd.GetNumString();
-
-            if( bOutFmtAttr )
-            {
-                Strm() << ' ';
-                bOutFmtAttr = FALSE;
-            }
-
-            if (sTxt.Len())
-            {
-                RTFOutFuncs::Out_String(Strm(), sTxt, eDefaultEncoding,
-                    bWriteHelpFmt);
-            }
-
-            if( bExportNumRule )
-            {
-                if( OUTLINE_RULE != pRule->GetRuleType() )
-                {
-                    Strm() << OOO_STRING_SVTOOLS_RTF_TAB << '}' << OOO_STRING_SVTOOLS_RTF_ILVL;
-                    if( nLvl > 8 )			// RTF-kennt nur 9 Ebenen
-                    {
-                        OutULong( 8 );
-                        OutComment( *this, OOO_STRING_SVTOOLS_RTF_SOUTLVL );
-                        OutULong( nLvl ) << '}';
-                    }
-                    else
-                        OutULong( nLvl );
-                    Strm()  << ' ';
-                }
-                else
-                    Strm() << OOO_STRING_SVTOOLS_RTF_TAB << '}';
-            }
-            else if( sTxt.Len() )
-                Strm() << OOO_STRING_SVTOOLS_RTF_TAB;
-        }
-        bOutListNumTxt = FALSE;
-    }
-    return bRet;
-}
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index 14277aa81c..7182ab139e 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -685,57 +685,6 @@ public:
 // Klassendefinitionen fuer Tabellen-Fastsave-Attribute
 // Da wir kein Fastsave unterstuetzen, brauchen wir's nicht
 
-#if 0
-
-class Ww1SingleSprmTInsert : public Ww1SingleSprm {
-public:
-    Ww1SingleSprmTInsert(sal_Char* sName) :
-        Ww1SingleSprm(4, sName) {
-        }
-    void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&);
-};
-
-class Ww1SingleSprmTDelete : public Ww1SingleSprmWord {
-public:
-    Ww1SingleSprmTDelete(sal_Char* sName) :
-        Ww1SingleSprmWord(sName) {
-        }
-    void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&);
-};
-
-class Ww1SingleSprmTDxaCol : public Ww1SingleSprm {
-public:
-    Ww1SingleSprmTDxaCol(sal_Char* sName) :
-        Ww1SingleSprm(4, sName) {
-        }
-    void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&);
-};
-
-class Ww1SingleSprmTMerge : public Ww1SingleSprmWord {
-public:
-    Ww1SingleSprmTMerge(sal_Char* sName) :
-        Ww1SingleSprmWord(sName) {
-        }
-    void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&);
-};
-
-class Ww1SingleSprmTSplit : public Ww1SingleSprmWord {
-public:
-    Ww1SingleSprmTSplit(sal_Char* sName) :
-        Ww1SingleSprmWord(sName) {
-        }
-    void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&);
-};
-
-class Ww1SingleSprmTSetBrc10 : public Ww1SingleSprm {
-public:
-    Ww1SingleSprmTSetBrc10(sal_Char* sName) :
-        Ww1SingleSprm(5, sName) {
-        }
-    void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&);
-};
-#endif // 0
-
 // Klassendefinitionen fuer Apos ( == Flys )
 
 class Ww1SingleSprmPpc : public Ww1SingleSprmByte {
diff --git a/sw/source/filter/ww1/w1struct.hxx b/sw/source/filter/ww1/w1struct.hxx
index cb4ff8552c..2009b93cda 100644
--- a/sw/source/filter/ww1/w1struct.hxx
+++ b/sw/source/filter/ww1/w1struct.hxx
@@ -848,83 +848,6 @@ struct W1_TC //////////////////////////////////////////////////////////
 };
 // cbTC (count of bytes of a TC) is 10(decimal), A(hex).
 
-#if 0
-struct W1_SHD ////////////////////////////////////////////// struct SHD
-{
-    SVBT16 aBits1;
-    // SVBT16 nFore : 5;// 0x001f ForegroundColor
-    USHORT GetFore() { return SVBT16ToShort(aBits1) & 0x01; };
-    void SetFore( short nVal ){
-        ShortToSVBT16((SVBT16ToShort(aBits1)&0xffe0)|(nVal&0x1f), aBits1); };
-    // SVBT16 nBack : 5;// 0x03e0 BackgroundColor
-    W1_SHD() { ShortToSVBT16( 0, aBits1 ); };
-    USHORT GetBack() { return (SVBT16ToShort(aBits1) >> 5 & 0x1f ); };
-    void SetBack( short nVal ){
-        ShortToSVBT16((SVBT16ToShort(aBits1)&0xfc1f)|(nVal&0x1f)<<5, aBits1); };
-    // SVBT16 nStyle : 5;// 0x7c00 Percentage and Style
-    USHORT GetStyle() { return (SVBT16ToShort(aBits1) >> 10 & 0x1f ); };
-    void SetStyle( short nVal ){
-        ShortToSVBT16((SVBT16ToShort(aBits1)&0x83ff)|(nVal&0x1f)<<10, aBits1); };
-    // SVBT16 nDontKnow : 1;// 0x8000 ???
-};
-
-struct W1_ANLV ////////////////////////////////////////////////////////
-{
-    SVBT8 nfc;// 0 number format code, 0=Arabic, 1=Upper case Roman, 2=Lower case Roman
-                        // 3=Upper case Letter, 4=Lower case letter, 5=Ordinal
-    SVBT8 cbTextBefore;// 1 offset into anld.rgch limit of prefix text
-    SVBT8 cbTextAfter;// 2
-    SVBT8 aBits1;
-// SVBT8 jc : 2;// 3 : 0x03	justification code, 0=left, 1=center, 2=right, 3=left and right justify
-// SVBT8 fPrev : 1;// 0x04	when ==1, include previous levels
-// SVBT8 fHang : 1;// 0x08	when ==1, number will be displayed using a hanging indent
-// SVBT8 fSetBold : 1;// 0x10	when ==1, boldness of number will be determined by anld.fBold.
-// SVBT8 fSetItalic : 1;// 0x20	when ==1, italicness of number will be determined by anld.fItalic
-// SVBT8 fSetSmallCaps : 1;// 0x40	when ==1, anld.fSmallCaps will determine whether number will be displayed in small caps or not.
-// SVBT8 fSetCaps : 1;// 0x80	when ==1, anld.fCaps will determine whether number will be displayed capitalized or not
-    SVBT8 aBits2;
-// SVBT8 fSetStrike : 1;// 4 : 0x01	when ==1, anld.fStrike will determine whether the number will be displayed using strikethrough or not.
-// SVBT8 fSetKul : 1;// 0x02 when ==1, anld.kul will determine the underlining state of the autonumber.
-// SVBT8 fPrevSpace : 1;// 0x04	when ==1, autonumber will be displayed with a single prefixing space character
-// SVBT8 fBold : 1;// 0x08	determines boldness of autonumber when anld.fSetBold == 1.
-// SVBT8 fItalic : 1;// 0x10	determines italicness of autonumber when anld.fSetItalic == 1.
-// SVBT8 fSmallCaps : 1;// 0x20	determines whether autonumber will be displayed using small caps when anld.fSetSmallCaps == 1.
-// SVBT8 fCaps : 1;// 0x40	determines whether autonumber will be displayed using caps when anld.fSetCaps == 1.
-// SVBT8 fStrike : 1;// 0x80	determines whether autonumber will be displayed using caps when anld.fSetStrike == 1.
-    SVBT8 aBits3;
-// SVBT8 kul : 3;// 5 : 0x07	determines whether autonumber will be displayed with underlining when anld.fSetKul == 1.
-// SVBT8 ico : 5;// 0xF1	color of autonumber
-    SVBT16 ftc;// 6 font code of autonumber
-    SVBT16 hps;// 8	font half point size (or 0=auto)
-    SVBT16 iStartAt;// 0x0a starting value (0 to 65535)
-    SVBT16 dxaIndent;// 0x0c *short?* *USHORT?* width of prefix text (same as indent)
-    SVBT16 dxaSpace;// 0x0e		minimum space between number and paragraph
-};
-// *cbANLV (count of bytes of ANLV) is 16 (decimal), 10(hex).
-
-struct W1_ANLD ////////////////////////////////////////////////////////
-{
-    W1_ANLV eAnlv;// 0
-    SVBT8 fNumber1;// 0x10		number only 1 item per table cell
-    SVBT8 fNumberAcross;// 0x11		number across cells in table rows(instead of down)
-    SVBT8 fRestartHdn;// 0x12		restart heading number on section boundary
-    SVBT8 fSpareX;// 0x13		unused( should be 0)
-    sal_Char rgchAnld[32];// 0x14	characters displayed before/after autonumber
-};
-
-
-struct W1_OLST ////////////////////////////////////////////////////////
-{
-    W1_ANLV rganlv[9];// 0 an array of 9 ANLV structures (heading levels)
-    SVBT8 fRestartHdr;// 0x90 when ==1, restart heading on section break
-    SVBT8 fSpareOlst2;// 0x91 reserved
-    SVBT8 fSpareOlst3;// 0x92 reserved
-    SVBT8 fSpareOlst4;// 0x93 reserved
-    sal_Char rgch[64];// 0x94 array of 64 chars		text before/after number
-};
-// cbOLST is 212(decimal), D4(hex).
-
-#endif
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7dd2205131..7219ad1751 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1066,23 +1066,6 @@ void DocxAttributeOutput::ParagraphStyle( USHORT nStyle )
     m_pSerializer->singleElementNS( XML_w, XML_pStyle, FSNS( XML_w, XML_val ), aStyleId.getStr(), FSEND );
 }
 
-#if 0
-void DocxAttributeOutput::InTable()
-{
-#if OSL_DEBUG_LEVEL > 0
-    OSL_TRACE( "TODO DocxAttributeOutput::InTable()\n" );
-#endif
-}
-
-
-void DocxAttributeOutput::TableRowProperties( bool /*bHeader*/, long /*nCellHeight*/, bool /*bCannotSplit*/, bool /*bRightToLeft*/ )
-{
-#if OSL_DEBUG_LEVEL > 0
-    OSL_TRACE( "TODO DocxAttributeOutput::TableRowProperties()\n" );
-#endif
-}
-#endif
-
 static OString impl_ConvertColor( const Color &rColor )
 {
     OString color( "auto" );
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 9728dc966c..05ae118926 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -568,21 +568,6 @@ namespace sw
             return aRet;
         }
 
-#if 0        
-        Frames GetFramesBetweenNodes(const Frames &rFrames,
-            const SwNode &rStart, const SwNode &rEnd)
-        {
-            Frames aRet;
-            ULONG nEnd = rEnd.GetIndex();
-            for (ULONG nI = rStart.GetIndex(); nI < nEnd; ++nI)
-            {
-                my_copy_if(rFrames.begin(), rFrames.end(),
-                    std::back_inserter(aRet), anchoredto(nI));
-            }
-            return aRet;
-
-        }
-#endif
         Frames GetFramesInNode(const Frames &rFrames, const SwNode &rNode)
         {
             Frames aRet;
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 2dde54b2b9..fab98c17f4 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -664,30 +664,6 @@ namespace sw
         */
         Frames GetFramesInNode(const Frames &rFrames, const SwNode &rNode);
 
-#if 0        
-        /** Get the Frames anchored for all nodes between two points
-
-            Given a container of frames, find the ones anchored to the nodes
-            from start to end. Half open sequence, i.e. those anchored to
-            start, but not those anchored to end
-
-            @param rFrames
-            The container of frames to search in
-
-            @param rStart
-            The SwNode to start check for anchors from
-
-            @param rEnd
-            The SwNode to end check for anchors from
-
-            @return the Frames in rFrames anchored to rNode
-
-            @author
-            <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
-        */
-        Frames GetFramesBetweenNodes(const Frames &rFrames,
-                const SwNode &rStart, const SwNode &rEnd);
-#endif
         /** Get the Numbering Format used on a paragraph
 
             There are two differing types of numbering formats that may be on a
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 344942f14f..74c10aa475 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2347,108 +2347,6 @@ void WW8AttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeIn
         aIt++;
     }
 }
-
-#if 0
-/*  */
-
-USHORT WW8Export::StartTableFromFrmFmt( WW8Bytes &rAt, const SwFrmFmt *pFmt )
-{
-    // Tell the undocumented table hack that everything between here and
-    // the last table position is nontable text
-    if ( WW8_CP nPos = Fc2Cp( Strm().Tell() ) )
-        pMagicTable->Append(nPos,0);
-
-    // sprmPDxaFromText10
-    if( bWrtWW8 )
-    {
-        static BYTE __READONLY_DATA  aTabLineAttr[] = {
-                0, 0,               // Sty # 0
-                0x16, 0x24, 1,      // sprmPFInTable
-                0x17, 0x24, 1 };    // sprmPFTtp
-        rAt.Insert( aTabLineAttr, sizeof( aTabLineAttr ), rAt.Count() );
-    }
-    else
-    {
-        static BYTE __READONLY_DATA  aTabLineAttr[] = {
-                0, 0,               // Sty # 0
-                24, 1,              // sprmPFInTable
-                25, 1 };            // sprmPFTtp
-        rAt.Insert( aTabLineAttr, sizeof( aTabLineAttr ), rAt.Count() );
-    }
-
-    ASSERT( pFmt, "No pFmt!" );
-    if ( pFmt )
-    {
-        const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient();
-        const SwFmtVertOrient &rVert = pFmt->GetVertOrient();
-        if (
-            (text::RelOrientation::PRINT_AREA == rHori.GetRelationOrient() ||
-             text::RelOrientation::FRAME == rHori.GetRelationOrient())
-            &&
-            (text::RelOrientation::PRINT_AREA == rVert.GetRelationOrient() ||
-             text::RelOrientation::FRAME == rVert.GetRelationOrient())
-           )
-        {
-            sal_Int16 eHOri = rHori.GetHoriOrient();
-            switch (eHOri)
-            {
-                case text::HoriOrientation::CENTER:
-                case text::HoriOrientation::RIGHT:
-                    if( bWrtWW8 )
-                        SwWW8Writer::InsUInt16( rAt, NS_sprm::LN_TJc );
-                    else
-                        rAt.Insert( 182, rAt.Count() );
-                    SwWW8Writer::InsUInt16( rAt, (text::HoriOrientation::RIGHT == eHOri ? 2 : 1 ));
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-    return rAt.Count();
-}
-
-//See #i19484# for why we need this
-static bool CellContainsProblematicGraphic( const SwWriteTableCell *pCell,
-    const MSWordExportBase &rExport )
-{
-    const SwNode *pStart = pCell ? pCell->GetBox()->GetSttNd() : 0;
-    const SwNode *pEnd = pStart ? pStart->EndOfSectionNode() : 0;
-    ASSERT( pStart && pEnd, "No start or end?" );
-    if ( !pStart || !pEnd )
-        return false;
-
-    bool bHasGraphic = false;
-
-    sw::Frames aFrames( GetFramesBetweenNodes( rExport.maFrames, *pStart, *pEnd ) );
-    sw::FrameIter aEnd = aFrames.end();
-    for ( sw::FrameIter aIter = aFrames.begin(); aIter != aEnd; ++aIter )
-    {
-        const SwFrmFmt &rEntry = aIter->GetFrmFmt();
-        if ( rEntry.GetSurround().GetSurround() == SURROUND_THROUGHT )
-        {
-            bHasGraphic = true;
-            break;
-        }
-    }
-    return bHasGraphic;
-}
-
-static bool RowContainsProblematicGraphic( const SwWriteTableCellPtr *pRow,
-    USHORT nCols, const MSWordExportBase &rExport )
-{
-    bool bHasGraphic = false;
-    for ( USHORT nI = 0; nI < nCols; ++nI )
-    {
-        if ( CellContainsProblematicGraphic( pRow[nI], rExport ) )
-        {
-            bHasGraphic = true;
-            break;
-        }
-    }
-    return bHasGraphic;
-}
-#endif
 //---------------------------------------------------------------------------
 //       Tabellen
 //---------------------------------------------------------------------------
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 3508f9c42b..b6b9f221f7 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1017,10 +1017,6 @@ public:
 
     virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t() );
     void WriteChar( sal_Unicode c );
-#if 0
-    USHORT StartTableFromFrmFmt(WW8Bytes &rAt, const SwFrmFmt *pFmt,
-        SwTwips &rPageSize);
-#endif
 
     void OutSwString(const String&, xub_StrLen nStt, xub_StrLen nLen,
         bool bUnicode, rtl_TextEncoding eChrSet);
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 56be84dcd1..9bbdab33a5 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1827,11 +1827,6 @@ void WW8Export::OutputField( const SwField* pFld, ww::eField eFldType,
                   eFldType == ww::eNOTEREF || eFldType == ww::eFOOTREF ))
                 bHandleBookmark = true;
 
-#if 0
-            if (pFld->GetTyp()->Which() == RES_INPUTFLD &&
-                eFldType == ww::eFORMTEXT)
-                bHandleBookmark = true;
-#endif
         }
 
         if ( bHandleBookmark )
@@ -4391,25 +4386,6 @@ void WW8AttributeOutput::FormatColumns_Impl( USHORT nCols, const SwFmtCol & rCol
         m_rWW8Export.pO->Insert( 138, m_rWW8Export.pO->Count(  ) );
     m_rWW8Export.pO->Insert( bEven ? 1 : 0, m_rWW8Export.pO->Count(  ) );
 
-#if 0
-    // FIXME what's the use of this code
-    if ( bEven )
-    {
-        USHORT nSpace = rColumns[0]->GetRight() + rColumns[1]->GetLeft();
-        for ( n = 2; n < nCols; n++ )
-        {
-            short nDiff = nSpace - ( rColumns[n - 1]->GetRight()
-                                         + rColumns[n]->GetLeft() );
-            if (nDiff > 10 || nDiff < -10)
-            {
-                // Toleranz: 10 tw
-                bEven = false;
-                break;
-            }
-        }
-    }
-#endif
-
     if ( !bEven )
     {
         for ( USHORT n = 0; n < nCols; ++n )
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 1bc5152fc8..8e7b05a0cd 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -538,15 +538,6 @@ private:
     WW8FormulaEditBox& operator=(const WW8FormulaEditBox&);
 public:
     WW8FormulaEditBox(SwWW8ImplReader &rR);
-#if 0
-    //#i3029# we are no longer importing editboxes as uno textboxes, using
-    //input fields instead for superior layout.
-    virtual sal_Bool Import(const com::sun::star::uno::Reference <
-        com::sun::star::lang::XMultiServiceFactory> &rServiceFactory,
-        com::sun::star::uno::Reference <
-        com::sun::star::form::XFormComponent> &rFComp,
-        com::sun::star::awt::Size &rSz);
-#endif
 };
 
 class SwMSConvertControls: public SvxMSConvertOCXControls
@@ -1183,13 +1174,10 @@ private:
     //border which has been previously set to a value and for which becoming
     //empty is valid. Set bCheBtwn to work with paragraphs that have a special
     //between paragraphs border
-#if 0
-    // #i20672# we can't properly support between lines so best to ignore
+
+    // Note #i20672# we can't properly support between lines so best to ignore
     // them for now
     bool SetBorder(SvxBoxItem& rBox, const WW8_BRC* pbrc, short *pSizeArray=0,
-        BYTE nSetBorders=0xFF, bool bChkBtwn = false) const;
-#endif
-    bool SetBorder(SvxBoxItem& rBox, const WW8_BRC* pbrc, short *pSizeArray=0,
         BYTE nSetBorders=0xFF) const;
     void GetBorderDistance(const WW8_BRC* pbrc, Rectangle& rInnerDist) const;
     sal_uInt16 GetParagraphAutoSpace(bool fDontUseHTMLAutoSpacing);
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 4dce54425a..57ab172736 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -143,13 +143,6 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr )
     if (!bUseEnhFields) {
     aFormula.sDefault = GetFieldResult(pF);
 
-#if 0 // why not? (flr)
-    //substituting Unicode spacing 0x2002 with double space for layout
-    aFormula.sDefault.SearchAndReplaceAll(
-        String(static_cast< sal_Unicode >(0x2002)),
-        CREATE_CONST_ASC("  "));
-#endif
-
     SwInputField aFld((SwInputFieldType*)rDoc.GetSysFldType( RES_INPUTFLD ),
               aFormula.sDefault , aFormula.sTitle , INP_TXT, 0 );
     aFld.SetHelp(aFormula.sHelp);
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index aeac0e64af..de0848b1cb 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5155,15 +5155,16 @@ WW8_CP WW8Fib::GetBaseCp(ManTypes nType) const
         case MAN_HDFT:
             nOffset = ccpText + ccpFtn;
             break;
-/* 
- * A subdocument of this kind probably exists in some defunct version
- * of MSWord, but now ccpMcr is always 0
- */
-#if 0
+        /*
+         A subdocument of this kind (MAN_MACRO) probably exists in some defunct
+         version of MSWord, but now ccpMcr is always 0. If some example that
+         uses this comes to light, this is the likely calculation required
+
         case MAN_MACRO:
             nOffset = ccpText + ccpFtn + ccpHdr;
             break;
-#endif
+
+        */
         case MAN_AND:
             nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr;
             break;
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index 4706541927..d72dce9ed8 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -613,55 +613,6 @@ struct WW8_OLST
 };
 // cbOLST is 212(decimal), D4(hex).
 
-#if 0
-struct ANLV
-{
-    ALNV();
-    void ReadFromMem(const sal_uInt8 *&pData);
-    sal_uInt8 nfc;
-    sal_uInt8 cbTextBefore;
-    sal_uInt8 cbTextAfter;
-    sal_uInt8 jc : 2;
-    sal_uInt8 fPrev : 1;
-    sal_uInt8 fHang : 1;
-    sal_uInt8 fSetBold : 1;
-    sal_uInt8 fSetItalic : 1;
-    sal_uInt8 fSetSmallCaps : 1;
-    sal_uInt8 fSetCaps : 1;
-    sal_uInt8 fSetStrike : 1;
-    sal_uInt8 fSetKul : 1;
-    sal_uInt8 fPrevSpace : 1;
-    sal_uInt8 fBold : 1;
-    sal_uInt8 fItalic : 1;
-    sal_uInt8 fSmallCaps : 1;
-    sal_uInt8 fCaps : 1;
-    sal_uInt8 fStrike : 1;
-    sal_uInt8 kul : 3;
-    sal_uInt8 ico : 5;
-    sal_uInt16 ftc;
-    sal_uInt16 hps;
-    sal_uInt16 iStartAt;
-    sal_uInt16 dxaIndent;
-    sal_uInt16 dxaSpace;
-};
-
-struct OLST
-{
-    OLST();
-    void ReadFromMem(const sal_uInt8 *&pData, bool bVer67)
-    ANLV rganlv[9];         // 0 an array of 9 ANLV structures (heading levels)
-    sal_uInt8 fRestartHdr;  // when ==1, restart heading on section break
-    sal_uInt8 fSpareOlst2;  // reserved
-    sal_uInt8 fSpareOlst3;  // reserved
-    sal_uInt8 fSpareOlst4;  // reserved
-    sal_uInt16 rgxch[64];   // array of 64 chars text before/after number
-#if 0
-    sal_uInt16 rgxch[32];   // array of 32 chars text before/after number
-    sal_uInt8 rgch[64];     // array of 64 chars text before/after number
-#endif
-};
-#endif
-
 struct WW8_FDOA
 {
     SVBT32 fc;          // 0  FC pointing to drawing object data
@@ -998,7 +949,7 @@ struct SEPr
     sal_uInt16 dmBinFirst;
     sal_uInt16 dmBinOther;
     sal_uInt16 dmPaperReq;
-#if 0
+/*
     28  1C  brcTop                    BRC                   top page border
 
     32  20  brcLeft                   BRC                   left page border
@@ -1006,7 +957,7 @@ struct SEPr
     36  24  brcBottom                 BRC                   bottom page border
 
     40  28  brcRight                  BRC                   right page border
-#endif
+*/
     sal_Int16 fPropRMark;
     sal_Int16 ibstPropRMark;
     sal_Int32 dttmPropRMark;        //DTTM
@@ -1048,9 +999,6 @@ struct SEPr
     sal_uInt8 dmOrientFirst;
     sal_uInt8 fLayout;
     sal_Int16 reserved4;
-#if 0
-    OLST olstAnm;       //currently unused
-#endif
 };
 
 namespace wwUtility
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 5d2c06cce4..e640f4a6a7 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -1305,26 +1305,6 @@ void SwPostItMgr::Delete()
     CalcRects();
     LayoutPostIts();
 }
-#if 0
-void SwPostItMgr::Hide(SwPostItField* pPostItField )
-{
-    for(std::list<SwSidebarItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
-    {
-        if ((*i)->GetFmtFld())
-        {
-            SwPostItField* pField = static_cast<SwPostItField*>((*i)->GetFmtFld()->GetFld());
-            if (pPostItField==pField)
-            {
-                (*i)->bShow = false;
-                (*i)->pPostIt->HideNote();
-                break;
-            }
-        }
-    }
-
-    LayoutPostIts();
-}
-#endif
 void SwPostItMgr::Hide( const String& rAuthor )
 {
     for(SwSidebarItem_iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index f97c23140a..c42e41c3fa 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -917,24 +917,6 @@ void SwSpellPopup::Execute( USHORT nId )
             lcl_CharDialog( *pSh, true, nId, 0, 0 );
             pSh->Pop( FALSE );  // restore cursor
         }
-#if 0
-        else if (nId == MN_SET_LANGUAGE_ALL_TEXT_START + nNumLanguageDocEntries - 1)
-        {
-            //Set Language_None as the default language
-            SwLangHelper::SetLanguage_None( *pSh, false, aCoreSet );
-        }
-        else if (nId == MN_SET_LANGUAGE_ALL_TEXT_START + nNumLanguageDocEntries)
-        {
-            // open the dialog "Tools/Options/Language Settings - Language"
-            SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-            if (pFact)
-            {
-                VclAbstractDialog* pDlg = pFact->CreateVclDialog( pSh->GetView().GetWindow(), SID_LANGUAGE_OPTIONS );
-                pDlg->Execute();
-                delete pDlg;
-            }
-        }
-#endif
     }    
 
     pSh->EnterStdMode();
diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx
index 2e7194217e..cb245e9b2a 100644
--- a/sw/source/ui/vba/vbawindow.cxx
+++ b/sw/source/ui/vba/vbawindow.cxx
@@ -37,10 +37,6 @@
 #include "vbapane.hxx"
 #include "wordvbahelper.hxx"
 #include <view.hxx>
-// #FIXME where has SfxTopViewFrame gone
-#if 0
-#include <sfx2/topfrm.hxx>
-#endif
 
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;