diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-04-26 12:14:33 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-04-26 16:49:48 +0200 |
| commit | 1bc4a49d9ba99ff0531bafc2cf0183f726bfe14b (patch) | |
| tree | b980c3c940e1d7c233e2c6d19da7cd7d55b5ad1a /include | |
| parent | fae7a3d060664e6540dbdfc3babd54ac9ccb45bf (diff) | |
QueryDesign: in criteria, remove column_ref when table *and* column name match
As opposed to only the column name
Change-Id: I261d13f23214f950daa55a5b63cd486e59a0e127
Diffstat (limited to 'include')
| -rw-r--r-- | include/connectivity/sqlnode.hxx | 4 | ||||
| -rw-r--r-- | include/connectivity/virtualdbtools.hxx | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index 940b27f25950..51a9ec2168ca 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -82,6 +82,7 @@ namespace connectivity ::boost::shared_ptr< QueryNameSet > pSubQueryHistory; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > xFormatter; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xField; + OUString sPredicateTableAlias; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xQueries; // see bParseToSDBCLevel const IParseContext& m_rContext; sal_Char cDecSep; @@ -94,6 +95,7 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _xFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xField, + const OUString &_sPredicateTableAlias, const ::com::sun::star::lang::Locale& _rLocale, const IParseContext* _pContext, bool _bIntl, @@ -329,6 +331,7 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField, + const OUString &_sTableAlias, const ::com::sun::star::lang::Locale& rIntl, sal_Char _cDec, const IParseContext* pContext = NULL ) const; @@ -410,6 +413,7 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField, + const OUString &_sPredicateTableAlias, const ::com::sun::star::lang::Locale& rIntl, const IParseContext* pContext, bool _bIntl, diff --git a/include/connectivity/virtualdbtools.hxx b/include/connectivity/virtualdbtools.hxx index 352c98d7a8c4..9083016fa621 100644 --- a/include/connectivity/virtualdbtools.hxx +++ b/include/connectivity/virtualdbtools.hxx @@ -294,6 +294,7 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, + const OUString &_sPredicateTableAlias, const ::com::sun::star::lang::Locale& _rIntl, const sal_Char _cDecSeparator, const IParseContext* _pContext |