diff options
| author | Xavier ALT <dex@phoenix-ind.net> | 2011-03-08 23:00:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-09 16:08:47 +0000 |
| commit | 17aac3bb4a83aa41460722dd94992bd94600d575 (patch) | |
| tree | 7b5b0ee848b9470b1fb3ef27416d6a7853144c20 /filter/inc | |
| parent | 69069f3fd9eb0ed2dae56efa83e708e9438bf7ca (diff) | |
remove SVX_LIGHT macro
Diffstat (limited to 'filter/inc')
| -rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 2 | ||||
| -rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index a75b8e455f7d..18490b47daf2 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 1bdf54fbb774..34db8f128c33 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: */ |