ooo-build r15503 - in trunk: . patches/dev300 patches/vba

[pflin svn gnome org]

Author: pflin
Date: Mon Mar  9 06:39:49 2009
New Revision: 15503
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15503&view=rev

Log:
2009-03-09  Fong Lin  <pflin novell com>
	* patches/dev300/apply: fix for n#459458.
	* patches/vba/vba-commandbar-enabled.diff:



Added:
   trunk/patches/vba/vba-commandbar-enabled.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Mar  9 06:39:49 2009
@@ -1891,6 +1891,7 @@
 # event handler ( bit of a hack )
 fix-doc-exit-basic-error-core.diff
 read-vba-dir-stream-fix.diff
+vba-commandbar-enabled.diff, n#459458, Fong
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao

Added: trunk/patches/vba/vba-commandbar-enabled.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-commandbar-enabled.diff	Mon Mar  9 06:39:49 2009
@@ -0,0 +1,52 @@
+diff --git oovbaapi/ooo/vba/XCommandBar.idl oovbaapi/ooo/vba/XCommandBar.idl
+index 5e27c6b..13d54da 100644
+--- oovbaapi/ooo/vba/XCommandBar.idl
++++ oovbaapi/ooo/vba/XCommandBar.idl
+@@ -54,6 +54,7 @@ interface XCommandBar
+ 
+     [attribute] string Name;
+     [attribute] boolean Visible;
++    [attribute] boolean Enabled;
+     
+     void Delete() raises ( com::sun::star::script::BasicErrorException );
+     any Controls( [in] any Index ) raises ( com::sun::star::script::BasicErrorException );
+diff --git vbahelper/source/vbahelper/vbacommandbar.cxx vbahelper/source/vbahelper/vbacommandbar.cxx
+index 55ba7b6..ba9f49b 100644
+--- vbahelper/source/vbahelper/vbacommandbar.cxx
++++ vbahelper/source/vbahelper/vbacommandbar.cxx
+@@ -267,6 +267,22 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
+         OSL_TRACE( "SetVisible get an exception\n" );
+     }
+ }
++
++::sal_Bool SAL_CALL 
++ScVbaCommandBar::getEnabled() throw (uno::RuntimeException)
++{
++    // #FIXME: seems tha main menu is alwayse enabled.
++    // for the toolbar, need to investigate
++    return sal_True;
++}
++
++void SAL_CALL
++ScVbaCommandBar::setEnabled( sal_Bool/* _enabled */ ) throw (uno::RuntimeException)
++{
++    // #FIXME: seems tha main menu is alwayse enabled.
++    // for the toolbar, need to investigate
++}
++
+ void SAL_CALL 
+ ScVbaCommandBar::Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ {
+diff --git vbahelper/source/vbahelper/vbacommandbar.hxx vbahelper/source/vbahelper/vbacommandbar.hxx
+index 0b830b2..c53a5cd 100644
+--- vbahelper/source/vbahelper/vbacommandbar.hxx
++++ vbahelper/source/vbahelper/vbacommandbar.hxx
+@@ -93,6 +93,8 @@ public:
+     virtual void SAL_CALL setName( const ::rtl::OUString& _name ) throw (css::uno::RuntimeException);
+     virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
+     virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
++    virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
++    virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException);
+ 
+     // Methods
+     virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);