[PATCH] remove SVX_LIGHT macro

Xavier ALT dex at phoenix-ind.net
Tue Mar 8 13:59:04 PST 2011


---
 editeng/source/editeng/editdoc.cxx               |   10 ---
 editeng/source/editeng/editobj.cxx               |    6 --
 editeng/source/editeng/editview.cxx              |   15 ----
 editeng/source/editeng/eerdll.cxx                |    5 -
 editeng/source/editeng/eertfpar.hxx              |    3 -
 editeng/source/editeng/impedit.cxx               |    4 -
 editeng/source/editeng/impedit.hxx               |    2 -
 editeng/source/editeng/impedit2.cxx              |   35 --------
 editeng/source/editeng/impedit3.cxx              |    7 --
 editeng/source/editeng/impedit4.cxx              |   92 ----------------------
 editeng/source/items/frmitems.cxx                |   26 ------
 editeng/source/items/itemtype.cxx                |    4 -
 editeng/source/items/paraitem.cxx                |    2 -
 editeng/source/items/textitem.cxx                |   16 ----
 editeng/source/outliner/outlin2.cxx              |    2 -
 editeng/source/rtf/svxrtf.cxx                    |    4 -
 svx/inc/svx/fmpage.hxx                           |    2 -
 svx/inc/svx/unomodel.hxx                         |    4 -
 svx/source/form/dataaccessdescriptor.cxx         |   78 ------------------
 svx/source/form/fmmodel.cxx                      |   34 --------
 svx/source/form/fmpage.cxx                       |   31 -------
 svx/source/items/algitem.cxx                     |    2 -
 svx/source/svdraw/svdotxln.cxx                   |    4 -
 svx/source/svdraw/svdview.cxx                    |    2 -
 svx/source/unodraw/unomod.cxx                    |    9 --
 svx/source/unodraw/unoprov.cxx                   |    4 -
 svx/source/unodraw/unoshap2.cxx                  |    2 -
 svx/source/unodraw/unoshap4.cxx                  |    2 -
 svx/source/xoutdev/xtabbtmp.cxx                  |    4 -
 svx/source/xoutdev/xtabcolr.cxx                  |    4 -
 svx/source/xoutdev/xtabdash.cxx                  |    3 -
 svx/source/xoutdev/xtabgrdt.cxx                  |    4 -
 svx/source/xoutdev/xtabhtch.cxx                  |    4 -
 svx/source/xoutdev/xtablend.cxx                  |    3 -
 xmloff/source/core/xmlimp.cxx                    |    8 --
 xmloff/source/draw/XMLNumberStyles.cxx           |    4 -
 xmloff/source/draw/ximpshap.cxx                  |    4 -
 xmloff/source/style/DashStyle.cxx                |    4 -
 xmloff/source/style/GradientStyle.cxx            |    4 -
 xmloff/source/style/HatchStyle.cxx               |    4 -
 xmloff/source/style/ImageStyle.cxx               |    4 -
 xmloff/source/style/MarkerStyle.cxx              |    4 -
 xmloff/source/style/PagePropertySetContext.cxx   |   10 ---
 xmloff/source/style/TransGradientStyle.cxx       |    4 -
 xmloff/source/style/xmlstyle.cxx                 |   17 ----
 xmloff/source/text/XMLTextPropertySetContext.cxx |    7 --
 xmloff/source/text/txtimp.cxx                    |   25 ------
 xmloff/source/text/txtparai.cxx                  |    5 -
 48 files changed, 0 insertions(+), 533 deletions(-)

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index e8078d7..d952072 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 8c3a66c..bbd7f3c 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 409e3be..99a5c04 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 c874362..8fa3a2b 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 73c58a6..837087a 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 827dadf..4b173ad 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 5bed250..3441406 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 cf0114c..d557ab9 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 4a92e56..765e2f8 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 e07f783..ed020d6 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 ccec3fd..a18fec5 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 0d169e4..ea8808c 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 57c9f3c..20dd54f 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 7943a51..d12a847 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 9e7de28..5921bbf 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 8170ab4..5dc21b9 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
 }
 
 
diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx
index 0160e22..2aee356 100644
--- a/svx/inc/svx/fmpage.hxx
+++ b/svx/inc/svx/fmpage.hxx
@@ -70,9 +70,7 @@ public:
     // access to all forms
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& GetForms( bool _bForceCreate = true ) const;
 
-#ifndef SVX_LIGHT
     FmFormPageImpl& GetImpl() const { return *m_pImpl; }
-#endif // SVX_LIGHT
 
 public:
     const String& 		GetName() const { return m_sPageName; }
diff --git a/svx/inc/svx/unomodel.hxx b/svx/inc/svx/unomodel.hxx
index dd0b5cc..1d6fc94 100644
--- a/svx/inc/svx/unomodel.hxx
+++ b/svx/inc/svx/unomodel.hxx
@@ -29,8 +29,6 @@
 #ifndef SVX_UNOMODEL_HXX
 #define SVX_UNOMODEL_HXX
 
-#ifndef SVX_LIGHT
-
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
@@ -109,6 +107,4 @@ SVX_DLLPUBLIC extern sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const com
 
 #endif
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 5b75dbe..dd1fca1 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -51,7 +51,6 @@ namespace svx
 
 #define CONST_CHAR( propname ) propname, sizeof(propname) - 1
 
-#ifndef SVX_LIGHT
     //====================================================================
     //= ODADescriptorImpl
     //====================================================================
@@ -325,67 +324,41 @@ namespace svx
         // don't need to rebuild next time
         m_bSetOutOfDate = sal_True;
     }
-#endif
 
     //====================================================================
     //= ODataAccessDescriptor
     //====================================================================
     //--------------------------------------------------------------------
     ODataAccessDescriptor::ODataAccessDescriptor()
-#ifndef SVX_LIGHT
         :m_pImpl(new ODADescriptorImpl)
-#else
-        :m_pImpl(NULL)
-#endif
     {
     }
 
     //--------------------------------------------------------------------
     ODataAccessDescriptor::ODataAccessDescriptor( const ODataAccessDescriptor& _rSource )
-#ifndef SVX_LIGHT
         :m_pImpl(new ODADescriptorImpl(*_rSource.m_pImpl))
-#else
-        :m_pImpl(NULL)
-#endif
     {
     }
 
     //--------------------------------------------------------------------
     const ODataAccessDescriptor& ODataAccessDescriptor::operator=(const ODataAccessDescriptor& _rSource)
     {
-#ifndef SVX_LIGHT
         delete m_pImpl;
         m_pImpl = new ODADescriptorImpl(*_rSource.m_pImpl);
-#else
-        OSL_ENSURE(sal_False, "ODataAccessDescriptor::operator=: not available in the SVX_LIGHT version!");
-#endif
         return *this;
     }
 
     //--------------------------------------------------------------------
     ODataAccessDescriptor::ODataAccessDescriptor( const Reference< XPropertySet >& _rValues )
-#ifndef SVX_LIGHT
         :m_pImpl(new ODADescriptorImpl)
-#else
-        :m_pImpl(NULL)
-#endif
     {
-#ifndef SVX_LIGHT
         m_pImpl->buildFrom(_rValues);
-#else
-        OSL_ENSURE(sal_False, "ODataAccessDescriptor::ODataAccessDescriptor: not available in the SVX_LIGHT version!");
-#endif
     }
 
     //--------------------------------------------------------------------
     ODataAccessDescriptor::ODataAccessDescriptor( const Any& _rValues )
-#ifndef SVX_LIGHT
         :m_pImpl(new ODADescriptorImpl)
-#else
-        :m_pImpl(NULL)
-#endif
     {
-#ifndef SVX_LIGHT
         // check if we know the format in the Any
         Sequence< PropertyValue > aValues;
         Reference< XPropertySet > xValues;
@@ -393,24 +366,13 @@ namespace svx
             m_pImpl->buildFrom( aValues );
         else if ( _rValues >>= xValues )
             m_pImpl->buildFrom( xValues );
-#else
-        OSL_ENSURE(sal_False, "ODataAccessDescriptor::ODataAccessDescriptor: not available in the SVX_LIGHT version!");
-#endif
     }
 
     //--------------------------------------------------------------------
     ODataAccessDescriptor::ODataAccessDescriptor( const Sequence< PropertyValue >& _rValues )
-#ifndef SVX_LIGHT
         :m_pImpl(new ODADescriptorImpl)
-#else
-        :m_pImpl(NULL)
-#endif
     {
-#ifndef SVX_LIGHT
         m_pImpl->buildFrom(_rValues);
-#else
-        OSL_ENSURE(sal_False, "ODataAccessDescriptor::ODataAccessDescriptor: not available in the SVX_LIGHT version!");
-#endif
     }
 
     //--------------------------------------------------------------------
@@ -422,35 +384,26 @@ namespace svx
     //--------------------------------------------------------------------
     void ODataAccessDescriptor::clear()
     {
-#ifndef SVX_LIGHT
         m_pImpl->m_aValues.clear();
-#endif
     }
 
     //--------------------------------------------------------------------
     void ODataAccessDescriptor::erase(DataAccessDescriptorProperty _eWhich)
     {
-#ifndef SVX_LIGHT
         OSL_ENSURE(has(_eWhich), "ODataAccessDescriptor::erase: invalid call!");
         if (has(_eWhich))
             m_pImpl->m_aValues.erase(_eWhich);
-#endif
     }
 
     //--------------------------------------------------------------------
     sal_Bool ODataAccessDescriptor::has(DataAccessDescriptorProperty _eWhich) const
     {
-#ifndef SVX_LIGHT
         return m_pImpl->m_aValues.find(_eWhich) != m_pImpl->m_aValues.end();
-#else
-        return sal_False;
-#endif
     }
 
     //--------------------------------------------------------------------
     const Any& ODataAccessDescriptor::operator [] ( DataAccessDescriptorProperty _eWhich ) const
     {
-#ifndef SVX_LIGHT
         if (!has(_eWhich))
         {
             OSL_ENSURE(sal_False, "ODataAccessDescriptor::operator[]: invalid acessor!");
@@ -459,58 +412,40 @@ namespace svx
         }
 
         return m_pImpl->m_aValues[_eWhich];
-#else
-        static const Any aDummy;
-        return aDummy;
-#endif
     }
 
     //--------------------------------------------------------------------
     Any& ODataAccessDescriptor::operator[] ( DataAccessDescriptorProperty _eWhich )
     {
-#ifndef SVX_LIGHT
         m_pImpl->invalidateExternRepresentations();
         return m_pImpl->m_aValues[_eWhich];
-#else
-        static const Any aDummy;
-        return aDummy;
-#endif
     }
 
     //--------------------------------------------------------------------
     void ODataAccessDescriptor::initializeFrom(const Reference< XPropertySet >& _rxValues, sal_Bool _bClear)
     {
-#ifndef SVX_LIGHT
         if (_bClear)
             clear();
         m_pImpl->buildFrom(_rxValues);
-#endif
     }
 
     //--------------------------------------------------------------------
     void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues, sal_Bool _bClear)
     {
-#ifndef SVX_LIGHT
         if (_bClear)
             clear();
         m_pImpl->buildFrom(_rValues);
-#endif
     }
 
     //--------------------------------------------------------------------
     Sequence< PropertyValue > ODataAccessDescriptor::createPropertyValueSequence()
     {
-#ifndef SVX_LIGHT
         m_pImpl->updateSequence();
         return m_pImpl->m_aAsSequence;
-#else
-        return Sequence< PropertyValue >();
-#endif
     }
     //--------------------------------------------------------------------
     Sequence< Any > ODataAccessDescriptor::createAnySequence()
     {
-#ifndef SVX_LIGHT
         m_pImpl->updateSequence();
         Sequence< Any > aRet(m_pImpl->m_aAsSequence.getLength());
         const PropertyValue* pBegin = m_pImpl->m_aAsSequence.getConstArray();
@@ -518,39 +453,27 @@ namespace svx
         for(sal_Int32 i=0;pBegin != pEnd;++pBegin,++i)
             aRet[i] <<= *pBegin;
         return aRet;
-#else
-        return Sequence< createAnySequence >();
-#endif
     }
 
     //--------------------------------------------------------------------
     Reference< XPropertySet > ODataAccessDescriptor::createPropertySet()
     {
-#ifndef SVX_LIGHT
         m_pImpl->updateSet();
         return m_pImpl->m_xAsSet;
-#else
-        return Reference< XPropertySet >();
-#endif
     }
     //--------------------------------------------------------------------
     ::rtl::OUString ODataAccessDescriptor::getDataSource() const
     {
-#ifndef SVX_LIGHT
         ::rtl::OUString	sDataSourceName;
         if ( has(daDataSource) )
             (*this)[daDataSource] >>= sDataSourceName;
         else if ( has(daDatabaseLocation) )
             (*this)[daDatabaseLocation] >>= sDataSourceName;
         return sDataSourceName;
-#else
-        return ::rtl::OUString();
-#endif
     }
     //--------------------------------------------------------------------
     void ODataAccessDescriptor::setDataSource(const ::rtl::OUString& _sDataSourceNameOrLocation)
     {
-#ifndef SVX_LIGHT
         if ( _sDataSourceNameOrLocation.getLength() )
         {
             INetURLObject aURL(_sDataSourceNameOrLocation);
@@ -558,7 +481,6 @@ namespace svx
         }
         else
             (*this)[ daDataSource ] <<= ::rtl::OUString();
-#endif
     }
 
 //........................................................................
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index ab61edb..d13accf 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -38,11 +38,7 @@
 #include <svx/svdobj.hxx>
 #include <tools/debug.hxx>
 
