Skip to content

C
core
Kaydet (Commit) 83015227 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

WaE: single value used to multiplex two different things

üst b26292e3
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 25 deletions
automation/source/server/statemnt.cxx
Dosyayı görüntüle @ 83015227
...@@ -674,12 +674,13 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, sal_uInt16 Method ...@@ -674,12 +674,13 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, sal_uInt16 Method
, nNr2(0) , nNr2(0)
, nNr3(0) , nNr3(0)
, nNr4(0) , nNr4(0)
, nLNr1(0)
, aString1() , aString1()
, aString2() , aString2()
, bBool1(sal_False) , bBool1(sal_False)
, bBool2(sal_False) , bBool2(sal_False)
{ {
nLNr1_and_Pointer.pWindow = 0;
QueStatement( pAfterThis ); QueStatement( pAfterThis );
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
...@@ -708,12 +709,13 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) ...@@ -708,12 +709,13 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
, nNr2(0) , nNr2(0)
, nNr3(0) , nNr3(0)
, nNr4(0) , nNr4(0)
, nLNr1(0)
, aString1() , aString1()
, aString2() , aString2()
, bBool1(sal_False) , bBool1(sal_False)
, bBool2(sal_False) , bBool2(sal_False)
{ {
nLNr1_and_Pointer.pWindow = 0;
QueStatement( NULL ); QueStatement( NULL );
pCmdIn->Read( nMethodId ); pCmdIn->Read( nMethodId );
pCmdIn->Read( nParams ); pCmdIn->Read( nParams );
...@@ -722,7 +724,7 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) ...@@ -722,7 +724,7 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
if( nParams & PARAM_UINT16_2 ) pCmdIn->Read( nNr2 ); if( nParams & PARAM_UINT16_2 ) pCmdIn->Read( nNr2 );
if( nParams & PARAM_UINT16_3 ) pCmdIn->Read( nNr3 ); if( nParams & PARAM_UINT16_3 ) pCmdIn->Read( nNr3 );
if( nParams & PARAM_UINT16_4 ) pCmdIn->Read( nNr4 ); if( nParams & PARAM_UINT16_4 ) pCmdIn->Read( nNr4 );
if( nParams & PARAM_UINT32_1 ) pCmdIn->Read( nLNr1 ); if( nParams & PARAM_UINT32_1 ) pCmdIn->Read( nLNr1_and_Pointer.nLNr1 );
if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 ); if( nParams & PARAM_STR_1 ) pCmdIn->Read( aString1 );
if( nParams & PARAM_STR_2 ) pCmdIn->Read( aString2 ); if( nParams & PARAM_STR_2 ) pCmdIn->Read( aString2 );
if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 ); if( nParams & PARAM_BOOL_1 ) pCmdIn->Read( bBool1 );
...@@ -1368,18 +1370,18 @@ sal_Bool StatementCommand::DisplayHID() ...@@ -1368,18 +1370,18 @@ sal_Bool StatementCommand::DisplayHID()
if ( !(nParams & PARAM_UINT32_1) ) if ( !(nParams & PARAM_UINT32_1) )
{ {
if( GetTTSettings()->pDisplayHidWin ) // Nichts ver�ndern if( GetTTSettings()->pDisplayHidWin ) // Nichts ver�ndern
nLNr1 = GetTTSettings()->pDisplayHidWin->GetConfig(); nLNr1_and_Pointer.nLNr1 = GetTTSettings()->pDisplayHidWin->GetConfig();
else // Beim ersten Aufruf wollen wir alles richtig einstellen else // Beim ersten Aufruf wollen wir alles richtig einstellen
nLNr1 = DH_MODE_KURZNAME | DH_MODE_LANGNAME; nLNr1_and_Pointer.nLNr1 = DH_MODE_KURZNAME | DH_MODE_LANGNAME;
if( ((nParams & PARAM_BOOL_1) && bBool1) ) if( ((nParams & PARAM_BOOL_1) && bBool1) )
nLNr1 |= DH_MODE_SEND_DATA; nLNr1_and_Pointer.nLNr1 |= DH_MODE_SEND_DATA;
else else
nLNr1 &= ( ~DH_MODE_SEND_DATA ); nLNr1_and_Pointer.nLNr1 &= ( ~DH_MODE_SEND_DATA );
} }
if ( GetTTSettings()->pDisplayHidWin ) if ( GetTTSettings()->pDisplayHidWin )
GetTTSettings()->pDisplayHidWin->SetConfig( nLNr1 ); GetTTSettings()->pDisplayHidWin->SetConfig( nLNr1_and_Pointer.nLNr1 );
} }
if ( GetTTSettings()->pDisplayInstance && GetTTSettings()->pDisplayInstance != this ) if ( GetTTSettings()->pDisplayInstance && GetTTSettings()->pDisplayInstance != this )
...@@ -1394,8 +1396,8 @@ sal_Bool StatementCommand::DisplayHID() ...@@ -1394,8 +1396,8 @@ sal_Bool StatementCommand::DisplayHID()
GetTTSettings()->aOriginalCaption = GetTTSettings()->pDisplayHidWin->GetText(); GetTTSettings()->aOriginalCaption = GetTTSettings()->pDisplayHidWin->GetText();
GetTTSettings()->pDisplayHidWin->Show(); GetTTSettings()->pDisplayHidWin->Show();
if ( bBool1 ) if ( bBool1 )
nLNr1 |= DH_MODE_SEND_DATA; nLNr1_and_Pointer.nLNr1 |= DH_MODE_SEND_DATA;
GetTTSettings()->pDisplayHidWin->SetConfig( nLNr1 ); GetTTSettings()->pDisplayHidWin->SetConfig( nLNr1_and_Pointer.nLNr1 );
GetTTSettings()->Old = NULL; GetTTSettings()->Old = NULL;
GetTTSettings()->Act = NULL; GetTTSettings()->Act = NULL;
...@@ -1996,7 +1998,7 @@ void TranslateWin::EnableTranslation() ...@@ -1996,7 +1998,7 @@ void TranslateWin::EnableTranslation()
void StatementCommand::Translate() void StatementCommand::Translate()
{ {
// Es wurde eine initale UniqueId mitgegeben. Dann nur die dopelten Shortcuts liefern // Es wurde eine initale UniqueId mitgegeben. Dann nur die dopelten Shortcuts liefern
if( (nParams & PARAM_STR_1) && nLNr1 ) if( (nParams & PARAM_STR_1) && nLNr1_and_Pointer.nLNr1 )
{ {
String aDouble; String aDouble;
Window *pWin = SearchTree( Str2Id( aString1 ) ,sal_False ); Window *pWin = SearchTree( Str2Id( aString1 ) ,sal_False );
...@@ -2244,10 +2246,10 @@ sal_Bool StatementCommand::Execute() ...@@ -2244,10 +2246,10 @@ sal_Bool StatementCommand::Execute()
case RC_AppDelay: case RC_AppDelay:
if ( !bBool1 ) if ( !bBool1 )
{ {
nLNr1 = Time().GetTime() + nNr1/10; nLNr1_and_Pointer.nLNr1 = Time().GetTime() + nNr1/10;
bBool1 = sal_True; bBool1 = sal_True;
} }
if ( Time().GetTime() < sal_Int32(nLNr1) ) // Aktuelle Zeit kleiner Endzeit if ( Time().GetTime() < sal_Int32(nLNr1_and_Pointer.nLNr1) ) // Aktuelle Zeit kleiner Endzeit
return sal_False; return sal_False;
break; break;
case RC_DisplayHid: case RC_DisplayHid:
...@@ -2261,7 +2263,7 @@ sal_Bool StatementCommand::Execute() ...@@ -2261,7 +2263,7 @@ sal_Bool StatementCommand::Execute()
nRetryCount = 150; // das sollte reichen. nRetryCount = 150; // das sollte reichen.
bBool1 = sal_True; // Nur beim ersten mal! bBool1 = sal_True; // Nur beim ersten mal!
nNr1 = 1; // Welcher Button ist dran? nNr1 = 1; // Welcher Button ist dran?
nLNr1 = 0; // Speichern des AppWin nLNr1_and_Pointer.pWindow = 0; // Speichern des AppWin
aString1 = UniString(); // Liste der geschlossenen Fenster aString1 = UniString(); // Liste der geschlossenen Fenster
// So da� nacher auch wieder alles auf Default steht // So da� nacher auch wieder alles auf Default steht
...@@ -2396,9 +2398,9 @@ sal_Bool StatementCommand::Execute() ...@@ -2396,9 +2398,9 @@ sal_Bool StatementCommand::Execute()
((DockingWindow*)pControl)->Close(); ((DockingWindow*)pControl)->Close();
// Eigentlich nur bei TaskWindows! Hoffen wir mal, da� keine anderen DockingWindows dazwischen hauen. // Eigentlich nur bei TaskWindows! Hoffen wir mal, da� keine anderen DockingWindows dazwischen hauen.
if ( (Window*)nLNr1 != pControl ) if ( nLNr1_and_Pointer.pWindow != pControl )
nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
nLNr1 = (sal_uLong)pControl; nLNr1_and_Pointer.pWindow = pControl;
return sal_False; return sal_False;
} }
...@@ -2425,9 +2427,9 @@ sal_Bool StatementCommand::Execute() ...@@ -2425,9 +2427,9 @@ sal_Bool StatementCommand::Execute()
pMenu->GetCloserHdl().Call( pMenu ); pMenu->GetCloserHdl().Call( pMenu );
// nur bei TaskWindows! // nur bei TaskWindows!
if ( (Window*)nLNr1 != pControl ) if ( nLNr1_and_Pointer.pWindow != pControl )
nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
nLNr1 = (sal_uLong)pControl; nLNr1_and_Pointer.pWindow = pControl;
return sal_False; return sal_False;
} }
...@@ -2441,9 +2443,9 @@ sal_Bool StatementCommand::Execute() ...@@ -2441,9 +2443,9 @@ sal_Bool StatementCommand::Execute()
((SystemWindow*)pControl)->Close(); ((SystemWindow*)pControl)->Close();
// Eigentlich nur bei TaskWindows! // Eigentlich nur bei TaskWindows!
if ( (Window*)nLNr1 != pControl ) if ( nLNr1_and_Pointer.pWindow != pControl )
nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
nLNr1 = (sal_uLong)pControl; nLNr1_and_Pointer.pWindow = pControl;
return sal_False; return sal_False;
} }
...@@ -2454,10 +2456,10 @@ sal_Bool StatementCommand::Execute() ...@@ -2454,10 +2456,10 @@ sal_Bool StatementCommand::Execute()
// E.g.: Floating toolbars on a Task which was hidden by another Task before // E.g.: Floating toolbars on a Task which was hidden by another Task before
if ( !bBool2 ) if ( !bBool2 )
{ {
nLNr1 = Time().GetTime() + 100; // 100 = 1 Second nLNr1_and_Pointer.nLNr1 = Time().GetTime() + 100; // 100 = 1 Second
bBool2 = sal_True; bBool2 = sal_True;
} }
if ( Time().GetTime() < sal_Int32(nLNr1) ) // Aktuelle Zeit kleiner Endzeit if ( Time().GetTime() < sal_Int32(nLNr1_and_Pointer.nLNr1) ) // Aktuelle Zeit kleiner Endzeit
return sal_False; return sal_False;
else else
pRet->GenReturn ( RET_Value, nMethodId, aString1); pRet->GenReturn ( RET_Value, nMethodId, aString1);
...@@ -2469,7 +2471,7 @@ sal_Bool StatementCommand::Execute() ...@@ -2469,7 +2471,7 @@ sal_Bool StatementCommand::Execute()
nNr1 = 1000; // defaults to 1000 = 1 Sec. nNr1 = 1000; // defaults to 1000 = 1 Sec.
if ( !bBool1 ) if ( !bBool1 )
{ {
nLNr1 = Time().GetTime() + nNr1/10; nLNr1_and_Pointer.nLNr1 = Time().GetTime() + nNr1/10;
bBool1 = sal_True; bBool1 = sal_True;
} }
...@@ -2477,7 +2479,7 @@ sal_Bool StatementCommand::Execute() ...@@ -2477,7 +2479,7 @@ sal_Bool StatementCommand::Execute()
pRet->GenReturn ( RET_Value, nMethodId, comm_UINT16(CONST_WSFinished) ); pRet->GenReturn ( RET_Value, nMethodId, comm_UINT16(CONST_WSFinished) );
else else
{ {
if ( Time().GetTime() < sal_Int32(nLNr1) ) // Aktuelle Zeit kleiner Endzeit if ( Time().GetTime() < sal_Int32(nLNr1_and_Pointer.nLNr1) ) // Aktuelle Zeit kleiner Endzeit
return sal_False; return sal_False;
pRet->GenReturn ( RET_Value, nMethodId, comm_UINT16(CONST_WSTimeout) ); pRet->GenReturn ( RET_Value, nMethodId, comm_UINT16(CONST_WSTimeout) );
} }
......
automation/source/server/statemnt.hxx
Dosyayı görüntüle @ 83015227
...@@ -330,6 +330,12 @@ public: ...@@ -330,6 +330,12 @@ public:
StatementUnoSlot(SCmdStream *pIn); StatementUnoSlot(SCmdStream *pIn);
}; };
union munge
{
comm_UINT32 nLNr1;
Window *pWindow;
};
class StatementCommand : public StatementList // Befehl ausf�hren (wintree, resetaplication ...) class StatementCommand : public StatementList // Befehl ausf�hren (wintree, resetaplication ...)
{ {
friend class ImplRemoteControl; friend class ImplRemoteControl;
...@@ -337,7 +343,7 @@ protected: ...@@ -337,7 +343,7 @@ protected:
sal_uInt16 nMethodId; sal_uInt16 nMethodId;
sal_uInt16 nParams; sal_uInt16 nParams;
comm_UINT16 nNr1,nNr2,nNr3,nNr4; comm_UINT16 nNr1,nNr2,nNr3,nNr4;
comm_UINT32 nLNr1; munge nLNr1_and_Pointer;
String aString1,aString2; String aString1,aString2;
sal_Bool bBool1,bBool2; sal_Bool bBool1,bBool2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment