cws tl74: merge

4 files changed, 158 insertions, 68 deletions

diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 2ada884e48c7..63ad384c7bd9 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -96,13 +96,13 @@
 #define CB_CHAR_HIDDEN  61
 // Print-Extra-Page
 #define CB_PGRF            61
-#define CB_PTAB            62
-#define CB_PDRAW           63
+//#define CB_PTAB            62 merged with CB_PGRF in printerpullpages
+//#define CB_PDRAW         63   removed in printerpullpages
 #define CB_LEFTP           64
 #define CB_RIGHTP          65
-#define CB_REVERSE         66
+//#define CB_REVERSE         66 removed in printerpullpages
 #define CB_PROSPECT        67
-#define CB_SINGLEJOBS      68
+//#define CB_SINGLEJOBS      68 removed in printerpullpages
 #define CB_CTRLFLD         69
 #define CB_PAPERFROMSETUP  70
 #define FL_1              71
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 41ba789789ff..f509b1cdcc5c 100644..100755
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -215,60 +215,66 @@ TabPage TP_OPTPRINT_PAGE
         Text [ en-US ] = "Contents" ;
         Group = TRUE ;
     };
-    CheckBox CB_PGRF
+    CheckBox CB_PGRF /*functionally merged with CB_PDRAW*/
     {
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
-        Text [ en-US ] = "~Graphics" ;
+        Text [ en-US ] = "~Pictures and objects" ;
         TabStop = TRUE ;
         Group = TRUE ;
     };
+/*
+    removed, tables now always get printed
     CheckBox CB_PTAB
     {
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Tables" ;
     };
+*/
+/*
+    functionally merged with CB_PGRF (pictures and graphics)
     CheckBox CB_PDRAW
     {
         Pos = MAP_APPFONT ( 12 , 40 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Dra~wings" ;
     };
+*/
     CheckBox CB_CTRLFLD
     {
-        Pos = MAP_APPFONT ( 12 , 53 ) ;
+        Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
-        Text [ en-US ] = "Control~s" ;
+        Text [ en-US ] = "Form control~s" ;
     };
     CheckBox CB_BACKGROUND
     {
-        Pos = MAP_APPFONT ( 12 , 66 ) ;
+        Pos = MAP_APPFONT ( 12 , 40 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
-        Text [ en-US ] = "Ba~ckground" ;
+        Text [ en-US ] = "Page ba~ckground" ;
     };
     CheckBox CB_BLACK_FONT
     {
-        Pos = MAP_APPFONT ( 12 , 79 ) ;
+        Pos = MAP_APPFONT ( 12 , 53 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
-        Text [ en-US ] = "Print blac~k" ;
+        Text [ en-US ] = "Print text in blac~k" ;
     };
     CheckBox CB_HIDDEN_TEXT
     {
-        Pos = MAP_APPFONT ( 12 , 92 ) ;
+        Pos = MAP_APPFONT ( 12 , 66 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Hidden te~xt" ;
     };
     CheckBox CB_TEXT_PLACEHOLDER
     {
-        Pos = MAP_APPFONT ( 12 , 105 ) ;
+        Pos = MAP_APPFONT ( 12 , 79 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Text ~placeholder" ;
     };
     FixedLine FL_SEP_PRT_LEFT
     {
         Pos = MAP_APPFONT ( 85 , 14 ) ;
-        Size = MAP_APPFONT ( 4 , 104 ) ;
+        Size = MAP_APPFONT ( 4 , 78 ) ;
         Vert = TRUE;
     };
     FixedLine FL_2
@@ -292,21 +298,24 @@ TabPage TP_OPTPRINT_PAGE
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Right pages" ;
     };
+/*
+    removed, noe handled by the new print dialog (i.e. vcl) itself
     CheckBox CB_REVERSE
     {
         Pos = MAP_APPFONT ( 96 , 40 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Re~versed" ;
     };
+*/
     CheckBox CB_PROSPECT
     {
-        Pos = MAP_APPFONT ( 96 , 53 ) ;
+        Pos = MAP_APPFONT ( 96 , 40 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Broch~ure" ;
     };
     CheckBox CB_PROSPECT_RTL
     {
-        Pos = MAP_APPFONT ( 103 , 66 ) ;
+        Pos = MAP_APPFONT ( 103 , 53 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "Right to Left" ;
         Text [ x-comment ] = " ";
@@ -340,7 +349,7 @@ TabPage TP_OPTPRINT_PAGE
     FixedLine FL_SEP_PRT_RIGHT
     {
         Pos = MAP_APPFONT ( 169 , 14 ) ;
-        Size = MAP_APPFONT ( 4 , 104 ) ;
+        Size = MAP_APPFONT ( 4 , 78 ) ;
         Vert = TRUE;
     };
     FixedLine FL_3
@@ -352,35 +361,37 @@ TabPage TP_OPTPRINT_PAGE
     };
     FixedLine FL_4
     {
-        Pos = MAP_APPFONT ( 6 , 121 ) ;
+        Pos = MAP_APPFONT ( 6 , 95 ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Group = TRUE ;
         Text [ en-US ] = "Other";
     };
     CheckBox CB_PRINTEMPTYPAGES
     {
-        Pos = MAP_APPFONT ( 12 , 132 ) ;
+        Pos = MAP_APPFONT ( 12 , 106 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Print ~automatically inserted blank pages";
     };
+/*
     CheckBox CB_SINGLEJOBS
     {
-        Pos = MAP_APPFONT ( 12 , 145 ) ;
+        Pos = MAP_APPFONT ( 12 , 119 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Create s~ingle print jobs" ;
     };
+*/
     CheckBox CB_PAPERFROMSETUP
     {
-        Pos = MAP_APPFONT ( 12 , 158 ) ;
+        Pos = MAP_APPFONT ( 12 , 119 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~Paper tray from printer settings";
     };
     FixedText FT_FAX
     {
-        Pos = MAP_APPFONT ( 12 , 173 ) ;
+        Pos = MAP_APPFONT ( 12 , 134 ) ;
         Size = MAP_APPFONT ( 50 , 8 ) ;
         Group = TRUE ;
         Text [ en-US ] = "~Fax";
@@ -388,7 +399,7 @@ TabPage TP_OPTPRINT_PAGE
     ListBox LB_FAX
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 70 , 171 ) ;
+        Pos = MAP_APPFONT ( 70 , 132 ) ;
         Size = MAP_APPFONT ( 184 , 70 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -935,3 +946,55 @@ TabPage TP_OPTSHDWCRSR
     };
 };
 
+
+StringArray STR_PRINTOPTUI
+{
+    ItemList [en-US] =
+    {
+        < "%PRODUCTNAME %s"; >;
+        < "Contents"; >;
+        < "Page ba~ckground"; >;
+        < "Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document."; >;
+        < "~Pictures and objects"; >;
+        < "Specifies whether the graphics and drawing or OLE objects of your text document are printed"; >;
+        < "Hidden te~xt"; >;
+        < "Enable this option to print text that is marked as hidden."; >;
+        < "~Text placeholder"; >;
+        < "Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout."; >;
+        < "Form control~s"; >;
+        < "Specifies whether the form control fields of the text document are printed"; >;
+        < "Color"; >;
+        < "Print text in blac~k"; >;
+        < "Specifies whether to always print text in black."; >;
+        < "Pages"; >;
+        < "Print ~automatically inserted blank pages"; >;
+        < "If this option is enabled automatically inserted blank pages are printed. This is best if you are printing double-sided. For example, in a book, a \"chapter\" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not"; >;
+        < "~Use only paper tray from printer preferences"; >;
+        < "For printers with multiple trays this option specifies whether the paper tray used is specified by the system settings of the printer."; >;
+        < "Print"; >;
+        < "None (document only)"; >;
+        < "Comments only"; >;
+        < "Place at end of document"; >;
+        < "Place at end of page"; >;
+        < "Specify where to print comments (if any)."; >;
+        < "~Comments"; >;
+        < "Page sides";>;
+        < "All pages"; >;
+        < "Back sides / left pages"; >;
+        < "Front sides / right pages"; >;
+        < "Specify which pages to include in the output"; >;
+        < "Include"; >;
+        < "Broch~ure"; >;
+        < "Select the Brochure option to print the document in brochure format."; >;
+        < "Left-to-right script"; >;
+        < "Right-to-left script"; >;
+        < "Ranges and copies"; >;
+        < "~All pages"; >;
+        < "Print the whole document."; >;
+        < "Pa~ges"; >;
+        < "Print a range of pages of the document."; >;
+        < "~Selection"; >;
+        < "Print only the selected parts of the document"; >;
+    };
+};
+
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index b206bce741fd..84e8958fa977 100644..100755
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -350,8 +350,8 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     SfxTabPage( pParent, SW_RES( TP_OPTPRINT_PAGE ), rCoreSet),
     aFL1          (this, SW_RES(FL_1)),
     aGrfCB           (this, SW_RES(CB_PGRF)),
-    aTabCB           (this, SW_RES(CB_PTAB)),
-    aDrawCB          (this, SW_RES(CB_PDRAW)),
+//  aTabCB           (this, SW_RES(CB_PTAB)),
+//  aDrawCB          (this, SW_RES(CB_PDRAW)),
     aCtrlFldCB       (this, SW_RES(CB_CTRLFLD)),
     aBackgroundCB    (this, SW_RES(CB_BACKGROUND)),
     aBlackFontCB     (this, SW_RES(CB_BLACK_FONT)),
@@ -361,7 +361,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     aFL2          (this, SW_RES(FL_2)),
     aLeftPageCB      (this, SW_RES(CB_LEFTP)),
     aRightPageCB     (this, SW_RES(CB_RIGHTP)),
-    aReverseCB       (this, SW_RES(CB_REVERSE)),
+//    aReverseCB       (this, SW_RES(CB_REVERSE)),
     aProspectCB      (this, SW_RES(CB_PROSPECT)),
     aProspectCB_RTL      (this, SW_RES(CB_PROSPECT_RTL)),
     aSeparatorRFL    (this, SW_RES(FL_SEP_PRT_RIGHT)),
@@ -372,7 +372,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     aFL3          (this, SW_RES(FL_3)),
     aFL4          (this, SW_RES(FL_4)),
     aPrintEmptyPagesCB(this, SW_RES(CB_PRINTEMPTYPAGES)),
-    aSingleJobsCB    (this, SW_RES(CB_SINGLEJOBS)),
+//    aSingleJobsCB    (this, SW_RES(CB_SINGLEJOBS)),
     aPaperFromSetupCB(this, SW_RES(CB_PAPERFROMSETUP)),
     aFaxFT           (this, SW_RES(FT_FAX)),
     aFaxLB           (this, SW_RES(LB_FAX)),
@@ -386,14 +386,14 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     aGrfCB.SetClickHdl( aLk );
     aRightPageCB.SetClickHdl( aLk );
     aLeftPageCB.SetClickHdl( aLk );
-    aTabCB.SetClickHdl( aLk );
-    aDrawCB.SetClickHdl( aLk );
+//  aTabCB.SetClickHdl( aLk );
+//  aDrawCB.SetClickHdl( aLk );
     aCtrlFldCB.SetClickHdl( aLk );
     aBackgroundCB.SetClickHdl( aLk );
     aBlackFontCB.SetClickHdl( aLk );
     aPrintHiddenTextCB.SetClickHdl( aLk );
     aPrintTextPlaceholderCB.SetClickHdl( aLk );
-    aReverseCB.SetClickHdl( aLk );
+//  aReverseCB.SetClickHdl( aLk );
     aProspectCB.SetClickHdl( aLk );
     aProspectCB_RTL.SetClickHdl( aLk );
     aPaperFromSetupCB.SetClickHdl( aLk );
@@ -402,27 +402,40 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     aEndRB.SetClickHdl( aLk );
     aOnlyRB.SetClickHdl( aLk );
     aNoRB.SetClickHdl( aLk );
-    aSingleJobsCB.SetClickHdl( aLk );
+//  aSingleJobsCB.SetClickHdl( aLk );
     aFaxLB.SetSelectHdl( LINK( this, SwAddPrinterTabPage, SelectHdl ) );
 
     const SfxPoolItem* pItem;
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, FALSE, &pItem )
         && ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)
     {
-        aDrawCB      .Hide();
+//      aDrawCB      .Hide();
         aLeftPageCB  .Hide();
         aRightPageCB .Hide();
         aPrintHiddenTextCB.Hide();
         aPrintTextPlaceholderCB.Hide();
-        Point rPt(aReverseCB .GetPosPixel());
-        rPt.setX(rPt.getX() + 15); // indent
-        aProspectCB_RTL.SetPosPixel(rPt);
-        aReverseCB.SetPosPixel(aLeftPageCB  .GetPosPixel());
-        aProspectCB.SetPosPixel(aRightPageCB .GetPosPixel());
-        aPrintHiddenTextCB.SetPosPixel(aBlackFontCB.GetPosPixel());
-        aBlackFontCB.SetPosPixel(aBackgroundCB.GetPosPixel());
-        aBackgroundCB.SetPosPixel(aCtrlFldCB.GetPosPixel());
-        aCtrlFldCB.SetPosPixel(aDrawCB.GetPosPixel());
+//      aReverseCB.SetPosPixel(aLeftPageCB.GetPosPixel());
+        aProspectCB.SetPosPixel(aLeftPageCB.GetPosPixel());
+        Point aPt( aRightPageCB.GetPosPixel() );
+        aPt.setX(aPt.getX() + 15); // indent
+        aProspectCB_RTL.SetPosPixel(aPt);
+//      aBlackFontCB.SetPosPixel(aBackgroundCB.GetPosPixel());
+//        aPrintHiddenTextCB.SetPosPixel(aBlackFontCB.GetPosPixel());
+//      aBackgroundCB.SetPosPixel(aCtrlFldCB.GetPosPixel());
+//      aCtrlFldCB.SetPosPixel(aDrawCB.GetPosPixel());
+
+        // hide aPrintEmptyPagesCB and move everything below up accordingly
+        long nDeltaY = aPaperFromSetupCB.GetPosPixel().getY() - aPrintEmptyPagesCB.GetPosPixel().getY();
+        aPrintEmptyPagesCB.Hide();
+        aPt = aPaperFromSetupCB.GetPosPixel();
+        aPt.setY( aPt.getY() - nDeltaY );
+        aPaperFromSetupCB.SetPosPixel( aPt );
+        aPt = aFaxFT.GetPosPixel();
+        aPt.setY( aPt.getY() - nDeltaY );
+        aFaxFT.SetPosPixel( aPt );
+        aPt = aFaxLB.GetPosPixel();
+        aPt.setY( aPt.getY() - nDeltaY );
+        aFaxLB.SetPosPixel( aPt );
     }
     aProspectCB_RTL.Disable();
     SvtCTLOptions aCTLOptions;
@@ -465,22 +478,22 @@ BOOL    SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet )
     {
         SwAddPrinterItem aAddPrinterAttr (FN_PARAM_ADDPRINTER);
         aAddPrinterAttr.bPrintGraphic   = aGrfCB.IsChecked();
-        aAddPrinterAttr.bPrintTable     = aTabCB.IsChecked();
-        aAddPrinterAttr.bPrintDraw   = aDrawCB.IsChecked();
+        aAddPrinterAttr.bPrintTable     = TRUE; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
+        aAddPrinterAttr.bPrintDraw      = aGrfCB.IsChecked(); // UI merged with aGrfCB in CWS printerpullgpages /*aDrawCB.IsChecked()*/;
         aAddPrinterAttr.bPrintControl   = aCtrlFldCB.IsChecked();
         aAddPrinterAttr.bPrintPageBackground = aBackgroundCB.IsChecked();
         aAddPrinterAttr.bPrintBlackFont = aBlackFontCB.IsChecked();
         aAddPrinterAttr.bPrintHiddenText = aPrintHiddenTextCB.IsChecked();
         aAddPrinterAttr.bPrintTextPlaceholder = aPrintTextPlaceholderCB.IsChecked();
 
-        aAddPrinterAttr.bPrintLeftPage  = aLeftPageCB.IsChecked();
-        aAddPrinterAttr.bPrintRightPage = aRightPageCB.IsChecked();
-        aAddPrinterAttr.bPrintReverse   = aReverseCB.IsChecked();
-        aAddPrinterAttr.bPrintProspect  = aProspectCB.IsChecked();
-        aAddPrinterAttr.bPrintProspect_RTL  = aProspectCB_RTL.IsChecked();
-        aAddPrinterAttr.bPaperFromSetup = aPaperFromSetupCB.IsChecked();
-        aAddPrinterAttr.bPrintEmptyPages = aPrintEmptyPagesCB.IsChecked();
-        aAddPrinterAttr.bPrintSingleJobs = aSingleJobsCB.IsChecked();
+        aAddPrinterAttr.bPrintLeftPages     = aLeftPageCB.IsChecked();
+        aAddPrinterAttr.bPrintRightPages    = aRightPageCB.IsChecked();
+        aAddPrinterAttr.bPrintReverse       = FALSE; // handled by vcl itself since CWS printerpullpages /*aReverseCB.IsChecked()*/;
+        aAddPrinterAttr.bPrintProspect      = aProspectCB.IsChecked();
+        aAddPrinterAttr.bPrintProspectRTL   = aProspectCB_RTL.IsChecked();
+        aAddPrinterAttr.bPaperFromSetup     = aPaperFromSetupCB.IsChecked();
+        aAddPrinterAttr.bPrintEmptyPages    = aPrintEmptyPagesCB.IsChecked();
+        aAddPrinterAttr.bPrintSingleJobs    = TRUE; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/;
 
         if (aNoRB.IsChecked())  aAddPrinterAttr.nPrintPostIts =
                                                         POSTITS_NONE;
@@ -508,22 +521,22 @@ void    SwAddPrinterTabPage::Reset( const SfxItemSet&  )
     if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , FALSE,
                                     (const SfxPoolItem**)&pAddPrinterAttr ))
     {
-        aGrfCB.Check(           pAddPrinterAttr->bPrintGraphic);
-        aTabCB.Check(           pAddPrinterAttr->bPrintTable);
-        aDrawCB.Check(          pAddPrinterAttr->bPrintDraw);
+        aGrfCB.Check(           pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw );
+//      aTabCB.Check(           pAddPrinterAttr->bPrintTable);
+//        aDrawCB.Check(          pAddPrinterAttr->bPrintDraw);
         aCtrlFldCB.Check(       pAddPrinterAttr->bPrintControl);
         aBackgroundCB.Check(    pAddPrinterAttr->bPrintPageBackground);
         aBlackFontCB.Check(     pAddPrinterAttr->bPrintBlackFont);
         aPrintHiddenTextCB.Check( pAddPrinterAttr->bPrintHiddenText);
         aPrintTextPlaceholderCB.Check(pAddPrinterAttr->bPrintTextPlaceholder);
-        aLeftPageCB.Check(      pAddPrinterAttr->bPrintLeftPage);
-        aRightPageCB.Check(     pAddPrinterAttr->bPrintRightPage);
-        aReverseCB.Check(       pAddPrinterAttr->bPrintReverse);
+        aLeftPageCB.Check(      pAddPrinterAttr->bPrintLeftPages);
+        aRightPageCB.Check(     pAddPrinterAttr->bPrintRightPages);
+//      aReverseCB.Check(       pAddPrinterAttr->bPrintReverse);
         aPaperFromSetupCB.Check(pAddPrinterAttr->bPaperFromSetup);
         aPrintEmptyPagesCB.Check(pAddPrinterAttr->bPrintEmptyPages);
         aProspectCB.Check(      pAddPrinterAttr->bPrintProspect);
-        aProspectCB_RTL.Check(      pAddPrinterAttr->bPrintProspect_RTL);
-        aSingleJobsCB.Check(    pAddPrinterAttr->bPrintSingleJobs);
+        aProspectCB_RTL.Check(      pAddPrinterAttr->bPrintProspectRTL);
+//      aSingleJobsCB.Check(    pAddPrinterAttr->bPrintSingleJobs);
 
         aNoRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_NONE ) ;
         aOnlyRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_ONLY ) ;
diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx
index 31f3dde739c7..68f86cae4639 100644
--- a/sw/source/ui/config/prtopt.cxx
+++ b/sw/source/ui/config/prtopt.cxx
@@ -69,8 +69,8 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames()
         "Page/LeftPage",                // 13 not in SW/Web
         "Page/RightPage",               // 14 not in SW/Web
         "EmptyPages",                   // 15 not in SW/Web
-        "Content/PrintPlaceholders",     // 16 not in Sw/Web
-        "Content/PrintHiddenText"      // 17
+        "Content/PrintPlaceholders",    // 16 not in Sw/Web
+        "Content/PrintHiddenText"       // 17 not in Sw/Web
     };
     const int nCount = bIsWeb ? 12 : 18;
     Sequence<OUString> aNames(nCount);
@@ -92,6 +92,8 @@ SwPrintOptions::SwPrintOptions(sal_Bool bWeb) :
     bPrintPageBackground = !bWeb;
     bPrintBlackFont = bWeb;
     bPrintTextPlaceholder = bPrintHiddenText = sal_False;
+    if (bWeb)
+        bPrintEmptyPages = sal_False;
 
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues = GetProperties(aNames);
@@ -119,13 +121,13 @@ SwPrintOptions::SwPrintOptions(sal_Bool bWeb) :
                     break;
                     case  6: bPrintReverse      = *(sal_Bool*)pValues[nProp].getValue();  break;
                     case  7: bPrintProspect      = *(sal_Bool*)pValues[nProp].getValue();  break;
-                    case  8: bPrintProspect_RTL  = *(sal_Bool*)pValues[nProp].getValue();  break;
+                    case  8: bPrintProspectRTL  = *(sal_Bool*)pValues[nProp].getValue();  break;
                     case  9: bPrintSingleJobs   = *(sal_Bool*)pValues[nProp].getValue();  break;
                     case 10: pValues[nProp] >>= sFaxName;  break;
                     case 11: bPaperFromSetup    = *(sal_Bool*)pValues[nProp].getValue();  break;
                     case 12: bPrintDraw         = *(sal_Bool*)pValues[nProp].getValue() ;  break;
-                    case 13: bPrintLeftPage     = *(sal_Bool*)pValues[nProp].getValue();  break;
-                    case 14: bPrintRightPage        = *(sal_Bool*)pValues[nProp].getValue();  break;
+                    case 13: bPrintLeftPages    = *(sal_Bool*)pValues[nProp].getValue();  break;
+                    case 14: bPrintRightPages       = *(sal_Bool*)pValues[nProp].getValue();  break;
                     case 15: bPrintEmptyPages       = *(sal_Bool*)pValues[nProp].getValue();  break;
                     case 16: bPrintTextPlaceholder = *(sal_Bool*)pValues[nProp].getValue();  break;
                     case 17: bPrintHiddenText = *(sal_Bool*)pValues[nProp].getValue();  break;
@@ -133,6 +135,12 @@ SwPrintOptions::SwPrintOptions(sal_Bool bWeb) :
             }
         }
     }
