strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for fdo41997 continuation of VCL cleanup

Browse source
This commit is contained in:
Olivier Hallot 2011-10-24 16:04:07 +01:00 committed by Michael Meeks
parent 0862556f1e
commit a5d6dca3e9
15 changed files with 42 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
basic/source/app/textedit.cxx
View file

@ -370,7 +370,7 @@ IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG )
bHighlightning = sal_True;
sal_uInt16 nLine;
while ( aSyntaxLineTable.First() && !Application::AnyInput( INPUT_MOUSEANDKEYBOARD ) )
while ( aSyntaxLineTable.First() && !Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD ) )
{
nLine = (sal_uInt16)aSyntaxLineTable.GetCurKey();
DoSyntaxHighlight( nLine );

4
desktop/source/app/app.cxx
View file

@ -1784,7 +1784,7 @@ int Desktop::Main()
(SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) &&
(!bExistsRecoveryData ) &&
(!bExistsSessionData ) &&
(!Application::AnyInput( INPUT_APPEVENT ) ))
(!Application::AnyInput( VCL_INPUT_APPEVENT ) ))
{
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ create BackingComponent" );
Reference< XFrame > xDesktopFrame( xDesktop, UNO_QUERY );
@ -2875,7 +2875,7 @@ void Desktop::OpenClients()
if ( xList->hasElements() || rArgs.IsServer() )
return;
if ( rArgs.IsQuickstart() || rArgs.IsInvisible() || rArgs.IsBean() || Application::AnyInput( INPUT_APPEVENT ) )
if ( rArgs.IsQuickstart() || rArgs.IsInvisible() || rArgs.IsBean() || Application::AnyInput( VCL_INPUT_APPEVENT ) )
// soffice was started as tray icon ...
return;
{

2
sc/source/core/data/documen8.cxx
View file

@ -450,7 +450,7 @@ void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress
//------------------------------------------------------------------------
#define CALCMAX 1000 // Berechnungen
#define ABORT_EVENTS (INPUT_ANY & ~INPUT_TIMER & ~INPUT_OTHER)
#define ABORT_EVENTS (VCL_INPUT_ANY & ~VCL_INPUT_TIMER & ~VCL_INPUT_OTHER)
sal_Bool ScDocument::IdleCalcTextWidth() // sal_True = demnaechst wieder versuchen
{

2
sc/source/ui/app/scmod.cxx
View file

@ -1822,7 +1822,7 @@ void lcl_CheckNeedsRepaint( ScDocShell* pDocShell )
IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG )
{
if ( Application::AnyInput( INPUT_MOUSEANDKEYBOARD ) )
if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD ) )
{
aIdleTimer.Start(); // Timeout unveraendert
return 0;

2
sd/source/ui/tools/IdleDetection.cxx
View file

@ -59,7 +59,7 @@ sal_Int32 IdleDetection::GetIdleState (const ::Window* pWindow)
sal_Int32 IdleDetection::CheckInputPending (void)
{
if (GetpApp()->AnyInput(VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD | INPUT_PAINT))
if (GetpApp()->AnyInput(VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD | VCL_INPUT_PAINT))
return IDET_SYSTEM_EVENT_PENDING;
else
return IDET_IDLE;

10
sw/source/core/layout/layact.cxx
View file

@ -2127,13 +2127,13 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
bAllValid = sal_False;
if ( aRepaint.HasArea() )
pImp->GetShell()->InvalidateWindows( aRepaint );
if ( Application::AnyInput( INPUT_MOUSEANDKEYBOARD|INPUT_OTHER|INPUT_PAINT ) )
if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD|VCL_INPUT_OTHER|VCL_INPUT_PAINT ) )
return sal_True;
break;
}
case AUTOCOMPLETE_WORDS :
((SwTxtFrm*)pCnt)->CollectAutoCmplWrds( pCntntNode, nTxtPos );
if ( Application::AnyInput( INPUT_ANY ) )
if ( Application::AnyInput( VCL_INPUT_ANY ) )
return sal_True;
break;
case WORD_COUNT :
@ -2141,7 +2141,7 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
const xub_StrLen nEnd = pTxtNode->GetTxt().Len();
SwDocStat aStat;
pTxtNode->CountWords( aStat, 0, nEnd );
if ( Application::AnyInput( INPUT_ANY ) )
if ( Application::AnyInput( VCL_INPUT_ANY ) )
return sal_True;
break;
}
@ -2153,7 +2153,7 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
bAllValid = sal_False;
if ( aRepaint.HasArea() )
pImp->GetShell()->InvalidateWindows( aRepaint );
if ( Application::AnyInput( INPUT_MOUSEANDKEYBOARD|INPUT_OTHER|INPUT_PAINT ) )
if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD|VCL_INPUT_OTHER|VCL_INPUT_PAINT ) )
return sal_True;
break;
}
@ -2360,7 +2360,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
} while ( pSh != pImp->GetShell() );
SwLayAction aAction( pRoot, pImp );
aAction.SetInputType( INPUT_ANY );
aAction.SetInputType( VCL_INPUT_ANY );
aAction.SetIdle( sal_True );
aAction.SetWaitAllowed( sal_False );
aAction.Action();

2
sw/source/core/txtnode/txtedt.cxx
View file

@ -1436,7 +1436,7 @@ void SwTxtFrm::CollectAutoCmplWrds( SwCntntNode* pActNode, xub_StrLen nActPos )
}
if( !--nCnt )
{
if ( Application::AnyInput( INPUT_ANY ) )
if ( Application::AnyInput( VCL_INPUT_ANY ) )
return;
nCnt = 100;
}

10
vcl/aqua/source/app/salinst.cxx
View file

@ -854,15 +854,15 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
bool AquaSalInstance::AnyInput( sal_uInt16 nType )
{
if( nType & INPUT_APPEVENT )
if( nType & VCL_INPUT_APPEVENT )
{
if( ! aAppEventList.empty() )
return true;
if( nType == INPUT_APPEVENT )
if( nType == VCL_INPUT_APPEVENT )
return false;
}
if( nType & INPUT_TIMER )
if( nType & VCL_INPUT_TIMER )
{
if( AquaSalTimer::pRunningTimer )
{
@ -885,9 +885,9 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType )
NSMouseEnteredMask | NSMouseExitedMask;
if( nType & VCL_INPUT_KEYBOARD)
nEventMask |= NSKeyDownMask | NSKeyUpMask | NSFlagsChangedMask;
if( nType & INPUT_OTHER)
if( nType & VCL_INPUT_OTHER)
nEventMask |= NSTabletPoint;
// TODO: INPUT_PAINT / more INPUT_OTHER
// TODO: VCL_INPUT_PAINT / more VCL_INPUT_OTHER
if( !nType)
return false;

2
vcl/headless/svpinst.cxx
View file

@ -397,7 +397,7 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
bool SvpSalInstance::AnyInput( sal_uInt16 nType )
{
if( (nType & INPUT_TIMER) != 0 )
if( (nType & VCL_INPUT_TIMER) != 0 )
return CheckTimeout( false );
return false;
}

12
vcl/inc/vcl/apptypes.hxx
View file

@ -57,12 +57,12 @@ public:
#define VCL_INPUT_MOUSE 0x0001
#define VCL_INPUT_KEYBOARD 0x0002
#define INPUT_PAINT 0x0004
#define INPUT_TIMER 0x0008
#define INPUT_OTHER 0x0010
#define INPUT_APPEVENT 0x0020
#define INPUT_MOUSEANDKEYBOARD (VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD)
#define INPUT_ANY (INPUT_MOUSEANDKEYBOARD | INPUT_PAINT | INPUT_TIMER | INPUT_OTHER | INPUT_APPEVENT)
#define VCL_INPUT_PAINT 0x0004
#define VCL_INPUT_TIMER 0x0008
#define VCL_INPUT_OTHER 0x0010
#define VCL_INPUT_APPEVENT 0x0020
#define VCL_INPUT_MOUSEANDKEYBOARD (VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD)
#define VCL_INPUT_ANY (VCL_INPUT_MOUSEANDKEYBOARD | VCL_INPUT_PAINT | VCL_INPUT_TIMER | VCL_INPUT_OTHER | VCL_INPUT_APPEVENT)
#define DISPATCH_OPEN 0x0001
#define DISPATCH_PRINT 0x0002

2
vcl/inc/vcl/svapp.hxx
View file

@ -258,7 +258,7 @@ public:
static sal_uInt16 GetModalModeCount();
static sal_uInt16 GetDispatchLevel();
static sal_Bool AnyInput( sal_uInt16 nType = INPUT_ANY );
static sal_Bool AnyInput( sal_uInt16 nType = VCL_INPUT_ANY );
static sal_uLong GetLastInputInterval();
static sal_Bool IsUICaptured();

6
vcl/ios/source/app/salinst.cxx
View file

@ -521,15 +521,15 @@ void IosSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
bool IosSalInstance::AnyInput( sal_uInt16 nType )
{
if( nType & INPUT_APPEVENT )
if( nType & VCL_INPUT_APPEVENT )
{
if( ! aAppEventList.empty() )
return true;
if( nType == INPUT_APPEVENT )
if( nType == VCL_INPUT_APPEVENT )
return false;
}
if( nType & INPUT_TIMER )
if( nType & VCL_INPUT_TIMER )
{
if( IosSalTimer::pRunningTimer )
{

9
vcl/unx/generic/app/salinst.cxx
View file

@ -131,13 +131,13 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char *pData )
case Expose:
case GraphicsExpose:
case NoExpose:
nType = INPUT_PAINT;
nType = VCL_INPUT_PAINT;
break;
default:
nType = 0;
}
if ( (nType & pPre->nType) || ( ! nType && (pPre->nType & INPUT_OTHER) ) )
if ( (nType & pPre->nType) || ( ! nType && (pPre->nType & VCL_INPUT_OTHER) ) )
pPre->bRet = sal_True;
return False;
@ -150,10 +150,9 @@ bool X11SalInstance::AnyInput(sal_uInt16 nType)
Display *pDisplay = pData->GetSalDisplay()->GetDisplay();
sal_Bool bRet = sal_False;
if( (nType & INPUT_TIMER) && mpXLib->CheckTimeout( false ) )
{
if( (nType & VCL_INPUT_TIMER) && mpXLib->CheckTimeout( false ) )
bRet = sal_True;
}
else if (XPending(pDisplay) )
{
PredicateReturn aInput;

10
vcl/unx/gtk/app/gtkinst.cxx
View file

@ -252,10 +252,10 @@ extern "C" {
case Expose:
case GraphicsExpose:
case NoExpose:
nType = INPUT_PAINT;
nType = VCL_INPUT_PAINT;
break;
default:
nType = INPUT_OTHER;
nType = VCL_INPUT_OTHER;
break;
}
((GtkInstance *)data)->addEvent( nType );
@ -284,10 +284,10 @@ extern "C" {
nType = VCL_INPUT_KEYBOARD;
break;
case GDK_EXPOSE:
nType = INPUT_PAINT;
nType = VCL_INPUT_PAINT;
break;
default:
nType = INPUT_OTHER;
nType = VCL_INPUT_OTHER;
break;
}
((GtkInstance *)data)->subtractEvent( nType );
@ -614,7 +614,7 @@ bool GtkInstance::IsTimerExpired()
bool GtkInstance::AnyInput( sal_uInt16 nType )
{
if( (nType & INPUT_TIMER) && IsTimerExpired() )
if( (nType & VCL_INPUT_TIMER) && IsTimerExpired() )
return true;
else
{

10
vcl/win/source/app/salinst.cxx
View file

@ -904,7 +904,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType )
{
MSG aMsg;
if ( (nType & (INPUT_ANY)) == (INPUT_ANY) )
if ( (nType & (VCL_INPUT_ANY)) == (VCL_INPUT_ANY) )
{
// revert bugfix for #108919# which never reported timeouts when called from the timer handler
// which made the application completely unresponsive during background formatting
@ -913,7 +913,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType )
}
else
{
if ( nType & INPUT_MOUSE )
if ( nType & VCL_INPUT_MOUSE )
{
// Test for mouse input
if ( ImplPeekMessage( &aMsg, 0, WM_MOUSEFIRST, WM_MOUSELAST,
@ -936,7 +936,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType )
}
}
if ( nType & INPUT_PAINT )
if ( nType & VCL_INPUT_PAINT )
{
// Test for paint input
if ( ImplPeekMessage( &aMsg, 0, WM_PAINT, WM_PAINT,
@ -960,7 +960,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType )
return true;
}
if ( nType & INPUT_TIMER )
if ( nType & VCL_INPUT_TIMER )
{
// Test for timer input
if ( ImplPeekMessage( &aMsg, 0, WM_TIMER, WM_TIMER,
@ -969,7 +969,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType )
}
if ( nType & INPUT_OTHER )
if ( nType & VCL_INPUT_OTHER )
{
// Test for any input
if ( ImplPeekMessage( &aMsg, 0, 0, 0, PM_NOREMOVE | PM_NOYIELD ) )