libreoffice/xmloff/source/text/XMLTextNumRuleInfo.hxx
Mike Kaganski 82bbf63582 tdf#155823: Improve the check if the list id is not required
The implementation introduced in commit 8f48f91009caa86d896f247059874242ed18bf39
(SwNumRule::HasContinueList) was a bit naive: it assumed that maTextNodeList is
sorted (it is not, and so, valid cases to avoid the id were missed); it assumed
that a given list can only consist of items of a single numbering style, and so
only tested the list of nodes referenced from maTextNodeList of given SwNumRule.
I.e., this implementation targeted a special case of a list style fully covering
a single continuous list.

This skipped ids for list items with list styles, in which maTextNodeList passed
the check in HasContinueList, but which were followed by items with a different
list style, continuing the same list. This constellation outputs continue-list
attribute in the following items (see XMLTextParagraphExport::exportListChange),
which references the skipped id. The resulting ODF is an invalid XML (an xml:id
is missing that is referenced), and also does not allow to continue such a list.

The change tries to fix this, using a list of nodes in XMLTextParagraphExport,
and analyzing if the list of the current paragraph has a continuation that needs
to reference this list id. Two new hidden properties introduced in SwXParagraph
and SwXTextDocument: "ODFExport_NodeIndex" and "ODFExport_ListNodes", resp. They
allow to pipe the data to the export. The previous special casing of property
state for "ListId", used in SwNumRule::HasContinueList, is removed together with
the mentioned function.

The intention is to have a logic allowing to detect 100% cases where the list id
is required, and where it's not required.

A related unit test for tdf#149668 was fixed to not rely on the mentioned ListId
property state workaround, and moved from sw/qa/core/unocore to xmloff/qa/unit.

Change-Id: If6a6ac7a3dfe0b2ea143229678a603875153eedb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153044
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-06-14 15:46:53 +02:00

159 lines
4.6 KiB
C++

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#pragma once
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/container/XIndexReplace.hpp>
#include <sal/types.h>
namespace com::sun::star {
namespace text { class XTextContent; }
}
class XMLTextListAutoStylePool;
/** information about list and list style for a certain paragraph
OD 2008-04-24 #refactorlists#
Complete refactoring of the class and enhancement of the class for lists.
These changes are considered by method <XMLTextParagraphExport::exportListChange(..)>
*/
class XMLTextNumRuleInfo
{
// numbering rules instance and its name
css::uno::Reference < css::container::XIndexReplace > mxNumRules;
OUString msNumRulesName;
// paragraph's list attributes
OUString msListId;
/// msListId won't be referenced by later lists.
bool mbListIdIsDefault;
sal_Int16 mnListStartValue;
sal_Int16 mnListLevel;
bool mbIsNumbered;
bool mbIsRestart;
// numbering rules' attributes
sal_Int16 mnListLevelStartValue;
// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
bool mbOutlineStyleAsNormalListStyle;
bool mbContinueingPreviousSubTree;
OUString msListLabelString;
public:
XMLTextNumRuleInfo();
inline XMLTextNumRuleInfo& operator=( const XMLTextNumRuleInfo& rInfo );
void Set( const css::uno::Reference < css::text::XTextContent > & rTextContent,
bool bOutlineStyleAsNormalListStyle,
const XMLTextListAutoStylePool& rListAutoPool,
bool bExportTextNumberElement,
bool bListIdIsDefault );
inline void Reset();
const OUString& GetNumRulesName() const
{
return msNumRulesName;
}
sal_Int16 GetListLevelStartValue() const
{
return mnListLevelStartValue;
}
const OUString& GetListId() const
{
return msListId;
}
bool IsListIdDefault() const { return mbListIdIsDefault; }
sal_Int16 GetLevel() const
{
return mnListLevel;
}
bool HasStartValue() const
{
return mnListStartValue != -1;
}
sal_uInt32 GetStartValue() const
{
return mnListStartValue;
}
bool IsNumbered() const
{
return mbIsNumbered;
}
bool IsRestart() const
{
return mbIsRestart;
}
bool BelongsToSameList( const XMLTextNumRuleInfo& rCmp ) const;
bool IsContinueingPreviousSubTree() const
{
return mbContinueingPreviousSubTree;
}
const OUString& ListLabelString() const
{
return msListLabelString;
}
};
inline XMLTextNumRuleInfo& XMLTextNumRuleInfo::operator=(
const XMLTextNumRuleInfo& rInfo )
{
msNumRulesName = rInfo.msNumRulesName;
mxNumRules = rInfo.mxNumRules;
msListId = rInfo.msListId;
mnListStartValue = rInfo.mnListStartValue;
mnListLevel = rInfo.mnListLevel;
mbIsNumbered = rInfo.mbIsNumbered;
mbIsRestart = rInfo.mbIsRestart;
// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
mbOutlineStyleAsNormalListStyle = rInfo.mbOutlineStyleAsNormalListStyle;
mbContinueingPreviousSubTree = rInfo.mbContinueingPreviousSubTree;
msListLabelString = rInfo.msListLabelString;
return *this;
}
inline void XMLTextNumRuleInfo::Reset()
{
mxNumRules = nullptr;
msNumRulesName.clear();
msListId.clear();
mnListStartValue = -1;
mnListLevel = 0;
// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
mbIsNumbered = mbIsRestart =
mbOutlineStyleAsNormalListStyle = false;
mbContinueingPreviousSubTree = false;
msListLabelString.clear();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */