diff options
| -rw-r--r-- | chart2/source/controller/main/ChartController_Properties.cxx | 10 | ||||
| -rw-r--r-- | chart2/source/model/main/DataPointProperties.cxx | 16 | ||||
| -rw-r--r-- | chart2/source/model/main/DataPointProperties.hxx | 7 |
3 files changed, 25 insertions, 8 deletions
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 3ecf666d314d..cf29e2720d01 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartController_Properties.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: bm $ $Date: 2003-11-25 13:07:52 $ + * last change: $Author: bm $ $Date: 2003-11-26 12:30:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -251,6 +251,10 @@ private: case OBJECTTYPE_DATA_LABEL: case OBJECTTYPE_DATA_POINT: { + ::std::auto_ptr< awt::Size > pRefSize; + if( pRefSizeProvider.get() ) + pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize())); + wrapper::GraphicPropertyItemConverter::eGraphicObjectType eMapTo = wrapper::GraphicPropertyItemConverter::FILLED_DATA_POINT; @@ -268,7 +272,7 @@ private: */ pItemConverter = new wrapper::DataPointItemConverter( xObjectProperties, rDrawModel.GetItemPool(), rDrawModel, - pNumberFormatterWrapper, eMapTo ); + pNumberFormatterWrapper, eMapTo, pRefSize ); break; } case OBJECTTYPE_DATA_ERRORS: diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 6d29b93a341d..3f9c1bbcd498 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.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-11-13 12:43:54 $ + * last change: $Author: bm $ $Date: 2003-11-26 12:31:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -274,6 +274,13 @@ void DataPointProperties::AddPropertiesToVector( ::getCppuType( reinterpret_cast< const chart2::NumberFormat * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); + + rOutProperties.push_back( + Property( C2U( "ReferenceDiagramSize" ), + PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE, + ::getCppuType( reinterpret_cast< const awt::Size * >(0)), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::MAYBEVOID )); } void DataPointProperties::AddDefaultsToMap( @@ -368,6 +375,11 @@ void DataPointProperties::AddDefaultsToMap( OSL_ASSERT( rOutMap.end() == rOutMap.find( PROP_DATAPOINT_NUMBER_FORMAT )); rOutMap[ PROP_DATAPOINT_NUMBER_FORMAT ] = uno::makeAny( aFormat ); + + // todo: default is just for testing. should be void + OSL_ASSERT( rOutMap.end() == rOutMap.find( PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE )); + rOutMap[ PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE ] = + uno::makeAny( awt::Size( 20000, 15000 ) ); } } // namespace chart diff --git a/chart2/source/model/main/DataPointProperties.hxx b/chart2/source/model/main/DataPointProperties.hxx index 5ce2f6de75b6..897fb3e0248b 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.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-11-12 10:45:02 $ + * last change: $Author: bm $ $Date: 2003-11-26 12:31:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,7 +109,8 @@ public: PROP_DATAPOINT_SYMBOL_PROP, PROP_DATAPOINT_OFFSET, PROP_DATAPOINT_DATA_CAPTION, - PROP_DATAPOINT_NUMBER_FORMAT + PROP_DATAPOINT_NUMBER_FORMAT, + PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE }; static void AddPropertiesToVector( |