sw: prefix members of SwLabItem

Change-Id: I8346c5f7a12deb5cbd4e4d9cc87ecadb30ebbeb4

1 files changed, 118 insertions, 118 deletions

diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index c346b7eba36c..f63b3651cca5 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -38,31 +38,31 @@
 
 void SwLabRec::SetFromItem( const SwLabItem& rItem )
 {
-    lHDist  = rItem.lHDist;
-    lVDist  = rItem.lVDist;
-    lWidth  = rItem.lWidth;
-    lHeight = rItem.lHeight;
-    lLeft   = rItem.lLeft;
-    lUpper  = rItem.lUpper;
-    nCols   = rItem.nCols;
-    nRows   = rItem.nRows;
-    lPWidth  = rItem.lPWidth;
-    lPHeight = rItem.lPHeight;
-    bCont   = rItem.bCont;
+    lHDist  = rItem.m_lHDist;
+    lVDist  = rItem.m_lVDist;
+    lWidth  = rItem.m_lWidth;
+    lHeight = rItem.m_lHeight;
+    lLeft   = rItem.m_lLeft;
+    lUpper  = rItem.m_lUpper;
+    nCols   = rItem.m_nCols;
+    nRows   = rItem.m_nRows;
+    lPWidth  = rItem.m_lPWidth;
+    lPHeight = rItem.m_lPHeight;
+    bCont   = rItem.m_bCont;
 }
 
 void SwLabRec::FillItem( SwLabItem& rItem ) const
 {
-    rItem.lHDist  = lHDist;
-    rItem.lVDist  = lVDist;
-    rItem.lWidth  = lWidth;
-    rItem.lHeight = lHeight;
-    rItem.lLeft   = lLeft;
-    rItem.lUpper  = lUpper;
-    rItem.nCols   = nCols;
-    rItem.lPWidth  = lPWidth;
-    rItem.lPHeight = lPHeight;
-    rItem.nRows   = nRows;
+    rItem.m_lHDist  = lHDist;
+    rItem.m_lVDist  = lVDist;
+    rItem.m_lWidth  = lWidth;
+    rItem.m_lHeight = lHeight;
+    rItem.m_lLeft   = lLeft;
+    rItem.m_lUpper  = lUpper;
+    rItem.m_nCols   = nCols;
+    rItem.m_lPWidth  = lPWidth;
+    rItem.m_lPHeight = lPHeight;
+    rItem.m_nRows   = nRows;
 }
 
 void SwLabDlg::_ReplaceGroup( const OUString &rMake )
@@ -155,7 +155,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
     for(size_t nMan = 0; nMan < rMan.size(); ++nMan)
     {
         aMakes.push_back(rMan[nMan]);
-        if ( rMan[nMan] == aItem.aLstMake )
+        if ( rMan[nMan] == aItem.m_aLstMake )
             nLstGroup = nMan;
     }
 
@@ -194,7 +194,7 @@ void SwLabDlg::GetLabItem(SwLabItem &rItem)
 
         // In rItem there are only settings defined by users.
         // Therefore get the real settings directly from Record
-        SwLabRec* pRec = GetRecord(rItem.aType, rItem.bCont);
+        SwLabRec* pRec = GetRecord(rItem.m_aType, rItem.m_bCont);
         pRec->FillItem( rItem );
     }
 }
@@ -283,7 +283,7 @@ SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet)
         OUString& rStr = GetParentSwLabDlg()->Makes()[i];
         m_pMakeBox->InsertEntry( rStr );
 
-        if ( rStr == aItem.aLstMake)
+        if ( rStr == aItem.m_aLstMake)
             nLstGroup = i;
     }
 
@@ -375,7 +375,7 @@ IMPL_LINK_NOARG_TYPED(SwLabPage, MakeHdl, ListBox&, void)
 
     const OUString aMake = m_pMakeBox->GetSelectEntry();
     GetParentSwLabDlg()->ReplaceGroup( aMake );
