i81715 - RFE: 16:9 (16:10) widescreen page format

This adds 16:9 and 16:10 as screen format for Impress (and Draw).

The new strings are visible for en-US immediately and will be for other languages after the next run of our Pootle synchronisation.

3 files changed, 52 insertions, 44 deletions

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 7aa17089dcb2..dec6378d807d 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1072,7 +1072,9 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox )
         {
             // Draw: bei Papierformat soll der Rand 1cm betragen
             long nTmp = 0;
-            sal_Bool bScreen = ( PAPER_SCREEN == ePaper );
+            sal_Bool bScreen = ( PAPER_SCREEN_4_BY_3 == ePaper )  ||
+                               ( PAPER_SCREEN_16_BY_9 == ePaper ) ||
+                               ( PAPER_SCREEN_16_BY_10 == ePaper );
 
             if ( !bScreen )
                 // bei Bildschirm keinen Rand
@@ -1549,7 +1551,9 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
     sal_uInt16 nPos = aPaperSizeBox.GetSelectEntryPos();
     Paper ePaper = (Paper)(sal_uLong)aPaperSizeBox.GetEntryData( nPos );
 
-    if ( ePaper != PAPER_SCREEN && IsMarginOutOfRange() )
+    if ( ePaper != PAPER_SCREEN_4_BY_3 && IsMarginOutOfRange()  ||
+         ePaper != PAPER_SCREEN_16_BY_9 && IsMarginOutOfRange() ||
+         ePaper != PAPER_SCREEN_16_BY_10 && IsMarginOutOfRange() )
     {
         if ( QueryBox( this, WB_YES_NO | WB_DEF_NO, aPrintRangeQueryText ).Execute() == RET_NO )
         {
diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
index 02b01a65abb2..8ff4eaa82197 100644
--- a/cui/source/tabpages/page.h
+++ b/cui/source/tabpages/page.h
@@ -20,54 +20,57 @@
  *************************************************************/
 
 
+
 #ifndef _SVX_PAGE_H
 #define _SVX_PAGE_H
 
 // define ----------------------------------------------------------------
 
-//!! the values of the following defines must correspond to the array position
+//!! 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
-#define PAPERSIZE_A3            3
-#define PAPERSIZE_A4            4
-#define PAPERSIZE_A5            5
-#define PAPERSIZE_B4_ISO        6
-#define PAPERSIZE_B5_ISO        7
-#define PAPERSIZE_LETTER        8
-#define PAPERSIZE_LEGAL         9
-#define PAPERSIZE_TABLOID       10
-#define PAPERSIZE_USER          11
-#define PAPERSIZE_B6_ISO        12
-#define PAPERSIZE_C4            13
-#define PAPERSIZE_C5            14
-#define PAPERSIZE_C6            15
-#define PAPERSIZE_C65           16
-#define PAPERSIZE_DL            17
-#define PAPERSIZE_DIA           18
-#define PAPERSIZE_SCREEN        19
-#define PAPERSIZE_C             20
-#define PAPERSIZE_D             21
-#define PAPERSIZE_E             22
-#define PAPERSIZE_EXECUTIVE     23
-#define PAPERSIZE_LEGAL2        24
-#define PAPERSIZE_MONARCH       25
-#define PAPERSIZE_COM675        26
-#define PAPERSIZE_COM9          27
-#define PAPERSIZE_COM10         28
-#define PAPERSIZE_COM11         29
-#define PAPERSIZE_COM12         30
-#define PAPERSIZE_KAI16         31
-#define PAPERSIZE_KAI32         32
-#define PAPERSIZE_KAI32BIG      33
-#define PAPERSIZE_B4_JIS        34
-#define PAPERSIZE_B5_JIS        35
-#define PAPERSIZE_B6_JIS        36
-#define PAPERSIZE_A6            56
 
-#endif
+#define PAPERSIZE_A0                0
+#define PAPERSIZE_A1                1
+#define PAPERSIZE_A2                2
+#define PAPERSIZE_A3                3
+#define PAPERSIZE_A4                4
+#define PAPERSIZE_A5                5
+#define PAPERSIZE_B4_ISO            6
+#define PAPERSIZE_B5_ISO            7
+#define PAPERSIZE_LETTER            8
+#define PAPERSIZE_LEGAL             9
+#define PAPERSIZE_TABLOID           10
+#define PAPERSIZE_USER              11
+#define PAPERSIZE_B6_ISO            12
+#define PAPERSIZE_C4                13
+#define PAPERSIZE_C5                14
+#define PAPERSIZE_C6                15
+#define PAPERSIZE_C65               16
+#define PAPERSIZE_DL                17
+#define PAPERSIZE_DIA               18
+#define PAPERSIZE_SCREEN_4_BY_3     19
+#define PAPERSIZE_C                 20
+#define PAPERSIZE_D                 21
+#define PAPERSIZE_E                 22
+#define PAPERSIZE_EXECUTIVE         23
+#define PAPERSIZE_LEGAL2            24
+#define PAPERSIZE_MONARCH           25
+#define PAPERSIZE_COM675            26
+#define PAPERSIZE_COM9              27
+#define PAPERSIZE_COM10             28
+#define PAPERSIZE_COM11             29
+#define PAPERSIZE_COM12             30
+#define PAPERSIZE_KAI16             31
+#define PAPERSIZE_KAI32             32
+#define PAPERSIZE_KAI32BIG          33
+#define PAPERSIZE_B4_JIS            34
+#define PAPERSIZE_B5_JIS            35
+#define PAPERSIZE_B6_JIS            36
+#define PAPERSIZE_A6                56
+#define PAPERSIZE_SCREEN_16_BY_9    78
+#define PAPERSIZE_SCREEN_16_BY_10   79
 
+#endif
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index e9f15ff7013b..2309a044d5c6 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -447,8 +447,9 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
         < "C5 Envelope" ; PAPERSIZE_C5 ; > ;
         < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
         < "Dia Slide" ; PAPERSIZE_DIA ; > ;
-        < "Screen" ; PAPERSIZE_SCREEN ; > ;
-
+        < "Screen (4:3)" ; PAPERSIZE_SCREEN_4_BY_3 ; > ;
+        < "Screen (16:9)" ; PAPERSIZE_SCREEN_16_BY_9 ; > ;
+        < "Screen (16:10)" ; PAPERSIZE_SCREEN_16_BY_10 ; > ;
     };
 };