diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 13:00:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 13:00:41 +0000 |
| commit | df4e0ad8fd9e21713062f0c59424ef762ffc5514 (patch) | |
| tree | 8fedfa939fde5e81a32a4b64c4944544923b40c3 /sfx2 | |
| parent | ff2d90b539bb089e283f09f88d1d0d87ed9c442c (diff) | |
INTEGRATION: CWS os113 (1.37.44); FILE MERGED
2008/05/22 05:42:24 os 1.37.44.1: #i88463# added parameter at methods of SfxTabPage to suppress deep search for WhichId
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index bbce3551c1f3..625c8956d1c9 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabdlg.cxx,v $ - * $Revision: 1.37 $ + * $Revision: 1.38 $ * * This file is part of OpenOffice.org. * @@ -384,7 +384,7 @@ BOOL SfxTabPage::IsReadOnly() const // ----------------------------------------------------------------------- -const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot ) +const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep ) /* [Beschreibung] @@ -395,7 +395,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot ) { const SfxItemPool* pPool = rSet.GetPool(); - USHORT nWh = pPool->GetWhich( nSlot ); + USHORT nWh = pPool->GetWhich( nSlot, bDeep ); const SfxPoolItem* pItem = 0; #ifdef DEBUG SfxItemState eState; @@ -411,7 +411,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, USHORT nSlot ) // ----------------------------------------------------------------------- const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet, - USHORT nSlot ) + USHORT nSlot, sal_Bool bDeep ) /* [Beschreibung] @@ -421,7 +421,7 @@ const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet, { const SfxItemSet& rOldSet = GetItemSet(); - USHORT nWh = GetWhich( nSlot ); + USHORT nWh = GetWhich( nSlot, bDeep ); const SfxPoolItem* pItem = 0; if ( pImpl->mbStandard && rOldSet.GetParent() ) |