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

[Tor Lillqvist]

 connectivity/source/inc/ado/Aolewrap.hxx |    2 +-
 toolkit/source/awt/vclxwindows.cxx       |    9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit bf6e54fffbe2bcc6b83b969bd9cfaf217d79c116
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Oct 5 14:06:08 2011 +0300

    WaE: switch statement contains 'default' but no 'case' labels

diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index f95ceb6..441810d 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -6665,14 +6665,7 @@ throw(::com::sun::star::uno::RuntimeException)
     (void)bVoid;
 #endif
 
-    sal_uInt16 nPropType = GetPropertyId( PropertyName );
-    switch ( nPropType )
-    {
-        default:
-        {
-            VCLXContainer::setProperty( PropertyName, Value );
-        }
-    }
+    VCLXContainer::setProperty( PropertyName, Value );
 }
 
 void VCLXFrame::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
commit e360fca67174ba591cb05100fba269c045499408
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Oct 5 14:05:23 2011 +0300

    Use OString::getStr() now

diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index 46dcf18..51407bc 100644
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
@@ -190,7 +190,7 @@ namespace connectivity
 #if OSL_DEBUG_LEVEL > 0
                     ::rtl::OString sTemp("Unknown Item: ");
                     sTemp += ::rtl::OString(sStr.getStr(),sStr.getLength(),osl_getThreadTextEncoding());
-                    OSL_FAIL(sTemp);
+                    OSL_FAIL(sTemp.getStr());
 #endif
                 }
                 else