mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

third argument should be SfxFilterFlags

Browse Source 
Change-Id: Id0a73ffbbddc7fd2b2190cc04f59769561f45dd0
This commit is contained in:
Caolán McNamara
2014-11-17 10:41:32 +00:00
parent 639f6dcb1f
commit 60b3d8119c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sw/source/core/unocore/unocrsrhelper.cxx
View File

@@ -1017,7 +1017,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, const OUString& rURL,
pMed->GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, sBaseURL ) ); pMed->GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, sBaseURL ) );
SfxFilterMatcher aMatcher( rFact.GetFilterContainer()->GetName() ); SfxFilterMatcher aMatcher( rFact.GetFilterContainer()->GetName() );
ErrCode nErr = aMatcher.GuessFilter( *pMed, &pFilter, sal_False ); ErrCode nErr = aMatcher.GuessFilter(*pMed, &pFilter, SFX_FILTER_VERSION_NONE);
if ( nErr || !pFilter) if ( nErr || !pFilter)
DELETEZ(pMed); DELETEZ(pMed);
else else

2
sw/source/uibase/dochdl/gloshdl.cxx
View File

@@ -729,7 +729,7 @@ bool SwGlossaryHdl::ImportGlossaries( const OUString& rName )
boost::scoped_ptr<SfxMedium> pMed(new SfxMedium( rName, STREAM_READ, 0, 0 )); boost::scoped_ptr<SfxMedium> pMed(new SfxMedium( rName, STREAM_READ, 0, 0 ));
SfxFilterMatcher aMatcher( OUString("swriter") ); SfxFilterMatcher aMatcher( OUString("swriter") );
pMed->UseInteractionHandler( true ); pMed->UseInteractionHandler( true );
if( !aMatcher.GuessFilter( *pMed, &pFilter, sal_False ) ) if (!aMatcher.GuessFilter(*pMed, &pFilter, SFX_FILTER_VERSION_NONE))
{ {
SwTextBlocks *pGlossary = NULL; SwTextBlocks *pGlossary = NULL;
pMed->SetFilter( pFilter ); pMed->SetFilter( pFilter );

2
sw/source/uibase/uiview/view2.cxx
View File

@@ -2132,7 +2132,7 @@ long SwView::InsertDoc( sal_uInt16 nSlotId, const OUString& rFileName, const OUS
pMed = new SfxMedium(rFileName, STREAM_READ, 0, 0 ); pMed = new SfxMedium(rFileName, STREAM_READ, 0, 0 );
SfxFilterMatcher aMatcher( rFact.GetFilterContainer()->GetName() ); SfxFilterMatcher aMatcher( rFact.GetFilterContainer()->GetName() );
pMed->UseInteractionHandler( true ); pMed->UseInteractionHandler( true );
ErrCode nErr = aMatcher.GuessFilter( *pMed, &pFilter, sal_False ); ErrCode nErr = aMatcher.GuessFilter(*pMed, &pFilter, SFX_FILTER_VERSION_NONE);
if ( nErr ) if ( nErr )
DELETEZ(pMed); DELETEZ(pMed);
else else