diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-04-18 08:17:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-04-18 12:21:36 +0200 |
| commit | aff9ea4c77e3cdcee6713c84aca26e5b195c4f3d (patch) | |
| tree | 9a9a51a9f5e4005e7ffc2a3de6eea4db75c4ff11 /sc | |
| parent | 2424fa9c601003a9778bbc3a9cf0f55d33ead6f1 (diff) | |
fix brain malfunction
in
commit 01a3cc1e55034f7703219d4bbb209de7c37bf07b
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue Nov 29 16:09:10 2022 +0200
tdf#133343 collect autostyle prop names
before scanning for autostyles. That way we can collect only the
property state we are interested in, instead of all properties.
where I apparently wrote the code at the beginning of the call-chain
to collect autostyle prop names, and I wrote the code at the end of the
call-chain to filter on those names, but I never hooked it up in
the middle.
(which just means that the initial commit had no effect at all)
Unfortunately, fixing the middle part results in
unit test failures, so for now, just revert it.
Change-Id: Ia1d655f70d2f5a1656e910d45817c3c4627b85fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150531
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index fd6693819f6b..a552de5f0ddf 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -583,7 +583,6 @@ void ScXMLExport::CollectShapesAutoStyles(SCTAB nTableCount) } if (pSharedData->HasDrawPage()) { - css::uno::Sequence<OUString> aAutoStylePropNames = GetAutoStylePool()->GetPropertyNames(); for (SCTAB nTable = 0; nTable < nTableCount; ++nTable) { uno::Reference<drawing::XDrawPage> xDrawPage(pSharedData->GetDrawPage(nTable)); @@ -602,7 +601,7 @@ void ScXMLExport::CollectShapesAutoStyles(SCTAB nTableCount) { for (const auto& rxShape : (*pTableShapes)[nTable]) { - GetShapeExport()->collectShapeAutoStyles(rxShape, aAutoStylePropNames); + GetShapeExport()->collectShapeAutoStyles(rxShape); IncrementProgressBar(false); } } @@ -611,7 +610,7 @@ void ScXMLExport::CollectShapesAutoStyles(SCTAB nTableCount) ScMyShapeList::const_iterator aEndItr(pShapeList->end()); while ( aShapeItr != aEndItr && ( aShapeItr->aAddress.Tab() == nTable ) ) { - GetShapeExport()->collectShapeAutoStyles(aShapeItr->xShape, aAutoStylePropNames); + GetShapeExport()->collectShapeAutoStyles(aShapeItr->xShape); IncrementProgressBar(false); ++aShapeItr; } @@ -622,7 +621,7 @@ void ScXMLExport::CollectShapesAutoStyles(SCTAB nTableCount) for (const auto& rNoteShape : rNoteShapes) { if ( rNoteShape.aPos.Tab() == nTable ) - GetShapeExport()->collectShapeAutoStyles(rNoteShape.xShape, aAutoStylePropNames); + GetShapeExport()->collectShapeAutoStyles(rNoteShape.xShape); } } } |