From 959d1dc0f3bbf0269d5c7be9a91bba9999d6f821 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 29 Mar 2013 17:04:52 +0000 Subject: fix 'Visible' property for XControlShape(s) Foreach support for CommandBars Seems now we need to additionally set 'Visible' property for XControlShapes to ensure correct visibility Also we need allow 'For Each' syntax to with with CommandBar collection. Note: the implementation of the CommandBar enumeration seems wrong, I would have thought that it should match ( and share ) implementation details with normal index access ( it doesn't ) Change-Id: Ia5306b4c976f6dc9a5f82e245ca5440f204f5bab --- vbahelper/source/msforms/vbacontrol.cxx | 15 ++++++++++++++- vbahelper/source/vbahelper/vbacommandbars.cxx | 4 ++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 288cefaf20cc..e9be0406615d 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -192,7 +192,14 @@ 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 ); - m_xProps->getPropertyValue( "EnableVisible" ) >>= bVisible; + 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; return bVisible; } @@ -200,6 +207,12 @@ 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 62b5f913a83b..0ca27c2c57f7 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -63,6 +63,10 @@ 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(); -- cgit