User: obo Date: 2006/07/10 08:07:40 Modified: dba/dbaccess/source/core/api/viewcontainer.cxx
Log: INTEGRATION: CWS qiq (1.22.118); FILE MERGED 2006/06/27 11:59:41 fs 1.22.118.3: RESYNC: (1.22-1.23); FILE MERGED 2006/06/16 11:47:38 fs 1.22.118.2: during #i51143#: refactored VCollection: - createEmptyObject now named createDescriptor - cloneObject removed - appendObject now returns the newly created object (previously done via a subsequent call to cloneObject) 2006/05/24 06:40:22 fs 1.22.118.1: some refactoring of compose/quoteTableName and friends, in preparation of #i51143# File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: viewcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/viewcontainer.cxx?r1=1.23&r2=1.24 Delta lines: +6 -4 ------------------- --- viewcontainer.cxx 20 Jun 2006 02:42:19 -0000 1.23 +++ viewcontainer.cxx 10 Jul 2006 15:07:38 -0000 1.24 @@ -169,7 +169,7 @@ return xProp; } // ----------------------------------------------------------------------------- -Reference< XPropertySet > OViewContainer::createEmptyObject() +Reference< XPropertySet > OViewContainer::createDescriptor() { Reference< XPropertySet > xRet; // frist we have to look if the master tables does support this @@ -185,7 +185,7 @@ } // ----------------------------------------------------------------------------- // XAppend -void OViewContainer::appendObject( const Reference< XPropertySet >& descriptor ) +ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { // append the new table with a create stmt ::rtl::OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME)); @@ -201,7 +201,7 @@ else { ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE VIEW "); - ::rtl::OUString sComposedName = ::dbtools::composeTableName(m_xMetaData,descriptor,sal_True,::dbtools::eInTableDefinitions); + ::rtl::OUString sComposedName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); if(!sComposedName.getLength()) ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(static_cast<OFilteredContainer*>(this))); @@ -221,6 +221,8 @@ ::comphelper::disposeComponent(xStmt); } } + + return createObject( _rForName ); } // ------------------------------------------------------------------------- // XDrop @@ -240,7 +242,7 @@ xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; xTable->getPropertyValue(PROPERTY_NAME) >>= sTable; - ::dbtools::composeTableName(m_xMetaData,sCatalog,sSchema,sTable,sComposedName,sal_True,::dbtools::eInTableDefinitions); + sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); } if(!sComposedName.getLength()) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
