[Libreoffice-commits] .: 2 commits - toolkit/source toolkit/workben

[Julien Nabet]

 toolkit/source/layout/core/import.cxx |    2 +-
 toolkit/workben/layout/editor.cxx     |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ffe9d3613ca2cbe54703a77d30dc62e25734a28f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Oct 27 22:46:39 2011 +0200

    Trace one catch, add a return false in another one

diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx
index ceee0fd..f46afb6 100644
--- a/toolkit/workben/layout/editor.cxx
+++ b/toolkit/workben/layout/editor.cxx
@@ -296,7 +296,9 @@ public:
         try {
             mxContainer->addChild( pChild->mxWidget );
         }
-        catch( awt::MaxChildrenException ex ) {
+        catch( awt::MaxChildrenException& rEx) {
+            fprintf (stderr, "ERROR: MaxChildrenException: '%s'.\n",
+                 rtl::OUStringToOString (rEx.Message, RTL_TEXTENCODING_UTF8).getStr());
             return false;
         }
 
@@ -331,6 +333,7 @@ public:
         } catch ( beans::UnknownPropertyException &rEx ) {
             fprintf (stderr, "ERROR: widget reports that it has a property it cannot return: '%s' this normally means that someone screwed up their PROPERTY_SET_INFO macro usage.\n",
                  rtl::OUStringToOString (rEx.Message, RTL_TEXTENCODING_UTF8).getStr());
+            return false;
         }
             }
         }
commit 95ed6bc10cadf3706548cb297cceb9eaab6ff05a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Oct 27 21:57:05 2011 +0200

    C-Style casting replaced by C++ style

diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx
index 5114ca5..fdc90de 100644
--- a/toolkit/source/layout/core/import.cxx
+++ b/toolkit/source/layout/core/import.cxx
@@ -77,7 +77,7 @@ SAL_THROW (())
 //DEBUG
         uno::Reference< awt::XLayoutConstrains > xParent;
         if ( pParent )
-            xParent = ((WidgetElement *) pParent)->mpWidget->getPeer();
+            xParent = (static_cast<WidgetElement *>(pParent))->mpWidget->getPeer();
 
 
         mpWidget = pImport->mrRoot.create( aId, name,