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

1 files changed, 284 insertions, 41 deletions

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 );