[Libreoffice-commits] .: basctl/source basic/source bridges/test comphelper/source connectivity/source cui/source dbaccess/source desktop/source editeng/source embeddedobj/source embedserv/source eventattacher/source extensions/source extensions/test filter/source forms/source framework/source i18npool/source lotuswordpro/source oox/source package/source reportdesign/source sc/source sd/source sfx2/source sot/source svl/source svtools/source svx/source sw/source ucb/source UnoControls/source unotools/source unoxml/source uui/source vcl/source xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Sep 19 04:17:13 PDT 2012
UnoControls/source/controls/framecontrol.cxx | 4
basctl/source/basicide/bastype2.cxx | 1
basctl/source/basicide/doceventnotifier.cxx | 7
basctl/source/basicide/documentenumeration.cxx | 9 -
basctl/source/basicide/documentenumeration.hxx | 9 -
basctl/source/basicide/moduldl2.cxx | 3
basctl/source/basicide/scriptdocument.cxx | 32 ++--
basic/source/runtime/iosys.cxx | 3
basic/source/uno/namecont.cxx | 8 -
bridges/test/testoffice.cxx | 2
comphelper/source/container/enumerablemap.cxx | 11 -
comphelper/source/eventattachermgr/eventattachermgr.cxx | 5
comphelper/source/misc/logging.cxx | 14 +
comphelper/source/property/opropertybag.cxx | 7
comphelper/source/property/opropertybag.hxx | 13 -
comphelper/source/streaming/seekableinput.cxx | 4
connectivity/source/commontools/predicateinput.cxx | 5
connectivity/source/drivers/flat/ETable.cxx | 3
connectivity/source/drivers/hsqldb/HConnection.cxx | 4
connectivity/source/parse/sqlnode.cxx | 2
cui/source/customize/acccfg.cxx | 7
cui/source/customize/cfg.cxx | 5
cui/source/customize/cfgutil.cxx | 3
cui/source/customize/selector.cxx | 76 ++++------
cui/source/options/treeopt.cxx | 3
dbaccess/source/ui/app/AppDetailView.cxx | 4
dbaccess/source/ui/browser/brwctrlr.cxx | 3
dbaccess/source/ui/browser/genericcontroller.cxx | 4
dbaccess/source/ui/control/ColumnControlWindow.cxx | 4
dbaccess/source/ui/control/toolboxcontroller.cxx | 4
dbaccess/source/ui/dlg/dbwizsetup.cxx | 8 -
dbaccess/source/ui/dlg/paramdialog.cxx | 3
dbaccess/source/ui/misc/TokenWriter.cxx | 3
dbaccess/source/ui/misc/UITools.cxx | 2
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 4
desktop/source/migration/migration.cxx | 5
editeng/source/xml/xmltxtimp.cxx | 2
embeddedobj/source/commonembedding/embedobj.cxx | 4
embeddedobj/source/commonembedding/persistence.cxx | 6
embeddedobj/source/general/docholder.cxx | 5
embeddedobj/source/msole/olecomponent.cxx | 4
embeddedobj/source/msole/oleembed.cxx | 8 -
embeddedobj/source/msole/olepersist.cxx | 20 +-
embeddedobj/source/msole/ownview.cxx | 6
embedserv/source/embed/ed_ipersiststr.cxx | 10 -
eventattacher/source/eventattacher.cxx | 6
extensions/source/dbpilots/groupboxwiz.cxx | 4
extensions/source/ole/unoobjw.cxx | 2
extensions/source/plugin/base/xplugin.cxx | 3
extensions/source/propctrlr/unourl.cxx | 4
extensions/test/ole/cpnt/cpnt.cxx | 4
filter/source/config/cache/typedetection.cxx | 6
filter/source/graphicfilter/icgm/actimpr.cxx | 3
filter/source/svg/svgreader.cxx | 3
filter/source/xsltfilter/OleHandler.cxx | 4
filter/source/xsltfilter/XSLTFilter.cxx | 8 -
forms/source/component/DatabaseForm.cxx | 4
forms/source/helper/urltransformer.cxx | 4
forms/source/solar/component/navbarcontrol.cxx | 4
forms/source/xforms/submission.cxx | 3
forms/source/xforms/submission/submission_get.cxx | 6
framework/source/classes/droptargetlistener.cxx | 4
framework/source/classes/menumanager.cxx | 3
framework/source/dispatch/systemexec.cxx | 4
framework/source/dispatch/windowcommanddispatch.cxx | 4
framework/source/jobs/shelljob.cxx | 4
framework/source/layoutmanager/layoutmanager.cxx | 4
framework/source/loadenv/loadenv.cxx | 7
framework/source/lomenubar/FrameHelper.cxx | 12 -
framework/source/recording/dispatchrecorder.cxx | 4
framework/source/services/autorecovery.cxx | 10 -
framework/source/services/backingcomp.cxx | 4
framework/source/services/dispatchhelper.cxx | 4
framework/source/services/frame.cxx | 6
framework/source/services/pathsettings.cxx | 4
framework/source/services/sessionlistener.cxx | 7
framework/source/uielement/buttontoolbarcontroller.cxx | 3
framework/source/uielement/complextoolbarcontroller.cxx | 4
framework/source/uielement/generictoolbarcontroller.cxx | 6
framework/source/uielement/langselectionstatusbarcontroller.cxx | 7
framework/source/uielement/menubarmanager.cxx | 3
framework/source/uielement/menubarwrapper.cxx | 3
framework/source/uielement/toolbarmanager.cxx | 4
i18npool/source/characterclassification/cclass_unicode_parser.cxx | 4
i18npool/source/collator/collatorImpl.cxx | 4
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 4
i18npool/source/registerservices/registerservices.cxx | 4
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 4
oox/source/ole/olehelper.cxx | 14 -
package/source/xstor/owriteablestream.cxx | 4
package/source/xstor/selfterminatefilestream.cxx | 3
package/source/xstor/switchpersistencestream.cxx | 4
package/source/xstor/xfactory.cxx | 6
package/source/xstor/xstorage.cxx | 8 -
package/source/zippackage/ZipPackage.cxx | 14 -
package/source/zippackage/ZipPackageStream.cxx | 8 -
package/source/zippackage/zipfileaccess.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 4
sc/source/filter/excel/excimp8.cxx | 8 -
sc/source/filter/excel/xiescher.cxx | 10 -
sd/source/filter/ppt/pptin.cxx | 9 -
sfx2/source/control/request.cxx | 3
sfx2/source/dialog/dockwin.cxx | 3
sfx2/source/dialog/mailmodel.cxx | 3
sfx2/source/doc/docfac.cxx | 3
sfx2/source/doc/doctemplates.cxx | 4
sfx2/source/doc/guisaveas.cxx | 5
sfx2/source/doc/iframe.cxx | 4
sfx2/source/doc/objuno.cxx | 6
sfx2/source/doc/plugin.cxx | 4
sfx2/source/view/viewsh.cxx | 3
sot/source/unoolestorage/xolesimplestorage.cxx | 6
svl/source/fsstor/fsstorage.cxx | 7
svl/source/misc/documentlockfile.cxx | 3
svtools/source/misc/acceleratorexecute.cxx | 8 -
svtools/source/misc/imageresourceaccess.cxx | 4
svtools/source/uno/framestatuslistener.cxx | 10 -
svtools/source/uno/generictoolboxcontroller.cxx | 4
svtools/source/uno/popupmenucontrollerbase.cxx | 4
svtools/source/uno/statusbarcontroller.cxx | 4
svtools/source/uno/toolboxcontroller.cxx | 6
svx/source/dialog/docrecovery.cxx | 7
svx/source/form/fmpgeimp.cxx | 4
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 4
sw/source/filter/ww8/wrtw8esh.cxx | 11 -
sw/source/filter/ww8/ww8par.cxx | 5
ucb/source/cacher/cachedcontentresultset.cxx | 4
ucb/source/core/ucbcmds.cxx | 4
ucb/source/ucp/ext/ucpext_content.cxx | 7
ucb/source/ucp/ext/ucpext_datasupplier.cxx | 3
ucb/source/ucp/file/filrow.cxx | 4
ucb/source/ucp/ftp/ftpcontentprovider.cxx | 4
ucb/source/ucp/gvfs/gvfs_content.cxx | 4
ucb/source/ucp/odma/odma_content.cxx | 6
ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 6
unotools/source/config/moduleoptions.cxx | 3
unotools/source/i18n/localedatawrapper.cxx | 4
unoxml/source/dom/saxbuilder.cxx | 4
uui/source/iahndl-authentication.cxx | 4
uui/source/passwordcontainer.cxx | 4
uui/source/sslwarndlg.cxx | 4
uui/source/unknownauthdlg.cxx | 4
vcl/source/app/unohelp.cxx | 3
vcl/source/gdi/pdfwriter_impl2.cxx | 3
xmloff/source/core/DocumentSettingsContext.cxx | 4
xmloff/source/core/SettingsExportHelper.cxx | 4
xmloff/source/core/xmluconv.cxx | 4
xmloff/source/draw/shapeexport4.cxx | 4
148 files changed, 387 insertions(+), 473 deletions(-)
New commits:
commit 03a9f139bd9ea1a4f9096fc982e6b326def58532
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Sep 19 13:15:15 2012 +0200
ComponentContext::getUnoContext -> getComponentContext simplification
...and some further clean-up.
Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 424f6a3..53f2ce0 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -25,7 +25,7 @@
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <osl/diagnose.h>
@@ -480,7 +480,7 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee
Reference< XURLTransformer > xTrans (
URLTransformer::create(
- ::comphelper::ComponentContext( impl_getMultiServiceFactory() ).getUNOContext() ) );
+ ::comphelper::getComponentContext( impl_getMultiServiceFactory() ) ) );
// load file
URL aURL ;
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 725b721..bd9858a 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -39,7 +39,6 @@
#include <com/sun/star/script/XLibraryContainerPassword.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <comphelper/processfactory.hxx>
-#include <comphelper/componentcontext.hxx>
#include <sfx2/dispatch.hxx>
#include <map>
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index 28133d1..a36ce20 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -27,7 +27,6 @@
#include <tools/diagnose_ex.h>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <osl/mutex.hxx>
@@ -209,9 +208,11 @@ namespace basctl
xBroadcaster.set( m_xModel, UNO_QUERY_THROW );
else
{
- ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+ Reference< com::sun::star::uno::XComponentContext > aContext(
+ comphelper::getProcessComponentContext() );
xBroadcaster.set(
- aContext.createComponent( "com.sun.star.frame.GlobalEventBroadcaster" ),
+ aContext->getServiceManager()->createInstanceWithContext(
+ "com.sun.star.frame.GlobalEventBroadcaster", aContext ),
UNO_QUERY_THROW );
}
diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx
index 87f521c..1527a8a 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/XFramesSupplier.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <tools/diagnose_ex.h>
@@ -60,10 +61,10 @@ namespace basctl { namespace docs {
//====================================================================
struct DocumentEnumeration_Data
{
- ::comphelper::ComponentContext aContext;
+ Reference< com::sun::star::uno::XComponentContext > aContext;
const IDocumentDescriptorFilter* pFilter;
- DocumentEnumeration_Data( const ::comphelper::ComponentContext& _rContext, const IDocumentDescriptorFilter* _pFilter )
+ DocumentEnumeration_Data( Reference< com::sun::star::uno::XComponentContext > const & _rContext, const IDocumentDescriptorFilter* _pFilter )
:aContext( _rContext )
,pFilter( _pFilter )
{
@@ -74,7 +75,7 @@ namespace basctl { namespace docs {
//= DocumentEnumeration
//====================================================================
//--------------------------------------------------------------------
- DocumentEnumeration::DocumentEnumeration( const ::comphelper::ComponentContext& _rContext, const IDocumentDescriptorFilter* _pFilter )
+ DocumentEnumeration::DocumentEnumeration( Reference< com::sun::star::uno::XComponentContext > const & _rContext, const IDocumentDescriptorFilter* _pFilter )
:m_pData( new DocumentEnumeration_Data( _rContext, _pFilter ) )
{
}
@@ -173,7 +174,7 @@ namespace basctl { namespace docs {
try
{
- const Reference< XDesktop > xDesktop( m_pData->aContext.createComponent( "com.sun.star.frame.Desktop" ), UNO_QUERY_THROW );
+ const Reference< XDesktop > xDesktop( m_pData->aContext->getServiceManager()->createInstanceWithContext( "com.sun.star.frame.Desktop", m_pData->aContext ), UNO_QUERY_THROW );
const Reference< XFramesSupplier > xSuppFrames( xDesktop, UNO_QUERY_THROW );
const Reference< XFrames > xFrames( xSuppFrames->getFrames(), UNO_SET_THROW );
const Sequence< Reference< XFrame > > aFrames( xFrames->queryFrames( FrameSearchFlag::ALL ) );
diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx
index 4ee8646..cd4af37 100644
--- a/basctl/source/basicide/documentenumeration.hxx
+++ b/basctl/source/basicide/documentenumeration.hxx
@@ -22,12 +22,15 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XController.hpp>
-
-#include <comphelper/componentcontext.hxx>
+#include <com/sun/star/uno/Reference.hxx>
#include <memory>
#include <vector>
+namespace com { namespace sun { namespace star { namespace uno {
+ class XComponentContext;
+} } } }
+
//........................................................................
namespace basctl { namespace docs {
//........................................................................
@@ -75,7 +78,7 @@ namespace basctl { namespace docs {
class DocumentEnumeration
{
public:
- DocumentEnumeration( const ::comphelper::ComponentContext& _rContext, const IDocumentDescriptorFilter* _pFilter = NULL );
+ DocumentEnumeration( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & _rContext, const IDocumentDescriptorFilter* _pFilter = NULL );
~DocumentEnumeration();
/** retrieves a list of all currently known documents in the application
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 5500ae0..20b4bcd 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -56,7 +56,6 @@
#include <com/sun/star/ucb/NameClash.hpp>
#include "com/sun/star/packages/manifest/XManifestWriter.hpp"
#include <unotools/pathoptions.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/util/VetoException.hpp>
@@ -1360,7 +1359,7 @@ void LibPage::ExportAsPackage( const String& aLibName )
// write into pipe:
Reference<packages::manifest::XManifestWriter> xManifestWriter( xMSF->createInstance
( DEFINE_CONST_UNICODE("com.sun.star.packages.manifest.ManifestWriter") ), UNO_QUERY );
- Reference<io::XOutputStream> xPipe( io::Pipe::create(comphelper::ComponentContext(xMSF).getUNOContext()), UNO_QUERY_THROW );
+ Reference<io::XOutputStream> xPipe( io::Pipe::create(comphelper::getComponentContext(xMSF)), UNO_QUERY_THROW );
xManifestWriter->writeManifestSequence(
xPipe, Sequence< Sequence<beans::PropertyValue> >(
&manifest[ 0 ], manifest.size() ) );
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 751a332..dfede33 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -57,7 +57,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/documentinfo.hxx>
-#include <comphelper/componentcontext.hxx>
#include <osl/mutex.hxx>
@@ -183,9 +182,9 @@ namespace basctl
{
_out_rModels.clear();
- ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
FilterDocuments aFilter( _bVisibleOnly );
- docs::DocumentEnumeration aEnum( aContext, &aFilter );
+ docs::DocumentEnumeration aEnum(
+ comphelper::getProcessComponentContext(), &aFilter );
aEnum.getDocuments( _out_rModels );
}
@@ -624,20 +623,25 @@ namespace basctl
if ( _eType == E_DIALOGS )
{
// create dialog model
- ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+ Reference< XComponentContext > aContext(
+ comphelper::getProcessComponentContext() );
Reference< XNameContainer > xDialogModel;
if ( _rxExistingDialogModel.is() )
xDialogModel = _rxExistingDialogModel;
else
- if ( !aContext.createComponent( "com.sun.star.awt.UnoControlDialogModel", xDialogModel ) )
- return false;
+ xDialogModel.set(
+ ( aContext->getServiceManager()->
+ createInstanceWithContext(
+ "com.sun.star.awt.UnoControlDialogModel",
+ aContext ) ),
+ UNO_QUERY_THROW );
// import dialog model
Reference< XInputStreamProvider > xISP( aElement, UNO_QUERY_THROW );
if ( !_rxExistingDialogModel.is() )
{
Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
- ::xmlscript::importDialogModel( xInput, xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
+ ::xmlscript::importDialogModel( xInput, xDialogModel, aContext, isDocument() ? getDocument() : Reference< XModel >() );
}
// set new name as property
@@ -645,7 +649,7 @@ namespace basctl
xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rNewName ) );
// export dialog model
- xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
+ xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext, isDocument() ? getDocument() : Reference< XModel >() );
aElement <<= xISP;
}
@@ -747,17 +751,19 @@ namespace basctl
return false;
// create new dialog model
- ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
- Reference< XNameContainer > xDialogModel;
- if ( !aContext.createComponent( "com.sun.star.awt.UnoControlDialogModel", xDialogModel ) )
- return false;
+ Reference< XComponentContext > aContext(
+ comphelper::getProcessComponentContext() );
+ Reference< XNameContainer > xDialogModel(
+ aContext->getServiceManager()->createInstanceWithContext(
+ "com.sun.star.awt.UnoControlDialogModel", aContext ),
+ UNO_QUERY_THROW );
// set name property
Reference< XPropertySet > xDlgPSet( xDialogModel, UNO_QUERY_THROW );
xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rDialogName ) );
// export dialog model
- _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext.getUNOContext(), isDocument() ? getDocument() : Reference< XModel >() );
+ _out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext, isDocument() ? getDocument() : Reference< XModel >() );
// insert dialog into library
xLib->insertByName( _rDialogName, makeAny( _out_rDialogProvider ) );
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index aa59515..7f2753a 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -37,7 +37,6 @@
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
@@ -543,7 +542,7 @@ SbError SbiStream::Open
if( xSMgr.is() )
{
Reference< XSimpleFileAccess2 >
- xSFI( SimpleFileAccess::create( comphelper::ComponentContext(xSMgr).getUNOContext() ) );
+ xSFI( SimpleFileAccess::create( comphelper::getComponentContext(xSMgr) ) );
try
{
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index dc72b38..091f04f 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -54,7 +54,7 @@
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/util/PathSubstitution.hpp>
#include <com/sun/star/deployment/ExtensionManager.hpp>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <basic/sbmod.hxx>
@@ -377,9 +377,9 @@ SfxLibraryContainer::SfxLibraryContainer( void )
mxMSF = comphelper::getProcessServiceFactory();
SAL_WARN_IF(!mxMSF.is(), "basic", "couldn't get ProcessServiceFactory");
- mxSFI = ucb::SimpleFileAccess::create( comphelper::ComponentContext(mxMSF).getUNOContext() );
+ mxSFI = ucb::SimpleFileAccess::create( comphelper::getComponentContext(mxMSF) );
- mxStringSubstitution = util::PathSubstitution::create( comphelper::ComponentContext(mxMSF).getUNOContext() );
+ mxStringSubstitution = util::PathSubstitution::create( comphelper::getComponentContext(mxMSF) );
}
SfxLibraryContainer::~SfxLibraryContainer()
@@ -2694,7 +2694,7 @@ void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OU
Reference< XSimpleFileAccess2 > xToUseSFI;
if( Handler.is() )
{
- xToUseSFI = ucb::SimpleFileAccess::create( comphelper::ComponentContext(mxMSF).getUNOContext() );
+ xToUseSFI = ucb::SimpleFileAccess::create( comphelper::getComponentContext(mxMSF) );
xToUseSFI->setInteractionHandler( Handler );
}
diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx
index 9b90bbe..8beb155 100644
--- a/bridges/test/testoffice.cxx
+++ b/bridges/test/testoffice.cxx
@@ -83,7 +83,7 @@ void mygetchar()
void testPipe( const Reference < XMultiServiceFactory > & rSmgr )
{
- Reference < XPipe > rPipe( Pipe::create(comphelper::ComponentContext(rSmgr).getUNOContext()), UNO_QUERY_THROW );
+ Reference < XPipe > rPipe( Pipe::create(comphelper::getComponentContext(rSmgr)), UNO_QUERY_THROW );
{
Sequence < sal_Int8 > seq( 10 );
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 45f1c5c..058310e 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -22,7 +22,6 @@
#include "comphelper/anytostring.hxx"
#include "comphelper/anycompare.hxx"
#include "comphelper/componentbase.hxx"
-#include "comphelper/componentcontext.hxx"
#include "comphelper/extract.hxx"
#include <com/sun/star/container/XEnumerableMap.hpp>
@@ -191,7 +190,7 @@ namespace comphelper
,public ComponentBase
{
protected:
- EnumerableMap( const ComponentContext& _rContext );
+ EnumerableMap();
virtual ~EnumerableMap();
// XInitialization
@@ -238,7 +237,6 @@ namespace comphelper
private:
::osl::Mutex m_aMutex;
- ComponentContext m_aContext;
MapData m_aData;
::std::vector< ::com::sun::star::uno::WeakReference< XInterface > >
@@ -347,10 +345,9 @@ namespace comphelper
//= EnumerableMap
//====================================================================
//--------------------------------------------------------------------
- EnumerableMap::EnumerableMap( const ComponentContext& _rContext )
+ EnumerableMap::EnumerableMap()
:Map_IFace( m_aMutex )
,ComponentBase( Map_IFace::rBHelper )
- ,m_aContext( _rContext )
{
}
@@ -729,9 +726,9 @@ namespace comphelper
}
//--------------------------------------------------------------------
- Reference< XInterface > SAL_CALL EnumerableMap::Create( const Reference< XComponentContext >& _context )
+ Reference< XInterface > SAL_CALL EnumerableMap::Create( SAL_UNUSED_PARAMETER const Reference< XComponentContext >& )
{
- return *new EnumerableMap( ComponentContext( _context ) );
+ return *new EnumerableMap;
}
//====================================================================
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 9b24026..85ed313 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -23,8 +23,8 @@
#endif
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/eventattachermgr.hxx>
+#include <comphelper/processfactory.hxx>
#include <com/sun/star/beans/XIntrospection.hpp>
#include <com/sun/star/io/XObjectInputStream.hpp>
#include <com/sun/star/io/XPersistObject.hpp>
@@ -45,7 +45,6 @@
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
-#include <comphelper/componentcontext.hxx>
#include <deque>
#include <algorithm>
@@ -363,7 +362,7 @@ Reference< XEventAttacherManager > createEventAttacherManager( const Reference<
if ( xIFace.is() )
{
Reference< XIntrospection > xIntrospection( xIFace, UNO_QUERY);
- return new ImplEventAttacherManager( xIntrospection, comphelper::ComponentContext(rSMgr).getUNOContext() );
+ return new ImplEventAttacherManager( xIntrospection, comphelper::getComponentContext(rSMgr) );
}
}
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index 19f7f42..d5c4656 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -19,10 +19,10 @@
#include <comphelper/logging.hxx>
-#include <comphelper/componentcontext.hxx>
#include <com/sun/star/logging/LoggerPool.hpp>
#include <com/sun/star/logging/LogLevel.hpp>
+#include <com/sun/star/resource/OfficeResourceLoader.hpp>
#include <com/sun/star/resource/XResourceBundle.hpp>
#include <com/sun/star/resource/XResourceBundleLoader.hpp>
@@ -53,7 +53,7 @@ namespace comphelper
class EventLogger_Impl
{
private:
- ::comphelper::ComponentContext m_aContext;
+ Reference< XComponentContext > m_aContext;
::rtl::OUString m_sLoggerName;
Reference< XLogger > m_xLogger;
@@ -68,7 +68,7 @@ namespace comphelper
inline bool isValid() const { return m_xLogger.is(); }
inline const ::rtl::OUString& getName() const { return m_sLoggerName; }
inline const Reference< XLogger >& getLogger() const { return m_xLogger; }
- inline const ::comphelper::ComponentContext& getContext() const { return m_aContext; }
+ inline Reference< XComponentContext > getContext() const { return m_aContext; }
private:
void impl_createLogger_nothrow();
@@ -82,7 +82,7 @@ namespace comphelper
{
try
{
- Reference< XLoggerPool > xPool( LoggerPool::get( m_aContext.getUNOContext() ), UNO_QUERY_THROW );
+ Reference< XLoggerPool > xPool( LoggerPool::get( m_aContext ) );
if ( !m_sLoggerName.isEmpty() )
m_xLogger = xPool->getNamedLogger( m_sLoggerName );
else
@@ -224,7 +224,7 @@ namespace comphelper
};
//--------------------------------------------------------------------
- bool lcl_loadBundle_nothrow( const ComponentContext& _rContext, ResourceBasedEventLogger_Data& _rLoggerData )
+ bool lcl_loadBundle_nothrow( Reference< XComponentContext > const & _rContext, ResourceBasedEventLogger_Data& _rLoggerData )
{
if ( _rLoggerData.bBundleLoaded )
return _rLoggerData.xBundle.is();
@@ -234,7 +234,9 @@ namespace comphelper
try
{
- Reference< XResourceBundleLoader > xLoader( _rContext.getSingleton( "com.sun.star.resource.OfficeResourceLoader" ), UNO_QUERY_THROW );
+ Reference< XResourceBundleLoader > xLoader(
+ com::sun::star::resource::OfficeResourceLoader::get(
+ _rContext ) );
_rLoggerData.xBundle = Reference< XResourceBundle >( xLoader->loadBundle_Default( _rLoggerData.sBundleBaseName ), UNO_QUERY_THROW );
}
catch( const Exception& e )
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index 8331d2f..40764a4 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -58,10 +58,9 @@ namespace comphelper
//= OPropertyBag
//====================================================================
//--------------------------------------------------------------------
- OPropertyBag::OPropertyBag( const Reference< XComponentContext >& _rxContext )
+ OPropertyBag::OPropertyBag()
:OPropertyBag_PBase( GetBroadcastHelper(), this )
,::cppu::IEventNotificationHook()
- ,m_aContext( _rxContext )
,m_bAutoAddProperties( false )
,m_NotifyListeners(m_aMutex)
,m_isModified(false)
@@ -116,9 +115,9 @@ namespace comphelper
}
//--------------------------------------------------------------------
- Reference< XInterface > SAL_CALL OPropertyBag::Create( const Reference< XComponentContext >& _rxContext )
+ Reference< XInterface > SAL_CALL OPropertyBag::Create( SAL_UNUSED_PARAMETER const Reference< XComponentContext >& )
{
- return *new OPropertyBag( _rxContext );
+ return *new OPropertyBag;
}
//--------------------------------------------------------------------
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index f5dbf4e..2127c66 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -30,11 +30,11 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/container/XSet.hpp>
+#include <boost/noncopyable.hpp>
#include <cppuhelper/implbase6.hxx>
#include <comphelper/propstate.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/propertybag.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/uno3.hxx>
#include <map>
@@ -76,11 +76,9 @@ namespace comphelper
,public OPropertyBag_PBase
,public OPropertyBag_Base
,public ::cppu::IEventNotificationHook
+ ,private boost::noncopyable
{
private:
- ::comphelper::ComponentContext
- m_aContext;
-
/// our IPropertyArrayHelper implementation
::std::auto_ptr< ::cppu::OPropertyArrayHelper >
m_pArrayHelper;
@@ -97,8 +95,6 @@ namespace comphelper
bool m_isModified;
public:
- OPropertyBag( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext );
-
// XServiceInfo - static versions
static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException );
static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -106,6 +102,7 @@ namespace comphelper
SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);
protected:
+ OPropertyBag();
virtual ~OPropertyBag();
DECLARE_XINTERFACE()
DECLARE_XTYPEPROVIDER()
@@ -215,10 +212,6 @@ namespace comphelper
*/
void impl_setPropertyValues_throw( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rProps );
- private:
- OPropertyBag(); // never implemented
- OPropertyBag( const OPropertyBag& ); // never implemented
- OPropertyBag& operator=( const OPropertyBag& ); // never implemented
protected:
using ::cppu::OPropertySetHelper::getPropertyValues;
using ::cppu::OPropertySetHelper::setPropertyValues;
diff --git a/comphelper/source/streaming/seekableinput.cxx b/comphelper/source/streaming/seekableinput.cxx
index 41ee54e..795b3b7 100644
--- a/comphelper/source/streaming/seekableinput.cxx
+++ b/comphelper/source/streaming/seekableinput.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/io/XOutputStream.hpp>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/seekableinput.hxx>
using namespace ::com::sun::star;
@@ -93,7 +93,7 @@ void OSeekableInputWrapper::PrepareCopy_Impl()
throw uno::RuntimeException();
uno::Reference< io::XOutputStream > xTempOut(
- io::TempFile::create(comphelper::ComponentContext(m_xFactory).getUNOContext()),
+ io::TempFile::create(comphelper::getComponentContext(m_xFactory)),
uno::UNO_QUERY_THROW );
copyInputToOutput_Impl( m_xOriginalStream, xTempOut );
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 67ec21f..4950de6 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -19,6 +19,7 @@
#include <connectivity/predicateinput.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
#include <com/sun/star/i18n/LocaleData.hpp>
@@ -111,7 +112,7 @@ namespace dbtools
if ( m_xORB.is() )
{
m_xFormatter = Reference< XNumberFormatter >(
- NumberFormatter::create(comphelper::ComponentContext(m_xORB).getUNOContext()),
+ NumberFormatter::create(comphelper::getComponentContext(m_xORB)),
UNO_QUERY_THROW
);
}
@@ -125,7 +126,7 @@ namespace dbtools
// create the locale data
if ( m_xORB.is() )
{
- m_xLocaleData = LocaleData::create( comphelper::ComponentContext(m_xORB).getUNOContext() );
+ m_xLocaleData = LocaleData::create( comphelper::getComponentContext(m_xORB) );
}
}
catch( const Exception& )
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 337d0f0..1473228 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -31,6 +31,7 @@
#include <stdio.h> //sprintf
#include <comphelper/extract.hxx>
#include <comphelper/numbers.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/string.hxx>
#include <comphelper/types.hxx>
@@ -423,7 +424,7 @@ void OFlatTable::construct()
Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString("com.sun.star.util.NumberFormatsSupplier"),aArg),UNO_QUERY);
m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(
::com::sun::star::util::NumberFormatter::create(
- comphelper::ComponentContext(m_pConnection->getDriver()->getFactory()).getUNOContext()),
+ comphelper::getComponentContext(m_pConnection->getDriver()->getFactory())),
UNO_QUERY_THROW);
m_xNumberFormatter->attachNumberFormatsSupplier(xSupplier);
Reference<XPropertySet> xProp(xSupplier->getNumberFormatSettings(),UNO_QUERY);
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index ee7c5b2..685db4c 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -35,8 +35,8 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData2.hpp>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/listenernotification.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/ustrbuf.hxx>
@@ -344,7 +344,7 @@ namespace connectivity { namespace hsqldb
// create a graphic provider
Reference< XGraphicProvider > xProvider;
if ( m_xORB.is() )
- xProvider.set( GraphicProvider::create(::comphelper::ComponentContext(m_xORB).getUNOContext()) );
+ xProvider.set( GraphicProvider::create(::comphelper::getComponentContext(m_xORB)) );
// assemble the image URL
::rtl::OUStringBuffer aImageURL;
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 9936d18..daf8ff5 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1286,7 +1286,7 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star:
s_pGarbageCollector = new OSQLParseNodesGarbageCollector();
if(!s_xLocaleData.is())
- s_xLocaleData = LocaleData::create(comphelper::ComponentContext(m_xServiceFactory).getUNOContext());
+ s_xLocaleData = LocaleData::create(comphelper::getComponentContext(m_xServiceFactory));
// reset to 0
memset(OSQLParser::s_nRuleIDs,0,sizeof(OSQLParser::s_nRuleIDs[0]) * (OSQLParseNode::rule_count+1));
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 8ed9d6c..4ba939e 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -67,7 +67,6 @@
//-----------------------------------------------
// include other projects
-#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <svtools/acceleratorexecute.hxx>
#include <svtools/svlbitm.hxx>
@@ -853,7 +852,7 @@ void SfxAcceleratorConfigPage::InitAccCfg()
m_xSMGR = ::comphelper::getProcessServiceFactory();
m_xUICmdDescription = css::frame::UICommandDescription::create(
- comphelper::ComponentContext(m_xSMGR).getUNOContext());
+ comphelper::getComponentContext(m_xSMGR));
// get the current active frame, which should be our "parent"
// for this session
@@ -866,7 +865,7 @@ void SfxAcceleratorConfigPage::InitAccCfg()
// identify module
css::uno::Reference< css::frame::XModuleManager2 > xModuleManager(
- css::frame::ModuleManager::create(comphelper::ComponentContext(m_xSMGR).getUNOContext()));
+ css::frame::ModuleManager::create(comphelper::getComponentContext(m_xSMGR)));
m_sModuleLongName = xModuleManager->identify(m_xFrame);
::comphelper::SequenceAsHashMap lModuleProps(xModuleManager->getByName(m_sModuleLongName));
m_sModuleShortName = lModuleProps.getUnpackedValueOrDefault(MODULEPROP_SHORTNAME, ::rtl::OUString());
@@ -877,7 +876,7 @@ void SfxAcceleratorConfigPage::InitAccCfg()
// get module accelerator configuration
- css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(css::ui::ModuleUIConfigurationManagerSupplier::create(comphelper::ComponentContext(m_xSMGR).getUNOContext()));
+ css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(css::ui::ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(m_xSMGR)));
css::uno::Reference< css::ui::XUIConfigurationManager > xUICfgManager = xModuleCfgSupplier->getUIConfigurationManager(m_sModuleLongName);
m_xModule = css::uno::Reference< css::ui::XAcceleratorConfiguration >(xUICfgManager->getShortCutManager(), css::uno::UNO_QUERY_THROW);
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 626a25d..f7dc04e 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -65,7 +65,6 @@
#include "eventdlg.hxx"
#include <dialmgr.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/documentinfo.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/configmgr.hxx>
@@ -915,7 +914,7 @@ SaveInData::SaveInData(
uno::Reference< container::XNameAccess > xNameAccess(
css::frame::UICommandDescription::create(
- comphelper::ComponentContext(m_xServiceManager).getUNOContext()) );
+ comphelper::getComponentContext(m_xServiceManager)) );
xNameAccess->getByName( aModuleId ) >>= m_xCommandToLabelMap;
@@ -1915,7 +1914,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
}
uno::Reference< css::frame::XModuleManager2 > xModuleManager(
- css::frame::ModuleManager::create( comphelper::ComponentContext(xServiceManager).getUNOContext() ) );
+ css::frame::ModuleManager::create( comphelper::getComponentContext(xServiceManager) ) );
try
{
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 0f08675..405c6fa 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -59,7 +59,6 @@
#include "cuires.hrc"
#include <sfx2/app.hxx>
#include <sfx2/minfitem.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/documentinfo.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx>
@@ -587,7 +586,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
m_xGlobalCategoryInfo = css::uno::Reference< css::container::XNameAccess >(m_xSMGR->createInstance(SERVICE_UICATEGORYDESCRIPTION), css::uno::UNO_QUERY_THROW);
m_xModuleCategoryInfo = css::uno::Reference< css::container::XNameAccess >(m_xGlobalCategoryInfo->getByName(m_sModuleLongName) , css::uno::UNO_QUERY_THROW);
m_xUICmdDescription = css::frame::UICommandDescription::create(
- ::comphelper::ComponentContext(m_xSMGR).getUNOContext());
+ ::comphelper::getComponentContext(m_xSMGR));
InitModule();
InitBasic();
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 280393a..c002303 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -44,7 +44,6 @@
#include <comphelper/documentinfo.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/componentcontext.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
@@ -352,8 +351,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
SvLBoxEntry* pNewEntry = InsertEntry( sUIName, _pParentEntry );
- ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
- Image aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode );
+ Image aImage = GetImage( theChild, comphelper::getProcessComponentContext(), bIsRootNode );
SetExpandedEntryBmp( pNewEntry, aImage );
SetCollapsedEntryBmp( pNewEntry, aImage );
@@ -400,16 +398,11 @@ void SvxConfigGroupListBox_Impl::Init()
SetUpdateMode(sal_False);
ClearAll();
- Reference< XComponentContext > xContext;
- Reference < beans::XPropertySet > xProps(
- ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
-
- xContext.set( xProps->getPropertyValue(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))),
- UNO_QUERY );
+ Reference< XComponentContext > xContext(
+ comphelper::getProcessComponentContext() );
// are we showing builtin commands?
- if ( m_bShowSlots && xContext.is() && m_xFrame.is() )
+ if ( m_bShowSlots && m_xFrame.is() )
{
Reference< lang::XMultiComponentFactory > xMCF =
xContext->getServiceManager();
@@ -502,45 +495,38 @@ void SvxConfigGroupListBox_Impl::Init()
}
}
- if ( xContext.is() )
- {
- // Add Scripting Framework entries
- Reference< browse::XBrowseNode > rootNode;
- Reference< XComponentContext> xCtx;
+ // Add Scripting Framework entries
+ Reference< browse::XBrowseNode > rootNode;
- try
- {
- Reference < beans::XPropertySet > _xProps(
- ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
- xCtx.set( _xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW );
- Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")) ), UNO_QUERY_THROW );
- rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
- }
- catch( const Exception& )
- {
- DBG_UNHANDLED_EXCEPTION();
- }
+ try
+ {
+ Reference< browse::XBrowseNodeFactory > xFac( xContext->getValueByName(
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")) ), UNO_QUERY_THROW );
+ rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
+ }
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
- if ( rootNode.is() )
+ if ( rootNode.is() )
+ {
+ if ( m_bShowSlots )
{
- if ( m_bShowSlots )
- {
- SvxGroupInfo_Impl *pInfo =
- new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, rootNode );
+ SvxGroupInfo_Impl *pInfo =
+ new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, rootNode );
- String aTitle =
- String( CUI_RES( STR_SELECTOR_MACROS ) );
+ String aTitle =
+ String( CUI_RES( STR_SELECTOR_MACROS ) );
- SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
- pNewEntry->SetUserData( pInfo );
- pNewEntry->EnableChildrenOnDemand( sal_True );
- aArr.push_back( pInfo );
- }
- else
- {
- fillScriptList( rootNode, NULL, false );
- }
+ SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
+ pNewEntry->SetUserData( pInfo );
+ pNewEntry->EnableChildrenOnDemand( sal_True );
+ aArr.push_back( pInfo );
+ }
+ else
+ {
+ fillScriptList( rootNode, NULL, false );
}
}
MakeVisible( GetEntry( 0,0 ) );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index c40bfda..19c6a50 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -67,7 +67,6 @@
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <editeng/optitems.hxx>
#include <editeng/unolingu.hxx>
@@ -1945,7 +1944,7 @@ rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier(
{
rtl::OUString sModule;
Reference < XFrame > xCurrentFrame( rFrame );
- Reference < XModuleManager2 > xModuleManager( ModuleManager::create(comphelper::ComponentContext(xMFac).getUNOContext()) );
+ Reference < XModuleManager2 > xModuleManager( ModuleManager::create(comphelper::getComponentContext(xMFac)) );
if ( !xCurrentFrame.is() )
{
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 5067b16..7ebc099 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -43,7 +43,7 @@
#include "dbtreelistbox.hxx"
#include "IApplicationController.hxx"
#include "imageprovider.hxx"
-#include "comphelper/componentcontext.hxx"
+#include "comphelper/processfactory.hxx"
using namespace ::dbaui;
using namespace ::com::sun::star::uno;
@@ -476,7 +476,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
try
{
Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier(
- ModuleUIConfigurationManagerSupplier::create(comphelper::ComponentContext(getDetailView()->getBorderWin().getView()->getORB()).getUNOContext()) );
+ ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(getDetailView()->getBorderWin().getView()->getORB())) );
Reference< XUIConfigurationManager > xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OfficeDatabaseDocument" ) )
);
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 348d33a..c918fa0 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -65,6 +65,7 @@
#include <comphelper/enumhelper.hxx>
#include <comphelper/extract.hxx>
#include <comphelper/interaction.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/string.hxx>
#include <connectivity/dbexception.hxx>
@@ -778,7 +779,7 @@ void SbaXDataBrowserController::initFormatter()
{
// create a new formatter
m_xFormatter = Reference< util::XNumberFormatter > (
- util::NumberFormatter::create(comphelper::ComponentContext(getORB()).getUNOContext()), UNO_QUERY_THROW);
+ util::NumberFormatter::create(comphelper::getComponentContext(getORB())), UNO_QUERY_THROW);
m_xFormatter->attachNumberFormatsSupplier(xSupplier);
}
else // clear the formatter
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index f62772e..11178af 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -28,7 +28,7 @@
#include <osl/diagnose.h>
#include "dbustrings.hrc"
#include <vcl/stdtext.hxx>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <framework/titlehelper.hxx>
#include <comphelper/sequence.hxx>
@@ -199,7 +199,7 @@ OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFacto
try
{
- m_xUrlTransformer = URLTransformer::create(comphelper::ComponentContext(_rM).getUNOContext());
+ m_xUrlTransformer = URLTransformer::create(comphelper::getComponentContext(_rM));
}
catch(Exception&)
{
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index d96da5c..ca661bc 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -23,7 +23,7 @@
#include <connectivity/dbtools.hxx>
#include "UITools.hxx"
#include "dbu_resource.hrc"
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <com/sun/star/util/NumberFormatter.hpp>
@@ -105,7 +105,7 @@ Reference< XNumberFormatter > OColumnControlWindow::GetFormatter() const
if ( xSupplier.is() )
{
// create a new formatter
- m_xFormatter.set( NumberFormatter::create(comphelper::ComponentContext(m_xORB).getUNOContext()), UNO_QUERY_THROW);
+ m_xFormatter.set( NumberFormatter::create(comphelper::getComponentContext(m_xORB)), UNO_QUERY_THROW);
m_xFormatter->attachNumberFormatsSupplier(xSupplier);
}
}
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index f5c2838..cf9242e 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -36,7 +36,7 @@
#include <osl/mutex.hxx>
#include "dbu_reghelper.hxx"
#include "UITools.hxx"
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
extern "C" void SAL_CALL createRegistryInfo_OToolboxController()
@@ -186,7 +186,7 @@ namespace dbaui
try
{
- Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(ModuleUIConfigurationManagerSupplier::create(comphelper::ComponentContext(getServiceManager()).getUNOContext()));
+ Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(getServiceManager())));
Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")));
Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY);
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 273efc5..274c813 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -76,9 +76,9 @@
#include <svl/filenotation.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/namedvaluecollection.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
@@ -841,7 +841,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
}
else if ( m_pCollection->isFileSystemBased(eType) )
{
- Reference< XSimpleFileAccess2 > xSimpleFileAccess(ucb::SimpleFileAccess::create(comphelper::ComponentContext(getORB()).getUNOContext()));
+ Reference< XSimpleFileAccess2 > xSimpleFileAccess(ucb::SimpleFileAccess::create(comphelper::getComponentContext(getORB())));
INetURLObject aDBPathURL(m_sWorkPath);
aDBPathURL.Append(m_aDocURL.getBase());
createUniqueFolderName(&aDBPathURL);
@@ -909,7 +909,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
//-------------------------------------------------------------------------
void ODbTypeWizDialogSetup::createUniqueFolderName(INetURLObject* pURL)
{
- Reference< XSimpleFileAccess2 > xSimpleFileAccess(ucb::SimpleFileAccess::create(comphelper::ComponentContext(getORB()).getUNOContext()));
+ Reference< XSimpleFileAccess2 > xSimpleFileAccess(ucb::SimpleFileAccess::create(comphelper::getComponentContext(getORB())));
:: rtl::OUString sLastSegmentName = pURL->getName();
sal_Bool bFolderExists = sal_True;
sal_Int32 i = 1;
@@ -927,7 +927,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
//-------------------------------------------------------------------------
String ODbTypeWizDialogSetup::createUniqueFileName(const INetURLObject& _rURL)
{
- Reference< XSimpleFileAccess2 > xSimpleFileAccess(ucb::SimpleFileAccess::create(comphelper::ComponentContext(getORB()).getUNOContext()));
+ Reference< XSimpleFileAccess2 > xSimpleFileAccess(ucb::SimpleFileAccess::create(comphelper::getComponentContext(getORB())));
:: rtl::OUString sFilename = _rURL.getName();
::rtl::OUString BaseName = _rURL.getBase();
::rtl::OUString sExtension = _rURL.getExtension();
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index a6d48cf..9489569 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -25,6 +25,7 @@
#include "moduledbu.hxx"
#include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
+#include <comphelper/processfactory.hxx>
#include <connectivity/dbtools.hxx>
#include "dbustrings.hrc"
#include <vcl/svapp.hxx>
@@ -81,7 +82,7 @@ DBG_NAME(OParameterDialog)
DBG_CTOR(OParameterDialog,NULL);
if (_rxORB.is())
- m_xFormatter = Reference< XNumberFormatter>( NumberFormatter::create(comphelper::ComponentContext(_rxORB).getUNOContext()), UNO_QUERY_THROW);
+ m_xFormatter = Reference< XNumberFormatter>( NumberFormatter::create(comphelper::getComponentContext(_rxORB)), UNO_QUERY_THROW);
else {
OSL_FAIL("OParameterDialog::OParameterDialog: need a service factory!");
}
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 286650f..ad091cc 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -25,6 +25,7 @@
#include "HtmlReader.hxx"
#include "dbustrings.hrc"
#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
@@ -730,7 +731,7 @@ void OHTMLImportExport::WriteHeader()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen at sun.com", "OHTMLImportExport::WriteHeader" );
uno::Reference<document::XDocumentProperties> xDocProps(
- document::DocumentProperties::create( comphelper::ComponentContext(m_xFactory).getUNOContext() ) );
+ document::DocumentProperties::create( comphelper::getComponentContext(m_xFactory) ) );
if (xDocProps.is()) {
xDocProps->setTitle(m_sName);
}
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 578e6e0..4131abc 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1627,7 +1627,7 @@ Reference< XNumberFormatter > getNumberFormatter(const Reference< XConnection >&
{
// create a new formatter
xFormatter = Reference< util::XNumberFormatter > (
- util::NumberFormatter::create(comphelper::ComponentContext(_rMF).getUNOContext()), UNO_QUERY_THROW);
+ util::NumberFormatter::create(comphelper::getComponentContext(_rMF)), UNO_QUERY_THROW);
xFormatter->attachNumberFormatsSupplier(xSupplier);
}
}
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 785b31b..09718e3 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbexception.hxx>
@@ -298,7 +298,7 @@ namespace dbaui
if(xSupplier.is())
{
m_pImpl->m_xFormatter = Reference< XNumberFormatter >(
- NumberFormatter::create(comphelper::ComponentContext(getORB()).getUNOContext()), UNO_QUERY_THROW);
+ NumberFormatter::create(comphelper::getComponentContext(getORB())), UNO_QUERY_THROW);
m_pImpl->m_xFormatter->attachNumberFormatsSupplier(xSupplier);
}
OSL_ENSURE(m_pImpl->m_xFormatter.is(),"No NumberFormatter!");
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index fe98ad0..bcc67ed 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -35,7 +35,6 @@
#include "migration_impl.hxx"
#include <unotools/textsearch.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <unotools/bootstrap.hxx>
@@ -275,7 +274,7 @@ sal_Bool MigrationImpl::doMigration()
lArgs[1] <<= embed::ElementModes::READ;
uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
- embed::FileSystemStorageFactory::create(comphelper::ComponentContext(m_xFactory).getUNOContext()));
+ embed::FileSystemStorageFactory::create(comphelper::getComponentContext(m_xFactory)));
uno::Reference< embed::XStorage > xModules(xStorageFactory->createInstanceWithArguments(lArgs), uno::UNO_QUERY);
uno::Reference< ui::XUIConfigurationManager > xOldCfgManager( m_xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UIConfigurationManager"))), uno::UNO_QUERY );
uno::Reference< ui::XUIConfigurationStorage > xOldCfgStorage( xOldCfgManager, uno::UNO_QUERY );
@@ -997,7 +996,7 @@ void MigrationImpl::runServices()
lArgs[1] <<= embed::ElementModes::READ;
uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
- embed::FileSystemStorageFactory::create(comphelper::ComponentContext(m_xFactory).getUNOContext()));
+ embed::FileSystemStorageFactory::create(comphelper::getComponentContext(m_xFactory)));
uno::Reference< embed::XStorage > xModules;
xModules = uno::Reference< embed::XStorage >(xStorageFactory->createInstanceWithArguments(lArgs), uno::UNO_QUERY);
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 2604ab8..cc5d111 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -200,7 +200,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r
break;
}
- uno::Reference< XInterface > xPipe( Pipe::create(comphelper::ComponentContext(xServiceFactory).getUNOContext()), UNO_QUERY );
+ uno::Reference< XInterface > xPipe( Pipe::create(comphelper::getComponentContext(xServiceFactory)), UNO_QUERY );
// connect pipe's output stream to the data source
xSource->setOutputStream( uno::Reference< io::XOutputStream >::query( xPipe ) );
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 06ad663..ae8ef08 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -46,7 +46,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/embed/EmbedMisc.hpp>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <rtl/logfile.hxx>
@@ -323,7 +323,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
uno::Reference< embed::XComponentSupplier > xCompSupl( m_xClientSite, uno::UNO_QUERY_THROW );
uno::Reference< uno::XInterface > xContDoc( xCompSupl->getComponent(), uno::UNO_QUERY_THROW );
- uno::Reference< frame::XModuleManager2 > xManager( frame::ModuleManager::create(comphelper::ComponentContext(m_xFactory).getUNOContext()) );
+ uno::Reference< frame::XModuleManager2 > xManager( frame::ModuleManager::create(comphelper::getComponentContext(m_xFactory)) );
aModuleName = xManager->identify( xContDoc );
}
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 4cd67ef..f881f10 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -54,8 +54,8 @@
#include <com/sun/star/beans/IllegalTypeException.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/fileformat.h>
+#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/mimeconfighelper.hxx>
#include <comphelper/namedvaluecollection.hxx>
@@ -134,7 +134,7 @@ uno::Reference< io::XInputStream > createTempInpStreamFromStor(
uno::Reference< io::XInputStream > xResult;
- uno::Reference < io::XStream > xTempStream( io::TempFile::create(comphelper::ComponentContext(xFactory).getUNOContext()),
+ uno::Reference < io::XStream > xTempStream( io::TempFile::create(comphelper::getComponentContext(xFactory)),
uno::UNO_QUERY_THROW );
uno::Reference < lang::XSingleServiceFactory > xStorageFactory(
@@ -585,7 +585,7 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr
const ::rtl::OUString& aHierarchName )
{
uno::Reference < io::XOutputStream > xTempOut(
- io::TempFile::create(comphelper::ComponentContext(m_xFactory).getUNOContext()),
+ io::TempFile::create(comphelper::getComponentContext(m_xFactory)),
uno::UNO_QUERY_THROW );
uno::Reference< io::XInputStream > aResult( xTempOut, uno::UNO_QUERY );
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index fd073ed..2f9e617 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -74,7 +74,6 @@
#include <osl/diagnose.h>
#include <rtl/process.h>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/namedvaluecollection.hxx>
@@ -576,14 +575,14 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
if ( !xResult.is() )
{
// no internal document configuration, use the one from the module
- uno::Reference< frame::XModuleManager2 > xModuleMan( frame::ModuleManager::create(comphelper::ComponentContext(m_xFactory).getUNOContext()) );
+ uno::Reference< frame::XModuleManager2 > xModuleMan( frame::ModuleManager::create(comphelper::getComponentContext(m_xFactory)) );
::rtl::OUString aModuleIdent =
xModuleMan->identify( uno::Reference< uno::XInterface >( m_xComponent, uno::UNO_QUERY ) );
if ( !aModuleIdent.isEmpty() )
{
uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModConfSupplier(
- ui::ModuleUIConfigurationManagerSupplier::create(comphelper::ComponentContext(m_xFactory).getUNOContext()) );
+ ui::ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(m_xFactory)) );
uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > xModUIConfMan(
xModConfSupplier->getUIConfigurationManager( aModuleIdent ),
uno::UNO_QUERY_THROW );
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index f4fe346..4389a2c 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -38,8 +38,8 @@
#include <platform.h>
#include <cppuhelper/interfacecontainer.h>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/mimeconfighelper.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
#include <osl/file.hxx>
#include <rtl/ref.hxx>
@@ -1598,7 +1598,7 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor&
// allow to retrieve stream-representation of the object persistence
bSupportedFlavor = sal_True;
uno::Reference < io::XStream > xTempFileStream(
- io::TempFile::create(comphelper::ComponentContext(m_xFactory).getUNOContext()),
+ io::TempFile::create(comphelper::getComponentContext(m_xFactory)),
uno::UNO_QUERY_THROW );
uno::Reference< io::XOutputStream > xTempOutStream = xTempFileStream->getOutputStream();
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 14db754..d829944 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -53,8 +53,8 @@
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <rtl/logfile.hxx>
-#include <comphelper/componentcontext.hxx>
#include <cppuhelper/interfacecontainer.h>
+#include <comphelper/processfactory.hxx>
#include <comphelper/mimeconfighelper.hxx>
#include <comphelper/storagehelper.hxx>
@@ -706,7 +706,7 @@ namespace
// the solution is only active for Unix systems
#ifndef WNT
uno::Reference <beans::XPropertySet> xNativeTempFile(
- io::TempFile::create(comphelper::ComponentContext(xFactory).getUNOContext()),
+ io::TempFile::create(comphelper::getComponentContext(xFactory)),
uno::UNO_QUERY_THROW);
uno::Reference < io::XStream > xStream(xNativeTempFile, uno::UNO_QUERY_THROW);
@@ -740,7 +740,7 @@ namespace
xNativeTempFile = uno::Reference<beans::XPropertySet>();
uno::Reference < ucb::XSimpleFileAccess2 > xSimpleFileAccess(
- ucb::SimpleFileAccess::create( comphelper::ComponentContext(xFactory).getUNOContext() ) );
+ ucb::SimpleFileAccess::create( comphelper::getComponentContext(xFactory) ) );
xSimpleFileAccess->setReadOnly(sUrl, sal_True);
}
@@ -879,7 +879,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
if (!m_aTempDumpURL.isEmpty())
{
uno::Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
- ::com::sun::star::system::SystemShellExecute::create(comphelper::ComponentContext(m_xFactory).getUNOContext()) );
+ ::com::sun::star::system::SystemShellExecute::create(comphelper::getComponentContext(m_xFactory)) );
xSystemShellExecute->execute(m_aTempDumpURL, ::rtl::OUString(), ::com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY);
}
else
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 7939ad5..edebfc3 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -49,7 +49,7 @@
#include <rtl/logfile.hxx>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/mimeconfighelper.hxx>
#include <comphelper/classids.hxx>
@@ -72,7 +72,7 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang:
try
{
uno::Reference < ucb::XSimpleFileAccess2 > xAccess(
- ucb::SimpleFileAccess::create( comphelper::ComponentContext(xFactory).getUNOContext() ) );
+ ucb::SimpleFileAccess::create( comphelper::getComponentContext(xFactory) ) );
xAccess->kill( aURL );
bRet = sal_True;
@@ -92,7 +92,7 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang:
::rtl::OUString aResult;
uno::Reference < beans::XPropertySet > xTempFile(
- io::TempFile::create(comphelper::ComponentContext(xFactory).getUNOContext()),
+ io::TempFile::create(comphelper::getComponentContext(xFactory)),
uno::UNO_QUERY_THROW );
try {
@@ -124,7 +124,7 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang:
{
try {
uno::Reference < ucb::XSimpleFileAccess2 > xTempAccess(
- ucb::SimpleFileAccess::create( comphelper::ComponentContext(xFactory).getUNOContext() ) );
+ ucb::SimpleFileAccess::create( comphelper::getComponentContext(xFactory) ) );
uno::Reference< io::XOutputStream > xTempOutStream = xTempAccess->openFileWrite( aResult );
if ( xTempOutStream.is() )
@@ -170,7 +170,7 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang:
try
{
uno::Reference < beans::XPropertySet > xTempFile(
- io::TempFile::create(comphelper::ComponentContext(xFactory).getUNOContext()),
+ io::TempFile::create(comphelper::getComponentContext(xFactory)),
uno::UNO_QUERY );
uno::Reference < io::XStream > xTempStream( xTempFile, uno::UNO_QUERY_THROW );
@@ -276,7 +276,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::GetNewFilledTempStream_Impl( co
OSL_ENSURE( xInStream.is(), "Wrong parameter is provided!\n" );
uno::Reference < io::XStream > xTempFile(
- io::TempFile::create(comphelper::ComponentContext(m_xFactory).getUNOContext()),
+ io::TempFile::create(comphelper::getComponentContext(m_xFactory)),
uno::UNO_QUERY_THROW );
uno::Reference< io::XOutputStream > xTempOutStream = xTempFile->getOutputStream();
@@ -353,7 +353,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl(
{
// this is either a bitmap or a metafile clipboard format, retrieve the pure stream
uno::Reference < io::XStream > xResult(
- io::TempFile::create(comphelper::ComponentContext(m_xFactory).getUNOContext()),
+ io::TempFile::create(comphelper::getComponentContext(m_xFactory)),
uno::UNO_QUERY_THROW );
uno::Reference < io::XSeekable > xResultSeek( xResult, uno::UNO_QUERY_THROW );
uno::Reference < io::XOutputStream > xResultOut = xResult->getOutputStream();
@@ -401,7 +401,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
xCachedSeek->seek( 0 );
uno::Reference < io::XStream > xTempFile(
- io::TempFile::create(comphelper::ComponentContext(m_xFactory).getUNOContext()),
+ io::TempFile::create(comphelper::getComponentContext(m_xFactory)),
uno::UNO_QUERY_THROW );
uno::Reference< io::XSeekable > xTempSeek( xTempFile, uno::UNO_QUERY_THROW );
@@ -587,7 +587,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream()
{
// open temporary file for reading
uno::Reference < ucb::XSimpleFileAccess2 > xTempAccess(
- ucb::SimpleFileAccess::create( comphelper::ComponentContext(m_xFactory).getUNOContext() ) );
+ ucb::SimpleFileAccess::create( comphelper::getComponentContext(m_xFactory) ) );
xStream = xTempAccess->openFileRead( m_aTempURL );
}
@@ -1053,7 +1053,7 @@ void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream >
// open temporary file for reading
uno::Reference < ucb::XSimpleFileAccess2 > xTempAccess(
- ucb::SimpleFileAccess::create( comphelper::ComponentContext(m_xFactory).getUNOContext() ) );
+ ucb::SimpleFileAccess::create( comphelper::getComponentContext(m_xFactory) ) );
uno::Reference< io::XInputStream > xTempInStream = xTempAccess->openFileRead( m_aTempURL );
OSL_ENSURE( xTempInStream.is(), "The object's temporary file can not be reopened for reading!\n" );
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index c5bb43a..a9bec96 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -47,7 +47,7 @@
#include <com/sun/star/document/XTypeDetection.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <cppuhelper/implbase1.hxx>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/mimeconfighelper.hxx>
@@ -277,7 +277,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
// create m_aNativeTempURL
::rtl::OUString aNativeTempURL;
uno::Reference < beans::XPropertySet > xNativeTempFile(
- io::TempFile::create(comphelper::ComponentContext(m_xFactory).getUNOContext()),
+ io::TempFile::create(comphelper::getComponentContext(m_xFactory)),
uno::UNO_QUERY_THROW );
uno::Reference < io::XStream > xNativeTempStream( xNativeTempFile, uno::UNO_QUERY_THROW );
uno::Reference < io::XOutputStream > xNativeOutTemp = xNativeTempStream->getOutputStream();
@@ -424,7 +424,7 @@ void OwnView_Impl::CreateNative()
try
{
uno::Reference < ucb::XSimpleFileAccess2 > xAccess(
- ucb::SimpleFileAccess::create( comphelper::ComponentContext(m_xFactory).getUNOContext() ) );
+ ucb::SimpleFileAccess::create( comphelper::getComponentContext(m_xFactory) ) );
uno::Reference< io::XInputStream > xInStream = xAccess->openFileRead( m_aTempFileURL );
if ( !xInStream.is() )
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index 9e9ef8c..92feee5 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
@@ -65,7 +65,7 @@ uno::Reference< io::XInputStream > createTempXInStreamFromIStream(
if ( !pStream )
return xResult;
- uno::Reference < io::XOutputStream > xTempOut( io::TempFile::create(comphelper::ComponentContext(xFactory).getUNOContext()),
+ uno::Reference < io::XOutputStream > xTempOut( io::TempFile::create(comphelper::getComponentContext(xFactory)),
uno::UNO_QUERY_THROW );
ULARGE_INTEGER nNewPos;
LARGE_INTEGER aZero = { 0L, 0L };
@@ -216,7 +216,7 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp
rtl::OUString sDocUrl;
if ( pFilePath )
{
- uno::Reference< util::XURLTransformer > aTransformer( util::URLTransformer::create(comphelper::ComponentContext(m_xFactory).getUNOContext()) );
+ uno::Reference< util::XURLTransformer > aTransformer( util::URLTransformer::create(comphelper::getComponentContext(m_xFactory)) );
util::URL aURL;
aURL.Complete = ::rtl::OUString( reinterpret_cast<const sal_Unicode*>(pFilePath) );
@@ -616,7 +616,7 @@ STDMETHODIMP EmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )
HRESULT hr = E_FAIL;
- uno::Reference < io::XOutputStream > xTempOut( io::TempFile::create(comphelper::ComponentContext(m_xFactory).getUNOContext()),
+ uno::Reference < io::XOutputStream > xTempOut( io::TempFile::create(comphelper::getComponentContext(m_xFactory)),
uno::UNO_QUERY_THROW );
uno::Reference< frame::XStorable > xStorable( m_pDocHolder->GetDocument(), uno::UNO_QUERY );
@@ -872,7 +872,7 @@ STDMETHODIMP EmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRemember )
util::URL aURL;
aURL.Complete = ::rtl::OUString( reinterpret_cast<const sal_Unicode*>( pszFileName ) );
- uno::Reference< util::XURLTransformer > aTransformer( util::URLTransformer::create(comphelper::ComponentContext(m_xFactory).getUNOContext()) );
+ uno::Reference< util::XURLTransformer > aTransformer( util::URLTransformer::create(comphelper::getComponentContext(m_xFactory)) );
if ( aTransformer->parseSmart( aURL, ::rtl::OUString() ) && aURL.Complete.getLength() )
{
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 0d04048..3b22b49 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -33,7 +33,7 @@
// InvocationToAllListenerMapper
#include <com/sun/star/script/XInvocation.hpp>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -408,7 +408,7 @@ Reference< XIdlReflection > EventAttacherImpl::getReflection() throw( Exception
Guard< Mutex > aGuard( m_aMutex );
if( !m_xReflection.is() )
{
- m_xReflection = theCoreReflection::get(comphelper::ComponentContext(m_xSMgr).getUNOContext());
+ m_xReflection = theCoreReflection::get(comphelper::getComponentContext(m_xSMgr));
}
return m_xReflection;
}
@@ -434,7 +434,7 @@ Reference< XTypeConverter > EventAttacherImpl::getConverter() throw( Exception )
Guard< Mutex > aGuard( m_aMutex );
if( !m_xConverter.is() )
{
- m_xConverter = Converter::create(comphelper::ComponentContext(m_xSMgr).getUNOContext());
+ m_xConverter = Converter::create(comphelper::getComponentContext(m_xSMgr));
}
return m_xConverter;
}
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 00d7dab..b5552e8 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -33,7 +33,7 @@
#include <vcl/msgbox.hxx>
#include "optiongrouplayouter.hxx"
#include "dbpilots.hrc"
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#define GBW_STATE_OPTIONLIST 0
#define GBW_STATE_DEFAULTOPTION 1
@@ -169,7 +169,7 @@ namespace dbp
{
try
{
- OOptionGroupLayouter aLayouter(comphelper::ComponentContext(getServiceFactory()).getUNOContext());
+ OOptionGroupLayouter aLayouter(comphelper::getComponentContext(getServiceFactory()));
aLayouter.doLayout(getContext(), getSettings());
}
catch(const Exception&)
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index cb0c408..b796260 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1122,7 +1122,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
sal_Bool bStruct= sal_False;
- Reference<XIdlReflection> xRefl = theCoreReflection::get(comphelper::ComponentContext(m_smgr).getUNOContext());
+ Reference<XIdlReflection> xRefl = theCoreReflection::get(comphelper::getComponentContext(m_smgr));
// the first parameter is in DISPPARAMS rgvargs contains the name of the struct.
CComVariant arg;
if( pdispparams->cArgs == 1 && SUCCEEDED( arg.ChangeType( VT_BSTR, &pdispparams->rgvarg[0])) )
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 9192f2f..6ad9b2c 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -43,7 +43,6 @@
#include <com/sun/star/loader/XImplementationLoader.hpp>
#include <com/sun/star/plugin/PluginManager.hpp>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <plugin/impl.hxx>
#include <tools/fsys.hxx>
@@ -895,7 +894,7 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_,
PluginDescription XPlugin_Impl::fitDescription( const OUString& rURL )
{
- uno::Reference< XPluginManager > xPMgr( plugin::PluginManager::create(comphelper::ComponentContext(m_xSMgr).getUNOContext()) );
+ uno::Reference< XPluginManager > xPMgr( plugin::PluginManager::create(comphelper::getComponentContext(m_xSMgr)) );
Sequence< PluginDescription > aDescrs = xPMgr->getPluginDescriptions();
const PluginDescription* pDescrs = aDescrs.getConstArray();
diff --git a/extensions/source/propctrlr/unourl.cxx b/extensions/source/propctrlr/unourl.cxx
index b0c02f7..0ab9711 100644
--- a/extensions/source/propctrlr/unourl.cxx
+++ b/extensions/source/propctrlr/unourl.cxx
@@ -29,7 +29,7 @@
#include "unourl.hxx"
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
//........................................................................
namespace pcr
@@ -53,7 +53,7 @@ namespace pcr
{
if ( _rxORB.is() )
{
- xTransform.set( URLTransformer::create(comphelper::ComponentContext(_rxORB).getUNOContext()) );
+ xTransform.set( URLTransformer::create(comphelper::getComponentContext(_rxORB)) );
OSL_ENSURE( xTransform.is(), "UnoURL::UnoURL: could not create an URL transformer!" );
if ( xTransform.is() )
xTransform->parseStrict( m_aURL );
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index 0f94488..a47f18e 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <osl/diagnose.h>
#include <uno/environment.h>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <cppuhelper/factory.hxx>
// OPTIONAL is a constant in com.sun.star.beans.PropertyAttributes but it must be
// undef'd in some header files
@@ -1493,7 +1493,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac
}
case 101:
{
- Reference<XIdlReflection> xRefl( theCoreReflection::get(comphelper::ComponentContext(m_rFactory).getUNOContext()) );
+ Reference<XIdlReflection> xRefl( theCoreReflection::get(comphelper::getComponentContext(m_rFactory)) );
Reference<XIdlClass> xClass= xRefl->forName(L"oletest.SimpleStruct");
Any any;
if( xClass.is())
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 51badc9..5f32519 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -41,7 +41,7 @@
#include <framework/interaction.hxx>
#include <tools/urlobj.hxx>
#include <unotools/localfilehelper.hxx>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
namespace filter{
@@ -75,7 +75,7 @@ TypeDetection::~TypeDetection()
css::util::URL aURL;
aURL.Complete = sURL;
- css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(comphelper::ComponentContext(m_xSMGR).getUNOContext()));
+ css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(comphelper::getComponentContext(m_xSMGR)));
xParser->parseStrict(aURL);
// set std types as minimum requirement first!
@@ -259,7 +259,7 @@ struct EqualByName : public std::binary_function<FlatDetectionInfo, FlatDetectio
css::util::URL aURL;
aURL.Complete = sURL;
- css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(comphelper::ComponentContext(m_xSMGR).getUNOContext()));
+ css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(comphelper::getComponentContext(m_xSMGR)));
xParser->parseStrict(aURL);
rtl::OUString aSelectedFilter = stlDescriptor.getUnpackedValueOrDefault(
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index 7d54127..bde6c5e 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -48,7 +48,6 @@
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/style/HorizontalAlignment.hpp>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -451,7 +450,7 @@ void CGMImpressOutAct::EndGroup()
if( aAny >>= aXShapeGrouper )
{
uno::Reference< drawing::XShapes > aXShapes(
- drawing::ShapeCollection::create(comphelper::ComponentContext(maXServiceManagerSC).getUNOContext()) );
+ drawing::ShapeCollection::create(comphelper::getComponentContext(maXServiceManagerSC)) );
for ( sal_uInt32 i = mnFirstIndex; i < mnCurrentCount; i++ )
{
uno::Reference< drawing::XShape > aXShape = *(uno::Reference< drawing::XShape > *)maXShapes->getByIndex( i ).getValue();
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 21d55ef..147f3f3 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -49,7 +49,6 @@
#include <com/sun/star/xml/dom/DocumentBuilder.hpp>
#include <com/sun/star/xml/dom/NodeType.hpp>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <basegfx/polygon/b2dpolygoncutandtouch.hxx>
#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
@@ -1904,7 +1903,7 @@ SVGReader::SVGReader(const uno::Reference<lang::XMultiServiceFactory>& xServ
sal_Bool SVGReader::parseAndConvert()
{
- uno::Reference<xml::dom::XDocumentBuilder> xDomBuilder(xml::dom::DocumentBuilder::create(comphelper::ComponentContext(m_xServiceFactory).getUNOContext()));
+ uno::Reference<xml::dom::XDocumentBuilder> xDomBuilder(xml::dom::DocumentBuilder::create(comphelper::getComponentContext(m_xServiceFactory)));
uno::Reference<xml::dom::XDocument> xDom(
xDomBuilder->parse(m_xInputStream),
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index 715058c..e76b57e 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -48,8 +48,8 @@
#include <package/Inflater.hxx>
#include <package/Deflater.hxx>
-#include <comphelper/componentcontext.hxx>
#include <cppuhelper/factory.hxx>
+#include <comphelper/processfactory.hxx>
#include <cppuhelper/servicefactory.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/XInterface.hpp>
@@ -73,7 +73,7 @@ namespace XSLT
{
Reference<XStream> SAL_CALL OleHandler::createTempFile() {
Reference<XStream> tempFile(
- TempFile::create(comphelper::ComponentContext(m_msf).getUNOContext()),
+ TempFile::create(comphelper::getComponentContext(m_msf)),
UNO_QUERY);
OSL_ASSERT(tempFile.is());
return tempFile;
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 4ebabc7..a5b28d5 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -41,8 +41,8 @@
#include <rtl/strbuf.hxx>
#include <tools/urlobj.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/interaction.hxx>
+#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/EventObject.hpp>
@@ -247,7 +247,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
XSLTFilter::rel2abs(const OUString& s)
{
- css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::ComponentContext(m_rServiceFactory).getUNOContext() );
+ css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::getComponentContext(m_rServiceFactory) );
css::uno::Reference<XStringSubstitution>
subs(css::util::PathSubstitution::create(xContext));
OUString aWorkingDir(subs->getSubstituteVariableValue(OUString( "$(progurl)")));
@@ -344,7 +344,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
// create pipe
css::uno::Reference<XOutputStream> pipeout(
- Pipe::create(comphelper::ComponentContext(m_rServiceFactory).getUNOContext()),
+ Pipe::create(comphelper::getComponentContext(m_rServiceFactory)),
UNO_QUERY);
css::uno::Reference<XInputStream> pipein(pipeout, UNO_QUERY);
@@ -497,7 +497,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False)
// create pipe
css::uno::Reference<XOutputStream> pipeout(
- Pipe::create(comphelper::ComponentContext(m_rServiceFactory).getUNOContext()),
+ Pipe::create(comphelper::getComponentContext(m_rServiceFactory)),
UNO_QUERY);
css::uno::Reference<XInputStream> pipein(pipeout, UNO_QUERY);
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index d3dd338..d73487c 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -64,11 +64,11 @@
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/util/XModifiable2.hpp>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/basicio.hxx>
#include <comphelper/container.hxx>
#include <comphelper/enumhelper.hxx>
#include <comphelper/extract.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/stl_types.hxx>
@@ -2241,7 +2241,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
if (!xFrame.is())
return;
- Reference<XURLTransformer> xTransformer(URLTransformer::create(comphelper::ComponentContext(m_xServiceFactory).getUNOContext()));
+ Reference<XURLTransformer> xTransformer(URLTransformer::create(comphelper::getComponentContext(m_xServiceFactory)));
// URL encoding
if( eSubmitEncoding == FormSubmitEncoding_URL )
diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx
index 28aea0b..11776a9 100644
--- a/forms/source/helper/urltransformer.cxx
+++ b/forms/source/helper/urltransformer.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <tools/debug.hxx>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
//........................................................................
namespace frm
@@ -60,7 +60,7 @@ namespace frm
{
if ( m_xORB.is() )
{
- m_xTransformer.set(URLTransformer::create(comphelper::ComponentContext(m_xORB).getUNOContext()));
+ m_xTransformer.set(URLTransformer::create(comphelper::getComponentContext(m_xORB)));
}
m_bTriedToCreateTransformer = true;
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index b2ad7ff..b675d01 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
@@ -285,7 +285,7 @@ namespace frm
_pParentWindow,
lcl_getWinBits_nothrow( _rxModel ),
createDocumentCommandImageProvider( _rxORB, xContextDocument ),
- createDocumentCommandDescriptionProvider( comphelper::ComponentContext(_rxORB).getUNOContext(), xContextDocument )
+ createDocumentCommandDescriptionProvider( comphelper::getComponentContext(_rxORB), xContextDocument )
);
// some knittings
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 82a2398..e5d7401 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -58,7 +58,6 @@
#include <com/sun/star/xforms/InvalidDataOnSubmitException.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/propertysetinfo.hxx>
#include <comphelper/interaction.hxx>
#include <comphelper/processfactory.hxx>
@@ -663,7 +662,7 @@ Reference< XDocument > Submission::getInstanceDocument(const Reference< XXPathOb
Reference< XDocumentFragment > Submission::createSubmissionDocument(const Reference< XXPathObject >& aObj, sal_Bool bRemoveWSNodes)
{
using namespace com::sun::star::xml::xpath;
- Reference< XDocumentBuilder > aDocBuilder(DocumentBuilder::create(comphelper::ComponentContext(m_aFactory).getUNOContext()));
+ Reference< XDocumentBuilder > aDocBuilder(DocumentBuilder::create(comphelper::getComponentContext(m_aFactory)));
Reference< XDocument > aDocument = aDocBuilder->newDocument();
Reference< XDocumentFragment > aFragment = aDocument->createDocumentFragment();
diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx
index e7934a1..9ae7b68 100644
--- a/forms/source/xforms/submission/submission_get.cxx
+++ b/forms/source/xforms/submission/submission_get.cxx
@@ -36,7 +36,7 @@
#include <rtl/strbuf.hxx>
#include <rtl/string.hxx>
#include <osl/file.hxx>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <ucbhelper/content.hxx>
#include <com/sun/star/io/Pipe.hpp>
@@ -98,8 +98,8 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference<
aUTF8QueryURL.append(aQueryString.makeStringAndClear());
}
OUString aQueryURL = OStringToOUString(aUTF8QueryURL.makeStringAndClear(), RTL_TEXTENCODING_UTF8);
- ucbhelper::Content aContent(aQueryURL, aEnvironment, comphelper::ComponentContext(m_aFactory).getUNOContext());
- CSS::uno::Reference< XOutputStream > aPipe( CSS::io::Pipe::create(comphelper::ComponentContext(m_aFactory).getUNOContext()), UNO_QUERY_THROW );
+ ucbhelper::Content aContent(aQueryURL, aEnvironment, comphelper::getComponentContext(m_aFactory));
+ CSS::uno::Reference< XOutputStream > aPipe( CSS::io::Pipe::create(comphelper::getComponentContext(m_aFactory)), UNO_QUERY_THROW );
aContent.openStream(aPipe);
// get reply
try {
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index 2e20817..97bddf5 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -42,7 +42,7 @@
#include <svtools/transfer.hxx>
#include <unotools/localfilehelper.hxx>
#include <sot/filelist.hxx>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <osl/file.hxx>
#include <vcl/svapp.hxx>
@@ -221,7 +221,7 @@ void DropTargetListener::implts_OpenFile( const String& rFilePath )
/* SAFE { */
ReadGuard aReadLock(m_aLock);
css::uno::Reference< css::frame::XFrame > xTargetFrame( m_xTargetFrame.get(), css::uno::UNO_QUERY );
- css::uno::Reference< css::util::XURLTransformer > xParser ( css::util::URLTransformer::create(::comphelper::ComponentContext(m_xFactory).getUNOContext()) );
+ css::uno::Reference< css::util::XURLTransformer > xParser ( css::util::URLTransformer::create(::comphelper::getComponentContext(m_xFactory)) );
aReadLock.unlock();
/* } SAFE */
if (xTargetFrame.is() && xParser.is())
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 99ad8b7..4736bd9 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -49,7 +49,6 @@
#include <com/sun/star/util/XStringWidth.hpp>
#include <comphelper/processfactory.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/extract.hxx>
#include <svtools/menuoptions.hxx>
@@ -289,7 +288,7 @@ void MenuManager::SetHdl()
m_pVCLMenu->SetSelectHdl( LINK( this, MenuManager, Select ));
if ( mxServiceFactory.is() )
- m_xURLTransformer.set( URLTransformer::create(::comphelper::ComponentContext(mxServiceFactory).getUNOContext()) );
+ m_xURLTransformer.set( URLTransformer::create(::comphelper::getComponentContext(mxServiceFactory)) );
}
MenuManager::~MenuManager()
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index 4daeb89..4d67609 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -38,7 +38,7 @@
#include <com/sun/star/frame/DispatchResultState.hpp>
#include <vcl/svapp.hxx>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
namespace framework{
@@ -157,7 +157,7 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL&
try
{
- css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::ComponentContext(xFactory).getUNOContext() );
+ css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::getComponentContext(xFactory) );
css::uno::Reference< css::util::XStringSubstitution > xPathSubst( css::util::PathSubstitution::create(xContext) );
::rtl::OUString sSystemURL = xPathSubst->substituteVariables(sSystemURLWithVariables, sal_True); // sal_True force an exception if unknown variables exists !
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index a2cc369..2764b61 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <vcl/cmdevt.hxx>
@@ -175,7 +175,7 @@ void WindowCommandDispatch::impl_dispatchCommand(const ::rtl::OUString& sCommand
if ( ! xProvider.is())
return;
- css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::ComponentContext(xSMGR).getUNOContext()));
+ css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::getComponentContext(xSMGR)));
css::util::URL aCommand;
aCommand.Complete = sCommand;
xParser->parseStrict(aCommand);
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index ca94160..66f9639 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -42,7 +42,7 @@
#include <osl/process.h>
#include <vcl/svapp.hxx>
#include <rtl/ustrbuf.hxx>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx>
//_______________________________________________
@@ -158,7 +158,7 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation()
try
{
- css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::ComponentContext(xSMGR).getUNOContext() );
+ css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::getComponentContext(xSMGR) );
css::uno::Reference< css::util::XStringSubstitution > xSubst( css::util::PathSubstitution::create(xContext) );
const ::sal_Bool bSubstRequired = sal_True;
const ::rtl::OUString sCompleteCommand = xSubst->substituteVariables(sCommand, bSubstRequired);
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index bc29f24..10094d9 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -66,7 +66,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
-#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
#include <svtools/imgdef.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/window.hxx>
@@ -118,7 +118,7 @@ LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceM
, ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex())
, LayoutManager_PBase( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
, m_xSMGR( xServiceManager )
- , m_xURLTransformer( URLTransformer::create(::comphelper::ComponentContext(xServiceManager).getUNOContext()) )
+ , m_xURLTransformer( URLTransformer::create(::comphelper::getComponentContext(xServiceManager)) )
, m_xDisplayAccess( xServiceManager->createInstance( SERVICENAME_DISPLAYACCESS ), UNO_QUERY )
, m_nLockCount( 0 )
, m_bActive( false )
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 6a0eb04..243f8bc 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -83,7 +83,6 @@
#include <svtools/sfxecode.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/ucbhelper.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/configurationhelper.hxx>
#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
@@ -280,7 +279,7 @@ void LoadEnv::initializeLoading(const ::rtl::OUString&
// parse it - because some following code require that
m_aURL.Complete = sURL;
- css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::ComponentContext(m_xSMGR).getUNOContext()));
+ css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(::comphelper::getComponentContext(m_xSMGR)));
xParser->parseStrict(m_aURL);
// BTW: Split URL and JumpMark ...
@@ -703,7 +702,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString&
// (v) Last but not least the UCB is used inside office to
// load contents. He has a special configuration to know
// which URL schemata can be used inside office.
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list