summaryrefslogtreecommitdiff
path: root/i18nutil
diff options
context:
space:
mode:
authorRob Snelders <programming@ertai.nl>2012-04-18 23:30:26 +0200
committerIvan Timofeev <timofeev.i.s@gmail.com>2012-04-23 22:18:33 +0400
commit9c99dac0968c405537cd6094a46c7f6de01ccc4e (patch)
tree2c125552b168c666dc550288933f3318fc2b9be5 /i18nutil
parent67d022ac0ce5e67565e0589f4cd9eb05a8fd5a3c (diff)
fdo#42986 Add Presentationsize 16:9 Widescreen
Diffstat (limited to 'i18nutil')
-rw-r--r--i18nutil/inc/i18nutil/paper.hxx7
-rw-r--r--i18nutil/source/utility/paper.cxx6
2 files changed, 8 insertions, 5 deletions
diff --git a/i18nutil/inc/i18nutil/paper.hxx b/i18nutil/inc/i18nutil/paper.hxx
index d5be9ec0bca4..98b88bd6373d 100644
--- a/i18nutil/inc/i18nutil/paper.hxx
+++ b/i18nutil/inc/i18nutil/paper.hxx
@@ -58,7 +58,7 @@ enum Paper
PAPER_ENV_C65,
PAPER_ENV_DL,
PAPER_SLIDE_DIA,
- PAPER_SCREEN,
+ PAPER_SCREEN_4_3,
PAPER_C,
PAPER_D,
PAPER_E,
@@ -116,11 +116,12 @@ enum Paper
PAPER_ARCHB,
PAPER_ARCHC,
PAPER_ARCHD,
- PAPER_ARCHE
+ PAPER_ARCHE,
+ PAPER_SCREEN_16_9
};
// defined for 'equal size' test with the implementation array
-#define NUM_PAPER_ENTRIES (PAPER_ARCHE - PAPER_A0 + 1)
+#define NUM_PAPER_ENTRIES (PAPER_SCREEN_16_9 - PAPER_A0 + 1)
// ---------
// - Paper -
diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index 63b5cff2a93d..a79089d93893 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -93,7 +93,7 @@ static PageDesc aDinTab[] =
{ MM2MM100( 114 ), MM2MM100( 229 ), "EnvC65", NULL },
{ MM2MM100( 110 ), MM2MM100( 220 ), "EnvDL", "DL" },
{ MM2MM100( 180), MM2MM100( 270 ), NULL, NULL }, //Dia
- { MM2MM100( 210), MM2MM100( 280 ), NULL, NULL }, //Screen
+ { MM2MM100( 210), MM2MM100( 280 ), NULL, NULL }, //Screen 4:3
{ IN2MM100( 17 ), IN2MM100( 22 ), "AnsiC", "CSheet" },
{ IN2MM100( 22 ), IN2MM100( 34 ), "AnsiD", "DSheet" },
{ IN2MM100( 34 ), IN2MM100( 44 ), "AnsiE", "ESheet" },
@@ -155,7 +155,9 @@ static PageDesc aDinTab[] =
{ IN2MM100( 12 ), IN2MM100( 18 ), "ARCHB", NULL },
{ IN2MM100( 18 ), IN2MM100( 24 ), "ARCHC", NULL },
{ IN2MM100( 24 ), IN2MM100( 36 ), "ARCHD", NULL },
- { IN2MM100( 36 ), IN2MM100( 48 ), "ARCHE", NULL }
+ { IN2MM100( 36 ), IN2MM100( 48 ), "ARCHE", NULL },
+ { MM2MM100( 157.5), MM2MM100( 280 ), NULL, NULL } //Screen 16:9
+
};
static const size_t nTabSize = SAL_N_ELEMENTS(aDinTab);