ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

sc: stop writing pivot table cell styles to the document

Browse Source 
The pivot table output set pivot table specific cell styles on its
cells ("Pivot Table Value", "Pivot Table Result", ...) and created
them in the document on first use. Remove this, so adding a pivot
table no longer adds any cell styles.

The attributes that these styles carried are applied as direct
formatting instead. The member cells are aligned to the left, and
the subtotal and grand total labels and results are bold. The left
alignment is also what makes the member indents visible, an indent
has no effect in a centered cell. The style name mapping in
stylehelper.cxx stays, so documents that already contain these
styles keep working.

Signed-off-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Change-Id: Ib33d170d2da38a60c0739eda8fa79ce4f1fcf745
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/8254
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.com>
(cherry picked from commit fee8a092ac3388c873d2b0763f7ce3d8cd032b76)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209431
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
This commit is contained in:
Tomaž Vajngerl
2026-08-21 10:32:29 +02:00
committed by Xisco Fauli
parent 0753600cc2
commit 2795944b41
3 changed files with 74 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/inc/pivot/StyleOutput.hxx
+23 -14
View File
@@ -123,11 +123,9 @@ struct Expander
ScMF nFlags = ScMF::NONE;
};
/** Collects the sections of a pivot table while the table content is written to the sheet and
* handles the whole visual formatting of the pivot table. The cell styles are applied as the
* sections are added, before any direct formatting reaches the cells, and apply() then draws
* the block frames, the member indents and the expand and collapse buttons in one pass over
* the collected sections. */
/** Collects the sections of a pivot table while the table content is written to the sheet, and
* then draws the whole visual formatting of the pivot table (block frames, member indents and
* the expand and collapse buttons) in one pass over the collected sections. */
class StyleOutput
{
private:
@@ -152,24 +150,35 @@ public:
void setGeometry(Geometry const& rGeometry) { maGeometry = rGeometry; }
/** Applies the base cell styles of the table: the header area on top and the data area
* below. The more specific styles of the sections are applied over them. */
void applyAreaStyles();
void addFieldCell(SCCOL nCol, SCROW nRow, bool bFrame);
void addFieldCell(SCCOL nCol, SCROW nRow, bool bFrame)
{
maFieldCells.push_back(FieldCell{ nCol, nRow, bFrame });
}
void addPageFieldValueCell(SCCOL nCol, SCROW nRow)
{
maPageFieldValueCells.push_back(PageFieldValueCell{ nCol, nRow });
}
void addColumnMemberSpan(size_t nField, SCCOL nStartCol, SCCOL nEndCol, SCROW nRow);
void addColumnMemberSpan(size_t nField, SCCOL nStartCol, SCCOL nEndCol, SCROW nRow)
{
maColumnMemberSpans.push_back(ColumnMemberSpan{ nField, nStartCol, nEndCol, nRow });
}
void addRowMemberSpan(size_t nField, SCCOL nCol, SCROW nStartRow, SCROW nEndRow);
void addRowMemberSpan(size_t nField, SCCOL nCol, SCROW nStartRow, SCROW nEndRow)
{
maRowMemberSpans.push_back(RowMemberSpan{ nField, nCol, nStartRow, nEndRow });
}
void addSubtotalColumn(SCCOL nCol, SCROW nStartRow, bool bGrandTotal);
void addSubtotalColumn(SCCOL nCol, SCROW nStartRow, bool bGrandTotal)
{
maSubtotalColumns.push_back(SubtotalColumn{ nCol, nStartRow, bGrandTotal });
}
void addSubtotalRow(SCROW nRow, SCCOL nStartCol, bool bGrandTotal);
void addSubtotalRow(SCROW nRow, SCCOL nStartCol, bool bGrandTotal)
{
maSubtotalRows.push_back(SubtotalRow{ nRow, nStartCol, bGrandTotal });
}
void addIndent(SCCOL nCol, SCROW nRow, tools::Long nIndent)
{
sc/source/core/data/dpoutput.cxx
-2
View File
@@ -969,8 +969,6 @@ void ScDPOutput::Output()
}
mpDocument->SetString(mnTabStartCol, mnTabStartRow, nTab, maDataDescription);
mpStyleOutput->applyAreaStyles();
outputColumnHeaders(nTab);
outputRowHeader(nTab);
sc/source/core/data/pivot/StyleOutput.cxx
+51 -116
View File
@@ -25,14 +25,10 @@
#include <editeng/boxitem.hxx>
#include <editeng/justifyitem.hxx>
#include <editeng/wghtitem.hxx>
#include <osl/diagnose.h>
#include <attrib.hxx>
#include <document.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
#include <stlpool.hxx>
#include <stlsheet.hxx>
#include <patattr.hxx>
#include <algorithm>
@@ -43,40 +39,6 @@ constexpr sal_uInt16 SC_DP_FRAME_OUTER_BOLD = 40;
constexpr Color SC_DP_FRAME_COLOR(0, 0, 0); //( 0x20, 0x40, 0x68 )
void lcl_SetStyleById(ScDocument& rDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2, TranslateId pStrId)
{
if (nCol1 > nCol2 || nRow1 > nRow2)
{
OSL_FAIL("SetStyleById: invalid range");
return;
}
OUString aStyleName = ScResId(pStrId);
ScStyleSheetPool* pStlPool = rDoc.GetStyleSheetPool();
ScStyleSheet* pStyle
= static_cast<ScStyleSheet*>(pStlPool->Find(aStyleName, SfxStyleFamily::Para));
if (!pStyle)
{
// create new style (was in ScPivot::SetStyle)
pStyle = static_cast<ScStyleSheet*>(
&pStlPool->Make(aStyleName, SfxStyleFamily::Para, SfxStyleSearchBits::UserDefined));
pStyle->SetParent(ScResId(STR_STYLENAME_STANDARD));
SfxItemSet& rSet = pStyle->GetItemSet();
if (pStrId == STR_PIVOT_STYLENAME_RESULT || pStrId == STR_PIVOT_STYLENAME_TITLE)
{
rSet.Put(SvxWeightItem(WEIGHT_BOLD, ATTR_FONT_WEIGHT));
rSet.Put(SvxWeightItem(WEIGHT_BOLD, ATTR_CJK_FONT_WEIGHT));
rSet.Put(SvxWeightItem(WEIGHT_BOLD, ATTR_CTL_FONT_WEIGHT));
}
if (pStrId == STR_PIVOT_STYLENAME_CATEGORY || pStrId == STR_PIVOT_STYLENAME_TITLE)
rSet.Put(SvxHorJustifyItem(SvxCellHorJustify::Left, ATTR_HOR_JUSTIFY));
}
rDoc.ApplyStyleAreaTab(nCol1, nRow1, nCol2, nRow2, nTab, *pStyle);
}
void lcl_SetFrame(ScDocument& rDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uInt16 nWidth)
{
@@ -94,6 +56,23 @@ void lcl_SetFrame(ScDocument& rDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL
rDoc.ApplyFrameAreaTab(ScRange(nCol1, nRow1, nTab, nCol2, nRow2, nTab), aBox, aBoxInfo);
}
void lcl_SetLeftAligned(ScDocument& rDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2)
{
ScPatternAttr aPattern(rDoc.getCellAttributeHelper());
aPattern.ItemSetPut(SvxHorJustifyItem(SvxCellHorJustify::Left, ATTR_HOR_JUSTIFY));
rDoc.ApplyPatternAreaTab(nCol1, nRow1, nCol2, nRow2, nTab, aPattern);
}
void lcl_SetBold(ScDocument& rDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2)
{
ScPatternAttr aPattern(rDoc.getCellAttributeHelper());
aPattern.ItemSetPut(SvxWeightItem(WEIGHT_BOLD, ATTR_FONT_WEIGHT));
aPattern.ItemSetPut(SvxWeightItem(WEIGHT_BOLD, ATTR_CJK_FONT_WEIGHT));
aPattern.ItemSetPut(SvxWeightItem(WEIGHT_BOLD, ATTR_CTL_FONT_WEIGHT));
rDoc.ApplyPatternAreaTab(nCol1, nRow1, nCol2, nRow2, nTab, aPattern);
}
/** Draws the block frames of the table: each block gets a box around it, with a bold line on the
* outer edges of the table. The rows and columns where subtotal and member blocks begin are
* collected with AddRow and AddCol, and OutputDataArea then frames the blocks between them. */
@@ -247,80 +226,6 @@ public:
namespace sc::pivot
{
void StyleOutput::applyAreaStyles()
{
SCTAB nTab = maGeometry.mnTab;
if (maGeometry.mnDataStartRow > maGeometry.mnTabStartRow)
{
lcl_SetStyleById(mrDocument, nTab, maGeometry.mnTabStartCol, maGeometry.mnTabStartRow,
maGeometry.mnTabEndCol, maGeometry.mnDataStartRow - 1,
STR_PIVOT_STYLENAME_TOP);
}
lcl_SetStyleById(mrDocument, nTab, maGeometry.mnDataStartCol, maGeometry.mnDataStartRow,
maGeometry.mnTabEndCol, maGeometry.mnTabEndRow, STR_PIVOT_STYLENAME_INNER);
}
void StyleOutput::addFieldCell(SCCOL nCol, SCROW nRow, bool bFrame)
{
maFieldCells.push_back(FieldCell{ nCol, nRow, bFrame });
lcl_SetStyleById(mrDocument, maGeometry.mnTab, nCol, nRow, nCol, nRow,
STR_PIVOT_STYLENAME_FIELDNAME);
}
void StyleOutput::addColumnMemberSpan(size_t nField, SCCOL nStartCol, SCCOL nEndCol, SCROW nRow)
{
maColumnMemberSpans.push_back(ColumnMemberSpan{ nField, nStartCol, nEndCol, nRow });
if (nField + 1 < maGeometry.mnColumnFieldCount)
{
lcl_SetStyleById(mrDocument, maGeometry.mnTab, nStartCol, nRow, nEndCol,
maGeometry.mnDataStartRow - 1, STR_PIVOT_STYLENAME_CATEGORY);
}
else
{
lcl_SetStyleById(mrDocument, maGeometry.mnTab, nStartCol, nRow, nStartCol,
maGeometry.mnDataStartRow - 1, STR_PIVOT_STYLENAME_CATEGORY);
}
}
void StyleOutput::addRowMemberSpan(size_t nField, SCCOL nCol, SCROW nStartRow, SCROW nEndRow)
{
maRowMemberSpans.push_back(RowMemberSpan{ nField, nCol, nStartRow, nEndRow });
if (nField + 1 < maGeometry.mnRowFieldCount)
{
lcl_SetStyleById(mrDocument, maGeometry.mnTab, nCol, nStartRow,
maGeometry.mnDataStartCol - 1, nEndRow, STR_PIVOT_STYLENAME_CATEGORY);
}
else
{
lcl_SetStyleById(mrDocument, maGeometry.mnTab, nCol, nStartRow,
maGeometry.mnDataStartCol - 1, nStartRow, STR_PIVOT_STYLENAME_CATEGORY);
}
}
void StyleOutput::addSubtotalColumn(SCCOL nCol, SCROW nStartRow, bool bGrandTotal)
{
maSubtotalColumns.push_back(SubtotalColumn{ nCol, nStartRow, bGrandTotal });
lcl_SetStyleById(mrDocument, maGeometry.mnTab, nCol, nStartRow, nCol,
maGeometry.mnDataStartRow - 1, STR_PIVOT_STYLENAME_TITLE);
lcl_SetStyleById(mrDocument, maGeometry.mnTab, nCol, maGeometry.mnDataStartRow, nCol,
maGeometry.mnTabEndRow, STR_PIVOT_STYLENAME_RESULT);
}
void StyleOutput::addSubtotalRow(SCROW nRow, SCCOL nStartCol, bool bGrandTotal)
{
maSubtotalRows.push_back(SubtotalRow{ nRow, nStartCol, bGrandTotal });
lcl_SetStyleById(mrDocument, maGeometry.mnTab, nStartCol, nRow, maGeometry.mnDataStartCol - 1,
nRow, STR_PIVOT_STYLENAME_TITLE);
lcl_SetStyleById(mrDocument, maGeometry.mnTab, maGeometry.mnDataStartCol, nRow,
maGeometry.mnTabEndCol, nRow, STR_PIVOT_STYLENAME_RESULT);
}
void StyleOutput::clear()
{
maGeometry = Geometry();
@@ -370,6 +275,13 @@ void StyleOutput::apply()
aBlockFrames.OutputBlockFrame(rSpan.nStartCol, rSpan.nRow, rSpan.nEndCol,
rSpan.nRow);
}
lcl_SetLeftAligned(mrDocument, nTab, rSpan.nStartCol, rSpan.nRow, rSpan.nEndCol,
maGeometry.mnDataStartRow - 1);
}
else
{
lcl_SetLeftAligned(mrDocument, nTab, rSpan.nStartCol, rSpan.nRow, rSpan.nStartCol,
maGeometry.mnDataStartRow - 1);
}
}
@@ -382,12 +294,19 @@ void StyleOutput::apply()
maGeometry.mnTabEndCol, maGeometry.mnMemberStartRow - 1);
}
// Subtotal and grand total columns
// Subtotal and grand total columns. The label cells in the header area are bold and aligned
// to the left, the result cells below them are bold.
for (SubtotalColumn const& rColumn : maSubtotalColumns)
{
aBlockFrames.AddCol(rColumn.nCol);
aBlockFrames.OutputBlockFrame(rColumn.nCol, rColumn.nStartRow, rColumn.nCol,
maGeometry.mnDataStartRow - 1);
lcl_SetBold(mrDocument, nTab, rColumn.nCol, rColumn.nStartRow, rColumn.nCol,
maGeometry.mnDataStartRow - 1);
lcl_SetLeftAligned(mrDocument, nTab, rColumn.nCol, rColumn.nStartRow, rColumn.nCol,
maGeometry.mnDataStartRow - 1);
lcl_SetBold(mrDocument, nTab, rColumn.nCol, maGeometry.mnDataStartRow, rColumn.nCol,
maGeometry.mnTabEndRow);
}
// Row field members. The first member that begins in a row also gets a frame around the whole
@@ -409,18 +328,34 @@ void StyleOutput::apply()
if (rSpan.nField == maGeometry.mnRowFieldCount - 2)
aBlockFrames.OutputBlockFrame(rSpan.nCol + 1, rSpan.nStartRow, rSpan.nCol + 1,
rSpan.nEndRow);
lcl_SetLeftAligned(mrDocument, nTab, rSpan.nCol, rSpan.nStartRow,
maGeometry.mnDataStartCol - 1, rSpan.nEndRow);
}
else
{
lcl_SetLeftAligned(mrDocument, nTab, rSpan.nCol, rSpan.nStartRow,
maGeometry.mnDataStartCol - 1, rSpan.nStartRow);
}
}
// Subtotal and grand total rows
// Subtotal and grand total rows. The label cells in the header area are bold and aligned to
// the left, the result cells to the right of them are bold.
for (SubtotalRow const& rRow : maSubtotalRows)
{
aBlockFrames.AddRow(rRow.nRow);
aBlockFrames.OutputBlockFrame(rRow.nStartCol, rRow.nRow, maGeometry.mnDataStartCol - 1,
rRow.nRow);
lcl_SetBold(mrDocument, nTab, rRow.nStartCol, rRow.nRow, maGeometry.mnDataStartCol - 1,
rRow.nRow);
lcl_SetLeftAligned(mrDocument, nTab, rRow.nStartCol, rRow.nRow,
maGeometry.mnDataStartCol - 1, rRow.nRow);
lcl_SetBold(mrDocument, nTab, maGeometry.mnDataStartCol, rRow.nRow, maGeometry.mnTabEndCol,
rRow.nRow);
}
// Member indents and expand/collapse buttons
// Member indents and the expand and collapse buttons. The indent shows up because the member
// cells are aligned to the left, an indent has no effect in a centered cell.
for (Indent const& rIndent : maIndentCells)
mrDocument.ApplyAttr(rIndent.nCol, rIndent.nRow, nTab, ScIndentItem(rIndent.nIndent));