Author: hdu
Date: Mon Dec 2 09:42:08 2013
New Revision: 1546938
URL: http://svn.apache.org/r1546938
Log:
#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.
Modified:
openoffice/trunk/main/cppuhelper/source/makefile.mk
openoffice/trunk/main/cppuhelper/source/primeweak.cxx
Modified: openoffice/trunk/main/cppuhelper/source/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/source/makefile.mk?rev=1546938&r1=1546937&r2=1546938&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/source/makefile.mk (original)
+++ openoffice/trunk/main/cppuhelper/source/makefile.mk Mon Dec 2 09:42:08 2013
@@ -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
Modified: openoffice/trunk/main/cppuhelper/source/primeweak.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppuhelper/source/primeweak.cxx?rev=1546938&r1=1546937&r2=1546938&view=diff
==============================================================================
--- openoffice/trunk/main/cppuhelper/source/primeweak.cxx (original)
+++ openoffice/trunk/main/cppuhelper/source/primeweak.cxx Mon Dec 2 09:42:08
2013
@@ -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 );
