[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cppuhelper/inc cppuhelper/prj cppuhelper/source
Damjan Jovanovic
damjan at apache.org
Tue Mar 13 05:10:05 UTC 2018
cppuhelper/inc/cppuhelper/access_control.hxx | 4 --
cppuhelper/inc/cppuhelper/bootstrap.hxx | 12 -------
cppuhelper/inc/cppuhelper/compbase_ex.hxx | 10 +----
cppuhelper/inc/cppuhelper/component.hxx | 3 -
cppuhelper/inc/cppuhelper/component_context.hxx | 2 -
cppuhelper/inc/cppuhelper/cppuhelperdllapi.h | 37 ----------------------
cppuhelper/inc/cppuhelper/exc_hlp.hxx | 6 +--
cppuhelper/inc/cppuhelper/factory.hxx | 9 -----
cppuhelper/inc/cppuhelper/implbase.hxx | 8 +---
cppuhelper/inc/cppuhelper/implbase_ex.hxx | 15 ++------
cppuhelper/inc/cppuhelper/implementationentry.hxx | 5 +-
cppuhelper/inc/cppuhelper/interfacecontainer.h | 8 +---
cppuhelper/inc/cppuhelper/propertysetmixin.hxx | 3 -
cppuhelper/inc/cppuhelper/propshlp.hxx | 9 ++---
cppuhelper/inc/cppuhelper/servicefactory.hxx | 2 -
cppuhelper/inc/cppuhelper/shlib.hxx | 3 -
cppuhelper/inc/cppuhelper/stdidlclass.hxx | 2 -
cppuhelper/inc/cppuhelper/typeprovider.hxx | 5 +-
cppuhelper/inc/cppuhelper/unourl.hxx | 6 +--
cppuhelper/inc/cppuhelper/weak.hxx | 3 -
cppuhelper/inc/cppuhelper/weakagg.hxx | 3 -
cppuhelper/inc/cppuhelper/weakref.hxx | 4 --
cppuhelper/prj/d.lst | 1
cppuhelper/source/bootstrap.cxx | 1
cppuhelper/source/makefile.mk | 5 --
25 files changed, 33 insertions(+), 133 deletions(-)
New commits:
commit 5062386f775274276ffd3558635d3faa753cfad6
Author: Damjan Jovanovic <damjan at apache.org>
Date: Tue Mar 13 03:12:02 2018 +0000
Revert the main/cppuhelper related parts of:
r1826428
r1826398
for now, while I investigate why they produce
multiple symbol errors on Windows when linking main/svtools.
Patch by: me
diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx
index 54964ec87ef2..53afcdd783ef 100644
--- a/cppuhelper/inc/cppuhelper/access_control.hxx
+++ b/cppuhelper/inc/cppuhelper/access_control.hxx
@@ -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;
diff --git a/cppuhelper/inc/cppuhelper/bootstrap.hxx b/cppuhelper/inc/cppuhelper/bootstrap.hxx
index 2b28624620b5..e222164f1b36 100644
--- a/cppuhelper/inc/cppuhelper/bootstrap.hxx
+++ b/cppuhelper/inc/cppuhelper/bootstrap.hxx
@@ -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 installTypeDescriptionManager(
@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() SAL_THROW( (::com::sun::star::uno::Ex
@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(const ::rtl::OUString & iniFile) SAL_TH
*
* @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);
diff --git a/cppuhelper/inc/cppuhelper/compbase_ex.hxx b/cppuhelper/inc/cppuhelper/compbase_ex.hxx
index bb67f1f1649f..847fdb7483cc 100644
--- a/cppuhelper/inc/cppuhelper/compbase_ex.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase_ex.hxx
@@ -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) );
diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx
index 2fb7edee5215..d1bdc0ff1740 100644
--- a/cppuhelper/inc/cppuhelper/component.hxx
+++ b/cppuhelper/inc/cppuhelper/component.hxx
@@ -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
diff --git a/cppuhelper/inc/cppuhelper/component_context.hxx b/cppuhelper/inc/cppuhelper/component_context.hxx
index 780782d51aca..43a7ece4b4ac 100644
--- a/cppuhelper/inc/cppuhelper/component_context.hxx
+++ b/cppuhelper/inc/cppuhelper/component_context.hxx
@@ -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,
diff --git a/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h b/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
index 3019cbb25725..e69de29bb2d1 100644
--- a/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
+++ b/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
@@ -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 */
-
diff --git a/cppuhelper/inc/cppuhelper/exc_hlp.hxx b/cppuhelper/inc/cppuhelper/exc_hlp.hxx
index a70171f1706f..7dd981b406d5 100644
--- a/cppuhelper/inc/cppuhelper/exc_hlp.hxx
+++ b/cppuhelper/inc/cppuhelper/exc_hlp.hxx
@@ -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 throwException( const ::com::sun::star::uno::
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();
}
diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx
index 93819d357e79..b58976ef1e37 100644
--- a/cppuhelper/inc/cppuhelper/factory.hxx
+++ b/cppuhelper/inc/cppuhelper/factory.hxx
@@ -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< ::com::sun::star::uno::XInterface >(
@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< ::com::sun::star::uno::XInterface >(SA
@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,
diff --git a/cppuhelper/inc/cppuhelper/implbase.hxx b/cppuhelper/inc/cppuhelper/implbase.hxx
index e73c50bac4f2..6a6c90598d01 100644
--- a/cppuhelper/inc/cppuhelper/implbase.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase.hxx
@@ -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 ClassDataBase
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 : public ClassDataBase
Not for public use.
@internal
*/
-CPPUHELPER_DLLPUBLIC ::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () );
+::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () );
}
//
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex.hxx b/cppuhelper/inc/cppuhelper/implbase_ex.hxx
index 0ef778e6d295..bb35aca9a46e 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex.hxx
@@ -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::uno::Any SAL_CALL ImplHelper_queryNoXInte
/** 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) );
diff --git a/cppuhelper/inc/cppuhelper/implementationentry.hxx b/cppuhelper/inc/cppuhelper/implementationentry.hxx
index 9431bc97f621..479a10d0299a 100644
--- a/cppuhelper/inc/cppuhelper/implementationentry.hxx
+++ b/cppuhelper/inc/cppuhelper/implementationentry.hxx
@@ -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_writeInfoHelper(
@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,
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h
index 164d2893cdcc..95d93ddccc38 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.h
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h
@@ -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.
diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
index 80ccf149aba2..c2613813047b 100644
--- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
+++ b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
@@ -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 PropertySetMixin;
@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
diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/cppuhelper/inc/cppuhelper/propshlp.hxx
index 34fb238a335a..813ca16fe465 100644
--- a/cppuhelper/inc/cppuhelper/propshlp.hxx
+++ b/cppuhelper/inc/cppuhelper/propshlp.hxx
@@ -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
{
diff --git a/cppuhelper/inc/cppuhelper/servicefactory.hxx b/cppuhelper/inc/cppuhelper/servicefactory.hxx
index 5a0908bef51e..7e37f7bee059 100644
--- a/cppuhelper/inc/cppuhelper/servicefactory.hxx
+++ b/cppuhelper/inc/cppuhelper/servicefactory.hxx
@@ -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,
diff --git a/cppuhelper/inc/cppuhelper/shlib.hxx b/cppuhelper/inc/cppuhelper/shlib.hxx
index b0aadb983bdd..0b6fb2123123 100644
--- a/cppuhelper/inc/cppuhelper/shlib.hxx
+++ b/cppuhelper/inc/cppuhelper/shlib.hxx
@@ -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,
diff --git a/cppuhelper/inc/cppuhelper/stdidlclass.hxx b/cppuhelper/inc/cppuhelper/stdidlclass.hxx
index d64659b7f1d1..3b131234c85a 100644
--- a/cppuhelper/inc/cppuhelper/stdidlclass.hxx
+++ b/cppuhelper/inc/cppuhelper/stdidlclass.hxx
@@ -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 ,
diff --git a/cppuhelper/inc/cppuhelper/typeprovider.hxx b/cppuhelper/inc/cppuhelper/typeprovider.hxx
index a1a18937bfdf..194cecdfa7e6 100644
--- a/cppuhelper/inc/cppuhelper/typeprovider.hxx
+++ b/cppuhelper/inc/cppuhelper/typeprovider.hxx
@@ -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;
diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx
index c1b68652d7fc..f05c6a9c91b4 100644
--- a/cppuhelper/inc/cppuhelper/unourl.hxx
+++ b/cppuhelper/inc/cppuhelper/unourl.hxx
@@ -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.
diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx
index 6bdd713249b9..727f02abbf97 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -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;
diff --git a/cppuhelper/inc/cppuhelper/weakagg.hxx b/cppuhelper/inc/cppuhelper/weakagg.hxx
index b37311ea2fa5..b6dbd6c58726 100644
--- a/cppuhelper/inc/cppuhelper/weakagg.hxx
+++ b/cppuhelper/inc/cppuhelper/weakagg.hxx
@@ -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
{
diff --git a/cppuhelper/inc/cppuhelper/weakref.hxx b/cppuhelper/inc/cppuhelper/weakref.hxx
index 13143b9fed48..56a24a42572f 100644
--- a/cppuhelper/inc/cppuhelper/weakref.hxx
+++ b/cppuhelper/inc/cppuhelper/weakref.hxx
@@ -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.
diff --git a/cppuhelper/prj/d.lst b/cppuhelper/prj/d.lst
index 4c29cf85d6f8..de80ca9b8533 100644
--- a/cppuhelper/prj/d.lst
+++ b/cppuhelper/prj/d.lst
@@ -55,7 +55,6 @@ mkdir: %_DEST%\inc%_EXT%\cppuhelper
..\inc\cppuhelper\implementationentry.hxx %_DEST%\inc%_EXT%\cppuhelper\implementationentry.hxx
..\inc\cppuhelper\access_control.hxx %_DEST%\inc%_EXT%\cppuhelper\access_control.hxx
..\inc\cppuhelper\unourl.hxx %_DEST%\inc%_EXT%\cppuhelper\unourl.hxx
-..\inc\cppuhelper\cppuhelperdllapi.h %_DEST%\inc%_EXT%\cppuhelper\cppuhelperdllapi.h
..\%__SRC%\bin\cppuh*.dll %_DEST%\bin%_EXT%\cppuh*.dll
..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib%_EXT%\*
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 80874f492110..3ada9e9d4a43 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -178,7 +178,6 @@ void addFactories(
}
// private forward decl
-SAL_DLLPUBLIC_EXPORT
Reference< lang::XMultiComponentFactory > bootstrapInitialSF(
OUString const & rBootstrapPath )
SAL_THROW( (Exception) );
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk
index 325201006fe3..52f939f92615 100644
--- a/cppuhelper/source/makefile.mk
+++ b/cppuhelper/source/makefile.mk
@@ -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"
More information about the Libreoffice-commits
mailing list