slidecopy: merged latest DEV300.m80 changes

18 files changed, 32 insertions, 49 deletions

diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index 922d47096e6b..64a67a05b343 100644..100755
--- 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>
@@ -30,8 +30,8 @@
     </display-name>
 
     <icon>
-      <default xlink:href="bitmaps/em47.png" />
-      <high-contrast xlink:href="bitmaps/em47_hc.png" />
+      <default xlink:href="bitmaps/extension_32.png" />
+      <high-contrast xlink:href="bitmaps/extension_32_h.png" />
     </icon>
 
 </description>
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
deleted file mode 100644
index a018f1710ea5..000000000000
--- a/sdext/source/minimizer/images/em47.png
+++ /dev/null
diff --git a/sdext/source/minimizer/images/em47_hc.png b/sdext/source/minimizer/images/em47_hc.png
deleted file mode 100644
index 418cd1479298..000000000000
--- a/sdext/source/minimizer/images/em47_hc.png
+++ /dev/null
diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk
index 18c7a0a435c5..8a3a385fc8f2 100644..100755
--- 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)
 
@@ -103,8 +103,8 @@ COMPONENT_BITMAPS= \
     $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80_h.png
 
 COMPONENT_IMAGES=\
-    $(EXTENSIONDIR)$/bitmaps$/em47.png \
-    $(EXTENSIONDIR)$/bitmaps$/em47_hc.png
+    $(EXTENSIONDIR)$/bitmaps$/extension_32.png \
+    $(EXTENSIONDIR)$/bitmaps$/extension_32_h.png
 
 # rather freestyle or common to all?
 COMPONENT_HELP= \
@@ -129,7 +129,7 @@ $(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
-$(COMPONENT_IMAGES) : images$/$$(@:f)
+$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml
index c2d36bd58be1..ec30133996c8 100644..100755
--- 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>
@@ -29,8 +29,8 @@
     </display-name>
 
     <icon>
-      <default xlink:href="images/pdfiext.png" />
-      <high-contrast xlink:href="images/pdfiext_hc.png" />
+      <default xlink:href="images/extension_32.png" />
+      <high-contrast xlink:href="images/extension_32_h.png" />
     </icon>
 
 </description>
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
deleted file mode 100644
index a018f1710ea5..000000000000
--- a/sdext/source/pdfimport/images/pdfiext.png
+++ /dev/null
diff --git a/sdext/source/pdfimport/images/pdfiext_hc.png b/sdext/source/pdfimport/images/pdfiext_hc.png
deleted file mode 100644
index 418cd1479298..000000000000
--- a/sdext/source/pdfimport/images/pdfiext_hc.png
+++ /dev/null
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index 318ff6bfda1f..8a7f7de20e18 100644..100755
--- 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)
@@ -125,8 +125,8 @@ COMPONENT_LIBRARIES= \
     $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
 
 COMPONENT_IMAGES=\
-    $(EXTENSIONDIR)$/images$/pdfiext.png \
-    $(EXTENSIONDIR)$/images$/pdfiext_hc.png
+    $(EXTENSIONDIR)$/images$/extension_32.png \
+    $(EXTENSIONDIR)$/images$/extension_32_h.png
 
 EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_HELP) $(COMPONENT_IMAGES) makefile.mk
 
@@ -148,7 +148,7 @@ $(COMPONENT_HELP) : help$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
-$(COMPONENT_IMAGES) : images$/$$(@:f)
+$(COMPONENT_IMAGES) :  $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 .ENDIF # L10N_framework
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
deleted file mode 100644
index a018f1710ea5..000000000000
--- a/sdext/source/presenter/bitmaps/em47.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/em47_hc.png b/sdext/source/presenter/bitmaps/em47_hc.png
deleted file mode 100644
index 418cd1479298..000000000000
--- a/sdext/source/presenter/bitmaps/em47_hc.png
+++ /dev/null
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index 8a56838ad263..ede52f0bf1bb 100644..100755
--- 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>
@@ -30,8 +30,8 @@
   </display-name>
 
   <icon>
-    <default xlink:href="bitmaps/em47.png" />
-    <high-contrast xlink:href="bitmaps/em47_hc.png" />
+    <default xlink:href="bitmaps/extension_32.png" />
+    <high-contrast xlink:href="bitmaps/extension_32_h.png" />
   </icon>
 
 </description>
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..08a3470fc24d 100644..100755
--- 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)
 
@@ -231,9 +231,11 @@ COMPONENT_BITMAPS=												\
                                                                 \
     $(ZIP1DIR)$/bitmaps$/LabelMouseOverLeft.png					\
     $(ZIP1DIR)$/bitmaps$/LabelMouseOverCenter.png				\
-    $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png                \
-    $(ZIP1DIR)$/bitmaps$/em47.png                               \
-    $(ZIP1DIR)$/bitmaps$/em47_hc.png
+    $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png
+
+COMPONENT_IMAGES=\
+    $(ZIP1DIR)$/bitmaps$/extension_32.png \
+    $(ZIP1DIR)$/bitmaps$/extension_32_h.png
 
 COMPONENT_MANIFEST= 							\
     $(ZIP1DIR)$/META-INF$/manifest.xml
@@ -257,6 +259,7 @@ ZIP1DEPS=					\
     $(COMPONENT_MANIFEST)	\
     $(COMPONENT_FILES)		\
     $(COMPONENT_BITMAPS)	\
+    $(COMPONENT_IMAGES)    	\
     $(COMPONENT_LIBRARY)	\
     $(COMPONENT_HELP)
 #	$(COMPONENT_MERGED_XCU) \
@@ -290,6 +293,10 @@ $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
     @-$(MKDIRHIER) $(@:d)
     +$(COPY) $< $@
 
+$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
+
 $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
     @-$(MKDIRHIER) $(@:d)
     +$(COPY) $< $@