diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/impgraph.cxx | 14 | ||||
| -rw-r--r-- | vcl/test/canvasbitmaptest.cxx | 2 | ||||
| -rw-r--r-- | vcl/workben/outdevgrind.cxx | 11 | ||||
| -rw-r--r-- | vcl/workben/svpclient.cxx | 21 |
4 files changed, 10 insertions, 38 deletions
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 5d28efa9fce9..333fb3f0ef32 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -26,7 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" +#include <comphelper/processfactory.hxx> #include <tools/vcompat.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> @@ -375,7 +377,8 @@ void ImpGraphic::ImplClear() try { ::ucbhelper::Content aCnt( mpSwapFile->aSwapURL.GetMainURL( INetURLObject::NO_DECODE ), - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + comphelper::getProcessComponentContext() ); aCnt.executeCommand( ::rtl::OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); @@ -1093,7 +1096,8 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) try { ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + comphelper::getProcessComponentContext() ); aCnt.executeCommand( ::rtl::OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); @@ -1285,7 +1289,8 @@ sal_Bool ImpGraphic::ImplSwapOut() try { ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + comphelper::getProcessComponentContext() ); aCnt.executeCommand( ::rtl::OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); @@ -1394,7 +1399,8 @@ sal_Bool ImpGraphic::ImplSwapIn() try { ::ucbhelper::Content aCnt( aSwapURL, - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + comphelper::getProcessComponentContext() ); aCnt.executeCommand( ::rtl::OUString("delete"), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); diff --git a/vcl/test/canvasbitmaptest.cxx b/vcl/test/canvasbitmaptest.cxx index 576810afc96e..98a7d2471221 100644 --- a/vcl/test/canvasbitmaptest.cxx +++ b/vcl/test/canvasbitmaptest.cxx @@ -45,8 +45,6 @@ #include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp> #include <com/sun/star/rendering/XBitmapPalette.hpp> -#include <ucbhelper/contentbroker.hxx> -#include <ucbhelper/configurationkeys.hxx> #include <cppuhelper/compbase3.hxx> #include <tools/diagnose_ex.h> diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 323feee5d94f..9422afcf38f1 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -36,9 +36,6 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/registry/XSimpleRegistry.hpp> -#include <ucbhelper/contentbroker.hxx> -#include <ucbhelper/configurationkeys.hxx> - #include <vcl/svapp.hxx> #include <vcl/dialog.hxx> #include <vcl/outdev.hxx> @@ -952,17 +949,9 @@ int GrindApp::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 ); - TestWindow pWindow; pWindow.Execute(); - // clean up UCB - ::ucbhelper::ContentBroker::deinitialize(); return EXIT_SUCCESS; } diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 4b07940eccf4..2f8c8561a948 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -48,8 +48,6 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/servicefactory.hxx> #include <cppuhelper/bootstrap.hxx> -#include "ucbhelper/contentbroker.hxx" -#include "ucbhelper/configurationkeys.hxx" #include <errno.h> #include <unistd.h> @@ -102,25 +100,6 @@ SAL_IMPLEMENT_MAIN() exit( 1 ); } - /* - * Create UCB. - */ - Sequence< Any > aArgs( 2 ); - aArgs[ 0 ] <<= OUString(UCB_CONFIGURATION_KEY1_LOCAL ); - aArgs[ 1 ] <<= OUString(UCB_CONFIGURATION_KEY2_OFFICE ); -#if OSL_DEBUG_LEVEL > 1 - sal_Bool bSuccess = -#endif - ::ucbhelper::ContentBroker::initialize( xFactory, aArgs ); - -#if OSL_DEBUG_LEVEL > 1 - if ( !bSuccess ) - { - fprintf( stderr, "Error creating UCB, installation must be in disorder. Exiting.\n" ); - exit( 1 ); - } -#endif - InitVCL( xFactory ); ::Main(); DeInitVCL(); |