diff options
36 files changed, 193 insertions, 190 deletions
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index b4dd69fa6c65..e4adae253e24 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -193,7 +193,7 @@ SvxMultiPathDialog::SvxMultiPathDialog(vcl::Window* pParent) OUString sHeader(get<FixedText>("pathlist")->GetText()); m_pRadioLB->SetQuickHelpText( sHeader ); sHeader = "\t" + sHeader; - m_pRadioLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT ); + m_pRadioLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HeaderBarItemBits::LEFT ); m_pRadioLB->SetSelectHdl( LINK( this, SvxMultiPathDialog, SelectHdl_Impl ) ); m_pRadioLB->SetCheckButtonHdl( LINK( this, SvxMultiPathDialog, CheckHdl_Impl ) ); diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index d6345be31a3d..bfe416952d7d 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -51,7 +51,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent) OUStringBuffer sHeader; sHeader.append('\t').append(sProfile).append('\t').append(sDirectory); - m_pCertPathList->InsertHeaderEntry( sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT ); + m_pCertPathList->InsertHeaderEntry( sHeader.makeStringAndClear(), HEADERBAR_APPEND, HeaderBarItemBits::LEFT ); m_pCertPathList->SetCheckButtonHdl( LINK( this, CertPathDialog, CheckHdl_Impl ) ); m_pAddBtn->SetClickHdl( LINK( this, CertPathDialog, AddHdl_Impl ) ); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 9b50fdc1cf31..c99defce27d0 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -139,11 +139,11 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons aSz.Width() = TAB_WIDTH1; rBar.InsertItem( ITEMID_TYPE, aTypeText, LogicToPixel( aSz, MapMode( MAP_APPFONT ) ).Width(), - HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW ); aSz.Width() = TAB_WIDTH2; rBar.InsertItem( ITEMID_PATH, aPathText, LogicToPixel( aSz, MapMode( MAP_APPFONT ) ).Width(), - HIB_LEFT | HIB_VCENTER ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); static long aTabs[] = {3, 0, TAB_WIDTH1, TAB_WIDTH1 + TAB_WIDTH2 }; Size aHeadSize = rBar.GetSizePixel(); @@ -243,13 +243,13 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet ) if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } rBar.SetItemBits( ITEMID_TYPE, nBits ); HeaderSelect_Impl( &rBar ); @@ -262,7 +262,7 @@ void DbRegistrationOptionsPage::FillUserData() OUString aUserData = OUString::number( rBar.GetItemSize( ITEMID_TYPE ) ) + ";"; HeaderBarItemBits nBits = rBar.GetItemBits( ITEMID_TYPE ); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); aUserData += (bUp ? OUString("1") : OUString("0")); SetUserData( aUserData ); } @@ -314,19 +314,19 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) return 0; HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; eMode = SortDescending; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } pBar->SetItemBits( ITEMID_TYPE, nBits ); SvTreeList* pModel = pPathBox->GetModel(); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index f4f6f1821cc7..a71e0bee28d8 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -80,8 +80,8 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent, m_pCheckLB->InsertHeaderEntry(sHeader.makeStringAndClear()); HeaderBar &rBar = m_pCheckLB->GetTheHeaderBar(); - HeaderBarItemBits nBits = rBar.GetItemBits(1) | HIB_FIXEDPOS | HIB_FIXED; - nBits &= ~HIB_CLICKABLE; + HeaderBarItemBits nBits = rBar.GetItemBits(1) | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED; + nBits &= ~HeaderBarItemBits::CLICKABLE; rBar.SetItemBits(1, nBits); rBar.SetItemBits(2, nBits); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index d7166442270b..ae9b3be32c3b 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -900,11 +900,11 @@ void ColorConfigCtrl_Impl::InitHeaderBar(const OUString &rOn, const OUString &rU const OUString &rColorSetting, const OUString &rPreview) { // filling - const WinBits nHeadBits = HIB_VCENTER | HIB_FIXED | HIB_FIXEDPOS; - m_pHeaderHB->InsertItem(1, rOn, 0, nHeadBits | HIB_CENTER); - m_pHeaderHB->InsertItem(2, rUIElems, 0, nHeadBits | HIB_LEFT); - m_pHeaderHB->InsertItem(3, rColorSetting, 0, nHeadBits | HIB_LEFT); - m_pHeaderHB->InsertItem(4, rPreview, 0, nHeadBits | HIB_LEFT); + const HeaderBarItemBits nHeadBits = HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXED | HeaderBarItemBits::FIXEDPOS; + m_pHeaderHB->InsertItem(1, rOn, 0, nHeadBits | HeaderBarItemBits::CENTER); + m_pHeaderHB->InsertItem(2, rUIElems, 0, nHeadBits | HeaderBarItemBits::LEFT); + m_pHeaderHB->InsertItem(3, rColorSetting, 0, nHeadBits | HeaderBarItemBits::LEFT); + m_pHeaderHB->InsertItem(4, rPreview, 0, nHeadBits | HeaderBarItemBits::LEFT); m_pHeaderHB->set_height_request(GetTextHeight() + 6); } diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 46051ce08c8e..ab49d9dd8adc 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -156,7 +156,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet OUString sHeader = sHeader1 + "\t" + sHeader2 + "\t"; m_pCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, - HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED ); + HeaderBarItemBits::CENTER | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED ); m_pCheckLB->SetStyle( m_pCheckLB->GetStyle()|WB_HSCROLL| WB_VSCROLL ); } diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 03fe25b2b1bf..3ad13eb797ba 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -172,7 +172,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& .append("\t").append(get<FixedText>("version")->GetText()) .append("\t").append(get<FixedText>("features")->GetText()) .append("\t"); - m_pJavaList->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT); + m_pJavaList->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HeaderBarItemBits::LEFT); m_pJavaList->setColSizes(); m_pJavaEnableCB->SetClickHdl( LINK( this, SvxJavaOptionsPage, EnableHdl_Impl ) ); diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 1c7df8c7c879..e6703b08738d 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -78,7 +78,7 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) HeaderBar &rBlBar = mpBlackList->GetTheHeaderBar(); HeaderBar &rWiBar = mpWhiteList->GetTheHeaderBar(); - WinBits nHBits = HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE; + HeaderBarItemBits nHBits = HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE; rBlBar.InsertItem( 1, mpOS->GetText(), 0, nHBits ); rBlBar.InsertItem( 2, mpOSVersion->GetText(), 0, nHBits ); rBlBar.InsertItem( 3, mpVendor->GetText(), 0, nHBits ); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index d4a16d775699..53363402f7d6 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -222,10 +222,10 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet) rBar.InsertItem( ITEMID_TYPE, get<FixedText>("type")->GetText(), 0, - HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW ); rBar.InsertItem( ITEMID_PATH, get<FixedText>("path")->GetText(), 0, - HIB_LEFT | HIB_VCENTER ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); long nWidth1 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_TYPE)); long nWidth2 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_PATH)); @@ -354,13 +354,13 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } rBar.SetItemBits( ITEMID_TYPE, nBits ); HeaderSelect_Impl( &rBar ); @@ -377,7 +377,7 @@ void SvxPathTabPage::FillUserData() OUString aUserData = OUString::number( rBar.GetItemSize( ITEMID_TYPE ) ) + ";"; HeaderBarItemBits nBits = rBar.GetItemBits( ITEMID_TYPE ); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); aUserData += bUp ? OUString("1") : OUString("0"); SetUserData( aUserData ); } @@ -639,19 +639,19 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar ) return 0; HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; eMode = SortDescending; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } pBar->SetItemBits( ITEMID_TYPE, nBits ); SvTreeList* pModel = pPathBox->GetModel(); diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 42fe55bf150e..b5c61bf88397 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -55,19 +55,19 @@ void PasswordTable::Resort( bool bForced ) if ( 0 == nColumn || bForced ) // only the first column is sorted { HeaderBarItemBits nBits = GetTheHeaderBar().GetItemBits(1); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); SvSortMode eMode = SortAscending; if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; eMode = SortDescending; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } GetTheHeaderBar().SetItemBits( 1, nBits ); SvTreeList* pListModel = GetModel(); @@ -116,9 +116,9 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent) long aStaticTabs[]= { 2, 0, 0 }; m_pPasswordsLB->SetTabs( aStaticTabs ); m_pPasswordsLB->InsertHeaderItem( 1, get<FixedText>("website")->GetText(), - HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS | HIB_CLICKABLE | HIB_UPARROW ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW ); m_pPasswordsLB->InsertHeaderItem( 2, get<FixedText>("username")->GetText(), - HIB_LEFT | HIB_VCENTER | HIB_FIXEDPOS ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS ); pPasswordsLBContainer->set_height_request(m_pPasswordsLB->GetTextHeight()*8); m_pPasswordsLB->SetHeaderBarClickHdl( LINK( this, WebConnectionInfoDialog, HeaderBarClickedHdl ) ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index a24210275486..09f5808724b3 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -435,7 +435,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent, sHeader.append(get<vcl::Window>("t")->GetText()); sHeader.append('\t'); m_pCheckLB->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, - HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); + HeaderBarItemBits::CENTER | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED); m_pEditPB->SetClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, EditHdl)); } @@ -1799,7 +1799,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) sHeader += get<vcl::Window>("t")->GetText(); sHeader += "\t"; m_pSwCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, - HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); + HeaderBarItemBits::CENTER | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED); m_pCheckLB->Hide(); } else diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 46f20905c59c..dc0d7a40d3b6 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -238,7 +238,7 @@ namespace dbaui nSortOrderColumnWidth = nSortOrderColumnWidth > nOther ? nSortOrderColumnWidth : nOther; // (plus some additional space) nSortOrderColumnWidth += GetTextWidth(OUString('0')) * 2; - InsertDataColumn(COLUMN_ID_ORDER, sColumnName, nSortOrderColumnWidth, HIB_STDSTYLE, 1); + InsertDataColumn(COLUMN_ID_ORDER, sColumnName, nSortOrderColumnWidth, HeaderBarItemBits::STDSTYLE, 1); m_pSortingCell = new ListBoxControl(&GetDataWindow()); m_pSortingCell->InsertEntry(m_sAscendingText); @@ -252,7 +252,7 @@ namespace dbaui nFieldNameWidth -= 8; // the "field name" column OUString sColumnName = ModuleRes(STR_TAB_INDEX_FIELD); - InsertDataColumn(COLUMN_ID_FIELDNAME, sColumnName, nFieldNameWidth, HIB_STDSTYLE, 0); + InsertDataColumn(COLUMN_ID_FIELDNAME, sColumnName, nFieldNameWidth, HeaderBarItemBits::STDSTYLE, 0); // create the cell controllers // for the field name cell diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index bc01a5c2e87f..b628238191d9 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1256,7 +1256,7 @@ void OSelectionBrowseBox::RemoveColumn(sal_uInt16 _nColumnId) getFields().push_back(pEntry); EditBrowseBox::RemoveColumn( _nColumnId ); - InsertDataColumn( _nColumnId , OUString(), DEFAULT_SIZE, HIB_STDSTYLE, HEADERBAR_APPEND); + InsertDataColumn( _nColumnId , OUString(), DEFAULT_SIZE, HeaderBarItemBits::STDSTYLE, HEADERBAR_APPEND); // Neuzeichnen Rectangle aInvalidRect = GetInvalidRect( _nColumnId ); @@ -1403,7 +1403,7 @@ OTableFieldDescRef OSelectionBrowseBox::AppendNewCol( sal_uInt16 nCnt) sal_uInt16 nColumnId = sal::static_int_cast< sal_uInt16 >(getFields().size()); pEmptyEntry->SetColumnId( nColumnId ); - InsertDataColumn( nColumnId , OUString(), DEFAULT_SIZE, HIB_STDSTYLE, HEADERBAR_APPEND); + InsertDataColumn( nColumnId , OUString(), DEFAULT_SIZE, HeaderBarItemBits::STDSTYLE, HEADERBAR_APPEND); } return getFields()[nCount]; diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 271db0b60a38..ba832bfea60b 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1432,9 +1432,9 @@ XMLFilterListBox::XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl long nTabSize = aBoxSize.Width() / 2; m_pHeaderBar->InsertItem( ITEMID_NAME, aStr1, nTabSize, - HIB_LEFT | HIB_VCENTER ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); m_pHeaderBar->InsertItem( ITEMID_TYPE, aStr2, nTabSize, - HIB_LEFT | HIB_VCENTER ); + HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); static long nTabs[] = {2, 0, nTabSize }; diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 4e4bbb363f75..b68fd2d5b50e 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -29,7 +29,7 @@ PlacesListBox_Impl::PlacesListBox_Impl( PlacesListBox* pParent, const OUString& long pTabs[] = { 2, 20, 600 }; SetTabs( &pTabs[0], MAP_PIXEL ); - mpHeaderBar->InsertItem( COLUMN_NAME, rTitle, 600, HIB_LEFT | HIB_VCENTER ); + mpHeaderBar->InsertItem( COLUMN_NAME, rTitle, 600, HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER ); Size aHeadSize = mpHeaderBar->GetSizePixel(); SetPosSizePixel( Point( 0, aHeadSize.getHeight() ), diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 6c29a0cd3c66..8ad76b82caab 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -479,7 +479,7 @@ public: // inserting, changing, removing and freezing of columns void InsertHandleColumn( sal_uLong nWidth ); void InsertDataColumn( sal_uInt16 nItemId, const OUString& rText, - long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, + long nSize, HeaderBarItemBits nBits = HeaderBarItemBits::STDSTYLE, sal_uInt16 nPos = HEADERBAR_APPEND ); void SetColumnTitle( sal_uInt16 nColumnId, const OUString &rTitle ); void SetColumnWidth( sal_uInt16 nColumnId, sal_uLong nWidth ); diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index fbd275a7de5a..acdb018a59ae 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -23,6 +23,7 @@ #include <svtools/svtdllapi.h> #include <tools/link.hxx> #include <vcl/window.hxx> +#include <o3tl/typed_flags_set.hxx> /************************************************************************* @@ -51,36 +52,36 @@ WB_STDHEADERBAR WB_BUTTONSTYLE | WB_BOTTOMBORDER ItemBits -HIB_LEFT content is displayed in the item left-justified -HIB_CENTER content is displayed in the item centred -HIB_RIGHT content is displayed in the item right-justified -HIB_TOP content is displayed in the item at the upper border -HIB_VCENTER content is displayed in the item vertically centred -HIB_BOTTOM content is displayed in the item at the bottom border -HIB_LEFTIMAGE in case of text and image, the image is displayed left of the text -HIB_RIGHTIMAGE in case of text and image, the image is displayed right of the text -HIB_FIXED item cannot be changed in size -HIB_FIXEDPOS item cannot be moved -HIB_CLICKABLE item is clickable +HeaderBarItemBits::LEFT content is displayed in the item left-justified +HeaderBarItemBits::CENTER content is displayed in the item centred +HeaderBarItemBits::RIGHT content is displayed in the item right-justified +HeaderBarItemBits::TOP content is displayed in the item at the upper border +HeaderBarItemBits::VCENTER content is displayed in the item vertically centred +HeaderBarItemBits::BOTTOM content is displayed in the item at the bottom border +HeaderBarItemBits::LEFTIMAGE in case of text and image, the image is displayed left of the text +HeaderBarItemBits::RIGHTIMAGE in case of text and image, the image is displayed right of the text +HeaderBarItemBits::FIXED item cannot be changed in size +HeaderBarItemBits::FIXEDPOS item cannot be moved +HeaderBarItemBits::CLICKABLE item is clickable (select handler is only called on MouseButtonUp) -HIB_FLAT item is displayed in a flat way, even if WB_BUTTONSTYLE is set -HIB_DOWNARROW An arrow pointing downwards is displayed behind the text, +HeaderBarItemBits::FLAT item is displayed in a flat way, even if WB_BUTTONSTYLE is set +HeaderBarItemBits::DOWNARROW An arrow pointing downwards is displayed behind the text, which should, for example, be shown, when after this item, a corresponding list is sorted in descending order. The status of the arrow can be set/reset with SetItemBits(). -HIB_UPARROW An arrow pointing upwards is displayed behind the text, +HeaderBarItemBits::UPARROW An arrow pointing upwards is displayed behind the text, which should, for example, be shown, when after this item, a corresponding list is sorted in ascending order. The status of the arrow can be set/reset with SetItemBits(). -HIB_USERDRAW For this item, the UserDraw handler is called as well. -HIB_STDSTYLE (HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER | HIB_CLICKABLE) +HeaderBarItemBits::USERDRAW For this item, the UserDraw handler is called as well. +HeaderBarItemBits::STDSTYLE (HeaderBarItemBits::LEFT | HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE) -------------------------------------------------------------------------- Handler -Select() Is called, when the item is clicked. If HIB_CLICKABLE - is set in the item and not HIB_FLAT, the handler is only +Select() Is called, when the item is clicked. If HeaderBarItemBits::CLICKABLE + is set in the item and not HeaderBarItemBits::FLAT, the handler is only called in the MouseButtonUp handler, when the mouse has been released over the item. In this case, the Select handler behaves like it does with a ToolBox button. @@ -165,7 +166,7 @@ If ButtonStyle has been set, it looks better, if an empty item is set at the end which takes up the remaining space. In order to do that, you can insert an item with an empty string and pass HEADERBAR_FULLSIZE as size. For such an item, you should not set -HIB_CLICKABLE, but HIB_FIXEDPOS. +HeaderBarItemBits::CLICKABLE, but HeaderBarItemBits::FIXEDPOS. *************************************************************************/ @@ -186,28 +187,30 @@ typedef ::std::vector< ImplHeadItem* > ImplHeadItemList; // - HeaderBarItemBits - -typedef sal_uInt16 HeaderBarItemBits; - - -// - Bits for HeaderBarItems - - - -#define HIB_LEFT ((HeaderBarItemBits)0x0001) -#define HIB_CENTER ((HeaderBarItemBits)0x0002) -#define HIB_RIGHT ((HeaderBarItemBits)0x0004) -#define HIB_TOP ((HeaderBarItemBits)0x0008) -#define HIB_VCENTER ((HeaderBarItemBits)0x0010) -#define HIB_BOTTOM ((HeaderBarItemBits)0x0020) -#define HIB_LEFTIMAGE ((HeaderBarItemBits)0x0040) -#define HIB_RIGHTIMAGE ((HeaderBarItemBits)0x0080) -#define HIB_FIXED ((HeaderBarItemBits)0x0100) -#define HIB_FIXEDPOS ((HeaderBarItemBits)0x0200) -#define HIB_CLICKABLE ((HeaderBarItemBits)0x0400) -#define HIB_FLAT ((HeaderBarItemBits)0x0800) -#define HIB_DOWNARROW ((HeaderBarItemBits)0x1000) -#define HIB_UPARROW ((HeaderBarItemBits)0x2000) -#define HIB_USERDRAW ((HeaderBarItemBits)0x4000) -#define HIB_STDSTYLE (HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER | HIB_CLICKABLE) +enum class HeaderBarItemBits +{ + NONE = 0x0000, + LEFT = 0x0001, + CENTER = 0x0002, + RIGHT = 0x0004, + TOP = 0x0008, + VCENTER = 0x0010, + BOTTOM = 0x0020, + LEFTIMAGE = 0x0040, + RIGHTIMAGE = 0x0080, + FIXED = 0x0100, + FIXEDPOS = 0x0200, + CLICKABLE = 0x0400, + FLAT = 0x0800, + DOWNARROW = 0x1000, + UPARROW = 0x2000, + USERDRAW = 0x4000, + STDSTYLE = LEFT | LEFTIMAGE | VCENTER | CLICKABLE, +}; +namespace o3tl +{ + template<> struct typed_flags<HeaderBarItemBits> : is_typed_flags<HeaderBarItemBits, 0x7fff> {}; +} // - HeaderBar-Types - @@ -304,7 +307,7 @@ public: virtual void DoubleClick(); void InsertItem( sal_uInt16 nItemId, const OUString& rText, - long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, + long nSize, HeaderBarItemBits nBits = HeaderBarItemBits::STDSTYLE, sal_uInt16 nPos = HEADERBAR_APPEND ); void RemoveItem( sal_uInt16 nItemId ); void MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos ); diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index b8414851256c..e3fc9f9cb929 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -94,7 +94,7 @@ public: void InsertHeaderEntry(const OUString& rText, sal_uInt16 nCol=HEADERBAR_APPEND, - HeaderBarItemBits nBits = HIB_STDSTYLE); + HeaderBarItemBits nBits = HeaderBarItemBits::STDSTYLE); void SetTabs(const long* pTabs, MapUnit = MAP_APPFONT); diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 2a6ff24bc5b3..c4c73b5deff7 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -25,7 +25,7 @@ ScCondFormatManagerWindow::ScCondFormatManagerWindow(SvSimpleTableContainer& rPa OUStringBuffer sHeader; sHeader.append(aRangeStr).append("\t").append(aConditionStr); - InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT | HIB_VCENTER); + InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER); setColSizes(); Init(); diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 02d3a317c397..db83be927871 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -414,7 +414,7 @@ ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScD aHeader += maStrTitleAuthor; aHeader += aTab; aHeader += maStrTitleDate; - m_pLbConflicts->InsertHeaderEntry( aHeader, HEADERBAR_APPEND, HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER ); + m_pLbConflicts->InsertHeaderEntry( aHeader, HEADERBAR_APPEND, HeaderBarItemBits::LEFT | HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::VCENTER ); m_pLbConflicts->SetStyle( m_pLbConflicts->GetStyle() | WB_HASLINES | WB_CLIPCHILDREN | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL ); m_pLbConflicts->SetSelectionMode( MULTIPLE_SELECTION ); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 911b74d3d1d8..35b1fff147fa 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -100,7 +100,7 @@ ScShareDocumentDlg::ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewD OUString aHeader(get<FixedText>("name")->GetText()); aHeader += "\t"; aHeader += get<FixedText>("accessed")->GetText(); - m_pLbUsers->InsertHeaderEntry( aHeader, HEADERBAR_APPEND, HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER ); + m_pLbUsers->InsertHeaderEntry( aHeader, HEADERBAR_APPEND, HeaderBarItemBits::LEFT | HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::VCENTER ); m_pLbUsers->SetSelectionMode( NO_SELECTION ); UpdateView(); diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 1f37f67291e4..fbe6cba61cad 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -49,9 +49,9 @@ ScRangeManagerTable::ScRangeManagerTable( SvSimpleTableContainer& rParent, boost OUString aScopeStr(ScGlobal::GetRscString(STR_HEADER_SCOPE)); HeaderBar& rHeaderBar = GetTheHeaderBar(); - rHeaderBar.InsertItem( ITEMID_NAME, aNameStr, 0, HIB_LEFT| HIB_VCENTER ); - rHeaderBar.InsertItem( ITEMID_RANGE, aRangeStr, 0, HIB_LEFT| HIB_VCENTER ); - rHeaderBar.InsertItem( ITEMID_SCOPE, aScopeStr, 0, HIB_LEFT| HIB_VCENTER ); + rHeaderBar.InsertItem( ITEMID_NAME, aNameStr, 0, HeaderBarItemBits::LEFT| HeaderBarItemBits::VCENTER ); + rHeaderBar.InsertItem( ITEMID_RANGE, aRangeStr, 0, HeaderBarItemBits::LEFT| HeaderBarItemBits::VCENTER ); + rHeaderBar.InsertItem( ITEMID_SCOPE, aScopeStr, 0, HeaderBarItemBits::LEFT| HeaderBarItemBits::VCENTER ); rHeaderBar.SetEndDragHdl( LINK( this, ScRangeManagerTable, HeaderEndDragHdl ) ); setColWidths(); diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 4317295fd248..b10cd7c9fc52 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -2009,7 +2009,7 @@ void CustomPropertiesControl::Init(VclBuilderContainer& rBuilder) m_pHeaderBar->set_height_request(GetTextHeight() + 6); - const HeaderBarItemBits nHeadBits = HIB_VCENTER | HIB_FIXED | HIB_FIXEDPOS | HIB_LEFT; + const HeaderBarItemBits nHeadBits = HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXED | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::LEFT; m_pHeaderBar->InsertItem( HI_NAME, sName, 0, nHeadBits ); m_pHeaderBar->InsertItem( HI_TYPE, sType, 0, nHeadBits ); diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 403f581efd34..8da102ca1355 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -244,8 +244,8 @@ SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, bool bIsSaveVersion m_pVersionBox->InsertHeaderEntry(sHeader.makeStringAndClear()); HeaderBar &rBar = m_pVersionBox->GetTheHeaderBar(); - HeaderBarItemBits nBits = rBar.GetItemBits(1) | HIB_FIXEDPOS | HIB_FIXED; - nBits &= ~HIB_CLICKABLE; + HeaderBarItemBits nBits = rBar.GetItemBits(1) | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED; + nBits &= ~HeaderBarItemBits::CLICKABLE; rBar.SetItemBits(1, nBits); rBar.SetItemBits(2, nBits); rBar.SetItemBits(3, nBits); @@ -537,8 +537,8 @@ SfxCmisVersionsDialog::SfxCmisVersionsDialog ( SfxViewFrame* pVwFrame, bool bIsS m_pVersionBox->InsertHeaderEntry(sHeader.makeStringAndClear()); HeaderBar &rBar = m_pVersionBox->GetTheHeaderBar(); - HeaderBarItemBits nBits = rBar.GetItemBits(1) | HIB_FIXEDPOS | HIB_FIXED; - nBits &= ~HIB_CLICKABLE; + HeaderBarItemBits nBits = rBar.GetItemBits(1) | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED; + nBits &= ~HeaderBarItemBits::CLICKABLE; rBar.SetItemBits(1, nBits); rBar.SetItemBits(2, nBits); rBar.SetItemBits(3, nBits); diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index c9b762d4d461..7c13d24fa146 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -1166,7 +1166,7 @@ namespace svt if (!w) w = GetDefaultColumnWidth(rName); - InsertDataColumn(nId, rName, w, (HIB_CENTER | HIB_VCENTER | HIB_CLICKABLE), nPos); + InsertDataColumn(nId, rName, w, (HeaderBarItemBits::CENTER | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE), nPos); return nId; } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index f957cd725e33..70471b08ea5d 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -599,13 +599,13 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin, mpHeaderBar = new HeaderBar( pParentWin, WB_BUTTONSTYLE | WB_BOTTOMBORDER ); mpHeaderBar->SetPosSizePixel( Point( 0, 0 ), mpHeaderBar->CalcWindowSizePixel() ); - HeaderBarItemBits nBits = ( HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE ); + HeaderBarItemBits nBits = ( HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE ); if (nFlags & FileViewFlags::SHOW_ONLYTITLE) { long pTabs[] = { 2, 20, 600 }; SetTabs(&pTabs[0], MAP_PIXEL); - mpHeaderBar->InsertItem(COLUMN_TITLE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_TITLE), 600, nBits | HIB_UPARROW); + mpHeaderBar->InsertItem(COLUMN_TITLE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_TITLE), 600, nBits | HeaderBarItemBits::UPARROW); } else { @@ -613,7 +613,7 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin, SetTabs(&pTabs[0], MAP_PIXEL); SetTabJustify(2, AdjustRight); // column "Size" - mpHeaderBar->InsertItem(COLUMN_TITLE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_TITLE), 180, nBits | HIB_UPARROW); + mpHeaderBar->InsertItem(COLUMN_TITLE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_TITLE), 180, nBits | HeaderBarItemBits::UPARROW); mpHeaderBar->InsertItem(COLUMN_TYPE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_TYPE), 140, nBits); mpHeaderBar->InsertItem(COLUMN_SIZE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_SIZE), 80, nBits); mpHeaderBar->InsertItem(COLUMN_DATE, SVT_RESSTR(STR_SVT_FILEVIEW_COLUMN_DATE), 500, nBits); @@ -1391,23 +1391,23 @@ IMPL_LINK( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar ) mpImp->mnSortColumn = COLUMN_TITLE; } nBits = pBar->GetItemBits( mpImp->mnSortColumn ); - nBits &= ~( HIB_UPARROW | HIB_DOWNARROW ); + nBits &= ~HeaderBarItemBits( HeaderBarItemBits::UPARROW | HeaderBarItemBits::DOWNARROW ); pBar->SetItemBits( mpImp->mnSortColumn, nBits ); } nBits = pBar->GetItemBits( nItemID ); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } pBar->SetItemBits( nItemID, nBits ); @@ -1447,7 +1447,7 @@ OUString SvtFileView::GetConfigString() const sRet += OUString::number( mpImp->mnSortColumn ); sRet += ";"; HeaderBarItemBits nBits = pBar->GetItemBits( mpImp->mnSortColumn ); - bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW ); + bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); sRet += bUp ? OUString("1") : OUString("0"); sRet += ";"; @@ -1478,13 +1478,13 @@ void SvtFileView::SetConfigString( const OUString& rCfgStr ) if ( bUp ) { - nBits &= ~HIB_UPARROW; - nBits |= HIB_DOWNARROW; + nBits &= ~HeaderBarItemBits::UPARROW; + nBits |= HeaderBarItemBits::DOWNARROW; } else { - nBits &= ~HIB_DOWNARROW; - nBits |= HIB_UPARROW; + nBits &= ~HeaderBarItemBits::DOWNARROW; + nBits |= HeaderBarItemBits::UPARROW; } pBar->SetItemBits( mpImp->mnSortColumn, nBits ); diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 1b2754b9b915..511a70046bb4 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -264,19 +264,19 @@ sal_uInt16 SvSimpleTable::GetSelectedCol() void SvSimpleTable::SortByCol(sal_uInt16 nCol, bool bDir) { if(nSortCol!=0xFFFF) - aHeaderBar.SetItemBits(nSortCol+1,HIB_STDSTYLE); + aHeaderBar.SetItemBits(nSortCol+1,HeaderBarItemBits::STDSTYLE); if (nCol != 0xFFFF) { if(bDir || nSortCol != nCol) { - aHeaderBar.SetItemBits( nCol+1, HIB_STDSTYLE | HIB_DOWNARROW); + aHeaderBar.SetItemBits( nCol+1, HeaderBarItemBits::STDSTYLE | HeaderBarItemBits::DOWNARROW); GetModel()->SetSortMode(SortAscending); bDir = true; } else { - aHeaderBar.SetItemBits( nCol+1, HIB_STDSTYLE | HIB_UPARROW); + aHeaderBar.SetItemBits( nCol+1, HeaderBarItemBits::STDSTYLE | HeaderBarItemBits::UPARROW); GetModel()->SetSortMode(SortDescending); } @@ -304,7 +304,7 @@ void SvSimpleTable::HBarClick() { sal_uInt16 nId=aHeaderBar.GetCurItemId(); - if (aHeaderBar.GetItemBits(nId) & HIB_CLICKABLE) + if (aHeaderBar.GetItemBits(nId) & HeaderBarItemBits::CLICKABLE) { if(nId==nSortCol+1) { diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 1f58281bcc45..79393103dc4f 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -210,7 +210,7 @@ sal_uInt16 HeaderBar::ImplHitTest( const Point& rPos, { nPos = i; - if ( !(pItem->mnBits & HIB_FIXED) && (rPos.X() >= (nX+pItem->mnSize-HEADERBAR_SPLITOFF)) ) + if ( !(pItem->mnBits & HeaderBarItemBits::FIXED) && (rPos.X() >= (nX+pItem->mnSize-HEADERBAR_SPLITOFF)) ) { nMode = HEAD_HITTEST_DIVIDER; nMouseOff = rPos.X()-(nX+pItem->mnSize); @@ -225,7 +225,7 @@ sal_uInt16 HeaderBar::ImplHitTest( const Point& rPos, return nMode; } - if ( pItem->mnBits & HIB_FIXED ) + if ( pItem->mnBits & HeaderBarItemBits::FIXED ) bLastFixed = true; else bLastFixed = false; @@ -386,7 +386,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, // avoid 3D borders if( bHigh ) DrawSelectionBackground( aRect, 1, true, false, false, &aSelectionTextColor ); - else if ( !mbButtonStyle || (nBits & HIB_FLAT) ) + else if ( !mbButtonStyle || (nBits & HeaderBarItemBits::FLAT) ) DrawSelectionBackground( aRect, 0, true, false, false, &aSelectionTextColor ); } @@ -401,12 +401,12 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, if (!pItem->maOutText.isEmpty()) aTxtSize.Height() = pDev->GetTextHeight(); long nArrowWidth = 0; - if ( nBits & (HIB_UPARROW | HIB_DOWNARROW) ) + if ( nBits & (HeaderBarItemBits::UPARROW | HeaderBarItemBits::DOWNARROW) ) nArrowWidth = HEAD_ARROWSIZE2+HEADERBAR_ARROWOFF; // do not draw if there is not enough space for the image long nTestHeight = aImageSize.Height(); - if ( !(nBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE)) ) + if ( !(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE)) ) nTestHeight += aTxtSize.Height(); if ( (aImageSize.Width() > aRect.GetWidth()) || (nTestHeight > aRect.GetHeight()) ) { @@ -417,7 +417,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, // cut text to correct length bool bLeftText = false; long nMaxTxtWidth = aRect.GetWidth()-(HEADERBAR_TEXTOFF*2)-nArrowWidth; - if ( nBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE) ) + if ( nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE) ) nMaxTxtWidth -= aImageSize.Width(); long nTxtWidth = aTxtSize.Width(); if ( nTxtWidth > nMaxTxtWidth ) @@ -441,26 +441,26 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, // calculate text/imageposition long nTxtPos; - if ( !bLeftText && (nBits & HIB_RIGHT) ) + if ( !bLeftText && (nBits & HeaderBarItemBits::RIGHT) ) { nTxtPos = aRect.Right()-nTxtWidth-HEADERBAR_TEXTOFF; - if ( nBits & HIB_RIGHTIMAGE ) + if ( nBits & HeaderBarItemBits::RIGHTIMAGE ) nTxtPos -= aImageSize.Width(); } - else if ( !bLeftText && (nBits & HIB_CENTER) ) + else if ( !bLeftText && (nBits & HeaderBarItemBits::CENTER) ) { long nTempWidth = nTxtWidth; - if ( nBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE) ) + if ( nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE) ) nTempWidth += aImageSize.Width(); nTxtPos = aRect.Left()+(aRect.GetWidth()-nTempWidth)/2; - if ( nBits & HIB_LEFTIMAGE ) + if ( nBits & HeaderBarItemBits::LEFTIMAGE ) nTxtPos += aImageSize.Width(); if ( nArrowWidth ) { if ( nTxtPos+nTxtWidth+nArrowWidth >= aRect.Right() ) { nTxtPos = aRect.Left()+HEADERBAR_TEXTOFF; - if ( nBits & HIB_LEFTIMAGE ) + if ( nBits & HeaderBarItemBits::LEFTIMAGE ) nTxtPos += aImageSize.Width(); } } @@ -468,9 +468,9 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, else { nTxtPos = aRect.Left()+HEADERBAR_TEXTOFF; - if ( nBits & HIB_LEFTIMAGE ) + if ( nBits & HeaderBarItemBits::LEFTIMAGE ) nTxtPos += aImageSize.Width(); - if ( nBits & HIB_RIGHT ) + if ( nBits & HeaderBarItemBits::RIGHT ) nTxtPos += nArrowWidth; } @@ -478,21 +478,21 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, long nTxtPosY = 0; if ( !pItem->maOutText.isEmpty() || (nArrowWidth && aTxtSize.Height()) ) { - if ( nBits & HIB_TOP ) + if ( nBits & HeaderBarItemBits::TOP ) { nTxtPosY = aRect.Top(); - if ( !(nBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE)) ) + if ( !(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE)) ) nTxtPosY += aImageSize.Height(); } - else if ( nBits & HIB_BOTTOM ) + else if ( nBits & HeaderBarItemBits::BOTTOM ) nTxtPosY = aRect.Bottom()-aTxtSize.Height(); else { long nTempHeight = aTxtSize.Height(); - if ( !(nBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE)) ) + if ( !(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE)) ) nTempHeight += aImageSize.Height(); nTxtPosY = aRect.Top()+((aRect.GetHeight()-nTempHeight)/2); - if ( !(nBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE)) ) + if ( !(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE)) ) nTxtPosY += aImageSize.Height(); } } @@ -518,40 +518,40 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, if ( aImageSize.Width() && aImageSize.Height() ) { long nImagePos = nTxtPos; - if ( nBits & HIB_LEFTIMAGE ) + if ( nBits & HeaderBarItemBits::LEFTIMAGE ) { nImagePos -= aImageSize.Width(); - if ( nBits & HIB_RIGHT ) + if ( nBits & HeaderBarItemBits::RIGHT ) nImagePos -= nArrowWidth; } - else if ( nBits & HIB_RIGHTIMAGE ) + else if ( nBits & HeaderBarItemBits::RIGHTIMAGE ) { nImagePos += nTxtWidth; - if ( !(nBits & HIB_RIGHT) ) + if ( !(nBits & HeaderBarItemBits::RIGHT) ) nImagePos += nArrowWidth; } else { - if ( nBits & HIB_RIGHT ) + if ( nBits & HeaderBarItemBits::RIGHT ) nImagePos = aRect.Right()-aImageSize.Width(); - else if ( nBits & HIB_CENTER ) + else if ( nBits & HeaderBarItemBits::CENTER ) nImagePos = aRect.Left()+(aRect.GetWidth()-aImageSize.Width())/2; else nImagePos = aRect.Left()+HEADERBAR_TEXTOFF; } - if ( nBits & HIB_TOP ) + if ( nBits & HeaderBarItemBits::TOP ) nImagePosY = aRect.Top(); - else if ( nBits & HIB_BOTTOM ) + else if ( nBits & HeaderBarItemBits::BOTTOM ) { nImagePosY = aRect.Bottom()-aImageSize.Height(); - if ( !(nBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE)) ) + if ( !(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE)) ) nImagePosY -= aTxtSize.Height(); } else { long nTempHeight = aImageSize.Height(); - if ( !(nBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE)) ) + if ( !(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE)) ) nTempHeight += aTxtSize.Height(); nImagePosY = aRect.Top()+((aRect.GetHeight()-nTempHeight)/2); } @@ -564,16 +564,16 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, } } - if ( nBits & (HIB_UPARROW | HIB_DOWNARROW) ) + if ( nBits & (HeaderBarItemBits::UPARROW | HeaderBarItemBits::DOWNARROW) ) { long nArrowX = nTxtPos; - if ( nBits & HIB_RIGHT ) + if ( nBits & HeaderBarItemBits::RIGHT ) nArrowX -= nArrowWidth; else nArrowX += nTxtWidth+HEADERBAR_ARROWOFF; - if ( !(nBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE)) && pItem->maText.isEmpty() ) + if ( !(nBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE)) && pItem->maText.isEmpty() ) { - if ( nBits & HIB_RIGHT ) + if ( nBits & HeaderBarItemBits::RIGHT ) nArrowX -= aImageSize.Width(); else nArrowX += aImageSize.Width(); @@ -592,7 +592,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, { aCtrlRegion=Rectangle(Point(nArrowX,aRect.Top()),Size(nArrowWidth,aRect.GetHeight())); // control value passes 1 if arrow points down, 0 otherwise - aControlValue.setNumericVal((nBits&HIB_DOWNARROW)?1:0); + aControlValue.setNumericVal((nBits&HeaderBarItemBits::DOWNARROW)?1:0); nState|=ControlState::ENABLED; if(bHigh) nState|=ControlState::PRESSED; @@ -609,15 +609,15 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, nArrowY = nImagePosY+(aImageSize.Height()/2); else { - if ( nBits & HIB_TOP ) + if ( nBits & HeaderBarItemBits::TOP ) nArrowY = aRect.Top()+1; - else if ( nBits & HIB_BOTTOM ) + else if ( nBits & HeaderBarItemBits::BOTTOM ) nArrowY = aRect.Bottom()-HEAD_ARROWSIZE2-1; else nArrowY = aRect.Top()+((aRect.GetHeight()-HEAD_ARROWSIZE2)/2); } nArrowY -= HEAD_ARROWSIZE1-1; - if ( nBits & HIB_DOWNARROW ) + if ( nBits & HeaderBarItemBits::DOWNARROW ) { pDev->SetLineColor( rStyleSettings.GetLightColor() ); pDev->DrawLine( Point( nArrowX, nArrowY ), @@ -711,8 +711,8 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, bool bCommand ) mbDrag = true; else { - if ( ((pItem->mnBits & HIB_CLICKABLE) && !(pItem->mnBits & HIB_FLAT)) || - (mbDragable && !(pItem->mnBits & HIB_FIXEDPOS)) ) + if ( ((pItem->mnBits & HeaderBarItemBits::CLICKABLE) && !(pItem->mnBits & HeaderBarItemBits::FLAT)) || + (mbDragable && !(pItem->mnBits & HeaderBarItemBits::FIXEDPOS)) ) { mbItemMode = true; mbDrag = true; @@ -779,7 +779,7 @@ void HeaderBar::ImplDrag( const Point& rMousePos ) // if needed switch on ItemDrag if ( bNewOutDrag && mbDragable && !mbItemDrag && - !((*mpItemList)[ nPos ]->mnBits & HIB_FIXEDPOS) ) + !((*mpItemList)[ nPos ]->mnBits & HeaderBarItemBits::FIXEDPOS) ) { if ( (rMousePos.Y() >= aItemRect.Top()) && (rMousePos.Y() <= aItemRect.Bottom()) ) { @@ -814,13 +814,13 @@ void HeaderBar::ImplDrag( const Point& rMousePos ) // do not use non-movable items if ( mnItemDragPos < nPos ) { - while ( ((*mpItemList)[ mnItemDragPos ]->mnBits & HIB_FIXEDPOS) && + while ( ((*mpItemList)[ mnItemDragPos ]->mnBits & HeaderBarItemBits::FIXEDPOS) && (mnItemDragPos < nPos) ) mnItemDragPos++; } else if ( mnItemDragPos > nPos ) { - while ( ((*mpItemList)[ mnItemDragPos ]->mnBits & HIB_FIXEDPOS) && + while ( ((*mpItemList)[ mnItemDragPos ]->mnBits & HeaderBarItemBits::FIXEDPOS) && (mnItemDragPos > nPos) ) mnItemDragPos--; } @@ -1420,7 +1420,7 @@ HeaderBarItemBits HeaderBar::GetItemBits( sal_uInt16 nItemId ) const if ( nPos != HEADERBAR_ITEM_NOTFOUND ) return (*mpItemList)[ nPos ]->mnBits; else - return 0; + return HeaderBarItemBits::NONE; } @@ -1489,7 +1489,7 @@ Size HeaderBar::CalcWindowSizePixel() const ImplHeadItem* pItem = (*mpItemList)[ i ]; // take image size into account long nImageHeight = pItem->maImage.GetSizePixel().Height(); - if ( !(pItem->mnBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE)) && !pItem->maText.isEmpty() ) + if ( !(pItem->mnBits & (HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::RIGHTIMAGE)) && !pItem->maText.isEmpty() ) nImageHeight += aSize.Height(); if ( nImageHeight > nMaxImageSize ) nMaxImageSize = nImageHeight; diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index a7af35a61b03..55b03309ed2c 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1425,14 +1425,14 @@ void FmGridControl::markColumn(sal_uInt16 nId) // deselektieren if (m_nMarkedColumnId != BROWSER_INVALIDID) { - HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(m_nMarkedColumnId) & ~HIB_FLAT; + HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(m_nMarkedColumnId) & ~HeaderBarItemBits::FLAT; GetHeaderBar()->SetItemBits(m_nMarkedColumnId, aBits); } if (nId != BROWSER_INVALIDID) { - HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(nId) | HIB_FLAT; + HeaderBarItemBits aBits = GetHeaderBar()->GetItemBits(nId) | HeaderBarItemBits::FLAT; GetHeaderBar()->SetItemBits(nId, aBits); } m_nMarkedColumnId = nId; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index f419f6280bdf..4ac024586375 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -3352,7 +3352,7 @@ void DbGridControl::ShowColumn(sal_uInt16 nId) OUString aName; pColumn->getModel()->getPropertyValue(FM_PROP_LABEL) >>= aName; - InsertDataColumn(nId, aName, CalcZoom(pColumn->m_nLastVisibleWidth), HIB_CENTER | HIB_VCENTER | HIB_CLICKABLE, nNewViewPos); + InsertDataColumn(nId, aName, CalcZoom(pColumn->m_nLastVisibleWidth), HeaderBarItemBits::CENTER | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE, nNewViewPos); pColumn->m_bHidden = false; ActivateCell(); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 8ecf292a752d..3e77a89b03f6 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2856,7 +2856,7 @@ namespace svxform sHeader += "\t"; sHeader += get<FixedText>("url")->GetText(); m_pNamespacesList->InsertHeaderEntry( - sHeader, HEADERBAR_APPEND, HIB_LEFT /*| HIB_FIXEDPOS | HIB_FIXED*/ ); + sHeader, HEADERBAR_APPEND, HeaderBarItemBits::LEFT /*| HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED*/ ); m_pNamespacesList->SetSelectHdl( LINK( this, NamespaceItemDialog, SelectHdl ) ); Link aLink = LINK( this, NamespaceItemDialog, ClickHdl ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index da04cd6628dc..9d8b6e68b5bd 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -47,7 +47,7 @@ namespace textconversiondlgs using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -#define HEADER_BAR_BITS ( HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_FIXED | HIB_FIXEDPOS ) +#define HEADER_BAR_BITS ( HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::FIXED | HeaderBarItemBits::FIXEDPOS ) DictionaryList::DictionaryList(SvSimpleTableContainer& rParent, WinBits nBits) : SvSimpleTable(rParent, nBits) @@ -406,7 +406,7 @@ void DictionaryList::init(const Reference< linguistic2::XConversionDictionary>& long nWidth3 = m_pLB_Property->get_preferred_size().Width(); HeaderBarItemBits nBits = HEADER_BAR_BITS; - rHeaderBar.InsertItem( 1, aColumn1, nWidth1, nBits | HIB_UPARROW ); + rHeaderBar.InsertItem( 1, aColumn1, nWidth1, nBits | HeaderBarItemBits::UPARROW ); rHeaderBar.InsertItem( 2, aColumn2, nWidth2, nBits ); rHeaderBar.InsertItem( 3, aColumn3, nWidth3, nBits ); @@ -795,18 +795,18 @@ IMPL_LINK(ChineseDictionaryDialog, HeaderBarClick, HeaderBar*, pHeaderBar) { sal_uInt16 nId = pHeaderBar->GetCurItemId(); HeaderBarItemBits nBits = pHeaderBar->GetItemBits(nId); - if( nBits & HIB_CLICKABLE ) + if( nBits & HeaderBarItemBits::CLICKABLE ) { //set new arrow positions in headerbar pHeaderBar->SetItemBits( getActiveDictionary().getSortColumn()+1, HEADER_BAR_BITS ); - if( nBits & HIB_UPARROW ) - pHeaderBar->SetItemBits( nId, HEADER_BAR_BITS | HIB_DOWNARROW ); + if( nBits & HeaderBarItemBits::UPARROW ) + pHeaderBar->SetItemBits( nId, HEADER_BAR_BITS | HeaderBarItemBits::DOWNARROW ); else - pHeaderBar->SetItemBits( nId, HEADER_BAR_BITS | HIB_UPARROW ); + pHeaderBar->SetItemBits( nId, HEADER_BAR_BITS | HeaderBarItemBits::UPARROW ); //sort lists nBits = pHeaderBar->GetItemBits(nId); - bool bSortAtoZ = nBits & HIB_UPARROW; + bool bSortAtoZ = bool(nBits & HeaderBarItemBits::UPARROW); getActiveDictionary().sortByColumn(nId-1,bSortAtoZ); getReverseDictionary().sortByColumn(nId-1,bSortAtoZ); } 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() |