-#ifndef SVX_LIGHT
 #include <sfx2/objsh.hxx>
-#else
-class SfxObjectShell;
-#endif
 
 #include <boost/optional.hpp>
 
@@ -81,11 +77,9 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers)
             ,m_bOpenInDesignMode(sal_False)
             ,m_bAutoControlFocus(sal_False)
 {
-#ifndef SVX_LIGHT
     m_pImpl = new FmFormModelImplData;
     m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this);
     m_pImpl->pUndoEnv->acquire();
-#endif
 }
 
 /*************************************************************************
@@ -100,11 +94,9 @@ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectSh
             ,m_bOpenInDesignMode(sal_False)
             ,m_bAutoControlFocus(sal_False)
 {
-#ifndef SVX_LIGHT
     m_pImpl = new FmFormModelImplData;
     m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this);
     m_pImpl->pUndoEnv->acquire();
-#endif
 }
 
 /*************************************************************************
@@ -121,11 +113,9 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers,
             ,m_bOpenInDesignMode(sal_False)
             ,m_bAutoControlFocus(sal_False)
 {
-#ifndef SVX_LIGHT
     m_pImpl = new FmFormModelImplData;
     m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this);
     m_pImpl->pUndoEnv->acquire();
-#endif
 }
 
 /*************************************************************************
@@ -141,11 +131,9 @@ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectSh
             ,m_bOpenInDesignMode(sal_False)
             ,m_bAutoControlFocus(sal_False)
 {
-#ifndef SVX_LIGHT
     m_pImpl = new FmFormModelImplData;
     m_pImpl->pUndoEnv = new FmXUndoEnvironment(*this);
     m_pImpl->pUndoEnv->acquire();
-#endif
 }
 
 /*************************************************************************
@@ -155,7 +143,6 @@ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectSh
 \************************************************************************/
 FmFormModel::~FmFormModel()
 {
-#ifndef SVX_LIGHT
     if (m_pObjShell && m_pImpl->pUndoEnv->IsListening(*m_pObjShell))
         SetObjectShell(NULL);
 
@@ -166,7 +153,6 @@ FmFormModel::~FmFormModel()
     m_pImpl->pUndoEnv->release();
     delete m_pImpl;
 
-#endif
 }
 
 /*************************************************************************
@@ -186,11 +172,9 @@ SdrPage* FmFormModel::AllocPage(bool bMasterPage)
 \************************************************************************/
 void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
 {
-#ifndef SVX_LIGHT
     // hack solange Methode intern
     if (m_pObjShell && !m_pImpl->pUndoEnv->IsListening( *m_pObjShell ))
         SetObjectShell(m_pObjShell);
-#endif
 
     SdrModel::InsertPage( pPage, nPos );
 }
@@ -202,16 +186,12 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
 \************************************************************************/
 void FmFormModel::MovePage( USHORT nPgNum, USHORT nNewPos )
 {
-#ifndef SVX_LIGHT
     m_pImpl->bMovingPage = sal_True;
         // see InsertPage for this
-#endif
 
     SdrModel::MovePage( nPgNum, nNewPos );
 
-#ifndef SVX_LIGHT
     m_pImpl->bMovingPage = sal_False;
-#endif
 }
 
 /*************************************************************************
@@ -224,14 +204,12 @@ SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum)
     FmFormPage* pToBeRemovedPage = dynamic_cast< FmFormPage* >( GetPage( nPgNum ) );
     OSL_ENSURE( pToBeRemovedPage, "FmFormModel::RemovePage: *which page*?" );
 
-#ifndef SVX_LIGHT
     if ( pToBeRemovedPage )
     {
         Reference< XNameContainer > xForms( pToBeRemovedPage->GetForms( false ) );
         if ( xForms.is() )
             m_pImpl->pUndoEnv->RemoveForms( xForms );
     }
-#endif
 
     FmFormPage* pRemovedPage = (FmFormPage*)SdrModel::RemovePage(nPgNum);
     OSL_ENSURE( pRemovedPage == pToBeRemovedPage, "FmFormModel::RemovePage: inconsistency!" );
@@ -245,11 +223,9 @@ SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum)
 \************************************************************************/
 void FmFormModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos)
 {
-#ifndef SVX_LIGHT
     // hack solange Methode intern
     if (m_pObjShell && !m_pImpl->pUndoEnv->IsListening( *m_pObjShell ))
         SetObjectShell(m_pObjShell);
-#endif
 
     SdrModel::InsertMasterPage(pPage, nPos);
 }
