chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 19 --------
chart2/source/model/main/DataTable.cxx | 27 +++++-------
2 files changed, 14 insertions(+), 32 deletions(-)
New commits:
commit 14553d280ad76c3436d394e900002c63de7b6e51
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri May 20 18:39:34 2022 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Jul 18 07:16:57 2022 +0200
chart2: better readable DataTable properties definition
Change-Id: Ib9cadee39f58b73782e6a3268d86b688183de1fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137157
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/chart2/source/model/main/DataTable.cxx
b/chart2/source/model/main/DataTable.cxx
index cfadc5fee0ae..cc07cc1b55f5 100644
--- a/chart2/source/model/main/DataTable.cxx
+++ b/chart2/source/model/main/DataTable.cxx
@@ -33,20 +33,19 @@ enum
DataTableProperty_Keys,
};
-void lcl_AddPropertiesToVector(std::vector<beans::Property>& rOutProperties)
-{
- rOutProperties.emplace_back(
- "HBorder", DataTableProperty_HorizontalBorder,
cppu::UnoType<bool>::get(),
- beans::PropertyAttribute::BOUND |
beans::PropertyAttribute::MAYBEDEFAULT);
- rOutProperties.emplace_back(
- "VBorder", DataTableProperty_VerticalBorder,
cppu::UnoType<bool>::get(),
- beans::PropertyAttribute::BOUND |
beans::PropertyAttribute::MAYBEDEFAULT);
- rOutProperties.emplace_back("Outline", DataTableProperty_Outilne,
cppu::UnoType<bool>::get(),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT);
- rOutProperties.emplace_back("Keys", DataTableProperty_Keys,
cppu::UnoType<bool>::get(),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT);
+void lcl_AddPropertiesToVector(std::vector<beans::Property>& rProps)
+{
+ auto const nBound = beans::PropertyAttribute::BOUND;
+ auto const nMaybeDefault = beans::PropertyAttribute::MAYBEDEFAULT;
+
+ rProps.emplace_back("HBorder", DataTableProperty_HorizontalBorder,
cppu::UnoType<bool>::get(),
+ nBound | nMaybeDefault);
+ rProps.emplace_back("VBorder", DataTableProperty_VerticalBorder,
cppu::UnoType<bool>::get(),
+ nBound | nMaybeDefault);
+ rProps.emplace_back("Outline", DataTableProperty_Outilne,
cppu::UnoType<bool>::get(),
+ nBound | nMaybeDefault);
+ rProps.emplace_back("Keys", DataTableProperty_Keys,
cppu::UnoType<bool>::get(),
+ nBound | nMaybeDefault);
}
struct StaticDataTableDefaults_Initializer
commit d518ac1e9ec866785a13367491c52d2ac72d85ec
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri May 20 18:20:51 2022 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Jul 18 07:16:44 2022 +0200
chart2: remove setting DataTable* props. from old chart::XDialog
No API change needed as the properties were not officialy part
of the API in the first place.
Change-Id: I8682087d13ab2e9eb1c619646b87cde59c3a8e45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137156
Tested-by: Tomaž Vajngerl <qui...@gmail.com>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index db1abe739787..0fea6c4da7f9 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -137,9 +137,6 @@ enum
PROP_DIAGRAM_HAS_SECOND_Y_AXIS_TITLE,
PROP_DIAGRAM_AUTOMATIC_SIZE,
- PROP_DIAGRAM_DATATABLEHBORDER,
- PROP_DIAGRAM_DATATABLEVBORDER,
- PROP_DIAGRAM_DATATABLEOUTLINE,
PROP_DIAGRAM_EXTERNALDATA
};
@@ -381,21 +378,7 @@ void lcl_AddPropertiesToVector(
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.emplace_back( "DataTableHBorder",
- PROP_DIAGRAM_DATATABLEHBORDER,
- cppu::UnoType<bool>::get(),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.emplace_back( "DataTableVBorder",
- PROP_DIAGRAM_DATATABLEVBORDER,
- cppu::UnoType<bool>::get(),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.emplace_back( "DataTableOutline",
- PROP_DIAGRAM_DATATABLEOUTLINE,
- cppu::UnoType<bool>::get(),
- beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT );
+
rOutProperties.emplace_back( "ExternalData",
PROP_DIAGRAM_EXTERNALDATA,
cppu::UnoType<OUString>::get(),
