summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/minimizer/description.xml2
-rw-r--r--sdext/source/minimizer/exports.map9
-rw-r--r--sdext/source/minimizer/images/em47.pngbin5448 -> 5483 bytes
-rw-r--r--sdext/source/minimizer/images/em47_hc.pngbin3182 -> 3176 bytes
-rw-r--r--sdext/source/minimizer/makefile.mk2
-rw-r--r--sdext/source/pdfimport/config/description.xml2
-rw-r--r--sdext/source/pdfimport/exports.map9
-rw-r--r--sdext/source/pdfimport/images/pdfiext.pngbin5448 -> 5483 bytes
-rw-r--r--sdext/source/pdfimport/images/pdfiext_hc.pngbin3182 -> 3176 bytes
-rw-r--r--sdext/source/pdfimport/makefile.mk2
-rwxr-xr-xsdext/source/pdfimport/test/export.map2
-rwxr-xr-xsdext/source/pdfimport/test/makefile.mk2
-rw-r--r--sdext/source/presenter/PresenterGeometryHelper.hxx1
-rw-r--r--sdext/source/presenter/bitmaps/em47.pngbin5448 -> 5483 bytes
-rw-r--r--sdext/source/presenter/bitmaps/em47_hc.pngbin3182 -> 3176 bytes
-rw-r--r--sdext/source/presenter/description.xml2
-rw-r--r--sdext/source/presenter/exports.map9
-rw-r--r--sdext/source/presenter/makefile.mk2
18 files changed, 10 insertions, 34 deletions
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index 922d47096e6b..3d2ec9c98bd7 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -22,7 +22,7 @@
<platform value="UPDATED_SUPPORTED_PLATFORM"/>
<publisher>
- <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name>
+ <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
</publisher>
<display-name>
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/images/em47.png b/sdext/source/minimizer/images/em47.png
index a018f1710ea5..cf3fe5f0d598 100644
--- a/sdext/source/minimizer/images/em47.png
+++ b/sdext/source/minimizer/images/em47.png
Binary files differ
diff --git a/sdext/source/minimizer/images/em47_hc.png b/sdext/source/minimizer/images/em47_hc.png
index 418cd1479298..535a6bfdff4f 100644
--- a/sdext/source/minimizer/images/em47_hc.png
+++ b/sdext/source/minimizer/images/em47_hc.png
Binary files differ
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/config/description.xml b/sdext/source/pdfimport/config/description.xml
index c2d36bd58be1..a49f81ff2c42 100644
--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -21,7 +21,7 @@
<platform value="UPDATED_SUPPORTED_PLATFORM" />
<publisher>
- <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name>
+ <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
</publisher>
<display-name>
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/images/pdfiext.png b/sdext/source/pdfimport/images/pdfiext.png
index a018f1710ea5..cf3fe5f0d598 100644
--- a/sdext/source/pdfimport/images/pdfiext.png
+++ b/sdext/source/pdfimport/images/pdfiext.png
Binary files differ
diff --git a/sdext/source/pdfimport/images/pdfiext_hc.png b/sdext/source/pdfimport/images/pdfiext_hc.png
index 418cd1479298..535a6bfdff4f 100644
--- a/sdext/source/pdfimport/images/pdfiext_hc.png
+++ b/sdext/source/pdfimport/images/pdfiext_hc.png
Binary files differ
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/PresenterGeometryHelper.hxx b/sdext/source/presenter/PresenterGeometryHelper.hxx
index b920b5da778b..15f70f7647ec 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.hxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.hxx
@@ -33,6 +33,7 @@
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/rendering/XGraphicDevice.hpp>
#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
+#include <com/sun/star/geometry/RealRectangle2D.hpp>
#include <vector>
namespace css = ::com::sun::star;
diff --git a/sdext/source/presenter/bitmaps/em47.png b/sdext/source/presenter/bitmaps/em47.png
index a018f1710ea5..cf3fe5f0d598 100644
--- a/sdext/source/presenter/bitmaps/em47.png
+++ b/sdext/source/presenter/bitmaps/em47.png
Binary files differ
diff --git a/sdext/source/presenter/bitmaps/em47_hc.png b/sdext/source/presenter/bitmaps/em47_hc.png
index 418cd1479298..535a6bfdff4f 100644
--- a/sdext/source/presenter/bitmaps/em47_hc.png
+++ b/sdext/source/presenter/bitmaps/em47_hc.png
Binary files differ
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index 8a56838ad263..3919bef973a4 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -22,7 +22,7 @@
<platform value="UPDATED_PLATFORM" />
<publisher>
- <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name>
+ <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
</publisher>
<display-name>
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)