INTEGRATION: CWS dr62 (1.10.6); FILE MERGED

2008/06/17 15:17:54 dr 1.10.6.2: RESYNC: (1.10-1.11); FILE MERGED
2008/06/13 07:07:07 iha 1.10.6.1: #i82614# Copy sheet with scatter chart to new document may result in wrong data
This commit is contained in:
Vladimir Glazounov 2008-07-01 15:35:39 +00:00
parent 5291f816e9
commit f03a176c96

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartModel.hxx,v $
* $Revision: 1.11 $
* $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@ -53,6 +53,7 @@
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/chart2/XUndoSupplier.hpp>
#include <com/sun/star/chart2/data/XDataSource.hpp>
// public API
#include <com/sun/star/chart2/data/XDataProvider.hpp>
@ -66,9 +67,9 @@
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_19)
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_19
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 19
#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_20)
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_20
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 20
#include "comphelper/implbase_var.hxx"
#endif
#include <osl/mutex.hxx>
@ -90,7 +91,7 @@ namespace impl
class ImplChartModel;
// Note: needed for queryInterface (if it calls the base-class implementation)
typedef ::comphelper::WeakImplHelper19<
typedef ::comphelper::WeakImplHelper20<
// ::com::sun::star::frame::XModel //comprehends XComponent (required interface), base of XChartDocument
::com::sun::star::util::XCloseable //comprehends XCloseBroadcaster
,::com::sun::star::frame::XStorable2 //(extension of XStorable)
@ -121,6 +122,7 @@ typedef ::comphelper::WeakImplHelper19<
,::com::sun::star::datatransfer::XTransferable
,::com::sun::star::chart2::XUndoSupplier
,::com::sun::star::document::XDocumentPropertiesSupplier
,::com::sun::star::chart2::data::XDataSource
>
ChartModel_Base;
}
@ -638,6 +640,10 @@ public:
// ____ XUndoSupplier ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XUndoManager > SAL_CALL getUndoManager()
throw (::com::sun::star::uno::RuntimeException);
// ____ XDataSource ____ allows access to the curently used data and data ranges
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
throw (::com::sun::star::uno::RuntimeException);
};
} // namespace chart