diff options
Diffstat (limited to 'canvas/workben/canvasdemo.cxx')
| -rw-r--r-- | canvas/workben/canvasdemo.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 1aa919f28d40..11de6f7db9f3 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/registry/XSimpleRegistry.hpp> - -#include <ucbhelper/contentbroker.hxx> -#include <ucbhelper/configurationkeys.hxx> +#include <com/sun/star/ucb/UniversalContentBroker.hpp> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> @@ -686,19 +684,15 @@ void DemoApp::Main() exit( 1 ); } - // Create UCB. - uno::Sequence< uno::Any > aArgs( 2 ); - aArgs[ 0 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY1_LOCAL ); - aArgs[ 1 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY2_OFFICE ); - ::ucbhelper::ContentBroker::initialize( xFactory, aArgs ); + // Create UCB (for backwards compatibility, in case some code still uses + // plain createInstance w/o args directly to obtain an instance): + ::ucb::UniversalContentBroker::create( + comphelper::getProcessComponentContext() ); InitVCL( xFactory ); TestWindow pWindow; pWindow.Execute(); DeInitVCL(); - - // clean up UCB - ::ucbhelper::ContentBroker::deinitialize(); } DemoApp aDemoApp; |