#87052# added reserved pointer for future use

3 files changed, 21 insertions, 16 deletions

diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx
index c0b659182281..da9c503a7beb 100644
--- a/cppuhelper/inc/cppuhelper/propshlp.hxx
+++ b/cppuhelper/inc/cppuhelper/propshlp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propshlp.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: dbo $ $Date: 2001-06-07 11:11:28 $
+ *  last change: $Author: dbo $ $Date: 2001-06-11 08:10:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -226,11 +226,18 @@ public:
      */
     virtual sal_Int32 SAL_CALL fillHandles(
         /*out*/sal_Int32 * pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPropNames );
+
+protected:
+    /** reserved for future use. do not use.
+     */
+    void * m_pReserved;
+
 private:
     void init( sal_Bool bSorted ) SAL_THROW( () );
 
     /** The sequence generstet from the pProperties array. */
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aInfos;
+
     /**
        True, If the values of the handles are sorted in the same way as the names
        and the highest handle value is getCount() -1, otherwise false.
@@ -566,6 +573,11 @@ protected:
        the Uik XVetoableChangeListener::getSmartUik().
      */
     OMultiTypeInterfaceContainerHelperInt32 aVetoableLC;
+
+    /** reserved for future use. do not use.
+     */
+    void * m_pReserved;
+
 private:
     OPropertySetHelper( const OPropertySetHelper & ) SAL_THROW( () );
     OPropertySetHelper &    operator = ( const OPropertySetHelper & ) SAL_THROW( () );
diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx
index a9ad44902414..c7bb291411e8 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: weak.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-05-28 13:22:46 $
+ *  last change: $Author: dbo $ $Date: 2001-06-11 08:10:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -112,6 +112,11 @@ protected:
        object does not affect the
      */
     OWeakConnectionPoint * m_pWeakConnectionPoint;
+
+    /** reserved for future use. do not use.
+     */
+    void * m_pReserved;
+
 public:
     // these are here to force memory de/allocation to sal lib.
     inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () )
diff --git a/cppuhelper/source/msvc_win32_intel.map b/cppuhelper/source/msvc_win32_intel.map
index 8515f98de1ea..918aec5fc1d1 100644
--- a/cppuhelper/source/msvc_win32_intel.map
+++ b/cppuhelper/source/msvc_win32_intel.map
@@ -16,16 +16,10 @@ component_getDescriptionFunc
 ??_GOComponentHelper@cppu@@UAEPAXI@Z
 ??_GOWeakAggObject@cppu@@MAEPAXI@Z
 ??_GOWeakObject@cppu@@MAEPAXI@Z
-?acquire@OWeakAggObject@cppu@@WM@AAXXZ
 ?addEventListener@OComponentHelper@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z
 ?dispose@OComponentHelper@cppu@@UAAXXZ
 ?disposing@OComponentHelper@cppu@@MAAXXZ
-?queryInterface@OWeakAggObject@cppu@@WM@AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z
 ?release@OComponentHelper@cppu@@UAAXXZ
-?release@OComponentHelper@cppu@@WBE@AAXXZ
-?release@OComponentHelper@cppu@@WBI@AAXXZ
-?release@OComponentHelper@cppu@@WM@AAXXZ
-?release@OWeakAggObject@cppu@@WM@AAXXZ
 ?removeEventListener@OComponentHelper@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z
 ??1OTypeCollection@cppu@@QAE@XZ
 ?createFactoryProxy@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABV23456@@Z
@@ -160,15 +154,9 @@ component_getDescriptionFunc
 ?createSingleFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABVOUString@rtl@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@0@ZABV?$Sequence@VOUString@rtl@@@3456@PAU_rtl_ModuleCount@@@Z
 ?defaultBootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@XZ
 ?acquire@OComponentHelper@cppu@@UAAXXZ
-?acquire@OComponentHelper@cppu@@WBE@AAXXZ
-?acquire@OComponentHelper@cppu@@WBI@AAXXZ
-?acquire@OComponentHelper@cppu@@WM@AAXXZ
 ?getTypes@OComponentHelper@cppu@@UAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ
 ?queryAggregation@OComponentHelper@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z
 ?queryInterface@OComponentHelper@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z
-?queryInterface@OComponentHelper@cppu@@WBE@AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z
-?queryInterface@OComponentHelper@cppu@@WBI@AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z
-?queryInterface@OComponentHelper@cppu@@WM@AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z
 ?removeListener@?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@cppu@@QAEXABVType@uno@star@sun@com@@ABV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z
 ??0OMultiTypeInterfaceContainerHelper@cppu@@QAE@AAVMutex@osl@@@Z
 ??0OMultiTypeInterfaceContainerHelperInt32@cppu@@QAE@AAVMutex@osl@@@Z