summaryrefslogtreecommitdiff
path: root/include/sal
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-04-03 14:28:56 +0200
committerAndras Timar <andras.timar@collabora.com>2017-04-07 07:53:08 +0200
commit5ec306f3fb4b8965c4aa0aa14ec09a135471571e (patch)
tree175983f8713362175ec2413c5690b45a6fd7f49e /include/sal
parentef7a181168e7f4e6a65d39f70dd16fb5ed11c5f2 (diff)
tdf#106237 sw: do some basic sanity checking on layout-cache
The bugdoc, with claimed generator AOO4.1.1 on Windows, contains a bogus layout-cache: debug:26706:1: nType P nIndex 29 2147483647 debug:26706:1: nType P nIndex 66 2147483647 debug:26706:1: nType P nIndex 105 2147483647 debug:26706:1: nType P nIndex 142 2147483647 debug:26706:1: nType P nIndex 178 2147483647 debug:26706:1: nType P nIndex 205 2147483647 debug:26706:1: nType P nIndex 229 2147483647 debug:26706:1: nType T nIndex 314 65535 Due to a loop-control this causes incorrect pagination if CalcLayout() is called only once. It should look like this: debug:26765:1: nType T nIndex 382 65535 debug:26765:1: nType T nIndex 790 65535 In this case we can easily detect that the indexes and types in the layout-cache are bogus by checking against the node types, so do that in SwLayHelper::SwLayHelper(). (cherry picked from commit 8a5374f2fdbd1e15c107133f55930cbc431edbd5) sw: [loplugin:sallogareas] (cherry picked from commit 282b3e8c4d45aacae57e3542b872cdbfebcc7195) loplugin:loopvartoosmall (cherry picked from commit dbaab58c1442e7f62ef0732376fe5a49840e9fd6) Change-Id: I7091af49a8c29bf0a11ceff0be9ba84b1f710fdb Reviewed-on: https://gerrit.libreoffice.org/36046 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 137ad218db262fb3531215adbc88b7093b4999c7)
Diffstat (limited to 'include/sal')
-rw-r--r--include/sal/log-areas.dox1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index e51c82c14970..bd4ab2f1240e 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -467,6 +467,7 @@ certain functionality.
@li @c sw
@li @c sw.a11y - accessibility
@li @c sw.core - Writer core
+@li @c sw.layout - Writer core view: document layout
@li @c sw.createcopy
@li @c sw.doc
@li @c sw.docappend