Tag: cws_src680_dba201 User: oj Date: 05/04/25 01:18:37 Modified: /dba/dbaccess/source/ui/control/ FieldDescControl.cxx /dba/dbaccess/source/ui/inc/ FieldDescControl.hxx
Log: #i46269# remove field desc control from task list File Changes: Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: FieldDescControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/FieldDescControl.cxx?r1=1.38&r2=1.38.42.1 Delta lines: +17 -5 -------------------- --- FieldDescControl.cxx 17 Feb 2005 11:07:04 -0000 1.38 +++ FieldDescControl.cxx 25 Apr 2005 08:18:33 -0000 1.38.42.1 @@ -2,9 +2,9 @@ * * $RCSfile: FieldDescControl.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.38.42.1 $ * - * last change: $Author: vg $ $Date: 2005/02/17 11:07:04 $ + * last change: $Author: oj $ $Date: 2005/04/25 08:18:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -265,6 +265,7 @@ ,m_pActFocusWindow(NULL) ,m_bRight(sal_False) ,m_nWidth(50) + ,m_bAdded(sal_False) { DBG_CTOR(OFieldDescControl,NULL); @@ -325,6 +326,7 @@ ,m_pActFocusWindow(NULL) ,m_bRight(sal_False) ,m_nWidth(50) + ,m_bAdded(sal_False) { DBG_CTOR(OFieldDescControl,NULL); @@ -360,6 +362,8 @@ ::std::auto_ptr<Window> aTemp(m_pHorzScroll); m_pHorzScroll = NULL; } + if ( m_bAdded ) + ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); pLastFocusWindow = NULL; ////////////////////////////////////////////////////////////////////// @@ -1530,11 +1534,19 @@ ////////////////////////////////////////////////////////////////////// // Zeiger des gespeicherten Focus zuruecksetzen pLastFocusWindow = NULL; + if ( m_bAdded ) + { ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); + m_bAdded = sal_False; + } return; } + if ( !m_bAdded ) + { ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::AddWindow)); + m_bAdded = sal_True; + } TOTypeInfoSP pFieldType; if( pFieldDescr ) Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: FieldDescControl.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/FieldDescControl.hxx?r1=1.12&r2=1.12.98.1 Delta lines: +4 -3 ------------------- --- FieldDescControl.hxx 27 Oct 2004 13:05:07 -0000 1.12 +++ FieldDescControl.hxx 25 Apr 2005 08:18:34 -0000 1.12.98.1 @@ -2,9 +2,9 @@ * * $RCSfile: FieldDescControl.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.98.1 $ * - * last change: $Author: pjunck $ $Date: 2004/10/27 13:05:07 $ + * last change: $Author: oj $ $Date: 2005/04/25 08:18:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,6 +168,7 @@ sal_Int32 m_nWidth; ULONG nDelayedGrabFocusEvent; + sal_Bool m_bAdded; DECL_LINK( OnScroll, ScrollBar*); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
