[Libreoffice-commits] core.git: 2 commits - reportdesign/source svx/source

[Lionel Elie Mamane]

 reportdesign/source/core/api/Shape.cxx |    2 +-
 svx/source/unodraw/unoshap4.cxx        |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 3cc85b071fdcf75adf8bcb3d59984940395c81e1
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Nov 8 03:08:10 2013 +0100

    earlier failure in debug mode
    
    in the case that mpObj.get() is not a SdrOle2Obj*
    
    Change-Id: Idff7324242062665c137685096cd82284e24f0d9

diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 768896d..d26546f 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -174,7 +174,14 @@ bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPro
         OUString aPersistName;
         if( rValue >>= aPersistName )
         {
-            static_cast<SdrOle2Obj*>(mpObj.get())->SetPersistName( aPersistName );
+            SdrOle2Obj *pOle;
+#if OSL_DEBUG_LEVEL > 0
+            pOle = dynamic_cast<SdrOle2Obj*>(mpObj.get());
+            assert(pOle);
+#else
+            pOle = static_cast<SdrOle2Obj*>(mpObj.get());
+#endif
+            pOle->SetPersistName( aPersistName );
             return true;
         }
         break;
commit e7fad6da680631f82684d4f248ab77d53caa4189
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Nov 8 03:06:09 2013 +0100

    fdo#71130 pretend to support service m_sServiceName
    
    Which was the case before, and was probably erroneously changed in
    commit 196f980012739d94654e6863b85b2e49f7e1a1e5
        fdo#54938: Replace existsValue for cppu::supportsService
    
    Change-Id: I20323bba1105d1844c79a5a0ad3c9e133a9d0d05

diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index 47270d4..d22ed65 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -151,7 +151,7 @@ uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames(  ) throw(un
 sal_Bool SAL_CALL OShape::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
 
-    return cppu::supportsService(this, ServiceName);
+    return m_sServiceName == ServiceName || cppu::supportsService(this, ServiceName);
 }
 // -----------------------------------------------------------------------------
 // XReportComponent