diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-12-02 09:42:08 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2013-12-02 09:42:08 +0000 |
| commit | ab750a7cd92c8cdaaceaaf5869edb3dd3c38758d (patch) | |
| tree | 4cc43177262bea3df1ccb85ed2c123428db55355 /cppuhelper | |
| parent | fcf9e5bf68926871de08a373be952318f41cc347 (diff) | |
#i122195# XContentEnumerationAccess is needed in UNO bootstrapping
stoc's OServiceManager has it as a base class so we really need
XContentEnumerationAccess' "comprehensive" type description early.
WeakMap priming enforces that now.
Notes
Notes:
prefer: d83de4b1a93ba7ed7bc3243073be3de96a44bfa9
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/makefile.mk | 2 | ||||
| -rw-r--r-- | cppuhelper/source/primeweak.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk index f21cd2cefb3c..52f939f92615 100644 --- a/cppuhelper/source/makefile.mk +++ b/cppuhelper/source/makefile.mk @@ -60,6 +60,7 @@ UNOTYPES= \ com.sun.star.bridge.UnoUrlResolver \ com.sun.star.bridge.XUnoUrlResolver \ com.sun.star.connection.SocketPermission \ + com.sun.star.container.XContentEnumerationAccess \ com.sun.star.container.XElementAccess \ com.sun.star.container.XEnumerationAccess \ com.sun.star.container.XHierarchicalNameAccess \ @@ -177,7 +178,6 @@ SHL1VERSIONMAP=msvc_win32_intel.map SHL1VERSIONMAP=cc5_solaris_sparc.map .ELIF "$(GUI)$(COMNAME)"=="OS2gcc3" SHL1VERSIONMAP=gcc3os2.map -#.ELIF "$(COMNAME)"=="gcc3" || "$(COMNAME)"=="Clang" .ELSE SHL1VERSIONMAP=gcc3.map .ENDIF diff --git a/cppuhelper/source/primeweak.cxx b/cppuhelper/source/primeweak.cxx index d17903e722e8..8b65d52412c4 100644 --- a/cppuhelper/source/primeweak.cxx +++ b/cppuhelper/source/primeweak.cxx @@ -64,6 +64,7 @@ #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" @@ -117,6 +118,7 @@ void primeWeakMap( void) InitTypeDesc( com::sun::star::container::XElementAccess ); InitTypeDesc( com::sun::star::container::XEnumeration ); InitTypeDesc( com::sun::star::container::XEnumerationAccess ); + InitTypeDesc( com::sun::star::container::XContentEnumerationAccess ); InitTypeDesc( com::sun::star::container::XHierarchicalNameAccess ); InitTypeDesc( com::sun::star::container::XNameAccess ); InitTypeDesc( com::sun::star::container::XNameReplace ); |