summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /idl
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'idl')
-rw-r--r--idl/inc/basobj.hxx4
-rw-r--r--idl/inc/bastype.hxx14
-rw-r--r--idl/inc/command.hxx2
-rw-r--r--idl/inc/database.hxx32
-rw-r--r--idl/inc/hash.hxx22
-rw-r--r--idl/inc/lex.hxx16
-rw-r--r--idl/inc/module.hxx8
-rw-r--r--idl/inc/object.hxx16
-rw-r--r--idl/inc/slot.hxx32
-rw-r--r--idl/inc/types.hxx52
-rw-r--r--idl/source/cmptools/hash.cxx14
-rw-r--r--idl/source/cmptools/lex.cxx18
-rw-r--r--idl/source/objects/basobj.cxx8
-rw-r--r--idl/source/objects/bastype.cxx12
-rw-r--r--idl/source/objects/module.cxx20
-rw-r--r--idl/source/objects/object.cxx18
-rw-r--r--idl/source/objects/slot.cxx88
-rw-r--r--idl/source/objects/types.cxx96
-rw-r--r--idl/source/prj/command.cxx24
-rw-r--r--idl/source/prj/database.cxx68
-rw-r--r--idl/source/prj/globals.cxx2
-rw-r--r--idl/source/prj/svidl.cxx40
22 files changed, 303 insertions, 303 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index cc6343744aa7..0bb8a79d93a4 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -125,8 +125,8 @@ public:
SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
SvMetaName();
- virtual sal_Bool SetName( const rtl::OString& rName, SvIdlDataBase * = NULL );
- void SetDescription( const rtl::OString& rText )
+ virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL );
+ void SetDescription( const OString& rText )
{ aDescription.setString(rText); }
const SvHelpContext& GetHelpContext() const { return aHelpContext; }
virtual const SvString & GetName() const { return aName; }
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index b3efec4a0115..f97672372dc4 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -92,23 +92,23 @@ public:
sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
- rtl::OString GetSvIdlString( SvStringHashEntry * pName );
+ OString GetSvIdlString( SvStringHashEntry * pName );
};
class SvIdentifier
{
private:
- rtl::OString m_aStr;
+ OString m_aStr;
public:
SvIdentifier()
{
}
- void setString(const rtl::OString& rStr)
+ void setString(const OString& rStr)
{
m_aStr = rStr;
}
- const rtl::OString& getString() const
+ const OString& getString() const
{
return m_aStr;
}
@@ -150,14 +150,14 @@ public:
class SvString
{
private:
- rtl::OString m_aStr;
+ OString m_aStr;
public:
SvString() {}
- void setString(const rtl::OString& rStr)
+ void setString(const OString& rStr)
{
m_aStr = rStr;
}
- const rtl::OString& getString() const
+ const OString& getString() const
{
return m_aStr;
}
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index b77ab2fcb9c7..23a646f4fad3 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -25,7 +25,7 @@
#include <vector>
typedef ::std::vector< String* > StringList;
-typedef ::std::vector< rtl::OString* > ByteStringList;
+typedef ::std::vector< OString* > ByteStringList;
class SvCommand
{
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 8c314d2ac06b..1702ed77618f 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -33,7 +33,7 @@ class SvCommand;
class SvIdlError
{
- rtl::OString aText;
+ OString aText;
public:
sal_uInt32 nLine, nColumn;
@@ -41,8 +41,8 @@ public:
SvIdlError( sal_uInt32 nL, sal_uInt32 nC )
: nLine(nL), nColumn(nC) {}
- const rtl::OString& GetText() const { return aText; }
- void SetText( const rtl::OString& rT ) { aText = rT; }
+ const OString& GetText() const { return aText; }
+ void SetText( const OString& rT ) { aText = rT; }
sal_Bool IsError() const { return nLine != 0; }
void Clear() { nLine = nColumn = 0; }
SvIdlError & operator = ( const SvIdlError & rRef )
@@ -71,14 +71,14 @@ class SvIdlDataBase
SvMetaTypeMemberList aTmpTypeList; // not persistent
protected:
- ::std::set< ::rtl::OUString > m_DepFiles;
+ ::std::set< OUString > m_DepFiles;
SvMetaObjectMemberStack aContextStack;
String aPath;
SvIdlError aError;
void WriteReset()
{
aUsedTypes.clear();
- aIFaceName = rtl::OString();
+ aIFaceName = OString();
}
public:
explicit SvIdlDataBase( const SvCommand& rCmd );
@@ -93,11 +93,11 @@ public:
SvMetaTypeMemberList & GetTypeList();
SvMetaClassMemberList & GetClassList() { return aClassList; }
SvMetaModuleMemberList & GetModuleList() { return aModuleList; }
- SvMetaModule * GetModule( const rtl::OString& rName );
+ SvMetaModule * GetModule( const OString& rName );
// list of used types while writing
SvMetaTypeMemberList aUsedTypes;
- rtl::OString aIFaceName;
+ OString aIFaceName;
SvNumberIdentifier aStructSlotId;
void StartNewFile( const String& rName );
@@ -111,13 +111,13 @@ public:
const String & GetPath() const { return aPath; }
SvMetaObjectMemberStack & GetStack() { return aContextStack; }
- void Write(const rtl::OString& rText);
- void WriteError(const rtl::OString& rErrWrn,
- const rtl::OString& rFileName,
- const rtl::OString& rErrorText,
+ void Write(const OString& rText);
+ void WriteError(const OString& rErrWrn,
+ const OString& rFileName,
+ const OString& rErrorText,
sal_uLong nRow = 0, sal_uLong nColumn = 0 ) const;
void WriteError( SvTokenStream & rInStm );
- void SetError( const rtl::OString& rError, SvToken * pTok );
+ void SetError( const OString& rError, SvToken * pTok );
void Push( SvMetaObject * pObj );
sal_Bool Pop( sal_Bool bOk, SvTokenStream & rInStm, sal_uInt32 nTokPos )
{
@@ -129,11 +129,11 @@ public:
return bOk;
}
sal_uInt32 GetUniqueId() { return ++nUniqueId; }
- sal_Bool FindId( const rtl::OString& rIdName, sal_uLong * pVal );
- sal_Bool InsertId( const rtl::OString& rIdName, sal_uLong nVal );
+ sal_Bool FindId( const OString& rIdName, sal_uLong * pVal );
+ sal_Bool InsertId( const OString& rIdName, sal_uLong nVal );
sal_Bool ReadIdFile( const String & rFileName );
- SvMetaType * FindType( const rtl::OString& rName );
+ SvMetaType * FindType( const OString& rName );
static SvMetaType * FindType( const SvMetaType *, SvMetaTypeMemberList & );
SvMetaType * ReadKnownType( SvTokenStream & rInStm );
@@ -142,7 +142,7 @@ public:
SvMetaAttribute * SearchKnownAttr( const SvNumberIdentifier& );
SvMetaClass * ReadKnownClass( SvTokenStream & rInStm );
void AddDepFile(String const& rFileName);
- bool WriteDepFile(SvFileStream & rStream, ::rtl::OUString const& rTarget);
+ bool WriteDepFile(SvFileStream & rStream, OUString const& rTarget);
};
class SvIdlWorkingBase : public SvIdlDataBase
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index d5297a825a87..115d09e82df0 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -31,12 +31,12 @@ class SvHashTable
sal_uInt32 lAsk; // number of requests
sal_uInt32 lTry; // number of tries
protected:
- sal_Bool Test_Insert( const rtl::OString&, sal_Bool bInsert, sal_uInt32 * pInsertPos );
+ sal_Bool Test_Insert( const OString&, sal_Bool bInsert, sal_uInt32 * pInsertPos );
// compare element with entry
- virtual bool equals( const rtl::OString& , sal_uInt32 ) const = 0;
+ virtual bool equals( const OString& , sal_uInt32 ) const = 0;
// get hash value from subclass
- virtual sal_uInt32 HashFunc( const rtl::OString& ) const = 0;
+ virtual sal_uInt32 HashFunc( const OString& ) const = 0;
public:
SvHashTable( sal_uInt32 nMaxEntries );
virtual ~SvHashTable();
@@ -50,20 +50,20 @@ class SvStringHashTable;
class SvStringHashEntry : public SvRefBase
{
friend class SvStringHashTable;
- rtl::OString aName;
+ OString aName;
sal_uInt32 nHashId;
sal_uLong nValue;
sal_Bool bHasId;
public:
SvStringHashEntry() : bHasId( sal_False ) {;}
- SvStringHashEntry( const rtl::OString& rName, sal_uInt32 nIdx )
+ SvStringHashEntry( const OString& rName, sal_uInt32 nIdx )
: aName( rName )
, nHashId( nIdx )
, nValue( 0 )
, bHasId( sal_True ) {}
~SvStringHashEntry();
- const rtl::OString& GetName() const { return aName; }
+ const OString& GetName() const { return aName; }
sal_Bool HasId() const { return bHasId; }
sal_uInt32 GetId() const { return nHashId; }
@@ -92,17 +92,17 @@ class SvStringHashTable : public SvHashTable
{
SvStringHashEntry* pEntries;
protected:
- virtual sal_uInt32 HashFunc( const rtl::OString& rElement ) const;
- virtual bool equals( const rtl::OString &rElement, sal_uInt32 nIndex ) const;
+ virtual sal_uInt32 HashFunc( const OString& rElement ) const;
+ virtual bool equals( const OString &rElement, sal_uInt32 nIndex ) const;
public:
SvStringHashTable( sal_uInt32 nMaxEntries ); // max size of hash-tabel
virtual ~SvStringHashTable();
- rtl::OString GetNearString( const rtl::OString& rName ) const;
+ OString GetNearString( const OString& rName ) const;
virtual sal_Bool IsEntry( sal_uInt32 nIndex ) const;
- sal_Bool Insert( const rtl::OString& rStr, sal_uInt32 * pHash ); // insert string
- sal_Bool Test( const rtl::OString& rStr, sal_uInt32 * pHash ) const; // test of insert string
+ sal_Bool Insert( const OString& rStr, sal_uInt32 * pHash ); // insert string
+ sal_Bool Test( const OString& rStr, sal_uInt32 * pHash ) const; // test of insert string
SvStringHashEntry * Get ( sal_uInt32 nIndex ) const; // return pointer to string
SvStringHashEntry & operator []( sal_uInt32 nPos ) const
{ return pEntries[ nPos ]; }
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 37d75e0d0d1d..7dd36f4e530e 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -37,7 +37,7 @@ class SvToken
friend class SvTokenStream;
sal_uLong nLine, nColumn;
SVTOKEN_ENUM nType;
- rtl::OString aString;
+ OString aString;
union
{
sal_uLong nLong;
@@ -51,12 +51,12 @@ public:
SvToken( sal_uLong n );
SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
SvToken( char c );
- SvToken( SVTOKEN_ENUM nTypeP, const rtl::OString& rStr );
+ SvToken( SVTOKEN_ENUM nTypeP, const OString& rStr );
SvToken( SVTOKEN_ENUM nTypeP );
SvToken & operator = ( const SvToken & rObj );
- rtl::OString GetTokenAsString() const;
+ OString GetTokenAsString() const;
SVTOKEN_ENUM GetType() const { return nType; }
void SetLine( sal_uLong nLineP ) { nLine = nLineP; }
@@ -81,7 +81,7 @@ public:
sal_Bool IsRttiBase() const { return nType == SVTOKEN_RTTIBASE; }
sal_Bool IsEof() const { return nType == SVTOKEN_EOF; }
- const rtl::OString& GetString() const
+ const OString& GetString() const
{
return IsIdentifierHash()
? pHash->GetName()
@@ -112,7 +112,7 @@ inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b )
inline SvToken::SvToken( char c )
: nType( SVTOKEN_CHAR ), cChar( c ) {}
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const rtl::OString& rStr )
+inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const OString& rStr )
: nType( nTypeP ), aString( rStr ) {}
inline SvToken::SvToken( SVTOKEN_ENUM nTypeP )
@@ -124,8 +124,8 @@ class SvTokenStream
int nBufPos;
int c; // next character
sal_uInt16 nTabSize; // length of tabulator
- rtl::OString aStrTrue;
- rtl::OString aStrFalse;
+ OString aStrTrue;
+ OString aStrFalse;
sal_uLong nMaxPos;
SvFileStream * pInStream;
@@ -136,7 +136,7 @@ class SvTokenStream
void InitCtor();
- rtl::OString aBufStr;
+ OString aBufStr;
int GetNextChar();
int GetFastNextChar()
{
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 386b216a61ed..7d42b7559b27 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -59,12 +59,12 @@ public:
SvMetaModule();
const String & GetIdlFileName() const { return aIdlFileName; }
- const rtl::OString& GetModulePrefix() const { return aModulePrefix.getString(); }
+ const OString& GetModulePrefix() const { return aModulePrefix.getString(); }
- virtual sal_Bool SetName( const rtl::OString& rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL );
- const rtl::OString& GetHelpFileName() const { return aHelpFileName.getString(); }
- const rtl::OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); }
+ const OString& GetHelpFileName() const { return aHelpFileName.getString(); }
+ const OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); }
const SvMetaAttributeMemberList & GetAttrList() const { return aAttrList; }
const SvMetaTypeMemberList & GetTypeList() const { return aTypeList; }
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index cbe4d31bd680..69c1eb1a6da8 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -27,8 +27,8 @@
struct SvSlotElement
{
SvMetaSlotRef xSlot;
- rtl::OString aPrefix;
- SvSlotElement( SvMetaSlot * pS, const rtl::OString& rPrefix )
+ OString aPrefix;
+ SvSlotElement( SvMetaSlot * pS, const OString& rPrefix )
: xSlot( pS )
, aPrefix( rPrefix )
{
@@ -43,15 +43,15 @@ SV_DECL_REF(SvMetaClass)
class SvClassElement : public SvPersistBase
{
SvBOOL aAutomation;
- rtl::OString aPrefix;
+ OString aPrefix;
SvMetaClassRef xClass;
public:
SV_DECL_PERSIST1( SvClassElement, SvPersistBase, 1 )
SvClassElement();
- void SetPrefix( const rtl::OString& rPrefix )
+ void SetPrefix( const OString& rPrefix )
{ aPrefix = rPrefix; }
- const rtl::OString& GetPrefix() const
+ const OString& GetPrefix() const
{ return aPrefix; }
void SetAutomation( sal_Bool rAutomation )
@@ -81,21 +81,21 @@ class SvMetaClass : public SvMetaType
sal_Bool TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
SvMetaAttribute & rAttr ) const;
- void WriteSlotStubs( const rtl::OString& rShellName,
+ void WriteSlotStubs( const OString& rShellName,
SvSlotElementList & rSlotList,
ByteStringList & rList,
SvStream & rOutStm );
sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
SvSlotElementList & rSlotList,
SvStream & rOutStm );
- sal_uInt16 WriteSlots( const rtl::OString& rShellName, sal_uInt16 nCount,
+ sal_uInt16 WriteSlots( const OString& rShellName, sal_uInt16 nCount,
SvSlotElementList & rSlotList,
SvIdlDataBase & rBase,
SvStream & rOutStm );
void InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
SvMetaClassList & rClassList,
- const rtl::OString& rPrefix, SvIdlDataBase& rBase );
+ const OString& rPrefix, SvIdlDataBase& rBase );
protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 1427218580a2..456d51d64b87 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -68,11 +68,11 @@ class SvMetaSlot : public SvMetaAttribute
SvMetaEnumValue* pEnumValue;
SvString aUnoName;
- void WriteSlot( const rtl::OString& rShellName,
- sal_uInt16 nCount, const rtl::OString& rSlotId,
+ void WriteSlot( const OString& rShellName,
+ sal_uInt16 nCount, const OString& rSlotId,
SvSlotElementList &rList,
size_t nStart,
- const rtl::OString& rPrefix,
+ const OString& rPrefix,
SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void Write( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab,
@@ -177,17 +177,17 @@ public:
virtual sal_Bool IsVariable() const;
virtual sal_Bool IsMethod() const;
- virtual rtl::OString GetMangleName( sal_Bool bVariable ) const;
+ virtual OString GetMangleName( sal_Bool bVariable ) const;
SvMetaAttribute * GetMethod() const;
SvMetaType * GetSlotType() const;
sal_Bool GetHasCoreId() 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;
+ const OString& GetGroupId() const;
+ const OString& GetConfigId() const;
+ const OString& GetExecMethod() const;
+ const OString& GetStateMethod() const;
+ const OString& GetDefault() const;
+ const OString& GetDisableFlags() const;
sal_Bool GetPseudoSlots() const;
sal_Bool GetCachable() const;
sal_Bool GetVolatile() const;
@@ -204,8 +204,8 @@ public:
sal_Bool GetRecordAbsolute() const;
sal_Bool GetHasDialog() const;
- const rtl::OString& GetPseudoPrefix() const;
- const rtl::OString& GetUnoName() const;
+ const OString& GetPseudoPrefix() const;
+ const OString& GetUnoName() const;
sal_Bool GetMenuConfig() const;
sal_Bool GetToolBoxConfig() const;
sal_Bool GetStatusBarConfig() const;
@@ -235,16 +235,16 @@ public:
virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteSvIdl( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab );
- virtual void Insert( SvSlotElementList&, const rtl::OString& rPrefix,
+ virtual void Insert( SvSlotElementList&, const OString& rPrefix,
SvIdlDataBase& );
- void WriteSlotStubs( const rtl::OString& rShellName,
+ void WriteSlotStubs( const OString& rShellName,
ByteStringList & rList,
SvStream & rOutStm );
- sal_uInt16 WriteSlotMap( const rtl::OString& rShellName,
+ sal_uInt16 WriteSlotMap( const OString& rShellName,
sal_uInt16 nCount,
SvSlotElementList&,
size_t nStart,
- const rtl::OString&,
+ const OString&,
SvIdlDataBase & rBase,
SvStream & rOutStm );
sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 7189ceb14cd0..0efc9082e135 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -98,7 +98,7 @@ public:
virtual sal_Bool IsMethod() const;
virtual sal_Bool IsVariable() const;
- virtual rtl::OString GetMangleName( sal_Bool bVariable ) const;
+ virtual OString GetMangleName( sal_Bool bVariable ) const;
virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -111,14 +111,14 @@ public:
WriteType, WriteAttribute );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- sal_uLong MakeSfx( rtl::OStringBuffer& rAtrrArray );
- virtual void Insert( SvSlotElementList&, const rtl::OString& rPrefix,
+ sal_uLong MakeSfx( OStringBuffer& rAtrrArray );
+ virtual void Insert( SvSlotElementList&, const OString& rPrefix,
SvIdlDataBase& );
virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
HelpIdTable& rIdTable );
virtual void WriteCSV( SvIdlDataBase&, SvStream& );
void FillIDTable(HelpIdTable& rIDTable);
- rtl::OString Compare( SvMetaAttribute *pAttr );
+ OString Compare( SvMetaAttribute *pAttr );
};
SV_IMPL_REF(SvMetaAttribute)
@@ -144,7 +144,7 @@ class SvMetaType : public SvMetaExtern
sal_Bool bIsShell;
char cParserChar;
- void WriteSfxItem( const rtl::OString& rItemName, SvIdlDataBase & rBase,
+ void WriteSfxItem( const OString& rItemName, SvIdlDataBase & rBase,
SvStream & rOutStm );
protected:
sal_Bool ReadNamesSvIdl( SvIdlDataBase & rBase,
@@ -166,12 +166,12 @@ protected:
public:
SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 )
SvMetaType();
- SvMetaType( const rtl::OString& rTypeName, char cParserChar,
- const rtl::OString& rCName );
- SvMetaType( const rtl::OString& rTypeName, const rtl::OString& rSbxName,
- const rtl::OString& rOdlName, char cParserChar,
- const rtl::OString& rCName, const rtl::OString& rBasicName,
- const rtl::OString& rBasicPostfix );
+ SvMetaType( const OString& rTypeName, char cParserChar,
+ const OString& rCName );
+ SvMetaType( const OString& rTypeName, const OString& rSbxName,
+ const OString& rOdlName, char cParserChar,
+ const OString& rCName, const OString& rBasicName,
+ const OString& rBasicPostfix );
SvMetaAttributeMemberList & GetAttrList() const;
sal_uLong GetAttrCount() const
@@ -202,18 +202,18 @@ public:
void SetCall1( int e);
int GetCall1() const;
- void SetBasicName(const rtl::OString& rName)
+ void SetBasicName(const OString& rName)
{ aBasicName.setString(rName); }
- 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;
+ const OString& GetBasicName() const;
+ OString GetBasicPostfix() const;
+ const OString& GetSvName() const;
+ const OString& GetSbxName() const;
+ const OString& GetOdlName() const;
+ const OString& GetCName() const;
char GetParserChar() const { return cParserChar; }
- virtual sal_Bool SetName( const rtl::OString& rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL );
virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -221,20 +221,20 @@ public:
SvStream & rOutStm, sal_uInt16 nTab );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- rtl::OString GetCString() const;
+ OString GetCString() const;
void WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
- sal_uLong MakeSfx( rtl::OStringBuffer& rAtrrArray );
+ sal_uLong MakeSfx( OStringBuffer& rAtrrArray );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
sal_Bool ReadMethodArgs( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
void WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
void WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
void WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
- rtl::OString GetParserString() const;
+ OString GetParserString() const;
void WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
- const rtl::OString& rChief );
+ const OString& rChief );
};
SV_IMPL_REF(SvMetaType)
@@ -252,7 +252,7 @@ class SvMetaTypeStringMemberList : public SvDeclPersistList<SvMetaTypeString *>
class SvMetaEnumValue : public SvMetaName
{
- rtl::OString aEnumValue;
+ OString aEnumValue;
public:
SV_DECL_META_FACTORY1( SvMetaEnumValue, SvMetaName, 20 )
SvMetaEnumValue();
@@ -269,7 +269,7 @@ class SvMetaEnumValueMemberList : public SvDeclPersistList<SvMetaEnumValue *> {}
class SvMetaTypeEnum : public SvMetaType
{
SvMetaEnumValueMemberList aEnumValueList;
- rtl::OString aPrefix;
+ OString aPrefix;
protected:
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
@@ -282,7 +282,7 @@ public:
sal_uInt16 GetMaxValue() const;
sal_uLong Count() const { return aEnumValueList.size(); }
- const rtl::OString& GetPrefix() const { return aPrefix; }
+ const OString& GetPrefix() const { return aPrefix; }
SvMetaEnumValue * GetObject( sal_uLong n ) const
{ return aEnumValueList[n]; }
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index 96eb8cc92d30..de253b6b817d 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -41,7 +41,7 @@ SvHashTable::~SvHashTable()
{
}
-sal_Bool SvHashTable::Test_Insert( const rtl::OString& rElement, sal_Bool bInsert,
+sal_Bool SvHashTable::Test_Insert( const OString& rElement, sal_Bool bInsert,
sal_uInt32 * pInsertPos )
{
sal_uInt32 nHash;
@@ -114,7 +114,7 @@ SvStringHashTable::~SvStringHashTable()
delete [] pEntries;
}
-sal_uInt32 SvStringHashTable::HashFunc( const rtl::OString& rElement ) const
+sal_uInt32 SvStringHashTable::HashFunc( const OString& rElement ) const
{
sal_uInt32 nHash = 0; // hash value
const char * pStr = rElement.getStr();
@@ -135,7 +135,7 @@ sal_uInt32 SvStringHashTable::HashFunc( const rtl::OString& rElement ) const
return( nHash );
}
-rtl::OString SvStringHashTable::GetNearString( const rtl::OString& rName ) const
+OString SvStringHashTable::GetNearString( const OString& rName ) const
{
for( sal_uInt32 i = 0; i < GetMax(); i++ )
{
@@ -146,7 +146,7 @@ rtl::OString SvStringHashTable::GetNearString( const rtl::OString& rName ) const
return pE->GetName();
}
}
- return rtl::OString();
+ return OString();
}
sal_Bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const
@@ -156,7 +156,7 @@ sal_Bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const
return pEntries[ nIndex ].HasId();
}
-sal_Bool SvStringHashTable::Insert( const rtl::OString& rName, sal_uInt32 * pIndex )
+sal_Bool SvStringHashTable::Insert( const OString& rName, sal_uInt32 * pIndex )
{
sal_uInt32 nIndex;
@@ -170,7 +170,7 @@ sal_Bool SvStringHashTable::Insert( const rtl::OString& rName, sal_uInt32 * pInd
return sal_True;
}
-sal_Bool SvStringHashTable::Test( const rtl::OString& rName, sal_uInt32 * pPos ) const
+sal_Bool SvStringHashTable::Test( const OString& rName, sal_uInt32 * pPos ) const
{
return const_cast<SvStringHashTable*>(this)->Test_Insert( rName, sal_False, pPos );
}
@@ -182,7 +182,7 @@ SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 nIndex ) const
return( NULL );
}
-bool SvStringHashTable::equals( const rtl::OString& rElement,
+bool SvStringHashTable::equals( const OString& rElement,
sal_uInt32 nIndex ) const
{
return rElement.equals( pEntries[ nIndex ].GetName() );
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index e01cabb9b692..e5b87310de8a 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -25,9 +25,9 @@
#include <globals.hxx>
#include <rtl/strbuf.hxx>
-rtl::OString SvToken::GetTokenAsString() const
+OString SvToken::GetTokenAsString() const
{
- rtl::OString aStr;
+ OString aStr;
switch( nType )
{
case SVTOKEN_EMPTY:
@@ -48,7 +48,7 @@ rtl::OString SvToken::GetTokenAsString() const
aStr = aString;
break;
case SVTOKEN_CHAR:
- aStr = rtl::OString(cChar);
+ aStr = OString(cChar);
break;
case SVTOKEN_RTTIBASE:
aStr = "RTTIBASE";
@@ -85,8 +85,8 @@ SvToken & SvToken::operator = ( const SvToken & rObj )
void SvTokenStream::InitCtor()
{
- aStrTrue = rtl::OString(RTL_CONSTASCII_STRINGPARAM("TRUE"));
- aStrFalse = rtl::OString(RTL_CONSTASCII_STRINGPARAM("FALSE"));
+ aStrTrue = OString(RTL_CONSTASCII_STRINGPARAM("TRUE"));
+ aStrFalse = OString(RTL_CONSTASCII_STRINGPARAM("FALSE"));
nLine = nColumn = 0;
nBufPos = 0;
nTabSize = 4;
@@ -161,7 +161,7 @@ int SvTokenStream::GetNextChar()
}
else
{
- aBufStr = rtl::OString();
+ aBufStr = OString();
nColumn = 0;
nBufPos = 0;
return '\0';
@@ -275,7 +275,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
}
else if( c == '"' )
{
- rtl::OStringBuffer aStr;
+ OStringBuffer aStr;
sal_Bool bDone = sal_False;
while( !bDone && !IsEof() && c )
{
@@ -322,13 +322,13 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken )
}
else if( isalpha (c) || (c == '_') )
{
- rtl::OStringBuffer aBuf;
+ OStringBuffer aBuf;
while( isalnum( c ) || c == '_' )
{
aBuf.append(static_cast<char>(c));
c = GetFastNextChar();
}
- rtl::OString aStr = aBuf.makeStringAndClear();
+ OString aStr = aBuf.makeStringAndClear();
if( aStr.equalsIgnoreAsciiCase( aStrTrue ) )
{
rToken.nType = SVTOKEN_BOOL;
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index f4d646569ea7..491d485a528b 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -152,7 +152,7 @@ void SvMetaName::Save( SvPersistStream & rStm )
if( nMask & 0x10 ) rStm << aDescription;
}
-sal_Bool SvMetaName::SetName( const rtl::OString& rName, SvIdlDataBase * )
+sal_Bool SvMetaName::SetName( const OString& rName, SvIdlDataBase * )
{
aName.setString(rName);
return sal_True;
@@ -220,7 +220,7 @@ void SvMetaName::WriteDescription( SvStream & rOutStm )
{
rOutStm << "<DESCRIPTION>" << endl;
- rtl::OString aDesc( GetDescription().getString() );
+ OString aDesc( GetDescription().getString() );
sal_Int32 nPos = aDesc.indexOf('\n');
while ( nPos != -1 )
{
@@ -378,7 +378,7 @@ void SvMetaName::WriteAttributes( SvIdlDataBase &, SvStream & rOutStm,
{
WriteTab( rOutStm, nTab );
rOutStm << "helpcontext("
- << rtl::OString::valueOf(static_cast<sal_Int64>(
+ << OString::valueOf(static_cast<sal_Int64>(
GetHelpContext().GetValue())).getStr()
<< ")," << endl;
}
@@ -558,7 +558,7 @@ void SvMetaExtern::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
WriteTab( rOutStm, nTab );
rOutStm << "// class SvMetaExtern" << endl;
WriteTab( rOutStm, nTab );
- rOutStm << "uuid(" << rtl::OUStringToOString(GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << ")," << endl;
+ rOutStm << "uuid(" << OUStringToOString(GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << ")," << endl;
WriteTab( rOutStm, nTab );
rOutStm << "version("
<< OString::number(aVersion.GetMajorVersion()).getStr()
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 0d7510e1046a..5678a6500643 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -166,12 +166,12 @@ sal_Bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm )
return sal_True;
}
-rtl::OString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
+OString SvBOOL::GetSvIdlString( SvStringHashEntry * pName )
{
if( nVal )
return pName->GetName();
- return rtl::OStringBuffer(pName->GetName()).
+ return OStringBuffer(pName->GetName()).
append(RTL_CONSTASCII_STRINGPARAM("(FALSE)")).
makeStringAndClear();
}
@@ -239,7 +239,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
}
else
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"no value for identifier <"));
aStr.append(getString()).append(RTL_CONSTASCII_STRINGPARAM("> "));
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
@@ -266,7 +266,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
}
else
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"no value for identifier <"));
aStr.append(getString()).append(RTL_CONSTASCII_STRINGPARAM("> "));
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
@@ -365,7 +365,7 @@ sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
if( pTok->IsString() )
{
pTok = rInStm.GetToken_Next();
- bOk = MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
+ bOk = MakeId(OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
}
if( bOk && bBraket )
bOk = rInStm.Read( ')' );
@@ -381,7 +381,7 @@ sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm )
{
// write global id
rOutStm << SvHash_uuid()->GetName().getStr() << "(\"";
- rOutStm << rtl::OUStringToOString(GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << "\")";
+ rOutStm << OUStringToOString(GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << "\")";
return sal_True;
}
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index e83c23bb11eb..05c258565eb5 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -100,7 +100,7 @@ void SvMetaModule::Save( SvPersistStream & rStm )
rStm.Seek( nPos );
}
-sal_Bool SvMetaModule::SetName( const rtl::OString& rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaModule::SetName( const OString& rName, SvIdlDataBase * pBase )
{
if( pBase )
{
@@ -132,9 +132,9 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
if( aSlotIdFile.ReadSvIdl( SvHash_SlotIdFile(), rInStm ) )
{
sal_uInt32 nTokPos = rInStm.Tell();
- if( !rBase.ReadIdFile( rtl::OStringToOUString(aSlotIdFile.getString(), RTL_TEXTENCODING_ASCII_US)) )
+ if( !rBase.ReadIdFile( OStringToOUString(aSlotIdFile.getString(), RTL_TEXTENCODING_ASCII_US)) )
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot read file: "));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot read file: "));
aStr.append(aSlotIdFile.getString());
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
rBase.WriteError( rInStm );
@@ -222,7 +222,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->IsString() )
{
- OUString aFullName(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
+ OUString aFullName(OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
rBase.StartNewFile( aFullName );
osl::FileBase::RC searchError = osl::File::searchFileURL(aFullName, rBase.GetPath(), aFullName);
osl::FileBase::getSystemPathFromFileURL( aFullName, aFullName );
@@ -256,15 +256,15 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
}
else
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot open file: "));
- aStr.append(rtl::OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot open file: "));
+ aStr.append(OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
}
else
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot find file:"));
- aStr.append(rtl::OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot find file:"));
+ aStr.append(OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
}
@@ -324,14 +324,14 @@ sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm
{
pTok = rInStm.GetToken_Next();
if( pTok->IsString() )
- bOk = aBeginName.MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
+ bOk = aBeginName.MakeId(OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
}
rInStm.ReadDelemiter();
if( bOk )
{
pTok = rInStm.GetToken_Next();
if( pTok->IsString() )
- bOk = aEndName.MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
+ bOk = aEndName.MakeId(OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
}
rInStm.ReadDelemiter();
if( bOk )
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 953886d97974..3d1d67e2ba50 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -297,7 +297,7 @@ sal_Bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
}
if( bOk )
{
- rBase.Write(rtl::OString('.'));
+ rBase.Write(OString('.'));
bOk = SvMetaName::ReadSvIdl( rBase, rInStm );
}
if( bOk )
@@ -329,7 +329,7 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
OSL_FAIL( pS->GetSlotId().getString().getStr() );
OSL_FAIL( rAttr.GetSlotId().getString().getStr() );
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute's "));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute's "));
aStr.append(pS->GetName().getString());
aStr.append(RTL_CONSTASCII_STRINGPARAM(" with different id's"));
rBase.SetError(aStr.makeStringAndClear(), rInStm.GetToken());
@@ -344,12 +344,12 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS
if( nId1 == nId2 && nId1 != 0 )
{
OSL_FAIL( "Gleiche Id in MetaClass : " );
- OSL_FAIL(rtl::OString::valueOf(static_cast<sal_Int32>(
+ OSL_FAIL(OString::valueOf(static_cast<sal_Int32>(
pS->GetSlotId().GetValue())).getStr());
OSL_FAIL( pS->GetSlotId().getString().getStr() );
OSL_FAIL( rAttr.GetSlotId().getString().getStr() );
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute "));
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute "));
aStr.append(pS->GetName().getString());
aStr.append(RTL_CONSTASCII_STRINGPARAM(" and Attribute "));
aStr.append(rAttr.GetName().getString());
@@ -442,7 +442,7 @@ sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase & rBase,
return nCount;
}
-sal_uInt16 SvMetaClass::WriteSlots( const rtl::OString& rShellName,
+sal_uInt16 SvMetaClass::WriteSlots( const OString& rShellName,
sal_uInt16 nCount, SvSlotElementList & rSlotList,
SvIdlDataBase & rBase,
SvStream & rOutStm )
@@ -462,7 +462,7 @@ sal_uInt16 SvMetaClass::WriteSlots( const rtl::OString& rShellName,
void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
SvMetaClassList &rClassList,
- const rtl::OString& rPrefix, SvIdlDataBase& rBase)
+ const OString& rPrefix, SvIdlDataBase& rBase)
{
// was this class already written?
for ( size_t i = 0, n = rClassList.size(); i < n ; ++i )
@@ -504,7 +504,7 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>&
{
SvClassElement * pEle = aClassList[n];
SvMetaClass * pCl = pEle->GetClass();
- rtl::OStringBuffer rPre(rPrefix);
+ OStringBuffer rPre(rPrefix);
if( rPre.getLength() && pEle->GetPrefix().getLength() )
rPre.append('.');
rPre.append(pEle->GetPrefix());
@@ -544,7 +544,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList )
}
-void SvMetaClass::WriteSlotStubs( const rtl::OString& rShellName,
+void SvMetaClass::WriteSlotStubs( const OString& rShellName,
SvSlotElementList & rSlotList,
ByteStringList & rList,
SvStream & rOutStm )
@@ -580,7 +580,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
std::vector<sal_uLong> aSuperList;
SvMetaClassList classList;
SvSlotElementList aSlotList;
- InsertSlots(aSlotList, aSuperList, classList, rtl::OString(), rBase);
+ InsertSlots(aSlotList, aSuperList, classList, OString(), rBase);
for ( size_t i = 0, n = aSlotList.size(); i < n; ++i )
{
SvSlotElement *pEle = aSlotList[ i ];
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 644ff6680e39..5cb323326260 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -291,7 +291,7 @@ sal_Bool SvMetaSlot::IsMethod() const
return b;
}
-rtl::OString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const
+OString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const
{
if( !bVariable )
{
@@ -324,32 +324,32 @@ sal_Bool SvMetaSlot::GetHasCoreId() const
if( aHasCoreId.IsSet() || !GetRef() ) return aHasCoreId;
return ((SvMetaSlot *)GetRef())->GetHasCoreId();
}
-const rtl::OString& SvMetaSlot::GetGroupId() const
+const OString& SvMetaSlot::GetGroupId() const
{
if( !aGroupId.getString().isEmpty() || !GetRef() ) return aGroupId.getString();
return ((SvMetaSlot *)GetRef())->GetGroupId();
}
-const rtl::OString& SvMetaSlot::GetDisableFlags() const
+const OString& SvMetaSlot::GetDisableFlags() const
{
if( !aDisableFlags.getString().isEmpty() || !GetRef() ) return aDisableFlags.getString();
return ((SvMetaSlot *)GetRef())->GetDisableFlags();
}
-const rtl::OString& SvMetaSlot::GetConfigId() const
+const OString& SvMetaSlot::GetConfigId() const
{
if( !aConfigId.getString().isEmpty() || !GetRef() ) return aConfigId.getString();
return ((SvMetaSlot *)GetRef())->GetConfigId();
}
-const rtl::OString& SvMetaSlot::GetExecMethod() const
+const OString& SvMetaSlot::GetExecMethod() const
{
if( !aExecMethod.getString().isEmpty() || !GetRef() ) return aExecMethod.getString();
return ((SvMetaSlot *)GetRef())->GetExecMethod();
}
-const rtl::OString& SvMetaSlot::GetStateMethod() const
+const OString& SvMetaSlot::GetStateMethod() const
{
if( !aStateMethod.getString().isEmpty() || !GetRef() ) return aStateMethod.getString();
return ((SvMetaSlot *)GetRef())->GetStateMethod();
}
-const rtl::OString& SvMetaSlot::GetDefault() const
+const OString& SvMetaSlot::GetDefault() const
{
if( !aDefault.getString().isEmpty() || !GetRef() ) return aDefault.getString();
return ((SvMetaSlot *)GetRef())->GetDefault();
@@ -440,7 +440,7 @@ sal_Bool SvMetaSlot::GetHasDialog() const
if( aHasDialog.IsSet() || !GetRef() ) return aHasDialog;
return ((SvMetaSlot *)GetRef())->GetHasDialog();
}
-const rtl::OString& SvMetaSlot::GetPseudoPrefix() const
+const OString& SvMetaSlot::GetPseudoPrefix() const
{
if( !aPseudoPrefix.getString().isEmpty() || !GetRef() ) return aPseudoPrefix.getString();
return ((SvMetaSlot *)GetRef())->GetPseudoPrefix();
@@ -488,7 +488,7 @@ sal_Bool SvMetaSlot::GetImageReflection() const
return ((SvMetaSlot *)GetRef())->GetImageReflection();
}
-const rtl::OString& SvMetaSlot::GetUnoName() const
+const OString& SvMetaSlot::GetUnoName() const
{
if( aUnoName.IsSet() || !GetRef() ) return aUnoName.getString();
return ((SvMetaSlot *)GetRef())->GetUnoName();
@@ -509,14 +509,14 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
bOk |= aDisableFlags.ReadSvIdl( SvHash_DisableFlags(), rInStm );
if( aGet.ReadSvIdl( SvHash_Get(), rInStm ) )
{
- rBase.WriteError( "warning", rtl::OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
+ rBase.WriteError( "warning", OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
"<Get> old style, use Readonly",
rInStm.GetToken()->GetLine(),
rInStm.GetToken()->GetColumn() );
}
if( aSet.ReadSvIdl( SvHash_Set(), rInStm ) )
{
- rBase.WriteError( "warning", rtl::OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
+ rBase.WriteError( "warning", OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
"<Set> old style, use method declaration",
rInStm.GetToken()->GetLine(),
rInStm.GetToken()->GetColumn() );
@@ -693,15 +693,15 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
rOutStm << ';' << endl;
}
- rtl::OString aDel(", ");
- rtl::OStringBuffer aOut;
+ OString aDel(", ");
+ OStringBuffer aOut;
if( aVolatile )
aOut.append(aVolatile.GetSvIdlString( SvHash_Volatile() ));
else if( !aCachable )
// because of Default == TRUE, only when no other is set
aOut.append(aCachable.GetSvIdlString( SvHash_Cachable() ));
else
- aDel = rtl::OString();
+ aDel = OString();
if( aToggle )
{
@@ -714,7 +714,7 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
aDel = ", ";
}
- rtl::OString aDel1(", ");
+ OString aDel1(", ");
if( aAsynchron )
aOut.append(aDel).append(aAsynchron.GetSvIdlString( SvHash_Asynchron() ));
else if( !aSynchron )
@@ -835,7 +835,7 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
}
else
{
- rtl::OStringBuffer aStr( "attribute " );
+ OStringBuffer aStr( "attribute " );
aStr.append(pAttr->GetName().getString());
aStr.append(" is method or variable but not a slot");
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
@@ -868,7 +868,7 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
}
else
{
- rtl::OStringBuffer aStr("attribute ");
+ OStringBuffer aStr("attribute ");
aStr.append(pAttr2->GetName().getString());
aStr.append(" is method or variable but not a slot");
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
@@ -922,7 +922,7 @@ void SvMetaSlot::Write( SvIdlDataBase & rBase,
}
-void SvMetaSlot::Insert( SvSlotElementList& rList, const rtl::OString& rPrefix,
+void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
SvIdlDataBase& rBase)
{
// get insert position through binary search in slotlist
@@ -1001,8 +1001,8 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const rtl::OString& rPrefix,
{
// create SlotId
SvMetaEnumValue *enumValue = pEnum->GetObject(n);
- rtl::OString aValName = enumValue->GetName().getString();
- rtl::OStringBuffer aBuf;
+ OString aValName = enumValue->GetName().getString();
+ OStringBuffer aBuf;
if( !GetPseudoPrefix().isEmpty() )
aBuf.append(GetPseudoPrefix());
else
@@ -1010,7 +1010,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const rtl::OString& rPrefix,
aBuf.append('_');
aBuf.append(aValName.copy(pEnum->GetPrefix().getLength()));
- rtl::OString aSId = aBuf.makeStringAndClear();
+ OString aSId = aBuf.makeStringAndClear();
xEnumSlot = NULL;
for( m=0; m<rBase.GetAttrList().size(); m++ )
@@ -1074,21 +1074,21 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const rtl::OString& rPrefix,
}
-static rtl::OString MakeSlotName( SvStringHashEntry * pEntry )
+static OString MakeSlotName( SvStringHashEntry * pEntry )
{
- rtl::OStringBuffer aName(RTL_CONSTASCII_STRINGPARAM("SFX_SLOT_"));
+ OStringBuffer aName(RTL_CONSTASCII_STRINGPARAM("SFX_SLOT_"));
aName.append(pEntry->GetName());
return aName.makeStringAndClear().toAsciiUpperCase();
};
-void SvMetaSlot::WriteSlotStubs( const rtl::OString& rShellName,
+void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
ByteStringList & rList,
SvStream & rOutStm )
{
if ( !GetExport() && !GetHidden() )
return;
- rtl::OString aMethodName( GetExecMethod() );
+ OString aMethodName( GetExecMethod() );
if ( !aMethodName.isEmpty() &&
!aMethodName.equalsL(RTL_CONSTASCII_STRINGPARAM("NoExec")) )
{
@@ -1104,7 +1104,7 @@ void SvMetaSlot::WriteSlotStubs( const rtl::OString& rShellName,
if ( !bIn )
{
- rList.push_back( new rtl::OString(aMethodName) );
+ rList.push_back( new OString(aMethodName) );
rOutStm << "SFX_EXEC_STUB("
<< rShellName.getStr()
<< ','
@@ -1129,7 +1129,7 @@ void SvMetaSlot::WriteSlotStubs( const rtl::OString& rShellName,
if ( !bIn )
{
- rList.push_back( new rtl::OString(aMethodName) );
+ rList.push_back( new OString(aMethodName) );
rOutStm << "SFX_STATE_STUB("
<< rShellName.getStr()
<< ','
@@ -1139,11 +1139,11 @@ void SvMetaSlot::WriteSlotStubs( const rtl::OString& rShellName,
}
}
-void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
- const rtl::OString& rSlotId,
+void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
+ const OString& rSlotId,
SvSlotElementList& rSlotList,
size_t nStart,
- const rtl::OString& rPrefix,
+ const OString& rPrefix,
SvIdlDataBase & rBase, SvStream & rOutStm )
{
if ( !GetExport() && !GetHidden() )
@@ -1154,7 +1154,7 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
rOutStm << "// Slot Nr. "
<< OString::number(nListPos).getStr()
<< " : ";
- rtl::OString aSlotIdValue(rtl::OString::valueOf(static_cast<sal_Int32>(
+ OString aSlotIdValue(OString::valueOf(static_cast<sal_Int32>(
GetSlotId().GetValue())));
rOutStm << aSlotIdValue.getStr() << endl;
WriteTab( rOutStm, 1 );
@@ -1181,11 +1181,11 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
if( bIsEnumSlot )
{
rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << rtl::OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
+ << OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
<< "] /*Offset Master*/, " << endl;
WriteTab( rOutStm, 4 );
rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << rtl::OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
+ << OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
<< "] /*Offset Next*/, " << endl;
WriteTab( rOutStm, 4 );
@@ -1240,13 +1240,13 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
else
{
rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << rtl::OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
+ << OString::valueOf(static_cast<sal_Int32>(pLinkedSlot->GetListPos())).getStr()
<< "] /*Offset Linked*/, " << endl;
WriteTab( rOutStm, 4 );
}
rOutStm << "&a" << rShellName.getStr() << "Slots_Impl["
- << rtl::OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
+ << OString::valueOf(static_cast<sal_Int32>(pNextSlot->GetListPos())).getStr()
<< "] /*Offset Next*/, " << endl;
WriteTab( rOutStm, 4 );
@@ -1377,7 +1377,7 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount,
pType = GetType();
sal_uLong nSCount = pType->GetAttrCount();
rOutStm
- << rtl::OString::valueOf(static_cast<sal_Int32>(
+ << OString::valueOf(static_cast<sal_Int32>(
nSCount)).getStr()
<< "/*Count*/";
}
@@ -1459,15 +1459,15 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO
return 0;
}
-sal_uInt16 SvMetaSlot::WriteSlotMap( const rtl::OString& rShellName, sal_uInt16 nCount,
+sal_uInt16 SvMetaSlot::WriteSlotMap( const OString& rShellName, sal_uInt16 nCount,
SvSlotElementList& rSlotList,
size_t nStart,
- const rtl::OString& rPrefix,
+ const OString& rPrefix,
SvIdlDataBase & rBase,
SvStream & rOutStm )
{
// SlotId, if not specified generate from name
- rtl::OString slotId = GetSlotId().getString();
+ OString slotId = GetSlotId().getString();
sal_uInt16 nSCount = 0;
if( IsMethod() )
@@ -1503,9 +1503,9 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
{
for( sal_uLong n = 0; n < pEnum->Count(); ++n )
{
- rtl::OString aValName = pEnum->GetObject( n )->GetName().getString();
+ OString aValName = pEnum->GetObject( n )->GetName().getString();
- rtl::OStringBuffer aBuf;
+ OStringBuffer aBuf;
if( !GetPseudoPrefix().isEmpty() )
aBuf.append(GetPseudoPrefix());
else
@@ -1513,7 +1513,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
aBuf.append('_');
aBuf.append(aValName.copy(pEnum->GetPrefix().getLength()));
- rtl::OString aSId = aBuf.makeStringAndClear();
+ OString aSId = aBuf.makeStringAndClear();
sal_uLong nSId2;
sal_Bool bIdOk = sal_False;
@@ -1529,7 +1529,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
rTable[ nSId2 ] = this;
rOutStm << "#define " << aSId.getStr() << '\t'
- << rtl::OString::valueOf(
+ << OString::valueOf(
static_cast<sal_Int32>(nSId2)).getStr()
<< endl;
}
@@ -1550,7 +1550,7 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
rStrm << "PROJECT,";
rStrm << GetSlotId().getString().getStr() << ',';
rStrm
- << rtl::OString::valueOf(
+ << OString::valueOf(
static_cast<sal_Int32>(GetSlotId().GetValue())).getStr()
<< ',';
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index af582515b614..3416266889ef 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -174,7 +174,7 @@ sal_Bool SvMetaAttribute::IsVariable() const
return pType->GetType() != TYPE_METHOD;
}
-rtl::OString SvMetaAttribute::GetMangleName( sal_Bool ) const
+OString SvMetaAttribute::GetMangleName( sal_Bool ) const
{
return GetName().getString();
}
@@ -413,7 +413,7 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm
{
WriteTab( rOutStm, nTab );
rOutStm << "id("
- << rtl::OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase,bVar))).getStr()
+ << OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase,bVar))).getStr()
<< ")," << endl;
}
if( bVar && (bReadonly || IsMethod()) )
@@ -455,12 +455,12 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
rOutStm << "pODKCallFunction( "
- << rtl::OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase, IsVariable()))).getStr();
+ << OString::valueOf(static_cast<sal_Int32>(MakeSlotValue(rBase, IsVariable()))).getStr();
rOutStm << ',' << endl;
WriteTab( rOutStm, 3 );
rOutStm << " h" << rBase.aIFaceName.getStr() << " , ";
- rtl::OString aParserStr;
+ OString aParserStr;
if( pBaseType->GetType() == TYPE_METHOD || bSet )
aParserStr = pBaseType->GetParserString();
if( !aParserStr.isEmpty() )
@@ -491,7 +491,7 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
{
rOutStm << ", ";
if( IsMethod() )
- pBaseType->WriteParamNames( rBase, rOutStm, rtl::OString() );
+ pBaseType->WriteParamNames( rBase, rOutStm, OString() );
else if( bSet )
pBaseType->WriteParamNames( rBase, rOutStm, GetName().getString() );
}
@@ -581,7 +581,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
if( !bVariable && IsMethod() )
{
- rtl::OString name = rBase.aIFaceName + GetName().getString();
+ OString name = rBase.aIFaceName + GetName().getString();
const char * pName = name.getStr();
WriteTab( rOutStm, nTab );
pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
@@ -603,7 +603,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
else
{
- rtl::OString name = GetName().getString();
+ OString name = GetName().getString();
sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY );
if ( !bReadonly && !IsMethod() )
@@ -708,7 +708,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
}
}
-sal_uLong SvMetaAttribute::MakeSfx( rtl::OStringBuffer& rAttrArray )
+sal_uLong SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray )
{
SvMetaType * pType = GetType();
DBG_ASSERT( pType, "no type for attribute" );
@@ -727,7 +727,7 @@ sal_uLong SvMetaAttribute::MakeSfx( rtl::OStringBuffer& rAttrArray )
}
}
-void SvMetaAttribute::Insert (SvSlotElementList&, const rtl::OString&, SvIdlDataBase&)
+void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase&)
{
}
@@ -751,8 +751,8 @@ SvMetaType::SvMetaType()
{
}
-SvMetaType::SvMetaType( const rtl::OString& rName, char cPC,
- const rtl::OString& rCName )
+SvMetaType::SvMetaType( const OString& rName, char cPC,
+ const OString& rCName )
CTOR
{
SetName( rName );
@@ -760,13 +760,13 @@ SvMetaType::SvMetaType( const rtl::OString& rName, char cPC,
aCName.setString(rCName);
}
-SvMetaType::SvMetaType( const rtl::OString& rName,
- const rtl::OString& rSbxName,
- const rtl::OString& rOdlName,
+SvMetaType::SvMetaType( const OString& rName,
+ const OString& rSbxName,
+ const OString& rOdlName,
char cPc,
- const rtl::OString& rCName,
- const rtl::OString& rBasicName,
- const rtl::OString& rBasicPostfix )
+ const OString& rCName,
+ const OString& rBasicName,
+ const OString& rBasicPostfix )
CTOR
{
SetName( rName );
@@ -864,7 +864,7 @@ void SvMetaType::SetType( int nT )
}
else if( nType == TYPE_CLASS )
{
- rtl::OStringBuffer aTmp(C_PREF);
+ OStringBuffer aTmp(C_PREF);
aTmp.append(RTL_CONSTASCII_STRINGPARAM("Object *"));
aCName.setString(aTmp.makeStringAndClear());
}
@@ -884,7 +884,7 @@ SvMetaType * SvMetaType::GetReturnType() const
return (SvMetaType *)GetRef();
}
-const rtl::OString& SvMetaType::GetBasicName() const
+const OString& SvMetaType::GetBasicName() const
{
if( aBasicName.IsSet() || !GetRef() )
return aBasicName.getString();
@@ -892,10 +892,10 @@ const rtl::OString& SvMetaType::GetBasicName() const
return ((SvMetaType*)GetRef())->GetBasicName();
}
-rtl::OString SvMetaType::GetBasicPostfix() const
+OString SvMetaType::GetBasicPostfix() const
{
// MBN and Co always want "As xxx"
- return rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM(" As ")).
+ return OStringBuffer(RTL_CONSTASCII_STRINGPARAM(" As ")).
append(GetBasicName()).
makeStringAndClear();
}
@@ -964,7 +964,7 @@ int SvMetaType::GetCall1() const
return ((SvMetaType *)GetRef())->GetCall1();
}
-const rtl::OString& SvMetaType::GetSvName() const
+const OString& SvMetaType::GetSvName() const
{
if( aSvName.IsSet() || !GetRef() )
return aSvName.getString();
@@ -972,7 +972,7 @@ const rtl::OString& SvMetaType::GetSvName() const
return ((SvMetaType *)GetRef())->GetSvName();
}
-const rtl::OString& SvMetaType::GetSbxName() const
+const OString& SvMetaType::GetSbxName() const
{
if( aSbxName.IsSet() || !GetRef() )
return aSbxName.getString();
@@ -980,7 +980,7 @@ const rtl::OString& SvMetaType::GetSbxName() const
return ((SvMetaType *)GetRef())->GetSbxName();
}
-const rtl::OString& SvMetaType::GetOdlName() const
+const OString& SvMetaType::GetOdlName() const
{
if( aOdlName.IsSet() || !GetRef() )
return aOdlName.getString();
@@ -988,7 +988,7 @@ const rtl::OString& SvMetaType::GetOdlName() const
return ((SvMetaType *)GetRef())->GetOdlName();
}
-const rtl::OString& SvMetaType::GetCName() const
+const OString& SvMetaType::GetCName() const
{
if( aCName.IsSet() || !GetRef() )
return aCName.getString();
@@ -996,7 +996,7 @@ const rtl::OString& SvMetaType::GetCName() const
return ((SvMetaType *)GetRef())->GetCName();
}
-sal_Bool SvMetaType::SetName( const rtl::OString& rName, SvIdlDataBase * pBase )
+sal_Bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase )
{
aSvName.setString(rName);
aSbxName.setString(rName);
@@ -1006,9 +1006,9 @@ sal_Bool SvMetaType::SetName( const rtl::OString& rName, SvIdlDataBase * pBase )
return SvMetaReference::SetName( rName, pBase );
}
-rtl::OString SvMetaType::GetCString() const
+OString SvMetaType::GetCString() const
{
- rtl::OStringBuffer out( GetSvName() );
+ OStringBuffer out( GetSvName() );
if( aCall0 == (int)CALL_POINTER )
out.append(" *");
else if( aCall0 == (int)CALL_REFERENCE )
@@ -1081,7 +1081,7 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
}
else
{
- rtl::OString aStr("wrong typedef: ");
+ OString aStr("wrong typedef: ");
rBase.SetError( aStr, rInStm.GetToken() );
rBase.WriteError( rInStm );
}
@@ -1098,7 +1098,7 @@ sal_Bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
{
if( ReadHeaderSvIdl( rBase, rInStm ) )
{
- rBase.Write(rtl::OString('.'));
+ rBase.Write(OString('.'));
return SvMetaExtern::ReadSvIdl( rBase, rInStm );
}
return sal_False;
@@ -1152,7 +1152,7 @@ void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
// write only enum
return;
- rtl::OString name = GetName().getString();
+ OString name = GetName().getString();
if( nT == WRITE_ODL || nT == WRITE_C_HEADER || nT == WRITE_CXX_HEADER )
{
switch( nType )
@@ -1173,7 +1173,7 @@ void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
if ( nT == WRITE_C_HEADER )
{
- rtl::OString aStr = name.toAsciiUpperCase();
+ OString aStr = name.toAsciiUpperCase();
rOutStm << "#ifndef " << C_PREF << aStr.getStr() << "_DEF " << endl;
rOutStm << "#define " << C_PREF << aStr.getStr() << "_DEF " << endl;
}
@@ -1305,7 +1305,7 @@ void SvMetaType::WriteAttributesSvIdl( SvIdlDataBase & rBase,
sal_uInt16 nTab )
{
SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
- rtl::OString name = GetName().getString();
+ OString name = GetName().getString();
if( aSvName.getString() != name || aSbxName.getString() != name || aOdlName.getString() != name )
{
WriteTab( rOutStm, nTab );
@@ -1373,7 +1373,7 @@ void SvMetaType::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA );
}
-sal_uLong SvMetaType::MakeSfx( rtl::OStringBuffer& rAttrArray )
+sal_uLong SvMetaType::MakeSfx( OStringBuffer& rAttrArray )
{
sal_uLong nC = 0;
@@ -1392,16 +1392,16 @@ sal_uLong SvMetaType::MakeSfx( rtl::OStringBuffer& rAttrArray )
}
void SvMetaType::WriteSfxItem(
- const rtl::OString& rItemName, SvIdlDataBase &, SvStream & rOutStm )
+ const OString& rItemName, SvIdlDataBase &, SvStream & rOutStm )
{
WriteStars( rOutStm );
- rtl::OStringBuffer aVarName(RTL_CONSTASCII_STRINGPARAM(" a"));
+ OStringBuffer aVarName(RTL_CONSTASCII_STRINGPARAM(" a"));
aVarName.append(rItemName).append(RTL_CONSTASCII_STRINGPARAM("_Impl"));
- rtl::OStringBuffer aTypeName(RTL_CONSTASCII_STRINGPARAM("SfxType"));
- rtl::OStringBuffer aAttrArray;
+ OStringBuffer aTypeName(RTL_CONSTASCII_STRINGPARAM("SfxType"));
+ OStringBuffer aAttrArray;
sal_uLong nAttrCount = MakeSfx( aAttrArray );
- rtl::OString aAttrCount(
+ OString aAttrCount(
OString::number(nAttrCount));
aTypeName.append(aAttrCount);
@@ -1589,7 +1589,7 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm,
rOutStm << "[out] ";
}
- rtl::OString out;
+ OString out;
if( GetType() == TYPE_METHOD )
out = GetReturnType()->GetBaseType()->GetOdlName();
else
@@ -1678,14 +1678,14 @@ void SvMetaType::WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm,
WriteMethodArgs( rBase, rOutStm, nTab +2, nT );
}
-rtl::OString SvMetaType::GetParserString() const
+OString SvMetaType::GetParserString() const
{
SvMetaType * pBT = GetBaseType();
if( pBT != this )
return pBT->GetParserString();
int type = GetType();
- rtl::OString aPStr;
+ OString aPStr;
if( TYPE_METHOD == type || TYPE_STRUCT == type )
{
@@ -1698,13 +1698,13 @@ rtl::OString SvMetaType::GetParserString() const
}
}
else
- aPStr = rtl::OString(GetParserChar());
+ aPStr = OString(GetParserChar());
return aPStr;
}
void SvMetaType::WriteParamNames( SvIdlDataBase & rBase,
SvStream & rOutStm,
- const rtl::OString& rChief )
+ const OString& rChief )
{
SvMetaType * pBT = GetBaseType();
if( pBT != this )
@@ -1720,7 +1720,7 @@ void SvMetaType::WriteParamNames( SvIdlDataBase & rBase,
for( sal_uLong n = 0; n < nAttrCount; n++ )
{
SvMetaAttribute * pA = (*pAttrList)[n];
- rtl::OString aStr = pA->GetName().getString();
+ OString aStr = pA->GetName().getString();
pA->GetType()->WriteParamNames( rBase, rOutStm, aStr );
if( n +1 < nAttrCount )
rOutStm << ", ";
@@ -1841,7 +1841,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
namespace
{
- rtl::OString getCommonSubPrefix(const rtl::OString &rA, const rtl::OString &rB)
+ OString getCommonSubPrefix(const OString &rA, const OString &rB)
{
sal_Int32 nMax = std::min(rA.getLength(), rB.getLength());
sal_Int32 nI = 0;
@@ -1965,9 +1965,9 @@ void SvMetaTypevoid::Save( SvPersistStream & rStm )
SvMetaType::Save( rStm );
}
-rtl::OString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
+OString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
{
- rtl::OStringBuffer aStr;
+ OStringBuffer aStr;
if ( aType.Is() )
{
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index f538bec146a0..3d6ce3708545 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -144,14 +144,14 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
pDataBase->Load( aStm );
if( aStm.GetError() != SVSTREAM_OK )
{
- rtl::OStringBuffer aStr;
+ OStringBuffer aStr;
if( aStm.GetError() == SVSTREAM_FILEFORMAT_ERROR )
aStr.append("error: incompatible format, file ");
else if( aStm.GetError() == SVSTREAM_WRONGVERSION )
aStr.append("error: wrong version, file ");
else
aStr.append("error during load, file ");
- aStr.append(rtl::OUStringToOString(aFileName,
+ aStr.append(OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8));
fprintf( stderr, "%s\n", aStr.getStr() );
return sal_False;
@@ -166,7 +166,7 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
}
else
{
- const rtl::OString aStr(rtl::OUStringToOString(aFileName,
+ const OString aStr(OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8));
fprintf( stderr, "unable to read input file: %s\n", aStr.getStr() );
return sal_False;
@@ -178,16 +178,16 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
{
// program name
- pList->push_back( new String(rtl::OUString::createFromAscii(*argv) ) );
+ pList->push_back( new String(OUString::createFromAscii(*argv) ) );
for( int i = 1; i < argc; i++ )
{
if( '@' == **(argv +i) )
{ // when @, then response file
- SvFileStream aStm( rtl::OUString::createFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE );
+ SvFileStream aStm( OUString::createFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE );
if( aStm.GetError() != SVSTREAM_OK )
return sal_False;
- rtl::OString aStr;
+ OString aStr;
while( aStm.ReadLine( aStr ) )
{
sal_uInt16 n = 0;
@@ -200,12 +200,12 @@ static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
while( aStr[n] && !isspace( aStr[n] ) )
n++;
if( n != nPos )
- pList->push_back( new String( rtl::OStringToOUString(aStr.copy(nPos, n - nPos), RTL_TEXTENCODING_ASCII_US) ) );
+ pList->push_back( new String( OStringToOUString(aStr.copy(nPos, n - nPos), RTL_TEXTENCODING_ASCII_US) ) );
}
}
}
else if( argv[ i ] )
- pList->push_back( new String( rtl::OUString::createFromAscii( argv[ i ] ) ) );
+ pList->push_back( new String( OUString::createFromAscii( argv[ i ] ) ) );
}
return sal_True;
}
@@ -293,7 +293,7 @@ SvCommand::SvCommand( int argc, char ** argv )
{
printf(
"unknown switch: %s\n",
- rtl::OUStringToOString(
+ OUStringToOString(
aParam, RTL_TEXTENCODING_UTF8).getStr());
exit( -1 );
}
@@ -336,7 +336,7 @@ SvCommand::SvCommand( int argc, char ** argv )
// temporary compatibility hack
printf(
"unknown switch: %s\n",
- rtl::OUStringToOString(
+ OUStringToOString(
aParam, RTL_TEXTENCODING_UTF8).getStr());
exit( -1 );
}
@@ -356,13 +356,13 @@ SvCommand::SvCommand( int argc, char ** argv )
delete aList[ i ];
aList.clear();
- rtl::OString aInc(getenv("INCLUDE"));
+ OString aInc(getenv("INCLUDE"));
// append include environment variable
if( aInc.getLength() )
{
if( aPath.Len() )
aPath += OUString( SAL_PATHSEPARATOR );
- aPath += rtl::OStringToOUString(aInc, RTL_TEXTENCODING_ASCII_US);
+ aPath += OStringToOUString(aInc, RTL_TEXTENCODING_ASCII_US);
}
}
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 7e907e769302..8850d9813d8e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -75,7 +75,7 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
return aTypeList;
}
-SvMetaModule * SvIdlDataBase::GetModule( const rtl::OString& rName )
+SvMetaModule * SvIdlDataBase::GetModule( const OString& rName )
{
for( sal_uLong n = 0; n < aModuleList.size(); n++ )
if( aModuleList[n]->GetName().getString().equals(rName) )
@@ -157,7 +157,7 @@ void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
aPStm << nUniqueId;
}
-void SvIdlDataBase::SetError( const rtl::OString& rError, SvToken * pTok )
+void SvIdlDataBase::SetError( const OString& rError, SvToken * pTok )
{
if( pTok->GetLine() > 10000 )
aError.SetText( "hgchcg" );
@@ -175,7 +175,7 @@ void SvIdlDataBase::Push( SvMetaObject * pObj )
GetStack().Push( pObj );
}
-sal_Bool SvIdlDataBase::FindId( const rtl::OString& rIdName, sal_uLong * pVal )
+sal_Bool SvIdlDataBase::FindId( const OString& rIdName, sal_uLong * pVal )
{
if( pIdTable )
{
@@ -189,7 +189,7 @@ sal_Bool SvIdlDataBase::FindId( const rtl::OString& rIdName, sal_uLong * pVal )
return sal_False;
}
-sal_Bool SvIdlDataBase::InsertId( const rtl::OString& rIdName, sal_uLong nVal )
+sal_Bool SvIdlDataBase::InsertId( const OString& rIdName, sal_uLong nVal )
{
if( !pIdTable )
pIdTable = new SvStringHashTable( 20003 );
@@ -228,12 +228,12 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
if( pTok->Is( SvHash_define() ) )
{
pTok = aTokStm.GetToken_Next();
- rtl::OString aDefName;
+ OString aDefName;
if( pTok->IsIdentifier() )
aDefName = pTok->GetString();
else
{
- rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM(
+ OString aStr(RTL_CONSTASCII_STRINGPARAM(
"unexpected token after define"));
// set error
SetError( aStr, pTok );
@@ -264,7 +264,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
|| pTok->GetChar() == '^'
|| pTok->GetChar() == '~' )
{
- rtl::OStringBuffer aStr("unknown operator '");
+ OStringBuffer aStr("unknown operator '");
aStr.append(pTok->GetChar());
aStr.append("'in define");
// set error
@@ -290,7 +290,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
{
if( !InsertId( aDefName, nVal ) )
{
- rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM("hash table overflow: "));
+ OString aStr(RTL_CONSTASCII_STRINGPARAM("hash table overflow: "));
SetError( aStr, pTok );
WriteError( aTokStm );
return sal_False;
@@ -300,7 +300,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
else if( pTok->Is( SvHash_include() ) )
{
pTok = aTokStm.GetToken_Next();
- rtl::OStringBuffer aName;
+ OStringBuffer aName;
if( pTok->IsString() )
aName.append(pTok->GetString());
else if( pTok->IsChar() && pTok->GetChar() == '<' )
@@ -314,7 +314,7 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
}
if( pTok->IsEof() )
{
- rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM(
+ OString aStr(RTL_CONSTASCII_STRINGPARAM(
"unexpected eof in #include"));
// set error
SetError(aStr, pTok);
@@ -322,10 +322,10 @@ sal_Bool SvIdlDataBase::ReadIdFile( const String & rFileName )
return sal_False;
}
}
- if (!ReadIdFile(rtl::OStringToOUString(aName.toString(),
+ if (!ReadIdFile(OStringToOUString(aName.toString(),
RTL_TEXTENCODING_ASCII_US)))
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"cannot read file: "));
aStr.append(aName.makeStringAndClear());
SetError(aStr.makeStringAndClear(), pTok);
@@ -352,7 +352,7 @@ SvMetaType * SvIdlDataBase::FindType( const SvMetaType * pPType,
return NULL;
}
-SvMetaType * SvIdlDataBase::FindType( const rtl::OString& rName )
+SvMetaType * SvIdlDataBase::FindType( const OString& rName )
{
for( SvMetaTypeMemberList::const_iterator it = aTypeList.begin(); it != aTypeList.end(); ++it )
if( rName.equals((*it)->GetName().getString()) )
@@ -401,7 +401,7 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
if( pTok->IsIdentifier() )
{
- rtl::OString aName = pTok->GetString();
+ OString aName = pTok->GetString();
SvMetaTypeMemberList & rList = GetTypeList();
SvMetaTypeMemberList::const_iterator it = rList.begin();
SvMetaType * pType = NULL;
@@ -484,7 +484,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
}
}
- rtl::OStringBuffer aStr("Nicht gefunden : ");
+ OStringBuffer aStr("Nicht gefunden : ");
aStr.append(pTok->GetString());
OSL_FAIL(aStr.getStr());
}
@@ -530,15 +530,15 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
return NULL;
}
-void SvIdlDataBase::Write(const rtl::OString& rText)
+void SvIdlDataBase::Write(const OString& rText)
{
if( nVerbosity != 0 )
fprintf( stdout, "%s", rText.getStr() );
}
-void SvIdlDataBase::WriteError( const rtl::OString& rErrWrn,
- const rtl::OString& rFileName,
- const rtl::OString& rErrorText,
+void SvIdlDataBase::WriteError( const OString& rErrWrn,
+ const OString& rFileName,
+ const OString& rErrorText,
sal_uLong nRow, sal_uLong nColumn ) const
{
// error treatment
@@ -555,7 +555,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
{
// error treatment
String aFileName( rInStm.GetFileName() );
- rtl::OStringBuffer aErrorText;
+ OStringBuffer aErrorText;
sal_uLong nRow = 0, nColumn = 0;
rInStm.SeekEnd();
@@ -595,7 +595,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
aError = SvIdlError();
}
- WriteError("error", rtl::OUStringToOString(aFileName,
+ WriteError("error", OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8), aErrorText.makeStringAndClear(), nRow, nColumn);
DBG_ASSERT( pTok, "token must be found" );
@@ -610,7 +610,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
}
if( pTok && pTok->IsIdentifier() )
{
- rtl::OString aN = IDLAPP->pHashTable->GetNearString( pTok->GetString() );
+ OString aN = IDLAPP->pHashTable->GetNearString( pTok->GetString() );
if( !aN.isEmpty() )
fprintf( stderr, "%s versus %s\n", pTok->GetString().getStr(), aN.getStr() );
}
@@ -636,7 +636,7 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported
{
OUString aFullName;
if( osl::FileBase::E_None == osl::File::searchFileURL(
- rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US),
+ OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US),
rPath,
aFullName) )
{
@@ -648,8 +648,8 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported
{
if( aStm.GetError() == SVSTREAM_WRONGVERSION )
{
- rtl::OStringBuffer aStr("wrong version, file ");
- aStr.append(rtl::OUStringToOString( aFullName, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("wrong version, file ");
+ aStr.append(OUStringToOString( aFullName, RTL_TEXTENCODING_UTF8));
SetError(aStr.makeStringAndClear(), pTok);
WriteError( rInStm );
bOk = sal_False;
@@ -716,7 +716,7 @@ sal_Bool SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
SvStringHashEntry* pEntry = aList[ i ];
rOutStm << "#define " << pEntry->GetName().getStr()
<< '\t'
- << rtl::OString::valueOf(static_cast<sal_Int64>(
+ << OString::valueOf(static_cast<sal_Int64>(
pEntry->GetValue())).getStr()
<< endl;
}
@@ -834,12 +834,12 @@ void SvIdlDataBase::AddDepFile(String const& rFileName)
}
#ifdef WNT
-static ::rtl::OString
-lcl_ConvertToCygwin(::rtl::OString const& rString)
+static OString
+lcl_ConvertToCygwin(OString const& rString)
{
sal_Int32 i = 0;
sal_Int32 const len = rString.getLength();
- ::rtl::OStringBuffer buf(len + 16);
+ OStringBuffer buf(len + 16);
if ((2 <= len) && (':' == rString[1]))
{
buf.append("/cygdrive/");
@@ -866,21 +866,21 @@ lcl_ConvertToCygwin(::rtl::OString const& rString)
}
#endif
-static ::rtl::OString
-lcl_Convert(::rtl::OUString const& rString)
+static OString
+lcl_Convert(OUString const& rString)
{
return
#ifdef WNT
lcl_ConvertToCygwin
#endif
- (::rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
+ (OUStringToOString(rString, RTL_TEXTENCODING_UTF8));
}
struct WriteDep
{
SvFileStream & m_rStream;
explicit WriteDep(SvFileStream & rStream) : m_rStream(rStream) { }
- void operator() (::rtl::OUString const& rItem)
+ void operator() (OUString const& rItem)
{
m_rStream << " \\\n ";
m_rStream << lcl_Convert(rItem).getStr();
@@ -888,7 +888,7 @@ struct WriteDep
};
bool SvIdlDataBase::WriteDepFile(
- SvFileStream & rStream, ::rtl::OUString const& rTarget)
+ SvFileStream & rStream, OUString const& rTarget)
{
rStream << lcl_Convert(rTarget).getStr();
rStream << " :";
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 1b2bb45b2328..ad8c9432324e 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -67,7 +67,7 @@ IdlDll::~IdlDll()
delete pHashTable;
}
-inline SvStringHashEntry * INS( const rtl::OString& rName )
+inline SvStringHashEntry * INS( const OString& rName )
{
sal_uInt32 nIdx;
IDLAPP->pHashTable->Insert( rName, &nIdx );
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index ea2c227e23b9..33e190e07401 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -96,8 +96,8 @@ inline OUString tempFileHelper(OUString const & fname)
}
else
{
- rtl::OStringBuffer aStr("invalid filename: ");
- aStr.append(rtl::OUStringToOString(fname, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("invalid filename: ");
+ aStr.append(OUStringToOString(fname, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
return aTmpFile;
@@ -147,8 +147,8 @@ int cdecl main ( int argc, char ** argv)
if( !pDataBase->WriteDocumentation( aOutStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write documentation file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aDocuFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write documentation file: ");
+ aStr.append(OUStringToOString(aCommand.aDocuFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -159,8 +159,8 @@ int cdecl main ( int argc, char ** argv)
if( !pDataBase->WriteSvIdl( aOutStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write list file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aListFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write list file: ");
+ aStr.append(OUStringToOString(aCommand.aListFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -171,8 +171,8 @@ int cdecl main ( int argc, char ** argv)
if( !pDataBase->WriteSfx( aOutStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write slotmap file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aSlotMapFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write slotmap file: ");
+ aStr.append(OUStringToOString(aCommand.aSlotMapFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -183,8 +183,8 @@ int cdecl main ( int argc, char ** argv)
if (!pDataBase->WriteHelpIds( aStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write help ID file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aHelpIdFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write help ID file: ");
+ aStr.append(OUStringToOString(aCommand.aHelpIdFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -195,8 +195,8 @@ int cdecl main ( int argc, char ** argv)
if (!pDataBase->WriteCSV( aStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write CSV file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aCSVFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write CSV file: ");
+ aStr.append(OUStringToOString(aCommand.aCSVFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -207,8 +207,8 @@ int cdecl main ( int argc, char ** argv)
if( !pDataBase->WriteSfxItem( aOutStm ) )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write item file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aSfxItemFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write item file: ");
+ aStr.append(OUStringToOString(aCommand.aSfxItemFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -220,8 +220,8 @@ int cdecl main ( int argc, char ** argv)
if( aOutStm.GetError() != SVSTREAM_OK )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot write database file: ");
- aStr.append(rtl::OUStringToOString(aCommand.aDataBaseFile, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aStr("cannot write database file: ");
+ aStr.append(OUStringToOString(aCommand.aDataBaseFile, RTL_TEXTENCODING_UTF8));
fprintf(stderr, "%s\n", aStr.getStr());
}
}
@@ -234,7 +234,7 @@ int cdecl main ( int argc, char ** argv)
{
nExit = -1;
fprintf( stderr, "cannot write dependency file: %s\n",
- ::rtl::OUStringToOString( aCommand.m_DepFile,
+ OUStringToOString( aCommand.m_DepFile,
RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
@@ -315,11 +315,11 @@ int cdecl main ( int argc, char ** argv)
if( bErr )
{
nExit = -1;
- rtl::OStringBuffer aStr("cannot move file from: ");
- aStr.append(rtl::OUStringToOString(aErrFile2,
+ OStringBuffer aStr("cannot move file from: ");
+ aStr.append(OUStringToOString(aErrFile2,
RTL_TEXTENCODING_UTF8));
aStr.append("\n to file: ");
- aStr.append(rtl::OUStringToOString(aErrFile,
+ aStr.append(OUStringToOString(aErrFile,
RTL_TEXTENCODING_UTF8));
fprintf( stderr, "%s\n", aStr.getStr() );
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 12:09:25 +0000