Skip to content

C
core
Kaydet (Commit) f32f7e4b authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

sw: prefix members of SwLabItem 

Change-Id: I8346c5f7a12deb5cbd4e4d9cc87ecadb30ebbeb4
üst deb5bae0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 101 deletions
sw/source/ui/envelp/label1.cxx
Dosyayı görüntüle @ f32f7e4b
This diff is collapsed.
sw/source/ui/envelp/labelexp.cxx
Dosyayı görüntüle @ f32f7e4b
...@@ -179,38 +179,38 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel, ...@@ -179,38 +179,38 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel,
const char* pName; const char* pName;
OUString SwLabItem:: *pValue; OUString SwLabItem:: *pValue;
} aArr[] = { } aArr[] = {
{ "BC_PRIV_FIRSTNAME" , &SwLabItem::aPrivFirstName }, { "BC_PRIV_FIRSTNAME" , &SwLabItem::m_aPrivFirstName },
{ "BC_PRIV_NAME" , &SwLabItem::aPrivName }, { "BC_PRIV_NAME" , &SwLabItem::m_aPrivName },
{ "BC_PRIV_INITIALS" , &SwLabItem::aPrivShortCut }, { "BC_PRIV_INITIALS" , &SwLabItem::m_aPrivShortCut },
{ "BC_PRIV_FIRSTNAME_2", &SwLabItem::aPrivFirstName2 }, { "BC_PRIV_FIRSTNAME_2", &SwLabItem::m_aPrivFirstName2 },
{ "BC_PRIV_NAME_2" , &SwLabItem::aPrivName2 }, { "BC_PRIV_NAME_2" , &SwLabItem::m_aPrivName2 },
{ "BC_PRIV_INITIALS_2" , &SwLabItem::aPrivShortCut2 }, { "BC_PRIV_INITIALS_2" , &SwLabItem::m_aPrivShortCut2 },
{ "BC_PRIV_STREET" , &SwLabItem::aPrivStreet }, { "BC_PRIV_STREET" , &SwLabItem::m_aPrivStreet },
{ "BC_PRIV_ZIP" , &SwLabItem::aPrivZip }, { "BC_PRIV_ZIP" , &SwLabItem::m_aPrivZip },
{ "BC_PRIV_CITY" , &SwLabItem::aPrivCity }, { "BC_PRIV_CITY" , &SwLabItem::m_aPrivCity },
{ "BC_PRIV_COUNTRY" , &SwLabItem::aPrivCountry }, { "BC_PRIV_COUNTRY" , &SwLabItem::m_aPrivCountry },
{ "BC_PRIV_STATE" , &SwLabItem::aPrivState }, { "BC_PRIV_STATE" , &SwLabItem::m_aPrivState },
{ "BC_PRIV_TITLE" , &SwLabItem::aPrivTitle }, { "BC_PRIV_TITLE" , &SwLabItem::m_aPrivTitle },
{ "BC_PRIV_PROFESSION" , &SwLabItem::aPrivProfession }, { "BC_PRIV_PROFESSION" , &SwLabItem::m_aPrivProfession },
{ "BC_PRIV_PHONE" , &SwLabItem::aPrivPhone }, { "BC_PRIV_PHONE" , &SwLabItem::m_aPrivPhone },
{ "BC_PRIV_MOBILE" , &SwLabItem::aPrivMobile }, { "BC_PRIV_MOBILE" , &SwLabItem::m_aPrivMobile },
{ "BC_PRIV_FAX" , &SwLabItem::aPrivFax }, { "BC_PRIV_FAX" , &SwLabItem::m_aPrivFax },
{ "BC_PRIV_WWW" , &SwLabItem::aPrivWWW }, { "BC_PRIV_WWW" , &SwLabItem::m_aPrivWWW },
{ "BC_PRIV_MAIL" , &SwLabItem::aPrivMail }, { "BC_PRIV_MAIL" , &SwLabItem::m_aPrivMail },
{ "BC_COMP_COMPANY" , &SwLabItem::aCompCompany }, { "BC_COMP_COMPANY" , &SwLabItem::m_aCompCompany },
{ "BC_COMP_COMPANYEXT" , &SwLabItem::aCompCompanyExt }, { "BC_COMP_COMPANYEXT" , &SwLabItem::m_aCompCompanyExt },
{ "BC_COMP_SLOGAN" , &SwLabItem::aCompSlogan }, { "BC_COMP_SLOGAN" , &SwLabItem::m_aCompSlogan },
{ "BC_COMP_STREET" , &SwLabItem::aCompStreet }, { "BC_COMP_STREET" , &SwLabItem::m_aCompStreet },
{ "BC_COMP_ZIP" , &SwLabItem::aCompZip }, { "BC_COMP_ZIP" , &SwLabItem::m_aCompZip },
{ "BC_COMP_CITY" , &SwLabItem::aCompCity }, { "BC_COMP_CITY" , &SwLabItem::m_aCompCity },
{ "BC_COMP_COUNTRY" , &SwLabItem::aCompCountry }, { "BC_COMP_COUNTRY" , &SwLabItem::m_aCompCountry },
{ "BC_COMP_STATE" , &SwLabItem::aCompState }, { "BC_COMP_STATE" , &SwLabItem::m_aCompState },
{ "BC_COMP_POSITION" , &SwLabItem::aCompPosition }, { "BC_COMP_POSITION" , &SwLabItem::m_aCompPosition },
{ "BC_COMP_PHONE" , &SwLabItem::aCompPhone }, { "BC_COMP_PHONE" , &SwLabItem::m_aCompPhone },
{ "BC_COMP_MOBILE" , &SwLabItem::aCompMobile }, { "BC_COMP_MOBILE" , &SwLabItem::m_aCompMobile },
{ "BC_COMP_FAX" , &SwLabItem::aCompFax }, { "BC_COMP_FAX" , &SwLabItem::m_aCompFax },
{ "BC_COMP_WWW" , &SwLabItem::aCompWWW }, { "BC_COMP_WWW" , &SwLabItem::m_aCompWWW },
{ "BC_COMP_MAIL" , &SwLabItem::aCompMail }, { "BC_COMP_MAIL" , &SwLabItem::m_aCompMail },
{ 0, 0 } { 0, 0 }
}; };
......
sw/source/ui/envelp/labfmt.cxx
Dosyayı görüntüle @ f32f7e4b
This diff is collapsed.
sw/source/ui/envelp/labprt.cxx
Dosyayı görüntüle @ f32f7e4b
...@@ -126,10 +126,10 @@ SfxTabPage::sfxpg SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet) ...@@ -126,10 +126,10 @@ SfxTabPage::sfxpg SwLabPrtPage::DeactivatePage(SfxItemSet* _pSet)
void SwLabPrtPage::FillItem(SwLabItem& rItem) void SwLabPrtPage::FillItem(SwLabItem& rItem)
{ {
rItem.bPage = m_pPageButton->IsChecked(); rItem.m_bPage = m_pPageButton->IsChecked();
rItem.nCol = static_cast<sal_Int32>(m_pColField->GetValue()); rItem.m_nCol = static_cast<sal_Int32>(m_pColField->GetValue());
rItem.nRow = static_cast<sal_Int32>(m_pRowField->GetValue()); rItem.m_nRow = static_cast<sal_Int32>(m_pRowField->GetValue());
rItem.bSynchron = m_pSynchronCB->IsChecked() && m_pSynchronCB->IsEnabled(); rItem.m_bSynchron = m_pSynchronCB->IsChecked() && m_pSynchronCB->IsEnabled();
} }
bool SwLabPrtPage::FillItemSet(SfxItemSet* rSet) bool SwLabPrtPage::FillItemSet(SfxItemSet* rSet)
...@@ -147,10 +147,10 @@ void SwLabPrtPage::Reset(const SfxItemSet* ) ...@@ -147,10 +147,10 @@ void SwLabPrtPage::Reset(const SfxItemSet* )
SwLabItem aItem; SwLabItem aItem;
GetParentSwLabDlg()->GetLabItem(aItem); GetParentSwLabDlg()->GetLabItem(aItem);
m_pColField->SetValue (aItem.nCol); m_pColField->SetValue (aItem.m_nCol);
m_pRowField->SetValue (aItem.nRow); m_pRowField->SetValue (aItem.m_nRow);
if (aItem.bPage) if (aItem.m_bPage)
{ {
m_pPageButton->Check(); m_pPageButton->Check();
m_pPageButton->GetClickHdl().Call(m_pPageButton); m_pPageButton->GetClickHdl().Call(m_pPageButton);
...@@ -169,13 +169,13 @@ void SwLabPrtPage::Reset(const SfxItemSet* ) ...@@ -169,13 +169,13 @@ void SwLabPrtPage::Reset(const SfxItemSet* )
else else
m_pPrinterInfo->SetText(Printer::GetDefaultPrinterName()); m_pPrinterInfo->SetText(Printer::GetDefaultPrinterName());
m_pColField->SetMax(aItem.nCols); m_pColField->SetMax(aItem.m_nCols);
m_pRowField->SetMax(aItem.nRows); m_pRowField->SetMax(aItem.m_nRows);
m_pColField->SetLast(m_pColField->GetMax()); m_pColField->SetLast(m_pColField->GetMax());
m_pRowField->SetLast(m_pRowField->GetMax()); m_pRowField->SetLast(m_pRowField->GetMax());
m_pSynchronCB->Check(aItem.bSynchron); m_pSynchronCB->Check(aItem.m_bSynchron);
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/uibase/app/applab.cxx
Dosyayı görüntüle @ f32f7e4b
This diff is collapsed.
sw/source/uibase/inc/labimg.hxx
Dosyayı görüntüle @ f32f7e4b
...@@ -40,67 +40,67 @@ public: ...@@ -40,67 +40,67 @@ public:
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override;
OUString aLstMake; // remember last selection OUString m_aLstMake; // remember last selection
OUString aLstType; OUString m_aLstType;
OUString sDBName; // used database OUString m_sDBName; // used database
OUString aWriting; // label OUString m_aWriting; // label
OUString aMake; // label mark OUString m_aMake; // label mark
OUString aType; // label type OUString m_aType; // label type
OUString aBin; // printer shaft OUString m_aBin; // printer shaft
sal_Int32 lHDist; // horizontal distance (user) sal_Int32 m_lHDist; // horizontal distance (user)
sal_Int32 lVDist; // vertical distance (user) sal_Int32 m_lVDist; // vertical distance (user)
sal_Int32 lWidth; // width (user) sal_Int32 m_lWidth; // width (user)
sal_Int32 lHeight; // height (user) sal_Int32 m_lHeight; // height (user)
sal_Int32 lLeft; // left border (user) sal_Int32 m_lLeft; // left border (user)
sal_Int32 lUpper; // upper border (user) sal_Int32 m_lUpper; // upper border (user)
sal_Int32 nCols; // number of columns (user) sal_Int32 m_nCols; // number of columns (user)
sal_Int32 nRows; // number of rows (user) sal_Int32 m_nRows; // number of rows (user)
sal_Int32 nCol; // column for single print sal_Int32 m_nCol; // column for single print
sal_Int32 nRow; // row for single print sal_Int32 m_nRow; // row for single print
sal_Int32 lPHeight; // paper height sal_Int32 m_lPHeight; // paper height
sal_Int32 lPWidth; // paper width sal_Int32 m_lPWidth; // paper width
bool bAddr;// address as label? bool m_bAddr;// address as label?
bool bCont;// continuous paper? bool m_bCont;// continuous paper?
bool bPage;// whole page or single labels? bool m_bPage;// whole page or single labels?
bool bSynchron;// synchronise all labels bool m_bSynchron;// synchronise all labels
//parts of the business card //parts of the business card
OUString aPrivFirstName; OUString m_aPrivFirstName;
OUString aPrivName; OUString m_aPrivName;
OUString aPrivShortCut; OUString m_aPrivShortCut;
OUString aPrivFirstName2; OUString m_aPrivFirstName2;
OUString aPrivName2; OUString m_aPrivName2;
OUString aPrivShortCut2; OUString m_aPrivShortCut2;
OUString aPrivStreet; OUString m_aPrivStreet;
OUString aPrivZip; OUString m_aPrivZip;
OUString aPrivCity; OUString m_aPrivCity;
OUString aPrivCountry; OUString m_aPrivCountry;
OUString aPrivState; OUString m_aPrivState;
OUString aPrivTitle; OUString m_aPrivTitle;
OUString aPrivProfession; OUString m_aPrivProfession;
OUString aPrivPhone; OUString m_aPrivPhone;
OUString aPrivMobile; OUString m_aPrivMobile;
OUString aPrivFax; OUString m_aPrivFax;
OUString aPrivWWW; OUString m_aPrivWWW;
OUString aPrivMail; OUString m_aPrivMail;
OUString aCompCompany; OUString m_aCompCompany;
OUString aCompCompanyExt; OUString m_aCompCompanyExt;
OUString aCompSlogan; OUString m_aCompSlogan;
OUString aCompStreet; OUString m_aCompStreet;
OUString aCompZip; OUString m_aCompZip;
OUString aCompCity; OUString m_aCompCity;
OUString aCompCountry; OUString m_aCompCountry;
OUString aCompState; OUString m_aCompState;
OUString aCompPosition; OUString m_aCompPosition;
OUString aCompPhone; OUString m_aCompPhone;
OUString aCompMobile; OUString m_aCompMobile;
OUString aCompFax; OUString m_aCompFax;
OUString aCompWWW; OUString m_aCompWWW;
OUString aCompMail; OUString m_aCompMail;
OUString sGlossaryGroup; OUString m_sGlossaryGroup;
OUString sGlossaryBlockName; OUString m_sGlossaryBlockName;
}; };
class SwLabCfgItem : public utl::ConfigItem class SwLabCfgItem : public utl::ConfigItem
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment