[Libreoffice-commits] .: 2 commits - connectivity/source connectivity/workben
Gert Faller
gfaller at kemper.freedesktop.org
Fri Nov 19 08:43:46 PST 2010
connectivity/source/cpool/ZPoolCollection.cxx | 12 +--
connectivity/source/cpool/Zregistration.cxx | 2
connectivity/source/manager/mdrivermanager.cxx | 4 -
connectivity/source/manager/mregistration.cxx | 2
connectivity/source/parse/PColumn.cxx | 4 -
connectivity/source/parse/sqliterator.cxx | 16 ++---
connectivity/source/parse/sqlnode.cxx | 78 ++++++++++++-------------
connectivity/source/sdbcx/VColumn.cxx | 8 +-
connectivity/source/sdbcx/VIndex.cxx | 8 +-
connectivity/source/sdbcx/VIndexColumn.cxx | 8 +-
connectivity/source/sdbcx/VKey.cxx | 8 +-
connectivity/source/sdbcx/VKeyColumn.cxx | 8 +-
connectivity/source/sdbcx/VTable.cxx | 8 +-
connectivity/workben/iniParser/main.cxx | 4 -
connectivity/workben/little/main.cxx | 12 +--
connectivity/workben/testmoz/main.cxx | 58 +++++++++---------
connectivity/workben/testmoz/mozthread.cxx | 42 ++++++-------
17 files changed, 141 insertions(+), 141 deletions(-)
New commits:
commit 61f34cbeaadc285a34c99771650f329e81cca78e
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Fri Nov 19 17:42:52 2010 +0100
TL_CONSTASCII_USTRINGPARAM in libs core 19
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 20761e1..892869c 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -82,13 +82,13 @@ OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >& _rxFac
:m_xServiceFactory(_rxFactory)
{
// 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);
OSL_ENSURE(m_xDriverAccess.is(), "have no (or an invalid) driver manager!");
m_xProxyFactory = Reference< XProxyFactory >(
m_xServiceFactory->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.reflection.ProxyFactory")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory"))),
UNO_QUERY);
OSL_ENSURE(m_xProxyFactory.is(), "OConnectionPool::OConnectionPool: could not create a proxy factory!");
@@ -99,7 +99,7 @@ OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >& _rxFac
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() )
m_xDesktop->addTerminateListener(this);
@@ -182,14 +182,14 @@ Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference
//--------------------------------------------------------------------------
::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 > 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;
}
// -----------------------------------------------------------------------------
@@ -386,7 +386,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
}
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!");
}
}
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index b66ecfe..7b4c6a6 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -55,7 +55,7 @@ sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star
{
::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
sMainKeyName += OPoolCollection::getImplementationName_Static();
- sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
+ sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
try
{
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 99cd425..2ce0fa0 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -59,7 +59,7 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::logging;
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)
{
@@ -563,7 +563,7 @@ Reference< XInterface > SAL_CALL OSDBCDriverManager::Create( const Reference< XM
//--------------------------------------------------------------------------
::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"));
}
//--------------------------------------------------------------------------
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index 19a9755..383bef3 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -62,7 +62,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceMana
{
::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
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);
if (xMainKey.is())
{
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index bdbe4bb..eb5cf9f 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -239,9 +239,9 @@ void OOrderColumn::construct()
{
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
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
- aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.GroupColumn");
+ aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GroupColumn"));
return aSupported;
}
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index a79c5c4..7e6f0cf 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -904,7 +904,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo
}
else if(pDatatype && pDatatype->getNodeType() == SQL_NODE_KEYWORD)
{
- aTypeName = ::rtl::OUString::createFromAscii("VARCHAR");
+ aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
}
if (aTypeName.getLength())
@@ -946,7 +946,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
if (pSelectNode->getChild(2)->isRule() && SQL_ISPUNCTUATION(pSelectNode->getChild(2)->getChild(0),"*"))
{
// 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))
{
@@ -966,7 +966,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
// alle Spalten der Tabelle
::rtl::OUString aTableRange;
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;
}
else if (SQL_ISRULE(pColumnRef,derived_column))
@@ -1475,7 +1475,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
? _rColumnAlias
: _aColumnName.getLength()
? _aColumnName
- : ::rtl::OUString::createFromAscii("?");
+ : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?"));
}
else if (SQL_ISPUNCTUATION(pMark,":"))
{
@@ -1681,8 +1681,8 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const ::rtl::OUString&
NULL,
sal_False,
rTableName,
- ::rtl::OUString::createFromAscii("Table"),
- ::rtl::OUString::createFromAscii("New Created Table"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Table")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New Created Table")),
rSchemaName,
rCatalogName
);
@@ -1788,7 +1788,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
// did not find a column with this name in any of the tables
OParseColumn* pColumn = new OParseColumn(
aNewColName,
- ::rtl::OUString::createFromAscii( "VARCHAR" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")),
// TODO: does this match with _nType?
// Or should be fill this from the getTypeInfo of the connection?
::rtl::OUString(),
@@ -2143,7 +2143,7 @@ void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError,
sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( sPlaceHolder1 ), sPlaceHolder1.getLength(), *_pReplaceToken1 );
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(
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index c8b5ff6..46993db 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -422,7 +422,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString,
case as:
if ( rParam.aMetaData.generateASBeforeCorrelationName() )
- rString.append(::rtl::OUString::createFromAscii( " AS" ));
+ rString.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AS")));
bHandled = true;
break;
@@ -670,7 +670,7 @@ void OSQLParseNode::impl_parseTableRangeNodeToString_throw(::rtl::OUStringBuffer
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen at sun.com", "OSQLParseNode::impl_parseTableRangeNodeToString_throw" );
OSL_PRECOND( ( count() == 2 ) || ( count() == 3 ) || ( count() == 5 ) ,"Illegal count");
- // rString += ::rtl::OUString::createFromAscii(" ");
+ // rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
::std::for_each(m_aChildren.begin(),m_aChildren.end(),
boost::bind( &OSQLParseNode::impl_parseNodeToString_throw, _1, boost::ref( rString ), boost::cref( rParam ) ));
}
@@ -726,7 +726,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rSt
{
::rtl::OUString aStr = ConvertLikeToken(pParaNode, pEscNode, rParam.bInternational);
rString.appendAscii(" ");
- rString.append(SetQuotation(aStr,::rtl::OUString::createFromAscii("\'"),::rtl::OUString::createFromAscii("\'\'")));
+ rString.append(SetQuotation(aStr,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\'")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\'\'"))));
}
else
pParaNode->impl_parseNodeToString_throw( rString, aNewParam );
@@ -989,7 +989,7 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode*& pAppend, OSQLParseNode*& pLi
sal_Int16 nScale = 0;
try
{
- Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, ::rtl::OUString::createFromAscii("Decimals") );
+ Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Decimals")) );
aValue >>= nScale;
}
catch( Exception& )
@@ -1006,7 +1006,7 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode*& pAppend, OSQLParseNode*& pLi
break;
default:
m_sErrorMessage = m_pContext->getErrorMessage(IParseContext::ERROR_VALUE_NO_LIKE);
- m_sErrorMessage = m_sErrorMessage.replaceAt(m_sErrorMessage.indexOf(::rtl::OUString::createFromAscii("#1")),2,pLiteral->getTokenValue());
+ m_sErrorMessage = m_sErrorMessage.replaceAt(m_sErrorMessage.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#1"))),2,pLiteral->getTokenValue());
break;
}
}
@@ -1022,10 +1022,10 @@ OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType)
{
::rtl::OUString aEmptyString;
OSQLParseNode* pNewNode = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::set_fct_spec));
- pNewNode->append(new OSQLInternalNode(::rtl::OUString::createFromAscii("{"), SQL_NODE_PUNCTUATION));
+ pNewNode->append(new OSQLInternalNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("{")), SQL_NODE_PUNCTUATION));
OSQLParseNode* pDateNode = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::odbc_fct_spec));
pNewNode->append(pDateNode);
- pNewNode->append(new OSQLInternalNode(::rtl::OUString::createFromAscii("}"), SQL_NODE_PUNCTUATION));
+ pNewNode->append(new OSQLInternalNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("}")), SQL_NODE_PUNCTUATION));
switch (nType)
{
@@ -1100,7 +1100,7 @@ OSQLParseNode* OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral)
{
::rtl::OUString aValue;
if(!m_xCharClass.is())
- m_xCharClass = Reference<XCharacterClassification>(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.CharacterClassification")),UNO_QUERY);
+ m_xCharClass = Reference<XCharacterClassification>(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification"))),UNO_QUERY);
if(m_xCharClass.is() && s_xLocaleData.is())
{
try
@@ -1109,10 +1109,10 @@ OSQLParseNode* OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral)
if((aResult.TokenType & KParseType::IDENTNAME) && aResult.EndPos == _rValue.getLength())
{
aValue = ::rtl::OUString::valueOf(aResult.Value);
- sal_Int32 nPos = aValue.lastIndexOf(::rtl::OUString::createFromAscii("."));
+ sal_Int32 nPos = aValue.lastIndexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")));
if((nPos+_nScale) < aValue.getLength())
aValue = aValue.replaceAt(nPos+_nScale,aValue.getLength()-nPos-_nScale,::rtl::OUString());
- aValue = aValue.replaceAt(aValue.lastIndexOf(::rtl::OUString::createFromAscii(".")),1,s_xLocaleData->getLocaleItem(m_pData->aLocale).decimalSeparator);
+ aValue = aValue.replaceAt(aValue.lastIndexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))),1,s_xLocaleData->getLocaleItem(m_pData->aLocale).decimalSeparator);
return aValue;
}
}
@@ -1319,7 +1319,7 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star:
s_pGarbageCollector = new OSQLParseNodesGarbageCollector();
if(!s_xLocaleData.is())
- s_xLocaleData = Reference<XLocaleData>(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.LocaleData")),UNO_QUERY);
+ s_xLocaleData = Reference<XLocaleData>(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.LocaleData"))),UNO_QUERY);
// auf 0 zuruecksetzen
memset(OSQLParser::s_nRuleIDs,0,sizeof(OSQLParser::s_nRuleIDs[0]) * (OSQLParseNode::rule_count+1));
@@ -1484,7 +1484,7 @@ void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode)
OSQLParseNode* pChildNode = _pNode->getChild(i);
if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() > 1)
{
- OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString::createFromAscii("?") ,SQL_NODE_PUNCTUATION,0);
+ OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?")) ,SQL_NODE_PUNCTUATION,0);
delete pChildNode->replace(pChildNode->getChild(0),pNewNode);
sal_Int32 nChildCount = pChildNode->count();
for(sal_Int32 j=1;j < nChildCount;++j)
@@ -1722,19 +1722,19 @@ sal_Bool OSQLParseNode::addDateValue(::rtl::OUStringBuffer& rString, const SQLPa
SQL_ISTOKEN(pODBCNodeChild, T) ||
SQL_ISTOKEN(pODBCNodeChild, TS) ))
{
- ::rtl::OUString suQuote(::rtl::OUString::createFromAscii("'"));
+ ::rtl::OUString suQuote(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")));
if (rParam.bPredicate)
{
if (rParam.aMetaData.shouldEscapeDateTime())
{
- suQuote = ::rtl::OUString::createFromAscii("#");
+ suQuote = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#"));
}
}
else
{
if (rParam.aMetaData.shouldEscapeDateTime())
{
- // suQuote = ::rtl::OUString::createFromAscii("'");
+ // suQuote = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
return sal_False;
}
}
@@ -1771,7 +1771,7 @@ void OSQLParseNode::replaceNodeValue(const ::rtl::OUString& rTableAlias,const ::
{
OSQLParseNode * pCol = removeAt((sal_uInt32)0);
append(new OSQLParseNode(rTableAlias,SQL_NODE_NAME));
- append(new OSQLParseNode(::rtl::OUString::createFromAscii("."),SQL_NODE_PUNCTUATION));
+ append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")),SQL_NODE_PUNCTUATION));
append(pCol);
}
else
@@ -1798,7 +1798,7 @@ OSQLParseNode* MakeANDNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
{
OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_term));
pNewNode->append(pLeftLeaf);
- pNewNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii("AND"),SQL_NODE_KEYWORD,SQL_TOKEN_AND));
+ pNewNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AND")),SQL_NODE_KEYWORD,SQL_TOKEN_AND));
pNewNode->append(pRightLeaf);
return pNewNode;
}
@@ -1807,7 +1807,7 @@ OSQLParseNode* MakeORNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
{
OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::search_condition));
pNewNode->append(pLeftLeaf);
- pNewNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii("OR"),SQL_NODE_KEYWORD,SQL_TOKEN_OR));
+ pNewNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OR")),SQL_NODE_KEYWORD,SQL_TOKEN_OR));
pNewNode->append(pRightLeaf);
return pNewNode;
}
@@ -1909,7 +1909,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
{
OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_term));
pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0));
- pNewNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii("AND"),SQL_NODE_KEYWORD,SQL_TOKEN_AND));
+ pNewNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AND")),SQL_NODE_KEYWORD,SQL_TOKEN_AND));
pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1));
replaceAndReset(pSearchCondition,pNewNode);
@@ -1929,7 +1929,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
{
OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::search_condition));
pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0));
- pNewNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii("OR"),SQL_NODE_KEYWORD,SQL_TOKEN_OR));
+ pNewNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OR")),SQL_NODE_KEYWORD,SQL_TOKEN_OR));
pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1));
replaceAndReset(pSearchCondition,pNewNode);
@@ -1961,22 +1961,22 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
switch(pComparison->getNodeType())
{
case SQL_NODE_EQUAL:
- pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii("<>"),SQL_NODE_NOTEQUAL,SQL_NOTEQUAL);
+ pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<>")),SQL_NODE_NOTEQUAL,SQL_NOTEQUAL);
break;
case SQL_NODE_LESS:
- pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii(">="),SQL_NODE_GREATEQ,SQL_GREATEQ);
+ pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">=")),SQL_NODE_GREATEQ,SQL_GREATEQ);
break;
case SQL_NODE_GREAT:
- pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii("<="),SQL_NODE_LESSEQ,SQL_LESSEQ);
+ pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<=")),SQL_NODE_LESSEQ,SQL_LESSEQ);
break;
case SQL_NODE_LESSEQ:
- pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii(">"),SQL_NODE_GREAT,SQL_GREAT);
+ pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">")),SQL_NODE_GREAT,SQL_GREAT);
break;
case SQL_NODE_GREATEQ:
- pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii("<"),SQL_NODE_LESS,SQL_LESS);
+ pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")),SQL_NODE_LESS,SQL_LESS);
break;
case SQL_NODE_NOTEQUAL:
- pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii("="),SQL_NODE_EQUAL,SQL_EQUAL);
+ pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")),SQL_NODE_EQUAL,SQL_EQUAL);
break;
default:
OSL_ENSURE( false, "OSQLParseNode::negateSearchCondition: unexpected node type!" );
@@ -2001,7 +2001,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
OSQLParseNode* pNot = pPart2->getChild(nNotPos);
OSQLParseNode* pNotNot = NULL;
if(pNot->isRule())
- pNotNot = new OSQLParseNode(::rtl::OUString::createFromAscii("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT);
+ pNotNot = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NOT")),SQL_NODE_KEYWORD,SQL_TOKEN_NOT);
else
pNotNot = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not));
pPart2->replace(pNot, pNotNot);
@@ -2012,7 +2012,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
OSQLParseNode* pNot = pSearchCondition->getChild( 1 )->getChild( 0 );
OSQLParseNode* pNotNot = NULL;
if(pNot->isRule())
- pNotNot = new OSQLParseNode(::rtl::OUString::createFromAscii("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT);
+ pNotNot = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NOT")),SQL_NODE_KEYWORD,SQL_TOKEN_NOT);
else
pNotNot = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not));
pSearchCondition->getChild( 1 )->replace(pNot, pNotNot);
@@ -2104,9 +2104,9 @@ void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition)
OSQLParseNode* p2ndAnd = MakeANDNode(new OSQLParseNode(*pA),pC);
pNewNode = MakeORNode(p1stAnd,p2ndAnd);
OSQLParseNode* pNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
- pNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii("("),SQL_NODE_PUNCTUATION));
+ pNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")),SQL_NODE_PUNCTUATION));
pNode->append(pNewNode);
- pNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii(")"),SQL_NODE_PUNCTUATION));
+ pNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")),SQL_NODE_PUNCTUATION));
OSQLParseNode::eraseBraces(p1stAnd);
OSQLParseNode::eraseBraces(p2ndAnd);
replaceAndReset(pSearchCondition,pNode);
@@ -2184,9 +2184,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
OSQLParseNode* pNode = MakeORNode(pLeft,pRight);
OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
- pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii("("),SQL_NODE_PUNCTUATION));
+ pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")),SQL_NODE_PUNCTUATION));
pNewRule->append(pNode);
- pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii(")"),SQL_NODE_PUNCTUATION));
+ pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")),SQL_NODE_PUNCTUATION));
OSQLParseNode::eraseBraces(pLeft);
OSQLParseNode::eraseBraces(pRight);
@@ -2201,9 +2201,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
OSQLParseNode* pNode = MakeORNode(pLeft,pRight);
OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
- pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii("("),SQL_NODE_PUNCTUATION));
+ pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")),SQL_NODE_PUNCTUATION));
pNewRule->append(pNode);
- pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii(")"),SQL_NODE_PUNCTUATION));
+ pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")),SQL_NODE_PUNCTUATION));
OSQLParseNode::eraseBraces(pLeft);
OSQLParseNode::eraseBraces(pRight);
@@ -2218,9 +2218,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
OSQLParseNode* pNode = MakeORNode(pLeft,pRight);
OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
- pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii("("),SQL_NODE_PUNCTUATION));
+ pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")),SQL_NODE_PUNCTUATION));
pNewRule->append(pNode);
- pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii(")"),SQL_NODE_PUNCTUATION));
+ pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")),SQL_NODE_PUNCTUATION));
OSQLParseNode::eraseBraces(pLeft);
OSQLParseNode::eraseBraces(pRight);
@@ -2235,9 +2235,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
OSQLParseNode* pNode = MakeORNode(pLeft,pRight);
OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
- pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii("("),SQL_NODE_PUNCTUATION));
+ pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")),SQL_NODE_PUNCTUATION));
pNewRule->append(pNode);
- pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii(")"),SQL_NODE_PUNCTUATION));
+ pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")),SQL_NODE_PUNCTUATION));
OSQLParseNode::eraseBraces(pLeft);
OSQLParseNode::eraseBraces(pRight);
@@ -2475,7 +2475,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode
case SQL_NODE_STRING:
if (rString.getLength())
rString.appendAscii(" ");
- rString.append(SetQuotation(m_aNodeValue,::rtl::OUString::createFromAscii("\'"),::rtl::OUString::createFromAscii("\'\'")));
+ rString.append(SetQuotation(m_aNodeValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\'")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\'\'"))));
break;
case SQL_NODE_NAME:
if (rString.getLength())
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 0c5f25a..f040832 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -47,17 +47,17 @@ using namespace ::com::sun::star::sdbc;
::rtl::OUString SAL_CALL OColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{
if(isNew())
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VColumnDescription");
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VColumn");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VColumnDescription"));
+ 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 > aSupported(1);
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
- aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Column");
+ aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Column"));
return aSupported;
}
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index e38fb9d..ac91069 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -52,17 +52,17 @@ using namespace ::com::sun::star::lang;
::rtl::OUString SAL_CALL OIndex::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{
if(isNew())
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndexDescriptor");
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndex");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndexDescriptor"));
+ 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 > aSupported(1);
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
- aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Index");
+ aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Index"));
return aSupported;
}
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 3abb964..bc5859c 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -39,17 +39,17 @@ using namespace ::com::sun::star::uno;
::rtl::OUString SAL_CALL OIndexColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{
if(isNew())
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndexColumnDescription");
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndex");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndexColumnDescription"));
+ 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 > aSupported(1);
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
- aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Index");
+ aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Index"));
return aSupported;
}
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index 4b27b9a..7b3cba8 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -51,17 +51,17 @@ using namespace ::com::sun::star::lang;
::rtl::OUString SAL_CALL OKey::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{
if(isNew())
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyDescription");
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKey");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKeyDescription"));
+ 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 > aSupported(1);
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
- aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Key");
+ aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Key"));
return aSupported;
}
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 06cad1a..89d079a 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -40,17 +40,17 @@ using namespace cppu;
::rtl::OUString SAL_CALL OKeyColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{
if(isNew())
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyColumnDescription");
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyColumn");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKeyColumnDescription"));
+ 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 > aSupported(1);
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
- aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.KeyColumn");
+ aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.KeyColumn"));
return aSupported;
}
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index 237dedc..315e21b 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -54,8 +54,8 @@ using namespace ::com::sun::star::lang;
::rtl::OUString SAL_CALL OTable::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{
if(isNew())
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VTableDescriptor");
- return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Table");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VTableDescriptor"));
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Table"));
}
// -----------------------------------------------------------------------------
@@ -63,9 +63,9 @@ using namespace ::com::sun::star::lang;
{
::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
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
- aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Table");
+ aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Table"));
return aSupported;
}
commit afc80adda5d42b9e04275a192e864b613579f478
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Fri Nov 19 17:25:17 2010 +0100
TL_CONSTASCII_USTRINGPARAM in libs core 18
diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx
index 7bc8d11..c6664cc 100644
--- a/connectivity/workben/iniParser/main.cxx
+++ b/connectivity/workben/iniParser/main.cxx
@@ -128,7 +128,7 @@ public:
sectionName = OStringToOUString(
line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US );
if (!sectionName.getLength())
- sectionName = OUString::createFromAscii("no name section");
+ sectionName = OUString(RTL_CONSTASCII_USTRINGPARAM("no name section"));
ini_Section *aSection = &mAllSection[sectionName];
aSection->sName = sectionName;
@@ -184,7 +184,7 @@ int _cdecl main( int argc, char * argv[] )
{
- IniParser parser(OUString::createFromAscii("test.ini"));
+ IniParser parser(OUString(RTL_CONSTASCII_USTRINGPARAM("test.ini")));
parser.Dump();
return 0;
}
diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx
index 8b4350d..49e0674 100644
--- a/connectivity/workben/little/main.cxx
+++ b/connectivity/workben/little/main.cxx
@@ -66,25 +66,25 @@ void _cdecl main( int argc, char * argv[] )
try{
Reference< ::com::sun::star::lang::XMultiServiceFactory > xFac =
- createRegistryServiceFactory(OUString::createFromAscii("g:\\office50\\program\\applicat.rdb"),OUString());
+ createRegistryServiceFactory(OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\office50\\program\\applicat.rdb")),OUString());
if(!xFac.is())
return;
- m_xDriver = Reference<XDriver>(xFac->createInstance(OUString::createFromAscii("com.sun.star.sdbc.driver.dbase.Driver")),UNO_QUERY);
+ m_xDriver = Reference<XDriver>(xFac->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.driver.dbase.Driver"))),UNO_QUERY);
if(m_xDriver.is())
{
Sequence<PropertyValue> aValue;
- // aValue.getArray()[0] = PropertyValue( OUString::createFromAscii("user"),0,makeAny(OUString::createFromAscii("TEST1")),PropertyState_DIRECT_VALUE);
- // aValue.getArray()[1] = PropertyValue( OUString::createFromAscii("password"),0,makeAny(OUString::createFromAscii("TEST1")),PropertyState_DIRECT_VALUE);
+ // aValue.getArray()[0] = PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("user")),0,makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("TEST1"))),PropertyState_DIRECT_VALUE);
+ // aValue.getArray()[1] = PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("password")),0,makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("TEST1"))),PropertyState_DIRECT_VALUE);
//
- m_xConnection = m_xDriver->connect(OUString::createFromAscii("sdbc:dbase:g:\\"),aValue);
+ m_xConnection = m_xDriver->connect(OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:g:\\")),aValue);
if(m_xConnection.is())
{
Reference<XStatement> xStmt = m_xConnection->createStatement();
if(xStmt.is())
{
- Reference<XResultSet> xRes = xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM Tele"));
+ Reference<XResultSet> xRes = xStmt->executeQuery(OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM Tele")));
if(xRes.is())
{
::rtl::OUString aPat( RTL_CONSTASCII_USTRINGPARAM( "%s\t" ));
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
index a8263f9..f40974f 100644
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
@@ -231,13 +231,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);
@@ -283,12 +283,12 @@ Reference< XMultiServiceFactory > InitializeFac( void )
/* // 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 );
+ aConfArgs[0] <<= PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("servertype")), 0, makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("local")) ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
+ aConfArgs[1] <<= PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("sourcepath")), 0, makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\")) ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
+ aConfArgs[2] <<= PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("updatepath")), 0, makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\")) ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
Reference< XContentProvider > xConfProvider
- ( xSMgr->createInstanceWithArguments( OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ), aConfArgs), UNO_QUERY );
+ ( xSMgr->createInstanceWithArguments( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")), aConfArgs), UNO_QUERY );
*/
@@ -301,13 +301,13 @@ Reference< XMultiServiceFactory > InitializeFac( void )
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 );
+ ( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.PackageContentProvider")) ), UNO_QUERY );
+ xUcb->registerContentProvider( xPackageProvider, OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.pkg")), sal_True );
*/
globalUcb = xUcb;
return xSMgr;
@@ -329,10 +329,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 );
}
@@ -348,9 +348,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 );
@@ -437,16 +437,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:
@@ -454,12 +454,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;
@@ -676,7 +676,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())
{
diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
index 794a677..463cfd1 100644
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ b/connectivity/workben/testmoz/mozthread.cxx
@@ -190,10 +190,10 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
OSL_TRACE("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 );
}
@@ -209,9 +209,9 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
OSL_TRACE("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 );
}
@@ -234,7 +234,7 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
OSL_TRACE(": got statement\n");
OSL_TRACE(": excuteQuery() : START \n");
// SELECT "First Name", "Display Name", "E-mail" FROM tablename
- OUString sqlPrefix= OUString::createFromAscii("SELECT \"First Name\", \"Display Name\", \"E-mail\" FROM ");
+ OUString sqlPrefix(RTL_CONSTASCII_USTRINGPARAM("SELECT \"First Name\", \"Display Name\", \"E-mail\" FROM "));
try
{
sal_Int32 times=0;
@@ -245,9 +245,9 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
OUString qut = xDmd->getIdentifierQuoteString();
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>() );
sal_Int32 nTables = 0;
while( xRes.is() && xRes->next())
@@ -300,24 +300,24 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
switch( nIndex)
{
case testLDAP:
- 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;
case testMozilla:
- url=OUString::createFromAscii("sdbc:address:mozilla://");
+ url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:mozilla://"));
break;
case testOp:
- url=OUString::createFromAscii("sdbc:address:outlook://");
+ url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:outlook://"));
break;
case testOe:
- url=OUString::createFromAscii("sdbc:address:outlookexp://");
+ url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:outlookexp://"));
break;
default:
- url=OUString::createFromAscii("sdbc:address:mozilla://");
+ url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:mozilla://"));
break;
}
pConnection =
@@ -364,7 +364,7 @@ void SAL_CALL mozThread(void*)
{
Reference< ::com::sun::star::sdbc::XDriver>
m_xDriver(mMgr->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())
{
More information about the Libreoffice-commits
mailing list