Author: damjan
Date: Mon Dec  3 18:02:46 2018
New Revision: 1848084

URL: http://svn.apache.org/viewvc?rev=1848084&view=rev
Log:
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


Added:
    openoffice/trunk/main/cppuhelper/prj/makefile.mk
Modified:
    openoffice/trunk/main/Module_ooo.mk
    openoffice/trunk/main/cppuhelper/Library_cppuhelper.mk
    openoffice/trunk/main/cppuhelper/Package_findsofficepath.mk
    openoffice/trunk/main/cppuhelper/prj/build.lst
    openoffice/trunk/main/cppuhelper/prj/d.lst
    openoffice/trunk/main/cppuhelper/source/bootstrap.cxx
    openoffice/trunk/main/cppuhelper/source/primeweak.cxx

Modified: openoffice/trunk/main/Module_ooo.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1848084&r1=1848083&r2=1848084&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Mon Dec  3 18:02:46 2018
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,o
        configmgr \
        cosv \
        cppcanvas \
+       cppuhelper \
        cpputools \
        cui \
        dbaccess \

Modified: openoffice/trunk/main/cppuhelper/Library_cppuhelper.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/Library_cppuhelper.mk?rev=1848084&r1=1848083&r2=1848084&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/Library_cppuhelper.mk (original)
+++ openoffice/trunk/main/cppuhelper/Library_cppuhelper.mk Mon Dec  3 18:02:46 
2018
@@ -28,13 +28,13 @@ $(eval $(call gb_Library_add_package_hea
 $(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,cpp
        -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 \

Modified: openoffice/trunk/main/cppuhelper/Package_findsofficepath.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/Package_findsofficepath.mk?rev=1848084&r1=1848083&r2=1848084&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/Package_findsofficepath.mk (original)
+++ openoffice/trunk/main/cppuhelper/Package_findsofficepath.mk Mon Dec  3 
18:02:46 2018
@@ -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))
 

Modified: openoffice/trunk/main/cppuhelper/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/prj/build.lst?rev=1848084&r1=1848083&r2=1848084&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/prj/build.lst (original)
+++ openoffice/trunk/main/cppuhelper/prj/build.lst Mon Dec  3 18:02:46 2018
@@ -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

Modified: openoffice/trunk/main/cppuhelper/prj/d.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/prj/d.lst?rev=1848084&r1=1848083&r2=1848084&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/prj/d.lst (original)
+++ openoffice/trunk/main/cppuhelper/prj/d.lst Mon Dec  3 18:02:46 2018
@@ -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*.*.*

Added: openoffice/trunk/main/cppuhelper/prj/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/prj/makefile.mk?rev=1848084&view=auto
==============================================================================
--- openoffice/trunk/main/cppuhelper/prj/makefile.mk (added)
+++ openoffice/trunk/main/cppuhelper/prj/makefile.mk Mon Dec  3 18:02:46 2018
@@ -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

Modified: openoffice/trunk/main/cppuhelper/source/bootstrap.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/source/bootstrap.cxx?rev=1848084&r1=1848083&r2=1848084&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/source/bootstrap.cxx (original)
+++ openoffice/trunk/main/cppuhelper/source/bootstrap.cxx Mon Dec  3 18:02:46 
2018
@@ -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"

Modified: openoffice/trunk/main/cppuhelper/source/primeweak.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/source/primeweak.cxx?rev=1848084&r1=1848083&r2=1848084&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/source/primeweak.cxx (original)
+++ openoffice/trunk/main/cppuhelper/source/primeweak.cxx Mon Dec  3 18:02:46 
2018
@@ -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)
 {


Reply via email to