sw: prefix members of SwPrintData

Change-Id: I3e6e18a0bc224ba6d201b476d77e82571ef2ee69

8 files changed, 212 insertions, 212 deletions

diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index adac3de94ac2..52710893ffdc 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -61,49 +61,49 @@ class SwPrintData
 
 public:
 
-    bool bPrintGraphic, bPrintTable, bPrintDraw, bPrintControl, bPrintPageBackground,
-             bPrintBlackFont,
+    bool m_bPrintGraphic, m_bPrintTable, m_bPrintDraw, m_bPrintControl, m_bPrintPageBackground,
+             m_bPrintBlackFont,
              //#i81434# - printing of hidden text
-             bPrintHiddenText, bPrintTextPlaceholder,
-             bPrintLeftPages, bPrintRightPages, bPrintReverse, bPrintProspect,
-             bPrintProspectRTL,
-             bPrintSingleJobs, bPaperFromSetup,
+             m_bPrintHiddenText, m_bPrintTextPlaceholder,
+             m_bPrintLeftPages, m_bPrintRightPages, m_bPrintReverse, m_bPrintProspect,
+             m_bPrintProspectRTL,
+             m_bPrintSingleJobs, m_bPaperFromSetup,
              /// Print empty pages
-             bPrintEmptyPages,
+             m_bPrintEmptyPages,
 
              /// #i56195# no field update while printing mail merge documents
-             bUpdateFieldsInPrinting,
-             bModified;
+             m_bUpdateFieldsInPrinting,
+             m_bModified;
 
-    SwPostItMode    nPrintPostIts;
-    OUString       sFaxName;
+    SwPostItMode    m_nPrintPostIts;
+    OUString       m_sFaxName;
 
     SwPrintData()
     {
         m_pPrintUIOptions       = nullptr;
         m_pRenderData        = nullptr;
 
-        bPrintGraphic           =
-        bPrintTable             =
-        bPrintDraw              =
-        bPrintControl           =
-        bPrintLeftPages         =
-        bPrintRightPages        =
-        bPrintPageBackground    =
-        bPrintEmptyPages        =
-        bUpdateFieldsInPrinting = true;
-
-        bPaperFromSetup         =
-        bPrintReverse           =
-        bPrintProspect          =
-        bPrintProspectRTL       =
-        bPrintSingleJobs        =
-        bModified               =
-        bPrintBlackFont         =
-        bPrintHiddenText        =
-        bPrintTextPlaceholder   = false;
-
-        nPrintPostIts           = SwPostItMode::NONE;
+        m_bPrintGraphic           =
+        m_bPrintTable             =
+        m_bPrintDraw              =
+        m_bPrintControl           =
+        m_bPrintLeftPages         =
+        m_bPrintRightPages        =
+        m_bPrintPageBackground    =
+        m_bPrintEmptyPages        =
+        m_bUpdateFieldsInPrinting = true;
+
+        m_bPaperFromSetup         =
+        m_bPrintReverse           =
+        m_bPrintProspect          =
+        m_bPrintProspectRTL       =
+        m_bPrintSingleJobs        =
+        m_bModified               =
+        m_bPrintBlackFont         =
+        m_bPrintHiddenText        =
+        m_bPrintTextPlaceholder   = false;
+
+        m_nPrintPostIts           = SwPostItMode::NONE;
     }
 
     virtual ~SwPrintData() {}
@@ -111,25 +111,25 @@ public:
     bool operator==(const SwPrintData& rData)const
     {
         return
-        bPrintGraphic       ==   rData.bPrintGraphic        &&
-        bPrintTable         ==   rData.bPrintTable          &&
-        bPrintDraw          ==   rData.bPrintDraw           &&
-        bPrintControl       ==   rData.bPrintControl        &&
-        bPrintPageBackground==   rData.bPrintPageBackground &&
-        bPrintBlackFont     ==   rData.bPrintBlackFont      &&
-        bPrintLeftPages     ==   rData.bPrintLeftPages      &&
-        bPrintRightPages    ==   rData.bPrintRightPages     &&
-        bPrintReverse       ==   rData.bPrintReverse        &&
-        bPrintProspect      ==   rData.bPrintProspect       &&
-        bPrintProspectRTL   ==   rData.bPrintProspectRTL    &&
-        bPrintSingleJobs    ==   rData.bPrintSingleJobs     &&
-        bPaperFromSetup     ==   rData.bPaperFromSetup      &&
-        bPrintEmptyPages    ==   rData.bPrintEmptyPages     &&
-        bUpdateFieldsInPrinting == rData.bUpdateFieldsInPrinting &&
-        nPrintPostIts       ==   rData.nPrintPostIts        &&
-        sFaxName            ==   rData.sFaxName             &&
-        bPrintHiddenText    ==   rData.bPrintHiddenText     &&
-        bPrintTextPlaceholder   ==   rData.bPrintTextPlaceholder;
+        m_bPrintGraphic       ==   rData.m_bPrintGraphic        &&
+        m_bPrintTable         ==   rData.m_bPrintTable          &&
+        m_bPrintDraw          ==   rData.m_bPrintDraw           &&
+        m_bPrintControl       ==   rData.m_bPrintControl        &&
+        m_bPrintPageBackground==   rData.m_bPrintPageBackground &&
+        m_bPrintBlackFont     ==   rData.m_bPrintBlackFont      &&
+        m_bPrintLeftPages     ==   rData.m_bPrintLeftPages      &&
+        m_bPrintRightPages    ==   rData.m_bPrintRightPages     &&
+        m_bPrintReverse       ==   rData.m_bPrintReverse        &&
+        m_bPrintProspect      ==   rData.m_bPrintProspect       &&
+        m_bPrintProspectRTL   ==   rData.m_bPrintProspectRTL    &&
+        m_bPrintSingleJobs    ==   rData.m_bPrintSingleJobs     &&
+        m_bPaperFromSetup     ==   rData.m_bPaperFromSetup      &&
+        m_bPrintEmptyPages    ==   rData.m_bPrintEmptyPages     &&
+        m_bUpdateFieldsInPrinting == rData.m_bUpdateFieldsInPrinting &&
+        m_nPrintPostIts       ==   rData.m_nPrintPostIts        &&
+        m_sFaxName            ==   rData.m_sFaxName             &&
+        m_bPrintHiddenText    ==   rData.m_bPrintHiddenText     &&
+        m_bPrintTextPlaceholder   ==   rData.m_bPrintTextPlaceholder;
     }
 
     /** Note: in the context where this class is used the pointers should always be valid
@@ -138,45 +138,45 @@ public:
     void  SetPrintUIOptions( const SwPrintUIOptions *pOpt )     { m_pPrintUIOptions = pOpt; }
     void  SetRenderData( const SwRenderData *pData )            { m_pRenderData = pData; }
 
-    bool IsPrintGraphic() const             { return bPrintGraphic; }
-    bool IsPrintTable() const               { return bPrintTable; }
-    bool IsPrintDraw() const                { return bPrintDraw; }
-    bool IsPrintControl() const             { return bPrintControl; }
-    bool IsPrintLeftPage() const            { return bPrintLeftPages; }
-    bool IsPrintRightPage() const           { return bPrintRightPages; }
-    bool IsPrintReverse() const             { return bPrintReverse; }
-    bool IsPaperFromSetup() const           { return bPaperFromSetup; }
-    bool IsPrintEmptyPages() const          { return bPrintEmptyPages; }
-    bool IsPrintProspect() const            { return bPrintProspect; }
-    bool IsPrintProspectRTL() const         { return bPrintProspectRTL; }
-    bool IsPrintPageBackground() const      { return bPrintPageBackground; }
-    bool IsPrintBlackFont() const           { return bPrintBlackFont; }
-    bool IsPrintSingleJobs() const          { return bPrintSingleJobs; }
-    SwPostItMode GetPrintPostIts() const           { return nPrintPostIts; }
-    const OUString GetFaxName() const      { return sFaxName; }
-    bool IsPrintHiddenText() const          { return bPrintHiddenText; }
-    bool IsPrintTextPlaceholder() const     { return bPrintTextPlaceholder; }
-
-    void SetPrintGraphic( bool b )              { doSetModified(); bPrintGraphic = b; }
-    void SetPrintTable( bool b )                { doSetModified(); bPrintTable = b; }
-    void SetPrintDraw( bool b )                 { doSetModified(); bPrintDraw = b; }
-    void SetPrintControl( bool b )              { doSetModified(); bPrintControl = b; }
-    void SetPrintLeftPage( bool b )             { doSetModified(); bPrintLeftPages = b; }
-    void SetPrintRightPage( bool b )            { doSetModified(); bPrintRightPages = b; }
-    void SetPrintReverse( bool b )              { doSetModified(); bPrintReverse = b; }
-    void SetPaperFromSetup( bool b )            { doSetModified(); bPaperFromSetup = b; }
-    void SetPrintEmptyPages( bool b )           { doSetModified(); bPrintEmptyPages = b; }
-    void SetPrintPostIts( SwPostItMode n )      { doSetModified(); nPrintPostIts = n; }
-    void SetPrintProspect( bool b )             { doSetModified(); bPrintProspect = b; }
-    void SetPrintProspect_RTL( bool b )         { doSetModified(); bPrintProspectRTL = b; }
-    void SetPrintPageBackground( bool b )       { doSetModified(); bPrintPageBackground = b; }
-    void SetPrintBlackFont( bool b )            { doSetModified(); bPrintBlackFont = b; }
-    void SetPrintSingleJobs( bool b )           { doSetModified(); bPrintSingleJobs = b; }
-    void SetFaxName( const OUString& rSet )     { sFaxName = rSet; }
-    void SetPrintHiddenText( bool b )           { doSetModified(); bPrintHiddenText = b; }
-    void SetPrintTextPlaceholder( bool b )      { doSetModified(); bPrintTextPlaceholder = b; }
-
-    virtual void doSetModified () { bModified = true;}
+    bool IsPrintGraphic() const             { return m_bPrintGraphic; }
+    bool IsPrintTable() const               { return m_bPrintTable; }
+    bool IsPrintDraw() const                { return m_bPrintDraw; }
+    bool IsPrintControl() const             { return m_bPrintControl; }
+    bool IsPrintLeftPage() const            { return m_bPrintLeftPages; }
+    bool IsPrintRightPage() const           { return m_bPrintRightPages; }
+    bool IsPrintReverse() const             { return m_bPrintReverse; }
+    bool IsPaperFromSetup() const           { return m_bPaperFromSetup; }
+    bool IsPrintEmptyPages() const          { return m_bPrintEmptyPages; }
+    bool IsPrintProspect() const            { return m_bPrintProspect; }
+    bool IsPrintProspectRTL() const         { return m_bPrintProspectRTL; }
+    bool IsPrintPageBackground() const      { return m_bPrintPageBackground; }
+    bool IsPrintBlackFont() const           { return m_bPrintBlackFont; }
+    bool IsPrintSingleJobs() const          { return m_bPrintSingleJobs; }
+    SwPostItMode GetPrintPostIts() const           { return m_nPrintPostIts; }
+    const OUString GetFaxName() const      { return m_sFaxName; }
+    bool IsPrintHiddenText() const          { return m_bPrintHiddenText; }
+    bool IsPrintTextPlaceholder() const     { return m_bPrintTextPlaceholder; }
+
+    void SetPrintGraphic( bool b )              { doSetModified(); m_bPrintGraphic = b; }
+    void SetPrintTable( bool b )                { doSetModified(); m_bPrintTable = b; }
+    void SetPrintDraw( bool b )                 { doSetModified(); m_bPrintDraw = b; }
+    void SetPrintControl( bool b )              { doSetModified(); m_bPrintControl = b; }
+    void SetPrintLeftPage( bool b )             { doSetModified(); m_bPrintLeftPages = b; }
+    void SetPrintRightPage( bool b )            { doSetModified(); m_bPrintRightPages = b; }
+    void SetPrintReverse( bool b )              { doSetModified(); m_bPrintReverse = b; }
+    void SetPaperFromSetup( bool b )            { doSetModified(); m_bPaperFromSetup = b; }
+    void SetPrintEmptyPages( bool b )           { doSetModified(); m_bPrintEmptyPages = b; }
+    void SetPrintPostIts( SwPostItMode n )      { doSetModified(); m_nPrintPostIts = n; }
+    void SetPrintProspect( bool b )             { doSetModified(); m_bPrintProspect = b; }
+    void SetPrintProspect_RTL( bool b )         { doSetModified(); m_bPrintProspectRTL = b; }
+    void SetPrintPageBackground( bool b )       { doSetModified(); m_bPrintPageBackground = b; }
+    void SetPrintBlackFont( bool b )            { doSetModified(); m_bPrintBlackFont = b; }
+    void SetPrintSingleJobs( bool b )           { doSetModified(); m_bPrintSingleJobs = b; }
+    void SetFaxName( const OUString& rSet )     { m_sFaxName = rSet; }
+    void SetPrintHiddenText( bool b )           { doSetModified(); m_bPrintHiddenText = b; }
+    void SetPrintTextPlaceholder( bool b )      { doSetModified(); m_bPrintTextPlaceholder = b; }
+
+    virtual void doSetModified () { m_bModified = true;}
 };
 
 class SwPrintUIOptions : public vcl::PrinterOptionsHelper
@@ -190,15 +190,15 @@ public:
 
     bool processPropertiesAndCheckFormat( const css::uno::Sequence< css::beans::PropertyValue >& i_rNewProp );
 
-    bool IsPrintFormControls() const            { return getBoolValue( "PrintControls",        m_rDefaultPrintData.bPrintControl ); }
-    bool IsPrintPageBackground() const          { return getBoolValue( "PrintPageBackground",  m_rDefaultPrintData.bPrintPageBackground ); }
-    bool IsPrintProspect() const                { return getBoolValue( "PrintProspect",        m_rDefaultPrintData.bPrintProspect ); }
-    bool IsPrintProspectRTL() const             { return getIntValue( "PrintProspectRTL",      m_rDefaultPrintData.bPrintProspectRTL ? 1 : 0 ) != 0; }
-    bool IsPrintTextPlaceholders() const        { return getBoolValue( "PrintTextPlaceholder", m_rDefaultPrintData.bPrintTextPlaceholder ); }
-    bool IsPrintHiddenText() const              { return getBoolValue( "PrintHiddenText",      m_rDefaultPrintData.bPrintHiddenText ); }
-    bool IsPrintWithBlackTextColor() const      { return getBoolValue( "PrintBlackFonts",      m_rDefaultPrintData.bPrintBlackFont ); }
-    SwPostItMode GetPrintPostItsType() const       { return static_cast< SwPostItMode >(getIntValue( "PrintAnnotationMode", static_cast<sal_uInt16>(m_rDefaultPrintData.nPrintPostIts) )); }
-    bool IsPaperFromSetup() const               { return getBoolValue( "PrintPaperFromSetup",  m_rDefaultPrintData.bPaperFromSetup ); }
+    bool IsPrintFormControls() const            { return getBoolValue( "PrintControls",        m_rDefaultPrintData.m_bPrintControl ); }
+    bool IsPrintPageBackground() const          { return getBoolValue( "PrintPageBackground",  m_rDefaultPrintData.m_bPrintPageBackground ); }
+    bool IsPrintProspect() const                { return getBoolValue( "PrintProspect",        m_rDefaultPrintData.m_bPrintProspect ); }
+    bool IsPrintProspectRTL() const             { return getIntValue( "PrintProspectRTL",      m_rDefaultPrintData.m_bPrintProspectRTL ? 1 : 0 ) != 0; }
+    bool IsPrintTextPlaceholders() const        { return getBoolValue( "PrintTextPlaceholder", m_rDefaultPrintData.m_bPrintTextPlaceholder ); }
+    bool IsPrintHiddenText() const              { return getBoolValue( "PrintHiddenText",      m_rDefaultPrintData.m_bPrintHiddenText ); }
+    bool IsPrintWithBlackTextColor() const      { return getBoolValue( "PrintBlackFonts",      m_rDefaultPrintData.m_bPrintBlackFont ); }
+    SwPostItMode GetPrintPostItsType() const       { return static_cast< SwPostItMode >(getIntValue( "PrintAnnotationMode", static_cast<sal_uInt16>(m_rDefaultPrintData.m_nPrintPostIts) )); }
+    bool IsPaperFromSetup() const               { return getBoolValue( "PrintPaperFromSetup",  m_rDefaultPrintData.m_bPaperFromSetup ); }
 
     bool IsPrintLeftPages() const;
     bool IsPrintRightPages() const;
diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx
index 52c83b37be97..0e4004ba2449 100644
--- a/sw/inc/prtopt.hxx
+++ b/sw/inc/prtopt.hxx
@@ -36,7 +36,7 @@ public:
     virtual ~SwPrintOptions();
 
     virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
-    virtual void            doSetModified( ) override { bModified = true; SetModified();}
+    virtual void            doSetModified( ) override { m_bModified = true; SetModified();}
 
     SwPrintOptions& operator=(const SwPrintData& rData)
     {
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index cabd06f8b901..9d0ab63a1deb 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -124,25 +124,25 @@ void SwRenderData::MakeSwPrtOptions(
     ::sw::InitPrintOptionsFromApplication(rOptions, bWeb);
 
     // get print options to use from provided properties
-    rOptions.bPrintGraphic          = pOpt->IsPrintGraphics();
-    rOptions.bPrintTable            = true; // for now it was decided that tables should always be printed
-    rOptions.bPrintDraw             = pOpt->IsPrintDrawings();
-    rOptions.bPrintControl          = pOpt->IsPrintFormControls();
-    rOptions.bPrintLeftPages        = pOpt->IsPrintLeftPages();
-    rOptions.bPrintRightPages       = pOpt->IsPrintRightPages();
-    rOptions.bPrintPageBackground   = pOpt->IsPrintPageBackground();
-    rOptions.bPrintEmptyPages       = pOpt->IsPrintEmptyPages( bIsPDFExport );
+    rOptions.m_bPrintGraphic          = pOpt->IsPrintGraphics();
+    rOptions.m_bPrintTable            = true; // for now it was decided that tables should always be printed
+    rOptions.m_bPrintDraw             = pOpt->IsPrintDrawings();
+    rOptions.m_bPrintControl          = pOpt->IsPrintFormControls();
+    rOptions.m_bPrintLeftPages        = pOpt->IsPrintLeftPages();
+    rOptions.m_bPrintRightPages       = pOpt->IsPrintRightPages();
+    rOptions.m_bPrintPageBackground   = pOpt->IsPrintPageBackground();
+    rOptions.m_bPrintEmptyPages       = pOpt->IsPrintEmptyPages( bIsPDFExport );
     // bUpdateFieldsInPrinting  <-- not set here; mail merge only
-    rOptions.bPaperFromSetup        = pOpt->IsPaperFromSetup();
-    rOptions.bPrintReverse          = false; /*handled by print dialog now*/
-    rOptions.bPrintProspect         = pOpt->IsPrintProspect();
-    rOptions.bPrintProspectRTL      = pOpt->IsPrintProspectRTL();
+    rOptions.m_bPaperFromSetup        = pOpt->IsPaperFromSetup();
+    rOptions.m_bPrintReverse          = false; /*handled by print dialog now*/
+    rOptions.m_bPrintProspect         = pOpt->IsPrintProspect();
+    rOptions.m_bPrintProspectRTL      = pOpt->IsPrintProspectRTL();
     // bPrintSingleJobs         <-- not set here; mail merge and or configuration
     // bModified                <-- not set here; mail merge only
-    rOptions.bPrintBlackFont        = pOpt->IsPrintWithBlackTextColor();
-    rOptions.bPrintHiddenText       = pOpt->IsPrintHiddenText();
-    rOptions.bPrintTextPlaceholder  = pOpt->IsPrintTextPlaceholders();
-    rOptions.nPrintPostIts          = pOpt->GetPrintPostItsType();
+    rOptions.m_bPrintBlackFont        = pOpt->IsPrintWithBlackTextColor();
+    rOptions.m_bPrintHiddenText       = pOpt->IsPrintHiddenText();
+    rOptions.m_bPrintTextPlaceholder  = pOpt->IsPrintTextPlaceholders();
+    rOptions.m_nPrintPostIts          = pOpt->GetPrintPostItsType();
 
     //! needs to be set after MakeOptions since the assignment operation in that
     //! function will destroy the pointers
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index f42c0deb51a5..4c0b4fd02b21 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -682,12 +682,12 @@ SwDrawViewSave::~SwDrawViewSave()
 // OD 09.01.2003 #i6467# - method also called for page preview
 void SwViewShell::PrepareForPrint( const SwPrintData &rOptions )
  {
-    mpOpt->SetGraphic  ( rOptions.bPrintGraphic );
-    mpOpt->SetTable    ( rOptions.bPrintTable );
-    mpOpt->SetDraw     ( rOptions.bPrintDraw  );
-    mpOpt->SetControl  ( rOptions.bPrintControl );
-    mpOpt->SetPageBack ( rOptions.bPrintPageBackground );
-    mpOpt->SetBlackFont( rOptions.bPrintBlackFont );
+    mpOpt->SetGraphic  ( rOptions.m_bPrintGraphic );
+    mpOpt->SetTable    ( rOptions.m_bPrintTable );
+    mpOpt->SetDraw     ( rOptions.m_bPrintDraw  );
+    mpOpt->SetControl  ( rOptions.m_bPrintControl );
+    mpOpt->SetPageBack ( rOptions.m_bPrintPageBackground );
+    mpOpt->SetBlackFont( rOptions.m_bPrintBlackFont );
 
     if ( HasDrawView() )
     {
@@ -695,11 +695,11 @@ void SwViewShell::PrepareForPrint( const SwPrintData &rOptions )
         // OD 09.01.2003 #i6467# - consider, if view shell belongs to page preview
         if ( !IsPreview() )
         {
-            pDrawView->SetLayerPrintable( "Controls", rOptions.bPrintControl );
+            pDrawView->SetLayerPrintable( "Controls", rOptions.m_bPrintControl );
         }
         else
         {
-            pDrawView->SetLayerVisible( "Controls", rOptions.bPrintControl );
+            pDrawView->SetLayerVisible( "Controls", rOptions.m_bPrintControl );
         }
     }
 }
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 5ba760542653..34a6ec15af79 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -408,37 +408,37 @@ bool    SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
     if ( bAttrModified )
     {
         SwAddPrinterItem aAddPrinterAttr (FN_PARAM_ADDPRINTER);
-        aAddPrinterAttr.bPrintGraphic   = m_pGrfCB->IsChecked();
-        aAddPrinterAttr.bPrintTable     = true; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
-        aAddPrinterAttr.bPrintDraw      = m_pGrfCB->IsChecked(); // UI merged with m_pGrfCB in CWS printerpullgpages
-        aAddPrinterAttr.bPrintControl   = m_pCtrlFieldCB->IsChecked();
-        aAddPrinterAttr.bPrintPageBackground = m_pBackgroundCB->IsChecked();
-        aAddPrinterAttr.bPrintBlackFont = m_pBlackFontCB->IsChecked();
-        aAddPrinterAttr.bPrintHiddenText = m_pPrintHiddenTextCB->IsChecked();
-        aAddPrinterAttr.bPrintTextPlaceholder = m_pPrintTextPlaceholderCB->IsChecked();
-
-        aAddPrinterAttr.bPrintLeftPages     = m_pLeftPageCB->IsChecked();
-        aAddPrinterAttr.bPrintRightPages    = m_pRightPageCB->IsChecked();
-        aAddPrinterAttr.bPrintReverse       = false; // handled by vcl itself since CWS printerpullpages /*aReverseCB.IsChecked()*/;
-        aAddPrinterAttr.bPrintProspect      = m_pProspectCB->IsChecked();
-        aAddPrinterAttr.bPrintProspectRTL   = m_pProspectCB_RTL->IsChecked();
-        aAddPrinterAttr.bPaperFromSetup     = m_pPaperFromSetupCB->IsChecked();
-        aAddPrinterAttr.bPrintEmptyPages    = m_pPrintEmptyPagesCB->IsChecked();
-        aAddPrinterAttr.bPrintSingleJobs    = true; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/;
-
-        if (m_pNoRB->IsChecked())  aAddPrinterAttr.nPrintPostIts =
+        aAddPrinterAttr.m_bPrintGraphic   = m_pGrfCB->IsChecked();
+        aAddPrinterAttr.m_bPrintTable     = true; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
+        aAddPrinterAttr.m_bPrintDraw      = m_pGrfCB->IsChecked(); // UI merged with m_pGrfCB in CWS printerpullgpages
+        aAddPrinterAttr.m_bPrintControl   = m_pCtrlFieldCB->IsChecked();
+        aAddPrinterAttr.m_bPrintPageBackground = m_pBackgroundCB->IsChecked();
+        aAddPrinterAttr.m_bPrintBlackFont = m_pBlackFontCB->IsChecked();
+        aAddPrinterAttr.m_bPrintHiddenText = m_pPrintHiddenTextCB->IsChecked();
+        aAddPrinterAttr.m_bPrintTextPlaceholder = m_pPrintTextPlaceholderCB->IsChecked();
+
+        aAddPrinterAttr.m_bPrintLeftPages     = m_pLeftPageCB->IsChecked();
+        aAddPrinterAttr.m_bPrintRightPages    = m_pRightPageCB->IsChecked();
+        aAddPrinterAttr.m_bPrintReverse       = false; // handled by vcl itself since CWS printerpullpages /*aReverseCB.IsChecked()*/;
+        aAddPrinterAttr.m_bPrintProspect      = m_pProspectCB->IsChecked();
+        aAddPrinterAttr.m_bPrintProspectRTL   = m_pProspectCB_RTL->IsChecked();
+        aAddPrinterAttr.m_bPaperFromSetup     = m_pPaperFromSetupCB->IsChecked();
+        aAddPrinterAttr.m_bPrintEmptyPages    = m_pPrintEmptyPagesCB->IsChecked();
+        aAddPrinterAttr.m_bPrintSingleJobs    = true; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/;
+
+        if (m_pNoRB->IsChecked())  aAddPrinterAttr.m_nPrintPostIts =
                                                         SwPostItMode::NONE;
-        if (m_pOnlyRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
+        if (m_pOnlyRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
                                                         SwPostItMode::Only;
-        if (m_pEndRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
+        if (m_pEndRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
                                                         SwPostItMode::EndDoc;
-        if (m_pEndPageRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
+        if (m_pEndPageRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
                                                         SwPostItMode::EndPage;
-        if (m_pInMarginsRB->IsChecked()) aAddPrinterAttr.nPrintPostIts =
+        if (m_pInMarginsRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
                                                         SwPostItMode::InMargins;
 
         const OUString sFax = m_pFaxLB->GetSelectEntry();
-        aAddPrinterAttr.sFaxName = sNone == sFax ? aEmptyOUStr : sFax;
+        aAddPrinterAttr.m_sFaxName = sNone == sFax ? aEmptyOUStr : sFax;
         rCoreSet->Put(aAddPrinterAttr);
     }
     return bAttrModified;
@@ -452,25 +452,25 @@ void    SwAddPrinterTabPage::Reset( const SfxItemSet*  )
     if( SfxItemState::SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , false,
                                     reinterpret_cast<const SfxPoolItem**>(&pAddPrinterAttr) ))
     {
-        m_pGrfCB->Check(pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw);
-        m_pCtrlFieldCB->Check(       pAddPrinterAttr->bPrintControl);
-        m_pBackgroundCB->Check(    pAddPrinterAttr->bPrintPageBackground);
-        m_pBlackFontCB->Check(     pAddPrinterAttr->bPrintBlackFont);
-        m_pPrintHiddenTextCB->Check( pAddPrinterAttr->bPrintHiddenText);
-        m_pPrintTextPlaceholderCB->Check(pAddPrinterAttr->bPrintTextPlaceholder);
-        m_pLeftPageCB->Check(      pAddPrinterAttr->bPrintLeftPages);
-        m_pRightPageCB->Check(     pAddPrinterAttr->bPrintRightPages);
-        m_pPaperFromSetupCB->Check(pAddPrinterAttr->bPaperFromSetup);
-        m_pPrintEmptyPagesCB->Check(pAddPrinterAttr->bPrintEmptyPages);
-        m_pProspectCB->Check(      pAddPrinterAttr->bPrintProspect);
-        m_pProspectCB_RTL->Check(      pAddPrinterAttr->bPrintProspectRTL);
-
-        m_pNoRB->Check (pAddPrinterAttr->nPrintPostIts== SwPostItMode::NONE ) ;
-        m_pOnlyRB->Check (pAddPrinterAttr->nPrintPostIts== SwPostItMode::Only ) ;
-        m_pEndRB->Check (pAddPrinterAttr->nPrintPostIts== SwPostItMode::EndDoc ) ;
-        m_pEndPageRB->Check (pAddPrinterAttr->nPrintPostIts== SwPostItMode::EndPage ) ;
-        m_pInMarginsRB->Check (pAddPrinterAttr->nPrintPostIts== SwPostItMode::InMargins ) ;
-        m_pFaxLB->SelectEntry( pAddPrinterAttr->sFaxName );
+        m_pGrfCB->Check(pAddPrinterAttr->m_bPrintGraphic || pAddPrinterAttr->m_bPrintDraw);
+        m_pCtrlFieldCB->Check(       pAddPrinterAttr->m_bPrintControl);
+        m_pBackgroundCB->Check(    pAddPrinterAttr->m_bPrintPageBackground);
+        m_pBlackFontCB->Check(     pAddPrinterAttr->m_bPrintBlackFont);
+        m_pPrintHiddenTextCB->Check( pAddPrinterAttr->m_bPrintHiddenText);
+        m_pPrintTextPlaceholderCB->Check(pAddPrinterAttr->m_bPrintTextPlaceholder);
+        m_pLeftPageCB->Check(      pAddPrinterAttr->m_bPrintLeftPages);
+        m_pRightPageCB->Check(     pAddPrinterAttr->m_bPrintRightPages);
+        m_pPaperFromSetupCB->Check(pAddPrinterAttr->m_bPaperFromSetup);
+        m_pPrintEmptyPagesCB->Check(pAddPrinterAttr->m_bPrintEmptyPages);
+        m_pProspectCB->Check(      pAddPrinterAttr->m_bPrintProspect);
+        m_pProspectCB_RTL->Check(      pAddPrinterAttr->m_bPrintProspectRTL);
+
+        m_pNoRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::NONE ) ;
+        m_pOnlyRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::Only ) ;
+        m_pEndRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndDoc ) ;
+        m_pEndPageRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndPage ) ;
+        m_pInMarginsRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::InMargins ) ;
+        m_pFaxLB->SelectEntry( pAddPrinterAttr->m_sFaxName );
     }
     if (m_pProspectCB->IsChecked())
     {
diff --git a/sw/source/uibase/config/prtopt.cxx b/sw/source/uibase/config/prtopt.cxx
index f182ca26001f..bb0af272cf07 100644
--- a/sw/source/uibase/config/prtopt.cxx
+++ b/sw/source/uibase/config/prtopt.cxx
@@ -67,11 +67,11 @@ SwPrintOptions::SwPrintOptions(bool bWeb) :
         ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree),
     bIsWeb(bWeb)
 {
-    bPrintPageBackground = !bWeb;
-    bPrintBlackFont = bWeb;
-    bPrintTextPlaceholder = bPrintHiddenText = false;
+    m_bPrintPageBackground = !bWeb;
+    m_bPrintBlackFont = bWeb;
+    m_bPrintTextPlaceholder = m_bPrintHiddenText = false;
     if (bWeb)
-        bPrintEmptyPages = false;
+        m_bPrintEmptyPages = false;
 
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues = GetProperties(aNames);
@@ -85,30 +85,30 @@ SwPrintOptions::SwPrintOptions(bool bWeb) :
             {
                 switch(nProp)
                 {
-                    case  0: bPrintGraphic      = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;
-                    case  1: bPrintTable            = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case  2: bPrintControl      = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case  3: bPrintPageBackground= *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case  4: bPrintBlackFont        = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case  0: m_bPrintGraphic      = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break;
+                    case  1: m_bPrintTable            = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case  2: m_bPrintControl      = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case  3: m_bPrintPageBackground= *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case  4: m_bPrintBlackFont        = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
                     case  5:
                     {
                         sal_Int32 nTmp = 0;
                         pValues[nProp] >>=  nTmp;
-                        nPrintPostIts = static_cast<SwPostItMode>(nTmp);
+                        m_nPrintPostIts = static_cast<SwPostItMode>(nTmp);
                     }
                     break;
-                    case  6: bPrintReverse      = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case  7: bPrintProspect      = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case  8: bPrintProspectRTL  = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case  9: bPrintSingleJobs   = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case 10: pValues[nProp] >>= sFaxName;  break;
-                    case 11: bPaperFromSetup    = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case 12: bPrintDraw         = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case 13: bPrintLeftPages    = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case 14: bPrintRightPages       = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case 15: bPrintEmptyPages       = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case 16: bPrintTextPlaceholder = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
-                    case 17: bPrintHiddenText = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case  6: m_bPrintReverse      = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case  7: m_bPrintProspect      = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case  8: m_bPrintProspectRTL  = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case  9: m_bPrintSingleJobs   = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case 10: pValues[nProp] >>= m_sFaxName;  break;
+                    case 11: m_bPaperFromSetup    = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case 12: m_bPrintDraw         = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case 13: m_bPrintLeftPages    = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case 14: m_bPrintRightPages       = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case 15: m_bPrintEmptyPages       = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case 16: m_bPrintTextPlaceholder = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
+                    case 17: m_bPrintHiddenText = *static_cast<sal_Bool const *>(pValues[nProp].getValue());  break;
                 }
             }
         }
@@ -118,7 +118,7 @@ SwPrintOptions::SwPrintOptions(bool bWeb) :
     // In the UI. (File/Print dialog and Tools/Options/.../Print)
     // And since print graphics is the only available in Writer and WrtierWeb ...
 
-    bPrintDraw = bPrintGraphic;
+    m_bPrintDraw = m_bPrintGraphic;
 }
 
 SwPrintOptions::~SwPrintOptions()
