sw/source/core/uibase/shells/annotsh.cxx | 2 +- sw/source/core/uibase/shells/drwtxtex.cxx | 2 +- sw/source/core/uibase/shells/textsh1.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit bc7943390e0d629d5f7e319cc8044d191fcd4331 Author: Maxim Monastirsky <[email protected]> Date: Sun Jun 22 13:07:29 2014 +0300 sw: Fix SID_CHAR_DLG_EFFECT behavior A regression from commit f41e7c70. The wrong tab is opened (used in the sidebar underline popup). The correct id is "fonteffects" not "fonteffect". Change-Id: Ic06fb3f93a033bcfe24b97eb124ceea082b4087f (cherry picked from commit d8d18c3cc707d38d98463ed43ae08e1d6bc6e56f) Reviewed-on: https://gerrit.libreoffice.org/9854 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sw/source/core/uibase/shells/annotsh.cxx b/sw/source/core/uibase/shells/annotsh.cxx index 32b0e77..ad3f5eb 100644 --- a/sw/source/core/uibase/shells/annotsh.cxx +++ b/sw/source/core/uibase/shells/annotsh.cxx @@ -489,7 +489,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) OSL_ENSURE(pDlg, "Dialogdiet fail!"); if (nSlot == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId("fonteffect"); + pDlg->SetCurPageId("fonteffects"); } sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet ) diff --git a/sw/source/core/uibase/shells/drwtxtex.cxx b/sw/source/core/uibase/shells/drwtxtex.cxx index 775e2bf..df90ad6 100644 --- a/sw/source/core/uibase/shells/drwtxtex.cxx +++ b/sw/source/core/uibase/shells/drwtxtex.cxx @@ -327,7 +327,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) OSL_ENSURE(pDlg, "Dialogdiet fail!"); if (nSlot == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId("fonteffect"); + pDlg->SetCurPageId("fonteffects"); } sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet ) diff --git a/sw/source/core/uibase/shells/textsh1.cxx b/sw/source/core/uibase/shells/textsh1.cxx index 8200cc0..83b3661 100644 --- a/sw/source/core/uibase/shells/textsh1.cxx +++ b/sw/source/core/uibase/shells/textsh1.cxx @@ -179,7 +179,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const } if (pDlg && nSlot == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId("fonteffect"); + pDlg->SetCurPageId("fonteffects"); } else if (pDlg && nSlot == SID_ATTR_CHAR_FONT) {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
