Repository.mk | 2 +- connectivity/source/drivers/mork/MConnection.cxx | 11 ++++++++++- connectivity/source/drivers/mork/MDriver.cxx | 7 ++++++- scp2/source/ooo/file_library_ooo.scp | 11 +---------- 4 files changed, 18 insertions(+), 13 deletions(-)
New commits: commit 88e411a9631254a983689e9c65fa07058cd18366 Author: David Ostrovsky <da...@ostrovsky.org> Date: Sat Jul 28 11:02:38 2012 +0200 mork driver: revert back to libmorklo.so Change-Id: Ib02ab0db30cc6f722066aa7d3ff162810d6f4b79 diff --git a/Repository.mk b/Repository.mk index 1153dac..e4142c1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -311,6 +311,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ lwpft \ MacOSXSpell \ merged \ + mork \ mozab2 \ mozabdrv \ msfilter \ @@ -448,7 +449,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ macab1 \ macabdrv1 \ mcnttype \ - mork \ mozbootstrap \ officebean \ package2 \ diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index 9fed202..3a737a1 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -76,7 +76,7 @@ void SAL_CALL OConnection::release() throw() void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { (void) info; // avoid warnings - SAL_INFO("connectvity.mork", "IN OConnection::construct()" ); + SAL_INFO("connectvity.mork", "=> OConnection::construct()" ); // open file setURL(url); // @@ -153,6 +153,8 @@ IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.mork.OConnection" // -------------------------------------------------------------------------------- Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException) { + SAL_INFO("connectvity.mork", "=> OConnection::createStatement()" ); + ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -165,6 +167,8 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep // -------------------------------------------------------------------------------- Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) { + SAL_INFO("connectvity.mork", "=> OConnection::prepareStatement()" ); + OSL_UNUSED( _sSql ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -175,6 +179,8 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const :: // -------------------------------------------------------------------------------- Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) { + SAL_INFO("connectvity.mork", "=> OConnection::prepareCall()" ); + SAL_INFO("connectvity.mork", "sql: " << _sSql); OSL_UNUSED( _sSql ); ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); SAL_INFO("connectvity.mork", "OConnection::prepareCall( " << OUtoCStr( _sSql ) << " )"); @@ -183,6 +189,9 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl:: // -------------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) { + SAL_INFO("connectvity.mork", "=> OConnection::nativeSQL()" ); + SAL_INFO("connectvity.mork", "sql: " << _sSql); + ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here SAL_INFO("connectvity.mork", "OConnection::nativeSQL(" << _sSql << " )" ); diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index 5961a0e..3301c27 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -27,6 +27,7 @@ namespace connectivity MorkDriver::MorkDriver(css::uno::Reference< css::uno::XComponentContext > const context): context_(context) { + SAL_INFO("connectvity.mork", "=> MorkDriver::MorkDriver()" ); m_ProfileAccess = new ProfileAccess(); assert(context.is()); } @@ -75,6 +76,8 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( css::uno::Sequence< css::beans::PropertyValue > const & info) throw (css::sdbc::SQLException, css::uno::RuntimeException) { + SAL_INFO("connectvity.mork", "=> MorkDriver::connect()" ); + (void) url; (void) info; // avoid warnings css::uno::Reference< css::sdbc::XConnection > xCon; OConnection* pCon = new OConnection(this); @@ -86,9 +89,11 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( sal_Bool MorkDriver::acceptsURL(rtl::OUString const & url) throw (css::sdbc::SQLException, css::uno::RuntimeException) { + SAL_INFO("connectvity.mork", "=> MorkDriver::acceptsURL()" ); + //... TODO (void) url; // avoid warnings - return false; + return true; } css::uno::Sequence< css::sdbc::DriverPropertyInfo > MorkDriver::getPropertyInfo( diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 58642f0..04ee5ee 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -880,16 +880,7 @@ File gid_File_Lib_Mcnttype #endif End -File gid_File_Lib_Mork - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(libmork,UNXSUFFIX)); - #else - Name = "mork.dll"; - #endif -End +STD_LIB_FILE(gid_File_Lib_Mork,mork) STD_LIB_FILE(gid_File_Lib_WpftWriter,wpftwriter) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits