chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 1
chart2/source/view/main/DataTableView.cxx | 19 +++++++++++---
2 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit e0599e403b9b8714794f4f80afe78feac0a77b32
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Aug 12 17:25:04 2022 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Aug 16 08:16:13 2022 +0200
chart2: add "font effects" tab page to the data table dialog
Change-Id: I5530477dc86ba2174ba6e553dfe77f8fa355a863
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138329
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 0ba0b76518cb..230862e2cedb 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -464,6 +464,7 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE);
AddTabPage("area", SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA);
AddTabPage("fontname", SchResId(STR_PAGE_FONT),
RID_SVXPAGE_CHAR_NAME);
+ AddTabPage("effects", SchResId(STR_PAGE_FONT_EFFECTS),
RID_SVXPAGE_CHAR_EFFECTS);
break;
case OBJECTTYPE_DATA_CURVE_EQUATION:
AddTabPage("border", SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE);
commit e4e5d77bcc30beb1d976fadf5da0247f00f5b9cc
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Thu Aug 11 22:44:56 2022 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Aug 16 08:15:56 2022 +0200
chart2: render line legend symbols better in a data table
Change-Id: I556b4f249688a3836bbeeb3f554cb9ecf1d31f65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138301
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/chart2/source/view/main/DataTableView.cxx
b/chart2/source/view/main/DataTableView.cxx
index d80e753d9e65..ae90b475e75a 100644
--- a/chart2/source/view/main/DataTableView.cxx
+++ b/chart2/source/view/main/DataTableView.cxx
@@ -287,16 +287,22 @@ void DataTableView::createShapes(basegfx::B2DVector
const& rStart, basegfx::B2DV
}
// ROW HEADER
- // Prepare keys
+ // Prepare keys (symbols)
+ sal_Int32 nMaxSymbolWidth = 0;
if (bKeys)
{
- awt::Size aMaxSymbolExtent(300, 300);
for (VSeriesPlotter* pSeriesPlotter : m_pSeriesPlotterList)
{
if (pSeriesPlotter)
{
+ sal_Int32 nSymbolWidth = 300;
+ if (pSeriesPlotter->getLegendSymbolStyle() ==
LegendSymbolStyle::Line)
+ nSymbolWidth = 600;
+
+ nMaxSymbolWidth = std::max(nSymbolWidth, nMaxSymbolWidth);
+
std::vector<ViewLegendSymbol> aNewEntries =
pSeriesPlotter->createSymbols(
- aMaxSymbolExtent, m_xTarget, m_xComponentContext);
+ { nSymbolWidth, 300 }, m_xTarget, m_xComponentContext);
aSymbols.insert(aSymbols.end(), aNewEntries.begin(),
aNewEntries.end());
}
}
@@ -327,7 +333,10 @@ void DataTableView::createShapes(basegfx::B2DVector const&
rStart, basegfx::B2DV
xCellPropertySet->setPropertyValue("ParaAdjust",
uno::Any(style::ParagraphAdjust_LEFT));
if (bKeys)
- xCellPropertySet->setPropertyValue("ParaLeftMargin",
uno::Any(sal_Int32(500)));
+ {
+ xCellPropertySet->setPropertyValue("ParaLeftMargin",
+ uno::Any(nMaxSymbolWidth +
sal_Int32(200)));
+ }
}
nRow++;
}
@@ -376,6 +385,7 @@ void DataTableView::createShapes(basegfx::B2DVector const&
rStart, basegfx::B2DV
pTableObject->DistributeColumns(0, nColumnCount - 1, true, true);
pTableObject->DistributeRows(0, nRowCount - 1, true, true);
+ xBroadcaster->lockBroadcasts();
uno::Reference<beans::XPropertySet>
xPropertySet(xTableColumns->getByIndex(0), uno::UNO_QUERY);
sal_Int32 nWidth = 0;
xPropertySet->getPropertyValue("Width") >>= nWidth;
@@ -406,6 +416,7 @@ void DataTableView::createShapes(basegfx::B2DVector const&
rStart, basegfx::B2DV
nTotalHeight += nHeight;
}
}
+ xBroadcaster->unlockBroadcasts();
}
void DataTableView::initializeShapes(const rtl::Reference<SvxShapeGroupAnyD>&
xTarget)
