Skip to content

C
core
Kaydet (Commit) 12088021 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

ByteString->rtl::OString

üst 5cc2997f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 110 deletions
idl/inc/basobj.hxx
Dosyayı görüntüle @ 12088021
......@@ -183,7 +183,7 @@ public:
const SvString & GetName() const
{
return ( !aRef.Is()
|| SvMetaName::GetName().getString().Len() )
|| !SvMetaName::GetName().getString().isEmpty() )
? SvMetaName::GetName()
: aRef->GetName();
}
......@@ -191,7 +191,7 @@ public:
const SvString & GetHelpText() const
{
return ( !aRef.Is()
|| SvMetaName::GetHelpText().getString().Len() )
|| !SvMetaName::GetHelpText().getString().isEmpty() )
? SvMetaName::GetHelpText()
: aRef->GetHelpText();
}
......@@ -199,7 +199,7 @@ public:
const SvString & GetConfigName() const
{
return ( !aRef.Is()
|| SvMetaName::GetConfigName().getString().Len() )
|| !SvMetaName::GetConfigName().getString().isEmpty() )
? SvMetaName::GetConfigName()
: aRef->GetConfigName();
}
......@@ -207,7 +207,7 @@ public:
const SvString & GetDescription() const
{
return ( !aRef.Is()
|| SvMetaName::GetDescription().getString().Len() )
|| !SvMetaName::GetDescription().getString().isEmpty() )
? SvMetaName::GetDescription()
: aRef->GetDescription();
}
......
idl/inc/bastype.hxx
Dosyayı görüntüle @ 12088021
......@@ -152,30 +152,33 @@ public:
sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
ByteString GetSvIdlString( SvStringHashEntry * pName );
rtl::OString GetSvIdlString( SvStringHashEntry * pName );
};
class SvIdentifier
{
private:
ByteString m_aStr;
rtl::OString m_aStr;
public:
SvIdentifier()
{
}
void setString(const ByteString & rStr)
void setString(const rtl::OString& rStr)
{
m_aStr = rStr;
}
const ByteString& getString() const
const rtl::OString& getString() const
{
return m_aStr;
}
friend SvStream& operator << (SvStream &, const SvIdentifier &);
friend SvStream& operator >> (SvStream &, SvIdentifier &);
sal_Bool IsSet() const { return m_aStr.Len() != 0; }
sal_Bool IsSet() const
{
return !m_aStr.isEmpty();
}
sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
sal_uInt16 nTab );
......@@ -207,12 +210,21 @@ public:
class SvString
{
private:
ByteString m_aStr;
rtl::OString m_aStr;
public:
SvString() {}
void setString(const ByteString &rStr) { m_aStr = rStr; }
const ByteString& getString() const { return m_aStr; }
sal_Bool IsSet() const { return m_aStr.Len() != 0; }
void setString(const rtl::OString& rStr)
{
m_aStr = rStr;
}
const rtl::OString& getString() const
{
return m_aStr;
}
sal_Bool IsSet() const
{
return !m_aStr.isEmpty();
}
friend SvStream& operator << (SvStream &, const SvString &);
friend SvStream& operator >> (SvStream &, SvString &);
......
idl/inc/command.hxx
Dosyayı görüntüle @ 12088021
......@@ -33,12 +33,8 @@
#include <rtl/ustring.hxx>
#include <vector>
#ifndef STRING_LIST
#define STRING_LIST
typedef ::std::vector< String* > StringList;
#endif
typedef ::std::vector< ByteString* > ByteStringList;
typedef ::std::vector< rtl::OString* > ByteStringList;
class SvCommand
{
......
idl/inc/module.hxx
Dosyayı görüntüle @ 12088021
......@@ -68,12 +68,12 @@ public:
SvMetaModule();
const String & GetIdlFileName() const { return aIdlFileName; }
const ByteString & GetModulePrefix() const { return aModulePrefix.getString(); }
const rtl::OString& GetModulePrefix() const { return aModulePrefix.getString(); }
virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
const ByteString & GetHelpFileName() const { return aHelpFileName.getString(); }
const ByteString & GetTypeLibFileName() const { return aTypeLibFile.getString(); }
const rtl::OString& GetHelpFileName() const { return aHelpFileName.getString(); }
const rtl::OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); }
const SvMetaAttributeMemberList & GetAttrList() const { return aAttrList; }
const SvMetaTypeMemberList & GetTypeList() const { return aTypeList; }
......
idl/inc/object.hxx
Dosyayı görüntüle @ 12088021
......@@ -36,11 +36,12 @@
struct SvSlotElement
{
SvMetaSlotRef xSlot;
ByteString aPrefix;
SvSlotElement( SvMetaSlot * pS, const ByteString & rPrefix )
: xSlot( pS )
, aPrefix( rPrefix )
{}
rtl::OString aPrefix;
SvSlotElement( SvMetaSlot * pS, const rtl::OString& rPrefix )
: xSlot( pS )
, aPrefix( rPrefix )
{
}
};
typedef std::vector< SvSlotElement* > SvSlotElementList;
......@@ -51,15 +52,15 @@ SV_DECL_REF(SvMetaClass)
class SvClassElement : public SvPersistBase
{
SvBOOL aAutomation;
ByteString aPrefix;
rtl::OString aPrefix;
SvMetaClassRef xClass;
public:
SV_DECL_PERSIST1( SvClassElement, SvPersistBase, 1 )
SvClassElement();
void SetPrefix( const ByteString & rPrefix )
void SetPrefix( const rtl::OString& rPrefix )
{ aPrefix = rPrefix; }
const ByteString & GetPrefix() const
const rtl::OString& GetPrefix() const
{ return aPrefix; }
void SetAutomation( sal_Bool rAutomation )
......@@ -88,14 +89,14 @@ class SvMetaClass : public SvMetaType
sal_Bool TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
SvMetaAttribute & rAttr ) const;
void WriteSlotStubs( const ByteString & rShellName,
void WriteSlotStubs( const rtl::OString& rShellName,
SvSlotElementList & rSlotList,
ByteStringList & rList,
SvStream & rOutStm );
sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
SvSlotElementList & rSlotList,
SvStream & rOutStm );
sal_uInt16 WriteSlots( const ByteString & rShellName, sal_uInt16 nCount,
sal_uInt16 WriteSlots( const rtl::OString& rShellName, sal_uInt16 nCount,
SvSlotElementList & rSlotList,
SvIdlDataBase & rBase,
SvStream & rOutStm );
......
idl/inc/slot.hxx
Dosyayı görüntüle @ 12088021
......@@ -78,11 +78,11 @@ class SvMetaSlot : public SvMetaAttribute
SvMetaEnumValue* pEnumValue;
SvString aUnoName;
void WriteSlot( const ByteString & rShellName,
sal_uInt16 nCount, const ByteString & rSlotId,
void WriteSlot( const rtl::OString& rShellName,
sal_uInt16 nCount, const rtl::OString& rSlotId,
SvSlotElementList &rList,
size_t nStart,
const ByteString & rPrefix,
const rtl::OString& rPrefix,
SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void Write( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab,
......@@ -192,12 +192,12 @@ public:
SvMetaAttribute * GetMethod() const;
SvMetaType * GetSlotType() const;
sal_Bool GetHasCoreId() const;
const ByteString & GetGroupId() const;
const ByteString & GetConfigId() const;
const ByteString & GetExecMethod() const;
const ByteString & GetStateMethod() const;
const ByteString & GetDefault() const;
const ByteString & GetDisableFlags() const;
const rtl::OString& GetGroupId() const;
const rtl::OString& GetConfigId() const;
const rtl::OString& GetExecMethod() const;
const rtl::OString& GetStateMethod() const;
const rtl::OString& GetDefault() const;
const rtl::OString& GetDisableFlags() const;
sal_Bool GetPseudoSlots() const;
sal_Bool GetCachable() const;
sal_Bool GetVolatile() const;
......@@ -214,8 +214,8 @@ public:
sal_Bool GetRecordAbsolute() const;
sal_Bool GetHasDialog() const;
const ByteString & GetPseudoPrefix() const;
const ByteString & GetUnoName() const;
const rtl::OString& GetPseudoPrefix() const;
const rtl::OString& GetUnoName() const;
sal_Bool GetMenuConfig() const;
sal_Bool GetToolBoxConfig() const;
sal_Bool GetStatusBarConfig() const;
......@@ -247,14 +247,14 @@ public:
SvStream & rOutStm, sal_uInt16 nTab );
virtual void Insert( SvSlotElementList&, const ByteString & rPrefix,
SvIdlDataBase& );
void WriteSlotStubs( const ByteString & rShellName,
void WriteSlotStubs( const rtl::OString& rShellName,
ByteStringList & rList,
SvStream & rOutStm );
sal_uInt16 WriteSlotMap( const ByteString & rShellName,
sal_uInt16 WriteSlotMap( const rtl::OString& rShellName,
sal_uInt16 nCount,
SvSlotElementList&,
size_t nStart,
const ByteString &,
const rtl::OString&,
SvIdlDataBase & rBase,
SvStream & rOutStm );
sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
......
idl/inc/types.hxx
Dosyayı görüntüle @ 12088021
......@@ -211,12 +211,12 @@ public:
void SetBasicName(const ByteString& rName)
{ aBasicName.setString(rName); }
const ByteString & GetBasicName() const;
ByteString GetBasicPostfix() const;
const ByteString & GetSvName() const;
const ByteString & GetSbxName() const;
const ByteString & GetOdlName() const;
const ByteString & GetCName() const;
const rtl::OString& GetBasicName() const;
rtl::OString GetBasicPostfix() const;
const rtl::OString& GetSvName() const;
const rtl::OString& GetSbxName() const;
const rtl::OString& GetOdlName() const;
const rtl::OString& GetCName() const;
char GetParserChar() const { return cParserChar; }
virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
......@@ -227,7 +227,7 @@ public:
SvStream & rOutStm, sal_uInt16 nTab );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
ByteString GetCString() const;
rtl::OString GetCString() const;
void WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
void AppendParserString (ByteString &rString);
......
idl/source/objects/basobj.cxx
Dosyayı görüntüle @ 12088021
......@@ -389,7 +389,7 @@ void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
if( GetHelpText().IsSet() )
{
WriteTab( rOutStm, nTab );
rOutStm << "helpstring(\"" << GetHelpText().getString().GetBuffer() << "\")," << endl;
rOutStm << "helpstring(\"" << GetHelpText().getString().getStr() << "\")," << endl;
}
if( GetHelpContext().IsSet() )
{
......
idl/source/objects/bastype.cxx
Dosyayı görüntüle @ 12088021
......@@ -175,18 +175,15 @@ sal_Bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
return sal_True;
}
ByteString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
rtl::OString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
{
if( nVal )
return pName->GetName();
else
{
ByteString aTmp( pName->GetName() );
aTmp += "(FALSE)";
return aTmp;
}
}
return rtl::OStringBuffer(pName->GetName()).
append(RTL_CONSTASCII_STRINGPARAM("(FALSE)")).
makeStringAndClear();
}
sal_Bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
{
......@@ -220,7 +217,7 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName,
sal_uInt16 /*nTab */ )
{
rOutStm << pName->GetName().GetBuffer() << '(';
rOutStm << getString().GetBuffer() << ')';
rOutStm << getString().getStr() << ')';
return sal_True;
}
......@@ -335,7 +332,7 @@ sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
sal_uInt16 /*nTab */ )
{
rOutStm << pName->GetName().GetBuffer() << "(\"";
rOutStm << m_aStr.GetBuffer() << "\")";
rOutStm << m_aStr.getStr() << "\")";
return sal_True;
}
......
idl/source/objects/module.cxx
Dosyayı görüntüle @ 12088021
......@@ -141,7 +141,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
if( aSlotIdFile.ReadSvIdl( SvHash_SlotIdFile(), rInStm ) )
{
sal_uInt32 nTokPos = rInStm.Tell();
if( !rBase.ReadIdFile( String::CreateFromAscii( aSlotIdFile.getString().GetBuffer() ) ) )
if( !rBase.ReadIdFile( String::CreateFromAscii( aSlotIdFile.getString().getStr() ) ) )
{
rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot read file: "));
aStr.append(aSlotIdFile.getString());
......@@ -160,21 +160,21 @@ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase,
sal_uInt16 nTab )
{
SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
if( aTypeLibFile.getString().Len() || aSlotIdFile.getString().Len() || aTypeLibFile.getString().Len() )
if( !aTypeLibFile.getString().isEmpty() || !aSlotIdFile.getString().isEmpty() || !aTypeLibFile.getString().isEmpty() )
{
if( aHelpFileName.getString().Len() )
if( !aHelpFileName.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
aHelpFileName.WriteSvIdl( SvHash_HelpFile(), rOutStm, nTab +1 );
rOutStm << ';' << endl;
}
if( aSlotIdFile.getString().Len() )
if( !aSlotIdFile.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
aSlotIdFile.WriteSvIdl( SvHash_SlotIdFile(), rOutStm, nTab +1 );
rOutStm << ';' << endl;
}
if( aTypeLibFile.getString().Len() )
if( !aTypeLibFile.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
aTypeLibFile.WriteSvIdl( SvHash_TypeLibFile(), rOutStm, nTab +1 );
......@@ -400,12 +400,12 @@ void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase,
WriteType nT, WriteAttribute nA )
{
SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
if( aHelpFileName.getString().Len() )
if( !aHelpFileName.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
rOutStm << "// class SvMetaModule" << endl;
WriteTab( rOutStm, nTab );
rOutStm << "helpfile(\"" << aHelpFileName.getString().GetBuffer() << "\");" << endl;
rOutStm << "helpfile(\"" << aHelpFileName.getString().getStr() << "\");" << endl;
}
}
......@@ -417,15 +417,15 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
case WRITE_ODL:
{
if( aSlotIdFile.getString().Len() )
if( !aSlotIdFile.getString().isEmpty() )
{
WriteTab( rOutStm, nTab );
rOutStm << "#include \"" << aSlotIdFile.getString().GetBuffer() << '"' << endl << endl;
rOutStm << "#include \"" << aSlotIdFile.getString().getStr() << '"' << endl << endl;
}
SvMetaExtern::Write( rBase, rOutStm, nTab, nT, nA );
rOutStm << endl;
WriteTab( rOutStm, nTab );
rOutStm << "library " << GetName().getString().GetBuffer() << endl;
rOutStm << "library " << GetName().getString().getStr() << endl;
WriteTab( rOutStm, nTab );
rOutStm << '{' << endl;
WriteTab( rOutStm, nTab );
......@@ -450,7 +450,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
case WRITE_DOCU:
{
rOutStm << "SvIDL interface documentation" << endl << endl;
rOutStm << "<MODULE>" << endl << GetName().getString().GetBuffer() << endl;
rOutStm << "<MODULE>" << endl << GetName().getString().getStr() << endl;
WriteDescription( rOutStm );
rOutStm << "</MODULE>" << endl << endl;
......@@ -460,10 +460,10 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
SvMetaClass * pClass = aClassList.GetObject( n );
if( !pClass->IsShell() )
{
rOutStm << pClass->GetName().getString().GetBuffer();
rOutStm << pClass->GetName().getString().getStr();
SvMetaClass* pSC = pClass->GetSuperClass();
if( pSC )
rOutStm << " : " << pSC->GetName().getString().GetBuffer();
rOutStm << " : " << pSC->GetName().getString().getStr();
// imported classes
const SvClassElementMemberList& rClassList = pClass->GetClassList();
......@@ -471,11 +471,11 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
rOutStm << " ( ";
for( sal_uLong m=0; m<rClassList.Count(); m++ )
for( sal_uLong m=0; m<rClassList.Count(); ++m )
{
SvClassElement *pEle = rClassList.GetObject(m);
SvMetaClass *pCl = pEle->GetClass();
rOutStm << pCl->GetName().getString().GetBuffer();
rOutStm << pCl->GetName().getString().getStr();
if ( m+1 == rClassList.Count() )
rOutStm << " )";
else
......@@ -510,8 +510,8 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pTable )
{
if( aSlotIdFile.getString().Len() )
rOutStm << "//#include <" << aSlotIdFile.getString().GetBuffer() << '>' << endl;
if( !aSlotIdFile.getString().isEmpty() )
rOutStm << "//#include <" << aSlotIdFile.getString().getStr() << '>' << endl;
for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
aClassList.GetObject( n )->WriteSrc( rBase, rOutStm, pTable );
......
idl/source/objects/object.cxx
Dosyayı görüntüle @ 12088021
......@@ -67,7 +67,7 @@ void SvClassElement::Save( SvPersistStream & rStm )
// create mask
sal_uInt8 nMask = 0;
if( aAutomation.IsSet() ) nMask |= 0x1;
if( aPrefix.Len() ) nMask |= 0x2;
if( !aPrefix.isEmpty() ) nMask |= 0x2;
if( xClass.Is() ) nMask |= 0x4;
// write data
......@@ -276,12 +276,12 @@ void SvMetaClass::WriteContextSvIdl
SvClassElement * pEle = aClassList.GetObject( n );
WriteTab( rOutStm, nTab );
rOutStm << SvHash_import()->GetName().GetBuffer() << ' '
<< pEle->GetPrefix().GetBuffer();
<< pEle->GetPrefix().getStr();
if( pEle->GetAutomation() )
rOutStm << " [ " << SvHash_Automation()->GetName().GetBuffer()
<< " ]";
if( pEle->GetPrefix().Len() )
rOutStm << ' ' << pEle->GetPrefix().GetBuffer();
if( !pEle->GetPrefix().isEmpty() )
rOutStm << ' ' << pEle->GetPrefix().getStr();
rOutStm << ';' << endl;
}
}
......@@ -322,7 +322,7 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
if ( !rAttr.GetRef() && rAttr.IsA( TYPE( SvMetaSlot ) ) )
{
OSL_FAIL( "Neuer Slot : " );
OSL_FAIL( rAttr.GetSlotId().getString().GetBuffer() );
OSL_FAIL( rAttr.GetSlotId().getString().getStr() );
}
for( sal_uLong n = 0; n < aAttrList.Count(); n++ )
......@@ -334,9 +334,9 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
if( pS->GetSlotId().GetValue() != rAttr.GetSlotId().GetValue() )
{
OSL_FAIL( "Gleicher Name in MetaClass : " );
OSL_FAIL( pS->GetName().getString().GetBuffer() );
OSL_FAIL( pS->GetSlotId().getString().GetBuffer() );
OSL_FAIL( rAttr.GetSlotId().getString().GetBuffer() );
OSL_FAIL( pS->GetName().getString().getStr() );
OSL_FAIL( pS->GetSlotId().getString().getStr() );
OSL_FAIL( rAttr.GetSlotId().getString().getStr() );
rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute's "));
aStr.append(pS->GetName().getString());
......@@ -355,8 +355,8 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
OSL_FAIL( "Gleiche Id in MetaClass : " );
OSL_FAIL(rtl::OString::valueOf(static_cast<sal_Int32>(
pS->GetSlotId().GetValue())).getStr());
OSL_FAIL( pS->GetSlotId().getString().GetBuffer() );
OSL_FAIL( rAttr.GetSlotId().getString().GetBuffer() );
OSL_FAIL( pS->GetSlotId().getString().getStr() );
OSL_FAIL( rAttr.GetSlotId().getString().getStr() );
rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute "));
aStr.append(pS->GetName().getString());
......@@ -380,7 +380,7 @@ void SvMetaClass::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
{
WriteHeaderSvIdl( rBase, rOutStm, nTab );
if( aSuperClass.Is() )
rOutStm << " : " << aSuperClass->GetName().getString().GetBuffer();
rOutStm << " : " << aSuperClass->GetName().getString().getStr();
rOutStm << endl;
SvMetaName::WriteSvIdl( rBase, rOutStm, nTab );
rOutStm << endl;
......@@ -407,7 +407,7 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
case WRITE_DOCU:
{
rOutStm << "<INTERFACE>" << endl
<< GetName().getString().GetBuffer();
<< GetName().getString().getStr();
if ( GetAutomation() )
rOutStm << " ( Automation ) ";
rOutStm << endl;
......@@ -451,7 +451,7 @@ sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
return nCount;
}
sal_uInt16 SvMetaClass::WriteSlots( const ByteString & rShellName,
sal_uInt16 SvMetaClass::WriteSlots( const rtl::OString& rShellName,
sal_uInt16 nCount, SvSlotElementList & rSlotList,
SvIdlDataBase & rBase,
SvStream & rOutStm )
......@@ -514,7 +514,7 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>&
SvClassElement * pEle = aClassList.GetObject( n );
SvMetaClass * pCl = pEle->GetClass();
rtl::OStringBuffer rPre(rPrefix);
if( rPre.getLength() && pEle->GetPrefix().Len() )
if( rPre.getLength() && pEle->GetPrefix().getLength() )
rPre.append('.');
rPre.append(pEle->GetPrefix());
......@@ -553,7 +553,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList )
}
void SvMetaClass::WriteSlotStubs( const ByteString & rShellName,
void SvMetaClass::WriteSlotStubs( const rtl::OString& rShellName,
SvSlotElementList & rSlotList,
ByteStringList & rList,
SvStream & rOutStm )
......@@ -571,10 +571,10 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
{
WriteStars( rOutStm );
// define class
rOutStm << "#ifdef " << GetName().getString().GetBuffer() << endl;
rOutStm << "#ifdef " << GetName().getString().getStr() << endl;
rOutStm << "#undef ShellClass" << endl;
rOutStm << "#undef " << GetName().getString().GetBuffer() << endl;
rOutStm << "#define ShellClass " << GetName().getString().GetBuffer() << endl;
rOutStm << "#undef " << GetName().getString().getStr() << endl;
rOutStm << "#define ShellClass " << GetName().getString().getStr() << endl;
// no slotmaps get written for interfaces
if( !IsShell() )
......@@ -583,7 +583,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
return;
}
// write parameter array
rOutStm << "SFX_ARGUMENTMAP(" << GetName().getString().GetBuffer() << ')' << endl
rOutStm << "SFX_ARGUMENTMAP(" << GetName().getString().getStr() << ')' << endl
<< '{' << endl;
std::vector<sal_uLong> aSuperList;
......@@ -620,7 +620,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
rOutStm << endl;
// write slotmap
rOutStm << "SFX_SLOTMAP_ARG(" << GetName().getString().GetBuffer() << ')' << endl
rOutStm << "SFX_SLOTMAP_ARG(" << GetName().getString().getStr() << ')' << endl
<< '{' << endl;
// write all attributes
......@@ -631,7 +631,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
{
// at least one dummy
WriteTab( rOutStm, 1 );
rOutStm << "SFX_SLOT_ARG(" << GetName().getString().GetBuffer()
rOutStm << "SFX_SLOT_ARG(" << GetName().getString().getStr()
<< ", 0, 0, "
<< "SFX_STUB_PTR_EXEC_NONE,"
<< "SFX_STUB_PTR_STATE_NONE,"
......@@ -679,7 +679,7 @@ void SvMetaClass::WriteHxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
const char * pSup = aSuperName.getStr();
rOutStm
<< "class " << GetSvName().GetBuffer()
<< "class " << GetSvName().getStr()
<< ": public " << pSup << endl
<< '{' << endl
<< "protected:" << endl
......@@ -732,7 +732,7 @@ void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 )
<< "\t sal_uInt16 * pMajor," << endl
<< "\t sal_uInt16 * pMinor ) const" << endl;
rOutStm << '{' << endl
<< "\t*pName = \"" << pMod->GetTypeLibFileName().GetBuffer() << "\";" << endl
<< "\t*pName = \"" << pMod->GetTypeLibFileName().getStr() << "\";" << endl
<< "\t*pMajor = "
<< rtl::OString::valueOf(static_cast<sal_Int32>(pMod->GetVersion().GetMajorVersion())).getStr()
<< ';' << endl
......
idl/source/objects/slot.cxx
Dosyayı görüntüle @ 12088021
This diff is collapsed.
idl/source/objects/types.cxx
Dosyayı görüntüle @ 12088021
This diff is collapsed.
idl/source/prj/command.cxx
Dosyayı görüntüle @ 12088021
......@@ -375,7 +375,7 @@ SvCommand::SvCommand( int argc, char ** argv )
SvCommand::~SvCommand()
{
// release ByteString list
// release String list
for ( size_t i = 0, n = aInFileList.size(); i < n; ++i )
delete aInFileList[ i ];
aInFileList.clear();
......
idl/source/prj/database.cxx
Dosyayı görüntüle @ 12088021
......@@ -88,7 +88,7 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
SvMetaModule * SvIdlDataBase::GetModule( const rtl::OString& rName )
{
for( sal_uLong n = 0; n < aModuleList.Count(); n++ )
if( aModuleList.GetObject( n )->GetName().getString().Equals(rName) )
if( aModuleList.GetObject( n )->GetName().getString().equals(rName) )
return aModuleList.GetObject( n );
return NULL;
}
......@@ -411,12 +411,12 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
if( pTok->IsIdentifier() )
{
ByteString aName = pTok->GetString();
rtl::OString aName = pTok->GetString();
SvMetaTypeMemberList & rList = GetTypeList();
SvMetaType * pType = rList.First();
while( pType )
{
if( pType->GetName().getString() == aName )
if( pType->GetName().getString().equals(aName) )
break;
pType = rList.Next();
}
......@@ -485,7 +485,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
for( sal_uLong i = 0; i < aAttrList.Count(); i++ )
{
SvMetaAttribute * pAttr = aAttrList.GetObject( i );
if( pAttr->GetSlotId().getString() == pTok->GetString() )
if( pAttr->GetSlotId().getString().equals(pTok->GetString()) )
return pAttr;
}
}
......@@ -528,7 +528,7 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
for( sal_uLong n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
if( pClass->GetName().getString() == pTok->GetString() )
if( pClass->GetName().getString().equals(pTok->GetString()) )
return pClass;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment