Tag: cws_src680_rptchart01 User: oj Date: 2008-02-13 07:45:40+0000 Modified: dba/dbaccess/source/core/dataaccess/connection.cxx dba/dbaccess/source/core/dataaccess/connection.hxx dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: #i85225# impl new method File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: connection.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/connection.cxx?r1=1.53&r2=1.53.32.1 Delta lines: +20 -3 -------------------- --- connection.cxx 2007-11-21 15:37:29+0000 1.53 +++ connection.cxx 2008-02-13 07:45:37+0000 1.53.32.1 @@ -4,9 +4,9 @@ * * $RCSfile: connection.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.53.32.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 15:37:29 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:45:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -818,7 +818,24 @@ return m_xConnectionTools->getDataSourceMetaData(); } +// ----------------------------------------------------------------------------- +Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const ::rtl::OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, RuntimeException) +{ + MutexGuard aGuard(m_aMutex); + checkDisposed(); + impl_loadConnectionTools_throw(); + + return m_xConnectionTools->getFieldsByCommandDescriptor(commandType,command,keepFieldsAlive); +} +//-------------------------------------------------------------------- +Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal_Int32 commandType, const ::rtl::OUString& command ) throw (::com::sun::star::uno::RuntimeException) +{ + MutexGuard aGuard(m_aMutex); + checkDisposed(); + impl_loadConnectionTools_throw(); + return m_xConnectionTools->getComposer(commandType,command); +} // ----------------------------------------------------------------------------- void OConnection::impl_checkTableQueryNames_nothrow() File [changed]: connection.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/connection.hxx?r1=1.25&r2=1.25.202.1 Delta lines: +5 -3 ------------------- --- connection.hxx 2006-10-05 12:58:51+0000 1.25 +++ connection.hxx 2008-02-13 07:45:37+0000 1.25.202.1 @@ -4,9 +4,9 @@ * * $RCSfile: connection.hxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.202.1 $ * - * last change: $Author: kz $ $Date: 2006/10/05 12:58:51 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:45:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -247,6 +247,8 @@ virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableName > SAL_CALL createTableName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XObjectNames > SAL_CALL getObjectNames( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const ::rtl::OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const ::rtl::OUString& command ) throw (::com::sun::star::uno::RuntimeException); // XTableUIProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getTableIcon( const ::rtl::OUString& TableName, ::sal_Int32 ColorMode ) throw (::com::sun::star::uno::RuntimeException); File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.50&r2=1.50.28.1 Delta lines: +13 -10 --------------------- --- documentdefinition.cxx 2007-11-21 15:39:30+0000 1.50 +++ documentdefinition.cxx 2008-02-13 07:45:37+0000 1.50.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: documentdefinition.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.50.28.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 15:39:30 $ + * last change: $Author: oj $ $Date: 2008/02/13 07:45:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1056,6 +1056,15 @@ dispose(); } + else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "storeOwn" ) ) ) + { + Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY); + if ( xPersist.is() ) + { + xPersist->storeOwn(); + notifyDataSourceModified(); + } + } else aRet = OContentHelper::execute(aCommand,CommandId,Environment); } @@ -1254,13 +1263,7 @@ } } - ::osl::MutexGuard aGuard(m_aMutex); - Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY); - if ( xPersist.is() ) - { - xPersist->storeOwn(); - notifyDataSourceModified(); - } + } catch(Exception&) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
