diff options
Diffstat (limited to 'unodevtools')
| -rw-r--r-- | unodevtools/inc/unodevtools/options.hxx | 3 | ||||
| -rw-r--r-- | unodevtools/inc/unodevtools/typemanager.hxx | 18 | ||||
| -rw-r--r-- | unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 90 | ||||
| -rw-r--r-- | unodevtools/source/skeletonmaker/cpptypemaker.cxx | 6 | ||||
| -rw-r--r-- | unodevtools/source/skeletonmaker/javacompskeleton.cxx | 46 | ||||
| -rw-r--r-- | unodevtools/source/skeletonmaker/javatypemaker.cxx | 7 | ||||
| -rw-r--r-- | unodevtools/source/skeletonmaker/makefile.mk | 4 | ||||
| -rw-r--r-- | unodevtools/source/skeletonmaker/skeletoncommon.cxx | 44 | ||||
| -rw-r--r-- | unodevtools/source/skeletonmaker/skeletoncommon.hxx | 22 | ||||
| -rw-r--r-- | unodevtools/source/skeletonmaker/skeletoncpp.hxx | 2 | ||||
| -rw-r--r-- | unodevtools/source/skeletonmaker/skeletonjava.hxx | 2 | ||||
| -rw-r--r-- | unodevtools/source/skeletonmaker/skeletonmaker.cxx | 3 | ||||
| -rw-r--r-- | unodevtools/source/unodevtools/options.cxx | 3 | ||||
| -rw-r--r-- | unodevtools/source/unodevtools/typeblob.cxx | 13 | ||||
| -rw-r--r-- | unodevtools/source/unodevtools/typemanager.cxx | 5 |
15 files changed, 145 insertions, 123 deletions
diff --git a/unodevtools/inc/unodevtools/options.hxx b/unodevtools/inc/unodevtools/options.hxx index 9fee20bb107e..f1fc70bad3fc 100644 --- a/unodevtools/inc/unodevtools/options.hxx +++ b/unodevtools/inc/unodevtools/options.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt, } // end of namespace unodevtools #endif // INCLUDED_UNODEVTOOLS_OPTIONS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/inc/unodevtools/typemanager.hxx b/unodevtools/inc/unodevtools/typemanager.hxx index a6bb601d815d..603fa4652648 100644 --- a/unodevtools/inc/unodevtools/typemanager.hxx +++ b/unodevtools/inc/unodevtools/typemanager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,31 +32,20 @@ #include <codemaker/typemanager.hxx> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> class RegistryKey; namespace typereg { class Reader; } -#if defined( _MSC_VER ) && ( _MSC_VER < 1200 ) -typedef ::std::__hash_map__ -< - ::rtl::OString, // Typename - RTTypeClass, // TypeClass - HashString, - EqualString, - NewAlloc -> T2TypeClassMap; -#else -typedef ::std::hash_map +typedef boost::unordered_map < ::rtl::OString, // Typename RTTypeClass, // TypeClass HashString, EqualString > T2TypeClassMap; -#endif namespace unodevtools { @@ -98,3 +88,5 @@ protected: } #endif // _UNODEVTOOLS_TYPEMANAGER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 1c74e4b1ad2b..f2b526ba3c95 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ using namespace ::codemaker::cpp; namespace skeletonmaker { namespace cpp { void generateIncludes(std::ostream & o, - const std::hash_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& interfaces, const AttributeInfo& /*properties*/, OString propertyhelper, bool serviceobject, bool supportxcomponent) @@ -64,13 +65,13 @@ void generateIncludes(std::ostream & o, o << "#include \"cppuhelper/propertysetmixin.hxx\"\n"; } - std::hash_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << "#include \"" << ((*iter).replace('.', '/').getStr()) << ".hpp\"\n"; - iter++; + ++iter; } } @@ -147,7 +148,7 @@ OString generateCompHelperDeclaration(std::ostream & o, void generateCompHelperDefinition(std::ostream & o, const OString & implname, const OString & classname, - const std::hash_set< OString, OStringHash >& services) + const boost::unordered_set< OString, OStringHash >& services) { OString nm; short nbrackets = generateNamespace(o, implname, true, nm); @@ -160,14 +161,14 @@ void generateCompHelperDefinition(std::ostream & o, "_getSupportedServiceNames()\n{\n css::uno::Sequence< " << "::rtl::OUString >" << " s(" << services.size() << ");\n"; - std::hash_set< OString, OStringHash >::const_iterator iter = services.begin(); + boost::unordered_set< OString, OStringHash >::const_iterator iter = services.begin(); short i=0; while (iter != services.end()) { o << " s[" << i++ << "] = ::rtl::OUString(" << "RTL_CONSTASCII_USTRINGPARAM(\n \"" << (*iter).replace('/','.') << "\"));\n"; - iter++; + ++iter; } o << " return s;\n}\n\n"; @@ -448,7 +449,7 @@ void generateXDispatch(std::ostream& o, } o << " }\n"; - iter++; + ++iter; } o << "}\n\n"; @@ -492,7 +493,7 @@ void generateXDispatchProvider(std::ostream& o, } o << " }\n"; - iter++; + ++iter; } o << " return xRet;\n}\n\n"; @@ -514,7 +515,7 @@ void generateXDispatchProvider(std::ostream& o, void generateAddinConstructorAndHelper(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, const OString & classname, - const std::hash_set< OString, OStringHash >& interfaces) + const boost::unordered_set< OString, OStringHash >& interfaces) { o << classname << "::" << classname << "(css::uno::Reference< css::uno::XComponentContext > const & context) :\n" @@ -535,13 +536,13 @@ void generateAddinConstructorAndHelper(std::ostream& o, " RTL_CONSTASCII_USTRINGPARAM(\n" " \"com.sun.star.configuration.ConfigurationAccess\"));\n\n"; - o << " ::rtl::OUStringBuffer sPath(::rtl::OUString::createFromAscii(\n" - " \"/org.openoffice.Office.CalcAddIns/AddInInfo/\"));\n" + o << " ::rtl::OUStringBuffer sPath(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\n" + " \"/org.openoffice.Office.CalcAddIns/AddInInfo/\")));\n" " sPath.appendAscii(sADDIN_SERVICENAME);\n" " sPath.appendAscii(\"/AddInFunctions\");\n\n" " // create arguments: nodepath\n" " css::beans::PropertyValue aArgument;\n" - " aArgument.Name = ::rtl::OUString::createFromAscii(\"nodepath\");\n" + " aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"nodepath\"));\n" " aArgument.Value <<= sPath.makeStringAndClear();\n\n" " css::uno::Sequence< css::uno::Any > aArguments(1);\n" " aArguments[0] <<= aArgument;\n\n"; @@ -556,8 +557,8 @@ void generateAddinConstructorAndHelper(std::ostream& o, o << " // extend arguments to create a view for all locales to get " "simple\n // access to the compatibilityname property\n" - " aArgument.Name = ::rtl::OUString::createFromAscii(\"locale\");\n" - " aArgument.Value <<= ::rtl::OUString::createFromAscii(\"*\");\n" + " aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"locale\"));\n" + " aArgument.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"*\"));\n" " aArguments.realloc(2);\n" " aArguments[1] <<= aArgument;\n\n" " // create view for all locales\n" @@ -581,7 +582,7 @@ void generateAddinConstructorAndHelper(std::ostream& o, " m_xHAccess->getByHierarchicalName(\n" " buf.makeStringAndClear()), css::uno::UNO_QUERY);\n" " xPropSet->getPropertyValue(\n " - "::rtl::OUString::createFromAscii(propName)) >>= ret;\n }\n" + "::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(propName))) >>= ret;\n }\n" " catch ( css::uno::RuntimeException & e ) {\n throw e;\n }\n" " catch ( css::uno::Exception & ) {\n }\n return ret;\n"; } @@ -634,10 +635,10 @@ OString generateClassDefinition(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, OString const & classname, - std::hash_set< OString, OStringHash > const & interfaces, + boost::unordered_set< OString, OStringHash > const & interfaces, AttributeInfo const & properties, AttributeInfo const & attributes, - std::hash_set< OString, OStringHash > const & propinterfaces, + boost::unordered_set< OString, OStringHash > const & propinterfaces, OString const & propertyhelper, bool supportxcomponent) { OStringBuffer parentname(64); @@ -656,12 +657,12 @@ OString generateClassDefinition(std::ostream& o, o << " public ::cppu::WeakImplHelper" << interfaces.size() << "<"; } - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << "\n " << scopedCppName(*iter, false, true); - iter++; + ++iter; if (iter != interfaces.end()) o << ","; else @@ -697,12 +698,12 @@ OString generateClassDefinition(std::ostream& o, OStringBuffer buffer(256); buffer.append(parentname); buffer.append("< "); - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { buffer.append(scopedCppName(*iter, false, true)); - iter++; + ++iter; if (iter != interfaces.end()) buffer.append(", "); else @@ -715,7 +716,7 @@ OString generateClassDefinition(std::ostream& o, << parent << "::release(); }\n\n"; } - std::hash_set< OString, OStringHash >::const_iterator it = + boost::unordered_set< OString, OStringHash >::const_iterator it = interfaces.begin(); codemaker::GeneratedTypeSet generated; while (it != interfaces.end()) @@ -723,7 +724,7 @@ OString generateClassDefinition(std::ostream& o, typereg::Reader reader(manager.getTypeReader((*it).replace('.','/'))); printMethods(o, options, manager, reader, generated, "", "", " ", true, propertyhelper); - it++; + ++it; } o << "private:\n " << classname << "(const " << classname << " &); // not defined\n" @@ -732,9 +733,9 @@ OString generateClassDefinition(std::ostream& o, << " virtual ~" << classname << "() {}\n\n"; if (options.componenttype == 2) { - o << " typedef std::hash_map< ::sal_Int32, rtl::OUString, " - "std::hash<::sal_Int32> > ParamMap;\n" - " typedef std::hash_map< rtl::OUString, ParamMap, " + o << " typedef boost::unordered_map< ::sal_Int32, rtl::OUString, " + "boost::hash<::sal_Int32> > ParamMap;\n" + " typedef boost::unordered_map< rtl::OUString, ParamMap, " "rtl::OUStringHash > FunctionMap;\n\n" " ::rtl::OUString SAL_CALL getAddinProperty(const ::rtl::OUString & " "funcName, const ::rtl::OUString & paramName, const char * propName) " @@ -809,11 +810,11 @@ OString generateClassDefinition(std::ostream& o, << "(css::uno::Reference< css::uno::XComponentContext > const & context) :\n"; if (supportxcomponent) { o << " ::cppu::WeakComponentImplHelper" << interfaces.size() << "<"; - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << "\n " << scopedCppName(*iter, false, true); - iter++; + ++iter; if (iter != interfaces.end()) o << ","; else @@ -896,13 +897,13 @@ void generateXServiceInfoBodies(std::ostream& o, void generateMethodBodies(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - std::hash_set< OString, OStringHash > const & interfaces, + boost::unordered_set< OString, OStringHash > const & interfaces, OString const & classname, OString const & comphelpernamespace, OString const & propertyhelper) { OString name(classname.concat("::")); - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); codemaker::GeneratedTypeSet generated; while (iter != interfaces.end()) { @@ -914,14 +915,14 @@ void generateMethodBodies(std::ostream& o, printMethods(o, options, manager, reader, generated, "_", name, "", true, propertyhelper); } - iter++; + ++iter; } } void generateQueryInterface(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& interfaces, OString const & parentname, OString const & classname, OString const & propertyhelper) @@ -939,12 +940,12 @@ void generateQueryInterface(std::ostream& o, o << "css::uno::Any a("; o << parentname << "<"; - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << "\n " << scopedCppName(*iter, false, true); - iter++; + ++iter; if (iter != interfaces.end()) o << ","; else @@ -979,18 +980,18 @@ void generateSkeleton(ProgramOptions const & options, return; } - std::hash_set< OString, OStringHash > interfaces; - std::hash_set< OString, OStringHash > services; + boost::unordered_set< OString, OStringHash > interfaces; + boost::unordered_set< OString, OStringHash > services; AttributeInfo properties; AttributeInfo attributes; - std::hash_set< OString, OStringHash > propinterfaces; + boost::unordered_set< OString, OStringHash > propinterfaces; bool serviceobject = false; bool supportxcomponent = false; std::vector< OString >::const_iterator iter = types.begin(); while (iter != types.end()) { checkType(manager, *iter, interfaces, services, properties); - iter++; + ++iter; } if (options.componenttype == 3) { @@ -1112,11 +1113,11 @@ void generateCalcAddin(ProgramOptions const & options, TypeManager const & manager, std::vector< OString > const & types) { - std::hash_set< OString, OStringHash > interfaces; - std::hash_set< OString, OStringHash > services; + boost::unordered_set< OString, OStringHash > interfaces; + boost::unordered_set< OString, OStringHash > services; AttributeInfo properties; AttributeInfo attributes; - std::hash_set< OString, OStringHash > propinterfaces; + boost::unordered_set< OString, OStringHash > propinterfaces; bool serviceobject = false; bool supportxcomponent = false; @@ -1124,7 +1125,7 @@ void generateCalcAddin(ProgramOptions const & options, std::vector< OString >::const_iterator iter = types.begin(); while (iter != types.end()) { checkType(manager, *iter, interfaces, services, properties); - iter++; + ++iter; } OString sAddinService; @@ -1136,7 +1137,7 @@ void generateCalcAddin(ProgramOptions const & options, // get the one and only add-in service for later use - std::hash_set< OString, OStringHash >::const_iterator iter2 = services.begin(); + boost::unordered_set< OString, OStringHash >::const_iterator iter2 = services.begin(); sAddinService = (*iter2).replace('/', '.'); if (sAddinService.equals("com.sun.star.sheet.AddIn")) { sAddinService = (*(++iter2)).replace('/', '.'); @@ -1203,7 +1204,7 @@ void generateCalcAddin(ProgramOptions const & options, "#include \"com/sun/star/container/XNameAccess.hpp\"\n" "#include \"com/sun/star/container/XHierarchicalNameAccess.hpp\"\n\n" "#include \"rtl/ustrbuf.hxx\"\n\n" - "#include <hash_map>\n" + "#include <boost/unordered_map.hpp>\n" "#include <set>\n"; // namespace @@ -1275,3 +1276,4 @@ void generateCalcAddin(ProgramOptions const & options, } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx index 66ef981e8978..ce9f4b8d95a6 100644 --- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx +++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -419,8 +420,8 @@ void printMethods(std::ostream & o, o << "// ::com::sun::star::lang::XServiceName:\n" "::rtl::OUString SAL_CALL " << classname << "getServiceName() " "throw (css::uno::RuntimeException)\n{\n " - "return ::rtl::OUString::createFromAscii(" - "sADDIN_SERVICENAME);\n}\n"; + "return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" + "sADDIN_SERVICENAME));\n}\n"; generated.add(type); return; } else if (type.equals("com/sun/star/sheet/XAddIn")) { @@ -969,3 +970,4 @@ void generateDocumentation(std::ostream & o, } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx b/unodevtools/source/skeletonmaker/javacompskeleton.cxx index ebc8ffe10d59..33b99676f8e1 100644 --- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,7 +46,7 @@ void generatePackage(std::ostream & o, const OString & implname) } void generateImports(std::ostream & o, ProgramOptions const & options, - const std::hash_set< OString, OStringHash >& /*interfaces*/, + const boost::unordered_set< OString, OStringHash >& /*interfaces*/, const OString & propertyhelper, bool serviceobject, bool supportxcomponent) { @@ -79,7 +80,7 @@ void generateImports(std::ostream & o, ProgramOptions const & options, } -// std::hash_set< OString, OStringHash >::const_iterator iter = +// boost::unordered_set< OString, OStringHash >::const_iterator iter = // interfaces.begin(); // while (iter != interfaces.end()) // { @@ -466,7 +467,7 @@ void generateXDispatchBodies(std::ostream& o, ProgramOptions const & options) } o << " }\n"; - iter++; + ++iter; } o << " }\n\n"; @@ -502,7 +503,7 @@ void generateXDispatchProviderBodies(std::ostream& o, ProgramOptions const & opt } o << " }\n"; - iter++; + ++iter; } o << " return null;\n }\n\n"; @@ -523,15 +524,15 @@ void generateXDispatchProviderBodies(std::ostream& o, ProgramOptions const & opt void generateMethodBodies(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& interfaces, const OString& indentation, bool usepropertymixin) { - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); codemaker::GeneratedTypeSet generated; while (iter != interfaces.end()) { OString type(*iter); - iter++; + ++iter; if (type.equals("com.sun.star.lang.XServiceInfo")) { generateXServiceInfoBodies(o); generated.add(type); @@ -595,8 +596,8 @@ static const char* propcomment= void generateAddinConstructorAndHelper(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, const OString & classname, - const std::hash_set< OString, OStringHash >& services, - const std::hash_set< OString, OStringHash >& interfaces) + const boost::unordered_set< OString, OStringHash >& services, + const boost::unordered_set< OString, OStringHash >& interfaces) { o << " private com.sun.star.lang.Locale m_locale = " "new com.sun.star.lang.Locale();\n"; @@ -610,7 +611,7 @@ void generateAddinConstructorAndHelper(std::ostream& o, // get the one and only add-in service for later use - std::hash_set< OString, OStringHash >::const_iterator iter = services.begin(); + boost::unordered_set< OString, OStringHash >::const_iterator iter = services.begin(); OString sAddinService = (*iter).replace('/', '.'); if (sAddinService.equals("com.sun.star.sheet.AddIn")) { sAddinService = (*(++iter)).replace('/', '.'); @@ -741,8 +742,8 @@ void generateClassDefinition(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, const OString & classname, - const std::hash_set< OString, OStringHash >& services, - const std::hash_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& services, + const boost::unordered_set< OString, OStringHash >& interfaces, const AttributeInfo& properties, const AttributeInfo& attributes, const OString& propertyhelper, bool supportxcomponent) @@ -759,11 +760,11 @@ void generateClassDefinition(std::ostream& o, o << "WeakBase\n"; } o << " implements "; - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while (iter != interfaces.end()) { o << (*iter); - iter++; + ++iter; if (iter != interfaces.end()) o << ",\n "; } @@ -786,11 +787,11 @@ void generateClassDefinition(std::ostream& o, if (!services.empty()) { o << " private static final String[] m_serviceNames = {\n"; - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = services.begin(); while (iter != services.end()) { o << " \"" << (*iter).replace('/','.') << "\""; - iter++; + ++iter; if (iter != services.end()) o << ",\n"; else @@ -808,7 +809,7 @@ void generateClassDefinition(std::ostream& o, printType(o, options, manager, iter->second.first.replace('.','/'), false, false); o << " m_" << iter->first << ";\n"; - iter++; + ++iter; } } else if (!attributes.empty()) { AttributeInfo::const_iterator iter = @@ -822,7 +823,7 @@ void generateClassDefinition(std::ostream& o, printType(o, options, manager, iter->second.first.replace('.','/'), false, true); o <<";\n"; - iter++; + ++iter; } } @@ -863,18 +864,18 @@ void generateSkeleton(ProgramOptions const & options, std::vector< OString > const & types, OString const & /*delegate*/) { - std::hash_set< OString, OStringHash > interfaces; - std::hash_set< OString, OStringHash > services; + boost::unordered_set< OString, OStringHash > interfaces; + boost::unordered_set< OString, OStringHash > services; AttributeInfo properties; AttributeInfo attributes; - std::hash_set< OString, OStringHash > propinterfaces; + boost::unordered_set< OString, OStringHash > propinterfaces; bool serviceobject = false; bool supportxcomponent = false; std::vector< OString >::const_iterator iter = types.begin(); while (iter != types.end()) { checkType(manager, *iter, interfaces, services, properties); - iter++; + ++iter; } if (options.componenttype == 3) { @@ -995,3 +996,4 @@ void generateSkeleton(ProgramOptions const & options, } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx index 36501555bc68..9f49f66a8785 100644 --- a/unodevtools/source/skeletonmaker/javatypemaker.cxx +++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -430,11 +431,6 @@ void printMethods(std::ostream & o, << codemaker::convertString(reader.getFieldName(i)).getStr() << "()"; - #if 0 - // DEBUG - sal_uInt16 mc = reader.getMethodCount(); - RTMethodMode mm = reader.getMethodFlags(method); - #endif OUString mn = reader.getMethodName(method); OUString fn = reader.getFieldName(i); @@ -874,3 +870,4 @@ void generateDocumentation(std::ostream & o, } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/makefile.mk b/unodevtools/source/skeletonmaker/makefile.mk index 72ac80ec9bda..6205a1fd476e 100644 --- a/unodevtools/source/skeletonmaker/makefile.mk +++ b/unodevtools/source/skeletonmaker/makefile.mk @@ -49,8 +49,8 @@ APP1OBJS = $(OBJ)$/skeletonmaker.obj \ APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \ $(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN) -APP1STDLIBS = $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \ - $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST) +APP1STDLIBS = $(UNODEVTOOLSLIBST) $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \ + $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST) OBJFILES = $(APP1OBJS) diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx index 95c53760687c..7329b793ab54 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -154,7 +155,7 @@ bool containsAttribute(AttributeInfo& attributes, OString const & attrname) void checkAttributes(TypeManager const & manager, const typereg::Reader& reader, AttributeInfo& attributes, - std::hash_set< OString, OStringHash >& propinterfaces) + boost::unordered_set< OString, OStringHash >& propinterfaces) { OString typeName = codemaker::convertString(reader.getTypeName()); if ( typeName.equals("com/sun/star/beans/XPropertySet") || @@ -195,8 +196,8 @@ void checkAttributes(TypeManager const & manager, void checkType(TypeManager const & manager, OString const & type, - std::hash_set< OString, OStringHash >& interfaceTypes, - std::hash_set< OString, OStringHash >& serviceTypes, + boost::unordered_set< OString, OStringHash >& interfaceTypes, + boost::unordered_set< OString, OStringHash >& serviceTypes, AttributeInfo& properties) { @@ -289,8 +290,8 @@ void checkType(TypeManager const & manager, } void checkDefaultInterfaces( - std::hash_set< OString, OStringHash >& interfaces, - const std::hash_set< OString, OStringHash >& services, + boost::unordered_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& services, const OString & propertyhelper) { if ( services.empty() ) { @@ -339,13 +340,13 @@ bool checkServiceProperties(TypeManager const & manager, OString checkPropertyHelper( ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& services, - const std::hash_set< OString, OStringHash >& interfaces, + const boost::unordered_set< OString, OStringHash >& services, + const boost::unordered_set< OString, OStringHash >& interfaces, AttributeInfo& attributes, - std::hash_set< OString, OStringHash >& propinterfaces) + boost::unordered_set< OString, OStringHash >& propinterfaces) { - std::hash_set< OString, OStringHash >::const_iterator iter; - std::hash_set< OString, OStringHash >::const_iterator end; + boost::unordered_set< OString, OStringHash >::const_iterator iter; + boost::unordered_set< OString, OStringHash >::const_iterator end; if ( !services.empty() ) { iter = services.begin(); @@ -391,7 +392,7 @@ OString checkPropertyHelper( osl_getThreadTextEncoding()); } } - iter++; + ++iter; } return (oldStyleWithProperties ? "_" : ""); @@ -427,12 +428,12 @@ bool checkXComponentSupport(TypeManager const & manager, // if XComponent is directly specified, return true and remove it from the // supported interfaces list bool checkXComponentSupport(TypeManager const & manager, - std::hash_set< OString, OStringHash >& interfaces) + boost::unordered_set< OString, OStringHash >& interfaces) { if ( interfaces.empty() ) return false; - std::hash_set< OString, OStringHash >::const_iterator iter = + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while ( iter != interfaces.end() ) { if ( (*iter).equals("com.sun.star.lang.XComponent") ) { @@ -442,7 +443,7 @@ bool checkXComponentSupport(TypeManager const & manager, typereg::Reader reader(manager.getTypeReader((*iter).replace('.', '/'))); if ( checkXComponentSupport(manager, reader) ) return true; - iter++; + ++iter; } return false; @@ -668,9 +669,9 @@ void generateFunctionParamterMap(std::ostream& o, for ( sal_uInt16 p = 0; p < reader.getMethodParameterCount(m); ++p ) { if ( options.language == 2 ) { o << " fpm[" << p - << "] = ::rtl::OUString::createFromAscii(\"" + << "] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"" << codemaker::convertString(reader.getMethodParameterName(m, p)) - << "\");\n"; + << "\"));\n"; } else { if ( options.java5 ) @@ -687,8 +688,8 @@ void generateFunctionParamterMap(std::ostream& o, } if ( options.language == 2 ) { - o << " m_functionMap[::rtl::OUString::createFromAscii(\"" - << sMethod << "\")] = fpm;\n\n"; + o << " m_functionMap[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"" + << sMethod << "\"))] = fpm;\n\n"; } else { o << " m_functionMap.put(\"" << sMethod << "\", fpm);\n\n"; @@ -699,11 +700,11 @@ void generateFunctionParamterMap(std::ostream& o, void generateFunctionParameterMap(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< OString, OStringHash >& interfaces) + const boost::unordered_set< OString, OStringHash >& interfaces) { ::codemaker::GeneratedTypeSet generated; bool bFirst = true; - std::hash_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); + boost::unordered_set< OString, OStringHash >::const_iterator iter = interfaces.begin(); while ( iter != interfaces.end() ) { typereg::Reader reader(manager.getTypeReader((*iter).replace('.','/'))); if (!reader.isValid()) { @@ -714,9 +715,10 @@ void generateFunctionParameterMap(std::ostream& o, } generateFunctionParamterMap(o, options, manager, reader, generated, bFirst); - iter++; + ++iter; } } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.hxx b/unodevtools/source/skeletonmaker/skeletoncommon.hxx index 13516fc75617..593b28504ae9 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.hxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ #include "codemaker/unotype.hxx" #include <fstream> -#include <hash_set> +#include <boost/unordered_set.hpp> #include <map> namespace skeletonmaker { @@ -110,21 +111,21 @@ codemaker::UnoType::Sort decomposeResolveAndCheck( void checkType(TypeManager const & manager, rtl::OString const & type, - std::hash_set< rtl::OString, rtl::OStringHash >& interfaceTypes, - std::hash_set< rtl::OString, rtl::OStringHash >& serviceTypes, + boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaceTypes, + boost::unordered_set< rtl::OString, rtl::OStringHash >& serviceTypes, AttributeInfo& properties); void checkDefaultInterfaces( - std::hash_set< rtl::OString, rtl::OStringHash >& interfaces, - const std::hash_set< rtl::OString, rtl::OStringHash >& services, + boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces, + const boost::unordered_set< rtl::OString, rtl::OStringHash >& services, const rtl::OString & propertyhelper); rtl::OString checkPropertyHelper( ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< rtl::OString, rtl::OStringHash >& services, - const std::hash_set< rtl::OString, rtl::OStringHash >& interfaces, + const boost::unordered_set< rtl::OString, rtl::OStringHash >& services, + const boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces, AttributeInfo& attributes, - std::hash_set< rtl::OString, rtl::OStringHash >& propinterfaces); + boost::unordered_set< rtl::OString, rtl::OStringHash >& propinterfaces); /** checks whether the return and parameters types are valid and allowed @@ -150,7 +151,7 @@ void checkAddInTypes(TypeManager const & manager, @return true if XComponent have to be supported */ bool checkXComponentSupport(TypeManager const & manager, - std::hash_set< rtl::OString, rtl::OStringHash >& interfaces); + boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces); sal_uInt16 checkAdditionalPropertyFlags(typereg::Reader const & reader, @@ -160,9 +161,10 @@ sal_uInt16 checkAdditionalPropertyFlags(typereg::Reader const & reader, void generateFunctionParameterMap(std::ostream& o, ProgramOptions const & options, TypeManager const & manager, - const std::hash_set< ::rtl::OString, ::rtl::OStringHash >& interfaces); + const boost::unordered_set< ::rtl::OString, ::rtl::OStringHash >& interfaces); } #endif // INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONCOMMON_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/skeletoncpp.hxx b/unodevtools/source/skeletonmaker/skeletoncpp.hxx index 2c7ec5c4c629..803788cfb3c6 100644 --- a/unodevtools/source/skeletonmaker/skeletoncpp.hxx +++ b/unodevtools/source/skeletonmaker/skeletoncpp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,4 @@ void generateCalcAddin(ProgramOptions const & options, #endif // INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONCPP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/skeletonjava.hxx b/unodevtools/source/skeletonmaker/skeletonjava.hxx index 6b35818a9744..e2c0c9e75539 100644 --- a/unodevtools/source/skeletonmaker/skeletonjava.hxx +++ b/unodevtools/source/skeletonmaker/skeletonjava.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,4 @@ void generateSkeleton(ProgramOptions const & options, TypeManager const & manage #endif // INCLUDED_UNODEVTOOLS_SKELETONJAVA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx b/unodevtools/source/skeletonmaker/skeletonmaker.cxx index 82063747288e..127411060105 100644 --- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx +++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -349,3 +350,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, /*argv*/) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx index 8cb1a19fa0b0..dbca5cb95f93 100644 --- a/unodevtools/source/unodevtools/options.cxx +++ b/unodevtools/source/unodevtools/options.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,3 +124,5 @@ sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt, } } // end of namespace unodevtools + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/unodevtools/typeblob.cxx b/unodevtools/source/unodevtools/typeblob.cxx index 6612b1eb0f33..9123bf13fff0 100644 --- a/unodevtools/source/unodevtools/typeblob.cxx +++ b/unodevtools/source/unodevtools/typeblob.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,9 +52,13 @@ using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace com::sun::star::container; using namespace com::sun::star::reflection; -using namespace rtl; using namespace codemaker; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringToOUString; +using ::rtl::OUStringToOString; + namespace unodevtools { void writeConstantData(typereg::Writer& rWriter, sal_uInt16 fieldIndex, @@ -131,7 +136,7 @@ void writeConstantData(typereg::Writer& rWriter, sal_uInt16 fieldIndex, } break; default: - OSL_ENSURE( 0, "unsupported constant type" ); + OSL_FAIL( "unsupported constant type" ); break; } @@ -793,7 +798,7 @@ void* getTypeBlob(Reference< XHierarchicalNameAccess > xTDmgr, } break; default: - OSL_ENSURE( 0, "unsupported type" ); + OSL_FAIL( "unsupported type" ); break; } @@ -801,3 +806,5 @@ void* getTypeBlob(Reference< XHierarchicalNameAccess > xTDmgr, } } // end of namespace unodevtools + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unodevtools/source/unodevtools/typemanager.cxx b/unodevtools/source/unodevtools/typemanager.cxx index 900faef87a24..db84a965339b 100644 --- a/unodevtools/source/unodevtools/typemanager.cxx +++ b/unodevtools/source/unodevtools/typemanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,7 +142,7 @@ sal_Bool UnoTypeManager::init( sal_True, sal_False); seqArgs[i++] = makeAny(xReg); - iter++; + ++iter; } Reference< XHierarchicalNameAccess > xTDProvider( @@ -279,3 +280,5 @@ RTTypeClass UnoTypeManager::getTypeClass(RegistryKey& rTypeKey) const } } // end of namespace unodevtools + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |