[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/uibase/lingu/olmenu.cxx   |    4 ++--
 sw/source/core/uibase/shells/textsh1.cxx |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit e813b9c2593ccfdf39761ed9bf446ef73d881e75
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 3 14:23:00 2014 +0100

    Resolves: fdo#39793 open the 'Font' tab after Set Language ... More ...
    
    Change-Id: I23c80a462ef473defe5536f9090167ae734553b7

diff --git a/sw/source/core/uibase/lingu/olmenu.cxx b/sw/source/core/uibase/lingu/olmenu.cxx
index 2108ac5..f941792 100644
--- a/sw/source/core/uibase/lingu/olmenu.cxx
+++ b/sw/source/core/uibase/lingu/olmenu.cxx
@@ -848,7 +848,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
         else if (nId == MN_SET_SELECTION_MORE)
         {
             //Open Format/Character Dialog
-            sw_CharDialog( *m_pSh, true, nId, 0, 0 );
+            sw_CharDialog( *m_pSh, true, SID_ATTR_CHAR_FONT, 0, 0 );
         }
         else if (MN_SET_LANGUAGE_PARAGRAPH_START <= nId && nId <= MN_SET_LANGUAGE_PARAGRAPH_END)
         {
@@ -880,7 +880,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
             m_pSh->Push();        // save cursor
             SwLangHelper::SelectCurrentPara( *m_pSh );
             //Open Format/Character Dialog
-            sw_CharDialog( *m_pSh, true, nId, 0, 0 );
+            sw_CharDialog( *m_pSh, true, SID_ATTR_CHAR_FONT, 0, 0 );
             m_pSh->Pop( sal_False );  // restore cursor
         }
     }
diff --git a/sw/source/core/uibase/shells/textsh1.cxx b/sw/source/core/uibase/shells/textsh1.cxx
index 52efc16..738efd7 100644
--- a/sw/source/core/uibase/shells/textsh1.cxx
+++ b/sw/source/core/uibase/shells/textsh1.cxx
@@ -181,6 +181,10 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
     {
         pDlg->SetCurPageId("fonteffect");
     }
+    else if (pDlg && nSlot == SID_ATTR_CHAR_FONT)
+    {
+        pDlg->SetCurPageId("font");
+    }
 
     const SfxItemSet* pSet = NULL;
     if ( !bUseDialog )