+
+    // currently there is just one checkbox for print drawings and print graphics
+    // In the UI. (File/Print dialog and Tools/Options/.../Print)
+    // And since print graphics is the only available in Writer and WrtierWeb ...
+
+    bPrintDraw = bPrintGraphic;
 }
 /* -----------------------------06.09.00 16:50--------------------------------
 
@@ -167,18 +175,24 @@ void    SwPrintOptions::Commit()
             case  5: pValues[nProp] <<=  (sal_Int32)nPrintPostIts       ; break;
             case  6: bVal = bPrintReverse       ; pValues[nProp].setValue(&bVal, rType);  break;
             case  7: bVal = bPrintProspect      ; pValues[nProp].setValue(&bVal, rType);  break;
-            case  8: bVal = bPrintProspect_RTL      ; pValues[nProp].setValue(&bVal, rType);  break;
+            case  8: bVal = bPrintProspectRTL      ; pValues[nProp].setValue(&bVal, rType);  break;
             case  9: bVal = bPrintSingleJobs     ; pValues[nProp].setValue(&bVal, rType);  break;
             case 10: pValues[nProp] <<= sFaxName;  break;
             case 11: bVal = bPaperFromSetup     ; pValues[nProp].setValue(&bVal, rType);  break;
             case 12: bVal = bPrintDraw           ; pValues[nProp].setValue(&bVal, rType);  break;
-            case 13: bVal = bPrintLeftPage       ; pValues[nProp].setValue(&bVal, rType);  break;
-            case 14: bVal = bPrintRightPage     ; pValues[nProp].setValue(&bVal, rType);  break;
+            case 13: bVal = bPrintLeftPages      ; pValues[nProp].setValue(&bVal, rType);  break;
+            case 14: bVal = bPrintRightPages    ; pValues[nProp].setValue(&bVal, rType);  break;
             case 15: bVal = bPrintEmptyPages    ; pValues[nProp].setValue(&bVal, rType);  break;
             case 16: bVal = bPrintTextPlaceholder; pValues[nProp].setValue(&bVal, rType);  break;
             case 17: bVal = bPrintHiddenText; pValues[nProp].setValue(&bVal, rType);  break;
         }
     }
+
+    // currently there is just one checkbox for print drawings and print graphics
+    // In the UI. (File/Print dialog and Tools/Options/.../Print)
+    // And since print graphics is the only available in Writer and WrtierWeb ...
+    bPrintDraw = bPrintGraphic;
+
     PutProperties(aNames, aValues);
 }