[dba-cvs] CVS update: /dba/reportdesign/source/core/sdr/RptObject.cxx

[ihi]

User: ihi     
Date: 2007-11-20 18:59:17+0000
Modified:
   dba/reportdesign/source/core/sdr/RptObject.cxx

Log:
 INTEGRATION: CWS reportdesign01 (1.5.20); FILE MERGED
 2007/09/06 09:07:43 oj 1.5.20.1: #i77507# check for width, height of a fixed 
line

File Changes:

Directory: /dba/reportdesign/source/core/sdr/
=============================================

File [changed]: RptObject.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/RptObject.cxx?r1=1.5&r2=1.6
Delta lines:  +18 -8
--------------------
--- RptObject.cxx       2007-08-03 12:44:07+0000        1.5
+++ RptObject.cxx       2007-11-20 18:59:15+0000        1.6
@@ -491,7 +491,7 @@
 }
 
 //----------------------------------------------------------------------------
-sal_Bool OObjectBase::supportsService( const sal_Char* _pServiceName ) const
+sal_Bool OObjectBase::supportsService( const ::rtl::OUString& _sServiceName ) 
const
 {
        DBG_CHKTHIS( rpt_OObjectBase,NULL);
        sal_Bool bSupports = sal_False;
@@ -499,7 +499,7 @@
        Reference< lang::XServiceInfo > xServiceInfo( m_xReportComponent , 
UNO_QUERY );
                // TODO: cache xServiceInfo as member?
        if ( xServiceInfo.is() )
-               bSupports = xServiceInfo->supportsService( 
::rtl::OUString::createFromAscii( _pServiceName ) );
+               bSupports = xServiceInfo->supportsService( _sServiceName );
 
        return bSupports;
 }
@@ -811,9 +811,19 @@
             if ( !m_xReportComponent.is() )
                 m_xReportComponent.set(getUnoShape(),uno::UNO_QUERY);
             // set labels      
-               if ( m_xReportComponent.is() && supportsService( 
"com.sun.star.report.FixedText" ) )
+               if ( m_xReportComponent.is() )
+            {
+                try
+                {
+                    if ( supportsService( SERVICE_FIXEDTEXT ) )
                 m_xReportComponent->setPropertyValue( PROPERTY_LABEL, 
uno::makeAny(GetDefaultName(this)) );
         }
+                catch(const uno::Exception&)
+                {
+                    OSL_ENSURE(0,"OUnoObject::EndCreate: Exception caught!");
+                }
+            }
+        }
         // set geometry properties     
         SetPropsFromRect(GetLogicRect());
     }
@@ -825,19 +835,19 @@
 {      
        sal_uInt16 nResId = 0;
        ::rtl::OUString aDefaultName = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HERE WE HAVE TO INSERT OUR 
NAME!"));
-    if ( _pObj->supportsService( "com.sun.star.report.FixedText" ) )
+    if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) )
        {
                nResId = RID_STR_CLASS_FIXEDTEXT;
        }
-    else if ( _pObj->supportsService( "com.sun.star.report.FixedLine" ) )
+    else if ( _pObj->supportsService( SERVICE_FIXEDLINE ) )
        {
                nResId = RID_STR_CLASS_FIXEDLINE;
        }
-    else if ( _pObj->supportsService( "com.sun.star.report.ImageControl" ) )
+    else if ( _pObj->supportsService( SERVICE_IMAGECONTROL ) )
        {
                nResId = RID_STR_CLASS_IMAGECONTROL;
        }
-       else if ( _pObj->supportsService( "com.sun.star.report.FormattedField" 
) )
+       else if ( _pObj->supportsService( SERVICE_FORMATTEDFIELD ) )
        {
                nResId = RID_STR_CLASS_FORMATTEDFIELD;
        }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]