i18nutil/source/utility/paper.cxx | 6 ++++--
include/i18nutil/paper.hxx | 6 ++++--
vcl/inc/print.hrc | 6 ++++--
vcl/source/gdi/print.cxx | 2 +-
4 files changed, 13 insertions(+), 7 deletions(-)
New commits:
commit f53f127e2f4bc876da49f2749b88740954026dec
Author: Daniel Silva <danielfaleirosi...@gmail.com>
AuthorDate: Sun Jul 22 20:29:38 2018 -0300
Commit: Katarina Behrens <katarina.behr...@cib.de>
CommitDate: Mon Aug 13 21:33:20 2018 +0200
Adds 16k papers to print files in vcl and paper files in i18nutil
Change-Id: Iacb5903e1a51134b65836f33948a1cf5cfc3af0d
Reviewed-on: https://gerrit.libreoffice.org/57832
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/i18nutil/source/utility/paper.cxx
b/i18nutil/source/utility/paper.cxx
index 473b8e1d977f..2c3dc6f15b00 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -101,7 +101,7 @@ static const PageDesc aDinTab[] =
{ IN2MM100( 4.125 ), IN2MM100( 9.5 ), "Env10", "Comm10" },
{ IN2MM100( 4.5 ), IN2MM100( 10.375 ), "Env11", nullptr },
{ IN2MM100( 4.75 ), IN2MM100( 11 ), "Env12", nullptr },
- { MM2MM100( 184 ), MM2MM100( 260 ), nullptr, nullptr }, //Kai16
+ { MM2MM100( 184 ), MM2MM100( 260 ), nullptr, nullptr }, //Kai16 / 16k
{ MM2MM100( 130 ), MM2MM100( 184 ), nullptr, nullptr }, //Kai32
{ MM2MM100( 140 ), MM2MM100( 203 ), nullptr, nullptr }, //BigKai32
{ MM2MM100( 257 ), MM2MM100( 364 ), "B4", nullptr }, //JIS
@@ -149,7 +149,9 @@ static const PageDesc aDinTab[] =
{ IN2MM100( 24 ), IN2MM100( 36 ), "ARCHD", nullptr },
{ IN2MM100( 36 ), IN2MM100( 48 ), "ARCHE", nullptr },
{ MM2MM100( 157.5), MM2MM100( 280 ), nullptr, nullptr }, //Screen 16:9
- { MM2MM100( 175 ), MM2MM100( 280 ), nullptr, nullptr } //Screen
16:10
+ { MM2MM100( 175 ), MM2MM100( 280 ), nullptr, nullptr }, //Screen
16:10
+ { MM2MM100( 195 ), MM2MM100( 270 ), nullptr, nullptr }, // 16k
+ { MM2MM100( 197 ), MM2MM100( 273 ), nullptr, nullptr } // 16k
};
diff --git a/include/i18nutil/paper.hxx b/include/i18nutil/paper.hxx
index 75f77de05401..c2f9a51fde8d 100644
--- a/include/i18nutil/paper.hxx
+++ b/include/i18nutil/paper.hxx
@@ -108,11 +108,13 @@ enum Paper
PAPER_ARCHD,
PAPER_ARCHE,
PAPER_SCREEN_16_9,
- PAPER_SCREEN_16_10
+ PAPER_SCREEN_16_10,
+ PAPER_16K_195x270,
+ PAPER_16K_197x273
};
// defined for 'equal size' test with the implementation array
-#define NUM_PAPER_ENTRIES (PAPER_SCREEN_16_10 - PAPER_A0 + 1)
+#define NUM_PAPER_ENTRIES (PAPER_16K_197x273 - PAPER_A0 + 1)
class I18NUTIL_DLLPUBLIC PaperInfo
diff --git a/vcl/inc/print.hrc b/vcl/inc/print.hrc
index 754a8027c320..1c12db68e0a2 100644
--- a/vcl/inc/print.hrc
+++ b/vcl/inc/print.hrc
@@ -56,7 +56,7 @@ const char* RID_STR_PAPERNAMES[] =
NC_("RID_STR_PAPERNAMES", "#10 Envelope"),
NC_("RID_STR_PAPERNAMES", "#11 Envelope"),
NC_("RID_STR_PAPERNAMES", "#12 Envelope"),
- NC_("RID_STR_PAPERNAMES", "16 Kai"),
+ NC_("RID_STR_PAPERNAMES", "16 Kai (16k)"),
NC_("RID_STR_PAPERNAMES", "32 Kai"),
NC_("RID_STR_PAPERNAMES", "Big 32 Kai"),
NC_("RID_STR_PAPERNAMES", "B4 (JIS)"),
@@ -104,8 +104,10 @@ const char* RID_STR_PAPERNAMES[] =
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", "Screen 16:10"),
+ NC_("RID_STR_PAPERNAMES", "16k (195 x 270)"),
+ // To translators: This is the last entry of the sequence of paper size
names
+ NC_("RID_STR_PAPERNAMES", "16k (197 x 273)")
};
#endif // INCLUDED_VCL_INC_PRINT_HRC
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index e285d93007d2..6929c7575718 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1482,7 +1482,7 @@ OUString Printer::GetPaperName( Paper ePaper )
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
+ PAPER_ARCHE, PAPER_SCREEN_16_9, PAPER_SCREEN_16_10,
PAPER_16K_195x270, PAPER_16K_197x273
};
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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
