summaryrefslogtreecommitdiff
path: root/include/tools/globname.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'include/tools/globname.hxx')
-rw-r--r--include/tools/globname.hxx21
1 files changed, 10 insertions, 11 deletions
diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx
index 2ea6850801d1..eb7b7e91bee2 100644
--- a/include/tools/globname.hxx
+++ b/include/tools/globname.hxx
@@ -23,7 +23,6 @@
#include "tools/toolsdllapi.h"
#include <com/sun/star/uno/Sequence.hxx>
-#include <tools/string.hxx>
struct ImpSvGlobalName
{
@@ -39,7 +38,7 @@ struct ImpSvGlobalName
ImpSvGlobalName( const ImpSvGlobalName & rObj );
ImpSvGlobalName( Empty );
- sal_Bool operator == ( const ImpSvGlobalName & rObj ) const;
+ bool operator == ( const ImpSvGlobalName & rObj ) const;
};
#ifdef WNT
@@ -82,17 +81,17 @@ public:
TOOLS_DLLPUBLIC friend SvStream & operator >> ( SvStream &, SvGlobalName & );
TOOLS_DLLPUBLIC friend SvStream & operator << ( SvStream &, const SvGlobalName & );
- sal_Bool operator < ( const SvGlobalName & rObj ) const;
- SvGlobalName & operator += ( sal_uInt32 );
- SvGlobalName & operator ++ () { return operator += ( 1 ); }
+ bool operator < ( const SvGlobalName & rObj ) const;
+ SvGlobalName& operator += ( sal_uInt32 );
+ SvGlobalName& operator ++ () { return operator += ( 1 ); }
- sal_Bool operator == ( const SvGlobalName & rObj ) const;
- sal_Bool operator != ( const SvGlobalName & rObj ) const
- { return !(*this == rObj); }
+ bool operator == ( const SvGlobalName & rObj ) const;
+ bool operator != ( const SvGlobalName & rObj ) const
+ { return !(*this == rObj); }
- void MakeFromMemory( void * pData );
- sal_Bool MakeId( const String & rId );
- String GetHexName() const;
+ void MakeFromMemory( void * pData );
+ bool MakeId( const OUString & rId );
+ OUString GetHexName() const;
SvGlobalName( const CLSID & rId );
const CLSID & GetCLSID() const { return *(CLSID *)pImp->szData; }