[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source sd/source

[Maxim Monastirsky]

 sc/source/ui/drawfunc/drtxtob1.cxx |    2 +-
 sc/source/ui/view/editsh.cxx       |    2 +-
 sd/source/ui/func/fuchar.cxx       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 58b9fa3873190ca8b53c68f59b6bfdee08fd4cc4
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Aug 31 01:52:52 2014 +0300

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index a437078..b1d8b8f 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 fed79b5..687d4ec 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 0c42a4f..715f155 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();