sw: prefix members of SwEnvItem

Change-Id: I8a56ad94978ff13428a4e25a9b5d70efa49e5005
Reviewed-on: https://gerrit.libreoffice.org/45304Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

sw/source/ui/envelp/envfmt.cxx

@@ -481,25 +481,25 @@ DeactivateRC SwEnvFormatPage::DeactivatePage(SfxItemSet* _pSet)
 
 void SwEnvFormatPage::FillItem(SwEnvItem& rItem)
 {
-    rItem.lAddrFromLeft = static_cast< sal_Int32 >(GetFieldVal(*m_pAddrLeftField));
-    rItem.lAddrFromTop  = static_cast< sal_Int32 >(GetFieldVal(*m_pAddrTopField ));
-    rItem.lSendFromLeft = static_cast< sal_Int32 >(GetFieldVal(*m_pSendLeftField));
-    rItem.lSendFromTop  = static_cast< sal_Int32 >(GetFieldVal(*m_pSendTopField ));
+    rItem.m_nAddrFromLeft = static_cast< sal_Int32 >(GetFieldVal(*m_pAddrLeftField));
+    rItem.m_nAddrFromTop  = static_cast< sal_Int32 >(GetFieldVal(*m_pAddrTopField ));
+    rItem.m_nSendFromLeft = static_cast< sal_Int32 >(GetFieldVal(*m_pSendLeftField));
+    rItem.m_nSendFromTop  = static_cast< sal_Int32 >(GetFieldVal(*m_pSendTopField ));
 
     const sal_uInt16 nPaper = aIDs[m_pSizeFormatBox->GetSelectedEntryPos()];
     if (nPaper == (sal_uInt16)PAPER_USER)
     {
         long lWVal = static_cast< long >(GetFieldVal(*m_pSizeWidthField ));
         long lHVal = static_cast< long >(GetFieldVal(*m_pSizeHeightField));
-        rItem.lWidth  = std::max(lWVal, lHVal);
-        rItem.lHeight = std::min(lWVal, lHVal);
+        rItem.m_nWidth  = std::max(lWVal, lHVal);
+        rItem.m_nHeight = std::min(lWVal, lHVal);
     }
     else
     {
         long lWVal = SvxPaperInfo::GetPaperSize((Paper)nPaper).Width ();
         long lHVal = SvxPaperInfo::GetPaperSize((Paper)nPaper).Height();
-        rItem.lWidth  = std::max(lWVal, lHVal);
-        rItem.lHeight = std::min(lWVal, lHVal);
+        rItem.m_nWidth  = std::max(lWVal, lHVal);
+        rItem.m_nHeight = std::min(lWVal, lHVal);
     }
 }
 
@@ -515,19 +515,19 @@ void SwEnvFormatPage::Reset(const SfxItemSet* rSet)
     const SwEnvItem& rItem = static_cast<const SwEnvItem&>( rSet->Get(FN_ENVELOP));
 
     Paper ePaper = SvxPaperInfo::GetSvxPaper(
-        Size( std::min(rItem.lWidth, rItem.lHeight),
-        std::max(rItem.lWidth, rItem.lHeight)), MapUnit::MapTwip);
+        Size( std::min(rItem.m_nWidth, rItem.m_nHeight),
+        std::max(rItem.m_nWidth, rItem.m_nHeight)), MapUnit::MapTwip);
     for (size_t i = 0; i < aIDs.size(); ++i)
         if (aIDs[i] == (sal_uInt16)ePaper)
             m_pSizeFormatBox->SelectEntryPos(static_cast<sal_Int32>(i));
 
     // Metric fields
-    SetFieldVal(*m_pAddrLeftField, rItem.lAddrFromLeft);
-    SetFieldVal(*m_pAddrTopField, rItem.lAddrFromTop );
-    SetFieldVal(*m_pSendLeftField, rItem.lSendFromLeft);
-    SetFieldVal(*m_pSendTopField, rItem.lSendFromTop );
-    SetFieldVal(*m_pSizeWidthField  , std::max(rItem.lWidth, rItem.lHeight));
-    SetFieldVal(*m_pSizeHeightField , std::min(rItem.lWidth, rItem.lHeight));
+    SetFieldVal(*m_pAddrLeftField, rItem.m_nAddrFromLeft);
+    SetFieldVal(*m_pAddrTopField, rItem.m_nAddrFromTop );
+    SetFieldVal(*m_pSendLeftField, rItem.m_nSendFromLeft);
+    SetFieldVal(*m_pSendTopField, rItem.m_nSendFromTop );
+    SetFieldVal(*m_pSizeWidthField  , std::max(rItem.m_nWidth, rItem.m_nHeight));
+    SetFieldVal(*m_pSizeHeightField , std::min(rItem.m_nWidth, rItem.m_nHeight));
     SetMinMax();
 
     DELETEZ(GetParentSwEnvDlg()->pSenderSet);

sw/source/ui/envelp/envlop1.cxx

@@ -73,8 +73,8 @@ void SwEnvPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectan
 
     const SwEnvItem& rItem = static_cast<SwEnvDlg*>(GetParentDialog())->aEnvItem;
 
-    const long nPageW = std::max(rItem.lWidth, rItem.lHeight);
-    const long nPageH = std::min(rItem.lWidth, rItem.lHeight);
+    const long nPageW = std::max(rItem.m_nWidth, rItem.m_nHeight);
+    const long nPageH = std::min(rItem.m_nWidth, rItem.m_nHeight);
 
     const double f = 0.8 * std::min(
         double(GetOutputSizePixel().Width()) / double(nPageW),
@@ -97,22 +97,22 @@ void SwEnvPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectan
     rRenderContext.DrawRect(tools::Rectangle(Point(nX, nY), Size(nW, nH)));
 
     // Sender
-    if (rItem.bSend)
+    if (rItem.m_bSend)
     {
-        const long nSendX = nX + static_cast<long>(f * rItem.lSendFromLeft);
-        const long nSendY = nY + static_cast<long>(f * rItem.lSendFromTop );
-        const long nSendW = static_cast<long>(f * (rItem.lAddrFromLeft - rItem.lSendFromLeft));
-        const long nSendH = static_cast<long>(f * (rItem.lAddrFromTop  - rItem.lSendFromTop  - 566));
+        const long nSendX = nX + static_cast<long>(f * rItem.m_nSendFromLeft);
+        const long nSendY = nY + static_cast<long>(f * rItem.m_nSendFromTop );
+        const long nSendW = static_cast<long>(f * (rItem.m_nAddrFromLeft - rItem.m_nSendFromLeft));
+        const long nSendH = static_cast<long>(f * (rItem.m_nAddrFromTop  - rItem.m_nSendFromTop  - 566));
         rRenderContext.SetFillColor(aMedium);
 
         rRenderContext.DrawRect(tools::Rectangle(Point(nSendX, nSendY), Size(nSendW, nSendH)));
     }
 
     // Addressee
-    const long nAddrX = nX + static_cast<long>(f * rItem.lAddrFromLeft);
-    const long nAddrY = nY + static_cast<long>(f * rItem.lAddrFromTop );
-    const long nAddrW = static_cast<long>(f * (nPageW - rItem.lAddrFromLeft - 566));
-    const long nAddrH = static_cast<long>(f * (nPageH - rItem.lAddrFromTop  - 566));
+    const long nAddrX = nX + static_cast<long>(f * rItem.m_nAddrFromLeft);
+    const long nAddrY = nY + static_cast<long>(f * rItem.m_nAddrFromTop );
+    const long nAddrW = static_cast<long>(f * (nPageW - rItem.m_nAddrFromLeft - 566));
+    const long nAddrH = static_cast<long>(f * (nPageH - rItem.m_nAddrFromTop  - 566));
     rRenderContext.SetFillColor(aMedium);
     rRenderContext.DrawRect(tools::Rectangle(Point(nAddrX, nAddrY), Size(nAddrW, nAddrH)));
 
@@ -281,7 +281,7 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl, Button*, void)
 IMPL_LINK_NOARG(SwEnvPage, SenderHdl, Button*, void)
 {
     const bool bEnable = m_pSenderBox->IsChecked();
-    GetParentSwEnvDlg()->aEnvItem.bSend = bEnable;
+    GetParentSwEnvDlg()->aEnvItem.m_bSend = bEnable;
     m_pSenderEdit->Enable(bEnable);
     if ( bEnable )
     {
@@ -339,9 +339,9 @@ DeactivateRC SwEnvPage::DeactivatePage(SfxItemSet* _pSet)
 
 void SwEnvPage::FillItem(SwEnvItem& rItem)
 {
-    rItem.aAddrText = m_pAddrEdit->GetText();
-    rItem.bSend     = m_pSenderBox->IsChecked();
-    rItem.aSendText = m_pSenderEdit->GetText();
+    rItem.m_aAddrText = m_pAddrEdit->GetText();
+    rItem.m_bSend     = m_pSenderBox->IsChecked();
+    rItem.m_aSendText = m_pSenderEdit->GetText();
 }
 
 bool SwEnvPage::FillItemSet(SfxItemSet* rSet)
@@ -354,9 +354,9 @@ bool SwEnvPage::FillItemSet(SfxItemSet* rSet)
 void SwEnvPage::Reset(const SfxItemSet* rSet)
 {
     SwEnvItem aItem = static_cast<const SwEnvItem&>( rSet->Get(FN_ENVELOP));
-    m_pAddrEdit->SetText(convertLineEnd(aItem.aAddrText, GetSystemLineEnd()));
-    m_pSenderEdit->SetText(convertLineEnd(aItem.aSendText, GetSystemLineEnd()));
-    m_pSenderBox->Check  (aItem.bSend);
+    m_pAddrEdit->SetText(convertLineEnd(aItem.m_aAddrText, GetSystemLineEnd()));
+    m_pSenderEdit->SetText(convertLineEnd(aItem.m_aSendText, GetSystemLineEnd()));
+    m_pSenderBox->Check  (aItem.m_bSend);
     m_pSenderBox->GetClickHdl().Call(m_pSenderBox);
 }
 

sw/source/ui/envelp/envprt.cxx

@@ -137,7 +137,7 @@ IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl, ToolBox *, void)
     {
         // GetCurItemId() == 0 is possible!
         const SwEnvItem& rItem = static_cast<const SwEnvItem&>( GetItemSet().Get(FN_ENVELOP) );
-        m_pAlignBox->CheckItem(m_aIds[rItem.eAlign]);
+        m_pAlignBox->CheckItem(m_aIds[rItem.m_eAlign]);
     }
 }
 
@@ -171,10 +171,10 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem)
         }
     }
 
-    rItem.eAlign          = (SwEnvAlign)nOrient;
-    rItem.bPrintFromAbove = m_pTopButton->IsChecked();
-    rItem.lShiftRight     = static_cast< sal_Int32 >(GetFieldVal(*m_pRightField));
-    rItem.lShiftDown      = static_cast< sal_Int32 >(GetFieldVal(*m_pDownField ));
+    rItem.m_eAlign          = (SwEnvAlign)nOrient;
+    rItem.m_bPrintFromAbove = m_pTopButton->IsChecked();
+    rItem.m_nShiftRight     = static_cast< sal_Int32 >(GetFieldVal(*m_pRightField));
+    rItem.m_nShiftDown      = static_cast< sal_Int32 >(GetFieldVal(*m_pDownField ));
 }
 
 bool SwEnvPrtPage::FillItemSet(SfxItemSet* rSet)
@@ -188,15 +188,15 @@ void SwEnvPrtPage::Reset(const SfxItemSet* rSet)
 {
     // Read item
     const SwEnvItem& rItem = static_cast<const SwEnvItem&>( rSet->Get(FN_ENVELOP) );
-    m_pAlignBox->CheckItem(m_aIds[rItem.eAlign]);
+    m_pAlignBox->CheckItem(m_aIds[rItem.m_eAlign]);
 
-    if (rItem.bPrintFromAbove)
+    if (rItem.m_bPrintFromAbove)
         m_pTopButton->Check();
     else
         m_pBottomButton->Check();
 
-    SetFieldVal(*m_pRightField, rItem.lShiftRight);
-    SetFieldVal(*m_pDownField , rItem.lShiftDown );
+    SetFieldVal(*m_pRightField, rItem.m_nShiftRight);
+    SetFieldVal(*m_pDownField , rItem.m_nShiftDown );
 
     ActivatePage(*rSet);
     ClickHdl(m_pTopButton);

sw/source/uibase/app/appenv.cxx

@@ -350,13 +350,13 @@ void SwModule::InsertEnv( SfxRequest& rReq )
         if ( aPaperSize.Width() > aPaperSize.Height() )
             Swap( aPaperSize );
 
-        long lLeft  = rItem.lShiftRight,
-             lUpper = rItem.lShiftDown;
+        long lLeft  = rItem.m_nShiftRight,
+             lUpper = rItem.m_nShiftDown;
 
-        sal_uInt16 nPageW = (sal_uInt16) std::max(rItem.lWidth, rItem.lHeight),
-               nPageH = (sal_uInt16) std::min(rItem.lWidth, rItem.lHeight);
+        sal_uInt16 nPageW = (sal_uInt16) std::max(rItem.m_nWidth, rItem.m_nHeight),
+               nPageH = (sal_uInt16) std::min(rItem.m_nWidth, rItem.m_nHeight);
 
-        switch (rItem.eAlign)
+        switch (rItem.m_eAlign)
         {
             case ENV_HOR_LEFT: break;
             case ENV_HOR_CNTR: lLeft  += std::max(0L, long(aPaperSize.Width() - nPageW)) / 2;
@@ -401,8 +401,8 @@ void SwModule::InsertEnv( SfxRequest& rReq )
             pDesc->SetFollow(pFollow);
 
         // Landscape
-        pDesc->SetLandscape( rItem.eAlign >= ENV_VER_LEFT &&
-                             rItem.eAlign <= ENV_VER_RGHT);
+        pDesc->SetLandscape( rItem.m_eAlign >= ENV_VER_LEFT &&
+                             rItem.m_eAlign <= ENV_VER_RGHT);
 
         // Apply page description
 
@@ -425,19 +425,19 @@ void SwModule::InsertEnv( SfxRequest& rReq )
         aMgr.SetLRSpace( 0L, 0L );
 
         // Sender
-        if (rItem.bSend)
+        if (rItem.m_bSend)
         {
             pSh->SttEndDoc(true);
             aMgr.InsertFlyFrame(RndStdIds::FLY_AT_PAGE,
-                Point(rItem.lSendFromLeft + lLeft, rItem.lSendFromTop  + lUpper),
-                Size (rItem.lAddrFromLeft - rItem.lSendFromLeft, 0));
+                Point(rItem.m_nSendFromLeft + lLeft, rItem.m_nSendFromTop  + lUpper),
+                Size (rItem.m_nAddrFromLeft - rItem.m_nSendFromLeft, 0));
 
             pSh->EnterSelFrameMode();
             pSh->SetFlyName(sSendMark);
             pSh->UnSelectFrame();
             pSh->LeaveSelFrameMode();
             pSh->SetTextFormatColl( pSend );
-            InsertLabEnvText( *pSh, aFieldMgr, rItem.aSendText );
+            InsertLabEnvText( *pSh, aFieldMgr, rItem.m_aSendText );
             aMgr.UpdateAttrMgr();
         }
 
@@ -445,14 +445,14 @@ void SwModule::InsertEnv( SfxRequest& rReq )
         pSh->SttEndDoc(true);
 
         aMgr.InsertFlyFrame(RndStdIds::FLY_AT_PAGE,
-            Point(rItem.lAddrFromLeft + lLeft, rItem.lAddrFromTop  + lUpper),
-            Size (nPageW - rItem.lAddrFromLeft - 566, 0));
+            Point(rItem.m_nAddrFromLeft + lLeft, rItem.m_nAddrFromTop  + lUpper),
+            Size (nPageW - rItem.m_nAddrFromLeft - 566, 0));
         pSh->EnterSelFrameMode();
         pSh->SetFlyName(sAddrMark);
         pSh->UnSelectFrame();
         pSh->LeaveSelFrameMode();
         pSh->SetTextFormatColl( pAddr );
