User: obo Date: 2006/07/10 08:36:10 Modified: dba/dbaccess/source/ui/misc/TableCopyHelper.cxx
Log: INTEGRATION: CWS qiq (1.6.10); FILE MERGED 2006/06/30 14:05:11 fs 1.6.10.3: warning-free 2006/06/27 12:45:29 fs 1.6.10.2: RESYNC: (1.6-1.7); FILE MERGED 2006/05/24 06:49:26 fs 1.6.10.1: some refactoring of compose/quoteTableName and friends, in preparation of #i51143# File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: TableCopyHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/TableCopyHelper.cxx?r1=1.7&r2=1.8 Delta lines: +5 -6 ------------------- --- TableCopyHelper.cxx 20 Jun 2006 03:20:36 -0000 1.7 +++ TableCopyHelper.cxx 10 Jul 2006 15:36:08 -0000 1.8 @@ -183,7 +183,7 @@ } ::rtl::OUString aSql(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT INTO "))); - ::rtl::OUString sComposedTableName = ::dbtools::composeTableName(_xMetaData,_xDestTable,sal_True,::dbtools::eInDataManipulation); + ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true ); aSql += sComposedTableName; aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ( ")); @@ -380,9 +380,7 @@ } sSql = sSql.replaceAt(sSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FROM ")); - sal_Bool bUseCatalogInSelect = ::dbtools::isDataSourcePropertyEnabled(_xSrcConnection,PROPERTY_USECATALOGINSELECT,sal_True); - sal_Bool bUseSchemaInSelect = ::dbtools::isDataSourcePropertyEnabled(_xSrcConnection,PROPERTY_USESCHEMAINSELECT,sal_True); - ::rtl::OUString sComposedName = ::dbtools::composeTableName(_xSrcConnection->getMetaData(),xSourceObject,sal_True,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); + ::rtl::OUString sComposedName = ::dbtools::composeTableNameForSelect( _xSrcConnection, xSourceObject ); sSql += sComposedName; xStmt = _xSrcConnection->createStatement(); if( xStmt.is() ) @@ -503,7 +501,7 @@ Reference<XConnection> xSrcConnection; Reference<XResultSet> xSrcRs; // the source resultset may be empty Sequence< Any > aSelection; - sal_Bool bBookmarkSelection; + sal_Bool bBookmarkSelection( sal_False ); ::rtl::OUString sCommand, sSrcDataSourceName = _rPasteData.getDataSource(); @@ -777,7 +775,8 @@ _rAsyncDrop.bHtml = bHtml; _rAsyncDrop.bError = !copyTagTable(_rAsyncDrop,sal_True,_xConnection); - if ( bRet = (!_rAsyncDrop.bError && _rAsyncDrop.aHtmlRtfStorage.Is()) ) + bRet = ( !_rAsyncDrop.bError && _rAsyncDrop.aHtmlRtfStorage.Is() ); + if ( bRet ) { // now we need to copy the stream ::utl::TempFile aTmp; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
