diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 10:51:50 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:51:50 +0100 |
| commit | 6db6a43ddc5a66f41f109b7995fd83adb5d35411 (patch) | |
| tree | be01c36438a39fdebd43608355671d2e6d120108 /vbahelper/util | |
| parent | 20658054d8bd6380b4b175b552ccc1480c49d01c (diff) | |
| parent | d1a9ad8f4dc25817cea279262286cdfb421fe891 (diff) | |
Merge branch 'vba' fix conflics, trailing ws & tab issues
also removed some old headers ( which I need to add new ones for )
Conflicts:
basic/source/classes/sbunoobj.cxx
basic/source/classes/sbxmod.cxx
xmloff/inc/xmlnmspe.hxx
xmloff/inc/xmloff/xmltoken.hxx
xmlscript/inc/xmlscript/xmldlg_imexp.hxx
Diffstat (limited to 'vbahelper/util')
| -rw-r--r-- | vbahelper/util/makefile.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk index dda4be0cbc81..a09ffa594483 100644 --- a/vbahelper/util/makefile.mk +++ b/vbahelper/util/makefile.mk @@ -95,6 +95,7 @@ SHL2STDLIBS= \ $(VCLLIB) \ $(TKLIB) \ $(BASICLIB) \ + $(SVXMSFILTERLIB) \ SHL2DEPN=$(SHL1TARGETN) SHL2LIBS=$(SLB)$/$(TARGET_MSFORMS).lib |