@@ -263,14 +239,12 @@ SdrPage* FmFormModel::RemoveMasterPage(sal_uInt16 nPgNum)
 {
     FmFormPage* pPage = (FmFormPage*)SdrModel::RemoveMasterPage(nPgNum);
 
-#ifndef SVX_LIGHT
     if ( pPage )
     {
         Reference< XNameContainer > xForms( pPage->GetForms( false ) );
         if ( xForms.is() )
             m_pImpl->pUndoEnv->RemoveForms( xForms );
     }
-#endif
 
     return pPage;
 }
@@ -298,18 +272,14 @@ void FmFormModel::implSetOpenInDesignMode( sal_Bool _bOpenDesignMode, sal_Bool _
 //------------------------------------------------------------------------
 void FmFormModel::SetOpenInDesignMode( sal_Bool bOpenDesignMode )
 {
-#ifndef SVX_LIGHT
     implSetOpenInDesignMode( bOpenDesignMode, sal_False );
-#endif
 }
 
-#ifndef SVX_LIGHT
 //------------------------------------------------------------------------
 sal_Bool FmFormModel::OpenInDesignModeIsDefaulted( )
 {
     return m_pImpl->bOpenInDesignIsDefaulted;
 }
-#endif
 
 //------------------------------------------------------------------------
 sal_Bool FmFormModel::ControlsUseRefDevice() const
@@ -327,19 +297,16 @@ sal_Bool FmFormModel::ControlsUseRefDevice() const
 //------------------------------------------------------------------------
 void FmFormModel::SetAutoControlFocus( sal_Bool _bAutoControlFocus )
 {
-#ifndef SVX_LIGHT
     if( _bAutoControlFocus != m_bAutoControlFocus )
     {
         m_bAutoControlFocus = _bAutoControlFocus;
         m_pObjShell->SetModified( sal_True );
     }
-#endif
 }
 
 //------------------------------------------------------------------------
 void FmFormModel::SetObjectShell( SfxObjectShell* pShell )
 {
-#ifndef SVX_LIGHT
     if (pShell == m_pObjShell)
         return;
 
@@ -360,7 +327,6 @@ void FmFormModel::SetObjectShell( SfxObjectShell* pShell )
 
         m_pImpl->pUndoEnv->StartListening( *m_pObjShell );
     }
-#endif
 }
 
 //------------------------------------------------------------------------
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 5625664..882fc43 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -38,36 +38,26 @@
 
 #include <svx/fmmodel.hxx>
 
-#ifndef SVX_LIGHT
 #include "fmobj.hxx"
-#endif
 
-#ifndef SVX_LIGHT
 #include "fmresids.hrc"
-#endif
 #include <tools/shl.hxx>
 #include <svx/dialmgr.hxx>
 
-#ifndef SVX_LIGHT
 #include "fmpgeimp.hxx"
-#endif
 
-#ifndef SVX_LIGHT
 #include <sfx2/objsh.hxx>
-#endif
 #include "svditer.hxx"
 #include <svx/svdview.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/help.hxx>
 
 
-#ifndef SVX_LIGHT
 #include <svx/fmglob.hxx>
 #include "fmprop.hrc"
 #include "fmundo.hxx"
 #include "svx/fmtools.hxx"
 using namespace ::svxform;
-#endif
 #include <comphelper/property.hxx>
 #include <rtl/logfile.hxx>
 
@@ -81,11 +71,7 @@ TYPEINIT1(FmFormPage, SdrPage);
 //------------------------------------------------------------------
 FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, bool bMasterPage)
            :SdrPage(rModel, bMasterPage)
-#ifndef SVX_LIGHT
            ,m_pImpl( new FmFormPageImpl( *this ) )
-#else
-           ,m_pImpl(NULL)
-#endif
            ,m_pBasic(_pBasic)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::FmFormPage" );
@@ -94,11 +80,7 @@ FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, bool bMasterPage
 //------------------------------------------------------------------
 FmFormPage::FmFormPage(const FmFormPage& rPage)
            :SdrPage(rPage)
-#ifndef SVX_LIGHT
            ,m_pImpl(new FmFormPageImpl( *this, rPage.GetImpl() ) )
-#else
-           ,m_pImpl(NULL)
-#endif
            ,m_pBasic(0)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::FmFormPage" );
@@ -108,9 +90,7 @@ FmFormPage::FmFormPage(const FmFormPage& rPage)
 //------------------------------------------------------------------
 FmFormPage::~FmFormPage()
 {
-#ifndef SVX_LIGHT
     delete m_pImpl;
-#endif
 }
 
 //------------------------------------------------------------------
@@ -166,17 +146,14 @@ void FmFormPage::InsertObject(SdrObject* pObj, ULONG nPos,
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::InsertObject" );
     SdrPage::InsertObject( pObj, nPos, pReason );
-#ifndef SVX_LIGHT
     if (GetModel() && (!pReason || pReason->GetReason() != SDRREASON_STREAMING))
         ((FmFormModel*)GetModel())->GetUndoEnv().Inserted(pObj);
-#endif
 }
 
 //------------------------------------------------------------------
 const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & FmFormPage::GetForms( bool _bForceCreate ) const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::GetForms" );
