[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - vbahelper/source

Noel Power noel.power at suse.com
Mon Apr 29 12:21:09 PDT 2013


 vbahelper/source/msforms/vbacontrol.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 8eb150e65632d9d04fe4d580471cdbdd9f80ccd4
Author: Noel Power <noel.power at suse.com>
Date:   Mon Apr 29 19:41:45 2013 +0100

    create togglebutton class ( for togglebutton on sheet )
    
    Change-Id: If987eb6ed04d80e62b4b418e8f9de3a143ef68a7

diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index b788368..516cfa6 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -615,7 +615,14 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R
         case form::FormComponentType::COMBOBOX:
             return new ScVbaComboBox( xVbaParent, xContext, xControlShape, xModel, xGeoHelper.release() );
         case form::FormComponentType::COMMANDBUTTON:
-            return new ScVbaButton( xVbaParent, xContext, xControlShape, xModel, xGeoHelper.release() );
+        {
+            sal_Bool bToggle = sal_False;
+            xProps->getPropertyValue( "Toggle" ) >>= bToggle;
+            if ( bToggle )
+                return new ScVbaToggleButton( xVbaParent, xContext, xControlShape, xModel, xGeoHelper.release() );
+            else
+                return new ScVbaButton( xVbaParent, xContext, xControlShape, xModel, xGeoHelper.release() );
+        }
         case form::FormComponentType::FIXEDTEXT:
             return new ScVbaLabel( xVbaParent, xContext, xControlShape, xModel, xGeoHelper.release() );
         case form::FormComponentType::TEXTFIELD:


More information about the Libreoffice-commits mailing list