summaryrefslogtreecommitdiff
path: root/sfx2/inc
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-06 13:00:06 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-06 13:00:06 +0000
commit51885f3e7d8f575f30cbcfbfdd34fe8be33616bf (patch)
tree6b28cbef1e88f7adc6a808f2f15ba10da60d1db3 /sfx2/inc
parentfa7e946da639d5816f1806ef30d284983ee765ca (diff)
INTEGRATION: CWS os113 (1.3.44); FILE MERGED
2008/05/22 05:41:40 os 1.3.44.1: #i88463# added parameter at methods of SfxTabPage to suppress deep search for WhichId
Diffstat (limited to 'sfx2/inc')
-rw-r--r--sfx2/inc/sfx2/tabdlg.hxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 7f4ed9f826..f5c9a20970 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tabdlg.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
* This file is part of OpenOffice.org.
*
@@ -241,9 +241,9 @@ protected:
USHORT GetSlot( USHORT nWhich ) const
{ return pSet->GetPool()->GetSlotId( nWhich ); }
- USHORT GetWhich( USHORT nSlot ) const
- { return pSet->GetPool()->GetWhich( nSlot ); }
- const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, USHORT nSlot );
+ USHORT GetWhich( USHORT nSlot, sal_Bool bDeep = sal_True ) const
+ { return pSet->GetPool()->GetWhich( nSlot, bDeep ); }
+ const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True );
const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot );
SfxTabDialog* GetTabDialog() const { return pTabDlg; }
@@ -282,7 +282,7 @@ public:
virtual void FillUserData();
virtual BOOL IsReadOnly() const;
virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
- static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot );
+ static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True );
void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame();