diff options
Diffstat (limited to 'sw/source/ui/config/optpage.cxx')
| -rw-r--r-- | sw/source/ui/config/optpage.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 526bc089aad2..02eb3015af0b 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -141,18 +141,18 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent, switch ( eFUnit ) { - case FUNIT_MM: - case FUNIT_CM: - case FUNIT_POINT: - case FUNIT_PICA: - case FUNIT_INCH: - case FUNIT_CHAR: // add two units , 'character' and 'line' , their ticks are not fixed - case FUNIT_LINE: + case FieldUnit::MM: + case FieldUnit::CM: + case FieldUnit::POINT: + case FieldUnit::PICA: + case FieldUnit::INCH: + case FieldUnit::CHAR: // add two units , 'character' and 'line' , their ticks are not fixed + case FieldUnit::LINE: { // only use these metrics // a horizontal ruler has not the 'line' unit // there isn't 'line' unit in HTML format - if ( eFUnit != FUNIT_LINE ) + if ( eFUnit != FieldUnit::LINE ) { sal_Int32 nPos = m_pMetricLB->InsertEntry( sMetric ); m_pMetricLB->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_IntPtr>(eFUnit)) ); @@ -160,7 +160,7 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent, m_pHMetric->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_IntPtr>(eFUnit)) ); } // a vertical ruler has not the 'character' unit - if ( eFUnit != FUNIT_CHAR ) + if ( eFUnit != FieldUnit::CHAR ) { sal_Int32 nPos = m_pVMetric->InsertEntry( sMetric ); m_pVMetric->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_IntPtr>(eFUnit)) ); @@ -1010,13 +1010,13 @@ IMPL_LINK( SwStdFontTabPage, ModifyHeightHdl, Edit&, rBox, void ) { if(&rBox == m_pStandardHeightLB) { - sal_Int64 nValue = static_cast<FontSizeBox&>(rBox).GetValue(FUNIT_TWIP); + sal_Int64 nValue = static_cast<FontSizeBox&>(rBox).GetValue(FieldUnit::TWIP); if(m_bSetListHeightDefault && m_bListHeightDefault) - m_pListHeightLB->SetValue(nValue, FUNIT_TWIP); + m_pListHeightLB->SetValue(nValue, FieldUnit::TWIP); if(m_bSetLabelHeightDefault && m_bLabelHeightDefault) - m_pLabelHeightLB->SetValue(nValue, FUNIT_TWIP); + m_pLabelHeightLB->SetValue(nValue, FieldUnit::TWIP); if(m_bSetIndexHeightDefault && m_bIndexHeightDefault) - m_pIndexHeightLB->SetValue(nValue, FUNIT_TWIP); + m_pIndexHeightLB->SetValue(nValue, FieldUnit::TWIP); } else if(&rBox == m_pListHeightLB) { @@ -1130,16 +1130,16 @@ bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); if(m_pRowMoveMF->IsModified()) - pModOpt->SetTableHMove( static_cast<sal_uInt16>(m_pRowMoveMF->Denormalize( m_pRowMoveMF->GetValue(FUNIT_TWIP)))); + pModOpt->SetTableHMove( static_cast<sal_uInt16>(m_pRowMoveMF->Denormalize( m_pRowMoveMF->GetValue(FieldUnit::TWIP)))); if(m_pColMoveMF->IsModified()) - pModOpt->SetTableVMove( static_cast<sal_uInt16>(m_pColMoveMF->Denormalize( m_pColMoveMF->GetValue(FUNIT_TWIP)))); + pModOpt->SetTableVMove( static_cast<sal_uInt16>(m_pColMoveMF->Denormalize( m_pColMoveMF->GetValue(FieldUnit::TWIP)))); if(m_pRowInsertMF->IsModified()) - pModOpt->SetTableHInsert(static_cast<sal_uInt16>(m_pRowInsertMF->Denormalize( m_pRowInsertMF->GetValue(FUNIT_TWIP)))); + pModOpt->SetTableHInsert(static_cast<sal_uInt16>(m_pRowInsertMF->Denormalize( m_pRowInsertMF->GetValue(FieldUnit::TWIP)))); if(m_pColInsertMF->IsModified()) - pModOpt->SetTableVInsert(static_cast<sal_uInt16>(m_pColInsertMF->Denormalize( m_pColInsertMF->GetValue(FUNIT_TWIP)))); + pModOpt->SetTableVInsert(static_cast<sal_uInt16>(m_pColInsertMF->Denormalize( m_pColInsertMF->GetValue(FieldUnit::TWIP)))); TableChgMode eMode; if(m_pFixRB->IsChecked()) @@ -1224,10 +1224,10 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet) ::SetFieldUnit( *m_pColInsertMF, eFieldUnit ); } - m_pRowMoveMF->SetValue(m_pRowMoveMF->Normalize(pModOpt->GetTableHMove()), FUNIT_TWIP); - m_pColMoveMF->SetValue(m_pColMoveMF->Normalize(pModOpt->GetTableVMove()), FUNIT_TWIP); - m_pRowInsertMF->SetValue(m_pRowInsertMF->Normalize(pModOpt->GetTableHInsert()), FUNIT_TWIP); - m_pColInsertMF->SetValue(m_pColInsertMF->Normalize(pModOpt->GetTableVInsert()), FUNIT_TWIP); + m_pRowMoveMF->SetValue(m_pRowMoveMF->Normalize(pModOpt->GetTableHMove()), FieldUnit::TWIP); + m_pColMoveMF->SetValue(m_pColMoveMF->Normalize(pModOpt->GetTableVMove()), FieldUnit::TWIP); + m_pRowInsertMF->SetValue(m_pRowInsertMF->Normalize(pModOpt->GetTableHInsert()), FieldUnit::TWIP); + m_pColInsertMF->SetValue(m_pColInsertMF->Normalize(pModOpt->GetTableVInsert()), FieldUnit::TWIP); switch(pModOpt->GetTableMode()) { |