CWS-TOOLING: integrate CWS unifypaper01

2009-05-27 17:14:41 +0200 cmc  r272362 : #i92819#, psprint moved into vcl
2009-05-19 15:45:46 +0200 cmc  r272083 : #i92819# having difficultly in getting this right under windows
2009-05-18 18:04:22 +0200 cmc  r272043 : #i92819# missing some export magic somewhere
2009-05-18 15:34:18 +0200 cmc  r272028 : #i92819# get depends right
2009-05-18 11:50:43 +0200 cmc  r272010 : ##i92819# fix import/export stuff
2009-05-18 10:07:00 +0200 cmc  r272000 : #i92819# fix window imp name
2009-05-16 15:17:23 +0200 cmc  r271975 : #i92819# fix win paper names
2009-05-16 11:11:29 +0200 cmc  r271974 : #i92819# std::abs prolematic for msvc
2009-05-15 15:36:56 +0200 cmc  r271941 : #i92819# handle missing setting, at least on mac
2009-05-15 10:13:44 +0200 cmc  r271927 : #i92819# adjust for moved page dialog
2009-05-14 13:47:14 +0200 cmc  r271887 : remove dead files that reappeared
2009-05-14 09:57:17 +0200 cmc  r271872 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@271830 (milestone: DEV300:m48)
2009-05-11 12:27:18 +0200 cmc  r271763 : #i92819# check return value
2009-05-06 17:28:25 +0200 cmc  r271602 : #i92819# these B4/B5s are the JIS ones according to their dimensions
2009-05-06 17:17:03 +0200 cmc  r271601 : #i92819# micro-optimization
2009-05-03 18:20:48 +0200 cmc  r271434 : #i92819# paper libs
2009-05-03 16:08:32 +0200 cmc  r271433 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@271427 (milestone: DEV300:m47)
2009-04-06 15:33:37 +0200 cmc  r270556 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@270033 (milestone: DEV300:m45)
2009-03-12 14:36:35 +0100 cmc  r269415 : #i92819# merge paper utilities
2009-03-11 13:44:27 +0100 cmc  r269328 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@269297 (milestone: DEV300:m43)
2009-03-09 14:42:07 +0100 cmc  r269190 : remove config_office from synced version
2009-03-09 14:34:50 +0100 cmc  r269187 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@268395 (milestone: DEV300:m42)
2009-03-09 12:11:29 +0100 cmc  r269077 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@265758 (milestone: DEV300:m38)
2009-03-06 17:17:39 +0100 cmc  r269027 : #i92819# paper goo
2008-12-04 11:29:30 +0100 cmc  r264826 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@264807 (milestone: DEV300:m37)
2008-11-26 10:33:06 +0100 cmc  r264357 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@264325 (milestone: DEV300:m36)
2008-11-21 14:09:36 +0100 cmc  r264138 : #i92819# paper consolidation

4 files changed, 107 insertions, 111 deletions

diff --git a/svx/source/cui/page.cxx b/svx/source/cui/page.cxx
index 06199f6752..8e44ebc1fc 100644
--- a/svx/source/cui/page.cxx
+++ b/svx/source/cui/page.cxx
@@ -310,8 +310,8 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
 
     bLandscape			( FALSE ),
     eMode				( SVX_PAGE_MODE_STANDARD ),
-    ePaperStart			( SVX_PAPER_A3 ),
-    ePaperEnd 			( SVX_PAPER_DL ),
+    ePaperStart			( PAPER_A3 ),
+    ePaperEnd 			( PAPER_ENV_DL ),
     pImpl				( new SvxPage_Impl )
 
 {
@@ -455,6 +455,7 @@ void SvxPageDescPage::Init_Impl()
 
         // Handler einstellen
     aLayoutBox.SetSelectHdl( LINK( this, SvxPageDescPage, LayoutHdl_Impl ) );
+    aPaperSizeBox.SetDropDownLineCount(10);
 
     aPaperTrayBox.SetGetFocusHdl(
         LINK( this, SvxPageDescPage, PaperBinHdl_Impl ) );
@@ -606,11 +607,11 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
     if ( bLandscape )
         Swap( aTmpSize );
     // aktuelles Format
-    SvxPaper ePaper = SvxPaperInfo::GetPaper( aTmpSize, (MapUnit)eUnit, TRUE );
+    Paper ePaper = SvxPaperInfo::GetSvxPaper( aTmpSize, (MapUnit)eUnit, TRUE );
     USHORT nActPos = LISTBOX_ENTRY_NOTFOUND;
     USHORT nAryId = RID_SVXSTRARY_PAPERSIZE_STD;
 
-    if ( ePaperStart != SVX_PAPER_A3 )
+    if ( ePaperStart != PAPER_A3 )
         nAryId = RID_SVXSTRARY_PAPERSIZE_DRAW;
     ResStringArray aPaperAry( SVX_RES( nAryId ) );
     sal_uInt32 nCnt = aPaperAry.Count();
@@ -618,7 +619,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
     for ( sal_uInt32 i = 0; i < nCnt; ++i )
     {
         String aStr = aPaperAry.GetString(i);
-        SvxPaper eSize = (SvxPaper)aPaperAry.GetValue(i);
+        Paper eSize = (Paper)aPaperAry.GetValue(i);
         USHORT nPos = aPaperSizeBox.InsertEntry( aStr );
         aPaperSizeBox.SetEntryData( nPos, (void*)(ULONG)eSize );
 
@@ -825,11 +826,11 @@ BOOL SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
     }
 
     nPos = aPaperSizeBox.GetSelectEntryPos();
-    SvxPaper ePaper = (SvxPaper)(ULONG)aPaperSizeBox.GetEntryData( nPos );
+    Paper ePaper = (Paper)(ULONG)aPaperSizeBox.GetEntryData( nPos );
     const USHORT nOld = aPaperSizeBox.GetSavedValue();
     BOOL bChecked = aLandscapeBtn.IsChecked();
 
-    if ( SVX_PAPER_USER == ePaper )
+    if ( PAPER_USER == ePaper )
     {
         if ( nOld != nPos						||
              aPaperWidthEdit.IsValueModified()  ||
@@ -1039,9 +1040,9 @@ IMPL_LINK( SvxPageDescPage, PaperBinHdl_Impl, ListBox *, EMPTYARG )
 IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox )
 {
     const USHORT nPos = pBox->GetSelectEntryPos();
-    SvxPaper ePaper = (SvxPaper)(ULONG)aPaperSizeBox.GetEntryData( nPos );
+    Paper ePaper = (Paper)(ULONG)aPaperSizeBox.GetEntryData( nPos );
 
-    if ( ePaper != SVX_PAPER_USER )
+    if ( ePaper != PAPER_USER )
     {
         Size aSize( SvxPaperInfo::GetPaperSize( ePaper ) );
 
@@ -1067,7 +1068,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox )
         {
             // Draw: bei Papierformat soll der Rand 1cm betragen
             long nTmp = 0;
-            BOOL bScreen = ( SVX_PAPER_SCREEN == ePaper );
+            BOOL bScreen = ( PAPER_SCREEN == ePaper );
 
             if ( !bScreen )
                 // bei Bildschirm keinen Rand
@@ -1116,12 +1117,12 @@ IMPL_LINK( SvxPageDescPage, PaperSizeModify_Impl, Edit *, EMPTYARG )
     SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich );
     Size aSize( GetCoreValue( aPaperWidthEdit, eUnit ),
                 GetCoreValue( aPaperHeightEdit, eUnit ) );
-    SvxPaper ePaper = SvxPaperInfo::GetPaper( aSize, (MapUnit)eUnit, TRUE );
+    Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, (MapUnit)eUnit, TRUE );
     USHORT nEntryCount = aPaperSizeBox.GetEntryCount();
 
     for ( USHORT i = 0; i < nEntryCount; ++i )
     {
-        SvxPaper eTmp = (SvxPaper)(ULONG)aPaperSizeBox.GetEntryData(i);
+        Paper eTmp = (Paper)(ULONG)aPaperSizeBox.GetEntryData(i);
 
         if ( eTmp == ePaper )
         {
@@ -1478,9 +1479,9 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
     // Wenn nicht, dann den Anwender fragen, ob sie "ubernommen werden sollen.
     // Wenn nicht, dann auf der TabPage bleiben.
     USHORT nPos = aPaperSizeBox.GetSelectEntryPos();
-    SvxPaper ePaper = (SvxPaper)(ULONG)aPaperSizeBox.GetEntryData( nPos );
+    Paper ePaper = (Paper)(ULONG)aPaperSizeBox.GetEntryData( nPos );
 
-    if ( ePaper != SVX_PAPER_SCREEN && IsMarginOutOfRange() )
+    if ( ePaper != PAPER_SCREEN && IsMarginOutOfRange() )
     {
         if ( QueryBox( this, WB_YES_NO | WB_DEF_NO, aPrintRangeQueryText ).Execute() == RET_NO )
         {
@@ -1775,7 +1776,7 @@ void SvxPageDescPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
     if (pModeItem)
         SetMode((SvxModeType)pModeItem->GetEnumValue());
     if (pPaperStartItem && pPaperEndItem)
-        SetPaperFormatRanges( (SvxPaper)pPaperStartItem->GetEnumValue(), (SvxPaper)pPaperEndItem->GetEnumValue() );
+        SetPaperFormatRanges( (Paper)pPaperStartItem->GetEnumValue(), (Paper)pPaperEndItem->GetEnumValue() );
     if (pCollectListItem)
         SetCollectionList(pCollectListItem->GetList());
 }
diff --git a/svx/source/cui/page.h b/svx/source/cui/page.h
index 91c6f1659b..dcbed63cc0 100644
--- a/svx/source/cui/page.h
+++ b/svx/source/cui/page.h
@@ -38,13 +38,13 @@
 #define PAPERSIZE_A3			3
 #define PAPERSIZE_A4			4
 #define PAPERSIZE_A5			5
-#define PAPERSIZE_B4			6
-#define PAPERSIZE_B5			7
+#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			12
+#define PAPERSIZE_B6_ISO		12
 #define PAPERSIZE_C4			13
 #define PAPERSIZE_C5			14
 #define PAPERSIZE_C6			15
@@ -52,24 +52,22 @@
 #define PAPERSIZE_DL			17
 #define PAPERSIZE_DIA   		18
 #define PAPERSIZE_SCREEN		19
-#define PAPERSIZE_A 			20
-#define PAPERSIZE_B 			21
-#define PAPERSIZE_C 			22
-#define PAPERSIZE_D 			23
-#define PAPERSIZE_E 			24
-#define PAPERSIZE_EXECUTIVE 	25
-#define PAPERSIZE_LEGAL2		26
-#define PAPERSIZE_MONARCH   	27
-#define PAPERSIZE_COM675  		28
-#define PAPERSIZE_COM9  		29
-#define PAPERSIZE_COM10 		30
-#define PAPERSIZE_COM11 		31
-#define PAPERSIZE_COM12 		32
-#define PAPERSIZE_KAI16 		33
-#define PAPERSIZE_KAI32 		34
-#define PAPERSIZE_KAI32BIG 		35
-#define PAPERSIZE_B4_JIS		36
-#define PAPERSIZE_B5_JIS		37
+#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 		29
+#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		38
 
 #endif
diff --git a/svx/source/cui/page.hxx b/svx/source/cui/page.hxx
index d624bd6f43..5be2c4d63f 100644
--- a/svx/source/cui/page.hxx
+++ b/svx/source/cui/page.hxx
@@ -53,6 +53,9 @@
 #include <svx/frmdirlbox.hxx>
 
 #include <svx/svxenum.hxx>
+
+#include <i18npool/paper.hxx>
+
 #include "flagsdef.hxx" //CHINA001
 
 // enum ------------------------------------------------------------------
@@ -183,8 +186,8 @@ class SvxPageDescPage : public SfxTabPage
     BOOL                bLandscape;
     FASTBOOL            bBorderModified;
     SvxModeType         eMode;
-    SvxPaper            ePaperStart;
-    SvxPaper            ePaperEnd;
+    Paper               ePaperStart;
+    Paper               ePaperEnd;
 
     SvxPage_Impl*		pImpl;
 
@@ -242,7 +245,7 @@ public:
     virtual ~SvxPageDescPage();
 
     void                SetMode( SvxModeType eMType ) { eMode = eMType; }
-    void                SetPaperFormatRanges( SvxPaper eStart, SvxPaper eEnd )
+    void                SetPaperFormatRanges( Paper eStart, Paper eEnd )
                             { ePaperStart = eStart, ePaperEnd = eEnd; }
 
     void				SetCollectionList(const List* pList);
diff --git a/svx/source/cui/page.src b/svx/source/cui/page.src
index b7c16e9124..2da8922d42 100644
--- a/svx/source/cui/page.src
+++ b/svx/source/cui/page.src
@@ -399,11 +399,11 @@ String RID_SVXSTR_PAPER_A5
 {
     Text = "A5" ;
 };
-String RID_SVXSTR_PAPER_B4
+String RID_SVXSTR_PAPER_B4_ISO
 {
     Text = "B4 (ISO)" ;
 };
-String RID_SVXSTR_PAPER_B5
+String RID_SVXSTR_PAPER_B5_ISO
 {
     Text = "B5 (ISO)" ;
 };
@@ -423,46 +423,38 @@ String RID_SVXSTR_PAPER_USER
 {
     Text [ en-US ] = "User Defined" ;
 };
-String RID_SVXSTR_PAPER_B6
+String RID_SVXSTR_PAPER_B6_ISO
 {
     Text = "B6 (ISO)" ;
 };
 String RID_SVXSTR_PAPER_C4
 {
-    Text = "C4" ;
+    Text = "C4 Envelope" ;
 };
 String RID_SVXSTR_PAPER_C5
 {
-    Text = "C5" ;
+    Text = "C5 Envelope" ;
 };
 String RID_SVXSTR_PAPER_C6
 {
-    Text = "C6" ;
+    Text = "C6 Envelope" ;
 };
 String RID_SVXSTR_PAPER_C65
 {
-    Text = "C6/5" ;
+    Text = "C6/5 Envelope" ;
 };
 String RID_SVXSTR_PAPER_DL
 {
-    Text = "DL" ;
+    Text = "DL Envelope" ;
 };
 String RID_SVXSTR_PAPER_DIA
 {
-    Text = "Dia" ;
+    Text = "Dia Slide" ;
 };
 String RID_SVXSTR_PAPER_SCREEN
 {
     Text [ en-US ] = "Screen" ;
 };
-String RID_SVXSTR_PAPER_A
-{
-    Text = "A" ;
-};
-String RID_SVXSTR_PAPER_B
-{
-    Text = "B" ;
-};
 String RID_SVXSTR_PAPER_C
 {
     Text = "C" ;
@@ -477,47 +469,47 @@ String RID_SVXSTR_PAPER_E
 };
 String RID_SVXSTR_PAPER_EXECUTIVE
 {
-    Text = "Executive" ;
+       Text = "Executive" ;
 };
 String RID_SVXSTR_PAPER_LEGAL2
 {
-    Text = "Legal" ;
+    Text = "Long Bond" ;
 };
 String RID_SVXSTR_PAPER_MONARCH
 {
-    Text = "Monarch" ;
+    Text = "#8 (Monarch) Envelope" ;
 };
 String RID_SVXSTR_PAPER_COM675
 {
-    Text = "Env. 6¾" ;
+    Text = "#6 3/4 (Personal) Envelope" ;
 };
 String RID_SVXSTR_PAPER_COM9
 {
-    Text = "Env. 9" ;
+    Text = "#9 Envelope" ;
 };
 String RID_SVXSTR_PAPER_COM10
 {
-    Text = "Env. 10" ;
+    Text = "#10 Envelope" ;
 };
 String RID_SVXSTR_PAPER_COM11
 {
-    Text = "Env. 11" ;
+    Text = "#11 Envelope" ;
 };
 String RID_SVXSTR_PAPER_COM12
 {
-    Text = "Env. 12" ;
+    Text = "#12 Envelope" ;
 };
 String RID_SVXSTR_PAPER_KAI16
 {
-    Text = "16 kai" ;
+    Text = "16 Kai" ;
 };
 String RID_SVXSTR_PAPER_KAI32
 {
-    Text = "32 kai" ;
+    Text = "32 Kai" ;
 };
 String RID_SVXSTR_PAPER_KAI32BIG
 {
-    Text = "32 kai big" ;
+    Text = "Big 32 Kai" ;
 };
 String RID_SVXSTR_PAPER_B4_JIS
 {
@@ -535,67 +527,69 @@ StringArray RID_SVXSTRARY_PAPERSIZE_STD
 {
     ItemList [ en-US ] =
     {
-             < "A3" ; PAPERSIZE_A3 ; > ;
-        < "A4" ; PAPERSIZE_A4 ; > ;
         < "A5" ; PAPERSIZE_A5 ; > ;
-        < "B4 (ISO)" ; PAPERSIZE_B4 ; > ;
-        < "B5 (ISO)" ; PAPERSIZE_B5 ; > ;
-        < "B6 (ISO)" ; PAPERSIZE_B6 ; > ;
-        < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
-        < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
-        < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
+        < "A4" ; PAPERSIZE_A4 ; > ;
+        < "A3" ; PAPERSIZE_A3 ; > ;
+        < "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
+        < "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
+        < "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
         < "Letter" ; PAPERSIZE_LETTER ; > ;
         < "Legal" ; PAPERSIZE_LEGAL ; > ;
+        < "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
         < "Tabloid" ; PAPERSIZE_TABLOID ; > ;
+        < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
+        < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
+        < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
+        < "16 Kai" ; PAPERSIZE_KAI16; > ;
+        < "32 Kai" ; PAPERSIZE_KAI32; > ;
+        < "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
         < "User" ; PAPERSIZE_USER ; > ;
-        < "C4" ; PAPERSIZE_C4 ; > ;
-        < "C5" ; PAPERSIZE_C5 ; > ;
-        < "C6" ; PAPERSIZE_C6 ; > ;
-        < "C6/5" ; PAPERSIZE_C65 ; > ;
-        < "DL" ; PAPERSIZE_DL ; > ;
-        < "Env. #6¾" ; PAPERSIZE_COM675; > ;
-        < "Env. Monarch" ; PAPERSIZE_MONARCH; > ;
-        < "Env. #9" ; PAPERSIZE_COM9; > ;
-        < "Env. #10" ; PAPERSIZE_COM10; > ;
-        < "Env. #11" ; PAPERSIZE_COM11; > ;
-        < "Env. #12" ; PAPERSIZE_COM12; > ;
-        < "16 kai" ; PAPERSIZE_KAI16; > ;
-        < "32 kai" ; PAPERSIZE_KAI32; > ;
-        < "32 kai large" ; PAPERSIZE_KAI32BIG; > ;
-    };
+        < "DL Envelope" ; PAPERSIZE_DL ; > ;
+        < "C6 Envelope" ; PAPERSIZE_C6 ; > ;
+        < "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
+        < "C5 Envelope" ; PAPERSIZE_C5 ; > ;
+        < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
+        < "#6 3/4 (Personal) Envelope" ; PAPERSIZE_COM675; > ;
+        < "#8 (Monarch) Envelope" ; PAPERSIZE_MONARCH; > ;
+        < "#9 Envelope" ; PAPERSIZE_COM9; > ;
+        < "#10 Envelope" ; PAPERSIZE_COM10; > ;
+        < "#11 Envelope" ; PAPERSIZE_COM11; > ;
+        < "#12 Envelope" ; PAPERSIZE_COM12; > ;
     };
+};
 StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
 {
     ItemList [ en-US ] =
     {
-             < "A0" ; PAPERSIZE_A0 ; > ;
-        < "A1" ; PAPERSIZE_A1 ; > ;
-        < "A2" ; PAPERSIZE_A2 ; > ;
-        < "A3" ; PAPERSIZE_A3 ; > ;
-        < "A4" ; PAPERSIZE_A4 ; > ;
         < "A5" ; PAPERSIZE_A5 ; > ;
-        < "B4 (ISO)" ; PAPERSIZE_B4 ; > ;
-        < "B5 (ISO)" ; PAPERSIZE_B5 ; > ;
-        < "B6 (ISO)" ; PAPERSIZE_B6 ; > ;
-        < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
-        < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
-        < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
+        < "A4" ; PAPERSIZE_A4 ; > ;
+        < "A3" ; PAPERSIZE_A3 ; > ;
+        < "A2" ; PAPERSIZE_A2 ; > ;
+        < "A1" ; PAPERSIZE_A1 ; > ;
+        < "A0" ; PAPERSIZE_A0 ; > ;
+        < "B6 (ISO)" ; PAPERSIZE_B6_ISO ; > ;
+        < "B5 (ISO)" ; PAPERSIZE_B5_ISO ; > ;
+        < "B4 (ISO)" ; PAPERSIZE_B4_ISO ; > ;
         < "Letter" ; PAPERSIZE_LETTER ; > ;
         < "Legal" ; PAPERSIZE_LEGAL ; > ;
+        < "Long Bond" ; PAPERSIZE_LEGAL2 ; > ;
         < "Tabloid" ; PAPERSIZE_TABLOID ; > ;
+        < "B6 (JIS)" ; PAPERSIZE_B6_JIS ; > ;
+        < "B5 (JIS)" ; PAPERSIZE_B5_JIS ; > ;
+        < "B4 (JIS)" ; PAPERSIZE_B4_JIS ; > ;
+        < "16 Kai" ; PAPERSIZE_KAI16; > ;
+        < "32 Kai" ; PAPERSIZE_KAI32; > ;
+        < "Big 32 Kai" ; PAPERSIZE_KAI32BIG; > ;
         < "User" ; PAPERSIZE_USER ; > ;
-        < "C4" ; PAPERSIZE_C4 ; > ;
-        < "C5" ; PAPERSIZE_C5 ; > ;
-        < "C6" ; PAPERSIZE_C6 ; > ;
-        < "C6/5" ; PAPERSIZE_C65 ; > ;
-        < "DL" ; PAPERSIZE_DL ; > ;
-        < "Slide" ; PAPERSIZE_DIA ; > ;
+        < "DL Envelope" ; PAPERSIZE_DL ; > ;
+        < "C6 Envelope" ; PAPERSIZE_C6 ; > ;
+        < "C6/5 Envelope" ; PAPERSIZE_C65 ; > ;
+        < "C5 Envelope" ; PAPERSIZE_C5 ; > ;
+        < "C4 Envelope" ; PAPERSIZE_C4 ; > ;
+        < "Dia Slide" ; PAPERSIZE_DIA ; > ;
         < "Screen" ; PAPERSIZE_SCREEN ; > ;
-        < "16 kai" ; PAPERSIZE_KAI16; > ;
-        < "32 kai" ; PAPERSIZE_KAI32; > ;
-        < "32 kai large" ; PAPERSIZE_KAI32BIG; > ;
-    };
     };
+};
 String RID_SVXSTR_PAPERBIN
 {
     Text [ en-US ] = "Paper tray" ;