Tag: cws_src680_dba24c User: fs Date: 2007-09-28 22:04:21+0000 Modified: dba/connectivity/source/parse/sqlbison.y dba/connectivity/source/parse/sqlnode.cxx
Log: #i10000# File Changes: Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: sqlbison.y Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlbison.y?r1=1.57.18.2&r2=1.57.18.3 Delta lines: +2 -25 -------------------- --- sqlbison.y 2007-09-28 19:17:51+0000 1.57.18.2 +++ sqlbison.y 2007-09-28 22:04:18+0000 1.57.18.3 @@ -1,7 +1,7 @@ %{ //-------------------------------------------------------------------------- // -// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.57.18.2 2007/09/28 19:17:51 fs Exp $ +// $Header: /cvs/dba/connectivity/source/parse/sqlbison.y,v 1.57.18.3 2007/09/28 22:04:18 fs Exp $ // // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. // @@ -9,7 +9,7 @@ // OJ // // Last change: -// $Author: fs $ $Date: 2007/09/28 19:17:51 $ $Revision: 1.57.18.2 $ +// $Author: fs $ $Date: 2007/09/28 22:04:18 $ $Revision: 1.57.18.3 $ // // Description: // @@ -3354,29 +3354,6 @@ { xxx_pGLOBAL_SQLPARSER = _pParser; } -//----------------------------------------------------------------------------- -OSQLParser::~OSQLParser() -{ - { - ::osl::MutexGuard aGuard(getMutex()); - OSL_ENSURE(s_nRefCount > 0, "OSQLParser::~OSQLParser() : suspicious call : have a refcount of 0 !"); - if (!--s_nRefCount) - { - s_pScanner->setScanner(sal_True); - delete s_pScanner; - s_pScanner = NULL; - - delete s_pGarbageCollector; - s_pGarbageCollector = NULL; - // is only set the first time so we should delete it only when there no more instances - s_xLocaleData = NULL; - - RuleIDMap aEmpty; - s_aReverseRuleIDLookup.swap( aEmpty ); - } - m_pParseTree = NULL; - } -} // ------------------------------------------------------------------------- void OSQLParser::setParseTree(OSQLParseNode * pNewParseTree) { File [changed]: sqlnode.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlnode.cxx?r1=1.47.34.2&r2=1.47.34.3 Delta lines: +26 -3 -------------------- --- sqlnode.cxx 2007-09-28 19:17:57+0000 1.47.34.2 +++ sqlnode.cxx 2007-09-28 22:04:18+0000 1.47.34.3 @@ -4,9 +4,9 @@ * * $RCSfile: sqlnode.cxx,v $ * - * $Revision: 1.47.34.2 $ + * $Revision: 1.47.34.3 $ * - * last change: $Author: fs $ $Date: 2007/09/28 19:17:57 $ + * last change: $Author: fs $ $Date: 2007/09/28 22:04:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1548,6 +1548,29 @@ m_pData->aLocale = m_pContext->getPreferredLocale(); } +//----------------------------------------------------------------------------- +OSQLParser::~OSQLParser() +{ + { + ::osl::MutexGuard aGuard(getMutex()); + OSL_ENSURE(s_nRefCount > 0, "OSQLParser::~OSQLParser() : suspicious call : have a refcount of 0 !"); + if (!--s_nRefCount) + { + s_pScanner->setScanner(sal_True); + delete s_pScanner; + s_pScanner = NULL; + + delete s_pGarbageCollector; + s_pGarbageCollector = NULL; + // is only set the first time so we should delete it only when there no more instances + s_xLocaleData = NULL; + + RuleIDMap aEmpty; + s_aReverseRuleIDLookup.swap( aEmpty ); + } + m_pParseTree = NULL; + } +} // ----------------------------------------------------------------------------- void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
