[ooo-build-commit] .: patches/dev300

[Noel Power]

 patches/dev300/vbahelper-optionality-fix.diff |   15 ---------------
 1 file changed, 15 deletions(-)

New commits:
commit 6624bc9ea9ec0e728a986d245f93733a0c030317
Author: Noel Power <noel.power at novell.com>
Date:   Thu Feb 18 17:35:41 2010 +0000

    fix so it applies
    
    * patches/dev300/vbahelper-optionality-fix.diff:

diff --git a/patches/dev300/vbahelper-optionality-fix.diff b/patches/dev300/vbahelper-optionality-fix.diff
index 06bf319..2e3e826 100644
--- a/patches/dev300/vbahelper-optionality-fix.diff
+++ b/patches/dev300/vbahelper-optionality-fix.diff
@@ -31,21 +31,6 @@ diff --git sw/util/makefile.mk sw/util/makefile.mk
 index b4e1127..ddd3ced 100644
 --- sw/util/makefile.mk
 +++ sw/util/makefile.mk
-@@ -126,8 +126,12 @@ SHL1STDLIBS+= \
-     $(SALLIB) \
-     $(SALHELPERLIB) \
-     $(ICUUCLIB) \
--    $(I18NUTILLIB)	\
--		        $(VBAHELPERLIB) \
-+	$(I18NUTILLIB)
-+.IF "$(ENABLE_VBA)" == "YES"
-+SHL1STDLIBS+= \
-+		        $(VBAHELPERLIB)
-+.ENDIF # "$(ENABLE_VBA)" == "YES" 
-+SHL1STDLIBS+= \
-     $(AVMEDIALIB)
- 
- .IF "$(GUI)"=="WNT"
 @@ -345,6 +349,7 @@ SHL4STDLIBS= \
      $(BASICLIB)     \
      $(I18NUTILLIB)