ooo-build r14554 - in trunk: . patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Thu Nov 20 10:27:18 2008
New Revision: 14554
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14554&view=rev

Log:
2008-11-20  Noel Power  <noel power novell com>

        patches/vba/enhanced-form-userform-controls.diff: n#447015



Modified:
   trunk/ChangeLog
   trunk/patches/vba/enhanced-form-userform-controls.diff

Modified: trunk/patches/vba/enhanced-form-userform-controls.diff
==============================================================================
--- trunk/patches/vba/enhanced-form-userform-controls.diff	(original)
+++ trunk/patches/vba/enhanced-form-userform-controls.diff	Thu Nov 20 10:27:18 2008
@@ -1533,7 +1533,7 @@
  
  
  using namespace ::com::sun::star;
-@@ -42,6 +51,60 @@ using ::rtl::OUString;
+@@ -42,6 +51,66 @@ using ::rtl::OUString;
  namespace xmlscript
  {
  
@@ -1547,13 +1547,13 @@
 +
 +    if ( xFac.is() && xBinding.is() )
 +    {
-+         Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );  
-+        Reference< beans::XPropertySet > xBindable( xBinding->getValueBinding(), UNO_QUERY );
-+        if ( xBindable.is() )
++        try
 +        {
-+            table::CellAddress aAddress; 
-+	    try
++            Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );  
++        Reference< beans::XPropertySet > xBindable( xBinding->getValueBinding(), UNO_QUERY );
++            if ( xBindable.is() )
 +            {
++                table::CellAddress aAddress; 
 +                xBindable->getPropertyValue( OUSTR("BoundCell") ) >>= aAddress; 
 +                xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) );
 +                rtl::OUString sAddress;
@@ -1564,9 +1564,9 @@
 +                OSL_TRACE( "*** Bindable value %s", rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() ); 
 +               
 +            }
-+            catch( Exception& e )
-+            {
-+            }
++        }
++        catch( uno::Exception& )
++        {
 +        }
 +    }
 +    Reference< form::binding::XListEntrySink > xEntrySink( _xProps, UNO_QUERY );
@@ -1575,18 +1575,24 @@
 +        Reference< beans::XPropertySet > xListSource( xEntrySink->getListEntrySource(), UNO_QUERY );
 +        if ( xListSource.is() )
 +        {
-+            Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );  
++            try
++            {
++                Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );  
 +
-+            table::CellRangeAddress aAddress; 
-+            xListSource->getPropertyValue( OUSTR( "CellRange" ) ) >>= aAddress;
++                table::CellRangeAddress aAddress; 
++                xListSource->getPropertyValue( OUSTR( "CellRange" ) ) >>= aAddress;
 +
-+            rtl::OUString sAddress;
-+            xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) );
-+            xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
-+            OSL_TRACE("**** cell range source list %s",
-+                rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() ); 
-+            if ( sAddress.getLength() > 0 );
-+                rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":source-cell-range"), sAddress );
++                rtl::OUString sAddress;
++                xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) );
++                xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
++                OSL_TRACE("**** cell range source list %s",
++                    rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() ); 
++                if ( sAddress.getLength() > 0 );
++                    rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":source-cell-range"), sAddress );
++            }
++            catch( uno::Exception& )
++            {
++            }
 +        }
 +    }
 +