-#ifndef SVX_LIGHT
     const SdrPage& rMasterPage( *this );
     const FmFormPage* pFormPage = dynamic_cast< const FmFormPage* >( &rMasterPage );
     OSL_ENSURE( pFormPage, "FmFormPage::GetForms: referenced page is no FmFormPage - is this allowed?!" );
@@ -184,10 +161,6 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContai
         pFormPage = this;
 
     return pFormPage->m_pImpl->getForms( _bForceCreate );
-#else
-    static ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >  aRef;
-    return aRef;
-#endif
 }
 
 //------------------------------------------------------------------
@@ -195,7 +168,6 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
                               const HelpEvent& rEvt )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::RequestHelp" );
-#ifndef SVX_LIGHT
     if( pView->IsAction() )
         return sal_False;
 
@@ -255,7 +227,6 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
         else
             Help::ShowQuickHelp( pWindow, aItemRect, aHelpText );
     }
-#endif
     return sal_True;
 }
 
@@ -264,10 +235,8 @@ SdrObject* FmFormPage::RemoveObject(ULONG nObjNum)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "FmFormPage::RemoveObject" );
     SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
-#ifndef SVX_LIGHT
     if (pObj && GetModel())
         ((FmFormModel*)GetModel())->GetUndoEnv().Removed(pObj);
-#endif
     return pObj;
 }
 
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 7d01059..a6086d9 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -255,7 +255,6 @@ SfxItemPresentation SvxMarginItem::GetPresentation
     XubString&          rText, const IntlWrapper *pIntl
 )	const
 {
-#ifndef SVX_LIGHT
     switch ( ePres )
     {
         case SFX_ITEM_PRESENTATION_NONE:
@@ -293,7 +292,6 @@ SfxItemPresentation SvxMarginItem::GetPresentation
         }
         default: ; //prevent warning
     }
-#endif
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index a59d31b..79b33da 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -46,7 +46,6 @@
 // #90477#
 #include <tools/tenccvt.hxx>
 
-#ifndef SVX_LIGHT
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 //  @@@@  @@@@@  @@@@@@  @@@@@@ @@@@@@ @@  @@ @@@@@@  @@    @@ @@  @@ @@  @@
@@ -127,7 +126,6 @@ void ImpSdrObjTextLink::DataChanged( const String& /*rMimeType*/,
     if (pSdrObj )
         pSdrObj->ReloadLinkedText( bForceReload );
 }
-#endif // SVX_LIGHT
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -151,9 +149,7 @@ ImpSdrObjTextLinkUserData::ImpSdrObjTextLinkUserData(SdrTextObj* pObj1):
 
 ImpSdrObjTextLinkUserData::~ImpSdrObjTextLinkUserData()
 {
-#ifndef SVX_LIGHT
     delete pLink;
-#endif
 }
 
 SdrObjUserData* ImpSdrObjTextLinkUserData::Clone(SdrObject* pObj1) const
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 0998ee3..4354487 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1106,13 +1106,11 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
 
                 // Sind 3D-Objekte selektiert?
                 BOOL b3DObjSelected = FALSE;
-#ifndef SVX_LIGHT
                 for (UINT32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) {
                     SdrObject* pObj = GetMarkedObjectByIndex(a);
                     if(pObj && pObj->ISA(E3dObject))
                         b3DObjSelected = TRUE;
                 }
-#endif
                 // Falls es um ein 3D-Objekt geht, muss trotz !IsShearAllowed
                 // weitergemacht werden, da es sich um eine Rotation statt um
                 // einen Shear handelt
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index f4e8a52..d617142 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -79,8 +79,6 @@ using namespace ::com::sun::star;
 
 //-////////////////////////////////////////////////////////////////////
 
-#ifndef SVX_LIGHT
-
 class SvxUnoDrawPagesAccess : public ::cppu::WeakImplHelper2< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo >
 {
 private:
@@ -107,10 +105,8 @@ public:
     virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 };
-#endif
 //-////////////////////////////////////////////////////////////////////
 
-#ifndef SVX_LIGHT
 const SvEventDescription* ImplGetSupportedMacroItems()
 {
     static const SvEventDescription aMacroDescriptionsImpl[] =
@@ -122,7 +118,6 @@ const SvEventDescription* ImplGetSupportedMacroItems()
 
     return aMacroDescriptionsImpl;
 }
-#endif
 
 //-////////////////////////////////////////////////////////////////////
 
@@ -247,8 +242,6 @@ uno::Sequence< OUString > SvxUnoDrawMSFactory::concatServiceNames( uno::Sequence
 }
 
 
-#ifndef SVX_LIGHT
-
 ///
 SvxUnoDrawingModel::SvxUnoDrawingModel( SdrModel* pDoc ) throw()
 : mpDoc( pDoc )
@@ -751,6 +744,4 @@ com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCr
 
 ///////////////////////////////////////////////////////////////////////
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 9f18162..0c43887 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1346,7 +1346,6 @@ bool SvxUnoConvertResourceString( USHORT* pSourceResIds, USHORT* pDestResIds, in
 */
 void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String& rInternalName, rtl::OUString& rApiName ) throw()
 {
-#ifndef SVX_LIGHT
     String aNew = rInternalName;
 
     if( nWhich == XATTR_LINECOLOR )
@@ -1372,7 +1371,6 @@ void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String& rInternalNam
             }
         }
     }
-#endif
 
     // just use previous name, if nothing else was found.
     rApiName = rInternalName;
@@ -1383,7 +1381,6 @@ void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String& rInternalNam
 */
 void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString& rApiName, String& rInternalName ) throw()
 {
-#ifndef SVX_LIGHT
     String aNew = rApiName;
 
     if( nWhich == XATTR_LINECOLOR )
@@ -1409,7 +1406,6 @@ void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString&
             }
         }
     }
-#endif // !SVX_LIGHT
 
     // just use previous name, if nothing else was found.
     rInternalName = rApiName;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 1c41d4c..94b0c22 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1619,11 +1619,9 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygonBezier::getSupportedServic
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <vcl/cvtgrf.hxx>
 #include <svx/svdograf.hxx>
-#ifndef SVX_LIGHT
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/fcontnr.hxx>
-#endif
 
 #include "toolkit/unohlp.hxx"
 
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index bd51490..dc6e676 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -39,10 +39,8 @@
 #include <svx/svdoole2.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/svdpool.hxx>
-#ifndef SVX_LIGHT
 #include <sot/clsids.hxx>
 #include <sfx2/frmdescr.hxx>
-#endif
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 8527117..74bfe67 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -29,8 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#ifndef SVX_LIGHT
-
 #include <com/sun/star/container/XNameContainer.hpp>
 #include "XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
@@ -38,8 +36,6 @@
 #include "xmlxtexp.hxx"
 #include "xmlxtimp.hxx"
 
-#endif
-
 #include <tools/urlobj.hxx>
 #include <vcl/virdev.hxx>
 #include <svl/itemset.hxx>
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index a79f663..405537b 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -29,8 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
-#ifndef SVX_LIGHT
-
 #include <com/sun/star/container/XNameContainer.hpp>
 #include "XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
@@ -40,8 +38,6 @@
 #include "xmlxtexp.hxx"
 #include "xmlxtimp.hxx"
 
-#endif
-
 #include <sfx2/docfile.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/dialogs.hrc>
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 3e1134d..ca49221 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -31,8 +31,6 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef SVX_LIGHT
-
 #include <com/sun/star/container/XNameContainer.hpp>
 #include "XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
@@ -40,7 +38,6 @@
 #include "xmlxtexp.hxx"
 #include "xmlxtimp.hxx"
 
-#endif
 #include <vcl/svapp.hxx>
 
 #include <tools/urlobj.hxx>
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 54454a7..6b2e92a 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -31,8 +31,6 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef SVX_LIGHT
-
 #include <com/sun/star/container/XNameContainer.hpp>
 #include "XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
@@ -40,8 +38,6 @@
 #include "xmlxtexp.hxx"
 #include "xmlxtimp.hxx"
 
-#endif
-
 #include <tools/urlobj.hxx>
 #include <vcl/virdev.hxx>
 #include <svl/itemset.hxx>
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index a35389e..ef3efea 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -31,8 +31,6 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef SVX_LIGHT
-
 #include <com/sun/star/container/XNameContainer.hpp>
 #include "XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
@@ -41,8 +39,6 @@
 #include "xmlxtexp.hxx"
 #include "xmlxtimp.hxx"
 
-#endif
-
 #include <tools/urlobj.hxx>
 #include <vcl/virdev.hxx>
 #include <svl/itemset.hxx>
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 4ccbe0c..7b3e4b3 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -31,8 +31,6 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef SVX_LIGHT
-
 #include <com/sun/star/container/XNameContainer.hpp>
 #include "XPropertyTable.hxx"
 #include <unotools/ucbstreamhelper.hxx>
@@ -40,7 +38,6 @@
 #include "xmlxtexp.hxx"
 #include "xmlxtimp.hxx"
 
-#endif
 #include <tools/urlobj.hxx>
 #include <vcl/virdev.hxx>
 
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 0ba243d..eaf5975 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1049,19 +1049,15 @@ XMLShapeImportHelper* SvXMLImport::CreateShapeImport()
     return new XMLShapeImportHelper( *this, mxModel );
 }
 
-#ifndef SVX_LIGHT
 SchXMLImportHelper* SvXMLImport::CreateChartImport()
 {
     return new SchXMLImportHelper();
 }
-#endif
 
-#ifndef SVX_LIGHT
 ::xmloff::OFormLayerXMLImport* SvXMLImport::CreateFormImport()
 {
     return new ::xmloff::OFormLayerXMLImport(*this);
 }
-#endif // #ifndef SVX_LIGHT
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1492,7 +1488,6 @@ void SvXMLImport::AddNumberStyle(sal_Int32 nKey, const OUString& rName)
 
 XMLEventImportHelper& SvXMLImport::GetEventImport()
 {
-#ifndef SVX_LIGHT
     if (!mpEventImportHelper)
     {
         // construct event helper and register StarBasic handler and standard
@@ -1511,7 +1506,6 @@ XMLEventImportHelper& SvXMLImport::GetEventImport()
         mpEventImportHelper->RegisterFactory(sStarBasicCap,
                                             new XMLStarBasicContextFactory());
     }
-#endif
 
     return *mpEventImportHelper;
 }
@@ -1558,10 +1552,8 @@ void SvXMLImport::SetAutoStyles( SvXMLStylesContext *pAutoStyles )
     mxAutoStyles = pAutoStyles;
     GetTextImport()->SetAutoStyles( pAutoStyles );
     GetShapeImport()->SetAutoStylesContext( pAutoStyles );
-#ifndef SVX_LIGHT
     GetChartImport()->SetAutoStylesContext( pAutoStyles );
     GetFormImport()->setAutoStyleContext( pAutoStyles );
-#endif
 }
 
 void SvXMLImport::SetMasterStyles( SvXMLStylesContext *pMasterStyles )
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 7dce0b8..7ce6a3e 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -328,8 +328,6 @@ const SdXMLFixedDataStyle* aSdXMLFixedTimeFormats[SdXMLTimeFormatCount] =
 ///////////////////////////////////////////////////////////////////////
 // export
 
-#ifndef SVX_LIGHT
-
 static void SdXMLExportDataStyleNumber( SdXMLExport& rExport, SdXMLDataStyleNumber& rElement )
 {
     if( rElement.mbDecimal02 )
@@ -492,8 +490,6 @@ OUString SdXMLNumberStylesExporter::getDateStyleName(const sal_Int32 nDateFormat
     }
 }
 
