diff options
Diffstat (limited to 'sw/source/ui/config/optload.cxx')
| -rw-r--r-- | sw/source/ui/config/optload.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 77f8bd0813d9..43ab57535bec 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -79,7 +79,7 @@ FieldUnit SwFieldUnitTable::GetValue(sal_uInt32 nPos) { if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count()) return STR_ARR_METRIC[nPos].second; - return FUNIT_NONE; + return FieldUnit::NONE; } SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet) @@ -109,11 +109,11 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet) switch ( eFUnit ) { - case FUNIT_MM: - case FUNIT_CM: - case FUNIT_POINT: - case FUNIT_PICA: - case FUNIT_INCH: + case FieldUnit::MM: + case FieldUnit::CM: + case FieldUnit::POINT: + case FieldUnit::PICA: + case FieldUnit::INCH: { // use only these metrics sal_Int32 nPos = m_pMetricLB->InsertEntry( sMetric ); @@ -228,7 +228,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet ) if(m_pTabMF->IsVisible() && m_pTabMF->IsValueChangedFromSaved()) { rSet->Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, - static_cast<sal_uInt16>(m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP))))); + static_cast<sal_uInt16>(m_pTabMF->Denormalize(m_pTabMF->GetValue(FieldUnit::TWIP))))); bRet = true; } @@ -340,7 +340,7 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet) if(SfxItemState::SET == rSet->GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem)) { m_nLastTab = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); - m_pTabMF->SetValue(m_pTabMF->Normalize(m_nLastTab), FUNIT_TWIP); + m_pTabMF->SetValue(m_pTabMF->Normalize(m_nLastTab), FieldUnit::TWIP); } m_pTabMF->SaveValue(); @@ -384,10 +384,10 @@ IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl, ListBox&, void) FieldUnit eFieldUnit = static_cast<FieldUnit>(reinterpret_cast<sal_IntPtr>(m_pMetricLB->GetEntryData( nMPos ))); bool bModified = m_pTabMF->IsModified(); long nVal = bModified ? - sal::static_int_cast<sal_Int32, sal_Int64 >( m_pTabMF->Denormalize( m_pTabMF->GetValue( FUNIT_TWIP ) )) : + sal::static_int_cast<sal_Int32, sal_Int64 >( m_pTabMF->Denormalize( m_pTabMF->GetValue( FieldUnit::TWIP ) )) : m_nLastTab; ::SetFieldUnit( *m_pTabMF, eFieldUnit ); - m_pTabMF->SetValue( m_pTabMF->Normalize( nVal ), FUNIT_TWIP ); + m_pTabMF->SetValue( m_pTabMF->Normalize( nVal ), FieldUnit::TWIP ); if(!bModified) m_pTabMF->ClearModifyFlag(); } |