diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-20 10:24:32 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-22 10:28:40 +0200 |
commit | 321d924f157ffbe05b9a9286ac7cb9d5f6bfe45c (patch) | |
tree | 71a5c44ad98d44baca8ff2e177995dbf852589f9 /sw | |
parent | 2ba352107abc44d2f9360874005c18b256c8707b (diff) |
convert HIB_ constants to scoped enum
Change-Id: I6fa3ecde4a1c5f9c7e6e1dcd22250cba065933e3
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/selectdbtabledialog.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index f0868a7f4179..58d0fc443810 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1135,11 +1135,11 @@ SwAssignFieldsDialog::SwAssignFieldsDialog( Size aOutputSize(m_pFieldsControl->m_aHeaderHB.GetSizePixel()); sal_Int32 nFirstWidth; sal_Int32 nSecondWidth = nFirstWidth = aOutputSize.Width() / 3; - const WinBits nHeadBits = HIB_VCENTER | HIB_FIXED| HIB_FIXEDPOS; - m_pFieldsControl->m_aHeaderHB.InsertItem( 1, sAddressElement, nFirstWidth, nHeadBits|HIB_LEFT); - m_pFieldsControl->m_aHeaderHB.InsertItem( 2, sMatchesTo, nSecondWidth, nHeadBits|HIB_LEFT); + const HeaderBarItemBits nHeadBits = HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXED| HeaderBarItemBits::FIXEDPOS; + m_pFieldsControl->m_aHeaderHB.InsertItem( 1, sAddressElement, nFirstWidth, nHeadBits|HeaderBarItemBits::LEFT); + m_pFieldsControl->m_aHeaderHB.InsertItem( 2, sMatchesTo, nSecondWidth, nHeadBits|HeaderBarItemBits::LEFT); m_pFieldsControl->m_aHeaderHB.InsertItem( 3, sPreview, - aOutputSize.Width() - nFirstWidth - nSecondWidth, nHeadBits|HIB_LEFT); + aOutputSize.Width() - nFirstWidth - nSecondWidth, nHeadBits|HeaderBarItemBits::LEFT); m_pFieldsControl->SetModifyHdl(LINK(this, SwAssignFieldsDialog, AssignmentModifyHdl_Impl )); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 466620225925..a1dc8affad88 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -267,10 +267,10 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem& long nPos2 = aSize.Width()/3; m_pStatusHB->InsertItem( ITEMID_TASK, sTask, nPos1, - HIB_LEFT | HIB_VCENTER ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); m_pStatusHB->InsertItem( ITEMID_STATUS, sStatus, nPos2, - HIB_LEFT | HIB_VCENTER ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); static long nTabs[] = {2, 0, nPos1}; m_pStatus->SetStyle( m_pStatus->GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 1b8ca4eec2dc..e701558e985a 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -108,8 +108,8 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent, m_pTable = new SwAddressTable(*pHeaderTreeContainer); long aStaticTabs[]= { 2, 0, 0 }; m_pTable->SetTabs( aStaticTabs ); - m_pTable->InsertHeaderItem(1, m_sName, HIB_LEFT | HIB_VCENTER); - m_pTable->InsertHeaderItem(2, m_sType, HIB_LEFT | HIB_VCENTER); + m_pTable->InsertHeaderItem(1, m_sName, HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER); + m_pTable->InsertHeaderItem(2, m_sType, HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER); m_pPreviewPB->SetClickHdl(LINK(this, SwSelectDBTableDialog, PreviewHdl)); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index b086d92da3d7..d9951f1bf2e5 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -3750,7 +3750,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pB --nWidth; for(sal_uInt16 i = 1; i < 8; i++) InsertDataColumn( i, *aTitles[i - 1], nWidth, - HIB_STDSTYLE, HEADERBAR_APPEND ); + HeaderBarItemBits::STDSTYLE, HEADERBAR_APPEND ); } void SwEntryBrowseBox::Resize() |