gridsort: do not allow NULL/VOID for a grid's columnd/data model - nothing would work then. (Both are already default-initited to some empty model in the grid model's ctor, for quite a few revisions)

2 files changed, 55 insertions, 15 deletions

diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index df301f9a57bd..79b8ae8a6c61 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -76,8 +76,8 @@ UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::
     ImplRegisterProperty( BASEPROPERTY_TABSTOP );
     ImplRegisterProperty( BASEPROPERTY_GRID_SHOWROWHEADER );
     ImplRegisterProperty( BASEPROPERTY_GRID_SHOWCOLUMNHEADER );
-    ImplRegisterProperty( BASEPROPERTY_GRID_DATAMODEL );
-    ImplRegisterProperty( BASEPROPERTY_GRID_COLUMNMODEL );
+    ImplRegisterProperty( BASEPROPERTY_GRID_DATAMODEL, makeAny( maContext.createComponent( "com.sun.star.awt.grid.DefaultGridDataModel" ) ) );
+    ImplRegisterProperty( BASEPROPERTY_GRID_COLUMNMODEL, makeAny( maContext.createComponent( "com.sun.star.awt.grid.DefaultGridColumnModel" ) ) );
     ImplRegisterProperty( BASEPROPERTY_GRID_SELECTIONMODE );
     ImplRegisterProperty( BASEPROPERTY_FONTRELIEF );
     ImplRegisterProperty( BASEPROPERTY_FONTEMPHASISMARK );
@@ -88,15 +88,6 @@ UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::
     ImplRegisterProperty( BASEPROPERTY_GRID_HEADER_BACKGROUND );
     ImplRegisterProperty( BASEPROPERTY_GRID_LINE_COLOR );
     ImplRegisterProperty( BASEPROPERTY_GRID_ROW_BACKGROUND );
-
-    osl_incrementInterlockedCount( &m_refCount );
-    {
-        setFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL,
-            makeAny( maContext.createComponent( "com.sun.star.awt.grid.DefaultGridColumnModel" ) ) );
-        setFastPropertyValue( BASEPROPERTY_GRID_DATAMODEL,
-            makeAny( maContext.createComponent( "com.sun.star.awt.grid.DefaultGridDataModel" ) ) );
-    }
-    osl_decrementInterlockedCount( &m_refCount );
 }
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -112,6 +103,53 @@ UnoControlModel* UnoGridModel::Clone() const
 }
 
 //----------------------------------------------------------------------------------------------------------------------
+namespace
+{
+    void lcl_dispose_nothrow( const Any& i_component )
+    {
+        try
+        {
+            const Reference< XComponent > xComponent( i_component, UNO_QUERY_THROW );
+            xComponent->dispose();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+void SAL_CALL UnoGridModel::dispose(  ) throw(RuntimeException)
+{
+    lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL ) );
+    lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_DATAMODEL ) );
+
+    UnoControlModel::dispose();
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
+{
+    Any aOldSubModel;
+    if ( ( nHandle == BASEPROPERTY_GRID_COLUMNMODEL ) || ( nHandle == BASEPROPERTY_GRID_DATAMODEL ) )
+    {
+        aOldSubModel = getFastPropertyValue( nHandle );
+        if ( aOldSubModel == rValue )
+        {
+            OSL_ENSURE( false, "UnoGridModel::setFastPropertyValue_NoBroadcast: setting the same value, again!" );
+                // shouldn't this have been caught by convertFastPropertyValue?
+            aOldSubModel.clear();
+        }
+    }
+
+    UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
+
+    if ( aOldSubModel.hasValue() )
+        lcl_dispose_nothrow( aOldSubModel );
+}
+
+//----------------------------------------------------------------------------------------------------------------------
 OUString UnoGridModel::getServiceName() throw(RuntimeException)
 {
     return OUString::createFromAscii( szServiceName_GridControlModel );
@@ -130,10 +168,6 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
             return uno::makeAny( (sal_Bool)sal_False );
         case BASEPROPERTY_GRID_SHOWCOLUMNHEADER:
             return uno::makeAny( (sal_Bool)sal_True );
-        case BASEPROPERTY_GRID_DATAMODEL:
-            return uno::makeAny( Reference<XGridDataModel> ());
-        case BASEPROPERTY_GRID_COLUMNMODEL:
-            return uno::makeAny(Reference<XGridColumnModel>() );
         case BASEPROPERTY_GRID_EVEN_ROW_BACKGROUND:
             return uno::makeAny( com::sun::star::util::Color(0xFFFFFF) );
         case BASEPROPERTY_GRID_HEADER_BACKGROUND:
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index d5c76f4a07f6..ce651a4061a9 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -60,12 +60,18 @@ public:
 
     UnoControlModel* Clone() const;
 
+    // ::com::sun::star::lang::XComponent
+    void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
+
     // ::com::sun::star::beans::XMultiPropertySet
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::io::XPersistObject
     ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
 
+    // OPropertySetHelper
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception);
+
     // XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoGridModel, UnoControlModel, szServiceName_GridControlModel )
 };