Tag: cws_src680_codecleanup01 User: mt Date: 05/10/07 18:25:32 Modified: /dba/dbaccess/source/ui/dlg/ odbcconfig.cxx
Log: RESYNC: (1.12-1.14); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: odbcconfig.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/odbcconfig.cxx?r1=1.12.160.1&r2=1.12.160.2 Delta lines: +34 -48 --------------------- --- odbcconfig.cxx 26 Jul 2005 12:40:52 -0000 1.12.160.1 +++ odbcconfig.cxx 8 Oct 2005 01:25:29 -0000 1.12.160.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_ODBC_CONFIG_HXX_ @@ -71,7 +45,9 @@ #ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> #endif - +#ifndef _TOOLS_DEBUG_HXX +#include <tools/debug.hxx> +#endif #ifdef HAVE_ODBC_SUPPORT @@ -143,10 +119,13 @@ //========================================================================= //= OOdbcLibWrapper //========================================================================= +DBG_NAME(OOdbcLibWrapper) //------------------------------------------------------------------------- OOdbcLibWrapper::OOdbcLibWrapper() :m_pOdbcLib(NULL) { + DBG_CTOR(OOdbcLibWrapper,NULL); + } //------------------------------------------------------------------------- @@ -182,6 +161,8 @@ OOdbcLibWrapper::~OOdbcLibWrapper() { unload(); + + DBG_DTOR(OOdbcLibWrapper,NULL); } //========================================================================= @@ -196,6 +177,7 @@ void* pDummy; #endif }; +DBG_NAME(OOdbcEnumeration) //------------------------------------------------------------------------- OOdbcEnumeration::OOdbcEnumeration() #ifdef HAVE_ODBC_SUPPORT @@ -205,6 +187,8 @@ ,m_pImpl(new OdbcTypesImpl) #endif { + DBG_CTOR(OOdbcEnumeration,NULL); + sal_Bool bLoaded = load(ODBC_LIBRARY); #ifdef ODBC_LIBRARY_1 if ( !bLoaded ) @@ -235,6 +219,8 @@ { freeEnv(); delete m_pImpl; + + DBG_DTOR(OOdbcEnumeration,NULL); } //------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
