diff options
Diffstat (limited to 'chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx')
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 5869a1e4bdb0..397527f3ea9d 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -43,7 +43,6 @@ #include "chartview/ExplicitValueProvider.hxx" #include "chartview/DrawModelWrapper.hxx" #include "Chart2ModelContact.hxx" -#include "InternalDataProvider.hxx" #include "DiagramHelper.hxx" #include "DataSourceHelper.hxx" @@ -56,6 +55,7 @@ #include "LegendWrapper.hxx" #include "AreaWrapper.hxx" #include "WrappedAddInProperty.hxx" +#include "WrappedIgnoreProperty.hxx" #include "ChartRenderer.hxx" #include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> @@ -70,6 +70,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/util/DateTime.hpp> #include <vector> #include <algorithm> @@ -94,9 +95,11 @@ enum eServiceType SERVICE_NAME_DONUT_DIAGRAM, SERVICE_NAME_LINE_DIAGRAM, SERVICE_NAME_NET_DIAGRAM, + SERVICE_NAME_FILLED_NET_DIAGRAM, SERVICE_NAME_PIE_DIAGRAM, SERVICE_NAME_STOCK_DIAGRAM, SERVICE_NAME_XY_DIAGRAM, + SERVICE_NAME_BUBBLE_DIAGRAM, SERVICE_NAME_DASH_TABLE, SERVICE_NAME_GARDIENT_TABLE, @@ -122,9 +125,11 @@ tServiceNameMap & lcl_getStaticServiceNameMap() ( C2U( "com.sun.star.chart.DonutDiagram" ), SERVICE_NAME_DONUT_DIAGRAM ) ( C2U( "com.sun.star.chart.LineDiagram" ), SERVICE_NAME_LINE_DIAGRAM ) ( C2U( "com.sun.star.chart.NetDiagram" ), SERVICE_NAME_NET_DIAGRAM ) + ( C2U( "com.sun.star.chart.FilledNetDiagram" ), SERVICE_NAME_FILLED_NET_DIAGRAM ) ( C2U( "com.sun.star.chart.PieDiagram" ), SERVICE_NAME_PIE_DIAGRAM ) ( C2U( "com.sun.star.chart.StockDiagram" ), SERVICE_NAME_STOCK_DIAGRAM ) ( C2U( "com.sun.star.chart.XYDiagram" ), SERVICE_NAME_XY_DIAGRAM ) + ( C2U( "com.sun.star.chart.BubbleDiagram" ), SERVICE_NAME_BUBBLE_DIAGRAM ) ( C2U( "com.sun.star.drawing.DashTable" ), SERVICE_NAME_DASH_TABLE ) ( C2U( "com.sun.star.drawing.GradientTable" ), SERVICE_NAME_GARDIENT_TABLE ) @@ -151,7 +156,8 @@ enum PROP_DOCUMENT_ADDIN, PROP_DOCUMENT_BASEDIAGRAM, PROP_DOCUMENT_ADDITIONAL_SHAPES, - PROP_DOCUMENT_UPDATE_ADDIN + PROP_DOCUMENT_UPDATE_ADDIN, + PROP_DOCUMENT_NULL_DATE }; void lcl_AddPropertiesToVector( @@ -215,6 +221,13 @@ void lcl_AddPropertiesToVector( PROP_DOCUMENT_UPDATE_ADDIN, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND )); + + // table:null-date // i99104 + rOutProperties.push_back( + Property( C2U( "NullDate" ), + PROP_DOCUMENT_NULL_DATE, + ::getCppuType( static_cast< const ::com::sun::star::util::DateTime * >(0)), + beans::PropertyAttribute::MAYBEVOID )); } const uno::Sequence< Property > & lcl_GetPropertySequence() @@ -696,7 +709,6 @@ Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPro //----------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------- - ChartDocumentWrapper::ChartDocumentWrapper( const Reference< uno::XComponentContext > & xContext ) : m_spChart2ModelContact( new Chart2ModelContact( xContext ) ), @@ -899,7 +911,7 @@ void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& x // create a data provider containing the new data Reference< chart2::data::XDataProvider > xTempDataProvider( - new InternalDataProvider( xDataArray )); + ChartModelHelper::createInternalDataProvider( xDataArray )); if( ! xTempDataProvider.is()) throw uno::RuntimeException( C2U("Couldn't create temporary data provider"), @@ -1331,6 +1343,14 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( bCreateDiagram = true; } break; + case SERVICE_NAME_FILLED_NET_DIAGRAM: + if( xManagerFact.is()) + { + xTemplate.set( + xManagerFact->createInstance( + C2U( "com.sun.star.chart2.template.FilledNet" )), uno::UNO_QUERY ); + bCreateDiagram = true; + } case SERVICE_NAME_PIE_DIAGRAM: if( xManagerFact.is()) { @@ -1359,6 +1379,16 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( } break; + case SERVICE_NAME_BUBBLE_DIAGRAM: + if( xManagerFact.is()) + { + xTemplate.set( + xManagerFact->createInstance( + C2U( "com.sun.star.chart2.template.Bubble" )), uno::UNO_QUERY ); + bCreateDiagram = true; + } + break; + case SERVICE_NAME_DASH_TABLE: case SERVICE_NAME_GARDIENT_TABLE: case SERVICE_NAME_HATCH_TABLE: @@ -1632,6 +1662,7 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert aWrappedProperties.push_back( new WrappedBaseDiagramProperty( *this ) ); aWrappedProperties.push_back( new WrappedAdditionalShapesProperty( *this ) ); aWrappedProperties.push_back( new WrappedRefreshAddInAllowedProperty( *this ) ); + aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U("NullDate"),Any() ) ); // i99104 return aWrappedProperties; } |