summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/appinit.cxx1
-rw-r--r--sfx2/source/appl/newhelp.cxx4
-rw-r--r--sfx2/source/appl/sfxhelp.cxx3
-rw-r--r--sfx2/source/appl/xpackcreator.cxx3
-rw-r--r--sfx2/source/bastyp/helper.cxx11
-rw-r--r--sfx2/source/control/templateremoteview.cxx4
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx5
-rw-r--r--sfx2/source/doc/docfile.cxx41
-rw-r--r--sfx2/source/doc/doctempl.cxx18
-rw-r--r--sfx2/source/doc/doctemplates.cxx68
-rw-r--r--sfx2/source/doc/objstor.cxx4
-rw-r--r--sfx2/source/doc/printhelper.cxx8
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx3
13 files changed, 89 insertions, 84 deletions
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 47e6bc67936d..d5f776b6e384 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -37,7 +37,6 @@
#include <unotools/configmgr.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/security.hxx>
-#include <ucbhelper/configurationkeys.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/historyoptions.hxx>
#include <unotools/moduleoptions.hxx>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 69424dbe6516..f6da0cab9d22 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -634,7 +634,7 @@ void IndexTabPage_Impl::InitializeIndex()
AppendConfigToken( aTemp, sal_True );
aURL = aTemp;
- Content aCnt( aURL, Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
+ Content aCnt( aURL, Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo = aCnt.getProperties();
if ( xInfo->hasPropertyByName( PROPERTY_ANCHORREF ) )
{
@@ -3340,7 +3340,7 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId )
{
try
{
- Content aCnt( aURL, Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
+ Content aCnt( aURL, Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo = aCnt.getProperties();
if ( xInfo->hasPropertyByName( PROPERTY_TITLE ) )
{
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index f2d86c2520fa..ec88716e179d 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -177,7 +177,8 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
try
{
::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ),
- Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
+ Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
+ comphelper::getProcessComponentContext() );
if ( ( aCnt.getPropertyValue( ::rtl::OUString("AnchorName") ) >>= sAnchor ) )
{
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index de3d37a002a1..302833dc9658 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -23,6 +23,7 @@
#include "xpackcreator.hxx"
+#include <comphelper/processfactory.hxx>
#include <sot/stg.hxx>
#include <sot/storage.hxx>
#include <tools/stream.hxx>
@@ -79,7 +80,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const ::rtl::OUString&
sal_Bool bSuccess = sal_False;
::ucbhelper::Content aContent;
- if( ::ucbhelper::Content::create( aFolderUrl, xComEnv, aContent ) )
+ if( ::ucbhelper::Content::create( aFolderUrl, xComEnv, comphelper::getProcessComponentContext(), aContent ) )
{
SvStream* pTempStream = NULL;
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 94b2e51be41c..2a01bf3f432b 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -82,7 +82,7 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
StringList_Impl* pList = NULL;
try
{
- ::ucbhelper::Content aCnt( rURL, uno::Reference< ucb::XCommandEnvironment >() );
+ ::ucbhelper::Content aCnt( rURL, uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
uno::Reference< sdbc::XResultSet > xResultSet;
uno::Reference< ucb::XDynamicResultSet > xDynResultSet;
uno::Sequence< OUString > aProps(3);
@@ -173,7 +173,7 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin
uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > (
xFactory->createInstance( "com.sun.star.task.InteractionHandler" ), uno::UNO_QUERY );
- ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ) );
+ ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ), comphelper::getProcessComponentContext() );
uno::Reference< sdbc::XResultSet > xResultSet;
uno::Sequence< OUString > aProps(2);
OUString* pProps = aProps.getArray();
@@ -256,7 +256,7 @@ String SfxContentHelper::GetActiveHelpString( const String& rURL )
uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > (
xFactory->createInstance( "com.sun.star.task.InteractionHandler" ), uno::UNO_QUERY );
- ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ) );
+ ::ucbhelper::Content aCnt( rURL, new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ), comphelper::getProcessComponentContext() );
// open the "active help" stream
uno::Reference< io::XInputStream > xStream = aCnt.openStream();
// and convert it to a String
@@ -288,7 +288,8 @@ sal_Bool SfxContentHelper::IsHelpErrorDocument( const String& rURL )
try
{
::ucbhelper::Content aCnt( INetURLObject( rURL ).GetMainURL( INetURLObject::NO_DECODE ),
- uno::Reference< ucb::XCommandEnvironment > () );
+ uno::Reference< ucb::XCommandEnvironment >(),
+ comphelper::getProcessComponentContext() );
if ( !( aCnt.getPropertyValue( "IsErrorDocument" ) >>= bRet ) )
{
SAL_WARN( "sfx2.bastyp", "Property 'IsErrorDocument' is missing" );
@@ -311,7 +312,7 @@ sal_uIntPtr SfxContentHelper::GetSize( const String& rContent )
DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
try
{
- ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
+ ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
aCnt.getPropertyValue( "Size" ) >>= nTemp;
}
catch( const ucb::CommandAbortedException& )
diff --git a/sfx2/source/control/templateremoteview.cxx b/sfx2/source/control/templateremoteview.cxx
index bef910237895..ad414affbb71 100644
--- a/sfx2/source/control/templateremoteview.cxx
+++ b/sfx2/source/control/templateremoteview.cxx
@@ -159,7 +159,7 @@ bool TemplateRemoteView::loadRepository (const sal_uInt16 nRepositoryId, bool bR
aProps[6] = "IsRemote";
aProps[7] = "IsRemoveable";
- ucbhelper::Content aContent(aURL,m_xCmdEnv);
+ ucbhelper::Content aContent(aURL, m_xCmdEnv, comphelper::getProcessComponentContext());
uno::Reference< XResultSet > xResultSet;
uno::Reference< XDynamicResultSet > xDynResultSet;
@@ -218,7 +218,7 @@ bool TemplateRemoteView::loadRepository (const sal_uInt16 nRepositoryId, bool bR
if ( bHasTargetURL &&
INetURLObject( aContentURL ).GetProtocol() == INET_PROT_VND_SUN_STAR_HIER )
{
- ucbhelper::Content aCnt( aTargetURL, m_xCmdEnv );
+ ucbhelper::Content aCnt( aTargetURL, m_xCmdEnv, comphelper::getProcessComponentContext() );
try
{
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 5ca226d1c8d6..b1ea8be470ae 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2064,7 +2064,7 @@ namespace
sPathCheck += '.';
try
{
- ::ucbhelper::Content aContent( sPathCheck, uno::Reference< ucb::XCommandEnvironment >() );
+ ::ucbhelper::Content aContent( sPathCheck, uno::Reference< ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
bValid = aContent.isFolder();
}
catch( const Exception& ) {}
@@ -2538,7 +2538,8 @@ static int impl_isFolder( const OUString& rPath )
try
{
::ucbhelper::Content aContent(
- rPath, uno::Reference< ucb::XCommandEnvironment > () );
+ rPath, uno::Reference< ucb::XCommandEnvironment > (),
+ comphelper::getProcessComponentContext() );
if ( aContent.isFolder() )
return 1;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 1a8c61976cc3..7620b8698a9b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -101,7 +101,6 @@ using namespace ::com::sun::star::io;
#include <unotools/pathoptions.hxx>
#include <svtools/asynclink.hxx>
#include <svl/inettype.hxx>
-#include <ucbhelper/contentbroker.hxx>
#include <ucbhelper/commandenvironment.hxx>
#include <unotools/localfilehelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -466,7 +465,7 @@ util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue )
try
{
uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv;
- ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv );
+ ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext() );
aContent.getPropertyValue( ::rtl::OUString("DateModified" ) ) >>= pImp->m_aDateTime;
pImp->m_bGotDateTime = true;
@@ -495,7 +494,7 @@ Reference < XContent > SfxMedium::GetContent() const
{
try
{
- pImp->aContent = ::ucbhelper::Content( xContent, xEnv );
+ pImp->aContent = ::ucbhelper::Content( xContent, xEnv, comphelper::getProcessComponentContext() );
}
catch ( const Exception& )
{
@@ -510,7 +509,7 @@ Reference < XContent > SfxMedium::GetContent() const
else if ( !pImp->m_aLogicName.isEmpty() )
aURL = GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
if (!aURL.isEmpty() )
- ::ucbhelper::Content::create( aURL, xEnv, pImp->aContent );
+ ::ucbhelper::Content::create( aURL, xEnv, comphelper::getProcessComponentContext(), pImp->aContent );
}
}
@@ -790,7 +789,7 @@ void SfxMedium::StorageBackup_Impl()
&& ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) );
if ( bBasedOnOriginalFile && pImp->m_aBackupURL.isEmpty()
- && ::ucbhelper::Content::create( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, aOriginalContent ) )
+ && ::ucbhelper::Content::create( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext(), aOriginalContent ) )
{
DoInternalBackup_Impl( aOriginalContent );
if( pImp->m_aBackupURL.isEmpty() )
@@ -1027,7 +1026,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
{
// MediaDescriptor does this check also, the duplication should be avoided in future
Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv;
- ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv );
+ ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext() );
aContent.getPropertyValue( ::rtl::OUString( "IsReadOnly" ) ) >>= bContentReadonly;
}
catch( const uno::Exception& ) {}
@@ -1496,7 +1495,7 @@ sal_Bool SfxMedium::UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalCont
{
try
{
- ::ucbhelper::Content aTransactCont( pImp->m_aBackupURL, xComEnv );
+ ::ucbhelper::Content aTransactCont( pImp->m_aBackupURL, xComEnv, comphelper::getProcessComponentContext() );
Reference< XInputStream > aOrigInput = aTransactCont.openStream();
aOriginalContent.writeStream( aOrigInput, true );
@@ -1542,7 +1541,7 @@ sal_Bool SfxMedium::StorageCommit_Impl()
OSL_ENSURE( !pImp->m_aBackupURL.isEmpty(), "No backup on storage commit!\n" );
if ( !pImp->m_aBackupURL.isEmpty()
&& ::ucbhelper::Content::create( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ),
- xDummyEnv,
+ xDummyEnv, comphelper::getProcessComponentContext(),
aOriginalContent ) )
{
// use backup to restore the file
@@ -1585,7 +1584,7 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
try
{
- aOriginalContent = ::ucbhelper::Content( aDest.GetMainURL( INetURLObject::NO_DECODE ), xComEnv );
+ aOriginalContent = ::ucbhelper::Content( aDest.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() );
}
catch ( const ::com::sun::star::ucb::CommandAbortedException& )
{
@@ -1619,7 +1618,7 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
CloseStreams_Impl();
::ucbhelper::Content aTempCont;
- if( ::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, aTempCont ) )
+ if( ::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext(), aTempCont ) )
{
bool bTransactStarted = false;
SFX_ITEMSET_ARG( GetItemSet(), pOverWrite, SfxBoolItem, SID_OVERWRITE, false );
@@ -1737,7 +1736,7 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet&
}
uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
- ::ucbhelper::Content aTargetContent( aURL, xEnv );
+ ::ucbhelper::Content aTargetContent( aURL, xEnv, comphelper::getProcessComponentContext() );
InsertCommandArgument aInsertArg;
aInsertArg.Data = xInStream;
@@ -1804,7 +1803,7 @@ void SfxMedium::Transfer_Impl()
INetURLObject aSource( aNameURL );
::ucbhelper::Content aTempCont;
- if( ::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xEnv, aTempCont ) )
+ if( ::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext(), aTempCont ) )
{
try
{
@@ -1928,7 +1927,7 @@ void SfxMedium::Transfer_Impl()
// Get the parent URL from the XChild if possible: why would the URL necessarily have
// a hierarchical path? It's not the case for CMIS.
::ucbhelper::Content aDestContent;
- ::ucbhelper::Content::create( aDestURL, xComEnv, aDestContent );
+ ::ucbhelper::Content::create( aDestURL, xComEnv, comphelper::getProcessComponentContext(), aDestContent );
Reference< ::com::sun::star::container::XChild> xChild( aDestContent.get(), uno::UNO_QUERY );
rtl::OUString sParentUrl;
if ( xChild.is( ) )
@@ -1953,7 +1952,7 @@ void SfxMedium::Transfer_Impl()
try
{
- aTransferContent = ::ucbhelper::Content( aDest.GetMainURL( INetURLObject::NO_DECODE ), xComEnv );
+ aTransferContent = ::ucbhelper::Content( aDest.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() );
}
catch (const ::com::sun::star::ucb::ContentCreationException& ex)
{
@@ -1979,7 +1978,7 @@ void SfxMedium::Transfer_Impl()
CloseStreams_Impl();
- ::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xEnv, aSourceContent );
+ ::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext(), aSourceContent );
// check for external parameters that may customize the handling of NameClash situations
SFX_ITEMSET_ARG( GetItemSet(), pRename, SfxBoolItem, SID_RENAME, false );
@@ -2057,7 +2056,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont
Reference < ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv;
::ucbhelper::Content aBackupCont;
- if( ::ucbhelper::Content::create( aDestDir, xDummyEnv, aBackupCont ) )
+ if( ::ucbhelper::Content::create( aDestDir, xDummyEnv, comphelper::getProcessComponentContext(), aBackupCont ) )
{
try
{
@@ -2132,7 +2131,7 @@ void SfxMedium::DoBackup_Impl()
// create content for the parent folder ( = backup folder )
::ucbhelper::Content aContent;
Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
- if( ::ucbhelper::Content::create( aBakDir, xEnv, aContent ) )
+ if( ::ucbhelper::Content::create( aBakDir, xEnv, comphelper::getProcessComponentContext(), aContent ) )
{
// save as ".bak" file
INetURLObject aDest( aBakDir );
@@ -2142,7 +2141,7 @@ void SfxMedium::DoBackup_Impl()
// create a content for the source file
::ucbhelper::Content aSourceContent;
- if ( ::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xEnv, aSourceContent ) )
+ if ( ::ucbhelper::Content::create( aSource.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext(), aSourceContent ) )
{
try
{
@@ -3280,7 +3279,7 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace )
INetURLObject::DECODE_WITH_CHARSET );
if ( !aFileName.isEmpty() && aTmpURLObj.removeSegment() )
{
- ::ucbhelper::Content aTargetContent( aTmpURLObj.GetMainURL( INetURLObject::NO_DECODE ), xComEnv );
+ ::ucbhelper::Content aTargetContent( aTmpURLObj.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() );
if ( aTargetContent.transferContent( pImp->aContent, ::ucbhelper::InsertOperation_COPY, aFileName, NameClash::OVERWRITE ) )
{
SetWritableForUserOnly( aTmpURL );
@@ -3515,8 +3514,8 @@ sal_Bool SfxMedium::IsOpen() const
try
{
uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
- ::ucbhelper::Content aTargetContent( aDest.GetMainURL( INetURLObject::NO_DECODE ), xComEnv );
- ::ucbhelper::Content aSourceContent( aSource.GetMainURL( INetURLObject::NO_DECODE ), xComEnv );
+ ::ucbhelper::Content aTargetContent( aDest.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() );
+ ::ucbhelper::Content aSourceContent( aSource.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() );
if ( aTargetContent.transferContent( aSourceContent,
::ucbhelper::InsertOperation_COPY,
aFileName,
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 2cf3f958b2d1..aa3c60327b8e 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -561,7 +561,7 @@ String SfxDocumentTemplates::GetPath
::rtl::OUString aResult;
Content aTemplate;
uno::Reference< XCommandEnvironment > aCmdEnv;
- if ( Content::create( aTemplateObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv, aTemplate ) )
+ if ( Content::create( aTemplateObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) )
{
OUString aPropName( TARGET_URL );
getTextProperty_Impl( aTemplate, aPropName, aResult );
@@ -817,7 +817,7 @@ sal_Bool SfxDocumentTemplates::CopyTo
try
{
- aTarget = Content( aParentURL, aCmdEnv );
+ aTarget = Content( aParentURL, aCmdEnv, comphelper::getProcessComponentContext() );
TransferInfo aTransferInfo;
aTransferInfo.MoveData = sal_False;
@@ -953,7 +953,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom
uno::Reference< XCommandEnvironment > aCmdEnv;
Content aTemplCont;
- if( Content::create( aTemplURL, aCmdEnv, aTemplCont ) )
+ if( Content::create( aTemplURL, aCmdEnv, comphelper::getProcessComponentContext(), aTemplCont ) )
{
OUString aTemplName;
OUString aPropName( TARGET_URL );
@@ -1665,7 +1665,7 @@ const OUString& DocTempl_EntryData_Impl::GetTargetURL()
uno::Reference< XCommandEnvironment > aCmdEnv;
Content aRegion;
- if ( Content::create( GetHierarchyURL(), aCmdEnv, aRegion ) )
+ if ( Content::create( GetHierarchyURL(), aCmdEnv, comphelper::getProcessComponentContext(), aRegion ) )
{
OUString aPropName( TARGET_URL );
@@ -1826,7 +1826,7 @@ const OUString& RegionData_Impl::GetTargetURL()
uno::Reference< XCommandEnvironment > aCmdEnv;
Content aRegion;
- if ( Content::create( GetHierarchyURL(), aCmdEnv, aRegion ) )
+ if ( Content::create( GetHierarchyURL(), aCmdEnv, comphelper::getProcessComponentContext(), aRegion ) )
{
OUString aPropName( TARGET_DIR_URL );
@@ -2027,7 +2027,7 @@ void SfxDocTemplate_Impl::CreateFromHierarchy( Content &rTemplRoot )
OUString aTitle( xRow->getString( 1 ) );
OUString aId = xContentAccess->queryContentIdentifierString();
- Content aContent = Content( aId, aCmdEnv );
+ Content aContent = Content( aId, aCmdEnv, comphelper::getProcessComponentContext() );
AddRegion( aTitle, aContent );
}
@@ -2076,7 +2076,7 @@ sal_Bool SfxDocTemplate_Impl::Construct( )
if ( aLongNames.Count() )
maStandardGroup = aLongNames.GetString( 0 );
- Content aTemplRoot( aRootContent, aCmdEnv );
+ Content aTemplRoot( aRootContent, aCmdEnv, comphelper::getProcessComponentContext() );
CreateFromHierarchy( aTemplRoot );
return sal_True;
@@ -2090,7 +2090,7 @@ void SfxDocTemplate_Impl::ReInitFromComponent()
{
uno::Reference < XContent > aRootContent = xTemplates->getContent();
uno::Reference < XCommandEnvironment > aCmdEnv;
- Content aTemplRoot( aRootContent, aCmdEnv );
+ Content aTemplRoot( aRootContent, aCmdEnv, comphelper::getProcessComponentContext() );
Clear();
CreateFromHierarchy( aTemplRoot );
}
@@ -2138,7 +2138,7 @@ void SfxDocTemplate_Impl::Rescan()
uno::Reference < XContent > aRootContent = xTemplates->getContent();
uno::Reference < XCommandEnvironment > aCmdEnv;
- Content aTemplRoot( aRootContent, aCmdEnv );
+ Content aTemplRoot( aRootContent, aCmdEnv, comphelper::getProcessComponentContext() );
CreateFromHierarchy( aTemplRoot );
}
}
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 1218562121ec..07b5abbf5f69 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -417,7 +417,7 @@ void SfxDocTplService_Impl::init_Impl()
::rtl::OUString aTemplVersPropName( TEMPLATE_VERSION );
::rtl::OUString aTemplVers( TEMPLATE_VERSION_VALUE );
- if ( Content::create( maRootURL, maCmdEnv, maRootContent ) )
+ if ( Content::create( maRootURL, maCmdEnv, comphelper::getProcessComponentContext(), maRootContent ) )
{
uno::Any aValue;
::rtl::OUString aPropValue;
@@ -756,7 +756,7 @@ sal_Bool SfxDocTplService_Impl::addEntry( Content& rParentFolder,
Content aLink;
- if ( ! Content::create( aLinkURL, maCmdEnv, aLink ) )
+ if ( ! Content::create( aLinkURL, maCmdEnv, comphelper::getProcessComponentContext(), aLink ) )
{
Sequence< OUString > aNames(3);
aNames[0] = OUString( TITLE );
@@ -805,7 +805,7 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL,
// if the parent exists, we can continue with the creation of the
// new folder, we have to create the parent otherwise ( as long as
// bCreateParent is set to true )
- if ( Content::create( aParentURL.GetMainURL( INetURLObject::NO_DECODE ), maCmdEnv, aParent ) )
+ if ( Content::create( aParentURL.GetMainURL( INetURLObject::NO_DECODE ), maCmdEnv, comphelper::getProcessComponentContext(), aParent ) )
{
try
{
@@ -864,7 +864,7 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OU
Content aParent;
uno::Reference< XCommandEnvironment > aQuietEnv;
- if ( Content::create( aDirPath.GetMainURL( INetURLObject::NO_DECODE ), aQuietEnv, aParent ) )
+ if ( Content::create( aDirPath.GetMainURL( INetURLObject::NO_DECODE ), aQuietEnv, comphelper::getProcessComponentContext(), aParent ) )
{
for ( sal_Int32 nInd = 0; nInd < 32000; nInd++ )
{
@@ -925,7 +925,7 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OU
Content aParent;
uno::Reference< XCommandEnvironment > aQuietEnv;
- if ( Content::create( aDirPath.GetMainURL( INetURLObject::NO_DECODE ), aQuietEnv, aParent ) )
+ if ( Content::create( aDirPath.GetMainURL( INetURLObject::NO_DECODE ), aQuietEnv, comphelper::getProcessComponentContext(), aParent ) )
{
for ( sal_Int32 nInd = 0; nInd < 32000; nInd++ )
{
@@ -1002,7 +1002,7 @@ sal_Bool SfxDocTplService_Impl::removeContent( const OUString& rContentURL )
{
Content aContent;
- if ( Content::create( rContentURL, maCmdEnv, aContent ) )
+ if ( Content::create( rContentURL, maCmdEnv, comphelper::getProcessComponentContext(), aContent ) )
return removeContent( aContent );
else
return sal_False;
@@ -1249,7 +1249,7 @@ void SfxDocTplService_Impl::doUpdate()
while ( nCountDir )
{
nCountDir--;
- if ( Content::create( pDirs[ nCountDir ], aQuietEnv, aDirContent ) )
+ if ( Content::create( pDirs[ nCountDir ], aQuietEnv, comphelper::getProcessComponentContext(), aDirContent ) )
{
createFromContent( aGroupList, aDirContent, sal_False, bWriteableDirectory );
}
@@ -1266,7 +1266,7 @@ void SfxDocTplService_Impl::doUpdate()
if ( pGroup->getInHierarchy() )
{
Content aGroup;
- if ( Content::create( pGroup->getHierarchyURL(), maCmdEnv, aGroup ) )
+ if ( Content::create( pGroup->getHierarchyURL(), maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) )
setProperty( aGroup,
OUString( TARGET_DIR_URL ),
makeAny( pGroup->getTargetURL() ) );
@@ -1316,7 +1316,7 @@ uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplate
// TODO/LATER: Use hashmap in future
uno::Sequence< beans::StringPair > aUINames;
- if ( Content::create( aLocObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference < ucb::XCommandEnvironment >(), aLocContent ) )
+ if ( Content::create( aLocObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference < ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext(), aLocContent ) )
{
try
{
@@ -1429,8 +1429,8 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU
} catch( uno::Exception& )
{}
- Content aTargetContent( aUserPath, maCmdEnv );
- Content aSourceContent( aTempURL, maCmdEnv );
+ Content aTargetContent( aUserPath, maCmdEnv, comphelper::getProcessComponentContext() );
+ Content aSourceContent( aTempURL, maCmdEnv, comphelper::getProcessComponentContext() );
aTargetContent.transferContent( aSourceContent,
InsertOperation_COPY,
::rtl::OUString( "groupuinames.xml" ),
@@ -1509,7 +1509,7 @@ sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName )
aNewGroupURL = aNewGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( Content::create( aNewGroupURL, maCmdEnv, aNewGroup ) ||
+ if ( Content::create( aNewGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aNewGroup ) ||
! createFolder( aNewGroupURL, sal_False, sal_False, aNewGroup ) )
{
// if there already was a group with this name or the new group
@@ -1596,7 +1596,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName )
Content aGroup;
OUString aGroupURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( Content::create( aGroupURL, maCmdEnv, aGroup ) )
+ if ( Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) )
{
OUString aPropName( TARGET_DIR_URL );
Any aValue;
@@ -1698,7 +1698,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName,
// Check, if there is a group with the new name, return false
// if there is one.
- if ( Content::create( aGroupURL, maCmdEnv, aGroup ) )
+ if ( Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) )
return sal_False;
aGroupObj.removeSegment();
@@ -1708,7 +1708,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName,
aGroupURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
// When there is no group with the old name, we can't rename it
- if ( ! Content::create( aGroupURL, maCmdEnv, aGroup ) )
+ if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) )
return sal_False;
OUString aGroupTargetURL;
@@ -1805,7 +1805,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
INetURLObject::ENCODE_ALL );
aGroupURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( ! Content::create( aGroupURL, maCmdEnv, aGroup ) )
+ if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) )
return sal_False;
::rtl::OUString aGroupTargetURL;
@@ -1824,7 +1824,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
INetURLObject::ENCODE_ALL );
aTemplateURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( Content::create( aTemplateURL, maCmdEnv, aTemplateToRemove ) )
+ if ( Content::create( aTemplateURL, maCmdEnv, comphelper::getProcessComponentContext(), aTemplateToRemove ) )
{
OUString aTargetTemplPropName( TARGET_URL );
@@ -1993,7 +1993,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName,
INetURLObject::ENCODE_ALL );
aGroupURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( ! Content::create( aGroupURL, maCmdEnv, aGroup ) )
+ if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) )
return sal_False;
// Check, if there's a template with the given name in this group
@@ -2003,7 +2003,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName,
INetURLObject::ENCODE_ALL );
aTemplateURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( Content::create( aTemplateURL, maCmdEnv, aTemplate ) )
+ if ( Content::create( aTemplateURL, maCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) )
return sal_False;
// get the target url of the group
@@ -2067,10 +2067,10 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName,
Content aSourceContent;
uno::Reference < ucb::XCommandEnvironment > xEnv;
INetURLObject aSourceURL( rSourceURL );
- if( ! Content::create( aSourceURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv, aSourceContent ) )
+ if( ! Content::create( aSourceURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext(), aSourceContent ) )
return sal_False;
- if( ! Content::create( aTargetURL, xEnv, aTargetGroup ) )
+ if( ! Content::create( aTargetURL, xEnv, comphelper::getProcessComponentContext(), aTargetGroup ) )
return sal_False;
// transfer source file
@@ -2084,7 +2084,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName,
// allow to edit the added template
Content aResultContent;
- if ( Content::create( aNewTemplateTargetURL, xEnv, aResultContent ) )
+ if ( Content::create( aNewTemplateTargetURL, xEnv, comphelper::getProcessComponentContext(), aResultContent ) )
{
::rtl::OUString aPropertyName( "IsReadOnly" );
uno::Any aProperty;
@@ -2143,7 +2143,7 @@ sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName,
INetURLObject::ENCODE_ALL );
aGroupURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( ! Content::create( aGroupURL, maCmdEnv, aGroup ) )
+ if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) )
return sal_False;
// Check, if there's a template with the given name in this group
@@ -2153,7 +2153,7 @@ sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName,
INetURLObject::ENCODE_ALL );
aTemplateURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( !Content::create( aTemplateURL, maCmdEnv, aTemplate ) )
+ if ( !Content::create( aTemplateURL, maCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) )
return sal_False;
// get the target URL from the template
@@ -2196,7 +2196,7 @@ sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName,
INetURLObject::ENCODE_ALL );
aGroupURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( ! Content::create( aGroupURL, maCmdEnv, aGroup ) )
+ if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) )
return sal_False;
// Check, if there's a template with the new name in this group
@@ -2206,7 +2206,7 @@ sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName,
INetURLObject::ENCODE_ALL );
aTemplateURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( Content::create( aTemplateURL, maCmdEnv, aTemplate ) )
+ if ( Content::create( aTemplateURL, maCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) )
return sal_False;
// Check, if there's a template with the old name in this group
@@ -2217,7 +2217,7 @@ sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName,
INetURLObject::ENCODE_ALL );
aTemplateURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( !Content::create( aTemplateURL, maCmdEnv, aTemplate ) )
+ if ( !Content::create( aTemplateURL, maCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) )
return sal_False;
OUString aTemplateTargetURL;
@@ -2449,7 +2449,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
try
{
- aContent = Content( rOwnURL, maCmdEnv );
+ aContent = Content( rOwnURL, maCmdEnv, comphelper::getProcessComponentContext() );
ResultSetInclude eInclude = INCLUDE_DOCUMENTS_ONLY;
xResultSet = aContent.createCursor( aProps, eInclude );
}
@@ -2561,7 +2561,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList,
// this method is only used during checking of the available template-folders
// that should happen quietly
uno::Reference< XCommandEnvironment > aQuietEnv;
- aContent = Content( rOwnURL, aQuietEnv );
+ aContent = Content( rOwnURL, aQuietEnv, comphelper::getProcessComponentContext() );
ResultSetInclude eInclude = INCLUDE_DOCUMENTS_ONLY;
xResultSet = aContent.createCursor( aProps, eInclude );
}
@@ -2668,7 +2668,7 @@ void SfxDocTplService_Impl::removeFromHierarchy( DocTemplates_EntryData_Impl *pD
{
Content aTemplate;
- if ( Content::create( pData->getHierarchyURL(), maCmdEnv, aTemplate ) )
+ if ( Content::create( pData->getHierarchyURL(), maCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) )
{
removeContent( aTemplate );
}
@@ -2680,7 +2680,7 @@ void SfxDocTplService_Impl::addToHierarchy( GroupData_Impl *pGroup,
{
Content aGroup, aTemplate;
- if ( ! Content::create( pGroup->getHierarchyURL(), maCmdEnv, aGroup ) )
+ if ( ! Content::create( pGroup->getHierarchyURL(), maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) )
return;
// Check, if there's a template with the given name in this group
@@ -2693,7 +2693,7 @@ void SfxDocTplService_Impl::addToHierarchy( GroupData_Impl *pGroup,
OUString aTemplateURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( Content::create( aTemplateURL, maCmdEnv, aTemplate ) )
+ if ( Content::create( aTemplateURL, maCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) )
return;
addEntry( aGroup, pData->getTitle(),
@@ -2706,7 +2706,7 @@ void SfxDocTplService_Impl::updateData( DocTemplates_EntryData_Impl *pData )
{
Content aTemplate;
- if ( ! Content::create( pData->getHierarchyURL(), maCmdEnv, aTemplate ) )
+ if ( ! Content::create( pData->getHierarchyURL(), maCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) )
return;
OUString aPropName;
@@ -2756,7 +2756,7 @@ void SfxDocTplService_Impl::removeFromHierarchy( GroupData_Impl *pGroup )
{
Content aGroup;
- if ( Content::create( pGroup->getHierarchyURL(), maCmdEnv, aGroup ) )
+ if ( Content::create( pGroup->getHierarchyURL(), maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) )
{
removeContent( aGroup );
}
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index bebe6b0bb823..cf8d0c264f51 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -742,7 +742,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
try
{
- ::ucbhelper::Content aContent( pMedium->GetName(), com::sun::star::uno::Reference < XCommandEnvironment >() );
+ ::ucbhelper::Content aContent( pMedium->GetName(), com::sun::star::uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() );
com::sun::star::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties();
if ( xProps.is() )
{
@@ -1674,7 +1674,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
{
try
{
- ::ucbhelper::Content aContent( rMedium.GetName(), com::sun::star::uno::Reference < XCommandEnvironment >() );
+ ::ucbhelper::Content aContent( rMedium.GetName(), com::sun::star::uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() );
com::sun::star::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties();
if ( xProps.is() )
{
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index cf7b5cff2d9f..fdc01f6fe892 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/EventObject.hpp>
#include <com/sun/star/view/DuplexMode.hpp>
-
+#include <comphelper/processfactory.hxx>
#include <svl/lstner.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
@@ -534,11 +534,13 @@ class ImplUCBPrintWatcher : public ::osl::Thread
{
::ucbhelper::Content aSource(
::rtl::OUString((*ppTempFile)->GetURL()),
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >());
+ ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
+ comphelper::getProcessComponentContext());
::ucbhelper::Content aTarget(
::rtl::OUString(aSplitter.GetMainURL(INetURLObject::NO_DECODE)),
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >());
+ ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
+ comphelper::getProcessComponentContext());
aTarget.transferContent(
aSource,
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index b2b6e20439e6..2ef4d8b5bede 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3783,7 +3783,8 @@ css::uno::Reference< css::frame::XUntitledNumbers > SfxBaseModel::impl_getUntitl
{
try {
::ucbhelper::Content aContent( pMedium->GetName(),
- uno::Reference<ucb::XCommandEnvironment>() );
+ uno::Reference<ucb::XCommandEnvironment>(),
+ comphelper::getProcessComponentContext() );
const uno::Reference < beans::XPropertySetInfo > xProps
= aContent.getProperties();
if ( xProps.is() )
generated by cgit (git 2.34.1) at 2025-02-26 23:38:53 +0000