openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1847937 - in /openoffice/trunk/main/cppuhelper: inc/cppuhelper/ prj/ source/
Date Sun, 02 Dec 2018 05:57:21 GMT
Author: damjan
Date: Sun Dec  2 05:57:21 2018
New Revision: 1847937

URL: http://svn.apache.org/viewvc?rev=1847937&view=rev
Log:
Revert the main/cppuhelper symbol visibility changes
in 1847839 and 1847840 for now, as they break the Windows build in the most
mysterious ways...

Patch by: me


Added:
    openoffice/trunk/main/cppuhelper/source/msvc_win32_intel.map
Modified:
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/access_control.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/bootstrap.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/compbase_ex.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/component.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/component_context.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/exc_hlp.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/factory.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/implbase.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/implbase_ex.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/implementationentry.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/interfacecontainer.h
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/propshlp.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/servicefactory.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/shlib.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/stdidlclass.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/typeprovider.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/unourl.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/weak.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/weakagg.hxx
    openoffice/trunk/main/cppuhelper/inc/cppuhelper/weakref.hxx
    openoffice/trunk/main/cppuhelper/prj/d.lst
    openoffice/trunk/main/cppuhelper/source/makefile.mk
    openoffice/trunk/main/cppuhelper/source/servicefactory.cxx

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/access_control.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/access_control.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/access_control.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/access_control.hxx Sun Dec  2 05:57:21 2018
@@ -26,15 +26,13 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/security/XAccessController.hpp>
 
-#include "cppuhelper/cppuhelperdllapi.h"
-
 
 namespace cppu
 {
 
 /** Helper class retriving access controller singleton from component context.
 */
-class CPPUHELPER_DLLPUBLIC AccessControl
+class AccessControl
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::security::XAccessController > m_xController;
     

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/bootstrap.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/bootstrap.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/bootstrap.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/bootstrap.hxx Sun Dec  2 05:57:21 2018
@@ -29,8 +29,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 
-#include "cppuhelper/cppuhelperdllapi.h"
-
 namespace com { namespace sun { namespace star {
     namespace container { class XHierarchicalNameAccess; }
     namespace registry { class XSimpleRegistry; }
@@ -45,7 +43,6 @@ namespace cppu
     @rBootstrapPath optional bootstrap path for initial components
     @return simple registry service instance
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry >
 SAL_CALL createSimpleRegistry(
 	const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() )
@@ -56,7 +53,6 @@ SAL_CALL createSimpleRegistry(
     @rBootstrapPath optional bootstrap path for initial components
     @return nested registry service instance
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry >
 SAL_CALL createNestedRegistry(
 	const ::rtl::OUString & rBootstrapPath = ::rtl::OUString() )
@@ -67,7 +63,6 @@ SAL_CALL createNestedRegistry(
     @param xTDMgr manager instance
     @return true, if successfully registered
 */
-CPPUHELPER_DLLPUBLIC
 sal_Bool SAL_CALL installTypeDescriptionManager(
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > const & xTDMgr )
     SAL_THROW( () );
@@ -83,7 +78,6 @@ sal_Bool SAL_CALL installTypeDescription
     @param rBootstrapPath optional bootstrap path for initial components
     @return component context
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL
 bootstrap_InitialComponentContext(
     ::com::sun::star::uno::Reference< ::com::sun::star::registry::XSimpleRegistry > const & xRegistry,
@@ -110,7 +104,6 @@ bootstrap_InitialComponentContext(
     
     @return component context
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL
 defaultBootstrap_InitialComponentContext() SAL_THROW( (::com::sun::star::uno::Exception) );
 
@@ -135,7 +128,6 @@ defaultBootstrap_InitialComponentContext
     @param iniFile ini filename to get bootstrap variables
     @return component context
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > SAL_CALL
 defaultBootstrap_InitialComponentContext(const ::rtl::OUString & iniFile) SAL_THROW( (::com::sun::star::uno::Exception) );
 
@@ -144,7 +136,7 @@ defaultBootstrap_InitialComponentContext
  *
  * @since UDK 3.2.0
  */
-class CPPUHELPER_DLLPUBLIC BootstrapException
+class BootstrapException
 {
 public:
     /**
@@ -197,7 +189,6 @@ private:
  *
  * @since UDK 3.2.0
  */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > 
 SAL_CALL bootstrap();
 
@@ -220,7 +211,6 @@ SAL_CALL bootstrap();
  *
  * @since UDK 3.2.8
  */
-CPPUHELPER_DLLPUBLIC
 ::rtl::OUString
 SAL_CALL bootstrap_expandUri(::rtl::OUString const & uri);
 

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/compbase_ex.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/compbase_ex.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/compbase_ex.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/compbase_ex.hxx Sun Dec  2 05:57:21 2018
@@ -27,7 +27,7 @@
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
-#include "cppuhelper/cppuhelperdllapi.h"
+
 
 namespace cppu
 {
@@ -36,7 +36,7 @@ namespace cppu
     ::com::sun::star::lang::XComponent.
     @internal
 */
-class CPPUHELPER_DLLPUBLIC SAL_NO_VTABLE WeakComponentImplHelperBase
+class SAL_NO_VTABLE WeakComponentImplHelperBase
 	: public ::cppu::OWeakObject
 	, public ::com::sun::star::lang::XComponent
 {
@@ -90,7 +90,7 @@ public:
     ::com::sun::star::lang::XComponent.
     @internal
 */
-class CPPUHELPER_DLLPUBLIC SAL_NO_VTABLE WeakAggComponentImplHelperBase
+class SAL_NO_VTABLE WeakAggComponentImplHelperBase
     : public ::cppu::OWeakAggObject
     , public ::com::sun::star::lang::XComponent
 {
@@ -138,7 +138,6 @@ public:
 /** WeakComponentImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Any SAL_CALL WeakComponentImplHelper_query(
     ::com::sun::star::uno::Type const & rType,
     class_data * cd,
@@ -148,7 +147,6 @@ CPPUHELPER_DLLPUBLIC
 /** WeakComponentImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakComponentImplHelper_getTypes(
     class_data * cd )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
@@ -156,7 +154,6 @@ CPPUHELPER_DLLPUBLIC
 /** WeakAggComponentImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Any SAL_CALL WeakAggComponentImplHelper_queryAgg(
     ::com::sun::star::uno::Type const & rType,
     class_data * cd,
@@ -166,7 +163,6 @@ CPPUHELPER_DLLPUBLIC
 /** WeakAggComponentImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakAggComponentImplHelper_getTypes(
     class_data * cd )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/component.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/component.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/component.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/component.hxx Sun Dec  2 05:57:21 2018
@@ -34,7 +34,6 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 
-#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace cppu
 {    
@@ -48,7 +47,7 @@ namespace cppu
     The life-cycle of the passed mutex reference has to be longer than objects of this class.
     @deprecated
 */
-class CPPUHELPER_DLLPUBLIC OComponentHelper
+class OComponentHelper
     : public ::cppu::OWeakAggObject
     , public ::com::sun::star::lang::XTypeProvider
     , public ::com::sun::star::lang::XComponent

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/component_context.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/component_context.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/component_context.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/component_context.hxx Sun Dec  2 05:57:21 2018
@@ -26,7 +26,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 
-#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace cppu
 {
@@ -81,7 +80,6 @@ struct ContextEntry_Init
     @param xDelegate delegation to further context, if value was not found
     @return new context object
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
 SAL_CALL createComponentContext(
     ContextEntry_Init const * pEntries, sal_Int32 nEntries,

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h Sun Dec  2 05:57:21 2018
@@ -1,37 +0,0 @@
-/**************************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-#ifndef INCLUDED_CPPUHELPERDLLAPI_H
-#define INCLUDED_CPPUHELPERDLLAPI_H
-                                                                                                                             
-#include "sal/types.h"
-
-#if defined(CPPUHELPER_DLLIMPLEMENTATION)
-#define CPPUHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
-#else
-#define CPPUHELPER_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
-#endif
-#define CPPUHELPER_DLLPRIVATE SAL_DLLPRIVATE
-                                                                                    
-#endif /* INCLUDED_CPPUHELPERDLLAPI_H */
-

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/exc_hlp.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/exc_hlp.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/exc_hlp.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/exc_hlp.hxx Sun Dec  2 05:57:21 2018
@@ -26,8 +26,6 @@
 
 #include <com/sun/star/uno/Any.hxx>
 
-#include "cppuhelper/cppuhelperdllapi.h"
-
 namespace cppu
 {    
 
@@ -38,7 +36,7 @@ namespace cppu
     @param rExc
            exception to be thrown.
 */
-CPPUHELPER_DLLPUBLIC void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc )
+void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc )
 	SAL_THROW( (::com::sun::star::uno::Exception) );
 
 /** Use this function to get the dynamic type of a caught C++-UNO exception;
@@ -88,7 +86,7 @@ CPPUHELPER_DLLPUBLIC void SAL_CALL throw
               development, because the whole OOo code base is compiled using the
               same C++ compiler (and linking against one runtime library).
 */
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL getCaughtException();
+::com::sun::star::uno::Any SAL_CALL getCaughtException();
 
 }
 

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/factory.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/factory.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/factory.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/factory.hxx Sun Dec  2 05:57:21 2018
@@ -33,8 +33,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
-#include "cppuhelper/cppuhelperdllapi.h"
-
 //##################################################################################################
 
 #define COMPONENT_GETENV			"component_getImplementationEnvironment"
@@ -140,7 +138,6 @@ typedef ::com::sun::star::uno::Reference
     @param rServiceNames supported services
 	@param pModCount for future extension (library unloading concept).
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >
 SAL_CALL createSingleComponentFactory(
 	ComponentFactoryFunc fptr,
@@ -158,7 +155,6 @@ SAL_CALL createSingleComponentFactory(
     
     @see createSingleComponentFactory
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > SAL_CALL
 createOneInstanceComponentFactory(
 	ComponentFactoryFunc fptr,
@@ -189,7 +185,6 @@ typedef ::com::sun::star::uno::Reference
     @see createOneInstanceFactory
     @deprecated
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
 createSingleFactory(
 	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
@@ -213,7 +208,6 @@ createSingleFactory(
     @see createSingleFactory
     @deprecated
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
 createFactoryProxy(
 	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
@@ -233,7 +227,6 @@ createFactoryProxy(
     @see createSingleFactory
     @deprecated
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
 createOneInstanceFactory(
 	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
@@ -252,7 +245,6 @@ createOneInstanceFactory(
     XSingleServiceFactory and XComponent.
     @deprecated
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createSingleRegistryFactory(
 	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
 	const ::rtl::OUString & rImplementationName, 
@@ -271,7 +263,6 @@ CPPUHELPER_DLLPUBLIC
     @see createSingleRegistryFactory
     @deprecated
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createOneInstanceRegistryFactory(
 	const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
 	const ::rtl::OUString & rComponentName, 

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/implbase.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/implbase.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/implbase.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/implbase.hxx Sun Dec  2 05:57:21 2018
@@ -31,8 +31,6 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include "cppuhelper/cppuhelperdllapi.h"
-
 /* This header should not be used anymore.
    @deprecated
 */
@@ -57,7 +55,7 @@ struct Type_Offset
     Not for plublic use.
     @internal
 */
-struct CPPUHELPER_DLLPUBLIC ClassDataBase
+struct ClassDataBase
 {
     /** determines whether the class data has been statically initialized
     */
@@ -102,7 +100,7 @@ struct CPPUHELPER_DLLPUBLIC ClassDataBas
     Not for plublic use.
     @internal
 */
-struct CPPUHELPER_DLLPUBLIC ClassData : public ClassDataBase
+struct ClassData : public ClassDataBase
 {
     /** type entries array
     */
@@ -146,7 +144,7 @@ struct CPPUHELPER_DLLPUBLIC ClassData :
     Not for public use.
     @internal
 */
-CPPUHELPER_DLLPUBLIC ::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () );
+::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () );
 }
 
 //

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/implbase_ex.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/implbase_ex.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/implbase_ex.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/implbase_ex.hxx Sun Dec  2 05:57:21 2018
@@ -27,8 +27,6 @@
 #include <cppuhelper/weakagg.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 
-#include "cppuhelper/cppuhelperdllapi.h"
-
 // Despite the fact that the following include is not used in this header, it has to remain,
 // because it is expected by files including cppuhelper/implbaseN.hxx.
 // So maybe we can omit it some time in the future...
@@ -102,7 +100,6 @@ struct class_data
 /** ImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Any SAL_CALL ImplHelper_query(
     ::com::sun::star::uno::Type const & rType,
     class_data * cd,
@@ -111,7 +108,7 @@ CPPUHELPER_DLLPUBLIC
 /** ImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL ImplHelper_queryNoXInterface(
+::com::sun::star::uno::Any SAL_CALL ImplHelper_queryNoXInterface(
     ::com::sun::star::uno::Type const & rType,
     class_data * cd,
     void * that )
@@ -119,27 +116,26 @@ CPPUHELPER_DLLPUBLIC ::com::sun::star::u
 /** ImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ImplHelper_getTypes(
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ImplHelper_getTypes(
     class_data * cd )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 /** ImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ImplInhHelper_getTypes(
+::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ImplInhHelper_getTypes(
     class_data * cd,
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > const & rAddTypes )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 /** ImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL ImplHelper_getImplementationId(
+::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL ImplHelper_getImplementationId(
     class_data * cd )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
 
 /** WeakImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Any SAL_CALL WeakImplHelper_query(
     ::com::sun::star::uno::Type const & rType,
     class_data * cd,
@@ -149,7 +145,6 @@ CPPUHELPER_DLLPUBLIC
 /** WeakImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakImplHelper_getTypes(
     class_data * cd )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );
@@ -157,7 +152,6 @@ CPPUHELPER_DLLPUBLIC
 /** WeakAggImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Any SAL_CALL WeakAggImplHelper_queryAgg(
     ::com::sun::star::uno::Type const & rType,
     class_data * cd,
@@ -167,7 +161,6 @@ CPPUHELPER_DLLPUBLIC
 /** WeakAggImplHelper
     @internal
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL WeakAggImplHelper_getTypes(
     class_data * cd )
     SAL_THROW( (::com::sun::star::uno::RuntimeException) );

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/implementationentry.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/implementationentry.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/implementationentry.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/implementationentry.hxx Sun Dec  2 05:57:21 2018
@@ -24,7 +24,6 @@
 #define _CPPUHELPER_IMPLEMENATIONENTRY_HXX_
 
 #include <cppuhelper/factory.hxx>
-#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace cppu
 {
@@ -81,7 +80,7 @@ struct ImplementationEntry
 	                       must be marked with a 0 entry in the create-function.
 	@return sal_True, if all implementations could be registered, otherwise sal_False.
  */
-CPPUHELPER_DLLPUBLIC sal_Bool component_writeInfoHelper(
+sal_Bool component_writeInfoHelper(
 	void *pServiceManager, void *pRegistryKey , const struct ImplementationEntry entries[] );
 
 /** Helper function for implementation of the component_getFactory()-function,
@@ -100,7 +99,7 @@ CPPUHELPER_DLLPUBLIC sal_Bool component_
     @return 0 if the helper failed to instantiate a factory, otherwise an acquired pointer
 	        to a factory.
  */
-CPPUHELPER_DLLPUBLIC void *component_getFactoryHelper(
+void *component_getFactoryHelper(
 	const sal_Char * pImplName,
 	void * pServiceManager,
 	void * pRegistryKey,

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/interfacecontainer.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/interfacecontainer.h?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/interfacecontainer.h (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/interfacecontainer.h Sun Dec  2 05:57:21 2018
@@ -36,8 +36,6 @@
 #include "com/sun/star/lang/DisposedException.hpp"
 #endif
 
-#include "cppuhelper/cppuhelperdllapi.h"
-
 /** */ //for docpp
 namespace cppu
 {     
@@ -62,7 +60,7 @@ class OInterfaceContainerHelper;
   
   @see OInterfaceContainerHelper
  */
-class CPPUHELPER_DLLPUBLIC OInterfaceIteratorHelper
+class OInterfaceIteratorHelper
 {
 public:
 	/**
@@ -120,7 +118,7 @@ private:
  
   @see OInterfaceIteratorHelper
  */
-class CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper
+class OInterfaceContainerHelper
 {
 public:
 	// these are here to force memory de/allocation to sal lib.
@@ -512,7 +510,7 @@ struct hashType_Impl
 /** Specialized class for key type com::sun::star::uno::Type,
     without explicit usage of STL symbols.
 */
-class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelper
+class OMultiTypeInterfaceContainerHelper
 {
 public:
 	// these are here to force memory de/allocation to sal lib.

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/propertysetmixin.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/propertysetmixin.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/propertysetmixin.hxx Sun Dec  2 05:57:21 2018
@@ -37,7 +37,6 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
 #include "sal/types.h"
-#include "cppuhelper/cppuhelperdllapi.h"
 
 /// @HTML
 
@@ -84,7 +83,7 @@ template< typename T > class PropertySet
 
    @since UDK 3.2.1
 */
-class CPPUHELPER_DLLPUBLIC PropertySetMixinImpl:
+class PropertySetMixinImpl:
     public com::sun::star::beans::XPropertySet,
     public com::sun::star::beans::XFastPropertySet,
     public com::sun::star::beans::XPropertyAccess

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/propshlp.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/propshlp.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/propshlp.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/propshlp.hxx Sun Dec  2 05:57:21 2018
@@ -27,7 +27,6 @@
 #include <rtl/alloc.h>
 
 #include <cppuhelper/interfacecontainer.hxx>
-#include "cppuhelper/cppuhelperdllapi.h"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
@@ -47,7 +46,7 @@ namespace cppu
 /**
    This interface is used by the OPropertyHelper, to access the property description.
  */
-class CPPUHELPER_DLLPUBLIC IPropertyArrayHelper
+class IPropertyArrayHelper
 {
 public:
 	// these are here to force memory de/allocation to sal lib.
@@ -114,7 +113,7 @@ public:
    You can use this helper class to map a XPropertySet-Interface to a XFast-
    or a XMultiPropertySet interface.
  */
-class CPPUHELPER_DLLPUBLIC OPropertyArrayHelper : public IPropertyArrayHelper
+class OPropertyArrayHelper : public IPropertyArrayHelper
 {
 public:
      /**
@@ -227,7 +226,7 @@ struct hashInt32_Impl
 /** Specialized class for key type sal_Int32,
     without explicit usage of STL symbols.
 */
-class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelperInt32
+class OMultiTypeInterfaceContainerHelperInt32
 {
 public:
 	// these are here to force memory de/allocation to sal lib.
@@ -344,7 +343,7 @@ public:
    the connection point interfaces. But only listeners that listen to all property changes.
   
  */
-class CPPUHELPER_DLLPUBLIC OPropertySetHelper : public ::com::sun::star::beans::XMultiPropertySet,
+class OPropertySetHelper : public ::com::sun::star::beans::XMultiPropertySet,
 						   public ::com::sun::star::beans::XFastPropertySet,
 						   public ::com::sun::star::beans::XPropertySet
 {

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/servicefactory.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/servicefactory.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/servicefactory.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/servicefactory.hxx Sun Dec  2 05:57:21 2018
@@ -28,7 +28,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 
-#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace cppu
 {
@@ -57,7 +56,6 @@ namespace cppu
     path.
     @deprecated
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL
 createRegistryServiceFactory(
 	const ::rtl::OUString & rWriteRegistryFile, 

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/shlib.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/shlib.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/shlib.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/shlib.hxx Sun Dec  2 05:57:21 2018
@@ -28,7 +28,6 @@
 #include <com/sun/star/loader/CannotActivateFactoryException.hpp>
 #include <com/sun/star/registry/CannotRegisterImplementationException.hpp>
 
-#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace cppu
 {
@@ -48,7 +47,6 @@ namespace cppu
     factory instance (::com::sun::star::lang::XSingleComponentFactory or
     ::com::sun::star::lang::XSingleComponentFactory)
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
 SAL_CALL loadSharedLibComponentFactory(
 	::rtl::OUString const & rLibName, ::rtl::OUString const & rPath,
@@ -70,7 +68,6 @@ SAL_CALL loadSharedLibComponentFactory(
 	@param xMgr service manager to be provided to the component
 	@param xKey registry key to be provided to the component
 */
-CPPUHELPER_DLLPUBLIC
 void
 SAL_CALL writeSharedLibComponentInfo(
 	::rtl::OUString const & rLibName, ::rtl::OUString const & rPath,

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/stdidlclass.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/stdidlclass.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/stdidlclass.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/stdidlclass.hxx Sun Dec  2 05:57:21 2018
@@ -26,14 +26,12 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/reflection/XIdlClass.hpp>
 
-#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace cppu {
 
 /*
   @deprecated
 */
-CPPUHELPER_DLLPUBLIC
 ::com::sun::star::reflection::XIdlClass * SAL_CALL createStandardClassWithSequence(
 	const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &rSMgr , 
 	const ::rtl::OUString & sImplementationName , 

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/typeprovider.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/typeprovider.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/typeprovider.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/typeprovider.hxx Sun Dec  2 05:57:21 2018
@@ -27,7 +27,6 @@
 #include <rtl/uuid.h>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace cppu
 {
@@ -35,7 +34,7 @@ namespace cppu
 /** Helper class to implement ::com::sun::star::lang::XTypeProvider.  Construct a static object
     of this class with your UNO object's supported types.
 */
-class CPPUHELPER_DLLPUBLIC OTypeCollection
+class OTypeCollection
 {
 	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > _aTypes;
 	
@@ -184,7 +183,7 @@ public:
 /** Helper class to implement ::com::sun::star::lang::XTypeProvider.  Construct a static object
     of this class for your UNO object's implementation id.
 */
-class CPPUHELPER_DLLPUBLIC OImplementationId
+class OImplementationId
 {
     /** @internal */
 	mutable ::com::sun::star::uno::Sequence< sal_Int8 > * _pSeq;

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/unourl.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/unourl.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/unourl.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/unourl.hxx Sun Dec  2 05:57:21 2018
@@ -26,8 +26,6 @@
 
 #include <memory>
 
-#include "cppuhelper/cppuhelperdllapi.h"
-
 namespace rtl { class OUString; }
 
 namespace cppu {
@@ -39,7 +37,7 @@ namespace cppu {
     For example, some functions take a string representing a connection or
     protocol descriptor as input, and can use this class to parse the string.
  */
-class CPPUHELPER_DLLPUBLIC UnoUrlDescriptor
+class UnoUrlDescriptor
 {
 public:
     /** @internal
@@ -136,7 +134,7 @@ private:
     invalid UTF-16 entities in the resulting output (e.g., a high surrogate not
     followed by a low surrogate) are not detected.
  */
-class CPPUHELPER_DLLPUBLIC UnoUrl
+class UnoUrl
 {
 public:
     /** Construct a UNO URL from a string representation.

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/weak.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/weak.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/weak.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/weak.hxx Sun Dec  2 05:57:21 2018
@@ -27,7 +27,6 @@
 #include <rtl/alloc.h>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include "cppuhelper/cppuhelperdllapi.h"
 #ifndef _COM_SUN_STAR_UNO_WEAK_HPP_
 #include <com/sun/star/uno/XWeak.hpp>
 #endif
@@ -47,7 +46,7 @@ class OWeakConnectionPoint;
     @derive
     Inherit from this class and delegate acquire()/ release() calls.
 */
-class CPPUHELPER_DLLPUBLIC OWeakObject : public ::com::sun::star::uno::XWeak
+class OWeakObject : public ::com::sun::star::uno::XWeak
 {
     /** @internal */
 	friend class OWeakConnectionPoint;

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/weakagg.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/weakagg.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/weakagg.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/weakagg.hxx Sun Dec  2 05:57:21 2018
@@ -24,7 +24,6 @@
 #define _CPPUHELPER_WEAKAGG_HXX_
 
 #include <cppuhelper/weak.hxx>
-#include "cppuhelper/cppuhelperdllapi.h"
 #include <com/sun/star/uno/XAggregation.hpp>
 
 
@@ -41,7 +40,7 @@ namespace cppu
     Inherit from this class and delegate acquire()/ release() calls.  Re-implement
     XAggregation::queryInterface().
 */
-class CPPUHELPER_DLLPUBLIC OWeakAggObject
+class OWeakAggObject
 	: public ::cppu::OWeakObject
 	, public ::com::sun::star::uno::XAggregation
 {

Modified: openoffice/trunk/main/cppuhelper/inc/cppuhelper/weakref.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/inc/cppuhelper/weakref.hxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/inc/cppuhelper/weakref.hxx (original)
+++ openoffice/trunk/main/cppuhelper/inc/cppuhelper/weakref.hxx Sun Dec  2 05:57:21 2018
@@ -25,8 +25,6 @@
 
 #include <com/sun/star/uno/XInterface.hpp>
 
-#include "cppuhelper/cppuhelperdllapi.h"
-
 
 namespace com
 {    
@@ -43,7 +41,7 @@ class OWeakRefListener;
 /** The WeakReferenceHelper holds a weak reference to an object. This object must implement
     the ::com::sun::star::uno::XWeak interface.  The implementation is thread safe.
 */
-class CPPUHELPER_DLLPUBLIC WeakReferenceHelper
+class WeakReferenceHelper
 {
 public:
 	/** Default ctor.  Creates an empty weak reference.

Modified: openoffice/trunk/main/cppuhelper/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/prj/d.lst?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/prj/d.lst (original)
+++ openoffice/trunk/main/cppuhelper/prj/d.lst Sun Dec  2 05:57:21 2018
@@ -1,6 +1,5 @@
 mkdir: %_DEST%\inc%_EXT%\cppuhelper
 
-..\inc\cppuhelper\cppuhelperdllapi.h %_DEST%\inc%_EXT%\cppuhelper\cppuhelperdllapi.h
 ..\inc\cppuhelper\implbase.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase.hxx
 ..\inc\cppuhelper\implbase_ex.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase_ex.hxx
 ..\inc\cppuhelper\implbase_ex_pre.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase_ex_pre.hxx

Modified: openoffice/trunk/main/cppuhelper/source/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/source/makefile.mk?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/source/makefile.mk (original)
+++ openoffice/trunk/main/cppuhelper/source/makefile.mk Sun Dec  2 05:57:21 2018
@@ -27,7 +27,6 @@ TARGET=cppuhelper
 
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
-VISIBILITY_HIDDEN=TRUE
 
 # not strictly a bootstrap service but containing
 # bootstrap code that may require generated files
@@ -122,8 +121,6 @@ CFLAGS += -Ob0
 .ENDIF
 .ENDIF
 
-CFLAGS += -DCPPUHELPER_DLLIMPLEMENTATION
-
 SLOFILES= \
 		$(SLO)$/typeprovider.obj 	\
 		$(SLO)$/exc_thrower.obj 	\
@@ -176,7 +173,7 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
 .IF "$(COMNAME)"=="msci"
-.ELIF "$(COMNAME)"=="mscx"
+SHL1VERSIONMAP=msvc_win32_intel.map
 .ELIF "$(COMNAME)"=="sunpro5"
 SHL1VERSIONMAP=cc5_solaris_sparc.map
 .ELIF "$(GUI)$(COMNAME)"=="OS2gcc3"

Added: openoffice/trunk/main/cppuhelper/source/msvc_win32_intel.map
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/source/msvc_win32_intel.map?rev=1847937&view=auto
==============================================================================
--- openoffice/trunk/main/cppuhelper/source/msvc_win32_intel.map (added)
+++ openoffice/trunk/main/cppuhelper/source/msvc_win32_intel.map Sun Dec  2 05:57:21 2018
@@ -0,0 +1,306 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+UDK_3_0_0 {
+	global:
+GetVersionInfo;
+??0OComponentHelper@cppu@@QAE@AAVMutex@osl@@@Z;
+??1OComponentHelper@cppu@@UAE@XZ;
+??BOWeakObject@cppu@@QAA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+??BWeakReferenceHelper@uno@star@sun@com@@QBA?AV?$Reference@VXInterface@uno@star@sun@com@@@1234@XZ;
+??_7OComponentHelper@cppu@@6BOWeakObject@1@@;
+??_7OComponentHelper@cppu@@6BXAggregation@uno@star@sun@com@@@;
+??_7OComponentHelper@cppu@@6BXComponent@lang@star@sun@com@@@;
+??_7OComponentHelper@cppu@@6BXTypeProvider@lang@star@sun@com@@@;
+??_7OWeakAggObject@cppu@@6BOWeakObject@1@@;
+??_7OWeakAggObject@cppu@@6BXAggregation@uno@star@sun@com@@@;
+??_7OWeakObject@cppu@@6B@;
+??_GOComponentHelper@cppu@@UAEPAXI@Z;
+??_GOWeakAggObject@cppu@@MAEPAXI@Z;
+??_GOWeakObject@cppu@@MAEPAXI@Z;
+?addEventListener@OComponentHelper@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
+?dispose@OComponentHelper@cppu@@UAAXXZ;
+?disposing@OComponentHelper@cppu@@MAAXXZ;
+?release@OComponentHelper@cppu@@UAAXXZ;
+?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;
+?createOneInstanceRegistryFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABVOUString@rtl@@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
+?createSingleRegistryFactory@cppu@@YA?AV?$Reference@VXSingleServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABVOUString@rtl@@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
+?getTypes@OTypeCollection@cppu@@QAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?createStandardClassWithSequence@cppu@@YAPAVXIdlClass@reflection@star@sun@com@@ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@456@ABVOUString@rtl@@ABV?$Reference@VXIdlClass@reflection@star@sun@com@@@8456@ABV?$Sequence@VOUString@rtl@@@8456@@Z;
+??0OInterfaceContainerHelper@cppu@@QAE@AAVMutex@osl@@@Z;
+??0OInterfaceIteratorHelper@cppu@@QAE@AAVOInterfaceContainerHelper@1@@Z;
+??1OInterfaceContainerHelper@cppu@@QAE@XZ;
+??1OInterfaceIteratorHelper@cppu@@QAE@XZ;
+?addInterface@OInterfaceContainerHelper@cppu@@QAAJABV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+?clear@OInterfaceContainerHelper@cppu@@QAAXXZ;
+?copyAndResetInUse@OInterfaceContainerHelper@cppu@@AAEXXZ;
+?disposeAndClear@OInterfaceContainerHelper@cppu@@QAAXABUEventObject@lang@star@sun@com@@@Z;
+?getElements@OInterfaceContainerHelper@cppu@@QBA?AV?$Sequence@V?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?getLength@OInterfaceContainerHelper@cppu@@QBAJXZ;
+?next@OInterfaceIteratorHelper@cppu@@QAAPAVXInterface@uno@star@sun@com@@XZ;
+?removeInterface@OInterfaceContainerHelper@cppu@@QAAJABV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+??0WeakReferenceHelper@uno@star@sun@com@@QAE@ABV01234@@Z;
+??0WeakReferenceHelper@uno@star@sun@com@@QAE@ABV?$Reference@VXInterface@uno@star@sun@com@@@1234@@Z;
+??1OWeakAggObject@cppu@@MAE@XZ;
+??1OWeakObject@cppu@@MAE@XZ;
+??1WeakReferenceHelper@uno@star@sun@com@@QAE@XZ;
+??4WeakReferenceHelper@uno@star@sun@com@@QAAAAV01234@ABV01234@@Z;
+??4WeakReferenceHelper@uno@star@sun@com@@QAAAAV01234@ABV?$Reference@VXInterface@uno@star@sun@com@@@1234@@Z;
+?acquire@OWeakAggObject@cppu@@UAAXXZ;
+?acquire@OWeakObject@cppu@@UAAXXZ;
+?get@WeakReferenceHelper@uno@star@sun@com@@QBA?AV?$Reference@VXInterface@uno@star@sun@com@@@2345@XZ;
+?queryAdapter@OWeakObject@cppu@@UAA?AV?$Reference@VXAdapter@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?queryAggregation@OWeakAggObject@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
+?queryInterface@OWeakAggObject@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
+?queryInterface@OWeakObject@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
+?release@OWeakAggObject@cppu@@UAAXXZ;
+?release@OWeakObject@cppu@@UAAXXZ;
+?setDelegator@OWeakAggObject@cppu@@UAAXABV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+??0OPropertyArrayHelper@cppu@@QAE@ABV?$Sequence@UProperty@beans@star@sun@com@@@uno@star@sun@com@@E@Z;
+??0OPropertyArrayHelper@cppu@@QAE@PAUProperty@beans@star@sun@com@@JE@Z;
+??1IPropertyArrayHelper@cppu@@UAE@XZ;
+??1OPropertyArrayHelper@cppu@@UAE@XZ;
+??1OPropertySetHelper@cppu@@QAE@XZ;
+??_7IPropertyArrayHelper@cppu@@6B@;
+??_7OPropertyArrayHelper@cppu@@6B@;
+??_7OPropertySetHelper@cppu@@6BXFastPropertySet@beans@star@sun@com@@@;
+??_7OPropertySetHelper@cppu@@6BXMultiPropertySet@beans@star@sun@com@@@;
+??_7OPropertySetHelper@cppu@@6BXPropertySet@beans@star@sun@com@@@;
+??_GIPropertyArrayHelper@cppu@@UAEPAXI@Z;
+??_GOPropertyArrayHelper@cppu@@UAEPAXI@Z;
+?addPropertiesChangeListener@OPropertySetHelper@cppu@@UAAXABV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@ABV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@4567@@Z;
+?addPropertyChangeListener@OPropertySetHelper@cppu@@UAAXABVOUString@rtl@@ABV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+?addVetoableChangeListener@OPropertySetHelper@cppu@@UAAXABVOUString@rtl@@ABV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+?createPropertySetInfo@OPropertySetHelper@cppu@@SA?AV?$Reference@VXPropertySetInfo@beans@star@sun@com@@@uno@star@sun@com@@AAVIPropertyArrayHelper@2@@Z;
+?disposing@OPropertySetHelper@cppu@@QAAXXZ;
+?fillHandles@OPropertyArrayHelper@cppu@@UAAJPAJABV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@@Z;
+?fillPropertyMembersByHandle@OPropertyArrayHelper@cppu@@UAAEPAVOUString@rtl@@PAFJ@Z;
+?fire@OPropertySetHelper@cppu@@IAAXPAJPBVAny@uno@star@sun@com@@1JE@Z;
+?firePropertiesChangeEvent@OPropertySetHelper@cppu@@UAAXABV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@ABV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@4567@@Z;
+?getCount@OPropertyArrayHelper@cppu@@QBAJXZ;
+?getFastPropertyValue@OPropertySetHelper@cppu@@UAA?AVAny@uno@star@sun@com@@J@Z;
+?getHandleByName@OPropertyArrayHelper@cppu@@UAAJABVOUString@rtl@@@Z;
+?getProperties@OPropertyArrayHelper@cppu@@UAA?AV?$Sequence@UProperty@beans@star@sun@com@@@uno@star@sun@com@@XZ;
+?getPropertyByName@OPropertyArrayHelper@cppu@@UAA?AUProperty@beans@star@sun@com@@ABVOUString@rtl@@@Z;
+?getPropertyValue@OPropertySetHelper@cppu@@UAA?AVAny@uno@star@sun@com@@ABVOUString@rtl@@@Z;
+?getPropertyValues@OPropertySetHelper@cppu@@UAA?AV?$Sequence@VAny@uno@star@sun@com@@@uno@star@sun@com@@ABV?$Sequence@VOUString@rtl@@@4567@@Z;
+?hasPropertyByName@OPropertyArrayHelper@cppu@@UAAEABVOUString@rtl@@@Z;
+?init@OPropertyArrayHelper@cppu@@AAEXE@Z;
+?queryInterface@OPropertySetHelper@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
+?queryInterface@OPropertySetHelper@cppu@@W3AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
+?queryInterface@OPropertySetHelper@cppu@@W7AA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
+?removePropertiesChangeListener@OPropertySetHelper@cppu@@UAAXABV?$Reference@VXPropertiesChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+?removePropertyChangeListener@OPropertySetHelper@cppu@@UAAXABVOUString@rtl@@ABV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+?removeVetoableChangeListener@OPropertySetHelper@cppu@@UAAXABVOUString@rtl@@ABV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+?setFastPropertyValue@OPropertySetHelper@cppu@@UAAXJABVAny@uno@star@sun@com@@@Z;
+?setFastPropertyValues@OPropertySetHelper@cppu@@IAAXJPAJPBVAny@uno@star@sun@com@@J@Z;
+?setPropertyValue@OPropertySetHelper@cppu@@UAAXABVOUString@rtl@@ABVAny@uno@star@sun@com@@@Z;
+?setPropertyValues@OPropertySetHelper@cppu@@UAAXABV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@ABV?$Sequence@VAny@uno@star@sun@com@@@4567@@Z;
+??0ClassDataBase@cppu@@QAE@J@Z;
+??0ClassDataBase@cppu@@QAE@XZ;
+??1ClassDataBase@cppu@@QAE@XZ;
+?getImplHelperInitMutex@cppu@@YAAAVMutex@osl@@XZ;
+?getImplementationId@ClassData@cppu@@QAA?AV?$Sequence@C@uno@star@sun@com@@XZ;
+?getTypes@ClassData@cppu@@QAA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?initTypeProvider@ClassData@cppu@@QAAXXZ;
+?query@ClassData@cppu@@QAA?AVAny@uno@star@sun@com@@ABVType@4567@PAVXTypeProvider@lang@567@@Z;
+?writeTypeOffset@ClassData@cppu@@QAAXABVType@uno@star@sun@com@@J@Z;
+?createRegistryServiceFactory@cppu@@YA?AV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@0E0@Z;
+?throwException@cppu@@YAXABVAny@uno@star@sun@com@@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@00000000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@0000000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@000000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@00000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@0000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@000000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@00000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@0000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@000ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@00ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@0ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??0OTypeCollection@cppu@@QAE@ABVType@uno@star@sun@com@@ABV?$Sequence@VType@uno@star@sun@com@@@3456@@Z;
+??1OImplementationId@cppu@@QAE@XZ;
+?getImplementationId@OImplementationId@cppu@@QBA?AV?$Sequence@C@uno@star@sun@com@@XZ;
+?writeSharedLibComponentInfo@cppu@@YAXABVOUString@rtl@@0ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@5678@@Z;
+?remove@OInterfaceIteratorHelper@cppu@@QAAXXZ;
+??0OWeakObject@cppu@@QAE@XZ;
+?installTypeDescriptionManager@cppu@@YAEABV?$Reference@VXHierarchicalNameAccess@container@star@sun@com@@@uno@star@sun@com@@@Z;
+?loadSharedLibComponentFactory@cppu@@YA?AV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@00ABV?$Reference@VXMultiServiceFactory@lang@star@sun@com@@@3456@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@3456@@Z;
+?createComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PBUContextEntry_Init@1@JABV23456@@Z;
+?bootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@ABV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@3456@ABVOUString@rtl@@@Z;
+?createNestedRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@@Z;
+?createSimpleRegistry@cppu@@YA?AV?$Reference@VXSimpleRegistry@registry@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@@Z;
+??0WeakAggComponentImplHelperBase@cppu@@IAE@AAVMutex@osl@@@Z;
+??0WeakComponentImplHelperBase@cppu@@IAE@AAVMutex@osl@@@Z;
+?acquire@WeakAggComponentImplHelperBase@cppu@@UAAXXZ;
+?acquire@WeakComponentImplHelperBase@cppu@@UAAXXZ;
+?addEventListener@WeakAggComponentImplHelperBase@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
+?addEventListener@WeakComponentImplHelperBase@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
+?dispose@WeakAggComponentImplHelperBase@cppu@@UAAXXZ;
+?dispose@WeakComponentImplHelperBase@cppu@@UAAXXZ;
+?queryAggregation@WeakAggComponentImplHelperBase@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
+?queryInterface@WeakAggComponentImplHelperBase@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
+?queryInterface@WeakComponentImplHelperBase@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
+?release@WeakAggComponentImplHelperBase@cppu@@UAAXXZ;
+?release@WeakComponentImplHelperBase@cppu@@UAAXXZ;
+?removeEventListener@WeakAggComponentImplHelperBase@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
+?removeEventListener@WeakComponentImplHelperBase@cppu@@UAAXABV?$Reference@VXEventListener@lang@star@sun@com@@@uno@star@sun@com@@@Z;
+??1WeakAggComponentImplHelperBase@cppu@@UAE@XZ;
+??1WeakComponentImplHelperBase@cppu@@UAE@XZ;
+?disposing@WeakAggComponentImplHelperBase@cppu@@MAAXXZ;
+?disposing@WeakComponentImplHelperBase@cppu@@MAAXXZ;
+?createOneInstanceFactory@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;
+?createSingleComponentFactory@cppu@@YA?AV?$Reference@VXSingleComponentFactory@lang@star@sun@com@@@uno@star@sun@com@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@ABV?$Reference@VXComponentContext@uno@star@sun@com@@@3456@@ZABVOUString@rtl@@ABV?$Sequence@VOUString@rtl@@@3456@PAU_rtl_ModuleCount@@@Z;
+?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;
+?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;
+?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;
+??1OMultiTypeInterfaceContainerHelper@cppu@@QAE@XZ;
+??1OMultiTypeInterfaceContainerHelperInt32@cppu@@QAE@XZ;
+?addInterface@OMultiTypeInterfaceContainerHelper@cppu@@QAAJABVType@uno@star@sun@com@@ABV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
+?addInterface@OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAJABJABV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+?clear@OMultiTypeInterfaceContainerHelper@cppu@@QAAXXZ;
+?clear@OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAXXZ;
+?disposeAndClear@OMultiTypeInterfaceContainerHelper@cppu@@QAAXABUEventObject@lang@star@sun@com@@@Z;
+?disposeAndClear@OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAXABUEventObject@lang@star@sun@com@@@Z;
+?getContainedTypes@OMultiTypeInterfaceContainerHelper@cppu@@QBA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+?getContainedTypes@OMultiTypeInterfaceContainerHelperInt32@cppu@@QBA?AV?$Sequence@J@uno@star@sun@com@@XZ;
+?getContainer@OMultiTypeInterfaceContainerHelper@cppu@@QBAPAVOInterfaceContainerHelper@2@ABVType@uno@star@sun@com@@@Z;
+?getContainer@OMultiTypeInterfaceContainerHelperInt32@cppu@@QBAPAVOInterfaceContainerHelper@2@ABJ@Z;
+?removeInterface@OMultiTypeInterfaceContainerHelper@cppu@@QAAJABVType@uno@star@sun@com@@ABV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
+?removeInterface@OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAJABJABV?$Reference@VXInterface@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+??0OPropertySetHelper@cppu@@QAE@AAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@@Z;
+?addListener@?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@cppu@@QAEXABVType@uno@star@sun@com@@ABV?$Reference@VXInterface@uno@star@sun@com@@@4567@@Z;
+?component_writeInfoHelper@cppu@@YAEPAX0QBUImplementationEntry@1@@Z;
+?component_getFactoryHelper@cppu@@YAPAXPBDPAX1QBUImplementationEntry@1@@Z;
+?ImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAX@Z;
+?ImplHelper_queryNoXInterface@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAX@Z;
+?ImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@@Z;
+?ImplInhHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@ABV23456@@Z;
+?ImplHelper_getImplementationId@cppu@@YA?AV?$Sequence@C@uno@star@sun@com@@PAUclass_data@1@@Z;
+?WeakImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAXPAVOWeakObject@1@@Z;
+?WeakImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@@Z;
+?WeakAggImplHelper_queryAgg@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAXPAVOWeakAggObject@1@@Z;
+?WeakAggComponentImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@@Z;
+?WeakComponentImplHelper_query@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAXPAVWeakComponentImplHelperBase@1@@Z;
+?WeakAggImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@@Z;
+?WeakAggComponentImplHelper_queryAgg@cppu@@YA?AVAny@uno@star@sun@com@@ABVType@3456@PAUclass_data@1@PAXPAVWeakAggComponentImplHelperBase@1@@Z;
+?WeakComponentImplHelper_getTypes@cppu@@YA?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@PAUclass_data@1@@Z;
+?defaultBootstrap_InitialComponentContext@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@ABVOUString@rtl@@@Z;
+
+??0AccessControl@cppu@@QAE@ABV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@@Z;
+??0AccessControl@cppu@@QAE@ABV?$Reference@VXAccessController@security@star@sun@com@@@uno@star@sun@com@@@Z;
+??0AccessControl@cppu@@QAE@ABV01@@Z;
+?checkRuntimePermission@AccessControl@cppu@@QAAXABVOUString@rtl@@@Z;
+?checkFilePermission@AccessControl@cppu@@QAAXABVOUString@rtl@@0@Z;
+?checkSocketPermission@AccessControl@cppu@@QAAXABVOUString@rtl@@0@Z;
+
+??0UnoUrl@cppu@@QAE@ABV01@@Z;
+??0UnoUrl@cppu@@QAE@ABVOUString@rtl@@@Z;
+??0UnoUrlDescriptor@cppu@@QAE@ABV01@@Z;
+??0UnoUrlDescriptor@cppu@@QAE@ABVOUString@rtl@@@Z;
+??1UnoUrl@cppu@@QAE@XZ;
+??1UnoUrlDescriptor@cppu@@QAE@XZ;
+??4UnoUrl@cppu@@QAEAAV01@ABV01@@Z;
+??4UnoUrlDescriptor@cppu@@QAEAAV01@ABV01@@Z;
+?getConnection@UnoUrl@cppu@@QBEABVUnoUrlDescriptor@2@XZ;
+?getDescriptor@UnoUrlDescriptor@cppu@@QBEABVOUString@rtl@@XZ;
+?getName@UnoUrlDescriptor@cppu@@QBEABVOUString@rtl@@XZ;
+?getObjectName@UnoUrl@cppu@@QBEABVOUString@rtl@@XZ;
+?getParameter@UnoUrlDescriptor@cppu@@QBE?AVOUString@rtl@@ABV34@@Z;
+?getProtocol@UnoUrl@cppu@@QBEABVUnoUrlDescriptor@2@XZ;
+?hasParameter@UnoUrlDescriptor@cppu@@QBE_NABVOUString@rtl@@@Z;
+
+	local:
+		*;
+};
+
+UDK_3.1 {
+    global:
+        ?getCaughtException@cppu@@YA?AVAny@uno@star@sun@com@@XZ;
+
+        ??0OPropertySetHelper@cppu@@QAE@AAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@_N@Z;
+
+        ?bootstrap@cppu@@YA?AV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+        ??0BootstrapException@cppu@@QAE@XZ;
+        ??0BootstrapException@cppu@@QAE@ABVOUString@rtl@@@Z;
+        ??0BootstrapException@cppu@@QAE@ABV01@@Z;
+        ??1BootstrapException@cppu@@UAE@XZ;
+        ??4BootstrapException@cppu@@QAEAAV01@ABV01@@Z;
+        ?getMessage@BootstrapException@cppu@@QBEABVOUString@rtl@@XZ;
+} UDK_3_0_0;
+
+UDK_3.2 {
+    global:
+        ??1PropertySetMixinImpl@cppu@@AAE@XZ;
+        ?queryInterface@PropertySetMixinImpl@cppu@@MAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z;
+        ?getPropertySetInfo@PropertySetMixinImpl@cppu@@MAA?AV?$Reference@VXPropertySetInfo@beans@star@sun@com@@@uno@star@sun@com@@XZ;
+        ?notify@BoundListeners@PropertySetMixinImpl@cppu@@QBEXXZ;
+        ?setPropertyValue@PropertySetMixinImpl@cppu@@MAAXABVOUString@rtl@@ABVAny@uno@star@sun@com@@@Z;
+        ?getPropertyValue@PropertySetMixinImpl@cppu@@MAA?AVAny@uno@star@sun@com@@ABVOUString@rtl@@@Z;
+        ?removePropertyChangeListener@PropertySetMixinImpl@cppu@@MAAXABVOUString@rtl@@ABV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+        ?removeVetoableChangeListener@PropertySetMixinImpl@cppu@@MAAXABVOUString@rtl@@ABV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+        ?setFastPropertyValue@PropertySetMixinImpl@cppu@@MAAXJABVAny@uno@star@sun@com@@@Z;
+        ?getFastPropertyValue@PropertySetMixinImpl@cppu@@MAA?AVAny@uno@star@sun@com@@J@Z;
+        ?getPropertyValues@PropertySetMixinImpl@cppu@@MAA?AV?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@XZ;
+        ?setPropertyValues@PropertySetMixinImpl@cppu@@MAAXABV?$Sequence@UPropertyValue@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+        ?prepareSet@PropertySetMixinImpl@cppu@@IAEXABVOUString@rtl@@ABVAny@uno@star@sun@com@@1PAVBoundListeners@12@@Z;
+        ??0BoundListeners@PropertySetMixinImpl@cppu@@QAE@XZ;
+        ??1BoundListeners@PropertySetMixinImpl@cppu@@QAE@XZ;
+        ??0PropertySetMixinImpl@cppu@@AAE@ABV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@W4Implements@01@ABV?$Sequence@VOUString@rtl@@@3456@ABVType@3456@@Z;
+        ?dispose@PropertySetMixinImpl@cppu@@IAEXXZ;
+        ?addPropertyChangeListener@PropertySetMixinImpl@cppu@@MAAXABVOUString@rtl@@ABV?$Reference@VXPropertyChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+        ?addVetoableChangeListener@PropertySetMixinImpl@cppu@@MAAXABVOUString@rtl@@ABV?$Reference@VXVetoableChangeListener@beans@star@sun@com@@@uno@star@sun@com@@@Z;
+} UDK_3.1;
+
+UDK_3.3 {
+    global:
+        ?getTypes@OPropertySetHelper@cppu@@QAE?AV?$Sequence@VType@uno@star@sun@com@@@uno@star@sun@com@@XZ;
+} UDK_3.2;
+
+UDK_3.4 { # OOo 2.4
+    global:
+        ?bootstrap_expandUri@cppu@@YA?AVOUString@rtl@@ABV23@@Z; # rtl::OUString cppu::bootstrap_expandUri(rtl::OUString const &)
+} UDK_3.3;
+
+UDK_3.5 { # OOo 3.0
+    global:
+        ??0OPropertySetHelper@cppu@@QAE@AAU?$OBroadcastHelperVar@VOMultiTypeInterfaceContainerHelper@cppu@@VType@uno@star@sun@com@@@1@PAVIEventNotificationHook@1@_N@Z;
+} UDK_3.4;
+
+UDK_3.6 { # OOo 3.3
+    global:
+        ?disposeWeakConnectionPoint@OWeakObject@cppu@@IAEXXZ;
+        ?clear@WeakReferenceHelper@uno@star@sun@com@@QAAXXZ;
+        ?createOneInstanceComponentFactory@cppu@@YA?AV?$Reference@VXSingleComponentFactory@lang@star@sun@com@@@uno@star@sun@com@@P6A?AV?$Reference@VXInterface@uno@star@sun@com@@@3456@ABV?$Reference@VXComponentContext@uno@star@sun@com@@@3456@@ZABVOUString@rtl@@ABV?$Sequence@VOUString@rtl@@@3456@PAU_rtl_ModuleCount@@@Z;
+} UDK_3.5;
+
+UDK_3.7 { # OOo 3.4
+    global:
+        ?setDependentFastPropertyValue@OPropertySetHelper@cppu@@IAEXJABVAny@uno@star@sun@com@@@Z;
+} UDK_3.6;
+

Modified: openoffice/trunk/main/cppuhelper/source/servicefactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/source/servicefactory.cxx?rev=1847937&r1=1847936&r2=1847937&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/source/servicefactory.cxx (original)
+++ openoffice/trunk/main/cppuhelper/source/servicefactory.cxx Sun Dec  2 05:57:21 2018
@@ -316,7 +316,6 @@ static void add_access_control_entries(
     context_values.push_back( entry );
 }
 
-SAL_DLLPUBLIC_EXPORT
 Reference< lang::XMultiComponentFactory > bootstrapInitialSF(
     OUString const & rBootstrapPath )
     SAL_THROW( (Exception) )



Mime
View raw message