Tag: cws_src680_mdbdriver02 User: fridrich_strba Date: 05/10/27 06:44:21 Modified: /dba/dbaccess/source/ui/dlg/ detailpages.cxx
Log: RESYNC: (1.36-1.38); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: detailpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/detailpages.cxx?r1=1.36.96.1&r2=1.36.96.2 Delta lines: +49 -55 --------------------- --- detailpages.cxx 15 Aug 2005 13:56:04 -0000 1.36.96.1 +++ detailpages.cxx 27 Oct 2005 13:44:18 -0000 1.36.96.2 @@ -1,22 +1,20 @@ /************************************************************************* * + * OpenOffice.org - a multi-platform office productivity suite + * * $RCSfile$ * * $Revision$ * * last change: $Author$ $Date$ * - * The Contents of this file are made available subject to the terms of - * either of the following licenses - * - * - GNU Lesser General Public License Version 2.1 - * - Sun Industry Standards Source License Version 1.1 + * The Contents of this file are made available subject to + * the terms of GNU Lesser General Public License Version 2.1. * - * Sun Microsystems Inc., October, 2000 * * GNU Lesser General Public License Version 2.1 * ============================================= - * Copyright 2000 by Sun Microsystems, Inc. + * Copyright 2005 by Sun Microsystems, Inc. * 901 San Antonio Road, Palo Alto, CA 94303, USA * * This library is free software; you can redistribute it and/or @@ -33,30 +31,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * - * Sun Industry Standards Source License Version 1.1 - * ================================================= - * The contents of this file are subject to the Sun Industry Standards - * Source License Version 1.1 (the "License"); You may not use this file - * except in compliance with the License. You may obtain a copy of the - * License at http://www.openoffice.org/license.html. - * - * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, - * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. - * See the License for the specific provisions governing your rights and - * obligations concerning the Software. - * - * The Initial Developer of the Original Code is: Sun Microsystems, Inc.. - * - * Copyright: 2000 by Sun Microsystems, Inc. - * - * All Rights Reserved. - * - * Contributor(s): _______________________________________ - * - * ************************************************************************/ #ifndef _DBAUI_DETAILPAGES_HXX_ @@ -140,7 +114,8 @@ //======================================================================== //= OCommonBehaviourTabPage - //======================================================================== +DBG_NAME(OCommonBehaviourTabPage) +//======================================================================== OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, USHORT nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource) @@ -171,6 +146,8 @@ ,m_pBooleanComprisonMode(NULL) ,m_nControlFlags(nControlFlags) { + DBG_CTOR(OCommonBehaviourTabPage,NULL); + if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS) { m_pOptionsLabel = new FixedText(this, ResId(FT_OPTIONS)); @@ -344,6 +321,8 @@ DELETEZ(m_pAutoRetrievingEnabled); DELETEZ(m_pAutoRetrievingLabel); DELETEZ(m_pAutoRetrieving); + + DBG_DTOR(OCommonBehaviourTabPage,NULL); } //------------------------------------------------------------------------ IMPL_LINK( OCommonBehaviourTabPage, OnCheckBoxClick, CheckBox*, pCheckBox ) @@ -702,7 +681,8 @@ //======================================================================== //= ODbaseDetailsPage //======================================================================== - //------------------------------------------------------------------------ +DBG_NAME(ODbaseDetailsPage) +//------------------------------------------------------------------------ ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_DBASE, _rCoreAttrs, CBTP_USE_CHARSET ,false) ,m_aShowDeleted (this, ResId(CB_SHOWDELETEDROWS)) @@ -710,6 +690,8 @@ ,m_aFT_Message (this, ResId( FT_SPECIAL_MESSAGE) ) ,m_aIndexes (this, ResId(PB_INDICIES)) { + DBG_CTOR(ODbaseDetailsPage,NULL); + m_aIndexes.SetClickHdl(LINK(this, ODbaseDetailsPage, OnButtonClicked)); m_aShowDeleted.SetClickHdl(LINK(this, ODbaseDetailsPage, OnButtonClicked)); @@ -722,6 +704,8 @@ // ----------------------------------------------------------------------- ODbaseDetailsPage::~ODbaseDetailsPage() { + + DBG_DTOR(ODbaseDetailsPage,NULL); } // ----------------------------------------------------------------------- @@ -800,15 +784,20 @@ //======================================================================== //= OAdoDetailsPage - //======================================================================== +DBG_NAME(OAdoDetailsPage) +//======================================================================== OAdoDetailsPage::OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_ADO, _rCoreAttrs, CBTP_USE_CHARSET ) { + DBG_CTOR(OAdoDetailsPage,NULL); + } // ----------------------------------------------------------------------- OAdoDetailsPage::~OAdoDetailsPage() { + + DBG_DTOR(OAdoDetailsPage,NULL); } // ----------------------------------------------------------------------- SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet ) @@ -1387,10 +1376,13 @@ //======================================================================== //= OTextDetailsPage //======================================================================== - //------------------------------------------------------------------------ +DBG_NAME(OTextDetailsPage) +//------------------------------------------------------------------------ OTextDetailsPage::OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_TEXT, _rCoreAttrs, CBTP_USE_CHARSET ,false) { + DBG_CTOR(OTextDetailsPage,NULL); + m_pTextConnectionHelper = new OTextConnectionHelper(this, PAGE_TEXT); // m_pCharset->SetZOrder(&m_aExtension, WINDOW_ZORDER_BEHIND); FreeResource(); @@ -1400,6 +1392,8 @@ OTextDetailsPage::~OTextDetailsPage() { DELETEZ(m_pTextConnectionHelper); + + DBG_DTOR(OTextDetailsPage,NULL); } // ----------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
