summaryrefslogtreecommitdiff
path: root/connectivity/source/parse
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-27 12:31:29 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-30 08:37:11 +0000
commita52231c78526e14977d2129fa1abe812de567f03 (patch)
tree8d38fd537ebb43a72b41f4b838bc0effb9d05769 /connectivity/source/parse
parenta499d1b980be1eb2bd6ccfa07b1d87c02fcb1343 (diff)
com::sun::star->css in connectivity
Change-Id: I9489e92dc89a6d83a26ff4f0d9aad26acd28ad9f Reviewed-on: https://gerrit.libreoffice.org/25537 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'connectivity/source/parse')
-rw-r--r--connectivity/source/parse/PColumn.cxx4
-rw-r--r--connectivity/source/parse/sqlbison.y2
-rw-r--r--connectivity/source/parse/sqlnode.cxx24
3 files changed, 15 insertions, 15 deletions
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index bb53c96ad9a3..5ef47c408e54 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -261,9 +261,9 @@ void OOrderColumn::construct()
return *OOrderColumn_PROP::getArrayHelper();
}
-::com::sun::star::uno::Sequence< OUString > SAL_CALL OOrderColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OOrderColumn::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Sequence< OUString > aSupported { "com.sun.star.sdb.OrderColumn" };
+ css::uno::Sequence< OUString > aSupported { "com.sun.star.sdb.OrderColumn" };
return aSupported;
}
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 94288049f80c..460804bc7318 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4481,7 +4481,7 @@ sal_Int32 OSQLParser::s_nRefCount = 0;
// ::osl::Mutex OSQLParser::s_aMutex;
OSQLScanner* OSQLParser::s_pScanner = 0;
OSQLParseNodesGarbageCollector* OSQLParser::s_pGarbageCollector = 0;
-::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData4> OSQLParser::s_xLocaleData = NULL;
+css::uno::Reference< css::i18n::XLocaleData4> OSQLParser::s_xLocaleData = NULL;
void setParser(OSQLParser* _pParser)
{
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 7907e3f14325..07bfe1e37d43 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -269,7 +269,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
void OSQLParseNode::parseNodeToPredicateStr(OUString& rString,
const Reference< XConnection >& _rxConnection,
const Reference< XNumberFormatter > & xFormatter,
- const ::com::sun::star::lang::Locale& rIntl,
+ const css::lang::Locale& rIntl,
sal_Char _cDec,
const IParseContext* pContext ) const
{
@@ -285,7 +285,7 @@ void OSQLParseNode::parseNodeToPredicateStr(OUString& rString,
const Reference< XNumberFormatter > & xFormatter,
const Reference< XPropertySet > & _xField,
const OUString &_sPredicateTableAlias,
- const ::com::sun::star::lang::Locale& rIntl,
+ const css::lang::Locale& rIntl,
sal_Char _cDec,
const IParseContext* pContext ) const
{
@@ -301,7 +301,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
const Reference< XNumberFormatter > & xFormatter,
const Reference< XPropertySet > & _xField,
const OUString &_sPredicateTableAlias,
- const ::com::sun::star::lang::Locale& rIntl,
+ const css::lang::Locale& rIntl,
const IParseContext* pContext,
bool _bIntl,
bool _bQuote,
@@ -335,7 +335,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
}
bool OSQLParseNode::parseNodeToExecutableStatement( OUString& _out_rString, const Reference< XConnection >& _rxConnection,
- OSQLParser& _rParser, ::com::sun::star::sdbc::SQLException* _pErrorHolder ) const
+ OSQLParser& _rParser, css::sdbc::SQLException* _pErrorHolder ) const
{
OSL_PRECOND( _rxConnection.is(), "OSQLParseNode::parseNodeToExecutableStatement: invalid connection!" );
SQLParseNodeParameter aParseParam( _rxConnection,
@@ -750,7 +750,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( OUStringBuffer& rString, c
bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode,
- ::com::sun::star::uno::Any &_rCatalog,
+ css::uno::Any &_rCatalog,
OUString &_rSchema,
OUString &_rTable,
const Reference< XDatabaseMetaData >& _xMetaData)
@@ -1145,7 +1145,7 @@ OUString OSQLParser::stringToDouble(const OUString& _rValue,sal_Int16 _nScale)
OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString& rStatement,
- const Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter,
+ const Reference< css::util::XNumberFormatter > & xFormatter,
const Reference< XPropertySet > & xField,
bool bUseRealName)
{
@@ -1195,9 +1195,9 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
if (m_nFormatKey && m_xFormatter.is())
{
Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LOCALE) );
- OSL_ENSURE(aValue.getValueType() == cppu::UnoType<com::sun::star::lang::Locale>::get(), "OSQLParser::PredicateTree : invalid language property !");
+ OSL_ENSURE(aValue.getValueType() == cppu::UnoType<css::lang::Locale>::get(), "OSQLParser::PredicateTree : invalid language property !");
- if (aValue.getValueType() == cppu::UnoType<com::sun::star::lang::Locale>::get())
+ if (aValue.getValueType() == cppu::UnoType<css::lang::Locale>::get())
aValue >>= m_pData->aLocale;
}
else
@@ -1207,13 +1207,13 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
{
try
{
- Reference< ::com::sun::star::util::XNumberFormatsSupplier > xFormatSup = m_xFormatter->getNumberFormatsSupplier();
+ Reference< css::util::XNumberFormatsSupplier > xFormatSup = m_xFormatter->getNumberFormatsSupplier();
if ( xFormatSup.is() )
{
- Reference< ::com::sun::star::util::XNumberFormats > xFormats = xFormatSup->getNumberFormats();
+ Reference< css::util::XNumberFormats > xFormats = xFormatSup->getNumberFormats();
if ( xFormats.is() )
{
- ::com::sun::star::lang::Locale aLocale;
+ css::lang::Locale aLocale;
aLocale.Language = "en";
aLocale.Country = "US";
OUString sFormat("YYYY-MM-DD");
@@ -1299,7 +1299,7 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
}
-OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const IParseContext* _pContext)
+OSQLParser::OSQLParser(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const IParseContext* _pContext)
:m_pContext(_pContext)
,m_pParseTree(nullptr)
,m_pData( new OSQLParser_Data( rxContext ) )