summaryrefslogtreecommitdiff
path: root/chart2/source/tools
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/tools')
-rw-r--r--chart2/source/tools/AxisHelper.cxx10
-rw-r--r--chart2/source/tools/ErrorBar.cxx24
-rw-r--r--chart2/source/tools/LineProperties.cxx191
-rw-r--r--chart2/source/tools/LinePropertiesHelper.cxx174
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx8
-rw-r--r--chart2/source/tools/RegressionEquation.cxx8
6 files changed, 258 insertions, 157 deletions
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index a91d05ace485..8a769f808f3a 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -23,7 +23,7 @@
#include "ChartTypeHelper.hxx"
#include "macros.hxx"
#include "AxisIndexDefines.hxx"
-#include "LineProperties.hxx"
+#include "LinePropertiesHelper.hxx"
#include "ContainerHelper.hxx"
#include "servicenames_coosystems.hxx"
#include "DataSeriesHelper.hxx"
@@ -463,7 +463,7 @@ void AxisHelper::makeAxisVisible( const Reference< XAxis >& xAxis )
if( xProps.is() )
{
xProps->setPropertyValue( "Show", uno::makeAny( sal_True ) );
- LineProperties::SetLineVisible( xProps );
+ LinePropertiesHelper::SetLineVisible( xProps );
xProps->setPropertyValue( "DisplayLabels", uno::makeAny( sal_True ) );
}
}
@@ -473,7 +473,7 @@ void AxisHelper::makeGridVisible( const Reference< beans::XPropertySet >& xGridP
if( xGridProperties.is() )
{
xGridProperties->setPropertyValue( "Show", uno::makeAny( sal_True ) );
- LineProperties::SetLineVisible( xGridProperties );
+ LinePropertiesHelper::SetLineVisible( xGridProperties );
}
}
@@ -665,7 +665,7 @@ sal_Bool AxisHelper::isAxisVisible( const Reference< XAxis >& xAxis )
if( xProps.is() )
{
xProps->getPropertyValue( "Show" ) >>= bRet;
- bRet = bRet && ( LineProperties::IsLineVisible( xProps )
+ bRet = bRet && ( LinePropertiesHelper::IsLineVisible( xProps )
|| areAxisLabelsVisible( xProps ) );
}
@@ -689,7 +689,7 @@ sal_Bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& xGri
if( xGridProperies.is() )
{
xGridProperies->getPropertyValue( "Show" ) >>= bRet;
- bRet = bRet && LineProperties::IsLineVisible( xGridProperies );
+ bRet = bRet && LinePropertiesHelper::IsLineVisible( xGridProperies );
}
return bRet;
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 0c9132388e4a..c42d7640b309 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -30,14 +30,15 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart/ErrorBarStyle.hpp>
+#include <com/sun/star/drawing/LineStyle.hpp>
+#include <com/sun/star/util/Color.hpp>
+#include <com/sun/star/drawing/LineJoint.hpp>
+
#include <rtl/math.hxx>
#include <rtl/ustrbuf.hxx>
using namespace ::com::sun::star;
-using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
-
namespace
{
@@ -59,8 +60,12 @@ const SfxItemPropertySet* GetErrorBarPropertySet()
{MAP_CHAR_LEN("NegativeError"),3,&getCppuType((const double*)0), 0, 0},
{MAP_CHAR_LEN("ErrorBarStyle"),4,&getCppuType((sal_Int32*)0),0,0},
{MAP_CHAR_LEN("Weight"),5,&getCppuType((const double*)0),0,0},
- {MAP_CHAR_LEN(""),6,&getBooleanCppuType(), 0, 0},
- {MAP_CHAR_LEN(""),7,&getCppuType((OUString*)0),0,0},
+ {MAP_CHAR_LEN("LineStyle"),7,&getCppuType((com::sun::star::drawing::LineStyle*)0),0,0},
+ {MAP_CHAR_LEN("LineDashName"),7,&getCppuType((OUString*)0),0,0},
+ {MAP_CHAR_LEN("LineWidth"),7,&getCppuType((sal_Int32*)0),0,0},
+ {MAP_CHAR_LEN("LineColor"),7,&getCppuType((com::sun::star::util::Color*)0),0,0},
+ {MAP_CHAR_LEN("LineTransparence"),7,&getCppuType((sal_uInt8*)0),0,0},
+ {MAP_CHAR_LEN("LineJoint"),7,&getCppuType((com::sun::star::drawing::LineJoint*)0),0,0},
{0,0,0,0,0,0}
};
static SfxItemPropertySet aPropSet( aErrorBarPropertyMap_Impl );
@@ -79,6 +84,7 @@ uno::Reference< beans::XPropertySet > createErrorBar( const uno::Reference< uno:
ErrorBar::ErrorBar(
uno::Reference< uno::XComponentContext > const & xContext ) :
+ LineProperties(),
mbShowPositiveError(true),
mbShowNegativeError(true),
mfPositiveError(0),
@@ -91,6 +97,7 @@ ErrorBar::ErrorBar(
ErrorBar::ErrorBar( const ErrorBar & rOther ) :
MutexContainer(),
impl::ErrorBar_Base(),
+ LineProperties(rOther),
mbShowPositiveError(rOther.mbShowPositiveError),
mbShowNegativeError(rOther.mbShowNegativeError),
mfPositiveError(rOther.mfPositiveError),
@@ -143,7 +150,9 @@ void ErrorBar::setPropertyValue( const OUString& rPropName, const uno::Any& rAny
else if(rPropName == "ShowNegativeError")
rAny >>= mbShowNegativeError;
else
- SAL_WARN("chart2", "asked for property value: " << rPropName);
+ LineProperties::setPropertyValue(rPropName, rAny);
+
+ m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
uno::Any ErrorBar::getPropertyValue(const OUString& rPropName)
@@ -161,7 +170,8 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName)
else if(rPropName == "ShowNegativeError")
aRet <<= mbShowNegativeError;
else
- SAL_WARN("chart2", "asked for property value: " << rPropName);
+ aRet = LineProperties::getPropertyValue(rPropName);
+ SAL_WARN_IF(!aRet.hasValue(), "chart2", "asked for property value: " << rPropName);
return aRet;
}
diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx
index e3c88d9860c3..c7c94778bc84 100644
--- a/chart2/source/tools/LineProperties.cxx
+++ b/chart2/source/tools/LineProperties.cxx
@@ -5,170 +5,87 @@
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "LineProperties.hxx"
-#include "macros.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/drawing/LineDash.hpp>
-#include <com/sun/star/drawing/LineJoint.hpp>
-using namespace ::com::sun::star;
+using namespace com::sun::star;
-using ::com::sun::star::beans::Property;
-
-namespace chart
+LineProperties::LineProperties():
+ mnLineWidth(0),
+ meLineStyle(drawing::LineStyle_SOLID),
+ maLineColor(0),
+ mnLineTransparence(0),
+ meLineJoint(drawing::LineJoint_ROUND)
{
-
-void LineProperties::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
-{
- // Line Properties see service drawing::LineProperties
- // ---------------
- rOutProperties.push_back(
- Property( "LineStyle",
- PROP_LINE_STYLE,
- ::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
-
- rOutProperties.push_back(
- Property( "LineDash",
- PROP_LINE_DASH,
- ::getCppuType( reinterpret_cast< const drawing::LineDash * >(0)),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
-
-//not in service description
- rOutProperties.push_back(
- Property( "LineDashName",
- PROP_LINE_DASH_NAME,
- ::getCppuType( reinterpret_cast< const OUString * >(0)),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT
- | beans::PropertyAttribute::MAYBEVOID ));
-
- rOutProperties.push_back(
- Property( "LineColor",
- PROP_LINE_COLOR,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
-
- rOutProperties.push_back(
- Property( "LineTransparence",
- PROP_LINE_TRANSPARENCE,
- ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
-
- rOutProperties.push_back(
- Property( "LineWidth",
- PROP_LINE_WIDTH,
- ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
-
- rOutProperties.push_back(
- Property( "LineJoint",
- PROP_LINE_JOINT,
- ::getCppuType( reinterpret_cast< const drawing::LineJoint * >(0)),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
}
-void LineProperties::AddDefaultsToMap(
- ::chart::tPropertyValueMap & rOutMap )
+LineProperties::LineProperties(const LineProperties& r):
+ maDashName(r.maDashName),
+ mnLineWidth(r.mnLineWidth),
+ meLineStyle(r.meLineStyle),
+ maLineColor(r.maLineColor),
+ mnLineTransparence(r.mnLineTransparence),
+ meLineJoint(r.meLineJoint)
{
- ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINE_STYLE, drawing::LineStyle_SOLID );
- ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINE_WIDTH, 0 );
- ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINE_COLOR, 0x000000 ); // black
- ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_LINE_TRANSPARENCE, 0 );
- ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINE_JOINT, drawing::LineJoint_ROUND );
}
-bool LineProperties::IsLineVisible( const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet >& xLineProperties )
+uno::Any LineProperties::getPropertyValue(const OUString& rName)
{
- bool bRet = false;
- try
+ uno::Any aRet;
+ if(rName == "DashName")
{
- if( xLineProperties.is() )
- {
- drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID);
- xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle;
- if( aLineStyle != drawing::LineStyle_NONE )
- {
- sal_Int16 nLineTransparence=0;
- xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence;
- if(100!=nLineTransparence)
- {
- bRet = true;
- }
- }
- }
+ aRet <<= maDashName;
}
- catch( const uno::Exception & ex )
+ else if(rName == "LineWidth")
{
- ASSERT_EXCEPTION( ex );
+ aRet <<= mnLineWidth;
}
- return bRet;
-}
-
-void LineProperties::SetLineVisible( const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet >& xLineProperties )
-{
- try
+ else if(rName == "LineStyle")
{
- if( xLineProperties.is() )
- {
- drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID);
- xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle;
- if( aLineStyle == drawing::LineStyle_NONE )
- xLineProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) );
-
- sal_Int16 nLineTransparence=0;
- xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence;
- if(100==nLineTransparence)
- xLineProperties->setPropertyValue( "LineTransparence", uno::makeAny( sal_Int16(0) ) );
- }
+ aRet = uno::makeAny(meLineStyle);
+ }
+ else if(rName == "LineColor")
+ {
+ aRet <<= maLineColor;
}
- catch( const uno::Exception & ex )
+ else if(rName == "LineTransparence")
{
- ASSERT_EXCEPTION( ex );
+ aRet <<= mnLineTransparence;
}
+ else if(rName == "LineJoint")
+ {
+ aRet <<= meLineJoint;
+ }
+ return aRet;
}
-void LineProperties::SetLineInvisible( const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet >& xLineProperties )
+void LineProperties::setPropertyValue(const OUString& rName, const uno::Any& rAny)
{
- try
+ if(rName == "DashName")
+ {
+ rAny >>= maDashName;
+ }
+ else if(rName == "LineWidth")
{
- if( xLineProperties.is() )
- {
- drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID);
- xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle;
- if( aLineStyle != drawing::LineStyle_NONE )
- xLineProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) );
- }
+ rAny >>= mnLineWidth;
}
- catch( const uno::Exception & ex )
+ else if(rName == "LineStyle")
{
- ASSERT_EXCEPTION( ex );
+ rAny >>= meLineStyle;
+ }
+ else if(rName == "LineColor")
+ {
+ rAny >>= maLineColor;
+ }
+ else if(rName == "LineTransparence")
+ {
+ rAny >>= mnLineTransparence;
+ }
+ else if(rName == "LineJoint")
+ {
+ rAny >>= meLineJoint;
}
}
-} // namespace chart
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx
new file mode 100644
index 000000000000..a965fc3039d8
--- /dev/null
+++ b/chart2/source/tools/LinePropertiesHelper.cxx
@@ -0,0 +1,174 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "LinePropertiesHelper.hxx"
+#include "macros.hxx"
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/drawing/LineStyle.hpp>
+#include <com/sun/star/drawing/LineDash.hpp>
+#include <com/sun/star/drawing/LineJoint.hpp>
+
+using namespace ::com::sun::star;
+
+using ::com::sun::star::beans::Property;
+
+namespace chart
+{
+
+void LinePropertiesHelper::AddPropertiesToVector(
+ ::std::vector< Property > & rOutProperties )
+{
+ // Line Properties see service drawing::LineProperties
+ // ---------------
+ rOutProperties.push_back(
+ Property( "LineStyle",
+ PROP_LINE_STYLE,
+ ::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+
+ rOutProperties.push_back(
+ Property( "LineDash",
+ PROP_LINE_DASH,
+ ::getCppuType( reinterpret_cast< const drawing::LineDash * >(0)),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEVOID ));
+
+//not in service description
+ rOutProperties.push_back(
+ Property( "LineDashName",
+ PROP_LINE_DASH_NAME,
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT
+ | beans::PropertyAttribute::MAYBEVOID ));
+
+ rOutProperties.push_back(
+ Property( "LineColor",
+ PROP_LINE_COLOR,
+ ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+
+ rOutProperties.push_back(
+ Property( "LineTransparence",
+ PROP_LINE_TRANSPARENCE,
+ ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+
+ rOutProperties.push_back(
+ Property( "LineWidth",
+ PROP_LINE_WIDTH,
+ ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+
+ rOutProperties.push_back(
+ Property( "LineJoint",
+ PROP_LINE_JOINT,
+ ::getCppuType( reinterpret_cast< const drawing::LineJoint * >(0)),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+}
+
+void LinePropertiesHelper::AddDefaultsToMap(
+ ::chart::tPropertyValueMap & rOutMap )
+{
+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINE_STYLE, drawing::LineStyle_SOLID );
+ ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINE_WIDTH, 0 );
+ ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINE_COLOR, 0x000000 ); // black
+ ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_LINE_TRANSPARENCE, 0 );
+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINE_JOINT, drawing::LineJoint_ROUND );
+}
+
+bool LinePropertiesHelper::IsLineVisible( const ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet >& xLineProperties )
+{
+ bool bRet = false;
+ try
+ {
+ if( xLineProperties.is() )
+ {
+ drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID);
+ xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle;
+ if( aLineStyle != drawing::LineStyle_NONE )
+ {
+ sal_Int16 nLineTransparence=0;
+ xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence;
+ if(100!=nLineTransparence)
+ {
+ bRet = true;
+ }
+ }
+ }
+ }
+ catch( const uno::Exception & ex )
+ {
+ ASSERT_EXCEPTION( ex );
+ }
+ return bRet;
+}
+
+void LinePropertiesHelper::SetLineVisible( const ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet >& xLineProperties )
+{
+ try
+ {
+ if( xLineProperties.is() )
+ {
+ drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID);
+ xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle;
+ if( aLineStyle == drawing::LineStyle_NONE )
+ xLineProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) );
+
+ sal_Int16 nLineTransparence=0;
+ xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence;
+ if(100==nLineTransparence)
+ xLineProperties->setPropertyValue( "LineTransparence", uno::makeAny( sal_Int16(0) ) );
+ }
+ }
+ catch( const uno::Exception & ex )
+ {
+ ASSERT_EXCEPTION( ex );
+ }
+}
+
+void LinePropertiesHelper::SetLineInvisible( const ::com::sun::star::uno::Reference<
+ ::com::sun::star::beans::XPropertySet >& xLineProperties )
+{
+ try
+ {
+ if( xLineProperties.is() )
+ {
+ drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID);
+ xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle;
+ if( aLineStyle != drawing::LineStyle_NONE )
+ xLineProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+ }
+ }
+ catch( const uno::Exception & ex )
+ {
+ ASSERT_EXCEPTION( ex );
+ }
+}
+
+} // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 0522af8b4cc5..2dd96ed2be86 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -19,7 +19,7 @@
#include "RegressionCurveModel.hxx"
#include "macros.hxx"
-#include "LineProperties.hxx"
+#include "LinePropertiesHelper.hxx"
#include "RegressionCurveHelper.hxx"
#include "RegressionCalculationHelper.hxx"
#include "RegressionEquation.hxx"
@@ -62,7 +62,7 @@ struct StaticXXXDefaults_Initializer
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
- ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+ ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
}
};
@@ -82,7 +82,7 @@ private:
uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
- ::chart::LineProperties::AddPropertiesToVector( aProperties );
+ ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
@@ -126,7 +126,7 @@ RegressionCurveModel::RegressionCurveModel(
// set 0 line width (default) hard, so that it is always written to XML,
// because the old implementation uses different defaults
setFastPropertyValue_NoBroadcast(
- LineProperties::PROP_LINE_WIDTH, uno::makeAny( sal_Int32( 0 )));
+ LinePropertiesHelper::PROP_LINE_WIDTH, uno::makeAny( sal_Int32( 0 )));
ModifyListenerHelper::addListener( m_xEquationProperties, m_xModifyEventForwarder );
}
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 16f771a16729..e8bdfe9720d8 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -19,7 +19,7 @@
#include "RegressionEquation.hxx"
-#include "LineProperties.hxx"
+#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
#include "UserDefinedProperties.hxx"
#include "CharacterProperties.hxx"
@@ -109,7 +109,7 @@ struct StaticRegressionEquationDefaults_Initializer
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
- ::chart::LineProperties::AddDefaultsToMap( rOutMap );
+ ::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );
::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
@@ -119,7 +119,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 );
float fDefaultCharHeight = 10.0;
::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::CharacterProperties::PROP_CHAR_CHAR_HEIGHT, fDefaultCharHeight );
@@ -145,7 +145,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 );
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 05:58:54 +0000