[Libreoffice-commits] core.git: chart2/source solenv/clang-format
chart2/source/inc/ChartTypeHelper.hxx |3 ++-
chart2/source/inc/DataSeriesProperties.hxx|4 ++--
chart2/source/model/main/DataSeries.cxx |2 +-
chart2/source/model/main/DataSeriesProperties.cxx |2 +-
chart2/source/tools/ChartTypeHelper.cxx | 10 +-
solenv/clang-format/excludelist |2 +-
6 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit 856e6627c21b84a0b9ab2e3cb95a5a57864854e8
Author: Noel Grandin
AuthorDate: Wed Mar 29 08:49:42 2023 +0200
Commit: Noel Grandin
CommitDate: Wed Mar 29 12:50:32 2023 +
use more concrete types in chart2
Change-Id: I938aa1d6d3c20b35d9e11818d4b641d8a03decaa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149684
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/inc/ChartTypeHelper.hxx
b/chart2/source/inc/ChartTypeHelper.hxx
index cd5985f9a51c..379f96ad0e44 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -29,6 +29,7 @@ namespace com::sun::star::chart2 { class XDataSeries; }
namespace chart
{
class ChartType;
+class DataSeries;
class OOO_DLLPUBLIC_CHARTTOOLS ChartTypeHelper
{
@@ -56,7 +57,7 @@ public:
//returns sequence of css::chart::DataLabelPlacement
static css::uno::Sequence < sal_Int32 > getSupportedLabelPlacements(
const rtl::Reference< ::chart::ChartType >& xChartType, bool bSwapXAndY
-, const css::uno::Reference< css::chart2::XDataSeries >& xSeries );
+, const rtl::Reference< ::chart::DataSeries >& xSeries );
//returns sequence of css::chart::MissingValueTreatment
static css::uno::Sequence < sal_Int32 > getSupportedMissingValueTreatments(
diff --git a/chart2/source/model/main/DataSeriesProperties.hxx
b/chart2/source/inc/DataSeriesProperties.hxx
similarity index 96%
rename from chart2/source/model/main/DataSeriesProperties.hxx
rename to chart2/source/inc/DataSeriesProperties.hxx
index 13636d442fb5..7d36721ef066 100644
--- a/chart2/source/model/main/DataSeriesProperties.hxx
+++ b/chart2/source/inc/DataSeriesProperties.hxx
@@ -18,8 +18,8 @@
*/
#pragma once
-#include
-#include
+#include "PropertyHelper.hxx"
+#include "FastPropertyIdRanges.hxx"
#include
diff --git a/chart2/source/model/main/DataSeries.cxx
b/chart2/source/model/main/DataSeries.cxx
index 9008ab8e664b..38f2c474b47a 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -18,7 +18,7 @@
*/
#include
-#include "DataSeriesProperties.hxx"
+#include
#include "DataPointProperties.hxx"
#include
#include
diff --git a/chart2/source/model/main/DataSeriesProperties.cxx
b/chart2/source/model/main/DataSeriesProperties.cxx
index d85d264753c1..92201a3544fe 100644
--- a/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/chart2/source/model/main/DataSeriesProperties.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "DataSeriesProperties.hxx"
+#include
#include "DataPointProperties.hxx"
#include
#include
diff --git a/chart2/source/tools/ChartTypeHelper.cxx
b/chart2/source/tools/ChartTypeHelper.cxx
index 92b0337b917f..b393b344fb0d 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
#include
#include
@@ -33,6 +34,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
+using namespace ::chart::DataSeriesProperties;
namespace chart
{
@@ -240,7 +242,7 @@ bool ChartTypeHelper::isSupportingBarConnectors(
uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements(
const rtl::Reference< ChartType >& xChartType
,
bool bSwapXAndY
- ,
const uno::Reference< chart2::XDataSeries >& xSeries )
+ ,
const rtl::Reference< DataSeries >& xSeries )
{
uno::Sequence < sal_Int32 > aRet;
if( !xChartType.is() )
@@ -288,9 +290,8 @@ uno::Sequence < sal_Int32 >
ChartTypeHelper::getSupportedLabelPlacements( const
bool bStacked = false;
{
-uno::Reference< beans::XPropertySet > xSeriesProp( xSeries,
uno::UNO_QUERY );
chart2::StackingDirection eStacking =
chart2::StackingDirection_NO_STACKING;
-xSeriesProp->getPropertyValue( "StackingDirection" ) >>= eStacking;
+xSeries->getFastPropertyValue( PROP_DATASERIES_STACKING_DIRECTION
) >>= eStacking; // "StackingDirection"
bStacked = (eStacking == chart2::StackingDirection_Y_STACKING);
}
@@ -319,9 +320,8 @@ uno::Sequence < sal_Int32 >
ChartTypeHelper::getSupportedLabelPlacements( const
{
bool bStacked =
[Libreoffice-commits] core.git: chart2/source solenv/clang-format
chart2/source/inc/Title.hxx |4 -
chart2/source/model/main/Title.cxx |2
chart2/source/tools/TitleHelper.cxx | 104
solenv/clang-format/excludelist |2
4 files changed, 52 insertions(+), 60 deletions(-)
New commits:
commit 8d00d5f36454e202586df4e2dafb12c7195b7a1f
Author: Noel Grandin
AuthorDate: Sun May 22 20:19:31 2022 +0200
Commit: Noel Grandin
CommitDate: Mon May 23 11:58:54 2022 +0200
instantiate Title directly in chart
which simplifies some code
Change-Id: I0c9aa212334a3dedd8a54f8deda6100d93b0be70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134743
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/inc/Title.hxx
similarity index 98%
rename from chart2/source/model/main/Title.hxx
rename to chart2/source/inc/Title.hxx
index 426fd5ef4219..091c558dba44 100644
--- a/chart2/source/model/main/Title.hxx
+++ b/chart2/source/inc/Title.hxx
@@ -18,14 +18,14 @@
*/
#pragma once
-#include
+#include "OPropertySet.hxx"
#include
#include
#include
#include
#include
#include
-#include
+#include "ModifyListenerHelper.hxx"
namespace chart
{
diff --git a/chart2/source/model/main/Title.cxx
b/chart2/source/model/main/Title.cxx
index ab32d7a306e6..98004e30a2d4 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Title.hxx"
+#include
#include
#include
#include
diff --git a/chart2/source/tools/TitleHelper.cxx
b/chart2/source/tools/TitleHelper.cxx
index ece3ec239d1b..943adace7913 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
#include
@@ -197,7 +198,7 @@ uno::Reference< XTitle > TitleHelper::createTitle(
, const uno::Reference< uno::XComponentContext > & xContext
, ReferenceSizeProvider * pRefSizeProvider )
{
-uno::Reference< XTitle > xTitle;
+rtl::Reference< ::chart::Title > xTitle;
uno::Reference< XTitled > xTitled( lcl_getTitleParent( eTitleType, xModel
) );
if( !xTitled.is() )
@@ -226,71 +227,62 @@ uno::Reference< XTitle > TitleHelper::createTitle(
{
rtl::Reference< Diagram > xDiagram( ChartModelHelper::findDiagram(
xModel ) );
-xTitle.set( xContext->getServiceManager()->createInstanceWithContext(
-"com.sun.star.chart2.Title",
-xContext ), uno::UNO_QUERY );
+xTitle = new ::chart::Title();
-if(xTitle.is())
+// default char height (main: 13.0 == default)
+float fDefaultCharHeightSub = 11.0;
+float fDefaultCharHeightAxis = 9.0;
+switch( eTitleType )
{
-// default char height (main: 13.0 == default)
-float fDefaultCharHeightSub = 11.0;
-float fDefaultCharHeightAxis = 9.0;
-switch( eTitleType )
-{
-case TitleHelper::SUB_TITLE:
-TitleHelper::setCompleteString(
-rTitleText, xTitle, xContext, & fDefaultCharHeightSub
);
-break;
-case TitleHelper::X_AXIS_TITLE:
-case TitleHelper::Y_AXIS_TITLE:
-case TitleHelper::Z_AXIS_TITLE:
-case TitleHelper::TITLE_AT_STANDARD_X_AXIS_POSITION:
-case TitleHelper::TITLE_AT_STANDARD_Y_AXIS_POSITION:
-case TitleHelper::SECONDARY_X_AXIS_TITLE:
-case TitleHelper::SECONDARY_Y_AXIS_TITLE:
-TitleHelper::setCompleteString(
-rTitleText, xTitle, xContext, & fDefaultCharHeightAxis
);
-break;
-default:
-TitleHelper::setCompleteString( rTitleText, xTitle,
xContext );
-break;
-}
+case TitleHelper::SUB_TITLE:
+TitleHelper::setCompleteString(
+rTitleText, xTitle, xContext, & fDefaultCharHeightSub );
+break;
+case TitleHelper::X_AXIS_TITLE:
+case TitleHelper::Y_AXIS_TITLE:
+case TitleHelper::Z_AXIS_TITLE:
+case TitleHelper::TITLE_AT_STANDARD_X_AXIS_POSITION:
+case TitleHelper::TITLE_AT_STANDARD_Y_AXIS_POSITION:
+case TitleHelper::SECONDARY_X_AXIS_TITLE:
+case TitleHelper::SECONDARY_Y_AXIS_TITLE:
+TitleHelper::setCompleteString(
+rTitleText, xTitle, xContext, & fDefaultCharHeightAxis );
+break;
+default:
+TitleHelper::setCompleteString( rTitleText, xTitle, xContext );
+break;
+}
-// set/clear autoscale
-if( pRefSizeProvider )
-
[Libreoffice-commits] core.git: chart2/source solenv/clang-format
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx |8 chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx |7 chart2/source/controller/dialogs/ObjectNameProvider.cxx |3 chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx |4 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |3 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |9 chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx |7 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |3 chart2/source/controller/main/ChartController_Insert.cxx |3 chart2/source/controller/main/ChartController_Properties.cxx | 11 chart2/source/controller/main/ChartController_Tools.cxx |3 chart2/source/controller/main/ChartController_Window.cxx |8 chart2/source/controller/main/ControllerCommandDispatch.cxx |1 chart2/source/controller/main/ObjectHierarchy.cxx | 16 chart2/source/controller/sidebar/ChartAxisPanel.cxx | 21 chart2/source/inc/Axis.hxx |9 chart2/source/inc/AxisHelper.hxx | 51 + chart2/source/inc/BaseCoordinateSystem.hxx |6 chart2/source/inc/ChartType.hxx |4 chart2/source/inc/Diagram.hxx |2 chart2/source/inc/DiagramHelper.hxx |5 chart2/source/inc/ObjectIdentifier.hxx |6 chart2/source/model/main/Axis.cxx |2 chart2/source/model/main/BaseCoordinateSystem.cxx | 48 + chart2/source/model/main/Diagram.cxx | 22 chart2/source/model/template/BubbleChartType.cxx |3 chart2/source/model/template/ChartType.cxx |9 chart2/source/model/template/ChartTypeTemplate.cxx | 35 - chart2/source/model/template/NetChartType.cxx |5 chart2/source/model/template/PieChartType.cxx |3 chart2/source/model/template/PieChartTypeTemplate.cxx |5 chart2/source/model/template/ScatterChartType.cxx |3 chart2/source/tools/AxisHelper.cxx | 277 ++ chart2/source/tools/DataSeriesHelper.cxx |9 chart2/source/tools/DiagramHelper.cxx | 33 - chart2/source/tools/ExplicitCategoriesProvider.cxx |9 chart2/source/tools/ObjectIdentifier.cxx | 37 + chart2/source/tools/ReferenceSizeProvider.cxx | 29 - chart2/source/tools/TitleHelper.cxx | 18 chart2/source/view/axes/VCartesianCoordinateSystem.cxx |5 chart2/source/view/axes/VCoordinateSystem.cxx |5 chart2/source/view/axes/VPolarCoordinateSystem.cxx |5 chart2/source/view/inc/VCoordinateSystem.hxx |4 chart2/source/view/main/ChartView.cxx | 15 solenv/clang-format/excludelist |2 45 files changed, 511 insertions(+), 262 deletions(-) New commits: commit 333ccb081b4ab62adce50ca4c93162b9baf984d0 Author: Noel Grandin AuthorDate: Sat Feb 5 14:58:07 2022 +0200 Commit: Noel Grandin CommitDate: Sat Feb 5 20:39:03 2022 +0100 use more concrete types in chart2, Axis Change-Id: If80b6487ad2b8ac75f98f798b839aff2b8a5c23e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129522 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index db3e413ba919..21f952069205 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -18,6 +18,7 @@
[Libreoffice-commits] core.git: chart2/source solenv/clang-format
chart2/source/inc/ChartType.hxx | 13 ++
chart2/source/inc/DataSeries.hxx | 22 ++--
chart2/source/inc/DataSeriesHelper.hxx |4
chart2/source/model/template/ChartType.cxx | 39 ++-
chart2/source/tools/DataSeriesHelper.cxx | 31 ++
chart2/source/view/charttypes/VSeriesPlotter.cxx | 114 ++-
chart2/source/view/inc/VDataSeries.hxx |7 -
chart2/source/view/main/ChartView.cxx|9 -
chart2/source/view/main/VDataSeries.cxx | 19 +--
solenv/clang-format/excludelist |2
10 files changed, 161 insertions(+), 99 deletions(-)
New commits:
commit c496412631c950f081d7696867db907fa313653a
Author: Noel Grandin
AuthorDate: Sun Jan 30 12:27:56 2022 +0200
Commit: Noel Grandin
CommitDate: Sun Jan 30 20:48:02 2022 +0100
use more concrete types in chart2, DataSeries
Change-Id: Ida984d1701e2426958127845418365f6645a9043
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129161
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/inc/ChartType.hxx b/chart2/source/inc/ChartType.hxx
index 833fa9783993..4c95fac5a704 100644
--- a/chart2/source/inc/ChartType.hxx
+++ b/chart2/source/inc/ChartType.hxx
@@ -35,6 +35,7 @@
namespace chart
{
+class DataSeries;
class ModifyEventForwarder;
namespace impl
@@ -93,6 +94,14 @@ public:
virtual rtl::Reference cloneChartType() const = 0;
+void addDataSeries(
+const rtl::Reference< ::chart::DataSeries >& aDataSeries );
+void removeDataSeries(
+const rtl::Reference< ::chart::DataSeries >& aDataSeries );
+void setDataSeries(
+const std::vector< rtl::Reference< ::chart::DataSeries > >&
aDataSeries );
+const std::vector< rtl::Reference< ::chart::DataSeries > > &
getDataSeries2() const { return m_aDataSeries; }
+
protected:
// XModifyListener
@@ -124,11 +133,11 @@ protected:
private:
void impl_addDataSeriesWithoutNotification(
-const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries );
+const rtl::Reference< ::chart::DataSeries >& aDataSeries );
private:
typedef
-std::vector< css::uno::Reference< css::chart2::XDataSeries > >
tDataSeriesContainerType;
+std::vector< rtl::Reference< ::chart::DataSeries > >
tDataSeriesContainerType;
// --- mutable members: the following members need mutex guard ---
diff --git a/chart2/source/model/inc/DataSeries.hxx
b/chart2/source/inc/DataSeries.hxx
similarity index 97%
rename from chart2/source/model/inc/DataSeries.hxx
rename to chart2/source/inc/DataSeries.hxx
index a7a91325a605..64aab7ff8822 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/inc/DataSeries.hxx
@@ -30,13 +30,13 @@
#include
#include
#include
-#include
+#include "ModifyListenerHelper.hxx"
// STL
#include
#include
-#include
+#include "OPropertySet.hxx"
namespace com::sun::star::beans { class XPropertySet; }
@@ -77,12 +77,8 @@ public:
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
-private:
explicit DataSeries( const DataSeries & rOther );
-// late initialization to call after copy-constructing
-void Init( const DataSeries & rOther );
-
// XDataSeries
/// @see css::chart2::XDataSeries
virtual css::uno::Reference< css::beans::XPropertySet >
@@ -134,6 +130,17 @@ private:
virtual void SAL_CALL removeModifyListener(
const css::uno::Reference< css::util::XModifyListener >& aListener )
override;
+typedef
+std::vector< rtl::Reference< ::chart::RegressionCurveModel > >
+tRegressionCurveContainerType;
+
+const tRegressionCurveContainerType & getRegressionCurves2() const {
return m_aRegressionCurves; }
+
+private:
+
+// late initialization to call after copy-constructing
+void Init( const DataSeries & rOther );
+
// XModifyListener
virtual void SAL_CALL modified(
const css::lang::EventObject& aEvent ) override;
@@ -155,9 +162,6 @@ private:
css::uno::Reference< css::beans::XPropertySet > >
tDataPointAttributeContainer;
tDataPointAttributeContainer m_aAttributedDataPoints;
-typedef
-std::vector< rtl::Reference< ::chart::RegressionCurveModel > >
-tRegressionCurveContainerType;
tRegressionCurveContainerType m_aRegressionCurves;
rtl::Reference m_xModifyEventForwarder;
diff --git a/chart2/source/inc/DataSeriesHelper.hxx
b/chart2/source/inc/DataSeriesHelper.hxx
index 8d2e7e3d5672..72d759afe008 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -39,6 +39,7 @@ namespace com::sun::star::uno { template class
Sequence; }
namespace chart { class BaseCoordinateSystem; }
namespace chart { class ChartType; }
namespace chart { class Diagram; }
+namespace chart { class
[Libreoffice-commits] core.git: chart2/source solenv/clang-format
chart2/source/inc/CloneHelper.hxx | 11 +-
chart2/source/inc/ModifyListenerHelper.hxx| 22 +
chart2/source/inc/RegressionCurveModel.hxx|6 +++--
chart2/source/model/inc/DataSeries.hxx|3 +-
chart2/source/model/main/DataSeries.cxx | 27 ++
chart2/source/tools/RegressionCurveHelper.cxx |2 -
chart2/source/tools/RegressionCurveModel.cxx |2 -
solenv/clang-format/excludelist |2 -
8 files changed, 60 insertions(+), 15 deletions(-)
New commits:
commit 026e2f437e969d75209ed05211e7f02349035b98
Author: Noel Grandin
AuthorDate: Sun Jan 30 08:34:22 2022 +0200
Commit: Noel Grandin
CommitDate: Sun Jan 30 16:02:18 2022 +0100
use more concrete types in chart2, RegressionCurveModel
Change-Id: Ib4a5198f425577307ba437c73c61408b88d83dc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129160
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/inc/CloneHelper.hxx
b/chart2/source/inc/CloneHelper.hxx
index d9771a2681f2..c0896efb5c7b 100644
--- a/chart2/source/inc/CloneHelper.hxx
+++ b/chart2/source/inc/CloneHelper.hxx
@@ -19,7 +19,7 @@
#pragma once
#include
-
+#include
#include
#include
#include
@@ -54,6 +54,15 @@ template< class Interface >
CreateRefClone< Interface >());
}
+template< class T >
+void CloneRefVector(
+const std::vector< rtl::Reference< T > > & rSource,
+std::vector< rtl::Reference< T > > & rDestination )
+{
+for (const auto & rSourceItem : rSource)
+
rDestination.push_back(static_cast(rSourceItem->createClone().get()));
+}
+
/// clones a UNO-sequence of UNO-References
template< class Interface >
void CloneRefSequence(
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx
b/chart2/source/inc/ModifyListenerHelper.hxx
index abee24032bae..de407f2ba137 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -176,6 +176,17 @@ void addListenerToAllElements(
impl::addListenerFunctor< typename
Container::value_type >( xListener ));
}
+template< class T >
+void addListenerToAllElements(
+const std::vector> & rContainer,
+const css::uno::Reference< css::util::XModifyListener > & xListener )
+{
+if( !xListener )
+return;
+for (auto const & i : rContainer)
+i->addModifyListener(xListener);
+}
+
template< class Container >
void addListenerToAllMapElements(
const Container & rContainer,
@@ -227,6 +238,17 @@ void removeListenerFromAllElements(
impl::removeListenerFunctor< typename
Container::value_type >( xListener ));
}
+template< class T >
+void removeListenerFromAllElements(
+const std::vector> & rContainer,
+const css::uno::Reference< css::util::XModifyListener > & xListener )
+{
+if( !xListener )
+return;
+for (auto const & i : rContainer)
+i->removeModifyListener(xListener);
+}
+
template< class Container >
void removeListenerFromAllMapElements(
const Container & rContainer,
diff --git a/chart2/source/tools/RegressionCurveModel.hxx
b/chart2/source/inc/RegressionCurveModel.hxx
similarity index 99%
rename from chart2/source/tools/RegressionCurveModel.hxx
rename to chart2/source/inc/RegressionCurveModel.hxx
index 73c2439f01e7..5c32ae5e6215 100644
--- a/chart2/source/tools/RegressionCurveModel.hxx
+++ b/chart2/source/inc/RegressionCurveModel.hxx
@@ -18,7 +18,7 @@
*/
#pragma once
-#include
+#include "OPropertySet.hxx"
#include
#include
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include "ModifyListenerHelper.hxx"
namespace chart
{
@@ -83,6 +83,7 @@ protected:
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo() override;
+public:
// XRegressionCurve
virtual css::uno::Reference< css::chart2::XRegressionCurveCalculator >
SAL_CALL getCalculator() override;
virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
getEquationProperties() override;
@@ -98,6 +99,7 @@ protected:
virtual void SAL_CALL removeModifyListener(
const css::uno::Reference< css::util::XModifyListener >& aListener )
override;
+protected:
// XModifyListener
virtual void SAL_CALL modified(
const css::lang::EventObject& aEvent ) override;
diff --git a/chart2/source/model/inc/DataSeries.hxx
b/chart2/source/model/inc/DataSeries.hxx
index eae00d7da153..a7a91325a605 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -42,6 +42,7 @@ namespace com::sun::star::beans { class XPropertySet; }
namespace chart
{
+class RegressionCurveModel;
namespace impl
{
@@ -155,7 +156,7 @@ private:
tDataPointAttributeContainer m_aAttributedDataPoints;
typedef
-std::vector<
[Libreoffice-commits] core.git: chart2/source solenv/clang-format
chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx |5
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 16 +-
chart2/source/controller/dialogs/res_LegendPosition.cxx |3
chart2/source/controller/main/ChartController_Insert.cxx |1
chart2/source/controller/main/ChartController_Tools.cxx |5
chart2/source/controller/sidebar/ChartElementsPanel.cxx | 11 -
chart2/source/inc/Diagram.hxx |9 -
chart2/source/inc/Legend.hxx | 11 +
chart2/source/inc/LegendHelper.hxx|5
chart2/source/inc/ModifyListenerHelper.hxx| 17 ++
chart2/source/inc/ObjectIdentifier.hxx|4
chart2/source/model/main/Diagram.cxx | 13 +
chart2/source/model/main/Legend.cxx |2
chart2/source/tools/LegendHelper.cxx | 33 ++---
chart2/source/tools/ObjectIdentifier.cxx | 21 +++
chart2/source/view/main/ChartView.cxx |3
chart2/source/view/main/VLegend.cxx | 66
++
chart2/source/view/main/VLegend.hxx |7 -
solenv/clang-format/excludelist |2
19 files changed, 157 insertions(+), 77 deletions(-)
New commits:
commit 2781c7a50f3a9bcf48e84a8c5f450b16d576a8e6
Author: Noel Grandin
AuthorDate: Sat Jan 29 12:45:23 2022 +0200
Commit: Noel Grandin
CommitDate: Sat Jan 29 15:51:30 2022 +0100
use more concrete types in chart2, Legend
Change-Id: Ifbf8ddd92eacd4caaf6fdaa061821222e543a1a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129133
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 4d85f5c0c493..fe29d1990c99 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -19,6 +19,7 @@
#include "Chart2ModelContact.hxx"
#include
+#include
#include
#include
#include
@@ -229,7 +230,7 @@ awt::Size Chart2ModelContact::GetLegendSize() const
ExplicitValueProvider* pProvider( getExplicitValueProvider() );
if( pProvider )
{
-uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend(
*m_xChartModel.get() ) );
+rtl::Reference< Legend > xLegend = LegendHelper::getLegend(
*m_xChartModel.get() );
OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject(
xLegend, m_xChartModel ) );
aSize = ToSize( pProvider->getRectangleOfObject( aCID ) );
}
@@ -242,7 +243,7 @@ awt::Point Chart2ModelContact::GetLegendPosition() const
ExplicitValueProvider* pProvider( getExplicitValueProvider() );
if( pProvider )
{
-uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend(
*m_xChartModel.get() ) );
+rtl::Reference< Legend > xLegend = LegendHelper::getLegend(
*m_xChartModel.get() );
OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject(
xLegend, m_xChartModel ) );
aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) );
}
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index e75bd16e8e24..d27c5ec6bb93 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -464,15 +465,14 @@ void WrappedHasLegendProperty::setPropertyValue( const
Any& rOuterValue, const R
try
{
-Reference< chart2::XLegend > xLegend( LegendHelper::getLegend(
*m_spChart2ModelContact->getDocumentModel(),
m_spChart2ModelContact->m_xContext,bNewValue ));
+rtl::Reference< Legend > xLegend = LegendHelper::getLegend(
*m_spChart2ModelContact->getDocumentModel(),
m_spChart2ModelContact->m_xContext,bNewValue );
if(xLegend.is())
{
-Reference< beans::XPropertySet > xLegendProp( xLegend,
uno::UNO_QUERY_THROW );
bool bOldValue = true;
-Any aAOld = xLegendProp->getPropertyValue("Show");
+Any aAOld = xLegend->getPropertyValue("Show");
aAOld >>= bOldValue;
if( bOldValue != bNewValue )
-xLegendProp->setPropertyValue("Show", uno::Any( bNewValue ));
+xLegend->setPropertyValue("Show", uno::Any( bNewValue ));
}
}
catch (const uno::Exception&)
@@ -486,10 +486,10 @@ Any
[Libreoffice-commits] core.git: chart2/source solenv/clang-format
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx|1 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx|5 chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 51 +++ chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 21 +-- chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx | 51 +++ chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 21 +-- chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx |3 chart2/source/controller/dialogs/DataBrowserModel.cxx | 12 - chart2/source/controller/dialogs/DialogModel.cxx | 13 + chart2/source/controller/dialogs/ObjectNameProvider.cxx|3 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |3 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx |1 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |1 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |3 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 39 ++--- chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |3 chart2/source/controller/main/ChartController_Properties.cxx |3 chart2/source/controller/main/ChartController_Window.cxx | 19 +- chart2/source/controller/main/ControllerCommandDispatch.cxx|3 chart2/source/controller/main/DragMethod_RotateDiagram.cxx |1 chart2/source/controller/main/ObjectHierarchy.cxx |3 chart2/source/inc/AxisHelper.hxx |5 chart2/source/inc/BaseCoordinateSystem.hxx |5 chart2/source/inc/ChartModelHelper.hxx |4 chart2/source/inc/ChartType.hxx| 11 + chart2/source/inc/ChartTypeHelper.hxx |3 chart2/source/inc/ChartTypeTemplate.hxx| 17 +- chart2/source/inc/DiagramHelper.hxx|8 - chart2/source/model/main/BaseCoordinateSystem.cxx | 37 +++-- chart2/source/model/template/AreaChartType.cxx |5 chart2/source/model/template/AreaChartType.hxx |4 chart2/source/model/template/BarChartType.cxx |5 chart2/source/model/template/BarChartType.hxx |4 chart2/source/model/template/BubbleChartType.cxx |5 chart2/source/model/template/BubbleChartType.hxx |4 chart2/source/model/template/CandleStickChartType.cxx |5 chart2/source/model/template/CandleStickChartType.hxx |4 chart2/source/model/template/ChartType.cxx |2 chart2/source/model/template/ChartTypeTemplate.cxx | 66 +++--- chart2/source/model/template/ColumnChartType.cxx |5 chart2/source/model/template/ColumnChartType.hxx |4 chart2/source/model/template/ColumnLineChartTypeTemplate.cxx |2 chart2/source/model/template/ColumnLineChartTypeTemplate.hxx |4 chart2/source/model/template/FilledNetChartType.cxx|5 chart2/source/model/template/FilledNetChartType.hxx|2 chart2/source/model/template/LineChartType.cxx |5 chart2/source/model/template/LineChartType.hxx |4 chart2/source/model/template/LineChartTypeTemplate.cxx | 12 - chart2/source/model/template/NetChartType.cxx |5 chart2/source/model/template/NetChartType.hxx |4 chart2/source/model/template/NetChartTypeTemplate.cxx |5 chart2/source/model/template/PieChartType.cxx |5 chart2/source/model/template/PieChartType.hxx |4 chart2/source/model/template/PieChartTypeTemplate.cxx |7 - chart2/source/model/template/PieChartTypeTemplate.hxx |4 chart2/source/model/template/ScatterChartType.cxx |5 chart2/source/model/template/ScatterChartType.hxx |4 chart2/source/model/template/ScatterChartTypeTemplate.cxx |6 chart2/source/model/template/StockChartTypeTemplate.cxx|2 chart2/source/model/template/StockChartTypeTemplate.hxx|4 chart2/source/tools/AxisHelper.cxx | 20 +-- chart2/source/tools/ChartModelHelper.cxx
[Libreoffice-commits] core.git: chart2/source solenv/clang-format
chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx|1 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx |1 chart2/source/controller/chartapiwrapper/GridWrapper.cxx |1 chart2/source/controller/dialogs/ChartTypeDialogController.cxx |1 chart2/source/controller/dialogs/DataBrowserModel.cxx |1 chart2/source/controller/dialogs/ObjectNameProvider.cxx|1 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |3 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |3 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |1 chart2/source/inc/AxisHelper.hxx |6 - chart2/source/inc/BaseCoordinateSystem.hxx |7 - chart2/source/inc/ChartModelHelper.hxx |5 chart2/source/inc/DataSeriesHelper.hxx |4 chart2/source/inc/Diagram.hxx | 11 +- chart2/source/model/inc/CartesianCoordinateSystem.hxx |2 chart2/source/model/inc/PolarCoordinateSystem.hxx |2 chart2/source/model/main/ChartModel_Persistence.cxx|1 chart2/source/model/main/Diagram.cxx | 55 -- chart2/source/model/template/BubbleChartType.cxx |4 chart2/source/model/template/ChartType.cxx |4 chart2/source/model/template/NetChartType.cxx |4 chart2/source/model/template/PieChartType.cxx |4 chart2/source/model/template/ScatterChartType.cxx |4 chart2/source/tools/AxisHelper.cxx | 44 chart2/source/tools/ChartModelHelper.cxx | 31 ++--- chart2/source/tools/DataSeriesHelper.cxx | 22 ++-- chart2/source/tools/DiagramHelper.cxx |3 chart2/source/tools/ExplicitCategoriesProvider.cxx |3 chart2/source/tools/InternalDataProvider.cxx |1 chart2/source/tools/ObjectIdentifier.cxx |3 chart2/source/view/axes/VCartesianCoordinateSystem.cxx |3 chart2/source/view/axes/VCartesianCoordinateSystem.hxx |2 chart2/source/view/axes/VCoordinateSystem.cxx | 10 - chart2/source/view/axes/VPolarCoordinateSystem.cxx |3 chart2/source/view/axes/VPolarCoordinateSystem.hxx |2 chart2/source/view/inc/VCoordinateSystem.hxx | 12 +- chart2/source/view/main/ChartView.cxx | 39 ++- solenv/clang-format/excludelist|2 38 files changed, 162 insertions(+), 144 deletions(-) New commits: commit 2064cdb1cd908a3ee55a54f0aeb4aee15f7c12da Author: Noel Grandin AuthorDate: Wed Jan 19 15:15:28 2022 +0200 Commit: Noel Grandin CommitDate: Wed Jan 19 20:00:25 2022 +0100 use more concrete types in chart2, BaseCoordinateSystem Change-Id: I1c246a3ea37595647ac254f492170a9e18540794 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128623 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index f00c812678b4..c943bd4e085f 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index bc5557b61a17..44bcaa623d11 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -31,6 +31,7 @@ #include #include #include "Chart2ModelContact.hxx" +#include #include diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index 6c88024a7d08..0cf33baa5848 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -21,6 +21,7 @@ #include #include "Chart2ModelContact.hxx" #include +#include #include #include diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index
[Libreoffice-commits] core.git: chart2/source solenv/clang-format
chart2/source/controller/dialogs/res_BarGeometry.cxx |2
chart2/source/controller/dialogs/tp_ChartType.cxx | 566
chart2/source/controller/dialogs/tp_PointGeometry.cxx |2
chart2/source/inc/ChartResourceGroups.hxx | 603 ++
chart2/source/inc/res_BarGeometry.hxx |7
solenv/clang-format/blacklist |1
6 files changed, 610 insertions(+), 571 deletions(-)
New commits:
commit e3b75f6c275b0f43806cef02414b0b76f2e443d0
Author: Muhammet Kara
AuthorDate: Mon Nov 11 20:19:55 2019 +0300
Commit: Muhammet Kara
CommitDate: Wed Nov 13 01:49:36 2019 +0100
chart2: Separate ChartResourceGroups to reuse
Change-Id: I0ca2ea9cd520013250faaba0e17e713da1e6fca3
Reviewed-on: https://gerrit.libreoffice.org/81581
Reviewed-by: Muhammet Kara
Tested-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/82462
Tested-by: Jenkins
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx
b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index ccd9e7b6c9c6..6b0a7eac2208 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "res_BarGeometry.hxx"
+#include
#include
#include
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index a9db960a0417..98a44f8f24f7 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -18,11 +18,12 @@
*/
#include "tp_ChartType.hxx"
+#include
#include
#include
#include
#include
-#include "res_BarGeometry.hxx"
+#include
#include
#include
#include
@@ -38,569 +39,6 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-enum {
-POS_3DSCHEME_SIMPLE= 0,
-POS_3DSCHEME_REALISTIC = 1
-};
-
-class Dim3DLookResourceGroup : public ChangingResource
-{
-public:
-explicit Dim3DLookResourceGroup(weld::Builder* pBuilder);
-
-void showControls( bool bShow );
-
-void fillControls( const ChartTypeParameter& rParameter );
-void fillParameter( ChartTypeParameter& rParameter );
-
-private:
-DECL_LINK( Dim3DLookCheckHdl, weld::ToggleButton&, void );
-DECL_LINK( SelectSchemeHdl, weld::ComboBox&, void );
-
-private:
-std::unique_ptr m_xCB_3DLook;
-std::unique_ptr m_xLB_Scheme;
-};
-
-Dim3DLookResourceGroup::Dim3DLookResourceGroup(weld::Builder* pBuilder)
-: ChangingResource()
-, m_xCB_3DLook(pBuilder->weld_check_button("3dlook"))
-, m_xLB_Scheme(pBuilder->weld_combo_box("3dscheme"))
-{
-m_xCB_3DLook->connect_toggled( LINK( this, Dim3DLookResourceGroup,
Dim3DLookCheckHdl ) );
-m_xLB_Scheme->connect_changed( LINK( this, Dim3DLookResourceGroup,
SelectSchemeHdl ) );
-}
-
-void Dim3DLookResourceGroup::showControls( bool bShow )
-{
-m_xCB_3DLook->set_visible(bShow);
-m_xLB_Scheme->set_visible(bShow);
-}
-
-void Dim3DLookResourceGroup::fillControls( const ChartTypeParameter&
rParameter )
-{
-m_xCB_3DLook->set_active(rParameter.b3DLook);
-m_xLB_Scheme->set_sensitive(rParameter.b3DLook);
-
-if( rParameter.eThreeDLookScheme == ThreeDLookScheme_Simple )
-m_xLB_Scheme->set_active(POS_3DSCHEME_SIMPLE);
-else if( rParameter.eThreeDLookScheme == ThreeDLookScheme_Realistic )
-m_xLB_Scheme->set_active(POS_3DSCHEME_REALISTIC);
-else
-m_xLB_Scheme->set_active(-1);
-}
-
-void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter )
-{
-rParameter.b3DLook = m_xCB_3DLook->get_active();
-const int nPos = m_xLB_Scheme->get_active();
-if( nPos == POS_3DSCHEME_SIMPLE )
-rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple;
-else if( nPos == POS_3DSCHEME_REALISTIC )
-rParameter.eThreeDLookScheme = ThreeDLookScheme_Realistic;
-else
-rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown;
-}
-
-IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl,
weld::ToggleButton&, void)
-{
-if(m_pChangeListener)
-m_pChangeListener->stateChanged();
-}
-
-IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl, weld::ComboBox&, void)
-{
-if(m_pChangeListener)
-m_pChangeListener->stateChanged();
-}
-
-class SortByXValuesResourceGroup : public ChangingResource
-{
-public:
-explicit SortByXValuesResourceGroup(weld::Builder* pBuilder);
-
-void showControls( bool bShow );
-
-void fillControls( const ChartTypeParameter& rParameter );
-void fillParameter( ChartTypeParameter& rParameter );
-
-private:
-DECL_LINK(SortByXValuesCheckHdl, weld::ToggleButton&, void);
-
-private:
-std::unique_ptr m_xCB_XValueSorting;
-};
-
-SortByXValuesResourceGroup::SortByXValuesResourceGroup(weld::Builder* pBuilder)
-:
[Libreoffice-commits] core.git: chart2/source solenv/clang-format
chart2/source/controller/dialogs/ChangingResource.cxx |2
chart2/source/controller/dialogs/ChartTypeDialogController.cxx |2
chart2/source/controller/dialogs/ChartTypeDialogController.hxx | 298
chart2/source/controller/dialogs/dlg_CreationWizard.cxx|2
chart2/source/controller/dialogs/dlg_DataSource.cxx|2
chart2/source/controller/dialogs/tp_ChartType.hxx |4
chart2/source/controller/dialogs/tp_DataSource.cxx |2
chart2/source/controller/dialogs/tp_RangeChooser.cxx |2
chart2/source/inc/ChangingResource.hxx |3
chart2/source/inc/ChartTypeDialogController.hxx| 363
++
chart2/source/inc/ChartTypeTemplateProvider.hxx| 17
solenv/clang-format/blacklist |3
12 files changed, 386 insertions(+), 314 deletions(-)
New commits:
commit e63fdaa0d6eed45ad677c36e4a8301f606c603f5
Author: Muhammet Kara
AuthorDate: Mon Nov 11 20:04:30 2019 +0300
Commit: Muhammet Kara
CommitDate: Tue Nov 12 21:06:53 2019 +0100
chart2: Move some headers to inc
So that they will be accessible from
inside the sidebar dir.
Change-Id: Iaf7b1a800a3b35a5c497d8122f68c97c8cdc9eff
Reviewed-on: https://gerrit.libreoffice.org/80922
Reviewed-by: Muhammet Kara
Tested-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/82461
Tested-by: Jenkins
diff --git a/chart2/source/controller/dialogs/ChangingResource.cxx
b/chart2/source/controller/dialogs/ChangingResource.cxx
index 6e1ba1c67274..c50f274dadd4 100644
--- a/chart2/source/controller/dialogs/ChangingResource.cxx
+++ b/chart2/source/controller/dialogs/ChangingResource.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "ChangingResource.hxx"
+#include
namespace chart
{
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 541236e4fa40..bbbd5a882f24 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "ChartTypeDialogController.hxx"
+#include
#include
#include
#include
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
deleted file mode 100644
index 35953980578d..
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ /dev/null
@@ -1,298 +0,0 @@
-/* -*- 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 .
- */
-
-#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_CHARTTYPEDIALOGCONTROLLER_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_CHARTTYPEDIALOGCONTROLLER_HXX
-
-#include
-
-#include
-
-#include "ChangingResource.hxx"
-#include
-
-#include
-#include
-
-namespace com { namespace sun { namespace star { namespace beans { class
XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class
XChartDocument; } } } }
-namespace com { namespace sun { namespace star { namespace chart2 { class
XChartTypeTemplate; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class
XMultiServiceFactory; } } } }
-
-class SvtValueSet;
-
-namespace chart
-{
-
-enum GlobalStackMode
-{
-GlobalStackMode_NONE,
-GlobalStackMode_STACK_Y,
-GlobalStackMode_STACK_Y_PERCENT,
-GlobalStackMode_STACK_Z
-};
-
-class ChartTypeParameter
-{
-public:
-ChartTypeParameter( sal_Int32 nSubTypeIndex, bool bXAxisWithValues=false
-, bool b3DLook=false, GlobalStackMode
eStackMode=GlobalStackMode_NONE
-, bool _bSymbols = true, bool _bLines = true
-, css::chart2::CurveStyle eCurveStyle =
css::chart2::CurveStyle_LINES );
-ChartTypeParameter();
-
-bool mapsToSameService( const ChartTypeParameter& rParameter )
[Libreoffice-commits] core.git: chart2/source solenv/clang-format
chart2/source/controller/dialogs/DialogModel.cxx |7 -
chart2/source/controller/main/ChartController_Window.cxx |4
chart2/source/inc/ContainerHelper.hxx| 73 ---
chart2/source/model/main/BaseCoordinateSystem.cxx|3
chart2/source/model/main/DataSeries.cxx |5 -
chart2/source/model/main/Title.cxx | 13 +-
chart2/source/tools/DataSeriesHelper.cxx |9 -
chart2/source/tools/DiagramHelper.cxx|5 -
chart2/source/tools/ErrorBar.cxx |3
chart2/source/tools/InternalDataProvider.cxx |7 -
chart2/source/tools/PropertyHelper.cxx |4
chart2/source/tools/RegressionEquation.cxx |7 -
chart2/source/view/axes/VCoordinateSystem.cxx|3
solenv/clang-format/blacklist|1
14 files changed, 33 insertions(+), 111 deletions(-)
New commits:
commit 1bf1c56ce05a08e09c3f7def4962ef7f7ae885d9
Author: Arkadiy Illarionov
AuthorDate: Sun May 12 12:13:42 2019 +0300
Commit: Noel Grandin
CommitDate: Mon May 13 10:02:02 2019 +0200
Remove ContainerHelper.hxx
Use comphelper::sequenceToContainer instead of
ContainerHelper::SequenceToVector
Change-Id: I4834255a1349ac7a29127a84a54fcfa98d678d00
Reviewed-on: https://gerrit.libreoffice.org/72186
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index 11a616a34f8e..a363c6cc6fc8 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -24,7 +24,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -489,7 +488,7 @@ void addNewSeriesToContainer(
const Reference& xNewSeries )
{
Reference xSeriesCnt(xChartType,
uno::UNO_QUERY_THROW);
-std::vector > aSeries =
ContainerHelper::SequenceToVector(xSeriesCnt->getDataSeries());
+auto aSeries =
comphelper::sequenceToContainer
>>(xSeriesCnt->getDataSeries());
std::vector >::iterator aIt =
std::find( aSeries.begin(), aSeries.end(), xSeries);
@@ -819,8 +818,8 @@ void DialogModel::applyInterpretedData(
// data series
std::vector< Reference< XDataSeriesContainer > > aSeriesCnt(
getAllDataSeriesContainers());
-std::vector< Sequence< Reference< XDataSeries > > > aNewSeries(
-ContainerHelper::SequenceToVector( rNewData.Series ));
+auto aNewSeries(
+comphelper::sequenceToContainer > >>( rNewData.Series ));
OSL_ASSERT( aSeriesCnt.size() == aNewSeries.size());
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index f63126747058..c928be0e3a17 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -39,7 +39,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -63,6 +62,7 @@
#include
#include
#include
+#include
#include
@@ -1054,7 +1054,7 @@ void ChartController::execute_Command( const
CommandEvent& rCEvt )
{
if( bIsPoint )
{
-std::vector< sal_Int32 > aIndices(
ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) );
+auto aIndices(
comphelper::sequenceToContainer>(
aAttributedDataPointIndexList ) );
std::vector< sal_Int32 >::iterator aIt =
std::find( aIndices.begin(), aIndices.end(), nPointIndex );
if( aIt != aIndices.end())
bSelectedPointIsFormatted = true;
diff --git a/chart2/source/inc/ContainerHelper.hxx
b/chart2/source/inc/ContainerHelper.hxx
deleted file mode 100644
index 014d3c1033d5..
--- a/chart2/source/inc/ContainerHelper.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- 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
-
