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.

8 files changed, 384 insertions, 370 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 ; > ;
     };
 };
 
diff --git a/i18npool/inc/i18npool/paper.hxx b/i18npool/inc/i18npool/paper.hxx
index 870b718263b2..97d8d9c4a2d8 100644
--- a/i18npool/inc/i18npool/paper.hxx
+++ b/i18npool/inc/i18npool/paper.hxx
@@ -55,7 +55,7 @@ enum Paper
     PAPER_ENV_C65,
     PAPER_ENV_DL,
     PAPER_SLIDE_DIA,
-    PAPER_SCREEN,
+    PAPER_SCREEN_4_BY_3,
     PAPER_C,
     PAPER_D,
     PAPER_E,
@@ -113,20 +113,20 @@ enum Paper
     PAPER_ARCHB,
     PAPER_ARCHC,
     PAPER_ARCHD,
-    PAPER_ARCHE
+    PAPER_ARCHE,
+    PAPER_SCREEN_16_BY_9,
+    PAPER_SCREEN_16_BY_10
 };
 
 // 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_BY_10 - PAPER_A0 + 1)
 
-// ---------
-// - Paper -
-// ---------
+// Paper
 
 class I18NPOOL_DLLPUBLIC PaperInfo
 {
     Paper m_eType;
-    long m_nPaperWidth;  // width in 100thMM
+    long m_nPaperWidth; // width in 100thMM
     long m_nPaperHeight; // height in 100thMM
 public:
     PaperInfo(Paper eType);
diff --git a/i18npool/source/paper/paper.cxx b/i18npool/source/paper/paper.cxx
index c1b555b0da8c..6532300547ad 100644
--- a/i18npool/source/paper/paper.cxx
+++ b/i18npool/source/paper/paper.cxx
@@ -80,22 +80,22 @@ static PageDesc aDinTab[] =
     { IN2MM100( 8.5 ),   IN2MM100( 11 ),     "Letter",  "Note" },
     { IN2MM100( 8.5 ),   IN2MM100( 14 ),     "Legal",  NULL },
     { IN2MM100( 11 ),    IN2MM100( 17 ),     "Tabloid",  "11x17" },
-    { 0,                 0,                  NULL, NULL }, //User
+    { 0,                 0,                  NULL, NULL }, // User
     { MM2MM100( 125 ),   MM2MM100( 176 ),    "ISOB6",  NULL },
     { MM2MM100( 229 ),   MM2MM100( 324 ),    "EnvC4",  "C4" },
     { MM2MM100( 162 ),   MM2MM100( 229 ),    "EnvC5",  "C5" },
     { MM2MM100( 114 ),   MM2MM100( 162 ),    "EnvC6",  "C6" },
     { 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( 180),    MM2MM100( 270 ),    NULL,  NULL }, // Dia Slide
+    { 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" },
     { IN2MM100( 7.25 ),  IN2MM100( 10.5 ),   "Executive",  NULL },
     //"Folio" is a different size in the PPD documentation than 8.5x11
     //This "FanFoldGermanLegal" is known in the Philippines as
-    //"Legal" paper or "Long Bond Paper".  The "Legal" name causing untold
+    //"Legal" paper or "Long Bond Paper". The "Legal" name causing untold
     //misery, given the differently sized US "Legal" paper
     { IN2MM100( 8.5 ),   IN2MM100( 13 ),     "FanFoldGermanLegal",  NULL },
     { IN2MM100( 3.875 ), IN2MM100( 7.5 ),    "EnvMonarch", "Monarch" },
@@ -104,12 +104,12 @@ static PageDesc aDinTab[] =
     { IN2MM100( 4.125 ), IN2MM100( 9.5 ),    "Env10",  "Comm10" },
     { IN2MM100( 4.5 ),   IN2MM100( 10.375 ), "Env11",  NULL },
     { IN2MM100( 4.75 ),  IN2MM100( 11 ),     "Env12",  NULL },
-    { MM2MM100( 184 ),   MM2MM100( 260 ),    NULL,  NULL }, //Kai16
-    { MM2MM100( 130 ),   MM2MM100( 184 ),    NULL,  NULL }, //Kai32
-    { MM2MM100( 140 ),   MM2MM100( 203 ),    NULL,  NULL }, //BigKai32
-    { MM2MM100( 257 ),   MM2MM100( 364 ),    "B4",  NULL }, //JIS
-    { MM2MM100( 182 ),   MM2MM100( 257 ),    "B5",  NULL }, //JIS
-    { MM2MM100( 128 ),   MM2MM100( 182 ),    "B6",  NULL }, //JIS
+    { MM2MM100( 184 ),   MM2MM100( 260 ),    NULL,  NULL }, // Kai16
+    { MM2MM100( 130 ),   MM2MM100( 184 ),    NULL,  NULL }, // Kai32
+    { MM2MM100( 140 ),   MM2MM100( 203 ),    NULL,  NULL }, // BigKai32
+    { MM2MM100( 257 ),   MM2MM100( 364 ),    "B4",  NULL }, // JIS
+    { MM2MM100( 182 ),   MM2MM100( 257 ),    "B5",  NULL }, // JIS
+    { MM2MM100( 128 ),   MM2MM100( 182 ),    "B6",  NULL }, // JIS
     { IN2MM100( 17 ),    IN2MM100( 11 ),     "Ledger",  NULL },
     { IN2MM100( 5.5 ),   IN2MM100( 8.5 ),    "Statement",  NULL },
     { PT2MM100( 610 ),   PT2MM100( 780 ),    "Quarto",  NULL },
@@ -150,7 +150,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)
+    { MM2MM100( 175),    MM2MM100( 280 ),    NULL,  NULL }  // Screen (16:10)
 };
 
 static const size_t nTabSize = sizeof(aDinTab) / sizeof(aDinTab[0]);
@@ -266,17 +268,17 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
                 aPaper = aPaper.trim();
                 static struct { const char *pName; Paper ePaper; } aCustoms [] =
                 {
-                    { "B0",   PAPER_B0_ISO },
-                    { "B1",   PAPER_B1_ISO },
-                    { "B2",   PAPER_B2_ISO },
-                    { "B3",   PAPER_B3_ISO },
-                    { "B4",   PAPER_B4_ISO },
-                    { "B5",   PAPER_B5_ISO },
-                    { "B6",   PAPER_B6_ISO },
-                    { "B7",   PAPER_B7_ISO },
-                    { "B8",   PAPER_B8_ISO },
-                    { "B9",   PAPER_B9_ISO },
-                    { "B10",  PAPER_B10_ISO },
+                    { "B0",    PAPER_B0_ISO },
+                    { "B1",    PAPER_B1_ISO },
+                    { "B2",    PAPER_B2_ISO },
+                    { "B3",    PAPER_B3_ISO },
+                    { "B4",    PAPER_B4_ISO },
+                    { "B5",    PAPER_B5_ISO },
+                    { "B6",    PAPER_B6_ISO },
+                    { "B7",    PAPER_B7_ISO },
+                    { "B8",    PAPER_B8_ISO },
+                    { "B9",    PAPER_B9_ISO },
+                    { "B10",   PAPER_B10_ISO },
                     { "folio", PAPER_FANFOLD_LEGAL_DE },
                     { "flsa",  PAPER_FANFOLD_LEGAL_DE },
                     { "flse",  PAPER_FANFOLD_LEGAL_DE }
@@ -297,7 +299,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
                 if (ePaper == PAPER_USER)
                 {
                     bHalve = !rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
-                        aPaper.getStr(), aPaper.getLength(),  "half", 4, 4);
+                        aPaper.getStr(), aPaper.getLength(), "half", 4, 4);
                     if (bHalve)
                         aPaper = aPaper.copy(4);
                     ePaper = PaperInfo::fromPSName(aPaper);
@@ -323,7 +325,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
         w.string = nl_langinfo(_NL_PAPER_WIDTH);
         h.string = nl_langinfo(_NL_PAPER_HEIGHT);
 
-        //glibc stores sizes as integer mm units
+        // glibc stores sizes as integer mm units
         w.word *= 100;
         h.word *= 100;
 
