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

Make it more generic.

Browse Source 
Change-Id: I3d3ddec1a8313bb58f5ae6bbc3edc1f273e25f94
This commit is contained in:
Kohei Yoshida
2012-08-31 12:13:46 -04:00
parent ae197be590
commit 66c213adb0
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sfx2/source/view/frmload.cxx
View File

@@ -519,8 +519,6 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
::comphelper::NamedValueCollection aDescriptor( rArgs ); ::comphelper::NamedValueCollection aDescriptor( rArgs );
bool bLoadWithOrcus = aDescriptor.getOrDefault<OUString>("FilterProvider", OUString()) == "orcus";
// ensure the descriptor contains a referrer // ensure the descriptor contains a referrer
if ( !aDescriptor.has( "Referer" ) ) if ( !aDescriptor.has( "Referer" ) )
aDescriptor.put( "Referer", ::rtl::OUString() ); aDescriptor.put( "Referer", ::rtl::OUString() );
@@ -572,10 +570,14 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
// no model passed from outside? => create one from scratch // no model passed from outside? => create one from scratch
if ( !xModel.is() ) if ( !xModel.is() )
{ {
// beforehand, determine the filter to use, and update the descriptor with its information bool bInternalFilter = aDescriptor.getOrDefault<OUString>("FilterProvider", OUString()).isEmpty();
if ( !bInitNewModel && !bLoadWithOrcus )
if (bInternalFilter && !bInitNewModel)
{ {
impl_determineFilter( aDescriptor ); // Ensure that the current SfxFilter instance is loaded before
// going further. We don't need to do this for external
// filter providers.
impl_determineFilter(aDescriptor);
} }
// create the new doc // create the new doc