-    aItem.aLstMake = aMake;
+    aItem.m_aLstMake = aMake;
 
     const bool   bCont    = m_pContButton->IsChecked();
     const size_t nCount   = GetParentSwLabDlg()->Recs().size();
@@ -403,7 +403,7 @@ IMPL_LINK_NOARG_TYPED(SwLabPage, MakeHdl, ListBox&, void)
         if(bInsert)
         {
             GetParentSwLabDlg()->TypeIds().push_back(i);
-            if ( !nLstType && aType == aItem.aLstType )
+            if ( !nLstType && aType == aItem.m_aLstType )
                 nLstType = GetParentSwLabDlg()->TypeIds().size();
         }
     }
@@ -412,7 +412,7 @@ IMPL_LINK_NOARG_TYPED(SwLabPage, MakeHdl, ListBox&, void)
         m_pTypeBox->InsertEntry(m_pHiddenSortTypeBox->GetEntry(nEntry));
     }
     if (nLstType)
-        m_pTypeBox->SelectEntry(aItem.aLstType);
+        m_pTypeBox->SelectEntry(aItem.m_aLstType);
     else
         m_pTypeBox->SelectEntryPos(0);
     m_pTypeBox->GetSelectHdl().Call(*m_pTypeBox);
@@ -421,7 +421,7 @@ IMPL_LINK_NOARG_TYPED(SwLabPage, MakeHdl, ListBox&, void)
 IMPL_LINK_NOARG_TYPED(SwLabPage, TypeHdl, ListBox&, void)
 {
     DisplayFormat();
-    aItem.aType = m_pTypeBox->GetSelectEntry();
+    aItem.m_aType = m_pTypeBox->GetSelectEntry();
 }
 
 void SwLabPage::DisplayFormat()
@@ -434,7 +434,7 @@ void SwLabPage::DisplayFormat()
     aField->SetMax         (LONG_MAX);
 
     SwLabRec* pRec = GetSelectedEntryPos();
-    aItem.aLstType = pRec->aType;
+    aItem.m_aLstType = pRec->aType;
     SETFLDVAL(*aField.get(), pRec->lWidth);
     aField->Reformat();
     const OUString aWString = aField->GetText();
@@ -498,18 +498,18 @@ SfxTabPage::sfxpg SwLabPage::DeactivatePage(SfxItemSet* _pSet)
 
 void SwLabPage::FillItem(SwLabItem& rItem)
 {
-    rItem.bAddr    = m_pAddrBox->IsChecked();
-    rItem.aWriting = m_pWritingEdit->GetText();
-    rItem.bCont    = m_pContButton->IsChecked();
-    rItem.aMake    = m_pMakeBox->GetSelectEntry();
-    rItem.aType    = m_pTypeBox->GetSelectEntry();
-    rItem.sDBName  = sActDBName;
+    rItem.m_bAddr    = m_pAddrBox->IsChecked();
+    rItem.m_aWriting = m_pWritingEdit->GetText();
+    rItem.m_bCont    = m_pContButton->IsChecked();
+    rItem.m_aMake    = m_pMakeBox->GetSelectEntry();
+    rItem.m_aType    = m_pTypeBox->GetSelectEntry();
+    rItem.m_sDBName  = sActDBName;
 
     SwLabRec* pRec = GetSelectedEntryPos();
     pRec->FillItem( rItem );
 
-    rItem.aLstMake = m_pMakeBox->GetSelectEntry();
-    rItem.aLstType = m_pTypeBox->GetSelectEntry();
+    rItem.m_aLstMake = m_pMakeBox->GetSelectEntry();
+    rItem.m_aLstType = m_pTypeBox->GetSelectEntry();
 }
 
 bool SwLabPage::FillItemSet(SfxItemSet* rSet)
@@ -523,11 +523,11 @@ bool SwLabPage::FillItemSet(SfxItemSet* rSet)
 void SwLabPage::Reset(const SfxItemSet* rSet)
 {
     aItem = static_cast<const SwLabItem&>( rSet->Get(FN_LABEL));
-    OUString sDBName  = aItem.sDBName;
+    OUString sDBName  = aItem.m_sDBName;
 
-    OUString aWriting(convertLineEnd(aItem.aWriting, GetSystemLineEnd()));
+    OUString aWriting(convertLineEnd(aItem.m_aWriting, GetSystemLineEnd()));
 
-    m_pAddrBox->Check( aItem.bAddr );
+    m_pAddrBox->Check( aItem.m_bAddr );
     m_pWritingEdit->SetText    ( aWriting );
 
     for(std::vector<OUString>::const_iterator i = GetParentSwLabDlg()->Makes().begin(); i != GetParentSwLabDlg()->Makes().end(); ++i)
@@ -536,17 +536,17 @@ void SwLabPage::Reset(const SfxItemSet* rSet)
             m_pMakeBox->InsertEntry(*i);
     }
 
-    m_pMakeBox->SelectEntry( aItem.aMake );
+    m_pMakeBox->SelectEntry( aItem.m_aMake );
     //save the current type
-    OUString sType(aItem.aType);
+    OUString sType(aItem.m_aType);
     m_pMakeBox->GetSelectHdl().Call(*m_pMakeBox);
-    aItem.aType = sType;
+    aItem.m_aType = sType;
     //#102806# a newly added make may not be in the type ListBox already
-    if (m_pTypeBox->GetEntryPos(aItem.aType) == LISTBOX_ENTRY_NOTFOUND && !aItem.aMake.isEmpty())
-        GetParentSwLabDlg()->UpdateGroup( aItem.aMake );
-    if (m_pTypeBox->GetEntryPos(aItem.aType) != LISTBOX_ENTRY_NOTFOUND)
+    if (m_pTypeBox->GetEntryPos(aItem.m_aType) == LISTBOX_ENTRY_NOTFOUND && !aItem.m_aMake.isEmpty())
+        GetParentSwLabDlg()->UpdateGroup( aItem.m_aMake );
+    if (m_pTypeBox->GetEntryPos(aItem.m_aType) != LISTBOX_ENTRY_NOTFOUND)
     {
-        m_pTypeBox->SelectEntry(aItem.aType);
+        m_pTypeBox->SelectEntry(aItem.m_aType);
         m_pTypeBox->GetSelectHdl().Call(*m_pTypeBox);
     }
     if (m_pDatabaseLB->GetEntryPos(sDBName) != LISTBOX_ENTRY_NOTFOUND)
@@ -555,7 +555,7 @@ void SwLabPage::Reset(const SfxItemSet* rSet)
         m_pDatabaseLB->GetSelectHdl().Call(*m_pDatabaseLB);
     }
 
-    if (aItem.bCont)
+    if (aItem.m_bCont)
         m_pContButton->Check();
     else
         m_pSheetButton->Check();
@@ -647,11 +647,11 @@ bool SwVisitingCardPage::FillItemSet(SfxItemSet* rSet)
     OSL_ENSURE(pGroup, "no group selected?");
 
     if (pGroup)
-        aLabItem.sGlossaryGroup = *pGroup;
+        aLabItem.m_sGlossaryGroup = *pGroup;
 
     SvTreeListEntry* pSelEntry = m_pAutoTextLB->FirstSelected();
     if(pSelEntry)
-        aLabItem.sGlossaryBlockName = *static_cast<OUString*>(pSelEntry->GetUserData());
+        aLabItem.m_sGlossaryBlockName = *static_cast<OUString*>(pSelEntry->GetUserData());
     rSet->Put(aLabItem);
     return true;
 }
@@ -693,7 +693,7 @@ void SwVisitingCardPage::Reset(const SfxItemSet* rSet)
     bool bFound = false;
     sal_Int32 i;
     for(i = 0; i < m_pAutoTextGroupLB->GetEntryCount(); i++)
-        if( aLabItem.sGlossaryGroup == *static_cast<const OUString*>(m_pAutoTextGroupLB->GetEntryData( i )))
+        if( aLabItem.m_sGlossaryGroup == *static_cast<const OUString*>(m_pAutoTextGroupLB->GetEntryData( i )))
         {
             bFound = true;
             break;
@@ -717,13 +717,13 @@ void SwVisitingCardPage::Reset(const SfxItemSet* rSet)
             m_pAutoTextGroupLB->SelectEntryPos(i);
             AutoTextSelectHdl(*m_pAutoTextGroupLB);
         }
-        if(lcl_FindBlock(*m_pAutoTextLB, aLabItem.sGlossaryBlockName))
+        if(lcl_FindBlock(*m_pAutoTextLB, aLabItem.m_sGlossaryBlockName))
         {
             SvTreeListEntry* pSelEntry = m_pAutoTextLB->FirstSelected();
             if( pSelEntry &&
-                *static_cast<OUString*>(pSelEntry->GetUserData()) != aLabItem.sGlossaryBlockName)
+                *static_cast<OUString*>(pSelEntry->GetUserData()) != aLabItem.m_sGlossaryBlockName)
             {
-                lcl_SelectBlock(*m_pAutoTextLB, aLabItem.sGlossaryBlockName);
+                lcl_SelectBlock(*m_pAutoTextLB, aLabItem.m_sGlossaryBlockName);
                 if(m_xAutoText.is() && pExampleFrame->IsInitialized())
                     pExampleFrame->ClearDocument( true );
             }