-#endif // #ifndef SVX_LIGHT
-
 
 ///////////////////////////////////////////////////////////////////////
 // import
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index f52fb7b..fc62731 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1702,7 +1702,6 @@ void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
         DBG_ASSERT( maFormId.getLength(), "draw:control without a form:id attribute!" );
         if( maFormId.getLength() )
         {
-#ifndef SVX_LIGHT
             if( GetImport().IsFormsSupported() )
             {
                 uno::Reference< awt::XControlModel > xControlModel( GetImport().GetFormImport()->lookupControl( maFormId ), uno::UNO_QUERY );
@@ -1714,7 +1713,6 @@ void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
 
                 }
             }
-#endif // #ifndef SVX_LIGHT
         }
 
         SetStyle();
@@ -2512,14 +2510,12 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri
                 aAny <<= aCLSID;
                 xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID") ), aAny );
 
-#ifndef SVX_LIGHT
                 aAny = xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ) );
                 uno::Reference< frame::XModel > xChartModel;
                 if( aAny >>= xChartModel )
                 {
                     mpChartContext = GetImport().GetChartImport()->CreateChartContext( GetImport(), XML_NAMESPACE_SVG, GetXMLToken(XML_CHART), xChartModel, xAttrList );
                 }
-#endif
             }
         }
 
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 3babd43..147582c 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -221,8 +221,6 @@ sal_Bool XMLDashStyleImport::importXML(
 // Export
 //-------------------------------------------------------------
 
-#ifndef SVX_LIGHT
-
 XMLDashStyleExport::XMLDashStyleExport( SvXMLExport& rExp )
     : rExport(rExp)
 {
@@ -330,6 +328,4 @@ sal_Bool XMLDashStyleExport::exportXML(
     return bRet;
 }
 
-#endif // #ifndef SVX_LIGHT
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 2f2f8d4..2b667f8 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -235,8 +235,6 @@ sal_Bool XMLGradientStyleImport::importXML(
 // Export
 //-------------------------------------------------------------
 
-#ifndef SVX_LIGHT
-
 XMLGradientStyleExport::XMLGradientStyleExport( 
     SvXMLExport& rExp )
     : rExport(rExp)
@@ -342,6 +340,4 @@ sal_Bool XMLGradientStyleExport::exportXML(
     return bRet;
 }
 
-#endif // #ifndef SVX_LIGHT
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index d3e766a..5ef15cd 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -189,8 +189,6 @@ sal_Bool XMLHatchStyleImport::importXML(
 // Export
 //-------------------------------------------------------------
 
-#ifndef SVX_LIGHT
-
 XMLHatchStyleExport::XMLHatchStyleExport( SvXMLExport& rExp )
     : rExport(rExp)
 {
@@ -261,6 +259,4 @@ sal_Bool XMLHatchStyleExport::exportXML(
     return bRet;
 }
 
-#endif // #ifndef SVX_LIGHT
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 3b78ea7..7d52fa5 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -70,8 +70,6 @@ XMLImageStyle::~XMLImageStyle()
 {
 }
 
-#ifndef SVX_LIGHT
-
 sal_Bool XMLImageStyle::exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport )
 {
     return ImpExportXML( rStrName, rValue, rExport );
@@ -134,8 +132,6 @@ sal_Bool XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any&
     return bRet;
 }
 
-#endif // #ifndef SVX_LIGHT
-
 sal_Bool XMLImageStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport )
 {
     return ImpImportXML( xAttrList, rValue, rStrName, rImport );
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index edf8991..ad6f732 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -165,8 +165,6 @@ sal_Bool XMLMarkerStyleImport::importXML(
 // Export
 //-------------------------------------------------------------
 
-#ifndef SVX_LIGHT
-
 XMLMarkerStyleExport::XMLMarkerStyleExport( SvXMLExport& rExp )
     : rExport( rExp )
 {
@@ -284,6 +282,4 @@ sal_Bool XMLMarkerStyleExport::exportXML(
     return bRet;
 }
 
-#endif // #ifndef SVX_LIGHT
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx
index 12893df..fdd93d7 100644
--- a/xmloff/source/style/PagePropertySetContext.cxx
+++ b/xmloff/source/style/PagePropertySetContext.cxx
@@ -112,25 +112,15 @@ SvXMLImportContext *PagePropertySetContext::CreateChildContext(
         break;
 
     case CTF_PM_TEXTCOLUMNS:
-#ifndef SVX_LIGHT
         pContext = new XMLTextColumnsContext( GetImport(), nPrefix,
                                               rLocalName, xAttrList, rProp,
                                               rProperties );
-#else
-        // create default context to skip content
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-#endif // #ifndef SVX_LIGHT
         break;
 
     case CTF_PM_FTN_LINE_WEIGTH:
-#ifndef SVX_LIGHT
         pContext = new XMLFootnoteSeparatorImport( 
             GetImport(), nPrefix, rLocalName, rProperties, 
             mxMapper->getPropertySetMapper(), rProp.mnIndex);
-#else
-        // create default context to skip content
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName);
-#endif // #ifndef SVX_LIGHT
         break;
     }
 
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 7976729..e30c92d 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -228,8 +228,6 @@ sal_Bool XMLTransGradientStyleImport::importXML(
 // Export
 //-------------------------------------------------------------
 
-#ifndef SVX_LIGHT
-
 XMLTransGradientStyleExport::XMLTransGradientStyleExport( SvXMLExport& rExp )
     : rExport(rExp)
 {
@@ -327,6 +325,4 @@ sal_Bool XMLTransGradientStyleExport::exportXML(
     return bRet;
 }
 
-#endif // #ifndef SVX_LIGHT
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 21fabba..63fc351 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -484,35 +484,20 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext(
                                                     rLocalName, xAttrList, sal_True );
                 break;
             case XML_TOK_TEXT_NOTE_CONFIG:
-#ifndef SVX_LIGHT
                 pStyle = new XMLFootnoteConfigurationImportContext(GetImport(),
                                                                    p_nPrefix,
                                                                    rLocalName,
                                                                    xAttrList);
-#else
-                // create default context to skip content
-                pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
-#endif // #ifndef SVX_LIGHT
                 break;
 
             case XML_TOK_TEXT_BIBLIOGRAPHY_CONFIG:
-#ifndef SVX_LIGHT
                 pStyle = new XMLIndexBibliographyConfigurationContext(
                     GetImport(), p_nPrefix, rLocalName, xAttrList);
-#else
-                // create default context to skip content
-                pStyle = new SvXMLStyleContext( GetImport(), p_nPrefix, rLocalName, xAttrList );
-#endif // #ifndef SVX_LIGHT
                 break;
 
             case XML_TOK_TEXT_LINENUMBERING_CONFIG:
-#ifndef SVX_LIGHT
                 pStyle = new XMLLineNumberingImportContext(
                     GetImport(), p_nPrefix, rLocalName, xAttrList);
-#else
-                // create default context to skip content
-                pStyle = new SvXMLStyleContext( GetImport(), p_nPrefix, rLocalName, xAttrList );
-#endif // #ifndef SVX_LIGHT
                 break;
 
             //
@@ -714,7 +699,6 @@ UniReference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportProperty
         }
         xMapper = mxShapeImpPropMapper;
         break;
-#ifndef SVX_LIGHT
     case XML_STYLE_FAMILY_SCH_CHART_ID:
         if( ! mxChartImpPropMapper.is() )
         {
@@ -723,7 +707,6 @@ UniReference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportProperty
         }
         xMapper = mxChartImpPropMapper;
         break;
-#endif
     case XML_STYLE_FAMILY_PAGE_MASTER:
         if( ! mxPageImpPropMapper.is() )
         {
diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx
index 8470aea..e2311e7 100644
--- a/xmloff/source/text/XMLTextPropertySetContext.cxx
+++ b/xmloff/source/text/XMLTextPropertySetContext.cxx
@@ -79,14 +79,9 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext(
                                                    rProperties );
         break;
     case CTF_TEXTCOLUMNS:
-#ifndef SVX_LIGHT
         pContext = new XMLTextColumnsContext( GetImport(), nPrefix,
                                                    rLocalName, xAttrList, rProp,
                                                    rProperties );
-#else
-        // create default context to skip content
-        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-#endif // #ifndef SVX_LIGHT
         break;
 
     case CTF_DROPCAPFORMAT:
@@ -134,14 +129,12 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext(
                                            rProperties );
     }
     break;
-#ifndef SVX_LIGHT
     case CTF_SECTION_FOOTNOTE_END:
     case CTF_SECTION_ENDNOTE_END:
         pContext = new XMLSectionFootnoteConfigImport( 
             GetImport(), nPrefix, rLocalName, rProperties, 
             mxMapper->getPropertySetMapper());
         break;
-#endif // #ifndef SVX_LIGHT
     }
     
     if( !pContext )
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 801415d..dcce74a 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2386,12 +2386,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
 
     case XML_TOK_TEXT_INDEX_TITLE:
     case XML_TOK_TEXT_SECTION:
-#ifndef SVX_LIGHT
         pContext = new XMLSectionImportContext( rImport, nPrefix, rLocalName );
-#else
-        // create default context to skip content
-        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
-#endif // #ifndef SVX_LIGHT
         break;
 
     case XML_TOK_TEXT_TOC:
@@ -2401,23 +2396,13 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
     case XML_TOK_TEXT_USER_INDEX:
     case XML_TOK_TEXT_ALPHABETICAL_INDEX:
     case XML_TOK_TEXT_BIBLIOGRAPHY_INDEX:
-#ifndef SVX_LIGHT
         if( XML_TEXT_TYPE_SHAPE != eType )
             pContext = new XMLIndexTOCContext( rImport, nPrefix, rLocalName );
-#else
-        // create default context to skip content
-        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
-#endif // #ifndef SVX_LIGHT
         break;
 
     case XML_TOK_TEXT_TRACKED_CHANGES:
-#ifndef SVX_LIGHT
         pContext = new XMLTrackedChangesImportContext( rImport, nPrefix,
                                                        rLocalName);
-#else
-        // create default context to skip content
-        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
-#endif // #ifndef SVX_LIGHT
         bContent = sal_False;
         break;
 
@@ -2432,12 +2417,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
         break;
 
     case XML_TOK_TEXT_FORMS:
-#ifndef SVX_LIGHT
         pContext = rImport.GetFormImport()->createOfficeFormsContext(rImport, nPrefix, rLocalName);
-#else
-        // create default context to skip content
-        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
-#endif // #ifndef SVX_LIGHT
         bContent = sal_False;
         break;
 
@@ -2450,12 +2430,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
         break;
 
     case XML_TOK_TEXT_CALCULATION_SETTINGS:
-#ifndef SVX_LIGHT
         pContext = new XMLCalculationSettingsContext ( rImport, nPrefix, rLocalName, xAttrList);
-#else
-        // create default context to skip content
-        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
-#endif // #ifndef SVX_LIGHT
         bContent = sal_False;
     break;
 
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index a2760c6..23386c0 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1696,7 +1696,6 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
         break;
 
     case XML_TOK_TEXT_NOTE:
-#ifndef SVX_LIGHT
         if (rImport.GetTextImport()->IsInFrame())
         {
             // we must not insert footnotes into text frames
@@ -1709,10 +1708,6 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
                                                      *rImport.GetTextImport().get(),
                                                      nPrefix, rLocalName );
         }
-#else
-        // create default context to skip content
-        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
-#endif // #ifndef SVX_LIGHT
         rIgnoreLeadingSpace = sal_False;
         break;
 
-- 
1.7.1


--------------010900070204080009030206--


More information about the LibreOffice mailing list