diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-13 00:41:13 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-13 01:54:43 -0400 |
| commit | 0583907f2b6a9fc5ca2a6368a1c22c803a4fe758 (patch) | |
| tree | dd87c1b0895001c32630ff326fb0304b6e12d4db /sfx2 | |
| parent | 9f7ac9aeeb60ed521ef07323e904ffc9eb13b715 (diff) | |
Handle hidden property for external filter loading as well.
Change-Id: I7a0154161d28e59c3e741fd592d3ce175676c901
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index fee8ea70413c..9024cd0bf551 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1823,6 +1823,16 @@ OUString getFilterProvider( SfxMedium& rMedium ) return pFilter->GetProviderName(); } +void setUpdatePickList( SfxMedium* pMedium ) +{ + bool bHidden = false; + SFX_ITEMSET_ARG(pMedium->GetItemSet(), pHidItem, SfxBoolItem, SID_HIDDEN, false); + if (pHidItem) + bHidden = pHidItem->GetValue(); + + pMedium->SetUpdatePickList(!bHidden); +} + } void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqArguments ) @@ -1855,7 +1865,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA nError = ERRCODE_IO_GENERAL; handleLoadError(nError, pMedium); - pMedium->SetUpdatePickList(false); + setUpdatePickList(pMedium); return; } @@ -1943,20 +1953,13 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA m_pData->m_pObjectShell->ResetError(); handleLoadError(nError, pMedium); - - loadCmisProperties( ); - - sal_Bool bHidden = sal_False; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHidItem, SfxBoolItem, SID_HIDDEN, sal_False); - if ( pHidItem ) - bHidden = pHidItem->GetValue(); + loadCmisProperties(); + setUpdatePickList(pMedium); #if OSL_DEBUG_LEVEL > 0 SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, sal_False); OSL_ENSURE( !pPasswdItem, "There should be no Password property in the document MediaDescriptor!" ); #endif - // !TODO: will be done by Framework! - pMedium->SetUpdatePickList( !bHidden ); } //________________________________________________________________________________________________________ |