chart2/source/view/axes/VCartesianAxis.cxx | 2
chart2/source/view/inc/DataTableView.hxx | 6 +
chart2/source/view/main/DataTableView.cxx | 74 ++++++++++++++++------
oox/inc/drawingml/chart/datatablemodel.hxx | 3
oox/source/drawingml/chart/datatablecontext.cxx | 7 +-
oox/source/drawingml/chart/datatableconverter.cxx | 3
6 files changed, 74 insertions(+), 21 deletions(-)
New commits:
commit ce9d9d1bf429cf2601be2f7288fa5d3d93612f79
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Thu May 19 21:52:15 2022 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Aug 18 08:50:49 2022 +0200
chart2: use {V,H}Border, Outline Data Table props. at rendering
insert DataTable class into DataTableView, so it is possible to
take the properties into account when rendering.
Change rendering:
VBorder - draw vert. border of data table
HBorder - draw horiz. border of data table
Outline - draw the outline borders of a data table
Change-Id: I8348d0672d9c188014d664d667abddde8ebbc7c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137155
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit 7cb504bd5e2c49a73af3270d1ecefe1bd838b66f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138437
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index d105ec8631c0..641269b6b367 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -2011,7 +2011,7 @@ void
VCartesianAxis::createDataTableView(std::vector<std::unique_ptr<VSeriesPlot
{
if (m_aAxisProperties.m_bDisplayDataTable)
{
- m_pDataTableView.reset(new DataTableView);
+ m_pDataTableView.reset(new
DataTableView(m_aAxisProperties.m_xDataTableModel));
m_pDataTableView->initializeValues(rSeriesPlotterList);
m_xNumberFormatsSupplier = xNumberFormatsSupplier;
}
diff --git a/chart2/source/view/inc/DataTableView.hxx
b/chart2/source/view/inc/DataTableView.hxx
index 2d368212309a..fb7fe83929f9 100644
--- a/chart2/source/view/inc/DataTableView.hxx
+++ b/chart2/source/view/inc/DataTableView.hxx
@@ -12,6 +12,7 @@
#include <svx/unodraw/SvxTableShape.hxx>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
+#include <DataTable.hxx>
namespace chart
{
@@ -21,17 +22,18 @@ class DataTableView final
{
css::uno::Reference<css::drawing::XShapes> m_xTarget;
rtl::Reference<SvxTableShape> m_xTableShape;
+ rtl::Reference<DataTable> m_xDataTableModel;
std::vector<OUString> m_aDataSeriesNames;
std::vector<OUString> m_aXValues;
std::vector<std::vector<OUString>> m_pDataSeriesValues;
public:
- DataTableView();
+ DataTableView(rtl::Reference<DataTable> const& rDataTableModel);
void initializeShapes(const css::uno::Reference<css::drawing::XShapes>&
xTarget);
void initializeValues(std::vector<std::unique_ptr<VSeriesPlotter>>&
rSeriesPlotterList);
void createShapes(basegfx::B2DVector const& rStart, basegfx::B2DVector
const& rEnd,
- sal_Int32 nDistance);
+ sal_Int32 nColumnWidth);
};
} //namespace chart
diff --git a/chart2/source/view/main/DataTableView.cxx
b/chart2/source/view/main/DataTableView.cxx
index 7614fa0ea1b3..2928458397c0 100644
--- a/chart2/source/view/main/DataTableView.cxx
+++ b/chart2/source/view/main/DataTableView.cxx
@@ -30,11 +30,15 @@ using namespace css;
namespace chart
{
-DataTableView::DataTableView() = default;
+DataTableView::DataTableView(rtl::Reference<DataTable> const& rDataTableModel)
+ : m_xDataTableModel(rDataTableModel)
+{
+}
namespace
{
-void setCellDefaults(uno::Reference<beans::XPropertySet>& xPropertySet)
+void setCellDefaults(uno::Reference<beans::XPropertySet>& xPropertySet, bool
bLeft, bool bTop,
+ bool bRight, bool bBottom)
{
xPropertySet->setPropertyValue("FillColor", uno::makeAny(Color(0xFFFFFF)));
xPropertySet->setPropertyValue("TextVerticalAdjust",
@@ -45,10 +49,14 @@ void setCellDefaults(uno::Reference<beans::XPropertySet>&
xPropertySet)
aBorderLine.LineWidth = o3tl::convert(0.5, o3tl::Length::pt,
o3tl::Length::mm100);
aBorderLine.Color = 0x000000;
- xPropertySet->setPropertyValue("TopBorder", uno::makeAny(aBorderLine));
- xPropertySet->setPropertyValue("BottomBorder", uno::makeAny(aBorderLine));
- xPropertySet->setPropertyValue("LeftBorder", uno::makeAny(aBorderLine));
- xPropertySet->setPropertyValue("RightBorder", uno::makeAny(aBorderLine));
+ if (bLeft)
+ xPropertySet->setPropertyValue("LeftBorder",
uno::makeAny(aBorderLine));
+ if (bTop)
+ xPropertySet->setPropertyValue("TopBorder", uno::makeAny(aBorderLine));
+ if (bRight)
+ xPropertySet->setPropertyValue("RightBorder",
uno::makeAny(aBorderLine));
+ if (bBottom)
+ xPropertySet->setPropertyValue("BottomBorder",
uno::makeAny(aBorderLine));
}
void setTopCell(uno::Reference<beans::XPropertySet>& xPropertySet)
@@ -67,7 +75,7 @@ void setTopCell(uno::Reference<beans::XPropertySet>&
xPropertySet)
}
}
void DataTableView::createShapes(basegfx::B2DVector const& rStart,
basegfx::B2DVector const& rEnd,
- sal_Int32 nColumnSize)
+ sal_Int32 nColumnWidth)
{
if (!m_xTarget.is())
return;
@@ -76,7 +84,6 @@ void DataTableView::createShapes(basegfx::B2DVector const&
rStart, basegfx::B2DV
m_xTableShape = ShapeFactory::createTable(m_xTarget);
uno::Reference<table::XTable> xTable;
- uno::Reference<util::XBroadcaster> xBroadcaster;
try
{
auto rDelta = rEnd - rStart;
@@ -88,18 +95,31 @@ void DataTableView::createShapes(basegfx::B2DVector const&
rStart, basegfx::B2DV
return;
}
- if (xTable.is())
- xBroadcaster.set(xTable, uno::UNO_QUERY);
+ if (!xTable.is())
+ return;
+
+ uno::Reference<util::XBroadcaster> xBroadcaster(xTable, uno::UNO_QUERY);
if (!xBroadcaster.is())
return;
xBroadcaster->lockBroadcasts();
+
+ bool bHBorder = false;
+ bool bVBorder = false;
+ bool bOutline = false;
+
+ m_xDataTableModel->getPropertyValue("HBorder") >>= bHBorder;
+ m_xDataTableModel->getPropertyValue("VBorder") >>= bVBorder;
+ m_xDataTableModel->getPropertyValue("Outline") >>= bOutline;
+
+ sal_Int32 nColumnCount = m_aXValues.size();
uno::Reference<table::XTableColumns> xTableColumns = xTable->getColumns();
- xTableColumns->insertByIndex(0, m_aXValues.size());
+ xTableColumns->insertByIndex(0, nColumnCount);
+ sal_Int32 nRowCount = m_aDataSeriesNames.size();
uno::Reference<table::XTableRows> xTableRows = xTable->getRows();
- xTableRows->insertByIndex(0, m_aDataSeriesNames.size());
+ xTableRows->insertByIndex(0, nRowCount);
{
uno::Reference<table::XCell> xCell = xTable->getCellByPosition(0, 0);
@@ -122,7 +142,8 @@ void DataTableView::createShapes(basegfx::B2DVector const&
rStart, basegfx::B2DV
if (xCellTextRange.is())
{
xCellTextRange->setString(rString);
- setCellDefaults(xPropertySet);
+ bool bLeft = bOutline || (bVBorder && nColumn > 1);
+ setCellDefaults(xPropertySet, bLeft, bOutline, bOutline, bOutline);
}
nColumn++;
}
@@ -135,8 +156,9 @@ void DataTableView::createShapes(basegfx::B2DVector const&
rStart, basegfx::B2DV
uno::Reference<text::XTextRange> xCellTextRange(xCell, uno::UNO_QUERY);
if (xCellTextRange.is())
{
+ bool bTop = bOutline || (bHBorder && nRow > 1);
xCellTextRange->setString(rSeriesName);
- setCellDefaults(xPropertySet);
+ setCellDefaults(xPropertySet, bOutline, bTop, bOutline, bOutline);
}
nRow++;
}
@@ -153,7 +175,25 @@ void DataTableView::createShapes(basegfx::B2DVector const&
rStart, basegfx::B2DV
if (xCellTextRange.is())
{
xCellTextRange->setString(rValue);
- setCellDefaults(xPropertySet);
+
+ bool bLeft = false;
+ bool bTop = false;
+ bool bRight = false;
+ bool bBottom = false;
+
+ if (nColumn > 1 && bVBorder)
+ bLeft = true;
+
+ if (nRow > 1 && bHBorder)
+ bTop = true;
+
+ if (nRow == nRowCount && bOutline)
+ bBottom = true;
+
+ if (nColumn == nColumnCount && bOutline)
+ bRight = true;
+
+ setCellDefaults(xPropertySet, bLeft, bTop, bRight, bBottom);
}
nColumn++;
}
@@ -163,7 +203,7 @@ void DataTableView::createShapes(basegfx::B2DVector const&
rStart, basegfx::B2DV
xBroadcaster->unlockBroadcasts();
auto* pTableObject =
static_cast<sdr::table::SdrTableObj*>(m_xTableShape->GetSdrObject());
- pTableObject->DistributeColumns(0, pTableObject->getColumnCount() - 1,
true, true);
+ pTableObject->DistributeColumns(0, nColumnCount - 1, true, true);
uno::Reference<beans::XPropertySet>
xPropertySet(xTableColumns->getByIndex(0), uno::UNO_QUERY);
sal_Int32 nWidth = 0;
@@ -175,7 +215,7 @@ void DataTableView::createShapes(basegfx::B2DVector const&
rStart, basegfx::B2DV
for (sal_Int32 i = 1; i < xTableColumns->getCount(); ++i)
{
xPropertySet.set(xTableColumns->getByIndex(i), uno::UNO_QUERY);
- xPropertySet->setPropertyValue("Width", uno::Any(nColumnSize));
+ xPropertySet->setPropertyValue("Width", uno::Any(nColumnWidth));
}
}
commit 488d57a84b25e9106390a0225ac74f895d004b31
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon May 16 16:19:39 2022 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Aug 18 08:50:37 2022 +0200
oox: support reading text and shape properties for a data table
Change-Id: I740d3bd6af11457ecb54878be648ad1e22b9d4b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137153
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit 7077e688408210b32596cbac2f2202610094ddf3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138436
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/oox/inc/drawingml/chart/datatablemodel.hxx
b/oox/inc/drawingml/chart/datatablemodel.hxx
index 5c7fe7901200..937dbb3c60a6 100644
--- a/oox/inc/drawingml/chart/datatablemodel.hxx
+++ b/oox/inc/drawingml/chart/datatablemodel.hxx
@@ -28,6 +28,9 @@ struct DataTableModel
bool mbShowOutline : 1; /// Show outline
bool mbShowKeys : 1;
+ ModelRef<Shape> mxShapeProp; /// frame formatting.
+ ModelRef<TextBody> mxTextProp; /// text formatting.
+
DataTableModel()
: mbShowHBorder(false)
, mbShowVBorder(false)
diff --git a/oox/source/drawingml/chart/datatablecontext.cxx
b/oox/source/drawingml/chart/datatablecontext.cxx
index 0813a6424312..c277dae5f4d6 100644
--- a/oox/source/drawingml/chart/datatablecontext.cxx
+++ b/oox/source/drawingml/chart/datatablecontext.cxx
@@ -18,7 +18,8 @@
*/
#include <drawingml/chart/datatablecontext.hxx>
-
+#include <drawingml/shapepropertiescontext.hxx>
+#include <drawingml/textbodycontext.hxx>
#include <drawingml/chart/plotareamodel.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
@@ -57,6 +58,10 @@ ContextHandlerRef
DataTableContext::onCreateContext(sal_Int32 nElement,
case C_TOKEN(showKeys):
mrModel.mbShowKeys = rAttribs.getBool(XML_val, false);
break;
+ case C_TOKEN(spPr):
+ return new ShapePropertiesContext(*this,
mrModel.mxShapeProp.create());
+ case C_TOKEN(txPr):
+ return new TextBodyContext(*this,
mrModel.mxTextProp.create());
}
break;
}
diff --git a/oox/source/drawingml/chart/datatableconverter.cxx
b/oox/source/drawingml/chart/datatableconverter.cxx
index 3c477c5d7507..4e42b7468ebc 100644
--- a/oox/source/drawingml/chart/datatableconverter.cxx
+++ b/oox/source/drawingml/chart/datatableconverter.cxx
@@ -55,6 +55,9 @@ void
DataTableConverter::convertFromModel(uno::Reference<chart2::XDiagram> const
aPropSet.setProperty(PROP_Outline, mrModel.mbShowOutline);
if (mrModel.mbShowKeys)
aPropSet.setProperty(PROP_Keys, mrModel.mbShowKeys);
+
+ getFormatter().convertFormatting(aPropSet, mrModel.mxShapeProp,
mrModel.mxTextProp,
+ OBJECTTYPE_DATATABLE);
}
catch (uno::Exception&)
{
