diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-07-04 21:21:46 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-02 16:42:38 +0300 |
| commit | b2678ed49be516c474b9d41ed0e7aa8264c6c009 (patch) | |
| tree | 22cc681eb5e3f1a846e79c1e362dd39174c39ada | |
| parent | 77f6ab5fe8d64694a6f619f657f759020bcae7b1 (diff) | |
tdf#73335 sc: ODF export: ignore ScChangeAction SC_CAT_NONE harder
ScChangeTrackingExportHelper::WorkWithChangeAction() must not add
attributes when it does not export an element.
Change-Id: Ia6625b73114ab8bf93c4b7a31b484d11bef2fde9
(cherry picked from commit ed913ce8352dc4ad9f4688180a9b27d02e8f524f)
Reviewed-on: https://gerrit.libreoffice.org/26918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 638a86ec065f43425065d6459fde05bf60c0e575)
| -rw-r--r-- | sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 8c3b6cc93147..0e0ec84a2832 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -672,6 +672,11 @@ void ScChangeTrackingExportHelper::CollectActionAutoStyles(ScChangeAction* pActi void ScChangeTrackingExportHelper::WorkWithChangeAction(ScChangeAction* pAction) { + if (pAction->GetType() == SC_CAT_NONE) + { + SAL_WARN("sc.filter", "WorkWithChangeAction: type is not writable"); + return; + } rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(pAction->GetActionNumber())); GetAcceptanceState(pAction); if (pAction->IsRejecting()) @@ -688,7 +693,7 @@ void ScChangeTrackingExportHelper::WorkWithChangeAction(ScChangeAction* pAction) WriteRejection(pAction); else { - OSL_FAIL("not a writeable type"); + assert(false); // tdf#73335 this would create duplicate attributes } rExport.CheckAttrList(); } |