diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /codemaker | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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 'codemaker')
35 files changed, 620 insertions, 640 deletions
diff --git a/codemaker/inc/codemaker/codemaker.hxx b/codemaker/inc/codemaker/codemaker.hxx index a1c3a14eea6c..9a821bea78ba 100644 --- a/codemaker/inc/codemaker/codemaker.hxx +++ b/codemaker/inc/codemaker/codemaker.hxx @@ -36,13 +36,13 @@ class TypeManager; namespace codemaker { -rtl::OString convertString(rtl::OUString const & string); +OString convertString(OUString const & string); codemaker::UnoType::Sort decomposeAndResolve( - rtl::Reference< TypeManager > const & manager, rtl::OString const & type, + rtl::Reference< TypeManager > const & manager, OString const & type, bool resolveTypedefs, bool allowVoid, bool allowExtraEntities, - RTTypeClass * typeClass, rtl::OString * name, sal_Int32 * rank, - std::vector< rtl::OString > * arguments); + RTTypeClass * typeClass, OString * name, sal_Int32 * rank, + std::vector< OString > * arguments); } diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/codemaker/inc/codemaker/commoncpp.hxx index 3cfd7133c0f1..4f81f98fff23 100644 --- a/codemaker/inc/codemaker/commoncpp.hxx +++ b/codemaker/inc/codemaker/commoncpp.hxx @@ -33,11 +33,11 @@ namespace codemaker { namespace cpp { Use common namespace aliases instead of fully specified (nested) namespace. currently replaces com::sun::star with css. */ -rtl::OString scopedCppName(rtl::OString const & type, bool ns_alias=true); +OString scopedCppName(OString const & type, bool ns_alias=true); -rtl::OString translateUnoToCppType( +OString translateUnoToCppType( codemaker::UnoType::Sort sort, RTTypeClass typeClass, - rtl::OString const & nucleus, bool shortname); + OString const & nucleus, bool shortname); enum IdentifierTranslationMode { ITM_GLOBAL, @@ -45,10 +45,10 @@ enum IdentifierTranslationMode { ITM_KEYWORDSONLY }; -rtl::OString translateUnoToCppIdentifier( - rtl::OString const & identifier, rtl::OString const & prefix, +OString translateUnoToCppIdentifier( + OString const & identifier, OString const & prefix, IdentifierTranslationMode transmode = ITM_GLOBAL, - rtl::OString const * forbidden = 0); + OString const * forbidden = 0); } } diff --git a/codemaker/inc/codemaker/commonjava.hxx b/codemaker/inc/codemaker/commonjava.hxx index 26c87e123fdb..f2e77ee9d1fa 100644 --- a/codemaker/inc/codemaker/commonjava.hxx +++ b/codemaker/inc/codemaker/commonjava.hxx @@ -24,12 +24,12 @@ namespace codemaker { namespace java { -rtl::OString translateUnoToJavaType( +OString translateUnoToJavaType( codemaker::UnoType::Sort sort, RTTypeClass typeClass, - rtl::OString const & nucleus, bool referenceType); + OString const & nucleus, bool referenceType); -rtl::OString translateUnoToJavaIdentifier( - rtl::OString const & identifier, rtl::OString const & prefix); +OString translateUnoToJavaIdentifier( + OString const & identifier, OString const & prefix); } } diff --git a/codemaker/inc/codemaker/dependencies.hxx b/codemaker/inc/codemaker/dependencies.hxx index c45db676d667..47e5e249c48f 100644 --- a/codemaker/inc/codemaker/dependencies.hxx +++ b/codemaker/inc/codemaker/dependencies.hxx @@ -26,8 +26,8 @@ #include "rtl/ref.hxx" #include "rtl/string.hxx" +#include "rtl/ustring.hxx" -namespace rtl { class OUString; } class TypeManager; /// @HTML @@ -47,7 +47,7 @@ public: */ enum Kind { KIND_NO_BASE, KIND_BASE }; - typedef std::map< rtl::OString, Kind > Map; + typedef std::map< OString, Kind > Map; /** Constructs the dependencies for a given type. @@ -63,7 +63,7 @@ public: */ Dependencies( rtl::Reference< TypeManager > const & manager, - rtl::OString const & type); + OString const & type); ~Dependencies(); @@ -73,7 +73,7 @@ public: @param type a UNO type registry name */ - void add(rtl::OString const & type) { insert(type, false); } + void add(OString const & type) { insert(type, false); } bool isValid() const { return m_valid; } @@ -117,9 +117,9 @@ private: Dependencies(Dependencies &); // not implemented void operator =(Dependencies); // not implemented - void insert(rtl::OUString const & type, bool base); + void insert(OUString const & type, bool base); - void insert(rtl::OString const & type, bool base); + void insert(OString const & type, bool base); Map m_map; bool m_valid; diff --git a/codemaker/inc/codemaker/exceptiontree.hxx b/codemaker/inc/codemaker/exceptiontree.hxx index fed0e5b9e4d7..91a0cae3f839 100644 --- a/codemaker/inc/codemaker/exceptiontree.hxx +++ b/codemaker/inc/codemaker/exceptiontree.hxx @@ -37,7 +37,7 @@ struct ExceptionTreeNode { typedef std::vector< ExceptionTreeNode * > Children; // Internally used by ExceptionTree: - ExceptionTreeNode(rtl::OString const & theName): + ExceptionTreeNode(OString const & theName): name(theName), present(false) {} // Internally used by ExceptionTree: @@ -47,9 +47,9 @@ struct ExceptionTreeNode { void setPresent() { present = true; clearChildren(); } // Internally used by ExceptionTree: - ExceptionTreeNode * add(rtl::OString const & theName); + ExceptionTreeNode * add(OString const & theName); - rtl::OString name; + OString name; bool present; Children children; @@ -94,7 +94,7 @@ public: type managers */ void add( - rtl::OString const & name, + OString const & name, rtl::Reference< TypeManager > const & manager) throw( CannotDumpException ); diff --git a/codemaker/inc/codemaker/generatedtypeset.hxx b/codemaker/inc/codemaker/generatedtypeset.hxx index 2081fc715ddd..3d1a5615b0b1 100644 --- a/codemaker/inc/codemaker/generatedtypeset.hxx +++ b/codemaker/inc/codemaker/generatedtypeset.hxx @@ -47,7 +47,7 @@ public: @param type a UNO type registry name */ - void add(rtl::OString const & type) { m_set.insert(type); } + void add(OString const & type) { m_set.insert(type); } /** Checks whether a given type has already been generated. @@ -56,14 +56,14 @@ public: @return true iff the given type has already been generated */ - bool contains(rtl::OString const & type) const + bool contains(OString const & type) const { return m_set.find(type) != m_set.end(); } private: GeneratedTypeSet(GeneratedTypeSet &); // not implemented void operator =(GeneratedTypeSet); // not implemented - boost::unordered_set< rtl::OString, rtl::OStringHash > m_set; + boost::unordered_set< OString, OStringHash > m_set; }; } diff --git a/codemaker/inc/codemaker/global.hxx b/codemaker/inc/codemaker/global.hxx index 17f78a886b65..891ed4705e87 100644 --- a/codemaker/inc/codemaker/global.hxx +++ b/codemaker/inc/codemaker/global.hxx @@ -32,7 +32,7 @@ struct EqualString { - sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const + sal_Bool operator()(const OString& str1, const OString& str2) const { return (str1 == str2); } @@ -40,7 +40,7 @@ struct EqualString struct HashString { - size_t operator()(const ::rtl::OString& str) const + size_t operator()(const OString& str) const { return str.hashCode(); } @@ -48,15 +48,15 @@ struct HashString struct LessString { - sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const + sal_Bool operator()(const OString& str1, const OString& str2) const { return (str1 < str2); } }; -typedef ::std::list< ::rtl::OString > StringList; -typedef ::std::vector< ::rtl::OString > StringVector; -typedef ::std::set< ::rtl::OString, LessString > StringSet; +typedef ::std::list< OString > StringList; +typedef ::std::vector< OString > StringVector; +typedef ::std::set< OString, LessString > StringSet; //************************************************************************* // FileStream @@ -77,45 +77,45 @@ public: sal_Bool isValid(); - void createTempFile(const ::rtl::OString& sPath); + void createTempFile(const OString& sPath); void close(); - ::rtl::OString getName() { return m_name; } + OString getName() { return m_name; } bool write(void const * buffer, sal_uInt64 size); // friend functions friend FileStream &operator<<(FileStream& o, sal_uInt32 i); friend FileStream &operator<<(FileStream& o, char const * s); - friend FileStream &operator<<(FileStream& o, ::rtl::OString* s); - friend FileStream &operator<<(FileStream& o, const ::rtl::OString& s); - friend FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer* s); - friend FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s); + friend FileStream &operator<<(FileStream& o, OString* s); + friend FileStream &operator<<(FileStream& o, const OString& s); + friend FileStream &operator<<(FileStream& o, OStringBuffer* s); + friend FileStream &operator<<(FileStream& o, const OStringBuffer& s); private: oslFileHandle m_file; - ::rtl::OString m_name; + OString m_name; }; //************************************************************************* // Helper functions //************************************************************************* -::rtl::OString getTempDir(const ::rtl::OString& sFileName); +OString getTempDir(const OString& sFileName); -::rtl::OString createFileNameFromType(const ::rtl::OString& destination, - const ::rtl::OString type, - const ::rtl::OString postfix, +OString createFileNameFromType(const OString& destination, + const OString type, + const OString postfix, sal_Bool bLowerCase=sal_False, - const ::rtl::OString prefix=""); + const OString prefix=""); -sal_Bool fileExists(const ::rtl::OString& fileName); -sal_Bool makeValidTypeFile(const ::rtl::OString& targetFileName, - const ::rtl::OString& tmpFileName, +sal_Bool fileExists(const OString& fileName); +sal_Bool makeValidTypeFile(const OString& targetFileName, + const OString& tmpFileName, sal_Bool bFileCheck); -sal_Bool removeTypeFile(const ::rtl::OString& fileName); +sal_Bool removeTypeFile(const OString& fileName); -::rtl::OUString convertToFileUrl(const ::rtl::OString& fileName); +OUString convertToFileUrl(const OString& fileName); //************************************************************************* // Global exception to signal problems when a type cannot be dumped @@ -123,10 +123,10 @@ sal_Bool removeTypeFile(const ::rtl::OString& fileName); class CannotDumpException { public: - CannotDumpException(const ::rtl::OString& msg) + CannotDumpException(const OString& msg) : m_message(msg) {} - ::rtl::OString m_message; + OString m_message; }; diff --git a/codemaker/inc/codemaker/options.hxx b/codemaker/inc/codemaker/options.hxx index 22b09ce00165..053cda9cf44b 100644 --- a/codemaker/inc/codemaker/options.hxx +++ b/codemaker/inc/codemaker/options.hxx @@ -26,8 +26,8 @@ typedef ::boost::unordered_map < - ::rtl::OString, - ::rtl::OString, + OString, + OString, HashString, EqualString > OptionMap; @@ -35,10 +35,10 @@ typedef ::boost::unordered_map class IllegalArgument { public: - IllegalArgument(const ::rtl::OString& msg) + IllegalArgument(const OString& msg) : m_message(msg) {} - ::rtl::OString m_message; + OString m_message; }; class Options @@ -50,11 +50,11 @@ public: virtual sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ) = 0; - virtual ::rtl::OString prepareHelp() = 0; + virtual OString prepareHelp() = 0; - const ::rtl::OString& getProgramName() const; - sal_Bool isValid(const ::rtl::OString& option); - const ::rtl::OString getOption(const ::rtl::OString& option) + const OString& getProgramName() const; + sal_Bool isValid(const OString& option); + const OString getOption(const OString& option) throw( IllegalArgument ); const StringVector& getInputFiles(); @@ -64,7 +64,7 @@ public: inline const StringVector& getExtraInputFiles() const { return m_extra_input_files; } protected: - ::rtl::OString m_program; + OString m_program; StringVector m_inputFiles; StringVector m_extra_input_files; OptionMap m_options; diff --git a/codemaker/inc/codemaker/typemanager.hxx b/codemaker/inc/codemaker/typemanager.hxx index 1b16115b85da..886aee54648c 100644 --- a/codemaker/inc/codemaker/typemanager.hxx +++ b/codemaker/inc/codemaker/typemanager.hxx @@ -37,7 +37,7 @@ typedef ::std::vector< KeyPair > RegistryKeyList; typedef ::boost::unordered_map < - ::rtl::OString, // Typename + OString, // Typename RTTypeClass, // TypeClass HashString, EqualString @@ -50,38 +50,38 @@ public: sal_Bool init(const StringVector& regFiles, const StringVector& extraFiles = StringVector() ); - ::rtl::OString getTypeName(RegistryKey& rTypeKey) const; + OString getTypeName(RegistryKey& rTypeKey) const; - sal_Bool isValidType(const ::rtl::OString& name) const + sal_Bool isValidType(const OString& name) const { return searchTypeKey(name, 0).isValid(); } RegistryKey getTypeKey( - const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const + const OString& name, sal_Bool * pIsExtraType = 0 ) const { return searchTypeKey(name, pIsExtraType); } - RegistryKeyList getTypeKeys(const ::rtl::OString& name) const; + RegistryKeyList getTypeKeys(const OString& name) const; typereg::Reader getTypeReader( - const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const; + const OString& name, sal_Bool * pIsExtraType = 0 ) const; typereg::Reader getTypeReader(RegistryKey& rTypeKey) const; - RTTypeClass getTypeClass(const ::rtl::OString& name) const; + RTTypeClass getTypeClass(const OString& name) const; RTTypeClass getTypeClass(RegistryKey& rTypeKey) const; - void setBase(const ::rtl::OString& base); - ::rtl::OString getBase() const { return m_base; } + void setBase(const OString& base); + OString getBase() const { return m_base; } sal_Int32 getSize() const { return m_t2TypeClass.size(); } - static sal_Bool isBaseType(const ::rtl::OString& name); + static sal_Bool isBaseType(const OString& name); private: virtual ~TypeManager(); RegistryKey searchTypeKey( - const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const; + const OString& name, sal_Bool * pIsExtraType = 0 ) const; void freeRegistries(); mutable T2TypeClassMap m_t2TypeClass; RegistryList m_registries; RegistryList m_extra_registries; - ::rtl::OString m_base; + OString m_base; }; #endif // INCLUDED_CODEMAKER_TYPEMANAGER_HXX diff --git a/codemaker/inc/codemaker/unotype.hxx b/codemaker/inc/codemaker/unotype.hxx index 23cf0668074e..ce22e62959dd 100644 --- a/codemaker/inc/codemaker/unotype.hxx +++ b/codemaker/inc/codemaker/unotype.hxx @@ -21,11 +21,10 @@ #define INCLUDED_CODEMAKER_UNOTYPE_HXX #include "sal/types.h" +#include <rtl/ustring.hxx> #include <vector> -namespace rtl { class OString; } - namespace codemaker { namespace UnoType { @@ -64,7 +63,7 @@ namespace UnoType { is a UNO type registry name that denotes something other than a UNO type, SORT_COMPLEX is returned) */ - Sort getSort(rtl::OString const & type); + Sort getSort(OString const & type); /** Determines whether a UNO type name or UNO type registry name denotes a @@ -75,7 +74,7 @@ namespace UnoType { @return true iff the given type denotes a UNO sequence type; the detection is purely syntactical */ - bool isSequenceType(rtl::OString const & type); + bool isSequenceType(OString const & type); /** Decomposes a UNO type name or UNO type registry name. @@ -92,9 +91,9 @@ namespace UnoType { @return the base part of the given type */ - rtl::OString decompose( - rtl::OString const & type, sal_Int32 * rank = 0, - std::vector< rtl::OString > * arguments = 0); + OString decompose( + OString const & type, sal_Int32 * rank = 0, + std::vector< OString > * arguments = 0); } } diff --git a/codemaker/source/codemaker/codemaker.cxx b/codemaker/source/codemaker/codemaker.cxx index b797a2c47358..0412e36d066b 100644 --- a/codemaker/source/codemaker/codemaker.cxx +++ b/codemaker/source/codemaker/codemaker.cxx @@ -39,7 +39,7 @@ namespace { -void checkNoTypeArguments(std::vector< rtl::OString > const & arguments) { +void checkNoTypeArguments(std::vector< OString > const & arguments) { if (!arguments.empty()) { throw CannotDumpException("Bad type information"); //TODO @@ -50,8 +50,8 @@ void checkNoTypeArguments(std::vector< rtl::OString > const & arguments) { namespace codemaker { -rtl::OString convertString(rtl::OUString const & string) { - rtl::OString s; +OString convertString(OUString const & string) { + OString s; if (!string.convertToString( &s, RTL_TEXTENCODING_UTF8, (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR @@ -63,14 +63,14 @@ rtl::OString convertString(rtl::OUString const & string) { } codemaker::UnoType::Sort decomposeAndResolve( - rtl::Reference< TypeManager > const & manager, rtl::OString const & type, + rtl::Reference< TypeManager > const & manager, OString const & type, bool resolveTypedefs, bool allowVoid, bool allowExtraEntities, - RTTypeClass * typeClass, rtl::OString * name, sal_Int32 * rank, - std::vector< rtl::OString > * arguments) + RTTypeClass * typeClass, OString * name, sal_Int32 * rank, + std::vector< OString > * arguments) { OSL_ASSERT(typeClass != 0 && name != 0 && rank != 0 && arguments != 0); *rank = 0; - for (rtl::OString t(type);;) { + for (OString t(type);;) { sal_Int32 n = 0; *name = codemaker::UnoType::decompose(t, &n, arguments); if (n > SAL_MAX_INT32 - *rank) { diff --git a/codemaker/source/codemaker/dependencies.cxx b/codemaker/source/codemaker/dependencies.cxx index d920ac4e7119..143dc98ffdc3 100644 --- a/codemaker/source/codemaker/dependencies.cxx +++ b/codemaker/source/codemaker/dependencies.cxx @@ -42,7 +42,7 @@ struct Bad {}; } Dependencies::Dependencies( - rtl::Reference< TypeManager > const & manager, rtl::OString const & type): + rtl::Reference< TypeManager > const & manager, OString const & type): m_voidDependency(false), m_booleanDependency(false), m_byteDependency(false), m_shortDependency(false), m_unsignedShortDependency(false), m_longDependency(false), @@ -122,8 +122,8 @@ Dependencies::Dependencies( Dependencies::~Dependencies() {} -void Dependencies::insert(rtl::OUString const & type, bool base) { - rtl::OString t; +void Dependencies::insert(OUString const & type, bool base) { + OString t; if (!type.convertToString( &t, RTL_TEXTENCODING_UTF8, (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR @@ -134,10 +134,10 @@ void Dependencies::insert(rtl::OUString const & type, bool base) { insert(t, base); } -void Dependencies::insert(rtl::OString const & type, bool base) { +void Dependencies::insert(OString const & type, bool base) { sal_Int32 rank; - std::vector< rtl::OString > args; - rtl::OString t(UnoType::decompose(type, &rank, &args)); + std::vector< OString > args; + OString t(UnoType::decompose(type, &rank, &args)); if (rank > 0) { m_sequenceDependency = true; } @@ -249,7 +249,7 @@ void Dependencies::insert(rtl::OString const & type, bool base) { case UnoType::SORT_COMPLEX: { - for (std::vector< rtl::OString >::iterator i(args.begin()); + for (std::vector< OString >::iterator i(args.begin()); i != args.end(); ++i) { insert(*i, false); diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx index 52f968493274..1b4915b65224 100644 --- a/codemaker/source/codemaker/exceptiontree.cxx +++ b/codemaker/source/codemaker/exceptiontree.cxx @@ -34,7 +34,7 @@ using codemaker::ExceptionTree; using codemaker::ExceptionTreeNode; -ExceptionTreeNode * ExceptionTreeNode::add(rtl::OString const & theName) { +ExceptionTreeNode * ExceptionTreeNode::add(OString const & theName) { std::auto_ptr< ExceptionTreeNode > node(new ExceptionTreeNode(theName)); children.push_back(node.get()); return node.release(); @@ -48,13 +48,13 @@ void ExceptionTreeNode::clearChildren() { } void ExceptionTree::add( - rtl::OString const & name, rtl::Reference< TypeManager > const & manager) + OString const & name, rtl::Reference< TypeManager > const & manager) throw( CannotDumpException ) { - typedef std::vector< rtl::OString > OStringList; + typedef std::vector< OString > OStringList; OStringList stringlist; bool runtimeException = false; - for (rtl::OString n(name); n != "com/sun/star/uno/Exception";) { + for (OString n(name); n != "com/sun/star/uno/Exception";) { if (n == "com/sun/star/uno/RuntimeException") { runtimeException = true; break; @@ -63,13 +63,13 @@ void ExceptionTree::add( typereg::Reader reader(manager->getTypeReader(n)); if (!reader.isValid()) throw CannotDumpException( - ::rtl::OString("Unknown type '" + n.replace('/', '.') + OString("Unknown type '" + n.replace('/', '.') + "', incomplete type library.")); OSL_ASSERT( reader.getTypeClass() == RT_TYPE_EXCEPTION && reader.getSuperTypeCount() == 1); - n = rtl::OUStringToOString( + n = OUStringToOString( reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } if (!runtimeException) { diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx index 34b0490c7d17..2630ee8b81ce 100644 --- a/codemaker/source/codemaker/global.cxx +++ b/codemaker/source/codemaker/global.cxx @@ -364,23 +364,23 @@ FileStream &operator<<(FileStream& o, char const * s) { osl_writeFile(o.m_file, s, strlen(s), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, ::rtl::OString* s) { +FileStream &operator<<(FileStream& o, OString* s) { sal_uInt64 writtenBytes; osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, const ::rtl::OString& s) { +FileStream &operator<<(FileStream& o, const OString& s) { sal_uInt64 writtenBytes; osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer* s) { +FileStream &operator<<(FileStream& o, OStringBuffer* s) { sal_uInt64 writtenBytes; osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes); return o; } -FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s) { +FileStream &operator<<(FileStream& o, const OStringBuffer& s) { sal_uInt64 writtenBytes; osl_writeFile( o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes); diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx index 59706d99c179..d233f6ff0bfc 100644 --- a/codemaker/source/codemaker/options.cxx +++ b/codemaker/source/codemaker/options.cxx @@ -20,7 +20,6 @@ #include "codemaker/options.hxx" -using ::rtl::OString; Options::Options() { diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx index 116684dbfb66..9d4cf63f58f5 100644 --- a/codemaker/source/codemaker/typemanager.cxx +++ b/codemaker/source/codemaker/typemanager.cxx @@ -23,12 +23,8 @@ #include "registry/reader.hxx" #include "registry/version.h" -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::rtl::OUStringToOString; -sal_Bool TypeManager::isBaseType(const ::rtl::OString& name) +sal_Bool TypeManager::isBaseType(const OString& name) { if ( name == "short" ) return sal_True; @@ -108,7 +104,7 @@ sal_Bool TypeManager::init( return sal_True; } -::rtl::OString TypeManager::getTypeName(RegistryKey& rTypeKey) const +OString TypeManager::getTypeName(RegistryKey& rTypeKey) const { OString typeName = OUStringToOString(rTypeKey.getName(), RTL_TEXTENCODING_UTF8); @@ -306,7 +302,7 @@ RegistryKey TypeManager::searchTypeKey(const OString& name_, sal_Bool * pIsExtra return key; } -RegistryKeyList TypeManager::getTypeKeys(const ::rtl::OString& name_) const +RegistryKeyList TypeManager::getTypeKeys(const OString& name_) const { RegistryKeyList keyList= RegistryKeyList(); OString tmpName; diff --git a/codemaker/source/codemaker/unotype.cxx b/codemaker/source/codemaker/unotype.cxx index 9adb9e1bc47b..8f2c89537c77 100644 --- a/codemaker/source/codemaker/unotype.cxx +++ b/codemaker/source/codemaker/unotype.cxx @@ -26,7 +26,7 @@ #include <vector> -codemaker::UnoType::Sort codemaker::UnoType::getSort(rtl::OString const & type) +codemaker::UnoType::Sort codemaker::UnoType::getSort(OString const & type) { return type == "void" ? SORT_VOID : type == "boolean" ? SORT_BOOLEAN @@ -46,13 +46,13 @@ codemaker::UnoType::Sort codemaker::UnoType::getSort(rtl::OString const & type) : SORT_COMPLEX; } -bool codemaker::UnoType::isSequenceType(rtl::OString const & type) { +bool codemaker::UnoType::isSequenceType(OString const & type) { return !type.isEmpty() && type[0] == '['; } -rtl::OString codemaker::UnoType::decompose( - rtl::OString const & type, sal_Int32 * rank, - std::vector< rtl::OString > * arguments) +OString codemaker::UnoType::decompose( + OString const & type, sal_Int32 * rank, + std::vector< OString > * arguments) { sal_Int32 len = type.getLength(); sal_Int32 i = 0; diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index 5db10d481c75..6f530409f745 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -56,7 +56,7 @@ OString scopedCppName(OString const & type, bool ns_alias) tmpBuf.append("::" + type.getToken(0, c, nPos)); } while( nPos != -1 ); - rtl::OString s(tmpBuf.makeStringAndClear()); + OString s(tmpBuf.makeStringAndClear()); if (ns_alias && s.indexOf("::com::sun::star::") == 0) { return s.replaceAt(0, 18, "css::"); // nicer shorthand @@ -70,10 +70,10 @@ OString translateUnoToCppType( codemaker::UnoType::Sort sort, RTTypeClass typeClass, OString const & nucleus, bool shortname) { - rtl::OStringBuffer buf; + OStringBuffer buf; if (sort == codemaker::UnoType::SORT_COMPLEX) { if (typeClass == RT_TYPE_INTERFACE - && nucleus == rtl::OString("com/sun/star/uno/XInterface")) + && nucleus == OString("com/sun/star/uno/XInterface")) { buf.append("::com::sun::star::uno::XInterface"); } else { @@ -84,13 +84,13 @@ OString translateUnoToCppType( static char const * const cppTypes[codemaker::UnoType::SORT_ANY + 1] = { "void", "::sal_Bool", "::sal_Int8", "::sal_Int16", "::sal_uInt16", "::sal_Int32", "::sal_uInt32", "::sal_Int64", "::sal_uInt64", - "float", "double", "::sal_Unicode", "::rtl::OUString", + "float", "double", "::sal_Unicode", "rtl::OUString", "::com::sun::star::uno::Type", "::com::sun::star::uno::Any" }; buf.append(cppTypes[sort]); } if (shortname) { - rtl::OString s(buf.makeStringAndClear()); + OString s(buf.makeStringAndClear()); if (s.indexOf("::com::sun::star") == 0) return s.replaceAt(0, 16, "css"); else @@ -100,9 +100,9 @@ OString translateUnoToCppType( return buf.makeStringAndClear(); } -rtl::OString translateUnoToCppIdentifier( - rtl::OString const & unoIdentifier, rtl::OString const & prefix, - IdentifierTranslationMode transmode, rtl::OString const * forbidden) +OString translateUnoToCppIdentifier( + OString const & unoIdentifier, OString const & prefix, + IdentifierTranslationMode transmode, OString const * forbidden) { if (// Keywords: unoIdentifier == "asm" diff --git a/codemaker/source/commonjava/commonjava.cxx b/codemaker/source/commonjava/commonjava.cxx index 8049c98295a0..8c8a630d1bda 100644 --- a/codemaker/source/commonjava/commonjava.cxx +++ b/codemaker/source/commonjava/commonjava.cxx @@ -54,7 +54,7 @@ OString translateUnoToJavaType( buf.append(nucleus); } } else { - rtl::OString const javaTypes[codemaker::UnoType::SORT_ANY + 1][2] = { + OString const javaTypes[codemaker::UnoType::SORT_ANY + 1][2] = { { "void", "java/lang/Void" }, { "boolean", "java/lang/Boolean" }, { "byte", "java/lang/Byte" }, @@ -75,8 +75,8 @@ OString translateUnoToJavaType( return buf.makeStringAndClear(); } -rtl::OString translateUnoToJavaIdentifier( - rtl::OString const & identifier, rtl::OString const & prefix) +OString translateUnoToJavaIdentifier( + OString const & identifier, OString const & prefix) { if (identifier == "abstract" || identifier == "assert" // since Java 1.4 diff --git a/codemaker/source/cppumaker/cppumaker.cxx b/codemaker/source/cppumaker/cppumaker.cxx index d18a952502e1..1f63ef26b5b2 100644 --- a/codemaker/source/cppumaker/cppumaker.cxx +++ b/codemaker/source/cppumaker/cppumaker.cxx @@ -29,14 +29,12 @@ #include "cppuoptions.hxx" #include "cpputype.hxx" -using ::rtl::OString; -using ::rtl::OUString; namespace { -void failed(rtl::OString const & typeName, CppuOptions * options) { +void failed(OString const & typeName, CppuOptions * options) { fprintf(stderr, "%s ERROR: %s\n", options->getProgramName().getStr(), - rtl::OString("cannot dump Type '" + typeName + "'").getStr()); + OString("cannot dump Type '" + typeName + "'").getStr()); exit(99); } @@ -52,7 +50,7 @@ void produce( } void produce( - rtl::OString const & typeName, + OString const & typeName, rtl::Reference< TypeManager > const & typeMgr, codemaker::GeneratedTypeSet & generated, CppuOptions * options) { diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx index 10b1d0c2d414..8affab24dd56 100644 --- a/codemaker/source/cppumaker/cppuoptions.cxx +++ b/codemaker/source/cppumaker/cppuoptions.cxx @@ -24,9 +24,6 @@ #include "osl/thread.h" #include "osl/process.h" -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; #ifdef SAL_UNX #define SEPARATOR '/' diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx index f2dd04549d3f..f07e945d1ff5 100644 --- a/codemaker/source/cppumaker/cppuoptions.hxx +++ b/codemaker/source/cppumaker/cppuoptions.hxx @@ -33,9 +33,9 @@ public: sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ); - ::rtl::OString prepareHelp(); + OString prepareHelp(); - ::rtl::OString prepareVersion(); + OString prepareVersion(); protected: }; diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index b5e52681a598..4f90a53139e3 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -43,19 +43,16 @@ using namespace codemaker::cpp; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringBuffer; namespace { -rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoType=false) { - static rtl::OString const trans[codemaker::UnoType::SORT_COMPLEX + 1] = { +OString translateSimpleUnoType(OString const & unoType, bool cppuUnoType=false) { + static OString const trans[codemaker::UnoType::SORT_COMPLEX + 1] = { "void", "::sal_Bool", "::sal_Int8", "::sal_Int16", "::sal_uInt16", "::sal_Int32", "::sal_uInt32", "::sal_Int64", "::sal_uInt64", "float", - "double", "::sal_Unicode", "::rtl::OUString", + "double", "::sal_Unicode", "rtl::OUString", "::com::sun::star::uno::Type", "::com::sun::star::uno::Any", - rtl::OString() }; + OString() }; const codemaker::UnoType::Sort sort = codemaker::UnoType::getSort(unoType); if (cppuUnoType && @@ -71,7 +68,7 @@ rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoTy return trans[sort]; } -bool isBootstrapType(rtl::OString const & name) { +bool isBootstrapType(OString const & name) { static char const * const names[] = { "com/sun/star/beans/PropertyAttribute", "com/sun/star/beans/PropertyState", @@ -192,7 +189,7 @@ void CppuType::dumpDeclaration(FileStream &) throw (CannotDumpException) { OSL_ASSERT(false); } -bool CppuType::dumpFiles(CppuOptions * options, rtl::OString const & outPath) { +bool CppuType::dumpFiles(CppuOptions * options, OString const & outPath) { return dumpFile(options, ".hdl", m_typeName, outPath) && dumpFile(options, ".hpp", m_typeName, outPath); } @@ -441,15 +438,15 @@ void CppuType::addDefaultHxxIncludes(codemaker::cppumaker::Includes & includes) } void CppuType::dumpInitializer( - FileStream & out, bool parameterized, rtl::OUString const & type) const + FileStream & out, bool parameterized, OUString const & type) const { out << "("; if (!parameterized) { - for (rtl::OString t( - rtl::OUStringToOString(type, RTL_TEXTENCODING_UTF8));;) + for (OString t( + OUStringToOString(type, RTL_TEXTENCODING_UTF8));;) { sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; t = codemaker::UnoType::decompose(t, &rank, &args); if (rank == 0) { switch (codemaker::UnoType::getSort(t)) { @@ -477,7 +474,7 @@ void CppuType::dumpInitializer( typereg::Reader reader(m_typeMgr->getTypeReader(t)); OSL_ASSERT(reader.isValid()); out << scopedCppName(t) << "_" - << rtl::OUStringToOString( + << OUStringToOString( reader.getFieldName(0), RTL_TEXTENCODING_UTF8); break; @@ -600,7 +597,7 @@ void CppuType::dumpNormalGetCppuType(FileStream& o) OString superType; if (m_reader.getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } sal_Bool bIsBaseException = sal_False; @@ -636,10 +633,10 @@ void CppuType::dumpNormalGetCppuType(FileStream& o) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = checkRealBaseType( - rtl::OUStringToOString( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8), sal_True); @@ -711,7 +708,7 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "{\n"; inc(); - o << indent() << "::rtl::OUString sTypeName( \"" + o << indent() << "rtl::OUString sTypeName( \"" << m_typeName.replace('/', '.') << "\" );\n\n"; o << indent() << "// Start inline typedescription generation\n" @@ -719,7 +716,7 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o) OString superType; if (m_reader.getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } if (!superType.isEmpty()) { @@ -748,17 +745,17 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o) continue; } - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = checkRealBaseType( - rtl::OUStringToOString( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8), sal_True); - o << indent() << "::rtl::OUString sMemberType" << i + o << indent() << "rtl::OUString sMemberType" << i << "( \"" << fieldType.replace('/', '.') << "\" );\n"; - o << indent() << "::rtl::OUString sMemberName" << i + o << indent() << "rtl::OUString sMemberName" << i << "( \""; o << fieldName << "\" );\n"; o << indent() << "aMembers[" << i << "].eTypeClass = " @@ -829,8 +826,8 @@ void CppuType::dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag) || (access & RT_ACCESS_PARAMETERIZED_TYPE) != 0) continue; - rtl::OString typeName( - rtl::OUStringToOString( + OString typeName( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if (aFinishedTypes.count(typeName) == 0) { @@ -875,7 +872,7 @@ sal_uInt32 CppuType::checkInheritedMemberCount(const typereg::Reader* pReader) sal_uInt32 count = 0; OString superType; if (pReader->getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( pReader->getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } if (!superType.isEmpty()) @@ -1000,8 +997,8 @@ void CppuType::dumpType(FileStream& o, const OString& type, const throw( CannotDumpException ) { sal_Int32 seqNum; - std::vector< rtl::OString > args; - rtl::OString relType( + std::vector< OString > args; + OString relType( codemaker::UnoType::decompose( checkRealBaseType(type, true), &seqNum, &args)); @@ -1044,7 +1041,7 @@ void CppuType::dumpType(FileStream& o, const OString& type, o << scopedCppName(relType); if (!args.empty()) { o << "< "; - for (std::vector< rtl::OString >::iterator i(args.begin()); + for (std::vector< OString >::iterator i(args.begin()); i != args.end(); ++i) { if (i != args.begin()) { @@ -1070,7 +1067,7 @@ void CppuType::dumpType(FileStream& o, const OString& type, void CppuType::dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDecl, CppuTypeDecl eDeclFlag) { - rtl::OString relType( + OString relType( codemaker::UnoType::decompose(checkRealBaseType(type, true))); if (eDeclFlag == CPPUTYPEDECL_ONLYINTERFACES) @@ -1108,7 +1105,7 @@ void CppuType::dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDec OString CppuType::typeToIdentifier(const OString& type) { sal_Int32 seqNum; - rtl::OString relType(codemaker::UnoType::decompose(type, &seqNum)); + OString relType(codemaker::UnoType::decompose(type, &seqNum)); OString sIdentifier; while( seqNum > 0 ) @@ -1135,8 +1132,8 @@ OString CppuType::typeToIdentifier(const OString& type) return sIdentifier; } -bool CppuType::passByReference(rtl::OString const & unoType) { - rtl::OString type(resolveTypedefs(unoType)); +bool CppuType::passByReference(OString const & unoType) { + OString type(resolveTypedefs(unoType)); switch (codemaker::UnoType::getSort(type)) { default: return false; @@ -1169,7 +1166,7 @@ OString CppuType::resolveTypedefs(const OString& type) const typeClass = reader.getTypeClass(); if (typeClass == RT_TYPE_TYPEDEF) - baseType = rtl::OUStringToOString( + baseType = OUStringToOString( reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); else isTypeDef = sal_False; @@ -1185,7 +1182,7 @@ OString CppuType::resolveTypedefs(const OString& type) const OString CppuType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly) const { sal_Int32 rank; - rtl::OString baseType(codemaker::UnoType::decompose(type, &rank)); + OString baseType(codemaker::UnoType::decompose(type, &rank)); RegistryKey key; RTTypeClass typeClass; @@ -1204,7 +1201,7 @@ OString CppuType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOn { sal_Int32 n; baseType = codemaker::UnoType::decompose( - rtl::OUStringToOString( + OUStringToOString( reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8), &n); OSL_ASSERT(n <= SAL_MAX_INT32 - rank); //TODO @@ -1272,7 +1269,7 @@ void CppuType::dumpConstantValue(FileStream& o, sal_uInt16 index) if (constValue.m_value.aHyper == SAL_MIN_INT64) { o << "SAL_MIN_INT64"; } else { - ::rtl::OString tmp(OString::valueOf(constValue.m_value.aHyper)); + OString tmp(OString::valueOf(constValue.m_value.aHyper)); o << "(sal_Int64) SAL_CONST_INT64(" << tmp.getStr() << ")"; } break; @@ -1290,7 +1287,7 @@ void CppuType::dumpConstantValue(FileStream& o, sal_uInt16 index) for (std::vector< char >::reverse_iterator i(buf.rbegin()); i != buf.rend(); ++i) { - o << rtl::OString::valueOf(*i).getStr(); + o << OString::valueOf(*i).getStr(); } } o << ")"; @@ -1298,21 +1295,21 @@ void CppuType::dumpConstantValue(FileStream& o, sal_uInt16 index) break; case RT_TYPE_FLOAT: { - ::rtl::OString tmp( OString::valueOf(constValue.m_value.aFloat) ); + OString tmp( OString::valueOf(constValue.m_value.aFloat) ); o << "(float)" << tmp.getStr(); } break; case RT_TYPE_DOUBLE: { - ::rtl::OString tmp( OString::valueOf(constValue.m_value.aDouble) ); + OString tmp( OString::valueOf(constValue.m_value.aDouble) ); o << "(double)" << tmp.getStr(); } break; case RT_TYPE_STRING: { - ::rtl::OUString aUStr(constValue.m_value.aString); - ::rtl::OString aStr = ::rtl::OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US); - o << "::rtl::OUString( \"" << aStr.getStr() << "\" )"; + OUString aUStr(constValue.m_value.aString); + OString aStr = OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US); + o << "rtl::OUString( \"" << aStr.getStr() << "\" )"; } break; } @@ -1392,7 +1389,7 @@ void InterfaceType::dumpDeclaration(FileStream& o) for (sal_Int16 i = 0; i < m_reader.getSuperTypeCount(); ++i) { o << (i == 0 ? " :" : ",") << " public " - << scopedCppName(rtl::OUStringToOString( + << scopedCppName(OUStringToOString( m_reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8)); } @@ -1458,9 +1455,9 @@ void InterfaceType::dumpAttributes(FileStream& o) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - rtl::OUString name(m_reader.getFieldName(i)); - fieldName = rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + OUString name(m_reader.getFieldName(i)); + fieldName = OUStringToOString(name, RTL_TEXTENCODING_UTF8); + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); bool depr = m_isDeprecated @@ -1517,9 +1514,9 @@ void InterfaceType::dumpMethods(FileStream& o) continue; } - methodName = rtl::OUStringToOString( + methodName = OUStringToOString( m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8); - returnType = rtl::OUStringToOString( + returnType = OUStringToOString( m_reader.getMethodReturnTypeName(i), RTL_TEXTENCODING_UTF8); paramCount = m_reader.getMethodParameterCount(i); @@ -1551,9 +1548,9 @@ void InterfaceType::dumpMethods(FileStream& o) o << " SAL_CALL " << methodName << "( "; for (sal_uInt16 j=0; j < paramCount; j++) { - paramName = rtl::OUStringToOString( + paramName = OUStringToOString( m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8); - paramType = rtl::OUStringToOString( + paramType = OUStringToOString( m_reader.getMethodParameterTypeName(i, j), RTL_TEXTENCODING_UTF8); paramMode = m_reader.getMethodParameterFlags(i, j); @@ -1607,7 +1604,7 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o) o << indent() << "aSuperTypes[" << i << "] = ::cppu::UnoType< "; dumpType( o, - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8), true, false, false, true); o << " >::get().getTypeLibType();\n"; @@ -1651,7 +1648,7 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "{\n"; inc(); - o << indent() << "::rtl::OUString sTypeName( \"" + o << indent() << "rtl::OUString sTypeName( \"" << m_typeName.replace('/', '.') << "\" );\n\n"; o << indent() << "// Start inline typedescription generation\n" @@ -1664,7 +1661,7 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "aSuperTypes[" << i << "] = ::cppu::UnoType< "; dumpType( o, - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8), false, false, false, true); o << " >::get().getTypeLibType();\n"; @@ -1798,10 +1795,10 @@ void InterfaceType::dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - o << indent() << "::rtl::OUString sAttributeName" << i << "( \"" + o << indent() << "rtl::OUString sAttributeName" << i << "( \"" << scope.replace('/', '.') << "::" << fieldName << "\" );\n"; o << indent() << "typelib_typedescriptionreference_new( &pMembers[" << index << "],\n"; @@ -1826,10 +1823,10 @@ void InterfaceType::dumpCppuMethodRefs(FileStream& o, sal_uInt32& index) continue; } - methodName = rtl::OUStringToOString( + methodName = OUStringToOString( m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8); - o << indent() << "::rtl::OUString sMethodName" << i << "( \"" + o << indent() << "rtl::OUString sMethodName" << i << "( \"" << scope.replace('/', '.') << "::" << methodName << "\" );\n"; o << indent() << "typelib_typedescriptionreference_new( &pMembers[" << index << "],\n"; @@ -1878,7 +1875,7 @@ private: void calculate(typereg::Reader const & reader); rtl::Reference< TypeManager > manager; - std::set< rtl::OString > set; + std::set< OString > set; sal_Int32 offset; }; @@ -1895,7 +1892,7 @@ void BaseOffset::calculateBases(typereg::Reader const & reader) { for (sal_Int16 i = 0; i < reader.getSuperTypeCount(); ++i) { typereg::Reader super( manager->getTypeReader( - rtl::OUStringToOString( + OUStringToOString( reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8))); if (super.isValid()) { calculate(super); @@ -1905,7 +1902,7 @@ void BaseOffset::calculateBases(typereg::Reader const & reader) { void BaseOffset::calculate(typereg::Reader const & reader) { if (set.insert( - rtl::OUStringToOString(reader.getTypeName(), RTL_TEXTENCODING_UTF8)) + OUStringToOString(reader.getTypeName(), RTL_TEXTENCODING_UTF8)) .second) { calculateBases(reader); @@ -1980,19 +1977,19 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - rtl::OUString name(m_reader.getFieldName(i)); - fieldName = rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8); + OUString name(m_reader.getFieldName(i)); + fieldName = OUStringToOString(name, RTL_TEXTENCODING_UTF8); fieldType = checkRealBaseType( - rtl::OUStringToOString( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8), sal_True); o << indent() << "{\n"; inc(); - o << indent() << "::rtl::OUString sAttributeType" << i << "( \"" + o << indent() << "rtl::OUString sAttributeType" << i << "( \"" << fieldType.replace('/', '.') << "\" );\n"; - o << indent() << "::rtl::OUString sAttributeName" << i << "( \"" + o << indent() << "rtl::OUString sAttributeName" << i << "( \"" << scope.replace('/', '.') << "::" << fieldName << "\" );\n"; sal_Int32 getExceptions = dumpAttributeExceptionTypeNames( @@ -2048,10 +2045,10 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index) continue; } - methodName = rtl::OUStringToOString( + methodName = OUStringToOString( m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8); returnType = checkRealBaseType( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodReturnTypeName(i), RTL_TEXTENCODING_UTF8), sal_True); paramCount = m_reader.getMethodParameterCount(i); @@ -2071,19 +2068,19 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index) for (sal_uInt16 j = 0; j < paramCount; j++) { - paramName = rtl::OUStringToOString( + paramName = OUStringToOString( m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8); paramType = checkRealBaseType( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterTypeName(i, j), RTL_TEXTENCODING_UTF8), sal_True); paramMode = m_reader.getMethodParameterFlags(i, j); - o << indent() << "::rtl::OUString sParamName" << j << "( \"" + o << indent() << "rtl::OUString sParamName" << j << "( \"" << paramName << "\" );\n"; - o << indent() << "::rtl::OUString sParamType" << j << "( \"" + o << indent() << "rtl::OUString sParamType" << j << "( \"" << paramType.replace('/', '.') << "\" );\n"; o << indent() << "aParameters[" << j << "].pParamName = sParamName" << j << ".pData;\n"; o << indent() << "aParameters[" << j << "].eTypeClass = (typelib_TypeClass)" @@ -2104,9 +2101,9 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index) sal_Int32 excCount = dumpExceptionTypeNames( o, "", i, bWithRuntimeException); - o << indent() << "::rtl::OUString sReturnType" << i << "( \"" + o << indent() << "rtl::OUString sReturnType" << i << "( \"" << returnType.replace('/', '.') << "\" );\n"; - o << indent() << "::rtl::OUString sMethodName" << i << + o << indent() << "rtl::OUString sMethodName" << i << "( \"" << scope.replace('/', '.') << "::" << methodName << "\" );\n"; o << indent() << "typelib_typedescription_newInterfaceMethod( &pMethod,\n"; @@ -2153,9 +2150,9 @@ void InterfaceType::dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTy if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (pFinishedTypes->count(fieldType) == 0) @@ -2175,7 +2172,7 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes for (sal_uInt16 i=0; i < methodCount; i++) { - returnType = rtl::OUStringToOString( + returnType = OUStringToOString( m_reader.getMethodReturnTypeName(i), RTL_TEXTENCODING_UTF8); paramCount = m_reader.getMethodParameterCount(i); excCount = m_reader.getMethodExceptionCount(i); @@ -2188,7 +2185,7 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes sal_uInt16 j; for (j=0; j < paramCount; j++) { - paramType = rtl::OUStringToOString( + paramType = OUStringToOString( m_reader.getMethodParameterTypeName(i, j), RTL_TEXTENCODING_UTF8); @@ -2201,7 +2198,7 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes for (j=0; j < excCount; j++) { - excType = rtl::OUStringToOString( + excType = OUStringToOString( m_reader.getMethodExceptionTypeName(i, j), RTL_TEXTENCODING_UTF8); if (pFinishedTypes->count(excType) == 0) @@ -2230,7 +2227,7 @@ void InterfaceType::dumpExceptionSpecification( sal_uInt16 count = m_reader.getMethodExceptionCount( static_cast< sal_uInt16 >(methodIndex)); for (sal_uInt16 i = 0; i < count; ++i) { - rtl::OUString name( + OUString name( m_reader.getMethodExceptionTypeName( static_cast< sal_uInt16 >(methodIndex), i)); if ( name != "com/sun/star/uno/RuntimeException" ) @@ -2240,7 +2237,7 @@ void InterfaceType::dumpExceptionSpecification( } first = false; out << scopedCppName( - rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8)); + OUStringToOString(name, RTL_TEXTENCODING_UTF8)); } } } @@ -2255,7 +2252,7 @@ void InterfaceType::dumpExceptionSpecification( } void InterfaceType::dumpAttributeExceptionSpecification( - FileStream & out, rtl::OUString const & name, RTMethodMode sort) + FileStream & out, OUString const & name, RTMethodMode sort) { sal_uInt16 methodCount = m_reader.getMethodCount(); for (sal_uInt16 i = 0; i < methodCount; ++i) { @@ -2270,11 +2267,11 @@ void InterfaceType::dumpAttributeExceptionSpecification( } void InterfaceType::dumpExceptionTypeName( - FileStream & out, char const * prefix, sal_uInt32 index, rtl::OUString name) + FileStream & out, char const * prefix, sal_uInt32 index, OUString name) { - out << indent() << "::rtl::OUString the_" << prefix << "ExceptionName" + out << indent() << "rtl::OUString the_" << prefix << "ExceptionName" << index << "( \"" - << rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).replace('/', '.') + << OUStringToOString(name, RTL_TEXTENCODING_UTF8).replace('/', '.') << "\" );\n"; } @@ -2285,7 +2282,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames( sal_Int32 count = 0; sal_uInt16 n = m_reader.getMethodExceptionCount(methodIndex); for (sal_uInt16 i = 0; i < n; ++i) { - rtl::OUString name(m_reader.getMethodExceptionTypeName(methodIndex, i)); + OUString name(m_reader.getMethodExceptionTypeName(methodIndex, i)); if ( name != "com/sun/star/uno/RuntimeException" ) { dumpExceptionTypeName(out, prefix, count++, name); @@ -2294,7 +2291,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames( if (runtimeException) { dumpExceptionTypeName( out, prefix, count++, - rtl::OUString("com/sun/star/uno/RuntimeException")); + OUString("com/sun/star/uno/RuntimeException")); } if (count > 0) { out << indent() << "rtl_uString * the_" << prefix << "Exceptions[] = {"; @@ -2308,7 +2305,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames( } sal_Int32 InterfaceType::dumpAttributeExceptionTypeNames( - FileStream & out, char const * prefix, rtl::OUString const & name, + FileStream & out, char const * prefix, OUString const & name, RTMethodMode sort) { sal_uInt16 methodCount = m_reader.getMethodCount(); @@ -2397,9 +2394,9 @@ void ConstantsType::dumpDeclaration(FileStream& o) OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); o << "static const "; @@ -2429,7 +2426,7 @@ sal_Bool ConstantsType::dumpHxxFile( OString headerDefine(dumpHeaderDefine(o, "HPP", bSpecialDefine)); o << "\n"; - rtl::OString suffix; + OString suffix; if (bSpecialDefine) { suffix = m_name; } @@ -2456,9 +2453,9 @@ ModuleType::~ModuleType() } bool ModuleType::dumpFiles( - CppuOptions * options, rtl::OString const & outPath) + CppuOptions * options, OString const & outPath) { - rtl::OString tmpName(m_typeName); + OString tmpName(m_typeName); if (tmpName == "/") { tmpName = "global"; } else { @@ -2474,7 +2471,7 @@ bool ModuleType::dumpFiles( namespace { -void dumpTypeParameterName(FileStream & out, rtl::OString const & name) { +void dumpTypeParameterName(FileStream & out, OString const & name) { // Prefix all type parameters with "typeparam_" to avoid problems when a // struct member has the same name as a type parameter, as in // struct<T> { T T; }; @@ -2514,9 +2511,9 @@ void StructureType::dumpDeclaration(FileStream& o) o << indent(); dumpTemplateHead(o); o << "struct " << m_name; - rtl::OString base; + OString base; if (m_reader.getSuperTypeCount() != 0) { - base = rtl::OUStringToOString( + base = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); OSL_ASSERT(!base.isEmpty()); //TODO } @@ -2535,8 +2532,8 @@ void StructureType::dumpDeclaration(FileStream& o) o << ", "; } prev = true; - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) { @@ -2546,7 +2543,7 @@ void StructureType::dumpDeclaration(FileStream& o) dumpType(o, type, true, true); } o << " " - << rtl::OUStringToOString( + << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8) << "_"; } @@ -2559,8 +2556,8 @@ void StructureType::dumpDeclaration(FileStream& o) bool parameterized = ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0); - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if (parameterized) { dumpTypeParameterName(o, type); @@ -2568,7 +2565,7 @@ void StructureType::dumpDeclaration(FileStream& o) dumpType(o, type); } o << " " - << rtl::OUStringToOString( + << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); if (i == 0 && !base.isEmpty() && type != "double" && type != "hyper" && type != "unsigned hyper") @@ -2609,7 +2606,7 @@ sal_Bool StructureType::dumpHxxFile( inc(); OString superType; if (m_reader.getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } sal_Bool first = sal_True; @@ -2631,7 +2628,7 @@ sal_Bool StructureType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); if (first) @@ -2666,9 +2663,9 @@ sal_Bool StructureType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (superHasMember) @@ -2703,7 +2700,7 @@ sal_Bool StructureType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); if (first) @@ -2734,8 +2731,8 @@ sal_Bool StructureType::dumpHxxFile( if (i > 0) { o << ", "; } - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) { @@ -2745,7 +2742,7 @@ sal_Bool StructureType::dumpHxxFile( dumpType(o, type, true, true); } o << " " - << rtl::OUStringToOString( + << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8) << "_"; } @@ -2759,7 +2756,7 @@ sal_Bool StructureType::dumpHxxFile( if (i > 0) { o << ", "; } - o << rtl::OUStringToOString( + o << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8) << "_"; } @@ -2791,16 +2788,16 @@ void StructureType::dumpLightGetCppuType(FileStream & out) { << indent() << "if (the_type == 0) {\n"; inc(); if (isPolymorphic()) { - out << indent() << "::rtl::OStringBuffer the_buffer(\"" + out << indent() << "OStringBuffer the_buffer(\"" << m_typeName.replace('/', '.') << "<\");\n"; sal_uInt16 n = m_reader.getReferenceCount(); for (sal_uInt16 i = 0; i < n; ++i) { out << indent() - << ("the_buffer.append(::rtl::OUStringToOString(" + << ("the_buffer.append(rtl::OUStringToOString(" "::cppu::getTypeFavourChar(static_cast< "); dumpTypeParameterName( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8)); out << " * >(0)).getTypeName(), RTL_TEXTENCODING_UTF8));\n"; if (i != n - 1) { @@ -2835,16 +2832,16 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) { << indent() << "if (the_type == 0) {\n"; inc(); if (isPolymorphic()) { - out << indent() << "::rtl::OStringBuffer the_buffer(\"" + out << indent() << "OStringBuffer the_buffer(\"" << m_typeName.replace('/', '.') << "<\");\n"; sal_uInt16 n = m_reader.getReferenceCount(); for (sal_uInt16 i = 0; i < n; ++i) { out << indent() - << ("the_buffer.append(::rtl::OUStringToOString(" + << ("the_buffer.append(rtl::OUStringToOString(" "::cppu::getTypeFavourChar(static_cast< "); dumpTypeParameterName( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8)); out << " * >(0)).getTypeName(), RTL_TEXTENCODING_UTF8));\n"; if (i != n - 1) { @@ -2859,8 +2856,8 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) { sal_uInt16 fields = m_reader.getFieldCount(); for (sal_uInt16 i = 0; i < fields; ++i) { out << indent(); - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) { out << "::cppu::getTypeFavourChar(static_cast< "; @@ -2901,7 +2898,7 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) { out << "::cppu::UnoType< "; dumpType( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8), false, false, false, true); out << " >::get().getTypeLibType()"; @@ -2950,7 +2947,7 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) << "the_buffer.append(::cppu::getTypeFavourChar(static_cast< "; dumpTypeParameterName( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8)); out << " * >(0)).getTypeName());\n"; if (i != n - 1) { @@ -2969,12 +2966,12 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) << m_typeName.replace('/', '.') << "\" );\n"; } sal_uInt16 fields = m_reader.getFieldCount(); - typedef std::map< rtl::OString, sal_uInt32 > Map; + typedef std::map< OString, sal_uInt32 > Map; Map parameters; Map types; for (sal_uInt16 i = 0; i < fields; ++i) { - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) { if (parameters.insert( @@ -2991,7 +2988,7 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) << "::typelib_TypeClass the_pclass" << n << " = (::typelib_TypeClass) the_ptype" << n << ".getTypeClass();\n" << indent() - << "::rtl::OUString the_pname" << n << "(the_ptype" << n + << "rtl::OUString the_pname" << n << "(the_ptype" << n << ".getTypeName());\n"; } } else if (types.insert( @@ -3013,14 +3010,14 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) // above getCppuType call will make available information about the // resolved type); no extra #include for the resolved type is // needed, as the header for the typedef includes it already: - out << indent() << "::rtl::OUString the_tname" + out << indent() << "rtl::OUString the_tname" << static_cast< sal_uInt32 >(types.size() - 1) << "( \"" << checkRealBaseType(type, true).replace('/', '.') << "\" );\n"; } - out << indent() << "::rtl::OUString the_name" << i + out << indent() << "rtl::OUString the_name" << i << "( \"" - << rtl::OUStringToOString( + << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8).replace( '/', '.') << "\" );\n"; @@ -3029,8 +3026,8 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) inc(); for (sal_uInt16 i = 0; i < fields; ++i) { out << indent() << "{ { "; - rtl::OString type( - rtl::OUStringToOString( + OString type( + OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8)); if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) { sal_uInt32 n = parameters.find(type)->second; @@ -3054,7 +3051,7 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out) out << "::cppu::UnoType< "; dumpType( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8), false, false, false, true); out << " >::get().getTypeLibType()"; @@ -3094,9 +3091,9 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType, if (aSuperReader.isValid()) { - rtl::OString superSuper; + OString superSuper; if (aSuperReader.getSuperTypeCount() >= 1) { - superSuper = rtl::OUStringToOString( + superSuper = OUStringToOString( aSuperReader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } hasMember = dumpSuperMember(o, superSuper, bWithType); @@ -3112,9 +3109,9 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType, if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( aSuperReader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( aSuperReader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (hasMember) @@ -3203,7 +3200,7 @@ void StructureType::dumpTemplateHead(FileStream & out) const { out << "typename "; dumpTypeParameterName( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8)); } out << " > "; @@ -3222,7 +3219,7 @@ void StructureType::dumpTemplateParameters(FileStream & out) const { && m_reader.getReferenceSort(i) == RT_REF_TYPE_PARAMETER); dumpTypeParameterName( out, - rtl::OUStringToOString( + OUStringToOString( m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8)); } out << " >"; @@ -3259,7 +3256,7 @@ void ExceptionType::dumpDeclaration(FileStream& o) OString superType; if (m_reader.getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } if (!superType.isEmpty()) @@ -3289,9 +3286,9 @@ void ExceptionType::dumpDeclaration(FileStream& o) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (superHasMember) @@ -3317,9 +3314,9 @@ void ExceptionType::dumpDeclaration(FileStream& o) if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); o << indent(); @@ -3358,7 +3355,7 @@ sal_Bool ExceptionType::dumpHxxFile( inc(); OString superType; if (m_reader.getSuperTypeCount() >= 1) { - superType = rtl::OUStringToOString( + superType = OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } sal_Bool first = sal_True; @@ -3380,7 +3377,7 @@ sal_Bool ExceptionType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); if (first) @@ -3420,9 +3417,9 @@ sal_Bool ExceptionType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (superHasMember) @@ -3452,7 +3449,7 @@ sal_Bool ExceptionType::dumpHxxFile( if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); if (first) @@ -3486,8 +3483,8 @@ sal_Bool ExceptionType::dumpHxxFile( first = false; } for (sal_uInt16 i = 0; i < fieldCount; ++i) { - rtl::OString name( - rtl::OUStringToOString( + OString name( + OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8)); o << (first ? ": " : ", ") << name << "(the_other." << name << ")"; first = false; @@ -3505,8 +3502,8 @@ sal_Bool ExceptionType::dumpHxxFile( << "::operator =(the_other);\n"; } for (sal_uInt16 i = 0; i < fieldCount; ++i) { - rtl::OString name( - rtl::OUStringToOString( + OString name( + OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8)); o << indent() << name << " = the_other." << name << ";\n"; } @@ -3535,9 +3532,9 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType, if (aSuperReader.isValid()) { - rtl::OString superSuper; + OString superSuper; if (aSuperReader.getSuperTypeCount() >= 1) { - superSuper = rtl::OUStringToOString( + superSuper = OUStringToOString( aSuperReader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8); } hasMember = dumpSuperMember(o, superSuper, bWithType); @@ -3553,9 +3550,9 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType, if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( aSuperReader.getFieldName(i), RTL_TEXTENCODING_UTF8); - fieldType = rtl::OUStringToOString( + fieldType = OUStringToOString( aSuperReader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); if (hasMember) @@ -3620,7 +3617,7 @@ void EnumType::dumpDeclaration(FileStream& o) if (access != RT_ACCESS_CONST) continue; - fieldName = rtl::OUStringToOString( + fieldName = OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); constValue = m_reader.getFieldValue(i); @@ -3669,7 +3666,7 @@ void EnumType::dumpNormalGetCppuType(FileStream& o) inc(31); o << indent() << "\"" << m_typeName.replace('/', '.') << "\",\n" << indent() << scopedCppName(m_typeName) << "_" - << rtl::OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8) + << OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8) << " );\n"; dec(31); dec(); @@ -3697,7 +3694,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "{\n"; inc(); - o << indent() << "::rtl::OUString sTypeName( \"" + o << indent() << "rtl::OUString sTypeName( \"" << m_typeName.replace('/', '.') << "\" );\n\n"; o << indent() << "// Start inline typedescription generation\n" @@ -3708,9 +3705,9 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o) sal_uInt16 i; for (i = 0; i < count; i++) { - o << indent() << "::rtl::OUString sEnumValue" << i + o << indent() << "rtl::OUString sEnumValue" << i << "( \"" - << rtl::OUStringToOString( + << OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8) << "\" );\n"; o << indent() << "enumValueNames[" << i << "] = sEnumValue" << i @@ -3736,7 +3733,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "sTypeName.pData,\n" << indent() << "(sal_Int32)" << scopedCppName(m_typeName, sal_False) << "_" - << rtl::OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8) + << OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8) << ",\n" << indent() << count << ", enumValueNames, enumValues );\n\n"; dec(); @@ -3813,7 +3810,7 @@ void TypeDefType::dumpDeclaration(FileStream& o) o << "\ntypedef "; dumpType( o, - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8)); o << " " << m_name << ";\n\n"; } @@ -3845,7 +3842,7 @@ sal_Bool ConstructiveType::dumpHFile( } bool ConstructiveType::dumpFiles( - CppuOptions * options, rtl::OString const & outPath) + CppuOptions * options, OString const & outPath) { return dumpFile(options, ".hpp", m_typeName, outPath); } @@ -3905,7 +3902,7 @@ sal_Bool ServiceType::dumpHxxFile( for (sal_uInt16 j = 0; j < params; ++j) { if (codemaker::UnoType::getSort( codemaker::UnoType::decompose( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterTypeName( i, j), RTL_TEXTENCODING_UTF8), @@ -3922,7 +3919,7 @@ sal_Bool ServiceType::dumpHxxFile( ++j) { tree.add( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodExceptionTypeName(i, j), RTL_TEXTENCODING_UTF8), m_typeMgr); @@ -3935,9 +3932,9 @@ sal_Bool ServiceType::dumpHxxFile( } } } - rtl::OString cppName(translateUnoToCppIdentifier( + OString cppName(translateUnoToCppIdentifier( m_name, "service", isGlobal())); - rtl::OString headerDefine(dumpHeaderDefine(o, "HPP")); + OString headerDefine(dumpHeaderDefine(o, "HPP")); o << "\n"; includes.dump(o, 0); o << "\n"; @@ -3947,12 +3944,12 @@ sal_Bool ServiceType::dumpHxxFile( o << "\nclass " << cppName << " {\n"; inc(); if (ctors > 0) { - rtl::OString fullName(m_typeName.replace('/', '.')); - rtl::OString baseName( - rtl::OUStringToOString( + OString fullName(m_typeName.replace('/', '.')); + OString baseName( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8)); - rtl::OString fullBaseName(baseName.replace('/', '.')); - rtl::OString scopedBaseName(scopedCppName(baseName)); + OString fullBaseName(baseName.replace('/', '.')); + OString scopedBaseName(scopedCppName(baseName)); o << "public:\n"; for (sal_uInt16 i = 0; i < ctors; ++i) { if (isDefaultConstructor(i)) { @@ -3972,7 +3969,7 @@ sal_Bool ServiceType::dumpHxxFile( << "the_instance = ::com::sun::star::uno::Reference< " << scopedBaseName << (" >(the_context->getServiceManager()->" - "createInstanceWithContext(::rtl::OUString(" + "createInstanceWithContext(rtl::OUString(" " \"") << fullName << "\" ), the_context), ::com::sun::star::uno::UNO_QUERY);\n"; @@ -3988,7 +3985,7 @@ sal_Bool ServiceType::dumpHxxFile( inc(); o << indent() << ("throw ::com::sun::star::uno::DeploymentException(" - "::rtl::OUString( " + "rtl::OUString( " "\"component context fails to supply service ") << fullName << " of type " << fullBaseName << ": \" ) + the_exception.Message, the_context);\n"; @@ -3998,7 +3995,7 @@ sal_Bool ServiceType::dumpHxxFile( inc(); o << indent() << ("throw ::com::sun::star::uno::DeploymentException(" - "::rtl::OUString( " + "rtl::OUString( " "\"component context fails to supply service ") << fullName << " of type " << fullBaseName << "\" ), the_context);\n"; @@ -4010,7 +4007,7 @@ sal_Bool ServiceType::dumpHxxFile( o << indent() << "static ::com::sun::star::uno::Reference< " << scopedBaseName << " > " << translateUnoToCppIdentifier( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8), "method", ITM_NONGLOBAL, &cppName) << ("(::com::sun::star::uno::Reference<" @@ -4020,22 +4017,22 @@ sal_Bool ServiceType::dumpHxxFile( bool rest = hasRestParameter(i); for (sal_uInt16 j = 0; j < params; ++j) { o << ", "; - rtl::OStringBuffer buf; + OStringBuffer buf; if ((m_reader.getMethodParameterFlags(i, j) & RT_PARAM_REST) != 0) { buf.append("[]"); } buf.append( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterTypeName(i, j), RTL_TEXTENCODING_UTF8)); - rtl::OString type(buf.makeStringAndClear()); + OString type(buf.makeStringAndClear()); bool byRef = passByReference(type); dumpType(o, type, byRef, byRef); o << " " << translateUnoToCppIdentifier( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8), "param", ITM_NONGLOBAL); @@ -4050,16 +4047,16 @@ sal_Bool ServiceType::dumpHxxFile( << params << ");\n"; for (sal_uInt16 j = 0; j < params; ++j) { o << indent() << "the_arguments[" << j << "] "; - rtl::OString param( + OString param( translateUnoToCppIdentifier( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8), "param", ITM_NONGLOBAL)); sal_Int32 rank; if (codemaker::UnoType::getSort( codemaker::UnoType::decompose( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterTypeName( i, j), RTL_TEXTENCODING_UTF8), @@ -4088,7 +4085,7 @@ sal_Bool ServiceType::dumpHxxFile( sal_uInt16 exceptions = m_reader.getMethodExceptionCount(i); for (sal_uInt16 j = 0; j < exceptions; ++j) { tree.add( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodExceptionTypeName(i, j), RTL_TEXTENCODING_UTF8), m_typeMgr); @@ -4101,12 +4098,12 @@ sal_Bool ServiceType::dumpHxxFile( << "the_instance = ::com::sun::star::uno::Reference< " << scopedBaseName << (" >(the_context->getServiceManager()->" - "createInstanceWithArgumentsAndContext(::rtl::OUString(" + "createInstanceWithArgumentsAndContext(rtl::OUString(" " \"") << fullName << "\" ), "; if (rest) { o << translateUnoToCppIdentifier( - rtl::OUStringToOString( + OUStringToOString( m_reader.getMethodParameterName(i, 0), RTL_TEXTENCODING_UTF8), "param", ITM_NONGLOBAL); @@ -4132,7 +4129,7 @@ sal_Bool ServiceType::dumpHxxFile( inc(); o << indent() << ("throw ::com::sun::star::uno::DeploymentException(" - "::rtl::OUString( " + "rtl::OUString( " "\"component context fails to supply service ") << fullName << " of type " << fullBaseName << ": \" ) + the_exception.Message, the_context);\n"; @@ -4143,7 +4140,7 @@ sal_Bool ServiceType::dumpHxxFile( inc(); o << indent() << ("throw ::com::sun::star::uno::DeploymentException(" - "::rtl::OUString( " + "rtl::OUString( " "\"component context fails to supply service ") << fullName << " of type " << fullBaseName << "\" ), the_context);\n"; @@ -4172,7 +4169,7 @@ void ServiceType::addSpecialDependencies() { if (m_reader.getMethodCount() > 0) { OSL_ASSERT(m_reader.getSuperTypeCount() == 1); m_dependencies.add( - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8)); } } @@ -4213,7 +4210,7 @@ void ServiceType::dumpCatchClauses( bool SingletonType::isInterfaceBased() { return (m_typeMgr->getTypeClass( - rtl::OUStringToOString( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8))) == RT_TYPE_INTERFACE; } @@ -4222,15 +4219,15 @@ sal_Bool SingletonType::dumpHxxFile( FileStream & o, codemaker::cppumaker::Includes & includes) throw (CannotDumpException) { - rtl::OString cppName(translateUnoToCppIdentifier( + OString cppName(translateUnoToCppIdentifier( m_name, "singleton", isGlobal())); - rtl::OString fullName(m_typeName.replace('/', '.')); - rtl::OString baseName( - rtl::OUStringToOString( + OString fullName(m_typeName.replace('/', '.')); + OString baseName( + OUStringToOString( m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8)); - rtl::OString fullBaseName(baseName.replace('/', '.')); - rtl::OString scopedBaseName(scopedCppName(baseName)); - rtl::OString headerDefine(dumpHeaderDefine(o, "HPP")); + OString fullBaseName(baseName.replace('/', '.')); + OString scopedBaseName(scopedCppName(baseName)); + OString headerDefine(dumpHeaderDefine(o, "HPP")); o << "\n"; //TODO: Decide whether the types added to includes should rather be added to // m_dependencies (and thus be generated during dumpDependedTypes): @@ -4259,12 +4256,12 @@ sal_Bool SingletonType::dumpHxxFile( << "::com::sun::star::uno::Reference< " << scopedBaseName << " > instance;\n" << indent() << ("if (!(the_context->getValueByName(" - "::rtl::OUString( \"/singletons/") + "rtl::OUString( \"/singletons/") << fullName << "\" )) >>= instance) || !instance.is()) {\n"; inc(); o << indent() << ("throw ::com::sun::star::uno::DeploymentException(" - "::rtl::OUString( \"component context" + "rtl::OUString( \"component context" " fails to supply singleton ") << fullName << " of type " << fullBaseName << "\" ), the_context);\n"; dec(); diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx index 09d0e5130ffa..9d92a014b8bd 100644 --- a/codemaker/source/cppumaker/cpputype.hxx +++ b/codemaker/source/cppumaker/cpputype.hxx @@ -29,7 +29,6 @@ #include "rtl/ref.hxx" #include "rtl/string.hxx" -namespace rtl { class OUString; } namespace codemaker { namespace cppumaker { class Includes; } struct ExceptionTreeNode; @@ -50,23 +49,23 @@ class CppuType { public: CppuType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~CppuType(); virtual sal_Bool dump(CppuOptions* pOptions) throw( CannotDumpException ); sal_Bool dumpFile(CppuOptions* pOptions, - const ::rtl::OString& sExtension, - const ::rtl::OString& sName, - const ::rtl::OString& sOutPath ) + const OString& sExtension, + const OString& sName, + const OString& sOutPath ) throw( CannotDumpException ); void dumpDependedTypes( codemaker::GeneratedTypeSet & generated, CppuOptions * options); virtual sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ) = 0; virtual sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ) = 0; - ::rtl::OString dumpHeaderDefine( + OString dumpHeaderDefine( FileStream& o, char const * prefix, sal_Bool bExtended=sal_False); void dumpGetCppuType(FileStream & out); @@ -74,13 +73,13 @@ public: virtual void dumpNormalGetCppuType(FileStream& o); virtual void dumpComprehensiveGetCppuType(FileStream& o); - virtual void dumpType(FileStream& o, const ::rtl::OString& type, bool bConst=false, + virtual void dumpType(FileStream& o, const OString& type, bool bConst=false, bool bRef=false, bool bNative=false, bool cppuUnoType=false) const throw( CannotDumpException ); - ::rtl::OString getTypeClass(const ::rtl::OString& type="", sal_Bool bCStyle=sal_False); - void dumpCppuGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, CppuTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES); + OString getTypeClass(const OString& type="", sal_Bool bCStyle=sal_False); + void dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDecl=sal_False, CppuTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES); - ::rtl::OString typeToIdentifier(const ::rtl::OString& type); + OString typeToIdentifier(const OString& type); void dumpConstantValue(FileStream& o, sal_uInt16 index); @@ -89,15 +88,15 @@ public: void inc(sal_Int32 num=4); void dec(sal_Int32 num=4); - ::rtl::OString indent() const; + OString indent() const; protected: virtual sal_uInt32 checkInheritedMemberCount( const typereg::Reader* pReader); - bool passByReference(rtl::OString const & unoType); + bool passByReference(OString const & unoType); - ::rtl::OString resolveTypedefs(const ::rtl::OString& type) const; - ::rtl::OString checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False) const; + OString resolveTypedefs(const OString& type) const; + OString checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly = sal_False) const; void dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag); codemaker::cpp::IdentifierTranslationMode isGlobal() const; @@ -106,7 +105,7 @@ protected: virtual void addSpecialDependencies() {} - virtual bool dumpFiles(CppuOptions * options, rtl::OString const & outPath); + virtual bool dumpFiles(CppuOptions * options, OString const & outPath); virtual void addLightGetCppuTypeIncludes( codemaker::cppumaker::Includes & includes) const; @@ -131,7 +130,7 @@ protected: void addDefaultHxxIncludes(codemaker::cppumaker::Includes & includes) const; void dumpInitializer( - FileStream & out, bool parameterized, rtl::OUString const & type) const; + FileStream & out, bool parameterized, OUString const & type) const; void dumpHFileContent( FileStream & out, codemaker::cppumaker::Includes & includes); @@ -142,8 +141,8 @@ protected: bool m_cppuTypeLeak; bool m_cppuTypeDynamic; sal_Int32 m_indentLength; - ::rtl::OString m_typeName; - ::rtl::OString m_name; + OString m_typeName; + OString m_name; typereg::Reader m_reader; rtl::Reference< TypeManager > m_typeMgr; codemaker::Dependencies m_dependencies; @@ -157,7 +156,7 @@ class InterfaceType : public CppuType { public: InterfaceType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~InterfaceType(); @@ -199,18 +198,18 @@ private: FileStream & out, sal_uInt32 methodIndex, bool runtimeException); void dumpAttributeExceptionSpecification( - FileStream & out, rtl::OUString const & name, RTMethodMode sort); + FileStream & out, OUString const & name, RTMethodMode sort); void dumpExceptionTypeName( FileStream & out, char const * prefix, sal_uInt32 index, - rtl::OUString name); + OUString name); sal_Int32 dumpExceptionTypeNames( FileStream & out, char const * prefix, sal_uInt16 methodIndex, bool runtimeException); sal_Int32 dumpAttributeExceptionTypeNames( - FileStream & out, char const * prefix, rtl::OUString const & name, + FileStream & out, char const * prefix, OUString const & name, RTMethodMode sort); }; @@ -218,7 +217,7 @@ class ConstantsType : public CppuType { public: ConstantsType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~ConstantsType(); @@ -235,20 +234,20 @@ class ModuleType : public ConstantsType { public: ModuleType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~ModuleType(); protected: - virtual bool dumpFiles(CppuOptions * options, rtl::OString const & outPath); + virtual bool dumpFiles(CppuOptions * options, OString const & outPath); }; class StructureType : public CppuType { public: StructureType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~StructureType(); @@ -263,7 +262,7 @@ public: virtual void dumpComprehensiveGetCppuType(FileStream & out); - sal_Bool dumpSuperMember(FileStream& o, const ::rtl::OString& super, sal_Bool bWithType); + sal_Bool dumpSuperMember(FileStream& o, const OString& super, sal_Bool bWithType); protected: virtual void addLightGetCppuTypeIncludes( @@ -286,7 +285,7 @@ class ExceptionType : public CppuType { public: ExceptionType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~ExceptionType(); @@ -295,14 +294,14 @@ public: sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); - sal_Bool dumpSuperMember(FileStream& o, const ::rtl::OString& super, sal_Bool bWithType); + sal_Bool dumpSuperMember(FileStream& o, const OString& super, sal_Bool bWithType); }; class EnumType : public CppuType { public: EnumType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~EnumType(); @@ -319,7 +318,7 @@ class TypeDefType : public CppuType { public: TypeDefType(typereg::Reader& typeReader, - const ::rtl::OString& typeName, + const OString& typeName, rtl::Reference< TypeManager > const & typeMgr); virtual ~TypeDefType(); @@ -332,7 +331,7 @@ public: class ConstructiveType: public CppuType { public: ConstructiveType( - typereg::Reader & reader, rtl::OString const & name, + typereg::Reader & reader, OString const & name, rtl::Reference< TypeManager > const & manager): CppuType(reader, name, manager) {} @@ -341,13 +340,13 @@ public: throw (CannotDumpException); protected: - virtual bool dumpFiles(CppuOptions * options, rtl::OString const & outPath); + virtual bool dumpFiles(CppuOptions * options, OString const & outPath); }; class ServiceType: public ConstructiveType { public: ServiceType( - typereg::Reader & reader, rtl::OString const & name, + typereg::Reader & reader, OString const & name, rtl::Reference< TypeManager > const & manager): ConstructiveType(reader, name, manager) {} @@ -371,7 +370,7 @@ private: class SingletonType: public ConstructiveType { public: SingletonType( - typereg::Reader & reader, rtl::OString const & name, + typereg::Reader & reader, OString const & name, rtl::Reference< TypeManager > const & manager): ConstructiveType(reader, name, manager) {} @@ -382,7 +381,7 @@ public: throw (CannotDumpException); }; -bool produceType(const ::rtl::OString& typeName, +bool produceType(const OString& typeName, rtl::Reference< TypeManager > const & typeMgr, codemaker::GeneratedTypeSet & generated, CppuOptions* pOptions) diff --git a/codemaker/source/cppumaker/dumputils.cxx b/codemaker/source/cppumaker/dumputils.cxx index a92aaf5ecc5e..bc1781314789 100644 --- a/codemaker/source/cppumaker/dumputils.cxx +++ b/codemaker/source/cppumaker/dumputils.cxx @@ -30,13 +30,13 @@ namespace codemaker { namespace cppumaker { bool dumpNamespaceOpen( - FileStream & out, rtl::OString const & registryType, bool fullModuleType) + FileStream & out, OString const & registryType, bool fullModuleType) { bool output = false; if (registryType != "/") { bool first = true; for (sal_Int32 i = 0; i >= 0;) { - rtl::OString id(registryType.getToken(0, '/', i)); + OString id(registryType.getToken(0, '/', i)); if (fullModuleType || i >= 0) { if (!first) { out << " "; @@ -51,7 +51,7 @@ bool dumpNamespaceOpen( } bool dumpNamespaceClose( - FileStream & out, rtl::OString const & registryType, bool fullModuleType) + FileStream & out, OString const & registryType, bool fullModuleType) { bool output = false; if (registryType != "/") { @@ -74,7 +74,7 @@ bool dumpNamespaceClose( return output; } -void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType) { +void dumpTypeIdentifier(FileStream & out, OString const & registryType) { out << registryType.copy(registryType.lastIndexOf('/') + 1); } diff --git a/codemaker/source/cppumaker/dumputils.hxx b/codemaker/source/cppumaker/dumputils.hxx index 5705d6a1abea..855e412534de 100644 --- a/codemaker/source/cppumaker/dumputils.hxx +++ b/codemaker/source/cppumaker/dumputils.hxx @@ -20,18 +20,19 @@ #ifndef INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_DUMPUTILS_HXX #define INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_DUMPUTILS_HXX -namespace rtl { class OString; } +#include <rtl/ustring.hxx> + class FileStream; namespace codemaker { namespace cppumaker { bool dumpNamespaceOpen( - FileStream & out, rtl::OString const & registryType, bool fullModuleType); + FileStream & out, OString const & registryType, bool fullModuleType); bool dumpNamespaceClose( - FileStream & out, rtl::OString const & registryType, bool fullModuleType); + FileStream & out, OString const & registryType, bool fullModuleType); -void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType); +void dumpTypeIdentifier(FileStream & out, OString const & registryType); } } diff --git a/codemaker/source/cppumaker/includes.cxx b/codemaker/source/cppumaker/includes.cxx index 0b0f83b869b7..34f23e954bf1 100644 --- a/codemaker/source/cppumaker/includes.cxx +++ b/codemaker/source/cppumaker/includes.cxx @@ -68,10 +68,10 @@ Includes::Includes( Includes::~Includes() {} -void Includes::add(rtl::OString const & registryType) { +void Includes::add(OString const & registryType) { sal_Int32 rank; - std::vector< rtl::OString > args; - rtl::OString type( + std::vector< OString > args; + OString type( codemaker::UnoType::decompose(registryType, &rank, &args)); if (rank > 0) { m_includeSequence = true; @@ -119,7 +119,7 @@ void Includes::add(rtl::OString const & registryType) { m_map.insert( codemaker::Dependencies::Map::value_type( type, codemaker::Dependencies::KIND_NO_BASE)); - for (std::vector< rtl::OString >::iterator i(args.begin()); + for (std::vector< OString >::iterator i(args.begin()); i != args.end(); ++i) { add(*i); @@ -144,7 +144,7 @@ void dumpEmptyLineBeforeFirst(FileStream & out, bool * first) { } -void Includes::dump(FileStream & out, rtl::OString const * companionHdl) { +void Includes::dump(FileStream & out, OString const * companionHdl) { OSL_ASSERT(companionHdl == 0 || m_hpp); if (!m_includeReference) { for (codemaker::Dependencies::Map::iterator i(m_map.begin()); @@ -264,8 +264,8 @@ void Includes::dump(FileStream & out, rtl::OString const * companionHdl) { } void Includes::dumpInclude( - FileStream & out, rtl::OString const & registryType, bool hpp, - rtl::OString const & suffix) + FileStream & out, OString const & registryType, bool hpp, + OString const & suffix) { static char const * extension[2] = { "hdl", "hpp" }; out << "#include \"" << registryType; @@ -275,7 +275,7 @@ void Includes::dumpInclude( out << "." << extension[hpp] << "\"\n"; } -bool Includes::isInterfaceType(rtl::OString const & registryType) const { +bool Includes::isInterfaceType(OString const & registryType) const { return m_manager->getTypeClass(registryType) == RT_TYPE_INTERFACE; } diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx index 8fdf44589844..80b842cd09d9 100644 --- a/codemaker/source/cppumaker/includes.hxx +++ b/codemaker/source/cppumaker/includes.hxx @@ -37,7 +37,7 @@ public: ~Includes(); - void add(rtl::OString const & registryType); + void add(OString const & registryType); void addCassert() { m_includeCassert = true; } void addAny() { m_includeAny = true; } void addReference() { m_includeReference = true; } @@ -59,17 +59,17 @@ public: void addTypelibTypeclassH() { m_includeTypelibTypeclassH = true; } void addTypelibTypedescriptionH() { m_includeTypelibTypedescriptionH = true; } - void dump(FileStream & out, rtl::OString const * companionHdl); + void dump(FileStream & out, OString const * companionHdl); static void dumpInclude( - FileStream & out, rtl::OString const & registryType, bool hpp, - rtl::OString const & suffix = rtl::OString()); + FileStream & out, OString const & registryType, bool hpp, + OString const & suffix = OString()); private: Includes(Includes &); // not implemented void operator =(Includes); // not implemented; - bool isInterfaceType(rtl::OString const & registryType) const; + bool isInterfaceType(OString const & registryType) const; rtl::Reference< TypeManager > m_manager; codemaker::Dependencies::Map m_map; diff --git a/codemaker/source/javamaker/classfile.cxx b/codemaker/source/javamaker/classfile.cxx index 0f115b20b4bf..c427e96952ae 100644 --- a/codemaker/source/javamaker/classfile.cxx +++ b/codemaker/source/javamaker/classfile.cxx @@ -121,7 +121,7 @@ void ClassFile::Code::instrAconstNull() { appendU1(m_code, 0x01); } -void ClassFile::Code::instrAnewarray(rtl::OString const & type) { +void ClassFile::Code::instrAnewarray(OString const & type) { // anewarray <indexbyte1> <indexbyte2>: appendU1(m_code, 0xBD); appendU2(m_code, m_classFile.addClassInfo(type)); @@ -137,7 +137,7 @@ void ClassFile::Code::instrAthrow() { appendU1(m_code, 0xBF); } -void ClassFile::Code::instrCheckcast(rtl::OString const & type) { +void ClassFile::Code::instrCheckcast(OString const & type) { // checkcast <indexbyte1> <indexbyte2>: appendU1(m_code, 0xC0); appendU2(m_code, m_classFile.addClassInfo(type)); @@ -149,8 +149,8 @@ void ClassFile::Code::instrDup() { } void ClassFile::Code::instrGetstatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // getstatic <indexbyte1> <indexbyte2>: appendU1(m_code, 0xB2); @@ -181,15 +181,15 @@ ClassFile::Code::Branch ClassFile::Code::instrIfnull() { return branch; } -void ClassFile::Code::instrInstanceof(rtl::OString const & type) { +void ClassFile::Code::instrInstanceof(OString const & type) { // instanceof <indexbyte1> <indexbyte2>: appendU1(m_code, 0xC1); appendU2(m_code, m_classFile.addClassInfo(type)); } void ClassFile::Code::instrInvokeinterface( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor, sal_uInt8 args) + OString const & type, OString const & name, + OString const & descriptor, sal_uInt8 args) { // invokeinterface <indexbyte1> <indexbyte2> <nargs> 0: appendU1(m_code, 0xB9); @@ -200,8 +200,8 @@ void ClassFile::Code::instrInvokeinterface( } void ClassFile::Code::instrInvokespecial( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // invokespecial <indexbyte1> <indexbyte2>: appendU1(m_code, 0xB7); @@ -209,8 +209,8 @@ void ClassFile::Code::instrInvokespecial( } void ClassFile::Code::instrInvokestatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // invokestatic <indexbyte1> <indexbyte2>: appendU1(m_code, 0xB8); @@ -218,8 +218,8 @@ void ClassFile::Code::instrInvokestatic( } void ClassFile::Code::instrInvokevirtual( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // invokevirtual <indexbyte1> <indexbyte2>: appendU1(m_code, 0xB6); @@ -265,7 +265,7 @@ void ClassFile::Code::instrLookupswitch( } } -void ClassFile::Code::instrNew(rtl::OString const & type) { +void ClassFile::Code::instrNew(OString const & type) { // new <indexbyte1> <indexbyte2>: appendU1(m_code, 0xBB); appendU2(m_code, m_classFile.addClassInfo(type)); @@ -288,8 +288,8 @@ void ClassFile::Code::instrPop() { } void ClassFile::Code::instrPutfield( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // putfield <indexbyte1> <indexbyte2>: appendU1(m_code, 0xB5); @@ -297,8 +297,8 @@ void ClassFile::Code::instrPutfield( } void ClassFile::Code::instrPutstatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { // putstatic <indexbyte1> <indexbyte2>: appendU1(m_code, 0xB3); @@ -374,7 +374,7 @@ void ClassFile::Code::loadIntegerConstant(sal_Int32 value) { } } -void ClassFile::Code::loadStringConstant(rtl::OString const & value) { +void ClassFile::Code::loadStringConstant(OString const & value) { ldc(m_classFile.addStringInfo(value)); } @@ -411,7 +411,7 @@ void ClassFile::Code::branchHere(Branch branch) { } void ClassFile::Code::addException( - Position start, Position end, Position handler, rtl::OString const & type) + Position start, Position end, Position handler, OString const & type) { OSL_ASSERT(start < end && end <= m_code.size() && handler <= m_code.size()); if (m_exceptionTableLength == SAL_MAX_UINT16) { @@ -466,8 +466,8 @@ void ClassFile::Code::accessLocal( } ClassFile::ClassFile( - AccessFlags accessFlags, rtl::OString const & thisClass, - rtl::OString const & superClass, rtl::OString const & signature): + AccessFlags accessFlags, OString const & thisClass, + OString const & superClass, OString const & signature): m_constantPoolCount(1), m_accessFlags(accessFlags), m_interfacesCount(0), m_fieldsCount(0), m_methodsCount(0), m_attributesCount(0) { @@ -555,7 +555,7 @@ sal_uInt16 ClassFile::addDoubleInfo(double value) { return index; } -void ClassFile::addInterface(rtl::OString const & interface) { +void ClassFile::addInterface(OString const & interface) { if (m_interfacesCount == SAL_MAX_UINT16) { throw CannotDumpException("Too many interfaces for Java class file format"); } @@ -564,9 +564,9 @@ void ClassFile::addInterface(rtl::OString const & interface) { } void ClassFile::addField( - AccessFlags accessFlags, rtl::OString const & name, - rtl::OString const & descriptor, sal_uInt16 constantValueIndex, - rtl::OString const & signature) + AccessFlags accessFlags, OString const & name, + OString const & descriptor, sal_uInt16 constantValueIndex, + OString const & signature) { if (m_fieldsCount == SAL_MAX_UINT16) { throw CannotDumpException("Too many fields for Java class file format"); @@ -588,10 +588,10 @@ void ClassFile::addField( } void ClassFile::addMethod( - AccessFlags accessFlags, rtl::OString const & name, - rtl::OString const & descriptor, Code const * code, - std::vector< rtl::OString > const & exceptions, - rtl::OString const & signature) + AccessFlags accessFlags, OString const & name, + OString const & descriptor, Code const * code, + std::vector< OString > const & exceptions, + OString const & signature) { if (m_methodsCount == SAL_MAX_UINT16) { throw CannotDumpException("Too many methods for Java class file format"); @@ -600,7 +600,7 @@ void ClassFile::addMethod( appendU2(m_methods, static_cast< sal_uInt16 >(accessFlags)); appendU2(m_methods, addUtf8Info(name)); appendU2(m_methods, addUtf8Info(descriptor)); - std::vector< rtl::OString >::size_type excs = exceptions.size(); + std::vector< OString >::size_type excs = exceptions.size(); if (excs > SAL_MAX_UINT16) { throw CannotDumpException("Too many exception specifications for Java class file format"); } @@ -638,7 +638,7 @@ void ClassFile::addMethod( m_methods, static_cast< sal_uInt32 >(2 + 2 * static_cast< sal_uInt32 >(excs))); appendU2(m_methods, static_cast< sal_uInt16 >(excs)); - for (std::vector< rtl::OString >::const_iterator i(exceptions.begin()); + for (std::vector< OString >::const_iterator i(exceptions.begin()); i != exceptions.end(); ++i) { appendU2(m_methods, addClassInfo(*i)); @@ -676,8 +676,8 @@ sal_uInt16 ClassFile::nextConstantPoolIndex(sal_uInt16 width) { return index; } -sal_uInt16 ClassFile::addUtf8Info(rtl::OString const & value) { - std::map< rtl::OString, sal_uInt16 >::iterator i(m_utf8Infos.find(value)); +sal_uInt16 ClassFile::addUtf8Info(OString const & value) { + std::map< OString, sal_uInt16 >::iterator i(m_utf8Infos.find(value)); if (i != m_utf8Infos.end()) { return i->second; } @@ -691,7 +691,7 @@ sal_uInt16 ClassFile::addUtf8Info(rtl::OString const & value) { appendU1(m_constantPool, static_cast< sal_uInt8 >(value[j])); } if (!m_utf8Infos.insert( - std::map< rtl::OString, sal_uInt16 >::value_type(value, index)). + std::map< OString, sal_uInt16 >::value_type(value, index)). second) { OSL_ASSERT(false); @@ -699,7 +699,7 @@ sal_uInt16 ClassFile::addUtf8Info(rtl::OString const & value) { return index; } -sal_uInt16 ClassFile::addClassInfo(rtl::OString const & type) { +sal_uInt16 ClassFile::addClassInfo(OString const & type) { sal_uInt16 nameIndex = addUtf8Info(type); std::map< sal_uInt16, sal_uInt16 >::iterator i( m_classInfos.find(nameIndex)); @@ -718,7 +718,7 @@ sal_uInt16 ClassFile::addClassInfo(rtl::OString const & type) { return index; } -sal_uInt16 ClassFile::addStringInfo(rtl::OString const & value) { +sal_uInt16 ClassFile::addStringInfo(OString const & value) { sal_uInt16 stringIndex = addUtf8Info(value); std::map< sal_uInt16, sal_uInt16 >::iterator i( m_stringInfos.find(stringIndex)); @@ -738,8 +738,8 @@ sal_uInt16 ClassFile::addStringInfo(rtl::OString const & value) { } sal_uInt16 ClassFile::addFieldrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { sal_uInt16 classIndex = addClassInfo(type); sal_uInt16 nameAndTypeIndex = addNameAndTypeInfo(name, descriptor); @@ -762,8 +762,8 @@ sal_uInt16 ClassFile::addFieldrefInfo( } sal_uInt16 ClassFile::addMethodrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { sal_uInt16 classIndex = addClassInfo(type); sal_uInt16 nameAndTypeIndex = addNameAndTypeInfo(name, descriptor); @@ -786,8 +786,8 @@ sal_uInt16 ClassFile::addMethodrefInfo( } sal_uInt16 ClassFile::addInterfaceMethodrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor) + OString const & type, OString const & name, + OString const & descriptor) { sal_uInt16 classIndex = addClassInfo(type); sal_uInt16 nameAndTypeIndex = addNameAndTypeInfo(name, descriptor); @@ -811,7 +811,7 @@ sal_uInt16 ClassFile::addInterfaceMethodrefInfo( } sal_uInt16 ClassFile::addNameAndTypeInfo( - rtl::OString const & name, rtl::OString const & descriptor) + OString const & name, OString const & descriptor) { sal_uInt16 nameIndex = addUtf8Info(name); sal_uInt16 descriptorIndex = addUtf8Info(descriptor); @@ -835,7 +835,7 @@ sal_uInt16 ClassFile::addNameAndTypeInfo( } void ClassFile::appendSignatureAttribute( - std::vector< unsigned char > & stream, rtl::OString const & signature) + std::vector< unsigned char > & stream, OString const & signature) { if (!signature.isEmpty()) { appendU2(stream, addUtf8Info("Signature")); diff --git a/codemaker/source/javamaker/classfile.hxx b/codemaker/source/javamaker/classfile.hxx index 18913c22ebb2..488660b7a175 100644 --- a/codemaker/source/javamaker/classfile.hxx +++ b/codemaker/source/javamaker/classfile.hxx @@ -29,7 +29,6 @@ #include <vector> class FileStream; -namespace rtl { class OString; } namespace codemaker { namespace javamaker { @@ -56,53 +55,53 @@ public: void instrAastore(); void instrAconstNull(); - void instrAnewarray(rtl::OString const & type); + void instrAnewarray(OString const & type); void instrAreturn(); void instrAthrow(); - void instrCheckcast(rtl::OString const & type); + void instrCheckcast(OString const & type); void instrDup(); void instrGetstatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); Branch instrIfAcmpne(); Branch instrIfeq(); Branch instrIfnull(); - void instrInstanceof(rtl::OString const & type); + void instrInstanceof(OString const & type); void instrInvokeinterface( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor, sal_uInt8 args); + OString const & type, OString const & name, + OString const & descriptor, sal_uInt8 args); void instrInvokespecial( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); void instrInvokestatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); void instrInvokevirtual( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); void instrLookupswitch( Code const * defaultBlock, std::list< std::pair< sal_Int32, Code * > > const & blocks); - void instrNew(rtl::OString const & type); + void instrNew(OString const & type); void instrNewarray(codemaker::UnoType::Sort sort); void instrPop(); void instrPutfield( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); void instrPutstatic( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); void instrReturn(); void instrSwap(); @@ -112,7 +111,7 @@ public: std::list< Code * > const & blocks); void loadIntegerConstant(sal_Int32 value); - void loadStringConstant(rtl::OString const & value); + void loadStringConstant(OString const & value); void loadLocalInteger(sal_uInt16 index); void loadLocalLong(sal_uInt16 index); void loadLocalFloat(sal_uInt16 index); @@ -123,7 +122,7 @@ public: void addException( Position start, Position end, Position handler, - rtl::OString const & type); + OString const & type); void setMaxStackAndLocals(sal_uInt16 maxStack, sal_uInt16 maxLocals) { m_maxStack = maxStack; m_maxLocals = maxLocals; } @@ -152,8 +151,8 @@ public: }; ClassFile( - AccessFlags accessFlags, rtl::OString const & thisClass, - rtl::OString const & superClass, rtl::OString const & signature); + AccessFlags accessFlags, OString const & thisClass, + OString const & superClass, OString const & signature); ~ClassFile(); @@ -164,53 +163,53 @@ public: sal_uInt16 addLongInfo(sal_Int64 value); sal_uInt16 addDoubleInfo(double value); - void addInterface(rtl::OString const & interface); + void addInterface(OString const & interface); void addField( - AccessFlags accessFlags, rtl::OString const & name, - rtl::OString const & descriptor, sal_uInt16 constantValueIndex, - rtl::OString const & signature); + AccessFlags accessFlags, OString const & name, + OString const & descriptor, sal_uInt16 constantValueIndex, + OString const & signature); void addMethod( - AccessFlags accessFlags, rtl::OString const & name, - rtl::OString const & descriptor, Code const * code, - std::vector< rtl::OString > const & exceptions, - rtl::OString const & signature); + AccessFlags accessFlags, OString const & name, + OString const & descriptor, Code const * code, + std::vector< OString > const & exceptions, + OString const & signature); void write(FileStream & file) const; //TODO private: - typedef std::map< rtl::OString, sal_uInt16 > Map; + typedef std::map< OString, sal_uInt16 > Map; ClassFile(ClassFile &); // not implemented void operator =(ClassFile); // not implemented sal_uInt16 nextConstantPoolIndex(sal_uInt16 width); - sal_uInt16 addUtf8Info(rtl::OString const & value); - sal_uInt16 addClassInfo(rtl::OString const & type); - sal_uInt16 addStringInfo(rtl::OString const & value); + sal_uInt16 addUtf8Info(OString const & value); + sal_uInt16 addClassInfo(OString const & type); + sal_uInt16 addStringInfo(OString const & value); sal_uInt16 addFieldrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); sal_uInt16 addMethodrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); sal_uInt16 addInterfaceMethodrefInfo( - rtl::OString const & type, rtl::OString const & name, - rtl::OString const & descriptor); + OString const & type, OString const & name, + OString const & descriptor); sal_uInt16 addNameAndTypeInfo( - rtl::OString const & name, rtl::OString const & descriptor); + OString const & name, OString const & descriptor); void appendSignatureAttribute( - std::vector< unsigned char > & stream, rtl::OString const & signature); + std::vector< unsigned char > & stream, OString const & signature); sal_uInt16 m_constantPoolCount; std::vector< unsigned char > m_constantPool; - std::map< rtl::OString, sal_uInt16 > m_utf8Infos; + std::map< OString, sal_uInt16 > m_utf8Infos; std::map< sal_Int32, sal_uInt16 > m_integerInfos; std::map< sal_Int64, sal_uInt16 > m_longInfos; std::map< float, sal_uInt16 > m_floatInfos; diff --git a/codemaker/source/javamaker/javamaker.cxx b/codemaker/source/javamaker/javamaker.cxx index 549913f9177c..912285ab2f6e 100644 --- a/codemaker/source/javamaker/javamaker.cxx +++ b/codemaker/source/javamaker/javamaker.cxx @@ -28,8 +28,6 @@ #include "javaoptions.hxx" #include "javatype.hxx" -using ::rtl::OUString; -using ::rtl::OString; sal_Bool produceAllTypes(RegistryKey& rTypeKey, sal_Bool bIsExtraType, rtl::Reference< TypeManager > const & typeMgr, codemaker::GeneratedTypeSet & generated, diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx index addb793a5fa5..fa90256834c3 100644 --- a/codemaker/source/javamaker/javaoptions.cxx +++ b/codemaker/source/javamaker/javaoptions.cxx @@ -23,9 +23,6 @@ #include "osl/process.h" #include "osl/thread.h" -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OUStringToOString; #ifdef SAL_UNX #define SEPARATOR '/' diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx index 618e3c2db014..128ebbcd4d6e 100644 --- a/codemaker/source/javamaker/javaoptions.hxx +++ b/codemaker/source/javamaker/javaoptions.hxx @@ -33,9 +33,9 @@ public: sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ); - ::rtl::OString prepareHelp(); + OString prepareHelp(); - ::rtl::OString prepareVersion(); + OString prepareVersion(); protected: }; diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index 61366192a04f..77d3042ac8da 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -59,8 +59,8 @@ namespace { // helper function for createUnoName void appendUnoName( - rtl::Reference< TypeManager > const & manager, rtl::OString const & nucleus, sal_Int32 rank, - std::vector< rtl::OString > const & arguments, rtl::OStringBuffer * buffer) + rtl::Reference< TypeManager > const & manager, OString const & nucleus, sal_Int32 rank, + std::vector< OString > const & arguments, OStringBuffer * buffer) { OSL_ASSERT(rank >= 0 && buffer != 0); for (sal_Int32 i = 0; i < rank; ++i) { @@ -69,16 +69,16 @@ void appendUnoName( buffer->append(nucleus.replace('/', '.')); if (!arguments.empty()) { buffer->append('<'); - for (std::vector< rtl::OString >::const_iterator i(arguments.begin()); + for (std::vector< OString >::const_iterator i(arguments.begin()); i != arguments.end(); ++i) { if (i != arguments.begin()) { buffer->append(','); } RTTypeClass argTypeClass; - rtl::OString argNucleus; + OString argNucleus; sal_Int32 argRank; - std::vector< rtl::OString > argArgs; + std::vector< OString > argArgs; codemaker::decomposeAndResolve( manager, *i, true, false, false, &argTypeClass, &argNucleus, &argRank, &argArgs); @@ -91,11 +91,11 @@ void appendUnoName( // Translate the name of a UNO type registry entity (enum type, plain struct // type, polymorphic struct type template, or interface type, decomposed into // nucleus, rank, and arguments) into a core UNO type name: -rtl::OString createUnoName( - rtl::Reference< TypeManager > const & manager, rtl::OString const & nucleus, sal_Int32 rank, - std::vector< rtl::OString > const & arguments) +OString createUnoName( + rtl::Reference< TypeManager > const & manager, OString const & nucleus, sal_Int32 rank, + std::vector< OString > const & arguments) { - rtl::OStringBuffer buf; + OStringBuffer buf; appendUnoName(manager, nucleus, rank, arguments, &buf); return buf.makeStringAndClear(); } @@ -109,7 +109,7 @@ rtl::OString createUnoName( constant groupds, single-interface--based services, accumulation-based services, interface-based singletons, and service-based singletons. */ -typedef std::set< rtl::OString > Dependencies; +typedef std::set< OString > Dependencies; enum SpecialType { SPECIAL_TYPE_NONE, @@ -122,8 +122,8 @@ bool isSpecialType(SpecialType special) { return special >= SPECIAL_TYPE_UNSIGNED; } -rtl::OString translateUnoTypeToJavaFullyQualifiedName( - rtl::OString const & type, rtl::OString const & prefix) +OString translateUnoTypeToJavaFullyQualifiedName( + OString const & type, OString const & prefix) { sal_Int32 i = type.lastIndexOf('/') + 1; return type.copy(0, i) + @@ -135,22 +135,22 @@ struct PolymorphicUnoType { enum Kind { KIND_NONE, KIND_STRUCT, KIND_SEQUENCE }; Kind kind; - rtl::OString name; + OString name; }; SpecialType translateUnoTypeToDescriptor( - rtl::Reference< TypeManager > const & manager, rtl::OString const & type, + rtl::Reference< TypeManager > const & manager, OString const & type, bool array, bool classType, Dependencies * dependencies, - rtl::OStringBuffer * descriptor, rtl::OStringBuffer * signature, + OStringBuffer * descriptor, OStringBuffer * signature, bool * needsSignature, PolymorphicUnoType * polymorphicUnoType); SpecialType translateUnoTypeToDescriptor( rtl::Reference< TypeManager > const & manager, codemaker::UnoType::Sort sort, RTTypeClass typeClass, - rtl::OString const & nucleus, sal_Int32 rank, - std::vector< rtl::OString > const & arguments, bool array, bool classType, - Dependencies * dependencies, rtl::OStringBuffer * descriptor, - rtl::OStringBuffer * signature, bool * needsSignature, + OString const & nucleus, sal_Int32 rank, + std::vector< OString > const & arguments, bool array, bool classType, + Dependencies * dependencies, OStringBuffer * descriptor, + OStringBuffer * signature, bool * needsSignature, PolymorphicUnoType * polymorphicUnoType) { OSL_ASSERT(rank >= 0 && (signature == 0) == (needsSignature == 0)); @@ -193,7 +193,7 @@ SpecialType translateUnoTypeToDescriptor( signature->append("L" + nucleus); if (!arguments.empty()) { signature->append('<'); - for (std::vector< rtl::OString >::const_iterator i( + for (std::vector< OString >::const_iterator i( arguments.begin()); i != arguments.end(); ++i) { @@ -220,7 +220,7 @@ SpecialType translateUnoTypeToDescriptor( return SPECIAL_TYPE_NONE; } } else { - static rtl::OString const + static OString const simpleTypeDescriptors[codemaker::UnoType::SORT_ANY + 1][2] = { { "V", "Ljava/lang/Void;" }, { "Z", "Ljava/lang/Boolean;" }, @@ -237,7 +237,7 @@ SpecialType translateUnoTypeToDescriptor( { "Ljava/lang/String;", "Ljava/lang/String;" }, { "Lcom/sun/star/uno/Type;", "Lcom/sun/star/uno/Type;" }, { "Ljava/lang/Object;", "Ljava/lang/Object;" } }; - rtl::OString const & s + OString const & s = simpleTypeDescriptors[sort][rank == 0 && classType]; if (descriptor != 0) { descriptor->append(s); @@ -260,15 +260,15 @@ SpecialType translateUnoTypeToDescriptor( } SpecialType translateUnoTypeToDescriptor( - rtl::Reference< TypeManager > const & manager, rtl::OString const & type, + rtl::Reference< TypeManager > const & manager, OString const & type, bool array, bool classType, Dependencies * dependencies, - rtl::OStringBuffer * descriptor, rtl::OStringBuffer * signature, + OStringBuffer * descriptor, OStringBuffer * signature, bool * needsSignature, PolymorphicUnoType * polymorphicUnoType) { RTTypeClass typeClass; - rtl::OString nucleus; + OString nucleus; sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; codemaker::UnoType::Sort sort = codemaker::decomposeAndResolve( manager, type, true, true, false, &typeClass, &nucleus, &rank, &args); OSL_ASSERT(rank < SAL_MAX_INT32); @@ -280,12 +280,12 @@ SpecialType translateUnoTypeToDescriptor( SpecialType getFieldDescriptor( rtl::Reference< TypeManager > const & manager, Dependencies * dependencies, - rtl::OString const & type, rtl::OString * descriptor, - rtl::OString * signature, PolymorphicUnoType * polymorphicUnoType) + OString const & type, OString * descriptor, + OString * signature, PolymorphicUnoType * polymorphicUnoType) { OSL_ASSERT(dependencies != 0 && descriptor != 0); - rtl::OStringBuffer desc; - rtl::OStringBuffer sig; + OStringBuffer desc; + OStringBuffer sig; bool needsSig = false; SpecialType specialType = translateUnoTypeToDescriptor( manager, type, false, false, dependencies, &desc, &sig, &needsSig, @@ -295,7 +295,7 @@ SpecialType getFieldDescriptor( if (needsSig) { *signature = sig.makeStringAndClear(); } else { - *signature = rtl::OString(); + *signature = OString(); } } return specialType; @@ -305,42 +305,42 @@ class MethodDescriptor { public: MethodDescriptor( rtl::Reference< TypeManager > const & manager, - Dependencies * dependencies, rtl::OString const & returnType, + Dependencies * dependencies, OString const & returnType, SpecialType * specialReturnType, PolymorphicUnoType * polymorphicUnoType); SpecialType addParameter( - rtl::OString const & type, bool array, bool dependency, + OString const & type, bool array, bool dependency, PolymorphicUnoType * polymorphicUnoType); - void addTypeParameter(rtl::OString const & name); + void addTypeParameter(OString const & name); - rtl::OString getDescriptor() const; + OString getDescriptor() const; - rtl::OString getSignature() const; + OString getSignature() const; private: rtl::Reference< TypeManager > m_manager; Dependencies * m_dependencies; - rtl::OStringBuffer m_descriptorStart; - rtl::OString m_descriptorEnd; - rtl::OStringBuffer m_signatureStart; - rtl::OString m_signatureEnd; + OStringBuffer m_descriptorStart; + OString m_descriptorEnd; + OStringBuffer m_signatureStart; + OString m_signatureEnd; bool m_needsSignature; }; MethodDescriptor::MethodDescriptor( rtl::Reference< TypeManager > const & manager, Dependencies * dependencies, - rtl::OString const & returnType, SpecialType * specialReturnType, + OString const & returnType, SpecialType * specialReturnType, PolymorphicUnoType * polymorphicUnoType): m_manager(manager), m_dependencies(dependencies), m_needsSignature(false) { OSL_ASSERT(dependencies != 0); m_descriptorStart.append('('); m_signatureStart.append('('); - rtl::OStringBuffer descEnd; + OStringBuffer descEnd; descEnd.append(')'); - rtl::OStringBuffer sigEnd; + OStringBuffer sigEnd; sigEnd.append(')'); SpecialType special = translateUnoTypeToDescriptor( m_manager, returnType, false, false, m_dependencies, &descEnd, &sigEnd, @@ -353,7 +353,7 @@ MethodDescriptor::MethodDescriptor( } SpecialType MethodDescriptor::addParameter( - rtl::OString const & type, bool array, bool dependency, + OString const & type, bool array, bool dependency, PolymorphicUnoType * polymorphicUnoType) { return translateUnoTypeToDescriptor( @@ -368,17 +368,17 @@ void MethodDescriptor::addTypeParameter(OString const & name) { m_needsSignature = true; } -rtl::OString MethodDescriptor::getDescriptor() const { - rtl::OStringBuffer buf(m_descriptorStart); +OString MethodDescriptor::getDescriptor() const { + OStringBuffer buf(m_descriptorStart); buf.append(m_descriptorEnd); return buf.makeStringAndClear(); } -rtl::OString MethodDescriptor::getSignature() const { +OString MethodDescriptor::getSignature() const { if (m_needsSignature) { return m_signatureStart + m_signatureEnd; } else { - return rtl::OString(); + return OString(); } } @@ -393,20 +393,20 @@ public: // KIND_MEMBER: TypeInfo( - rtl::OString const & name, SpecialType specialType, sal_Int32 index, + OString const & name, SpecialType specialType, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType, sal_Int32 typeParameterIndex); // KIND_ATTRIBUTE/METHOD: TypeInfo( - Kind kind, rtl::OString const & name, SpecialType specialType, + Kind kind, OString const & name, SpecialType specialType, Flags flags, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType); // KIND_PARAMETER: TypeInfo( - rtl::OString const & parameterName, SpecialType specialType, - bool inParameter, bool outParameter, rtl::OString const & methodName, + OString const & parameterName, SpecialType specialType, + bool inParameter, bool outParameter, OString const & methodName, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType); sal_uInt16 generateCode(ClassFile::Code & code, Dependencies * dependencies) @@ -417,10 +417,10 @@ public: private: Kind m_kind; - rtl::OString m_name; + OString m_name; sal_Int32 m_flags; sal_Int32 m_index; - rtl::OString m_methodName; + OString m_methodName; PolymorphicUnoType m_polymorphicUnoType; sal_Int32 m_typeParameterIndex; }; @@ -441,7 +441,7 @@ sal_Int32 translateSpecialTypeFlags( } TypeInfo::TypeInfo( - rtl::OString const & name, SpecialType specialType, sal_Int32 index, + OString const & name, SpecialType specialType, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType, sal_Int32 typeParameterIndex): m_kind(KIND_MEMBER), m_name(name), @@ -455,7 +455,7 @@ TypeInfo::TypeInfo( } TypeInfo::TypeInfo( - Kind kind, rtl::OString const & name, SpecialType specialType, + Kind kind, OString const & name, SpecialType specialType, Flags flags, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType): m_kind(kind), m_name(name), @@ -466,8 +466,8 @@ TypeInfo::TypeInfo( } TypeInfo::TypeInfo( - rtl::OString const & parameterName, SpecialType specialType, - bool inParameter, bool outParameter, rtl::OString const & methodName, + OString const & parameterName, SpecialType specialType, + bool inParameter, bool outParameter, OString const & methodName, sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType): m_kind(KIND_PARAMETER), m_name(parameterName), m_flags(translateSpecialTypeFlags(specialType, inParameter, outParameter)), @@ -602,7 +602,7 @@ void writeClassFile( if (!tempfile.isValid()) { throw CannotDumpException("Cannot create temporary file for " + filename); } - rtl::OString tempname(tempfile.getName()); + OString tempname(tempfile.getName()); try { classFile.write(tempfile); } catch (...) { @@ -621,7 +621,7 @@ void writeClassFile( } void addTypeInfo( - rtl::OString const & className, std::vector< TypeInfo > const & typeInfo, + OString const & className, std::vector< TypeInfo > const & typeInfo, Dependencies * dependencies, ClassFile * classFile) { OSL_ASSERT(dependencies != 0 && classFile != 0); @@ -661,7 +661,7 @@ void addTypeInfo( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PRIVATE | ClassFile::ACC_STATIC), "<clinit>", "()V", code.get(), - std::vector< rtl::OString >(), ""); + std::vector< OString >(), ""); } } @@ -682,7 +682,7 @@ void handleEnumType( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString className(codemaker::convertString(reader.getTypeName())); + OString className(codemaker::convertString(reader.getTypeName())); SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< ClassFile > cf( new ClassFile( @@ -691,7 +691,7 @@ void handleEnumType( | ClassFile::ACC_SUPER), className, "com/sun/star/uno/Enum", "")); SAL_WNODEPRECATED_DECLARATIONS_POP - rtl::OString classDescriptor("L" + className + ";"); + OString classDescriptor("L" + className + ";"); for (sal_uInt16 i = 0; i < fields; ++i) { RTConstValue fieldValue(reader.getFieldValue(i)); if (fieldValue.m_type != RT_TYPE_INT32 @@ -700,13 +700,13 @@ void handleEnumType( { throw CannotDumpException("Bad type information"); //TODO } - rtl::OString fieldName( + OString fieldName( codemaker::convertString(reader.getFieldName(i))); cf->addField( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC | ClassFile::ACC_FINAL), - fieldName, classDescriptor, 0, rtl::OString()); + fieldName, classDescriptor, 0, OString()); cf->addField( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC @@ -739,7 +739,7 @@ void handleEnumType( code.get(), std::vector< OString >(), ""); code.reset(cf->newCode()); code->loadLocalInteger(0); - std::map< sal_Int32, rtl::OString > map; + std::map< sal_Int32, OString > map; sal_Int32 min = SAL_MAX_INT32; sal_Int32 max = SAL_MIN_INT32; for (sal_uInt16 i = 0; i < fields; ++i) { @@ -747,7 +747,7 @@ void handleEnumType( min = std::min(min, value); max = std::max(max, value); map.insert( - std::map< sal_Int32, rtl::OString >::value_type( + std::map< sal_Int32, OString >::value_type( value, codemaker::convertString(reader.getFieldName(i)))); } sal_uInt64 size = static_cast< sal_uInt64 >(map.size()); @@ -763,7 +763,7 @@ void handleEnumType( std::list< ClassFile::Code * > blocks; //FIXME: pointers contained in blocks may leak sal_Int32 last = SAL_MAX_INT32; - for (std::map< sal_Int32, rtl::OString >::iterator i(map.begin()); + for (std::map< sal_Int32, OString >::iterator i(map.begin()); i != map.end(); ++i) { sal_Int32 value = i->first; @@ -795,7 +795,7 @@ void handleEnumType( defCode->instrAreturn(); std::list< std::pair< sal_Int32, ClassFile::Code * > > blocks; //FIXME: pointers contained in blocks may leak - for (std::map< sal_Int32, rtl::OString >::iterator i(map.begin()); + for (std::map< sal_Int32, OString >::iterator i(map.begin()); i != map.end(); ++i) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -819,7 +819,7 @@ void handleEnumType( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC), "fromInt", "(I)" + classDescriptor, - code.get(), std::vector< rtl::OString >(), ""); + code.get(), std::vector< OString >(), ""); code.reset(cf->newCode()); for (sal_uInt16 i = 0; i < fields; ++i) { code->instrNew(className); @@ -837,19 +837,19 @@ void handleEnumType( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PRIVATE | ClassFile::ACC_STATIC), "<clinit>", "()V", code.get(), - std::vector< rtl::OString >(), ""); + std::vector< OString >(), ""); writeClassFile(options, className, *cf.get()); } void addField( rtl::Reference< TypeManager > const & manager, Dependencies * dependencies, ClassFile * classFile, std::vector< TypeInfo > * typeInfo, - sal_Int32 typeParameterIndex, rtl::OString const & type, - rtl::OString const & name, sal_Int32 index) + sal_Int32 typeParameterIndex, OString const & type, + OString const & name, sal_Int32 index) { OSL_ASSERT(dependencies != 0 && classFile != 0 && typeInfo != 0); - rtl::OString descriptor; - rtl::OString signature; + OString descriptor; + OString signature; SpecialType specialType; PolymorphicUnoType polymorphicUnoType; if (typeParameterIndex >= 0) { @@ -869,8 +869,8 @@ void addField( sal_uInt16 addFieldInit( rtl::Reference< TypeManager > const & manager, - rtl::OString const & className, rtl::OString const & fieldName, - bool typeParameter, rtl::OString const & fieldType, + OString const & className, OString const & fieldName, + bool typeParameter, OString const & fieldType, Dependencies * dependencies, ClassFile::Code * code) { OSL_ASSERT(dependencies != 0 && code != 0); @@ -878,9 +878,9 @@ sal_uInt16 addFieldInit( return 0; } else { RTTypeClass typeClass; - rtl::OString nucleus; + OString nucleus; sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; codemaker::UnoType::Sort sort = codemaker::decomposeAndResolve( manager, fieldType, true, false, false, &typeClass, &nucleus, &rank, &args); @@ -888,7 +888,7 @@ sal_uInt16 addFieldInit( switch (sort) { case codemaker::UnoType::SORT_STRING: code->loadLocalReference(0); - code->loadStringConstant(rtl::OString()); + code->loadStringConstant(OString()); code->instrPutfield(className, fieldName, "Ljava/lang/String;"); return 2; @@ -913,12 +913,12 @@ sal_uInt16 addFieldInit( if (reader.getFieldCount() == 0) { throw CannotDumpException("Bad type information"); //TODO } - rtl::OStringBuffer descBuf; + OStringBuffer descBuf; translateUnoTypeToDescriptor( manager, sort, typeClass, nucleus, 0, - std::vector< rtl::OString >(), false, false, + std::vector< OString >(), false, false, dependencies, &descBuf, 0, 0, 0); - rtl::OString desc(descBuf.makeStringAndClear()); + OString desc(descBuf.makeStringAndClear()); code->instrGetstatic( nucleus, codemaker::convertString(reader.getFieldName(0)), @@ -933,10 +933,10 @@ sal_uInt16 addFieldInit( code->instrNew(nucleus); code->instrDup(); code->instrInvokespecial(nucleus, "<init>", "()V"); - rtl::OStringBuffer desc; + OStringBuffer desc; translateUnoTypeToDescriptor( manager, sort, typeClass, nucleus, 0, - std::vector< rtl::OString >(), false, false, + std::vector< OString >(), false, false, dependencies, &desc, 0, 0, 0); code->instrPutfield( className, fieldName, desc.makeStringAndClear()); @@ -965,17 +965,17 @@ sal_uInt16 addFieldInit( nucleus, 0)); } } else { - rtl::OStringBuffer desc; + OStringBuffer desc; translateUnoTypeToDescriptor( manager, sort, typeClass, nucleus, rank - 1, - std::vector< rtl::OString >(), false, false, dependencies, + std::vector< OString >(), false, false, dependencies, &desc, 0, 0, 0); code->instrAnewarray(desc.makeStringAndClear()); } - rtl::OStringBuffer desc; + OStringBuffer desc; translateUnoTypeToDescriptor( manager, sort, typeClass, nucleus, rank, - std::vector< rtl::OString >(), false, false, dependencies, + std::vector< OString >(), false, false, dependencies, &desc, 0, 0, 0); code->instrPutfield( className, fieldName, desc.makeStringAndClear()); @@ -986,7 +986,7 @@ sal_uInt16 addFieldInit( sal_uInt16 addLoadLocal( rtl::Reference< TypeManager > const & manager, ClassFile::Code * code, - sal_uInt16 * index, bool typeParameter, rtl::OString const & type, bool any, + sal_uInt16 * index, bool typeParameter, OString const & type, bool any, Dependencies * dependencies) { OSL_ASSERT( @@ -999,9 +999,9 @@ sal_uInt16 addLoadLocal( stack = size = 1; } else { RTTypeClass typeClass; - rtl::OString nucleus; + OString nucleus; sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; codemaker::UnoType::Sort sort = codemaker::decomposeAndResolve( manager, type, true, false, false, &typeClass, &nucleus, &rank, &args); if (rank == 0) { @@ -1327,7 +1327,7 @@ sal_uInt16 addLoadLocal( void addBaseArguments( rtl::Reference< TypeManager > const & manager, Dependencies * dependencies, MethodDescriptor * methodDescriptor, ClassFile::Code * code, - RTTypeClass typeClass, rtl::OString const & type, sal_uInt16 * index) + RTTypeClass typeClass, OString const & type, sal_uInt16 * index) { OSL_ASSERT( dependencies != 0 && methodDescriptor != 0 && code != 0 && index != 0); @@ -1368,7 +1368,7 @@ void addBaseArguments( { throw CannotDumpException("Bad type information"); //TODO } - rtl::OString fieldType( + OString fieldType( codemaker::convertString(reader.getFieldTypeName(i))); methodDescriptor->addParameter(fieldType, false, true, 0); addLoadLocal( @@ -1379,13 +1379,13 @@ void addBaseArguments( sal_uInt16 addDirectArgument( rtl::Reference< TypeManager > const & manager, Dependencies * dependencies, MethodDescriptor * methodDescriptor, ClassFile::Code * code, - sal_uInt16 * index, rtl::OString const & className, - rtl::OString const & fieldName, bool typeParameter, - rtl::OString const & fieldType) + sal_uInt16 * index, OString const & className, + OString const & fieldName, bool typeParameter, + OString const & fieldType) { OSL_ASSERT( dependencies != 0 && methodDescriptor != 0 && code != 0 && index != 0); - rtl::OString desc; + OString desc; if (typeParameter) { methodDescriptor->addTypeParameter(fieldType); desc = "Ljava/lang/Object;"; @@ -1412,13 +1412,13 @@ void handleAggregatingType( //TODO } RTTypeClass typeClass = reader.getTypeClass(); - rtl::OString className(codemaker::convertString(reader.getTypeName())); + OString className(codemaker::convertString(reader.getTypeName())); sal_uInt16 superTypes = reader.getSuperTypeCount(); sal_uInt16 fields = reader.getFieldCount(); sal_uInt16 firstField = 0; sal_uInt16 references = reader.getReferenceCount(); bool runtimeException = false; - rtl::OString superClass; + OString superClass; if (className == "com/sun/star/uno/Exception") { if (typeClass != RT_TYPE_EXCEPTION || superTypes != 0 || fields != 2 @@ -1459,10 +1459,10 @@ void handleAggregatingType( dependencies->insert(superClass); } } - rtl::OString sig; - std::map< rtl::OString, sal_Int32 > typeParameters; + OString sig; + std::map< OString, sal_Int32 > typeParameters; if (references != 0) { - rtl::OStringBuffer buf; + OStringBuffer buf; buf.append('<'); for (sal_uInt16 i = 0; i < references; ++i) { if (reader.getReferenceFlags(i) != RT_ACCESS_INVALID @@ -1471,11 +1471,11 @@ void handleAggregatingType( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString name( + OString name( codemaker::convertString(reader.getReferenceTypeName(i))); buf.append(name + ":Ljava/lang/Object;"); if (!typeParameters.insert( - std::map< rtl::OString, sal_Int32 >::value_type(name, i)). + std::map< OString, sal_Int32 >::value_type(name, i)). second) { throw CannotDumpException("Bad type information"); @@ -1502,13 +1502,13 @@ void handleAggregatingType( { throw CannotDumpException("Bad type information"); //TODO } - rtl::OString type( + OString type( codemaker::convertString(reader.getFieldTypeName(i))); sal_Int32 typeParameterIndex; if ((flags & RT_ACCESS_PARAMETERIZED_TYPE) == 0) { typeParameterIndex = -1; } else { - std::map< rtl::OString, sal_Int32 >::iterator it( + std::map< OString, sal_Int32 >::iterator it( typeParameters.find(type)); if (it == typeParameters.end()) { throw CannotDumpException("Bad type information"); @@ -1551,7 +1551,7 @@ void handleAggregatingType( cf->addMethod( ClassFile::ACC_PUBLIC, "<init>", "()V", code.get(), - std::vector< rtl::OString >(), ""); + std::vector< OString >(), ""); if (typeClass == RT_TYPE_EXCEPTION) { code.reset(cf->newCode()); code->loadLocalReference(0); @@ -1578,7 +1578,7 @@ void handleAggregatingType( code->instrReturn(); code->setMaxStackAndLocals(stack + 2, 2); cf->addMethod(ClassFile::ACC_PUBLIC, "<init>", "(Ljava/lang/String;)V", - code.get(), std::vector< rtl::OString >(), ""); + code.get(), std::vector< OString >(), ""); } MethodDescriptor desc(manager, dependencies, "void", 0, 0); code.reset(cf->newCode()); @@ -1613,7 +1613,7 @@ void handleAggregatingType( code->instrReturn(); code->setMaxStackAndLocals(maxSize, index); cf->addMethod(ClassFile::ACC_PUBLIC, "<init>", - desc.getDescriptor(), code.get(), std::vector< rtl::OString >(), + desc.getDescriptor(), code.get(), std::vector< OString >(), desc.getSignature()); addTypeInfo(className, typeInfo, dependencies, cf.get()); writeClassFile(options, className, *cf.get()); @@ -1622,13 +1622,13 @@ void handleAggregatingType( void createExceptionsAttribute( rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, sal_uInt16 methodIndex, - Dependencies * dependencies, std::vector< rtl::OString > * exceptions, + Dependencies * dependencies, std::vector< OString > * exceptions, codemaker::ExceptionTree * tree) { OSL_ASSERT(dependencies != 0 && exceptions != 0); sal_uInt16 n = reader.getMethodExceptionCount(methodIndex); for (sal_uInt16 i = 0; i < n; ++i) { - rtl::OString type( + OString type( codemaker::convertString( reader.getMethodExceptionTypeName(methodIndex, i))); dependencies->insert(type); @@ -1646,7 +1646,7 @@ void handleInterfaceType( { OSL_ASSERT(dependencies != 0); - rtl::OString className(codemaker::convertString(reader.getTypeName())); + OString className(codemaker::convertString(reader.getTypeName())); sal_uInt16 superTypes = reader.getSuperTypeCount(); sal_uInt16 fields = reader.getFieldCount(); sal_uInt16 methods = reader.getMethodCount(); @@ -1669,7 +1669,7 @@ void handleInterfaceType( className, "java/lang/Object", "")); SAL_WNODEPRECATED_DECLARATIONS_POP for (sal_uInt16 i = 0; i < superTypes; ++i) { - rtl::OString t(codemaker::convertString(reader.getSuperTypeName(i))); + OString t(codemaker::convertString(reader.getSuperTypeName(i))); dependencies->insert(t); cf->addInterface(t); } @@ -1698,7 +1698,7 @@ void handleInterfaceType( } //TODO: exploit the fact that attribute getter/setter methods preceed // real methods - rtl::OUString attrNameUtf16(reader.getFieldName(i)); + OUString attrNameUtf16(reader.getFieldName(i)); sal_uInt16 getter = SAL_MAX_UINT16; sal_uInt16 setter = SAL_MAX_UINT16; for (sal_uInt16 j = 0; j < methods; ++j) { @@ -1720,19 +1720,19 @@ void handleInterfaceType( (mflags == RT_MODE_ATTRIBUTE_GET ? getter : setter) = j; } } - rtl::OString fieldType( + OString fieldType( codemaker::convertString(reader.getFieldTypeName(i))); SpecialType specialType; PolymorphicUnoType polymorphicUnoType; MethodDescriptor gdesc( manager, dependencies, fieldType, &specialType, &polymorphicUnoType); - std::vector< rtl::OString > exc; + std::vector< OString > exc; if (getter != SAL_MAX_UINT16) { createExceptionsAttribute( manager, reader, getter, dependencies, &exc, 0); } - rtl::OString attrName(codemaker::convertString(attrNameUtf16)); + OString attrName(codemaker::convertString(attrNameUtf16)); cf->addMethod( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PUBLIC | ClassFile::ACC_ABSTRACT), @@ -1741,7 +1741,7 @@ void handleInterfaceType( MethodDescriptor sdesc( manager, dependencies, "void", 0, 0); sdesc.addParameter(fieldType, false, true, 0); - std::vector< rtl::OString > exc2; + std::vector< OString > exc2; if (setter != SAL_MAX_UINT16) { createExceptionsAttribute( manager, reader, setter, dependencies, &exc2, 0); @@ -1768,7 +1768,7 @@ void handleInterfaceType( case RT_MODE_ONEWAY: case RT_MODE_TWOWAY: { - rtl::OString methodName( + OString methodName( codemaker::convertString(reader.getMethodName(i))); SpecialType specialReturnType; PolymorphicUnoType polymorphicUnoReturnType; @@ -1825,7 +1825,7 @@ void handleInterfaceType( polymorphicUnoType)); } } - std::vector< rtl::OString > exc2; + std::vector< OString > exc2; createExceptionsAttribute( manager, reader, i, dependencies, &exc2, 0); cf->addMethod( @@ -1841,7 +1841,7 @@ void handleInterfaceType( { //TODO: exploit the fact that attribute getter/setter methods // are ordered the same way as the attribute fields themselves - rtl::OUString methodNameUtf16(reader.getMethodName(i)); + OUString methodNameUtf16(reader.getMethodName(i)); bool found = false; for (sal_uInt16 j = 0; j < fields; ++j) { if (reader.getFieldName(j) == methodNameUtf16) { @@ -1874,9 +1874,9 @@ void handleTypedef( //TODO } RTTypeClass typeClass; - rtl::OString nucleus; + OString nucleus; sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; if (codemaker::decomposeAndResolve( manager, codemaker::convertString(reader.getSuperTypeName(0)), false, false, false, &typeClass, &nucleus, &rank, &args) @@ -1917,9 +1917,9 @@ void addConstant( RTConstValue fieldValue(reader.getFieldValue(index)); sal_uInt16 valueIndex; RTTypeClass typeClass; - rtl::OString nucleus; + OString nucleus; sal_Int32 rank; - std::vector< rtl::OString > args; + std::vector< OString > args; switch (codemaker::decomposeAndResolve( manager, codemaker::convertString(reader.getFieldTypeName(index)), @@ -2002,8 +2002,8 @@ void addConstant( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString desc; - rtl::OString sig; + OString desc; + OString sig; getFieldDescriptor( manager, dependencies, codemaker::convertString(reader.getFieldTypeName(index)), @@ -2028,7 +2028,7 @@ void handleConstantGroup( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString className(codemaker::convertString(reader.getTypeName())); + OString className(codemaker::convertString(reader.getTypeName())); SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< ClassFile > cf( new ClassFile( @@ -2056,10 +2056,10 @@ void handleModule( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString prefix(codemaker::convertString(reader.getTypeName()) + "/"); + OString prefix(codemaker::convertString(reader.getTypeName()) + "/"); sal_uInt16 fields = reader.getFieldCount(); for (sal_uInt16 i = 0; i < fields; ++i) { - rtl::OString className( + OString className( prefix + codemaker::convertString(reader.getFieldName(i))); SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< ClassFile > cf( @@ -2094,10 +2094,10 @@ void addExceptionHandlers( void addConstructor( rtl::Reference< TypeManager > const & manager, - rtl::OString const & realJavaBaseName, rtl::OString const & unoName, - rtl::OString const & className, typereg::Reader const & reader, - sal_uInt16 methodIndex, rtl::OString const & methodName, - rtl::OString const & returnType, bool defaultConstructor, + OString const & realJavaBaseName, OString const & unoName, + OString const & className, typereg::Reader const & reader, + sal_uInt16 methodIndex, OString const & methodName, + OString const & returnType, bool defaultConstructor, Dependencies * dependencies, ClassFile * classFile) { OSL_ASSERT(dependencies != 0 && classFile != 0); @@ -2116,7 +2116,7 @@ void addConstructor( codemaker::ExceptionTree tree; ClassFile::Code::Position tryStart; ClassFile::Code::Position tryEnd; - std::vector< rtl::OString > exc; + std::vector< OString > exc; sal_uInt16 stack; sal_uInt16 localIndex = 1; ClassFile::AccessFlags access = static_cast< ClassFile::AccessFlags >( @@ -2153,7 +2153,7 @@ void addConstructor( for (sal_uInt16 i = 0; i < parameters; ++i) { RTParamMode flags = reader.getMethodParameterFlags( methodIndex, i); - rtl::OString paramType( + OString paramType( codemaker::convertString( reader.getMethodParameterTypeName(methodIndex, i))); if ((flags != RT_PARAM_IN @@ -2258,8 +2258,8 @@ void handleService( if (superTypes == 0) { return; } - rtl::OString unoName(codemaker::convertString(reader.getTypeName())); - rtl::OString className( + OString unoName(codemaker::convertString(reader.getTypeName())); + OString className( translateUnoTypeToJavaFullyQualifiedName(unoName, "service")); unoName = unoName.replace('/', '.'); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -2271,16 +2271,16 @@ void handleService( className, "java/lang/Object", "")); SAL_WNODEPRECATED_DECLARATIONS_POP if (methods > 0) { - rtl::OString base(codemaker::convertString( + OString base(codemaker::convertString( reader.getSuperTypeName(0))); - rtl::OString realJavaBaseName(base.replace('/', '.')); + OString realJavaBaseName(base.replace('/', '.')); dependencies->insert(base); dependencies->insert("com/sun/star/lang/XMultiComponentFactory"); dependencies->insert("com/sun/star/uno/DeploymentException"); dependencies->insert("com/sun/star/uno/TypeClass"); dependencies->insert("com/sun/star/uno/XComponentContext"); for (sal_uInt16 i = 0; i < methods; ++i) { - rtl::OString name(codemaker::convertString( + OString name(codemaker::convertString( reader.getMethodName(i))); bool defaultCtor = name.isEmpty(); if (reader.getMethodFlags(i) != RT_MODE_TWOWAY @@ -2351,7 +2351,7 @@ void handleService( | ClassFile::ACC_SYNTHETIC), "$castInstance", "(Ljava/lang/Object;Lcom/sun/star/uno/" "XComponentContext;)Ljava/lang/Object;", - code.get(), std::vector< rtl::OString >(), ""); + code.get(), std::vector< OString >(), ""); } } writeClassFile(options, className, *cf.get()); @@ -2369,8 +2369,8 @@ void handleSingleton( throw CannotDumpException("Bad type information"); //TODO } - rtl::OString base(codemaker::convertString(reader.getSuperTypeName(0))); - rtl::OString realJavaBaseName(base.replace('/', '.')); + OString base(codemaker::convertString(reader.getSuperTypeName(0))); + OString realJavaBaseName(base.replace('/', '.')); switch (manager->getTypeReader(base).getTypeClass()) { case RT_TYPE_INTERFACE: break; @@ -2475,14 +2475,14 @@ void handleSingleton( static_cast< ClassFile::AccessFlags >( ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC), "get", desc.getDescriptor(), - code.get(), std::vector< rtl::OString >(), desc.getSignature()); + code.get(), std::vector< OString >(), desc.getSignature()); writeClassFile(options, className, *cf.get()); } } bool produceType( - rtl::OString const & type, rtl::Reference< TypeManager > const & manager, + OString const & type, rtl::Reference< TypeManager > const & manager, codemaker::GeneratedTypeSet & generated, JavaOptions * options) { OSL_ASSERT(options != 0); @@ -2556,7 +2556,7 @@ bool produceType( rtl::Reference< TypeManager > const & manager, codemaker::GeneratedTypeSet & generated, JavaOptions * options) { - ::rtl::OString typeName = manager->getTypeName(rTypeKey); + OString typeName = manager->getTypeName(rTypeKey); OSL_ASSERT(options != 0); if (typeName == "/" || typeName == manager->getBase() diff --git a/codemaker/source/javamaker/javatype.hxx b/codemaker/source/javamaker/javatype.hxx index 5161628d8b82..6d53bd747ef3 100644 --- a/codemaker/source/javamaker/javatype.hxx +++ b/codemaker/source/javamaker/javatype.hxx @@ -23,15 +23,15 @@ #include "sal/config.h" #include "rtl/ref.hxx" +#include "rtl/string.hxx" namespace codemaker { class GeneratedTypeSet; } -namespace rtl { class OString; } class JavaOptions; class TypeManager; class RegistryKey; bool produceType( - rtl::OString const & type, rtl::Reference< TypeManager > const & manager, + OString const & type, rtl::Reference< TypeManager > const & manager, codemaker::GeneratedTypeSet & generated, JavaOptions * pOptions); bool produceType(RegistryKey& typeName, bool bIsExtraType, rtl::Reference< TypeManager > const & typeMgr, |