diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-13 11:00:33 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-14 18:42:15 +0100 |
| commit | 57f358f1ac4f3e05fcdf54326388ba8a19f0f2b3 (patch) | |
| tree | 629aa858a64b621201d4a674130f1f0b57d0fb77 /sw/source/core/unocore | |
| parent | 5e622d1bf3491bce79e2e1831b30716abb924750 (diff) | |
sw_redlinehide_3: add second result to SwGetExpField, SwSetExpField
This is quite tricky & somewhat ugly due to the SwValueField base class
& we need to duplicate its member too :(
It would be possible to filter the deleted fields in
SwDocUpdateField::MakeFieldList(), but the problem with that is that
the instance is long-lived & might be used with different layout
settings, so it's probably better to filter in the 5 or so client
functions that iterate over the GetSortList().
Note that this will also filter other fields including database fields,
hopefully that shouldn't cause problems.
Change-Id: I0cdbc7757fa529598b5dbceec0bd2c4a619be05a
Diffstat (limited to 'sw/source/core/unocore')
| -rw-r--r-- | sw/source/core/unocore/unofield.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index b8ada47916cd..4fe387ba3b59 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -1730,7 +1730,7 @@ void SAL_CALL SwXTextField::attach( pSEField->SetInputFlag(m_pImpl->m_pProps->bBool1); pSEField->SetPromptText(m_pImpl->m_pProps->sPar3); if (!m_pImpl->m_pProps->sPar4.isEmpty()) - pSEField->ChgExpStr(m_pImpl->m_pProps->sPar4); + pSEField->ChgExpStr(m_pImpl->m_pProps->sPar4, nullptr); } break; @@ -1772,7 +1772,7 @@ void SAL_CALL SwXTextField::attach( xField.reset(pGEField); //TODO: evaluate SubType! if (!m_pImpl->m_pProps->sPar4.isEmpty()) - pGEField->ChgExpStr(m_pImpl->m_pProps->sPar4); + pGEField->ChgExpStr(m_pImpl->m_pProps->sPar4, nullptr); // #i82544# if (bSetGetExpFieldUninitialized) pGEField->SetLateInitialization(); |