-        InsertLabEnvText(*pSh, aFieldMgr, rItem.aAddrText);
+        InsertLabEnvText(*pSh, aFieldMgr, rItem.m_aAddrText);
 
         // Move Flys to the "old" pages
         if (!aFlyArr.empty())
@@ -472,7 +472,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
         {
             pFrame->GetFrame().Appear();
 
-            if ( rItem.aAddrText.indexOf('<') >= 0 )
+            if ( rItem.m_aAddrText.indexOf('<') >= 0 )
             {
                 static sal_uInt16 const aInva[] =
                                     {

sw/source/uibase/inc/envimg.hxx

@@ -39,19 +39,19 @@ class SW_DLLPUBLIC SwEnvItem : public SfxPoolItem
 {
 public:
 
-    OUString   aAddrText;       // text for receiver
-    bool        bSend;           // sender?
-    OUString   aSendText;       // text for sender
-    sal_Int32       lAddrFromLeft;   // left gap for receiver (twips)
-    sal_Int32       lAddrFromTop;    // upper gap for receiver (twips)
-    sal_Int32       lSendFromLeft;   // left gap for sender (twips)
-    sal_Int32       lSendFromTop;    // upper gap for sender (twips)
-    sal_Int32       lWidth;          // envelope's width (twips)
-    sal_Int32       lHeight;         // envelope's height (twips)
-    SwEnvAlign      eAlign;          // alignment at indent
-    bool        bPrintFromAbove; // print from above?
-    sal_Int32       lShiftRight;     // shift to right (twips)
-    sal_Int32       lShiftDown;      // shift down (twips)
+    OUString   m_aAddrText;       // text for receiver
+    bool        m_bSend;           // sender?
+    OUString   m_aSendText;       // text for sender
+    sal_Int32       m_nAddrFromLeft;   // left gap for receiver (twips)
+    sal_Int32       m_nAddrFromTop;    // upper gap for receiver (twips)
+    sal_Int32       m_nSendFromLeft;   // left gap for sender (twips)
+    sal_Int32       m_nSendFromTop;    // upper gap for sender (twips)
+    sal_Int32       m_nWidth;          // envelope's width (twips)
+    sal_Int32       m_nHeight;         // envelope's height (twips)
+    SwEnvAlign      m_eAlign;          // alignment at indent
+    bool        m_bPrintFromAbove; // print from above?
+    sal_Int32       m_nShiftRight;     // shift to right (twips)
+    sal_Int32       m_nShiftDown;      // shift down (twips)
 
     SwEnvItem();