diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
| commit | 628edf8ff148f7d29a1213769e13e98baccd8015 (patch) | |
| tree | ac6c5c1b6ddc7885c78016dcda8c0e606820dc40 /sdext | |
| parent | a20397473560338997571d48d882fd8cb9ebb4a8 (diff) | |
| parent | 6c9b78ddeb8a0189f8f41fe07d5f687d7f90225d (diff) | |
CWS-TOOLING: integrate CWS sb118
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/minimizer/exports.map | 9 | ||||
| -rw-r--r-- | sdext/source/minimizer/makefile.mk | 2 | ||||
| -rw-r--r-- | sdext/source/pdfimport/exports.map | 9 | ||||
| -rw-r--r-- | sdext/source/pdfimport/makefile.mk | 2 | ||||
| -rwxr-xr-x | sdext/source/pdfimport/test/export.map | 2 | ||||
| -rwxr-xr-x | sdext/source/pdfimport/test/makefile.mk | 2 | ||||
| -rw-r--r-- | sdext/source/presenter/exports.map | 9 | ||||
| -rw-r--r-- | sdext/source/presenter/makefile.mk | 2 |
8 files changed, 6 insertions, 31 deletions
diff --git a/sdext/source/minimizer/exports.map b/sdext/source/minimizer/exports.map deleted file mode 100644 index c673092ae700..000000000000 --- a/sdext/source/minimizer/exports.map +++ /dev/null @@ -1,9 +0,0 @@ -PDFFILTER_1_0 { - global: - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -};
\ No newline at end of file diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk index 18c7a0a435c5..5b14f7215fd0 100644 --- a/sdext/source/minimizer/makefile.mk +++ b/sdext/source/minimizer/makefile.mk @@ -77,7 +77,7 @@ SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP= exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1RPATH= OXT DEF1NAME= $(SHL1TARGET) diff --git a/sdext/source/pdfimport/exports.map b/sdext/source/pdfimport/exports.map deleted file mode 100644 index c673092ae700..000000000000 --- a/sdext/source/pdfimport/exports.map +++ /dev/null @@ -1,9 +0,0 @@ -PDFFILTER_1_0 { - global: - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -};
\ No newline at end of file diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk index 318ff6bfda1f..436345216b55 100644 --- a/sdext/source/pdfimport/makefile.mk +++ b/sdext/source/pdfimport/makefile.mk @@ -90,7 +90,7 @@ SHL1STDLIBS=\ SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP=exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1RPATH=OXT DEF1NAME=$(SHL1TARGET) diff --git a/sdext/source/pdfimport/test/export.map b/sdext/source/pdfimport/test/export.map index 709047ae63e5..7321bbca16ad 100755 --- a/sdext/source/pdfimport/test/export.map +++ b/sdext/source/pdfimport/test/export.map @@ -25,7 +25,7 @@ # #************************************************************************* -UDK_3.1 { +UDK_3_0_0 { global: registerAllTestFunction; diff --git a/sdext/source/pdfimport/test/makefile.mk b/sdext/source/pdfimport/test/makefile.mk index 3d525d2e38b4..d0b05912d22e 100755 --- a/sdext/source/pdfimport/test/makefile.mk +++ b/sdext/source/pdfimport/test/makefile.mk @@ -42,6 +42,8 @@ ENABLE_EXCEPTIONS=TRUE @echo "PDF Import extension disabled." .ENDIF +CFLAGSCXX += $(CPPUNIT_CFLAGS) + .IF "$(SYSTEM_ZLIB)" == "YES" CFLAGS+=-DSYSTEM_ZLIB .ENDIF diff --git a/sdext/source/presenter/exports.map b/sdext/source/presenter/exports.map deleted file mode 100644 index c673092ae700..000000000000 --- a/sdext/source/presenter/exports.map +++ /dev/null @@ -1,9 +0,0 @@ -PDFFILTER_1_0 { - global: - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -};
\ No newline at end of file diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index c6dbe7185ec9..b0bedecd4f8b 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -103,7 +103,7 @@ SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP= exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1RPATH= OXT DEF1NAME= $(SHL1TARGET) |