diff options
author | Björn Milcke <bm@openoffice.org> | 2003-11-12 09:45:02 +0000 |
---|---|---|
committer | Björn Milcke <bm@openoffice.org> | 2003-11-12 09:45:02 +0000 |
commit | fee3a6718c0f38b0769e6f7120b6b6b248daa8c4 (patch) | |
tree | 62db0513522f786c23b87834723de535c8e41c4d /chart2/source/model | |
parent | 99fd4eb8a0448ad726073f99163386f79bac9479 (diff) |
+SymbolProperties
Diffstat (limited to 'chart2/source/model')
-rw-r--r-- | chart2/source/model/main/DataPointProperties.cxx | 20 | ||||
-rw-r--r-- | chart2/source/model/main/DataPointProperties.hxx | 6 |
2 files changed, 16 insertions, 10 deletions
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 9881da9b803a..72eb6a37aa7d 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataPointProperties.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:30 $ + * last change: $Author: bm $ $Date: 2003-11-12 10:44:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,6 +98,9 @@ #ifndef _DRAFTS_COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_ #include <drafts/com/sun/star/chart2/NumberFormat.hpp> #endif +#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOLPROPERTIES_HPP_ +#include <drafts/com/sun/star/chart2/SymbolProperties.hpp> +#endif using namespace ::com::sun::star; using namespace ::drafts::com::sun::star; @@ -247,8 +250,8 @@ void DataPointProperties::AddPropertiesToVector( // others rOutProperties.push_back( Property( C2U( "Symbol" ), - PROP_DATAPOINT_SYMBOL, - ::getCppuType( reinterpret_cast< const drawing::PolyPolygonBezierCoords * >(0)), + PROP_DATAPOINT_SYMBOL_PROP, + ::getCppuType( reinterpret_cast< const chart2::SymbolProperties * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( @@ -337,9 +340,12 @@ void DataPointProperties::AddDefaultsToMap( //others - OSL_ASSERT( rOutMap.end() == rOutMap.find( PROP_DATAPOINT_SYMBOL )); - rOutMap[ PROP_DATAPOINT_SYMBOL ] = - uno::Any();//need this empty default value otherwise get a costly exception in DataSeries::GetDefaultValue + chart2::SymbolProperties aSymbProp; + aSymbProp.aStyle = chart2::SymbolStyle_NONE; + aSymbProp.nStandardSymbol = 0; + OSL_ASSERT( rOutMap.end() == rOutMap.find( PROP_DATAPOINT_SYMBOL_PROP )); + rOutMap[ PROP_DATAPOINT_SYMBOL_PROP ] = + uno::makeAny( aSymbProp ); OSL_ASSERT( rOutMap.end() == rOutMap.find( PROP_DATAPOINT_OFFSET )); rOutMap[ PROP_DATAPOINT_OFFSET ] = diff --git a/chart2/source/model/main/DataPointProperties.hxx b/chart2/source/model/main/DataPointProperties.hxx index 010427657d82..5ce2f6de75b6 100644 --- a/chart2/source/model/main/DataPointProperties.hxx +++ b/chart2/source/model/main/DataPointProperties.hxx @@ -2,9 +2,9 @@ * * $RCSfile: DataPointProperties.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:30 $ + * last change: $Author: bm $ $Date: 2003-11-12 10:45:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,7 +106,7 @@ public: PROP_DATAPOINT_LINE_DASH, // others - PROP_DATAPOINT_SYMBOL, + PROP_DATAPOINT_SYMBOL_PROP, PROP_DATAPOINT_OFFSET, PROP_DATAPOINT_DATA_CAPTION, PROP_DATAPOINT_NUMBER_FORMAT |