User: obo     
Date: 2007/01/25 04:00:03

Modified:
   dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx

Log:
 INTEGRATION: CWS dba22c (1.20.14); FILE MERGED
 2007/01/08 10:55:53 oj 1.20.14.2: #137758# autotimer stoped when visible state 
changed
 2007/01/04 11:17:07 oj 1.20.14.1: #137758# guess fix for timer problem

File Changes:

Directory: /dba/dbaccess/source/ui/app/
=======================================

File [changed]: AppDetailPageHelper.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.20&r2=1.21
Delta lines:  +10 -2
--------------------
--- AppDetailPageHelper.cxx     1 Dec 2006 17:29:53 -0000       1.20
+++ AppDetailPageHelper.cxx     25 Jan 2007 12:00:00 -0000      1.21
@@ -332,8 +332,10 @@
        {
                if ( m_pLists[i] )
                {
+            m_pLists[i]->clearCurrentSelectionEntry();
                        m_pLists[i]->Hide();
-                       ::std::auto_ptr<Window> aTemp(m_pLists[i]);
+                       ::std::auto_ptr<DBTreeListBox> aTemp(m_pLists[i]);
+            m_pLists[i]->clearCurrentSelectionEntry();
                        m_pLists[i] = NULL;
                }
 
@@ -680,12 +682,18 @@
                pCurrent->Hide();
 
        showPreview(NULL);
+    BOOL bHasFocus = FALSE;
        m_aFL.Show();
+    {
+        bHasFocus = pCurrent->HasChildPathFocus();
        _pWindow->Show();
+    }
        m_aTBPreview.Show();
        m_aBorder.Show();
        switchPreview(m_ePreviewMode,TRUE);
 
+    if ( bHasFocus )
+        _pWindow->GrabFocus();
        Resize();
 }
 // 
-----------------------------------------------------------------------------




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to