#91945# limiting exports

6 files changed, 20 insertions, 33 deletions

diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
index 2453b02b86a0..fdc3eb07c74f 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cpp2uno.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: dbo $ $Date: 2001-07-03 16:11:07 $
+ *  last change: $Author: dbo $ $Date: 2001-09-06 11:59:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -606,7 +606,7 @@ void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_Interface
 }
 
 //==================================================================================================
-extern "C" void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
     XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
 {
     static MediateClassData * s_pMediateClassData = 0;
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk b/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk
index af33e0a6fc00..0c307f8c8e74 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: hjs $ $Date: 2001-08-14 11:01:48 $
+#   last change: $Author: dbo $ $Date: 2001-09-06 11:59:03 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -90,6 +90,7 @@ SHL1TARGET= $(TARGET)
 
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 SHL1IMPLIB= i$(TARGET)
+SHL1VERSIONMAP=..$/..$/bridge_exports.map
 
 SHL1OBJS= \
     $(SLO)$/cpp2uno.obj		\
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
index d77b5d0b9980..d41e8ee0d7c0 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: uno2cpp.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: pl $ $Date: 2001-07-05 14:38:52 $
+ *  last change: $Author: dbo $ $Date: 2001-09-06 11:59:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -323,7 +323,7 @@ static inline void cpp_call(
 }
 
 //==================================================================================================
-extern "C" void SAL_CALL cppu_unoInterfaceProxy_dispatch(
+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
     uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
     void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
 {
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index 030b4b349b49..641501fbf2c9 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cpp2uno.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: dbo $ $Date: 2001-08-01 10:09:58 $
+ *  last change: $Author: dbo $ $Date: 2001-09-06 11:59:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -543,7 +543,7 @@ const void * MediateVtables::getMediateVtable( sal_Int32 nSize ) throw ()
 }
 
 //==================================================================================================
-extern "C" void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
+void SAL_CALL cppu_cppInterfaceProxy_patchVtable(
     XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw ()
 {
     static MediateVtables * s_pMediateVtables = 0;
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk b/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
index 28d10a159e79..eac887f9e3f0 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
+++ b/bridges/source/cpp_uno/msvc_win32_intel/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: dbo $ $Date: 2001-08-01 11:23:13 $
+#   last change: $Author: dbo $ $Date: 2001-09-06 11:59:04 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,9 +76,6 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Files --------------------------------------------------------
 .IF "$(COM)" == "MSC"
 
-# cant CFLAGS += /Ox here, because NOOPTFILES wont work then
-# product build does this anyway
-
 .IF "$(debug)" != ""
 CFLAGS += /Ob0
 .ENDIF
@@ -93,14 +90,14 @@ SLOFILES= \
     $(SLO)$/cpp2uno.obj		\
     $(SLO)$/uno2cpp.obj		\
     $(SLO)$/except.obj
-
 NOOPTFILES= \
     $(SLO)$/except.obj
 
 SHL1TARGET= $(TARGET)
 
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB= i$(TARGET)
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+SHL1IMPLIB=i$(TARGET)
+SHL1VERSIONMAP=..$/..$/bridge_exports.map
 
 SHL1OBJS= \
     $(SLO)$/cpp2uno.obj		\
@@ -115,16 +112,5 @@ SHL1STDLIBS= \
 
 .INCLUDE :  target.mk
 
-$(MISC)$/$(SHL1TARGET).def: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo LIBRARY     $(SHL1TARGET)                                  >$@
-    @echo DESCRIPTION 'MS Visual C++ bridge for UNO'                >>$@
-    @echo DATA        READ WRITE NONSHARED                          >>$@
-    @echo EXPORTS                                                   >>$@
-    @echo uno_initEnvironment @3                                    >>$@
-    @echo uno_ext_getMapping @4					    >>$@
-    @echo component_canUnload @5				    >>$@
-
 .ENDIF
 
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
index 421d4187002d..aea90118f7b2 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: uno2cpp.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dbo $ $Date: 2001-08-01 10:09:58 $
+ *  last change: $Author: dbo $ $Date: 2001-09-06 11:59:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -373,7 +373,7 @@ inline static void cpp_call(
 }
 
 //==================================================================================================
-extern "C" void SAL_CALL cppu_unoInterfaceProxy_dispatch(
+void SAL_CALL cppu_unoInterfaceProxy_dispatch(
     uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
     void * pReturn, void * pArgs[], uno_Any ** ppException ) throw ()
 {