cppcanvas/source/mtfrenderer/textaction.cxx | 4 ---- xmloff/source/core/RDFaImportHelper.cxx | 7 ++----- 2 files changed, 2 insertions(+), 9 deletions(-)
New commits: commit 226a5ddda17e4b9c0744b7e3f5203f46a4ba289e Author: Tor Lillqvist <t...@iki.fi> Date: Mon Sep 26 21:35:20 2011 +0300 WaE: control reaches end of non-void function diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx index 043b9f7..956021c 100644 --- a/xmloff/source/core/RDFaImportHelper.cxx +++ b/xmloff/source/core/RDFaImportHelper.cxx @@ -218,11 +218,8 @@ RDFaReader::ReadCURIE(::rtl::OUString const & i_rCURIE) const } } } - else - { - OSL_TRACE( "ReadCURIE: invalid CURIE: no prefix" ); - return ::rtl::OUString(); - } + OSL_TRACE( "ReadCURIE: invalid CURIE: no prefix" ); + return ::rtl::OUString(); } ::std::vector< ::rtl::OUString > commit e594b27aa841d2c4a0a1861def8ade092eab6c5f Author: Tor Lillqvist <t...@iki.fi> Date: Mon Sep 26 21:14:13 2011 +0300 WaE: control reaches end of non-void function diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index a80306d..ec353ea 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -2286,12 +2286,8 @@ namespace cppcanvas rState ) ); } } -#if defined __GNUC__ -#if __GNUC__ == 4 && __GNUC_MINOR__ >= 1 // Unreachable; to avoid bogus warning: return ActionSharedPtr(); -#endif -#endif } } } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits