diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 22:54:20 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-22 09:07:47 +0000 |
commit | 1c1961786a519101bbf34c62542542c8a56e0328 (patch) | |
tree | 9c47063f906a01315006cbb9ecbe07d1a661931b /idl/inc | |
parent | 66714f1888eaccef4eb5341971278ae7dfafa16b (diff) |
inheriting from ByteString is kind of weird
Diffstat (limited to 'idl/inc')
-rw-r--r-- | idl/inc/bastype.hxx | 20 | ||||
-rw-r--r-- | idl/inc/types.hxx | 2 |
2 files changed, 16 insertions, 6 deletions
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index 7fdeafd36a33..d52a38b9a81e 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -156,16 +156,26 @@ public: }; -class SvIdentifier : public ByteString +class SvIdentifier { +private: + ByteString m_aStr; public: - SvIdentifier(){}; - SvIdentifier & operator = ( const ByteString & rStr ) - { ByteString::operator =( rStr ); return *this; } + SvIdentifier() + { + } + void setIdentifier(const ByteString & rStr) + { + m_aStr = rStr; + } + const ByteString& getIdentifier() const + { + return m_aStr; + } friend SvStream& operator << (SvStream &, const SvIdentifier &); friend SvStream& operator >> (SvStream &, SvIdentifier &); - sal_Bool IsSet() const { return Len() != 0; } + sal_Bool IsSet() const { return m_aStr.Len() != 0; } sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ); sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, sal_uInt16 nTab ); diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 6e8841f4a15d..0b7c4bacace6 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -209,7 +209,7 @@ public: int GetCall1() const; void SetBasicName(const ByteString& rName) - { aBasicName = rName; } + { aBasicName.setIdentifier(rName); } const ByteString & GetBasicName() const; ByteString GetBasicPostfix() const; |