Kaydet (Commit) b67fc189 authored tarafından Gert Faller's avatar Gert Faller

TL_CONSTASCII_USTRINGPARAM in libs core 19

üst 5762105d
...@@ -82,13 +82,13 @@ OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >& _rxF ...@@ -82,13 +82,13 @@ OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >& _rxF
:m_xServiceFactory(_rxFactory) :m_xServiceFactory(_rxFactory)
{ {
// bootstrap all objects supporting the .sdb.Driver service // bootstrap all objects supporting the .sdb.Driver service
m_xManager = Reference< XDriverManager >(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.sdbc.DriverManager") ), UNO_QUERY); m_xManager = Reference< XDriverManager >(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager")) ), UNO_QUERY);
m_xDriverAccess = Reference< XDriverAccess >(m_xManager, UNO_QUERY); m_xDriverAccess = Reference< XDriverAccess >(m_xManager, UNO_QUERY);
OSL_ENSURE(m_xDriverAccess.is(), "have no (or an invalid) driver manager!"); OSL_ENSURE(m_xDriverAccess.is(), "have no (or an invalid) driver manager!");
m_xProxyFactory = Reference< XProxyFactory >( m_xProxyFactory = Reference< XProxyFactory >(
m_xServiceFactory->createInstance( m_xServiceFactory->createInstance(
::rtl::OUString::createFromAscii("com.sun.star.reflection.ProxyFactory")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory"))),
UNO_QUERY); UNO_QUERY);
OSL_ENSURE(m_xProxyFactory.is(), "OConnectionPool::OConnectionPool: could not create a proxy factory!"); OSL_ENSURE(m_xProxyFactory.is(), "OConnectionPool::OConnectionPool: could not create a proxy factory!");
...@@ -99,7 +99,7 @@ OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >& _rxF ...@@ -99,7 +99,7 @@ OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >& _rxF
osl_incrementInterlockedCount( &m_refCount ); osl_incrementInterlockedCount( &m_refCount );
{ {
m_xDesktop = Reference< ::com::sun::star::frame::XDesktop>( m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop") ), UNO_QUERY); m_xDesktop = Reference< ::com::sun::star::frame::XDesktop>( m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY);
if ( m_xDesktop.is() ) if ( m_xDesktop.is() )
m_xDesktop->addTerminateListener(this); m_xDesktop->addTerminateListener(this);
...@@ -182,14 +182,14 @@ Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference ...@@ -182,14 +182,14 @@ Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
::rtl::OUString SAL_CALL OPoolCollection::getImplementationName_Static( ) throw(RuntimeException) ::rtl::OUString SAL_CALL OPoolCollection::getImplementationName_Static( ) throw(RuntimeException)
{ {
return ::rtl::OUString::createFromAscii("com.sun.star.sdbc.OConnectionPool"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.OConnectionPool"));
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( ) throw(RuntimeException) Sequence< ::rtl::OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( ) throw(RuntimeException)
{ {
Sequence< ::rtl::OUString > aSupported(1); Sequence< ::rtl::OUString > aSupported(1);
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ConnectionPool"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ConnectionPool"));
return aSupported; return aSupported;
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
...@@ -386,7 +386,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu ...@@ -386,7 +386,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
} }
else else
{ {
OSL_ENSURE(xSI->supportsService(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), OSL_ENSURE(xSI->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
"::createWithProvider: sure this is a provider? Missing the ConfigurationProvider service!"); "::createWithProvider: sure this is a provider? Missing the ConfigurationProvider service!");
} }
} }
......
...@@ -55,7 +55,7 @@ sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star ...@@ -55,7 +55,7 @@ sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star
{ {
::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" )); ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
sMainKeyName += OPoolCollection::getImplementationName_Static(); sMainKeyName += OPoolCollection::getImplementationName_Static();
sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
try try
{ {
......
...@@ -59,7 +59,7 @@ using namespace ::com::sun::star::container; ...@@ -59,7 +59,7 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::logging; using namespace ::com::sun::star::logging;
using namespace ::osl; using namespace ::osl;
#define SERVICE_SDBC_DRIVER ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver") #define SERVICE_SDBC_DRIVER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"))
void throwNoSuchElementException() throw(NoSuchElementException) void throwNoSuchElementException() throw(NoSuchElementException)
{ {
...@@ -563,7 +563,7 @@ Reference< XInterface > SAL_CALL OSDBCDriverManager::Create( const Reference< XM ...@@ -563,7 +563,7 @@ Reference< XInterface > SAL_CALL OSDBCDriverManager::Create( const Reference< XM
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
::rtl::OUString SAL_CALL OSDBCDriverManager::getImplementationName_static( ) throw(RuntimeException) ::rtl::OUString SAL_CALL OSDBCDriverManager::getImplementationName_static( ) throw(RuntimeException)
{ {
return ::rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.OSDBCDriverManager"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.OSDBCDriverManager"));
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
......
...@@ -62,7 +62,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceMana ...@@ -62,7 +62,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceMana
{ {
::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" )); ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
sMainKeyName += ::drivermanager::OSDBCDriverManager::getImplementationName_static(); sMainKeyName += ::drivermanager::OSDBCDriverManager::getImplementationName_static();
sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName); Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName);
if (xMainKey.is()) if (xMainKey.is())
{ {
......
...@@ -239,9 +239,9 @@ void OOrderColumn::construct() ...@@ -239,9 +239,9 @@ void OOrderColumn::construct()
{ {
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
if ( m_bOrder ) if ( m_bOrder )
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.OrderColumn"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OrderColumn"));
else else
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.GroupColumn"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GroupColumn"));
return aSupported; return aSupported;
} }
......
...@@ -904,7 +904,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo ...@@ -904,7 +904,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo
} }
else if(pDatatype && pDatatype->getNodeType() == SQL_NODE_KEYWORD) else if(pDatatype && pDatatype->getNodeType() == SQL_NODE_KEYWORD)
{ {
aTypeName = ::rtl::OUString::createFromAscii("VARCHAR"); aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
} }
if (aTypeName.getLength()) if (aTypeName.getLength())
...@@ -946,7 +946,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele ...@@ -946,7 +946,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
if (pSelectNode->getChild(2)->isRule() && SQL_ISPUNCTUATION(pSelectNode->getChild(2)->getChild(0),"*")) if (pSelectNode->getChild(2)->isRule() && SQL_ISPUNCTUATION(pSelectNode->getChild(2)->getChild(0),"*"))
{ {
// SELECT * ... // SELECT * ...
setSelectColumnName(m_aSelectColumns,::rtl::OUString::createFromAscii("*"), aEmptyString,aEmptyString); setSelectColumnName(m_aSelectColumns,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aEmptyString,aEmptyString);
} }
else if (SQL_ISRULE(pSelectNode->getChild(2),scalar_exp_commalist)) else if (SQL_ISRULE(pSelectNode->getChild(2),scalar_exp_commalist))
{ {
...@@ -966,7 +966,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele ...@@ -966,7 +966,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
// alle Spalten der Tabelle // alle Spalten der Tabelle
::rtl::OUString aTableRange; ::rtl::OUString aTableRange;
pColumnRef->getChild(0)->parseNodeToStr( aTableRange, m_pImpl->m_xConnection, NULL, sal_False, sal_False ); pColumnRef->getChild(0)->parseNodeToStr( aTableRange, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
setSelectColumnName(m_aSelectColumns,::rtl::OUString::createFromAscii("*"), aEmptyString,aTableRange); setSelectColumnName(m_aSelectColumns,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aEmptyString,aTableRange);
continue; continue;
} }
else if (SQL_ISRULE(pColumnRef,derived_column)) else if (SQL_ISRULE(pColumnRef,derived_column))
...@@ -1475,7 +1475,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode ...@@ -1475,7 +1475,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
? _rColumnAlias ? _rColumnAlias
: _aColumnName.getLength() : _aColumnName.getLength()
? _aColumnName ? _aColumnName
: ::rtl::OUString::createFromAscii("?"); : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?"));
} }
else if (SQL_ISPUNCTUATION(pMark,":")) else if (SQL_ISPUNCTUATION(pMark,":"))
{ {
...@@ -1681,8 +1681,8 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const ::rtl::OUString& ...@@ -1681,8 +1681,8 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const ::rtl::OUString&
NULL, NULL,
sal_False, sal_False,
rTableName, rTableName,
::rtl::OUString::createFromAscii("Table"), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Table")),
::rtl::OUString::createFromAscii("New Created Table"), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New Created Table")),
rSchemaName, rSchemaName,
rCatalogName rCatalogName
); );
...@@ -1788,7 +1788,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ ...@@ -1788,7 +1788,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
// did not find a column with this name in any of the tables // did not find a column with this name in any of the tables
OParseColumn* pColumn = new OParseColumn( OParseColumn* pColumn = new OParseColumn(
aNewColName, aNewColName,
::rtl::OUString::createFromAscii( "VARCHAR" ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")),
// TODO: does this match with _nType? // TODO: does this match with _nType?
// Or should be fill this from the getTypeInfo of the connection? // Or should be fill this from the getTypeInfo of the connection?
::rtl::OUString(), ::rtl::OUString(),
...@@ -2143,7 +2143,7 @@ void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError, ...@@ -2143,7 +2143,7 @@ void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError,
sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( sPlaceHolder1 ), sPlaceHolder1.getLength(), *_pReplaceToken1 ); sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( sPlaceHolder1 ), sPlaceHolder1.getLength(), *_pReplaceToken1 );
if ( _pReplaceToken2 ) if ( _pReplaceToken2 )
sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( ::rtl::OUString::createFromAscii( "#2" ) ), 2, *_pReplaceToken2 ); sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#2")) ), 2, *_pReplaceToken2 );
} }
impl_appendError( SQLException( impl_appendError( SQLException(
......
...@@ -47,17 +47,17 @@ using namespace ::com::sun::star::sdbc; ...@@ -47,17 +47,17 @@ using namespace ::com::sun::star::sdbc;
::rtl::OUString SAL_CALL OColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) ::rtl::OUString SAL_CALL OColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{ {
if(isNew()) if(isNew())
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VColumnDescription"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VColumnDescription"));
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VColumn"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VColumn"));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException)
{ {
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ColumnDescription"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ColumnDescription"));
else else
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Column"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Column"));
return aSupported; return aSupported;
} }
......
...@@ -52,17 +52,17 @@ using namespace ::com::sun::star::lang; ...@@ -52,17 +52,17 @@ using namespace ::com::sun::star::lang;
::rtl::OUString SAL_CALL OIndex::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) ::rtl::OUString SAL_CALL OIndex::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{ {
if(isNew()) if(isNew())
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndexDescriptor"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndexDescriptor"));
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndex"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndex"));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OIndex::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OIndex::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException)
{ {
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.IndexDescriptor"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.IndexDescriptor"));
else else
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Index"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Index"));
return aSupported; return aSupported;
} }
......
...@@ -39,17 +39,17 @@ using namespace ::com::sun::star::uno; ...@@ -39,17 +39,17 @@ using namespace ::com::sun::star::uno;
::rtl::OUString SAL_CALL OIndexColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) ::rtl::OUString SAL_CALL OIndexColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{ {
if(isNew()) if(isNew())
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndexColumnDescription"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndexColumnDescription"));
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndex"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndex"));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OIndexColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OIndexColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException)
{ {
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.IndexDescription"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.IndexDescription"));
else else
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Index"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Index"));
return aSupported; return aSupported;
} }
......
...@@ -51,17 +51,17 @@ using namespace ::com::sun::star::lang; ...@@ -51,17 +51,17 @@ using namespace ::com::sun::star::lang;
::rtl::OUString SAL_CALL OKey::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) ::rtl::OUString SAL_CALL OKey::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{ {
if(isNew()) if(isNew())
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyDescription"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKeyDescription"));
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKey"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKey"));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OKey::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OKey::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException)
{ {
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.KeyDescription"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.KeyDescription"));
else else
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Key"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Key"));
return aSupported; return aSupported;
} }
......
...@@ -40,17 +40,17 @@ using namespace cppu; ...@@ -40,17 +40,17 @@ using namespace cppu;
::rtl::OUString SAL_CALL OKeyColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) ::rtl::OUString SAL_CALL OKeyColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{ {
if(isNew()) if(isNew())
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyColumnDescription"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKeyColumnDescription"));
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyColumn"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKeyColumn"));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OKeyColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OKeyColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException)
{ {
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.KeyColumnDescription"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.KeyColumnDescription"));
else else
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.KeyColumn"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.KeyColumn"));
return aSupported; return aSupported;
} }
......
...@@ -54,8 +54,8 @@ using namespace ::com::sun::star::lang; ...@@ -54,8 +54,8 @@ using namespace ::com::sun::star::lang;
::rtl::OUString SAL_CALL OTable::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) ::rtl::OUString SAL_CALL OTable::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{ {
if(isNew()) if(isNew())
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VTableDescriptor"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VTableDescriptor"));
return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Table"); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Table"));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
...@@ -63,9 +63,9 @@ using namespace ::com::sun::star::lang; ...@@ -63,9 +63,9 @@ using namespace ::com::sun::star::lang;
{ {
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.TableDescriptor"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.TableDescriptor"));
else else
aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Table"); aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Table"));
return aSupported; return aSupported;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment