summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2014-08-31 01:52:52 +0300
committerCaolán McNamara <caolanm@redhat.com>2014-09-05 10:33:17 -0500
commit58b9fa3873190ca8b53c68f59b6bfdee08fd4cc4 (patch)
tree12c8ef07da124437b539bfa60b8d2b3eeedb0490
parent233e6a62d12d2d67089f1934777ac41c9fc88238 (diff)
Show the right tab for SID_CHAR_DLG_EFFECT
Change-Id: I3a8b7a9e973d20f06d423ec55cf689478ca98e0a (cherry picked from commit e201506a4cc7e1cac2d04ef3169ef37e34de379a) Reviewed-on: https://gerrit.libreoffice.org/11281 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/ui/drawfunc/drtxtob1.cxx2
-rw-r--r--sc/source/ui/view/editsh.cxx2
-rw-r--r--sd/source/ui/func/fuchar.cxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index a437078f74f8..b1d8b8ff6e6d 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -54,7 +54,7 @@ bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
OSL_ENSURE(pDlg, "Dialog create fail!");
if (nSlot == SID_CHAR_DLG_EFFECT)
{
- pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+ pDlg->SetCurPageId("fonteffects");
}
bool bRet = ( pDlg->Execute() == RET_OK );
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index fed79b5a8d8a..687d4ec5f93b 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -462,7 +462,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
OSL_ENSURE(pDlg, "Dialog create fail!");
if (nSlot == SID_CHAR_DLG_EFFECT)
{
- pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+ pDlg->SetCurPageId("fonteffects");
}
short nRet = pDlg->Execute();
// pDlg is needed below
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 0c42a4f4cdd4..715f155dfd03 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -78,7 +78,7 @@ void FuChar::DoExecute( SfxRequest& rReq )
{
if (rReq.GetSlot() == SID_CHAR_DLG_EFFECT)
{
- pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+ pDlg->SetCurPageId("RID_SVXPAGE_CHAR_EFFECTS");
}
nResult = pDlg->Execute();