mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert GetMangleName

Browse Source
This commit is contained in:
Caolán McNamara
2011-12-13 07:40:27 +00:00
parent 34cbfad1b2
commit 2338a8c9c5
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
idl/inc/slot.hxx
View File

@@ -189,7 +189,7 @@ public:
virtual sal_Bool IsVariable() const; virtual sal_Bool IsVariable() const;
virtual sal_Bool IsMethod() const; virtual sal_Bool IsMethod() const;
virtual ByteString GetMangleName( sal_Bool bVariable ) const; virtual rtl::OString GetMangleName( sal_Bool bVariable ) const;
SvMetaAttribute * GetMethod() const; SvMetaAttribute * GetMethod() const;
SvMetaType * GetSlotType() const; SvMetaType * GetSlotType() const;

14
idl/inc/types.hxx
View File

@@ -103,7 +103,7 @@ public:
virtual sal_Bool IsMethod() const; virtual sal_Bool IsMethod() const;
virtual sal_Bool IsVariable() const; virtual sal_Bool IsVariable() const;
virtual ByteString GetMangleName( sal_Bool bVariable ) const; virtual rtl::OString GetMangleName( sal_Bool bVariable ) const;
#ifdef IDL_COMPILER #ifdef IDL_COMPILER
@@ -178,12 +178,12 @@ protected:
public: public:
SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 ) SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 )
SvMetaType(); SvMetaType();
SvMetaType( const ByteString & rTypeName, char cParserChar, SvMetaType( const rtl::OString& rTypeName, char cParserChar,
const ByteString & rCName ); const rtl::OString& rCName );
SvMetaType( const ByteString & rTypeName, const ByteString & rSbxName, SvMetaType( const rtl::OString& rTypeName, const rtl::OString& rSbxName,
const ByteString & rOdlName, char cParserChar, const rtl::OString& rOdlName, char cParserChar,
const ByteString & rCName, const ByteString & rBasicName, const rtl::OString& rCName, const rtl::OString& rBasicName,
const ByteString & rBasicPostfix ); const rtl::OString& rBasicPostfix );
SvMetaAttributeMemberList & GetAttrList() const; SvMetaAttributeMemberList & GetAttrList() const;
sal_uLong GetAttrCount() const sal_uLong GetAttrCount() const

6
idl/source/objects/slot.cxx
View File

@@ -300,7 +300,7 @@ sal_Bool SvMetaSlot::IsMethod() const
return b; return b;
} }
ByteString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const rtl::OString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const
{ {
if( !bVariable ) if( !bVariable )
{ {
@@ -1393,7 +1393,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
rOutStm << '.'; rOutStm << '.';
if ( !IsVariable() || !GetType() || if ( !IsVariable() || !GetType() ||
GetType()->GetBaseType()->GetType() != TYPE_STRUCT ) GetType()->GetBaseType()->GetType() != TYPE_STRUCT )
rOutStm << GetMangleName( sal_False ).GetBuffer(); rOutStm << GetMangleName( sal_False ).getStr();
rOutStm << "\","; rOutStm << "\",";
} }
else else
@@ -1414,7 +1414,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
{ {
rOutStm << ",\""; rOutStm << ",\"";
rOutStm << GetMangleName( sal_False ).GetBuffer(); rOutStm << GetMangleName( sal_False ).getStr();
rOutStm << "\""; rOutStm << "\"";
} }

18
idl/source/objects/types.cxx
View File

@@ -183,7 +183,7 @@ sal_Bool SvMetaAttribute::IsVariable() const
return pType->GetType() != TYPE_METHOD; return pType->GetType() != TYPE_METHOD;
} }
ByteString SvMetaAttribute::GetMangleName( sal_Bool ) const rtl::OString SvMetaAttribute::GetMangleName( sal_Bool ) const
{ {
return GetName(); return GetName();
} }
@@ -769,8 +769,8 @@ SvMetaType::SvMetaType()
{ {
} }
SvMetaType::SvMetaType( const ByteString & rName, char cPC, SvMetaType::SvMetaType( const rtl::OString& rName, char cPC,
const ByteString & rCName ) const rtl::OString& rCName )
CTOR CTOR
{ {
SetName( rName ); SetName( rName );
@@ -778,13 +778,13 @@ SvMetaType::SvMetaType( const ByteString & rName, char cPC,
aCName = rCName; aCName = rCName;
} }
SvMetaType::SvMetaType( const ByteString & rName, SvMetaType::SvMetaType( const rtl::OString& rName,
const ByteString & rSbxName, const rtl::OString& rSbxName,
const ByteString & rOdlName, const rtl::OString& rOdlName,
char cPc, char cPc,
const ByteString & rCName, const rtl::OString& rCName,
const ByteString & rBasicName, const rtl::OString& rBasicName,
const ByteString & rBasicPostfix ) const rtl::OString& rBasicPostfix )
CTOR CTOR
{ {
SetName( rName ); SetName( rName );