[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                             |    1 -
 patches/dev300/warning-return-values-filter.diff |   23 -----------------------
 2 files changed, 24 deletions(-)

New commits:
commit c76f158f8e2c7e46e9ea7c55aa99ec653223d640
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 19:32:58 2011 +0200

    pushed warning-return-values-filter.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 45c45b7..92f0ac2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -559,7 +559,6 @@ svx-customshapes-NOOPTFILES.diff, martink
 
 # This set seem to be related to a gcc bug ...
 # fixes warnings about missing return values
-warning-return-values-filter.diff, i#58977, pmladek
 warning-return-values-registry.diff, i#58979, pmladek
 # fixes warnings about that a variable is used unitialized
 warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
diff --git a/patches/dev300/warning-return-values-filter.diff b/patches/dev300/warning-return-values-filter.diff
deleted file mode 100644
index 02c143a..0000000
--- a/patches/dev300/warning-return-values-filter.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- filter/source/config/cache/filtercache.cxx |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git filter/source/config/cache/filtercache.cxx filter/source/config/cache/filtercache.cxx
-index c2ea190..657e8ad 100644
---- filter/source/config/cache/filtercache.cxx
-+++ filter/source/config/cache/filtercache.cxx
-@@ -832,10 +832,12 @@ CacheItemList& FilterCache::impl_getItemList(EItemType eType) const
-         case E_CONTENTHANDLER : return m_lContentHandlers;
-         case E_DETECTSERVICE  : return m_lDetectServices ;
- 
--        default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown sub container requested." )),
--                                            css::uno::Reference< css::uno::XInterface >()                      );
-     }
- 
-+    // throw has been moved from the default section of the switch to
-+    // avoid warning: control reaches end of non-void function
-+    throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown sub container requested." )),
-+                                            css::uno::Reference< css::uno::XInterface >()                      );
-     // <- SAFE ----------------------------------
- }
-