Syncs paper names in vcl with i18nutil/*/paper.hxx

Change-Id: Ie6137f6f5f180282df0329ee807b071c09e0c331
Reviewed-on: https://gerrit.libreoffice.org/57532
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

2 files changed, 56 insertions, 11 deletions

diff --git a/vcl/inc/print.hrc b/vcl/inc/print.hrc
index fced0004312d..a6a5f5069559 100644
--- a/vcl/inc/print.hrc
+++ b/vcl/inc/print.hrc
@@ -31,7 +31,6 @@ const char* RID_STR_PAPERNAMES[] =
     NC_("RID_STR_PAPERNAMES", "A3"),
     NC_("RID_STR_PAPERNAMES", "A4"),
     NC_("RID_STR_PAPERNAMES", "A5"),
-    NC_("RID_STR_PAPERNAMES", "A6"),
     NC_("RID_STR_PAPERNAMES", "B4 (ISO)"),
     NC_("RID_STR_PAPERNAMES", "B5 (ISO)"),
     NC_("RID_STR_PAPERNAMES", "Letter"),
@@ -45,11 +44,12 @@ const char* RID_STR_PAPERNAMES[] =
     NC_("RID_STR_PAPERNAMES", "C6/5 Envelope"),
     NC_("RID_STR_PAPERNAMES", "DL Envelope"),
     NC_("RID_STR_PAPERNAMES", "Dia Slide"),
+    NC_("RID_STR_PAPERNAMES", "Screen 4:3"),
     NC_("RID_STR_PAPERNAMES", "C"),
     NC_("RID_STR_PAPERNAMES", "D"),
     NC_("RID_STR_PAPERNAMES", "E"),
     NC_("RID_STR_PAPERNAMES", "Executive"),
-    NC_("RID_STR_PAPERNAMES", "Long Bond"),
+    NC_("RID_STR_PAPERNAMES", "German Legal Fanfold"),
     NC_("RID_STR_PAPERNAMES", "#8 (Monarch) Envelope"),
     NC_("RID_STR_PAPERNAMES", "#6 3/4 (Personal) Envelope"),
     NC_("RID_STR_PAPERNAMES", "#9 Envelope"),
@@ -62,9 +62,50 @@ const char* RID_STR_PAPERNAMES[] =
     NC_("RID_STR_PAPERNAMES", "B4 (JIS)"),
     NC_("RID_STR_PAPERNAMES", "B5 (JIS)"),
     NC_("RID_STR_PAPERNAMES", "B6 (JIS)"),
+    NC_("RID_STR_PAPERNAMES", "Ledger"),
+    NC_("RID_STR_PAPERNAMES", "Statement"),
+    NC_("RID_STR_PAPERNAMES", "Quarto"),
+    NC_("RID_STR_PAPERNAMES", "10x14"),
+    NC_("RID_STR_PAPERNAMES", "#14 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "C3 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "Italian Envelope"),
+    NC_("RID_STR_PAPERNAMES", "U.S. Standard Fanfold"),
+    NC_("RID_STR_PAPERNAMES", "German Standard Fanfold"),
     NC_("RID_STR_PAPERNAMES", "Japanese Postcard"),
+    NC_("RID_STR_PAPERNAMES", "9x11"),
+    NC_("RID_STR_PAPERNAMES", "10x11"),
+    NC_("RID_STR_PAPERNAMES", "15x11"),
+    NC_("RID_STR_PAPERNAMES", "Invitation Envelope"),
+    NC_("RID_STR_PAPERNAMES", "SuperA"),
+    NC_("RID_STR_PAPERNAMES", "SuperB"),
+    NC_("RID_STR_PAPERNAMES", "Letter Plus"),
+    NC_("RID_STR_PAPERNAMES", "A4 Plus"),
+    NC_("RID_STR_PAPERNAMES", "Double Postcard"),
+    NC_("RID_STR_PAPERNAMES", "A6"),
+    NC_("RID_STR_PAPERNAMES", "12x11"),
+    NC_("RID_STR_PAPERNAMES", "A7"),
+    NC_("RID_STR_PAPERNAMES", "A8"),
+    NC_("RID_STR_PAPERNAMES", "A9"),
+    NC_("RID_STR_PAPERNAMES", "A10"),
+    NC_("RID_STR_PAPERNAMES", "B0 (ISO)"),
+    NC_("RID_STR_PAPERNAMES", "B1 (ISO)"),
+    NC_("RID_STR_PAPERNAMES", "B2 (ISO)"),
+    NC_("RID_STR_PAPERNAMES", "B3 (ISO)"),
+    NC_("RID_STR_PAPERNAMES", "B7 (ISO)"),
+    NC_("RID_STR_PAPERNAMES", "B8 (ISO)"),
+    NC_("RID_STR_PAPERNAMES", "B9 (ISO)"),
+    NC_("RID_STR_PAPERNAMES", "B10 (ISO)"),
+    NC_("RID_STR_PAPERNAMES", "C2 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "C7 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "C8 Envelope"),
+    NC_("RID_STR_PAPERNAMES", "Arch A"),
+    NC_("RID_STR_PAPERNAMES", "Arch B"),
+    NC_("RID_STR_PAPERNAMES", "Arch C"),
+    NC_("RID_STR_PAPERNAMES", "Arch D"),
+    NC_("RID_STR_PAPERNAMES", "Arch E"),
+    NC_("RID_STR_PAPERNAMES", "Screen 16:9"),
     // To translators: This is the last entry of the sequence of paper size names
-    NC_("RID_STR_PAPERNAMES", "Double Postcard")
+    NC_("RID_STR_PAPERNAMES", "Screen 16:10"),
 };
 
 #endif // INCLUDED_VCL_INC_PRINT_HRC
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 32da4f83cf34..7fb990a04700 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1432,14 +1432,18 @@ OUString Printer::GetPaperName( Paper ePaper )
     {
         static const int PaperIndex[] =
         {
-            PAPER_A0, PAPER_A1, PAPER_A2, PAPER_A3, PAPER_A4, PAPER_A5, PAPER_A6,
-            PAPER_B4_ISO, PAPER_B5_ISO, PAPER_LETTER, PAPER_LEGAL, PAPER_TABLOID,
-            PAPER_USER, PAPER_B6_ISO, PAPER_ENV_C4, PAPER_ENV_C5, PAPER_ENV_C6, PAPER_ENV_C65,
-            PAPER_ENV_DL, PAPER_SLIDE_DIA, PAPER_C, PAPER_D, PAPER_E,
-            PAPER_EXECUTIVE, PAPER_FANFOLD_LEGAL_DE, PAPER_ENV_MONARCH, PAPER_ENV_PERSONAL,
-            PAPER_ENV_9, PAPER_ENV_10, PAPER_ENV_11, PAPER_ENV_12, PAPER_KAI16,
-            PAPER_KAI32, PAPER_KAI32BIG, PAPER_B4_JIS, PAPER_B5_JIS, PAPER_B6_JIS,
-            PAPER_POSTCARD_JP, PAPER_DOUBLEPOSTCARD_JP
+            PAPER_A0, PAPER_A1, PAPER_A2, PAPER_A3, PAPER_A4, PAPER_A5, PAPER_B4_ISO, PAPER_B5_ISO,
+            PAPER_LETTER, PAPER_LEGAL, PAPER_TABLOID, PAPER_USER, PAPER_B6_ISO, PAPER_ENV_C4, PAPER_ENV_C5,
+            PAPER_ENV_C6, PAPER_ENV_C65, PAPER_ENV_DL, PAPER_SLIDE_DIA, PAPER_SCREEN_4_3, PAPER_C, PAPER_D,
+            PAPER_E, PAPER_EXECUTIVE, PAPER_FANFOLD_LEGAL_DE, PAPER_ENV_MONARCH, PAPER_ENV_PERSONAL, PAPER_ENV_9,
+            PAPER_ENV_10, PAPER_ENV_11, PAPER_ENV_12, PAPER_KAI16, PAPER_KAI32, PAPER_KAI32BIG, PAPER_B4_JIS,
+            PAPER_B5_JIS, PAPER_B6_JIS, PAPER_LEDGER, PAPER_STATEMENT, PAPER_QUARTO, PAPER_10x14, PAPER_ENV_14,
+            PAPER_ENV_C3, PAPER_ENV_ITALY, PAPER_FANFOLD_US, PAPER_FANFOLD_DE, PAPER_POSTCARD_JP, PAPER_9x11,
+            PAPER_10x11, PAPER_15x11, PAPER_ENV_INVITE, PAPER_A_PLUS, PAPER_B_PLUS, PAPER_LETTER_PLUS, PAPER_A4_PLUS,
+            PAPER_DOUBLEPOSTCARD_JP, PAPER_A6, PAPER_12x11, PAPER_A7, PAPER_A8, PAPER_A9, PAPER_A10, PAPER_B0_ISO,
+            PAPER_B1_ISO, PAPER_B2_ISO, PAPER_B3_ISO, PAPER_B7_ISO, PAPER_B8_ISO, PAPER_B9_ISO, PAPER_B10_ISO,
+            PAPER_ENV_C2, PAPER_ENV_C7, PAPER_ENV_C8, PAPER_ARCHA, PAPER_ARCHB, PAPER_ARCHC, PAPER_ARCHD,
+            PAPER_ARCHE, PAPER_SCREEN_16_9, PAPER_SCREEN_16_10
         };
         assert(SAL_N_ELEMENTS(PaperIndex) == SAL_N_ELEMENTS(RID_STR_PAPERNAMES) && "localized paper name count wrong");
         for (size_t i = 0; i < SAL_N_ELEMENTS(PaperIndex); ++i)