diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-26 13:51:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-26 13:51:22 +0000 |
| commit | d736eef49512ee4623c7fe8d8b6fcb09669df7f8 (patch) | |
| tree | 0570a7347fadf71d97da2b2ce1161bb5cd9b8d28 /dbaccess/source/ui/misc/TokenWriter.cxx | |
| parent | 74b07f5dd97e34c1462b3183ff1eb6b67b7eb071 (diff) | |
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: dyf@openoffice.org
Reviewed by: frank.schoenheit@sun.com
Diffstat (limited to 'dbaccess/source/ui/misc/TokenWriter.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/TokenWriter.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index ac8b43750ddc..86a354451c4f 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TokenWriter.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: rt $ $Date: 2007-07-24 12:10:12 $ + * last change: $Author: hr $ $Date: 2007-09-26 14:51:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -180,6 +180,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor& 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 @@ void ODatabaseImportExport::disposing() ::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 @@ BOOL OHTMLImportExport::Read() ((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; |