diff options
Diffstat (limited to 'unodevtools/source/skeletonmaker/cpptypemaker.cxx')
-rw-r--r-- | unodevtools/source/skeletonmaker/cpptypemaker.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx index e95b5039934f..640d0545464d 100644 --- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx +++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx @@ -28,7 +28,7 @@ using namespace ::codemaker::cpp; namespace skeletonmaker { namespace cpp { void printType(std::ostream & o, - ProgramOptions const & options, TypeManager const & manager, + ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, codemaker::UnoType::Sort sort, RTTypeClass typeClass, OString const & name, sal_Int32 rank, std::vector< OString > const & arguments, short referenceType, @@ -63,7 +63,7 @@ void printType(std::ostream & o, if (defaultvalue && referenceType == 16) { if (typeClass == RT_TYPE_ENUM) { - typereg::Reader reader(manager.getTypeReader(name)); + typereg::Reader reader(manager->getTypeReader(name)); o << name.copy(name.lastIndexOf('/')) << "_" << codemaker::convertString(reader.getFieldName(0)); @@ -122,7 +122,7 @@ void printType(std::ostream & o, } void printType(std::ostream & o, - ProgramOptions const & options, TypeManager const & manager, + ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, OString const & type, short referenceType, bool defaultvalue) { RTTypeClass typeClass; @@ -137,7 +137,7 @@ void printType(std::ostream & o, } bool printConstructorParameters(std::ostream & o, - ProgramOptions const & options, TypeManager const & manager, + ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, typereg::Reader const & outerReader, std::vector< OString > const & arguments) { @@ -145,7 +145,7 @@ bool printConstructorParameters(std::ostream & o, if (reader.getSuperTypeCount() != 0) { OString super( codemaker::convertString(reader.getSuperTypeName(0))); - typereg::Reader superReader(manager.getTypeReader(super)); + typereg::Reader superReader(manager->getTypeReader(super)); if (!superReader.isValid()) throw CannotDumpException("Bad type library entity " + super); @@ -186,7 +186,7 @@ bool printConstructorParameters(std::ostream & o, } void printConstructor(std::ostream & o, - ProgramOptions const & options, TypeManager const & manager, + ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, std::vector< OString > const & arguments) { @@ -199,7 +199,7 @@ void printConstructor(std::ostream & o, } void printMethodParameters(std::ostream & o, - ProgramOptions const & options, TypeManager const & manager, + ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, sal_uInt16 method, bool previous, bool withtype) { @@ -235,7 +235,7 @@ void printMethodParameters(std::ostream & o, } void printExceptionSpecification(std::ostream & o, - ProgramOptions const & options, TypeManager const & manager, + ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, sal_uInt16 method) { o << ((options.shortnames) ? " throw (css::uno::RuntimeException" : @@ -367,7 +367,7 @@ void generateXDispatchProvider(std::ostream& o, void printMethods(std::ostream & o, - ProgramOptions const & options, TypeManager const & manager, + ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, codemaker::GeneratedTypeSet & generated, OString const & delegate, OString const & classname, OString const & indentation, bool defaultvalue, @@ -456,7 +456,7 @@ void printMethods(std::ostream & o, if (options.all || defaultvalue) { for (sal_uInt16 i = 0; i < reader.getSuperTypeCount(); ++i) { typereg::Reader super( - manager.getTypeReader( + manager->getTypeReader( codemaker::convertString( reader.getSuperTypeName(i)))); if (!super.isValid()) { @@ -642,7 +642,7 @@ void printMethods(std::ostream & o, } void printConstructionMethods(std::ostream & o, - ProgramOptions const & options, TypeManager const & manager, + ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader) { for (sal_uInt16 i = 0; i < reader.getMethodCount(); ++i) { @@ -671,7 +671,7 @@ void printConstructionMethods(std::ostream & o, } void printServiceMembers(std::ostream & o, - ProgramOptions const & options, TypeManager const & manager, + ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, typereg::Reader const & reader, OString const & type, OString const & delegate) { @@ -709,7 +709,7 @@ void printServiceMembers(std::ostream & o, } void printMapsToCppType(std::ostream & o, - ProgramOptions const & options, TypeManager const & manager, + ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, codemaker::UnoType::Sort sort, RTTypeClass typeClass, OString const & name, sal_Int32 rank, std::vector< OString > const & arguments, const char * cppTypeSort) @@ -728,7 +728,7 @@ void printMapsToCppType(std::ostream & o, } void generateDocumentation(std::ostream & o, - ProgramOptions const & options, TypeManager const & manager, + ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, OString const & type, OString const & delegate) { if (type.indexOf('/') >= 0) @@ -760,7 +760,7 @@ void generateDocumentation(std::ostream & o, } else if (sort != codemaker::UnoType::SORT_COMPLEX) { o << " simple type"; } else { - typereg::Reader reader(manager.getTypeReader(name)); + typereg::Reader reader(manager->getTypeReader(name)); if (!reader.isValid()) throw CannotDumpException("Bad type library entity " + name); @@ -803,7 +803,7 @@ void generateDocumentation(std::ostream & o, break; case RT_TYPE_SINGLETON: - if ((manager.getTypeReader( + if ((manager->getTypeReader( codemaker::convertString( reader.getSuperTypeName(0))).getTypeClass()) == RT_TYPE_INTERFACE) @@ -839,7 +839,7 @@ void generateDocumentation(std::ostream & o, o << '\n'; } } else { - typereg::Reader reader(manager.getTypeReader(name)); + typereg::Reader reader(manager->getTypeReader(name)); if (!reader.isValid()) throw CannotDumpException("Bad type library entity " + name); @@ -933,7 +933,7 @@ void generateDocumentation(std::ostream & o, case RT_TYPE_SINGLETON: if (reader.getSuperTypeCount() > 0 && - ((manager.getTypeReader( + ((manager->getTypeReader( codemaker::convertString( reader.getSuperTypeName(0))). getTypeClass()) == RT_TYPE_INTERFACE) ) |