summaryrefslogtreecommitdiff
path: root/chart2/source/model
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-04-21 02:49:04 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-04-22 13:57:31 +0200
commit4a4bdc142ab7a41b69512d54302851e7fbb3100b (patch)
tree3f2bb8413d74ff7fe5ba531a07fc5e64e9dbf280 /chart2/source/model
parentcabb933bc2d76dc184e2cdc4c039f7055b73d8d2 (diff)
fix the remaining issues with the changed handling of ErrorBar props
Change-Id: I75c839cbfccbe84e7aa98aef6959bcd0c5390ab6
Diffstat (limited to 'chart2/source/model')
-rw-r--r--chart2/source/model/main/Axis.cxx10
-rw-r--r--chart2/source/model/main/DataPointProperties.cxx18
-rw-r--r--chart2/source/model/main/GridProperties.cxx8
-rw-r--r--chart2/source/model/main/Legend.cxx6
-rw-r--r--chart2/source/model/main/PageBackground.cxx8
-rw-r--r--chart2/source/model/main/StockBar.cxx8
-rw-r--r--chart2/source/model/main/Title.cxx8
-rw-r--r--chart2/source/model/main/Wall.cxx8
8 files changed, 37 insertions, 37 deletions
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 59e3d126ea2a..35fcabb89571 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -21,7 +21,7 @@
#include "GridProperties.hxx"
#include "macros.hxx"
#include "CharacterProperties.hxx"
-#include "LineProperties.hxx"
+#include "LinePropertiesHelper.hxx"
#include "UserDefinedProperties.hxx"
#include "PropertyHelper.hxx"
#include "ContainerHelper.hxx"
@@ -194,7 +194,7 @@ private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
- ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+ ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_SHOW, true );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_AXIS_CROSSOVER_POSITION, ::com::sun::star::chart::ChartAxisPosition_ZERO );
@@ -235,7 +235,7 @@ private:
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
- ::chart::LineProperties::AddPropertiesToVector( aProperties );
+ ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
::std::sort( aProperties.begin(), aProperties.end(),
@@ -312,7 +312,7 @@ Axis::Axis( Reference< uno::XComponentContext > const & /* xContext */ ) :
{
osl_atomic_increment(&m_refCount);
setFastPropertyValue_NoBroadcast(
- ::chart::LineProperties::PROP_LINE_COLOR, uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
+ ::chart::LinePropertiesHelper::PROP_LINE_COLOR, uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30
if( m_xGrid.is())
ModifyListenerHelper::addListener( m_xGrid, m_xModifyEventForwarder );
@@ -405,7 +405,7 @@ void Axis::AllocateSubGrids()
for( sal_Int32 i = nOldSubIncCount; i < nNewSubIncCount; ++i )
{
m_aSubGridProperties[ i ] = new GridProperties();
- LineProperties::SetLineInvisible( m_aSubGridProperties[ i ] );
+ LinePropertiesHelper::SetLineInvisible( m_aSubGridProperties[ i ] );
aNewBroadcasters.push_back( m_aSubGridProperties[ i ] );
}
}
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index de4f0b6e62f4..32befb374889 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -19,7 +19,7 @@
#include "DataPointProperties.hxx"
#include "macros.hxx"
-#include "LineProperties.hxx"
+#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -158,25 +158,25 @@ void DataPointProperties::AddPropertiesToVector(
// ---------------
rOutProperties.push_back(
Property( "LineStyle",
- LineProperties::PROP_LINE_STYLE,
+ LinePropertiesHelper::PROP_LINE_STYLE,
::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "LineWidth",
- LineProperties::PROP_LINE_WIDTH,
+ LinePropertiesHelper::PROP_LINE_WIDTH,
::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
Property( "LineDash",
- LineProperties::PROP_LINE_DASH,
+ LinePropertiesHelper::PROP_LINE_DASH,
::getCppuType( reinterpret_cast< const drawing::LineDash * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
Property( "LineDashName",
- LineProperties::PROP_LINE_DASH_NAME,
+ LinePropertiesHelper::PROP_LINE_DASH_NAME,
::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
@@ -368,10 +368,10 @@ void DataPointProperties::AddDefaultsToMap(
PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_DATAPOINT_BORDER_TRANSPARENCY, 0 );
//line
- PropertyHelper::setPropertyValueDefault( rOutMap, LineProperties::PROP_LINE_STYLE, drawing::LineStyle_SOLID );
- PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, LineProperties::PROP_LINE_WIDTH, 0 );
- PropertyHelper::setPropertyValueDefault( rOutMap, LineProperties::PROP_LINE_DASH, drawing::LineDash());
- PropertyHelper::setEmptyPropertyValueDefault( rOutMap, LineProperties::PROP_LINE_DASH_NAME );
+ PropertyHelper::setPropertyValueDefault( rOutMap, LinePropertiesHelper::PROP_LINE_STYLE, drawing::LineStyle_SOLID );
+ PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, LinePropertiesHelper::PROP_LINE_WIDTH, 0 );
+ PropertyHelper::setPropertyValueDefault( rOutMap, LinePropertiesHelper::PROP_LINE_DASH, drawing::LineDash());
+ PropertyHelper::setEmptyPropertyValueDefault( rOutMap, LinePropertiesHelper::PROP_LINE_DASH_NAME );
//fill bitmap
PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, FillProperties::PROP_FILL_BITMAP_OFFSETX, 0 );
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index fd713a9aa5f2..27a444369d1d 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -19,7 +19,7 @@
#include "GridProperties.hxx"
-#include "LineProperties.hxx"
+#include "LinePropertiesHelper.hxx"
#include "UserDefinedProperties.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
@@ -70,13 +70,13 @@ struct StaticGridDefaults_Initializer
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
- ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+ ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_GRID_SHOW, false );
// override other defaults
::chart::PropertyHelper::setPropertyValue< sal_Int32 >(
- rOutMap, ::chart::LineProperties::PROP_LINE_COLOR, 0xb3b3b3 ); // gray30
+ rOutMap, ::chart::LinePropertiesHelper::PROP_LINE_COLOR, 0xb3b3b3 ); // gray30
}
};
@@ -97,7 +97,7 @@ private:
{
::std::vector< Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::chart::LineProperties::AddPropertiesToVector( aProperties );
+ ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
::std::sort( aProperties.begin(), aProperties.end(),
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 2173f933c7be..21d9e5c4a244 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -19,7 +19,7 @@
#include "Legend.hxx"
#include "macros.hxx"
-#include "LineProperties.hxx"
+#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
#include "CharacterProperties.hxx"
#include "UserDefinedProperties.hxx"
@@ -116,7 +116,7 @@ struct StaticLegendDefaults_Initializer
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
- ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+ ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );
::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
@@ -148,7 +148,7 @@ private:
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::chart::LineProperties::AddPropertiesToVector( aProperties );
+ ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 5728f9c26fef..d200ca510efb 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -19,7 +19,7 @@
#include "PageBackground.hxx"
#include "macros.hxx"
-#include "LineProperties.hxx"
+#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
#include "UserDefinedProperties.hxx"
#include "ContainerHelper.hxx"
@@ -53,12 +53,12 @@ struct StaticPageBackgroundDefaults_Initializer
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
- ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+ ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );
// override other defaults
::chart::PropertyHelper::setPropertyValue< sal_Int32 >( rOutMap, ::chart::FillProperties::PROP_FILL_COLOR, 0xffffff );
- ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LineProperties::PROP_LINE_STYLE, drawing::LineStyle_NONE );
+ ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LinePropertiesHelper::PROP_LINE_STYLE, drawing::LineStyle_NONE );
}
};
@@ -78,7 +78,7 @@ private:
uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
- ::chart::LineProperties::AddPropertiesToVector( aProperties );
+ ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index 02d63f9bc7ef..9cf832463e33 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -19,7 +19,7 @@
#include "StockBar.hxx"
-#include "LineProperties.hxx"
+#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
#include "UserDefinedProperties.hxx"
#include "PropertyHelper.hxx"
@@ -58,7 +58,7 @@ private:
uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
- ::chart::LineProperties::AddPropertiesToVector( aProperties );
+ ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
@@ -99,7 +99,7 @@ struct StaticStockBarDefaults_Initializer
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
- ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+ ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );
// override other defaults
@@ -129,7 +129,7 @@ StockBar::StockBar( bool bRisingCourse ) :
::chart::FillProperties::PROP_FILL_COLOR,
uno::makeAny( sal_Int32( 0x000000 ))); // black
setFastPropertyValue_NoBroadcast(
- ::chart::LineProperties::PROP_LINE_COLOR,
+ ::chart::LinePropertiesHelper::PROP_LINE_COLOR,
uno::makeAny( sal_Int32( 0xb3b3b3 ))); // gray30
}
}
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index bd127e899ed9..346a967058af 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -20,7 +20,7 @@
#include "Title.hxx"
#include "macros.hxx"
#include "FormattedString.hxx"
-#include "LineProperties.hxx"
+#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
#include "ContainerHelper.hxx"
#include "CloneHelper.hxx"
@@ -156,7 +156,7 @@ struct StaticTitleDefaults_Initializer
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
- ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+ ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );
// ParagraphProperties
@@ -176,7 +176,7 @@ private:
// override other defaults
::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE );
- ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LineProperties::PROP_LINE_STYLE, drawing::LineStyle_NONE );
+ ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LinePropertiesHelper::PROP_LINE_STYLE, drawing::LineStyle_NONE );
}
};
@@ -197,7 +197,7 @@ private:
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::chart::LineProperties::AddPropertiesToVector( aProperties );
+ ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::std::sort( aProperties.begin(), aProperties.end(),
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index cc80cf6351a0..1a666388bbf4 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -19,7 +19,7 @@
#include "Wall.hxx"
#include "macros.hxx"
-#include "LineProperties.hxx"
+#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
#include "UserDefinedProperties.hxx"
#include "ContainerHelper.hxx"
@@ -59,11 +59,11 @@ struct StaticWallDefaults_Initializer
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
- ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+ ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );
// override other defaults
- ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LineProperties::PROP_LINE_STYLE, drawing::LineStyle_NONE );
+ ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::LinePropertiesHelper::PROP_LINE_STYLE, drawing::LineStyle_NONE );
}
};
@@ -83,7 +83,7 @@ private:
uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
- ::chart::LineProperties::AddPropertiesToVector( aProperties );
+ ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );