summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-11 16:54:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-08-11 16:56:46 +0100
commit3ac80237f310366afef0f7b6c427889d652bd369 (patch)
tree6e5081bf35bc6627ec470c16a3f70ca7caa0e8a1 /sw
parent835d3e818f4d27ecf34aca268e5300ac58cc92c5 (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
Diffstat (limited to 'sw')
-rw-r--r--sw/source/uibase/shells/textsh1.cxx7
1 files changed, 7 insertions, 0 deletions
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;