Revert "fix 'Visible' property for XControlShape(s) Foreach support for CommandBars"

This reverts commit 5a588c257056b2e9f0b324b1904b1e568c762a94.

2 files changed, 1 insertions, 18 deletions

diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 78fbf4173b7a..f97ee77cf824 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -188,14 +188,7 @@ void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeE
 sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
 {
     sal_Bool bVisible( sal_True );
-    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
-    if ( xControlShape.is() )
-    {
-        uno::Reference< beans::XPropertySet > xProps( m_xControl, uno::UNO_QUERY_THROW );
-        xProps->getPropertyValue ( "Visible" ) >>= bVisible;
-    }
-    else
-        m_xProps->getPropertyValue ( "EnableVisible" ) >>= bVisible;
+    m_xProps->getPropertyValue( "EnableVisible" ) >>= bVisible;
     return bVisible;
 }
 
@@ -203,12 +196,6 @@ void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeE
 {
     uno::Any aValue( bVisible );
     m_xProps->setPropertyValue( "EnableVisible" , aValue);
-    uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
-    if ( xControlShape.is() )
-    {
-        uno::Reference< beans::XPropertySet > xProps( m_xControl, uno::UNO_QUERY_THROW );
-        xProps->setPropertyValue ( "Visible", aValue );
-    }
 }
 double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException)
 {
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index a1515fbbeaba..e8a200044d24 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -63,10 +63,6 @@ public:
             {
                 uno::Reference< container::XIndexAccess > xCBarSetting = m_pCBarHelper->getSettings( sResourceUrl );
                 uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, m_pCBarHelper, xCBarSetting, sResourceUrl, sal_False ) );
-                // Strange, shouldn't the Enumeration support match/share the
-                // iteration code? ( e.g. ScVbaCommandBars::Item(...) )
-                // and we at least should return here ( something ) it seems
-                return uno::makeAny( xCommandBar );
              }
              else
                 return nextElement();