summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorAlexander Bergmann <myaddons@gmx.de>2012-02-09 13:15:27 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-02-13 17:33:15 +0000
commit8963cc01f5267f3afc4e4a4ff5a65a67520f447b (patch)
treec1f058310dd7ac12ddc0546c5bd3f8fcdbbd1ab8 /cppcanvas
parentbbeb0f7a82945e8d7b98e5d5da9f69dfc5c6fabe (diff)
EasyHack: Removed gcc conditionals
Diffstat (limited to 'cppcanvas')
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx5
-rw-r--r--cppcanvas/source/uno/uno_mtfrenderer.cxx6
2 files changed, 1 insertions, 10 deletions
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 71c29ca07c67..d6da081d06e1 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -2284,12 +2284,9 @@ namespace cppcanvas
rState ) );
}
}
-#if defined __GNUC__
-#if __GNUC__ == 4
- // Unreachable; to avoid bogus warning:
+#if defined(__GNUC__)
return ActionSharedPtr();
#endif
-#endif
}
}
}
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx b/cppcanvas/source/uno/uno_mtfrenderer.cxx
index 596b5e7c82b4..dacaeab7d1db 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.cxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx
@@ -66,14 +66,8 @@ MtfRenderer::MtfRenderer (uno::Sequence<uno::Any> const& aArgs, uno::Reference<u
}
namespace sdecl = comphelper::service_decl;
-#if defined (__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ <= 3)
- sdecl::class_<MtfRenderer, sdecl::with_args<true> > serviceImpl;
- const sdecl::ServiceDecl MtfRendererDecl(
- serviceImpl,
-#else
const sdecl::ServiceDecl MtfRendererDecl(
sdecl::class_<MtfRenderer, sdecl::with_args<true> >(),
-#endif
"com.sun.star.comp.rendering.MtfRenderer",
"com.sun.star.rendering.MtfRenderer" );