User: vg Date: 05/03/11 03:00:26 Modified: /dba/dbaccess/source/filter/migration/ cfgimport.cxx
Log: INTEGRATION: CWS lobeta2 (1.4.48); FILE MERGED 2005/02/24 21:17:09 mba 1.4.48.1: #i43232#: avoid exception on when inserting existing table File Changes: Directory: /dba/dbaccess/source/filter/migration/ ================================================= File [changed]: cfgimport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/migration/cfgimport.cxx?r1=1.6&r2=1.7 Delta lines: +57 -57 --------------------- --- cfgimport.cxx 10 Mar 2005 16:38:30 -0000 1.6 +++ cfgimport.cxx 11 Mar 2005 11:00:24 -0000 1.7 @@ -640,7 +640,6 @@ aURL.setExtension(sExtension); sFileName = aURL.GetMainURL(INetURLObject::NO_DECODE); } - m_xModel->attachResource(sFileName,Sequence<PropertyValue>()); } catch(Exception&) @@ -878,6 +877,7 @@ Reference<XNameContainer> xTables(xSupplier->getTables(),UNO_QUERY); ::rtl::OUString sName; m_xCurrentObject->getPropertyValue(PROPERTY_NAME) >>= sName; + if ( !xTables->hasByName(sName) ) xTables->insertByName(sName,makeAny(m_xCurrentObject)); m_xCurrentObject = NULL; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
