svx/source/dialog/page.hrc | 7 +++++++ sw/qa/uitest/writer_tests3/pageDialog.py | 3 ++- sw/source/uibase/sidebar/PageSizeControl.cxx | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-)
New commits: commit a4e417a3a18818724b5c4495ba24c8c364e91461 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Tue Jan 13 23:00:31 2026 +0100 Commit: Samuel Mehrbrodt <[email protected]> CommitDate: Mon Jan 19 07:37:46 2026 +0100 tdf#106889 Support more paper sizes in the page style dialog and also in the paper size sidebar dropdown. There are printers for these page formats used in some circumstances, so offer them as page formats too. Change-Id: Ie2e0aaa6bafc51319e079d434d990fa50efa3e5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197229 Reviewed-by: Samuel Mehrbrodt <[email protected]> Tested-by: Jenkins (cherry picked from commit c63afd390be7431040c925e116fbd8f611cd42d4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197351 Tested-by: allotropia jenkins <[email protected]> diff --git a/svx/source/dialog/page.hrc b/svx/source/dialog/page.hrc index 9252e2e68b47..7d9a1826817a 100644 --- a/svx/source/dialog/page.hrc +++ b/svx/source/dialog/page.hrc @@ -32,9 +32,16 @@ const std::pair<TranslateId, int> RID_SVXSTRARY_PAPERSIZE_STD[] = { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "A5") , PAPER_A5 }, { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "A4") , PAPER_A4 }, { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "A3") , PAPER_A3 }, + { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "A2") , PAPER_A2 }, + { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "A1") , PAPER_A1 }, + { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "A0") , PAPER_A0 }, { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B6 (ISO)") , PAPER_B6_ISO }, { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B5 (ISO)") , PAPER_B5_ISO }, { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B4 (ISO)") , PAPER_B4_ISO }, + { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B3 (ISO)") , PAPER_B3_ISO }, + { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B2 (ISO)") , PAPER_B2_ISO }, + { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B1 (ISO)") , PAPER_B1_ISO }, + { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "B0 (ISO)") , PAPER_B0_ISO }, { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "Letter") , PAPER_LETTER }, { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "Legal") , PAPER_LEGAL }, { NC_("RID_SVXSTRARY_PAPERSIZE_STD", "Long Bond") , PAPER_FANFOLD_LEGAL_DE }, diff --git a/sw/qa/uitest/writer_tests3/pageDialog.py b/sw/qa/uitest/writer_tests3/pageDialog.py index 7e95e08d8570..9305c7727b3f 100644 --- a/sw/qa/uitest/writer_tests3/pageDialog.py +++ b/sw/qa/uitest/writer_tests3/pageDialog.py @@ -142,7 +142,8 @@ class WriterPageDialog(UITestCase): def test_paper_format(self): - lPaperFormat = ["A6", "A5", "A4", "A3", "B6 (ISO)", "B5 (ISO)", "B4 (ISO)", "Letter", + lPaperFormat = ["A6", "A5", "A4", "A3", "A2", "A1", "A0", "B6 (ISO)", "B5 (ISO)", + "B4 (ISO)", "B3 (ISO)", "B2 (ISO)", "B1 (ISO)", "B0 (ISO)", "Letter", "Legal", "Long Bond", "Tabloid", "B6 (JIS)", "B5 (JIS)", "B4 (JIS)", "16 Kai", "32 Kai", "Big 32 Kai", "User", "DL Envelope", "C6 Envelope", "C6/5 Envelope", "C5 Envelope", "C4 Envelope", "#6¾ Envelope", "#7¾ (Monarch) Envelope", diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 33785c007832..160ba3085373 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -81,11 +81,20 @@ PageSizeControl::PageSizeControl(PageSizePopup* pControl, weld::Widget* pParent) mxWidthHeightField->set_increments(10, 100, FieldUnit::NONE); SetFieldUnit( *mxWidthHeightField, lcl_GetFieldUnit() ); + maPaperList.push_back( PAPER_A0 ); + maPaperList.push_back( PAPER_A1 ); + maPaperList.push_back( PAPER_A2 ); maPaperList.push_back( PAPER_A3 ); maPaperList.push_back( PAPER_A4 ); maPaperList.push_back( PAPER_A5 ); + maPaperList.push_back( PAPER_A6 ); + maPaperList.push_back( PAPER_B0_ISO ); + maPaperList.push_back( PAPER_B1_ISO ); + maPaperList.push_back( PAPER_B2_ISO ); + maPaperList.push_back( PAPER_B3_ISO ); maPaperList.push_back( PAPER_B4_ISO ); maPaperList.push_back( PAPER_B5_ISO ); + maPaperList.push_back( PAPER_B6_ISO ); maPaperList.push_back( PAPER_ENV_C5 ); maPaperList.push_back( PAPER_LETTER ); maPaperList.push_back( PAPER_LEGAL );