@@ -138,31 +138,31 @@ void SwPrintOptions::ImplCommit()
     {
         switch(nProp)
         {
-            case  0: pValues[nProp] <<= bPrintGraphic; break;
-            case  1: pValues[nProp] <<= bPrintTable; break;
-            case  2: pValues[nProp] <<= bPrintControl; break;
-            case  3: pValues[nProp] <<= bPrintPageBackground; break;
-            case  4: pValues[nProp] <<= bPrintBlackFont; break;
-            case  5: pValues[nProp] <<=  (sal_Int32)nPrintPostIts       ; break;
-            case  6: pValues[nProp] <<= bPrintReverse; break;
-            case  7: pValues[nProp] <<= bPrintProspect; break;
-            case  8: pValues[nProp] <<= bPrintProspectRTL; break;
-            case  9: pValues[nProp] <<= bPrintSingleJobs; break;
-            case 10: pValues[nProp] <<= sFaxName;  break;
-            case 11: pValues[nProp] <<= bPaperFromSetup; break;
-            case 12: pValues[nProp] <<= bPrintDraw; break;
-            case 13: pValues[nProp] <<= bPrintLeftPages; break;
-            case 14: pValues[nProp] <<= bPrintRightPages; break;
-            case 15: pValues[nProp] <<= bPrintEmptyPages; break;
-            case 16: pValues[nProp] <<= bPrintTextPlaceholder; break;
-            case 17: pValues[nProp] <<= bPrintHiddenText; break;
+            case  0: pValues[nProp] <<= m_bPrintGraphic; break;
+            case  1: pValues[nProp] <<= m_bPrintTable; break;
+            case  2: pValues[nProp] <<= m_bPrintControl; break;
+            case  3: pValues[nProp] <<= m_bPrintPageBackground; break;
+            case  4: pValues[nProp] <<= m_bPrintBlackFont; break;
+            case  5: pValues[nProp] <<=  (sal_Int32)m_nPrintPostIts       ; break;
+            case  6: pValues[nProp] <<= m_bPrintReverse; break;
+            case  7: pValues[nProp] <<= m_bPrintProspect; break;
+            case  8: pValues[nProp] <<= m_bPrintProspectRTL; break;
+            case  9: pValues[nProp] <<= m_bPrintSingleJobs; break;
+            case 10: pValues[nProp] <<= m_sFaxName;  break;
+            case 11: pValues[nProp] <<= m_bPaperFromSetup; break;
+            case 12: pValues[nProp] <<= m_bPrintDraw; break;
+            case 13: pValues[nProp] <<= m_bPrintLeftPages; break;
+            case 14: pValues[nProp] <<= m_bPrintRightPages; break;
+            case 15: pValues[nProp] <<= m_bPrintEmptyPages; break;
+            case 16: pValues[nProp] <<= m_bPrintTextPlaceholder; break;
+            case 17: pValues[nProp] <<= m_bPrintHiddenText; 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;
+    m_bPrintDraw = m_bPrintGraphic;
 
     PutProperties(aNames, aValues);
 }
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index 50928483b905..2677f98bf355 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -118,7 +118,7 @@ public:
 
     virtual bool         operator==( const SfxPoolItem& ) const override;
 
-    const OUString &GetFax() const              { return sFaxName; }
+    const OUString &GetFax() const              { return m_sFaxName; }
 };
 
 // Item for settings dialog, ShadowCursorPage
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 104a5d227d12..094e374d0e16 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -4266,7 +4266,7 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions)
     aRenderViewOptions.SetLineBreak( false );             // breaks (type 1)
     aRenderViewOptions.SetPageBreak( false );             // breaks (type 2)
     aRenderViewOptions.SetColumnBreak( false );           // breaks (type 3)
-    bool bVal = pPrtOptions && pPrtOptions->bPrintHiddenText;
+    bool bVal = pPrtOptions && pPrtOptions->m_bPrintHiddenText;
     if (bContainsHiddenChars)
         aRenderViewOptions.SetShowHiddenChar( bVal );     // hidden text
     if (bContainsHiddenFields)
@@ -4277,7 +4277,7 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions)
     if (bContainsPlaceHolders)
     {
         // should always be printed in PDF export!
-        bVal = !pPrtOptions || pPrtOptions->bPrintTextPlaceholder;
+        bVal = !pPrtOptions || pPrtOptions->m_bPrintTextPlaceholder;
         aRenderViewOptions.SetShowPlaceHolderFields( bVal );
     }