The new LayoutTests (in next PR) are also using OdfCanvas and combine well with these patches.