Tag: cws_src680_rptchart01 User: oj Date: 2008-01-25 13:58:37+0000 Modified: dba/dbaccess/source/core/misc/DatabaseDataProvider.cxx dba/dbaccess/source/core/inc/DatabaseDataProvider.hxx
Log: #i85225# add two new attributes File Changes: Directory: /dba/dbaccess/source/core/misc/ ========================================== File [changed]: DatabaseDataProvider.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/DatabaseDataProvider.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +15 -5 -------------------- --- DatabaseDataProvider.cxx 2008-01-24 12:14:38+0000 1.1.2.1 +++ DatabaseDataProvider.cxx 2008-01-25 13:58:34+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: DatabaseDataProvider.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2008/01/24 12:14:38 $ + * last change: $Author: oj $ $Date: 2008/01/25 13:58:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -173,10 +173,10 @@ virtual uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() throw (uno::RuntimeException); inline ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence> getDataSequence(sal_Int32 _nPos) - { return m_aDataValues[_nPos]; } + { impl_fill(); return (static_cast<sal_uInt32>(_nPos) < m_aDataValues.size() ? m_aDataValues[_nPos] : ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence>()); } inline ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence> getLabelSequence(sal_Int32 _nPos) - { return m_aLabels[_nPos]; } + { impl_fill(); return (static_cast<sal_uInt32>(_nPos) < m_aLabels.size() ? m_aLabels[_nPos] : ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence>()); } private: DatabaseDataSource(DatabaseDataSource &); // not defined @@ -386,7 +386,7 @@ else if ( _sXMLRange.equalsAscii("local-table.$A1:$F100") ) sBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("all")); else - sBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("5")); + sBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("data")); return sBuffer.makeStringAndClear(); } @@ -520,6 +520,16 @@ throw lang::IllegalArgumentException(); set(PROPERTY_ACTIVECONNECTION,the_value,m_xActiveConnection); } +::rtl::OUString SAL_CALL DatabaseDataProvider::getDataSourceName() throw (uno::RuntimeException) +{ + osl::MutexGuard g(m_aMutex); + return m_DataSourceName; +} + +void SAL_CALL DatabaseDataProvider::setDataSourceName(const ::rtl::OUString& the_value) throw (uno::RuntimeException, lang::IllegalArgumentException) +{ + set(PROPERTY_DATASOURCENAME,the_value,m_DataSourceName); +} } // namespace dbaccess Directory: /dba/dbaccess/source/core/inc/ ========================================= File [changed]: DatabaseDataProvider.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/inc/DatabaseDataProvider.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +6 -4 ------------------- --- DatabaseDataProvider.hxx 2008-01-24 12:14:50+0000 1.1.2.1 +++ DatabaseDataProvider.hxx 2008-01-25 13:58:35+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: DatabaseDataProvider.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2008/01/24 12:14:50 $ + * last change: $Author: oj $ $Date: 2008/01/25 13:58:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -122,7 +122,8 @@ virtual void SAL_CALL setRowLimit( ::sal_Int32 _rowlimit ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getActiveConnection() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setActiveConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); - + virtual ::rtl::OUString SAL_CALL getDataSourceName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDataSourceName( const ::rtl::OUString& _datasourcename ) throw (::com::sun::star::uno::RuntimeException); private: DatabaseDataProvider(DatabaseDataProvider &); // not defined void operator =(DatabaseDataProvider &); // not defined @@ -156,6 +157,7 @@ DatabaseDataSource* m_pDataSource; ::rtl::OUString m_Command; + ::rtl::OUString m_DataSourceName; ::sal_Int32 m_CommandType; sal_Int32 m_RowLimit; ::rtl::OUString m_Filter; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
