Tag: cws_src680_hsql1808 User: fs Date: 2007-10-20 12:21:45+0000 Modified: dba/connectivity/source/drivers/hsqldb/HDriver.cxx
Log: rename PermittedJavaClasses to PermittedJavaMethods, and make it an extensible group File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HDriver.cxx?r1=1.23.48.1.6.1&r2=1.23.48.1.6.2 Delta lines: +21 -8 -------------------- --- HDriver.cxx 2007-10-16 13:10:27+0000 1.23.48.1.6.1 +++ HDriver.cxx 2007-10-20 12:21:43+0000 1.23.48.1.6.2 @@ -4,9 +4,9 @@ * * $RCSfile: HDriver.cxx,v $ * - * $Revision: 1.23.48.1.6.1 $ + * $Revision: 1.23.48.1.6.2 $ * - * last change: $Author: fs $ $Date: 2007/10/16 13:10:27 $ + * last change: $Author: fs $ $Date: 2007/10/20 12:21:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -195,18 +195,31 @@ //-------------------------------------------------------------------- namespace { - ::rtl::OUString lcl_getPermittedJavaClasses_nothrow( const Reference< XMultiServiceFactory >& _rxORB ) + ::rtl::OUString lcl_getPermittedJavaMethods_nothrow( const Reference< XMultiServiceFactory >& _rxORB ) { - ::rtl::OUString sPermittedClasses; - ::rtl::OUStringBuffer aConfigPath; aConfigPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" ); aConfigPath.append ( ODriverDelegator::getImplementationName_Static() ); + aConfigPath.appendAscii( "/PermittedJavaMethods" ); ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithServiceFactory( _rxORB, aConfigPath.makeStringAndClear() ) ); - OSL_VERIFY( aConfig.getNodeValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PermittedJavaClasses" ) ) ) >>= sPermittedClasses ); - return sPermittedClasses; + ::rtl::OUStringBuffer aPermittedMethods; + Sequence< ::rtl::OUString > aNodeNames( aConfig.getNodeNames() ); + for ( const ::rtl::OUString* pNodeNames = aNodeNames.getConstArray(); + pNodeNames != aNodeNames.getConstArray() + aNodeNames.getLength(); + ++pNodeNames + ) + { + ::rtl::OUString sPermittedMethod; + OSL_VERIFY( aConfig.getNodeValue( *pNodeNames ) >>= sPermittedMethod ); + + if ( aPermittedMethods.getLength() ) + aPermittedMethods.append( (sal_Unicode)';' ); + aPermittedMethods.append( sPermittedMethod ); + } + + return aPermittedMethods.makeStringAndClear();; } } @@ -291,7 +304,7 @@ // security: permitted Java classes NamedValue aPermittedClasses( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "hsqldb.method_class_names" ) ), - makeAny( lcl_getPermittedJavaClasses_nothrow( m_xFactory ) ) + makeAny( lcl_getPermittedJavaMethods_nothrow( m_xFactory ) ) ); aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
