remove SVX_LIGHT macro

18 files changed, 0 insertions, 196 deletions

diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx
index a1ff7a9e3541..64445eb742b9 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 5bf74079f359..45b8dcd92ac9 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 575481527996..0bfd01b0ad10 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 751706c4509a..6954c28e34ca 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 ddcf5a445926..2d2f5904bac2 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@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@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@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@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@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@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 8d257e823656..7cd2bceb0cba 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 6382ee5ca35a..9aebbd0e403d 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 9ce94cd5c3e5..6e7e9521d7fb 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 ae632a2e2834..297888f36ba5 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 884fe682e470..743b1cc0199b 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 63a2678051d6..66aab4faf89b 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 dcebfac35051..18f63af74cfb 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 1d6da54de628..5d663c3b61ed 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 2129dd0e00f3..187d74774490 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 1a7d8241a83c..a4e479598235 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 2c7dba4b2b85..2f413b5030f9 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 ada5f93667f5..d82c010eda9c 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 c1d44d53db63..da5215324e36 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>