diff options
Diffstat (limited to 'cui/source/tabpages/measure.cxx')
| -rw-r--r-- | cui/source/tabpages/measure.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index e27e1c8d9970..16585eff9bcd 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -86,11 +86,11 @@ SvxMeasurePage::SvxMeasurePage(TabPageParent pWindow, const SfxItemSet& rInAttrs , eUnit(MapUnit::Map100thMM) , bPositionModified(false) , m_aCtlPosition(this) - , m_xMtrFldLineDist(m_xBuilder->weld_metric_spin_button("MTR_LINE_DIST", FUNIT_MM)) - , m_xMtrFldHelplineOverhang(m_xBuilder->weld_metric_spin_button("MTR_FLD_HELPLINE_OVERHANG", FUNIT_MM)) - , m_xMtrFldHelplineDist(m_xBuilder->weld_metric_spin_button("MTR_FLD_HELPLINE_DIST", FUNIT_MM)) - , m_xMtrFldHelpline1Len(m_xBuilder->weld_metric_spin_button("MTR_FLD_HELPLINE1_LEN", FUNIT_MM)) - , m_xMtrFldHelpline2Len(m_xBuilder->weld_metric_spin_button("MTR_FLD_HELPLINE2_LEN", FUNIT_MM)) + , m_xMtrFldLineDist(m_xBuilder->weld_metric_spin_button("MTR_LINE_DIST", FieldUnit::MM)) + , m_xMtrFldHelplineOverhang(m_xBuilder->weld_metric_spin_button("MTR_FLD_HELPLINE_OVERHANG", FieldUnit::MM)) + , m_xMtrFldHelplineDist(m_xBuilder->weld_metric_spin_button("MTR_FLD_HELPLINE_DIST", FieldUnit::MM)) + , m_xMtrFldHelpline1Len(m_xBuilder->weld_metric_spin_button("MTR_FLD_HELPLINE1_LEN", FieldUnit::MM)) + , m_xMtrFldHelpline2Len(m_xBuilder->weld_metric_spin_button("MTR_FLD_HELPLINE2_LEN", FieldUnit::MM)) , m_xTsbBelowRefEdge(m_xBuilder->weld_check_button("TSB_BELOW_REF_EDGE")) , m_xMtrFldDecimalPlaces(m_xBuilder->weld_spin_button("MTR_FLD_DECIMALPLACES")) , m_xTsbAutoPosV(m_xBuilder->weld_check_button("TSB_AUTOPOSV")) @@ -112,13 +112,13 @@ SvxMeasurePage::SvxMeasurePage(TabPageParent pWindow, const SfxItemSet& rInAttrs SetFieldUnit( *m_xMtrFldHelplineDist, eFUnit ); SetFieldUnit( *m_xMtrFldHelpline1Len, eFUnit ); SetFieldUnit( *m_xMtrFldHelpline2Len, eFUnit ); - if( eFUnit == FUNIT_MM ) + if( eFUnit == FieldUnit::MM ) { - m_xMtrFldLineDist->set_increments(50, 500, FUNIT_NONE); - m_xMtrFldHelplineOverhang->set_increments(50, 500, FUNIT_NONE); - m_xMtrFldHelplineDist->set_increments(50, 500, FUNIT_NONE); - m_xMtrFldHelpline1Len->set_increments(50, 500, FUNIT_NONE); - m_xMtrFldHelpline2Len->set_increments(50, 500, FUNIT_NONE); + m_xMtrFldLineDist->set_increments(50, 500, FieldUnit::NONE); + m_xMtrFldHelplineOverhang->set_increments(50, 500, FieldUnit::NONE); + m_xMtrFldHelplineDist->set_increments(50, 500, FieldUnit::NONE); + m_xMtrFldHelpline1Len->set_increments(50, 500, FieldUnit::NONE); + m_xMtrFldHelpline2Len->set_increments(50, 500, FieldUnit::NONE); } m_xTsbAutoPosV->connect_toggled(LINK( this, SvxMeasurePage, ClickAutoPosHdl_Impl)); @@ -746,15 +746,15 @@ void SvxMeasurePage::FillUnitLB() { // fill ListBox with metrics - FieldUnit nUnit = FUNIT_NONE; + FieldUnit nUnit = FieldUnit::NONE; OUString aStrMetric(m_xFtAutomatic->get_label()); - m_xLbUnit->append(OUString::number(nUnit), aStrMetric); + m_xLbUnit->append(OUString::number(sal_uInt32(nUnit)), aStrMetric); for( sal_uInt32 i = 0; i < SvxFieldUnitTable::Count(); ++i ) { aStrMetric = SvxFieldUnitTable::GetString(i); nUnit = SvxFieldUnitTable::GetValue(i); - m_xLbUnit->append(OUString::number(nUnit), aStrMetric); + m_xLbUnit->append(OUString::number(sal_uInt32(nUnit)), aStrMetric); } } |