diff options
| author | Henry Castro <hcastro@collabora.com> | 2022-11-04 07:52:09 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2022-12-06 18:13:06 +0000 |
| commit | 7a6445eedde28675c575f74c09ff236963525d20 (patch) | |
| tree | d653c01f5ed33d3793b6c16be0fd790f7e1f8b49 | |
| parent | fa82e151d80d15eeb6dfae434f1dbb3b68907188 (diff) | |
sfx2: rename FN_PARAM_1 to FN_NOUPDATE
The parameter is intended to not update the fields
from data source otherwise it will reset to the first
record.
Signed-off-by: Henry Castro <hcastro@collabora.com>
Change-Id: I204cd20b8eb0b3f26c204e139c72b479c83bbf0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142276
Tested-by: Jenkins
| -rw-r--r-- | include/sfx2/sfxsids.hrc | 1 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 2 | ||||
| -rw-r--r-- | svx/sdi/svx.sdi | 2 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 6 |
4 files changed, 7 insertions, 4 deletions
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 4e9badc4346f..a0289c0881ab 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -673,6 +673,7 @@ class SvxZoomItem; #define FN_PARAM_4 (FN_PARAM+63) #define FN_PARAM_5 (FN_PARAM+64) #define FN_PARAM_6 (FN_PARAM+65) +#define FN_NOUPDATE (FN_PARAM+66) #define FN_FAX (SID_SW_START + 28) /* Fax */ #define SID_KEYFUNC_START (SID_SC_START + 521) diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index bb2a01b77620..f0bc6172ab1d 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1032,7 +1032,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if (bMailPrepareExport) { SfxRequest aRequest(SID_MAIL_PREPAREEXPORT, SfxCallMode::SYNCHRON, GetPool()); - aRequest.AppendItem(SfxBoolItem(FN_PARAM_1, true)); + aRequest.AppendItem(SfxBoolItem(FN_NOUPDATE, true)); ExecuteSlot(aRequest); } diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index d4e4f62450b6..bc1d9e5c429f 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -11770,7 +11770,7 @@ SfxVoidItem InsertRowsAfter SID_TABLE_INSERT_ROW_AFTER ] SfxBoolItem PrepareMailExport SID_MAIL_PREPAREEXPORT -(SfxBoolItem On FN_PARAM_1) +(SfxBoolItem On FN_NOUPDATE) [ AutoUpdate = FALSE, FastCall = FALSE, diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 99eaf2249423..ef3c607444e5 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -881,13 +881,15 @@ void SwDocShell::Execute(SfxRequest& rReq) case SID_MAIL_PREPAREEXPORT: { - const SfxPoolItem* pNoUpdate; + const SfxBoolItem* pNoUpdate = pArgs ? + pArgs->GetItem<SfxBoolItem>(FN_NOUPDATE, false) : + nullptr; //pWrtShell is not set in page preview if (m_pWrtShell) m_pWrtShell->StartAllAction(); - if (!pArgs || (pArgs && !pArgs->HasItem(FN_PARAM_1, &pNoUpdate))) + if (!pNoUpdate || !pNoUpdate->GetValue()) { m_xDoc->getIDocumentFieldsAccess().UpdateFields( false ); m_xDoc->getIDocumentLinksAdministration().EmbedAllLinks(); |