diff options
Diffstat (limited to 'codemaker')
54 files changed, 1099 insertions, 1099 deletions
diff --git a/codemaker/inc/codemaker/codemaker.hxx b/codemaker/inc/codemaker/codemaker.hxx index 91cf382d39f8..2a0d8bf1a2d7 100644 --- a/codemaker/inc/codemaker/codemaker.hxx +++ b/codemaker/inc/codemaker/codemaker.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace rtl { } class TypeManager; -namespace codemaker { +namespace codemaker { rtl::OString convertString(rtl::OUString const & string); diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/codemaker/inc/codemaker/commoncpp.hxx index 5ccb5e30efcb..993397f5fdd9 100644 --- a/codemaker/inc/codemaker/commoncpp.hxx +++ b/codemaker/inc/codemaker/commoncpp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/inc/codemaker/commonjava.hxx b/codemaker/inc/codemaker/commonjava.hxx index 9fa36efc60fd..d99826ab6bb4 100644 --- a/codemaker/inc/codemaker/commonjava.hxx +++ b/codemaker/inc/codemaker/commonjava.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/inc/codemaker/dependencies.hxx b/codemaker/inc/codemaker/dependencies.hxx index 0e6bc90197f0..681901175630 100644 --- a/codemaker/inc/codemaker/dependencies.hxx +++ b/codemaker/inc/codemaker/dependencies.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/inc/codemaker/exceptiontree.hxx b/codemaker/inc/codemaker/exceptiontree.hxx index e8edb35fab57..3a92ddbd41dd 100644 --- a/codemaker/inc/codemaker/exceptiontree.hxx +++ b/codemaker/inc/codemaker/exceptiontree.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/inc/codemaker/generatedtypeset.hxx b/codemaker/inc/codemaker/generatedtypeset.hxx index 7740847c273a..a290bb7cfc39 100644 --- a/codemaker/inc/codemaker/generatedtypeset.hxx +++ b/codemaker/inc/codemaker/generatedtypeset.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/inc/codemaker/global.hxx b/codemaker/inc/codemaker/global.hxx index 2406305db451..820dd58de6e4 100644 --- a/codemaker/inc/codemaker/global.hxx +++ b/codemaker/inc/codemaker/global.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,9 +68,9 @@ typedef ::std::new_alloc NewAlloc; #endif -typedef ::std::list< ::rtl::OString > StringList; -typedef ::std::vector< ::rtl::OString > StringVector; -typedef ::std::set< ::rtl::OString, LessString > StringSet; +typedef ::std::list< ::rtl::OString > StringList; +typedef ::std::vector< ::rtl::OString > StringVector; +typedef ::std::set< ::rtl::OString, LessString > StringSet; //************************************************************************* // FileStream @@ -87,16 +87,16 @@ class FileStream { public: FileStream(); - FileStream(const ::rtl::OString& name, FileAccessMode nMode = FAM_READWRITE); + FileStream(const ::rtl::OString& name, FileAccessMode nMode = FAM_READWRITE); virtual ~FileStream(); - + sal_Bool isValid(); void open(const ::rtl::OString& name, FileAccessMode nMode = FAM_READWRITE); void createTempFile(const ::rtl::OString& sPath); void close(); - ::rtl::OString getName() { return m_name; } + ::rtl::OString getName() { return m_name; } bool write(void const * buffer, sal_uInt64 size); @@ -112,7 +112,7 @@ private: sal_uInt32 checkAccessMode(FileAccessMode mode); oslFileHandle m_file; - ::rtl::OString m_name; + ::rtl::OString m_name; }; @@ -121,8 +121,8 @@ private: //************************************************************************* ::rtl::OString getTempDir(const ::rtl::OString& sFileName); -::rtl::OString createFileNameFromType(const ::rtl::OString& destination, - const ::rtl::OString type, +::rtl::OString createFileNameFromType(const ::rtl::OString& destination, + const ::rtl::OString type, const ::rtl::OString postfix, sal_Bool bLowerCase=sal_False, const ::rtl::OString prefix=""); @@ -144,7 +144,7 @@ public: CannotDumpException(const ::rtl::OString& msg) : m_message(msg) {} - ::rtl::OString m_message; + ::rtl::OString m_message; }; diff --git a/codemaker/inc/codemaker/options.hxx b/codemaker/inc/codemaker/options.hxx index d443d35d2c1a..421cc217aa74 100644 --- a/codemaker/inc/codemaker/options.hxx +++ b/codemaker/inc/codemaker/options.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,20 +34,20 @@ #include <codemaker/global.hxx> #if defined( _MSC_VER ) && ( _MSC_VER < 1200 ) -typedef ::std::__hash_map__ -< - ::rtl::OString, - ::rtl::OString, - HashString, - EqualString, +typedef ::std::__hash_map__ +< + ::rtl::OString, + ::rtl::OString, + HashString, + EqualString, NewAlloc > OptionMap; #else -typedef ::std::hash_map -< - ::rtl::OString, - ::rtl::OString, - HashString, +typedef ::std::hash_map +< + ::rtl::OString, + ::rtl::OString, + HashString, EqualString > OptionMap; #endif @@ -58,7 +58,7 @@ public: IllegalArgument(const ::rtl::OString& msg) : m_message(msg) {} - ::rtl::OString m_message; + ::rtl::OString m_message; }; class Options @@ -67,34 +67,34 @@ public: Options(); virtual ~Options(); - virtual sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) + virtual sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ) = 0; - virtual ::rtl::OString prepareHelp() = 0; + virtual ::rtl::OString prepareHelp() = 0; - const ::rtl::OString& getProgramName() const; - sal_Bool isValid(const ::rtl::OString& option); - const ::rtl::OString getOption(const ::rtl::OString& option) + const ::rtl::OString& getProgramName() const; + sal_Bool isValid(const ::rtl::OString& option); + const ::rtl::OString getOption(const ::rtl::OString& option) throw( IllegalArgument ); - const OptionMap& getOptions(); + const OptionMap& getOptions(); - const ::rtl::OString getInputFile(sal_uInt16 index) + const ::rtl::OString getInputFile(sal_uInt16 index) throw( IllegalArgument ); const StringVector& getInputFiles(); ::rtl::OString getExtraInputFile(sal_uInt16 index) const throw( IllegalArgument ); inline sal_uInt16 getNumberOfExtraInputFiles() const - { return (sal_uInt16)m_extra_input_files.size(); } + { return (sal_uInt16)m_extra_input_files.size(); } inline const StringVector& getExtraInputFiles() const { return m_extra_input_files; } protected: - ::rtl::OString m_program; - StringVector m_inputFiles; + ::rtl::OString m_program; + StringVector m_inputFiles; StringVector m_extra_input_files; - OptionMap m_options; + OptionMap m_options; }; - + #endif // INCLUDED_CODEMAKER_OPTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/inc/codemaker/typemanager.hxx b/codemaker/inc/codemaker/typemanager.hxx index 8927e9080932..49a6e0a4938f 100644 --- a/codemaker/inc/codemaker/typemanager.hxx +++ b/codemaker/inc/codemaker/typemanager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,28 +38,28 @@ namespace typereg { class Reader; } -//typedef ::std::list< Registry* > RegistryList; -typedef ::std::vector< Registry* > RegistryList; -typedef ::std::pair< RegistryKey, sal_Bool > KeyPair; -typedef ::std::vector< KeyPair > RegistryKeyList; +//typedef ::std::list< Registry* > RegistryList; +typedef ::std::vector< Registry* > RegistryList; +typedef ::std::pair< RegistryKey, sal_Bool > KeyPair; +typedef ::std::vector< KeyPair > RegistryKeyList; #if defined( _MSC_VER ) && ( _MSC_VER < 1200 ) -typedef ::std::__hash_map__ -< +typedef ::std::__hash_map__ +< ::rtl::OString, // Typename - RTTypeClass, // TypeClass - HashString, - EqualString, + RTTypeClass, // TypeClass + HashString, + EqualString, NewAlloc -> T2TypeClassMap; +> T2TypeClassMap; #else -typedef ::std::hash_map -< +typedef ::std::hash_map +< ::rtl::OString, // Typename - RTTypeClass, // TypeClass - HashString, + RTTypeClass, // TypeClass + HashString, EqualString -> T2TypeClassMap; +> T2TypeClassMap; #endif struct TypeManagerImpl @@ -68,8 +68,8 @@ struct TypeManagerImpl : m_refCount(0) {} - sal_Int32 m_refCount; -}; + sal_Int32 m_refCount; +}; class TypeManager { @@ -96,19 +96,19 @@ public: virtual ::rtl::OString getTypeName(RegistryKey&) const { return ::rtl::OString(); } - - virtual RegistryKey getTypeKey(const ::rtl::OString&, sal_Bool * = 0 ) const + + virtual RegistryKey getTypeKey(const ::rtl::OString&, sal_Bool * = 0 ) const { return RegistryKey(); } - virtual RegistryKeyList getTypeKeys(const ::rtl::OString&) const + virtual RegistryKeyList getTypeKeys(const ::rtl::OString&) const { return RegistryKeyList(); } virtual typereg::Reader getTypeReader( const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const = 0; virtual typereg::Reader getTypeReader(RegistryKey& rTypeKey) const = 0; - virtual RTTypeClass getTypeClass(const ::rtl::OString&) const - { return RT_TYPE_INVALID; } - virtual RTTypeClass getTypeClass(RegistryKey&) const + virtual RTTypeClass getTypeClass(const ::rtl::OString&) const + { return RT_TYPE_INVALID; } + virtual RTTypeClass getTypeClass(RegistryKey&) const { return RT_TYPE_INVALID; } - + virtual void setBase(const ::rtl::OString&) {} virtual ::rtl::OString getBase() const { return ::rtl::OString(); } @@ -126,14 +126,14 @@ protected: struct RegistryTypeManagerImpl { RegistryTypeManagerImpl() - : m_base("/") + : m_base("/") {} - T2TypeClassMap m_t2TypeClass; - RegistryList m_registries; - RegistryList m_extra_registries; - ::rtl::OString m_base; -}; + T2TypeClassMap m_t2TypeClass; + RegistryList m_registries; + RegistryList m_extra_registries; + ::rtl::OString m_base; +}; class RegistryTypeManager : public TypeManager { @@ -151,27 +151,27 @@ public: sal_Bool init(const StringVector& regFiles, const StringVector& extraFiles = StringVector() ); ::rtl::OString getTypeName(RegistryKey& rTypeKey) const; - - sal_Bool isValidType(const ::rtl::OString& name) const + + sal_Bool isValidType(const ::rtl::OString& name) const { return searchTypeKey(name, 0).isValid(); } - RegistryKey getTypeKey( + RegistryKey getTypeKey( const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const { return searchTypeKey(name, pIsExtraType); } - RegistryKeyList getTypeKeys(const ::rtl::OString& name) const; + RegistryKeyList getTypeKeys(const ::rtl::OString& name) const; typereg::Reader getTypeReader( const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const; typereg::Reader getTypeReader(RegistryKey& rTypeKey) const; - RTTypeClass getTypeClass(const ::rtl::OString& name) const; - RTTypeClass getTypeClass(RegistryKey& rTypeKey) const; + RTTypeClass getTypeClass(const ::rtl::OString& name) const; + RTTypeClass getTypeClass(RegistryKey& rTypeKey) const; void setBase(const ::rtl::OString& base); ::rtl::OString getBase() const { return m_pImpl->m_base; } sal_Int32 getSize() const { return m_pImpl->m_t2TypeClass.size(); } protected: - RegistryKey searchTypeKey( + RegistryKey searchTypeKey( const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const; - void freeRegistries(); + void freeRegistries(); void acquire(); void release(); @@ -179,7 +179,7 @@ protected: protected: RegistryTypeManagerImpl* m_pImpl; }; - + #endif // INCLUDED_CODEMAKER_TYPEMANAGER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/inc/codemaker/unotype.hxx b/codemaker/inc/codemaker/unotype.hxx index e79e760530d7..3e490beed682 100644 --- a/codemaker/inc/codemaker/unotype.hxx +++ b/codemaker/inc/codemaker/unotype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/inc/pch/precompiled_codemaker.cxx b/codemaker/inc/pch/precompiled_codemaker.cxx index fbe55a4f00f4..a3a0735bd8af 100644 --- a/codemaker/inc/pch/precompiled_codemaker.cxx +++ b/codemaker/inc/pch/precompiled_codemaker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/inc/pch/precompiled_codemaker.hxx b/codemaker/inc/pch/precompiled_codemaker.hxx index 443b3f60ee23..0409cb77eb18 100644 --- a/codemaker/inc/pch/precompiled_codemaker.hxx +++ b/codemaker/inc/pch/precompiled_codemaker.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/source/codemaker/codemaker.cxx b/codemaker/source/codemaker/codemaker.cxx index 8ce02ab0a1d5..d141a7c107e6 100644 --- a/codemaker/source/codemaker/codemaker.cxx +++ b/codemaker/source/codemaker/codemaker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ codemaker::UnoType::Sort decomposeAndResolve( throw CannotDumpException( errorMsg(rtl::OString( RTL_CONSTASCII_STRINGPARAM("Bad type information: ")), - type)); + type)); //TODO } *rank += n; @@ -114,7 +114,7 @@ codemaker::UnoType::Sort decomposeAndResolve( throw CannotDumpException( errorMsg(rtl::OString( RTL_CONSTASCII_STRINGPARAM("Bad type information: ")), - type)); + type)); //TODO } default: @@ -140,7 +140,7 @@ codemaker::UnoType::Sort decomposeAndResolve( throw CannotDumpException( errorMsg(rtl::OString( RTL_CONSTASCII_STRINGPARAM("Bad type information: ")), - type)); + type)); //TODO } return sort; @@ -154,7 +154,7 @@ codemaker::UnoType::Sort decomposeAndResolve( throw CannotDumpException( errorMsg(rtl::OString( RTL_CONSTASCII_STRINGPARAM("Bad type information: ")), - type)); + type)); //TODO } checkNoTypeArguments(*arguments); @@ -179,7 +179,7 @@ codemaker::UnoType::Sort decomposeAndResolve( throw CannotDumpException( errorMsg(rtl::OString( RTL_CONSTASCII_STRINGPARAM("Bad type information: ")), - type)); + type)); //TODO } } diff --git a/codemaker/source/codemaker/dependencies.cxx b/codemaker/source/codemaker/dependencies.cxx index da8d33e1f88e..51ea792b0ad2 100644 --- a/codemaker/source/codemaker/dependencies.cxx +++ b/codemaker/source/codemaker/dependencies.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx index e54483d39561..e7cbc5e68cc4 100644 --- a/codemaker/source/codemaker/exceptiontree.cxx +++ b/codemaker/source/codemaker/exceptiontree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ void ExceptionTree::add(rtl::OString const & name, TypeManager const & manager) throw CannotDumpException( ::rtl::OString("Unknown type '" + n.replace('/', '.') + "', incomplete type library.")); - + OSL_ASSERT( reader.getTypeClass() == RT_TYPE_EXCEPTION && reader.getSuperTypeCount() == 1); diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx index 52e4e3486aa6..e3f690fe87b3 100644 --- a/codemaker/source/codemaker/global.cxx +++ b/codemaker/source/codemaker/global.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -167,7 +167,7 @@ OString createFileNameFromType( const OString& destination, OUString uSysFileName; OSL_VERIFY( FileBase::getSystemPathFromFileURL( - convertToFileUrl(fileName), uSysFileName) == FileBase::E_None ); + convertToFileUrl(fileName), uSysFileName) == FileBase::E_None ); return OUStringToOString(uSysFileName, osl_getThreadTextEncoding());; } @@ -188,14 +188,14 @@ sal_Bool checkFileContent(const OString& targetFileName, const OString& tmpFileN { FILE *target = fopen(targetFileName.getStr(), "r"); FILE *tmp = fopen(tmpFileName.getStr(), "r"); - sal_Bool bFindChanges = sal_False; + sal_Bool bFindChanges = sal_False; if (target != NULL && tmp != NULL) { - sal_Char buffer1[1024+1]; - sal_Char buffer2[1024+1]; - sal_Int32 n1 = 0; - sal_Int32 n2 = 0; + sal_Char buffer1[1024+1]; + sal_Char buffer2[1024+1]; + sal_Int32 n1 = 0; + sal_Int32 n2 = 0; while ( !bFindChanges && !feof(target) && !feof(tmp)) { @@ -212,7 +212,7 @@ sal_Bool checkFileContent(const OString& targetFileName, const OString& tmpFileN if (target) fclose(target); if (tmp) fclose(tmp); - + return bFindChanges; } @@ -223,14 +223,14 @@ sal_Bool makeValidTypeFile(const OString& targetFileName, const OString& tmpFile if (checkFileContent(targetFileName, tmpFileName)) { if ( !unlink(targetFileName.getStr()) ) if ( !rename(tmpFileName.getStr(), targetFileName.getStr()) ) - return sal_True; - } else + return sal_True; + } else return removeTypeFile(tmpFileName); } else { if (fileExists(targetFileName)) if (!removeTypeFile(targetFileName)) return sal_False; - + if ( rename(tmpFileName.getStr(), targetFileName.getStr()) ) { if (errno == EEXIST) return sal_True; @@ -303,7 +303,7 @@ FileStream::FileStream(const OString& name, FileAccessMode mode) if ( name.getLength() > 0 ) { OUString sUrl(convertToFileUrl(name)); -#ifdef SAL_UNX +#ifdef SAL_UNX sal_uInt64 uAttr = osl_File_Attribute_OwnWrite | osl_File_Attribute_OwnRead | osl_File_Attribute_GrpWrite | @@ -346,7 +346,7 @@ void FileStream::createTempFile(const OString& sPath) sTmpPath = convertToFileUrl(sTmp); if (osl_createTempFile(sTmpPath.pData, &m_file, &sTmpName.pData) == osl_File_E_None) { -#ifdef SAL_UNX +#ifdef SAL_UNX sal_uInt64 uAttr = osl_File_Attribute_OwnWrite | osl_File_Attribute_OwnRead | osl_File_Attribute_GrpWrite | @@ -356,7 +356,7 @@ void FileStream::createTempFile(const OString& sPath) m_file = NULL; return; } -#endif +#endif OUString sSysTmpName; FileBase::getSystemPathFromFileURL(sTmpName, sSysTmpName); m_name = OUStringToOString(sSysTmpName, osl_getThreadTextEncoding()); @@ -435,7 +435,7 @@ FileStream &operator<<(FileStream& o, const ::rtl::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) { sal_uInt64 writtenBytes; diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx index 2019e96b3518..27ebb14d5b3e 100644 --- a/codemaker/source/codemaker/options.cxx +++ b/codemaker/source/codemaker/options.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,22 +35,22 @@ using namespace rtl; Options::Options() { -} +} Options::~Options() { - + } const OString& Options::getProgramName() const { return m_program; -} +} sal_Bool Options::isValid(const OString& option) { - return (m_options.count(option) > 0); -} + return (m_options.count(option) > 0); +} const OString Options::getOption(const OString& option) throw( IllegalArgument ) @@ -66,36 +66,36 @@ const OString Options::getOption(const OString& option) const OptionMap& Options::getOptions() { - return m_options; -} + return m_options; +} const OString Options::getInputFile(sal_uInt16 index) throw( IllegalArgument ) { if (index < m_inputFiles.size()) { - return m_inputFiles[index]; + return m_inputFiles[index]; } else { throw IllegalArgument("index is out of bound."); } -} +} const StringVector& Options::getInputFiles() { - return m_inputFiles; -} - + return m_inputFiles; +} + OString Options::getExtraInputFile(sal_uInt16 index) const throw( IllegalArgument ) { if (index < m_extra_input_files.size()) { - return m_extra_input_files[index]; + return m_extra_input_files[index]; } else { throw IllegalArgument("index is out of bound."); } -} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx index b65120aa1aa0..a3a453013859 100644 --- a/codemaker/source/codemaker/typemanager.cxx +++ b/codemaker/source/codemaker/typemanager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,21 +39,21 @@ using namespace rtl; TypeManager::TypeManager() { m_pImpl = new TypeManagerImpl(); - acquire(); -} + acquire(); +} TypeManager::~TypeManager() { release(); -} +} sal_Int32 TypeManager::acquire() -{ +{ return osl_incrementInterlockedCount(&m_pImpl->m_refCount); } sal_Int32 TypeManager::release() -{ +{ sal_Int32 refCount = 0; if (0 == (refCount = osl_decrementInterlockedCount(&m_pImpl->m_refCount)) ) { @@ -96,30 +96,30 @@ sal_Bool TypeManager::isBaseType(const ::rtl::OString& name) return sal_True; return sal_False; -} +} RegistryTypeManager::RegistryTypeManager() { m_pImpl = new RegistryTypeManagerImpl(); - acquire(); -} + acquire(); +} RegistryTypeManager::~RegistryTypeManager() { release(); -} +} void RegistryTypeManager::acquire() -{ +{ TypeManager::acquire(); } void RegistryTypeManager::release() -{ +{ if (0 == TypeManager::release()) { freeRegistries(); - + delete m_pImpl; } } @@ -157,9 +157,9 @@ sal_Bool RegistryTypeManager::init( } ++iter; } - + return sal_True; -} +} ::rtl::OString RegistryTypeManager::getTypeName(RegistryKey& rTypeKey) const { @@ -178,126 +178,126 @@ typereg::Reader RegistryTypeManager::getTypeReader( { typereg::Reader reader; RegistryKey key(searchTypeKey(name, pIsExtraType)); - + if (key.isValid()) { - RegValueType valueType; - sal_uInt32 valueSize; + RegValueType valueType; + sal_uInt32 valueSize; if (!key.getValueInfo(OUString(), &valueType, &valueSize)) { - sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); + sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); if (!key.getValue(OUString(), pBuffer)) { reader = typereg::Reader( pBuffer, valueSize, true, TYPEREG_VERSION_1); - } + } rtl_freeMemory(pBuffer); } } return reader; -} +} typereg::Reader RegistryTypeManager::getTypeReader(RegistryKey& rTypeKey) const { typereg::Reader reader; - + if (rTypeKey.isValid()) { - RegValueType valueType; - sal_uInt32 valueSize; + RegValueType valueType; + sal_uInt32 valueSize; if (!rTypeKey.getValueInfo(OUString(), &valueType, &valueSize)) { - sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); + sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); if (!rTypeKey.getValue(OUString(), pBuffer)) { reader = typereg::Reader( pBuffer, valueSize, true, TYPEREG_VERSION_1); - } + } rtl_freeMemory(pBuffer); } } return reader; -} +} RTTypeClass RegistryTypeManager::getTypeClass(const OString& name) const { if (m_pImpl->m_t2TypeClass.count(name) > 0) { - return m_pImpl->m_t2TypeClass[name]; + return m_pImpl->m_t2TypeClass[name]; } else { RegistryKey key(searchTypeKey(name)); - + if (key.isValid()) { - RegValueType valueType; - sal_uInt32 valueSize; + RegValueType valueType; + sal_uInt32 valueSize; if (!key.getValueInfo(OUString(), &valueType, &valueSize)) { - sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); + sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); if (!key.getValue(OUString(), pBuffer)) { typereg::Reader reader( pBuffer, valueSize, false, TYPEREG_VERSION_1); RTTypeClass ret = reader.getTypeClass(); - + rtl_freeMemory(pBuffer); - - m_pImpl->m_t2TypeClass[name] = ret; + + m_pImpl->m_t2TypeClass[name] = ret; return ret; - } + } rtl_freeMemory(pBuffer); } } - } + } - return RT_TYPE_INVALID; -} + return RT_TYPE_INVALID; +} RTTypeClass RegistryTypeManager::getTypeClass(RegistryKey& rTypeKey) const { OString name = getTypeName(rTypeKey); - + if (m_pImpl->m_t2TypeClass.count(name) > 0) { - return m_pImpl->m_t2TypeClass[name]; + return m_pImpl->m_t2TypeClass[name]; } else { if (rTypeKey.isValid()) { - RegValueType valueType; - sal_uInt32 valueSize; + RegValueType valueType; + sal_uInt32 valueSize; if (!rTypeKey.getValueInfo(OUString(), &valueType, &valueSize)) { - sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); + sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); if (!rTypeKey.getValue(OUString(), pBuffer)) { typereg::Reader reader( pBuffer, valueSize, false, TYPEREG_VERSION_1); RTTypeClass ret = reader.getTypeClass(); - + rtl_freeMemory(pBuffer); - - m_pImpl->m_t2TypeClass[name] = ret; + + m_pImpl->m_t2TypeClass[name] = ret; return ret; - } + } rtl_freeMemory(pBuffer); } } - } + } - return RT_TYPE_INVALID; -} + return RT_TYPE_INVALID; +} void RegistryTypeManager::setBase(const OString& base) -{ +{ if (base.lastIndexOf('/') == (base.getLength() - 1)) m_pImpl->m_base += base.copy(0, base.lastIndexOf('/') - 1); @@ -319,14 +319,14 @@ void RegistryTypeManager::freeRegistries() delete *iter; ++iter; } -} +} -RegistryKey RegistryTypeManager::searchTypeKey(const OString& name_, sal_Bool * pIsExtraType ) +RegistryKey RegistryTypeManager::searchTypeKey(const OString& name_, sal_Bool * pIsExtraType ) const { OUString name( OStringToOUString(m_pImpl->m_base + "/" + name_, RTL_TEXTENCODING_UTF8) ); RegistryKey key, rootKey; - + RegistryList::const_iterator iter = m_pImpl->m_registries.begin(); while (iter != m_pImpl->m_registries.end()) { @@ -354,12 +354,12 @@ RegistryKey RegistryTypeManager::searchTypeKey(const OString& name_, sal_Bool * } } ++iter; - } - + } + return key; -} - -RegistryKeyList RegistryTypeManager::getTypeKeys(const ::rtl::OString& name_) const +} + +RegistryKeyList RegistryTypeManager::getTypeKeys(const ::rtl::OString& name_) const { RegistryKeyList keyList= RegistryKeyList(); OString tmpName; @@ -371,10 +371,10 @@ RegistryKeyList RegistryTypeManager::getTypeKeys(const ::rtl::OString& name_) co else tmpName = m_pImpl->m_base + "/" + name_; } - + OUString name( OStringToOUString(tmpName, RTL_TEXTENCODING_UTF8) ); RegistryKey key, rootKey; - + RegistryList::const_iterator iter = m_pImpl->m_registries.begin(); while (iter != m_pImpl->m_registries.end()) { @@ -398,8 +398,8 @@ RegistryKeyList RegistryTypeManager::getTypeKeys(const ::rtl::OString& name_) co } } ++iter; - } - + } + return keyList; } diff --git a/codemaker/source/codemaker/unotype.cxx b/codemaker/source/codemaker/unotype.cxx index cd3ce6d83752..7ce45a100d34 100644 --- a/codemaker/source/codemaker/unotype.cxx +++ b/codemaker/source/codemaker/unotype.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index c8da1873846d..ec7cadcafe93 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ rtl::OString typeToPrefix(TypeManager const & manager, rtl::OString const & type if (typeclass == RT_TYPE_INVALID || typeclass == RT_TYPE_PUBLISHED) return rtl::OString("_"); - + static char const * const typeclassPrefix[RT_TYPE_UNION + 1] = { "invalid", /* RT_TYPE_INVALID, is here only as placeholder */ "interface", /* RT_TYPE_INTERFACE */ @@ -103,9 +103,9 @@ rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace, else return s; } - + return tmpBuf.makeStringAndClear(); -} +} rtl::OString translateUnoToCppType( diff --git a/codemaker/source/commonjava/commonjava.cxx b/codemaker/source/commonjava/commonjava.cxx index fe2fad09eb43..6dcbd2619f3e 100644 --- a/codemaker/source/commonjava/commonjava.cxx +++ b/codemaker/source/commonjava/commonjava.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/source/cppumaker/cppumaker.cxx b/codemaker/source/cppumaker/cppumaker.cxx index 82edce406682..0d6048a99999 100644 --- a/codemaker/source/cppumaker/cppumaker.cxx +++ b/codemaker/source/cppumaker/cppumaker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,21 +69,21 @@ void produce( } void produceAllTypes(RegistryKey& rTypeKey, bool bIsExtraType, - TypeManager const & typeMgr, + TypeManager const & typeMgr, codemaker::GeneratedTypeSet & generated, CppuOptions* pOptions, sal_Bool bFullScope) throw( CannotDumpException ) { OString typeName = typeMgr.getTypeName(rTypeKey); - + produce(rTypeKey, bIsExtraType, typeMgr, generated, pOptions); RegistryKeyList typeKeys = typeMgr.getTypeKeys(typeName); RegistryKeyList::const_iterator iter = typeKeys.begin(); RegistryKey key, subKey; RegistryKeyArray subKeys; - + while (iter != typeKeys.end()) { key = (*iter).first; @@ -103,19 +103,19 @@ void produceAllTypes(RegistryKey& rTypeKey, bool bIsExtraType, typeMgr, generated, pOptions); } } - } + } ++iter; } } void produceAllTypes(const OString& typeName, - TypeManager const & typeMgr, + TypeManager const & typeMgr, codemaker::GeneratedTypeSet & generated, CppuOptions* pOptions, sal_Bool bFullScope) throw( CannotDumpException ) -{ +{ produce(typeName, typeMgr, generated, pOptions); RegistryKeyList typeKeys = typeMgr.getTypeKeys(typeName); @@ -141,8 +141,8 @@ void produceAllTypes(const OString& typeName, typeMgr, generated, pOptions); } } - } - + } + ++iter; } } @@ -153,7 +153,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { CppuOptions options; - try + try { if (!options.initOptions(argc, argv)) { @@ -167,7 +167,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } RegistryTypeManager typeMgr; - + if (!typeMgr.init(options.getInputFiles(), options.getExtraInputFiles())) { fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr()); @@ -180,7 +180,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } codemaker::GeneratedTypeSet generated; - try + try { if (options.isValid("-T")) { @@ -203,7 +203,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } else { tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/'); - if (tmpName.getLength() == 0) + if (tmpName.getLength() == 0) tmpName = "/"; else tmpName.replace('.', '/'); @@ -233,8 +233,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } catch( CannotDumpException& e) { - fprintf(stderr, "%s ERROR: %s\n", - options.getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + options.getProgramName().getStr(), e.m_message.getStr()); exit(99); } diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx index f1ec221b89e5..302a7ea3f3af 100644 --- a/codemaker/source/cppumaker/cppuoptions.cxx +++ b/codemaker/source/cppumaker/cppuoptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_codemaker.hxx" -#include <stdio.h> +#include <stdio.h> #include <string.h> #include "cppuoptions.hxx" @@ -37,16 +37,16 @@ using namespace rtl; -sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) +sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw( IllegalArgument ) { - sal_Bool ret = sal_True; - sal_uInt16 i=0; + sal_Bool ret = sal_True; + sal_uInt16 i=0; if (!bCmdFile) { bCmdFile = sal_True; - + m_program = av[0]; if (ac < 2) @@ -61,7 +61,7 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) i = 0; } - char *s=NULL; + char *s=NULL; for( ; i < ac; i++) { if (av[i][0] == '-') @@ -82,14 +82,14 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + m_options["-O"] = OString(s); break; case 'B': @@ -106,14 +106,14 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + m_options["-B"] = OString(s); break; case 'T': @@ -130,14 +130,14 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + if (m_options.count("-T") > 0) { OString tmp(m_options["-T"]); @@ -159,7 +159,7 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw IllegalArgument(tmp); } - + if (isValid("-C") || isValid("-CS")) { OString tmp("'-L' could not be combined with '-C' or '-CS' option"); @@ -199,7 +199,7 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw IllegalArgument(tmp); } - + if (isValid("-L") || isValid("-CS")) { OString tmp("'-C' could not be combined with '-L' or '-CS' option"); @@ -234,9 +234,9 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw IllegalArgument(tmp); } - + m_options["-G"] = OString(""); - break; + break; case 'X': // support for eXtra type rdbs { if (av[i][2] == '\0') @@ -252,18 +252,18 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + m_extra_input_files.push_back( s ); break; } - + default: throw IllegalArgument("the option is unknown" + OString(av[i])); } @@ -288,14 +288,14 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) rargc++; } fclose(cmdFile); - + ret = initOptions(rargc, rargv, bCmdFile); - - for (long j=0; j < rargc; j++) + + for (long j=0; j < rargc; j++) { free(rargv[j]); } - } + } } else { if (bCmdFile) @@ -311,14 +311,14 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) } m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding())); } - } + } } } + + return ret; +} - return ret; -} - -OString CppuOptions::prepareHelp() +OString CppuOptions::prepareHelp() { OString help("\nusing: "); help += m_program + " [-options] file_1 ... file_n\nOptions:\n"; @@ -327,7 +327,7 @@ OString CppuOptions::prepareHelp() help += " -T<name> = name specifies a type or a list of types. The output for this\n"; help += " [t1;...] type is generated. If no '-T' option is specified,\n"; help += " then output for all types is generated.\n"; - help += " Example: 'com.sun.star.uno.XInterface' is a valid type.\n"; + help += " Example: 'com.sun.star.uno.XInterface' is a valid type.\n"; help += " -B<name> = name specifies the base node. All types are searched under this\n"; help += " node. Default is the root '/' of the registry files.\n"; help += " -L = UNO type functions are generated lightweight, that means only\n"; @@ -341,18 +341,18 @@ OString CppuOptions::prepareHelp() help += " -Gc = generate only target files which content will be changed.\n"; help += " -X<file> = extra types which will not be taken into account for generation.\n"; help += prepareVersion(); - + return help; -} +} -OString CppuOptions::prepareVersion() +OString CppuOptions::prepareVersion() { OString version("\nSun Microsystems (R) "); version += m_program + " Version 2.0\n\n"; return version; -} - +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx index 567372e91c5d..94ca9ee0af2a 100644 --- a/codemaker/source/cppumaker/cppuoptions.hxx +++ b/codemaker/source/cppumaker/cppuoptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,16 +39,16 @@ public: ~CppuOptions() {} - sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) + sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ); - ::rtl::OString prepareHelp(); - - ::rtl::OString prepareVersion(); + ::rtl::OString prepareHelp(); + ::rtl::OString prepareVersion(); + protected: }; - + #endif // INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_CPPUOPTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index 22e1c6b01729..20359b0063ef 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoTy else return "::cppu::UnoUnsignedShortType"; } - + return trans[sort]; } @@ -246,7 +246,7 @@ sal_Bool CppuType::dumpFile(CppuOptions* pOptions, sTmpExt = ".tmp"; bHdl = sal_False; } - + OString sFileName = createFileNameFromType(sOutPath, sName, sExtension); if (sFileName.getLength() == 0) return sal_False; @@ -264,7 +264,7 @@ sal_Bool CppuType::dumpFile(CppuOptions* pOptions, FileStream oFile; oFile.createTempFile(sTmpDir); OString sTmpFileName; - + if(!oFile.isValid()) { OString message("cannot open "); @@ -274,13 +274,13 @@ sal_Bool CppuType::dumpFile(CppuOptions* pOptions, sTmpFileName = oFile.getName(); codemaker::cppumaker::Includes includes(m_typeMgr, m_dependencies, !bHdl); - if (bHdl) + if (bHdl) ret = dumpHFile(oFile, includes); else { addGetCppuTypeIncludes(includes); ret = dumpHxxFile(oFile, includes); } - + oFile.close(); if (ret) { @@ -289,7 +289,7 @@ sal_Bool CppuType::dumpFile(CppuOptions* pOptions, // remove existing type file if something goes wrong to ensure consistency if (fileExists(sFileName)) removeTypeFile(sFileName); - + // remove tmp file if something goes wrong removeTypeFile(sTmpFileName); } @@ -509,27 +509,27 @@ void CppuType::dumpNormalGetCppuType(FileStream& o) o << " >::get();\n\n"; } } - + sal_uInt32 count = getMemberCount(); if (count) { o << indent() << "typelib_TypeDescriptionReference * aMemberRefs[" << count << "];\n"; - + sal_uInt16 fieldCount = m_reader.getFieldCount(); RTFieldAccess access = RT_ACCESS_INVALID; OString fieldType, fieldName; OString scope = m_typeName.replace('/', '.'); OString modFieldType; StringSet generatedTypeSet; - StringSet::iterator findIter; + StringSet::iterator findIter; for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - + fieldName = rtl::OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = checkRealBaseType( @@ -571,7 +571,7 @@ void CppuType::dumpNormalGetCppuType(FileStream& o) { o << "0, " << count << ", "; } - + if (count) { o << " aMemberRefs );\n"; @@ -699,8 +699,8 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o) void CppuType::dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag) { - sal_uInt16 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; + sal_uInt16 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; StringSet aFinishedTypes; for (sal_uInt16 i=0; i < fieldCount; i++) @@ -798,10 +798,10 @@ sal_uInt32 CppuType::getInheritedMemberCount() return m_inheritedMemberCount; } -OString CppuType::getTypeClass(const OString& type, sal_Bool bCStyle) +OString CppuType::getTypeClass(const OString& type, sal_Bool bCStyle) { - OString typeName = (type.getLength() > 0 ? type : m_typeName); - RTTypeClass rtTypeClass = RT_TYPE_INVALID; + OString typeName = (type.getLength() > 0 ? type : m_typeName); + RTTypeClass rtTypeClass = RT_TYPE_INVALID; if (type.getLength() > 0) { @@ -978,15 +978,15 @@ void CppuType::dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDec m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE) return; -// if (m_typeMgr.getTypeClass(type) == RT_TYPE_TYPEDEF) -// { -// o << indent() << "get_" << type.replace('/', '_') << "_Type()"; -// } else -// { +// if (m_typeMgr.getTypeClass(type) == RT_TYPE_TYPEDEF) +// { +// o << indent() << "get_" << type.replace('/', '_') << "_Type()"; +// } else +// { o << indent() << "::cppu::UnoType< "; dumpType(o, type, false, false, false, true); o << " >::get()"; -// } +// } } if (bDecl) o << ";\n"; @@ -1039,13 +1039,13 @@ bool CppuType::passByReference(rtl::OString const & unoType) { } } -OString CppuType::resolveTypedefs(const OString& type) const +OString CppuType::resolveTypedefs(const OString& type) const { OString baseType(type); - RegistryKey key; - RTTypeClass typeClass; - sal_Bool isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); + RegistryKey key; + RTTypeClass typeClass; + sal_Bool isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); typereg::Reader reader; while (isTypeDef) @@ -1070,14 +1070,14 @@ OString CppuType::resolveTypedefs(const OString& type) const return baseType; } -OString CppuType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly) const +OString CppuType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly) const { sal_Int32 rank; rtl::OString baseType(codemaker::UnoType::decompose(type, &rank)); - RegistryKey key; - RTTypeClass typeClass; - sal_Bool mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); + RegistryKey key; + RTTypeClass typeClass; + sal_Bool mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); typereg::Reader reader; while (mustBeChecked) @@ -1282,8 +1282,8 @@ sal_Bool InterfaceType::dumpDeclaration(FileStream& o) { // rtl::OString cppName(translateUnoToCppIdentifier( // m_name, "interface", ITM_KEYWORDSONLY, &m_name)); - -// o << "\nclass SAL_NO_VTABLE " << cppName; + +// o << "\nclass SAL_NO_VTABLE " << cppName; o << "\nclass SAL_NO_VTABLE " << m_name; for (sal_Int16 i = 0; i < m_reader.getSuperTypeCount(); ++i) { @@ -1324,7 +1324,7 @@ sal_Bool InterfaceType::dumpHxxFile( // rtl::OString cppName(translateUnoToCppIdentifier( // m_name, "interface", ITM_KEYWORDSONLY, &m_name)); - + o << "\n::com::sun::star::uno::Type const & " << scopedCppName(m_typeName) << "::static_type(void *) {\n"; @@ -1391,7 +1391,7 @@ void InterfaceType::dumpMethods(FileStream& o) OString methodName, returnType, paramType, paramName; sal_uInt16 paramCount = 0; RTMethodMode methodMode = RT_MODE_INVALID; - RTParamMode paramMode = RT_PARAM_INVALID; + RTParamMode paramMode = RT_PARAM_INVALID; sal_Bool bRef = sal_False; sal_Bool bConst = sal_False; @@ -1428,9 +1428,9 @@ void InterfaceType::dumpMethods(FileStream& o) o << " SAL_CALL " << methodName << "( "; for (sal_uInt16 j=0; j < paramCount; j++) { - paramName = rtl::OUStringToOString( + paramName = rtl::OUStringToOString( m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8); - paramType = rtl::OUStringToOString( + paramType = rtl::OUStringToOString( m_reader.getMethodParameterTypeName(i, j), RTL_TEXTENCODING_UTF8); paramMode = m_reader.getMethodParameterFlags(i, j); @@ -1451,7 +1451,7 @@ void InterfaceType::dumpMethods(FileStream& o) } dumpType(o, paramType, bConst, bRef); -// o << " " << translateUnoToCppIdentifier( +// o << " " << translateUnoToCppIdentifier( // paramName, "param", ITM_KEYWORDSONLY, NULL); o << " " << paramName; @@ -1469,7 +1469,7 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o) o << indent() << "static typelib_TypeDescriptionReference * the_type = 0;\n"; - + o << indent() << "if ( !the_type )\n" << indent() << "{\n"; inc(); sal_Int16 nBases = m_reader.getSuperTypeCount(); @@ -1496,7 +1496,7 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o) o << indent() << "typelib_static_mi_interface_type_init( &the_type, \"" << m_typeName.replace('/', '.') << "\", " << nBases << ", "; - + if ( nBases > 0 ) { o << "aSuperTypes );\n"; @@ -1633,7 +1633,7 @@ void InterfaceType::dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index) RTFieldAccess access = RT_ACCESS_INVALID; OString fieldName; - OString scope = m_typeName.replace('/', '.'); + OString scope = m_typeName.replace('/', '.'); for (sal_uInt16 i=0; i < fieldCount; i++) { @@ -1659,9 +1659,9 @@ void InterfaceType::dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index) void InterfaceType::dumpCppuMethodRefs(FileStream& o, sal_uInt32& index) { - sal_uInt16 methodCount = m_reader.getMethodCount(); - OString methodName; - OString scope = m_typeName.replace('/', '.'); + sal_uInt16 methodCount = m_reader.getMethodCount(); + OString methodName; + OString scope = m_typeName.replace('/', '.'); for (sal_uInt16 i = 0; i < methodCount; i++) { @@ -1793,23 +1793,23 @@ sal_uInt32 InterfaceType::getInheritedMemberCount() { if (m_inheritedMemberCount == 0) { - m_inheritedMemberCount = checkInheritedMemberCount(0); + m_inheritedMemberCount = checkInheritedMemberCount(0); } - + return m_inheritedMemberCount; -} +} void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index) { sal_uInt16 fieldCount = m_reader.getFieldCount(); - + RTFieldAccess access = RT_ACCESS_INVALID; OString fieldName; - OString fieldType; - OString scope = m_typeName.replace('/', '.'); + OString fieldType; + OString scope = m_typeName.replace('/', '.'); sal_uInt32 absoluteIndex = index; - + if (m_hasAttributes) { o << "\n" << indent() << "typelib_InterfaceAttributeTypeDescription * pAttribute = 0;\n"; @@ -1817,7 +1817,7 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index) for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; @@ -1830,7 +1830,7 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index) o << indent() << "{\n"; inc(); - o << indent() << "::rtl::OUString sAttributeType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\"" + o << indent() << "::rtl::OUString sAttributeType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\"" << fieldType.replace('/', '.') << "\") );\n"; sal_Int32 getExceptions = dumpAttributeExceptionTypeNames( o, "get", name, RT_MODE_ATTRIBUTE_GET); @@ -1841,7 +1841,7 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index) " &pAttribute,\n"); inc(); o << indent() << absoluteIndex++ << ", sAttributeName" << i << ".pData,\n"; - o << indent() << "(typelib_TypeClass)" << getTypeClass(fieldType) + o << indent() << "(typelib_TypeClass)" << getTypeClass(fieldType) << ", sAttributeType" << i << ".pData,\n"; o << indent() << "sal_" << ((access & RT_ACCESS_READONLY) == 0 ? "False" : "True") << ", " @@ -1853,21 +1853,21 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index) o << indent() << "typelib_typedescription_register( (typelib_TypeDescription**)&pAttribute );\n"; dec(); o << indent() << "}\n"; - } + } o << indent() << "typelib_typedescription_release( (typelib_TypeDescription*)pAttribute );\n"; index = absoluteIndex; } -} +} void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index) { - sal_uInt16 methodCount = m_reader.getMethodCount(); - OString methodName, returnType, paramType, paramName; - sal_uInt16 paramCount = 0; - RTMethodMode methodMode = RT_MODE_INVALID; - RTParamMode paramMode = RT_PARAM_INVALID; - sal_Bool bWithRuntimeException = sal_True; + sal_uInt16 methodCount = m_reader.getMethodCount(); + OString methodName, returnType, paramType, paramName; + sal_uInt16 paramCount = 0; + RTMethodMode methodMode = RT_MODE_INVALID; + RTParamMode paramMode = RT_PARAM_INVALID; + sal_Bool bWithRuntimeException = sal_True; sal_uInt32 absoluteIndex = index; @@ -1894,36 +1894,36 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index) if ( methodName.equals("acquire") || methodName.equals("release") ) { - bWithRuntimeException = sal_False; + bWithRuntimeException = sal_False; } o << indent() << "{\n"; inc(); - + if (paramCount) { - o << indent() << "typelib_Parameter_Init aParameters[" << paramCount << "];\n"; + o << indent() << "typelib_Parameter_Init aParameters[" << paramCount << "];\n"; } sal_uInt16 j; for (j=0; j < paramCount; j++) { - paramName = rtl::OUStringToOString( + paramName = rtl::OUStringToOString( m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8); - paramType = checkRealBaseType( + paramType = checkRealBaseType( rtl::OUStringToOString( m_reader.getMethodParameterTypeName(i, j), RTL_TEXTENCODING_UTF8), sal_True); paramMode = m_reader.getMethodParameterFlags(i, j); - - o << indent() << "::rtl::OUString sParamName" << j << "( RTL_CONSTASCII_USTRINGPARAM(\"" + + o << indent() << "::rtl::OUString sParamName" << j << "( RTL_CONSTASCII_USTRINGPARAM(\"" << paramName << "\") );\n"; - o << indent() << "::rtl::OUString sParamType" << j << "( RTL_CONSTASCII_USTRINGPARAM(\"" + o << indent() << "::rtl::OUString sParamType" << j << "( RTL_CONSTASCII_USTRINGPARAM(\"" << paramType.replace('/', '.') << "\") );\n"; o << indent() << "aParameters[" << j << "].pParamName = sParamName" << j << ".pData;\n"; - o << indent() << "aParameters[" << j << "].eTypeClass = (typelib_TypeClass)" + o << indent() << "aParameters[" << j << "].eTypeClass = (typelib_TypeClass)" << getTypeClass(paramType) << ";\n"; o << indent() << "aParameters[" << j << "].pTypeName = sParamType" << j << ".pData;\n"; @@ -1940,49 +1940,49 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index) sal_Int32 excCount = dumpExceptionTypeNames( o, "", i, bWithRuntimeException); - - o << indent() << "::rtl::OUString sReturnType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\"" + + o << indent() << "::rtl::OUString sReturnType" << i << "( RTL_CONSTASCII_USTRINGPARAM(\"" << returnType.replace('/', '.') << "\") );\n"; o << indent() << "typelib_typedescription_newInterfaceMethod( &pMethod,\n"; inc(); o << indent() << absoluteIndex++ << ", "; if (methodMode == RT_MODE_ONEWAY || methodMode == RT_MODE_ONEWAY_CONST) o << "sal_True,\n"; - else + else o << "sal_False,\n"; o << indent() << "sMethodName" << i << ".pData,\n"; - o << indent() << "(typelib_TypeClass)" << getTypeClass(returnType) + o << indent() << "(typelib_TypeClass)" << getTypeClass(returnType) << ", sReturnType" << i << ".pData,\n"; if (paramCount) - o << indent() << paramCount << ", aParameters,\n"; - else - o << indent() << "0, 0,\n"; + o << indent() << paramCount << ", aParameters,\n"; + else + o << indent() << "0, 0,\n"; o << indent() << excCount << ", " - << (excCount == 0 ? "0" : "the_Exceptions") << " );\n"; + << (excCount == 0 ? "0" : "the_Exceptions") << " );\n"; dec(); o << indent() << "typelib_typedescription_register( (typelib_TypeDescription**)&pMethod );\n"; - dec(); + dec(); o << indent() << "}\n"; - } + } o << indent() << "typelib_typedescription_release( (typelib_TypeDescription*)pMethod );\n"; - index = absoluteIndex; + index = absoluteIndex; } -} +} void InterfaceType::dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag) { sal_uInt16 fieldCount = m_reader.getFieldCount(); - + RTFieldAccess access = RT_ACCESS_INVALID; OString fieldName; - OString fieldType; + OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; @@ -1990,21 +1990,21 @@ void InterfaceType::dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTy m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = rtl::OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); - - if (pFinishedTypes->count(fieldType) == 0) + + if (pFinishedTypes->count(fieldType) == 0) { pFinishedTypes->insert(fieldType); - dumpCppuGetType(o, fieldType, sal_True, eDeclFlag); + dumpCppuGetType(o, fieldType, sal_True, eDeclFlag); } - } -} + } +} void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag) { - sal_uInt16 methodCount = m_reader.getMethodCount(); - OString returnType, paramType, excType; - sal_uInt16 paramCount = 0; - sal_uInt16 excCount = 0; + sal_uInt16 methodCount = m_reader.getMethodCount(); + OString returnType, paramType, excType; + sal_uInt16 paramCount = 0; + sal_uInt16 excCount = 0; for (sal_uInt16 i=0; i < methodCount; i++) { @@ -2012,20 +2012,20 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes m_reader.getMethodReturnTypeName(i), RTL_TEXTENCODING_UTF8); paramCount = m_reader.getMethodParameterCount(i); excCount = m_reader.getMethodExceptionCount(i); - - if (pFinishedTypes->count(returnType) == 0) + + if (pFinishedTypes->count(returnType) == 0) { pFinishedTypes->insert(returnType); - dumpCppuGetType(o, returnType, sal_True, eDeclFlag); + dumpCppuGetType(o, returnType, sal_True, eDeclFlag); } sal_uInt16 j; for (j=0; j < paramCount; j++) { - paramType = rtl::OUStringToOString( + paramType = rtl::OUStringToOString( m_reader.getMethodParameterTypeName(i, j), RTL_TEXTENCODING_UTF8); - if (pFinishedTypes->count(paramType) == 0) + if (pFinishedTypes->count(paramType) == 0) { pFinishedTypes->insert(paramType); dumpCppuGetType(o, paramType, sal_True, eDeclFlag); @@ -2037,14 +2037,14 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes excType = rtl::OUStringToOString( m_reader.getMethodExceptionTypeName(i, j), RTL_TEXTENCODING_UTF8); - if (pFinishedTypes->count(excType) == 0) + if (pFinishedTypes->count(excType) == 0) { pFinishedTypes->insert(excType); dumpCppuGetType(o, excType, sal_True, eDeclFlag); } } - } -} + } +} void InterfaceType::dumpExceptionSpecification( FileStream & out, sal_uInt32 methodIndex, bool runtimeException) @@ -2164,8 +2164,8 @@ ConstantsType::ConstantsType(typereg::Reader& typeReader, ConstantsType::~ConstantsType() { - -} + +} sal_Bool ConstantsType::dump(CppuOptions* pOptions) throw( CannotDumpException ) @@ -2177,11 +2177,11 @@ sal_Bool ConstantsType::dump(CppuOptions* pOptions) if (pOptions->isValid("-U")) m_cppuTypeDynamic = sal_True; - + OString outPath; if (pOptions->isValid("-O")) outPath = pOptions->getOption("-O"); - + return dumpFiles(pOptions, outPath); } @@ -2222,22 +2222,22 @@ sal_Bool ConstantsType::dumpHFile( sal_Bool ConstantsType::dumpDeclaration(FileStream& o) throw( CannotDumpException ) { - sal_uInt16 fieldCount = m_reader.getFieldCount(); - OString fieldName; - OString fieldType; + sal_uInt16 fieldCount = m_reader.getFieldCount(); + OString fieldName; + OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { fieldName = rtl::OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = rtl::OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); - + o << "static const "; - dumpType(o, fieldType); + dumpType(o, fieldType); o << " " << fieldName << " = "; dumpConstantValue(o, i); o << ";\n"; - } + } return sal_True; } @@ -2245,7 +2245,7 @@ sal_Bool ConstantsType::dumpDeclaration(FileStream& o) sal_Bool ConstantsType::hasConstants() { return m_reader.getFieldCount() > 0; -} +} sal_Bool ConstantsType::dumpHxxFile( FileStream& o, codemaker::cppumaker::Includes &) @@ -2260,7 +2260,7 @@ sal_Bool ConstantsType::dumpHxxFile( OString headerDefine(dumpHeaderDefine(o, "HPP", bSpecialDefine)); o << "\n"; - + rtl::OString suffix; if (bSpecialDefine) { suffix = m_name; @@ -2284,8 +2284,8 @@ ModuleType::ModuleType(typereg::Reader& typeReader, ModuleType::~ModuleType() { - -} + +} bool ModuleType::dumpFiles( CppuOptions * options, rtl::OString const & outPath) @@ -2324,8 +2324,8 @@ StructureType::StructureType(typereg::Reader& typeReader, StructureType::~StructureType() { - -} + +} sal_Bool StructureType::dumpHFile( FileStream& o, codemaker::cppumaker::Includes & includes) @@ -2353,7 +2353,7 @@ sal_Bool StructureType::dumpHFile( dumpTemplateHead(o); o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( "; - dumpType(o, m_typeName, sal_True, sal_False); + dumpType(o, m_typeName, sal_True, sal_False); dumpTemplateParameters(o); o << "* );\n\n"; @@ -2366,7 +2366,7 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o) throw( CannotDumpException ) { o << "\n#ifdef SAL_W32\n" - << "# pragma pack(push, 8)\n" + << "# pragma pack(push, 8)\n" << "#elif defined(SAL_OS2)\n" << "# pragma pack(8)\n" << "#endif\n\n"; @@ -2458,7 +2458,7 @@ sal_Bool StructureType::dumpHxxFile( { OString headerDefine(dumpHeaderDefine(o, "HPP")); o << "\n"; - + includes.dump(o, &m_typeName); o << "\n"; @@ -2483,16 +2483,16 @@ sal_Bool StructureType::dumpHxxFile( o << indent() << ": " << scopedCppName(superType) << "()\n"; first = sal_False; } - - sal_uInt16 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; + + sal_uInt16 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; @@ -2527,7 +2527,7 @@ sal_Bool StructureType::dumpHxxFile( for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; @@ -2535,21 +2535,21 @@ sal_Bool StructureType::dumpHxxFile( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = rtl::OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); - + if (superHasMember) o << ", "; else superHasMember = sal_True; - + if ((access & RT_ACCESS_PARAMETERIZED_TYPE) != 0) { dumpTypeParameterName(o, fieldType); o << " const &"; } else { dumpType(o, fieldType, sal_True, sal_True); } -// o << " __" << fieldName; +// o << " __" << fieldName; o << " " << fieldName << "_"; - } + } o << ") SAL_THROW( () )\n"; inc(); @@ -2565,23 +2565,23 @@ sal_Bool StructureType::dumpHxxFile( for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; fieldName = rtl::OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - + if (first) { first = sal_False; o << indent() << ": "; } else o << indent() << ", "; - -// o << fieldName << "(__" << fieldName << ")\n"; + +// o << fieldName << "(__" << fieldName << ")\n"; o << fieldName << "(" << fieldName << "_)\n"; - } + } dec(); o << "{\n}\n\n"; @@ -2935,7 +2935,7 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType, if (superType.getLength() > 0) { typereg::Reader aSuperReader(m_typeMgr.getTypeReader(superType)); - + if (aSuperReader.isValid()) { rtl::OString superSuper; @@ -2945,14 +2945,14 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType, } hasMember = dumpSuperMember(o, superSuper, bWithType); - sal_uInt16 fieldCount = aSuperReader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; + sal_uInt16 fieldCount = aSuperReader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { access = aSuperReader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; @@ -2960,8 +2960,8 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType, aSuperReader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = rtl::OUStringToOString( aSuperReader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); - - if (hasMember) + + if (hasMember) { o << ", "; } else @@ -2971,17 +2971,17 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType, if (bWithType) { - dumpType(o, fieldType, sal_True, sal_True); + dumpType(o, fieldType, sal_True, sal_True); o << " "; - } -// o << "__" << fieldName; + } +// o << "__" << fieldName; o << fieldName << "_"; } } } - + return hasMember; -} +} void StructureType::addLightGetCppuTypeIncludes( codemaker::cppumaker::Includes & includes) const @@ -3086,8 +3086,8 @@ ExceptionType::ExceptionType(typereg::Reader& typeReader, ExceptionType::~ExceptionType() { - -} + +} sal_Bool ExceptionType::dumpHFile( FileStream& o, codemaker::cppumaker::Includes & includes) @@ -3105,7 +3105,7 @@ sal_Bool ExceptionType::dumpHFile( } dumpDeclaration(o); - + if (codemaker::cppumaker::dumpNamespaceClose(o, m_typeName, false)) { o << "\n"; } @@ -3114,7 +3114,7 @@ sal_Bool ExceptionType::dumpHFile( << "class Type;\n} } } }\n\n"; o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( "; - dumpType(o, m_typeName, sal_True, sal_False); + dumpType(o, m_typeName, sal_True, sal_False); o << "* ) SAL_THROW( () );\n\n"; o << "#endif // "<< headerDefine << "\n"; @@ -3134,31 +3134,31 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o) } if (superType.getLength() > 0) o << " : public " << scopedCppName(superType); - + o << "\n{\npublic:\n"; inc(); o << indent() << "inline CPPU_GCC_DLLPRIVATE " << m_name << "() SAL_THROW( () );\n\n"; - - sal_uInt16 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; - sal_uInt16 i = 0; - + + sal_uInt16 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; + sal_uInt16 i = 0; + if (fieldCount > 0 || getInheritedMemberCount() > 0) { o << indent() << "inline CPPU_GCC_DLLPRIVATE " << m_name << "("; - + sal_Bool superHasMember = dumpSuperMember(o, superType, sal_True); - + for (i=0; i < fieldCount; i++) { access = m_reader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; - + fieldName = rtl::OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = rtl::OUStringToOString( @@ -3169,10 +3169,10 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o) else superHasMember = sal_True; - dumpType(o, fieldType, sal_True, sal_True); -// o << " __" << fieldName; + dumpType(o, fieldType, sal_True, sal_True); +// o << " __" << fieldName; o << " " << fieldName << "_"; - } + } o << ") SAL_THROW( () );\n\n"; } o << indent() << "inline CPPU_GCC_DLLPRIVATE " << m_name << "(" << m_name @@ -3194,7 +3194,7 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o) m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); o << indent(); - dumpType(o, fieldType); + dumpType(o, fieldType); o << " " << fieldName; if (i == 0 && superType.getLength() && !fieldType.equals("double") && !fieldType.equals("hyper") && !fieldType.equals("unsigned hyper")) @@ -3204,7 +3204,7 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o) o << ";\n"; } - + dec(); o << "};\n\n"; @@ -3217,11 +3217,11 @@ sal_Bool ExceptionType::dumpHxxFile( { OString headerDefine(dumpHeaderDefine(o, "HPP")); o << "\n"; - + addDefaultHxxIncludes(includes); includes.dump(o, &m_typeName); o << "\n"; - + if (codemaker::cppumaker::dumpNamespaceOpen(o, m_typeName, false)) { o << "\n"; } @@ -3240,16 +3240,16 @@ sal_Bool ExceptionType::dumpHxxFile( o << indent() << ": " << scopedCppName(superType) << "()\n"; first = sal_False; } - - sal_uInt16 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; + + sal_uInt16 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; @@ -3289,7 +3289,7 @@ sal_Bool ExceptionType::dumpHxxFile( for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; @@ -3297,16 +3297,16 @@ sal_Bool ExceptionType::dumpHxxFile( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = rtl::OUStringToOString( m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); - + if (superHasMember) o << ", "; else superHasMember = sal_True; - - dumpType(o, fieldType, sal_True, sal_True); -// o << " __" << fieldName; + + dumpType(o, fieldType, sal_True, sal_True); +// o << " __" << fieldName; o << " " << fieldName << "_"; - } + } o << ") SAL_THROW( () )\n"; inc(); @@ -3322,23 +3322,23 @@ sal_Bool ExceptionType::dumpHxxFile( for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; fieldName = rtl::OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); - + if (first) { first = sal_False; o << indent() << ": "; } else o << indent() << ", "; - -// o << fieldName << "(__" << fieldName << ")\n"; + +// o << fieldName << "(__" << fieldName << ")\n"; o << fieldName << "(" << fieldName << "_)\n"; - } + } dec(); if ( !m_cppuTypeDynamic ) @@ -3407,7 +3407,7 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType, if (superType.getLength() > 0) { typereg::Reader aSuperReader(m_typeMgr.getTypeReader(superType)); - + if (aSuperReader.isValid()) { rtl::OString superSuper; @@ -3417,14 +3417,14 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType, } hasMember = dumpSuperMember(o, superSuper, bWithType); - sal_uInt16 fieldCount = aSuperReader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; + sal_uInt16 fieldCount = aSuperReader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { access = aSuperReader.getFieldFlags(i); - + if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID) continue; @@ -3432,8 +3432,8 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType, aSuperReader.getFieldName(i), RTL_TEXTENCODING_UTF8); fieldType = rtl::OUStringToOString( aSuperReader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8); - - if (hasMember) + + if (hasMember) { o << ", "; } else @@ -3443,17 +3443,17 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType, if (bWithType) { - dumpType(o, fieldType, sal_True, sal_True); + dumpType(o, fieldType, sal_True, sal_True); o << " "; - } -// o << "__" << fieldName; + } +// o << "__" << fieldName; o << fieldName << "_"; } } } - + return hasMember; -} +} //************************************************************************* // EnumType @@ -3467,8 +3467,8 @@ EnumType::EnumType(typereg::Reader& typeReader, EnumType::~EnumType() { - -} + +} sal_Bool EnumType::dumpHFile( FileStream& o, codemaker::cppumaker::Includes & includes) @@ -3495,7 +3495,7 @@ sal_Bool EnumType::dumpHFile( << "class Type;\n} } } }\n\n"; o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( "; - dumpType(o, m_typeName, sal_True, sal_False); + dumpType(o, m_typeName, sal_True, sal_False); o << "* ) SAL_THROW( () );\n\n"; o << "#endif // "<< headerDefine << "\n"; @@ -3509,11 +3509,11 @@ sal_Bool EnumType::dumpDeclaration(FileStream& o) o << "\nenum " << m_name << "\n{\n"; inc(); - sal_uInt16 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - RTConstValue constValue; - OString fieldName; - sal_Int32 value=0; + sal_uInt16 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + RTConstValue constValue; + OString fieldName; + sal_Int32 value=0; for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldFlags(i); @@ -3524,17 +3524,17 @@ sal_Bool EnumType::dumpDeclaration(FileStream& o) fieldName = rtl::OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8); constValue = m_reader.getFieldValue(i); - + if (constValue.m_type == RT_TYPE_INT32) value = constValue.m_value.aLong; else value++; - + o << indent() << m_name << "_" << fieldName << " = " << value << ",\n"; - } - + } + o << indent() << m_name << "_MAKE_FIXED_SIZE = SAL_MAX_ENUM\n"; - + dec(); o << "};\n\n"; @@ -3547,7 +3547,7 @@ sal_Bool EnumType::dumpHxxFile( { OString headerDefine(dumpHeaderDefine(o, "HPP")); o << "\n"; - + addDefaultHxxIncludes(includes); includes.dump(o, &m_typeName); o << "\n"; @@ -3573,7 +3573,7 @@ void EnumType::dumpNormalGetCppuType(FileStream& o) o << indent() << "\"" << m_typeName.replace('/', '.') << "\",\n" << indent() << scopedCppName(m_typeName) << "_" << rtl::OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8) - << " );\n"; + << " );\n"; dec(31); dec(); o << indent() << "}\n"; @@ -3595,7 +3595,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "if (the_pType == 0)\n" << indent() << "{\n"; inc(); - o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\"" + o << indent() << "::rtl::OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM(\"" << m_typeName.replace('/', '.') << "\") );\n\n"; o << indent() << "// Start inline typedescription generation\n" @@ -3607,7 +3607,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o) for (i = 0; i < count; i++) { o << indent() << "::rtl::OUString sEnumValue" << i - << "( RTL_CONSTASCII_USTRINGPARAM(\"" + << "( RTL_CONSTASCII_USTRINGPARAM(\"" << rtl::OUStringToOString( m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8) << "\") );\n"; @@ -3648,7 +3648,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o) o << indent() << "static ::com::sun::star::uno::Type the_staticType( " << getTypeClass(m_typeName) << ", sTypeName );\n"; o << indent() << "the_pType = &the_staticType;\n"; - + dec(); o << indent() << "}\n"; dec(); @@ -3670,8 +3670,8 @@ TypeDefType::TypeDefType(typereg::Reader& typeReader, TypeDefType::~TypeDefType() { - -} + +} sal_Bool TypeDefType::dumpHFile( FileStream& o, codemaker::cppumaker::Includes & includes) @@ -3694,10 +3694,10 @@ sal_Bool TypeDefType::dumpHFile( o << "\n"; } -// o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n" -// << "class Type;\n} } } }\n\n"; -// o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << m_typeName.replace('/', '_') -// << "_Type( ) SAL_THROW( () );\n\n"; +// o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n" +// << "class Type;\n} } } }\n\n"; +// o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << m_typeName.replace('/', '_') +// << "_Type( ) SAL_THROW( () );\n\n"; o << "#endif // "<< headerDefine << "\n"; @@ -3723,11 +3723,11 @@ sal_Bool TypeDefType::dumpHxxFile( { OString headerDefine(dumpHeaderDefine(o, "HPP")); o << "\n"; - + addDefaultHxxIncludes(includes); includes.dump(o, &m_typeName); o << "\n"; - + o << "\n#endif // "<< headerDefine << "\n"; return sal_True; } @@ -4207,7 +4207,7 @@ sal_Bool SingletonType::dumpHxxFile( // produceType //************************************************************************* bool produceType(const OString& typeName, - TypeManager const & typeMgr, + TypeManager const & typeMgr, codemaker::GeneratedTypeSet & generated, CppuOptions* pOptions) throw( CannotDumpException ) @@ -4217,7 +4217,7 @@ bool produceType(const OString& typeName, { return true; } - + sal_Bool bIsExtraType = sal_False; typereg::Reader reader(typeMgr.getTypeReader(typeName, &bIsExtraType)); if (bIsExtraType) { @@ -4336,12 +4336,12 @@ bool produceType(const OString& typeName, OSL_ASSERT(false); break; } - + return ret; } bool produceType(RegistryKey& rTypeKey, bool bIsExtraType, - TypeManager const & typeMgr, + TypeManager const & typeMgr, codemaker::GeneratedTypeSet & generated, CppuOptions* pOptions) throw( CannotDumpException ) @@ -4353,7 +4353,7 @@ bool produceType(RegistryKey& rTypeKey, bool bIsExtraType, { return true; } - + if (bIsExtraType) { generated.add(typeName); return true; @@ -4471,7 +4471,7 @@ bool produceType(RegistryKey& rTypeKey, bool bIsExtraType, OSL_ASSERT(false); break; } - + return ret; } @@ -4497,11 +4497,11 @@ OString scopedName(const OString& scope, const OString& type, token, "module", ITM_KEYWORDSONLY)); else tmpBuf.append(translateUnoToCppIndentifier( - token, "interface", ITM_KEYWORDSONLY)); + token, "interface", ITM_KEYWORDSONLY)); } while( nPos != -1 ); - + return tmpBuf.makeStringAndClear(); -} +} */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx index 2823e9c30159..9932bf70aad4 100644 --- a/codemaker/source/cppumaker/cpputype.hxx +++ b/codemaker/source/cppumaker/cpputype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ enum CppuTypeDecl CPPUTYPEDECL_ALLTYPES, CPPUTYPEDECL_NOINTERFACES, CPPUTYPEDECL_ONLYINTERFACES -}; +}; class CppuOptions; class FileStream; @@ -68,7 +68,7 @@ public: const ::rtl::OString& sExtension, const ::rtl::OString& sName, const ::rtl::OString& sOutPath ) - throw( CannotDumpException ); + throw( CannotDumpException ); void dumpDependedTypes( codemaker::GeneratedTypeSet & generated, CppuOptions * options); virtual sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ) = 0; @@ -85,28 +85,28 @@ public: virtual void dumpType(FileStream& o, const ::rtl::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); + ::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); ::rtl::OString typeToIdentifier(const ::rtl::OString& type); - void dumpConstantValue(FileStream& o, sal_uInt16 index); + void dumpConstantValue(FileStream& o, sal_uInt16 index); virtual sal_uInt32 getMemberCount(); - virtual sal_uInt32 getInheritedMemberCount(); + virtual sal_uInt32 getInheritedMemberCount(); - void inc(sal_Int32 num=4); - void dec(sal_Int32 num=4); - ::rtl::OString indent() const; + void inc(sal_Int32 num=4); + void dec(sal_Int32 num=4); + ::rtl::OString indent() const; protected: virtual sal_uInt32 checkInheritedMemberCount( const typereg::Reader* pReader); bool passByReference(rtl::OString const & unoType); - ::rtl::OString resolveTypedefs(const ::rtl::OString& type) const; - ::rtl::OString checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False) const; - void dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag); + ::rtl::OString resolveTypedefs(const ::rtl::OString& type) const; + ::rtl::OString checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False) const; + void dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag); codemaker::cpp::IdentifierTranslationMode isGlobal() const; @@ -140,13 +140,13 @@ protected: FileStream & out, bool parameterized, rtl::OUString const & type) const; protected: - sal_uInt32 m_inheritedMemberCount; + sal_uInt32 m_inheritedMemberCount; - sal_Bool m_cppuTypeLeak; - sal_Bool m_cppuTypeDynamic; - sal_Int32 m_indentLength; - ::rtl::OString m_typeName; - ::rtl::OString m_name; + sal_Bool m_cppuTypeLeak; + sal_Bool m_cppuTypeDynamic; + sal_Int32 m_indentLength; + ::rtl::OString m_typeName; + ::rtl::OString m_name; typereg::Reader m_reader; TypeManager const & m_typeMgr; codemaker::Dependencies m_dependencies; @@ -165,23 +165,23 @@ public: virtual ~InterfaceType(); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); - sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); - void dumpAttributes(FileStream& o); - void dumpMethods(FileStream& o); - void dumpNormalGetCppuType(FileStream& o); - void dumpComprehensiveGetCppuType(FileStream& o); - void dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index); - void dumpCppuMethodRefs(FileStream& o, sal_uInt32& index); - void dumpCppuAttributes(FileStream& o, sal_uInt32& index); - void dumpCppuMethods(FileStream& o, sal_uInt32& index); - void dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag); - void dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag ); + void dumpAttributes(FileStream& o); + void dumpMethods(FileStream& o); + void dumpNormalGetCppuType(FileStream& o); + void dumpComprehensiveGetCppuType(FileStream& o); + void dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index); + void dumpCppuMethodRefs(FileStream& o, sal_uInt32& index); + void dumpCppuAttributes(FileStream& o, sal_uInt32& index); + void dumpCppuMethods(FileStream& o, sal_uInt32& index); + void dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag); + void dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CppuTypeDecl eDeclFlag ); - sal_uInt32 getMemberCount(); - sal_uInt32 getInheritedMemberCount(); + sal_uInt32 getMemberCount(); + sal_uInt32 getInheritedMemberCount(); protected: virtual void addSpecialDependencies(); @@ -189,12 +189,12 @@ protected: virtual void addComprehensiveGetCppuTypeIncludes( codemaker::cppumaker::Includes & includes) const; - sal_uInt32 checkInheritedMemberCount(const typereg::Reader* pReader); + sal_uInt32 checkInheritedMemberCount(const typereg::Reader* pReader); protected: - sal_uInt32 m_inheritedMemberCount; - sal_Bool m_hasAttributes; - sal_Bool m_hasMethods; + sal_uInt32 m_inheritedMemberCount; + sal_Bool m_hasAttributes; + sal_Bool m_hasMethods; private: void dumpExceptionSpecification( @@ -225,12 +225,12 @@ public: virtual ~ConstantsType(); - virtual sal_Bool dump(CppuOptions* pOptions) throw( CannotDumpException ); + virtual sal_Bool dump(CppuOptions* pOptions) throw( CannotDumpException ); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); - sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); - sal_Bool hasConstants(); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + sal_Bool hasConstants(); }; class ModuleType : public ConstantsType @@ -255,9 +255,9 @@ public: virtual ~StructureType(); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); - sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); virtual void dumpLightGetCppuType(FileStream & out); @@ -265,7 +265,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 ::rtl::OString& super, sal_Bool bWithType); protected: virtual void addLightGetCppuTypeIncludes( @@ -293,11 +293,11 @@ public: virtual ~ExceptionType(); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); - sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + 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 ::rtl::OString& super, sal_Bool bWithType); }; class EnumType : public CppuType @@ -309,12 +309,12 @@ public: virtual ~EnumType(); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); - sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); - void dumpNormalGetCppuType(FileStream& o); - void dumpComprehensiveGetCppuType(FileStream& o); + void dumpNormalGetCppuType(FileStream& o); + void dumpComprehensiveGetCppuType(FileStream& o); }; class TypeDefType : public CppuType @@ -326,9 +326,9 @@ public: virtual ~TypeDefType(); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); - sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); }; class ConstructiveType: public CppuType { @@ -385,23 +385,23 @@ public: }; bool produceType(const ::rtl::OString& typeName, - TypeManager const & typeMgr, + TypeManager const & typeMgr, codemaker::GeneratedTypeSet & generated, CppuOptions* pOptions) throw( CannotDumpException ); bool produceType(RegistryKey& typeName, bool bIsExtraType, - TypeManager const & typeMgr, + TypeManager const & typeMgr, codemaker::GeneratedTypeSet & generated, CppuOptions* pOptions) throw( CannotDumpException ); /** - * This function returns a C++ scoped name, represents the namespace + * This function returns a C++ scoped name, represents the namespace * scoping of this type, e.g. com:.sun::star::uno::XInterface. */ -// ::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type, -// sal_Bool bNoNameSpace=sal_False); +// ::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type, +// sal_Bool bNoNameSpace=sal_False); #endif // INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_CPPUTYPE_HXX diff --git a/codemaker/source/cppumaker/dumputils.cxx b/codemaker/source/cppumaker/dumputils.cxx index 05f178eed2fe..c74636af78e9 100644 --- a/codemaker/source/cppumaker/dumputils.cxx +++ b/codemaker/source/cppumaker/dumputils.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,7 +85,7 @@ bool dumpNamespaceClose( return output; } -void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType) { +void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType) { out << registryType.copy(registryType.lastIndexOf('/') + 1); } diff --git a/codemaker/source/cppumaker/dumputils.hxx b/codemaker/source/cppumaker/dumputils.hxx index 265110dedbea..18126ce1d17c 100644 --- a/codemaker/source/cppumaker/dumputils.hxx +++ b/codemaker/source/cppumaker/dumputils.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/source/cppumaker/includes.cxx b/codemaker/source/cppumaker/includes.cxx index 02021e660522..10e58a243834 100644 --- a/codemaker/source/cppumaker/includes.cxx +++ b/codemaker/source/cppumaker/includes.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx index 887faac10484..2a2445627fab 100644 --- a/codemaker/source/cppumaker/includes.hxx +++ b/codemaker/source/cppumaker/includes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/source/cunomaker/cunomaker.cxx b/codemaker/source/cunomaker/cunomaker.cxx index d05764f94edc..28f7a3d3d9f1 100644 --- a/codemaker/source/cunomaker/cunomaker.cxx +++ b/codemaker/source/cunomaker/cunomaker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,26 +42,26 @@ using namespace rtl; sal_Bool produceAllTypes(const OString& typeName, - TypeManager& typeMgr, + TypeManager& typeMgr, TypeDependency& typeDependencies, CunoOptions* pOptions, sal_Bool bFullScope) throw( CannotDumpException ) { - if (!produceType(typeName, typeMgr, typeDependencies, pOptions)) + if (!produceType(typeName, typeMgr, typeDependencies, pOptions)) { - fprintf(stderr, "%s ERROR: %s\n", - pOptions->getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + pOptions->getProgramName().getStr(), OString("cannot dump Type '" + typeName + "'").getStr()); exit(99); } - RegistryKey typeKey = typeMgr.getTypeKey(typeName); + RegistryKey typeKey = typeMgr.getTypeKey(typeName); RegistryKeyNames subKeys; - + if (typeKey.getKeyNames(OUString(), subKeys)) return sal_False; - + OString tmpName; for (sal_uInt32 i=0; i < subKeys.getLength(); i++) { @@ -82,15 +82,15 @@ sal_Bool produceAllTypes(const OString& typeName, return sal_False; } } - - return sal_True; + + return sal_True; } SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { CunoOptions options; - try + try { if (!options.initOptions(argc, argv)) { @@ -104,8 +104,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } RegistryTypeManager typeMgr; - TypeDependency typeDependencies; - + TypeDependency typeDependencies; + if (!typeMgr.init(!options.isValid("-T"), options.getInputFiles())) { fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr()); @@ -117,7 +117,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) typeMgr.setBase(options.getOption("-B")); } - try + try { if (options.isValid("-T")) { @@ -141,7 +141,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } else { tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/'); - if (tmpName.getLength() == 0) + if (tmpName.getLength() == 0) tmpName = "/"; else tmpName.replace('.', '/'); @@ -155,8 +155,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if (!ret) { - fprintf(stderr, "%s ERROR: %s\n", - options.getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + options.getProgramName().getStr(), OString("cannot dump Type '" + typeName + "'").getStr()); exit(99); } @@ -166,8 +166,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) // produce all types if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True)) { - fprintf(stderr, "%s ERROR: %s\n", - options.getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + options.getProgramName().getStr(), "an error occurs while dumping all types."); exit(99); } @@ -175,8 +175,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } catch( CannotDumpException& e) { - fprintf(stderr, "%s ERROR: %s\n", - options.getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + options.getProgramName().getStr(), e.m_message.getStr()); exit(99); } diff --git a/codemaker/source/cunomaker/cunooptions.cxx b/codemaker/source/cunomaker/cunooptions.cxx index ababcc32b79c..a26efe18361e 100644 --- a/codemaker/source/cunomaker/cunooptions.cxx +++ b/codemaker/source/cunomaker/cunooptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,22 +28,22 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_codemaker.hxx" -#include <stdio.h> +#include <stdio.h> -#include "cunooptions.hxx" +#include "cunooptions.hxx" using namespace rtl; -sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) +sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw( IllegalArgument ) { - sal_Bool ret = sal_True; - sal_uInt16 i=0; + sal_Bool ret = sal_True; + sal_uInt16 i=0; if (!bCmdFile) { bCmdFile = sal_True; - + m_program = av[0]; if (ac < 2) @@ -58,7 +58,7 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) i = 0; } - char *s=NULL; + char *s=NULL; for (i; i < ac; i++) { if (av[i][0] == '-') @@ -81,7 +81,7 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else @@ -105,14 +105,14 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + m_options["-O"] = OString(s); break; case 'B': @@ -129,14 +129,14 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + m_options["-B"] = OString(s); break; case 'T': @@ -153,14 +153,14 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + if (m_options.count("-T") > 0) { OString tmp(m_options["-T"]); @@ -182,7 +182,7 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw IllegalArgument(tmp); } - + m_options["-U"] = OString(""); break; /* @@ -197,7 +197,7 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw IllegalArgument(tmp); } - + if (isValid("-C") || isValid("-CS")) { OString tmp("'-L' could not be combined with '-C' or '-CS' option"); @@ -217,7 +217,7 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw IllegalArgument(tmp); } - + if (isValid("-L") || isValid("-CS")) { OString tmp("'-C' could not be combined with '-L' or '-CS' option"); @@ -252,12 +252,12 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw IllegalArgument(tmp); } - + m_options["-G"] = OString(""); break; default: throw IllegalArgument("the option is unknown" + OString(av[i])); - break; + break; } } else { @@ -280,25 +280,25 @@ sal_Bool CunoOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) rargc++; } fclose(cmdFile); - + ret = initOptions(rargc, rargv, bCmdFile); - - for (long i=0; i < rargc; i++) + + for (long i=0; i < rargc; i++) { free(rargv[i]); } - } + } } else { m_inputFiles.push_back(av[i]); - } + } } } + + return ret; +} - return ret; -} - -OString CunoOptions::prepareHelp() +OString CunoOptions::prepareHelp() { OString help("\nusing: "); help += m_program + " [-options] file_1 ... file_n\nOptions:\n"; @@ -307,27 +307,27 @@ OString CunoOptions::prepareHelp() help += " -T<name> = name specifies a type or a list of types. The output for this\n"; help += " [t1;...] type is generated. If no '-T' option is specified,\n"; help += " then output for all types is generated.\n"; - help += " Example: 'com.sun.star.uno.XInterface' is a valid type.\n"; + help += " Example: 'com.sun.star.uno.XInterface' is a valid type.\n"; help += " -B<name> = name specifies the base node. All types are searched under this\n"; help += " node. Default is the root '/' of the registry files.\n"; help += " -U = activate the generating of a getCppuType_<name> function.\n"; -// help += " -L = getCppuType function with a known leak.\n"; +// help += " -L = getCppuType function with a known leak.\n"; help += " -C = getCppuType_<name> function keeps comprehensive type information.\n"; help += " -G = generate only target files which does not exists.\n"; help += " -Gc = generate only target files which content will be changed.\n"; help += prepareVersion(); - + return help; -} +} -OString CunoOptions::prepareVersion() +OString CunoOptions::prepareVersion() { OString version("\nSun Microsystems (R) "); version += m_program + " Version 1.0\n\n"; return version; -} - +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/cunomaker/cunooptions.hxx b/codemaker/source/cunomaker/cunooptions.hxx index 2f8debf897b3..615ec6b78e74 100644 --- a/codemaker/source/cunomaker/cunooptions.hxx +++ b/codemaker/source/cunomaker/cunooptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #ifndef INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOOPTIONS_HXX #define INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOOPTIONS_HXX -#include <codemaker/options.hxx> +#include <codemaker/options.hxx> class CunoOptions : public Options { @@ -39,16 +39,16 @@ public: ~CunoOptions() {} - sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) + sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ); - ::rtl::OString prepareHelp(); - - ::rtl::OString prepareVersion(); + ::rtl::OString prepareHelp(); + ::rtl::OString prepareVersion(); + protected: }; - + #endif // INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOOPTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/cunomaker/cunotype.cxx b/codemaker/source/cunomaker/cunotype.cxx index c5452de9b14e..40637c785af7 100644 --- a/codemaker/source/cunomaker/cunotype.cxx +++ b/codemaker/source/cunomaker/cunotype.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,12 +30,12 @@ #include "precompiled_codemaker.hxx" #include <stdio.h> -#include <rtl/alloc.h> -#include <rtl/ustring.hxx> -#include <rtl/strbuf.hxx> +#include <rtl/alloc.h> +#include <rtl/ustring.hxx> +#include <rtl/strbuf.hxx> -#include "cunotype.hxx" -#include "cunooptions.hxx" +#include "cunotype.hxx" +#include "cunooptions.hxx" using namespace rtl; @@ -52,7 +52,7 @@ CunoType::CunoType(TypeReader& typeReader, , m_cunoTypeDynamic(sal_True) , m_indentLength(0) , m_typeName(typeName) -// , m_name(typeName.getToken(typeName.getTokenCount('/') - 1, '/')) +// , m_name(typeName.getToken(typeName.getTokenCount('/') - 1, '/')) , m_name(typeName.replace('/', '_')) , m_reader(typeReader) , m_typeMgr((TypeManager&)typeMgr) @@ -142,7 +142,7 @@ sal_Bool CunoType::dump(CunoOptions* pOptions) if ( bFileExists && pOptions->isValid("-Gc") ) { - tmpFileName = createFileNameFromType(outPath, m_typeName, ".tmh"); + tmpFileName = createFileNameFromType(outPath, m_typeName, ".tmh"); bFileCheck = sal_True; } @@ -191,7 +191,7 @@ sal_Bool CunoType::dump(CunoOptions* pOptions) if ( bFileExists && pOptions->isValid("-Gc") ) { - tmpFileName = createFileNameFromType(outPath, m_typeName, ".tmc"); + tmpFileName = createFileNameFromType(outPath, m_typeName, ".tmc"); bFileCheck = sal_True; } @@ -366,11 +366,11 @@ void CunoType::dumpDepIncludes(FileStream& o, const OString& typeName, sal_Char* TypeUsingSet::const_iterator iter = usingSet.begin(); - OString sPrefix(OString(prefix).toAsciiUpperCase()); - sal_Bool bSequenceDumped = sal_False; - sal_uInt32 index = 0; - sal_uInt32 seqNum = 0; - OString relType; + OString sPrefix(OString(prefix).toAsciiUpperCase()); + sal_Bool bSequenceDumped = sal_False; + sal_uInt32 index = 0; + sal_uInt32 seqNum = 0; + OString relType; while (iter != usingSet.end()) { sal_Bool bDumpThisType = sal_True; @@ -416,15 +416,15 @@ void CunoType::dumpDepIncludes(FileStream& o, const OString& typeName, sal_Char* iLastS = outerNamespace.lastIndexOf('/'); OString outerClass(outerNamespace.copy(iLastS+1)); -// o << "\n"; -// dumpNameSpace(o, sal_True, sal_False, outerNamespace); -// o << "\nclass " << outerClass << "::" << innerClass << ";\n"; -// dumpNameSpace(o, sal_False, sal_False, outerNamespace); -// o << "\n\n"; +// o << "\n"; +// dumpNameSpace(o, sal_True, sal_False, outerNamespace); +// o << "\nclass " << outerClass << "::" << innerClass << ";\n"; +// dumpNameSpace(o, sal_False, sal_False, outerNamespace); +// o << "\n\n"; } else { -// dumpInclude(o, relType, prefix); +// dumpInclude(o, relType, prefix); OString type(relType.replace('/', '_')); o << "\n#ifndef " << type.toAsciiUpperCase() << "\n"; o << "#define " << type.toAsciiUpperCase() << "\n"; @@ -612,14 +612,14 @@ void CunoType::dumpGetCunoType(FileStream& o) if (count) { - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldType, fieldName; - OString scope = m_typeName.replace('/', '.'); - sal_Bool bWithScope = sal_True; - OString modFieldType; - StringSet generatedTypeSet; - StringSet::iterator findIter; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldType, fieldName; + OString scope = m_typeName.replace('/', '.'); + sal_Bool bWithScope = sal_True; + OString modFieldType; + StringSet generatedTypeSet; + StringSet::iterator findIter; for (sal_uInt16 i=0; i < fieldCount; i++) { @@ -631,7 +631,7 @@ void CunoType::dumpGetCunoType(FileStream& o) fieldName = m_reader.getFieldName(i); fieldType = checkRealBaseType(m_reader.getFieldType(i), sal_True); -// modFieldType = typeToIdentifier(fieldType); +// modFieldType = typeToIdentifier(fieldType); findIter = generatedTypeSet.find(fieldType); if ( findIter == generatedTypeSet.end() ) @@ -711,9 +711,9 @@ void CunoType::dumpCGetCunoType(FileStream& o) if (superType.getLength() > 0) o << indent() << "typelib_TypeDescriptionReference * pSuperType = 0;\n"; - sal_uInt32 count = getMemberCount(); - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; + sal_uInt32 count = getMemberCount(); + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; if (count) { o << indent() << "typelib_CompoundMember_Init aMembers[" @@ -743,8 +743,8 @@ void CunoType::dumpCGetCunoType(FileStream& o) if (count) { - OString fieldType, fieldName; - OString scope = m_typeName.replace('/', '.'); + OString fieldType, fieldName; + OString scope = m_typeName.replace('/', '.'); for (sal_uInt16 i=0; i < fieldCount; i++) { @@ -821,8 +821,8 @@ void CunoType::dumpCGetCunoType(FileStream& o) void CunoType::dumpCppuGetTypeMemberDecl(FileStream& o, CunoTypeDecl eDeclFlag) { - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; if ( fieldCount ) { @@ -941,10 +941,10 @@ void CunoType::dumpInheritedMembers(FileStream& o, rtl::OString& superType) } } -OString CunoType::getTypeClass(const OString& type, sal_Bool bCStyle) +OString CunoType::getTypeClass(const OString& type, sal_Bool bCStyle) { - OString typeName = (type.getLength() > 0 ? type : m_typeName); - RTTypeClass rtTypeClass = RT_TYPE_INVALID; + OString typeName = (type.getLength() > 0 ? type : m_typeName); + RTTypeClass rtTypeClass = RT_TYPE_INVALID; if (type.getLength() > 0) { @@ -981,7 +981,7 @@ OString CunoType::getTypeClass(const OString& type, sal_Bool bCStyle) OString realType = checkRealBaseType( typeName ); return getTypeClass( realType, bCStyle ); } -// return bCStyle ? "typelib_TypeClass_TYPEDEF" : "::com::sun::star::uno::TypeClass_TYPEDEF"; +// return bCStyle ? "typelib_TypeClass_TYPEDEF" : "::com::sun::star::uno::TypeClass_TYPEDEF"; break; case RT_TYPE_SERVICE: return bCStyle ? "typelib_TypeClass_SERVICE" : "::com::sun::star::uno::TypeClass_SERVICE"; @@ -1037,7 +1037,7 @@ void CunoType::dumpType(FileStream& o, const OString& type, RTTypeClass typeClass = m_typeMgr.getTypeClass(relType); -// if (bConst) o << "const "; +// if (bConst) o << "const "; if ( seqNum ) { @@ -1087,7 +1087,7 @@ void CunoType::dumpType(FileStream& o, const OString& type, if (bPointer) o << "*"; } -OString CunoType::getBaseType(const OString& type) +OString CunoType::getBaseType(const OString& type) { if (type.equals("long")) return "sal_Int32"; @@ -1285,17 +1285,17 @@ OString CunoType::typeToIdentifier(const OString& type) return sIdentifier; } -OString CunoType::checkSpecialCunoType(const OString& type) +OString CunoType::checkSpecialCunoType(const OString& type) { OString baseType(type); RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader(); - RegistryKey key; - sal_uInt8* pBuffer=NULL; - RTTypeClass typeClass; - sal_Bool isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); - TypeReader reader; + RegistryKey key; + sal_uInt8* pBuffer=NULL; + RTTypeClass typeClass; + sal_Bool isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); + TypeReader reader; while (isTypeDef) { @@ -1350,7 +1350,7 @@ sal_Bool CunoType::isArrayType(const OString& type, OString& baseType, OString& return sal_False; } -OString CunoType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly) +OString CunoType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly) { OString realType; OString baseType; @@ -1363,11 +1363,11 @@ OString CunoType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOn RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader(); - RegistryKey key; - sal_uInt8* pBuffer=NULL; - RTTypeClass typeClass; - sal_Bool mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); - TypeReader reader; + RegistryKey key; + sal_uInt8* pBuffer=NULL; + RTTypeClass typeClass; + sal_Bool mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); + TypeReader reader; while (mustBeChecked) { reader = m_typeMgr.getTypeReader(baseType); @@ -1491,7 +1491,7 @@ OString CunoType::indent() return tmp.makeStringAndClear(); } -OString CunoType::indent(sal_uInt32 num) +OString CunoType::indent(sal_uInt32 num) { OStringBuffer tmp(m_indentLength + num); @@ -1797,7 +1797,7 @@ void InterfaceType::dumpMethods(FileStream& o, const OString& interfaceType, Typ sal_uInt32 paramCount = 0; sal_uInt32 excCount = 0; RTMethodMode methodMode = RT_MODE_INVALID; - RTParamMode paramMode = RT_PARAM_INVALID; + RTParamMode paramMode = RT_PARAM_INVALID; sal_Bool bPointer = sal_False; sal_Bool bParam = sal_False; @@ -1846,8 +1846,8 @@ void InterfaceType::dumpMethods(FileStream& o, const OString& interfaceType, Typ sal_uInt16 j; for (j=0; j < paramCount; j++) { - paramName = reader.getMethodParamName(i, j); - paramType = reader.getMethodParamType(i, j); + paramName = reader.getMethodParamName(i, j); + paramType = reader.getMethodParamType(i, j); paramMode = reader.getMethodParamMode(i, j); if (j < (sal_uInt16)paramCount) o << ", "; @@ -2060,9 +2060,9 @@ void InterfaceType::dumpCGetCunoType(FileStream& o) << "typelib_TypeClass_INTERFACE, (typelib_TypeDescription*)pTD);\n\n"; o << indent() << "typelib_TypeDescriptionReference ** ppTypeRef = 0;\n"; - StringSet aTypes; + StringSet aTypes; // type for RuntimeException is always needed - OString sRunTimeExceptionType("com/sun/star/uno/RuntimeException"); + OString sRunTimeExceptionType("com/sun/star/uno/RuntimeException"); aTypes.insert(sRunTimeExceptionType); dumpCppuGetType(o, sRunTimeExceptionType, sal_True, CUNOTYPEDECL_ALLTYPES); @@ -2116,7 +2116,7 @@ void InterfaceType::dumpCUnoAttributeTypeNames(FileStream&o, sal_Bool bRelease) void InterfaceType::dumpCUnoMethodTypeNames(FileStream&o, sal_Bool bRelease) { - sal_uInt32 methodCount = m_reader.getMethodCount(); + sal_uInt32 methodCount = m_reader.getMethodCount(); for (sal_uInt16 i = 0; i < methodCount; i++) { @@ -2135,7 +2135,7 @@ void InterfaceType::dumpCUnoAttributeRefs(FileStream& o, sal_uInt32& index) sal_uInt32 fieldCount = m_reader.getFieldCount(); RTFieldAccess access = RT_ACCESS_INVALID; OString fieldName; - OString scope = m_typeName.replace('/', '.'); + OString scope = m_typeName.replace('/', '.'); for (sal_uInt16 i=0; i < fieldCount; i++) { @@ -2158,9 +2158,9 @@ void InterfaceType::dumpCUnoAttributeRefs(FileStream& o, sal_uInt32& index) void InterfaceType::dumpCUnoMethodRefs(FileStream& o, sal_uInt32& index) { - sal_uInt32 methodCount = m_reader.getMethodCount(); - OString methodName; //, returnType, paramType, paramName; - OString scope = m_typeName.replace('/', '.'); + sal_uInt32 methodCount = m_reader.getMethodCount(); + OString methodName; //, returnType, paramType, paramName; + OString scope = m_typeName.replace('/', '.'); for (sal_uInt16 i = 0; i < methodCount; i++) { @@ -2295,13 +2295,13 @@ void InterfaceType::dumpCUnoAttributes(FileStream& o, sal_uInt32& index) void InterfaceType::dumpCUnoMethods(FileStream& o, sal_uInt32& index) { - sal_uInt32 methodCount = m_reader.getMethodCount(); - OString methodName, returnType, paramType, paramName; - sal_uInt32 paramCount = 0; - sal_uInt32 excCount = 0; - RTMethodMode methodMode = RT_MODE_INVALID; - RTParamMode paramMode = RT_PARAM_INVALID; - sal_Bool bWithRuntimeException = sal_True; + sal_uInt32 methodCount = m_reader.getMethodCount(); + OString methodName, returnType, paramType, paramName; + sal_uInt32 paramCount = 0; + sal_uInt32 excCount = 0; + RTMethodMode methodMode = RT_MODE_INVALID; + RTParamMode paramMode = RT_PARAM_INVALID; + sal_Bool bWithRuntimeException = sal_True; sal_uInt32 absoluteIndex = index; @@ -2351,8 +2351,8 @@ void InterfaceType::dumpCUnoMethods(FileStream& o, sal_uInt32& index) } for (j=0; j < paramCount; j++) { - paramName = m_reader.getMethodParamName(i, j); - paramType = checkRealBaseType(m_reader.getMethodParamType(i, j), sal_True); + paramName = m_reader.getMethodParamName(i, j); + paramType = checkRealBaseType(m_reader.getMethodParamType(i, j), sal_True); paramMode = m_reader.getMethodParamMode(i, j); o << indent() << "rtl_uString_newFromAscii( &pParamName" << j << ", \"" << paramName << "\" );\n"; @@ -2468,10 +2468,10 @@ void InterfaceType::dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTy void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag) { - sal_uInt32 methodCount = m_reader.getMethodCount(); - OString returnType, paramType, excType; - sal_uInt32 paramCount = 0; - sal_uInt32 excCount = 0; + sal_uInt32 methodCount = m_reader.getMethodCount(); + OString returnType, paramType, excType; + sal_uInt32 paramCount = 0; + sal_uInt32 excCount = 0; for (sal_uInt16 i=0; i < methodCount; i++) { @@ -2487,7 +2487,7 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes sal_uInt16 j; for (j=0; j < paramCount; j++) { - paramType = m_reader.getMethodParamType(i, j); + paramType = m_reader.getMethodParamType(i, j); if (pFinishedTypes->count(paramType) == 0) { @@ -2541,7 +2541,7 @@ sal_Bool ModuleType::dump(CunoOptions* pOptions) if (tmpName.equals("/")) tmpName = "global"; else -// tmpName += "/" + m_typeName.getToken(m_typeName.getTokenCount('/') - 1, '/'); +// tmpName += "/" + m_typeName.getToken(m_typeName.getTokenCount('/') - 1, '/'); tmpName += "/" + m_name; OString tmpFileName; @@ -2558,7 +2558,7 @@ sal_Bool ModuleType::dump(CunoOptions* pOptions) if ( bFileExists && pOptions->isValid("-Gc") ) { - tmpFileName = createFileNameFromType(outPath, m_typeName, ".tml"); + tmpFileName = createFileNameFromType(outPath, m_typeName, ".tml"); bFileCheck = sal_True; } @@ -2599,7 +2599,7 @@ sal_Bool ModuleType::dump(CunoOptions* pOptions) if ( bFileExists && pOptions->isValid("-Gc") ) { - tmpFileName = createFileNameFromType(outPath, m_typeName, ".tmc"); + tmpFileName = createFileNameFromType(outPath, m_typeName, ".tmc"); bFileCheck = sal_True; } @@ -2663,10 +2663,10 @@ sal_Bool ModuleType::dumpHFile(FileStream& o) sal_Bool ModuleType::dumpDeclaration(FileStream& o) throw( CannotDumpException ) { - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldAccess(i); @@ -2689,8 +2689,8 @@ sal_Bool ModuleType::dumpDeclaration(FileStream& o) sal_Bool ModuleType::hasConstants() { - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; for (sal_uInt16 i=0; i < fieldCount; i++) { @@ -2751,7 +2751,7 @@ sal_Bool ConstantsType::dump(CunoOptions* pOptions) if ( bFileExists && pOptions->isValid("-Gc") ) { - tmpFileName = createFileNameFromType(outPath, m_typeName, ".tmh"); + tmpFileName = createFileNameFromType(outPath, m_typeName, ".tmh"); bFileCheck = sal_True; } @@ -2792,7 +2792,7 @@ sal_Bool ConstantsType::dump(CunoOptions* pOptions) if ( bFileExists && pOptions->isValid("-Gc") ) { - tmpFileName = createFileNameFromType(outPath, m_typeName, ".tmc"); + tmpFileName = createFileNameFromType(outPath, m_typeName, ".tmc"); bFileCheck = sal_True; } @@ -2886,11 +2886,11 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o) o << indent() << superType.replace('/', '_').getStr() << " _Base;\n"; //dumpInheritedMembers(o, superType); - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; - sal_uInt16 i=0; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; + sal_uInt16 i=0; for (i=0; i < fieldCount; i++) { @@ -2996,11 +2996,11 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o) o << indent() << superType.replace('/', '_').getStr() << " _Base;\n"; //dumpInheritedMembers(o, superType); - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; - sal_uInt16 i = 0; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; + sal_uInt16 i = 0; for (i=0; i < fieldCount; i++) { @@ -3093,11 +3093,11 @@ sal_Bool EnumType::dumpDeclaration(FileStream& o) o << "\ntypedef enum _" << m_name << "\n{\n"; inc(); - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - RTConstValue constValue; - OString fieldName; - sal_Int32 value=0; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + RTConstValue constValue; + OString fieldName; + sal_Int32 value=0; for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldAccess(i); @@ -3227,8 +3227,8 @@ void EnumType::dumpCGetCunoType(FileStream& o) o << indent() << "enumValueNames[" << i << "] = pEnumValue" << i << ";\n"; } - RTConstValue constValue; - sal_Int32 value=0; + RTConstValue constValue; + sal_Int32 value=0; for (i = 0; i < count; i++) { o << indent() << "enumValues[" << i << "] = "; @@ -3389,7 +3389,7 @@ sal_Bool produceType(const OString& typeName, return sal_False; RTTypeClass typeClass = reader.getTypeClass(); - sal_Bool ret = sal_False; + sal_Bool ret = sal_False; switch (typeClass) { case RT_TYPE_INTERFACE: @@ -3407,7 +3407,7 @@ sal_Bool produceType(const OString& typeName, { ret = mType.dump(pOptions); if (ret) typeDependencies.setGenerated(typeName); -// ret = mType.dumpDependedTypes(pOptions); +// ret = mType.dumpDependedTypes(pOptions); } else { typeDependencies.setGenerated(typeName); @@ -3454,7 +3454,7 @@ sal_Bool produceType(const OString& typeName, { ret = cType.dump(pOptions); if (ret) typeDependencies.setGenerated(typeName); -// ret = cType.dumpDependedTypes(pOptions); +// ret = cType.dumpDependedTypes(pOptions); } else { typeDependencies.setGenerated(typeName); diff --git a/codemaker/source/cunomaker/cunotype.hxx b/codemaker/source/cunomaker/cunotype.hxx index 89e1347715f3..e735246ec6b1 100644 --- a/codemaker/source/cunomaker/cunotype.hxx +++ b/codemaker/source/cunomaker/cunotype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,8 +29,8 @@ #ifndef INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOTYPE_HXX_ #define INCLUDED_CODEMAKER_SOURCE_CUNOMAKER_CUNOTYPE_HXX -#include <codemaker/typemanager.hxx> -#include <codemaker/dependency.hxx> +#include <codemaker/typemanager.hxx> +#include <codemaker/dependency.hxx> enum BASETYPE { @@ -39,7 +39,7 @@ enum BASETYPE BT_ANY, BT_TYPE, BT_BOOLEAN, - BT_CHAR, + BT_CHAR, BT_STRING, BT_FLOAT, BT_DOUBLE, @@ -59,7 +59,7 @@ enum CunoTypeDecl CUNOTYPEDECL_ALLTYPES, CUNOTYPEDECL_NOINTERFACES, CUNOTYPEDECL_ONLYINTERFACES -}; +}; class CunoOptions; class FileStream; @@ -69,7 +69,7 @@ class CunoType public: CunoType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~CunoType(); @@ -95,58 +95,58 @@ public: virtual void dumpType(FileStream& o, const ::rtl::OString& type, sal_Bool bConst=sal_False, sal_Bool bPointer=sal_False, sal_Bool bParam=sal_False) throw( CannotDumpException ); - ::rtl::OString getTypeClass(const ::rtl::OString& type="", sal_Bool bCStyle=sal_False); - ::rtl::OString getBaseType(const ::rtl::OString& type); - void dumpCppuGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, CunoTypeDecl eDeclFlag=CUNOTYPEDECL_ALLTYPES); - void dumpTypeInit(FileStream& o, const ::rtl::OString& type); + ::rtl::OString getTypeClass(const ::rtl::OString& type="", sal_Bool bCStyle=sal_False); + ::rtl::OString getBaseType(const ::rtl::OString& type); + void dumpCppuGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, CunoTypeDecl eDeclFlag=CUNOTYPEDECL_ALLTYPES); + void dumpTypeInit(FileStream& o, const ::rtl::OString& type); BASETYPE isBaseType(const ::rtl::OString& type); ::rtl::OString typeToIdentifier(const ::rtl::OString& type); - void dumpConstantValue(FileStream& o, sal_uInt16 index); + void dumpConstantValue(FileStream& o, sal_uInt16 index); virtual sal_uInt32 getMemberCount(); - virtual sal_uInt32 getInheritedMemberCount(); - void dumpInheritedMembers(FileStream& o, rtl::OString& superType); + virtual sal_uInt32 getInheritedMemberCount(); + void dumpInheritedMembers(FileStream& o, rtl::OString& superType); sal_Bool isSeqType(const ::rtl::OString& type, ::rtl::OString& baseType, ::rtl::OString& seqPrefix); sal_Bool isArrayType(const ::rtl::OString& type, ::rtl::OString& baseType, ::rtl::OString& arrayPrefix); sal_Bool isVoid(const ::rtl::OString& type) { return type.equals("void"); } - void inc(sal_uInt32 num=4); - void dec(sal_uInt32 num=4); - ::rtl::OString indent(); - ::rtl::OString indent(sal_uInt32 num); + void inc(sal_uInt32 num=4); + void dec(sal_uInt32 num=4); + ::rtl::OString indent(); + ::rtl::OString indent(sal_uInt32 num); protected: - virtual sal_uInt32 checkInheritedMemberCount(const TypeReader* pReader); + virtual sal_uInt32 checkInheritedMemberCount(const TypeReader* pReader); - ::rtl::OString checkSpecialCunoType(const ::rtl::OString& type); - ::rtl::OString checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False); - void dumpCppuGetTypeMemberDecl(FileStream& o, CunoTypeDecl eDeclFlag); + ::rtl::OString checkSpecialCunoType(const ::rtl::OString& type); + ::rtl::OString checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False); + void dumpCppuGetTypeMemberDecl(FileStream& o, CunoTypeDecl eDeclFlag); - sal_Bool isNestedType() + sal_Bool isNestedType() { return m_bIsNestedType; }; - RegistryKeyNames& getNestedTypeNames() + RegistryKeyNames& getNestedTypeNames() { return m_nestedTypeNames; }; sal_Bool isNestedTypeByName(const ::rtl::OString& type); sal_Bool hasNestedType(const ::rtl::OString& type); protected: - sal_uInt32 m_inheritedMemberCount; - - sal_Bool m_cunoTypeLib; - sal_Bool m_cunoTypeLeak; - sal_Bool m_cunoTypeDynamic; - sal_uInt32 m_indentLength; - ::rtl::OString m_typeName; - ::rtl::OString m_name; - TypeReader m_reader; - TypeManager& m_typeMgr; - TypeDependency m_dependencies; - sal_Bool m_bIsNestedType; - RegistryKeyNames m_nestedTypeNames; + sal_uInt32 m_inheritedMemberCount; + + sal_Bool m_cunoTypeLib; + sal_Bool m_cunoTypeLeak; + sal_Bool m_cunoTypeDynamic; + sal_uInt32 m_indentLength; + ::rtl::OString m_typeName; + ::rtl::OString m_name; + TypeReader m_reader; + TypeManager& m_typeMgr; + TypeDependency m_dependencies; + sal_Bool m_bIsNestedType; + RegistryKeyNames m_nestedTypeNames; }; class InterfaceType : public CunoType @@ -154,39 +154,39 @@ class InterfaceType : public CunoType public: InterfaceType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~InterfaceType(); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); - - void dumpInheritedFunctions(FileStream& o, rtl::OString& superType); - void dumpAttributes(FileStream& o, const ::rtl::OString& interfaceType, TypeReader& reader ); - void dumpMethods(FileStream& o, const ::rtl::OString& interfaceType, TypeReader& reader ); - void dumpGetCunoType(FileStream& o); - void dumpCGetCunoType(FileStream& o); - void dumpCUnoAttributeTypeNames(FileStream& o, sal_Bool bRelease=sal_False); - void dumpCUnoMethodTypeNames(FileStream& o, sal_Bool bRelease=sal_False); - void dumpCUnoAttributeRefs(FileStream& o, sal_uInt32& index); - void dumpCUnoMethodRefs(FileStream& o, sal_uInt32& index); - void dumpCUnoAttributes(FileStream& o, sal_uInt32& index); - void dumpCUnoMethods(FileStream& o, sal_uInt32& index); - void dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag); - void dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag ); - - sal_uInt32 getMemberCount(); - sal_uInt32 getInheritedMemberCount(); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); + + void dumpInheritedFunctions(FileStream& o, rtl::OString& superType); + void dumpAttributes(FileStream& o, const ::rtl::OString& interfaceType, TypeReader& reader ); + void dumpMethods(FileStream& o, const ::rtl::OString& interfaceType, TypeReader& reader ); + void dumpGetCunoType(FileStream& o); + void dumpCGetCunoType(FileStream& o); + void dumpCUnoAttributeTypeNames(FileStream& o, sal_Bool bRelease=sal_False); + void dumpCUnoMethodTypeNames(FileStream& o, sal_Bool bRelease=sal_False); + void dumpCUnoAttributeRefs(FileStream& o, sal_uInt32& index); + void dumpCUnoMethodRefs(FileStream& o, sal_uInt32& index); + void dumpCUnoAttributes(FileStream& o, sal_uInt32& index); + void dumpCUnoMethods(FileStream& o, sal_uInt32& index); + void dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag); + void dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes, CunoTypeDecl eDeclFlag ); + + sal_uInt32 getMemberCount(); + sal_uInt32 getInheritedMemberCount(); protected: - sal_uInt32 checkInheritedMemberCount(const TypeReader* pReader); + sal_uInt32 checkInheritedMemberCount(const TypeReader* pReader); protected: - sal_uInt32 m_inheritedMemberCount; - sal_Bool m_hasAttributes; - sal_Bool m_hasMethods; + sal_uInt32 m_inheritedMemberCount; + sal_Bool m_hasAttributes; + sal_Bool m_hasMethods; }; class ModuleType : public CunoType @@ -194,17 +194,17 @@ class ModuleType : public CunoType public: ModuleType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~ModuleType(); - virtual sal_Bool dump(CunoOptions* pOptions) throw( CannotDumpException ); + virtual sal_Bool dump(CunoOptions* pOptions) throw( CannotDumpException ); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); - sal_Bool hasConstants(); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); + sal_Bool hasConstants(); }; class ConstantsType : public ModuleType @@ -212,12 +212,12 @@ class ConstantsType : public ModuleType public: ConstantsType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~ConstantsType(); - virtual sal_Bool dump(CunoOptions* pOptions) throw( CannotDumpException ); + virtual sal_Bool dump(CunoOptions* pOptions) throw( CannotDumpException ); }; class StructureType : public CunoType @@ -225,14 +225,14 @@ class StructureType : public CunoType public: StructureType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~StructureType(); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); }; class ExceptionType : public CunoType @@ -240,14 +240,14 @@ class ExceptionType : public CunoType public: ExceptionType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~ExceptionType(); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); }; class EnumType : public CunoType @@ -255,17 +255,17 @@ class EnumType : public CunoType public: EnumType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~EnumType(); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); - void dumpGetCunoType(FileStream& o); - void dumpCGetCunoType(FileStream& o); + void dumpGetCunoType(FileStream& o); + void dumpCGetCunoType(FileStream& o); }; class TypeDefType : public CunoType @@ -278,31 +278,31 @@ public: virtual ~TypeDefType(); - sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); - sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpDeclaration(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpCFile(FileStream& o) throw( CannotDumpException ); - void dumpGetCunoType(FileStream& o); - void dumpLGetCunoType(FileStream& o); - void dumpCGetCunoType(FileStream& o); + void dumpGetCunoType(FileStream& o); + void dumpLGetCunoType(FileStream& o); + void dumpCGetCunoType(FileStream& o); }; sal_Bool produceType(const ::rtl::OString& typeName, - TypeManager& typeMgr, + TypeManager& typeMgr, TypeDependency& typeDependencies, CunoOptions* pOptions) throw( CannotDumpException ); /** - * This function returns a C++ scoped name, represents the namespace + * This function returns a C++ scoped name, represents the namespace * scoping of this type, e.g. com:.sun::star::uno::XInterface. If the scope of * the type is equal scope, the relativ name will be used. */ -::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type, +::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type, sal_Bool bNoNameSpace=sal_False); -::rtl::OString shortScopedName(const ::rtl::OString& scope, const ::rtl::OString& type, +::rtl::OString shortScopedName(const ::rtl::OString& scope, const ::rtl::OString& type, sal_Bool bNoNameSpace=sal_False); diff --git a/codemaker/source/idlmaker/idlmaker.cxx b/codemaker/source/idlmaker/idlmaker.cxx index 9287f22ecb53..416aef10ab4f 100644 --- a/codemaker/source/idlmaker/idlmaker.cxx +++ b/codemaker/source/idlmaker/idlmaker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,26 +42,26 @@ using namespace rtl; sal_Bool produceAllTypes(const OString& typeName, - TypeManager& typeMgr, + TypeManager& typeMgr, TypeDependency& typeDependencies, IdlOptions* pOptions, sal_Bool bFullScope) throw( CannotDumpException ) { - if (!produceType(typeName, typeMgr, typeDependencies, pOptions)) + if (!produceType(typeName, typeMgr, typeDependencies, pOptions)) { - fprintf(stderr, "%s ERROR: %s\n", - pOptions->getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + pOptions->getProgramName().getStr(), OString("cannot dump Type '" + typeName + "'").getStr()); exit(99); } - RegistryKey typeKey = typeMgr.getTypeKey(typeName); + RegistryKey typeKey = typeMgr.getTypeKey(typeName); RegistryKeyNames subKeys; - + if (typeKey.getKeyNames(OUString(), subKeys)) return sal_False; - + OString tmpName; for (sal_uInt32 i=0; i < subKeys.getLength(); i++) { @@ -82,15 +82,15 @@ sal_Bool produceAllTypes(const OString& typeName, return sal_False; } } - - return sal_True; + + return sal_True; } SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { IdlOptions options; - try + try { if (!options.initOptions(argc, argv)) { @@ -104,8 +104,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } RegistryTypeManager typeMgr; - TypeDependency typeDependencies; - + TypeDependency typeDependencies; + if (!typeMgr.init(!options.isValid("-T"), options.getInputFiles())) { fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr()); @@ -117,7 +117,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) typeMgr.setBase(options.getOption("-B")); } - try + try { if (options.isValid("-T")) { @@ -141,7 +141,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } else { tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/'); - if (tmpName.getLength() == 0) + if (tmpName.getLength() == 0) tmpName = "/"; else tmpName.replace('.', '/'); @@ -155,8 +155,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if (!ret) { - fprintf(stderr, "%s ERROR: %s\n", - options.getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + options.getProgramName().getStr(), OString("cannot dump Type '" + typeName + "'").getStr()); exit(99); } @@ -166,8 +166,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) // produce all types if (!produceAllTypes("/", typeMgr, typeDependencies, &options, sal_True)) { - fprintf(stderr, "%s ERROR: %s\n", - options.getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + options.getProgramName().getStr(), "an error occurs while dumping all types."); exit(99); } @@ -175,8 +175,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } catch( CannotDumpException& e) { - fprintf(stderr, "%s ERROR: %s\n", - options.getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + options.getProgramName().getStr(), e.m_message.getStr()); exit(99); } diff --git a/codemaker/source/idlmaker/idloptions.cxx b/codemaker/source/idlmaker/idloptions.cxx index d2e2689e2435..b5435a1a1109 100644 --- a/codemaker/source/idlmaker/idloptions.cxx +++ b/codemaker/source/idlmaker/idloptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,22 +28,22 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_codemaker.hxx" -#include <stdio.h> +#include <stdio.h> -#include "idloptions.hxx" +#include "idloptions.hxx" using namespace rtl; -sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) +sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw( IllegalArgument ) { - sal_Bool ret = sal_True; - sal_uInt16 i=0; + sal_Bool ret = sal_True; + sal_uInt16 i=0; if (!bCmdFile) { bCmdFile = sal_True; - + m_program = av[0]; if (ac < 2) @@ -58,7 +58,7 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) i = 0; } - char *s=NULL; + char *s=NULL; for (i; i < ac; i++) { if (av[i][0] == '-') @@ -79,14 +79,14 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + m_options["-O"] = OString(s); break; case 'B': @@ -103,14 +103,14 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + m_options["-B"] = OString(s); break; case 'T': @@ -127,14 +127,14 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + if (m_options.count("-T") > 0) { OString tmp(m_options["-T"]); @@ -172,12 +172,12 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw IllegalArgument(tmp); } - + m_options["-G"] = OString(""); break; default: throw IllegalArgument("the option is unknown" + OString(av[i])); - break; + break; } } else { @@ -200,25 +200,25 @@ sal_Bool IdlOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) rargc++; } fclose(cmdFile); - + ret = initOptions(rargc, rargv, bCmdFile); - - for (long i=0; i < rargc; i++) + + for (long i=0; i < rargc; i++) { free(rargv[i]); } - } + } } else { m_inputFiles.push_back(av[i]); - } + } } } + + return ret; +} - return ret; -} - -OString IdlOptions::prepareHelp() +OString IdlOptions::prepareHelp() { OString help("\nusing: "); help += m_program + " [-options] file_1 ... file_n\nOptions:\n"; @@ -227,28 +227,28 @@ OString IdlOptions::prepareHelp() help += " -T<name> = name specifies a type or a list of types. The output for this\n"; help += " [t1;...] type is generated. If no '-T' option is specified,\n"; help += " then output for all types is generated.\n"; - help += " Example: 'com.sun.star.uno.XInterface' is a valid type.\n"; + help += " Example: 'com.sun.star.uno.XInterface' is a valid type.\n"; help += " -B<name> = name specifies the base node. All types are searched under this\n"; help += " node. Default is the root '/' of the registry files.\n"; help += " -G = generate only target files which does not exists.\n"; help += " -Gc = generate only target files which content will be changed.\n"; - help += "IMPORTANT: You lose enum values and struct, exception inheritance!\n"; - help += " Parameter name Object is translated to _Object!\n"; - help += " The type type is translated to CORBA::TypeCode!\n"; - help += " Sequences are expanded to a typedef name Sequence_..._\"name\"!\n"; + help += "IMPORTANT: You lose enum values and struct, exception inheritance!\n"; + help += " Parameter name Object is translated to _Object!\n"; + help += " The type type is translated to CORBA::TypeCode!\n"; + help += " Sequences are expanded to a typedef name Sequence_..._\"name\"!\n"; help += prepareVersion(); - + return help; -} +} -OString IdlOptions::prepareVersion() +OString IdlOptions::prepareVersion() { OString version("\nSun Microsystems (R) "); version += m_program + " Version 2.0\n\n"; return version; -} - +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/idlmaker/idloptions.hxx b/codemaker/source/idlmaker/idloptions.hxx index 4b52736e907c..8d94c2b9aac6 100644 --- a/codemaker/source/idlmaker/idloptions.hxx +++ b/codemaker/source/idlmaker/idloptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #ifndef INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLOPTIONS_HXX #define INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLOPTIONS_HXX -#include <codemaker/options.hxx> +#include <codemaker/options.hxx> class IdlOptions : public Options { @@ -39,16 +39,16 @@ public: ~IdlOptions() {} - sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) + sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ); - ::rtl::OString prepareHelp(); - - ::rtl::OString prepareVersion(); + ::rtl::OString prepareHelp(); + ::rtl::OString prepareVersion(); + protected: }; - + #endif // INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLOPTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/idlmaker/idltype.cxx b/codemaker/source/idlmaker/idltype.cxx index 9a2c75427560..4cd516369498 100644 --- a/codemaker/source/idlmaker/idltype.cxx +++ b/codemaker/source/idlmaker/idltype.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,12 +30,12 @@ #include "precompiled_codemaker.hxx" #include <stdio.h> -#include <rtl/alloc.h> -#include <rtl/ustring.hxx> -#include <rtl/strbuf.hxx> +#include <rtl/alloc.h> +#include <rtl/ustring.hxx> +#include <rtl/strbuf.hxx> -#include "idltype.hxx" -#include "idloptions.hxx" +#include "idltype.hxx" +#include "idloptions.hxx" using namespace rtl; @@ -85,7 +85,7 @@ sal_Bool IdlType::dump(IdlOptions* pOptions) if ( bFileExists && pOptions->isValid("-Gc") ) { - tmpFileName = createFileNameFromType(outPath, m_typeName, ".tml"); + tmpFileName = createFileNameFromType(outPath, m_typeName, ".tml"); bFileCheck = sal_True; } @@ -210,9 +210,9 @@ void IdlType::dumpInclude(FileStream& o, const OString& genTypeName, const OStri o << "../"; } while( nIndex != -1 ); -// sal_Int32 nSlashes = genTypeName.getTokenCount( '/'); -// for( sal_Int32 i = 1; i < nSlashes; i++ ) -// o << "../"; +// sal_Int32 nSlashes = genTypeName.getTokenCount( '/'); +// for( sal_Int32 i = 1; i < nSlashes; i++ ) +// o << "../"; o << tmp; o << ">\n#endif\n"; } @@ -223,10 +223,10 @@ void IdlType::dumpDepIncludes(FileStream& o, const OString& typeName, sal_Char* TypeUsingSet::const_iterator iter = usingSet.begin(); - OString sPrefix(OString(prefix).toAsciiUpperCase()); - sal_uInt32 index = 0; - sal_uInt32 seqNum = 0; - OString relType; + OString sPrefix(OString(prefix).toAsciiUpperCase()); + sal_uInt32 index = 0; + sal_uInt32 seqNum = 0; + OString relType; while (iter != usingSet.end()) { index = (*iter).m_type.lastIndexOf(']'); @@ -455,7 +455,7 @@ void IdlType::dumpType(FileStream& o, const OString& type ) } } -OString IdlType::getBaseType(const OString& type) +OString IdlType::getBaseType(const OString& type) { if (type.equals("long")) return type; @@ -521,15 +521,15 @@ void IdlType::dumpIdlGetType(FileStream& o, const OString& type, sal_Bool bDecl, m_typeMgr.getTypeClass(relType) == RT_TYPE_INTERFACE) return; -// if (m_typeMgr.getTypeClass(type) == RT_TYPE_TYPEDEF) -// { -// o << indent() << "get_" << type.replace('/', '_') << "_Type()"; -// } else -// { +// if (m_typeMgr.getTypeClass(type) == RT_TYPE_TYPEDEF) +// { +// o << indent() << "get_" << type.replace('/', '_') << "_Type()"; +// } else +// { o << indent() << "getIdlType( ("; dumpType(o, type); o << "*)0 )"; -// } +// } } if (bDecl) o << ";\n"; @@ -570,17 +570,17 @@ BASETYPE IdlType::isBaseType(const OString& type) return BT_INVALID; } -OString IdlType::checkSpecialIdlType(const OString& type) +OString IdlType::checkSpecialIdlType(const OString& type) { OString baseType(type); RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader(); - RegistryKey key; - sal_uInt8* pBuffer=NULL; - RTTypeClass typeClass; - sal_Bool isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); - TypeReader reader; + RegistryKey key; + sal_uInt8* pBuffer=NULL; + RTTypeClass typeClass; + sal_Bool isTypeDef = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); + TypeReader reader; while (isTypeDef) { @@ -603,7 +603,7 @@ OString IdlType::checkSpecialIdlType(const OString& type) return baseType; } -OString IdlType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly) +OString IdlType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly) { sal_uInt32 index = type.lastIndexOf(']'); OString baseType = (index > 0 ? ((OString)type).copy(index+1) : type); @@ -611,11 +611,11 @@ OString IdlType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnl RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader(); - RegistryKey key; - sal_uInt8* pBuffer=NULL; - RTTypeClass typeClass; - sal_Bool mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); - TypeReader reader; + RegistryKey key; + sal_uInt8* pBuffer=NULL; + RTTypeClass typeClass; + sal_Bool mustBeChecked = (m_typeMgr.getTypeClass(baseType) == RT_TYPE_TYPEDEF); + TypeReader reader; while (mustBeChecked) { @@ -737,7 +737,7 @@ OString IdlType::indent() return tmp.makeStringAndClear(); } -OString IdlType::indent(sal_uInt32 num) +OString IdlType::indent(sal_uInt32 num) { OStringBuffer tmp(m_indentLength + num); @@ -800,8 +800,8 @@ sal_Bool InterfaceType::dumpHFile(FileStream& o) dumpNameSpace(o, sal_False); -// o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n" -// << "class Type;\n} } } }\n\n"; +// o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n" +// << "class Type;\n} } } }\n\n"; o << "#endif /* "<< headerDefine << "*/" << "\n"; return sal_True; @@ -853,7 +853,7 @@ void InterfaceType::dumpMethods(FileStream& o) sal_uInt32 paramCount = 0; sal_uInt32 excCount = 0; RTMethodMode methodMode = RT_MODE_INVALID; - RTParamMode paramMode = RT_PARAM_INVALID; + RTParamMode paramMode = RT_PARAM_INVALID; sal_Bool bRef = sal_False; sal_Bool bConst = sal_False; @@ -883,8 +883,8 @@ void InterfaceType::dumpMethods(FileStream& o) sal_uInt16 j; for (j=0; j < paramCount; j++) { - paramName = m_reader.getMethodParamName(i, j); - paramType = m_reader.getMethodParamType(i, j); + paramName = m_reader.getMethodParamName(i, j); + paramType = m_reader.getMethodParamType(i, j); paramMode = m_reader.getMethodParamMode(i, j); switch (paramMode) @@ -1054,7 +1054,7 @@ sal_Bool ModuleType::dump(IdlOptions* pOptions) if (tmpName.equals("/")) tmpName = "global"; else -// tmpName += "/" + m_typeName.getToken(m_typeName.getTokenCount('/') - 1, '/'); +// tmpName += "/" + m_typeName.getToken(m_typeName.getTokenCount('/') - 1, '/'); tmpName += "/" + m_name; OString tmpFileName; @@ -1071,7 +1071,7 @@ sal_Bool ModuleType::dump(IdlOptions* pOptions) if ( bFileExists && pOptions->isValid("-Gc") ) { - tmpFileName = createFileNameFromType(outPath, m_typeName, ".tml"); + tmpFileName = createFileNameFromType(outPath, m_typeName, ".tml"); bFileCheck = sal_True; } @@ -1117,10 +1117,10 @@ sal_Bool ModuleType::dumpHFile(FileStream& o) dumpNameSpace(o, sal_True, sal_True); o << "\n"; - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldAccess(i); @@ -1147,8 +1147,8 @@ sal_Bool ModuleType::dumpHFile(FileStream& o) sal_Bool ModuleType::hasConstants() { - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; for (sal_uInt16 i=0; i < fieldCount; i++) { @@ -1200,7 +1200,7 @@ sal_Bool ConstantsType::dump(IdlOptions* pOptions) if ( bFileExists && pOptions->isValid("-Gc") ) { - tmpFileName = createFileNameFromType(outPath, m_typeName, ".tml"); + tmpFileName = createFileNameFromType(outPath, m_typeName, ".tml"); bFileCheck = sal_True; } @@ -1274,11 +1274,11 @@ sal_Bool StructureType::dumpHFile(FileStream& o) if (superType.getLength() > 0) dumpSuperMember(o, superType); - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; - sal_uInt16 i=0; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; + sal_uInt16 i=0; for (i=0; i < fieldCount; i++) { @@ -1320,10 +1320,10 @@ void StructureType::dumpSuperMember(FileStream& o, const OString& superType) { dumpSuperMember(o, aSuperReader.getSuperTypeName()); - sal_uInt32 fieldCount = aSuperReader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; + sal_uInt32 fieldCount = aSuperReader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { access = aSuperReader.getFieldAccess(i); @@ -1393,11 +1393,11 @@ sal_Bool ExceptionType::dumpHFile(FileStream& o) if (superType.getLength() > 0) dumpSuperMember(o, superType); - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; - sal_uInt16 i = 0; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; + sal_uInt16 i = 0; for (i=0; i < fieldCount; i++) { @@ -1440,10 +1440,10 @@ void ExceptionType::dumpSuperMember(FileStream& o, const OString& superType) { dumpSuperMember(o, aSuperReader.getSuperTypeName()); - sal_uInt32 fieldCount = aSuperReader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - OString fieldName; - OString fieldType; + sal_uInt32 fieldCount = aSuperReader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + OString fieldName; + OString fieldType; for (sal_uInt16 i=0; i < fieldCount; i++) { access = aSuperReader.getFieldAccess(i); @@ -1503,11 +1503,11 @@ sal_Bool EnumType::dumpHFile(FileStream& o) o << "\nenum " << m_name << "\n{\n"; inc(); - sal_uInt32 fieldCount = m_reader.getFieldCount(); - RTFieldAccess access = RT_ACCESS_INVALID; - RTConstValue constValue; - OString fieldName; - sal_uInt32 value=0; + sal_uInt32 fieldCount = m_reader.getFieldCount(); + RTFieldAccess access = RT_ACCESS_INVALID; + RTConstValue constValue; + OString fieldName; + sal_uInt32 value=0; for (sal_uInt16 i=0; i < fieldCount; i++) { access = m_reader.getFieldAccess(i); @@ -1528,7 +1528,7 @@ sal_Bool EnumType::dumpHFile(FileStream& o) OString aDoc = m_reader.getFieldDoku(i); if( aDoc.getLength() ) */ - // o << "/**\n" << aDoc << "\n*/\n"; + // o << "/**\n" << aDoc << "\n*/\n"; o << indent() << fieldName; if( i +1 < fieldCount ) o << ",\n"; @@ -1612,7 +1612,7 @@ sal_Bool produceType(const OString& typeName, return sal_False; RTTypeClass typeClass = reader.getTypeClass(); - sal_Bool ret = sal_False; + sal_Bool ret = sal_False; switch (typeClass) { case RT_TYPE_INTERFACE: @@ -1630,7 +1630,7 @@ sal_Bool produceType(const OString& typeName, { ret = mType.dump(pOptions); if (ret) typeDependencies.setGenerated(typeName); -// ret = mType.dumpDependedTypes(pOptions); +// ret = mType.dumpDependedTypes(pOptions); } else { typeDependencies.setGenerated(typeName); @@ -1677,7 +1677,7 @@ sal_Bool produceType(const OString& typeName, { ret = cType.dump(pOptions); if (ret) typeDependencies.setGenerated(typeName); -// ret = cType.dumpDependedTypes(pOptions); +// ret = cType.dumpDependedTypes(pOptions); } else { typeDependencies.setGenerated(typeName); diff --git a/codemaker/source/idlmaker/idltype.hxx b/codemaker/source/idlmaker/idltype.hxx index 84ced9a9208f..d3fa71abff2b 100644 --- a/codemaker/source/idlmaker/idltype.hxx +++ b/codemaker/source/idlmaker/idltype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,8 +29,8 @@ #ifndef INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLTYPE_HXX #define INCLUDED_CODEMAKER_SOURCE_IDLMAKER_IDLTYPE_HXX -#include <codemaker/typemanager.hxx> -#include <codemaker/dependency.hxx> +#include <codemaker/typemanager.hxx> +#include <codemaker/dependency.hxx> enum BASETYPE { @@ -39,7 +39,7 @@ enum BASETYPE BT_ANY, BT_TYPE, BT_BOOLEAN, - BT_CHAR, + BT_CHAR, BT_STRING, BT_FLOAT, BT_DOUBLE, @@ -59,7 +59,7 @@ enum IdlTypeDecl CPPUTYPEDECL_ALLTYPES, CPPUTYPEDECL_NOINTERFACES, CPPUTYPEDECL_ONLYINTERFACES -}; +}; class IdlOptions; class FileStream; @@ -69,7 +69,7 @@ class IdlType public: IdlType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~IdlType(); @@ -88,34 +88,34 @@ public: virtual void dumpType(FileStream& o, const ::rtl::OString& type) throw( CannotDumpException ); - ::rtl::OString getBaseType(const ::rtl::OString& type); - void dumpIdlGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, IdlTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES); + ::rtl::OString getBaseType(const ::rtl::OString& type); + void dumpIdlGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, IdlTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES); BASETYPE isBaseType(const ::rtl::OString& type); - void dumpConstantValue(FileStream& o, sal_uInt16 index); + void dumpConstantValue(FileStream& o, sal_uInt16 index); virtual sal_uInt32 getMemberCount(); - virtual sal_uInt32 getInheritedMemberCount(); + virtual sal_uInt32 getInheritedMemberCount(); - void inc(sal_uInt32 num=4); - void dec(sal_uInt32 num=4); - ::rtl::OString indent(); - ::rtl::OString indent(sal_uInt32 num); + void inc(sal_uInt32 num=4); + void dec(sal_uInt32 num=4); + ::rtl::OString indent(); + ::rtl::OString indent(sal_uInt32 num); protected: - virtual sal_uInt32 checkInheritedMemberCount(const TypeReader* pReader); - - ::rtl::OString checkSpecialIdlType(const ::rtl::OString& type); - ::rtl::OString checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False); + virtual sal_uInt32 checkInheritedMemberCount(const TypeReader* pReader); + ::rtl::OString checkSpecialIdlType(const ::rtl::OString& type); + ::rtl::OString checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False); + protected: - sal_uInt32 m_inheritedMemberCount; - - sal_uInt32 m_indentLength; - ::rtl::OString m_typeName; - ::rtl::OString m_name; - TypeReader m_reader; - TypeManager& m_typeMgr; - TypeDependency m_dependencies; + sal_uInt32 m_inheritedMemberCount; + + sal_uInt32 m_indentLength; + ::rtl::OString m_typeName; + ::rtl::OString m_name; + TypeReader m_reader; + TypeManager& m_typeMgr; + TypeDependency m_dependencies; }; class InterfaceType : public IdlType @@ -123,26 +123,26 @@ class InterfaceType : public IdlType public: InterfaceType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~InterfaceType(); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); - void dumpAttributes(FileStream& o); - void dumpMethods(FileStream& o); + void dumpAttributes(FileStream& o); + void dumpMethods(FileStream& o); - sal_uInt32 getMemberCount(); - sal_uInt32 getInheritedMemberCount(); + sal_uInt32 getMemberCount(); + sal_uInt32 getInheritedMemberCount(); protected: - sal_uInt32 checkInheritedMemberCount(const TypeReader* pReader); + sal_uInt32 checkInheritedMemberCount(const TypeReader* pReader); protected: - sal_uInt32 m_inheritedMemberCount; - sal_Bool m_hasAttributes; - sal_Bool m_hasMethods; + sal_uInt32 m_inheritedMemberCount; + sal_Bool m_hasAttributes; + sal_Bool m_hasMethods; }; class ModuleType : public IdlType @@ -150,14 +150,14 @@ class ModuleType : public IdlType public: ModuleType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~ModuleType(); - virtual sal_Bool dump(IdlOptions* pOptions) throw( CannotDumpException ); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); - sal_Bool hasConstants(); + virtual sal_Bool dump(IdlOptions* pOptions) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool hasConstants(); }; class ConstantsType : public ModuleType @@ -165,12 +165,12 @@ class ConstantsType : public ModuleType public: ConstantsType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~ConstantsType(); - virtual sal_Bool dump(IdlOptions* pOptions) throw( CannotDumpException ); + virtual sal_Bool dump(IdlOptions* pOptions) throw( CannotDumpException ); }; class StructureType : public IdlType @@ -178,14 +178,14 @@ class StructureType : public IdlType public: StructureType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~StructureType(); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); - void dumpSuperMember(FileStream& o, const ::rtl::OString& super); + void dumpSuperMember(FileStream& o, const ::rtl::OString& super); }; class ExceptionType : public IdlType @@ -193,14 +193,14 @@ class ExceptionType : public IdlType public: ExceptionType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~ExceptionType(); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); - void dumpSuperMember(FileStream& o, const ::rtl::OString& super); + void dumpSuperMember(FileStream& o, const ::rtl::OString& super); }; class EnumType : public IdlType @@ -208,12 +208,12 @@ class EnumType : public IdlType public: EnumType(TypeReader& typeReader, const ::rtl::OString& typeName, - const TypeManager& typeMgr, + const TypeManager& typeMgr, const TypeDependency& typeDependencies); virtual ~EnumType(); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); }; class TypeDefType : public IdlType @@ -226,18 +226,18 @@ public: virtual ~TypeDefType(); - sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); + sal_Bool dumpHFile(FileStream& o) throw( CannotDumpException ); }; sal_Bool produceType(const ::rtl::OString& typeName, - TypeManager& typeMgr, + TypeManager& typeMgr, TypeDependency& typeDependencies, IdlOptions* pOptions) throw( CannotDumpException ); /** - * This function returns a C++ scoped name, represents the namespace + * This function returns a C++ scoped name, represents the namespace * scoping of this type, e.g. com:.sun::star::uno::XInterface. If the scope of * the type is equal scope, the relativ name will be used. */ diff --git a/codemaker/source/javamaker/classfile.cxx b/codemaker/source/javamaker/classfile.cxx index 9ab2e4296228..4f6f6755ce00 100644 --- a/codemaker/source/javamaker/classfile.cxx +++ b/codemaker/source/javamaker/classfile.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/source/javamaker/classfile.hxx b/codemaker/source/javamaker/classfile.hxx index 57986a70aa18..72a5d0528800 100644 --- a/codemaker/source/javamaker/classfile.hxx +++ b/codemaker/source/javamaker/classfile.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/source/javamaker/javamaker.cxx b/codemaker/source/javamaker/javamaker.cxx index bb7ec071fb19..6a25bc728e25 100644 --- a/codemaker/source/javamaker/javamaker.cxx +++ b/codemaker/source/javamaker/javamaker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,18 +41,18 @@ using namespace rtl; sal_Bool produceAllTypes(RegistryKey& rTypeKey, sal_Bool bIsExtraType, - TypeManager const & typeMgr, + TypeManager const & typeMgr, codemaker::GeneratedTypeSet & generated, JavaOptions* pOptions, sal_Bool bFullScope) throw( CannotDumpException ) { OString typeName = typeMgr.getTypeName(rTypeKey); - + if (!produceType(rTypeKey, bIsExtraType, typeMgr, generated, pOptions)) { - fprintf(stderr, "%s ERROR: %s\n", - pOptions->getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + pOptions->getProgramName().getStr(), OString("cannot dump Type '" + typeName + "'").getStr()); exit(99); } @@ -61,7 +61,7 @@ sal_Bool produceAllTypes(RegistryKey& rTypeKey, sal_Bool bIsExtraType, RegistryKeyList::const_iterator iter = typeKeys.begin(); RegistryKey key, subKey; RegistryKeyArray subKeys; - + while (iter != typeKeys.end()) { key = (*iter).first; @@ -84,25 +84,25 @@ sal_Bool produceAllTypes(RegistryKey& rTypeKey, sal_Bool bIsExtraType, return sal_False; } } - } + } ++iter; } - - return sal_True; + + return sal_True; } sal_Bool produceAllTypes(const OString& typeName, - TypeManager const & typeMgr, + TypeManager const & typeMgr, codemaker::GeneratedTypeSet & generated, JavaOptions* pOptions, sal_Bool bFullScope) throw( CannotDumpException ) { - if (!produceType(typeName, typeMgr, generated, pOptions)) + if (!produceType(typeName, typeMgr, generated, pOptions)) { - fprintf(stderr, "%s ERROR: %s\n", - pOptions->getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + pOptions->getProgramName().getStr(), OString("cannot dump Type '" + typeName + "'").getStr()); exit(99); } @@ -133,19 +133,19 @@ sal_Bool produceAllTypes(const OString& typeName, return sal_False; } } - } - + } + ++iter; } - - return sal_True; + + return sal_True; } SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { JavaOptions options; - try + try { if (!options.initOptions(argc, argv)) { @@ -159,7 +159,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } RegistryTypeManager typeMgr; - + if (!typeMgr.init(options.getInputFiles(), options.getExtraInputFiles())) { fprintf(stderr, "%s : init registries failed, check your registry files.\n", options.getProgramName().getStr()); @@ -171,7 +171,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) typeMgr.setBase(options.getOption("-B")); } - try + try { if (options.isValid("-T")) { @@ -184,7 +184,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) do { typeName = tOption.getToken(0, ';', nIndex); - + sal_Int32 nPos = typeName.lastIndexOf( '.' ); tmpName = typeName.copy( nPos != -1 ? nPos+1 : 0 ); if (tmpName == "*") @@ -196,7 +196,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } else { tmpName = typeName.copy(0, typeName.lastIndexOf('.')).replace('.', '/'); - if (tmpName.getLength() == 0) + if (tmpName.getLength() == 0) tmpName = "/"; else tmpName.replace('.', '/'); @@ -215,8 +215,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if (!ret) { - fprintf(stderr, "%s ERROR: %s\n", - options.getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + options.getProgramName().getStr(), OString("cannot dump Type '" + typeName + "'").getStr()); exit(99); } @@ -227,8 +227,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) codemaker::GeneratedTypeSet generated; if (!produceAllTypes("/", typeMgr, generated, &options, sal_True)) { - fprintf(stderr, "%s ERROR: %s\n", - options.getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + options.getProgramName().getStr(), "an error occurs while dumping all types."); exit(99); } @@ -236,8 +236,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } catch( CannotDumpException& e) { - fprintf(stderr, "%s ERROR: %s\n", - options.getProgramName().getStr(), + fprintf(stderr, "%s ERROR: %s\n", + options.getProgramName().getStr(), e.m_message.getStr()); exit(99); } diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx index db4980ba6a69..105357c27ef4 100644 --- a/codemaker/source/javamaker/javaoptions.cxx +++ b/codemaker/source/javamaker/javaoptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_codemaker.hxx" -#include <stdio.h> +#include <stdio.h> #include <string.h> #include "javaoptions.hxx" #include "osl/process.h" @@ -36,16 +36,16 @@ using namespace rtl; -sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) +sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw( IllegalArgument ) { - sal_Bool ret = sal_True; - sal_uInt16 i=0; + sal_Bool ret = sal_True; + sal_uInt16 i=0; if (!bCmdFile) { bCmdFile = sal_True; - + m_program = av[0]; if (ac < 2) @@ -60,7 +60,7 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) i = 0; } - char *s=NULL; + char *s=NULL; for( ; i < ac; i++) { if (av[i][0] == '-') @@ -81,14 +81,14 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + m_options["-O"] = OString(s); break; case 'B': @@ -105,14 +105,14 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + m_options["-B"] = OString(s); break; case 'n': @@ -122,7 +122,7 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) tmp += " your input '" + OString(av[i]) + "'"; throw IllegalArgument(tmp); } - + m_options["-nD"] = OString(""); break; case 'T': @@ -139,14 +139,14 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + if (m_options.count("-T") > 0) { OString tmp(m_options["-T"]); @@ -184,7 +184,7 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw IllegalArgument(tmp); } - + m_options["-G"] = OString(""); break; case 'X': // support for eXtra type rdbs @@ -202,18 +202,18 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) { tmp += " your input '" + OString(av[i+1]) + "'"; } - + throw IllegalArgument(tmp); } } else { s = av[i] + 2; } - + m_extra_input_files.push_back( s ); break; } - + default: throw IllegalArgument("the option is unknown" + OString(av[i])); } @@ -238,14 +238,14 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) rargc++; } fclose(cmdFile); - + ret = initOptions(rargc, rargv, bCmdFile); - - for (long j=0; j < rargc; j++) + + for (long j=0; j < rargc; j++) { free(rargv[j]); } - } + } } else { if (bCmdFile) @@ -261,14 +261,14 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) } m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding())); } - } + } } } + + return ret; +} - return ret; -} - -OString JavaOptions::prepareHelp() +OString JavaOptions::prepareHelp() { OString help("\nusing: "); help += m_program + " [-options] file_1 ... file_n -Xfile_n+1 -Xfile_n+2\nOptions:\n"; @@ -277,7 +277,7 @@ OString JavaOptions::prepareHelp() help += " -T<name> = name specifies a type or a list of types. The output for this\n"; help += " [t1;...] type and all dependent types are generated. If no '-T' option is \n"; help += " specified, then output for all types is generated.\n"; - help += " Example: 'com.sun.star.uno.XInterface' is a valid type.\n"; + help += " Example: 'com.sun.star.uno.XInterface' is a valid type.\n"; help += " -B<name> = name specifies the base node. All types are searched under this\n"; help += " node. Default is the root '/' of the registry files.\n"; help += " -nD = no dependent types are generated.\n"; @@ -285,18 +285,18 @@ OString JavaOptions::prepareHelp() help += " -Gc = generate only target files which content will be changed.\n"; help += " -X<file> = extra types which will not be taken into account for generation.\n"; help += prepareVersion(); - + return help; -} +} -OString JavaOptions::prepareVersion() +OString JavaOptions::prepareVersion() { OString version("\nSun Microsystems (R) "); version += m_program + " Version 2.0\n\n"; return version; -} - +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx index e7f2f48b3960..5317529a32f6 100644 --- a/codemaker/source/javamaker/javaoptions.hxx +++ b/codemaker/source/javamaker/javaoptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,16 +39,16 @@ public: ~JavaOptions() {} - sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) + sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False) throw( IllegalArgument ); - ::rtl::OString prepareHelp(); - - ::rtl::OString prepareVersion(); + ::rtl::OString prepareHelp(); + ::rtl::OString prepareVersion(); + protected: }; - + #endif // INCLUDED_CODEMAKER_SOURCE_JAVAMAKER_JAVAOPTIONS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index 4b99ef9f116b..0ef325ca3711 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1873,7 +1873,7 @@ void handleAggregatingType( } else { if ( ( - typeClass == RT_TYPE_STRUCT && + typeClass == RT_TYPE_STRUCT && ( fields == 0 || (references == 0 ? superTypes > 1 : superTypes != 0) @@ -3307,7 +3307,7 @@ bool produceType( codemaker::GeneratedTypeSet & generated, JavaOptions * options) { ::rtl::OString typeName = manager.getTypeName(rTypeKey); - + OSL_ASSERT(options != 0); if (typeName.equals("/") || typeName.equals(manager.getBase()) diff --git a/codemaker/source/javamaker/javatype.hxx b/codemaker/source/javamaker/javatype.hxx index e294aa6ab94f..dd507af7891a 100644 --- a/codemaker/source/javamaker/javatype.hxx +++ b/codemaker/source/javamaker/javatype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ bool produceType( rtl::OString const & type, TypeManager const & manager, codemaker::GeneratedTypeSet & generated, JavaOptions * pOptions); -bool produceType(RegistryKey& typeName, bool bIsExtraType, TypeManager const & typeMgr, +bool produceType(RegistryKey& typeName, bool bIsExtraType, TypeManager const & typeMgr, codemaker::GeneratedTypeSet & generated, JavaOptions* pOptions); diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx index 92d4d7024f62..a55cefacd538 100644 --- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx +++ b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/test/cppumaker/types.idl b/codemaker/test/cppumaker/types.idl index 9d9c70234ae3..20e2dad46ba1 100644 --- a/codemaker/test/cppumaker/types.idl +++ b/codemaker/test/cppumaker/types.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/test/cppumaker/version.map b/codemaker/test/cppumaker/version.map index 7321bbca16ad..f313c44bd7ad 100644 --- a/codemaker/test/cppumaker/version.map +++ b/codemaker/test/cppumaker/version.map @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/test/javamaker/Test.java b/codemaker/test/javamaker/Test.java index 532b9de76c9d..b1473555621c 100644 --- a/codemaker/test/javamaker/Test.java +++ b/codemaker/test/javamaker/Test.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/test/javamaker/java15/Test.java b/codemaker/test/javamaker/java15/Test.java index de5e43367198..968a369ff4b1 100644 --- a/codemaker/test/javamaker/java15/Test.java +++ b/codemaker/test/javamaker/java15/Test.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/test/javamaker/java15/types.idl b/codemaker/test/javamaker/java15/types.idl index b2f96818dd72..cc7291f50013 100644 --- a/codemaker/test/javamaker/java15/types.idl +++ b/codemaker/test/javamaker/java15/types.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/codemaker/test/javamaker/types.idl b/codemaker/test/javamaker/types.idl index 81710430acb7..a3fd9a646815 100644 --- a/codemaker/test/javamaker/types.idl +++ b/codemaker/test/javamaker/types.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |