User: hr Date: 2007-09-26 14:51:49+0000 Modified: dba/dbaccess/source/ui/misc/WCopyTable.cxx
Log: INTEGRATION: CWS dba24a (1.52.18); FILE MERGED 2007/09/05 11:05:14 oj 1.52.18.2: #i68334# renaming 2007/07/23 11:59:03 fs 1.52.18.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]: WCopyTable.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WCopyTable.cxx?r1=1.52&r2=1.53 Delta lines: +26 -15 --------------------- --- WCopyTable.cxx 2007-07-06 08:35:06+0000 1.52 +++ WCopyTable.cxx 2007-09-26 14:51:47+0000 1.53 @@ -186,6 +186,8 @@ m_sSourceName = ::dbtools::composeTableName( m_xConnection->getMetaData(), m_xSourceObject, ::dbtools::eInDataManipulation, false, false, false ); else _xSourceObject->getPropertyValue(PROPERTY_NAME) >>= m_sSourceName; + } + if ( m_xSourceConnection == m_xConnection ) { Reference<XTablesSupplier> xSup(m_xConnection,UNO_QUERY_THROW); @@ -194,11 +196,11 @@ else m_sName = m_sSourceName; } - } catch(const Exception&) { m_sName = m_sSourceName; } + } // ----------------------------------------------------------------------------- OCopyTableWizard::OCopyTableWizard(Window * pParent, @@ -654,13 +656,13 @@ // Bei Add duerfen nur die leeren Zeilen editierbar sein. // Bei Add und Drop koennen alle Zeilen editiert werden. Sequence< ::rtl::OUString> aColumns = xColumns->getElementNames(); - const ::rtl::OUString* pBegin = aColumns.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aColumns.getLength(); + const ::rtl::OUString* pIter = aColumns.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aColumns.getLength(); - for(;pBegin != pEnd;++pBegin) + for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xColumn; - xColumns->getByName(*pBegin) >>= xColumn; + xColumns->getByName(*pIter) >>= xColumn; sal_Int32 nType = 0; sal_Int32 nScale = 0; @@ -914,19 +916,20 @@ } if(m_xDestObject.is()) { + xSuppDestinationColumns.set( m_xDestObject, UNO_QUERY_THROW ); // insert new table name into table filter ::dbaui::appendToFilter(m_xConnection,m_sName,GetFactory(),this); // set column mappings Reference<XNameAccess> xNameAccess = xSuppDestinationColumns->getColumns(); Sequence< ::rtl::OUString> aSeq = xNameAccess->getElementNames(); - const ::rtl::OUString* pBegin = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aSeq.getLength(); + const ::rtl::OUString* pIter = aSeq.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); ::std::vector<int> aAlreadyFound(m_vColumnPos.size(),0); - for(sal_Int32 nNewPos=1;pBegin != pEnd;++pBegin,++nNewPos) + for(sal_Int32 nNewPos=1;pIter != pEnd;++pIter,++nNewPos) { - ODatabaseExport::TColumns::iterator aDestIter = m_vDestColumns.find(*pBegin); + ODatabaseExport::TColumns::iterator aDestIter = m_vDestColumns.find(*pIter); if ( aDestIter != m_vDestColumns.end() ) { @@ -1203,4 +1206,12 @@ aMsg.Execute(); } // ----------------------------------------------------------------------------- +//------dyf add +void OCopyTableWizard::ResetsName(const ::rtl::OUString & _sName) +{ + if ( _sName.getLength() != 0 ) + m_sName = _sName; +} +//------dyf add end +//------------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
