From 1bc4a49d9ba99ff0531bafc2cf0183f726bfe14b Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Fri, 26 Apr 2013 12:14:33 +0200 Subject: QueryDesign: in criteria, remove column_ref when table *and* column name match As opposed to only the column name Change-Id: I261d13f23214f950daa55a5b63cd486e59a0e127 --- include/connectivity/sqlnode.hxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/connectivity/sqlnode.hxx') 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, -- cgit