On Tuesday 29 November 2005 15:42, Stephan Bergmann wrote:
> Petr Mladek wrote:
> > One more patch :-) I tried to compile OOo with the actual state of
> > cws-sb41. It seems that you removed :: from the patches I sent to you. ::
> > is necessary because ::cppu::getTypeFavourUnsigned is called inside a
> > namespace.
> >
> > I get the following type of error without the patch:
> > --- cut ---
> > /usr/src/packages/BUILD/ooo-build-src680.140.0/build/src680-m140/solver/6
> >80/unxl ngi6.pro/inc/comphelper/property.hxx:162: error:
> > 'getTypeFavourUnsigned' is not a member of 'comphelper::cppu'
> > --- cut ---
>
> The problem is somewhere else, and changing
> "cppu::getTypeFavourUnsigned" to "::cppu::getTypeFavourUnsigned" is only
> a workaround. The problem is better fixed by the following patch (which
> will make it into CWS sb41):
>
> --- 8< ---
> ***
> /so/ws/SRC680/src.m141/comphelper/inc/comphelper/IdPropArrayHelper.hxx
> ---
> /cws/cws04/sb41/SRC680/src.m141/comphelper/inc/comphelper/IdPropArrayHelper
>.hxx
>
> ***************
> *** 55,66 ****
> #endif
> #include <cppuhelper/propshlp.hxx>
>
> namespace comphelper
> {
> //************************************************************
> // OIdPropertyArrayUsageHelper
> //************************************************************
> - namespace cppu { class IPropertyArrayHelper; }
> template <typename TYPE> struct OIdPropertyArrayUsageHelperMutex
>
> : public rtl::Static< ::osl::Mutex,
>
> OIdPropertyArrayUsageHelperMutex<TYPE> > {};
>
> --- 55,67 ----
> #endif
> #include <cppuhelper/propshlp.hxx>
>
> + namespace cppu { class IPropertyArrayHelper; }
> +
> namespace comphelper
> {
> //************************************************************
> // OIdPropertyArrayUsageHelper
> //************************************************************
> template <typename TYPE> struct OIdPropertyArrayUsageHelperMutex
>
> : public rtl::Static< ::osl::Mutex,
>
> OIdPropertyArrayUsageHelperMutex<TYPE> > {};
>
> --- 8< ---
Great. The patch really solved the problem.
I attach one more patch for comphelper/inc/comphelper/extract.hxx. The problem
was visible only when compiling the module binfilter.
Stephan, I tried to search for all occurrences of getCppuType, to see where it
is used in a template and must be replaced by cppu::getTypeFavourUnsigned. It
is not so easy, so I have put it off until I know your opinion. Did you
already do this check? Is it necessary? It might be enough to fix all build
problems. Would you welcome a help from my side in this task?
Thanks a lot for help.
--
Best Regards,
Petr Mladek
software developer
---------------------------------------------------------------------
SuSE CR, s.r.o. e-mail: [EMAIL PROTECTED]
Drahobejlova 27 tel:+420 296 542 373
190 00 Praha 9 fax:+420 296 542 374
Czech Republic http://www.suse.cz/
--- comphelper/inc/comphelper/extract.hxx.old 2005-09-08 04:30:55.000000000 +0200
+++ comphelper/inc/comphelper/extract.hxx 2005-12-05 12:04:15.000000000 +0100
@@ -123,7 +123,7 @@
template< typename E >
inline ::com::sun::star::uno::Any SAL_CALL enum2any( E eEnum )
{
- return ::com::sun::star::uno::Any( &eEnum, getCppuType((const E*)0) );
+ return ::com::sun::star::uno::Any( &eEnum, ::cppu::getTypeFavourUnsigned((const E*)0) );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
