User: kz Date: 2006/12/13 08:12:19 Modified: dba/connectivity/inc/connectivity/sqlnode.hxx
Log: INTEGRATION: CWS dba22ui (1.19.70); FILE MERGED 2006/12/05 09:46:52 fs 1.19.70.1: copying the fix for #i72252# from CWS dba22b to dba22ui - intended for the latter, but wrongly checked in into the former File Changes: Directory: /dba/connectivity/inc/connectivity/ ============================================== File [changed]: sqlnode.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/inc/connectivity/sqlnode.hxx?r1=1.19&r2=1.20 Delta lines: +11 -20 --------------------- --- sqlnode.hxx 10 Jul 2006 14:16:48 -0000 1.19 +++ sqlnode.hxx 13 Dec 2006 16:12:16 -0000 1.20 @@ -35,8 +35,10 @@ #ifndef _CONNECTIVITY_SQLNODE_HXX #define _CONNECTIVITY_SQLNODE_HXX -#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ -#include <com/sun/star/uno/Reference.h> +#include "connectivity/dbmetadata.hxx" + +#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_ +#include <com/sun/star/uno/Reference.hxx> #endif #ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTYPES_HPP_ #include <com/sun/star/util/XNumberFormatTypes.hpp> @@ -44,9 +46,6 @@ #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> #endif -#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#endif #include <vector> #include <functional> #include <set> @@ -59,10 +58,6 @@ { namespace star { - namespace sdbc - { - class XDatabaseMetaData; - } namespace beans { class XPropertySet; @@ -100,8 +95,7 @@ struct SQLParseNodeParameter { const ::com::sun::star::lang::Locale& rLocale; - const ::rtl::OUString aIdentifierQuote; - const ::rtl::OUString aCatalogSeparator; + ::dbtools::DatabaseMetaData aMetaData; OSQLParser* pParser; ::boost::shared_ptr< QueryNameSet > pSubQueryHistory; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > xFormatter; @@ -113,11 +107,9 @@ bool bInternational : 1; /// should we internationalize keywords and placeholders? bool bPredicate : 1; /// are we going to parse a mere predicate? bool bParseToSDBCLevel : 1; /// should we create an SDBC-level statement (e.g. with substituted sub queries)? - bool bCaseSensistiveIdentCompare : 1; /// should identifiers be compared case-sensitively? SQLParseNodeParameter( - const ::rtl::OUString& _rIdentifierQuote, - const ::rtl::OUString& _rCatalogSep, + 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 ::com::sun::star::lang::Locale& _rLocale, @@ -126,8 +118,7 @@ bool _bQuote, sal_Char _cDecSep, bool _bPredicate, - bool _bParseToSDBC, - bool _bCaseSensistiveIdentCompare + bool _bParseToSDBC ); ~SQLParseNodeParameter(); }; @@ -331,21 +322,21 @@ ::com::sun::star::sdbc::SQLException* _pErrorHolder ) const; void parseNodeToStr(::rtl::OUString& rString, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > & xMeta, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const IParseContext* pContext = NULL, sal_Bool _bIntl = sal_False, sal_Bool _bQuote= sal_True) const; // quoted und internationalisert void parseNodeToPredicateStr(::rtl::OUString& rString, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > & xMeta, + 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::lang::Locale& rIntl, sal_Char _cDec, const IParseContext* pContext = NULL ) const; void parseNodeToPredicateStr(::rtl::OUString& rString, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > & xMeta, + 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 ::com::sun::star::lang::Locale& rIntl, @@ -425,7 +416,7 @@ protected: // ParseNodeToStr konkateniert alle Token (Blaetter) des ParseNodes void parseNodeToStr(::rtl::OUString& rString, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > & xMeta, + 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 ::com::sun::star::lang::Locale& rIntl, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
