Kaydet (Commit) ab750a7c authored tarafından Herbert Dürr's avatar Herbert Dürr

#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.
üst fcf9e5bf
...@@ -60,6 +60,7 @@ UNOTYPES= \ ...@@ -60,6 +60,7 @@ UNOTYPES= \
com.sun.star.bridge.UnoUrlResolver \ com.sun.star.bridge.UnoUrlResolver \
com.sun.star.bridge.XUnoUrlResolver \ com.sun.star.bridge.XUnoUrlResolver \
com.sun.star.connection.SocketPermission \ com.sun.star.connection.SocketPermission \
com.sun.star.container.XContentEnumerationAccess \
com.sun.star.container.XElementAccess \ com.sun.star.container.XElementAccess \
com.sun.star.container.XEnumerationAccess \ com.sun.star.container.XEnumerationAccess \
com.sun.star.container.XHierarchicalNameAccess \ com.sun.star.container.XHierarchicalNameAccess \
...@@ -177,7 +178,6 @@ SHL1VERSIONMAP=msvc_win32_intel.map ...@@ -177,7 +178,6 @@ SHL1VERSIONMAP=msvc_win32_intel.map
SHL1VERSIONMAP=cc5_solaris_sparc.map SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(GUI)$(COMNAME)"=="OS2gcc3" .ELIF "$(GUI)$(COMNAME)"=="OS2gcc3"
SHL1VERSIONMAP=gcc3os2.map SHL1VERSIONMAP=gcc3os2.map
#.ELIF "$(COMNAME)"=="gcc3" || "$(COMNAME)"=="Clang"
.ELSE .ELSE
SHL1VERSIONMAP=gcc3.map SHL1VERSIONMAP=gcc3.map
.ENDIF .ENDIF
......
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
#include "cppuhelper/com/sun/star/beans/PropertyValue.hpp" #include "cppuhelper/com/sun/star/beans/PropertyValue.hpp"
#include "cppuhelper/com/sun/star/beans/XPropertySet.hpp" #include "cppuhelper/com/sun/star/beans/XPropertySet.hpp"
#include "cppuhelper/com/sun/star/beans/XMultiPropertySet.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/XEnumerationAccess.hpp"
#include "cppuhelper/com/sun/star/container/XEnumeration.hpp" #include "cppuhelper/com/sun/star/container/XEnumeration.hpp"
#include "cppuhelper/com/sun/star/container/XNameAccess.hpp" #include "cppuhelper/com/sun/star/container/XNameAccess.hpp"
...@@ -117,6 +118,7 @@ void primeWeakMap( void) ...@@ -117,6 +118,7 @@ void primeWeakMap( void)
InitTypeDesc( com::sun::star::container::XElementAccess ); InitTypeDesc( com::sun::star::container::XElementAccess );
InitTypeDesc( com::sun::star::container::XEnumeration ); InitTypeDesc( com::sun::star::container::XEnumeration );
InitTypeDesc( com::sun::star::container::XEnumerationAccess ); InitTypeDesc( com::sun::star::container::XEnumerationAccess );
InitTypeDesc( com::sun::star::container::XContentEnumerationAccess );
InitTypeDesc( com::sun::star::container::XHierarchicalNameAccess ); InitTypeDesc( com::sun::star::container::XHierarchicalNameAccess );
InitTypeDesc( com::sun::star::container::XNameAccess ); InitTypeDesc( com::sun::star::container::XNameAccess );
InitTypeDesc( com::sun::star::container::XNameReplace ); InitTypeDesc( com::sun::star::container::XNameReplace );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment