diff options
Diffstat (limited to 'cli_ure/source/climaker/climaker_app.cxx')
-rw-r--r-- | cli_ure/source/climaker/climaker_app.cxx | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index 97b1a5ce9bce..d551659fec4b 100644 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -39,7 +39,6 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "unoidl/unoidl.hxx" -using namespace ::std; using namespace ::System::Reflection; @@ -285,10 +284,10 @@ SAL_IMPLEMENT_MAIN() get_option_info( "assembly-trademark" ); OUString output; - vector< OUString > mandatory_registries; - vector< OUString > extra_registries; - vector< OUString > extra_assemblies; - vector< OUString > explicit_types; + std::vector< OUString > mandatory_registries; + std::vector< OUString > extra_registries; + std::vector< OUString > extra_assemblies; + std::vector< OUString > explicit_types; OUString version, product, description, company, copyright, trademark, keyfile, delaySign; @@ -395,12 +394,12 @@ SAL_IMPLEMENT_MAIN() std::vector< rtl::Reference< unoidl::Provider > > unoidlMandatoryProvs; for (auto& rRegistry : extra_registries) { - xSet->insert(makeAny(rRegistry)); + xSet->insert(Any(rRegistry)); unoidlMgr->addProvider(rRegistry); } for (auto& rRegistry : mandatory_registries) { - xSet->insert(makeAny(rRegistry)); + xSet->insert(Any(rRegistry)); rtl::Reference< unoidl::Provider > prov(unoidlMgr->addProvider(rRegistry)); unoidlMandatoryProvs.push_back(prov); } @@ -583,9 +582,9 @@ SAL_IMPLEMENT_MAIN() { css::uno::Reference< reflection::XTypeDescription > td( xTD_enum->nextTypeDescription()); - OUString name(td->getName()); + OUString td_name(td->getName()); bool bEmit = std::any_of(unoidlMandatoryProvs.begin(), unoidlMandatoryProvs.end(), - [&name](rtl::Reference<unoidl::Provider>& rProv) { return rProv->findEntity(name).is(); }); + [&td_name](rtl::Reference<unoidl::Provider>& rProv) { return rProv->findEntity(td_name).is(); }); if (bEmit) { type_emitter->get_type(td); } @@ -601,7 +600,7 @@ SAL_IMPLEMENT_MAIN() UNO_QUERY_THROW ) ); } } - type_emitter->~TypeEmitter(); + type_emitter->finish(); if (g_bVerbose) { |