diff options
| author | Alexander Bergmann <myaddons@gmx.de> | 2012-02-09 13:15:27 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-13 17:33:15 +0000 |
| commit | 8963cc01f5267f3afc4e4a4ff5a65a67520f447b (patch) | |
| tree | c1f058310dd7ac12ddc0546c5bd3f8fcdbbd1ab8 /slideshow | |
| parent | bbeb0f7a82945e8d7b98e5d5da9f69dfc5c6fabe (diff) | |
EasyHack: Removed gcc conditionals
Diffstat (limited to 'slideshow')
4 files changed, 2 insertions, 26 deletions
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm index c0f881a20a10..f3bfab40f664 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm @@ -1118,14 +1118,8 @@ public: } namespace sdecl = comphelper::service_decl; -#if defined (__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ <= 3) - sdecl::class_<OGLTransitionFactoryImpl> serviceImpl; - const sdecl::ServiceDecl OGLTransitionFactoryDecl( - serviceImpl, -#else const sdecl::ServiceDecl OGLTransitionFactoryDecl( sdecl::class_<OGLTransitionFactoryImpl>(), -#endif "com.sun.star.comp.presentation.OGLTransitionFactory", "com.sun.star.presentation.TransitionFactory" ); diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx index c8cad45908ee..1f301e60fd99 100644 --- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx @@ -1464,14 +1464,8 @@ public: } namespace sdecl = comphelper::service_decl; -#if defined (__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ <= 3) - sdecl::class_<OGLTransitionFactoryImpl> serviceImpl; - const sdecl::ServiceDecl OGLTransitionFactoryDecl( - serviceImpl, -#else const sdecl::ServiceDecl OGLTransitionFactoryDecl( sdecl::class_<OGLTransitionFactoryImpl>(), -#endif "com.sun.star.comp.presentation.OGLTransitionFactory", "com.sun.star.presentation.TransitionFactory" ); diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx index 80e2e73a4ccc..7aa72062d662 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx @@ -1436,14 +1436,8 @@ public: } namespace sdecl = comphelper::service_decl; -#if defined (__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ <= 3) - sdecl::class_<OGLTransitionFactoryImpl> serviceImpl; - const sdecl::ServiceDecl OGLTransitionFactoryDecl( - serviceImpl, -#else - const sdecl::ServiceDecl OGLTransitionFactoryDecl( +const sdecl::ServiceDecl OGLTransitionFactoryDecl( sdecl::class_<OGLTransitionFactoryImpl>(), -#endif "com.sun.star.comp.presentation.OGLTransitionFactory", "com.sun.star.presentation.TransitionFactory" ); diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index ffdf438ff33d..864c412cbf9b 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -2450,14 +2450,8 @@ void FrameSynchronization::Deactivate (void) } // anon namespace namespace sdecl = comphelper::service_decl; -#if defined (__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ <= 3) - sdecl::class_<SlideShowImpl> serviceImpl; - const sdecl::ServiceDecl slideShowDecl( - serviceImpl, -#else - const sdecl::ServiceDecl slideShowDecl( +const sdecl::ServiceDecl slideShowDecl( sdecl::class_<SlideShowImpl>(), -#endif "com.sun.star.comp.presentation.SlideShow", "com.sun.star.presentation.SlideShow" ); |