[Libreoffice-commits] core.git: filter/source include/sal

[Stephan Bergmann]

 filter/source/odfflatxml/OdfFlatXml.cxx |    6 +++---
 include/sal/log-areas.dox               |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 21055f014c2d98f9f57ee81da9c54a4218d45e0d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 11 10:48:41 2013 +0200

    -Werror,-Wunused-variable
    
    Change-Id: Ia3e6da86b47099106c4be793a1477979d327a2b9

diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 1303b64..13de487 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -135,9 +135,9 @@ OdfFlatXml::importer(
         }
     catch (const Exception &exc)
         {
-            OString msg = OUStringToOString(exc.Message,
-                                            RTL_TEXTENCODING_ASCII_US);
-            OSL_FAIL(msg.getStr());
+            SAL_WARN(
+                "filter.odfflatxml",
+                "caught exception \"" << exc.Message << "\"");
             return sal_False;
         }
     return sal_True;
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index b4ddc03..e85a498 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -133,6 +133,7 @@ certain functionality.
 
 @li @c filter.config
 @li @c filter.ms - escher import/export
+ at li @c filter.odfflatxml
 @li @c filter.xslt - xslt import/export
 @li @c oox.cscode - see oox/source/drawingml/customshapes/README
 @li @c oox.drawingml - DrawingML