diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-05-21 10:11:51 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-05-21 10:11:51 +0200 |
| commit | 87523ea7109b044939ff51bb481aad00171c2e3a (patch) | |
| tree | f4451a2a1db327b942d0f18df9211d474c061f97 /vbahelper/util | |
| parent | cff39a2614347c6db8ae1a214947d90a3ea57000 (diff) | |
| parent | 2f4bff8415b28e36346872157104eb71322a743a (diff) | |
npower13_objectmodules: rebase and merge with DEV300_m78
Diffstat (limited to 'vbahelper/util')
| -rw-r--r-- | vbahelper/util/makefile.mk | 6 | ||||
| -rw-r--r-- | vbahelper/util/msforms.map | 9 |
2 files changed, 5 insertions, 10 deletions
diff --git a/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk index 7af48db00aff..dda4be0cbc81 100644 --- a/vbahelper/util/makefile.mk +++ b/vbahelper/util/makefile.mk @@ -34,6 +34,10 @@ TARGET=vbahelper .INCLUDE : settings.mk +.IF "$(ENABLE_VBA)" == "NO" +dummy: + @echo "Nothing to build" +.ENDIF TARGET_HELPER=vbahelper @@ -73,7 +77,7 @@ TARGET_MSFORMS=msforms SHL2TARGET=$(TARGET_MSFORMS)$(DLLPOSTFIX).uno SHL2IMPLIB= i$(TARGET_MSFORMS) -SHL2VERSIONMAP=$(TARGET_MSFORMS).map +SHL2VERSIONMAP=$(SOLARENV)/src/component.map SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME=$(SHL2TARGET) SHL2STDLIBS= \ diff --git a/vbahelper/util/msforms.map b/vbahelper/util/msforms.map deleted file mode 100644 index 737cddbfe3df..000000000000 --- a/vbahelper/util/msforms.map +++ /dev/null @@ -1,9 +0,0 @@ -OOO_1.1 { - global: - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -}; |