User: obo     
Date: 2006/07/10 07:28:45

Modified:
   dba/connectivity/source/drivers/hsqldb/HUsers.cxx

Log:
 INTEGRATION: CWS qiq (1.3.104); FILE MERGED
 2006/06/27 14:28:05 fs 1.3.104.2: RESYNC: (1.3-1.4); FILE MERGED
 2006/06/16 11:32:33 fs 1.3.104.1: 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)

File Changes:

Directory: /dba/connectivity/source/drivers/hsqldb/
===================================================

File [changed]: HUsers.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HUsers.cxx?r1=1.4&r2=1.5
Delta lines:  +5 -4
-------------------
--- HUsers.cxx  20 Jun 2006 01:31:29 -0000      1.4
+++ HUsers.cxx  10 Jul 2006 14:28:43 -0000      1.5
@@ -97,19 +97,18 @@
        m_pParent->refreshUsers();
 }
 // -------------------------------------------------------------------------
-Reference< XPropertySet > OUsers::createEmptyObject()
+Reference< XPropertySet > OUsers::createDescriptor()
 {
        OUserExtend* pNew = new OUserExtend(m_xConnection);
        return pNew;
 }
 // -------------------------------------------------------------------------
 // XAppend
-void OUsers::appendObject( const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, 
const Reference< XPropertySet >& descriptor )
 {
        ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("GRANT USAGE 
ON * TO ");
        ::rtl::OUString aQuote  = 
m_xConnection->getMetaData()->getIdentifierQuoteString(  );
-       ::rtl::OUString sUserName;
-       
descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))
 >>= sUserName;
+       ::rtl::OUString sUserName( _rForName );
        aSql += ::dbtools::quoteName(aQuote,sUserName)
                                + ::rtl::OUString::createFromAscii(" @\"%\" ");
        ::rtl::OUString sPassword;
@@ -125,6 +124,8 @@
        if(xStmt.is())
                xStmt->execute(aSql);
        ::comphelper::disposeComponent(xStmt);
+
+    return createObject( _rForName );
 }
 // -------------------------------------------------------------------------
 // XDrop




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to