[Libreoffice-commits] .: filter/inc

[Caolán McNamara]

 filter/inc/filter/msfilter/msdffimp.hxx |    2 --
 filter/inc/filter/msfilter/svdfppt.hxx  |    4 ----
 2 files changed, 6 deletions(-)

New commits:
commit e6a5bbee09ef2d1390b41c0ec11eeca084e7b94d
Author: Xavier ALT <dex at phoenix-ind.net>
Date:   Tue Mar 8 23:00:02 2011 +0100

    remove SVX_LIGHT macro

diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index 9e82dea..27a22f9 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -515,13 +515,11 @@ protected :
                                   sal_Int64 nAspect ) const;
     SdrObject* GetAutoForm( MSO_SPT eTyp ) const;
     static const GDIMetaFile* lcl_GetMetaFileFromGrf_Impl( const Graphic& rGrf, GDIMetaFile& rMtf );
-#ifndef SVX_LIGHT
     static com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > CheckForConvertToSOObj(
                 UINT32 nConvertFlags, SotStorage& rSrcStg,
                 const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg,
                 const Graphic& rGrf,
                 const Rectangle& rVisArea );
-#endif
 
 /*
         folgende Methoden sind zum Excel-Import zu ueberschreiben:
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index c3d933d..1d4059b 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -29,8 +29,6 @@
 #ifndef _SVDFPPT_HXX
 #define _SVDFPPT_HXX
 
-#ifndef SVX_LIGHT
-
 #include <tools/solar.h>
 #include <svl/svarray.hxx>
 #include <tools/string.hxx>
@@ -1411,8 +1409,6 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls
 #define PPT_PLACEHOLDER_ORGANISZATIONCHART		23	// 24 Organization Chart
 #define PPT_PLACEHOLDER_MEDIACLIP				24	// 25 Media Clip
 
-#endif // SVX_LIGHT
-
 #endif //_SVDFPPT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */