diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-01-19 12:15:01 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-01-19 16:06:18 +0100 |
| commit | 4565382ee6f8fec96f0df94c34a2567816291c2e (patch) | |
| tree | 3f4f06f9f64c40a22de28300ef95f6a320cc221b /sw/source/core/doc/docbm.cxx | |
| parent | ab6176e88f78d0b3aa2490fbc7858304c2d4a437 (diff) | |
sw: generalize ModelToViewHelper to handle all NonTextFieldmarks
Rename getDropDownsFor() to getNoTextFieldmarksIn().
Move some code so that sw::mark::ExpandFieldmark can expand all
fieldmarks that use CH_TXT_ATR_FORMELEMENT.
Change-Id: I8a1e28fc0ad77df3a749d9e55c306cb45187a082
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128606
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/source/core/doc/docbm.cxx')
| -rw-r--r-- | sw/source/core/doc/docbm.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index e9c0ce701eba..5ed676719622 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -1569,7 +1569,7 @@ namespace sw::mark return pMark; } - std::vector<IFieldmark*> MarkManager::getDropDownsFor(const SwPaM &rPaM) const + std::vector<IFieldmark*> MarkManager::getNoTextFieldmarksIn(const SwPaM &rPaM) const { std::vector<IFieldmark*> aRet; @@ -1582,8 +1582,11 @@ namespace sw::mark continue; IFieldmark *pMark = dynamic_cast<IFieldmark*>(pI); - if (!pMark || pMark->GetFieldname() != ODF_FORMDROPDOWN) + if (!pMark || (pMark->GetFieldname() != ODF_FORMDROPDOWN + && pMark->GetFieldname() != ODF_FORMCHECKBOX)) + { continue; + } aRet.push_back(pMark); } |