summaryrefslogtreecommitdiff
path: root/sc/source/ui/dbgui/sfiltdlg.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/dbgui/sfiltdlg.cxx')
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx52
1 files changed, 18 insertions, 34 deletions
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 990939dca7ff..f00924e8f76f 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -18,7 +18,6 @@
*/
#include <sfx2/dispatch.hxx>
-#include <vcl/idle.hxx>
#include "uiitems.hxx"
#include "rangenam.hxx"
@@ -57,8 +56,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vc
pViewData ( nullptr ),
pDoc ( nullptr ),
pRefInputEdit ( nullptr ),
- bRefInputMode ( false ),
- pIdle ( nullptr )
+ bRefInputMode ( false )
{
get(pLbFilterArea,"lbfilterarea");
get(pEdFilterArea,"edfilterarea");
@@ -85,12 +83,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vc
Init( rArgSet );
pEdFilterArea->GrabFocus();
- // Hack: RefInput-Kontrolle
- pIdle = new Idle;
- // FIXME: this is an abomination
- pIdle->SetPriority( SchedulerPriority::LOWEST );
- pIdle->SetIdleHdl( LINK( this, ScSpecialFilterDlg, TimeOutHdl ) );
- pIdle->Start();
pLbCopyArea->SetAccessibleName(pBtnCopyResult->GetText());
pEdCopyArea->SetAccessibleName(pBtnCopyResult->GetText());
@@ -112,10 +104,6 @@ void ScSpecialFilterDlg::dispose()
delete pOutItem;
- // Hack: RefInput-Kontrolle
- pIdle->Stop();
- delete pIdle;
-
pLbFilterArea.clear();
pEdFilterArea.clear();
pRbFilterArea.clear();
@@ -228,6 +216,7 @@ bool ScSpecialFilterDlg::Close()
void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
{
+ SyncFocusState();
if ( bRefInputMode && pRefInputEdit ) // Nur moeglich, wenn im Referenz-Editmodus
{
if ( rRef.aStart != rRef.aEnd )
@@ -247,6 +236,7 @@ void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
void ScSpecialFilterDlg::SetActive()
{
+ SyncFocusState();
if ( bRefInputMode )
{
if ( pRefInputEdit == pEdCopyArea )
@@ -399,30 +389,24 @@ IMPL_LINK_TYPED( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void )
}
}
-IMPL_LINK_TYPED( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void )
-{
- // every 50ms check whether RefInputMode is still true
- if( (_pIdle == pIdle) && IsActive() )
+void ScSpecialFilterDlg::SyncFocusState()
+{
+ if( pEdCopyArea->HasFocus() || pRbCopyArea->HasFocus() )
{
- if( pEdCopyArea->HasFocus() || pRbCopyArea->HasFocus() )
- {
- pRefInputEdit = pEdCopyArea;
- bRefInputMode = true;
- }
- else if( pEdFilterArea->HasFocus() || pRbFilterArea->HasFocus() )
- {
- pRefInputEdit = pEdFilterArea;
- bRefInputMode = true;
- }
- else if( bRefInputMode )
- {
- pRefInputEdit = nullptr;
- bRefInputMode = false;
- }
+ pRefInputEdit = pEdCopyArea;
+ bRefInputMode = true;
+ }
+ else if( pEdFilterArea->HasFocus() || pRbFilterArea->HasFocus() )
+ {
+ pRefInputEdit = pEdFilterArea;
+ bRefInputMode = true;
+ }
+ else if( bRefInputMode )
+ {
+ pRefInputEdit = nullptr;
+ bRefInputMode = false;
}
-
- pIdle->Start();
}
IMPL_LINK_TYPED( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void )