diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-04-27 08:51:26 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-04-27 08:51:26 +0000 |
| commit | 5f8008185d55aed09b08750a00c74d8fd85bfd30 (patch) | |
| tree | 92a5e62ffd6c0770de0b34d89368fab51a838e34 | |
| parent | 9c829c078458a333fb3b6a4953a4609e1525ae0e (diff) | |
INTEGRATION: CWS os80 (1.18.66); FILE MERGED
2006/04/10 11:25:25 os 1.18.66.1: #i62975# AutoFilter toolbox function fixed
| -rw-r--r-- | extensions/source/bibliography/toolbar.cxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 2917c69904bc..b4243da5c153 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -4,9 +4,9 @@ * * $RCSfile: toolbar.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: kz $ $Date: 2006-01-05 18:08:45 $ + * last change: $Author: kz $ $Date: 2006-04-27 09:51:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -283,8 +283,7 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): aTimer.SetTimeoutHdl(LINK( this, BibToolBar, SendSelHdl)); aTimer.SetTimeout(400); - aMenuTimer.SetTimeoutHdl(LINK( this, BibToolBar, MenuHdl)); - aMenuTimer.SetTimeout(300); + SetDropdownClickHdl( LINK( this, BibToolBar, MenuHdl)); aEdQuery.SetSizePixel(aLBSource.GetSizePixel()); aEdQuery.Show(); @@ -428,11 +427,7 @@ void BibToolBar::Click() { sal_uInt16 nId=GetCurItemId(); - if(nId==TBC_BT_AUTOFILTER) - { - aMenuTimer.Start(); - } - else if(nId == TBC_BT_COL_ASSIGN ) + if(nId == TBC_BT_COL_ASSIGN ) { if(pDatMan) pDatMan->CreateMappingDialog(GetParent()); @@ -555,9 +550,10 @@ IMPL_LINK( BibToolBar, SendSelHdl, Timer*,pT) return 0; } //----------------------------------------------------------------------------- -IMPL_LINK( BibToolBar, MenuHdl, Timer*,pT) +IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, pToolbox)//Timer*,pT) { - if(IsItemDown(TBC_BT_AUTOFILTER)) + sal_uInt16 nId=GetCurItemId(); + if(nId==TBC_BT_AUTOFILTER) { EndSelection(); // vor SetDropMode (SetDropMode ruft SetItemImage) |