[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 11 commits - cppuhelper/GoogleTest_cppuhelper_ifcontainer.mk cppuhelper/GoogleTest_cppuhelper_unourl.mk cppuhelper/Library_cppuhelper.mk cppuhelper/Makefile cppuhelper/Module_cppuhelper.mk cppuhelper/Package_findsofficepath.mk cppuhelper/Package_inc.mk cppuhelper/Package_unorc.mk cppuhelper/source curl/makefile.mk sc/source solenv/gbuild tools/inc tools/source vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 3 00:37:54 UTC 2018
cppuhelper/GoogleTest_cppuhelper_ifcontainer.mk | 48 +++
cppuhelper/GoogleTest_cppuhelper_unourl.mk | 43 +++
cppuhelper/Library_cppuhelper.mk | 173 +++++++++++++
cppuhelper/Makefile | 32 ++
cppuhelper/Module_cppuhelper.mk | 37 ++
cppuhelper/Package_findsofficepath.mk | 31 ++
cppuhelper/Package_inc.mk | 80 ++++++
cppuhelper/Package_unorc.mk | 28 ++
cppuhelper/source/msvc_win32_intel.map | 305 ------------------------
curl/makefile.mk | 5
sc/source/ui/src/scfuncs.src | 2
solenv/gbuild/platform/windows.mk | 5
tools/inc/tools/debug.hxx | 14 -
tools/source/debug/debug.cxx | 12
tools/source/rc/resmgr.cxx | 4
vcl/source/gdi/outdev3.cxx | 5
16 files changed, 499 insertions(+), 325 deletions(-)
New commits:
commit 2463de78beeff993952e2950aa7dceeed050aaac
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Sun Dec 2 11:33:56 2018 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Sun Dec 2 11:33:56 2018 +0000
i123192 - Word Count Dialog: last digit truncated at the right
Patch by: hanya
Thank you for your contribution!
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 2657f23e4970..3b9f42a135a3 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -6792,10 +6792,10 @@ Rectangle OutputDevice::GetTextRect( const Rectangle& rRect,
else if ( nStyle & TEXT_DRAW_CENTER )
{
aRect.Left() += (nWidth-nMaxWidth)/2;
- aRect.Right() = aRect.Left()+nMaxWidth-1;
+ aRect.Right() = aRect.Left()+nMaxWidth;
}
else
- aRect.Right() = aRect.Left()+nMaxWidth-1;
+ aRect.Right() = aRect.Left()+nMaxWidth;
if ( nStyle & TEXT_DRAW_BOTTOM )
aRect.Top() = aRect.Bottom()-(nTextHeight*nLines)+1;
@@ -6807,7 +6807,6 @@ Rectangle OutputDevice::GetTextRect( const Rectangle& rRect,
else
aRect.Bottom() = aRect.Top()+(nTextHeight*nLines)-1;
- aRect.Right()++; // #99188# get rid of rounding problems when using this rect later
return aRect;
}
commit 5bab9af0eef386978f073ca04a2e478b157aee63
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sun Dec 2 05:57:21 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sun Dec 2 05:57:21 2018 +0000
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
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 6c987559dbe9..de80ca9b8533 100644
--- a/cppuhelper/prj/d.lst
+++ b/cppuhelper/prj/d.lst
@@ -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
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"
diff --git a/cppuhelper/source/msvc_win32_intel.map b/cppuhelper/source/msvc_win32_intel.map
new file mode 100644
index 000000000000..19590721a282
--- /dev/null
+++ b/cppuhelper/source/msvc_win32_intel.map
@@ -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 at cppu@@QAE at AAVMutex@osl@@@Z;
+??1OComponentHelper at cppu@@UAE at XZ;
+??BOWeakObject at cppu@@QAA?AV?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@XZ;
+??BWeakReferenceHelper at uno@star at sun@com@@QBA?AV?$Reference at VXInterface@uno at star@sun at com@@@1234 at XZ;
+??_7OComponentHelper at cppu@@6BOWeakObject at 1@@;
+??_7OComponentHelper at cppu@@6BXAggregation at uno@star at sun@com@@@;
+??_7OComponentHelper at cppu@@6BXComponent at lang@star at sun@com@@@;
+??_7OComponentHelper at cppu@@6BXTypeProvider at lang@star at sun@com@@@;
+??_7OWeakAggObject at cppu@@6BOWeakObject at 1@@;
+??_7OWeakAggObject at cppu@@6BXAggregation at uno@star at sun@com@@@;
+??_7OWeakObject at cppu@@6B@;
+??_GOComponentHelper at cppu@@UAEPAXI at Z;
+??_GOWeakAggObject at cppu@@MAEPAXI at Z;
+??_GOWeakObject at cppu@@MAEPAXI at Z;
+?addEventListener at OComponentHelper@cppu@@UAAXABV?$Reference at VXEventListener@lang at star@sun at com@@@uno at star@sun at com@@@Z;
+?dispose at OComponentHelper@cppu@@UAAXXZ;
+?disposing at OComponentHelper@cppu@@MAAXXZ;
+?release at OComponentHelper@cppu@@UAAXXZ;
+?removeEventListener at OComponentHelper@cppu@@UAAXABV?$Reference at VXEventListener@lang at star@sun at com@@@uno at star@sun at com@@@Z;
+??1OTypeCollection at cppu@@QAE at XZ;
+?createFactoryProxy at cppu@@YA?AV?$Reference at VXSingleServiceFactory@lang at star@sun at com@@@uno at star@sun at com@@ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@3456 at ABV23456@@Z;
+?createOneInstanceRegistryFactory at cppu@@YA?AV?$Reference at VXSingleServiceFactory@lang at star@sun at com@@@uno at star@sun at com@@ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@3456 at ABVOUString@rtl@@ABV?$Reference at VXRegistryKey@registry at star@sun at com@@@3456@@Z;
+?createSingleRegistryFactory at cppu@@YA?AV?$Reference at VXSingleServiceFactory@lang at star@sun at com@@@uno at star@sun at com@@ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@3456 at ABVOUString@rtl@@ABV?$Reference at VXRegistryKey@registry at star@sun at com@@@3456@@Z;
+?getTypes at OTypeCollection@cppu@@QAA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@XZ;
+?createStandardClassWithSequence at cppu@@YAPAVXIdlClass at reflection@star at sun@com@@ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@uno at 456@ABVOUString at rtl@@ABV?$Reference at VXIdlClass@reflection at star@sun at com@@@8456 at ABV?$Sequence at VOUString@rtl@@@8456@@Z;
+??0OInterfaceContainerHelper at cppu@@QAE at AAVMutex@osl@@@Z;
+??0OInterfaceIteratorHelper at cppu@@QAE at AAVOInterfaceContainerHelper@1@@Z;
+??1OInterfaceContainerHelper at cppu@@QAE at XZ;
+??1OInterfaceIteratorHelper at cppu@@QAE at XZ;
+?addInterface at OInterfaceContainerHelper@cppu@@QAAJABV?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@@Z;
+?clear at OInterfaceContainerHelper@cppu@@QAAXXZ;
+?copyAndResetInUse at OInterfaceContainerHelper@cppu@@AAEXXZ;
+?disposeAndClear at OInterfaceContainerHelper@cppu@@QAAXABUEventObject at lang@star at sun@com@@@Z;
+?getElements at OInterfaceContainerHelper@cppu@@QBA?AV?$Sequence at V?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@@uno at star@sun at com@@XZ;
+?getLength at OInterfaceContainerHelper@cppu@@QBAJXZ;
+?next at OInterfaceIteratorHelper@cppu@@QAAPAVXInterface at uno@star at sun@com@@XZ;
+?removeInterface at OInterfaceContainerHelper@cppu@@QAAJABV?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@@Z;
+??0WeakReferenceHelper at uno@star at sun@com@@QAE at ABV01234@@Z;
+??0WeakReferenceHelper at uno@star at sun@com@@QAE at ABV?$Reference at VXInterface@uno at star@sun at com@@@1234@@Z;
+??1OWeakAggObject at cppu@@MAE at XZ;
+??1OWeakObject at cppu@@MAE at XZ;
+??1WeakReferenceHelper at uno@star at sun@com@@QAE at XZ;
+??4WeakReferenceHelper at uno@star at sun@com@@QAAAAV01234 at ABV01234@@Z;
+??4WeakReferenceHelper at uno@star at sun@com@@QAAAAV01234 at ABV?$Reference at VXInterface@uno at star@sun at com@@@1234@@Z;
+?acquire at OWeakAggObject@cppu@@UAAXXZ;
+?acquire at OWeakObject@cppu@@UAAXXZ;
+?get at WeakReferenceHelper@uno at star@sun at com@@QBA?AV?$Reference at VXInterface@uno at star@sun at com@@@2345 at XZ;
+?queryAdapter at OWeakObject@cppu@@UAA?AV?$Reference at VXAdapter@uno at star@sun at com@@@uno at star@sun at com@@XZ;
+?queryAggregation at OWeakAggObject@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+?queryInterface at OWeakAggObject@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+?queryInterface at OWeakObject@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+?release at OWeakAggObject@cppu@@UAAXXZ;
+?release at OWeakObject@cppu@@UAAXXZ;
+?setDelegator at OWeakAggObject@cppu@@UAAXABV?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@@Z;
+??0OPropertyArrayHelper at cppu@@QAE at ABV?$Sequence at UProperty@beans at star@sun at com@@@uno at star@sun at com@@E at Z;
+??0OPropertyArrayHelper at cppu@@QAE at PAUProperty@beans at star@sun at com@@JE at Z;
+??1IPropertyArrayHelper at cppu@@UAE at XZ;
+??1OPropertyArrayHelper at cppu@@UAE at XZ;
+??1OPropertySetHelper at cppu@@QAE at XZ;
+??_7IPropertyArrayHelper at cppu@@6B@;
+??_7OPropertyArrayHelper at cppu@@6B@;
+??_7OPropertySetHelper at cppu@@6BXFastPropertySet at beans@star at sun@com@@@;
+??_7OPropertySetHelper at cppu@@6BXMultiPropertySet at beans@star at sun@com@@@;
+??_7OPropertySetHelper at cppu@@6BXPropertySet at beans@star at sun@com@@@;
+??_GIPropertyArrayHelper at cppu@@UAEPAXI at Z;
+??_GOPropertyArrayHelper at cppu@@UAEPAXI at Z;
+?addPropertiesChangeListener at OPropertySetHelper@cppu@@UAAXABV?$Sequence at VOUString@rtl@@@uno at star@sun at com@@ABV?$Reference at VXPropertiesChangeListener@beans at star@sun at com@@@4567@@Z;
+?addPropertyChangeListener at OPropertySetHelper@cppu@@UAAXABVOUString at rtl@@ABV?$Reference at VXPropertyChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
+?addVetoableChangeListener at OPropertySetHelper@cppu@@UAAXABVOUString at rtl@@ABV?$Reference at VXVetoableChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
+?createPropertySetInfo at OPropertySetHelper@cppu@@SA?AV?$Reference at VXPropertySetInfo@beans at star@sun at com@@@uno at star@sun at com@@AAVIPropertyArrayHelper at 2@@Z;
+?disposing at OPropertySetHelper@cppu@@QAAXXZ;
+?fillHandles at OPropertyArrayHelper@cppu@@UAAJPAJABV?$Sequence at VOUString@rtl@@@uno at star@sun at com@@@Z;
+?fillPropertyMembersByHandle at OPropertyArrayHelper@cppu@@UAAEPAVOUString at rtl@@PAFJ at Z;
+?fire at OPropertySetHelper@cppu@@IAAXPAJPBVAny at uno@star at sun@com@@1JE at Z;
+?firePropertiesChangeEvent at OPropertySetHelper@cppu@@UAAXABV?$Sequence at VOUString@rtl@@@uno at star@sun at com@@ABV?$Reference at VXPropertiesChangeListener@beans at star@sun at com@@@4567@@Z;
+?getCount at OPropertyArrayHelper@cppu@@QBAJXZ;
+?getFastPropertyValue at OPropertySetHelper@cppu@@UAA?AVAny at uno@star at sun@com@@J at Z;
+?getHandleByName at OPropertyArrayHelper@cppu@@UAAJABVOUString at rtl@@@Z;
+?getProperties at OPropertyArrayHelper@cppu@@UAA?AV?$Sequence at UProperty@beans at star@sun at com@@@uno at star@sun at com@@XZ;
+?getPropertyByName at OPropertyArrayHelper@cppu@@UAA?AUProperty at beans@star at sun@com@@ABVOUString at rtl@@@Z;
+?getPropertyValue at OPropertySetHelper@cppu@@UAA?AVAny at uno@star at sun@com@@ABVOUString at rtl@@@Z;
+?getPropertyValues at OPropertySetHelper@cppu@@UAA?AV?$Sequence at VAny@uno at star@sun at com@@@uno at star@sun at com@@ABV?$Sequence at VOUString@rtl@@@4567@@Z;
+?hasPropertyByName at OPropertyArrayHelper@cppu@@UAAEABVOUString at rtl@@@Z;
+?init at OPropertyArrayHelper@cppu@@AAEXE at Z;
+?queryInterface at OPropertySetHelper@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+?queryInterface at OPropertySetHelper@cppu@@W3AA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+?queryInterface at OPropertySetHelper@cppu@@W7AA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+?removePropertiesChangeListener at OPropertySetHelper@cppu@@UAAXABV?$Reference at VXPropertiesChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
+?removePropertyChangeListener at OPropertySetHelper@cppu@@UAAXABVOUString at rtl@@ABV?$Reference at VXPropertyChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
+?removeVetoableChangeListener at OPropertySetHelper@cppu@@UAAXABVOUString at rtl@@ABV?$Reference at VXVetoableChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
+?setFastPropertyValue at OPropertySetHelper@cppu@@UAAXJABVAny at uno@star at sun@com@@@Z;
+?setFastPropertyValues at OPropertySetHelper@cppu@@IAAXJPAJPBVAny at uno@star at sun@com@@J at Z;
+?setPropertyValue at OPropertySetHelper@cppu@@UAAXABVOUString at rtl@@ABVAny at uno@star at sun@com@@@Z;
+?setPropertyValues at OPropertySetHelper@cppu@@UAAXABV?$Sequence at VOUString@rtl@@@uno at star@sun at com@@ABV?$Sequence at VAny@uno at star@sun at com@@@4567@@Z;
+??0ClassDataBase at cppu@@QAE at J@Z;
+??0ClassDataBase at cppu@@QAE at XZ;
+??1ClassDataBase at cppu@@QAE at XZ;
+?getImplHelperInitMutex at cppu@@YAAAVMutex at osl@@XZ;
+?getImplementationId at ClassData@cppu@@QAA?AV?$Sequence at C@uno at star@sun at com@@XZ;
+?getTypes at ClassData@cppu@@QAA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@XZ;
+?initTypeProvider at ClassData@cppu@@QAAXXZ;
+?query at ClassData@cppu@@QAA?AVAny at uno@star at sun@com@@ABVType at 4567@PAVXTypeProvider at lang@567@@Z;
+?writeTypeOffset at ClassData@cppu@@QAAXABVType at uno@star at sun@com@@J at Z;
+?createRegistryServiceFactory at cppu@@YA?AV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@uno at star@sun at com@@ABVOUString at rtl@@0E0 at Z;
+?throwException at cppu@@YAXABVAny at uno@star at sun@com@@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@00000000000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@0000000000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@000000000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@00000000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@0000000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@000000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@00000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@0000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@000ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@00ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@0ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??0OTypeCollection at cppu@@QAE at ABVType@uno at star@sun at com@@ABV?$Sequence at VType@uno at star@sun at com@@@3456@@Z;
+??1OImplementationId at cppu@@QAE at XZ;
+?getImplementationId at OImplementationId@cppu@@QBA?AV?$Sequence at C@uno at star@sun at com@@XZ;
+?writeSharedLibComponentInfo at cppu@@YAXABVOUString at rtl@@0ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@uno at star@sun at com@@ABV?$Reference at VXRegistryKey@registry at star@sun at com@@@5678@@Z;
+?remove at OInterfaceIteratorHelper@cppu@@QAAXXZ;
+??0OWeakObject at cppu@@QAE at XZ;
+?installTypeDescriptionManager at cppu@@YAEABV?$Reference at VXHierarchicalNameAccess@container at star@sun at com@@@uno at star@sun at com@@@Z;
+?loadSharedLibComponentFactory at cppu@@YA?AV?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@ABVOUString at rtl@@00ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@3456 at ABV?$Reference at VXRegistryKey@registry at star@sun at com@@@3456@@Z;
+?createComponentContext at cppu@@YA?AV?$Reference at VXComponentContext@uno at star@sun at com@@@uno at star@sun at com@@PBUContextEntry_Init at 1@JABV23456@@Z;
+?bootstrap_InitialComponentContext at cppu@@YA?AV?$Reference at VXComponentContext@uno at star@sun at com@@@uno at star@sun at com@@ABV?$Reference at VXSimpleRegistry@registry at star@sun at com@@@3456 at ABVOUString@rtl@@@Z;
+?createNestedRegistry at cppu@@YA?AV?$Reference at VXSimpleRegistry@registry at star@sun at com@@@uno at star@sun at com@@ABVOUString at rtl@@@Z;
+?createSimpleRegistry at cppu@@YA?AV?$Reference at VXSimpleRegistry@registry at star@sun at com@@@uno at star@sun at com@@ABVOUString at rtl@@@Z;
+??0WeakAggComponentImplHelperBase at cppu@@IAE at AAVMutex@osl@@@Z;
+??0WeakComponentImplHelperBase at cppu@@IAE at AAVMutex@osl@@@Z;
+?acquire at WeakAggComponentImplHelperBase@cppu@@UAAXXZ;
+?acquire at WeakComponentImplHelperBase@cppu@@UAAXXZ;
+?addEventListener at WeakAggComponentImplHelperBase@cppu@@UAAXABV?$Reference at VXEventListener@lang at star@sun at com@@@uno at star@sun at com@@@Z;
+?addEventListener at WeakComponentImplHelperBase@cppu@@UAAXABV?$Reference at VXEventListener@lang at star@sun at com@@@uno at star@sun at com@@@Z;
+?dispose at WeakAggComponentImplHelperBase@cppu@@UAAXXZ;
+?dispose at WeakComponentImplHelperBase@cppu@@UAAXXZ;
+?queryAggregation at WeakAggComponentImplHelperBase@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+?queryInterface at WeakAggComponentImplHelperBase@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+?queryInterface at WeakComponentImplHelperBase@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+?release at WeakAggComponentImplHelperBase@cppu@@UAAXXZ;
+?release at WeakComponentImplHelperBase@cppu@@UAAXXZ;
+?removeEventListener at WeakAggComponentImplHelperBase@cppu@@UAAXABV?$Reference at VXEventListener@lang at star@sun at com@@@uno at star@sun at com@@@Z;
+?removeEventListener at WeakComponentImplHelperBase@cppu@@UAAXABV?$Reference at VXEventListener@lang at star@sun at com@@@uno at star@sun at com@@@Z;
+??1WeakAggComponentImplHelperBase at cppu@@UAE at XZ;
+??1WeakComponentImplHelperBase at cppu@@UAE at XZ;
+?disposing at WeakAggComponentImplHelperBase@cppu@@MAAXXZ;
+?disposing at WeakComponentImplHelperBase@cppu@@MAAXXZ;
+?createOneInstanceFactory at cppu@@YA?AV?$Reference at VXSingleServiceFactory@lang at star@sun at com@@@uno at star@sun at com@@ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@3456 at ABVOUString@rtl@@P6A?AV?$Reference at VXInterface@uno at star@sun at com@@@3456 at 0@ZABV?$Sequence at VOUString@rtl@@@3456 at PAU_rtl_ModuleCount@@@Z;
+?createSingleComponentFactory at cppu@@YA?AV?$Reference at VXSingleComponentFactory@lang at star@sun at com@@@uno at star@sun at com@@P6A?AV?$Reference at VXInterface@uno at star@sun at com@@@3456 at ABV?$Reference at VXComponentContext@uno at star@sun at com@@@3456@@ZABVOUString at rtl@@ABV?$Sequence at VOUString@rtl@@@3456 at PAU_rtl_ModuleCount@@@Z;
+?createSingleFactory at cppu@@YA?AV?$Reference at VXSingleServiceFactory@lang at star@sun at com@@@uno at star@sun at com@@ABV?$Reference at VXMultiServiceFactory@lang at star@sun at com@@@3456 at ABVOUString@rtl@@P6A?AV?$Reference at VXInterface@uno at star@sun at com@@@3456 at 0@ZABV?$Sequence at VOUString@rtl@@@3456 at PAU_rtl_ModuleCount@@@Z;
+?defaultBootstrap_InitialComponentContext at cppu@@YA?AV?$Reference at VXComponentContext@uno at star@sun at com@@@uno at star@sun at com@@XZ;
+?acquire at OComponentHelper@cppu@@UAAXXZ;
+?getTypes at OComponentHelper@cppu@@UAA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@XZ;
+?queryAggregation at OComponentHelper@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+?queryInterface at OComponentHelper@cppu@@UAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+?removeListener@?$OBroadcastHelperVar at VOMultiTypeInterfaceContainerHelper@cppu@@VType at uno@star at sun@com@@@cppu@@QAEXABVType at uno@star at sun@com@@ABV?$Reference at VXInterface@uno at star@sun at com@@@4567@@Z;
+??0OMultiTypeInterfaceContainerHelper at cppu@@QAE at AAVMutex@osl@@@Z;
+??0OMultiTypeInterfaceContainerHelperInt32 at cppu@@QAE at AAVMutex@osl@@@Z;
+??1OMultiTypeInterfaceContainerHelper at cppu@@QAE at XZ;
+??1OMultiTypeInterfaceContainerHelperInt32 at cppu@@QAE at XZ;
+?addInterface at OMultiTypeInterfaceContainerHelper@cppu@@QAAJABVType at uno@star at sun@com@@ABV?$Reference at VXInterface@uno at star@sun at com@@@4567@@Z;
+?addInterface at OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAJABJABV?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@@Z;
+?clear at OMultiTypeInterfaceContainerHelper@cppu@@QAAXXZ;
+?clear at OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAXXZ;
+?disposeAndClear at OMultiTypeInterfaceContainerHelper@cppu@@QAAXABUEventObject at lang@star at sun@com@@@Z;
+?disposeAndClear at OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAXABUEventObject at lang@star at sun@com@@@Z;
+?getContainedTypes at OMultiTypeInterfaceContainerHelper@cppu@@QBA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@XZ;
+?getContainedTypes at OMultiTypeInterfaceContainerHelperInt32@cppu@@QBA?AV?$Sequence at J@uno at star@sun at com@@XZ;
+?getContainer at OMultiTypeInterfaceContainerHelper@cppu@@QBAPAVOInterfaceContainerHelper at 2@ABVType at uno@star at sun@com@@@Z;
+?getContainer at OMultiTypeInterfaceContainerHelperInt32@cppu@@QBAPAVOInterfaceContainerHelper at 2@ABJ at Z;
+?removeInterface at OMultiTypeInterfaceContainerHelper@cppu@@QAAJABVType at uno@star at sun@com@@ABV?$Reference at VXInterface@uno at star@sun at com@@@4567@@Z;
+?removeInterface at OMultiTypeInterfaceContainerHelperInt32@cppu@@QAAJABJABV?$Reference at VXInterface@uno at star@sun at com@@@uno at star@sun at com@@@Z;
+??0OPropertySetHelper at cppu@@QAE at AAU?$OBroadcastHelperVar at VOMultiTypeInterfaceContainerHelper@cppu@@VType at uno@star at sun@com@@@1@@Z;
+?addListener@?$OBroadcastHelperVar at VOMultiTypeInterfaceContainerHelper@cppu@@VType at uno@star at sun@com@@@cppu@@QAEXABVType at uno@star at sun@com@@ABV?$Reference at VXInterface@uno at star@sun at com@@@4567@@Z;
+?component_writeInfoHelper at cppu@@YAEPAX0QBUImplementationEntry at 1@@Z;
+?component_getFactoryHelper at cppu@@YAPAXPBDPAX1QBUImplementationEntry at 1@@Z;
+?ImplHelper_query at cppu@@YA?AVAny at uno@star at sun@com@@ABVType at 3456@PAUclass_data at 1@PAX at Z;
+?ImplHelper_queryNoXInterface at cppu@@YA?AVAny at uno@star at sun@com@@ABVType at 3456@PAUclass_data at 1@PAX at Z;
+?ImplHelper_getTypes at cppu@@YA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@PAUclass_data at 1@@Z;
+?ImplInhHelper_getTypes at cppu@@YA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@PAUclass_data at 1@ABV23456@@Z;
+?ImplHelper_getImplementationId at cppu@@YA?AV?$Sequence at C@uno at star@sun at com@@PAUclass_data at 1@@Z;
+?WeakImplHelper_query at cppu@@YA?AVAny at uno@star at sun@com@@ABVType at 3456@PAUclass_data at 1@PAXPAVOWeakObject at 1@@Z;
+?WeakImplHelper_getTypes at cppu@@YA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@PAUclass_data at 1@@Z;
+?WeakAggImplHelper_queryAgg at cppu@@YA?AVAny at uno@star at sun@com@@ABVType at 3456@PAUclass_data at 1@PAXPAVOWeakAggObject at 1@@Z;
+?WeakAggComponentImplHelper_getTypes at cppu@@YA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@PAUclass_data at 1@@Z;
+?WeakComponentImplHelper_query at cppu@@YA?AVAny at uno@star at sun@com@@ABVType at 3456@PAUclass_data at 1@PAXPAVWeakComponentImplHelperBase at 1@@Z;
+?WeakAggImplHelper_getTypes at cppu@@YA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@PAUclass_data at 1@@Z;
+?WeakAggComponentImplHelper_queryAgg at cppu@@YA?AVAny at uno@star at sun@com@@ABVType at 3456@PAUclass_data at 1@PAXPAVWeakAggComponentImplHelperBase at 1@@Z;
+?WeakComponentImplHelper_getTypes at cppu@@YA?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@PAUclass_data at 1@@Z;
+?defaultBootstrap_InitialComponentContext at cppu@@YA?AV?$Reference at VXComponentContext@uno at star@sun at com@@@uno at star@sun at com@@ABVOUString at rtl@@@Z;
+
+??0AccessControl at cppu@@QAE at ABV?$Reference at VXComponentContext@uno at star@sun at com@@@uno at star@sun at com@@@Z;
+??0AccessControl at cppu@@QAE at ABV?$Reference at VXAccessController@security at star@sun at com@@@uno at star@sun at com@@@Z;
+??0AccessControl at cppu@@QAE at ABV01@@Z;
+?checkRuntimePermission at AccessControl@cppu@@QAAXABVOUString at rtl@@@Z;
+?checkFilePermission at AccessControl@cppu@@QAAXABVOUString at rtl@@0 at Z;
+?checkSocketPermission at AccessControl@cppu@@QAAXABVOUString at rtl@@0 at Z;
+
+??0UnoUrl at cppu@@QAE at ABV01@@Z;
+??0UnoUrl at cppu@@QAE at ABVOUString@rtl@@@Z;
+??0UnoUrlDescriptor at cppu@@QAE at ABV01@@Z;
+??0UnoUrlDescriptor at cppu@@QAE at ABVOUString@rtl@@@Z;
+??1UnoUrl at cppu@@QAE at XZ;
+??1UnoUrlDescriptor at cppu@@QAE at XZ;
+??4UnoUrl at cppu@@QAEAAV01 at ABV01@@Z;
+??4UnoUrlDescriptor at cppu@@QAEAAV01 at ABV01@@Z;
+?getConnection at UnoUrl@cppu@@QBEABVUnoUrlDescriptor at 2@XZ;
+?getDescriptor at UnoUrlDescriptor@cppu@@QBEABVOUString at rtl@@XZ;
+?getName at UnoUrlDescriptor@cppu@@QBEABVOUString at rtl@@XZ;
+?getObjectName at UnoUrl@cppu@@QBEABVOUString at rtl@@XZ;
+?getParameter at UnoUrlDescriptor@cppu@@QBE?AVOUString at rtl@@ABV34@@Z;
+?getProtocol at UnoUrl@cppu@@QBEABVUnoUrlDescriptor at 2@XZ;
+?hasParameter at UnoUrlDescriptor@cppu@@QBE_NABVOUString at rtl@@@Z;
+
+ local:
+ *;
+};
+
+UDK_3.1 {
+ global:
+ ?getCaughtException at cppu@@YA?AVAny at uno@star at sun@com@@XZ;
+
+ ??0OPropertySetHelper at cppu@@QAE at AAU?$OBroadcastHelperVar at VOMultiTypeInterfaceContainerHelper@cppu@@VType at uno@star at sun@com@@@1 at _N@Z;
+
+ ?bootstrap at cppu@@YA?AV?$Reference at VXComponentContext@uno at star@sun at com@@@uno at star@sun at com@@XZ;
+ ??0BootstrapException at cppu@@QAE at XZ;
+ ??0BootstrapException at cppu@@QAE at ABVOUString@rtl@@@Z;
+ ??0BootstrapException at cppu@@QAE at ABV01@@Z;
+ ??1BootstrapException at cppu@@UAE at XZ;
+ ??4BootstrapException at cppu@@QAEAAV01 at ABV01@@Z;
+ ?getMessage at BootstrapException@cppu@@QBEABVOUString at rtl@@XZ;
+} UDK_3_0_0;
+
+UDK_3.2 {
+ global:
+ ??1PropertySetMixinImpl at cppu@@AAE at XZ;
+ ?queryInterface at PropertySetMixinImpl@cppu@@MAA?AVAny at uno@star at sun@com@@ABVType at 4567@@Z;
+ ?getPropertySetInfo at PropertySetMixinImpl@cppu@@MAA?AV?$Reference at VXPropertySetInfo@beans at star@sun at com@@@uno at star@sun at com@@XZ;
+ ?notify at BoundListeners@PropertySetMixinImpl at cppu@@QBEXXZ;
+ ?setPropertyValue at PropertySetMixinImpl@cppu@@MAAXABVOUString at rtl@@ABVAny at uno@star at sun@com@@@Z;
+ ?getPropertyValue at PropertySetMixinImpl@cppu@@MAA?AVAny at uno@star at sun@com@@ABVOUString at rtl@@@Z;
+ ?removePropertyChangeListener at PropertySetMixinImpl@cppu@@MAAXABVOUString at rtl@@ABV?$Reference at VXPropertyChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
+ ?removeVetoableChangeListener at PropertySetMixinImpl@cppu@@MAAXABVOUString at rtl@@ABV?$Reference at VXVetoableChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
+ ?setFastPropertyValue at PropertySetMixinImpl@cppu@@MAAXJABVAny at uno@star at sun@com@@@Z;
+ ?getFastPropertyValue at PropertySetMixinImpl@cppu@@MAA?AVAny at uno@star at sun@com@@J at Z;
+ ?getPropertyValues at PropertySetMixinImpl@cppu@@MAA?AV?$Sequence at UPropertyValue@beans at star@sun at com@@@uno at star@sun at com@@XZ;
+ ?setPropertyValues at PropertySetMixinImpl@cppu@@MAAXABV?$Sequence at UPropertyValue@beans at star@sun at com@@@uno at star@sun at com@@@Z;
+ ?prepareSet at PropertySetMixinImpl@cppu@@IAEXABVOUString at rtl@@ABVAny at uno@star at sun@com@@1PAVBoundListeners at 12@@Z;
+ ??0BoundListeners at PropertySetMixinImpl@cppu@@QAE at XZ;
+ ??1BoundListeners at PropertySetMixinImpl@cppu@@QAE at XZ;
+ ??0PropertySetMixinImpl at cppu@@AAE at ABV?$Reference at VXComponentContext@uno at star@sun at com@@@uno at star@sun at com@@W4Implements at 01@ABV?$Sequence at VOUString@rtl@@@3456 at ABVType@3456@@Z;
+ ?dispose at PropertySetMixinImpl@cppu@@IAEXXZ;
+ ?addPropertyChangeListener at PropertySetMixinImpl@cppu@@MAAXABVOUString at rtl@@ABV?$Reference at VXPropertyChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
+ ?addVetoableChangeListener at PropertySetMixinImpl@cppu@@MAAXABVOUString at rtl@@ABV?$Reference at VXVetoableChangeListener@beans at star@sun at com@@@uno at star@sun at com@@@Z;
+} UDK_3.1;
+
+UDK_3.3 {
+ global:
+ ?getTypes at OPropertySetHelper@cppu@@QAE?AV?$Sequence at VType@uno at star@sun at com@@@uno at star@sun at com@@XZ;
+} UDK_3.2;
+
+UDK_3.4 { # OOo 2.4
+ global:
+ ?bootstrap_expandUri at cppu@@YA?AVOUString at rtl@@ABV23@@Z; # rtl::OUString cppu::bootstrap_expandUri(rtl::OUString const &)
+} UDK_3.3;
+
+UDK_3.5 { # OOo 3.0
+ global:
+ ??0OPropertySetHelper at cppu@@QAE at AAU?$OBroadcastHelperVar at VOMultiTypeInterfaceContainerHelper@cppu@@VType at uno@star at sun@com@@@1 at PAVIEventNotificationHook@1 at _N@Z;
+} UDK_3.4;
+
+UDK_3.6 { # OOo 3.3
+ global:
+ ?disposeWeakConnectionPoint at OWeakObject@cppu@@IAEXXZ;
+ ?clear at WeakReferenceHelper@uno at star@sun at com@@QAAXXZ;
+ ?createOneInstanceComponentFactory at cppu@@YA?AV?$Reference at VXSingleComponentFactory@lang at star@sun at com@@@uno at star@sun at com@@P6A?AV?$Reference at VXInterface@uno at star@sun at com@@@3456 at ABV?$Reference at VXComponentContext@uno at star@sun at com@@@3456@@ZABVOUString at rtl@@ABV?$Sequence at VOUString@rtl@@@3456 at PAU_rtl_ModuleCount@@@Z;
+} UDK_3.5;
+
+UDK_3.7 { # OOo 3.4
+ global:
+ ?setDependentFastPropertyValue at OPropertySetHelper@cppu@@IAEXJABVAny at uno@star at sun@com@@@Z;
+} UDK_3.6;
+
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index 791b17bdaa1b..ed30ad88dee4 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -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) )
commit 071ac25a21b22049e29b24a7b05e2a0e44d053a1
Author: Mechtilde Stehmann <mechtilde at apache.org>
AuthorDate: Sat Dec 1 13:14:51 2018 +0000
Commit: Mechtilde Stehmann <mechtilde at apache.org>
CommitDate: Sat Dec 1 13:14:51 2018 +0000
correct typo - closed #120336 https://bz.apache.org/ooo/show.cgi?id=120336
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index d00fa9be1569..952c0568a602 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -5624,7 +5624,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
{
String 1 // Description
{
- Text [ en-US ] = "Returns the discreet probability of an interval." ;
+ Text [ en-US ] = "Returns the discrete probability of an interval." ;
};
ExtraData =
{
commit c44a1a2ed2544ca6b7f077d14fbd5abbc0738f98
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Dec 1 08:11:49 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Dec 1 08:11:49 2018 +0000
Define BOOST_MEM_FN_ENABLE_CDECL only on Win32,
as it breaks the build on Win64.
Patch by: me
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 361d9cd7b1d7..50dc1baf0518 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -62,7 +62,6 @@ gb_COMPILERDEFS := \
-D_CRT_SECURE_NO_DEPRECATE \
-D_MT \
-D_DLL \
- -DBOOST_MEM_FN_ENABLE_CDECL \
-DCPPU_ENV=$(COMNAME) \
-DFULL_DESK \
-DM1500 \
@@ -75,6 +74,10 @@ ifeq ($(CPUNAME),X86_64)
gb_CPUDEFS += -D_AMD64_=1
endif
+ifeq ($(CPUNAME),INTEL)
+gb_COMPILERDEFS += -DBOOST_MEM_FN_ENABLE_CDECL
+endif
+
gb_RCDEFS := \
-DWINVER=0x0400 \
-DWIN32 \
commit 53cf5a9dc7bd383545f98e4620b57e3ed7cf95a6
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Fri Nov 30 17:26:40 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Fri Nov 30 17:26:40 2018 +0000
Detect Win32 and Win64 properly in my last patch.
Patch by: me
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk
index 57da8f5ca155..325201006fe3 100644
--- a/cppuhelper/source/makefile.mk
+++ b/cppuhelper/source/makefile.mk
@@ -175,7 +175,9 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
-.IF "$(COMNAME)"=="sunpro5"
+.IF "$(COMNAME)"=="msci"
+.ELIF "$(COMNAME)"=="mscx"
+.ELIF "$(COMNAME)"=="sunpro5"
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(GUI)$(COMNAME)"=="OS2gcc3"
SHL1VERSIONMAP=gcc3os2.map
commit 4092a8e50c05d570c37bcfe2b82001fd655e36d5
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Fri Nov 30 17:20:22 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Fri Nov 30 17:20:22 2018 +0000
Change default symbol visibility to hidden in main/cppuhelper, and export
symbols using source-level attributes (SAL_DLLPUBLIC_EXPORT) instead.
Stop using the .map file for Windows, and rely only on the above to control
symbol visibility.
This is not a perfect solution, as the exported symbols lack some typeinfos
compared to before, but it doesn't seem to break anything, and a full symbol
audit needs to be done later to fix other modules anyway.
Also added some files to get it to build with gbuild, which are currently
unused, as the gbuild build seems to break in main/i18npool.
Patch by: me
diff --git a/cppuhelper/GoogleTest_cppuhelper_ifcontainer.mk b/cppuhelper/GoogleTest_cppuhelper_ifcontainer.mk
new file mode 100644
index 000000000000..3fdc66ab9701
--- /dev/null
+++ b/cppuhelper/GoogleTest_cppuhelper_ifcontainer.mk
@@ -0,0 +1,48 @@
+###############################################################
+#
+# 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.
+#
+###############################################################
+
+
+$(eval $(call gb_GoogleTest_GoogleTest,cppuhelper_ifcontainer))
+
+$(eval $(call gb_GoogleTest_add_exception_objects,cppuhelper_ifcontainer, \
+ cppuhelper/qa/ifcontainer/cppu_ifcontainer \
+ cppuhelper/qa/ifcontainer/main \
+))
+
+$(eval $(call gb_GoogleTest_set_include,cppuhelper_ifcontainer,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/cppuhelper/inc \
+ -I$(SRCDIR)/cppuhelper/inc/pch \
+))
+
+$(eval $(call gb_GoogleTest_add_api,cppuhelper_ifcontainer, \
+ udkapi \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,cppuhelper_ifcontainer, \
+ cppu \
+ cppuhelper \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/GoogleTest_cppuhelper_unourl.mk b/cppuhelper/GoogleTest_cppuhelper_unourl.mk
new file mode 100644
index 000000000000..a5aee4ea050c
--- /dev/null
+++ b/cppuhelper/GoogleTest_cppuhelper_unourl.mk
@@ -0,0 +1,43 @@
+###############################################################
+#
+# 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.
+#
+###############################################################
+
+
+$(eval $(call gb_GoogleTest_GoogleTest,cppuhelper_unourl))
+
+$(eval $(call gb_GoogleTest_add_exception_objects,cppuhelper_unourl, \
+ cppuhelper/qa/unourl/cppu_unourl \
+))
+
+$(eval $(call gb_GoogleTest_set_include,cppuhelper_unourl,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/cppuhelper/inc \
+ -I$(SRCDIR)/cppuhelper/inc/pch \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,cppuhelper_unourl, \
+ cppu \
+ cppuhelper \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
new file mode 100644
index 000000000000..963a3f9b1e08
--- /dev/null
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -0,0 +1,173 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,cppuhelper))
+
+$(eval $(call gb_Library_add_package_headers,cppuhelper,cppuhelper_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,cppuhelper,$(SRCDIR)/formula/inc/pch/precompiled_cppuhelper))
+
+ifeq ($(COMNAME),msci)
+$(eval $(call gb_Library_set_versionmap,cppuhelper,$(SRCDIR)/cppuhelper/source/msvc_win32_intel.map))
+else ifeq ($(COMNAME),sunpro5)
+$(eval $(call gb_Library_set_versionmap,cppuhelper,$(SRCDIR)/cppuhelper/source/cc5_solaris_sparc.map))
+else ifeq ($(GUI)$(COMNAME),OS2gcc3)
+$(eval $(call gb_Library_set_versionmap,cppuhelper,$(SRCDIR)/cppuhelper/source/gcc3os2.map))
+else
+#$(eval $(call gb_Library_set_versionmap,cppuhelper,$(SRCDIR)/cppuhelper/source/gcc3.map))
+endif
+
+
+$(eval $(call gb_Library_set_include,cppuhelper,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/cppuhelper/inc \
+ -I$(SRCDIR)/cppuhelper/inc/pch \
+ -I$(OUTDIR)/inc \
+))
+
+# cppuhelper/private_types \
+
+# offapi \
+
+$(eval $(call gb_Library_add_api,cppuhelper, \
+ udkapi \
+))
+
+$(eval $(call gb_Library_set_private_api,cppuhelper,$(OUTDIR)/bin/types.rdb,\
+ $(SRCDIR)/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl,\
+ cppuhelper.detail.XExceptionThrower \
+))
+
+$(eval $(call gb_Library_set_private_extract_of_public_api,cppuhelper,$(OUTDIR)/bin/udkapi.rdb,\
+ com.sun.star.beans.PropertyAttribute \
+ com.sun.star.beans.PropertyValue \
+ com.sun.star.beans.XFastPropertySet \
+ com.sun.star.beans.XMultiPropertySet \
+ com.sun.star.beans.XPropertyAccess \
+ com.sun.star.beans.XPropertySet \
+ com.sun.star.bridge.UnoUrlResolver \
+ com.sun.star.bridge.XUnoUrlResolver \
+ com.sun.star.connection.SocketPermission \
+ com.sun.star.container.XContentEnumerationAccess \
+ com.sun.star.container.XElementAccess \
+ com.sun.star.container.XEnumerationAccess \
+ com.sun.star.container.XHierarchicalNameAccess \
+ com.sun.star.container.XNameAccess \
+ com.sun.star.container.XNameReplace \
+ com.sun.star.container.XNameContainer \
+ com.sun.star.container.XSet \
+ com.sun.star.io.FilePermission \
+ com.sun.star.io.IOException \
+ com.sun.star.lang.DisposedException \
+ com.sun.star.lang.WrappedTargetRuntimeException \
+ com.sun.star.lang.XComponent \
+ com.sun.star.lang.XEventListener \
+ com.sun.star.lang.XInitialization \
+ com.sun.star.lang.XMultiComponentFactory \
+ com.sun.star.lang.XMultiServiceFactory \
+ com.sun.star.lang.XServiceInfo \
+ com.sun.star.lang.XSingleComponentFactory \
+ com.sun.star.lang.XSingleServiceFactory \
+ com.sun.star.lang.XUnoTunnel \
+ com.sun.star.lang.XTypeProvider \
+ com.sun.star.loader.XImplementationLoader \
+ com.sun.star.reflection.XArrayTypeDescription \
+ com.sun.star.reflection.XCompoundTypeDescription \
+ com.sun.star.reflection.XEnumTypeDescription \
+ com.sun.star.reflection.XIdlClass \
+ com.sun.star.reflection.XIdlClassProvider \
+ com.sun.star.reflection.XIdlField2 \
+ com.sun.star.reflection.XIdlReflection \
+ com.sun.star.reflection.XIndirectTypeDescription \
+ com.sun.star.reflection.XInterfaceAttributeTypeDescription \
+ com.sun.star.reflection.XInterfaceAttributeTypeDescription2 \
+ com.sun.star.reflection.XInterfaceMemberTypeDescription \
+ com.sun.star.reflection.XInterfaceMethodTypeDescription \
+ com.sun.star.reflection.XInterfaceTypeDescription2 \
+ com.sun.star.reflection.XMethodParameter \
+ com.sun.star.reflection.XStructTypeDescription \
+ com.sun.star.reflection.XTypeDescription \
+ com.sun.star.reflection.XUnionTypeDescription \
+ com.sun.star.registry.XImplementationRegistration \
+ com.sun.star.registry.XRegistryKey \
+ com.sun.star.registry.XSimpleRegistry \
+ com.sun.star.security.RuntimePermission \
+ com.sun.star.security.XAccessController \
+ com.sun.star.uno.DeploymentException \
+ com.sun.star.uno.RuntimeException \
+ com.sun.star.uno.XAggregation \
+ com.sun.star.uno.XComponentContext \
+ com.sun.star.uno.XCurrentContext \
+ com.sun.star.uno.XUnloadingPreference \
+ com.sun.star.uno.XWeak \
+ com.sun.star.util.XMacroExpander \
+))
+
+$(eval $(call gb_Library_add_defs,cppuhelper,\
+ -DCPPUHELPER_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,cppuhelper,\
+ cppu \
+ sal \
+ salhelper \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,cppuhelper,\
+ advapi32 \
+))
+endif
+
+$(eval $(call gb_Library_add_cobjects,cppuhelper,\
+ cppuhelper/source/findsofficepath \
+))
+
+$(eval $(call gb_Library_add_exception_objects,cppuhelper,\
+ cppuhelper/source/access_control \
+ cppuhelper/source/bootstrap \
+ cppuhelper/source/component \
+ cppuhelper/source/component_context \
+ cppuhelper/source/exc_thrower \
+ cppuhelper/source/factory \
+ cppuhelper/source/implbase \
+ cppuhelper/source/implbase_ex \
+ cppuhelper/source/implementationentry \
+ cppuhelper/source/interfacecontainer \
+ cppuhelper/source/macro_expander \
+ cppuhelper/source/primeweak \
+ cppuhelper/source/propertysetmixin \
+ cppuhelper/source/propshlp \
+ cppuhelper/source/servicefactory \
+ cppuhelper/source/stdidlclass \
+ cppuhelper/source/shlib \
+ cppuhelper/source/tdmgr \
+ cppuhelper/source/typeprovider \
+ cppuhelper/source/unourl \
+ cppuhelper/source/weak \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/cppuhelper/Makefile b/cppuhelper/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/cppuhelper/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk
new file mode 100644
index 000000000000..b0aebdcaea90
--- /dev/null
+++ b/cppuhelper/Module_cppuhelper.mk
@@ -0,0 +1,37 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,cppuhelper))
+
+$(eval $(call gb_Module_add_targets,cppuhelper,\
+ GoogleTest_cppuhelper_ifcontainer \
+ GoogleTest_cppuhelper_unourl \
+ Library_cppuhelper \
+ Package_inc \
+ Package_findsofficepath \
+ Package_unorc \
+))
+
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/Package_findsofficepath.mk b/cppuhelper/Package_findsofficepath.mk
new file mode 100644
index 000000000000..6a47f7dab902
--- /dev/null
+++ b/cppuhelper/Package_findsofficepath.mk
@@ -0,0 +1,31 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,cppuhelper_findsofficepath,$(WORKDIR)/CObject/cppuhelper/source))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.obj,findsofficepath.obj))
+else
+$(eval $(call gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.o,findsofficepath.o))
+endif
+
diff --git a/cppuhelper/Package_inc.mk b/cppuhelper/Package_inc.mk
new file mode 100644
index 000000000000..8a0d058f5a07
--- /dev/null
+++ b/cppuhelper/Package_inc.mk
@@ -0,0 +1,80 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,cppuhelper_inc,$(SRCDIR)/cppuhelper/inc))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase.hxx,cppuhelper/implbase.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex.hxx,cppuhelper/implbase_ex.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex_pre.hxx,cppuhelper/implbase_ex_pre.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase_ex_post.hxx,cppuhelper/implbase_ex_post.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase1.hxx,cppuhelper/implbase1.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase2.hxx,cppuhelper/implbase2.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase3.hxx,cppuhelper/implbase3.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase4.hxx,cppuhelper/implbase4.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase5.hxx,cppuhelper/implbase5.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase6.hxx,cppuhelper/implbase6.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase7.hxx,cppuhelper/implbase7.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase8.hxx,cppuhelper/implbase8.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase9.hxx,cppuhelper/implbase9.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase10.hxx,cppuhelper/implbase10.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase11.hxx,cppuhelper/implbase11.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implbase12.hxx,cppuhelper/implbase12.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase.hxx,cppuhelper/compbase.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase_ex.hxx,cppuhelper/compbase_ex.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase1.hxx,cppuhelper/compbase1.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase2.hxx,cppuhelper/compbase2.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase3.hxx,cppuhelper/compbase3.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase4.hxx,cppuhelper/compbase4.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase5.hxx,cppuhelper/compbase5.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase6.hxx,cppuhelper/compbase6.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase7.hxx,cppuhelper/compbase7.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase8.hxx,cppuhelper/compbase8.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase9.hxx,cppuhelper/compbase9.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase10.hxx,cppuhelper/compbase10.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase11.hxx,cppuhelper/compbase11.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/compbase12.hxx,cppuhelper/compbase12.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/shlib.hxx,cppuhelper/shlib.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/basemutex.hxx,cppuhelper/basemutex.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/bootstrap.hxx,cppuhelper/bootstrap.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/exc_hlp.hxx,cppuhelper/exc_hlp.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/typeprovider.hxx,cppuhelper/typeprovider.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/factory.hxx,cppuhelper/factory.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/component_context.hxx,cppuhelper/component_context.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/interfacecontainer.hxx,cppuhelper/interfacecontainer.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/interfacecontainer.h,cppuhelper/interfacecontainer.h))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/component.hxx,cppuhelper/component.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/propshlp.hxx,cppuhelper/propshlp.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/proptypehlp.hxx,cppuhelper/proptypehlp.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/propertysetmixin.hxx,cppuhelper/propertysetmixin.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/proptypehlp.h,cppuhelper/proptypehlp.h))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/stdidlclass.hxx,cppuhelper/stdidlclass.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weak.hxx,cppuhelper/weak.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weakagg.hxx,cppuhelper/weakagg.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/queryinterface.hxx,cppuhelper/queryinterface.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weakref.hxx,cppuhelper/weakref.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/servicefactory.hxx,cppuhelper/servicefactory.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/implementationentry.hxx,cppuhelper/implementationentry.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/access_control.hxx,cppuhelper/access_control.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/unourl.hxx,cppuhelper/unourl.hxx))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/cppuhelperdllapi.h,cppuhelper/cppuhelperdllapi.h))
+$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/findsofficepath.h,cppuhelper/findsofficepath.h))
+
diff --git a/cppuhelper/Package_unorc.mk b/cppuhelper/Package_unorc.mk
new file mode 100644
index 000000000000..1f13bf801836
--- /dev/null
+++ b/cppuhelper/Package_unorc.mk
@@ -0,0 +1,28 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,cppuhelper_unorc,$(SRCDIR)/cppuhelper/source))
+
+$(eval $(call gb_Package_add_file,cppuhelper_unorc,bin/uno.ini,unorc))
+$(eval $(call gb_Package_add_file,cppuhelper_unorc,lib/unorc,unorc))
+
diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx
index 53afcdd783ef..54964ec87ef2 100644
--- a/cppuhelper/inc/cppuhelper/access_control.hxx
+++ b/cppuhelper/inc/cppuhelper/access_control.hxx
@@ -26,13 +26,15 @@
#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 AccessControl
+class CPPUHELPER_DLLPUBLIC 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 e222164f1b36..2b28624620b5 100644
--- a/cppuhelper/inc/cppuhelper/bootstrap.hxx
+++ b/cppuhelper/inc/cppuhelper/bootstrap.hxx
@@ -29,6 +29,8 @@
#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; }
@@ -43,6 +45,7 @@ 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() )
@@ -53,6 +56,7 @@ 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() )
@@ -63,6 +67,7 @@ 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( () );
@@ -78,6 +83,7 @@ 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,
@@ -104,6 +110,7 @@ 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) );
@@ -128,6 +135,7 @@ 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) );
@@ -136,7 +144,7 @@ defaultBootstrap_InitialComponentContext(const ::rtl::OUString & iniFile) SAL_TH
*
* @since UDK 3.2.0
*/
-class BootstrapException
+class CPPUHELPER_DLLPUBLIC BootstrapException
{
public:
/**
@@ -189,6 +197,7 @@ private:
*
* @since UDK 3.2.0
*/
+CPPUHELPER_DLLPUBLIC
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
SAL_CALL bootstrap();
@@ -211,6 +220,7 @@ 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 847fdb7483cc..bb67f1f1649f 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 SAL_NO_VTABLE WeakComponentImplHelperBase
+class CPPUHELPER_DLLPUBLIC 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 SAL_NO_VTABLE WeakAggComponentImplHelperBase
+class CPPUHELPER_DLLPUBLIC SAL_NO_VTABLE WeakAggComponentImplHelperBase
: public ::cppu::OWeakAggObject
, public ::com::sun::star::lang::XComponent
{
@@ -138,6 +138,7 @@ public:
/** WeakComponentImplHelper
@internal
*/
+CPPUHELPER_DLLPUBLIC
::com::sun::star::uno::Any SAL_CALL WeakComponentImplHelper_query(
::com::sun::star::uno::Type const & rType,
class_data * cd,
@@ -147,6 +148,7 @@ public:
/** 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) );
@@ -154,6 +156,7 @@ public:
/** WeakAggComponentImplHelper
@internal
*/
+CPPUHELPER_DLLPUBLIC
::com::sun::star::uno::Any SAL_CALL WeakAggComponentImplHelper_queryAgg(
::com::sun::star::uno::Type const & rType,
class_data * cd,
@@ -163,6 +166,7 @@ public:
/** 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 d1bdc0ff1740..2fb7edee5215 100644
--- a/cppuhelper/inc/cppuhelper/component.hxx
+++ b/cppuhelper/inc/cppuhelper/component.hxx
@@ -34,6 +34,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
+#include "cppuhelper/cppuhelperdllapi.h"
namespace cppu
{
@@ -47,7 +48,7 @@ namespace cppu
The life-cycle of the passed mutex reference has to be longer than objects of this class.
@deprecated
*/
-class OComponentHelper
+class CPPUHELPER_DLLPUBLIC 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 43a7ece4b4ac..780782d51aca 100644
--- a/cppuhelper/inc/cppuhelper/component_context.hxx
+++ b/cppuhelper/inc/cppuhelper/component_context.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
+#include "cppuhelper/cppuhelperdllapi.h"
namespace cppu
{
@@ -80,6 +81,7 @@ 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 e69de29bb2d1..3019cbb25725 100644
--- a/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
+++ b/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h
@@ -0,0 +1,37 @@
+/**************************************************************
+ *
+ * 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 7dd981b406d5..a70171f1706f 100644
--- a/cppuhelper/inc/cppuhelper/exc_hlp.hxx
+++ b/cppuhelper/inc/cppuhelper/exc_hlp.hxx
@@ -26,6 +26,8 @@
#include <com/sun/star/uno/Any.hxx>
+#include "cppuhelper/cppuhelperdllapi.h"
+
namespace cppu
{
@@ -36,7 +38,7 @@ namespace cppu
@param rExc
exception to be thrown.
*/
-void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc )
+CPPUHELPER_DLLPUBLIC 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;
@@ -86,7 +88,7 @@ void SAL_CALL throwException( const ::com::sun::star::uno::Any & rExc )
development, because the whole OOo code base is compiled using the
same C++ compiler (and linking against one runtime library).
*/
-::com::sun::star::uno::Any SAL_CALL getCaughtException();
+CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL getCaughtException();
}
diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx
index b58976ef1e37..93819d357e79 100644
--- a/cppuhelper/inc/cppuhelper/factory.hxx
+++ b/cppuhelper/inc/cppuhelper/factory.hxx
@@ -33,6 +33,8 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/registry/XRegistryKey.hpp>
+#include "cppuhelper/cppuhelperdllapi.h"
+
//##################################################################################################
#define COMPONENT_GETENV "component_getImplementationEnvironment"
@@ -138,6 +140,7 @@ 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,
@@ -155,6 +158,7 @@ SAL_CALL createSingleComponentFactory(
@see createSingleComponentFactory
*/
+CPPUHELPER_DLLPUBLIC
::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > SAL_CALL
createOneInstanceComponentFactory(
ComponentFactoryFunc fptr,
@@ -185,6 +189,7 @@ 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,
@@ -208,6 +213,7 @@ 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,
@@ -227,6 +233,7 @@ 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,
@@ -245,6 +252,7 @@ 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,
@@ -263,6 +271,7 @@ createOneInstanceFactory(
@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 6a6c90598d01..e73c50bac4f2 100644
--- a/cppuhelper/inc/cppuhelper/implbase.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase.hxx
@@ -31,6 +31,8 @@
#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
*/
@@ -55,7 +57,7 @@ struct Type_Offset
Not for plublic use.
@internal
*/
-struct ClassDataBase
+struct CPPUHELPER_DLLPUBLIC ClassDataBase
{
/** determines whether the class data has been statically initialized
*/
@@ -100,7 +102,7 @@ struct ClassDataBase
Not for plublic use.
@internal
*/
-struct ClassData : public ClassDataBase
+struct CPPUHELPER_DLLPUBLIC ClassData : public ClassDataBase
{
/** type entries array
*/
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list