diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-20 14:36:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-22 10:28:41 +0200 |
| commit | f3632c2c0a53f61c9ceab39e8861d2029c0b0992 (patch) | |
| tree | c18a950280cb3b365e706b0b69a57d9e9713a263 /svtools/source | |
| parent | 2c9ee17c3b18d82680f4949d029a7caff4029c03 (diff) | |
convert COL_ATTRS_ constants to scoped enum
Change-Id: I339f0668b32be1f3b06ff788e96e58c4a6de2408
Diffstat (limited to 'svtools/source')
| -rw-r--r-- | svtools/source/table/tablecontrol_impl.cxx | 10 | ||||
| -rw-r--r-- | svtools/source/uno/unogridcolumnfacade.cxx | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index a9a7607a5c93..2d2bf0166586 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -502,13 +502,13 @@ namespace svt { namespace table void TableControl_Impl::columnChanged( ColPos const i_column, ColumnAttributeGroup const i_attributeGroup ) { ColumnAttributeGroup nGroup( i_attributeGroup ); - if ( nGroup & COL_ATTRS_APPEARANCE ) + if ( nGroup & ColumnAttributeGroup::APPEARANCE ) { impl_invalidateColumn( i_column ); - nGroup &= ~COL_ATTRS_APPEARANCE; + nGroup &= ~ColumnAttributeGroup::APPEARANCE; } - if ( nGroup & COL_ATTRS_WIDTH ) + if ( nGroup & ColumnAttributeGroup::WIDTH ) { if ( !m_bUpdatingColWidths ) { @@ -516,10 +516,10 @@ namespace svt { namespace table invalidate( TableAreaAll ); } - nGroup &= ~COL_ATTRS_WIDTH; + nGroup &= ~ColumnAttributeGroup::WIDTH; } - OSL_ENSURE( ( nGroup == COL_ATTRS_NONE ) || ( i_attributeGroup == COL_ATTRS_ALL ), + OSL_ENSURE( ( nGroup == ColumnAttributeGroup::NONE ) || ( i_attributeGroup == ColumnAttributeGroup::ALL ), "TableControl_Impl::columnChanged: don't know how to handle this change!" ); } diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx index 6b98792f3047..815e2b61a662 100644 --- a/svtools/source/uno/unogridcolumnfacade.cxx +++ b/svtools/source/uno/unogridcolumnfacade.cxx @@ -141,10 +141,10 @@ namespace svt { namespace table return; } - ColumnAttributeGroup nChangedAttributes( COL_ATTRS_NONE ); + ColumnAttributeGroup nChangedAttributes( ColumnAttributeGroup::NONE ); if ( i_event.AttributeName == "HorizontalAlign" ) - nChangedAttributes |= COL_ATTRS_APPEARANCE; + nChangedAttributes |= ColumnAttributeGroup::APPEARANCE; if ( i_event.AttributeName == "ColumnWidth" || i_event.AttributeName == "MaxWidth" @@ -153,9 +153,9 @@ namespace svt { namespace table || i_event.AttributeName == "Resizeable" || i_event.AttributeName == "Flexibility" ) - nChangedAttributes |= COL_ATTRS_WIDTH; + nChangedAttributes |= ColumnAttributeGroup::WIDTH; - OSL_ENSURE( nChangedAttributes != COL_ATTRS_NONE, + OSL_ENSURE( nChangedAttributes != ColumnAttributeGroup::NONE, "ColumnChangeMultiplexer::columnChanged: unknown column attributed changed!" ); SolarMutexGuard aGuard; |