@@ -331,9 +333,9 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
         {
             if (i == PAPER_USER) continue;
 
-            //glibc stores sizes as integer mm units, and so is inaccurate. To
-            //find a standard paper size we calculate the standard paper sizes
-            //into equally inaccurate mm and compare
+            // glibc stores sizes as integer mm units, and so is inaccurate. To
+            // find a standard paper size we calculate the standard paper sizes
+            // into equally inaccurate mm and compare
             long width = (aDinTab[i].m_nWidth + 50) / 100;
             long height = (aDinTab[i].m_nHeight + 50) / 100;
 
@@ -507,4 +509,4 @@ PaperInfo PaperInfo::getDefaultPaperForLocale(
     return eType;
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim: set noet sw=4 ts=4: */
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 5dcb577fa75b..4d44927f1dd4 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -642,7 +642,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
                 }
                 else
                 {
-                    // The printer is not available.  Use a border of 10mm
+                    // The printer is not available. Use a border of 10mm
                     // on each side instead.
                     // This has to be kept synchronized with the border
                     // width set in the
@@ -653,7 +653,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
             else
             {
                 // Impress: stets Bildschirmformat, quer
-                Size aSz( SvxPaperInfo::GetPaperSize(PAPER_SCREEN, MAP_100TH_MM) );
+                Size aSz( SvxPaperInfo::GetPaperSize(PAPER_SCREEN_4_BY_3, MAP_100TH_MM) );
                 pPage->SetSize( Size( aSz.Height(), aSz.Width() ) );
                 pPage->SetBorder(0, 0, 0, 0);
             }
@@ -1545,7 +1545,7 @@ sal_uInt16 SdDrawDocument::InsertPageSet (
     String aNotesPageName = sNotesPageName;
 
     // Gather some information about the standard page and the notes page
-    // that are to be inserted.  This makes sure that there is always one
+    // that are to be inserted. This makes sure that there is always one
     // standard page followed by one notes page.
     if (ePageKind == PK_NOTES)
     {
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index b66cfb81b01c..4f2afd06425e 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1304,14 +1304,14 @@ rtl::OUString Printer::GetPaperName( Paper ePaper )
                 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, 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_ENV_DL, PAPER_SLIDE_DIA, PAPER_SCREEN_4_BY_3, PAPER_SCREEN_16_BY_9, PAPER_SCREEN_16_BY_10,
+                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
             };
             OSL_ENSURE( sal_uInt32(sizeof(PaperIndex)/sizeof(PaperIndex[0])) == aPaperStrings.Count(), "localized paper name count wrong" );
             for( int i = 0; i < int(sizeof(PaperIndex)/sizeof(PaperIndex[0])); i++ )
-                (*pSVData->mpPaperNames)[PaperIndex[i]] = aPaperStrings.GetString(i);
+            (*pSVData->mpPaperNames)[PaperIndex[i]] = aPaperStrings.GetString(i);
         }
     }
 
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index 44b344c716e3..6ccde012f000 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -25,474 +25,474 @@
 
 ModalDialog SV_DLG_PRINT
 {
-    HelpID = ".HelpID:vcl:PrintDialog:Dialog";
-    Text [en-US] = "Print";
-    Closeable = TRUE;
-    Sizeable = TRUE;
-    Moveable = TRUE;
-    Maxable = TRUE;
-    SVLook = TRUE;
+    HelpID = ".HelpID:vcl:PrintDialog:Dialog" ;
+    Text [en-US] = "Print" ;
+    Closeable = TRUE ;
+    Sizeable = TRUE ;
+    Moveable = TRUE ;
+    Maxable = TRUE ;
+    SVLook = TRUE ;
 
-    Size = MAP_APPFONT( 350, 215 );
+    Size = MAP_APPFONT ( 350, 215 ) ;
 
     OKButton SV_PRINT_OK
     {
-        DefButton = TRUE;
-        Pos = MAP_APPFONT( 240, 195 );
-        Size = MAP_APPFONT( 50, 15 );
-        Text [en-US] = "~Print";
-        HelpID = ".HelpID:vcl:PrintDialog:OK";
+        DefButton = TRUE ;
+        Pos = MAP_APPFONT ( 240, 195 ) ;
+        Size = MAP_APPFONT ( 50, 15 ) ;
+        Text [en-US] = "~Print" ;
+        HelpID = ".HelpID:vcl:PrintDialog:OK" ;
     };
     CancelButton SV_PRINT_CANCEL
     {
-        Pos = MAP_APPFONT( 295, 195 );
-        Size = MAP_APPFONT( 50, 15 );
-        HelpID = ".HelpID:vcl:PrintDialog:Cancel";
+        Pos = MAP_APPFONT ( 295, 195 ) ;
+        Size = MAP_APPFONT ( 50, 15 ) ;
+        HelpID = ".HelpID:vcl:PrintDialog:Cancel" ;
     };
     HelpButton SV_PRINT_HELP
     {
-        Pos = MAP_APPFONT( 5, 5 );
-        Size = MAP_APPFONT( 50, 15 );
-        HelpID = ".HelpID:vcl:PrintDialog:Help";
+        Pos = MAP_APPFONT ( 5, 5 ) ;
+        Size = MAP_APPFONT ( 50, 15 ) ;
+        HelpID = ".HelpID:vcl:PrintDialog:Help" ;
     };
 
     Window SV_PRINT_PAGE_PREVIEW
     {
-        Pos = MAP_APPFONT( 5, 5 );
-        Size = MAP_APPFONT( 130, 130 );
-        Border = FALSE;
-        HelpID = ".HelpID:vcl:PrintDialog:Preview";
+        Pos = MAP_APPFONT ( 5, 5 ) ;
+        Size = MAP_APPFONT ( 130, 130 ) ;
+        Border = FALSE ;
+        HelpID = ".HelpID:vcl:PrintDialog:Preview" ;
     };
     NumericField SV_PRINT_PAGE_EDIT
     {
-        Pos = MAP_APPFONT( 5, 140 );
-        Size = MAP_APPFONT( 30, 12 );
-        SVLook = TRUE;
-        Spin = FALSE;
-        Border = TRUE;
-        HelpID = ".HelpID:vcl:PrintDialog:PageEdit";
+        Pos = MAP_APPFONT ( 5, 140 ) ;
+        Size = MAP_APPFONT ( 30, 12 ) ;
+        SVLook = TRUE ;
+        Spin = FALSE ;
+        Border = TRUE ;
+        HelpID = ".HelpID:vcl:PrintDialog:PageEdit" ;
     };
     FixedText SV_PRINT_PAGE_TXT
     {
-        Pos = MAP_APPFONT( 40,142 );
-        Size = MAP_APPFONT( 30, 12 );
-        Text [ en-US ] = "/ %n";
-        VCenter = TRUE;
-        HelpID = ".HelpID:vcl:PrintDialog:NumPagesText";
+        Pos = MAP_APPFONT ( 40,142 ) ;
+        Size = MAP_APPFONT ( 30, 12 ) ;
+        Text [ en-US ] = "/ %n" ;
+        VCenter = TRUE ;
+        HelpID = ".HelpID:vcl:PrintDialog:NumPagesText" ;
     };
     PushButton SV_PRINT_PAGE_FORWARD
     {
-        Pos = MAP_APPFONT( 95, 140 );
-        Size = MAP_APPFONT( 15, 12 );
-        HelpID = ".HelpID:vcl:PrintDialog:ForwardBtn";
+        Pos = MAP_APPFONT ( 95, 140 ) ;
+        Size = MAP_APPFONT ( 15, 12 ) ;
+        HelpID = ".HelpID:vcl:PrintDialog:ForwardBtn" ;
     };
     PushButton SV_PRINT_PAGE_BACKWARD
     {
-        Pos = MAP_APPFONT( 80, 140 );
-        Size = MAP_APPFONT( 15, 12 );
-        HelpID = ".HelpID:vcl:PrintDialog:BackwardBtn";
+        Pos = MAP_APPFONT ( 80, 140 ) ;
+        Size = MAP_APPFONT ( 15, 12 ) ;
+        HelpID = ".HelpID:vcl:PrintDialog:BackwardBtn" ;
     };
     TabControl SV_PRINT_TABCTRL
     {
-        Pos = MAP_APPFONT( 140, 5 );
-        Size = MAP_APPFONT( 205, 175 );
-        HelpID = ".HelpID:vcl:PrintDialog:TabPages";
+        Pos = MAP_APPFONT ( 140, 5 ) ;
+        Size = MAP_APPFONT ( 205, 175 ) ;
+        HelpID = ".HelpID:vcl:PrintDialog:TabPages" ;
     };
     FixedLine SV_PRINT_BUTTONLINE
     {
-        Pos = MAP_APPFONT( 0, 185 );
-        Size = MAP_APPFONT( 350, 8 );
+        Pos = MAP_APPFONT ( 0, 185 ) ;
+        Size = MAP_APPFONT ( 350, 8 ) ;
     };
     String SV_PRINT_NOPAGES
     {
-        Text [en-US] = "No pages";
+        Text [en-US] = "No pages" ;
     };
 
     String SV_PRINT_TOFILE_TXT
     {
-        Text [en-US] = "Print to File...";
+        Text [en-US] = "Print to File..." ;
     };
 
     String SV_PRINT_DEFPRT_TXT
     {
-        Text [en-US] = "Default printer";
+        Text [en-US] = "Default printer" ;
     };
 
 
     String SV_PRINT_PRINTPREVIEW_TXT
     {
-        Text [en-US] = "Print preview";
+        Text [en-US] = "Print preview" ;
     };
 
     TabPage SV_PRINT_TAB_NUP
     {
-        HelpID = ".HelpID:vcl:PrintDialog:NUpPage";
-        Text [en-US] = "Page Layout";
-        Hide = TRUE;
+        HelpID = ".HelpID:vcl:PrintDialog:NUpPage" ;
+        Text [en-US] = "Page Layout" ;
+        Hide = TRUE ;
 
         FixedLine SV_PRINT_PRT_NUP_LAYOUT_FL
         {
-            Pos = MAP_APPFONT( 5, 5 );
-            Size = MAP_APPFONT( 150, 10 );
-            Text [en-US] = "Layout";
+            Pos = MAP_APPFONT ( 5, 5 ) ;
+            Size = MAP_APPFONT ( 150, 10 ) ;
+            Text [en-US] = "Layout" ;
         };
         RadioButton SV_PRINT_PRT_NUP_BROCHURE_BTN
         {
-            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:Brochure";
-            Pos = MAP_APPFONT( 0, 0 );
-            Size = MAP_APPFONT( 10, 10 );
-            Text = "";
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:Brochure" ;
+            Pos = MAP_APPFONT ( 0, 0 ) ;
+            Size = MAP_APPFONT ( 10, 10 ) ;
+            Text = "" ;
         };
         RadioButton SV_PRINT_PRT_NUP_PAGES_BTN
         {
-            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:PagesPerSheet";
-            Pos = MAP_APPFONT( 0, 0 );
-            Size = MAP_APPFONT( 10, 10 );
-            Text [en-US] = "Pa~ges per sheet";
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:PagesPerSheet" ;
+            Pos = MAP_APPFONT ( 0, 0 ) ;
+            Size = MAP_APPFONT ( 10, 10 ) ;
+            Text [en-US] = "Pa~ges per sheet" ;
         };
         ListBox SV_PRINT_PRT_NUP_PAGES_BOX
         {
-            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:PagesPerSheetBox";
-            Pos = MAP_APPFONT( 0, 0 );
-            Size = MAP_APPFONT( 10, 80 );
-            Border = TRUE;
-            DropDown = TRUE;
-            CurPos = 0;
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:PagesPerSheetBox" ;
+            Pos = MAP_APPFONT ( 0, 0 ) ;
+            Size = MAP_APPFONT ( 10, 80 ) ;
+            Border = TRUE ;
+            DropDown = TRUE ;
+            CurPos = 0 ;
             StringList [en-US] =
             {
-                < "1"; 1; >;
-                < "2"; 2; >;
-                < "4"; 4; >;
-                < "6"; 6; >;
-                < "9"; 9; >;
-                < "16"; 16; >;
-                < "Custom"; 0xffff; >;
+                < "1" ; 1; > ;
+                < "2" ; 2; > ;
+                < "4" ; 4; > ;
+                < "6" ; 6; > ;
+                < "9" ; 9; > ;
+                < "16" ; 16; > ;
+                < "Custom" ; 0xffff; > ;
             };
         };
         FixedText SV_PRINT_PRT_NUP_NUM_PAGES_TXT
         {
-            Pos = MAP_APPFONT( 0, 0 );
-            Size = MAP_APPFONT( 10, 10 );
-            Text [en-US] = "P~ages";
-            VCenter = TRUE;
+            Pos = MAP_APPFONT ( 0, 0 ) ;
+            Size = MAP_APPFONT ( 10, 10 ) ;
+            Text [en-US] = "P~ages" ;
+            VCenter = TRUE ;
         };
         NumericField SV_PRINT_PRT_NUP_COLS_EDT
         {
-            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:ColumnsBox";
-            Pos = MAP_APPFONT( 55, 20 );
-            Size = MAP_APPFONT( 40, 12 );
-            Border = TRUE;
-            Spin = TRUE;
-            Minimum = 1;
-            Maximum = 32;
-            Value = 1;
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:ColumnsBox" ;
+            Pos = MAP_APPFONT ( 55, 20 ) ;
+            Size = MAP_APPFONT ( 40, 12 ) ;
+            Border = TRUE ;
+            Spin = TRUE ;
+            Minimum = 1 ;
+            Maximum = 32 ;
+            Value = 1 ;
         };
         FixedText SV_PRINT_PRT_NUP_TIMES_TXT
         {
-            Pos = MAP_APPFONT( 10, 35 );
-            Size = MAP_APPFONT( 40, 10 );
-            Text [en-US] = "b~y";
-            VCenter = TRUE;
+            Pos = MAP_APPFONT ( 10, 35 ) ;
+            Size = MAP_APPFONT ( 40, 10 ) ;
+            Text [en-US] = "b~y" ;
+            VCenter = TRUE ;
         };
         NumericField SV_PRINT_PRT_NUP_ROWS_EDT
         {
-            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:RowsBox";
-            Pos = MAP_APPFONT( 55, 35 );
-            Size = MAP_APPFONT( 40, 12 );
-            Border = TRUE;
-            Spin = TRUE;
-            Minimum = 1;
-            Maximum = 32;
-            Value = 1;
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:RowsBox" ;
+            Pos = MAP_APPFONT ( 55, 35 ) ;
+            Size = MAP_APPFONT ( 40, 12 ) ;
+            Border = TRUE ;
+            Spin = TRUE ;
+            Minimum = 1 ;
+            Maximum = 32 ;
+            Value = 1 ;
         };
         FixedText SV_PRINT_PRT_NUP_MARGINS_PAGES_1_TXT
         {
-            Pos = MAP_APPFONT( 10, 95 );
-            Size = MAP_APPFONT( 40, 10 );
-            Text [en-US] = "~Distance";
+            Pos = MAP_APPFONT ( 10, 95 ) ;
+            Size = MAP_APPFONT ( 40, 10 ) ;
+            Text [en-US] = "~Distance" ;
         };
         MetricField SV_PRINT_PRT_NUP_MARGINS_PAGES_EDT
         {
-            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:PageMarginBox";
-            Pos = MAP_APPFONT( 55, 95 );
-            Size = MAP_APPFONT( 40, 12 );
-            Spin = TRUE;
-            Border = TRUE;
-            Value = 0;
-            Unit = FUNIT_MM;
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:PageMarginBox" ;
+            Pos = MAP_APPFONT ( 55, 95 ) ;
+            Size = MAP_APPFONT ( 40, 12 ) ;
+            Spin = TRUE ;
+            Border = TRUE ;
+            Value = 0 ;
+            Unit = FUNIT_MM ;
         };
         FixedText SV_PRINT_PRT_NUP_MARGINS_PAGES_2_TXT
         {
-            Pos = MAP_APPFONT( 10, 95 );
-            Size = MAP_APPFONT( 40, 10 );
-            Text [en-US] = "between pages";
+            Pos = MAP_APPFONT ( 10, 95 ) ;
+            Size = MAP_APPFONT ( 40, 10 ) ;
+            Text [en-US] = "between pages" ;
         };
         FixedText SV_PRINT_PRT_NUP_MARGINS_SHEET_1_TXT
         {
-            Pos = MAP_APPFONT( 110, 95 );
-            Size = MAP_APPFONT( 40, 10 );
-            Text [en-US] = "~Margin";
+            Pos = MAP_APPFONT ( 110, 95 ) ;
+            Size = MAP_APPFONT ( 40, 10 ) ;
+            Text [en-US] = "~Margin" ;
         };
         MetricField SV_PRINT_PRT_NUP_MARGINS_SHEET_EDT
         {
-            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:SheetMarginBox";
-            Pos = MAP_APPFONT( 155, 95 );
-            Size = MAP_APPFONT( 40, 12 );
-            Spin = TRUE;
-            Border = TRUE;
-            Value = 0;
-            Unit = FUNIT_MM;
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:SheetMarginBox" ;
+            Pos = MAP_APPFONT ( 155, 95 ) ;
+            Size = MAP_APPFONT ( 40, 12 ) ;
+            Spin = TRUE ;
+            Border = TRUE ;
+            Value = 0 ;
+            Unit = FUNIT_MM ;
         };
         FixedText SV_PRINT_PRT_NUP_MARGINS_SHEET_2_TXT
         {
-            Pos = MAP_APPFONT( 110, 95 );
-            Size = MAP_APPFONT( 40, 10 );
-            Text [en-US] = "to sheet border";
+            Pos = MAP_APPFONT ( 110, 95 ) ;
+            Size = MAP_APPFONT ( 40, 10 ) ;
+            Text [en-US] = "to sheet border" ;
         };
         FixedText SV_PRINT_PRT_NUP_ORIENTATION_TXT
         {
-            Pos = MAP_APPFONT( 0, 0 );
-            Size = MAP_APPFONT( 10, 10 );
-            Text [en-US] = "~Orientation";
+            Pos = MAP_APPFONT ( 0, 0 ) ;
+            Size = MAP_APPFONT ( 10, 10 ) ;
+            Text [en-US] = "~Orientation" ;
         };
         ListBox SV_PRINT_PRT_NUP_ORIENTATION_BOX
         {
-            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:OrientationBox";
-            Pos = MAP_APPFONT( 0, 0 );
-            Size = MAP_APPFONT( 10, 40 );
-            Border = TRUE;
-            DropDown = TRUE;
-            CurPos = 0;
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:OrientationBox" ;
+            Pos = MAP_APPFONT ( 0, 0 ) ;
+            Size = MAP_APPFONT ( 10, 40 ) ;
+            Border = TRUE ;
+            DropDown = TRUE ;
+            CurPos = 0 ;
             StringList [en-US] =
             {
-                < "Automatic"; SV_PRINT_PRT_NUP_ORIENTATION_AUTOMATIC; >;
-                < "Portrait"; SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT; >;
-                < "Landscape"; SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE; >;
+                < "Automatic" ; SV_PRINT_PRT_NUP_ORIENTATION_AUTOMATIC; > ;
+                < "Portrait" ; SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT; > ;
+                < "Landscape" ; SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE; > ;
             };
         };
         FixedText SV_PRINT_PRT_NUP_ORDER_TXT
         {
-            Pos = MAP_APPFONT( 0, 0 );
-            Size = MAP_APPFONT( 10, 10 );
-            Text [en-US] = "Order";
+            Pos = MAP_APPFONT ( 0, 0 ) ;
+            Size = MAP_APPFONT ( 10, 10 ) ;
+            Text [en-US] = "Order" ;
         };
         ListBox SV_PRINT_PRT_NUP_ORDER_BOX
         {
-            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:OrderBox";
-            Pos = MAP_APPFONT( 0, 0 );
-            Size = MAP_APPFONT( 10, 50 );
-            DropDown = TRUE;
-            Border = TRUE;
-            CurPos = 0;
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:OrderBox" ;
+            Pos = MAP_APPFONT ( 0, 0 ) ;
+            Size = MAP_APPFONT ( 10, 50 ) ;
+            DropDown = TRUE ;
+            Border = TRUE ;
+            CurPos = 0 ;
             StringList [en-US] =
             {
-                < "left to right, then down"; SV_PRINT_PRT_NUP_ORDER_LRTB; >;
-                < "top to bottom, then right"; SV_PRINT_PRT_NUP_ORDER_TBLR; >;
-                < "top to bottom, then left"; SV_PRINT_PRT_NUP_ORDER_TBRL; >;
-                < "right to left, then down"; SV_PRINT_PRT_NUP_ORDER_RLTB; >;
+                < "left to right, then down" ; SV_PRINT_PRT_NUP_ORDER_LRTB; > ;
+                < "top to bottom, then right" ; SV_PRINT_PRT_NUP_ORDER_TBLR; > ;
+                < "top to bottom, then left" ; SV_PRINT_PRT_NUP_ORDER_TBRL; > ;
+                < "right to left, then down" ; SV_PRINT_PRT_NUP_ORDER_RLTB; > ;
             };
         };
         CheckBox SV_PRINT_PRT_NUP_BORDER_CB
         {
-            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:BorderBox";
-            Pos = MAP_APPFONT( 10, 65 );
-            Size = MAP_APPFONT( 150, 12 );
-            Text [en-US] = "Draw a border around each page";
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:BorderBox" ;
+            Pos = MAP_APPFONT ( 10, 65 ) ;
+            Size = MAP_APPFONT ( 150, 12 ) ;
+            Text [en-US] = "Draw a border around each page" ;
         };
     };
 
     TabPage SV_PRINT_TAB_JOB
     {
-        HelpID = ".HelpID:vcl:PrintDialog:JobPage";
-        Text [en-US] = "General";
-        Hide = TRUE;
+        HelpID = ".HelpID:vcl:PrintDialog:JobPage" ;
+        Text [en-US] = "General" ;
+        Hide = TRUE ;
 
         FixedLine SV_PRINT_PRINTERS_FL
         {
-            Pos = MAP_APPFONT( 5, 5 );
-            Size = MAP_APPFONT( 100, 10 );
-            Text [ en-US ] = "Prin~ter";
+            Pos = MAP_APPFONT ( 5, 5 ) ;
+            Size = MAP_APPFONT ( 100, 10 ) ;
+            Text [ en-US ] = "Prin~ter" ;
         };
         ListBox SV_PRINT_PRINTERS
         {
-            HelpID = ".HelpID:vcl:PrintDialog:JobPage:PrinterList";
-            Pos = MAP_APPFONT( 5, 5 );
-            Size = MAP_APPFONT( 100, 80 );
-            Border = TRUE;
-            Sort = TRUE;
+            HelpID = ".HelpID:vcl:PrintDialog:JobPage:PrinterList" ;
+            Pos = MAP_APPFONT ( 5, 5 ) ;
+            Size = MAP_APPFONT ( 100, 80 ) ;
+            Border = TRUE ;
+            Sort = TRUE ;
         };
         CheckBox SV_PRINT_DETAILS_BTN
         {
-            HelpID = ".HelpID:vcl:PrintDialog:JobPage:DetailsBtn";
-            Pos = MAP_APPFONT( 5, 5 );
-            Size = MAP_APPFONT( 5, 5 );
-            Text [en-US] = "Details";
+            HelpID = ".HelpID:vcl:PrintDialog:JobPage:DetailsBtn" ;
+            Pos = MAP_APPFONT ( 5, 5 ) ;
+            Size = MAP_APPFONT ( 5, 5 ) ;
+            Text [en-US] = "Details" ;
         };
         FixedText SV_PRINT_STATUS_TXT
         {
-            Pos = MAP_APPFONT( 5, 5 );
-            Size = MAP_APPFONT( 100, 10 );
-            Text [en-US] = "Status:";
+            Pos = MAP_APPFONT ( 5, 5 ) ;
+            Size = MAP_APPFONT ( 100, 10 ) ;
+            Text [en-US] = "Status:" ;
         };
         FixedText SV_PRINT_LOCATION_TXT
         {
-            Pos = MAP_APPFONT( 5, 5 );
-            Size = MAP_APPFONT( 100, 10 );
-            Text [en-US] = "Location:";
+            Pos = MAP_APPFONT ( 5, 5 ) ;
+            Size = MAP_APPFONT ( 100, 10 ) ;
+            Text [en-US] = "Location:" ;
         };
         FixedText SV_PRINT_COMMENT_TXT
         {
-            Pos = MAP_APPFONT( 5, 5 );
-            Size = MAP_APPFONT( 100, 10 );
-            Text [en-US] = "Comment:";
+            Pos = MAP_APPFONT ( 5, 5 ) ;
+            Size = MAP_APPFONT ( 100, 10 ) ;
+            Text [en-US] = "Comment:" ;
         };
         PushButton SV_PRINT_PRT_SETUP
         {
-            HelpID = ".HelpID:vcl:PrintDialog:JobPage:Properties";
-            Pos = MAP_APPFONT( 115, 5 );
-            Size = MAP_APPFONT( 50, 15 );
-            Text [en-US] = "Properties...";
+            HelpID = ".HelpID:vcl:PrintDialog:JobPage:Properties" ;
+            Pos = MAP_APPFONT ( 115, 5 ) ;
+            Size = MAP_APPFONT ( 50, 15 ) ;
+            Text [en-US] = "Properties..." ;
         };
         FixedLine SV_PRINT_COPIES
         {
-            Pos = MAP_APPFONT( 5, 35 );
-            Size = MAP_APPFONT( 150, 10 );
-            Text [en-US] = "Range and copies";
+            Pos = MAP_APPFONT ( 5, 35 ) ;
+            Size = MAP_APPFONT ( 150, 10 ) ;
+            Text [en-US] = "Range and copies" ;
         };
         FixedText SV_PRINT_COPYCOUNT
         {
-            Pos = MAP_APPFONT( 10, 45 );
-            Size = MAP_APPFONT( 80, 10 );
-            Text [en-US] = "Number of copies";
+            Pos = MAP_APPFONT ( 10, 45 ) ;
+            Size = MAP_APPFONT ( 80, 10 ) ;
+            Text [en-US] = "Number of copies" ;
         };
         NumericField SV_PRINT_COPYCOUNT_FIELD
         {
-            HelpID = ".HelpID:vcl:PrintDialog:JobPage:Copies";
-            Pos = MAP_APPFONT( 10, 56 );
-            Size = MAP_APPFONT( 40, 12 );
-            Border = TRUE;
-            Spin = TRUE;
-            Minimum = 1;
-            Maximum = 16384;
-            Value = 1;
+            HelpID = ".HelpID:vcl:PrintDialog:JobPage:Copies" ;
+            Pos = MAP_APPFONT ( 10, 56 ) ;
+            Size = MAP_APPFONT ( 40, 12 ) ;
+            Border = TRUE ;
+            Spin = TRUE ;
+            Minimum = 1 ;
+            Maximum = 16384 ;
+            Value = 1 ;
         };
         FixedImage SV_PRINT_COLLATE_IMAGE
         {
-            Pos = MAP_APPFONT( 95, 60 );
-            Size = MAP_PIXEL( 80, 30 );
+            Pos = MAP_APPFONT ( 95, 60 ) ;
+            Size = MAP_PIXEL ( 80, 30 ) ;
         };
         CheckBox SV_PRINT_COLLATE
         {
-            HelpID = ".HelpID:vcl:PrintDialog:JobPage:Collate";
-            Pos = MAP_APPFONT( 95, 45 );
-            Size = MAP_APPFONT( 70, 10 );
-            Text [en-US] = "Collate";
+            HelpID = ".HelpID:vcl:PrintDialog:JobPage:Collate" ;
+            Pos = MAP_APPFONT ( 95, 45 ) ;
+            Size = MAP_APPFONT ( 70, 10 ) ;
+            Text [en-US] = "Collate" ;
         };
 
         Image SV_PRINT_COLLATE_IMG
         {
-            ImageBitmap = Bitmap { File = "collate.png" ; };
+            ImageBitmap = Bitmap { File = "collate.png" ; } ;
         };
 
         Image SV_PRINT_NOCOLLATE_IMG
         {
-            ImageBitmap = Bitmap { File = "ncollate.png" ; };
+            ImageBitmap = Bitmap { File = "ncollate.png" ; } ;
         };
 
         Image SV_PRINT_COLLATE_HC_IMG
         {
-            ImageBitmap = Bitmap { File = "collate_h.png" ; };
+            ImageBitmap = Bitmap { File = "collate_h.png" ; } ;
         };
 
         Image SV_PRINT_NOCOLLATE_HC_IMG
         {
-            ImageBitmap = Bitmap { File = "ncollate_h.png" ; };
+            ImageBitmap = Bitmap { File = "ncollate_h.png" ; } ;
         };
 
         CheckBox SV_PRINT_OPT_REVERSE
         {
-            HelpID = ".HelpID:vcl:PrintDialog:OptPage:ToReverse";
-            Pos = MAP_APPFONT( 10, 50 );
-            Size = MAP_APPFONT( 200, 12 );
-            Text [en-US] = "Print in ~reverse page order";
+            HelpID = ".HelpID:vcl:PrintDialog:OptPage:ToReverse" ;
+            Pos = MAP_APPFONT ( 10, 50 ) ;
+            Size = MAP_APPFONT ( 200, 12 ) ;
+            Text [en-US] = "Print in ~reverse page order" ;
         };
     };
 
     TabPage SV_PRINT_TAB_OPT
     {
-        Text [en-US] = "Options";
-        Hide = TRUE;
-        HelpID = ".HelpID:vcl:PrintDialog:OptPage";
+        Text [en-US] = "Options" ;
+        Hide = TRUE ;
+        HelpID = ".HelpID:vcl:PrintDialog:OptPage" ;
 
         FixedLine SV_PRINT_OPT_PRINT_FL
         {
-            Pos = MAP_APPFONT( 5, 5 );
-            Size = MAP_APPFONT( 150, 10 );
-            Text [en-US] = "Options";
+            Pos = MAP_APPFONT ( 5, 5 ) ;
+            Size = MAP_APPFONT ( 150, 10 ) ;
+            Text [en-US] = "Options" ;
         };
         CheckBox SV_PRINT_OPT_TOFILE
         {
-            HelpID = ".HelpID:vcl:PrintDialog:OptPage:ToFile";
-            Pos = MAP_APPFONT( 10, 20 );
-            Size = MAP_APPFONT( 200, 12 );
-            Text [en-US] = "Print to ~file";
+            HelpID = ".HelpID:vcl:PrintDialog:OptPage:ToFile" ;
+            Pos = MAP_APPFONT ( 10, 20 ) ;
+            Size = MAP_APPFONT ( 200, 12 ) ;
+            Text [en-US] = "Print to ~file" ;
         };
         CheckBox SV_PRINT_OPT_SINGLEJOBS
         {
-            HelpID = ".HelpID:vcl:PrintDialog:OptPage:SingleJobs";
-            Pos = MAP_APPFONT( 10, 35 );
-            Size = MAP_APPFONT( 200, 12 );
-            Text [en-US] = "~Create single print jobs for collated output";
+            HelpID = ".HelpID:vcl:PrintDialog:OptPage:SingleJobs" ;
+            Pos = MAP_APPFONT ( 10, 35 ) ;
+            Size = MAP_APPFONT ( 200, 12 ) ;
+            Text [en-US] = "~Create single print jobs for collated output" ;
         };
     };
 };
 
 ModelessDialog SV_DLG_PRINT_PROGRESS
 {
-    HelpID = "vcl:ModelessDialog:SV_DLG_PRINT_PROGRESS";
-    Text [en-US] = "Printing";
-    Closeable = FALSE;
-    Sizeable = FALSE;
-    Moveable = TRUE;
-    SVLook = TRUE;
+    HelpID = "vcl:ModelessDialog:SV_DLG_PRINT_PROGRESS" ;
+    Text [en-US] = "Printing" ;
+    Closeable = FALSE ;
+    Sizeable = FALSE ;
+    Moveable = TRUE ;
+    SVLook = TRUE ;
 
-    Size = MAP_APPFONT( 120, 70 );
+    Size = MAP_APPFONT ( 120, 70 ) ;
 
     CancelButton SV_PRINT_PROGRESS_CANCEL
     {
-        Pos = MAP_APPFONT( 35, 50 );
-        Size = MAP_APPFONT( 50, 15 );
+        Pos = MAP_APPFONT ( 35, 50 ) ;
+        Size = MAP_APPFONT ( 50, 15 ) ;
     };
     FixedText SV_PRINT_PROGRESS_TEXT
     {
-        Pos = MAP_APPFONT( 5,10 );
-        Size = MAP_APPFONT( 110, 10 );
-        Text [ en-US ] = "Page %p of %n";
-        Center = TRUE;
+        Pos = MAP_APPFONT ( 5,10 ) ;
+        Size = MAP_APPFONT ( 110, 10 ) ;
+        Text [ en-US ] = "Page %p of %n" ;
+        Center = TRUE ;
     };
 };
 
 ErrorBox SV_PRINT_NOPRINTERWARNING
 {
-    Title = "%PRODUCTNAME";
-    Message [en-US] = "No default printer found.\nPlease choose a printer and try again.";
+    Title = "%PRODUCTNAME" ;
+    Message [en-US] = "No default printer found.\nPlease choose a printer and try again." ;
 };
 
 ErrorBox SV_PRINT_NOCONTENT
 {
-    Title = "%PRODUCTNAME";
-    Message [en-US] = "There are no pages to be printed. Please check your document for ranges relevant to printing.";
+    Title = "%PRODUCTNAME" ;
+    Message [en-US] = "There are no pages to be printed. Please check your document for ranges relevant to printing." ;
 };
 
 StringArray SV_PRINT_NATIVE_STRINGS
 {
     ItemList [en-US] =
     {
-        < "Preview"; >;
-        < "Page number"; >;
-        < "Number of pages"; >;
-        < "More"; >;
-        < "Print selection only"; >;
+        < "Preview" ; > ;
+        < "Page number" ; > ;
+        < "Number of pages" ; > ;
+        < "More" ; >;
+        < "Print selection only" ; > ;
     };
 };
 
@@ -500,42 +500,46 @@ StringArray RID_STR_PAPERNAMES
 {
     ItemList [en-US] =
     {
-        < "A0"; >;
-        < "A1"; >;
-        < "A2"; >;
-        < "A3"; >;
-        < "A4"; >;
-        < "A5"; >;
-        < "B4 (ISO)"; >;
-        < "B5 (ISO)"; >;
-        < "Letter"; >;
-        < "Legal"; >;
-        < "Tabloid"; >;
-        < "User Defined"; >;
-        < "B6 (ISO)"; >;
-        < "C4 Envelope"; >;
-        < "C5 Envelope"; >;
-        < "C6 Envelope"; >;
-        < "C6/5 Envelope"; >;
-        < "DL Envelope"; >;
-        < "Dia Slide"; >;
-        < "Screen"; >;
-        < "C"; >;
-        < "D"; >;
-        < "E"; >;
-        < "Executive"; >;
-        < "Long Bond"; >;
-        < "#8 (Monarch) Envelope"; >;
-        < "#6 3/4 (Personal) Envelope"; >;
-        < "#9 Envelope"; >;
-        < "#10 Envelope"; >;
-        < "#11 Envelope"; >;
-        < "#12 Envelope"; >;
-        < "16 Kai"; >;
-        < "32 Kai"; >;
-        < "Big 32 Kai"; >;
-        < "B4 (JIS)"; >;
-        < "B5 (JIS)"; >;
-        < "B6 (JIS)"; >;
+        < "A0" ; > ;
+        < "A1" ; > ;
+        < "A2" ; > ;
+        < "A3" ; > ;
+        < "A4" ; > ;
+        < "A5" ; > ;
+        < "B4 (ISO)" ; > ;
+        < "B5 (ISO)" ; > ;
+        < "Letter" ; > ;
+        < "Legal" ; > ;
+        < "Tabloid" ; > ;
+        < "User Defined" ; > ;
+        < "B6 (ISO)" ; > ;
+        < "C4 Envelope" ; > ;
+        < "C5 Envelope" ; > ;
+        < "C6 Envelope" ; > ;
+        < "C6/5 Envelope" ; > ;
+        < "DL Envelope" ; > ;
+        < "Dia Slide" ; > ;
+        < "Screen (4:3)" ; > ;
+        < "Screen (16:9)" ; > ;
+        < "Screen (16:10)" ; > ;
+        < "C" ; > ;
+        < "D" ; > ;
+        < "E" ; > ;
+        < "Executive" ; > ;
+        < "Long Bond" ; > ;
+        < "#8 (Monarch) Envelope" ; > ;
+        < "#6 3/4 (Personal) Envelope" ; > ;
+        < "#9 Envelope" ; > ;
+        < "#10 Envelope" ; > ;
+        < "#11 Envelope" ; > ;
+        < "#12 Envelope" ; > ;
+        < "16 Kai" ; > ;
+        < "32 Kai" ; > ;
+        < "Big 32 Kai" ; > ;
+        < "B4 (JIS)" ; > ;
+        < "B5 (JIS)" ; > ;
+        < "B6 (JIS)" ; > ;
     };
 };
+
+// ********************************************************************** EOF