diff options
Diffstat (limited to 'connectivity/workben/testmoz/main.cxx')
-rw-r--r-- | connectivity/workben/testmoz/main.cxx | 91 |
1 files changed, 32 insertions, 59 deletions
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index af6ec282353b..86e991e128e1 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,14 +73,12 @@ using namespace comphelper; using namespace cppu; -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace com::sun::star::ucb; using namespace com::sun::star::beans; -//using namespace com::sun::star; using namespace connectivity; using namespace com::sun::star::sdb; using namespace com::sun::star::sdbc; @@ -87,6 +86,10 @@ using namespace com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace com::sun::star::registry; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; +using ::rtl::OUStringToOString; + #define OUtoCStr( x ) (OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US ).getStr()) Reference< XContentProviderManager > globalUcb; #define PRINTSTR(x) printf("%s",x); @@ -102,13 +105,8 @@ void printColumns( Reference<XResultSet> &xRes ) printf( "ColumnCount = %d\n", xMeta->getColumnCount()); for(sal_Int32 i=1;i<=xMeta->getColumnCount();++i) { - // printf(aPat.getStr(), xMeta->getColumnName(i).getStr()); const char *str = OUtoCStr(xMeta->getColumnName(i)); -// if ( i < 3 ) { -// printf( aPat_Short, str ); -// } else { - printf( aPat, str ); -// } + printf( aPat, str ); } printf("\n"); printf("------------------------------------------------------------------------------------------\n"); @@ -127,11 +125,7 @@ void printXResultSet( Reference<XResultSet> &xRes ) { try { const char *str = OUtoCStr(xRow->getString(j)); -// if ( j < 3 ) { -// printf( aPat_Short, str ); -// } else { - printf( aPat_Short, str ); -// } + printf( aPat_Short, str ); } catch (...) { printf(" Ex "); } @@ -158,7 +152,6 @@ void printXResultSets( Reference<XResultSet> &xRes ) } } -//#define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) static const char * const components[] = { SAL_MODULENAME( "ucb1" ) // KSO, ABI @@ -230,13 +223,13 @@ Reference< XMultiServiceFactory > InitializeFac( void ) createRegistryServiceFactory( types, sal_True ); Reference< XImplementationRegistration > xIR( interimSmgr->createInstance( - OUString::createFromAscii( - "com.sun.star.registry.ImplementationRegistration" ) ), UNO_QUERY ); + OUString::(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.registry.ImplementationRegistration" )) ), UNO_QUERY ); Reference< XSimpleRegistry > xReg( interimSmgr->createInstance( - OUString::createFromAscii( - "com.sun.star.registry.SimpleRegistry" ) ), UNO_QUERY ); + OUString::(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.registry.SimpleRegistry" )) ), UNO_QUERY ); if ( xReg.is() ) { xReg->open(services, sal_False, sal_True); @@ -280,34 +273,18 @@ Reference< XMultiServiceFactory > InitializeFac( void ) // set global factory setProcessServiceFactory( xSMgr ); -/* // Create simple ConfigManager - Sequence< Any > aConfArgs(3); - aConfArgs[0] <<= PropertyValue( OUString::createFromAscii("servertype"), 0, makeAny( OUString::createFromAscii("local") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE ); - aConfArgs[1] <<= PropertyValue( OUString::createFromAscii("sourcepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE ); - aConfArgs[2] <<= PropertyValue( OUString::createFromAscii("updatepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE ); - - Reference< XContentProvider > xConfProvider - ( xSMgr->createInstanceWithArguments( OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ), aConfArgs), UNO_QUERY ); -*/ - // Create unconfigured Ucb: -/* Sequence< Any > aArgs(1); - aArgs[1] = makeAny ( xConfProvider );*/ Sequence< Any > aArgs; ::ucb::ContentBroker::initialize( xSMgr, aArgs ); Reference< XContentProviderManager > xUcb = ucb::ContentBroker::get()->getContentProviderManagerInterface(); Reference< XContentProvider > xFileProvider - ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ) ), UNO_QUERY ); - xUcb->registerContentProvider( xFileProvider, OUString::createFromAscii( "file" ), sal_True ); + ( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContentProvider")) ), UNO_QUERY ); + xUcb->registerContentProvider( xFileProvider, OUString(RTL_CONSTASCII_USTRINGPARAM("file")), sal_True ); -/* Reference< XContentProvider > xPackageProvider - ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.PackageContentProvider" ) ), UNO_QUERY ); - xUcb->registerContentProvider( xPackageProvider, OUString::createFromAscii( "vnd.sun.star.pkg" ), sal_True ); - */ globalUcb = xUcb; return xSMgr; } @@ -328,10 +305,10 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) printf("Testing getColumns() : START\n"); { Reference<XResultSet> xRes = xDmd->getColumns( - makeAny(OUString::createFromAscii("")), // Catalog - OUString::createFromAscii("%"), // Schema - OUString::createFromAscii("%"), // TabName - OUString::createFromAscii("%") + makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog + OUString(RTL_CONSTASCII_USTRINGPARAM("%")), // Schema + OUString(RTL_CONSTASCII_USTRINGPARAM("%")), // TabName + OUString(RTL_CONSTASCII_USTRINGPARAM("%")) ); printXResultSets( xRes ); } @@ -347,9 +324,9 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) printf("Testing getTables() : START\n"); { Reference<XResultSet> xRes = xDmd->getTables( - makeAny(OUString::createFromAscii("")), // Catalog - OUString::createFromAscii("%"), // Schema - OUString::createFromAscii("%"), // TabName + makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog + OUString(RTL_CONSTASCII_USTRINGPARAM("%")), // Schema + OUString(RTL_CONSTASCII_USTRINGPARAM("%")), // TabName Sequence<rtl::OUString>() ); printXResultSets( xRes ); @@ -396,12 +373,7 @@ Reference<XResultSet> TestQuery(Reference< ::com::sun::star::sdbc::XConnection> for (times = 0;times< 100;times ++) { Reference<XResultSet> tmpRes = - //xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM \"addr\"")); xStmt->executeQuery(OUString::createFromAscii(sql)); - // xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM \"Personal Address Book\" WHERE ( PrimaryEmail IS NULL )")); - // xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM \"Personal Address Book\" WHERE ( PrimaryEmail LIKE \"Darren\" )")); - // xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM \"Personal Address Book\"")); - // xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM \"myldap\" WHERE ( PrimaryEmail LIKE \"%Darren%\" OR DisplayName LIKE \"%Darren%\" )")); autoTest( tmpRes ); Reference<XCloseable> clsRes(tmpRes,UNO_QUERY); @@ -436,16 +408,16 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected { case -1: case 1: //mozilla - url=OUString::createFromAscii("sdbc:address:mozilla://"); + url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:mozilla://")); break; case 2: - url=OUString::createFromAscii("sdbc:address:ldap://"); + url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:ldap://")); char hostname[40],basedn[40]; scanf("%s %s",hostname,basedn); aValue.realloc(2); - aValue[0].Name = ::rtl::OUString::createFromAscii("HostName"); + aValue[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HostName")); aValue[0].Value <<= rtl::OUString::createFromAscii(hostname); - aValue[1].Name = ::rtl::OUString::createFromAscii("BaseDN"); + aValue[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN")); aValue[1].Value <<= rtl::OUString::createFromAscii(basedn); break; case 3: @@ -453,12 +425,12 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected break; case 5: //Default LDAP AB - url=OUString::createFromAscii("sdbc:address:ldap://"); + url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:ldap://")); aValue.realloc(2); - aValue[0].Name = ::rtl::OUString::createFromAscii("HostName"); - aValue[0].Value <<= rtl::OUString::createFromAscii("sun-ds"); - aValue[1].Name = ::rtl::OUString::createFromAscii("BaseDN"); - aValue[1].Value <<= rtl::OUString::createFromAscii("dc=sun,dc=com"); + aValue[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HostName")); + aValue[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sun-ds")); + aValue[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN")); + aValue[1].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dc=sun,dc=com")); break; default: return pConnection; @@ -662,7 +634,7 @@ void menuMain() PRINTSTR("4 Open OE Address Book\n") PRINTSTR("Please Input your choice:") } -#if (defined UNX) || (defined OS2) +#if (defined UNX) int main( int argc, char * argv[] ) #else int _cdecl main( int argc, char * argv[] ) @@ -675,7 +647,7 @@ int _cdecl main( int argc, char * argv[] ) { Reference< ::com::sun::star::sdbc::XDriver> m_xDriver(xMgr->createInstance( - OUString::createFromAscii("com.sun.star.comp.sdbc.MozabDriver")), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.MozabDriver"))), UNO_QUERY); if(m_xDriver.is()) { @@ -722,3 +694,4 @@ int _cdecl main( int argc, char * argv[] ) return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |