diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2023-01-24 15:32:29 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2023-01-24 15:50:45 +0000 |
commit | 0bb90afaeb193181d7b98b79e962549d8a1dd85a (patch) | |
tree | 05e7bad5eab68cd82e37c44b4608315279337536 /sw/qa/core | |
parent | 413bd0a96b010feb10dc3d76efa266ea082de006 (diff) |
sw: add document model for multi-page fly frames
Currently we can have multi-page tables and fly frames (where the
content wraps around the fly frame), but not both at the same time.
Allowing multi-page fly frames in general would probably go too far, but
handling this in case the fly frame only contains a table would make
sense to support Word's multi-page floating tables.
Fix this by adding a new SwFormatFlySplit property on fly frames: this
is meant to be enabled when the fly frame is part of a multi-page
floating table.
Unlike table split, this is off by default. Some logic will be needed
later to enable this in case the fly frame originates from a Word
floating table. (And obvously this is just the doc model, everything
else still needs doing.)
Change-Id: Id92130c684016cd7e7153e15b0ec6821e4471879
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146095
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/qa/core')
-rw-r--r-- | sw/qa/core/attr/attr.cxx | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/sw/qa/core/attr/attr.cxx b/sw/qa/core/attr/attr.cxx index 3ba2a3b9a1eb..25d2a8025020 100644 --- a/sw/qa/core/attr/attr.cxx +++ b/sw/qa/core/attr/attr.cxx @@ -12,6 +12,9 @@ #include <docsh.hxx> #include <swdtflvr.hxx> #include <swmodule.hxx> +#include <frmmgr.hxx> +#include <frameformats.hxx> +#include <formatflysplit.hxx> namespace { @@ -50,6 +53,26 @@ CPPUNIT_TEST_FIXTURE(Test, testSwAttrSet) CPPUNIT_ASSERT(aData.hasValue()); pMod->m_pXSelection = pOldTransferable; } + +CPPUNIT_TEST_FIXTURE(Test, testFormatFlySplit) +{ + createSwDoc(); + SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell(); + SwFlyFrameAttrMgr aMgr(true, pWrtShell, Frmmgr_Type::TEXT, nullptr); + RndStdIds eAnchor = RndStdIds::FLY_AT_PARA; + aMgr.InsertFlyFrame(eAnchor, aMgr.GetPos(), aMgr.GetSize()); + SwDoc* pDoc = getSwDoc(); + SwFrameFormats& rFlys = *pDoc->GetSpzFrameFormats(); + SwFrameFormat* pFly = rFlys[0]; + CPPUNIT_ASSERT(!pFly->GetAttrSet().GetFlySplit().GetValue()); + + SfxItemSet aSet(pFly->GetAttrSet()); + SwFormatFlySplit aItem(true); + aSet.Put(aItem); + pDoc->SetFlyFrameAttr(*pFly, aSet); + + CPPUNIT_ASSERT(pFly->GetAttrSet().GetFlySplit().GetValue()); +} } CPPUNIT_PLUGIN_IMPLEMENT(); |