diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-08-31 12:13:46 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-09-07 09:10:37 -0400 |
| commit | 66c213adb03e4457380b3f67fb559e13cb72bf00 (patch) | |
| tree | 772b78f9afc98ca6c5b1bf929e929ad43b693a44 | |
| parent | ae197be590cd06bff282bffce1ef77ff83087d39 (diff) | |
Make it more generic.
Change-Id: I3d3ddec1a8313bb58f5ae6bbc3edc1f273e25f94
| -rw-r--r-- | sfx2/source/view/frmload.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 11ed90eff262..26b1ec7a179a 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -519,8 +519,6 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA ::comphelper::NamedValueCollection aDescriptor( rArgs ); - bool bLoadWithOrcus = aDescriptor.getOrDefault<OUString>("FilterProvider", OUString()) == "orcus"; - // ensure the descriptor contains a referrer if ( !aDescriptor.has( "Referer" ) ) 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 if ( !xModel.is() ) { - // beforehand, determine the filter to use, and update the descriptor with its information - if ( !bInitNewModel && !bLoadWithOrcus ) + bool bInternalFilter = aDescriptor.getOrDefault<OUString>("FilterProvider", OUString()).isEmpty(); + + 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 |