[ooo-build-commit] patches/dev300

[Noel Power]

 patches/dev300/apply |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0dd607d189f1f9c0570c38eced5d16c5435d65db
Author: Noel Power <noel.power at novell.com>
Date:   Tue Jul 28 15:08:02 2009 +0100

    add upstream iz number for vba-automation-set-fix.diff
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 37f2dc5..840bf49 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1877,7 +1877,6 @@ vba-workbook-auto-open-event.diff, n#520228, Fong
 vba-buildin-toolbar-fix.diff, n#520228, Fong
 # support WorkBook.PrecisionAsDisplayed
 vba-workbook-precisionasdisplayed.diff, n#520228, Fong
-<<<<<<< HEAD:patches/dev300/apply
 # fix for uno api in XMenu::getPopupMenu
 uno-xmenu-getpopupMenu-fix.diff, i#103486, Fong
 # support CommandbarControl.Enabled
@@ -1887,7 +1886,7 @@ vba-commandbar-document-scope.diff, Fong
 # fix for dim a variable as vba constant
 vba-dim-as-contants-fix.diff, n#521820, Fong
 # fix for set involving an automation object ( in vba mode )
-vba-automation-set-fix.diff, n#507501
+vba-automation-set-fix.diff, n#507501, iz#103859
 # various improvements, handle tooltip, handle seperators, fix bug where 
 # toolbar control isn't displayed if the macro isn't resolved, 
 # added classed for excel toolbar import ( disabled )