summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-20 10:24:32 +0200
committerNoel Grandin <noel@peralex.com>2015-04-22 10:28:40 +0200
commit321d924f157ffbe05b9a9286ac7cb9d5f6bfe45c (patch)
tree71a5c44ad98d44baca8ff2e177995dbf852589f9 /svx
parent2ba352107abc44d2f9360874005c18b256c8707b (diff)
convert HIB_ constants to scoped enum
Change-Id: I6fa3ecde4a1c5f9c7e6e1dcd22250cba065933e3
Diffstat (limited to 'svx')
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx4
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
-rw-r--r--svx/source/form/datanavi.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx14
4 files changed, 11 insertions, 11 deletions
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);
}