@@ -806,24 +806,24 @@ bool SwPrivateDataPage::FillItemSet(SfxItemSet* rSet)
 {
 
     SwLabItem aItem = static_cast<const SwLabItem&>( GetTabDialog()->GetExampleSet()->Get(FN_LABEL) );
-    aItem.aPrivFirstName = m_pFirstNameED->GetText();
-    aItem.aPrivName      = m_pNameED->GetText(  );
-    aItem.aPrivShortCut  = m_pShortCutED->GetText(  );
-    aItem.aPrivFirstName2 = m_pFirstName2ED->GetText();
-    aItem.aPrivName2     = m_pName2ED->GetText(  );
-    aItem.aPrivShortCut2 = m_pShortCut2ED->GetText(  );
-    aItem.aPrivStreet    = m_pStreetED->GetText(  );
-    aItem.aPrivZip       = m_pZipED->GetText(  );
-    aItem.aPrivCity      = m_pCityED->GetText(  );
-    aItem.aPrivCountry   = m_pCountryED->GetText(  );
-    aItem.aPrivState     = m_pStateED->GetText(  );
-    aItem.aPrivTitle     = m_pTitleED->GetText(  );
-    aItem.aPrivProfession= m_pProfessionED->GetText(   );
-    aItem.aPrivPhone     = m_pPhoneED->GetText(  );
-    aItem.aPrivMobile    = m_pMobilePhoneED->GetText(  );
-    aItem.aPrivFax       = m_pFaxED->GetText(  );
-    aItem.aPrivWWW       = m_pHomePageED->GetText(  );
-    aItem.aPrivMail      = m_pMailED->GetText(  );
+    aItem.m_aPrivFirstName = m_pFirstNameED->GetText();
+    aItem.m_aPrivName      = m_pNameED->GetText(  );
+    aItem.m_aPrivShortCut  = m_pShortCutED->GetText(  );
+    aItem.m_aPrivFirstName2 = m_pFirstName2ED->GetText();
+    aItem.m_aPrivName2     = m_pName2ED->GetText(  );
+    aItem.m_aPrivShortCut2 = m_pShortCut2ED->GetText(  );
+    aItem.m_aPrivStreet    = m_pStreetED->GetText(  );
+    aItem.m_aPrivZip       = m_pZipED->GetText(  );
+    aItem.m_aPrivCity      = m_pCityED->GetText(  );
+    aItem.m_aPrivCountry   = m_pCountryED->GetText(  );
+    aItem.m_aPrivState     = m_pStateED->GetText(  );
+    aItem.m_aPrivTitle     = m_pTitleED->GetText(  );
+    aItem.m_aPrivProfession= m_pProfessionED->GetText(   );
+    aItem.m_aPrivPhone     = m_pPhoneED->GetText(  );
+    aItem.m_aPrivMobile    = m_pMobilePhoneED->GetText(  );
+    aItem.m_aPrivFax       = m_pFaxED->GetText(  );
+    aItem.m_aPrivWWW       = m_pHomePageED->GetText(  );
+    aItem.m_aPrivMail      = m_pMailED->GetText(  );
 
     rSet->Put(aItem);
     return true;
@@ -832,24 +832,24 @@ bool SwPrivateDataPage::FillItemSet(SfxItemSet* rSet)
 void SwPrivateDataPage::Reset(const SfxItemSet* rSet)
 {
     const SwLabItem& aItem = static_cast<const SwLabItem&>( rSet->Get(FN_LABEL) );
-    m_pFirstNameED->SetText(aItem.aPrivFirstName);
-    m_pNameED->SetText(aItem.aPrivName);
-    m_pShortCutED->SetText(aItem.aPrivShortCut);
-    m_pFirstName2ED->SetText(aItem.aPrivFirstName2);
-    m_pName2ED->SetText(aItem.aPrivName2);
-    m_pShortCut2ED->SetText(aItem.aPrivShortCut2);
-    m_pStreetED->SetText(aItem.aPrivStreet);
-    m_pZipED->SetText(aItem.aPrivZip);
-    m_pCityED->SetText(aItem.aPrivCity);
-    m_pCountryED->SetText(aItem.aPrivCountry);
-    m_pStateED->SetText(aItem.aPrivState);
-    m_pTitleED->SetText(aItem.aPrivTitle);
-    m_pProfessionED->SetText(aItem.aPrivProfession);
-    m_pPhoneED->SetText(aItem.aPrivPhone);
-    m_pMobilePhoneED->SetText(aItem.aPrivMobile);
-    m_pFaxED->SetText(aItem.aPrivFax);
-    m_pHomePageED->SetText(aItem.aPrivWWW);
-    m_pMailED->SetText(aItem.aPrivMail);
+    m_pFirstNameED->SetText(aItem.m_aPrivFirstName);
+    m_pNameED->SetText(aItem.m_aPrivName);
+    m_pShortCutED->SetText(aItem.m_aPrivShortCut);
+    m_pFirstName2ED->SetText(aItem.m_aPrivFirstName2);
+    m_pName2ED->SetText(aItem.m_aPrivName2);
+    m_pShortCut2ED->SetText(aItem.m_aPrivShortCut2);
+    m_pStreetED->SetText(aItem.m_aPrivStreet);
+    m_pZipED->SetText(aItem.m_aPrivZip);
+    m_pCityED->SetText(aItem.m_aPrivCity);
+    m_pCountryED->SetText(aItem.m_aPrivCountry);
+    m_pStateED->SetText(aItem.m_aPrivState);
+    m_pTitleED->SetText(aItem.m_aPrivTitle);
+    m_pProfessionED->SetText(aItem.m_aPrivProfession);
+    m_pPhoneED->SetText(aItem.m_aPrivPhone);
+    m_pMobilePhoneED->SetText(aItem.m_aPrivMobile);
+    m_pFaxED->SetText(aItem.m_aPrivFax);
+    m_pHomePageED->SetText(aItem.m_aPrivWWW);
+    m_pMailED->SetText(aItem.m_aPrivMail);
 }
 
 SwBusinessDataPage::SwBusinessDataPage(vcl::Window* pParent, const SfxItemSet& rSet)
@@ -919,20 +919,20 @@ bool SwBusinessDataPage::FillItemSet(SfxItemSet* rSet)
 {
     SwLabItem aItem = static_cast<const SwLabItem&>( GetTabDialog()->GetExampleSet()->Get(FN_LABEL) );
 
-    aItem.aCompCompany   = m_pCompanyED->GetText();
-    aItem.aCompCompanyExt= m_pCompanyExtED->GetText();
-    aItem.aCompSlogan    = m_pSloganED->GetText();
-    aItem.aCompStreet    = m_pStreetED->GetText();
-    aItem.aCompZip       = m_pZipED->GetText();
-    aItem.aCompCity      = m_pCityED->GetText();
-    aItem.aCompCountry   = m_pCountryED->GetText();
-    aItem.aCompState     = m_pStateED->GetText();
-    aItem.aCompPosition  = m_pPositionED->GetText();
-    aItem.aCompPhone     = m_pPhoneED->GetText();
-    aItem.aCompMobile    = m_pMobilePhoneED->GetText();
-    aItem.aCompFax       = m_pFaxED->GetText();
-    aItem.aCompWWW       = m_pHomePageED->GetText();
-    aItem.aCompMail      = m_pMailED->GetText();
+    aItem.m_aCompCompany   = m_pCompanyED->GetText();
+    aItem.m_aCompCompanyExt= m_pCompanyExtED->GetText();
+    aItem.m_aCompSlogan    = m_pSloganED->GetText();
+    aItem.m_aCompStreet    = m_pStreetED->GetText();
+    aItem.m_aCompZip       = m_pZipED->GetText();
+    aItem.m_aCompCity      = m_pCityED->GetText();
+    aItem.m_aCompCountry   = m_pCountryED->GetText();
+    aItem.m_aCompState     = m_pStateED->GetText();
+    aItem.m_aCompPosition  = m_pPositionED->GetText();
+    aItem.m_aCompPhone     = m_pPhoneED->GetText();
+    aItem.m_aCompMobile    = m_pMobilePhoneED->GetText();
+    aItem.m_aCompFax       = m_pFaxED->GetText();
+    aItem.m_aCompWWW       = m_pHomePageED->GetText();
+    aItem.m_aCompMail      = m_pMailED->GetText();
 
     rSet->Put(aItem);
     return true;
@@ -941,20 +941,20 @@ bool SwBusinessDataPage::FillItemSet(SfxItemSet* rSet)
 void SwBusinessDataPage::Reset(const SfxItemSet* rSet)
 {
     const SwLabItem& aItem = static_cast<const SwLabItem&>( rSet->Get(FN_LABEL) );
-    m_pCompanyED->SetText(aItem.aCompCompany);
-    m_pCompanyExtED->SetText(aItem.aCompCompanyExt);
-    m_pSloganED->SetText(aItem.aCompSlogan);
-    m_pStreetED->SetText(aItem.aCompStreet);
-    m_pZipED->SetText(aItem.aCompZip);
-    m_pCityED->SetText(aItem.aCompCity);
-    m_pCountryED->SetText(aItem.aCompCountry);
-    m_pStateED->SetText(aItem.aCompState);
-    m_pPositionED->SetText(aItem.aCompPosition);
-    m_pPhoneED->SetText(aItem.aCompPhone);
-    m_pMobilePhoneED->SetText(aItem.aCompMobile);
-    m_pFaxED->SetText(aItem.aCompFax);
-    m_pHomePageED->SetText(aItem.aCompWWW);
-    m_pMailED->SetText(aItem.aCompMail);
+    m_pCompanyED->SetText(aItem.m_aCompCompany);
+    m_pCompanyExtED->SetText(aItem.m_aCompCompanyExt);
+    m_pSloganED->SetText(aItem.m_aCompSlogan);
+    m_pStreetED->SetText(aItem.m_aCompStreet);
+    m_pZipED->SetText(aItem.m_aCompZip);
+    m_pCityED->SetText(aItem.m_aCompCity);
+    m_pCountryED->SetText(aItem.m_aCompCountry);
+    m_pStateED->SetText(aItem.m_aCompState);
+    m_pPositionED->SetText(aItem.m_aCompPosition);
+    m_pPhoneED->SetText(aItem.m_aCompPhone);
+    m_pMobilePhoneED->SetText(aItem.m_aCompMobile);
+    m_pFaxED->SetText(aItem.m_aCompFax);
+    m_pHomePageED->SetText(aItem.m_aCompWWW);
+    m_pMailED->SetText(aItem.m_aCompMail);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */