remove SVX_LIGHT macro

16 files changed, 0 insertions, 233 deletions

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 1782a264b8fb..e9f7fe48dcf3 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -712,9 +712,7 @@ ContentNode::ContentNode( const XubString& rStr, const ContentAttribs& rContentA
 ContentNode::~ContentNode()
 {
     DBG_DTOR( EE_ContentNode, 0 );
-#ifndef SVX_LIGHT
     delete pWrongList;
-#endif
 }
 
 void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemPool )
@@ -842,13 +840,11 @@ void ContentNode::ExpandAttribs( USHORT nIndex, USHORT nNew, SfxItemPool& rItemP
     if ( bResort )
         aCharAttribList.ResortAttribs();
 
-#ifndef SVX_LIGHT
     if ( pWrongList )
     {
         BOOL bSep = ( GetChar( nIndex ) == ' ' ) || IsFeature( nIndex );
         pWrongList->TextInserted( nIndex, nNew, bSep );
     }
-#endif // !SVX_LIGHT
 
 #ifdef EDITDEBUG
     DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), TRUE ), "Expand: Start List distorted" );
@@ -935,10 +931,8 @@ void ContentNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted, SfxItemPool& r
     if ( bResort )
         aCharAttribList.ResortAttribs();
 
-#ifndef SVX_LIGHT
     if ( pWrongList )
         pWrongList->TextDeleted( nIndex, nDeleted );
-#endif // !SVX_LIGHT
 
 #ifdef EDITDEBUG
     DBG_ASSERT( CheckOrderedList( aCharAttribList.GetAttribs(), TRUE ), "Collaps: Start list distorted" );
@@ -1087,18 +1081,14 @@ void ContentNode::SetStyleSheet( SfxStyleSheet* pS, BOOL bRecalcFont )
 
 void ContentNode::DestroyWrongList()
 {
-#ifndef SVX_LIGHT
     delete pWrongList;
-#endif
     pWrongList = NULL;
 }
 
 void ContentNode::CreateWrongList()
 {
     DBG_ASSERT( !pWrongList, "WrongList already exist!" );
-#ifndef SVX_LIGHT
     pWrongList = new WrongList;
-#endif
 }
 
 void ContentNode::SetWrongList( WrongList* p )
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index fc3e4ef7ed38..0f8af97ab52d 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -211,10 +211,8 @@ ContentInfo::ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse
     }
 
     pWrongs = NULL;
-#ifndef SVX_LIGHT
     if ( rCopyFrom.GetWrongList() )
         pWrongs = rCopyFrom.GetWrongList()->Clone();
-#endif // !SVX_LIGHT
 }
 
 ContentInfo::~ContentInfo()
@@ -226,9 +224,7 @@ ContentInfo::~ContentInfo()
         delete pAttr;
     }
     aAttribs.Remove( 0, aAttribs.Count() );
-#ifndef SVX_LIGHT
     delete pWrongs;
-#endif
 }
 
 // #i102062#
@@ -877,14 +873,12 @@ void BinTextObject::ClearPortionInfo()
 
 BOOL BinTextObject::HasOnlineSpellErrors() const
 {
-#ifndef SVX_LIGHT
     for ( USHORT n = 0; n < aContents.Count(); n++ )
     {
         ContentInfo* p = aContents.GetObject( n );
         if ( p->GetWrongList() && p->GetWrongList()->Count() )
             return TRUE;
     }
-#endif // !SVX_LIGHT
     return FALSE;
 
 }
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index ad67a7d35fdd..b9604c68401c 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -601,7 +601,6 @@ ULONG EditView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFo
     return rInput.GetError();
 }
 
-#ifndef SVX_LIGHT
 ULONG EditView::Write( SvStream& rOutput, EETextFormat eFormat )
 {
     DBG_CHKTHIS( EditView, 0 );
@@ -610,7 +609,6 @@ ULONG EditView::Write( SvStream& rOutput, EETextFormat eFormat )
     ShowCursor();
     return rOutput.GetError();
 }
-#endif
 
 void EditView::Cut()
 {
@@ -936,30 +934,22 @@ void EditView::CompleteAutoCorrect( Window* pFrameWin )
 
 EESpellState EditView::StartSpeller( sal_Bool bMultipleDoc )
 {
-#ifdef SVX_LIGHT
-    return EE_SPELL_NOSPELLER;
-#else
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     if ( !PIMPEE->GetSpeller().is() )
         return EE_SPELL_NOSPELLER;
 
     return PIMPEE->Spell( this, bMultipleDoc );
-#endif
 }
 
 EESpellState EditView::StartThesaurus()
 {
-#ifdef SVX_LIGHT
-    return EE_SPELL_NOSPELLER;
-#else
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     if ( !PIMPEE->GetSpeller().is() )
         return EE_SPELL_NOSPELLER;
 
     return PIMPEE->StartThesaurus( this );
-#endif
 }
 
 
@@ -967,12 +957,9 @@ void EditView::StartTextConversion(
         LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
         INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc )
 {
-#ifdef SVX_LIGHT
-#else
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     PIMPEE->Convert( this, nSrcLang, nDestLang, pDestFont, nOptions, bIsInteractive, bMultipleDoc );
-#endif
 }
 
 
@@ -1028,7 +1015,6 @@ static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl )
 
 void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
 {
-#ifndef SVX_LIGHT
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
 
@@ -1302,7 +1288,6 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
             SetSelection( aOldSel );
         }
     }
-#endif
 }
 
 void EditView::SpellIgnoreWord()
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 150d8127dc57..ff6d40581369 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -160,12 +160,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
         ppDefItems[43] = new SvxEmphasisMarkItem( EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK );
         ppDefItems[44] = new SvxCharReliefItem( RELIEF_NONE, EE_CHAR_RELIEF );
         ppDefItems[45] = new SfxVoidItem( EE_CHAR_RUBI_DUMMY );
-#ifndef SVX_LIGHT
         ppDefItems[46] = new SvXMLAttrContainerItem( EE_CHAR_XMLATTRIBS );
-#else
-        // no need to have alien attributes persistent
-        ppDefItems[46] = new SfxVoidItem( EE_CHAR_XMLATTRIBS );
-#endif // #ifndef SVX_LIGHT
         ppDefItems[47] = new SvxOverlineItem( UNDERLINE_NONE, EE_CHAR_OVERLINE );
 
         // Features
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index f7e048388229..4752025bca01 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -33,8 +33,6 @@
 #include <editdoc.hxx>
 #include <impedit.hxx>
 
-#ifndef SVX_LIGHT
-
 class EditNodeIdx : public SvxNodeIdx
 {
 private:
@@ -125,7 +123,6 @@ SV_DECL_REF( EditRTFParser )
 SV_IMPL_REF( EditRTFParser );
 
 
-#endif  // !SVX_LIGH
 #endif  //_EERTFPAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index a65d339b73bb..295164853971 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1102,7 +1102,6 @@ void ImpEditView::SetInsertMode( sal_Bool bInsert )
 sal_Bool ImpEditView::IsWrongSpelledWord( const EditPaM& rPaM, sal_Bool bMarkIfWrong )
 {
     sal_Bool bIsWrong = sal_False;
-#ifndef SVX_LIGHT
     if ( rPaM.GetNode()->GetWrongList() )
     {
         EditSelection aSel = pEditEngine->pImpEditEngine->SelectWord( rPaM, ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
@@ -1114,14 +1113,12 @@ sal_Bool ImpEditView::IsWrongSpelledWord( const EditPaM& rPaM, sal_Bool bMarkIfW
             DrawSelection();
         }
     }
-#endif // !SVX_LIGHT
     return bIsWrong;
 }
 
 String ImpEditView::SpellIgnoreOrAddWord( sal_Bool bAdd )
 {
     String aWord;
-#ifndef SVX_LIGHT
     if ( pEditEngine->pImpEditEngine->GetSpeller().is() )
     {
         EditPaM aPaM = GetEditSelection().Max();
@@ -1162,7 +1159,6 @@ String ImpEditView::SpellIgnoreOrAddWord( sal_Bool bAdd )
             pEditEngine->pImpEditEngine->StartOnlineSpellTimer();
         }
     }
-#endif // !SVX_LIGHT
     return aWord;
 }
 
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 11ae1a119beb..1e5927c150b4 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -1108,14 +1108,12 @@ inline void ImpEditEngine::IdleFormatAndUpdate( EditView* pCurView )
     aIdleFormatter.DoIdleFormat( pCurView );
 }
 
-#ifndef SVX_LIGHT
 inline EditUndoManager& ImpEditEngine::GetUndoManager()
 {
     if ( !pUndoManager )
         pUndoManager = new EditUndoManager( this );
     return *pUndoManager;
 }
-#endif
 
 inline ParaPortion* ImpEditEngine::FindParaPortion( ContentNode* pNode ) const
 {
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index da6cd539533d..66185f7cf74b 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -265,10 +265,8 @@ void ImpEditEngine::InitDoc( BOOL bKeepParaAttribs )
         GetEditEnginePtr()->ParagraphInserted( 0 );
     }
 
-#ifndef SVX_LIGHT
     if ( GetStatus().DoOnlineSpelling() )
         aEditDoc.GetObject( 0 )->CreateWrongList();
-#endif // !SVX_LIGHT
 }
 
 EditPaM ImpEditEngine::DeleteSelected( EditSelection aSel )
@@ -763,9 +761,7 @@ void ImpEditEngine::SetText( const XubString& rText )
     if( !rText.Len() )  // otherwise it must be invalidated later, !bFormatted is enough.
         nCurTextHeight = 0;
     EnableUndo( bUndoCurrentlyEnabled );
-#ifndef SVX_LIGHT
     DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(), "Undo after SetText?" );
-#endif
 }
 
 
@@ -2123,21 +2119,17 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, USHORT nChars, EditUndo
             EditCharAttrib* pAttr = rAttribs[nAttr];
             if ( ( pAttr->GetEnd() >= nStart ) && ( pAttr->GetStart() < nEnd ) )
             {
-#ifndef SVX_LIGHT
                 EditSelection aSel( rPaM );
                 aSel.Max().GetIndex() = aSel.Max().GetIndex() + nChars;
                 EditUndoSetAttribs* pAttrUndo = CreateAttribUndo( aSel, GetEmptyItemSet() );
                 InsertUndo( pAttrUndo );
-#endif
                 break;  // for
             }
         }
         if ( pCurUndo && ( CreateEditPaM( pCurUndo->GetEPaM() ) == rPaM ) )
             pCurUndo->GetStr() += aStr;
-#ifndef SVX_LIGHT
         else
             InsertUndo( new EditUndoRemoveChars( this, CreateEPaM( rPaM ), aStr ) );
-#endif
     }
 
     aEditDoc.RemoveChars( rPaM, nChars );
@@ -2276,7 +2268,6 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
 
     GetEditEnginePtr()->ParagraphConnected( aEditDoc.GetPos( pLeft ), aEditDoc.GetPos( pRight ) );
 
-#ifndef SVX_LIGHT
     if ( IsUndoEnabled() && !IsInUndo() )
     {
         InsertUndo( new EditUndoConnectParas( this,
@@ -2284,7 +2275,6 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
             pLeft->GetContentAttribs().GetItems(), pRight->GetContentAttribs().GetItems(),
             pLeft->GetStyleSheet(), pRight->GetStyleSheet(), bBackward ) );
     }
-#endif
 
     if ( bBackward )
     {
@@ -2302,7 +2292,6 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
     DBG_ASSERT( pRightPortion, "Blind Portion in ImpConnectParagraphs(2)" );
     DBG_ASSERT( nParagraphTobeDeleted == GetParaPortions().GetPos( pRightPortion ), "NodePos != PortionPos?" );
 
-#ifndef SVX_LIGHT
     if ( GetStatus().DoOnlineSpelling() )
     {
         xub_StrLen nEnd = pLeft->Len();
@@ -2322,7 +2311,6 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
             }
         }
     }
-#endif
 
     if ( IsCallParaInsertedOrDeleted() )
         GetEditEnginePtr()->ParagraphDeleted( nParagraphTobeDeleted );
@@ -2528,11 +2516,9 @@ void ImpEditEngine::ImpRemoveParagraph( USHORT nPara )
     if ( pNextNode )
         ParaAttribsChanged( pNextNode );
 
-#ifndef SVX_LIGHT
     if ( IsUndoEnabled() && !IsInUndo() )
         InsertUndo( new EditUndoDelContent( this, pNode, nPara ) );
     else
-#endif
     {
         aEditDoc.RemoveItemsFromPool( pNode );
         if ( pNode->GetStyleSheet() )
@@ -2545,7 +2531,6 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
                                     bool bOverwrite, Window* pFrameWin )
 {
     EditSelection aSel( rCurSel );
-#ifndef SVX_LIGHT
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
     if ( pAutoCorrect )
     {
@@ -2599,7 +2584,6 @@ EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, xub_Unicode c,
         // shared we need to reset the value to it's original state.
         pAutoCorrect->SetAutoCorrFlag( CptlSttSntnc, bOldCptlSttSntnc );
     }
-#endif // !SVX_LIGHT
     return aSel.Max();
 }
 
@@ -2752,10 +2736,8 @@ EditPaM ImpEditEngine::ImpInsertText( EditSelection aCurSel, const XubString& rS
                 nEnd -= ( aLine.Len() - nMaxNewChars ); // Then the characters end up in the next paragraph.
                 aLine.Erase( nMaxNewChars );            // Delete the Rest...
             }
-#ifndef SVX_LIGHT
             if ( IsUndoEnabled() && !IsInUndo() )
                 InsertUndo( new EditUndoInsertChars( this, CreateEPaM( aPaM ), aLine ) );
-#endif
             // Tabs ?
             if ( aLine.Search( '\t' ) == STRING_NOTFOUND )
                 aPaM = aEditDoc.InsertText( aPaM, aLine );
@@ -2807,10 +2789,8 @@ EditPaM ImpEditEngine::ImpFastInsertText( EditPaM aPaM, const XubString& rStr )
 
     if ( ( aPaM.GetNode()->Len() + rStr.Len() ) < MAXCHARSINPARA )
     {
-#ifndef SVX_LIGHT
         if ( IsUndoEnabled() && !IsInUndo() )
             InsertUndo( new EditUndoInsertChars( this, CreateEPaM( aPaM ), rStr ) );
-#endif
 
         aPaM = aEditDoc.InsertText( aPaM, rStr );
         TextModified();
@@ -2834,10 +2814,8 @@ EditPaM ImpEditEngine::ImpInsertFeature( EditSelection aCurSel, const SfxPoolIte
     if ( aPaM.GetIndex() >= 0xfffe )
         return aPaM;
 
-#ifndef SVX_LIGHT
     if ( IsUndoEnabled() && !IsInUndo() )
         InsertUndo( new EditUndoInsertFeature( this, CreateEPaM( aPaM ), rItem ) );
-#endif
     aPaM = aEditDoc.InsertFeature( aPaM, rItem );
 
     ParaPortion* pPortion = FindParaPortion( aPaM.GetNode() );
@@ -2868,14 +2846,11 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
         return rPaM;
     }
 
-#ifndef SVX_LIGHT
     if ( IsUndoEnabled() && !IsInUndo() )
         InsertUndo( new EditUndoSplitPara( this, aEditDoc.GetPos( rPaM.GetNode() ), rPaM.GetIndex() ) );
-#endif
 
     EditPaM aPaM( aEditDoc.InsertParaBreak( rPaM, bKeepEndingAttribs ) );
 
-#ifndef SVX_LIGHT
     if ( GetStatus().DoOnlineSpelling() )
     {
         xub_StrLen nEnd = rPaM.GetNode()->Len();
@@ -2907,8 +2882,6 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
         pRWrongs->SetValid(); // otherwise 0 - 0xFFFF
         pRWrongs->MarkInvalid( 0, 1 );  // Only test the first word
     }
-#endif // !SVX_LIGHT
-
 
     ParaPortion* pPortion = FindParaPortion( rPaM.GetNode() );
     DBG_ASSERT( pPortion, "Blind Portion in ImpInsertParaBreak" );
@@ -2930,7 +2903,6 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL bKeepEnding
 
 EditPaM ImpEditEngine::ImpFastInsertParagraph( USHORT nPara )
 {
-#ifndef SVX_LIGHT
     if ( IsUndoEnabled() && !IsInUndo() )
     {
         if ( nPara )
@@ -2941,16 +2913,13 @@ EditPaM ImpEditEngine::ImpFastInsertParagraph( USHORT nPara )
         else
             InsertUndo( new EditUndoSplitPara( this, 0, 0 ) );
     }
-#endif
 
     ContentNode* pNode = new ContentNode( aEditDoc.GetItemPool() );
     // If flat mode, then later no Font is set:
     pNode->GetCharAttribs().GetDefFont() = aEditDoc.GetDefFont();
 
-#ifndef SVX_LIGHT
     if ( GetStatus().DoOnlineSpelling() )
         pNode->CreateWrongList();
-#endif // !SVX_LIGHT
 
     aEditDoc.Insert( pNode, nPara );
 
@@ -3609,7 +3578,6 @@ void ImpEditEngine::SetActiveView( EditView* pView )
 
 uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable( const EditSelection& rSelection ) const
 {
-#ifndef SVX_LIGHT
     EditSelection aSelection( rSelection );
     aSelection.Adjust( GetEditDoc() );
 
@@ -3651,9 +3619,6 @@ uno::Reference< datatransfer::XTransferable > ImpEditEngine::CreateTransferable(
     }
 
     return xDataObj;
-#else
-    return uno::Reference< datatransfer::XTransferable >();
-#endif
 }
 
 EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, BOOL bUseSpecial )
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 03c3bc57d54d..9c47a54de83f 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -172,7 +172,6 @@ void lcl_DrawRedLines(
     BOOL bVertical,
     BOOL bIsRightToLeft )
 {
-#ifndef SVX_LIGHT
     // Aber nur, wenn Font nicht zu klein...
     long nHght = pOutDev->LogicToPixel( Size( 0, nFontHeight ) ).Height();
     if( WRONG_SHOW_MIN < nHght )
@@ -244,7 +243,6 @@ void lcl_DrawRedLines(
                 bWrong = sal_False;
         }
     }
-#endif // !SVX_LIGHT
 }
 
 Point lcl_ImplCalcRotatedPos( Point rPos, Point rOrigin, double nSin, double nCos )
@@ -1826,7 +1824,6 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
         bHangingPunctuation = ( nBreakPos > nMaxBreakPos ) ? sal_True : sal_False;
         pLine->SetHangingPunctuation( bHangingPunctuation );
 
-    #ifndef SVX_LIGHT
         // Egal ob Trenner oder nicht: Das Wort nach dem Trenner durch
         // die Silbentrennung jagen...
         // nMaxBreakPos ist das letzte Zeichen was in die Zeile passt,
@@ -1922,8 +1919,6 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
             }
         }
 
-    #endif // !SVX_LIGHT
-
         if ( nBreakPos <= pLine->GetStart() )
         {
             // keine Trenner in Zeile => abhacken !
@@ -3472,7 +3467,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
 
                                     }
 
-#ifndef SVX_LIGHT
                                     if ( GetStatus().DoOnlineSpelling() && pPortion->GetNode()->GetWrongList()->HasWrongs() && pTextPortion->GetLen() )
                                     {
                                         {//#105750# adjust LinePos for superscript or subscript text
@@ -3491,7 +3485,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                         lcl_DrawRedLines( pOutDev, aTmpFont.GetSize().Height(), aRedLineTmpPos, nIndex, nIndex + pTextPortion->GetLen(), pDXArray, pPortion->GetNode()->GetWrongList(), nOrientation, aOrigin, IsVertical(), pTextPortion->IsRightToLeft() );
                                         pOutDev->SetLineColor( aOldColor );
                                     }
-#endif // !SVX_LIGHT
                                 }
 
                                 pOutDev->Pop();
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 277cf4fb8de6..c8df8cbcf907 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -147,7 +147,6 @@ EditPaM ImpEditEngine::ReadText( SvStream& rInput, EditSelection aSel )
 
 EditPaM ImpEditEngine::ReadXML( SvStream& rInput, EditSelection aSel )
 {
-#ifndef SVX_LIGHT
     if ( aSel.HasRange() )
         aSel = ImpDeleteSelection( aSel );
 
@@ -156,15 +155,10 @@ EditPaM ImpEditEngine::ReadXML( SvStream& rInput, EditSelection aSel )
     ::SvxReadXML( *GetEditEnginePtr(), rInput, aESel );
 
     return aSel.Max();
-#else
-    return EditPaM();
-#endif
 }
 
 EditPaM ImpEditEngine::ReadRTF( SvStream& rInput, EditSelection aSel )
 {
-#ifndef SVX_LIGHT
-
 #if defined (EDITDEBUG) && !defined( UNX )
     SvFileStream aRTFOut( String( RTL_CONSTASCII_USTRINGPARAM ( "d:\\rtf_in.rtf" ) ), STREAM_WRITE );
     aRTFOut << rInput;
@@ -192,15 +186,10 @@ EditPaM ImpEditEngine::ReadRTF( SvStream& rInput, EditSelection aSel )
         return aSel.Min();
     }
     return xPrsr->GetCurPaM();
-#else
-    return EditPaM();
-#endif
 }
 
 EditPaM ImpEditEngine::ReadHTML( SvStream& rInput, const String& rBaseURL, EditSelection aSel, SvKeyValueIterator* pHTTPHeaderAttrs )
 {
-#ifndef SVX_LIGHT
-
     if ( aSel.HasRange() )
         aSel = ImpDeleteSelection( aSel );
 
@@ -212,9 +201,6 @@ EditPaM ImpEditEngine::ReadHTML( SvStream& rInput, const String& rBaseURL, EditS
         return aSel.Min();
     }
     return xPrsr->GetCurSelection().Max();
-#else
-    return EditPaM();
-#endif
 }
 
 EditPaM ImpEditEngine::ReadBin( SvStream& rInput, EditSelection aSel )
@@ -230,7 +216,6 @@ EditPaM ImpEditEngine::ReadBin( SvStream& rInput, EditSelection aSel )
     return aLastPaM;
 }
 
-#ifndef SVX_LIGHT
 void ImpEditEngine::Write( SvStream& rOutput, EETextFormat eFormat, EditSelection aSel )
 {
     if ( !rOutput.IsWritable() )
@@ -254,7 +239,6 @@ void ImpEditEngine::Write( SvStream& rOutput, EETextFormat eFormat, EditSelectio
         }
     }
 }
-#endif
 
 sal_uInt32 ImpEditEngine::WriteText( SvStream& rOutput, EditSelection aSel )
 {
@@ -332,7 +316,6 @@ sal_uInt32 ImpEditEngine::WriteBin( SvStream& rOutput, EditSelection aSel, BOOL
     return 0;
 }
 
-#ifndef SVX_LIGHT
 sal_uInt32 ImpEditEngine::WriteXML( SvStream& rOutput, EditSelection aSel )
 {
     ESelection aESel = CreateESel( aSel );
@@ -341,7 +324,6 @@ sal_uInt32 ImpEditEngine::WriteXML( SvStream& rOutput, EditSelection aSel )
 
     return 0;
 }
-#endif
 
 static sal_uInt16 getStylePos( const SfxStyles& rStyles, SfxStyleSheet* pSheet )
 {
@@ -358,7 +340,6 @@ static sal_uInt16 getStylePos( const SfxStyles& rStyles, SfxStyleSheet* pSheet )
 
 sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
 {
-#ifndef SVX_LIGHT
     DBG_ASSERT( GetUpdateMode(), "WriteRTF for UpdateMode = sal_False!" );
     CheckIdleFormatter();
     if ( !IsFormatted() )
@@ -720,9 +701,6 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
 #endif
 
     return rOutput.GetError();
-#else
-    return 0;
-#endif
 }
 
 
@@ -1129,11 +1107,9 @@ EditTextObject* ImpEditEngine::CreateBinTextObject( EditSelection aSel, SfxItemP
             pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr );
         }
 
-#ifndef SVX_LIGHT
         // If possible online spelling
         if ( bAllowBigObjects && bOnlyFullParagraphs && pNode->GetWrongList() )
             pC->SetWrongList( pNode->GetWrongList()->Clone() );
-#endif // !SVX_LIGHT
 
     }
 
@@ -1200,9 +1176,7 @@ void ImpEditEngine::SetText( const EditTextObject& rTextObject )
     InsertText( rTextObject, EditSelection( aPaM, aPaM ) );
     SetVertical( rTextObject.IsVertical() );
 
-#ifndef SVX_LIGHT
     DBG_ASSERT( !HasUndoManager() || !GetUndoManager().GetUndoActionCount(), "From where comes the Undo in SetText ?!" );
-#endif
     SetUpdateMode( _bUpdate );
     EnableUndo( _bUndo );
 }
@@ -1386,13 +1360,11 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
                 aPaM.GetNode()->CreateDefFont();
         }
 
-#ifndef SVX_LIGHT
         if ( bNewContent && GetStatus().DoOnlineSpelling() && pC->GetWrongList() )
         {
             aPaM.GetNode()->DestroyWrongList(); // otherwise MLK, if list exists...
             aPaM.GetNode()->SetWrongList( pC->GetWrongList()->Clone() );
         }
-#endif // !SVX_LIGHT
 
         // Wrap when followed by other ...
         if ( n < ( nContents-1) )
@@ -1431,10 +1403,8 @@ LanguageType ImpEditEngine::GetLanguage( const EditPaM& rPaM, USHORT* pEndPos )
 
 Reference< XSpellChecker1 > ImpEditEngine::GetSpeller()
 {
-#ifndef SVX_LIGHT
     if ( !xSpeller.is() )
         xSpeller = SvxGetSpellChecker();
-#endif
     return xSpeller;
 }
 
@@ -1459,10 +1429,6 @@ SpellInfo * ImpEditEngine::CreateSpellInfo( const EditSelection &rSel, bool bMul
 
 EESpellState ImpEditEngine::Spell( EditView* pEditView, sal_Bool bMultipleDoc )
 {
-#ifdef SVX_LIGHT
-    return EE_SPELL_NOSPELLER;
-#else
-
     DBG_ASSERTWARNING( xSpeller.is(), "No Spell checker set!" );
 
     if ( !xSpeller.is() )
@@ -1504,15 +1470,11 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, sal_Bool bMultipleDoc )
     delete pSpellInfo;
     pSpellInfo = 0;
     return eState;
-#endif
 }
 
 
 sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
 {
-#ifdef SVX_LIGHT
-    return sal_False;
-#else
     sal_Bool    bHasConvTxt = sal_False;
 
     USHORT nParas = pEditEngine->GetParagraphCount();
@@ -1542,7 +1504,6 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
        }
     }
 
-#endif
     return bHasConvTxt;
 }
 
@@ -1553,9 +1514,6 @@ void ImpEditEngine::Convert( EditView* pEditView,
 {
     // modified version of ImpEditEngine::Spell
 
-#ifdef SVX_LIGHT
-#else
-
     // In MultipleDoc always from the front / rear ...
     if ( bMultipleDoc )
         pEditView->pImpEditView->SetEditSelection( aEditDoc.GetStartPaM() );
@@ -1635,7 +1593,6 @@ void ImpEditEngine::Convert( EditView* pEditView,
     }
     delete pConvInfo;
     pConvInfo = 0;
-#endif
 }
 
 
@@ -1684,11 +1641,6 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
     String aRes;
     LanguageType nResLang = LANGUAGE_NONE;
 
-#ifdef SVX_LIGHT
-    rConvTxt = rtl::OUString();
-    rConvTxtLang = LANGUAGE_NONE;
-#else
-
     /* ContentNode* pLastNode = */ aEditDoc.SaveGetObject( aEditDoc.Count()-1 );
 
     EditPaM aPos( CreateEditPaM( pConvInfo->aConvContinue ) );
@@ -1844,16 +1796,11 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
     rConvTxt = aRes;
     if (rConvTxt.getLength())
         rConvTxtLang = nResLang;
-#endif
 }
 
 
 Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView )
 {
-#ifdef SVX_LIGHT
-    return Reference< XSpellAlternatives >();
-#else
-
     DBG_ASSERT( xSpeller.is(), "No spell checker set!" );
 
     ContentNode* pLastNode = aEditDoc.SaveGetObject( (aEditDoc.Count()-1) );
@@ -1916,7 +1863,6 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView )
     pEditView->pImpEditView->DrawSelection();
     pEditView->ShowCursor( sal_True, sal_False );
     return xSpellAlt;
-#endif
 }
 
 void ImpEditEngine::EndSpelling()
@@ -1982,8 +1928,6 @@ bool ImpEditEngine::SpellSentence(EditView& rEditView,
     ::svx::SpellPortions& rToFill,
     bool /*bIsGrammarChecking*/ )
 {
-#ifdef SVX_LIGHT
-#else
     bool bRet = false;
     EditSelection aCurSel( rEditView.pImpEditView->GetEditSelection() );
     if(!pSpellInfo)
@@ -2037,7 +1981,6 @@ bool ImpEditEngine::SpellSentence(EditView& rEditView,
         //set the selection to the end of the current sentence
         rEditView.pImpEditView->SetEditSelection(aSentencePaM.Max());
     }
-#endif
     return bRet;
 }
 
@@ -2048,8 +1991,6 @@ void ImpEditEngine::AddPortion(
                                 ::svx::SpellPortions& rToFill,
                                 bool bIsField)
 {
-#ifdef SVX_LIGHT
-#else
     if(rSel.HasRange())
     {
         svx::SpellPortion aPortion;
@@ -2064,7 +2005,6 @@ void ImpEditEngine::AddPortion(
         pSpellInfo->aLastSpellContentSelections.push_back(rSel);
 
     }
-#endif
 }
 
 // Adds one or more portions of text to the SpellPortions depending on language changes
@@ -2074,8 +2014,6 @@ void ImpEditEngine::AddPortionIterated(
                             Reference< XSpellAlternatives > xAlt,
                                 ::svx::SpellPortions& rToFill)
 {
-#ifdef SVX_LIGHT
-#else
     if(rSel.Min() != rSel.Max())
     {
         if(xAlt.is())
@@ -2137,15 +2075,12 @@ void ImpEditEngine::AddPortionIterated(
             AddPortion(aSelection, xAlt, rToFill, bIsField);
         }
     }
-#endif
 }
 
 void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
     const ::svx::SpellPortions& rNewPortions,
     bool bRecheck )
 {
-#ifdef SVX_LIGHT
-#else
     // Note: rNewPortions.size() == 0 is valid and happens when the whole
     // sentence got removed in the dialog
 
@@ -2266,25 +2201,19 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
         FormatAndUpdate();
         aEditDoc.SetModified(TRUE);
     }
-#endif
 }
 
 void ImpEditEngine::PutSpellingToSentenceStart( EditView& rEditView )
 {
-#ifdef SVX_LIGHT
-#else
     if( pSpellInfo && pSpellInfo->aLastSpellContentSelections.size() )
     {
         rEditView.pImpEditView->SetEditSelection( pSpellInfo->aLastSpellContentSelections.begin()->Min() );
     }
-
-#endif
 }
 
 
 void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpellAtCursorPos, sal_Bool bInteruptable )
 {
-#ifndef SVX_LIGHT
     /*
      It will iterate over all the paragraphs, paragraphs with only
      invalidated wrong list will be checked ...
@@ -2484,7 +2413,6 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpel
     }
     if ( bRestartTimer )
         aOnlineSpellTimer.Start();
-#endif // !SVX_LIGHT
 }
 
 
@@ -2492,7 +2420,6 @@ EESpellState ImpEditEngine::HasSpellErrors()
 {
     DBG_ASSERT( xSpeller.is(), "No spell checker set!" );
 
-#ifndef SVX_LIGHT
     ContentNode* pLastNode = aEditDoc.SaveGetObject( aEditDoc.Count() - 1 );
     EditSelection aCurSel( aEditDoc.GetStartPaM() );
 
@@ -2517,14 +2444,12 @@ EESpellState ImpEditEngine::HasSpellErrors()
         }
         aCurSel = WordRight( aCurSel.Max(), ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
     }
-#endif
 
     return EE_SPELL_ERRORFOUND;
 }
 
 EESpellState ImpEditEngine::StartThesaurus( EditView* pEditView )
 {
-#ifndef SVX_LIGHT
     EditSelection aCurSel( pEditView->pImpEditView->GetEditSelection() );
     if ( !aCurSel.HasRange() )
         aCurSel = SelectWord( aCurSel, ::com::sun::star::i18n::WordType::DICTIONARY_WORD );
@@ -2548,16 +2473,12 @@ EESpellState ImpEditEngine::StartThesaurus( EditView* pEditView )
 
     delete pDlg;
     return EE_SPELL_OK;
-#else
-    return EE_SPELL_NOSPELLER;
-#endif
 }
 
 sal_uInt16 ImpEditEngine::StartSearchAndReplace( EditView* pEditView, const SvxSearchItem& rSearchItem )
 {
     sal_uInt16 nFound = 0;
 
-#ifndef SVX_LIGHT
     EditSelection aCurSel( pEditView->pImpEditView->GetEditSelection() );
 
     // FIND_ALL is not possible without multiple selection.
@@ -2615,7 +2536,6 @@ sal_uInt16 ImpEditEngine::StartSearchAndReplace( EditView* pEditView, const SvxS
             pEditView->ShowCursor( sal_True, sal_False );
         }
     }
-#endif // !SVX_LIGHT
     return nFound;
 }
 
@@ -2654,7 +2574,6 @@ BOOL ImpEditEngine::Search( const SvxSearchItem& rSearchItem, EditView* pEditVie
 sal_Bool ImpEditEngine::ImpSearch( const SvxSearchItem& rSearchItem,
     const EditSelection& rSearchSelection, const EditPaM& rStartPos, EditSelection& rFoundSel )
 {
-#ifndef SVX_LIGHT
     util::SearchOptions aSearchOptions( rSearchItem.GetSearchOptions() );
     aSearchOptions.Locale = GetLocale( rStartPos );
 
@@ -2721,13 +2640,11 @@ sal_Bool ImpEditEngine::ImpSearch( const SvxSearchItem& rSearchItem,
             return sal_True;
         }
     }
-#endif // !SVX_LIGHT
     return sal_False;
 }
 
 sal_Bool ImpEditEngine::HasText( const SvxSearchItem& rSearchItem )
 {
-#ifndef SVX_LIGHT
     SvxSearchItem aTmpItem( rSearchItem );
     aTmpItem.SetBackward( sal_False );
     aTmpItem.SetSelection( sal_False );
@@ -2736,18 +2653,13 @@ sal_Bool ImpEditEngine::HasText( const SvxSearchItem& rSearchItem )
     EditSelection aDummySel( aStartPaM );
     EditSelection aFoundSel;
     return ImpSearch( aTmpItem, aDummySel, aStartPaM, aFoundSel );
-#else
-    return sal_False;
-#endif
 }
 
 void ImpEditEngine::SetAutoCompleteText( const String& rStr, sal_Bool bClearTipWindow )
 {
-#ifndef SVX_LIGHT
     aAutoCompleteText = rStr;
     if ( bClearTipWindow && pActiveView )
         Help::ShowQuickHelp( pActiveView->GetWindow(), Rectangle(), String(), 0 );
-#endif // !SVX_LIGHT
 }
 
 
@@ -3005,7 +2917,6 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
 
         if (aChanges.size() > 0)
         {
-#ifndef SVX_LIGHT
             // Create a single UndoAction on Demand for all the changes ...
             if ( !pUndo && IsUndoEnabled() && !IsInUndo() )
             {
@@ -3032,7 +2943,6 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
                 else
                     pUndo->SetText( CreateBinTextObject( aSel, NULL ) );
             }
-#endif
 
             // now apply the changes from end to start to leave the offsets of the
             // yet unchanged text parts remain the same.
@@ -3061,14 +2971,12 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
         }
     }
 
-#ifndef SVX_LIGHT
     if ( pUndo )
     {
         ESelection aESel( CreateESel( aNewSel ) );
         pUndo->SetNewSelection( aESel );
         InsertUndo( pUndo );
     }
-#endif
 
     if ( bChanges )
     {
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 45fd0b5759d7..42165364e111 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -325,7 +325,6 @@ SfxItemPresentation SvxSizeItem::GetPresentation
     XubString&          rText, const IntlWrapper *pIntl
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -351,7 +350,6 @@ SfxItemPresentation SvxSizeItem::GetPresentation
         default: ;//prevent warning
 
     }
-#endif // !SVX_LIGHT
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -578,7 +576,6 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
     XubString&          rText, const IntlWrapper* pIntl
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -644,7 +641,6 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
         }
         default: ;//prevent warning
     }
-#endif // !SVX_LIGHT
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -935,7 +931,6 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
     XubString&          rText, const IntlWrapper *pIntl
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -977,7 +972,6 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
         }
         default: ;//prevent warning
     }
-#endif
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -1074,7 +1068,6 @@ SfxItemPresentation SvxPrintItem::GetPresentation
     XubString&          rText, const IntlWrapper *
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -1093,7 +1086,6 @@ SfxItemPresentation SvxPrintItem::GetPresentation
         }
         default: ;//prevent warning
     }
-#endif // !SVX_LIGHT
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -1131,7 +1123,6 @@ SfxItemPresentation SvxOpaqueItem::GetPresentation
     XubString&          rText, const IntlWrapper *
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -1150,7 +1141,6 @@ SfxItemPresentation SvxOpaqueItem::GetPresentation
         }
         default: ;//prevent warning
     }
-#endif // !SVX_LIGHT
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -1216,7 +1206,6 @@ SfxItemPresentation SvxProtectItem::GetPresentation
     XubString&          rText, const IntlWrapper *
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -1247,7 +1236,6 @@ SfxItemPresentation SvxProtectItem::GetPresentation
         }
         default: ;//prevent warning
     }
-#endif // !SVX_LIGHT
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -1441,7 +1429,6 @@ SfxItemPresentation SvxShadowItem::GetPresentation
     XubString&          rText, const IntlWrapper *pIntl
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -1482,7 +1469,6 @@ SfxItemPresentation SvxShadowItem::GetPresentation
         }
         default: ;//prevent warning
     }
-#endif
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -1618,7 +1604,6 @@ XubString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
                                       const IntlWrapper* pIntl,
                                       sal_Bool bMetricStr) const
 {
-#ifndef SVX_LIGHT
     sal_uInt16 nResId = 0;
 
     if ( 0 == nDistance )
@@ -1698,9 +1683,6 @@ XubString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
     }
     aStr += sal_Unicode(')');
     return aStr;
-#else
-    return UniString();
-#endif
 }
 
 bool SvxBorderLine::HasPriority( const SvxBorderLine& rOtherLine ) const
@@ -2151,7 +2133,6 @@ SfxItemPresentation SvxBoxItem::GetPresentation
     XubString&          rText, const IntlWrapper *pIntl
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -2280,7 +2261,6 @@ SfxItemPresentation SvxBoxItem::GetPresentation
         }
         default: ;//prevent warning
     }
-#endif // !SVX_LIGHT
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -3002,7 +2982,6 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation
     XubString&          rText, const IntlWrapper *
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -3015,7 +2994,6 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation
             return ePres;
         default: ;//prevent warning
     }
-#endif // !SVX_LIGHT
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -3156,7 +3134,6 @@ SfxItemPresentation SvxFmtKeepItem::GetPresentation
     XubString&          rText, const IntlWrapper *
     ) const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -3175,7 +3152,6 @@ SfxItemPresentation SvxFmtKeepItem::GetPresentation
         }
         default: ;//prevent warning
     }
-#endif
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -3310,7 +3286,6 @@ SfxItemPresentation SvxLineItem::GetPresentation
     XubString&          rText, const IntlWrapper *pIntl
 )   const
 {
-#ifndef SVX_LIGHT
     rText.Erase();
 
     switch ( ePres )
@@ -3327,7 +3302,6 @@ SfxItemPresentation SvxLineItem::GetPresentation
         }
         default: ;//prevent warning
     }
-#endif
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index 0d169e4b0b00..ea8808ce7517 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -146,8 +146,6 @@ XubString GetSvxString( sal_uInt16 nId )
     return EE_RESSTR( nId );
 }
 
-#ifndef SVX_LIGHT
-
 // -----------------------------------------------------------------------
 
 XubString GetColorString( const Color& rCol )
@@ -187,8 +185,6 @@ XubString GetColorString( const Color& rCol )
     return sStr;
 }
 
-#endif
-
 // -----------------------------------------------------------------------
 
 sal_uInt16 GetMetricId( SfxMapUnit eUnit )
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index d8807301872b..1bb874386778 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -1149,7 +1149,6 @@ SfxItemPresentation SvxTabStopItem::GetPresentation
 
     if ( ePres > SFX_ITEM_PRESENTATION_NONE )
     {
-#ifndef SVX_LIGHT
         sal_Bool bComma = sal_False;
 
         for ( sal_uInt16 i = 0; i < Count(); ++i )
@@ -1165,7 +1164,6 @@ SfxItemPresentation SvxTabStopItem::GetPresentation
                 bComma = sal_True;
             }
         }
-#endif
     }
     return ePres;
 }
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 0d172cf481bf..e9f37363f17d 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1061,7 +1061,6 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
     XubString&          rText, const IntlWrapper *pIntl
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -1089,7 +1088,6 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
         }
         default: ; //prevent warning
     }
-#endif
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -1122,12 +1120,10 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const USHORT nNewProp,
 {
     DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
 
-#ifndef SVX_LIGHT
     if( SFX_MAPUNIT_RELATIVE != eUnit )
         nHeight = nNewHeight + ::ItemToControl( (short)nNewProp, eUnit,
                                                 SFX_FUNIT_TWIP );
     else
-#endif // !SVX_LIGHT
     if( 100 != nNewProp )
         nHeight = sal_uInt32(( nNewHeight * nNewProp ) / 100 );
     else
@@ -1142,14 +1138,12 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, USHORT nNewProp,
 {
     DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
 
-#ifndef SVX_LIGHT
     if( SFX_MAPUNIT_RELATIVE != eMetric )
         nHeight = nNewHeight +
                 ::ControlToItem( ::ItemToControl((short)nNewProp, eMetric,
                                         SFX_FUNIT_TWIP ), SFX_FUNIT_TWIP,
                                         eCoreMetric );
     else
-#endif // !SVX_LIGHT
     if( 100 != nNewProp )
         nHeight = sal_uInt32(( nNewHeight * nNewProp ) / 100 );
     else
@@ -1268,7 +1262,6 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation
     XubString&          rText, const IntlWrapper *pIntl
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -1289,7 +1282,6 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation
         }
         default: ; //prevent warning
     }
-#endif
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -1364,7 +1356,6 @@ SfxItemPresentation SvxTextLineItem::GetPresentation
     XubString&          rText, const IntlWrapper * /*pIntl*/
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -1378,7 +1369,6 @@ SfxItemPresentation SvxTextLineItem::GetPresentation
             return ePres;
         default: ; //prevent warning
     }
-#endif
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -2055,7 +2045,6 @@ SfxItemPresentation SvxColorItem::GetPresentation
     XubString&          rText, const IntlWrapper * /*pIntl*/
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -2067,7 +2056,6 @@ SfxItemPresentation SvxColorItem::GetPresentation
             return ePres;
         default: ; //prevent warning
     }
-#endif
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -2195,7 +2183,6 @@ SfxItemPresentation SvxKerningItem::GetPresentation
     XubString&          rText, const IntlWrapper *pIntl
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -2223,7 +2210,6 @@ SfxItemPresentation SvxKerningItem::GetPresentation
         }
         default: ; //prevent warning
     }
-#endif
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
@@ -2608,7 +2594,6 @@ SfxItemPresentation SvxLanguageItem::GetPresentation
     XubString&          rText, const IntlWrapper * /*pIntl*/
 )   const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -2623,7 +2608,6 @@ SfxItemPresentation SvxLanguageItem::GetPresentation
         }
         default: ; //prevent warning
     }
-#endif // !SVX_LIGHT
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 96d92e6bcf83..dcefdca1e580 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -419,10 +419,8 @@ void Outliner::UndoActionEnd( USHORT nId )
 
 void Outliner::InsertUndo( EditUndo* pUndo )
 {
-#ifndef SVX_LIGHT
     DBG_CHKTHIS(Outliner,0);
     pEditEngine->GetUndoManager().AddUndoAction( pUndo, FALSE );
-#endif
 }
 
 BOOL Outliner::IsInUndo()
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 95a71bf2d826..6a2af87c8de8 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -263,11 +263,9 @@ INSINGLECHAR:
         bNewGroup = false;
         break;
     case RTF_INFO:
-#ifndef SVX_LIGHT
         if (bReadDocInfo && bNewDoc && m_xDocProps.is())
             ReadInfo();
         else
-#endif
             SkipGroup();
         break;
 
@@ -693,7 +691,6 @@ util::DateTime SvxRTFParser::GetDateTimeStamp( )
 
 void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo )
 {
-#ifndef SVX_LIGHT
     int _nOpenBrakets = 1, nToken;  // the first was already detected earlier!!
     DBG_ASSERT(m_xDocProps.is(),
         "SvxRTFParser::ReadInfo: no DocumentProperties");
@@ -793,7 +790,6 @@ void SvxRTFParser::ReadInfo( const sal_Char* pChkForVerNo )
         nVersionNo = nVersNo;
 
     SkipToken( -1 );        // the closing brace is evaluated "above"
-#endif
 }