diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-17 16:43:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-22 18:25:42 +0200 |
| commit | 5275ed805a6e42f56c59d1c5876a7994625905a9 (patch) | |
| tree | 0a802c2ce8bbf54c047ada5c303a403b51ba8136 /cli_ure | |
| parent | f21d1faf6d5a8d9df84b48becbc137175d56ad79 (diff) | |
Revert "Revert "WIP: Experimental new binary type.rdb format""
This reverts commit 67e69a55820f50973ca0de75ccab2bb07d0bada8, applying a band-
aid fix to cli_ure/source/climaker for now.
Conflicts:
stoc/inc/bootstrapservices.hxx
stoc/source/tdmanager/lrucache.hxx
stoc/source/tdmanager/tdmgr.cxx
stoc/source/tdmanager/tdmgr_common.hxx
stoc/source/tdmanager/tdmgr_tdenumeration.cxx
stoc/source/tdmanager/tdmgr_tdenumeration.hxx
Change-Id: Iae669985d0194f06fa349a4a39f0ebd230bc5d28
Diffstat (limited to 'cli_ure')
| -rwxr-xr-x[-rw-r--r--] | cli_ure/source/climaker/climaker_app.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index f7b1f27bb5e6..e74cc23d4749 100644..100755 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -483,17 +483,15 @@ SAL_IMPLEMENT_MAIN() Sequence< Any >( &arg, 1 ), xContext ) ); // insert provider to tdmgr Reference< container::XSet > xSet( xTDmgr, UNO_QUERY_THROW ); - Any provider( makeAny( xTD_provider ) ); - xSet->insert( provider ); - OSL_ASSERT( xSet->has( provider ) ); - if (! extra_registries.empty()) + for (vector< OUString >::iterator i(extra_registries.begin()); + i != extra_registries.end(); ++i) { - arg = makeAny( open_registries( extra_registries, xContext ) ); - provider = makeAny( - xTDprov_factory->createInstanceWithArgumentsAndContext( - Sequence< Any >( &arg, 1 ), xContext ) ); - xSet->insert( provider ); - OSL_ASSERT( xSet->has( provider ) ); + xSet->insert(makeAny(*i)); + } + for (vector< OUString >::iterator i(mandatory_registries.begin()); + i != mandatory_registries.end(); ++i) + { + xSet->insert(makeAny(*i)); } if (0 == output.getLength()) // no output file specified |