User: hr Date: 2007-09-26 14:51:24+0000 Modified: dba/dbaccess/source/ui/misc/TokenWriter.cxx
Log: INTEGRATION: CWS dba24a (1.32.16); FILE MERGED 2007/08/30 09:04:15 oj 1.32.16.3: #i68334# decrement refcount 2007/08/13 05:31:37 oj 1.32.16.2: RESYNC: (1.32-1.33); FILE MERGED 2007/07/23 11:59:03 fs 1.32.16.1: when pasting tables, use a meaningful default in the wizard, as indicated by the current selection Issue number: #i18907# Submitted by: [EMAIL PROTECTED] Reviewed by: [EMAIL PROTECTED] File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: TokenWriter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/TokenWriter.cxx?r1=1.33&r2=1.34 Delta lines: +9 -4 ------------------- --- TokenWriter.cxx 2007-07-24 12:10:12+0000 1.33 +++ TokenWriter.cxx 2007-09-26 14:51:22+0000 1.34 @@ -180,6 +180,7 @@ for(xub_StrLen i=SBA_FORMAT_SELECTION_COUNT;i<nCount;++i) m_pRowMarker[i-SBA_FORMAT_SELECTION_COUNT] = rExchange.GetToken(i,char(11)).ToInt32(); } + osl_decrementInterlockedCount( &m_refCount ); } // ----------------------------------------------------------------------------- // import data @@ -223,10 +224,11 @@ ::comphelper::disposeComponent(m_xRow); - m_xObject = NULL; - m_xResultSetMetaData = NULL; - m_xResultSet = NULL; - m_xRow = NULL; + m_xObject.clear(); + m_xResultSetMetaData.clear(); + m_xResultSet.clear(); + m_xRow.clear(); + m_xFormatter.clear(); m_aKeepModelAlive.clear(); } @@ -730,6 +732,9 @@ ((OHTMLReader*)m_pReader)->AddRef(); if ( isCheckEnabled() ) m_pReader->enableCheckOnly(); + //dyf add 20070601 + m_pReader->SetTableName(m_sDefaultTableName); + //dyf add end eState = ((OHTMLReader*)m_pReader)->CallParser(); m_pReader->release(); m_pReader = NULL; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
