Attachment #76289 for issue #117718

View | Details | Raw Unified | Return to issue 117718
Collapse All | Expand All

Lines 130-136 Link Here

(-)a/sfx2/inc/sfx2/docfile.hxx (-1 / +7 lines)
130	const SfxItemSet* pSet=0,	130	const SfxItemSet* pSet=0,
131	sal_Bool bRoot = sal_False );	131	sal_Bool bRoot = sal_False );
132		132
133	SfxMedium( const SfxMedium &rMedium, sal_Bool bCreateTemporary = sal_False );	133	SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
		134	const String& rBaseURL,
		135	const String& rTypeName,
		136	const SfxItemSet* pSet=0,
		137	sal_Bool bRoot = sal_False );
		138
		139	SfxMedium( const SfxMedium &rMedium, sal_Bool bCreateTemporary = sal_False );
134	SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );	140	SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
135		141
136	~SfxMedium();	142	~SfxMedium();




        GetItemSet()->Put( *p );
}

SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const String& rTypeName, const SfxItemSet* p, sal_Bool bRootP )
:   IMPL_CTOR( bRootP, 0 ),	// bRoot, pURLObj
    pSet(0),
    pImp( new SfxMedium_Impl( this ))
{
	pFilter = SFX_APP()->GetFilterMatcher().GetFilter4EA( rTypeName );
    DBG_ASSERT( pFilter, "No Filter for storage found!" );

    Init_Impl();
    pImp->xStorage = rStor;
    pImp->bDisposeStorage = sal_False;

    // always take BaseURL first, could be overwritten by ItemSet
    GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, rBaseURL ) );
    if ( p )
        GetItemSet()->Put( *p );
}

//------------------------------------------------------------------

SfxMedium::~SfxMedium()

Lines 71-77 Link Here

(-)a/sw/source/core/swg/SwXMLTextBlocks1.cxx (-1 / +1 lines)
71	try	71	try
72	{	72	{
73	xRoot = xBlkRoot->openStorageElement( aFolderName, embed::ElementModes::READ );	73	xRoot = xBlkRoot->openStorageElement( aFolderName, embed::ElementModes::READ );
74	xMedium = new SfxMedium(xRoot, GetBaseURL());	74	xMedium = new SfxMedium(xRoot, GetBaseURL(), S2U("writer8"));
75	SwReader aReader(*xMedium,aFolderName, pDoc );	75	SwReader aReader(*xMedium,aFolderName, pDoc );
76	ReadXML->SetBlockMode( sal_True );	76	ReadXML->SetBlockMode( sal_True );
77	aReader.Read( *ReadXML );	77	aReader.Read( *ReadXML );

Return to issue 117718

Lines 3030-3035 Link Here

(-)a/sfx2/source/doc/docfile.cxx (+18 lines)
3030	GetItemSet()->Put( *p );	3030	GetItemSet()->Put( *p );
3031	}	3031	}
3032		3032
		3033	SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const String& rTypeName, const SfxItemSet* p, sal_Bool bRootP )
		3034	: IMPL_CTOR( bRootP, 0 ), // bRoot, pURLObj
		3035	pSet(0),
		3036	pImp( new SfxMedium_Impl( this ))
		3037	{
		3038	pFilter = SFX_APP()->GetFilterMatcher().GetFilter4EA( rTypeName );
		3039	DBG_ASSERT( pFilter, "No Filter for storage found!" );
		3040
		3041	Init_Impl();
		3042	pImp->xStorage = rStor;
		3043	pImp->bDisposeStorage = sal_False;
		3044
		3045	// always take BaseURL first, could be overwritten by ItemSet
		3046	GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, rBaseURL ) );
		3047	if ( p )
		3048	GetItemSet()->Put( *p );
		3049	}
		3050
3033	//------------------------------------------------------------------	3051	//------------------------------------------------------------------
3034		3052
3035	SfxMedium::~SfxMedium()	3053	SfxMedium::~SfxMedium()