On Monday 28 November 2005 13:35, Stephan Bergmann wrote:
> Petr Mladek wrote:
> > Good news. I have compiled OOo with gcc-4.1. It seems to work. At least,
> > I was able to start the application, and write/save two simple documents
> > in writer and spreadsheet.
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/680/unxl
ngi6.pro/inc/comphelper/property.hxx:162: error: 'getTypeFavourUnsigned' is
not a member of 'comphelper::cppu'
--- cut ---
The patch against the current CWS sb41 is attached.
--
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/
diff -urN sb41.orig/bridges/inc/bridges/remote/marshal.hxx sb41/bridges/inc/bridges/remote/marshal.hxx
--- sb41.orig/bridges/inc/bridges/remote/marshal.hxx 2005-11-25 10:11:24.000000000 +0100
+++ sb41/bridges/inc/bridges/remote/marshal.hxx 2005-11-29 12:53:52.000000000 +0100
@@ -87,7 +87,7 @@
template < class C >
inline void operator <<= (Marshal & r, C& value)
{
- r.pack( &value, cppu::getTypeFavourUnsigned( &value ) );
+ r.pack( &value, ::cppu::getTypeFavourUnsigned( &value ) );
}
}
diff -urN sb41.orig/bridges/inc/bridges/remote/unmarshal.hxx sb41/bridges/inc/bridges/remote/unmarshal.hxx
--- sb41.orig/bridges/inc/bridges/remote/unmarshal.hxx 2005-11-25 10:11:25.000000000 +0100
+++ sb41/bridges/inc/bridges/remote/unmarshal.hxx 2005-11-29 12:53:46.000000000 +0100
@@ -89,7 +89,7 @@
inline sal_Bool operator >>= (Unmarshal & r, C& value)
{
return r.unpackAndDestruct(
- &value , cppu::getTypeFavourUnsigned( &value ) );
+ &value , ::cppu::getTypeFavourUnsigned( &value ) );
}
}
diff -urN sb41.orig/comphelper/inc/comphelper/property.hxx sb41/comphelper/inc/comphelper/property.hxx
--- sb41.orig/comphelper/inc/comphelper/property.hxx 2005-11-28 17:01:32.000000000 +0100
+++ sb41/comphelper/inc/comphelper/property.hxx 2005-11-29 12:53:46.000000000 +0100
@@ -159,7 +159,7 @@
template <class ENUMTYPE>
sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const ENUMTYPE& _rCurrentValue)
{
- if (cppu::getTypeFavourUnsigned(&_rCurrentValue).getTypeClass()
+ if (::cppu::getTypeFavourUnsigned(&_rCurrentValue).getTypeClass()
!= staruno::TypeClass_ENUM)
return tryPropertyValue(_rConvertedValue, _rOldValue, _rValueToSet, _rCurrentValue);
diff -urN sb41.orig/comphelper/inc/comphelper/types.hxx sb41/comphelper/inc/comphelper/types.hxx
--- sb41.orig/comphelper/inc/comphelper/types.hxx 2005-11-25 10:10:15.000000000 +0100
+++ sb41/comphelper/inc/comphelper/types.hxx 2005-11-29 12:53:46.000000000 +0100
@@ -112,7 +112,7 @@
template <class TYPE>
sal_Bool isA(const staruno::Type& _rType, TYPE* pDummy)
{
- return _rType.equals(cppu::getTypeFavourUnsigned(pDummy));
+ return _rType.equals(::cppu::getTypeFavourUnsigned(pDummy));
}
//-------------------------------------------------------------------------
@@ -123,7 +123,7 @@
sal_Bool isA(const staruno::Any& _rVal, TYPE* pDummy)
{
return _rVal.getValueType().equals(
- cppu::getTypeFavourUnsigned(pDummy));
+ ::cppu::getTypeFavourUnsigned(pDummy));
}
//-------------------------------------------------------------------------
@@ -133,7 +133,7 @@
sal_Bool isAReference(const staruno::Type& _rType, TYPE* pDummy)
{
return _rType.equals(
- cppu::getTypeFavourUnsigned(
+ ::cppu::getTypeFavourUnsigned(
static_cast<staruno::Reference<TYPE>*>(NULL)));
}
@@ -144,7 +144,7 @@
sal_Bool isAReference(const staruno::Any& _rVal, TYPE* pDummy)
{
return _rVal.getValueType().equals(
- cppu::getTypeFavourUnsigned(
+ ::cppu::getTypeFavourUnsigned(
static_cast<staruno::Reference<TYPE>*>(NULL)));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
