diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-03-26 11:07:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-03-26 11:07:03 +0000 |
| commit | 290cc577dca29804393e4bcfccdb25d0b15b887b (patch) | |
| tree | 34a18172b52240077b0b1f5f934f565d07676f7b /automation | |
| parent | 4754443b44db70fe4b0ef1a39b8ca1362675eafc (diff) | |
INTEGRATION: CWS gh3 (1.3.2.1.6); FILE MERGED
2003/03/19 14:54:30 gh 1.3.2.1.6.4: small fix for wnt
2003/03/18 11:36:17 gh 1.3.2.1.6.3: added debug code
2003/02/26 17:45:09 gh 1.3.2.1.6.2: #107741#don't try to close hidden windows in ResetApplication
2003/02/13 09:57:21 gh 1.3.2.1.6.1: #100876#call CheckButtonHdl() to propagate changes
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/source/server/statemnt.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 21c1fd9b9426..027ef84ba740 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: statemnt.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-03-18 16:03:47 $ + * last change: $Author: vg $ $Date: 2003-03-26 12:07:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2264,7 +2264,7 @@ Window* StatementCommand::GetNextRecoverWin() { // zuerst weitere Fenster auf dem Fenster suchen und schliessen pControl = GetNextOverlap( pBase ); - if ( pControl && !IsFirstDocWin( pControl ) && !IsIMEWin( pControl ) ) + if ( pControl && pControl->IsVisible() && !IsFirstDocWin( pControl ) && !IsIMEWin( pControl ) ) { /* Window *pDock = GetWinByRT( pControl, WINDOW_DOCKINGWINDOW, FALSE ); if ( pDock ) @@ -2276,7 +2276,7 @@ Window* StatementCommand::GetNextRecoverWin() // dann das Fenster selbst Schliessen // erstes DocWin berspringen // Assumption that Doc Windows are Borderwindows and ButtonDialog and such are not - if ( !IsFirstDocWin( pBase ) && pBase->GetType() != WINDOW_BORDERWINDOW && !IsIMEWin( pBase ) ) + if ( pBase->IsVisible() && !IsFirstDocWin( pBase ) && pBase->GetType() != WINDOW_BORDERWINDOW && !IsIMEWin( pBase ) ) return pBase; pBase = Application::GetNextTopLevelWindow( pBase ); @@ -3198,7 +3198,7 @@ BOOL StatementCommand::Execute() #endif // The Count is only larger than 2 is the path is a directory which is not empty // the Count of 2 results from the "." and ".." directory - if ( Dir( aDestPath, FSYS_KIND_FILE | FSYS_KIND_DIR ).Count() > 2 ) + if ( Dir( aDestPath, FSYS_KIND_FILE | FSYS_KIND_DIR | FSYS_KIND_DEV | FSYS_KIND_BLOCK ).Count() > 2 ) DirectLog( S_QAError, GEN_RES_STR1( S_DIRECTORY_NOT_EMPTY, aDestPath.GetFull() ) ); SotStorageRef xStorage = new SotStorage( aFileName, STREAM_STD_READ ); @@ -5310,16 +5310,16 @@ USHORT nValidTextItemCount = 0;\ pRet->GenReturn ( RET_Value, nUId, ULONG( pItem->GetButtonFlags() & ~SV_STATE_MASK )); break; case M_Check : - pItem->SetStateChecked(); - pTree->InvalidateEntry( pThisEntry ); + pTree->SetCheckButtonState( pThisEntry, SV_BUTTON_CHECKED ); + pTree->CheckButtonHdl(); break; case M_UnCheck : - pItem->SetStateUnchecked(); - pTree->InvalidateEntry( pThisEntry ); + pTree->SetCheckButtonState( pThisEntry, SV_BUTTON_UNCHECKED ); + pTree->CheckButtonHdl(); break; case M_TriState : - pItem->SetStateTristate(); - pTree->InvalidateEntry( pThisEntry ); + pTree->SetCheckButtonState( pThisEntry, SV_BUTTON_TRISTATE ); + pTree->CheckButtonHdl(); break; default: ReportError( nUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); |