sc/source/ui/drawfunc/drtxtob.cxx | 2 +-
sc/source/ui/view/editsh.cxx | 2 +-
sd/source/ui/view/drtxtob.cxx | 2 +-
sw/source/uibase/shells/annotsh.cxx | 2 +-
sw/source/uibase/shells/drwtxtex.cxx | 2 +-
sw/source/uibase/shells/textsh1.cxx | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 02293e09b5e1c066c377cf4f0b6aa5c0aa61a581
Author: Maxim Monastirsky <momonas...@gmail.com>
AuthorDate: Wed Aug 31 16:55:41 2022 +0300
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Sep 9 15:39:58 2022 +0200
tdf#150506 Execution parameter confused with slot state
Regression of a6eddceda5d376cd73922123a3bb3a5683307c41
("rename some SID to FN_PARAM").
Change-Id: I5bcafdcec16cc91b1b77f7a3affd630a2f6cc556
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139121
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
(cherry picked from commit a72861e3be5b89544ae943c0c5cc6d43e8e70a7d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138992
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 3e39f667590355843336edda9b2f8f7676bbc870)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139419
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx
b/sc/source/ui/drawfunc/drtxtob.cxx
index 3e8a7f975f23..ec796f4a8521 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -450,7 +450,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
EditView& rEditView = pOutView->GetEditView();
bIsLookUpWord = GetStatusValueForThesaurusFromContext( aStatusVal,
nLang, rEditView );
}
- rSet.Put( SfxStringItem( FN_PARAM_THES_WORD_REPLACE, aStatusVal ) );
+ rSet.Put( SfxStringItem( SID_THES, aStatusVal ) );
// disable thesaurus main menu and context menu entry if there is
nothing to look up
bool bCanDoThesaurus = ScModule::HasThesaurusLanguage( nLang );
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index dbfd28404fd7..0fd33f62ed6d 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -817,7 +817,7 @@ void ScEditShell::GetState( SfxItemSet& rSet )
LanguageType nLang = LANGUAGE_NONE;
bool bIsLookUpWord = pActiveView &&
GetStatusValueForThesaurusFromContext(aStatusVal,
nLang, *pActiveView);
- rSet.Put( SfxStringItem( FN_PARAM_THES_WORD_REPLACE,
aStatusVal ) );
+ rSet.Put( SfxStringItem( SID_THES, aStatusVal ) );
// disable thesaurus context menu entry if there is
nothing to look up
bool bCanDoThesaurus = ScModule::HasThesaurusLanguage(
nLang );
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index b3f53c7a6860..b10af08289fa 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -415,7 +415,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
OUString aStatusVal;
LanguageType nLang = LANGUAGE_NONE;
bool bIsLookUpWord =
GetStatusValueForThesaurusFromContext( aStatusVal, nLang, rEditView );
- rSet.Put( SfxStringItem( FN_PARAM_THES_WORD_REPLACE,
aStatusVal ) );
+ rSet.Put( SfxStringItem( SID_THES, aStatusVal ) );
// disable "Thesaurus" context menu entry if there is
nothing to look up
uno::Reference< linguistic2::XThesaurus > xThes(
LinguMgr::GetThesaurus() );
diff --git a/sw/source/uibase/shells/annotsh.cxx
b/sw/source/uibase/shells/annotsh.cxx
index 3801f0489da7..4089a84970c5 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1399,7 +1399,7 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet)
OUString aStatusVal;
LanguageType nLang = LANGUAGE_NONE;
bool bIsLookUpWord = GetStatusValueForThesaurusFromContext(
aStatusVal, nLang, pOLV->GetEditView() );
- rSet.Put( SfxStringItem( FN_PARAM_THES_WORD_REPLACE,
aStatusVal ) );
+ rSet.Put( SfxStringItem( SID_THES, aStatusVal ) );
// disable "Thesaurus" context menu entry if there is nothing
to look up
uno::Reference< linguistic2::XThesaurus > xThes(
::GetThesaurus() );
diff --git a/sw/source/uibase/shells/drwtxtex.cxx
b/sw/source/uibase/shells/drwtxtex.cxx
index 0891d65c57d8..1a5f3a8665d4 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -703,7 +703,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
LanguageType nLang = LANGUAGE_NONE;
bool bIsLookUpWord
= GetStatusValueForThesaurusFromContext(aStatusVal, nLang,
pOLV->GetEditView());
- rSet.Put(SfxStringItem(FN_PARAM_THES_WORD_REPLACE,
aStatusVal));
+ rSet.Put(SfxStringItem(SID_THES, aStatusVal));
// disable "Thesaurus" context menu entry if there is nothing
to look up
uno::Reference<linguistic2::XThesaurus>
xThes(::GetThesaurus());
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index 4c5e42bc5d59..37b321383a55 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1721,7 +1721,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
{
// set word and locale to look up as status value
OUString aStatusVal = aText + "#" + aLanguageTag.getBcp47();
- rSet.Put( SfxStringItem( FN_PARAM_THES_WORD_REPLACE,
aStatusVal ) );
+ rSet.Put( SfxStringItem( SID_THES, aStatusVal ) );
}
}
break;
