include/vcl/tabs.hrc | 1 + sd/inc/strings.hrc | 1 - sd/source/ui/dlg/dlgpage.cxx | 14 ++++++-------- svx/source/dialog/dialcontrol.cxx | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-)
New commits: commit b9cc944daeede51acd322b1cea47d6f44b20968a Author: Heiko Tietze <[email protected]> AuthorDate: Mon Sep 15 14:19:46 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Mon Sep 15 17:04:50 2025 +0200 Resolves tdf#167971 - Dialcontrol with clean background For some reason the DrawEllipsis() command paints rather a rounded rectangle than a circle; DrawPie() wiorks much better Change-Id: I60a2f9df30d47479a2367c0d0fbbd895859190c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190968 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index b55535575f10..d8dd5a08a0af 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -212,7 +212,7 @@ void DialControlBmp::DrawBackground() SetFillColor( GetBackgroundColor() ); tools::Rectangle aEllipseRect = maRect; aEllipseRect.shrink(DIAL_OUTER_WIDTH); - DrawEllipse( aEllipseRect ); + DrawPie(aEllipseRect, aEllipseRect.TopLeft(), aEllipseRect.TopLeft()); } DialControl::DialControl_Impl::DialControl_Impl(OutputDevice& rReference) : commit f6f3f2cb61f471cc312444906cedd031af663bd8 Author: Heiko Tietze <[email protected]> AuthorDate: Mon Sep 15 15:04:50 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Mon Sep 15 17:04:35 2025 +0200 Resolves tdf#168420 - Vertical tabs not working for Slide Properties Change-Id: I6290ebfc06811c7a7fa40b26425f590f40ed8c7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190973 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> diff --git a/include/vcl/tabs.hrc b/include/vcl/tabs.hrc index a0881de858a3..75cf2333f83d 100644 --- a/include/vcl/tabs.hrc +++ b/include/vcl/tabs.hrc @@ -56,6 +56,7 @@ inline constexpr TabData RID_TAB_CONDITION{ NC_("RID_TAB_CONDITION", "Condition" inline constexpr TabData RID_TAB_HEADER{ NC_("RID_TAB_HEADER", "Header"), u"insertheader.png"_ustr }; inline constexpr TabData RID_TAB_FOOTER{ NC_("RID_TAB_FOOTER", "Footer"), u"insertfooter.png"_ustr }; inline constexpr TabData RID_TAB_PAGE{ NC_("RID_TAB_PAGE", "Page"), u"attributepagesize.png"_ustr }; // also Draw/Impress +inline constexpr TabData RID_TAB_SLIDE{ NC_("RID_TAB_SLIDE", "Slide"), u"attributepagesize.png"_ustr }; // also Draw/Impress inline constexpr TabData RID_TAB_COLUMNS{ NC_("RID_TAB_COLUMNS", "Columns"), u"pagecolumntype.png"_ustr }; inline constexpr TabData RID_TAB_FOOTNOTES{ NC_("RID_TAB_FOOTNOTES", "Footnote"), u"footnotedialog.png"_ustr }; inline constexpr TabData RID_TAB_ENDNOTES{ NC_("RID_TAB_ENDNOTES", "Endnote"), u"insertendnote.png"_ustr }; diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index 466726ed22cc..1bd737c2cb72 100644 --- a/sd/inc/strings.hrc +++ b/sd/inc/strings.hrc @@ -309,7 +309,6 @@ #define STR_UNDO_MOVEPAGES NC_("STR_UNDO_MOVEPAGES", "Move slides" ) #define STR_INSERT_PAGES NC_("STR_INSERT_PAGES", "Insert Pages" ) #define STR_INSERT_PAGE_DRAW NC_("STR_INSERT_PAGE_DRAW", "Insert Page" ) -#define STR_SLIDE_SETUP_TITLE NC_("STR_SLIDE_SETUP_TITLE", "Slide Properties" ) #define STR_POOLSHEET_OBJWITHOUTFILL NC_("STR_POOLSHEET_OBJWITHOUTFILL", "Object without fill" ) #define STR_POOLSHEET_OBJNOLINENOFILL NC_("STR_POOLSHEET_OBJNOLINENOFILL", "Object with no fill and no line" ) diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index f549f821bf7a..14eb222005b8 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -57,8 +57,12 @@ SdPageDlg::SdPageDlg(SfxObjectShell const* pDocSh, weld::Window* pParent, const SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - AddTabPage(u"RID_SVXPAGE_PAGE"_ustr, TabResId(RID_TAB_PAGE.aLabel), - pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PAGE), RID_L + RID_TAB_PAGE.sIconName); + if (mbIsImpressDoc) + AddTabPage(u"RID_SVXPAGE_PAGE"_ustr, TabResId(RID_TAB_SLIDE.aLabel), + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PAGE), RID_L + RID_TAB_SLIDE.sIconName); + else + AddTabPage(u"RID_SVXPAGE_PAGE"_ustr, TabResId(RID_TAB_PAGE.aLabel), + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PAGE), RID_L + RID_TAB_PAGE.sIconName); if (bAreaPage) { // I have to add the page before I remove it ! AddTabPage(u"RID_SVXPAGE_AREA"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel), @@ -68,12 +72,6 @@ SdPageDlg::SdPageDlg(SfxObjectShell const* pDocSh, weld::Window* pParent, const pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TRANSPARENCE), RID_L + RID_TAB_TRANSPARENCE.sIconName); } - - if (mbIsImpressDoc) - { - set_title(SdResId(STR_SLIDE_SETUP_TITLE)); - m_xTabCtrl->set_tab_label_text(u"RID_SVXPAGE_PAGE"_ustr, SdResId(STR_SLIDE_NAME)); - } } void SdPageDlg::PageCreated(const OUString& rId, SfxTabPage& rPage)
