strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Open the right tab for the More... command

Browse source 
Partially fixed by Caolán in
3ac80237f3.

Remaining issues are the paragraph submenu, and the top
menu for both selection and paragraph. Also fixed for
the drawing text and annotations shells (including the
regression created by the above commit, that the dialog
didn't show at all).

Change-Id: I1ba4c825ad48af23ad5c07c8c5f25380952c0be1
This commit is contained in:
Maxim Monastirsky 2014-08-22 14:24:43 +03:00
parent 6396e18f4d
commit d15d7b7bba
4 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
framework/source/uielement/langselectionmenucontroller.cxx
View file

@ -207,7 +207,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
OUString aCmd_Language;
if( eMode == MODE_SetLanguageSelectionMenu )
{
aCmd_Dialog += ".uno:FontDialog?Language:string=*";
aCmd_Dialog += ".uno:FontDialog?Page:string=font";
aCmd_Language += ".uno:LanguageStatus?Language:string=Current_";
}
else if ( eMode == MODE_SetLanguageParagraphMenu )

12
sw/source/uibase/shells/annotsh.cxx
View file

@ -466,8 +466,11 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
case SID_CHAR_DLG:
{
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem = 0;
if (nSlot == SID_CHAR_DLG)
pItem = pArgs->GetItem(FN_PARAM_1, false, TYPE(SfxStringItem) );
if( !pArgs )
if( !pArgs || pItem )
{
/* mod
SwView* pView = &GetView();
@ -490,6 +493,13 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
{
pDlg->SetCurPageId("fonteffects");
}
else if (pItem)
{
const SfxStringItem* pStringItem = static_cast< const SfxStringItem* >(pItem);
if (pStringItem)
pDlg->SetCurPageId(OUStringToOString(pStringItem->GetValue(), RTL_TEXTENCODING_UTF8));
}
sal_uInt16 nRet = pDlg->Execute();
if(RET_OK == nRet )
{

16
sw/source/uibase/shells/drwtxtex.cxx
View file

@ -298,8 +298,11 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
case SID_CHAR_DLG_FOR_PARAGRAPH:
{
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem = 0;
if (nSlot == SID_CHAR_DLG)
pItem = pArgs->GetItem(FN_PARAM_1, false, TYPE(SfxStringItem) );
if( !pArgs )
if( !pArgs || pItem )
{
aOldSelection = pOLV->GetSelection();
if (nSlot == SID_CHAR_DLG_FOR_PARAGRAPH)
@ -329,6 +332,17 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
{
pDlg->SetCurPageId("fonteffects");
}
else if (nSlot == SID_CHAR_DLG_FOR_PARAGRAPH)
{
pDlg->SetCurPageId("font");
}
else if (pItem)
{
const SfxStringItem* pStringItem = static_cast< const SfxStringItem* >(pItem);
if (pStringItem)
pDlg->SetCurPageId(OUStringToOString(pStringItem->GetValue(), RTL_TEXTENCODING_UTF8));
}
sal_uInt16 nRet = pDlg->Execute();
if(RET_OK == nRet )
{

5
sw/source/uibase/shells/textsh1.cxx
View file

@ -183,12 +183,11 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
{
pDlg->SetCurPageId("fonteffects");
}
else if (pDlg && nSlot == SID_ATTR_CHAR_FONT)
else if (pDlg && (nSlot == SID_ATTR_CHAR_FONT || nSlot == SID_CHAR_DLG_FOR_PARAGRAPH))
{
pDlg->SetCurPageId("font");
}
if (pReq)
else if (pDlg && pReq)
{
SFX_REQUEST_ARG((*pReq), pItem, SfxStringItem, FN_PARAM_1, false);
if (pItem)