#95662# BASEPROPERTY_ENABLE: Don't enable with children

2 files changed, 4 insertions, 39 deletions

diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 45eb9f8ac26c..bbffb6ade909 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unocontrols.hxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: mt $ $Date: 2001-11-30 13:55:23 $
+ *  last change: $Author: mt $ $Date: 2001-12-06 16:00:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -247,7 +247,6 @@ protected:
     void        ImplInsertControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel, const ::rtl::OUString& rName );
     void        ImplRemoveControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel );
     void        ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl );
-    void        ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
 
 public:
 
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index a2ff1fc610e4..cdc8d55c940c 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unocontrols.cxx,v $
  *
- *  $Revision: 1.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: mt $ $Date: 2001-11-30 13:56:29 $
+ *  last change: $Author: mt $ $Date: 2001-12-06 16:00:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -603,40 +603,6 @@ void UnoDialogControl::ImplSetPosSize( uno::Reference< awt::XControl >& rxCtrl )
     xW->setPosSize( nX, nY, nWidth, nHeight, awt::PosSize::POSSIZE );
 }
 
-void UnoDialogControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const uno::Any& rVal )
-{
-    UnoControl::ImplSetPeerProperty( rPropName, rVal );
-
-    sal_uInt16 nType = GetPropertyId( rPropName );
-    if ( nType == BASEPROPERTY_ENABLED )
-    {
-        // #95241# Enable is recursive on all children.
-        // Wenn a control is disabled, but now enabled because of Dialog::Enable(),
-        // it's not possible to disable the control again, because
-        // the property will not change on second call "enabled = false".
-
-        // => set Property to all children
-
-        uno::Reference< container::XNameAccess > xNA( getModel(), uno::UNO_QUERY );
-        if ( xNA.is() )
-        {
-            uno::Sequence< ::rtl::OUString > aNames = xNA->getElementNames();
-            const ::rtl::OUString* pNames = aNames.getConstArray();
-            sal_uInt32 nCtrls = aNames.getLength();
-
-            for( sal_uInt32 n = 0; n < nCtrls; n++ )
-            {
-                uno::Any aA = xNA->getByName( pNames[n] );
-                uno::Reference< beans::XPropertySet > xPSet;
-                aA >>= xPSet;
-                if ( xPSet.is() )
-                    xPSet->setPropertyValue( rPropName, rVal );
-            }
-        }
-    }
-}
-
-
 void UnoDialogControl::dispose() throw(uno::RuntimeException)
 {
     lang::EventObject aEvt;