diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 16:18:16 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 16:18:16 +0000 |
| commit | f805668f72591cc966856dbe64436654177feba9 (patch) | |
| tree | 1799a00529cf7bd82b5a8ea00f84c156bf3e0dec | |
| parent | fffd34f29a533e22fe43f1d7db44670fa1d8fe9e (diff) | |
INTEGRATION: CWS insight01 (1.4.52); FILE MERGED
2004/04/23 06:25:47 oj 1.4.52.1: new switch to disable catalog and schema
| -rw-r--r-- | connectivity/source/simpledbt/staticdbtools_s.cxx | 18 | ||||
| -rw-r--r-- | connectivity/source/simpledbt/staticdbtools_s.hxx | 9 |
2 files changed, 21 insertions, 6 deletions
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx index b470f89aedf4..e5283a8dbf9a 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.cxx +++ b/connectivity/source/simpledbt/staticdbtools_s.cxx @@ -2,9 +2,9 @@ * * $RCSfile: staticdbtools_s.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-03-19 16:38:50 $ + * last change: $Author: hr $ $Date: 2004-08-02 17:17:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -189,9 +189,11 @@ namespace connectivity } //---------------------------------------------------------------- - ::rtl::OUString ODataAccessStaticTools::quoteTableName(const Reference< XDatabaseMetaData>& _rxMeta, const ::rtl::OUString& _rName) const + ::rtl::OUString ODataAccessStaticTools::quoteTableName(const Reference< XDatabaseMetaData>& _rxMeta, const ::rtl::OUString& _rName + , sal_Bool _bUseCatalogInSelect + , sal_Bool _bUseSchemaInSelect) const { - return ::dbtools::quoteTableName(_rxMeta, _rName,::dbtools::eInDataManipulation); + return ::dbtools::quoteTableName(_rxMeta, _rName,::dbtools::eInDataManipulation,_bUseCatalogInSelect,_bUseSchemaInSelect); } //---------------------------------------------------------------- @@ -243,6 +245,14 @@ namespace connectivity _rCommand, _pErrorInfo ); } + //---------------------------------------------------------------- + sal_Bool ODataAccessStaticTools::isDataSourcePropertyEnabled(const Reference< XInterface>& _xProp + ,const ::rtl::OUString& _sProperty, + sal_Bool _bDefault) const + { + return ::dbtools::isDataSourcePropertyEnabled( _xProp,_sProperty ,_bDefault ); + } + //........................................................................ } // namespace connectivity //........................................................................ diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx index 31c349efaa3b..437289c8154a 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.hxx +++ b/connectivity/source/simpledbt/staticdbtools_s.hxx @@ -2,9 +2,9 @@ * * $RCSfile: staticdbtools_s.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-03-19 16:38:50 $ + * last change: $Author: hr $ $Date: 2004-08-02 17:18:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,6 +168,8 @@ namespace connectivity virtual ::rtl::OUString quoteTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMeta, const ::rtl::OUString& _rName + , sal_Bool _bUseCatalogInSelect = sal_True + , sal_Bool _bUseSchemaInSelect = sal_True ) const; // ------------------------------------------------ @@ -221,6 +223,9 @@ namespace connectivity ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL ) SAL_THROW( ( ) ); + virtual sal_Bool isDataSourcePropertyEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xProp + ,const ::rtl::OUString& _sProperty, + sal_Bool _bDefault = sal_False) const; // disambiguate IReference // ------------------------------------------------ virtual oslInterlockedCount SAL_CALL acquire(); |