ooo-build r15502 - in branches/opensuse-11-1: . patches/dev300 patches/vba

[pflin svn gnome org]

Author: pflin
Date: Mon Mar  9 04:33:56 2009
New Revision: 15502
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15502&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:
   branches/opensuse-11-1/patches/vba/vba-commandbar-enabled.diff
Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/apply

Modified: branches/opensuse-11-1/patches/dev300/apply
==============================================================================
--- branches/opensuse-11-1/patches/dev300/apply	(original)
+++ branches/opensuse-11-1/patches/dev300/apply	Mon Mar  9 04:33:56 2009
@@ -1696,6 +1696,7 @@
 vba-interior-object-fix.diff, n#459479, Fong
 #  futureproofing against n#478187 note: doesn't affect ooo300-m9
 vba-fix-copysheet-toend.diff, n#478187
+vba-commandbar-enabled.diff, n#459458, Fong
 
 [ VBAUntested ]
 SectionOwner => noelpwer

Added: branches/opensuse-11-1/patches/vba/vba-commandbar-enabled.diff
==============================================================================
--- (empty file)
+++ branches/opensuse-11-1/patches/vba/vba-commandbar-enabled.diff	Mon Mar  9 04:33:56 2009
@@ -0,0 +1,52 @@
+diff --git oovbaapi/org/openoffice/vba/XCommandBar.idl oovbaapi/org/openoffice/vba/XCommandBar.idl
+index 6449537..986cf45 100644
+--- oovbaapi/org/openoffice/vba/XCommandBar.idl
++++ oovbaapi/org/openoffice/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 sc/source/ui/vba/vbacommandbar.cxx sc/source/ui/vba/vbacommandbar.cxx
+index 7e03949..da99068 100644
+--- sc/source/ui/vba/vbacommandbar.cxx
++++ sc/source/ui/vba/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 sc/source/ui/vba/vbacommandbar.hxx sc/source/ui/vba/vbacommandbar.hxx
+index c284c90..1c814ee 100644
+--- sc/source/ui/vba/vbacommandbar.hxx
++++ sc/source/ui/vba/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);