diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 16:44:31 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 16:44:31 +0000 |
| commit | 83bca555846291d130d766528108266b71c94277 (patch) | |
| tree | ba3ac8bda4125bef774c1a9c51e1ac79e7ffe314 /basic | |
| parent | 1f3a0b61cf2c5e57cb300a55967c644875361045 (diff) | |
INTEGRATION: CWS warnings01 (1.11.6); FILE MERGED
2006/04/07 18:39:11 sb 1.11.6.3: RESYNC: (1.13-1.14); FILE MERGED
2005/12/01 14:56:08 ab 1.11.6.2: #i53898# Removed warnings for unxlngi6
2005/11/07 12:02:48 ab 1.11.6.1: #i53898# Removed warnings
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/inc/sbunoobj.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 016555cd45fb..d7453b75b750 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sbunoobj.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2006-01-31 18:30:30 $ + * last change: $Author: hr $ $Date: 2006-06-19 17:44:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,7 @@ #include <com/sun/star/reflection/XIdlClass.hpp> #endif #ifndef _RTL_USTRING_ -#include <rtl/ustring> +#include <rtl/ustring.hxx> #endif using namespace com::sun::star::uno; @@ -97,7 +97,7 @@ class SbUnoObject: public SbxObject public: TYPEINFO(); - SbUnoObject( const String& aName, const Any& aUnoObj_ ); + SbUnoObject( const String& aName_, const Any& aUnoObj_ ); ~SbUnoObject(); // #76470 Introspection on Demand durchfuehren @@ -140,7 +140,7 @@ class SbUnoMethod : public SbxMethod public: TYPEINFO(); - SbUnoMethod( const String& aName, SbxDataType eSbxType, Reference< XIdlMethod > xUnoMethod_, + SbUnoMethod( const String& aName_, SbxDataType eSbxType, Reference< XIdlMethod > xUnoMethod_, bool bInvocation ); virtual ~SbUnoMethod(); virtual SbxInfo* GetInfo(); @@ -158,15 +158,15 @@ class SbUnoProperty : public SbxProperty // Daten der Uno-Property Property aUnoProp; - UINT32 nId; + INT32 nId; bool mbInvocation; // Property is based on invocation virtual ~SbUnoProperty(); public: TYPEINFO(); - SbUnoProperty( const String& aName, SbxDataType eSbxType, - const Property& aUnoProp_, UINT32 nId_, bool bInvocation ); + SbUnoProperty( const String& aName_, SbxDataType eSbxType, + const Property& aUnoProp_, INT32 nId_, bool bInvocation ); bool isInvocationBased( void ) { return mbInvocation; } @@ -187,11 +187,11 @@ class SbUnoClass: public SbxObject public: TYPEINFO(); - SbUnoClass( const String& aName ) - : SbxObject( aName ) + SbUnoClass( const String& aName_ ) + : SbxObject( aName_ ) {} - SbUnoClass( const String& aName, const Reference< XIdlClass >& xClass_ ) - : SbxObject( aName ) + SbUnoClass( const String& aName_, const Reference< XIdlClass >& xClass_ ) + : SbxObject( aName_ ) , m_xClass( xClass_ ) {} //~SbUnoClass(); @@ -274,9 +274,9 @@ class BasicCollection : public SbxObject const SfxHint& rHint, const TypeId& rHintType ); INT32 implGetIndex( SbxVariable* pIndexVar ); INT32 implGetIndexForName( const String& rName ); - void CollAdd( SbxArray* pPar ); - void CollItem( SbxArray* pPar ); - void CollRemove( SbxArray* pPar ); + void CollAdd( SbxArray* pPar_ ); + void CollItem( SbxArray* pPar_ ); + void CollRemove( SbxArray* pPar_ ); public: TYPEINFO(); |