diff --git a/sc/uiconfig/scalc/ui/chardialog.ui b/sc/uiconfig/scalc/ui/chardialog.ui index f202f8219abf..053faf19696d 100644 --- a/sc/uiconfig/scalc/ui/chardialog.ui +++ b/sc/uiconfig/scalc/ui/chardialog.ui @@ -298,7 +298,7 @@ - 4 + 3 False diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index 665cc3739bf0..10b2c4faf522 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -38,29 +38,29 @@ SdCharDlg::SdCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - AddTabPage(u"RID_SVXPAGE_CHAR_NAME"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr); - AddTabPage(u"RID_SVXPAGE_CHAR_EFFECTS"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr); - AddTabPage(u"RID_SVXPAGE_CHAR_POSITION"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_POSITION), nullptr); - AddTabPage(u"RID_SVXPAGE_BKG"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr); + AddTabPage(u"font"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr); + AddTabPage(u"fonteffects"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr); + AddTabPage(u"position"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_POSITION), nullptr); + AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr); } void SdCharDlg::PageCreated(const OUString& rId, SfxTabPage &rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - if (rId == "RID_SVXPAGE_CHAR_NAME") + if (rId == "font") { SvxFontListItem aItem(* static_cast( rDocShell.GetItem( SID_ATTR_CHAR_FONTLIST) ) ); aSet.Put (SvxFontListItem( aItem.GetFontList(), SID_ATTR_CHAR_FONTLIST)); rPage.PageCreated(aSet); } - else if (rId == "RID_SVXPAGE_CHAR_EFFECTS") + else if (rId == "fonteffects") { // Opt in for character transparency. aSet.Put(SfxUInt32Item(SID_FLAG_TYPE, SVX_ENABLE_CHAR_TRANSPARENCY)); rPage.PageCreated(aSet); } - else if (rId == "RID_SVXPAGE_BKG") + else if (rId == "background") { aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast(SvxBackgroundTabFlags::SHOW_CHAR_BKGCOLOR))); rPage.PageCreated(aSet); diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index c9229f82934d..89573d174e88 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -69,7 +69,7 @@ void FuChar::DoExecute( SfxRequest& rReq ) ScopedVclPtr pDlg( pFact->CreateSdTabCharDialog(mrViewShell.GetFrameWeld(), &aNewAttr, mrDoc.GetDocSh() ) ); if (rReq.GetSlot() == SID_CHAR_DLG_EFFECT) { - pDlg->SetCurPageId(u"RID_SVXPAGE_CHAR_EFFECTS"_ustr); + pDlg->SetCurPageId(u"fonteffects"_ustr); } sal_uInt16 nResult = pDlg->Execute(); diff --git a/sd/uiconfig/sdraw/ui/drawchardialog.ui b/sd/uiconfig/sdraw/ui/drawchardialog.ui index 27138d54ee83..a3e0522f8992 100644 --- a/sd/uiconfig/sdraw/ui/drawchardialog.ui +++ b/sd/uiconfig/sdraw/ui/drawchardialog.ui @@ -94,193 +94,215 @@ True True True - True + left + icons - + True False - - - - - - - - - - - - - - - - - - - - - - - - - - True - False - Fonts + + False + 3 + + + True + False + cmd/32/fontdialog.png + + + + + + False + True + 0 + + + + + True + False + Fonts + font + + + + + + False + True + 1 + + - - False - - + True False - - - - - - - - - - - - - - - - - - - - - - - - 1 - - True - False - Font Effects + + False + 3 + + + True + False + cmd/32/color.png + + + + + + False + True + 0 + + + + + True + False + Font Effects + fonteffects + + + + + + False + True + 1 + + 1 - False + False - + True False - - - - - - - - - - - - - - - - - - - - - - - - 2 - - True - False - Position + + False + 3 + + + True + False + cmd/32/fontwork.png + + + + + + False + True + 0 + + + + + True + False + Position + position + + + + + + False + True + 1 + + 2 - False + False - + True False - - - - - - - - - - - - - - - - - - - - - - - - 3 - - True - False - Highlighting + + False + 3 + + + True + False + cmd/32/backcolor.png + + + + + + False + True + 0 + + + + + True + False + Highlighting + background + + + + + + False + True + 1 + + 3 - False + False