summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2011-01-27 16:53:34 +0100
committerVladimir Glazunov <vg@openoffice.org>2011-01-27 16:53:34 +0100
commitdd8d794f7e36c45c185b397a777f2f5e9cb36d99 (patch)
tree3246dc309da363e22d7dd7191fc847f1578c07a9 /cui
parent959f9f9d22b785c43d100353aacd9a4e1c16f82c (diff)
parentaf1f139458b03e151d47079e759291a21381f06b (diff)
CWS-TOOLING: integrate CWS tl84
Diffstat (limited to 'cui')
-rw-r--r--cui/source/tabpages/page.h6
-rw-r--r--cui/source/tabpages/page.src2
2 files changed, 8 insertions, 0 deletions
diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
index 2bc5583fe859..9de1ee21d3e5 100644
--- a/cui/source/tabpages/page.h
+++ b/cui/source/tabpages/page.h
@@ -29,6 +29,11 @@
// define ----------------------------------------------------------------
+//!! the values of the following defines must correspond to the array position
+//!! of the respective paper size in the file i18npool/source/paper/paper.cxx
+//!! There are enums for them in i18npool/inc/i18npool/paper.hxx but unfortunately
+//!! the resource compiler does not understand enums, thus the enum values need
+//!! to be duplicated here for use in the src file.
#define PAPERSIZE_A0 0
#define PAPERSIZE_A1 1
#define PAPERSIZE_A2 2
@@ -66,6 +71,7 @@
#define PAPERSIZE_B4_JIS 34
#define PAPERSIZE_B5_JIS 35
#define PAPERSIZE_B6_JIS 36
+#define PAPERSIZE_A6 56
#endif
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 5c919f1df17a..2618b0b9389a 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -389,6 +389,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_STD
{
ItemList [ en-US ] =
{
+ < "A6" ; PAPERSIZE_A6 ; > ;
< "A5" ; PAPERSIZE_A5 ; > ;
< "A4" ; PAPERSIZE_A4 ; > ;
< "A3" ; PAPERSIZE_A3 ; > ;
@@ -423,6 +424,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
{
ItemList [ en-US ] =
{
+ < "A6" ; PAPERSIZE_A6 ; > ;
< "A5" ; PAPERSIZE_A5 ; > ;
< "A4" ; PAPERSIZE_A4 ; > ;
< "A3" ; PAPERSIZE_A3 ; > ;