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

12 files changed, 339 insertions, 349 deletions

diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index ef6258829261..a0062834e269 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -187,8 +187,8 @@ static struct PaperSizeEntry
     { 420,  595, PAPER_A5 },
     { 612,  792, PAPER_LETTER },
     { 612, 1008, PAPER_LEGAL },
-    { 728, 1032, PAPER_B4 },
-    { 516,  729, PAPER_B5 },
+    { 728, 1032, PAPER_B4_JIS },
+    { 516,  729, PAPER_B5_JIS },
     { 792, 1224, PAPER_TABLOID }
 };
 
@@ -216,8 +216,8 @@ static Paper recognizePaper( double i_fWidth, double i_fHeight )
     case 595000842: aPaper = PAPER_A4;      break;
     case 420000595: aPaper = PAPER_A5;      break;
     case 612000792: aPaper = PAPER_LETTER;  break;
-    case 728001032: aPaper = PAPER_B4;      break;
-    case 516000729: aPaper = PAPER_B5;      break;
+    case 728001032: aPaper = PAPER_B4_JIS;  break;
+    case 516000729: aPaper = PAPER_B5_JIS;  break;
     case 612001008: aPaper = PAPER_LEGAL;   break;
     case 792001224: aPaper = PAPER_TABLOID; break;
     default:
diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/vcl/jobset.h
index 5d08319a7e6c..9f3eefd507d5 100644
--- a/vcl/inc/vcl/jobset.h
+++ b/vcl/inc/vcl/jobset.h
@@ -61,7 +61,7 @@ struct ImplJobSetup
     String          maDriver;           // Driver-Name
     Orientation     meOrientation;      // Orientation
     USHORT          mnPaperBin;         // Papierschacht
-    Paper           mePaperFormat;      // Papierformat
+    Paper       mePaperFormat;      // Papierformat
     long            mnPaperWidth;       // Papierbreite in 100tel mm
     long            mnPaperHeight;      // Papierhoehe in 100tel mm
     ULONG           mnDriverDataLen;    // Laenge der systemabhaengigen Daten
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index fdc7f2ba9c69..b9176f4106dc 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -330,17 +330,12 @@ public:
     USHORT                      GetPaperBin() const;
     BOOL                        SetPaper( Paper ePaper );
     BOOL                        SetPaperSizeUser( const Size& rSize );
-    Paper                       GetPaper() const;
+    Paper                   GetPaper() const;
 
     // returns number of available paper formats
     int                         GetPaperInfoCount() const;
     // returns info about paper format nPaper
-    const vcl::PaperInfo&       GetPaperInfo( int nPaper ) const;
-    // sets current paper to format contained in rInfo
-    BOOL                        SetPaperFromInfo( const vcl::PaperInfo& rInfo );
-    // gets info about paper fromat best matching current paper
-    const vcl::PaperInfo&       GetCurrentPaperInfo() const;
-
+    const PaperInfo&            GetPaperInfo( int nPaper ) const;
     USHORT                      GetPaperBinCount() const;
     XubString                   GetPaperBinName( USHORT nPaperBin ) const;
 
diff --git a/vcl/inc/vcl/prntypes.hxx b/vcl/inc/vcl/prntypes.hxx
index 84ef320de20e..681f4f972a7c 100644
--- a/vcl/inc/vcl/prntypes.hxx
+++ b/vcl/inc/vcl/prntypes.hxx
@@ -33,6 +33,7 @@
 
 #include <tools/string.hxx>
 #include <vcl/sv.h>
+#include <i18npool/paper.hxx>
 
 // ---------------
 // - Duplex Mode -
@@ -46,33 +47,6 @@ enum DuplexMode { DUPLEX_UNKNOWN, DUPLEX_OFF, DUPLEX_ON };
 
 enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE };
 
-// ---------
-// - Paper -
-// ---------
-
-typedef USHORT Paper;
-#define PAPER_A3                    ((Paper)0)
-#define PAPER_A4                    ((Paper)1)
-#define PAPER_A5                    ((Paper)2)
-#define PAPER_B4                    ((Paper)3)
-#define PAPER_B5                    ((Paper)4)
-#define PAPER_LETTER                ((Paper)5)
-#define PAPER_LEGAL                 ((Paper)6)
-#define PAPER_TABLOID               ((Paper)7)
-#define PAPER_USER                  ((Paper)8)
-
-namespace vcl
-{
-struct PaperInfo
-{
-    String              m_aPaperName;       // user readable name of paper
-    unsigned long       m_nPaperWidth;      // width in mm
-    unsigned long       m_nPaperHeight;     // height in mm
-
-    PaperInfo() : m_nPaperWidth( 0 ), m_nPaperHeight( 0 ) {}
-};
-}
-
 // -------------------
 // - QueueInfo-Types -
 // -------------------
diff --git a/vcl/inc/vcl/salprn.hxx b/vcl/inc/vcl/salprn.hxx
index a80c5873cbfb..2927215034b5 100644
--- a/vcl/inc/vcl/salprn.hxx
+++ b/vcl/inc/vcl/salprn.hxx
@@ -68,7 +68,7 @@ struct VCL_DLLPUBLIC SalPrinterQueueInfo
 class VCL_DLLPUBLIC SalInfoPrinter
 {
 public:
-    std::vector< vcl::PaperInfo  >      m_aPaperFormats;    // all printer supported formats
+    std::vector< PaperInfo  >           m_aPaperFormats;    // all printer supported formats
     bool                                m_bPapersInit;      // set to true after InitPaperFormats
     bool                                m_bCompatMetrics;
 
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 0a5fbb189885..937d966b3978 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -70,44 +70,22 @@ int nImplSysDialog = 0;
 
 // =======================================================================
 
-#define PAPER_SLOPPY    50  // Bigger sloppy value as PaperInfo uses only mm accuracy!
-#define PAPER_COUNT     9
-
-// Use more accurate metric values for Letter/Legal/Tabloid paper formats
-static long ImplPaperFormats[PAPER_COUNT*2] =
-{
-    29700, 42000,   // A3
-    21000, 29700,   // A4
-    14800, 21000,   // A5
-    25000, 35300,   // B4
-    17600, 25000,   // B5
-    21590, 27940,   // Letter
-    21590, 35570,   // Legal
-    27960, 43130,   // Tabloid
-    0,     0        // USER
-};
-
-// =======================================================================
-
-Paper ImplGetPaperFormat( long nWidth100thMM, long nHeight100thMM )
+namespace
 {
-    USHORT i;
-
-    for( i = 0; i < PAPER_COUNT; i++ )
+    static Paper ImplGetPaperFormat( long nWidth100thMM, long nHeight100thMM )
     {
-        if ( (ImplPaperFormats[i*2] == nWidth100thMM) &&
-             (ImplPaperFormats[i*2+1] == nHeight100thMM) )
-            return (Paper)i;
+        PaperInfo aInfo(nWidth100thMM, nHeight100thMM);
+        aInfo.doSloppyFit();
+        return aInfo.getPaper();
     }
 
-    for( i = 0; i < PAPER_COUNT; i++ )
+// -----------------------------------------------------------------------
+
+    static const PaperInfo& ImplGetEmptyPaper()
     {
-        if ( (Abs( ImplPaperFormats[i*2]-nWidth100thMM ) < PAPER_SLOPPY) &&
-             (Abs( ImplPaperFormats[i*2+1]-nHeight100thMM ) < PAPER_SLOPPY) )
-            return (Paper)i;
+        static PaperInfo aInfo(PAPER_USER);
+        return aInfo;
     }
-
-    return PAPER_USER;
 }
 
 // =======================================================================
@@ -121,8 +99,9 @@ void ImplUpdateJobSetupPaper( JobSetup& rJobSetup )
         if ( pConstData->mePaperFormat != PAPER_USER )
         {
             ImplJobSetup* pData  = rJobSetup.ImplGetData();
-            pData->mnPaperWidth  = ImplPaperFormats[((USHORT)pConstData->mePaperFormat)*2];
-            pData->mnPaperHeight = ImplPaperFormats[((USHORT)pConstData->mePaperFormat)*2+1];
+            PaperInfo aInfo(pConstData->mePaperFormat);
+            pData->mnPaperWidth  = aInfo.getWidth();
+            pData->mnPaperHeight = aInfo.getHeight();
         }
     }
     else if ( pConstData->mePaperFormat == PAPER_USER )
@@ -997,17 +976,6 @@ USHORT Printer::GetPaperBin() const
 
 // -----------------------------------------------------------------------
 
-static BOOL ImplPaperSizeEqual( unsigned long nPaperWidth1, unsigned long nPaperHeight1,
-                                unsigned long nPaperWidth2, unsigned long nPaperHeight2 )
-{
-    const long PAPER_ACCURACY = 1; // 1.0 mm accuracy
-
-    return ( (Abs( long(nPaperWidth1)-long(nPaperWidth2) ) <= PAPER_ACCURACY ) &&
-             (Abs( long(nPaperHeight1)-long(nPaperHeight2) ) <= PAPER_ACCURACY ) );
-}
-
-// -----------------------------------------------------------------------
-
 // Map user paper format to a available printer paper formats
 void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup )
 {
@@ -1016,21 +984,17 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup )
     int     nLandscapeAngle = GetLandscapeAngle();
     int     nPaperCount     = GetPaperInfoCount();
 
-    unsigned long nPaperWidth   = pSetupData->mnPaperWidth/100;
-    unsigned long nPaperHeight  = pSetupData->mnPaperHeight/100;
+    PaperInfo aInfo(pSetupData->mnPaperWidth, pSetupData->mnPaperHeight);
 
     // Alle Papierformate vergleichen und ein passendes raussuchen
     for ( int i = 0; i < nPaperCount; i++ )
     {
-        const vcl::PaperInfo& rPaperInfo = GetPaperInfo( i );
+        const PaperInfo& rPaperInfo = GetPaperInfo( i );
 
-        if ( ImplPaperSizeEqual( rPaperInfo.m_nPaperWidth,
-                                 rPaperInfo.m_nPaperHeight,
-                                 nPaperWidth,
-                                 nPaperHeight ) )
+        if ( aInfo.sloppyEqual(rPaperInfo) )
         {
-            pSetupData->mePaperFormat = ImplGetPaperFormat( rPaperInfo.m_nPaperWidth*100,
-                                                            rPaperInfo.m_nPaperHeight*100 );
+            pSetupData->mePaperFormat = ImplGetPaperFormat( rPaperInfo.getWidth(),
+                                                            rPaperInfo.getHeight() );
             break;
         }
     }
@@ -1042,17 +1006,17 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup )
          nLandscapeAngle != 0 &&
          HasSupport( SUPPORT_SET_ORIENTATION ))
     {
+
+        PaperInfo aRotatedInfo(pSetupData->mnPaperHeight, pSetupData->mnPaperWidth);
+
         for ( int i = 0; i < nPaperCount; i++ )
         {
-            const vcl::PaperInfo& rPaperInfo = GetPaperInfo( i );
+            const PaperInfo& rPaperInfo = GetPaperInfo( i );
 
-            if ( ImplPaperSizeEqual( rPaperInfo.m_nPaperWidth,
-                                     rPaperInfo.m_nPaperHeight,
-                                     nPaperHeight,
-                                     nPaperWidth ))
+            if ( aRotatedInfo.sloppyEqual( rPaperInfo ) )
             {
-                pSetupData->mePaperFormat = ImplGetPaperFormat( rPaperInfo.m_nPaperWidth*100,
-                                                                rPaperInfo.m_nPaperHeight*100 );
+                pSetupData->mePaperFormat = ImplGetPaperFormat( rPaperInfo.getWidth(),
+                                                                rPaperInfo.getHeight() );
                 break;
             }
         }
@@ -1073,8 +1037,9 @@ BOOL Printer::SetPaper( Paper ePaper )
         pSetupData->mePaperFormat = ePaper;
         if ( ePaper != PAPER_USER )
         {
-            pSetupData->mnPaperWidth  = ImplPaperFormats[((USHORT)ePaper)*2];
-            pSetupData->mnPaperHeight = ImplPaperFormats[((USHORT)ePaper)*2+1];
+            PaperInfo aInfo(ePaper);
+            pSetupData->mnPaperWidth  = aInfo.getWidth();
+            pSetupData->mnPaperHeight = aInfo.getHeight();
         }
 
         if ( IsDisplayPrinter() )
@@ -1110,9 +1075,8 @@ BOOL Printer::SetPaperSizeUser( const Size& rSize )
     if ( mbInPrintPage )
         return FALSE;
 
-    MapMode aMap100thMM( MAP_100TH_MM );
     Size    aPixSize = LogicToPixel( rSize );
-    Size    aPageSize = PixelToLogic( aPixSize, aMap100thMM );
+    Size    aPageSize = PixelToLogic( aPixSize, MAP_100TH_MM );
     if ( (maJobSetup.ImplGetConstData()->mePaperFormat != PAPER_USER)       ||
          (maJobSetup.ImplGetConstData()->mnPaperWidth  != aPageSize.Width()) ||
          (maJobSetup.ImplGetConstData()->mnPaperHeight != aPageSize.Height()) )
@@ -1150,15 +1114,6 @@ BOOL Printer::SetPaperSizeUser( const Size& rSize )
     return TRUE;
 }
 
-
-// -----------------------------------------------------------------------
-
-static const vcl::PaperInfo& ImplGetEmptyPaper()
-{
-    static vcl::PaperInfo aInfo;
-    return aInfo;
-}
-
 // -----------------------------------------------------------------------
 
 int Printer::GetPaperInfoCount() const
@@ -1172,7 +1127,7 @@ int Printer::GetPaperInfoCount() const
 
 // -----------------------------------------------------------------------
 
-const vcl::PaperInfo& Printer::GetPaperInfo( int nPaper ) const
+const PaperInfo& Printer::GetPaperInfo( int nPaper ) const
 {
     if( ! mpInfoPrinter )
         return ImplGetEmptyPaper();
@@ -1185,17 +1140,6 @@ const vcl::PaperInfo& Printer::GetPaperInfo( int nPaper ) const
 
 // -----------------------------------------------------------------------
 
-BOOL Printer::SetPaperFromInfo( const vcl::PaperInfo& rInfo )
-{
-    MapMode aMap( MAP_MM );
-    Size aSize( rInfo.m_nPaperWidth, rInfo.m_nPaperHeight );
-    aSize = LogicToPixel( aSize, aMap );
-    aSize = PixelToLogic( aSize );
-    return SetPaperSizeUser( aSize );
-}
-
-// -----------------------------------------------------------------------
-
 DuplexMode Printer::GetDuplexMode() const
 {
     return mpInfoPrinter ? mpInfoPrinter->GetDuplexMode( maJobSetup.ImplGetConstData() ) : DUPLEX_UNKNOWN;
@@ -1210,38 +1154,6 @@ int Printer::GetLandscapeAngle() const
 
 // -----------------------------------------------------------------------
 
-const vcl::PaperInfo& Printer::GetCurrentPaperInfo() const
-{
-    if( ! mpInfoPrinter )
-        return ImplGetEmptyPaper();
-    if( ! mpInfoPrinter->m_bPapersInit )
-        mpInfoPrinter->InitPaperFormats( maJobSetup.ImplGetConstData() );
-    if( mpInfoPrinter->m_aPaperFormats.empty() )
-        return ImplGetEmptyPaper();
-
-    MapMode aMap( MAP_MM );
-    Size aSize = PixelToLogic( GetPaperSizePixel(), aMap );
-    int nMatch = -1;
-    long nDelta = 0;
-    for( unsigned int i = 0; i < mpInfoPrinter->m_aPaperFormats.size(); i++ )
-    {
-        long nW = mpInfoPrinter->m_aPaperFormats[i].m_nPaperWidth;
-        long nH = mpInfoPrinter->m_aPaperFormats[i].m_nPaperHeight;
-        if( nW >= (aSize.Width()-1) && nH >= (aSize.Height()-1) )
-        {
-            long nCurDelta = (nW - aSize.Width())*(nW - aSize.Width()) + (nH - aSize.Height() )*(nH - aSize.Height() );
-            if( nMatch == -1 || nCurDelta < nDelta )
-            {
-                nMatch = i;
-                nDelta = nCurDelta;
-            }
-        }
-    }
-    return nMatch != -1 ? mpInfoPrinter->m_aPaperFormats[nMatch] : ImplGetEmptyPaper();
-}
-
-// -----------------------------------------------------------------------
-
 Paper Printer::GetPaper() const
 {
     return maJobSetup.ImplGetConstData()->mePaperFormat;
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index 862eb99ab18d..c3253ed163e8 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.cxx
@@ -73,37 +73,6 @@ inline int PtTo10Mu( int nPoints ) { return (int)((((double)nPoints)*35.27777778
 
 inline int TenMuToPt( int nUnits ) { return (int)((((double)nUnits)/35.27777778)+0.5); }
 
-static struct
-{
-    int         width;
-    int         height;
-    const char* name;
-    int         namelength;
-    Paper       paper;
-} aPaperTab[] =
-{
-    { 29700, 42000, "A3",           2,  PAPER_A3        },
-    { 21000, 29700, "A4",           2,  PAPER_A4        },
-    { 14800, 21000, "A5",           2,  PAPER_A5        },
-    { 25000, 35300, "B4",           2,  PAPER_B4        },
-    { 17600, 25000, "B5",           2,  PAPER_B5        },
-    { 21600, 27900, "Letter",       6,  PAPER_LETTER    },
-    { 21600, 35600, "Legal",        5,  PAPER_LEGAL     },
-    { 27900, 43100, "Tabloid",      7,  PAPER_TABLOID   },
-    { 0, 0,         "USER",         4,  PAPER_USER      }
-};
-
-static Paper getPaperType( const String& rPaperName )
-{
-    ByteString aPaper( rPaperName, RTL_TEXTENCODING_ISO_8859_1 );
-    for( unsigned int i = 0; i < sizeof( aPaperTab )/sizeof( aPaperTab[0] ); i++ )
-    {
-        if( ! strcmp( aPaper.GetBuffer(), aPaperTab[i].name ) )
-            return aPaperTab[i].paper;
-    }
-    return PAPER_USER;
-}
-
 static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
 {
     pJobSetup->meOrientation    = (Orientation)(rData.m_eOrientation == orientation::Landscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
@@ -113,7 +82,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
     int width, height;
 
     rData.m_aContext.getPageSize( aPaper, width, height );
-    pJobSetup->mePaperFormat    = getPaperType( aPaper );
+    pJobSetup->mePaperFormat    = PaperInfo::fromPSName(OUStringToOString( aPaper, RTL_TEXTENCODING_ISO_8859_1 ));
     pJobSetup->mnPaperWidth     = 0;
     pJobSetup->mnPaperHeight    = 0;
     if( pJobSetup->mePaperFormat == PAPER_USER )
@@ -475,14 +444,9 @@ void PspSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
             for( int i = 0; i < nValues; i++ )
             {
                 const PPDValue* pValue = pKey->getValue( i );
-                vcl::PaperInfo aInfo;
-                aInfo.m_aPaperName = pValue->m_aOptionTranslation;
-                if( ! aInfo.m_aPaperName.Len() )
-                    aInfo.m_aPaperName = pValue->m_aOption;
                 int nWidth = 0, nHeight = 0;
                 m_aJobData.m_pParser->getPaperDimension( pValue->m_aOption, nWidth, nHeight );
-                aInfo.m_nPaperWidth = (unsigned long)((PtTo10Mu( nWidth )+50)/100);
-                aInfo.m_nPaperHeight = (unsigned long)((PtTo10Mu( nHeight )+50)/100);
+                PaperInfo aInfo(PtTo10Mu( nWidth ), PtTo10Mu( nHeight ));
                 m_aPaperFormats.push_back( aInfo );
             }
         }
@@ -628,7 +592,7 @@ BOOL PspSalInfoPrinter::SetData(
                     TenMuToPt( pJobSetup->mnPaperWidth ),
                     TenMuToPt( pJobSetup->mnPaperHeight ) );
             else
-                aPaper = String( ByteString( aPaperTab[ pJobSetup->mePaperFormat ].name ), RTL_TEXTENCODING_ISO_8859_1 );
+                aPaper = rtl::OStringToOUString(PaperInfo::toPSName(pJobSetup->mePaperFormat), RTL_TEXTENCODING_ISO_8859_1);
 
             pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
             pValue = pKey ? pKey->getValue( aPaper ) : NULL;
diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx
index 5f8c76fdb16f..2cf4e3baedd3 100644
--- a/vcl/unx/source/gdi/salprnpsp.cxx
+++ b/vcl/unx/source/gdi/salprnpsp.cxx
@@ -126,37 +126,6 @@ inline int PtTo10Mu( int nPoints ) { return (int)((((double)nPoints)*35.27777778
 
 inline int TenMuToPt( int nUnits ) { return (int)((((double)nUnits)/35.27777778)+0.5); }
 
-static struct
-{
-    int         width;
-    int         height;
-    const char* name;
-    int         namelength;
-    Paper       paper;
-} aPaperTab[] =
-{
-    { 29700, 42000, "A3",           2,  PAPER_A3        },
-    { 21000, 29700, "A4",           2,  PAPER_A4        },
-    { 14800, 21000, "A5",           2,  PAPER_A5        },
-    { 25000, 35300, "B4",           2,  PAPER_B4        },
-    { 17600, 25000, "B5",           2,  PAPER_B5        },
-    { 21600, 27900, "Letter",       6,  PAPER_LETTER    },
-    { 21600, 35600, "Legal",        5,  PAPER_LEGAL     },
-    { 27900, 43100, "Tabloid",      7,  PAPER_TABLOID   },
-    { 0, 0,         "USER",         4,  PAPER_USER      }
-};
-
-static Paper getPaperType( const String& rPaperName )
-{
-    ByteString aPaper( rPaperName, RTL_TEXTENCODING_ISO_8859_1 );
-    for( unsigned int i = 0; i < sizeof( aPaperTab )/sizeof( aPaperTab[0] ); i++ )
-    {
-        if( ! rtl_str_compareIgnoreAsciiCase( aPaper.GetBuffer(), aPaperTab[i].name ) )
-            return aPaperTab[i].paper;
-    }
-    return PAPER_USER;
-}
-
 static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
 {
     pJobSetup->meOrientation    = (Orientation)(rData.m_eOrientation == orientation::Landscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
@@ -166,7 +135,8 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
     int width, height;
 
     rData.m_aContext.getPageSize( aPaper, width, height );
-    pJobSetup->mePaperFormat    = getPaperType( aPaper );
+    pJobSetup->mePaperFormat    = PaperInfo::fromPSName(OUStringToOString( aPaper, RTL_TEXTENCODING_ISO_8859_1 ));
+
     pJobSetup->mnPaperWidth     = 0;
     pJobSetup->mnPaperHeight    = 0;
     if( pJobSetup->mePaperFormat == PAPER_USER )
@@ -544,14 +514,9 @@ void PspSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
             for( int i = 0; i < nValues; i++ )
             {
                 const PPDValue* pValue = pKey->getValue( i );
-                vcl::PaperInfo aInfo;
-                aInfo.m_aPaperName = pValue->m_aOptionTranslation;
-                if( ! aInfo.m_aPaperName.Len() )
-                    aInfo.m_aPaperName = pValue->m_aOption;
                 int nWidth = 0, nHeight = 0;
                 m_aJobData.m_pParser->getPaperDimension( pValue->m_aOption, nWidth, nHeight );
-                aInfo.m_nPaperWidth = (unsigned long)((PtTo10Mu( nWidth )+50)/100);
-                aInfo.m_nPaperHeight = (unsigned long)((PtTo10Mu( nHeight )+50)/100);
+                PaperInfo aInfo(PtTo10Mu( nWidth ), PtTo10Mu( nHeight ));
                 m_aPaperFormats.push_back( aInfo );
             }
         }
@@ -730,7 +695,7 @@ BOOL PspSalInfoPrinter::SetData(
                     TenMuToPt( pJobSetup->mnPaperWidth ),
                     TenMuToPt( pJobSetup->mnPaperHeight ) );
             else
-                aPaper = String( ByteString( aPaperTab[ pJobSetup->mePaperFormat ].name ), RTL_TEXTENCODING_ISO_8859_1 );
+                aPaper = rtl::OStringToOUString(PaperInfo::toPSName(pJobSetup->mePaperFormat), RTL_TEXTENCODING_ISO_8859_1);
 
             pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
             pValue = pKey ? pKey->getValueCaseInsensitive( aPaper ) : NULL;
diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx
index cf5a4a886c41..b3e5b4667a6a 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/source/printer/printerinfomanager.cxx
@@ -44,6 +44,8 @@
 #include "tools/debug.hxx"
 #include "tools/config.hxx"
 
+#include "i18npool/paper.hxx"
+
 #include "rtl/strbuf.hxx"
 
 #include "osl/thread.hxx"
@@ -154,77 +156,9 @@ void PrinterInfoManager::setCUPSDisabled( bool bDisable )
 
 void PrinterInfoManager::initSystemDefaultPaper()
 {
-    bool bSuccess = false;
-
-    // try libpaper
-
-    // #i78617# workaround missing paperconf command
-    FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
-    if( pPipe )
-    {
-        char pBuffer[ 1024 ];
-        *pBuffer = 0;
-        fgets( pBuffer, sizeof(pBuffer)-1, pPipe );
-        pclose( pPipe );
-
-        ByteString aPaper( pBuffer );
-        aPaper = WhitespaceToSpace( aPaper );
-        if( aPaper.Len() )
-        {
-            m_aSystemDefaultPaper = OUString( OStringToOUString( aPaper, osl_getThreadTextEncoding() ) );
-            bSuccess = true;
-            #if OSL_DEBUG_LEVEL > 1
-            fprintf( stderr, "paper from paperconf = %s\n", aPaper.GetBuffer() );
-            #endif
-        }
-        if( bSuccess )
-            return;
-    }
-
-    // default value is Letter for US (en_US), Cannada (en_CA, fr_CA); else A4
-    // en will be interpreted as en_US
-
-    // note: at this point m_aSystemDefaultPaper is set to "A4" from the constructor
-
-    // check for LC_PAPER
-    const char* pPaperLang = getenv( "LC_PAPER" );
-    if( pPaperLang && *pPaperLang )
-    {
-        OString aLang( pPaperLang );
-        if( aLang.getLength() > 5 )
-            aLang = aLang.copy( 0, 5 );
-        if( aLang.getLength() == 5 )
-        {
-            if(    aLang.equalsIgnoreAsciiCase( "en_us" )
-                || aLang.equalsIgnoreAsciiCase( "en_ca" )
-            || aLang.equalsIgnoreAsciiCase( "fr_ca" )
-            )
-                m_aSystemDefaultPaper = OUString( RTL_CONSTASCII_USTRINGPARAM( "Letter" ) );
-        }
-        else if( aLang.getLength() == 2 && aLang.equalsIgnoreAsciiCase( "en" ) )
-            m_aSystemDefaultPaper = OUString( RTL_CONSTASCII_USTRINGPARAM( "Letter" ) );
-        return;
-    }
-
-    // use process locale to determine paper
-    rtl_Locale* pLoc = NULL;
-    osl_getProcessLocale( &pLoc );
-    if( pLoc )
-    {
-        if( 0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pLoc->Language->buffer, pLoc->Language->length, "en") )
-        {
-            if(    0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pLoc->Country->buffer, pLoc->Country->length, "us")
-                || 0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pLoc->Country->buffer, pLoc->Country->length, "ca")
-                || pLoc->Country->length == 0
-                )
-                m_aSystemDefaultPaper = OUString( RTL_CONSTASCII_USTRINGPARAM( "Letter" ) );
-        }
-        else if( 0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pLoc->Language->buffer, pLoc->Language->length, "fr") )
-        {
-            if( 0 == rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pLoc->Country->buffer, pLoc->Country->length, "ca") )
-                m_aSystemDefaultPaper = OUString( RTL_CONSTASCII_USTRINGPARAM( "Letter" ) );
-        }
-    }
+    m_aSystemDefaultPaper = rtl::OStringToOUString(
+        PaperInfo::toPSName(PaperInfo::getSystemDefaultPaper().getPaper()),
+        RTL_TEXTENCODING_UTF8);
 }
 
 // -----------------------------------------------------------------
diff --git a/vcl/util/linksvp/makefile.mk b/vcl/util/linksvp/makefile.mk
index 8e7d6f35ef83..e5e82323af5c 100644
--- a/vcl/util/linksvp/makefile.mk
+++ b/vcl/util/linksvp/makefile.mk
@@ -54,6 +54,7 @@ SHL1LIBS=$(LIB1TARGET)
 SHL1DEPN=$(LB)$/libvcl$(DLLPOSTFIX)$(DLLPOST)
 SHL1STDLIBS=\
             $(VCLLIB)\
+            $(I18NPAPERLIB)\
             $(BASEBMPLIB)\
             $(BASEGFXLIB)\
             $(TOOLSLIB)         \
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index 08d6f9197f28..96c28980118f 100644
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -170,8 +170,9 @@ SHL1STDLIBS+=\
             $(SOTLIB)           \
             $(UNOTOOLSLIB)      \
             $(TOOLSLIB)         \
+            $(I18NPAPERLIB)     \
             $(I18NISOLANGLIB)   \
-            $(I18NUTILLIB)   \
+            $(I18NUTILLIB)      \
             $(COMPHELPERLIB)	\
             $(UCBHELPERLIB)     \
             $(CPPUHELPERLIB)    \
@@ -264,6 +265,7 @@ SHL2DEPN=$(SHL1IMPLIBN) $(SHL1TARGETN)
 # libs for generic plugin
 SHL2STDLIBS=\
             $(VCLLIB)\
+            $(I18NPAPERLIB)     \
             $(TOOLSLIB)         \
             $(VOSLIB)           \
             $(BASEGFXLIB)	\
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index cc359da97cd9..ecf91aea7c1b 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -894,6 +894,24 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
         }
         switch( CHOOSE_DEVMODE(dmPaperSize) )
         {
+            case( DMPAPER_LETTER ):
+                pSetupData->mePaperFormat = PAPER_LETTER;
+                break;
+            case( DMPAPER_TABLOID ):
+                pSetupData->mePaperFormat = PAPER_TABLOID;
+                break;
+            case( DMPAPER_LEDGER ):
+                pSetupData->mePaperFormat = PAPER_LEDGER;
+                break;
+            case( DMPAPER_LEGAL ):
+                pSetupData->mePaperFormat = PAPER_LEGAL;
+                break;
+            case( DMPAPER_STATEMENT ):
+                pSetupData->mePaperFormat = PAPER_STATEMENT;
+                break;
+            case( DMPAPER_EXECUTIVE ):
+                pSetupData->mePaperFormat = PAPER_EXECUTIVE;
+                break;
             case( DMPAPER_A3 ):
                 pSetupData->mePaperFormat = PAPER_A3;
                 break;
@@ -903,20 +921,138 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
             case( DMPAPER_A5 ):
                 pSetupData->mePaperFormat = PAPER_A5;
                 break;
+            //See http://wiki.services.openoffice.org/wiki/DefaultPaperSize
+            //i.e.
+            //http://msdn.microsoft.com/en-us/library/dd319099(VS.85).aspx
+            //DMPAPER_B4    12  B4 (JIS) 257 x 364 mm
+            //http://partners.adobe.com/public/developer/en/ps/5003.PPD_Spec_v4.3.pdf
+            //also says that the MS DMPAPER_B4 is JIS, which makes most sense. And
+            //matches our Excel filter's belief about the matching XlPaperSize
+            //enumeration.
+            //
+            //http://msdn.microsoft.com/en-us/library/ms776398(VS.85).aspx said
+            ////"DMPAPER_B4     12  B4 (JIS) 250 x 354"
+            //which is bogus as it's either JIS 257 × 364 or ISO 250 × 353
+            //(cmc)
             case( DMPAPER_B4 ):
-                pSetupData->mePaperFormat = PAPER_B4;
+                pSetupData->mePaperFormat = PAPER_B4_JIS;
                 break;
             case( DMPAPER_B5 ):
-                pSetupData->mePaperFormat = PAPER_B5;
+                pSetupData->mePaperFormat = PAPER_B5_JIS;
                 break;
-            case( DMPAPER_LETTER ):
+            case( DMPAPER_QUARTO ):
+                pSetupData->mePaperFormat = PAPER_QUARTO;
+                break;
+            case( DMPAPER_10X14 ):
+                pSetupData->mePaperFormat = PAPER_10x14;
+                break;
+            case( DMPAPER_NOTE ):
                 pSetupData->mePaperFormat = PAPER_LETTER;
                 break;
-            case( DMPAPER_LEGAL ):
-                pSetupData->mePaperFormat = PAPER_LEGAL;
+            case( DMPAPER_ENV_9 ):
+                pSetupData->mePaperFormat = PAPER_ENV_9;
                 break;
-            case( DMPAPER_TABLOID ):
-                pSetupData->mePaperFormat = PAPER_TABLOID;
+            case( DMPAPER_ENV_10 ):
+                pSetupData->mePaperFormat = PAPER_ENV_10;
+                break;
+            case( DMPAPER_ENV_11 ):
+                pSetupData->mePaperFormat = PAPER_ENV_11;
+                break;
+            case( DMPAPER_ENV_12 ):
+                pSetupData->mePaperFormat = PAPER_ENV_12;
+                break;
+            case( DMPAPER_ENV_14 ):
+                pSetupData->mePaperFormat = PAPER_ENV_14;
+                break;
+            case( DMPAPER_CSHEET ):
+                pSetupData->mePaperFormat = PAPER_C;
+                break;
+            case( DMPAPER_DSHEET ):
+                pSetupData->mePaperFormat = PAPER_D;
+                break;
+            case( DMPAPER_ESHEET ):
+                pSetupData->mePaperFormat = PAPER_E;
+                break;
+            case( DMPAPER_ENV_DL):
+                pSetupData->mePaperFormat = PAPER_ENV_DL;
+                break;
+            case( DMPAPER_ENV_C5):
+                pSetupData->mePaperFormat = PAPER_ENV_C5;
+                break;
+            case( DMPAPER_ENV_C3):
+                pSetupData->mePaperFormat = PAPER_ENV_C3;
+                break;
+            case( DMPAPER_ENV_C4):
+                pSetupData->mePaperFormat = PAPER_ENV_C4;
+                break;
+            case( DMPAPER_ENV_C6):
+                pSetupData->mePaperFormat = PAPER_ENV_C6;
+                break;
+            case( DMPAPER_ENV_C65):
+                pSetupData->mePaperFormat = PAPER_ENV_C65;
+                break;
+            case( DMPAPER_ENV_ITALY ):
+                pSetupData->mePaperFormat = PAPER_ENV_ITALY;
+                break;
+            case( DMPAPER_ENV_MONARCH ):
+                pSetupData->mePaperFormat = PAPER_ENV_MONARCH;
+                break;
+            case( DMPAPER_ENV_PERSONAL ):
+                pSetupData->mePaperFormat = PAPER_ENV_PERSONAL;
+                break;
+            case( DMPAPER_FANFOLD_US ):
+                pSetupData->mePaperFormat = PAPER_FANFOLD_US;
+                break;
+            case( DMPAPER_FANFOLD_STD_GERMAN ):
+                pSetupData->mePaperFormat = PAPER_FANFOLD_DE;
+                break;
+            case( DMPAPER_FANFOLD_LGL_GERMAN ):
+                pSetupData->mePaperFormat = PAPER_FANFOLD_LEGAL_DE;
+                break;
+            case( DMPAPER_ISO_B4 ):
+                pSetupData->mePaperFormat = PAPER_B4_ISO;
+                break;
+            case( DMPAPER_JAPANESE_POSTCARD ):
+                pSetupData->mePaperFormat = PAPER_POSTCARD_JP;
+                break;
+            case( DMPAPER_9X11 ):
+                pSetupData->mePaperFormat = PAPER_9x11;
+                break;
+            case( DMPAPER_10X11 ):
+                pSetupData->mePaperFormat = PAPER_10x11;
+                break;
+            case( DMPAPER_15X11 ):
+                pSetupData->mePaperFormat = PAPER_15x11;
+                break;
+            case( DMPAPER_ENV_INVITE ):
+                pSetupData->mePaperFormat = PAPER_ENV_INVITE;
+                break;
+            case( DMPAPER_A_PLUS ):
+                pSetupData->mePaperFormat = PAPER_A_PLUS;
+                break;
+            case( DMPAPER_B_PLUS ):
+                pSetupData->mePaperFormat = PAPER_B_PLUS;
+                break;
+            case( DMPAPER_LETTER_PLUS ):
+                pSetupData->mePaperFormat = PAPER_LETTER_PLUS;
+                break;
+            case( DMPAPER_A4_PLUS ):
+                pSetupData->mePaperFormat = PAPER_A4_PLUS;
+                break;
+            case( DMPAPER_A2 ):
+                pSetupData->mePaperFormat = PAPER_A2;
+                break;
+            case( DMPAPER_DBL_JAPANESE_POSTCARD ):
+                pSetupData->mePaperFormat = PAPER_DOUBLEPOSTCARD_JP;
+                break;
+            case( DMPAPER_A6 ):
+                pSetupData->mePaperFormat = PAPER_A6;
+                break;
+            case( DMPAPER_B6_JIS ):
+                pSetupData->mePaperFormat = PAPER_B6_JIS;
+                break;
+            case( DMPAPER_12X11 ):
+                pSetupData->mePaperFormat = PAPER_12x11;
                 break;
             default:
                 pSetupData->mePaperFormat = PAPER_USER;
@@ -927,17 +1063,6 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
 
 // -----------------------------------------------------------------------
 
-static BOOL ImplPaperSizeEqual( short nPaperWidth1, short nPaperHeight1,
-                                short nPaperWidth2, short nPaperHeight2 )
-{
-    const short PAPER_SLOPPY = 1; // 0.1 mm accuracy
-
-    return ( (Abs( nPaperWidth1-nPaperWidth2 ) <= PAPER_SLOPPY) &&
-             (Abs( nPaperHeight1-nPaperHeight2 ) <= PAPER_SLOPPY) );
-}
-
-// -----------------------------------------------------------------------
-
 static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, ULONG nFlags )
 {
     if ( !pSetupData || !pSetupData->mpDriverData )
@@ -979,6 +1104,9 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
 
         switch( pSetupData->mePaperFormat )
         {
+            case( PAPER_A2 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A2;
+                break;
             case( PAPER_A3 ):
                 CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A3;
                 break;
@@ -988,11 +1116,8 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
             case( PAPER_A5 ):
                 CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A5;
                 break;
-            case( PAPER_B4 ):
-                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_B4;
-                break;
-            case( PAPER_B5 ):
-                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_B5;
+            case( PAPER_B4_ISO):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ISO_B4;
                 break;
             case( PAPER_LETTER ):
                 CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_LETTER;
@@ -1003,6 +1128,136 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
             case( PAPER_TABLOID ):
                 CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_TABLOID;
                 break;
+#if 0
+            //http://msdn.microsoft.com/en-us/library/ms776398(VS.85).aspx
+            //DMPAPER_ENV_B6 is documented as:
+            //"DMPAPER_ENV_B6   35  Envelope B6 176 x 125 mm"
+            //which is the wrong way around, it is surely 125 x 176, i.e.
+            //compare DMPAPER_ENV_B4 and DMPAPER_ENV_B4 as
+            //DMPAPER_ENV_B4    33  Envelope B4 250 x 353 mm
+            //DMPAPER_ENV_B5    34  Envelope B5 176 x 250 mm
+            case( PAPER_B6_ISO ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_B6;
+                break;
+#endif
+            case( PAPER_ENV_C4 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_C4;
+                break;
+            case( PAPER_ENV_C5 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_C5;
+                break;
+            case( PAPER_ENV_C6 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_C6;
+                break;
+            case( PAPER_ENV_C65 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_C65;
+                break;
+            case( PAPER_ENV_DL ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_DL;
+                break;
+            case( PAPER_C ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_CSHEET;
+                break;
+            case( PAPER_D ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_DSHEET;
+                break;
+            case( PAPER_E ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ESHEET;
+                break;
+            case( PAPER_EXECUTIVE ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_EXECUTIVE;
+                break;
+            case( PAPER_FANFOLD_LEGAL_DE ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_FANFOLD_LGL_GERMAN;
+                break;
+            case( PAPER_ENV_MONARCH ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_MONARCH;
+                break;
+            case( PAPER_ENV_PERSONAL ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_PERSONAL;
+                break;
+            case( PAPER_ENV_9 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_9;
+                break;
+            case( PAPER_ENV_10 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_10;
+                break;
+            case( PAPER_ENV_11 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_11;
+                break;
+            case( PAPER_ENV_12 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_12;
+                break;
+            //See the comments on DMPAPER_B4 above
+            case( PAPER_B4_JIS ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_B4;
+                break;
+            case( PAPER_B5_JIS ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_B5;
+                break;
+            case( PAPER_B6_JIS ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_B6_JIS;
+                break;
+            case( PAPER_LEDGER ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_LEDGER;
+                break;
+            case( PAPER_STATEMENT ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_STATEMENT;
+                break;
+            case( PAPER_10x14 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_10X14;
+                break;
+            case( PAPER_ENV_14 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_14;
+                break;
+            case( PAPER_ENV_C3 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_C3;
+                break;
+            case( PAPER_ENV_ITALY ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_ITALY;
+                break;
+            case( PAPER_FANFOLD_US ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_FANFOLD_US;
+                break;
+            case( PAPER_FANFOLD_DE ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_FANFOLD_STD_GERMAN;
+                break;
+            case( PAPER_POSTCARD_JP ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_JAPANESE_POSTCARD;
+                break;
+            case( PAPER_9x11 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_9X11;
+                break;
+            case( PAPER_10x11 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_10X11;
+                break;
+            case( PAPER_15x11 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_15X11;
+                break;
+            case( PAPER_ENV_INVITE ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_ENV_INVITE;
+                break;
+            case( PAPER_A_PLUS ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A_PLUS;
+                break;
+            case( PAPER_B_PLUS ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_B_PLUS;
+                break;
+            case( PAPER_LETTER_PLUS ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_LETTER_PLUS;
+                break;
+            case( PAPER_A4_PLUS ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A4_PLUS;
+                break;
+            case( PAPER_DOUBLEPOSTCARD_JP ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_DBL_JAPANESE_POSTCARD;
+                break;
+            case( PAPER_A6 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_A6;
+                break;
+            case( PAPER_12x11 ):
+                CHOOSE_DEVMODE(dmPaperSize) = DMPAPER_12X11;
+                break;
             default:
             {
                 short   nPaper = 0;
@@ -1023,13 +1278,11 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
                 }
                 if ( (nPaperSizeCount == nPaperCount) && pPapers && pPaperSizes )
                 {
+                    PaperInfo aInfo(pSetupData->mnPaperWidth, pSetupData->mnPaperHeight);
                     // compare paper formats and select a good match
                     for ( ULONG i = 0; i < nPaperCount; i++ )
                     {
-                        if ( ImplPaperSizeEqual( (short)(pSetupData->mnPaperWidth/10),
-                                                (short)(pSetupData->mnPaperHeight/10),
-                                                (short)pPaperSizes[i].x,
-                                                (short)pPaperSizes[i].y ) )
+                        if ( aInfo.sloppyEqual(PaperInfo(pPaperSizes[i].x*10, pPaperSizes[i].y*10)))
                         {
                             nPaper = pPapers[i];
                             break;
@@ -1041,12 +1294,10 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
                     // all paper sizes with portrait orientation only!!
                     if ( !nPaper && nLandscapeAngle != 0 )
                     {
+                        PaperInfo aRotatedInfo(pSetupData->mnPaperHeight, pSetupData->mnPaperWidth);
                         for ( ULONG i = 0; i < nPaperCount; i++ )
                         {
-                            if ( ImplPaperSizeEqual( (short)(pSetupData->mnPaperWidth/10),
-                                                    (short)(pSetupData->mnPaperHeight/10),
-                                                    (short)pPaperSizes[i].y,
-                                                    (short)pPaperSizes[i].x ) )
+                            if ( aRotatedInfo.sloppyEqual(PaperInfo(pPaperSizes[i].x*10, pPaperSizes[i].y*10)) )
                             {
                                 nPaper = pPapers[i];
                                 break;
@@ -1284,11 +1535,7 @@ void WinSalInfoPrinter::InitPaperFormats( const ImplJobSetup* pSetupData )
             ImplDeviceCaps( this, DC_PAPERNAMES, (BYTE*)pNamesBuffer, pSetupData );
             for( DWORD i = 0; i < nCount; ++i )
             {
-                vcl::PaperInfo aInfo;
-                aInfo.m_nPaperWidth  = (pPaperSizes[i].x + 5) / 10;
-                aInfo.m_nPaperHeight = (pPaperSizes[i].y + 5) / 10;
-                pNamesBuffer[(i+1)*64-1] = '\0';    // make very long names zero terminated
-                aInfo.m_aPaperName = pNamesBuffer + (i*64);
+                PaperInfo aInfo(pPaperSizes[i].x * 10, pPaperSizes[i].y * 10);
                 m_aPaperFormats.push_back( aInfo );
             }
             rtl_freeMemory( pNamesBuffer );
@@ -1299,11 +1546,7 @@ void WinSalInfoPrinter::InitPaperFormats( const ImplJobSetup* pSetupData )
             ImplDeviceCaps( this, DC_PAPERNAMES, (BYTE*)pNamesBuffer, pSetupData );
             for( DWORD i = 0; i < nCount; ++i )
             {
-                vcl::PaperInfo aInfo;
-                aInfo.m_nPaperWidth  = (pPaperSizes[i].x + 5) / 10;
-                aInfo.m_nPaperHeight = (pPaperSizes[i].y + 5) / 10;
-                pNamesBuffer[(i+1)*64-1] = '\0';    // make very long names zero terminated
-                aInfo.m_aPaperName = ImplSalGetUniString( (const char*)(pNamesBuffer + (i*64)) );
+                PaperInfo aInfo(pPaperSizes[i].x * 10, pPaperSizes[i].y * 10);
                 m_aPaperFormats.push_back( aInfo );
             }
             rtl_freeMemory( pNamesBuffer );