diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-11-25 15:20:48 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-11-25 20:56:02 +0100 |
| commit | 4fbdc82cb3afce1f067ae45253b2fe50678cb948 (patch) | |
| tree | b936ad6032463af5b6f67abe5e7e9d5ba89b58a6 /include | |
| parent | 293f854778d3d7af70f690fc2442c65341ac73e1 (diff) | |
tdf#152200: Make sure to not write objects into field character runs
Similar how it's done for preceding objects immediately after calculating
'ofs', we also need to make sure to create a separate run for the objects
that may be anchored after the last character; otherwise, the field that
was just processed (and is waiting in the attributes) would be put out of
place, inside an inner run (e.g., in a text box inside the object).
Change-Id: I2702693595acf4befdbd25ef07a9f7c444926aab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143297
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit ec345c02d8fa5a7c7d4ea4ad08ae7be5303d9b20)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143259
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/test/xmltesttools.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx index a4f0ef30d8ba..e37638fa674c 100644 --- a/include/test/xmltesttools.hxx +++ b/include/test/xmltesttools.hxx @@ -62,6 +62,10 @@ protected: */ int getXPathPosition(const xmlDocUniquePtr& pXmlDoc, const OString& rXPath, std::string_view rChildName); /** + * Get the number of the nodes returned by the rXPath. + */ + int countXPathNodes(const xmlDocUniquePtr& pXmlDoc, const OString& rXPath); + /** * Assert that rXPath exists, and returns exactly one node. */ void assertXPath(const xmlDocUniquePtr& pXmlDoc, const OString& rXPath); |