[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 10 commits - cppuhelper/inc cppuhelper/Library_cppuhelper.mk cppuhelper/Package_findsofficepath.mk cppuhelper/prj cppuhelper/source i18npool/source Module_ooo.mk odk/pack odk/source sc/Library_scui.mk sfx2/GoogleTest_sfx2_metadatable.mk solenv/gbuild
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 3 19:08:19 UTC 2018
Module_ooo.mk | 1
cppuhelper/Library_cppuhelper.mk | 12
cppuhelper/Package_findsofficepath.mk | 6
cppuhelper/inc/cppuhelper/access_control.hxx | 4
cppuhelper/inc/cppuhelper/bootstrap.hxx | 12
cppuhelper/inc/cppuhelper/compbase_ex.hxx | 10
cppuhelper/inc/cppuhelper/component.hxx | 3
cppuhelper/inc/cppuhelper/component_context.hxx | 2
cppuhelper/inc/cppuhelper/cppuhelperdllapi.h | 37 ++
cppuhelper/inc/cppuhelper/exc_hlp.hxx | 6
cppuhelper/inc/cppuhelper/factory.hxx | 9
cppuhelper/inc/cppuhelper/implbase.hxx | 8
cppuhelper/inc/cppuhelper/implbase1.hxx | 2
cppuhelper/inc/cppuhelper/implbase10.hxx | 2
cppuhelper/inc/cppuhelper/implbase11.hxx | 2
cppuhelper/inc/cppuhelper/implbase12.hxx | 2
cppuhelper/inc/cppuhelper/implbase2.hxx | 2
cppuhelper/inc/cppuhelper/implbase3.hxx | 2
cppuhelper/inc/cppuhelper/implbase4.hxx | 2
cppuhelper/inc/cppuhelper/implbase5.hxx | 2
cppuhelper/inc/cppuhelper/implbase6.hxx | 2
cppuhelper/inc/cppuhelper/implbase7.hxx | 2
cppuhelper/inc/cppuhelper/implbase8.hxx | 2
cppuhelper/inc/cppuhelper/implbase9.hxx | 2
cppuhelper/inc/cppuhelper/implbase_ex.hxx | 15 -
cppuhelper/inc/cppuhelper/implementationentry.hxx | 5
cppuhelper/inc/cppuhelper/interfacecontainer.h | 8
cppuhelper/inc/cppuhelper/propertysetmixin.hxx | 5
cppuhelper/inc/cppuhelper/propshlp.hxx | 9
cppuhelper/inc/cppuhelper/servicefactory.hxx | 2
cppuhelper/inc/cppuhelper/shlib.hxx | 3
cppuhelper/inc/cppuhelper/stdidlclass.hxx | 2
cppuhelper/inc/cppuhelper/typeprovider.hxx | 5
cppuhelper/inc/cppuhelper/unourl.hxx | 6
cppuhelper/inc/cppuhelper/weak.hxx | 3
cppuhelper/inc/cppuhelper/weakagg.hxx | 3
cppuhelper/inc/cppuhelper/weakref.hxx | 4
cppuhelper/prj/build.lst | 8
cppuhelper/prj/d.lst | 74 -----
cppuhelper/prj/makefile.mk | 44 +++
cppuhelper/source/bootstrap.cxx | 2
cppuhelper/source/makefile.mk | 5
cppuhelper/source/msvc_win32_intel.map | 306 ----------------------
cppuhelper/source/primeweak.cxx | 94 +++---
cppuhelper/source/servicefactory.cxx | 1
i18npool/source/textconversion/data/makefile.mk | 1
odk/pack/gendocu/makefile.mk | 1
odk/source/unoapploader/unx/makefile.mk | 2
sc/Library_scui.mk | 1
sfx2/GoogleTest_sfx2_metadatable.mk | 2
solenv/gbuild/TargetLocations.mk | 2
51 files changed, 250 insertions(+), 497 deletions(-)
New commits:
commit 13c84a5c75ee0b8c0229123fe76d65620644e410
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Mon Dec 3 18:03:46 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Mon Dec 3 18:03:46 2018 +0000
Link main/i18npool's textconv_dict to cppu and cppuhelper.
Patch by: me
diff --git a/i18npool/source/textconversion/data/makefile.mk b/i18npool/source/textconversion/data/makefile.mk
index f6ad14aa8d22..832a819c9db8 100644
--- a/i18npool/source/textconversion/data/makefile.mk
+++ b/i18npool/source/textconversion/data/makefile.mk
@@ -32,6 +32,7 @@ LIBTARGET=NO
.IF "$(COMEX)" != "8"
CDEFS+=-Zm300
.ENDIF
+SHL1STDLIBS+= $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
.ENDIF
# --- Files --------------------------------------------------------
commit 84f425854b2f66f5b5441323c4ecbcf05ee913e4
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Mon Dec 3 18:02:46 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Mon Dec 3 18:02:46 2018 +0000
Finally port main/cppuhelper to gbuild.
The problem before was apparently that including udkapi
ended up using the solver headers, instead of our
generated "comprehensive" headers.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 3a4e4f17539b..d7ce54c26135 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
configmgr \
cosv \
cppcanvas \
+ cppuhelper \
cpputools \
cui \
dbaccess \
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index 963a3f9b1e08..e82d413faa26 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -28,13 +28,13 @@ $(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),mscx)
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))
+$(eval $(call gb_Library_set_versionmap,cppuhelper,$(SRCDIR)/cppuhelper/source/gcc3.map))
endif
@@ -45,14 +45,6 @@ $(eval $(call gb_Library_set_include,cppuhelper,\
-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 \
diff --git a/cppuhelper/Package_findsofficepath.mk b/cppuhelper/Package_findsofficepath.mk
index 6a47f7dab902..069da9a8f4f2 100644
--- a/cppuhelper/Package_findsofficepath.mk
+++ b/cppuhelper/Package_findsofficepath.mk
@@ -23,9 +23,7 @@
$(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
+# For Windows:
+$(eval $(call gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.obj,findsofficepath.o))
diff --git a/cppuhelper/prj/build.lst b/cppuhelper/prj/build.lst
index f43ef4ad8051..5dd703e6533c 100644
--- a/cppuhelper/prj/build.lst
+++ b/cppuhelper/prj/build.lst
@@ -1,8 +1,2 @@
ch cppuhelper : BOOST:boost LIBXSLT:libxslt codemaker cppu offapi NULL
-ch cppuhelper usr1 - all ch_mkout NULL
-ch cppuhelper\inc nmake - all ch_include NULL
-ch cppuhelper\source nmake - all ch_source ch_unotypes ch_include NULL
-ch cppuhelper\unotypes nmake - all ch_unotypes NULL
-ch cppuhelper\qa\ifcontainer nmake - all ch_qa_ifcontainer ch_source ch_include ch_unotypes NULL
-ch cppuhelper\qa\unourl nmake - all ch_qa_unourl ch_source ch_include ch_unotypes NULL
-ch cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_source NULL
+ch cppuhelper\prj nmake - all ch_prj NULL
diff --git a/cppuhelper/prj/d.lst b/cppuhelper/prj/d.lst
index 6c987559dbe9..e69de29bb2d1 100644
--- a/cppuhelper/prj/d.lst
+++ b/cppuhelper/prj/d.lst
@@ -1,75 +0,0 @@
-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
-..\inc\cppuhelper\implbase_ex_post.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase_ex_post.hxx
-..\inc\cppuhelper\implbase1.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase1.hxx
-..\inc\cppuhelper\implbase2.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase2.hxx
-..\inc\cppuhelper\implbase3.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase3.hxx
-..\inc\cppuhelper\implbase4.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase4.hxx
-..\inc\cppuhelper\implbase5.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase5.hxx
-..\inc\cppuhelper\implbase6.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase6.hxx
-..\inc\cppuhelper\implbase7.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase7.hxx
-..\inc\cppuhelper\implbase8.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase8.hxx
-..\inc\cppuhelper\implbase9.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase9.hxx
-..\inc\cppuhelper\implbase10.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase10.hxx
-..\inc\cppuhelper\implbase11.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase11.hxx
-..\inc\cppuhelper\implbase12.hxx %_DEST%\inc%_EXT%\cppuhelper\implbase12.hxx
-
-..\inc\cppuhelper\compbase.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase.hxx
-..\inc\cppuhelper\compbase_ex.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase_ex.hxx
-..\inc\cppuhelper\compbase1.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase1.hxx
-..\inc\cppuhelper\compbase2.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase2.hxx
-..\inc\cppuhelper\compbase3.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase3.hxx
-..\inc\cppuhelper\compbase4.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase4.hxx
-..\inc\cppuhelper\compbase5.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase5.hxx
-..\inc\cppuhelper\compbase6.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase6.hxx
-..\inc\cppuhelper\compbase7.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase7.hxx
-..\inc\cppuhelper\compbase8.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase8.hxx
-..\inc\cppuhelper\compbase9.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase9.hxx
-..\inc\cppuhelper\compbase10.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase10.hxx
-..\inc\cppuhelper\compbase11.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase11.hxx
-..\inc\cppuhelper\compbase12.hxx %_DEST%\inc%_EXT%\cppuhelper\compbase12.hxx
-
-..\inc\cppuhelper\shlib.hxx %_DEST%\inc%_EXT%\cppuhelper\shlib.hxx
-..\inc\cppuhelper\basemutex.hxx %_DEST%\inc%_EXT%\cppuhelper\basemutex.hxx
-..\inc\cppuhelper\bootstrap.hxx %_DEST%\inc%_EXT%\cppuhelper\bootstrap.hxx
-..\inc\cppuhelper\exc_hlp.hxx %_DEST%\inc%_EXT%\cppuhelper\exc_hlp.hxx
-..\inc\cppuhelper\typeprovider.hxx %_DEST%\inc%_EXT%\cppuhelper\typeprovider.hxx
-..\inc\cppuhelper\factory.hxx %_DEST%\inc%_EXT%\cppuhelper\factory.hxx
-..\inc\cppuhelper\component_context.hxx %_DEST%\inc%_EXT%\cppuhelper\component_context.hxx
-..\inc\cppuhelper\interfacecontainer.hxx %_DEST%\inc%_EXT%\cppuhelper\interfacecontainer.hxx
-..\inc\cppuhelper\interfacecontainer.h %_DEST%\inc%_EXT%\cppuhelper\interfacecontainer.h
-..\inc\cppuhelper\component.hxx %_DEST%\inc%_EXT%\cppuhelper\component.hxx
-..\inc\cppuhelper\propshlp.hxx %_DEST%\inc%_EXT%\cppuhelper\propshlp.hxx
-..\inc\cppuhelper\proptypehlp.hxx %_DEST%\inc%_EXT%\cppuhelper\proptypehlp.hxx
-..\inc\cppuhelper\propertysetmixin.hxx %_DEST%\inc%_EXT%\cppuhelper\propertysetmixin.hxx
-..\inc\cppuhelper\proptypehlp.h %_DEST%\inc%_EXT%\cppuhelper\proptypehlp.h
-..\inc\cppuhelper\stdidlclass.hxx %_DEST%\inc%_EXT%\cppuhelper\stdidlclass.hxx
-..\inc\cppuhelper\weak.hxx %_DEST%\inc%_EXT%\cppuhelper\weak.hxx
-..\inc\cppuhelper\weakagg.hxx %_DEST%\inc%_EXT%\cppuhelper\weakagg.hxx
-..\inc\cppuhelper\queryinterface.hxx %_DEST%\inc%_EXT%\cppuhelper\queryinterface.hxx
-..\inc\cppuhelper\weakref.hxx %_DEST%\inc%_EXT%\cppuhelper\weakref.hxx
-..\inc\cppuhelper\servicefactory.hxx %_DEST%\inc%_EXT%\cppuhelper\servicefactory.hxx
-..\inc\cppuhelper\implementationentry.hxx %_DEST%\inc%_EXT%\cppuhelper\implementationentry.hxx
-..\inc\cppuhelper\access_control.hxx %_DEST%\inc%_EXT%\cppuhelper\access_control.hxx
-..\inc\cppuhelper\unourl.hxx %_DEST%\inc%_EXT%\cppuhelper\unourl.hxx
-
-..\%__SRC%\bin\cppuh*.dll %_DEST%\bin%_EXT%\cppuh*.dll
-..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib%_EXT%\*
-
-..\%__SRC%\lib\libuno_cppuhelper*.*.* %_DEST%\lib%_EXT%\*
-
-..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\cppuh*.lib %_DEST%\lib%_EXT%\*
-
-..\source\unorc %_DEST%\bin%_EXT%\uno.ini
-..\source\unorc %_DEST%\lib%_EXT%\unorc
-
-..\inc\cppuhelper\findsofficepath.h %_DEST%\inc%_EXT%\cppuhelper\findsofficepath.h
-..\%__SRC%\obj\findsofficepath.o %_DEST%\lib%_EXT%\findsofficepath.o
-..\%__SRC%\obj\findsofficepath.obj %_DEST%\lib%_EXT%\findsofficepath.obj
-
-linklib: libuno_cppuhelper*.*.*
diff --git a/cppuhelper/prj/makefile.mk b/cppuhelper/prj/makefile.mk
new file mode 100644
index 000000000000..c62c6a657d16
--- /dev/null
+++ b/cppuhelper/prj/makefile.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 3ada9e9d4a43..a1e5507ffd12 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -48,7 +48,7 @@
#include "cppuhelper/access_control.hxx"
#include "cppuhelper/findsofficepath.h"
-#include <cppuhelper/com/sun/star/container/XElementAccess.hpp>
+#include "com/sun/star/container/XElementAccess.hpp"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XCurrentContext.hpp"
diff --git a/cppuhelper/source/primeweak.cxx b/cppuhelper/source/primeweak.cxx
index 8b65d52412c4..4ba9ad8c3bdf 100644
--- a/cppuhelper/source/primeweak.cxx
+++ b/cppuhelper/source/primeweak.cxx
@@ -44,53 +44,53 @@
// NOTE: the cppuhelper part in the include paths below ensures that the type descriptions
// are comprehensive descriptions and not some weak descriptions e.g. from solver
-#include "cppuhelper/com/sun/star/lang/XComponent.hpp"
-#include "cppuhelper/com/sun/star/lang/XInitialization.hpp"
-#include "cppuhelper/com/sun/star/lang/XSingleServiceFactory.hpp"
-#include "cppuhelper/com/sun/star/lang/XSingleComponentFactory.hpp"
-#include "cppuhelper/com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "cppuhelper/com/sun/star/lang/XMultiComponentFactory.hpp"
-#include "cppuhelper/com/sun/star/lang/XServiceInfo.hpp"
-#include "cppuhelper/com/sun/star/lang/XEventListener.hpp"
-#include "cppuhelper/com/sun/star/lang/XTypeProvider.hpp"
-#include "cppuhelper/com/sun/star/lang/XUnoTunnel.hpp"
-#include "cppuhelper/com/sun/star/lang/DisposedException.hpp"
-#include "cppuhelper/com/sun/star/uno/DeploymentException.hpp"
-#include "cppuhelper/com/sun/star/uno/XWeak.hpp"
-#include "cppuhelper/com/sun/star/uno/XCurrentContext.hpp"
-#include "cppuhelper/com/sun/star/uno/XComponentContext.hpp"
-#include "cppuhelper/com/sun/star/uno/RuntimeException.hpp"
-#include "cppuhelper/com/sun/star/util/XMacroExpander.hpp"
-#include "cppuhelper/com/sun/star/beans/PropertyValue.hpp"
-#include "cppuhelper/com/sun/star/beans/XPropertySet.hpp"
-#include "cppuhelper/com/sun/star/beans/XMultiPropertySet.hpp"
-#include "cppuhelper/com/sun/star/container/XContentEnumerationAccess.hpp"
-#include "cppuhelper/com/sun/star/container/XEnumerationAccess.hpp"
-#include "cppuhelper/com/sun/star/container/XEnumeration.hpp"
-#include "cppuhelper/com/sun/star/container/XNameAccess.hpp"
-#include "cppuhelper/com/sun/star/container/XNameReplace.hpp"
-#include "cppuhelper/com/sun/star/container/XNameContainer.hpp"
-#include "cppuhelper/com/sun/star/container/XHierarchicalNameAccess.hpp"
-#include "cppuhelper/com/sun/star/container/XSet.hpp"
-#include "cppuhelper/com/sun/star/bridge/XUnoUrlResolver.hpp"
-#include "cppuhelper/com/sun/star/io/IOException.hpp"
-#include "cppuhelper/com/sun/star/io/FilePermission.hpp"
-#include "cppuhelper/com/sun/star/security/RuntimePermission.hpp"
-#include "cppuhelper/com/sun/star/loader/XImplementationLoader.hpp"
-#include "cppuhelper/com/sun/star/security/XAccessController.hpp"
-#include "cppuhelper/com/sun/star/registry/XRegistryKey.hpp"
-#include "cppuhelper/com/sun/star/registry/XSimpleRegistry.hpp"
-#include "cppuhelper/com/sun/star/reflection/XTypeDescription.hpp"
-#include "cppuhelper/com/sun/star/reflection/XEnumTypeDescription.hpp"
-#include "cppuhelper/com/sun/star/reflection/XArrayTypeDescription.hpp"
-#include "cppuhelper/com/sun/star/reflection/XStructTypeDescription.hpp"
-#include "cppuhelper/com/sun/star/reflection/XUnionTypeDescription.hpp"
-#include "cppuhelper/com/sun/star/reflection/XCompoundTypeDescription.hpp"
-#include "cppuhelper/com/sun/star/reflection/XIndirectTypeDescription.hpp"
-#include "cppuhelper/com/sun/star/reflection/XInterfaceTypeDescription.hpp"
-#include "cppuhelper/com/sun/star/reflection/XInterfaceMemberTypeDescription.hpp"
-#include "cppuhelper/com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp"
-#include "cppuhelper/com/sun/star/reflection/XMethodParameter.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XEventListener.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XWeak.hpp"
+#include "com/sun/star/uno/XCurrentContext.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/util/XMacroExpander.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameReplace.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/container/XSet.hpp"
+#include "com/sun/star/bridge/XUnoUrlResolver.hpp"
+#include "com/sun/star/io/IOException.hpp"
+#include "com/sun/star/io/FilePermission.hpp"
+#include "com/sun/star/security/RuntimePermission.hpp"
+#include "com/sun/star/loader/XImplementationLoader.hpp"
+#include "com/sun/star/security/XAccessController.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/registry/XSimpleRegistry.hpp"
+#include "com/sun/star/reflection/XTypeDescription.hpp"
+#include "com/sun/star/reflection/XEnumTypeDescription.hpp"
+#include "com/sun/star/reflection/XArrayTypeDescription.hpp"
+#include "com/sun/star/reflection/XStructTypeDescription.hpp"
+#include "com/sun/star/reflection/XUnionTypeDescription.hpp"
+#include "com/sun/star/reflection/XCompoundTypeDescription.hpp"
+#include "com/sun/star/reflection/XIndirectTypeDescription.hpp"
+#include "com/sun/star/reflection/XInterfaceTypeDescription.hpp"
+#include "com/sun/star/reflection/XInterfaceMemberTypeDescription.hpp"
+#include "com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp"
+#include "com/sun/star/reflection/XMethodParameter.hpp"
void primeWeakMap( void)
{
commit c34bf5a57d3e3d16e2f7e47279a2b63353120e13
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Mon Dec 3 17:58:33 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Mon Dec 3 17:58:33 2018 +0000
Use .o for the findsofficepath file on *nix.
Patch by: me
diff --git a/odk/source/unoapploader/unx/makefile.mk b/odk/source/unoapploader/unx/makefile.mk
index d62f0de7668b..26596d6d5435 100644
--- a/odk/source/unoapploader/unx/makefile.mk
+++ b/odk/source/unoapploader/unx/makefile.mk
@@ -49,7 +49,7 @@ APP1RPATH=NONE
APP1TARGET= $(TARGET)
-APP1OBJS= $(OBJ)$/unoapploader.obj $(SOLARLIBDIR)$/findsofficepath.obj
+APP1OBJS= $(OBJ)$/unoapploader.obj $(SOLARLIBDIR)$/findsofficepath.o
# --- Targets ------------------------------------------------------
commit 07e44dbe5eb11a95bebb3646adfe2dadab3f3ba8
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Mon Dec 3 17:57:38 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Mon Dec 3 17:57:38 2018 +0000
Allow packaging files into $(OUTDIR)/lib as well.
Patch by: me
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 6f5ff811758a..b042a153dd7b 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -26,7 +26,7 @@
gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component
gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
-gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin $(OUTDIR)/idl $(OUTDIR)/pck
+gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin $(OUTDIR)/lib $(OUTDIR)/idl $(OUTDIR)/pck
gb_PackagePart_get_target = $(OUTDIR)/$(1)
gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
commit bdd7a3ddaf961fde748b5861c416ab242e3d05c1
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Mon Dec 3 17:56:47 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Mon Dec 3 17:56:47 2018 +0000
The scui library also needs to link to cppuhelper.
Patch by: me
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index c0ea6d2c209e..1c2f4e6099c9 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_add_api,scui,\
$(eval $(call gb_Library_add_linked_libs,scui,\
comphelper \
cppu \
+ cppuhelper \
editeng \
for \
forui \
commit 72d67ce637c7785ee08462c02dd7666593e5dfc7
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Mon Dec 3 17:55:55 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Mon Dec 3 17:55:55 2018 +0000
Also export PropertySetMixinImpl::BoundListeners.
Patch by: me
diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
index 80ccf149aba2..99b883c80eae 100644
--- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
+++ b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
@@ -129,7 +129,7 @@ protected:
@descr See <code>cppu::PropertySetMixinImpl::prepareSet</code> for
further details.
*/
- class BoundListeners {
+ class CPPUHELPER_DLLPUBLIC BoundListeners {
public:
/**
@short The constructor.
commit e04c6c078dff76a249c93eb7cb53ff8101831a1b
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Mon Dec 3 17:54:53 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Mon Dec 3 17:54:53 2018 +0000
Add cppu and cppuhelper to the linked libs for the main/sfx2
GoogleTest.
Patch by: me
diff --git a/sfx2/GoogleTest_sfx2_metadatable.mk b/sfx2/GoogleTest_sfx2_metadatable.mk
index a55fd14839a3..1d15da6ef2ad 100644
--- a/sfx2/GoogleTest_sfx2_metadatable.mk
+++ b/sfx2/GoogleTest_sfx2_metadatable.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_GoogleTest_add_api,sfx2_metadatable, \
))
$(eval $(call gb_GoogleTest_add_linked_libs,sfx2_metadatable, \
+ cppu \
+ cppuhelper \
sal \
sfx \
stl \
commit 2f6d0c88c75e3e6f9880be018c4c2fe8e8fe7c3a
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Mon Dec 3 17:53:16 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Mon Dec 3 17:53:16 2018 +0000
main/odk needs to ignore SAL_DLLPUBLIC_EXPORT when generating autodoc.
Patch by: me
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index fe6ee9741c16..dd93bf880880 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -66,6 +66,7 @@ JAVA_BEAN_SRC_FILES=\
AUTODOCPARAMS=\
-ignoredefine CPPUHELPER_DLLPUBLIC \
+ -ignoredefine SAL_DLLPUBLIC_EXPORT \
-lg c++ \
-p sal $(INCOUT) -t sal -t osl -t rtl \
-p store $(INCOUT) -t store \
commit e8087fa293e6f3a5780ee3f18aa0a0aceb814e9e
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Mon Dec 3 17:51:52 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Mon Dec 3 17:51:52 2018 +0000
After much experimentation, it was found that on Windows
WeakImplHelper1 needs to be SAL_DLLPUBLIC_EXPORT to prevent
multiple definition errors when building in debug mode
as opposed to CPPUHELPER_DLLPUBLIC we would normally use.
Without -DCPPUHELPER_DLLIMPLEMENTATION, the header's
CPPUHELPER_DLLPUBLIC would become SAL_DLLPUBLIC_IMPORT,
and on MSVC that presumbly causes symbols to be redefined
and exported for some unknown reason, whereas when we use only
SAL_DLLPUBLIC_EXPORT, it is exported in multiple modules, but
at least when building those modules we won't get errors,
as the modules' dependencies presumably aren't searched.
This has no effect on FreeBSD and hopefully other platforms.
Make all WeakImplHelper[1-12] SAL_DLLPUBLIC_EXPORT just in case.
This need for mysterious platform-specific code attributes that
affect the linker in undocumented ways really reveals a
profound and terrible truth: how ugly, poor, flimsy, degenerate,
twisted, dark, revolting and sick C++ remains as a language,
even after decades of its development.
Patch by: me
diff --git a/cppuhelper/inc/cppuhelper/implbase1.hxx b/cppuhelper/inc/cppuhelper/implbase1.hxx
index fc1e9d256008..3879511c1d6d 100644
--- a/cppuhelper/inc/cppuhelper/implbase1.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase1.hxx
@@ -88,7 +88,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1 >
- class SAL_NO_VTABLE WeakImplHelper1
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper1
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1
diff --git a/cppuhelper/inc/cppuhelper/implbase10.hxx b/cppuhelper/inc/cppuhelper/implbase10.hxx
index ed3e1d87f083..97d2d9f56cf0 100644
--- a/cppuhelper/inc/cppuhelper/implbase10.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase10.hxx
@@ -98,7 +98,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10 >
- class SAL_NO_VTABLE WeakImplHelper10
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper10
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10
diff --git a/cppuhelper/inc/cppuhelper/implbase11.hxx b/cppuhelper/inc/cppuhelper/implbase11.hxx
index f189f16ca88c..f20a3f41c6c5 100644
--- a/cppuhelper/inc/cppuhelper/implbase11.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase11.hxx
@@ -99,7 +99,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11 >
- class SAL_NO_VTABLE WeakImplHelper11
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper11
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11
diff --git a/cppuhelper/inc/cppuhelper/implbase12.hxx b/cppuhelper/inc/cppuhelper/implbase12.hxx
index f95fce6e7dba..f8c90e572caf 100644
--- a/cppuhelper/inc/cppuhelper/implbase12.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase12.hxx
@@ -100,7 +100,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12 >
- class SAL_NO_VTABLE WeakImplHelper12
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper12
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12
diff --git a/cppuhelper/inc/cppuhelper/implbase2.hxx b/cppuhelper/inc/cppuhelper/implbase2.hxx
index 24bbddf5a843..09f8bc76c44d 100644
--- a/cppuhelper/inc/cppuhelper/implbase2.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase2.hxx
@@ -89,7 +89,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1, class Ifc2 >
- class SAL_NO_VTABLE WeakImplHelper2
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper2
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1, public Ifc2
diff --git a/cppuhelper/inc/cppuhelper/implbase3.hxx b/cppuhelper/inc/cppuhelper/implbase3.hxx
index 092e48feba85..12cf073fa1fd 100644
--- a/cppuhelper/inc/cppuhelper/implbase3.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase3.hxx
@@ -90,7 +90,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1, class Ifc2, class Ifc3 >
- class SAL_NO_VTABLE WeakImplHelper3
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper3
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1, public Ifc2, public Ifc3
diff --git a/cppuhelper/inc/cppuhelper/implbase4.hxx b/cppuhelper/inc/cppuhelper/implbase4.hxx
index b4f0019212e5..d22c1f930de1 100644
--- a/cppuhelper/inc/cppuhelper/implbase4.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase4.hxx
@@ -92,7 +92,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1, class Ifc2, class Ifc3, class Ifc4 >
- class SAL_NO_VTABLE WeakImplHelper4
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper4
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1, public Ifc2, public Ifc3, public Ifc4
diff --git a/cppuhelper/inc/cppuhelper/implbase5.hxx b/cppuhelper/inc/cppuhelper/implbase5.hxx
index fb5f0b8c7eb7..2cb93e85a81c 100644
--- a/cppuhelper/inc/cppuhelper/implbase5.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase5.hxx
@@ -93,7 +93,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5 >
- class SAL_NO_VTABLE WeakImplHelper5
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper5
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5
diff --git a/cppuhelper/inc/cppuhelper/implbase6.hxx b/cppuhelper/inc/cppuhelper/implbase6.hxx
index 672f4d4cf63b..9e917704898a 100644
--- a/cppuhelper/inc/cppuhelper/implbase6.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase6.hxx
@@ -94,7 +94,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6 >
- class SAL_NO_VTABLE WeakImplHelper6
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper6
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6
diff --git a/cppuhelper/inc/cppuhelper/implbase7.hxx b/cppuhelper/inc/cppuhelper/implbase7.hxx
index fa6159531e93..a3da5def2ada 100644
--- a/cppuhelper/inc/cppuhelper/implbase7.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase7.hxx
@@ -96,7 +96,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7 >
- class SAL_NO_VTABLE WeakImplHelper7
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper7
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7
diff --git a/cppuhelper/inc/cppuhelper/implbase8.hxx b/cppuhelper/inc/cppuhelper/implbase8.hxx
index 8e2d4b94a01c..ee3fe419aba6 100644
--- a/cppuhelper/inc/cppuhelper/implbase8.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase8.hxx
@@ -96,7 +96,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8 >
- class SAL_NO_VTABLE WeakImplHelper8
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper8
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8
diff --git a/cppuhelper/inc/cppuhelper/implbase9.hxx b/cppuhelper/inc/cppuhelper/implbase9.hxx
index fb8deaedd46e..cad14dea5a79 100644
--- a/cppuhelper/inc/cppuhelper/implbase9.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase9.hxx
@@ -98,7 +98,7 @@ namespace cppu
Your sub class defines method implementations for these interface(s).
*/
template< class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, class Ifc8, class Ifc9 >
- class SAL_NO_VTABLE WeakImplHelper9
+ class SAL_DLLPUBLIC_EXPORT SAL_NO_VTABLE WeakImplHelper9
: public OWeakObject
, public ::com::sun::star::lang::XTypeProvider
, public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9
commit 73866e708f1e89ec38fb43ad00d7afd852fa11c6
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Mon Dec 3 17:49:04 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Mon Dec 3 17:49:04 2018 +0000
Re-commit r1847839 and r1847840, with future patches on the way that
will get the module building in gbuild and using source-level attributes
to control symbol visibility. The original commit was worded as:
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/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
*/
@@ -144,7 +146,7 @@ struct ClassData : public ClassDataBase
Not for public use.
@internal
*/
-::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW( () );
+CPPUHELPER_DLLPUBLIC ::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 bb35aca9a46e..0ef778e6d295 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex.hxx
@@ -27,6 +27,8 @@
#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...
@@ -100,6 +102,7 @@ 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,
@@ -108,7 +111,7 @@ struct class_data
/** ImplHelper
@internal
*/
-::com::sun::star::uno::Any SAL_CALL ImplHelper_queryNoXInterface(
+CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Any SAL_CALL ImplHelper_queryNoXInterface(
::com::sun::star::uno::Type const & rType,
class_data * cd,
void * that )
@@ -116,26 +119,27 @@ struct class_data
/** ImplHelper
@internal
*/
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ImplHelper_getTypes(
+CPPUHELPER_DLLPUBLIC ::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
*/
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ImplInhHelper_getTypes(
+CPPUHELPER_DLLPUBLIC ::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
*/
-::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL ImplHelper_getImplementationId(
+CPPUHELPER_DLLPUBLIC ::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,
@@ -145,6 +149,7 @@ struct class_data
/** 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) );
@@ -152,6 +157,7 @@ struct class_data
/** WeakAggImplHelper
@internal
*/
+CPPUHELPER_DLLPUBLIC
::com::sun::star::uno::Any SAL_CALL WeakAggImplHelper_queryAgg(
::com::sun::star::uno::Type const & rType,
class_data * cd,
@@ -161,6 +167,7 @@ struct class_data
/** 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 479a10d0299a..9431bc97f621 100644
--- a/cppuhelper/inc/cppuhelper/implementationentry.hxx
+++ b/cppuhelper/inc/cppuhelper/implementationentry.hxx
@@ -24,6 +24,7 @@
#define _CPPUHELPER_IMPLEMENATIONENTRY_HXX_
#include <cppuhelper/factory.hxx>
+#include "cppuhelper/cppuhelperdllapi.h"
namespace cppu
{
@@ -80,7 +81,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.
*/
-sal_Bool component_writeInfoHelper(
+CPPUHELPER_DLLPUBLIC sal_Bool component_writeInfoHelper(
void *pServiceManager, void *pRegistryKey , const struct ImplementationEntry entries[] );
/** Helper function for implementation of the component_getFactory()-function,
@@ -99,7 +100,7 @@ sal_Bool component_writeInfoHelper(
@return 0 if the helper failed to instantiate a factory, otherwise an acquired pointer
to a factory.
*/
-void *component_getFactoryHelper(
+CPPUHELPER_DLLPUBLIC 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 95d93ddccc38..164d2893cdcc 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.h
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h
@@ -36,6 +36,8 @@
#include "com/sun/star/lang/DisposedException.hpp"
#endif
+#include "cppuhelper/cppuhelperdllapi.h"
+
/** */ //for docpp
namespace cppu
{
@@ -60,7 +62,7 @@ class OInterfaceContainerHelper;
@see OInterfaceContainerHelper
*/
-class OInterfaceIteratorHelper
+class CPPUHELPER_DLLPUBLIC OInterfaceIteratorHelper
{
public:
/**
@@ -118,7 +120,7 @@ private:
@see OInterfaceIteratorHelper
*/
-class OInterfaceContainerHelper
+class CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper
{
public:
// these are here to force memory de/allocation to sal lib.
@@ -510,7 +512,7 @@ struct hashType_Impl
/** Specialized class for key type com::sun::star::uno::Type,
without explicit usage of STL symbols.
*/
-class OMultiTypeInterfaceContainerHelper
+class CPPUHELPER_DLLPUBLIC 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 c2613813047b..80ccf149aba2 100644
--- a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
+++ b/cppuhelper/inc/cppuhelper/propertysetmixin.hxx
@@ -37,6 +37,7 @@
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/Sequence.hxx"
#include "sal/types.h"
+#include "cppuhelper/cppuhelperdllapi.h"
/// @HTML
@@ -83,7 +84,7 @@ template< typename T > class PropertySetMixin;
@since UDK 3.2.1
*/
-class PropertySetMixinImpl:
+class CPPUHELPER_DLLPUBLIC 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 813ca16fe465..34fb238a335a 100644
--- a/cppuhelper/inc/cppuhelper/propshlp.hxx
+++ b/cppuhelper/inc/cppuhelper/propshlp.hxx
@@ -27,6 +27,7 @@
#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>
@@ -46,7 +47,7 @@ namespace cppu
/**
This interface is used by the OPropertyHelper, to access the property description.
*/
-class IPropertyArrayHelper
+class CPPUHELPER_DLLPUBLIC IPropertyArrayHelper
{
public:
// these are here to force memory de/allocation to sal lib.
@@ -113,7 +114,7 @@ public:
You can use this helper class to map a XPropertySet-Interface to a XFast-
or a XMultiPropertySet interface.
*/
-class OPropertyArrayHelper : public IPropertyArrayHelper
+class CPPUHELPER_DLLPUBLIC OPropertyArrayHelper : public IPropertyArrayHelper
{
public:
/**
@@ -226,7 +227,7 @@ struct hashInt32_Impl
/** Specialized class for key type sal_Int32,
without explicit usage of STL symbols.
*/
-class OMultiTypeInterfaceContainerHelperInt32
+class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelperInt32
{
public:
// these are here to force memory de/allocation to sal lib.
@@ -343,7 +344,7 @@ public:
the connection point interfaces. But only listeners that listen to all property changes.
*/
-class OPropertySetHelper : public ::com::sun::star::beans::XMultiPropertySet,
+class CPPUHELPER_DLLPUBLIC 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 7e37f7bee059..5a0908bef51e 100644
--- a/cppuhelper/inc/cppuhelper/servicefactory.hxx
+++ b/cppuhelper/inc/cppuhelper/servicefactory.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
+#include "cppuhelper/cppuhelperdllapi.h"
namespace cppu
{
@@ -56,6 +57,7 @@ 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 0b6fb2123123..b0aadb983bdd 100644
--- a/cppuhelper/inc/cppuhelper/shlib.hxx
+++ b/cppuhelper/inc/cppuhelper/shlib.hxx
@@ -28,6 +28,7 @@
#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
#include <com/sun/star/registry/CannotRegisterImplementationException.hpp>
+#include "cppuhelper/cppuhelperdllapi.h"
namespace cppu
{
@@ -47,6 +48,7 @@ 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,
@@ -68,6 +70,7 @@ 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 3b131234c85a..d64659b7f1d1 100644
--- a/cppuhelper/inc/cppuhelper/stdidlclass.hxx
+++ b/cppuhelper/inc/cppuhelper/stdidlclass.hxx
@@ -26,12 +26,14 @@
#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 194cecdfa7e6..a1a18937bfdf 100644
--- a/cppuhelper/inc/cppuhelper/typeprovider.hxx
+++ b/cppuhelper/inc/cppuhelper/typeprovider.hxx
@@ -27,6 +27,7 @@
#include <rtl/uuid.h>
#include <com/sun/star/uno/Sequence.hxx>
+#include "cppuhelper/cppuhelperdllapi.h"
namespace cppu
{
@@ -34,7 +35,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 OTypeCollection
+class CPPUHELPER_DLLPUBLIC OTypeCollection
{
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > _aTypes;
@@ -183,7 +184,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 OImplementationId
+class CPPUHELPER_DLLPUBLIC 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 f05c6a9c91b4..c1b68652d7fc 100644
--- a/cppuhelper/inc/cppuhelper/unourl.hxx
+++ b/cppuhelper/inc/cppuhelper/unourl.hxx
@@ -26,6 +26,8 @@
#include <memory>
+#include "cppuhelper/cppuhelperdllapi.h"
+
namespace rtl { class OUString; }
namespace cppu {
@@ -37,7 +39,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 UnoUrlDescriptor
+class CPPUHELPER_DLLPUBLIC UnoUrlDescriptor
{
public:
/** @internal
@@ -134,7 +136,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 UnoUrl
+class CPPUHELPER_DLLPUBLIC 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 727f02abbf97..6bdd713249b9 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -27,6 +27,7 @@
#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
@@ -46,7 +47,7 @@ class OWeakConnectionPoint;
@derive
Inherit from this class and delegate acquire()/ release() calls.
*/
-class OWeakObject : public ::com::sun::star::uno::XWeak
+class CPPUHELPER_DLLPUBLIC 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 b6dbd6c58726..b37311ea2fa5 100644
--- a/cppuhelper/inc/cppuhelper/weakagg.hxx
+++ b/cppuhelper/inc/cppuhelper/weakagg.hxx
@@ -24,6 +24,7 @@
#define _CPPUHELPER_WEAKAGG_HXX_
#include <cppuhelper/weak.hxx>
+#include "cppuhelper/cppuhelperdllapi.h"
#include <com/sun/star/uno/XAggregation.hpp>
@@ -40,7 +41,7 @@ namespace cppu
Inherit from this class and delegate acquire()/ release() calls. Re-implement
XAggregation::queryInterface().
*/
-class OWeakAggObject
+class CPPUHELPER_DLLPUBLIC 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 56a24a42572f..13143b9fed48 100644
--- a/cppuhelper/inc/cppuhelper/weakref.hxx
+++ b/cppuhelper/inc/cppuhelper/weakref.hxx
@@ -25,6 +25,8 @@
#include <com/sun/star/uno/XInterface.hpp>
+#include "cppuhelper/cppuhelperdllapi.h"
+
namespace com
{
@@ -41,7 +43,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 WeakReferenceHelper
+class CPPUHELPER_DLLPUBLIC WeakReferenceHelper
{
public:
/** Default ctor. Creates an empty weak reference.
diff --git a/cppuhelper/prj/d.lst b/cppuhelper/prj/d.lst
index de80ca9b8533..6c987559dbe9 100644
--- a/cppuhelper/prj/d.lst
+++ b/cppuhelper/prj/d.lst
@@ -1,5 +1,6 @@
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 52f939f92615..325201006fe3 100644
--- a/cppuhelper/source/makefile.mk
+++ b/cppuhelper/source/makefile.mk
@@ -27,6 +27,7 @@ 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
@@ -121,6 +122,8 @@ CFLAGS += -Ob0
.ENDIF
.ENDIF
+CFLAGS += -DCPPUHELPER_DLLIMPLEMENTATION
+
SLOFILES= \
$(SLO)$/typeprovider.obj \
$(SLO)$/exc_thrower.obj \
@@ -173,7 +176,7 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
.IF "$(COMNAME)"=="msci"
-SHL1VERSIONMAP=msvc_win32_intel.map
+.ELIF "$(COMNAME)"=="mscx"
.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
deleted file mode 100644
index 19590721a282..000000000000
--- a/cppuhelper/source/msvc_win32_intel.map
+++ /dev/null
@@ -1,306 +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.
-#
-###############################################################
-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 ed30ad88dee4..791b17bdaa1b 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -316,6 +316,7 @@ static void add_access_control_entries(
context_values.push_back( entry );
}
+SAL_DLLPUBLIC_EXPORT
Reference< lang::XMultiComponentFactory > bootstrapInitialSF(
OUString const & rBootstrapPath )
SAL_THROW( (Exception) )
More information about the Libreoffice-commits
mailing list