summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2014-06-22 13:07:29 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2014-06-22 13:09:02 +0300
commitd8d18c3cc707d38d98463ed43ae08e1d6bc6e56f (patch)
tree4e4f194fd6b0a323b9595ee1e689f3571726d8c5
parenta7e262b1f2d9e804b9de4fbe9dfc3b784d21dcb0 (diff)
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
-rw-r--r--sw/source/uibase/shells/annotsh.cxx2
-rw-r--r--sw/source/uibase/shells/drwtxtex.cxx2
-rw-r--r--sw/source/uibase/shells/textsh1.cxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 86bcdfc0a11b..458de83db224 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/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/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index e2f5990f629a..ed6744193ee8 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -328,7 +328,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/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index e2144e7fd20d..c9d6244bdb1b 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -180,7 +180,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)
{