diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-11 16:54:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-11 16:56:46 +0100 |
| commit | 3ac80237f310366afef0f7b6c427889d652bd369 (patch) | |
| tree | 6e5081bf35bc6627ec470c16a3f70ca7caa0e8a1 | |
| parent | 835d3e818f4d27ecf34aca268e5300ac58cc92c5 (diff) | |
Resolves: fdo#81795 open the font tab via More... languages
a) FontDialog doesn't take a Language argument, so drop that
b) Give FontDialog a Page argument and set it to "font" when
called from the status bar More... menu entry
Change-Id: Ibaf4d5e51d47794b8b0e3c3e06a6d8e00a7d2896
| -rw-r--r-- | framework/source/uielement/langselectionstatusbarcontroller.cxx | 2 | ||||
| -rw-r--r-- | svx/sdi/svx.sdi | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textsh1.cxx | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index d1cfd9001a8b..f043c1d8dd5a 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -254,7 +254,7 @@ throw (css::uno::RuntimeException) else if (nId == MID_LANG_SEL_MORE) { //open the dialog "format/character" for current selection - aBuff.append( ".uno:FontDialog?Language:string=*" ); + aBuff.append( ".uno:FontDialog?Page:string=font" ); } else if (MID_LANG_PARA_1 <= nId && nId <= MID_LANG_PARA_9) { diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 374c6fb525cb..88885bbb3b6a 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -3961,7 +3961,7 @@ SfxObjectItem FmFilterNavigatorController SID_FM_FILTER_NAVIGATOR_CONTROL SfxVoidItem FontDialog SID_CHAR_DLG -() +(SfxStringItem Page FN_PARAM_1) [ /* flags: */ AutoUpdate = FALSE, diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index fe5ceeb976f6..0a845a5e0a86 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -188,6 +188,13 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const pDlg->SetCurPageId("font"); } + if (pReq) + { + SFX_REQUEST_ARG((*pReq), pItem, SfxStringItem, FN_PARAM_1, false); + if (pItem) + pDlg->SetCurPageId(OUStringToOString(pItem->GetValue(), RTL_TEXTENCODING_UTF8)); + } + const SfxItemSet* pSet = NULL; if ( !bUseDialog ) pSet = pArgs; |