diff options
149 files changed, 2038 insertions, 1999 deletions
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 9d958a582e86..6262bf63dba6 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -110,11 +110,11 @@ ErrorBarResources::ErrorBarResources(weld::Builder* pParent, TabPageParent pPare , m_xLbFunction(pParent->weld_combo_box("LB_FUNCTION")) , m_xFlParameters(pParent->weld_frame("framePARAMETERS")) , m_xBxPositive(pParent->weld_widget("boxPOSITIVE")) - , m_xMfPositive(pParent->weld_metric_spin_button("MF_POSITIVE", FUNIT_NONE)) + , m_xMfPositive(pParent->weld_metric_spin_button("MF_POSITIVE", FieldUnit::NONE)) , m_xEdRangePositive(pParent->weld_entry("ED_RANGE_POSITIVE")) , m_xIbRangePositive(pParent->weld_button("IB_RANGE_POSITIVE")) , m_xBxNegative(pParent->weld_widget("boxNEGATIVE")) - , m_xMfNegative(pParent->weld_metric_spin_button("MF_NEGATIVE", FUNIT_NONE)) + , m_xMfNegative(pParent->weld_metric_spin_button("MF_NEGATIVE", FieldUnit::NONE)) , m_xEdRangeNegative(pParent->weld_entry("ED_RANGE_NEGATIVE")) , m_xIbRangeNegative(pParent->weld_button("IB_RANGE_NEGATIVE")) , m_xCbSyncPosNeg(pParent->weld_check_button("CB_SYN_POS_NEG")) @@ -256,29 +256,29 @@ void ErrorBarResources::UpdateControlStates() ( m_xRbFunction->get_active()) && ( m_xLbFunction->get_active() == CHART_LB_FUNCTION_ERROR_MARGIN )); bool bIsPercentage( m_xRbPercent->get_active() || bIsErrorMargin ); - FieldUnit eFieldUnit = FUNIT_NONE; + FieldUnit eFieldUnit = FieldUnit::NONE; if( bIsPercentage ) { - eFieldUnit = FUNIT_PERCENT; + eFieldUnit = FieldUnit::PERCENT; m_xMfPositive->set_digits( 1 ); - m_xMfPositive->set_increments(10, 100, FUNIT_NONE); + m_xMfPositive->set_increments(10, 100, FieldUnit::NONE); m_xMfNegative->set_digits( 1 ); - m_xMfNegative->set_increments(10, 100, FUNIT_NONE); + m_xMfNegative->set_increments(10, 100, FieldUnit::NONE); } else { m_xMfPositive->set_digits( m_nConstDecimalDigits ); - m_xMfPositive->set_increments(m_nConstSpinSize, m_nConstSpinSize * 10, FUNIT_NONE); + m_xMfPositive->set_increments(m_nConstSpinSize, m_nConstSpinSize * 10, FieldUnit::NONE); m_xMfNegative->set_digits( m_nConstDecimalDigits ); - m_xMfNegative->set_increments(m_nConstSpinSize, m_nConstSpinSize * 10, FUNIT_NONE); + m_xMfNegative->set_increments(m_nConstSpinSize, m_nConstSpinSize * 10, FieldUnit::NONE); } sal_Int32 nPlusValue = static_cast< sal_Int32 >( m_fPlusValue * pow(10.0,m_xMfPositive->get_digits()) ); sal_Int32 nMinusValue = static_cast< sal_Int32 >( m_fMinusValue * pow(10.0,m_xMfNegative->get_digits()) ); - m_xMfPositive->set_value(nPlusValue, FUNIT_NONE); - m_xMfNegative->set_value(nMinusValue, FUNIT_NONE); + m_xMfPositive->set_value(nPlusValue, FieldUnit::NONE); + m_xMfNegative->set_value(nMinusValue, FieldUnit::NONE); m_xMfPositive->set_unit(eFieldUnit); m_xMfNegative->set_unit(eFieldUnit); @@ -392,7 +392,7 @@ IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, weld::ToggleButton&, void ) else if( m_eErrorKind != SvxChartKindError::Range && eOldError == SvxChartKindError::Range ) { - m_xCbSyncPosNeg->set_active( m_xMfPositive->get_value(FUNIT_NONE) == m_xMfNegative->get_value(FUNIT_NONE)); + m_xCbSyncPosNeg->set_active( m_xMfPositive->get_value(FieldUnit::NONE) == m_xMfNegative->get_value(FieldUnit::NONE)); } UpdateControlStates(); @@ -414,7 +414,7 @@ IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged, weld::MetricSpinButton&, voi m_bRangeNegUnique = m_bRangePosUnique; } else - m_xMfNegative->set_value(m_xMfPositive->get_value(FUNIT_NONE), FUNIT_NONE); + m_xMfNegative->set_value(m_xMfPositive->get_value(FieldUnit::NONE), FieldUnit::NONE); } } @@ -628,14 +628,14 @@ void ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const m_eErrorKind == SvxChartKindError::Percent || m_eErrorKind == SvxChartKindError::BigError ) { - double fPosValue = static_cast< double >( m_xMfPositive->get_value(FUNIT_NONE)) / + double fPosValue = static_cast< double >( m_xMfPositive->get_value(FieldUnit::NONE)) / pow( 10.0, m_xMfPositive->get_digits()); double fNegValue = 0.0; if( m_xCbSyncPosNeg->get_active()) fNegValue = fPosValue; else - fNegValue = static_cast< double >( m_xMfNegative->get_value(FUNIT_NONE)) / + fNegValue = static_cast< double >( m_xMfNegative->get_value(FieldUnit::NONE)) / pow( 10.0, m_xMfNegative->get_digits()); rOutAttrs.Put( SvxDoubleItem( fPosValue, SCHATTR_STAT_CONSTPLUS )); diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index 3821f10e51fe..2cab39c84e8e 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -43,8 +43,8 @@ SchOptionTabPage::SchOptionTabPage(TabPageParent pWindow,const SfxItemSet& rInAt , m_xRbtAxis1(m_xBuilder->weld_radio_button("RBT_OPT_AXIS_1")) , m_xRbtAxis2(m_xBuilder->weld_radio_button("RBT_OPT_AXIS_2")) , m_xGrpBar(m_xBuilder->weld_widget("frameSettings")) - , m_xMTGap(m_xBuilder->weld_metric_spin_button("MT_GAP", FUNIT_PERCENT)) - , m_xMTOverlap(m_xBuilder->weld_metric_spin_button("MT_OVERLAP", FUNIT_PERCENT)) + , m_xMTGap(m_xBuilder->weld_metric_spin_button("MT_GAP", FieldUnit::PERCENT)) + , m_xMTOverlap(m_xBuilder->weld_metric_spin_button("MT_OVERLAP", FieldUnit::PERCENT)) , m_xCBConnect(m_xBuilder->weld_check_button("CB_CONNECTOR")) , m_xCBAxisSideBySide(m_xBuilder->weld_check_button("CB_BARS_SIDE_BY_SIDE")) , m_xGrpPlotOptions(m_xBuilder->weld_widget("frameFL_PLOT_OPTIONS")) @@ -85,10 +85,10 @@ bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs) rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_PRIMARY_Y)); if(m_xMTGap->get_visible()) - rOutAttrs->Put(SfxInt32Item(SCHATTR_BAR_GAPWIDTH,static_cast< sal_Int32 >( m_xMTGap->get_value(FUNIT_PERCENT)))); + rOutAttrs->Put(SfxInt32Item(SCHATTR_BAR_GAPWIDTH,static_cast< sal_Int32 >( m_xMTGap->get_value(FieldUnit::PERCENT)))); if(m_xMTOverlap->get_visible()) - rOutAttrs->Put(SfxInt32Item(SCHATTR_BAR_OVERLAP,static_cast< sal_Int32 >( m_xMTOverlap->get_value(FUNIT_PERCENT)))); + rOutAttrs->Put(SfxInt32Item(SCHATTR_BAR_OVERLAP,static_cast< sal_Int32 >( m_xMTOverlap->get_value(FieldUnit::PERCENT)))); if(m_xCBConnect->get_visible()) rOutAttrs->Put(SfxBoolItem(SCHATTR_BAR_CONNECT,m_xCBConnect->get_active())); @@ -131,13 +131,13 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs) if (rInAttrs->GetItemState(SCHATTR_BAR_GAPWIDTH, true, &pPoolItem) == SfxItemState::SET) { nTmp = static_cast<long>(static_cast<const SfxInt32Item*>(pPoolItem)->GetValue()); - m_xMTGap->set_value(nTmp, FUNIT_PERCENT); + m_xMTGap->set_value(nTmp, FieldUnit::PERCENT); } if (rInAttrs->GetItemState(SCHATTR_BAR_OVERLAP, true, &pPoolItem) == SfxItemState::SET) { nTmp = static_cast<long>(static_cast<const SfxInt32Item*>(pPoolItem)->GetValue()); - m_xMTOverlap->set_value(nTmp, FUNIT_PERCENT); + m_xMTOverlap->set_value(nTmp, FieldUnit::PERCENT); } if (rInAttrs->GetItemState(SCHATTR_BAR_CONNECT, true, &pPoolItem) == SfxItemState::SET) diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index 0100ec109da3..dc1ba9f657a6 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -62,7 +62,7 @@ void CalcConfigItem::Notify( const uno::Sequence<OUString>& ) {} FieldUnit CalcConfigItem::getFieldUnit() { - FieldUnit eResult( FUNIT_CM ); + FieldUnit eResult( FieldUnit::CM ); uno::Sequence< OUString > aNames( 1 ); if( lcl_IsMetric() ) diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 6375a9a68f91..3e5da04a0818 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -781,13 +781,13 @@ ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, sal_In , m_xMFGreen(m_xBuilder->weld_spin_button("greenSpinbutton")) , m_xMFBlue(m_xBuilder->weld_spin_button("blueSpinbutton")) , m_xEDHex(new weld::HexColorControl(m_xBuilder->weld_entry("hexEntry"))) - , m_xMFHue(m_xBuilder->weld_metric_spin_button("hueSpinbutton", FUNIT_DEGREE)) - , m_xMFSaturation(m_xBuilder->weld_metric_spin_button("satSpinbutton", FUNIT_PERCENT)) - , m_xMFBrightness(m_xBuilder->weld_metric_spin_button("brightSpinbutton", FUNIT_PERCENT)) - , m_xMFCyan(m_xBuilder->weld_metric_spin_button("cyanSpinbutton", FUNIT_PERCENT)) - , m_xMFMagenta(m_xBuilder->weld_metric_spin_button("magSpinbutton", FUNIT_PERCENT)) - , m_xMFYellow(m_xBuilder->weld_metric_spin_button("yellowSpinbutton", FUNIT_PERCENT)) - , m_xMFKey(m_xBuilder->weld_metric_spin_button("keySpinbutton", FUNIT_PERCENT)) + , m_xMFHue(m_xBuilder->weld_metric_spin_button("hueSpinbutton", FieldUnit::DEGREE)) + , m_xMFSaturation(m_xBuilder->weld_metric_spin_button("satSpinbutton", FieldUnit::PERCENT)) + , m_xMFBrightness(m_xBuilder->weld_metric_spin_button("brightSpinbutton", FieldUnit::PERCENT)) + , m_xMFCyan(m_xBuilder->weld_metric_spin_button("cyanSpinbutton", FieldUnit::PERCENT)) + , m_xMFMagenta(m_xBuilder->weld_metric_spin_button("magSpinbutton", FieldUnit::PERCENT)) + , m_xMFYellow(m_xBuilder->weld_metric_spin_button("yellowSpinbutton", FieldUnit::PERCENT)) + , m_xMFKey(m_xBuilder->weld_metric_spin_button("keySpinbutton", FieldUnit::PERCENT)) , meMode( DefaultMode ) { m_aColorField.SetModifyHdl( LINK( this, ColorPickerDialog, ColorFieldControlModifydl ) ); @@ -868,17 +868,17 @@ void ColorPickerDialog::update_color( UpdateFlags n ) if (n & UpdateFlags::CMYK) // update CMYK { - m_xMFCyan->set_value(toInt(mdCyan, 100.0), FUNIT_PERCENT); - m_xMFMagenta->set_value(toInt(mdMagenta, 100.0), FUNIT_PERCENT); - m_xMFYellow->set_value(toInt(mdYellow, 100.0), FUNIT_PERCENT); - m_xMFKey->set_value(toInt(mdKey, 100.0), FUNIT_PERCENT); + m_xMFCyan->set_value(toInt(mdCyan, 100.0), FieldUnit::PERCENT); + m_xMFMagenta->set_value(toInt(mdMagenta, 100.0), FieldUnit::PERCENT); + m_xMFYellow->set_value(toInt(mdYellow, 100.0), FieldUnit::PERCENT); + m_xMFKey->set_value(toInt(mdKey, 100.0), FieldUnit::PERCENT); } if (n & UpdateFlags::HSB ) // update HSB { - m_xMFHue->set_value(toInt(mdHue, 1.0), FUNIT_DEGREE); - m_xMFSaturation->set_value(toInt( mdSat, 100.0), FUNIT_PERCENT); - m_xMFBrightness->set_value(toInt( mdBri, 100.0), FUNIT_PERCENT); + m_xMFHue->set_value(toInt(mdHue, 1.0), FieldUnit::DEGREE); + m_xMFSaturation->set_value(toInt( mdSat, 100.0), FieldUnit::PERCENT); + m_xMFBrightness->set_value(toInt( mdBri, 100.0), FieldUnit::PERCENT); } if (n & UpdateFlags::ColorChooser ) // update Color Chooser 1 @@ -1010,37 +1010,37 @@ IMPL_LINK(ColorPickerDialog, ColorModifyMetricHdl, weld::MetricSpinButton&, rEdi if (&rEdit == m_xMFHue.get()) { - setColorComponent( ColorComponent::Hue, static_cast<double>(m_xMFHue->get_value(FUNIT_DEGREE)) ); + setColorComponent( ColorComponent::Hue, static_cast<double>(m_xMFHue->get_value(FieldUnit::DEGREE)) ); n = UpdateFlags::All & ~UpdateFlags::HSB; } else if (&rEdit == m_xMFSaturation.get()) { - setColorComponent( ColorComponent::Saturation, static_cast<double>(m_xMFSaturation->get_value(FUNIT_PERCENT)) / 100.0 ); + setColorComponent( ColorComponent::Saturation, static_cast<double>(m_xMFSaturation->get_value(FieldUnit::PERCENT)) / 100.0 ); n = UpdateFlags::All & ~UpdateFlags::HSB; } else if (&rEdit == m_xMFBrightness.get()) { - setColorComponent( ColorComponent::Brightness, static_cast<double>(m_xMFBrightness->get_value(FUNIT_PERCENT)) / 100.0 ); + setColorComponent( ColorComponent::Brightness, static_cast<double>(m_xMFBrightness->get_value(FieldUnit::PERCENT)) / 100.0 ); n = UpdateFlags::All & ~UpdateFlags::HSB; } else if (&rEdit == m_xMFCyan.get()) { - setColorComponent( ColorComponent::Cyan, static_cast<double>(m_xMFCyan->get_value(FUNIT_PERCENT)) / 100.0 ); + setColorComponent( ColorComponent::Cyan, static_cast<double>(m_xMFCyan->get_value(FieldUnit::PERCENT)) / 100.0 ); n = UpdateFlags::All & ~UpdateFlags::CMYK; } else if (&rEdit == m_xMFMagenta.get()) { - setColorComponent( ColorComponent::Magenta, static_cast<double>(m_xMFMagenta->get_value(FUNIT_PERCENT)) / 100.0 ); + setColorComponent( ColorComponent::Magenta, static_cast<double>(m_xMFMagenta->get_value(FieldUnit::PERCENT)) / 100.0 ); n = UpdateFlags::All & ~UpdateFlags::CMYK; } else if (&rEdit == m_xMFYellow.get()) { - setColorComponent( ColorComponent::Yellow, static_cast<double>(m_xMFYellow->get_value(FUNIT_PERCENT)) / 100.0 ); + setColorComponent( ColorComponent::Yellow, static_cast<double>(m_xMFYellow->get_value(FieldUnit::PERCENT)) / 100.0 ); n = UpdateFlags::All & ~UpdateFlags::CMYK; } else if (&rEdit == m_xMFKey.get()) { - setColorComponent( ColorComponent::Key, static_cast<double>(m_xMFKey->get_value(FUNIT_PERCENT)) / 100.0 ); + setColorComponent( ColorComponent::Key, static_cast<double>(m_xMFKey->get_value(FieldUnit::PERCENT)) / 100.0 ); n = UpdateFlags::All & ~UpdateFlags::CMYK; } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 9bc7dcf55cbf..15e8dc084392 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -159,16 +159,16 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void) GraphicFilterMosaic::GraphicFilterMosaic(weld::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges) : GraphicFilterDialog(pParent, "cui/ui/mosaicdialog.ui", "MosaicDialog", rGraphic) - , mxMtrWidth(m_xBuilder->weld_metric_spin_button("width", FUNIT_PIXEL)) - , mxMtrHeight(m_xBuilder->weld_metric_spin_button("height", FUNIT_PIXEL)) + , mxMtrWidth(m_xBuilder->weld_metric_spin_button("width", FieldUnit::PIXEL)) + , mxMtrHeight(m_xBuilder->weld_metric_spin_button("height", FieldUnit::PIXEL)) , mxCbxEdges(m_xBuilder->weld_check_button("edges")) { - mxMtrWidth->set_value(nTileWidth, FUNIT_PIXEL); - mxMtrWidth->set_max(GetGraphicSizePixel().Width(), FUNIT_PIXEL); + mxMtrWidth->set_value(nTileWidth, FieldUnit::PIXEL); + mxMtrWidth->set_max(GetGraphicSizePixel().Width(), FieldUnit::PIXEL); mxMtrWidth->connect_value_changed(LINK(this, GraphicFilterMosaic, EditModifyHdl)); - mxMtrHeight->set_value(nTileHeight, FUNIT_PIXEL); - mxMtrHeight->set_max(GetGraphicSizePixel().Height(), FUNIT_PIXEL); + mxMtrHeight->set_value(nTileHeight, FieldUnit::PIXEL); + mxMtrHeight->set_max(GetGraphicSizePixel().Height(), FieldUnit::PIXEL); mxMtrHeight->connect_value_changed(LINK(this, GraphicFilterMosaic, EditModifyHdl)); mxCbxEdges->set_active(bEnhanceEdges); @@ -191,8 +191,8 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) { Graphic aRet; - long nTileWidth = static_cast<long>(mxMtrWidth->get_value(FUNIT_PIXEL)); - long nTileHeight = static_cast<long>(mxMtrHeight->get_value(FUNIT_PIXEL)); + long nTileWidth = static_cast<long>(mxMtrWidth->get_value(FieldUnit::PIXEL)); + long nTileHeight = static_cast<long>(mxMtrHeight->get_value(FieldUnit::PIXEL)); const Size aSize( std::max( FRound( nTileWidth * fScaleX ), 1L ), std::max( FRound( nTileHeight * fScaleY ), 1L ) ); @@ -268,10 +268,10 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double GraphicFilterSolarize::GraphicFilterSolarize(weld::Window* pParent, const Graphic& rGraphic, sal_uInt8 cGreyThreshold, bool bInvert) : GraphicFilterDialog(pParent, "cui/ui/solarizedialog.ui", "SolarizeDialog", rGraphic) - , mxMtrThreshold(m_xBuilder->weld_metric_spin_button("value", FUNIT_PERCENT)) + , mxMtrThreshold(m_xBuilder->weld_metric_spin_button("value", FieldUnit::PERCENT)) , mxCbxInvert(m_xBuilder->weld_check_button("invert")) { - mxMtrThreshold->set_value(FRound(cGreyThreshold / 2.55), FUNIT_PERCENT); + mxMtrThreshold->set_value(FRound(cGreyThreshold / 2.55), FieldUnit::PERCENT); mxMtrThreshold->connect_value_changed(LINK(this, GraphicFilterSolarize, EditModifyHdl)); mxCbxInvert->set_active(bInvert); @@ -291,7 +291,7 @@ IMPL_LINK_NOARG(GraphicFilterSolarize, EditModifyHdl, weld::MetricSpinButton&, v Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, double, double ) { Graphic aRet; - sal_uInt8 nGreyThreshold = static_cast<sal_uInt8>(FRound(mxMtrThreshold->get_value(FUNIT_PERCENT) * 2.55)); + sal_uInt8 nGreyThreshold = static_cast<sal_uInt8>(FRound(mxMtrThreshold->get_value(FieldUnit::PERCENT) * 2.55)); if( rGraphic.IsAnimated() ) { @@ -324,9 +324,9 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, doub GraphicFilterSepia::GraphicFilterSepia(weld::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent) : GraphicFilterDialog(pParent, "cui/ui/agingdialog.ui", "AgingDialog", rGraphic) - , mxMtrSepia(m_xBuilder->weld_metric_spin_button("value", FUNIT_PERCENT)) + , mxMtrSepia(m_xBuilder->weld_metric_spin_button("value", FieldUnit::PERCENT)) { - mxMtrSepia->set_value(nSepiaPercent, FUNIT_PERCENT); + mxMtrSepia->set_value(nSepiaPercent, FieldUnit::PERCENT); mxMtrSepia->connect_value_changed(LINK(this, GraphicFilterSepia, EditModifyHdl)); } @@ -338,7 +338,7 @@ IMPL_LINK_NOARG(GraphicFilterSepia, EditModifyHdl, weld::MetricSpinButton&, void Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, double, double ) { Graphic aRet; - sal_uInt16 nSepiaPct = sal::static_int_cast< sal_uInt16 >(mxMtrSepia->get_value(FUNIT_PERCENT)); + sal_uInt16 nSepiaPct = sal::static_int_cast< sal_uInt16 >(mxMtrSepia->get_value(FieldUnit::PERCENT)); if( rGraphic.IsAnimated() ) { diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index f02e8b1a79a8..8423823cf113 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -39,7 +39,7 @@ sal_uInt16 SvxZoomDialog::GetFactor() const return 100; if (m_xUserBtn->get_active()) - return static_cast<sal_uInt16>(m_xUserEdit->get_value(FUNIT_PERCENT)); + return static_cast<sal_uInt16>(m_xUserEdit->get_value(FieldUnit::PERCENT)); else return SPECIAL_FACTOR; } @@ -59,13 +59,13 @@ void SvxZoomDialog::SetFactor(sal_uInt16 nNewFactor, ZoomButtonId nButtonId) { m_xUserBtn->set_active(true); m_xUserEdit->set_sensitive(true); - m_xUserEdit->set_value(nNewFactor, FUNIT_PERCENT); + m_xUserEdit->set_value(nNewFactor, FieldUnit::PERCENT); m_xUserEdit->grab_focus(); } } else { - m_xUserEdit->set_value(nNewFactor, FUNIT_PERCENT); + m_xUserEdit->set_value(nNewFactor, FieldUnit::PERCENT); switch(nButtonId) { case ZoomButtonId::OPTIMAL: @@ -115,7 +115,7 @@ void SvxZoomDialog::HideButton(ZoomButtonId nButtonId) void SvxZoomDialog::SetLimits(sal_uInt16 nMin, sal_uInt16 nMax) { DBG_ASSERT(nMin < nMax, "invalid limits"); - m_xUserEdit->set_range(nMin, nMax, FUNIT_PERCENT); + m_xUserEdit->set_range(nMin, nMax, FieldUnit::PERCENT); } const SfxItemSet* SvxZoomDialog::GetOutputItemSet() const @@ -132,7 +132,7 @@ SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet) , m_xPageWidthBtn(m_xBuilder->weld_radio_button("fitw")) , m_x100Btn(m_xBuilder->weld_radio_button("100pc")) , m_xUserBtn(m_xBuilder->weld_radio_button("variable")) - , m_xUserEdit(m_xBuilder->weld_metric_spin_button("zoomsb", FUNIT_PERCENT)) + , m_xUserEdit(m_xBuilder->weld_metric_spin_button("zoomsb", FieldUnit::PERCENT)) , m_xViewFrame(m_xBuilder->weld_widget("viewframe")) , m_xAutomaticBtn(m_xBuilder->weld_radio_button("automatic")) , m_xSingleBtn(m_xBuilder->weld_radio_button("singlepage")) @@ -184,7 +184,7 @@ SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet) nMax = nValue; SetLimits(nMin, nMax); - m_xUserEdit->set_value(nValue, FUNIT_PERCENT); + m_xUserEdit->set_value(nValue, FieldUnit::PERCENT); const SfxPoolItem& rItem = m_rSet.Get(m_rSet.GetPool()->GetWhich(SID_ATTR_ZOOM)); @@ -392,7 +392,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, OKHdl, weld::Button&, void) if (pShell) { - sal_uInt16 nZoomValue = static_cast<sal_uInt16>(m_xUserEdit->get_value(FUNIT_PERCENT)); + sal_uInt16 nZoomValue = static_cast<sal_uInt16>(m_xUserEdit->get_value(FieldUnit::PERCENT)); pShell->PutItem(SfxUInt16Item(SID_ATTR_ZOOM_USER, nZoomValue)); } m_xDialog->response(RET_OK); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 821e9abf875a..57e23b0bba46 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -108,7 +108,7 @@ AlignmentTabPage::AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCor // text alignment , m_xLbHorAlign(m_xBuilder->weld_combo_box("comboboxHorzAlign")) , m_xFtIndent(m_xBuilder->weld_label("labelIndent")) - , m_xEdIndent(m_xBuilder->weld_metric_spin_button("spinIndentFrom", FUNIT_POINT)) + , m_xEdIndent(m_xBuilder->weld_metric_spin_button("spinIndentFrom", FieldUnit::POINT)) , m_xFtVerAlign(m_xBuilder->weld_label("labelVertAlign")) , m_xLbVerAlign(m_xBuilder->weld_combo_box("comboboxVertAlign")) //text rotation @@ -207,7 +207,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) if (m_xEdIndent->get_value_changed_from_saved()) { - rSet->Put(SfxUInt16Item(GetWhich(SID_ATTR_ALIGN_INDENT), m_xEdIndent->get_value(FUNIT_TWIP))); + rSet->Put(SfxUInt16Item(GetWhich(SID_ATTR_ALIGN_INDENT), m_xEdIndent->get_value(FieldUnit::TWIP))); bChanged = true; } @@ -419,7 +419,7 @@ void AlignmentTabPage::Reset(const SfxItemSet* pCoreAttrs) case SfxItemState::SET: { const SfxUInt16Item& rIndentItem = static_cast<const SfxUInt16Item&>(pCoreAttrs->Get(nWhich)); - m_xEdIndent->set_value(rIndentItem.GetValue(), FUNIT_TWIP); + m_xEdIndent->set_value(rIndentItem.GetValue(), FieldUnit::TWIP); break; } } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 1a76003fb216..03aa790d0f9d 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -308,7 +308,7 @@ class OfaAutoFmtPrcntSet : public weld::GenericDialogController public: explicit OfaAutoFmtPrcntSet(weld::Window* pParent) : GenericDialogController(pParent, "cui/ui/percentdialog.ui", "PercentDialog") - , m_xPrcntMF(m_xBuilder->weld_metric_spin_button("margin", FUNIT_PERCENT)) + , m_xPrcntMF(m_xBuilder->weld_metric_spin_button("margin", FieldUnit::PERCENT)) { } @@ -743,10 +743,10 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void) { // dialog for per cent settings OfaAutoFmtPrcntSet aDlg(GetFrameWeld()); - aDlg.GetPrcntFld().set_value(nPercent, FUNIT_PERCENT); + aDlg.GetPrcntFld().set_value(nPercent, FieldUnit::PERCENT); if (aDlg.run() == RET_OK) { - nPercent = static_cast<sal_uInt16>(aDlg.GetPrcntFld().get_value(FUNIT_PERCENT)); + nPercent = static_cast<sal_uInt16>(aDlg.GetPrcntFld().get_value(FieldUnit::PERCENT)); sMargin = " " + unicode::formatPercent(nPercent, Application::GetSettings().GetUILanguageTag()); } diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 7bfaf4889ad1..a9cf96dc1734 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -79,9 +79,9 @@ const sal_uInt16 SvxBorderTabPage::pRanges[] = static void lcl_SetDecimalDigitsTo1(weld::MetricSpinButton& rField) { - auto nMin = rField.denormalize(rField.get_min(FUNIT_TWIP)); + auto nMin = rField.denormalize(rField.get_min(FieldUnit::TWIP)); rField.set_digits(1); - rField.set_min(rField.normalize(nMin), FUNIT_TWIP); + rField.set_min(rField.normalize(nMin), FieldUnit::TWIP); } // number of preset images to show @@ -128,7 +128,7 @@ SvxShadowItem ShadowControlsWrapper::GetControlValue(const SvxShadowItem& rItem) // has not changed its value, to avoid round-trip errors (like twip->cm->twip) // E.g., initial 100 twip will become 0.18 cm, which will return as 102 twip if (mrMfSize.get_value_changed_from_saved()) - aItem.SetWidth(mrMfSize.denormalize(mrMfSize.get_value(FUNIT_TWIP))); + aItem.SetWidth(mrMfSize.denormalize(mrMfSize.get_value(FieldUnit::TWIP))); if (!mrLbColor.IsNoSelection()) aItem.SetColor(mrLbColor.GetSelectEntryColor()); return aItem; @@ -157,7 +157,7 @@ void ShadowControlsWrapper::SetControlValue(const SvxShadowItem& rItem) mrVsPos.SetNoSelection(); break; } - mrMfSize.set_value(mrMfSize.normalize(rItem.GetWidth()), FUNIT_TWIP); + mrMfSize.set_value(mrMfSize.normalize(rItem.GetWidth()), FieldUnit::TWIP); mrLbColor.SelectEntry(rItem.GetColor()); } @@ -181,13 +181,13 @@ SvxMarginItem MarginControlsWrapper::GetControlValue(const SvxMarginItem &rItem) { SvxMarginItem aItem(rItem); if (mrLeftWrp.get_sensitive()) - aItem.SetLeftMargin(mrLeftWrp.denormalize(mrLeftWrp.get_value(FUNIT_TWIP))); + aItem.SetLeftMargin(mrLeftWrp.denormalize(mrLeftWrp.get_value(FieldUnit::TWIP))); if (mrRightWrp.get_sensitive()) - aItem.SetRightMargin(mrRightWrp.denormalize(mrRightWrp.get_value(FUNIT_TWIP))); + aItem.SetRightMargin(mrRightWrp.denormalize(mrRightWrp.get_value(FieldUnit::TWIP))); if (mrTopWrp.get_sensitive()) - aItem.SetTopMargin(mrTopWrp.denormalize(mrTopWrp.get_value(FUNIT_TWIP))); + aItem.SetTopMargin(mrTopWrp.denormalize(mrTopWrp.get_value(FieldUnit::TWIP))); if (mrBottomWrp.get_sensitive()) - aItem.SetBottomMargin(mrBottomWrp.denormalize(mrBottomWrp.get_value(FUNIT_TWIP))); + aItem.SetBottomMargin(mrBottomWrp.denormalize(mrBottomWrp.get_value(FieldUnit::TWIP))); return aItem; } @@ -201,10 +201,10 @@ bool MarginControlsWrapper::get_value_changed_from_saved() const void MarginControlsWrapper::SetControlValue(const SvxMarginItem& rItem) { - mrLeftWrp.set_value(mrLeftWrp.normalize(rItem.GetLeftMargin()), FUNIT_TWIP); - mrRightWrp.set_value(mrRightWrp.normalize(rItem.GetRightMargin()), FUNIT_TWIP); - mrTopWrp.set_value(mrTopWrp.normalize(rItem.GetTopMargin()), FUNIT_TWIP); - mrBottomWrp.set_value(mrBottomWrp.normalize(rItem.GetBottomMargin()), FUNIT_TWIP); + mrLeftWrp.set_value(mrLeftWrp.normalize(rItem.GetLeftMargin()), FieldUnit::TWIP); + mrRightWrp.set_value(mrRightWrp.normalize(rItem.GetRightMargin()), FieldUnit::TWIP); + mrTopWrp.set_value(mrTopWrp.normalize(rItem.GetTopMargin()), FieldUnit::TWIP); + mrBottomWrp.set_value(mrBottomWrp.normalize(rItem.GetBottomMargin()), FieldUnit::TWIP); mrLeftWrp.save_value(); mrRightWrp.save_value(); mrTopWrp.save_value(); @@ -245,22 +245,22 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor , m_xFrameSelWin(new weld::CustomWeld(*m_xBuilder, "framesel", m_aFrameSel)) , m_xLbLineStyle(new SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb"))) , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pParent.GetFrameWeld())) - , m_xLineWidthMF(m_xBuilder->weld_metric_spin_button("linewidthmf", FUNIT_POINT)) + , m_xLineWidthMF(m_xBuilder->weld_metric_spin_button("linewidthmf", FieldUnit::POINT)) , m_xSpacingFrame(m_xBuilder->weld_container("spacing")) , m_xLeftFT(m_xBuilder->weld_label("leftft")) - , m_xLeftMF(m_xBuilder->weld_metric_spin_button("leftmf", FUNIT_MM)) + , m_xLeftMF(m_xBuilder->weld_metric_spin_button("leftmf", FieldUnit::MM)) , m_xRightFT(m_xBuilder->weld_label("rightft")) - , m_xRightMF(m_xBuilder->weld_metric_spin_button("rightmf", FUNIT_MM)) + , m_xRightMF(m_xBuilder->weld_metric_spin_button("rightmf", FieldUnit::MM)) , m_xTopFT(m_xBuilder->weld_label("topft")) - , m_xTopMF(m_xBuilder->weld_metric_spin_button("topmf", FUNIT_MM)) + , m_xTopMF(m_xBuilder->weld_metric_spin_button("topmf", FieldUnit::MM)) , m_xBottomFT(m_xBuilder->weld_label("bottomft")) - , m_xBottomMF(m_xBuilder->weld_metric_spin_button("bottommf", FUNIT_MM)) + , m_xBottomMF(m_xBuilder->weld_metric_spin_button("bottommf", FieldUnit::MM)) , m_xSynchronizeCB(m_xBuilder->weld_check_button("sync")) , m_xShadowFrame(m_xBuilder->weld_container("shadow")) , m_xWndShadows(new SvtValueSet(m_xBuilder->weld_scrolled_window("shadowswin"))) , m_xWndShadowsWin(new weld::CustomWeld(*m_xBuilder, "shadows", *m_xWndShadows)) , m_xFtShadowSize(m_xBuilder->weld_label("distanceft")) - , m_xEdShadowSize(m_xBuilder->weld_metric_spin_button("distancemf", FUNIT_MM)) + , m_xEdShadowSize(m_xBuilder->weld_metric_spin_button("distancemf", FieldUnit::MM)) , m_xFtShadowColor(m_xBuilder->weld_label("shadowcolorft")) , m_xLbShadowColor(new ColorListBox(m_xBuilder->weld_menu_button("shadowcolorlb"), pParent.GetFrameWeld())) , m_xPropertiesFrame(m_xBuilder->weld_container("properties")) @@ -340,7 +340,7 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor { // The caller specifies default line width. Honor it. const SfxInt64Item* p = static_cast<const SfxInt64Item*>(pItem); - m_xLineWidthMF->set_value(p->GetValue(), FUNIT_POINT); + m_xLineWidthMF->set_value(p->GetValue(), FieldUnit::POINT); } // set metric @@ -353,17 +353,17 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor { // #103396# the default value (1pt) can't be accurately represented in // inches or pica with two decimals, so point is used instead. - case FUNIT_PICA: - case FUNIT_INCH: - case FUNIT_FOOT: - case FUNIT_MILE: - eFUnit = FUNIT_POINT; + case FieldUnit::PICA: + case FieldUnit::INCH: + case FieldUnit::FOOT: + case FieldUnit::MILE: + eFUnit = FieldUnit::POINT; break; - case FUNIT_CM: - case FUNIT_M: - case FUNIT_KM: - eFUnit = FUNIT_MM; + case FieldUnit::CM: + case FieldUnit::M: + case FieldUnit::KM: + eFUnit = FieldUnit::MM; break; default: ;//prevent warning } @@ -372,9 +372,9 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor { switch ( eFUnit ) { - case FUNIT_M: - case FUNIT_KM: - eFUnit = FUNIT_MM; + case FieldUnit::M: + case FieldUnit::KM: + eFUnit = FieldUnit::MM; break; default: ; //prevent warning } @@ -414,7 +414,7 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor } bIsDontCare = !pBoxInfo->IsValid( SvxBoxInfoItemValidFlags::DISABLE ); } - if(!mbUseMarginItem && eFUnit == FUNIT_MM && MapUnit::MapTwip == rCoreAttrs.GetPool()->GetMetric( GetWhich( SID_ATTR_BORDER_INNER ) )) + if(!mbUseMarginItem && eFUnit == FieldUnit::MM && MapUnit::MapTwip == rCoreAttrs.GetPool()->GetMetric( GetWhich( SID_ATTR_BORDER_INNER ) )) { //#i91548# changing the number of decimal digits changes the minimum values, too lcl_SetDecimalDigitsTo1(*m_xLeftMF); @@ -628,7 +628,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) SetMetricValue(*m_xTopMF, pBoxInfoItem->GetDefDist(), eCoreUnit); SetMetricValue(*m_xBottomMF, pBoxInfoItem->GetDefDist(), eCoreUnit); - nMinValue = m_xLeftMF->get_value(FUNIT_NONE); + nMinValue = m_xLeftMF->get_value(FieldUnit::NONE); if ( pBoxInfoItem->IsDist() ) { @@ -637,10 +637,10 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) bool bIsAnyBorderVisible = m_aFrameSel.IsAnyBorderVisible(); if( !bIsAnyBorderVisible || !pBoxInfoItem->IsMinDist() ) { - m_xLeftMF->set_min(0, FUNIT_NONE); - m_xRightMF->set_min(0, FUNIT_NONE); - m_xTopMF->set_min(0, FUNIT_NONE); - m_xBottomMF->set_min(0, FUNIT_NONE); + m_xLeftMF->set_min(0, FieldUnit::NONE); + m_xRightMF->set_min(0, FieldUnit::NONE); + m_xTopMF->set_min(0, FieldUnit::NONE); + m_xBottomMF->set_min(0, FieldUnit::NONE); } long nLeftDist = pBoxItem->GetDistance( SvxBoxItemLine::LEFT); SetMetricValue(*m_xLeftMF, nLeftDist, eCoreUnit); @@ -704,8 +704,8 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) // Determine the width first as some styles can be missing depending on it sal_Int64 nWidthPt = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( sal_Int64( nWidth ), m_xLineWidthMF->get_digits(), - MapUnit::MapTwip, FUNIT_POINT )); - m_xLineWidthMF->set_value(nWidthPt, FUNIT_POINT); + MapUnit::MapTwip, FieldUnit::POINT )); + m_xLineWidthMF->set_value(nWidthPt, FieldUnit::POINT); m_xLbLineStyle->SetWidth(nWidth); // then set the style @@ -772,9 +772,9 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) } LinesChanged_Impl( nullptr ); - if (m_xLeftMF->get_value(FUNIT_NONE) == m_xRightMF->get_value(FUNIT_NONE) && - m_xTopMF->get_value(FUNIT_NONE) == m_xBottomMF->get_value(FUNIT_NONE) && - m_xTopMF->get_value(FUNIT_NONE) == m_xLeftMF->get_value(FUNIT_NONE)) + if (m_xLeftMF->get_value(FieldUnit::NONE) == m_xRightMF->get_value(FieldUnit::NONE) && + m_xTopMF->get_value(FieldUnit::NONE) == m_xBottomMF->get_value(FieldUnit::NONE) && + m_xTopMF->get_value(FieldUnit::NONE) == m_xLeftMF->get_value(FieldUnit::NONE)) { mbSync = true; } @@ -945,10 +945,10 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) m_xRightMF->get_value_changed_from_saved() || m_xTopMF->get_value_changed_from_saved() || m_xBottomMF->get_value_changed_from_saved() || - nMinValue == m_xLeftMF->get_value(FUNIT_NONE) || - nMinValue == m_xRightMF->get_value(FUNIT_NONE) || - nMinValue == m_xTopMF->get_value(FUNIT_NONE) || - nMinValue == m_xBottomMF->get_value(FUNIT_NONE) || + nMinValue == m_xLeftMF->get_value(FieldUnit::NONE) || + nMinValue == m_xRightMF->get_value(FieldUnit::NONE) || + nMinValue == m_xTopMF->get_value(FieldUnit::NONE) || + nMinValue == m_xBottomMF->get_value(FieldUnit::NONE) || (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(SvxBoxInfoItemValidFlags::DISTANCE)) ) { @@ -1139,11 +1139,11 @@ IMPL_LINK(SvxBorderTabPage, SelColHdl_Impl, ColorListBox&, rColorBox, void) IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl, weld::MetricSpinButton&, void) { - sal_Int64 nVal = m_xLineWidthMF->get_value(FUNIT_NONE); + sal_Int64 nVal = m_xLineWidthMF->get_value(FieldUnit::NONE); nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( nVal, m_xLineWidthMF->get_digits(), - FUNIT_POINT, MapUnit::MapTwip )); + FieldUnit::POINT, MapUnit::MapTwip )); m_xLbLineStyle->SetWidth( nVal ); m_aFrameSel.SetStyleToSelection( nVal, @@ -1152,11 +1152,11 @@ IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl, weld::MetricSpinButton&, IMPL_LINK_NOARG(SvxBorderTabPage, SelStyleHdl_Impl, SvtLineListBox&, void) { - sal_Int64 nVal = m_xLineWidthMF->get_value(FUNIT_NONE); + sal_Int64 nVal = m_xLineWidthMF->get_value(FieldUnit::NONE); nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( nVal, m_xLineWidthMF->get_digits(), - FUNIT_POINT, MapUnit::MapTwip )); + FieldUnit::POINT, MapUnit::MapTwip )); m_aFrameSel.SetStyleToSelection ( nVal, m_xLbLineStyle->GetSelectEntryStyle() ); } @@ -1321,7 +1321,7 @@ void SvxBorderTabPage::FillLineListBox_Impl() { SvxBorderLineStyle::INSET, 10, &SvxBorderLine::darkColor, &SvxBorderLine::lightColor, &sameDistColor } }; - m_xLbLineStyle->SetSourceUnit( FUNIT_TWIP ); + m_xLbLineStyle->SetSourceUnit( FieldUnit::TWIP ); for (size_t i = 0; i < SAL_N_ELEMENTS(aLines); ++i) { @@ -1333,7 +1333,7 @@ void SvxBorderTabPage::FillLineListBox_Impl() aLines[i].mnMinWidth, aLines[i].mpColor1Fn, aLines[i].mpColor2Fn, aLines[i].mpColorDistFn); } - sal_Int64 nVal = m_xLineWidthMF->get_value(FUNIT_NONE); + sal_Int64 nVal = m_xLineWidthMF->get_value(FieldUnit::NONE); nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue(nVal, m_xLineWidthMF->get_digits(), m_xLineWidthMF->get_unit(), MapUnit::MapTwip)); m_xLbLineStyle->SetWidth( nVal ); @@ -1354,24 +1354,24 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void) { if(!bSpaceModified) { - m_xLeftMF->set_value(nMinValue, FUNIT_NONE); - m_xRightMF->set_value(nMinValue, FUNIT_NONE); - m_xTopMF->set_value(nMinValue, FUNIT_NONE); - m_xBottomMF->set_value(nMinValue, FUNIT_NONE); + m_xLeftMF->set_value(nMinValue, FieldUnit::NONE); + m_xRightMF->set_value(nMinValue, FieldUnit::NONE); + m_xTopMF->set_value(nMinValue, FieldUnit::NONE); + m_xBottomMF->set_value(nMinValue, FieldUnit::NONE); } } else { - m_xLeftMF->set_min(0, FUNIT_NONE); - m_xRightMF->set_min(0, FUNIT_NONE); - m_xTopMF->set_min(0, FUNIT_NONE); - m_xBottomMF->set_min(0, FUNIT_NONE); + m_xLeftMF->set_min(0, FieldUnit::NONE); + m_xRightMF->set_min(0, FieldUnit::NONE); + m_xTopMF->set_min(0, FieldUnit::NONE); + m_xBottomMF->set_min(0, FieldUnit::NONE); if(!bSpaceModified && !mbAllowPaddingWithoutBorders) { - m_xLeftMF->set_value(0, FUNIT_NONE); - m_xRightMF->set_value(0, FUNIT_NONE); - m_xTopMF->set_value(0, FUNIT_NONE); - m_xBottomMF->set_value(0, FUNIT_NONE); + m_xLeftMF->set_value(0, FieldUnit::NONE); + m_xRightMF->set_value(0, FieldUnit::NONE); + m_xTopMF->set_value(0, FieldUnit::NONE); + m_xBottomMF->set_value(0, FieldUnit::NONE); } } // for tables everything is allowed @@ -1418,15 +1418,15 @@ IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, weld::MetricSpinButton&, rF if (mbSync) { - const auto nVal = rField.get_value(FUNIT_NONE); + const auto nVal = rField.get_value(FieldUnit::NONE); if (&rField != m_xLeftMF.get()) - m_xLeftMF->set_value(nVal, FUNIT_NONE); + m_xLeftMF->set_value(nVal, FieldUnit::NONE); if (&rField != m_xRightMF.get()) - m_xRightMF->set_value(nVal, FUNIT_NONE); + m_xRightMF->set_value(nVal, FieldUnit::NONE); if (&rField != m_xTopMF.get()) - m_xTopMF->set_value(nVal, FUNIT_NONE); + m_xTopMF->set_value(nVal, FieldUnit::NONE); if (&rField != m_xBottomMF.get()) - m_xBottomMF->set_value(nVal, FUNIT_NONE); + m_xBottomMF->set_value(nVal, FieldUnit::NONE); } } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index acb3bfb8e9c3..c24db30aa290 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -460,7 +460,7 @@ namespace // conversion twips for the example-window aSize.setHeight( - ItemToControl( nHeight, _pPage->GetItemSet().GetPool()->GetMetric( _nFontHeightWhich ), FUNIT_TWIP ) ); + ItemToControl( nHeight, _pPage->GetItemSet().GetPool()->GetMetric( _nFontHeightWhich ), FieldUnit::TWIP ) ); } else if ( !_pFontSizeLB->get_active_text().isEmpty() ) aSize.setHeight( PointToTwips( static_cast<long>(_pFontSizeLB->get_value() / 10) ) ); @@ -2457,10 +2457,10 @@ SvxCharPositionPage::SvxCharPositionPage(TabPageParent pParent, const SfxItemSet , m_xNormalPosBtn(m_xBuilder->weld_radio_button("normal")) , m_xLowPosBtn(m_xBuilder->weld_radio_button("subscript")) , m_xHighLowFT(m_xBuilder->weld_label("raiselower")) - , m_xHighLowMF(m_xBuilder->weld_metric_spin_button("raiselowersb", FUNIT_PERCENT)) + , m_xHighLowMF(m_xBuilder->weld_metric_spin_button("raiselowersb", FieldUnit::PERCENT)) , m_xHighLowRB(m_xBuilder->weld_check_button("automatic")) , m_xFontSizeFT(m_xBuilder->weld_label("relativefontsize")) - , m_xFontSizeMF(m_xBuilder->weld_metric_spin_button("fontsizesb", FUNIT_PERCENT)) + , m_xFontSizeMF(m_xBuilder->weld_metric_spin_button("fontsizesb", FieldUnit::PERCENT)) , m_xRotationContainer(m_xBuilder->weld_widget("rotationcontainer")) , m_xScalingFT(m_xBuilder->weld_label("scale")) , m_xScalingAndRotationFT(m_xBuilder->weld_label("rotateandscale")) @@ -2468,8 +2468,8 @@ SvxCharPositionPage::SvxCharPositionPage(TabPageParent pParent, const SfxItemSet , m_x90degRB(m_xBuilder->weld_radio_button("90deg")) , m_x270degRB(m_xBuilder->weld_radio_button("270deg")) , m_xFitToLineCB(m_xBuilder->weld_check_button("fittoline")) - , m_xScaleWidthMF(m_xBuilder->weld_metric_spin_button("scalewidthsb", FUNIT_PERCENT)) - , m_xKerningMF(m_xBuilder->weld_metric_spin_button("kerningsb", FUNIT_POINT)) + , m_xScaleWidthMF(m_xBuilder->weld_metric_spin_button("scalewidthsb", FieldUnit::PERCENT)) + , m_xKerningMF(m_xBuilder->weld_metric_spin_button("kerningsb", FieldUnit::POINT)) , m_xPairKerningBtn(m_xBuilder->weld_check_button("pairkerning")) { m_xPreviewWin.reset(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin)); @@ -2536,8 +2536,8 @@ void SvxCharPositionPage::SetEscapement_Impl( SvxEscapement nEsc ) short nFac = aEscItm.GetEsc() < 0 ? -1 : 1; - m_xHighLowMF->set_value(aEscItm.GetEsc() * nFac, FUNIT_PERCENT); - m_xFontSizeMF->set_value(aEscItm.GetProportionalHeight(), FUNIT_PERCENT); + m_xHighLowMF->set_value(aEscItm.GetEsc() * nFac, FieldUnit::PERCENT); + m_xFontSizeMF->set_value(aEscItm.GetProportionalHeight(), FieldUnit::PERCENT); if ( SvxEscapement::Off == nEsc ) { @@ -2590,8 +2590,8 @@ IMPL_LINK_NOARG(SvxCharPositionPage, RotationHdl_Impl, weld::ToggleButton&, void void SvxCharPositionPage::FontModifyHdl_Impl() { - sal_uInt8 nEscProp = static_cast<sal_uInt8>(m_xFontSizeMF->get_value(FUNIT_PERCENT)); - short nEsc = static_cast<short>(m_xHighLowMF->get_value(FUNIT_PERCENT)); + sal_uInt8 nEscProp = static_cast<sal_uInt8>(m_xFontSizeMF->get_value(FieldUnit::PERCENT)); + short nEsc = static_cast<short>(m_xHighLowMF->get_value(FieldUnit::PERCENT)); nEsc *= m_xLowPosBtn->get_active() ? -1 : 1; UpdatePreview_Impl( 100, nEscProp, nEsc ); } @@ -2614,13 +2614,13 @@ IMPL_LINK_NOARG(SvxCharPositionPage, FitToLineHdl_Impl, weld::ToggleButton&, voi sal_uInt16 nVal = m_nScaleWidthInitialVal; if (m_xFitToLineCB->get_active()) nVal = m_nScaleWidthItemSetVal; - m_xScaleWidthMF->set_value(nVal, FUNIT_PERCENT); + m_xScaleWidthMF->set_value(nVal, FieldUnit::PERCENT); m_aPreviewWin.SetFontWidthScale( nVal ); } IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl, weld::MetricSpinButton&, void) { - long nVal = static_cast<long>(m_xKerningMF->get_value(FUNIT_POINT)); + long nVal = static_cast<long>(m_xKerningMF->get_value(FieldUnit::POINT)); nVal = LogicToLogic( nVal, MapUnit::MapPoint, MapUnit::MapTwip ); long nKern = static_cast<short>(m_xKerningMF->denormalize(nVal)); @@ -2643,16 +2643,16 @@ IMPL_LINK(SvxCharPositionPage, ValueChangedHdl_Impl, weld::MetricSpinButton&, rF if (m_xHighLowMF.get() == &rField) { if ( bLow ) - m_nSubEsc = static_cast<short>(m_xHighLowMF->get_value(FUNIT_PERCENT)) * -1; + m_nSubEsc = static_cast<short>(m_xHighLowMF->get_value(FieldUnit::PERCENT)) * -1; else - m_nSuperEsc = static_cast<short>(m_xHighLowMF->get_value(FUNIT_PERCENT)); + m_nSuperEsc = static_cast<short>(m_xHighLowMF->get_value(FieldUnit::PERCENT)); } else if (m_xFontSizeMF.get() == &rField) { if ( bLow ) - m_nSubProp = static_cast<sal_uInt8>(m_xFontSizeMF->get_value(FUNIT_PERCENT)); + m_nSubProp = static_cast<sal_uInt8>(m_xFontSizeMF->get_value(FieldUnit::PERCENT)); else - m_nSuperProp = static_cast<sal_uInt8>(m_xFontSizeMF->get_value(FUNIT_PERCENT)); + m_nSuperProp = static_cast<sal_uInt8>(m_xFontSizeMF->get_value(FieldUnit::PERCENT)); } FontModifyHdl_Impl(); @@ -2660,7 +2660,7 @@ IMPL_LINK(SvxCharPositionPage, ValueChangedHdl_Impl, weld::MetricSpinButton&, rF IMPL_LINK_NOARG(SvxCharPositionPage, ScaleWidthModifyHdl_Impl, weld::MetricSpinButton&, void) { - m_aPreviewWin.SetFontWidthScale(sal_uInt16(m_xScaleWidthMF->get_value(FUNIT_PERCENT))); + m_aPreviewWin.SetFontWidthScale(sal_uInt16(m_xScaleWidthMF->get_value(FieldUnit::PERCENT))); } DeactivateRC SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) @@ -2689,13 +2689,13 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) //fdo#75307 validate all the entries and discard all of them if any are //out of range bool bValid = true; - if (m_nSuperEsc < m_xHighLowMF->get_min(FUNIT_PERCENT) || m_nSuperEsc > m_xHighLowMF->get_max(FUNIT_PERCENT)) + if (m_nSuperEsc < m_xHighLowMF->get_min(FieldUnit::PERCENT) || m_nSuperEsc > m_xHighLowMF->get_max(FieldUnit::PERCENT)) bValid = false; - if (m_nSubEsc*-1 < m_xHighLowMF->get_min(FUNIT_PERCENT) || m_nSubEsc*-1 > m_xHighLowMF->get_max(FUNIT_PERCENT)) + if (m_nSubEsc*-1 < m_xHighLowMF->get_min(FieldUnit::PERCENT) || m_nSubEsc*-1 > m_xHighLowMF->get_max(FieldUnit::PERCENT)) bValid = false; - if (m_nSuperProp < m_xFontSizeMF->get_min(FUNIT_PERCENT) || m_nSuperProp > m_xFontSizeMF->get_max(FUNIT_PERCENT)) + if (m_nSuperProp < m_xFontSizeMF->get_min(FieldUnit::PERCENT) || m_nSuperProp > m_xFontSizeMF->get_max(FieldUnit::PERCENT)) bValid = false; - if (m_nSubProp < m_xFontSizeMF->get_min(FUNIT_PERCENT) || m_nSubProp > m_xFontSizeMF->get_max(FUNIT_PERCENT)) + if (m_nSubProp < m_xFontSizeMF->get_min(FieldUnit::PERCENT) || m_nSubProp > m_xFontSizeMF->get_max(FieldUnit::PERCENT)) bValid = false; if (!bValid) @@ -2767,7 +2767,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) m_xHighLowFT->set_sensitive(false); m_xHighLowMF->set_sensitive(false); } - m_xHighLowMF->set_value(m_xHighLowMF->normalize(nFac * nEsc), FUNIT_PERCENT); + m_xHighLowMF->set_value(m_xHighLowMF->normalize(nFac * nEsc), FieldUnit::PERCENT); } else { @@ -2776,7 +2776,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) PositionHdl_Impl(*m_xNormalPosBtn); } //the height has to be set after the handler is called to keep the value also if the escapement is zero - m_xFontSizeMF->set_value(m_xFontSizeMF->normalize(nEscProp), FUNIT_PERCENT); + m_xFontSizeMF->set_value(m_xFontSizeMF->normalize(nEscProp), FieldUnit::PERCENT); } else { @@ -2805,10 +2805,10 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) rCTLFont.SetFixKerning( static_cast<short>(nKern) ); //the attribute value must be displayed also if it's above the maximum allowed value - long nVal = static_cast<long>(m_xKerningMF->get_max(FUNIT_POINT)); + long nVal = static_cast<long>(m_xKerningMF->get_max(FieldUnit::POINT)); if(nVal < nKerning) - m_xKerningMF->set_max(nKerning, FUNIT_POINT); - m_xKerningMF->set_value(nKerning, FUNIT_POINT); + m_xKerningMF->set_max(nKerning, FieldUnit::POINT); + m_xKerningMF->set_value(nKerning, FieldUnit::POINT); } else m_xKerningMF->set_text(OUString()); @@ -2830,10 +2830,10 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) { const SvxCharScaleWidthItem& rItem = static_cast<const SvxCharScaleWidthItem&>( rSet->Get( nWhich ) ); m_nScaleWidthInitialVal = rItem.GetValue(); - m_xScaleWidthMF->set_value(m_nScaleWidthInitialVal, FUNIT_PERCENT); + m_xScaleWidthMF->set_value(m_nScaleWidthInitialVal, FieldUnit::PERCENT); } else - m_xScaleWidthMF->set_value(100, FUNIT_PERCENT); + m_xScaleWidthMF->set_value(100, FieldUnit::PERCENT); nWhich = GetWhich( SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ); if ( rSet->GetItemState( nWhich ) >= SfxItemState::DEFAULT ) @@ -2924,10 +2924,10 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet ) nEsc = bHigh ? DFLT_ESC_AUTO_SUPER : DFLT_ESC_AUTO_SUB; else { - nEsc = static_cast<short>(m_xHighLowMF->denormalize(m_xHighLowMF->get_value(FUNIT_PERCENT))); + nEsc = static_cast<short>(m_xHighLowMF->denormalize(m_xHighLowMF->get_value(FieldUnit::PERCENT))); nEsc *= (bHigh ? 1 : -1); } - nEscProp = static_cast<sal_uInt8>(m_xFontSizeMF->denormalize(m_xFontSizeMF->get_value(FUNIT_PERCENT))); + nEscProp = static_cast<sal_uInt8>(m_xFontSizeMF->denormalize(m_xFontSizeMF->get_value(FieldUnit::PERCENT))); } else { @@ -2963,7 +2963,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet ) short nKerning = 0; MapUnit eUnit = rSet->GetPool()->GetMetric( nWhich ); - long nTmp = static_cast<long>(m_xKerningMF->get_value(FUNIT_POINT)); + long nTmp = static_cast<long>(m_xKerningMF->get_value(FieldUnit::POINT)); long nVal = LogicToLogic( nTmp, MapUnit::MapPoint, eUnit ); nKerning = static_cast<short>(m_xKerningMF->denormalize( nVal )); @@ -2998,7 +2998,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet ) nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); if (m_xScaleWidthMF->get_value_changed_from_saved()) { - rSet->Put(SvxCharScaleWidthItem(static_cast<sal_uInt16>(m_xScaleWidthMF->get_value(FUNIT_PERCENT)), nWhich)); + rSet->Put(SvxCharScaleWidthItem(static_cast<sal_uInt16>(m_xScaleWidthMF->get_value(FieldUnit::PERCENT)), nWhich)); bModified = true; } else if ( SfxItemState::DEFAULT == rOldSet.GetItemState( nWhich, false ) ) diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index d71bc5623972..9586d3d4e539 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -75,15 +75,15 @@ SvxConnectionPage::SvxConnectionPage(TabPageParent pWindow, const SfxItemSet& rI , pView(nullptr) , m_xLbType(m_xBuilder->weld_combo_box("LB_TYPE")) , m_xFtLine1(m_xBuilder->weld_label("FT_LINE_1")) - , m_xMtrFldLine1(m_xBuilder->weld_metric_spin_button("MTR_FLD_LINE_1", FUNIT_CM)) + , m_xMtrFldLine1(m_xBuilder->weld_metric_spin_button("MTR_FLD_LINE_1", FieldUnit::CM)) , m_xFtLine2(m_xBuilder->weld_label("FT_LINE_2")) - , m_xMtrFldLine2(m_xBuilder->weld_metric_spin_button("MTR_FLD_LINE_2", FUNIT_CM)) + , m_xMtrFldLine2(m_xBuilder->weld_metric_spin_button("MTR_FLD_LINE_2", FieldUnit::CM)) , m_xFtLine3(m_xBuilder->weld_label("FT_LINE_3")) - , m_xMtrFldLine3(m_xBuilder->weld_metric_spin_button("MTR_FLD_LINE_3", FUNIT_CM)) - , m_xMtrFldHorz1(m_xBuilder->weld_metric_spin_button("MTR_FLD_HORZ_1", FUNIT_MM)) - , m_xMtrFldVert1(m_xBuilder->weld_metric_spin_button("MTR_FLD_VERT_1", FUNIT_MM)) - , m_xMtrFldHorz2(m_xBuilder->weld_metric_spin_button("MTR_FLD_HORZ_2", FUNIT_MM)) - , m_xMtrFldVert2(m_xBuilder->weld_metric_spin_button("MTR_FLD_VERT_2", FUNIT_MM)) + , m_xMtrFldLine3(m_xBuilder->weld_metric_spin_button("MTR_FLD_LINE_3", FieldUnit::CM)) + , m_xMtrFldHorz1(m_xBuilder->weld_metric_spin_button("MTR_FLD_HORZ_1", FieldUnit::MM)) + , m_xMtrFldVert1(m_xBuilder->weld_metric_spin_button("MTR_FLD_VERT_1", FieldUnit::MM)) + , m_xMtrFldHorz2(m_xBuilder->weld_metric_spin_button("MTR_FLD_HORZ_2", FieldUnit::MM)) + , m_xMtrFldVert2(m_xBuilder->weld_metric_spin_button("MTR_FLD_VERT_2", FieldUnit::MM)) , m_xCtlPreview(new weld::CustomWeld(*m_xBuilder, "CTL_PREVIEW", m_aCtlPreview)) { SfxItemPool* pPool = rOutAttrs.GetPool(); @@ -100,15 +100,15 @@ SvxConnectionPage::SvxConnectionPage(TabPageParent pWindow, const SfxItemSet& rI SetFieldUnit( *m_xMtrFldLine1, eFUnit ); SetFieldUnit( *m_xMtrFldLine2, eFUnit ); SetFieldUnit( *m_xMtrFldLine3, eFUnit ); - if( eFUnit == FUNIT_MM ) + if( eFUnit == FieldUnit::MM ) { - m_xMtrFldHorz1->set_increments(50, 500, FUNIT_NONE); - m_xMtrFldHorz2->set_increments(50, 500, FUNIT_NONE); - m_xMtrFldVert1->set_increments(50, 500, FUNIT_NONE); - m_xMtrFldVert2->set_increments(50, 500, FUNIT_NONE); - m_xMtrFldLine1->set_increments(50, 500, FUNIT_NONE); - m_xMtrFldLine2->set_increments(50, 500, FUNIT_NONE); - m_xMtrFldLine3->set_increments(50, 500, FUNIT_NONE); + m_xMtrFldHorz1->set_increments(50, 500, FieldUnit::NONE); + m_xMtrFldHorz2->set_increments(50, 500, FieldUnit::NONE); + m_xMtrFldVert1->set_increments(50, 500, FieldUnit::NONE); + m_xMtrFldVert2->set_increments(50, 500, FieldUnit::NONE); + m_xMtrFldLine1->set_increments(50, 500, FieldUnit::NONE); + m_xMtrFldLine2->set_increments(50, 500, FieldUnit::NONE); + m_xMtrFldLine3->set_increments(50, 500, FieldUnit::NONE); } Link<weld::MetricSpinButton&,void> aLink(LINK(this, SvxConnectionPage, ChangeAttrEditHdl_Impl)); @@ -337,21 +337,21 @@ IMPL_LINK_NOARG(SvxConnectionPage, ChangeAttrListBoxHdl_Impl, weld::ComboBox&, v m_xFtLine3->set_sensitive( nCount > 2 ); m_xMtrFldLine3->set_sensitive( nCount > 2 ); if( nCount > 2 ) - m_xMtrFldLine3->set_value(m_xMtrFldLine3->get_value(FUNIT_NONE), FUNIT_NONE); + m_xMtrFldLine3->set_value(m_xMtrFldLine3->get_value(FieldUnit::NONE), FieldUnit::NONE); else m_xMtrFldLine3->set_text(""); m_xFtLine2->set_sensitive( nCount > 1 ); m_xMtrFldLine2->set_sensitive( nCount > 1 ); if( nCount > 1 ) - m_xMtrFldLine2->set_value(m_xMtrFldLine2->get_value(FUNIT_NONE), FUNIT_NONE); + m_xMtrFldLine2->set_value(m_xMtrFldLine2->get_value(FieldUnit::NONE), FieldUnit::NONE); else m_xMtrFldLine2->set_text(""); m_xFtLine1->set_sensitive( nCount > 0 ); m_xMtrFldLine1->set_sensitive( nCount > 0 ); if( nCount > 0 ) - m_xMtrFldLine1->set_value(m_xMtrFldLine1->get_value(FUNIT_NONE), FUNIT_NONE); + m_xMtrFldLine1->set_value(m_xMtrFldLine1->get_value(FieldUnit::NONE), FieldUnit::NONE); else m_xMtrFldLine1->set_text(""); } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 22fb67eff376..d42f42a7f045 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -57,16 +57,16 @@ SvxGrfCropPage::SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet) , m_xCropFrame(m_xBuilder->weld_widget("cropframe")) , m_xZoomConstRB(m_xBuilder->weld_radio_button("keepscale")) , m_xSizeConstRB(m_xBuilder->weld_radio_button("keepsize")) - , m_xLeftMF(m_xBuilder->weld_metric_spin_button("left", FUNIT_CM)) - , m_xRightMF(m_xBuilder->weld_metric_spin_button("right", FUNIT_CM)) - , m_xTopMF(m_xBuilder->weld_metric_spin_button("top", FUNIT_CM)) - , m_xBottomMF(m_xBuilder->weld_metric_spin_button("bottom", FUNIT_CM)) + , m_xLeftMF(m_xBuilder->weld_metric_spin_button("left", FieldUnit::CM)) + , m_xRightMF(m_xBuilder->weld_metric_spin_button("right", FieldUnit::CM)) + , m_xTopMF(m_xBuilder->weld_metric_spin_button("top", FieldUnit::CM)) + , m_xBottomMF(m_xBuilder->weld_metric_spin_button("bottom", FieldUnit::CM)) , m_xScaleFrame(m_xBuilder->weld_widget("scaleframe")) - , m_xWidthZoomMF(m_xBuilder->weld_metric_spin_button("widthzoom", FUNIT_PERCENT)) - , m_xHeightZoomMF(m_xBuilder->weld_metric_spin_button("heightzoom", FUNIT_PERCENT)) + , m_xWidthZoomMF(m_xBuilder->weld_metric_spin_button("widthzoom", FieldUnit::PERCENT)) + , m_xHeightZoomMF(m_xBuilder->weld_metric_spin_button("heightzoom", FieldUnit::PERCENT)) , m_xSizeFrame(m_xBuilder->weld_widget("sizeframe")) - , m_xWidthMF(m_xBuilder->weld_metric_spin_button("width", FUNIT_CM)) - , m_xHeightMF(m_xBuilder->weld_metric_spin_button("height", FUNIT_CM)) + , m_xWidthMF(m_xBuilder->weld_metric_spin_button("width", FieldUnit::CM)) + , m_xHeightMF(m_xBuilder->weld_metric_spin_button("height", FieldUnit::CM)) , m_xOrigSizeGrid(m_xBuilder->weld_widget("origsizegrid")) , m_xOrigSizeFT(m_xBuilder->weld_label("origsizeft")) , m_xOrigSizePB(m_xBuilder->weld_button("origsize")) @@ -151,10 +151,10 @@ void SvxGrfCropPage::Reset( const SfxItemSet *rSet ) } else { - m_xLeftMF->set_value(0, FUNIT_NONE); - m_xRightMF->set_value(0, FUNIT_NONE); - m_xTopMF->set_value(0, FUNIT_NONE); - m_xBottomMF->set_value(0, FUNIT_NONE); + m_xLeftMF->set_value(0, FieldUnit::NONE); + m_xRightMF->set_value(0, FieldUnit::NONE); + m_xTopMF->set_value(0, FieldUnit::NONE); + m_xBottomMF->set_value(0, FieldUnit::NONE); } m_xLeftMF->save_value(); @@ -301,12 +301,12 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet) auto nWidth = m_xWidthMF->normalize(nOldWidth); auto nHeight = m_xHeightMF->normalize(nOldHeight); - if (nWidth != m_xWidthMF->get_value(FUNIT_TWIP)) - m_xWidthMF->set_value(nWidth, FUNIT_TWIP); + if (nWidth != m_xWidthMF->get_value(FieldUnit::TWIP)) + m_xWidthMF->set_value(nWidth, FieldUnit::TWIP); m_xWidthMF->save_value(); - if (nHeight != m_xHeightMF->get_value(FUNIT_TWIP)) - m_xHeightMF->set_value(nHeight, FUNIT_TWIP); + if (nHeight != m_xHeightMF->get_value(FieldUnit::TWIP)) + m_xHeightMF->set_value(nHeight, FieldUnit::TWIP); m_xHeightMF->save_value(); if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) ) @@ -364,7 +364,7 @@ IMPL_LINK( SvxGrfCropPage, ZoomHdl, weld::MetricSpinButton&, rField, void ) long nLRBorders = lcl_GetValue(*m_xLeftMF, eUnit) +lcl_GetValue(*m_xRightMF, eUnit); m_xWidthMF->set_value( m_xWidthMF->normalize( - ((aOrigSize.Width() - nLRBorders) * rField.get_value(FUNIT_NONE))/100), + ((aOrigSize.Width() - nLRBorders) * rField.get_value(FieldUnit::NONE))/100), eUnit); } else @@ -372,7 +372,7 @@ IMPL_LINK( SvxGrfCropPage, ZoomHdl, weld::MetricSpinButton&, rField, void ) long nULBorders = lcl_GetValue(*m_xTopMF, eUnit) +lcl_GetValue(*m_xBottomMF, eUnit); m_xHeightMF->set_value( m_xHeightMF->normalize( - ((aOrigSize.Height() - nULBorders ) * rField.get_value(FUNIT_NONE))/100) , + ((aOrigSize.Height() - nULBorders ) * rField.get_value(FieldUnit::NONE))/100) , eUnit ); } } @@ -399,7 +399,7 @@ IMPL_LINK( SvxGrfCropPage, SizeHdl, weld::MetricSpinButton&, rField, void ) if(!nWidth) nWidth++; sal_uInt16 nZoom = static_cast<sal_uInt16>( aSize.Width() * 100 / nWidth); - m_xWidthZoomMF->set_value(nZoom, FUNIT_NONE); + m_xWidthZoomMF->set_value(nZoom, FieldUnit::NONE); } else { @@ -409,7 +409,7 @@ IMPL_LINK( SvxGrfCropPage, SizeHdl, weld::MetricSpinButton&, rField, void ) if(!nHeight) nHeight++; sal_uInt16 nZoom = static_cast<sal_uInt16>( aSize.Height() * 100 / nHeight); - m_xHeightZoomMF->set_value(nZoom, FUNIT_NONE); + m_xHeightZoomMF->set_value(nZoom, FieldUnit::NONE); } } @@ -429,7 +429,7 @@ IMPL_LINK( SvxGrfCropPage, CropModifyHdl, weld::MetricSpinButton&, rField, void { long nLeft = lcl_GetValue( *m_xLeftMF, eUnit ); long nRight = lcl_GetValue( *m_xRightMF, eUnit ); - long nWidthZoom = static_cast<long>(m_xWidthZoomMF->get_value(FUNIT_NONE)); + long nWidthZoom = static_cast<long>(m_xWidthZoomMF->get_value(FieldUnit::NONE)); if (bZoom && nWidthZoom != 0 && ( ( ( aOrigSize.Width() - (nLeft + nRight )) * nWidthZoom ) / 100 >= aPageSize.Width() ) ) { @@ -466,7 +466,7 @@ IMPL_LINK( SvxGrfCropPage, CropModifyHdl, weld::MetricSpinButton&, rField, void { long nTop = lcl_GetValue( *m_xTopMF, eUnit ); long nBottom = lcl_GetValue( *m_xBottomMF, eUnit ); - long nHeightZoom = static_cast<long>(m_xHeightZoomMF->get_value(FUNIT_NONE)); + long nHeightZoom = static_cast<long>(m_xHeightZoomMF->get_value(FieldUnit::NONE)); if(bZoom && ( ( ( aOrigSize.Height() - (nTop + nBottom )) * nHeightZoom) / 100 >= aPageSize.Height())) { @@ -517,8 +517,8 @@ IMPL_LINK_NOARG(SvxGrfCropPage, OrigSizeHdl, weld::Button&, void) lcl_GetValue( *m_xTopMF, eUnit ) - lcl_GetValue( *m_xBottomMF, eUnit ); m_xHeightMF->set_value( m_xHeightMF->normalize( nHeight ), eUnit ); - m_xWidthZoomMF->set_value(100, FUNIT_NONE); - m_xHeightZoomMF->set_value(100, FUNIT_NONE); + m_xWidthZoomMF->set_value(100, FieldUnit::NONE); + m_xHeightZoomMF->set_value(100, FieldUnit::NONE); bSetOrigSize = true; } /*-------------------------------------------------------------------- @@ -542,12 +542,12 @@ void SvxGrfCropPage::CalcZoom() long nDen; if( (nDen = aOrigSize.Width() - nLRBorders) > 0) nZoom = static_cast<sal_uInt16>((( nWidth * 1000 / nDen )+5)/10); - m_xWidthZoomMF->set_value(nZoom, FUNIT_NONE); + m_xWidthZoomMF->set_value(nZoom, FieldUnit::NONE); if( (nDen = aOrigSize.Height() - nULBorders) > 0) nZoom = static_cast<sal_uInt16>((( nHeight * 1000 / nDen )+5)/10); else nZoom = 0; - m_xHeightZoomMF->set_value(nZoom, FUNIT_NONE); + m_xHeightZoomMF->set_value(nZoom, FieldUnit::NONE); } /*-------------------------------------------------------------------- @@ -618,13 +618,13 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound ) m_aExampleWN.SetBottom(nVal); } - m_xLeftMF->set_increments(nSpin, nSpin * 10, FUNIT_NONE); - m_xRightMF->set_increments(nSpin, nSpin * 10, FUNIT_NONE); + m_xLeftMF->set_increments(nSpin, nSpin * 10, FieldUnit::NONE); + m_xRightMF->set_increments(nSpin, nSpin * 10, FieldUnit::NONE); nSpin = m_xTopMF->normalize(aOrigSize.Height()) / 20; nSpin = MetricField::ConvertValue( nSpin, aOrigSize.Width(), 0, eUnit, m_xLeftMF->get_unit() ); - m_xTopMF->set_increments(nSpin, nSpin * 10, FUNIT_NONE); - m_xBottomMF->set_increments(nSpin, nSpin * 10, FUNIT_NONE); + m_xTopMF->set_increments(nSpin, nSpin * 10, FieldUnit::NONE); + m_xBottomMF->set_increments(nSpin, nSpin * 10, FieldUnit::NONE); // display original size const FieldUnit eMetric = GetModuleFieldUnit( GetItemSet() ); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 680b78f41878..778d4b869e5b 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -81,15 +81,15 @@ SvxCaptionTabPage::SvxCaptionTabPage(TabPageParent pParent, const SfxItemSet& rI , nExtension(0) , rOutAttrs(rInAttrs) , pView(nullptr) - , m_xMF_SPACING(m_xBuilder->weld_metric_spin_button("spacing", FUNIT_MM)) + , m_xMF_SPACING(m_xBuilder->weld_metric_spin_button("spacing", FieldUnit::MM)) , m_xLB_EXTENSION(m_xBuilder->weld_combo_box("extension")) , m_xFT_BYFT(m_xBuilder->weld_label("byft")) - , m_xMF_BY(m_xBuilder->weld_metric_spin_button("by", FUNIT_MM)) + , m_xMF_BY(m_xBuilder->weld_metric_spin_button("by", FieldUnit::MM)) , m_xFT_POSITIONFT(m_xBuilder->weld_label("positionft")) , m_xLB_POSITION(m_xBuilder->weld_combo_box("position")) , m_xLineTypes(m_xBuilder->weld_combo_box("linetypes")) , m_xFT_LENGTHFT(m_xBuilder->weld_label("lengthft")) - , m_xMF_LENGTH(m_xBuilder->weld_metric_spin_button("length", FUNIT_MM)) + , m_xMF_LENGTH(m_xBuilder->weld_metric_spin_button("length", FieldUnit::MM)) , m_xCB_OPTIMAL(m_xBuilder->weld_check_button("optimal")) , m_xCT_CAPTTYPE(new SvtValueSet(m_xBuilder->weld_scrolled_window("valuesetwin"))) , m_xCT_CAPTTYPEWin(new weld::CustomWeld(*m_xBuilder, "valueset", *m_xCT_CAPTTYPE)) @@ -232,10 +232,10 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) switch ( eFUnit ) { - case FUNIT_CM: - case FUNIT_M: - case FUNIT_KM: - eFUnit = FUNIT_MM; + case FieldUnit::CM: + case FieldUnit::M: + case FieldUnit::KM: + eFUnit = FieldUnit::MM; break; default: ;//prevent warning } @@ -253,7 +253,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) eUnit = pPool->GetMetric( nWhich ); nEscAbs = static_cast<const SdrCaptionEscAbsItem&>( rOutAttrs.Get( nWhich ) ).GetValue(); SetMetricValue( *m_xMF_BY, nEscAbs, eUnit ); - nEscAbs = m_xMF_BY->get_value(FUNIT_NONE); + nEscAbs = m_xMF_BY->get_value(FieldUnit::NONE); nWhich = GetWhich( SDRATTR_CAPTIONESCREL ); nEscRel = static_cast<long>(static_cast<const SdrCaptionEscRelItem&>( rOutAttrs.Get( nWhich ) ).GetValue()); @@ -263,14 +263,14 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) eUnit = pPool->GetMetric( nWhich ); nLineLen = static_cast<const SdrCaptionLineLenItem&>( rOutAttrs.Get( nWhich ) ).GetValue(); SetMetricValue( *m_xMF_LENGTH, nLineLen, eUnit ); - nLineLen = m_xMF_LENGTH->get_value(FUNIT_NONE); + nLineLen = m_xMF_LENGTH->get_value(FieldUnit::NONE); //------- distance to box ---------- nWhich = GetWhich( SDRATTR_CAPTIONGAP ); eUnit = pPool->GetMetric( nWhich ); nGap = static_cast<const SdrCaptionGapItem&>( rOutAttrs.Get( nWhich ) ).GetValue(); SetMetricValue( *m_xMF_SPACING, nGap, eUnit ); - nGap = m_xMF_SPACING->get_value(FUNIT_NONE); + nGap = m_xMF_SPACING->get_value(FieldUnit::NONE); nCaptionType = static_cast<const SdrCaptionTypeItem&>( rOutAttrs.Get( GetWhich( SDRATTR_CAPTIONTYPE ) ) ).GetValue(); bFitLineLen = static_cast<const SfxBoolItem&>( rOutAttrs.Get( GetWhich( SDRATTR_CAPTIONFITLINELEN ) ) ).GetValue(); @@ -291,7 +291,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) nPosition = POS_MIDDLE; nExtension = EXT_OPTIMAL; - m_xMF_SPACING->set_value(nGap, FUNIT_NONE); + m_xMF_SPACING->set_value(nGap, FieldUnit::NONE); if( nEscDir == SdrCaptionEscDir::Horizontal ) { @@ -306,7 +306,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) else { nExtension = EXT_FROM_TOP; - m_xMF_BY->set_value(nEscAbs, FUNIT_NONE); + m_xMF_BY->set_value(nEscAbs, FieldUnit::NONE); } } else if( nEscDir == SdrCaptionEscDir::Vertical ) @@ -322,7 +322,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) else { nExtension = EXT_FROM_LEFT; - m_xMF_BY->set_value(nEscAbs, FUNIT_NONE); + m_xMF_BY->set_value(nEscAbs, FieldUnit::NONE); } } else if( nEscDir == SdrCaptionEscDir::BestFit ) @@ -331,7 +331,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) } m_xCB_OPTIMAL->set_active(bFitLineLen); - m_xMF_LENGTH->set_value(nLineLen, FUNIT_NONE); + m_xMF_LENGTH->set_value(nLineLen, FieldUnit::NONE); m_xLB_EXTENSION->set_active(nExtension); 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); } } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 5e1f23cede2a..5904c18affcf 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1070,7 +1070,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(TabPageParent pParent, , m_xBulColorFT(m_xBuilder->weld_label("colorft")) , m_xBulColLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), pParent.GetFrameWeld())) , m_xBulRelSizeFT(m_xBuilder->weld_label("relsizeft")) - , m_xBulRelSizeMF(m_xBuilder->weld_metric_spin_button("relsize", FUNIT_PERCENT)) + , m_xBulRelSizeMF(m_xBuilder->weld_metric_spin_button("relsize", FieldUnit::PERCENT)) , m_xAllLevelFT(m_xBuilder->weld_label("sublevelsft")) , m_xAllLevelNF(m_xBuilder->weld_spin_button("sublevels")) , m_xStartFT(m_xBuilder->weld_label("startatft")) @@ -1080,9 +1080,9 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(TabPageParent pParent, , m_xBitmapFT(m_xBuilder->weld_label("bitmapft")) , m_xBitmapMB(m_xBuilder->weld_menu_button("bitmap")) , m_xWidthFT(m_xBuilder->weld_label("widthft")) - , m_xWidthMF(m_xBuilder->weld_metric_spin_button("widthmf", FUNIT_CM)) + , m_xWidthMF(m_xBuilder->weld_metric_spin_button("widthmf", FieldUnit::CM)) , m_xHeightFT(m_xBuilder->weld_label("heightft")) - , m_xHeightMF(m_xBuilder->weld_metric_spin_button("heightmf", FUNIT_CM)) + , m_xHeightMF(m_xBuilder->weld_metric_spin_button("heightmf", FieldUnit::CM)) , m_xRatioCB(m_xBuilder->weld_check_button("keepratio")) , m_xOrientFT(m_xBuilder->weld_label("orientft")) , m_xOrientLB(m_xBuilder->weld_combo_box("orientlb")) @@ -1091,8 +1091,8 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(TabPageParent pParent, , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWIN)) { m_xBulColLB->SetSlotId(SID_ATTR_CHAR_COLOR); - m_xBulRelSizeMF->set_min(SVX_NUM_REL_SIZE_MIN, FUNIT_PERCENT); - m_xBulRelSizeMF->set_increments(5, 50, FUNIT_PERCENT); + m_xBulRelSizeMF->set_min(SVX_NUM_REL_SIZE_MIN, FieldUnit::PERCENT); + m_xBulRelSizeMF->set_increments(5, 50, FieldUnit::PERCENT); SetExchangeSupport(); aActBulletFont = lcl_GetDefaultBulletFont(); @@ -1155,7 +1155,7 @@ void SvxNumOptionsTabPage::dispose() void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) { - if(eMetric == FUNIT_MM) + if(eMetric == FieldUnit::MM) { m_xWidthMF->set_digits(1); m_xHeightMF->set_digits(1); @@ -1478,7 +1478,7 @@ void SvxNumOptionsTabPage::InitControls() if(bBullRelSize) { if(bSameBulRelSize) - m_xBulRelSizeMF->set_value(aNumFmtArr[nLvl]->GetBulletRelSize(), FUNIT_PERCENT); + m_xBulRelSizeMF->set_value(aNumFmtArr[nLvl]->GetBulletRelSize(), FieldUnit::PERCENT); else m_xBulRelSizeMF->set_text(""); } @@ -1804,7 +1804,7 @@ IMPL_LINK(SvxNumOptionsTabPage, BulColorHdl_Impl, ColorListBox&, rColorBox, void IMPL_LINK(SvxNumOptionsTabPage, BulRelSizeHdl_Impl, weld::MetricSpinButton&, rField, void) { - sal_uInt16 nRelSize = rField.get_value(FUNIT_PERCENT); + sal_uInt16 nRelSize = rField.get_value(FieldUnit::PERCENT); sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) @@ -2010,8 +2010,8 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, weld::MetricSpinButton&, rField, bool bWidth = &rField == m_xWidthMF.get(); bLastWidthModified = bWidth; bool bRatio = m_xRatioCB->get_active(); - long nWidthVal = static_cast<long>(m_xWidthMF->denormalize(m_xWidthMF->get_value(FUNIT_100TH_MM))); - long nHeightVal = static_cast<long>(m_xHeightMF->denormalize(m_xHeightMF->get_value(FUNIT_100TH_MM))); + long nWidthVal = static_cast<long>(m_xWidthMF->denormalize(m_xWidthMF->get_value(FieldUnit::MM_100TH))); + long nHeightVal = static_cast<long>(m_xHeightMF->denormalize(m_xHeightMF->get_value(FieldUnit::MM_100TH))); nWidthVal = OutputDevice::LogicToLogic( nWidthVal , MapUnit::Map100thMM, eCoreUnit ); nHeightVal = OutputDevice::LogicToLogic( nHeightVal, @@ -2044,7 +2044,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, weld::MetricSpinButton&, rField, aSize.setHeight( aInitSize[i].Height() + static_cast<long>(static_cast<double>(nDelta) / fSizeRatio) ); m_xHeightMF->set_value(m_xHeightMF->normalize( OutputDevice::LogicToLogic( aSize.Height(), eCoreUnit, MapUnit::Map100thMM )), - FUNIT_100TH_MM); + FieldUnit::MM_100TH); } } else @@ -2056,7 +2056,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, weld::MetricSpinButton&, rField, aSize.setWidth( aInitSize[i].Width() + static_cast<long>(static_cast<double>(nDelta) * fSizeRatio) ); m_xWidthMF->set_value(m_xWidthMF->normalize( OutputDevice::LogicToLogic( aSize.Width(), eCoreUnit, MapUnit::Map100thMM )), - FUNIT_100TH_MM); + FieldUnit::MM_100TH); } } const SvxBrushItem* pBrushItem = aNumFmt.GetBrush(); @@ -2489,24 +2489,24 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(TabPageParent pParent, const SfxIte , bLabelAlignmentPosAndSpaceModeActive(false) , m_xLevelLB(m_xBuilder->weld_tree_view("levellb")) , m_xDistBorderFT(m_xBuilder->weld_label("indent")) - , m_xDistBorderMF(m_xBuilder->weld_metric_spin_button("indentmf", FUNIT_CM)) + , m_xDistBorderMF(m_xBuilder->weld_metric_spin_button("indentmf", FieldUnit::CM)) , m_xRelativeCB(m_xBuilder->weld_check_button("relative")) , m_xIndentFT(m_xBuilder->weld_label("numberingwidth")) - , m_xIndentMF(m_xBuilder->weld_metric_spin_button("numberingwidthmf", FUNIT_CM)) + , m_xIndentMF(m_xBuilder->weld_metric_spin_button("numberingwidthmf", FieldUnit::CM)) , m_xDistNumFT(m_xBuilder->weld_label("numdist")) - , m_xDistNumMF(m_xBuilder->weld_metric_spin_button("numdistmf", FUNIT_CM)) + , m_xDistNumMF(m_xBuilder->weld_metric_spin_button("numdistmf", FieldUnit::CM)) , m_xAlignFT(m_xBuilder->weld_label("numalign")) , m_xAlignLB(m_xBuilder->weld_combo_box("numalignlb")) , m_xLabelFollowedByFT(m_xBuilder->weld_label("numfollowedby")) , m_xLabelFollowedByLB(m_xBuilder->weld_combo_box("numfollowedbylb")) , m_xListtabFT(m_xBuilder->weld_label("at")) - , m_xListtabMF(m_xBuilder->weld_metric_spin_button("atmf", FUNIT_CM)) + , m_xListtabMF(m_xBuilder->weld_metric_spin_button("atmf", FieldUnit::CM)) , m_xAlign2FT(m_xBuilder->weld_label("num2align")) , m_xAlign2LB(m_xBuilder->weld_combo_box("num2alignlb")) , m_xAlignedAtFT(m_xBuilder->weld_label("alignedat")) - , m_xAlignedAtMF(m_xBuilder->weld_metric_spin_button("alignedatmf", FUNIT_CM)) + , m_xAlignedAtMF(m_xBuilder->weld_metric_spin_button("alignedatmf", FieldUnit::CM)) , m_xIndentAtFT(m_xBuilder->weld_label("indentat")) - , m_xIndentAtMF(m_xBuilder->weld_metric_spin_button("indentatmf", FUNIT_CM)) + , m_xIndentAtMF(m_xBuilder->weld_metric_spin_button("indentatmf", FieldUnit::CM)) , m_xStandardPB(m_xBuilder->weld_button("standard")) , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWIN)) { @@ -2946,7 +2946,7 @@ VclPtr<SfxTabPage> SvxNumPositionTabPage::Create(TabPageParent pParent, void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) { - if (eMetric == FUNIT_MM) + if (eMetric == FieldUnit::MM) { m_xDistBorderMF->set_digits(1); m_xDistNumMF->set_digits(1); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index a06cf51ef2e7..d45cc342531b 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -151,8 +151,8 @@ SvxPageDescPage::SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rAttr) , mbDelPrinter(false) , mbEnableDrawingLayerFillStyles(false) , m_xPaperSizeBox(new SvxPaperSizeListBox(m_xBuilder->weld_combo_box("comboPageFormat"))) - , m_xPaperWidthEdit(m_xBuilder->weld_metric_spin_button("spinWidth", FUNIT_CM)) - , m_xPaperHeightEdit(m_xBuilder->weld_metric_spin_button("spinHeight", FUNIT_CM)) + , m_xPaperWidthEdit(m_xBuilder->weld_metric_spin_button("spinWidth", FieldUnit::CM)) + , m_xPaperHeightEdit(m_xBuilder->weld_metric_spin_button("spinHeight", FieldUnit::CM)) , m_xOrientationFT(m_xBuilder->weld_label("labelOrientation")) , m_xPortraitBtn(m_xBuilder->weld_radio_button("radiobuttonPortrait")) , m_xLandscapeBtn(m_xBuilder->weld_radio_button("radiobuttonLandscape")) @@ -160,11 +160,11 @@ SvxPageDescPage::SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rAttr) , m_xTextFlowBox(new svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("comboTextFlowBox"))) , m_xPaperTrayBox(m_xBuilder->weld_combo_box("comboPaperTray")) , m_xLeftMarginLbl(m_xBuilder->weld_label("labelLeftMargin")) - , m_xLeftMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargLeft", FUNIT_CM)) + , m_xLeftMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargLeft", FieldUnit::CM)) , m_xRightMarginLbl(m_xBuilder->weld_label("labelRightMargin")) - , m_xRightMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargRight", FUNIT_CM)) - , m_xTopMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargTop", FUNIT_CM)) - , m_xBottomMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargBot", FUNIT_CM)) + , m_xRightMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargRight", FieldUnit::CM)) + , m_xTopMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargTop", FieldUnit::CM)) + , m_xBottomMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargBot", FieldUnit::CM)) , m_xPageText(m_xBuilder->weld_label("labelPageLayout")) , m_xLayoutBox(m_xBuilder->weld_combo_box("comboPageLayout")) , m_xNumberFormatBox(new SvxPageNumberListBox(m_xBuilder->weld_combo_box("comboLayoutFormat"))) @@ -261,28 +261,28 @@ SvxPageDescPage::SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rAttr) Point aPrintOffset = mpDefPrinter->GetPageOffset() - mpDefPrinter->PixelToLogic( Point() ); mpDefPrinter->SetMapMode( aOldMode ); - nFirstLeftMargin = m_xLeftMarginEdit->convert_value_from(m_xLeftMarginEdit->normalize(aPrintOffset.X()), FUNIT_TWIP); - nFirstRightMargin = m_xRightMarginEdit->convert_value_from(m_xRightMarginEdit->normalize(aPaperSize.Width() - aPrintSize.Width() - aPrintOffset.X()), FUNIT_TWIP); - nFirstTopMargin = m_xTopMarginEdit->convert_value_from(m_xTopMarginEdit->normalize(aPrintOffset.Y() ), FUNIT_TWIP); - nFirstBottomMargin = m_xBottomMarginEdit->convert_value_from(m_xBottomMarginEdit->normalize(aPaperSize.Height() - aPrintSize.Height() - aPrintOffset.Y()), FUNIT_TWIP ); - nLastLeftMargin = m_xLeftMarginEdit->convert_value_from(m_xLeftMarginEdit->normalize(aPrintOffset.X() + aPrintSize.Width()), FUNIT_TWIP); - nLastRightMargin = m_xRightMarginEdit->convert_value_from(m_xRightMarginEdit->normalize(aPrintOffset.X() + aPrintSize.Width()), FUNIT_TWIP); - nLastTopMargin = m_xTopMarginEdit->convert_value_from(m_xTopMarginEdit->normalize(aPrintOffset.Y() + aPrintSize.Height()), FUNIT_TWIP); - nLastBottomMargin = m_xBottomMarginEdit->convert_value_from(m_xBottomMarginEdit->normalize(aPrintOffset.Y() + aPrintSize.Height()), FUNIT_TWIP); + nFirstLeftMargin = m_xLeftMarginEdit->convert_value_from(m_xLeftMarginEdit->normalize(aPrintOffset.X()), FieldUnit::TWIP); + nFirstRightMargin = m_xRightMarginEdit->convert_value_from(m_xRightMarginEdit->normalize(aPaperSize.Width() - aPrintSize.Width() - aPrintOffset.X()), FieldUnit::TWIP); + nFirstTopMargin = m_xTopMarginEdit->convert_value_from(m_xTopMarginEdit->normalize(aPrintOffset.Y() ), FieldUnit::TWIP); + nFirstBottomMargin = m_xBottomMarginEdit->convert_value_from(m_xBottomMarginEdit->normalize(aPaperSize.Height() - aPrintSize.Height() - aPrintOffset.Y()), FieldUnit::TWIP ); + nLastLeftMargin = m_xLeftMarginEdit->convert_value_from(m_xLeftMarginEdit->normalize(aPrintOffset.X() + aPrintSize.Width()), FieldUnit::TWIP); + nLastRightMargin = m_xRightMarginEdit->convert_value_from(m_xRightMarginEdit->normalize(aPrintOffset.X() + aPrintSize.Width()), FieldUnit::TWIP); + nLastTopMargin = m_xTopMarginEdit->convert_value_from(m_xTopMarginEdit->normalize(aPrintOffset.Y() + aPrintSize.Height()), FieldUnit::TWIP); + nLastBottomMargin = m_xBottomMarginEdit->convert_value_from(m_xBottomMarginEdit->normalize(aPrintOffset.Y() + aPrintSize.Height()), FieldUnit::TWIP); // #i4219# get DrawingLayer options const SvtOptionsDrawinglayer aDrawinglayerOpt; // #i4219# take Maximum now from configuration (1/100th cm) // was: 11900 -> 119 cm ;new value 3 meters -> 300 cm -> 30000 - m_xPaperWidthEdit->set_max(m_xPaperWidthEdit->normalize(aDrawinglayerOpt.GetMaximumPaperWidth()), FUNIT_CM); - m_xPaperHeightEdit->set_max(m_xPaperHeightEdit->normalize(aDrawinglayerOpt.GetMaximumPaperHeight()), FUNIT_CM); + m_xPaperWidthEdit->set_max(m_xPaperWidthEdit->normalize(aDrawinglayerOpt.GetMaximumPaperWidth()), FieldUnit::CM); + m_xPaperHeightEdit->set_max(m_xPaperHeightEdit->normalize(aDrawinglayerOpt.GetMaximumPaperHeight()), FieldUnit::CM); // #i4219# also for margins (1/100th cm). Was: 9999, keeping. - m_xLeftMarginEdit->set_max(m_xLeftMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperLeftMargin()), FUNIT_MM); - m_xRightMarginEdit->set_max(m_xRightMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperRightMargin()), FUNIT_MM); - m_xTopMarginEdit->set_max(m_xTopMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperTopMargin()), FUNIT_MM); - m_xBottomMarginEdit->set_max(m_xBottomMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FUNIT_MM); + m_xLeftMarginEdit->set_max(m_xLeftMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperLeftMargin()), FieldUnit::MM); + m_xRightMarginEdit->set_max(m_xRightMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperRightMargin()), FieldUnit::MM); + m_xTopMarginEdit->set_max(m_xTopMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperTopMargin()), FieldUnit::MM); + m_xBottomMarginEdit->set_max(m_xBottomMarginEdit->normalize(aDrawinglayerOpt.GetMaximumPaperBottomMargin()), FieldUnit::MM); // Get the i18n framework numberings and add them to the listbox. SvxNumOptionsTabPageHelper::GetI18nNumbering(m_xNumberFormatBox->get_widget(), std::numeric_limits<sal_uInt16>::max()); @@ -839,12 +839,12 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeSelect_Impl, weld::ComboBox&, void) if (m_xLandscapeBtn->get_active()) Swap( aSize ); - if ( aSize.Height() < m_xPaperHeightEdit->get_min( FUNIT_100TH_MM ) ) + if ( aSize.Height() < m_xPaperHeightEdit->get_min( FieldUnit::MM_100TH ) ) m_xPaperHeightEdit->set_min( - m_xPaperHeightEdit->normalize( aSize.Height() ), FUNIT_100TH_MM ); - if ( aSize.Width() < m_xPaperWidthEdit->get_min( FUNIT_100TH_MM ) ) + m_xPaperHeightEdit->normalize( aSize.Height() ), FieldUnit::MM_100TH ); + if ( aSize.Width() < m_xPaperWidthEdit->get_min( FieldUnit::MM_100TH ) ) m_xPaperWidthEdit->set_min( - m_xPaperWidthEdit->normalize( aSize.Width() ), FUNIT_100TH_MM ); + m_xPaperWidthEdit->normalize( aSize.Width() ), FieldUnit::MM_100TH ); SetMetricValue( *m_xPaperHeightEdit, aSize.Height(), MapUnit::Map100thMM ); SetMetricValue( *m_xPaperWidthEdit, aSize.Width(), MapUnit::Map100thMM ); @@ -863,13 +863,13 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeSelect_Impl, weld::ComboBox&, void) // no margin if screen nTmp = 1; // accordingly 1 cm - if ( bScreen || m_xRightMarginEdit->get_value(FUNIT_NONE) == 0 ) + if ( bScreen || m_xRightMarginEdit->get_value(FieldUnit::NONE) == 0 ) SetMetricValue( *m_xRightMarginEdit, nTmp, MapUnit::MapCM ); - if ( bScreen || m_xLeftMarginEdit->get_value(FUNIT_NONE) == 0 ) + if ( bScreen || m_xLeftMarginEdit->get_value(FieldUnit::NONE) == 0 ) SetMetricValue( *m_xLeftMarginEdit, nTmp, MapUnit::MapCM ); - if ( bScreen || m_xBottomMarginEdit->get_value(FUNIT_NONE) == 0 ) + if ( bScreen || m_xBottomMarginEdit->get_value(FieldUnit::NONE) == 0 ) SetMetricValue( *m_xBottomMarginEdit, nTmp, MapUnit::MapCM ); - if ( bScreen || m_xTopMarginEdit->get_value(FUNIT_NONE) == 0 ) + if ( bScreen || m_xTopMarginEdit->get_value(FieldUnit::NONE) == 0 ) SetMetricValue( *m_xTopMarginEdit, nTmp, MapUnit::MapCM ); UpdateExample_Impl( true ); } @@ -951,38 +951,38 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) mpDefPrinter->SetOrientation( eOldOri ); sal_Int64 nSetL = m_xLeftMarginEdit->denormalize( - m_xLeftMarginEdit->get_value( FUNIT_TWIP ) ); + m_xLeftMarginEdit->get_value( FieldUnit::TWIP ) ); sal_Int64 nSetR = m_xRightMarginEdit->denormalize( - m_xRightMarginEdit->get_value( FUNIT_TWIP ) ); + m_xRightMarginEdit->get_value( FieldUnit::TWIP ) ); sal_Int64 nSetT = m_xTopMarginEdit->denormalize( - m_xTopMarginEdit->get_value( FUNIT_TWIP ) ); + m_xTopMarginEdit->get_value( FieldUnit::TWIP ) ); sal_Int64 nSetB = m_xBottomMarginEdit->denormalize( - m_xBottomMarginEdit->get_value( FUNIT_TWIP ) ); + m_xBottomMarginEdit->get_value( FieldUnit::TWIP ) ); long nNewL = aPrintOffset.X(); long nNewR = aPaperSize.Width() - aPrintSize.Width() - aPrintOffset.X(); long nNewT = aPrintOffset.Y(); long nNewB = aPaperSize.Height() - aPrintSize.Height() - aPrintOffset.Y(); - nFirstLeftMargin = m_xLeftMarginEdit->convert_value_from(m_xLeftMarginEdit->normalize(nNewL), FUNIT_TWIP); - nFirstRightMargin = m_xRightMarginEdit->convert_value_from(m_xRightMarginEdit->normalize(nNewR), FUNIT_TWIP); - nFirstTopMargin = m_xTopMarginEdit->convert_value_from(m_xTopMarginEdit->normalize(nNewT), FUNIT_TWIP); - nFirstBottomMargin = m_xBottomMarginEdit->convert_value_from(m_xBottomMarginEdit->normalize(nNewB), FUNIT_TWIP); + nFirstLeftMargin = m_xLeftMarginEdit->convert_value_from(m_xLeftMarginEdit->normalize(nNewL), FieldUnit::TWIP); + nFirstRightMargin = m_xRightMarginEdit->convert_value_from(m_xRightMarginEdit->normalize(nNewR), FieldUnit::TWIP); + nFirstTopMargin = m_xTopMarginEdit->convert_value_from(m_xTopMarginEdit->normalize(nNewT), FieldUnit::TWIP); + nFirstBottomMargin = m_xBottomMarginEdit->convert_value_from(m_xBottomMarginEdit->normalize(nNewB), FieldUnit::TWIP); if ( bSet ) { if ( nSetL < nNewL ) m_xLeftMarginEdit->set_value( m_xLeftMarginEdit->normalize( nNewL ), - FUNIT_TWIP ); + FieldUnit::TWIP ); if ( nSetR < nNewR ) m_xRightMarginEdit->set_value( m_xRightMarginEdit->normalize( nNewR ), - FUNIT_TWIP ); + FieldUnit::TWIP ); if ( nSetT < nNewT ) m_xTopMarginEdit->set_value( m_xTopMarginEdit->normalize( nNewT ), - FUNIT_TWIP ); + FieldUnit::TWIP ); if ( nSetB < nNewB ) m_xBottomMarginEdit->set_value( m_xBottomMarginEdit->normalize( nNewB ), - FUNIT_TWIP ); + FieldUnit::TWIP ); } } @@ -1312,10 +1312,10 @@ void SvxPageDescPage::RangeHdl_Impl() long nHFRight = std::max(m_aBspWin.GetHdRight(), m_aBspWin.GetFtRight()); // current values for page margins - long nBT = static_cast<long>(m_xTopMarginEdit->denormalize(m_xTopMarginEdit->get_value(FUNIT_TWIP))); - long nBB = static_cast<long>(m_xBottomMarginEdit->denormalize(m_xBottomMarginEdit->get_value(FUNIT_TWIP))); - long nBL = static_cast<long>(m_xLeftMarginEdit->denormalize(m_xLeftMarginEdit->get_value(FUNIT_TWIP))); - long nBR = static_cast<long>(m_xRightMarginEdit->denormalize(m_xRightMarginEdit->get_value(FUNIT_TWIP))); + long nBT = static_cast<long>(m_xTopMarginEdit->denormalize(m_xTopMarginEdit->get_value(FieldUnit::TWIP))); + long nBB = static_cast<long>(m_xBottomMarginEdit->denormalize(m_xBottomMarginEdit->get_value(FieldUnit::TWIP))); + long nBL = static_cast<long>(m_xLeftMarginEdit->denormalize(m_xLeftMarginEdit->get_value(FieldUnit::TWIP))); + long nBR = static_cast<long>(m_xRightMarginEdit->denormalize(m_xRightMarginEdit->get_value(FieldUnit::TWIP))); // calculate width of page border const SfxItemSet* _pSet = &GetItemSet(); @@ -1336,33 +1336,33 @@ void SvxPageDescPage::RangeHdl_Impl() long nMin = nHHeight + nHDist + nFDist + nFHeight + nBT + nBB + MINBODY + aBorder.Height(); - m_xPaperHeightEdit->set_min(m_xPaperHeightEdit->normalize(nMin), FUNIT_TWIP); + m_xPaperHeightEdit->set_min(m_xPaperHeightEdit->normalize(nMin), FieldUnit::TWIP); nMin = MINBODY + nBL + nBR + aBorder.Width(); - m_xPaperWidthEdit->set_min(m_xPaperWidthEdit->normalize(nMin), FUNIT_TWIP); + m_xPaperWidthEdit->set_min(m_xPaperWidthEdit->normalize(nMin), FieldUnit::TWIP); - long nH = static_cast<long>(m_xPaperHeightEdit->denormalize(m_xPaperHeightEdit->get_value(FUNIT_TWIP))); - long nW = static_cast<long>(m_xPaperWidthEdit->denormalize(m_xPaperWidthEdit->get_value(FUNIT_TWIP))); + long nH = static_cast<long>(m_xPaperHeightEdit->denormalize(m_xPaperHeightEdit->get_value(FieldUnit::TWIP))); + long nW = static_cast<long>(m_xPaperWidthEdit->denormalize(m_xPaperWidthEdit->get_value(FieldUnit::TWIP))); // Top long nMax = nH - nBB - aBorder.Height() - MINBODY - nFDist - nFHeight - nHDist - nHHeight; - m_xTopMarginEdit->set_max(m_xTopMarginEdit->normalize(nMax), FUNIT_TWIP); + m_xTopMarginEdit->set_max(m_xTopMarginEdit->normalize(nMax), FieldUnit::TWIP); // Bottom nMax = nH - nBT - aBorder.Height() - MINBODY - nFDist - nFHeight - nHDist - nHHeight; - m_xBottomMarginEdit->set_max(m_xTopMarginEdit->normalize(nMax), FUNIT_TWIP); + m_xBottomMarginEdit->set_max(m_xTopMarginEdit->normalize(nMax), FieldUnit::TWIP); // Left nMax = nW - nBR - MINBODY - aBorder.Width() - nHFLeft - nHFRight; - m_xLeftMarginEdit->set_max(m_xLeftMarginEdit->normalize(nMax), FUNIT_TWIP); + m_xLeftMarginEdit->set_max(m_xLeftMarginEdit->normalize(nMax), FieldUnit::TWIP); // Right nMax = nW - nBL - MINBODY - aBorder.Width() - nHFLeft - nHFRight; - m_xRightMarginEdit->set_max(m_xRightMarginEdit->normalize(nMax), FUNIT_TWIP); + m_xRightMarginEdit->set_max(m_xRightMarginEdit->normalize(nMax), FieldUnit::TWIP); } void SvxPageDescPage::CalcMargin_Impl() @@ -1465,12 +1465,12 @@ bool SvxPageDescPage::IsPrinterRangeOverflow( { bool bRet = false; bool bCheck = ( ( m_nPos & nPos ) == 0 ); - long nValue = rField.get_value(FUNIT_NONE); + long nValue = rField.get_value(FieldUnit::NONE); if ( bCheck && ( nValue < nFirstMargin || nValue > nLastMargin ) && rField.get_value_changed_from_saved() ) { - rField.set_value(nValue < nFirstMargin ? nFirstMargin : nLastMargin, FUNIT_NONE); + rField.set_value(nValue < nFirstMargin ? nFirstMargin : nLastMargin, FieldUnit::NONE); bRet = true; } @@ -1485,16 +1485,16 @@ void SvxPageDescPage::CheckMarginEdits( bool _bClear ) if ( _bClear ) m_nPos = 0; - sal_Int64 nValue = m_xLeftMarginEdit->get_value(FUNIT_NONE); + sal_Int64 nValue = m_xLeftMarginEdit->get_value(FieldUnit::NONE); if ( nValue < nFirstLeftMargin || nValue > nLastLeftMargin ) m_nPos |= MARGIN_LEFT; - nValue = m_xRightMarginEdit->get_value(FUNIT_NONE); + nValue = m_xRightMarginEdit->get_value(FieldUnit::NONE); if ( nValue < nFirstRightMargin || nValue > nLastRightMargin ) m_nPos |= MARGIN_RIGHT; - nValue = m_xTopMarginEdit->get_value(FUNIT_NONE); + nValue = m_xTopMarginEdit->get_value(FieldUnit::NONE); if ( nValue < nFirstTopMargin || nValue > nLastTopMargin ) m_nPos |= MARGIN_TOP; - nValue = m_xBottomMarginEdit->get_value(FUNIT_NONE); + nValue = m_xBottomMarginEdit->get_value(FieldUnit::NONE); if ( nValue < nFirstBottomMargin || nValue > nLastBottomMargin ) m_nPos |= MARGIN_BOTTOM; } @@ -1503,20 +1503,20 @@ bool SvxPageDescPage::IsMarginOutOfRange() { bool bRet = ( ( ( !( m_nPos & MARGIN_LEFT ) && m_xLeftMarginEdit->get_value_changed_from_saved() ) && - ( m_xLeftMarginEdit->get_value(FUNIT_NONE) < nFirstLeftMargin || - m_xLeftMarginEdit->get_value(FUNIT_NONE) > nLastLeftMargin ) ) || + ( m_xLeftMarginEdit->get_value(FieldUnit::NONE) < nFirstLeftMargin || + m_xLeftMarginEdit->get_value(FieldUnit::NONE) > nLastLeftMargin ) ) || ( ( !( m_nPos & MARGIN_RIGHT ) && m_xRightMarginEdit->get_value_changed_from_saved() ) && - ( m_xRightMarginEdit->get_value(FUNIT_NONE) < nFirstRightMargin || - m_xRightMarginEdit->get_value(FUNIT_NONE) > nLastRightMargin ) ) || + ( m_xRightMarginEdit->get_value(FieldUnit::NONE) < nFirstRightMargin || + m_xRightMarginEdit->get_value(FieldUnit::NONE) > nLastRightMargin ) ) || ( ( !( m_nPos & MARGIN_TOP ) && m_xTopMarginEdit->get_value_changed_from_saved() ) && - ( m_xTopMarginEdit->get_value(FUNIT_NONE) < nFirstTopMargin || - m_xTopMarginEdit->get_value(FUNIT_NONE) > nLastTopMargin ) ) || + ( m_xTopMarginEdit->get_value(FieldUnit::NONE) < nFirstTopMargin || + m_xTopMarginEdit->get_value(FieldUnit::NONE) > nLastTopMargin ) ) || ( ( !( m_nPos & MARGIN_BOTTOM ) && m_xBottomMarginEdit->get_value_changed_from_saved() ) && - ( m_xBottomMarginEdit->get_value(FUNIT_NONE) < nFirstBottomMargin || - m_xBottomMarginEdit->get_value(FUNIT_NONE) > nLastBottomMargin ) ) ); + ( m_xBottomMarginEdit->get_value(FieldUnit::NONE) < nFirstBottomMargin || + m_xBottomMarginEdit->get_value(FieldUnit::NONE) > nLastBottomMargin ) ) ); return bRet; } diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index d93649366dfe..a038007c49fb 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -171,8 +171,8 @@ void SvxStdParagraphTabPage::ELRLoseFocus() sal_Int64 nR = m_xRightIndent->denormalize(m_xRightIndent->get_value(eUnit)); OUString aTmp = m_xFLineIndent->get_text(); - if (m_xLeftIndent->get_min(FUNIT_NONE) < 0) - m_xFLineIndent->set_min(-99999, FUNIT_MM); + if (m_xLeftIndent->get_min(FieldUnit::NONE) < 0) + m_xFLineIndent->set_min(-99999, FieldUnit::MM); else m_xFLineIndent->set_min(m_xFLineIndent->normalize(-nL), eUnit); @@ -242,7 +242,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) case LLINESPACE_PROP: SetLineSpace_Impl( aSpacing, nPos, static_cast<long>(m_xLineDistAtPercentBox->denormalize( - m_xLineDistAtPercentBox->get_value(FUNIT_NONE) )) ); + m_xLineDistAtPercentBox->get_value(FieldUnit::NONE) )) ); break; case LLINESPACE_MIN: @@ -284,13 +284,13 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) if ( m_xTopDist->IsRelative() ) aMargin.SetUpper( rOldItem.GetUpper(), - static_cast<sal_uInt16>(m_xTopDist->get_value(FUNIT_NONE)) ); + static_cast<sal_uInt16>(m_xTopDist->get_value(FieldUnit::NONE)) ); else aMargin.SetUpper( static_cast<sal_uInt16>(m_xTopDist->GetCoreValue(eUnit)) ); if ( m_xBottomDist->IsRelative() ) aMargin.SetLower( rOldItem.GetLower(), - static_cast<sal_uInt16>(m_xBottomDist->get_value(FUNIT_NONE)) ); + static_cast<sal_uInt16>(m_xBottomDist->get_value(FieldUnit::NONE)) ); else aMargin.SetLower( static_cast<sal_uInt16>(m_xBottomDist->GetCoreValue(eUnit)) ); @@ -331,19 +331,19 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) if (m_xLeftIndent->IsRelative()) aMargin.SetTextLeft( rOldItem.GetTextLeft(), - static_cast<sal_uInt16>(m_xLeftIndent->get_value(FUNIT_NONE)) ); + static_cast<sal_uInt16>(m_xLeftIndent->get_value(FieldUnit::NONE)) ); else aMargin.SetTextLeft(m_xLeftIndent->GetCoreValue(eUnit)); if ( m_xRightIndent->IsRelative() ) aMargin.SetRight( rOldItem.GetRight(), - static_cast<sal_uInt16>(m_xRightIndent->get_value(FUNIT_NONE)) ); + static_cast<sal_uInt16>(m_xRightIndent->get_value(FieldUnit::NONE)) ); else aMargin.SetRight(m_xRightIndent->GetCoreValue(eUnit)); if ( m_xFLineIndent->IsRelative() ) aMargin.SetTextFirstLineOfst( rOldItem.GetTextFirstLineOfst(), - static_cast<sal_uInt16>(m_xFLineIndent->get_value(FUNIT_NONE)) ); + static_cast<sal_uInt16>(m_xFLineIndent->get_value(FieldUnit::NONE)) ); else aMargin.SetTextFirstLineOfst(static_cast<sal_uInt16>(m_xFLineIndent->GetCoreValue(eUnit))); } @@ -422,16 +422,16 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) SvtCJKOptions aCJKOptions; if(aCJKOptions.IsAsianTypographyEnabled() && bApplyCharUnit ) - eFUnit = FUNIT_CHAR; + eFUnit = FieldUnit::CHAR; m_xLeftIndent->SetFieldUnit(eFUnit); m_xRightIndent->SetFieldUnit(eFUnit); m_xFLineIndent->SetFieldUnit(eFUnit); - if ( eFUnit == FUNIT_CHAR ) + if ( eFUnit == FieldUnit::CHAR ) { - m_xTopDist->SetFieldUnit(FUNIT_LINE); - m_xBottomDist->SetFieldUnit(FUNIT_LINE); - SetFieldUnit(*m_xLineDistAtMetricBox, FUNIT_POINT); + m_xTopDist->SetFieldUnit(FieldUnit::LINE); + m_xBottomDist->SetFieldUnit(FieldUnit::LINE); + SetFieldUnit(*m_xLineDistAtMetricBox, FieldUnit::POINT); } else { @@ -455,7 +455,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) if ( rOldItem.GetPropLeft() != 100 ) { m_xLeftIndent->SetRelative( true ); - m_xLeftIndent->set_value(rOldItem.GetPropLeft(), FUNIT_NONE); + m_xLeftIndent->set_value(rOldItem.GetPropLeft(), FieldUnit::NONE); } else { @@ -467,7 +467,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) if ( rOldItem.GetPropRight() != 100 ) { m_xRightIndent->SetRelative( true ); - m_xRightIndent->set_value(rOldItem.GetPropRight(), FUNIT_NONE); + m_xRightIndent->set_value(rOldItem.GetPropRight(), FieldUnit::NONE); } else { @@ -479,12 +479,12 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) if ( rOldItem.GetPropTextFirstLineOfst() != 100 ) { m_xFLineIndent->SetRelative(true); - m_xFLineIndent->set_value(rOldItem.GetPropTextFirstLineOfst(), FUNIT_NONE); + m_xFLineIndent->set_value(rOldItem.GetPropTextFirstLineOfst(), FieldUnit::NONE); } else { m_xFLineIndent->SetRelative(false); - m_xFLineIndent->set_min(-9999, FUNIT_NONE); + m_xFLineIndent->set_min(-9999, FieldUnit::NONE); m_xFLineIndent->SetFieldUnit(eFUnit); m_xFLineIndent->SetMetricValue(rOldItem.GetTextFirstLineOfst(), eUnit); } @@ -524,13 +524,13 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) if ( rOldItem.GetPropUpper() != 100 ) { m_xTopDist->SetRelative( true ); - m_xTopDist->set_value(rOldItem.GetPropUpper(), FUNIT_NONE); + m_xTopDist->set_value(rOldItem.GetPropUpper(), FieldUnit::NONE); } else { m_xTopDist->SetRelative(false); - if (eFUnit == FUNIT_CHAR) - m_xTopDist->SetFieldUnit(FUNIT_LINE); + if (eFUnit == FieldUnit::CHAR) + m_xTopDist->SetFieldUnit(FieldUnit::LINE); else m_xTopDist->SetFieldUnit(eFUnit); m_xTopDist->SetMetricValue(rOldItem.GetUpper(), eUnit); @@ -539,13 +539,13 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) if ( rOldItem.GetPropLower() != 100 ) { m_xBottomDist->SetRelative( true ); - m_xBottomDist->set_value(rOldItem.GetPropLower(), FUNIT_NONE); + m_xBottomDist->set_value(rOldItem.GetPropLower(), FieldUnit::NONE); } else { m_xBottomDist->SetRelative(false); - if (eFUnit == FUNIT_CHAR) - m_xBottomDist->SetFieldUnit(FUNIT_LINE); + if (eFUnit == FieldUnit::CHAR) + m_xBottomDist->SetFieldUnit(FieldUnit::LINE); else m_xBottomDist->SetFieldUnit(eFUnit); m_xBottomDist->SetMetricValue(rOldItem.GetLower(), eUnit); @@ -674,18 +674,18 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage(TabPageParent pParent, const Sfx , nWidth(11905 /*567 * 50*/) , nMinFixDist(0) , bRelativeMode(false) - , m_xLeftIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_LEFTINDENT", FUNIT_CM))) + , m_xLeftIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_LEFTINDENT", FieldUnit::CM))) , m_xRightLabel(m_xBuilder->weld_label("labelFT_RIGHTINDENT")) - , m_xRightIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_RIGHTINDENT", FUNIT_CM))) + , m_xRightIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_RIGHTINDENT", FieldUnit::CM))) , m_xFLineLabel(m_xBuilder->weld_label("labelFT_FLINEINDENT")) - , m_xFLineIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_FLINEINDENT", FUNIT_CM))) + , m_xFLineIndent(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_FLINEINDENT", FieldUnit::CM))) , m_xAutoCB(m_xBuilder->weld_check_button("checkCB_AUTO")) - , m_xTopDist(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_TOPDIST", FUNIT_CM))) - , m_xBottomDist(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_BOTTOMDIST", FUNIT_CM))) + , m_xTopDist(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_TOPDIST", FieldUnit::CM))) + , m_xBottomDist(new RelativeField(m_xBuilder->weld_metric_spin_button("spinED_BOTTOMDIST", FieldUnit::CM))) , m_xContextualCB(m_xBuilder->weld_check_button("checkCB_CONTEXTUALSPACING")) , m_xLineDist(m_xBuilder->weld_combo_box("comboLB_LINEDIST")) - , m_xLineDistAtPercentBox(m_xBuilder->weld_metric_spin_button("spinED_LINEDISTPERCENT", FUNIT_PERCENT)) - , m_xLineDistAtMetricBox(m_xBuilder->weld_metric_spin_button("spinED_LINEDISTMETRIC", FUNIT_CM)) + , m_xLineDistAtPercentBox(m_xBuilder->weld_metric_spin_button("spinED_LINEDISTPERCENT", FieldUnit::PERCENT)) + , m_xLineDistAtMetricBox(m_xBuilder->weld_metric_spin_button("spinED_LINEDISTMETRIC", FieldUnit::CM)) , m_xLineDistAtLabel(m_xBuilder->weld_label("labelFT_LINEDIST")) , m_xAbsDist(m_xBuilder->weld_label("labelST_LINEDIST_ABS")) , m_xRegisterFL(m_xBuilder->weld_widget("frameFL_REGISTER")) @@ -700,7 +700,7 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage(TabPageParent pParent, const Sfx m_xLineDistAtMetricBox->hide(); Init_Impl(); - m_xFLineIndent->set_min(-9999, FUNIT_NONE); // is set to 0 on default + m_xFLineIndent->set_min(-9999, FieldUnit::NONE); // is set to 0 on default } SvxStdParagraphTabPage::~SvxStdParagraphTabPage() @@ -709,8 +709,8 @@ SvxStdParagraphTabPage::~SvxStdParagraphTabPage() void SvxStdParagraphTabPage::EnableNegativeMode() { - m_xLeftIndent->set_min(-9999, FUNIT_NONE); - m_xRightIndent->set_min(-9999, FUNIT_NONE); + m_xLeftIndent->set_min(-9999, FieldUnit::NONE); + m_xRightIndent->set_min(-9999, FieldUnit::NONE); m_xRightIndent->EnableNegativeMode(); m_xLeftIndent->EnableNegativeMode(); } @@ -761,7 +761,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl break; } // the set per cent value - m_xLineDistAtPercentBox->set_value(m_xLineDistAtPercentBox->normalize(rAttr.GetPropLineSpace()), FUNIT_NONE); + m_xLineDistAtPercentBox->set_value(m_xLineDistAtPercentBox->normalize(rAttr.GetPropLineSpace()), FieldUnit::NONE); m_xLineDist->set_active( LLINESPACE_PROP ); break; @@ -805,10 +805,10 @@ IMPL_LINK(SvxStdParagraphTabPage, LineDistHdl_Impl, weld::ComboBox&, rBox, void) case LLINESPACE_DURCH: // setting a sensible default? // limit MS min(10, aPageSize) - m_xLineDistAtMetricBox->set_min(0, FUNIT_NONE); + m_xLineDistAtMetricBox->set_min(0, FieldUnit::NONE); if (m_xLineDistAtMetricBox->get_text().isEmpty()) - m_xLineDistAtMetricBox->set_value(m_xLineDistAtMetricBox->normalize(1), FUNIT_NONE); + m_xLineDistAtMetricBox->set_value(m_xLineDistAtMetricBox->normalize(1), FieldUnit::NONE); m_xLineDistAtPercentBox->hide(); m_xLineDistAtMetricBox->show(); m_xLineDistAtMetricBox->set_sensitive(true); @@ -816,10 +816,10 @@ IMPL_LINK(SvxStdParagraphTabPage, LineDistHdl_Impl, weld::ComboBox&, rBox, void) break; case LLINESPACE_MIN: - m_xLineDistAtMetricBox->set_min(0, FUNIT_NONE); + m_xLineDistAtMetricBox->set_min(0, FieldUnit::NONE); if (m_xLineDistAtMetricBox->get_text().isEmpty()) - m_xLineDistAtMetricBox->set_value(m_xLineDistAtMetricBox->normalize(10), FUNIT_TWIP); + m_xLineDistAtMetricBox->set_value(m_xLineDistAtMetricBox->normalize(10), FieldUnit::TWIP); m_xLineDistAtPercentBox->hide(); m_xLineDistAtMetricBox->show(); m_xLineDistAtMetricBox->set_sensitive(true); @@ -829,7 +829,7 @@ IMPL_LINK(SvxStdParagraphTabPage, LineDistHdl_Impl, weld::ComboBox&, rBox, void) case LLINESPACE_PROP: if (m_xLineDistAtPercentBox->get_text().isEmpty()) - m_xLineDistAtPercentBox->set_value(m_xLineDistAtPercentBox->normalize(100), FUNIT_TWIP); + m_xLineDistAtPercentBox->set_value(m_xLineDistAtPercentBox->normalize(100), FieldUnit::TWIP); m_xLineDistAtMetricBox->hide(); m_xLineDistAtPercentBox->show(); m_xLineDistAtPercentBox->set_sensitive(true); @@ -837,12 +837,12 @@ IMPL_LINK(SvxStdParagraphTabPage, LineDistHdl_Impl, weld::ComboBox&, rBox, void) break; case LLINESPACE_FIX: { - auto nTemp = m_xLineDistAtMetricBox->get_value(FUNIT_NONE); - m_xLineDistAtMetricBox->set_min(m_xLineDistAtMetricBox->normalize(nMinFixDist), FUNIT_TWIP); + auto nTemp = m_xLineDistAtMetricBox->get_value(FieldUnit::NONE); + m_xLineDistAtMetricBox->set_min(m_xLineDistAtMetricBox->normalize(nMinFixDist), FieldUnit::TWIP); // if the value has been changed at SetMin, // it is time for the default - if (m_xLineDistAtMetricBox->get_value(FUNIT_NONE) != nTemp) + if (m_xLineDistAtMetricBox->get_value(FieldUnit::NONE) != nTemp) SetMetricValue( *m_xLineDistAtMetricBox, FIX_DIST_DEF, MapUnit::MapTwip ); // fix is only in Writer m_xLineDistAtPercentBox->hide(); m_xLineDistAtMetricBox->show(); @@ -890,11 +890,11 @@ void SvxStdParagraphTabPage::Init_Impl() void SvxStdParagraphTabPage::UpdateExample_Impl() { - m_aExampleWin.SetFirstLineOfst( static_cast<short>(m_xFLineIndent->denormalize( m_xFLineIndent->get_value( FUNIT_TWIP ) )) ); - m_aExampleWin.SetLeftMargin( static_cast<long>(m_xLeftIndent->denormalize( m_xLeftIndent->get_value( FUNIT_TWIP ) ) ) ); - m_aExampleWin.SetRightMargin( static_cast<long>(m_xRightIndent->denormalize( m_xRightIndent->get_value( FUNIT_TWIP ) ) ) ); - m_aExampleWin.SetUpper( static_cast<sal_uInt16>(m_xTopDist->denormalize( m_xTopDist->get_value( FUNIT_TWIP ) )) ); - m_aExampleWin.SetLower( static_cast<sal_uInt16>(m_xBottomDist->denormalize( m_xBottomDist->get_value( FUNIT_TWIP ) )) ); + m_aExampleWin.SetFirstLineOfst( static_cast<short>(m_xFLineIndent->denormalize( m_xFLineIndent->get_value( FieldUnit::TWIP ) )) ); + m_aExampleWin.SetLeftMargin( static_cast<long>(m_xLeftIndent->denormalize( m_xLeftIndent->get_value( FieldUnit::TWIP ) ) ) ); + m_aExampleWin.SetRightMargin( static_cast<long>(m_xRightIndent->denormalize( m_xRightIndent->get_value( FieldUnit::TWIP ) ) ) ); + m_aExampleWin.SetUpper( static_cast<sal_uInt16>(m_xTopDist->denormalize( m_xTopDist->get_value( FieldUnit::TWIP ) )) ); + m_aExampleWin.SetLower( static_cast<sal_uInt16>(m_xBottomDist->denormalize( m_xBottomDist->get_value( FieldUnit::TWIP ) )) ); int nPos = m_xLineDist->get_active(); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 5d4aecb4329d..c67b3f8eddc4 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -525,8 +525,8 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(TabPageParent pParent, const SfxItemSet , m_bIsMultiSelection(false) , m_bIsInRightToLeft(false) , m_nProtectSizeState(TRISTATE_FALSE) - , m_xWidthMF(m_xBuilder->weld_metric_spin_button("width", FUNIT_CM)) - , m_xHeightMF(m_xBuilder->weld_metric_spin_button("height", FUNIT_CM)) + , m_xWidthMF(m_xBuilder->weld_metric_spin_button("width", FieldUnit::CM)) + , m_xHeightMF(m_xBuilder->weld_metric_spin_button("height", FieldUnit::CM)) , m_xKeepRatioCB(m_xBuilder->weld_check_button("ratio")) , m_xToPageRB(m_xBuilder->weld_radio_button("topage")) , m_xToParaRB(m_xBuilder->weld_radio_button("topara")) @@ -539,14 +539,14 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(TabPageParent pParent, const SfxItemSet , m_xHoriFT(m_xBuilder->weld_label("horiposft")) , m_xHoriLB(m_xBuilder->weld_combo_box("horipos")) , m_xHoriByFT(m_xBuilder->weld_label("horibyft")) - , m_xHoriByMF(m_xBuilder->weld_metric_spin_button("byhori", FUNIT_CM)) + , m_xHoriByMF(m_xBuilder->weld_metric_spin_button("byhori", FieldUnit::CM)) , m_xHoriToFT(m_xBuilder->weld_label("horitoft")) , m_xHoriToLB(m_xBuilder->weld_combo_box("horianchor")) , m_xHoriMirrorCB(m_xBuilder->weld_check_button("mirror")) , m_xVertFT(m_xBuilder->weld_label("vertposft")) , m_xVertLB(m_xBuilder->weld_combo_box("vertpos")) , m_xVertByFT(m_xBuilder->weld_label("vertbyft")) - , m_xVertByMF(m_xBuilder->weld_metric_spin_button("byvert", FUNIT_CM)) + , m_xVertByMF(m_xBuilder->weld_metric_spin_button("byvert", FieldUnit::CM)) , m_xVertToFT(m_xBuilder->weld_label("verttoft")) , m_xVertToLB(m_xBuilder->weld_combo_box("vertanchor")) , m_xFollowCB(m_xBuilder->weld_check_button("followtextflow")) @@ -781,8 +781,8 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) { if (m_xHoriByMF->get_value_changed_from_saved() || m_xVertByMF->get_value_changed_from_saved()) { - auto nHoriByPos = m_xHoriByMF->denormalize(m_xHoriByMF->get_value(FUNIT_TWIP)); - auto nVertByPos = m_xVertByMF->denormalize(m_xVertByMF->get_value(FUNIT_TWIP)); + auto nHoriByPos = m_xHoriByMF->denormalize(m_xHoriByMF->get_value(FieldUnit::TWIP)); + auto nVertByPos = m_xVertByMF->denormalize(m_xVertByMF->get_value(FieldUnit::TWIP)); // old rectangle with CoreUnit m_aRect = m_pSdrView->GetAllMarkedRect(); @@ -811,7 +811,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) sal_uInt16 nMapPos = GetMapPos(m_pHMap, *m_xHoriLB); short nAlign = GetAlignment(m_pHMap, nMapPos, *m_xHoriToLB); short nRel = GetRelation(*m_xHoriToLB); - const auto nHoriByPos = m_xHoriByMF->denormalize(m_xHoriByMF->get_value(FUNIT_TWIP)); + const auto nHoriByPos = m_xHoriByMF->denormalize(m_xHoriByMF->get_value(FieldUnit::TWIP)); if ( nAlign != rHoriOrient.GetValue() || nRel != rHoriRelation.GetValue() || @@ -842,7 +842,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) short nRel = GetRelation(*m_xVertToLB); // #i34055# - convert vertical position for // as-character anchored objects - auto nVertByPos = m_xVertByMF->denormalize(m_xVertByMF->get_value(FUNIT_TWIP)); + auto nVertByPos = m_xVertByMF->denormalize(m_xVertByMF->get_value(FieldUnit::TWIP)); if (GetAnchorType() == RndStdIds::FLY_AS_CHAR) { nVertByPos *= -1; @@ -876,8 +876,8 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) } if (m_xWidthMF->get_value_changed_from_saved() || m_xHeightMF->get_value_changed_from_saved()) { - sal_uInt32 nWidth = static_cast<sal_uInt32>(m_xWidthMF->denormalize(m_xWidthMF->get_value(FUNIT_TWIP))); - sal_uInt32 nHeight = static_cast<sal_uInt32>(m_xHeightMF->denormalize(m_xHeightMF->get_value(FUNIT_TWIP))); + sal_uInt32 nWidth = static_cast<sal_uInt32>(m_xWidthMF->denormalize(m_xWidthMF->get_value(FieldUnit::TWIP))); + sal_uInt32 nHeight = static_cast<sal_uInt32>(m_xHeightMF->denormalize(m_xHeightMF->get_value(FieldUnit::TWIP))); rSet->Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ), nWidth ) ); rSet->Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_HEIGHT ), nHeight ) ); //this item is required by SdrEditView::SetGeoAttrToMarked() @@ -994,11 +994,11 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet* rSet) pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_WIDTH ); sal_Int32 nWidth = std::max( pItem ? ( static_cast<const SfxUInt32Item*>(pItem)->GetValue()) : 0, sal_uInt32(1) ); - m_xWidthMF->set_value(m_xWidthMF->normalize(nWidth), FUNIT_TWIP); + m_xWidthMF->set_value(m_xWidthMF->normalize(nWidth), FieldUnit::TWIP); pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HEIGHT ); sal_Int32 nHeight = std::max( pItem ? ( static_cast<const SfxUInt32Item*>(pItem)->GetValue()) : 0, sal_uInt32(1) ); - m_xHeightMF->set_value(m_xHeightMF->normalize(nHeight), FUNIT_TWIP); + m_xHeightMF->set_value(m_xHeightMF->normalize(nHeight), FieldUnit::TWIP); m_fWidthHeightRatio = double(nWidth) / double(nHeight); if(!m_bPositioningDisabled) @@ -1157,41 +1157,41 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl, weld::Widget&, void) else aVal.nVertOrient = VertOrientation::NONE; - const auto nAtHorzPosVal = m_xHoriByMF->denormalize(m_xHoriByMF->get_value(FUNIT_TWIP)); - const auto nAtVertPosVal = m_xVertByMF->denormalize(m_xVertByMF->get_value(FUNIT_TWIP)); + const auto nAtHorzPosVal = m_xHoriByMF->denormalize(m_xHoriByMF->get_value(FieldUnit::TWIP)); + const auto nAtVertPosVal = m_xVertByMF->denormalize(m_xVertByMF->get_value(FieldUnit::TWIP)); aVal.nHPos = nAtHorzPosVal; aVal.nVPos = nAtVertPosVal; - sal_Int32 nWidth = static_cast<sal_uInt32>(m_xWidthMF->denormalize(m_xWidthMF->get_value(FUNIT_TWIP))); - sal_Int32 nHeight = static_cast<sal_uInt32>(m_xHeightMF->denormalize(m_xHeightMF->get_value(FUNIT_TWIP))); + sal_Int32 nWidth = static_cast<sal_uInt32>(m_xWidthMF->denormalize(m_xWidthMF->get_value(FieldUnit::TWIP))); + sal_Int32 nHeight = static_cast<sal_uInt32>(m_xHeightMF->denormalize(m_xHeightMF->get_value(FieldUnit::TWIP))); aVal.nWidth = nWidth; aVal.nHeight = nHeight; m_aValidateLink.Call(aVal); // minimum width also for style - m_xHeightMF->set_min(m_xHeightMF->normalize(aVal.nMinHeight), FUNIT_TWIP); - m_xWidthMF->set_min(m_xWidthMF->normalize(aVal.nMinWidth), FUNIT_TWIP); + m_xHeightMF->set_min(m_xHeightMF->normalize(aVal.nMinHeight), FieldUnit::TWIP); + m_xWidthMF->set_min(m_xWidthMF->normalize(aVal.nMinWidth), FieldUnit::TWIP); sal_Int32 nMaxWidth(aVal.nMaxWidth); sal_Int32 nMaxHeight(aVal.nMaxHeight); sal_Int64 nTmp = m_xHeightMF->normalize(nMaxHeight); - m_xHeightMF->set_max(nTmp, FUNIT_TWIP); + m_xHeightMF->set_max(nTmp, FieldUnit::TWIP); nTmp = m_xWidthMF->normalize(nMaxWidth); - m_xWidthMF->set_max(nTmp, FUNIT_TWIP); + m_xWidthMF->set_max(nTmp, FieldUnit::TWIP); m_xHoriByMF->set_range(m_xHoriByMF->normalize(aVal.nMinHPos), - m_xHoriByMF->normalize(aVal.nMaxHPos), FUNIT_TWIP); + m_xHoriByMF->normalize(aVal.nMaxHPos), FieldUnit::TWIP); if ( aVal.nHPos != nAtHorzPosVal ) - m_xHoriByMF->set_value(m_xHoriByMF->normalize(aVal.nHPos), FUNIT_TWIP); + m_xHoriByMF->set_value(m_xHoriByMF->normalize(aVal.nHPos), FieldUnit::TWIP); m_xVertByMF->set_range(m_xVertByMF->normalize(aVal.nMinVPos), - m_xVertByMF->normalize(aVal.nMaxVPos), FUNIT_TWIP); + m_xVertByMF->normalize(aVal.nMaxVPos), FieldUnit::TWIP); if ( aVal.nVPos != nAtVertPosVal ) - m_xVertByMF->set_value(m_xVertByMF->normalize(aVal.nVPos), FUNIT_TWIP); + m_xVertByMF->set_value(m_xVertByMF->normalize(aVal.nVPos), FieldUnit::TWIP); } IMPL_LINK_NOARG(SvxSwPosSizeTabPage, AnchorTypeHdl, weld::ToggleButton&, void) @@ -1342,19 +1342,19 @@ IMPL_LINK(SvxSwPosSizeTabPage, PosHdl, weld::ComboBox&, rLB, void) IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, weld::MetricSpinButton&, rEdit, void ) { - auto nWidth = m_xWidthMF->denormalize(m_xWidthMF->get_value(FUNIT_TWIP)); - auto nHeight = m_xHeightMF->denormalize(m_xHeightMF->get_value(FUNIT_TWIP)); + auto nWidth = m_xWidthMF->denormalize(m_xWidthMF->get_value(FieldUnit::TWIP)); + auto nHeight = m_xHeightMF->denormalize(m_xHeightMF->get_value(FieldUnit::TWIP)); if (m_xKeepRatioCB->get_active()) { if ( &rEdit == m_xWidthMF.get() ) { nHeight = int(static_cast<double>(nWidth) / m_fWidthHeightRatio); - m_xHeightMF->set_value(m_xHeightMF->normalize(nHeight), FUNIT_TWIP); + m_xHeightMF->set_value(m_xHeightMF->normalize(nHeight), FieldUnit::TWIP); } else if(&rEdit == m_xHeightMF.get()) { nWidth = int(static_cast<double>(nHeight) * m_fWidthHeightRatio); - m_xWidthMF->set_value(m_xWidthMF->normalize(nWidth), FUNIT_TWIP); + m_xWidthMF->set_value(m_xWidthMF->normalize(nWidth), FieldUnit::TWIP); } } m_fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0; @@ -1557,16 +1557,16 @@ void SvxSwPosSizeTabPage::InitPos(RndStdIds nAnchor, bEnable = nH == HoriOrientation::NONE && nAnchor != RndStdIds::FLY_AS_CHAR; //#61359# why not in formats&& !bFormat; if (!bEnable) { - m_xHoriByMF->set_value(0, FUNIT_TWIP); + m_xHoriByMF->set_value(0, FieldUnit::TWIP); } else if(m_bIsMultiSelection) { - m_xHoriByMF->set_value(m_xHoriByMF->normalize(m_aRect.Left()), FUNIT_TWIP); + m_xHoriByMF->set_value(m_xHoriByMF->normalize(m_aRect.Left()), FieldUnit::TWIP); } else { if (nX != LONG_MAX) - m_xHoriByMF->set_value(m_xHoriByMF->normalize(nX), FUNIT_TWIP); + m_xHoriByMF->set_value(m_xHoriByMF->normalize(nX), FieldUnit::TWIP); } m_xHoriByFT->set_sensitive(bEnable); m_xHoriByMF->set_sensitive(bEnable); @@ -1574,11 +1574,11 @@ void SvxSwPosSizeTabPage::InitPos(RndStdIds nAnchor, bEnable = nV == VertOrientation::NONE; if ( !bEnable ) { - m_xVertByMF->set_value( 0, FUNIT_TWIP ); + m_xVertByMF->set_value( 0, FieldUnit::TWIP ); } else if(m_bIsMultiSelection) { - m_xVertByMF->set_value(m_xVertByMF->normalize(m_aRect.Top()), FUNIT_TWIP); + m_xVertByMF->set_value(m_xVertByMF->normalize(m_aRect.Top()), FieldUnit::TWIP); } else { @@ -1590,7 +1590,7 @@ void SvxSwPosSizeTabPage::InitPos(RndStdIds nAnchor, nY *= -1; } if ( nY != LONG_MAX ) - m_xVertByMF->set_value( m_xVertByMF->normalize(nY), FUNIT_TWIP ); + m_xVertByMF->set_value( m_xVertByMF->normalize(nY), FieldUnit::TWIP ); } m_xVertByFT->set_sensitive( bEnable ); m_xVertByMF->set_sensitive( bEnable ); @@ -1622,8 +1622,8 @@ void SvxSwPosSizeTabPage::UpdateExample() } // Size - auto nXPos = m_xHoriByMF->denormalize(m_xHoriByMF->get_value(FUNIT_TWIP)); - auto nYPos = m_xVertByMF->denormalize(m_xVertByMF->get_value(FUNIT_TWIP)); + auto nXPos = m_xHoriByMF->denormalize(m_xHoriByMF->get_value(FieldUnit::TWIP)); + auto nYPos = m_xVertByMF->denormalize(m_xVertByMF->get_value(FieldUnit::TWIP)); m_aExampleWN.SetRelPos(Point(nXPos, nYPos)); m_aExampleWN.SetAnchor( GetAnchorType() ); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index f60015656fd3..51f864fd6cd7 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -69,8 +69,8 @@ SvxTabulatorTabPage::SvxTabulatorTabPage(TabPageParent pParent, const SfxItemSet , aCurrentTab(0) , aNewTabs(0, 0, SvxTabAdjust::Left, GetWhich(SID_ATTR_TABSTOP)) , nDefDist(0) - , eDefUnit(FUNIT_100TH_MM) - , m_xTabSpin(m_xBuilder->weld_metric_spin_button("SP_TABPOS", FUNIT_CM)) + , eDefUnit(FieldUnit::MM_100TH) + , m_xTabSpin(m_xBuilder->weld_metric_spin_button("SP_TABPOS", FieldUnit::CM)) , m_xTabBox(m_xBuilder->weld_entry_tree_view("tabgrid", "ED_TABPOS", "LB_TABPOS")) , m_xCenterTab(m_xBuilder->weld_radio_button("radiobuttonBTN_TABTYPE_CENTER")) , m_xDezTab(m_xBuilder->weld_radio_button("radiobuttonBTN_TABTYPE_DECIMAL")) @@ -634,7 +634,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl, weld::TreeView&, void) IMPL_LINK_NOARG(SvxTabulatorTabPage, ReformatHdl_Impl, weld::Widget&, void) { m_xTabSpin->set_text(m_xTabBox->get_active_text()); - m_xTabSpin->set_value(m_xTabSpin->get_value(FUNIT_NONE), FUNIT_NONE); + m_xTabSpin->set_value(m_xTabSpin->get_value(FieldUnit::NONE), FieldUnit::NONE); m_xTabBox->set_entry_text(m_xTabSpin->get_text()); } diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 749fe4781184..d5e27cfc2113 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -103,9 +103,9 @@ SvxTextAnimationPage::SvxTextAnimationPage(TabPageParent pPage, const SfxItemSet , m_xTsbEndless(m_xBuilder->weld_check_button("TSB_ENDLESS")) , m_xNumFldCount(m_xBuilder->weld_spin_button("NUM_FLD_COUNT")) , m_xTsbPixel(m_xBuilder->weld_check_button("TSB_PIXEL")) - , m_xMtrFldAmount(m_xBuilder->weld_metric_spin_button("MTR_FLD_AMOUNT", FUNIT_PIXEL)) + , m_xMtrFldAmount(m_xBuilder->weld_metric_spin_button("MTR_FLD_AMOUNT", FieldUnit::PIXEL)) , m_xTsbAuto(m_xBuilder->weld_check_button("TSB_AUTO")) - , m_xMtrFldDelay(m_xBuilder->weld_metric_spin_button("MTR_FLD_DELAY", FUNIT_MILLISECOND)) + , m_xMtrFldDelay(m_xBuilder->weld_metric_spin_button("MTR_FLD_DELAY", FieldUnit::MILLISECOND)) { eFUnit = GetModuleFieldUnit( rInAttrs ); SfxItemPool* pPool = rOutAttrs.GetPool(); @@ -248,7 +248,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs ) { m_xTsbAuto->set_inconsistent(false); long nValue = static_cast<long>(static_cast<const SdrTextAniDelayItem*>(pItem)->GetValue()); - m_xMtrFldDelay->set_value(nValue, FUNIT_NONE); + m_xMtrFldDelay->set_value(nValue, FieldUnit::NONE); if( nValue == 0 ) { m_xTsbAuto->set_state( TRISTATE_TRUE ); @@ -279,12 +279,12 @@ void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs ) nValue = -nValue; if( nValue == 0 ) nValue++; - m_xMtrFldAmount->set_unit( FUNIT_CUSTOM ); + m_xMtrFldAmount->set_unit( FieldUnit::CUSTOM ); m_xMtrFldAmount->set_digits(0); - m_xMtrFldAmount->set_increments(1, 10, FUNIT_NONE); - m_xMtrFldAmount->set_range(1, 100, FUNIT_NONE); - m_xMtrFldAmount->set_value(nValue, FUNIT_NONE); + m_xMtrFldAmount->set_increments(1, 10, FieldUnit::NONE); + m_xMtrFldAmount->set_range(1, 100, FieldUnit::NONE); + m_xMtrFldAmount->set_value(nValue, FieldUnit::NONE); } else { @@ -292,8 +292,8 @@ void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs ) m_xMtrFldAmount->set_unit( eFUnit ); m_xMtrFldAmount->set_digits(2); - m_xMtrFldAmount->set_increments(10, 100, FUNIT_NONE); - m_xMtrFldAmount->set_range(1, 10000, FUNIT_NONE); + m_xMtrFldAmount->set_increments(10, 100, FieldUnit::NONE); + m_xMtrFldAmount->set_range(1, 10000, FieldUnit::NONE); SetMetricValue( *m_xMtrFldAmount, nValue, eUnit ); } @@ -391,7 +391,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs) { if( m_xMtrFldDelay->get_value_changed_from_saved() ) { - nValue = m_xMtrFldDelay->get_value(FUNIT_NONE); + nValue = m_xMtrFldDelay->get_value(FieldUnit::NONE); bModified = true; } } @@ -407,7 +407,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs) sal_Int64 nValue = 0; if( eState == TRISTATE_TRUE ) { - nValue = m_xMtrFldAmount->get_value(FUNIT_NONE); + nValue = m_xMtrFldAmount->get_value(FieldUnit::NONE); nValue = -nValue; } else @@ -519,7 +519,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl, weld::Button&, void) else { m_xMtrFldDelay->set_sensitive(true); - m_xMtrFldDelay->set_value(m_xMtrFldDelay->get_value(FUNIT_NONE), FUNIT_NONE); //to-do + m_xMtrFldDelay->set_value(m_xMtrFldDelay->get_value(FieldUnit::NONE), FieldUnit::NONE); //to-do } } @@ -528,27 +528,27 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, weld::Button&, void) TriState eState = m_xTsbPixel->get_state(); if (eState == TRISTATE_TRUE) { - int nValue = m_xMtrFldAmount->get_value(FUNIT_NONE) / 10; + int nValue = m_xMtrFldAmount->get_value(FieldUnit::NONE) / 10; m_xMtrFldAmount->set_sensitive(true); - m_xMtrFldAmount->set_unit(FUNIT_CUSTOM); + m_xMtrFldAmount->set_unit(FieldUnit::CUSTOM); m_xMtrFldAmount->set_digits(0); - m_xMtrFldAmount->set_increments(1, 10, FUNIT_NONE); - m_xMtrFldAmount->set_range(1, 100, FUNIT_NONE); + m_xMtrFldAmount->set_increments(1, 10, FieldUnit::NONE); + m_xMtrFldAmount->set_range(1, 100, FieldUnit::NONE); - m_xMtrFldAmount->set_value(nValue, FUNIT_NONE); + m_xMtrFldAmount->set_value(nValue, FieldUnit::NONE); } else if( eState == TRISTATE_FALSE ) { - int nValue = m_xMtrFldAmount->get_value(FUNIT_NONE) * 10; + int nValue = m_xMtrFldAmount->get_value(FieldUnit::NONE) * 10; m_xMtrFldAmount->set_sensitive(true); m_xMtrFldAmount->set_unit(eFUnit); m_xMtrFldAmount->set_digits(2); - m_xMtrFldAmount->set_increments(10, 100, FUNIT_NONE); - m_xMtrFldAmount->set_range(1, 10000, FUNIT_NONE); + m_xMtrFldAmount->set_increments(10, 100, FieldUnit::NONE); + m_xMtrFldAmount->set_range(1, 10000, FieldUnit::NONE); - m_xMtrFldAmount->set_value(nValue, FUNIT_NONE); + m_xMtrFldAmount->set_value(nValue, FieldUnit::NONE); } } diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index b54f1dc97cce..b80cfd38fd7c 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -73,10 +73,10 @@ SvxTextAttrPage::SvxTextAttrPage(TabPageParent pPage, const SfxItemSet& rInAttrs , m_xTsbWordWrapText(m_xBuilder->weld_check_button("TSB_WORDWRAP_TEXT")) , m_xTsbAutoGrowSize(m_xBuilder->weld_check_button("TSB_AUTOGROW_SIZE")) , m_xFlDistance(m_xBuilder->weld_frame("FL_DISTANCE")) - , m_xMtrFldLeft(m_xBuilder->weld_metric_spin_button("MTR_FLD_LEFT", FUNIT_CM)) - , m_xMtrFldRight(m_xBuilder->weld_metric_spin_button("MTR_FLD_RIGHT", FUNIT_CM)) - , m_xMtrFldTop(m_xBuilder->weld_metric_spin_button("MTR_FLD_TOP", FUNIT_CM)) - , m_xMtrFldBottom(m_xBuilder->weld_metric_spin_button("MTR_FLD_BOTTOM", FUNIT_CM)) + , m_xMtrFldLeft(m_xBuilder->weld_metric_spin_button("MTR_FLD_LEFT", FieldUnit::CM)) + , m_xMtrFldRight(m_xBuilder->weld_metric_spin_button("MTR_FLD_RIGHT", FieldUnit::CM)) + , m_xMtrFldTop(m_xBuilder->weld_metric_spin_button("MTR_FLD_TOP", FieldUnit::CM)) + , m_xMtrFldBottom(m_xBuilder->weld_metric_spin_button("MTR_FLD_BOTTOM", FieldUnit::CM)) , m_xFlPosition(m_xBuilder->weld_frame("FL_POSITION")) , m_xCtlPosition(new weld::CustomWeld(*m_xBuilder, "CTL_POSITION", m_aCtlPosition)) , m_xTsbFullWidth(m_xBuilder->weld_check_button("TSB_FULL_WIDTH")) @@ -650,10 +650,10 @@ IMPL_LINK(SvxTextAttrPage, ClickHdl_Impl, weld::Button&, rButton, void) if( bContour && bContourEnabled ) { - m_xMtrFldLeft->set_value(0, FUNIT_NONE); - m_xMtrFldRight->set_value(0, FUNIT_NONE); - m_xMtrFldTop->set_value(0, FUNIT_NONE); - m_xMtrFldBottom->set_value(0, FUNIT_NONE); + m_xMtrFldLeft->set_value(0, FieldUnit::NONE); + m_xMtrFldRight->set_value(0, FieldUnit::NONE); + m_xMtrFldTop->set_value(0, FieldUnit::NONE); + m_xMtrFldBottom->set_value(0, FieldUnit::NONE); } // #103516# Do the setup based on states of hor/ver adjust diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index d7af780b41aa..779c3ca096de 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -81,16 +81,16 @@ SvxBitmapTabPage::SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInA , m_xBitmapStyleLB(m_xBuilder->weld_combo_box("bitmapstyle")) , m_xSizeBox(m_xBuilder->weld_container("sizebox")) , m_xTsbScale(m_xBuilder->weld_check_button("scaletsb")) - , m_xBitmapWidth(m_xBuilder->weld_metric_spin_button("width", FUNIT_PERCENT)) - , m_xBitmapHeight(m_xBuilder->weld_metric_spin_button("height", FUNIT_PERCENT)) + , m_xBitmapWidth(m_xBuilder->weld_metric_spin_button("width", FieldUnit::PERCENT)) + , m_xBitmapHeight(m_xBuilder->weld_metric_spin_button("height", FieldUnit::PERCENT)) , m_xPositionBox(m_xBuilder->weld_container("posbox")) , m_xPositionLB(m_xBuilder->weld_combo_box("positionlb")) , m_xPositionOffBox(m_xBuilder->weld_container("posoffbox")) - , m_xPositionOffX(m_xBuilder->weld_metric_spin_button("posoffx", FUNIT_PERCENT)) - , m_xPositionOffY(m_xBuilder->weld_metric_spin_button("posoffy", FUNIT_PERCENT)) + , m_xPositionOffX(m_xBuilder->weld_metric_spin_button("posoffx", FieldUnit::PERCENT)) + , m_xPositionOffY(m_xBuilder->weld_metric_spin_button("posoffy", FieldUnit::PERCENT)) , m_xTileOffBox(m_xBuilder->weld_container("tileoffbox")) , m_xTileOffLB(m_xBuilder->weld_combo_box("tileofflb")) - , m_xTileOffset(m_xBuilder->weld_metric_spin_button("tileoffmtr", FUNIT_PERCENT)) + , m_xTileOffset(m_xBuilder->weld_metric_spin_button("tileoffmtr", FieldUnit::PERCENT)) , m_xBtnImport(m_xBuilder->weld_button("BTN_IMPORT")) , m_xCtlBitmapPreview(new weld::CustomWeld(*m_xBuilder, "CTL_BITMAP_PREVIEW", m_aCtlBitmapPreview)) , m_xBitmapLBWin(new weld::CustomWeld(*m_xBuilder, "BITMAP", *m_xBitmapLB)) @@ -163,8 +163,8 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& rSet ) } else { - m_xBitmapWidth->set_value( 100, FUNIT_NONE ); - m_xBitmapHeight->set_value( 100, FUNIT_NONE ); + m_xBitmapWidth->set_value( 100, FieldUnit::NONE ); + m_xBitmapHeight->set_value( 100, FieldUnit::NONE ); const_cast<SfxItemSet&>(rSet).Put( XFillBmpSizeXItem( GetCoreValue( *m_xBitmapWidth, mePoolUnit ) ) ); const_cast<SfxItemSet&>(rSet).Put( XFillBmpSizeYItem( GetCoreValue( *m_xBitmapHeight, mePoolUnit ) ) ); } @@ -208,8 +208,8 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* rAttrs ) case CUSTOM: case TILED: { - sal_Int64 nWidthPercent = m_xBitmapWidth->get_value(FUNIT_NONE); - sal_Int64 nHeightPercent = m_xBitmapHeight->get_value(FUNIT_NONE); + sal_Int64 nWidthPercent = m_xBitmapWidth->get_value(FieldUnit::NONE); + sal_Int64 nHeightPercent = m_xBitmapHeight->get_value(FieldUnit::NONE); if (m_xTsbScale->get_sensitive() && m_xTsbScale->get_state() == TRISTATE_TRUE) { aSetBitmapSize.setWidth( -nWidthPercent ); @@ -240,13 +240,13 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* rAttrs ) if (m_xPositionLB->get_sensitive()) rAttrs->Put( XFillBmpPosItem( static_cast<RectPoint>( m_xPositionLB->get_active() ) ) ); if (m_xPositionOffX->get_sensitive()) - rAttrs->Put( XFillBmpPosOffsetXItem(m_xPositionOffX->get_value(FUNIT_PERCENT))); + rAttrs->Put( XFillBmpPosOffsetXItem(m_xPositionOffX->get_value(FieldUnit::PERCENT))); if (m_xPositionOffY->get_sensitive()) - rAttrs->Put( XFillBmpPosOffsetYItem(m_xPositionOffY->get_value(FUNIT_PERCENT))); + rAttrs->Put( XFillBmpPosOffsetYItem(m_xPositionOffY->get_value(FieldUnit::PERCENT))); if (m_xTileOffBox->get_sensitive()) { TileOffset eValue = static_cast<TileOffset>(m_xTileOffLB->get_active()); - sal_uInt16 nOffsetValue = static_cast<sal_uInt16>(m_xTileOffset->get_value(FUNIT_PERCENT)); + sal_uInt16 nOffsetValue = static_cast<sal_uInt16>(m_xTileOffset->get_value(FieldUnit::PERCENT)); sal_uInt16 nRowOff = (eValue == ROW) ? nOffsetValue : 0; sal_uInt16 nColOff = (eValue == COLUMN) ? nOffsetValue : 0; rAttrs->Put( XFillBmpTileOffsetXItem(nRowOff) ); @@ -364,8 +364,8 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs ) { if (eRelative == TRISTATE_TRUE) { - m_xBitmapWidth->set_value(nWidth, FUNIT_NONE); - m_xBitmapHeight->set_value(nHeight, FUNIT_NONE); + m_xBitmapWidth->set_value(nWidth, FieldUnit::NONE); + m_xBitmapHeight->set_value(nHeight, FieldUnit::NONE); } else { @@ -383,7 +383,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs ) if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETX ) != SfxItemState::DONTCARE ) { sal_Int32 nValue = rAttrs->Get( XATTR_FILLBMP_POSOFFSETX ).GetValue(); - m_xPositionOffX->set_value(nValue, FUNIT_PERCENT); + m_xPositionOffX->set_value(nValue, FieldUnit::PERCENT); } else m_xPositionOffX->set_text(""); @@ -391,7 +391,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs ) if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETY ) != SfxItemState::DONTCARE ) { sal_Int32 nValue = rAttrs->Get( XATTR_FILLBMP_POSOFFSETY ).GetValue(); - m_xPositionOffY->set_value(nValue, FUNIT_PERCENT); + m_xPositionOffY->set_value(nValue, FieldUnit::PERCENT); } else m_xPositionOffY->set_text(""); @@ -402,7 +402,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs ) if(nValue > 0) { m_xTileOffLB->set_active(static_cast<sal_Int32>(ROW)); - m_xTileOffset->set_value(nValue, FUNIT_PERCENT); + m_xTileOffset->set_value(nValue, FieldUnit::PERCENT); } } @@ -412,7 +412,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs ) if(nValue > 0) { m_xTileOffLB->set_active(static_cast<sal_Int32>(COLUMN)); - m_xTileOffset->set_value(nValue, FUNIT_PERCENT); + m_xTileOffset->set_value(nValue, FieldUnit::PERCENT); } } @@ -586,8 +586,8 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapSizeHdl, weld::MetricSpinButton&, m_bLogicalSize = false; if (m_xTsbScale->get_state() != TRISTATE_TRUE && static_cast<BitmapStyle>(m_xBitmapStyleLB->get_active()) != TILED) { - sal_Int64 nWidthPercent = m_xBitmapWidth->denormalize(m_xBitmapWidth->get_value(FUNIT_NONE)); - sal_Int64 nHeightPercent = m_xBitmapHeight->denormalize(m_xBitmapHeight->get_value(FUNIT_NONE)); + sal_Int64 nWidthPercent = m_xBitmapWidth->denormalize(m_xBitmapWidth->get_value(FieldUnit::NONE)); + sal_Int64 nHeightPercent = m_xBitmapHeight->denormalize(m_xBitmapHeight->get_value(FieldUnit::NONE)); if (nWidthPercent == 100 && nHeightPercent == 100) m_xBitmapStyleLB->set_active(static_cast<sal_Int32>(CUSTOM)); } @@ -602,26 +602,26 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, weld::Button&, void ) if (m_xTsbScale->get_state() == TRISTATE_TRUE) { m_xBitmapWidth->set_digits( 0 ); - m_xBitmapWidth->set_unit(FUNIT_PERCENT); - m_xBitmapWidth->set_value(100, FUNIT_NONE); - m_xBitmapWidth->set_range(0, 100, FUNIT_NONE); + m_xBitmapWidth->set_unit(FieldUnit::PERCENT); + m_xBitmapWidth->set_value(100, FieldUnit::NONE); + m_xBitmapWidth->set_range(0, 100, FieldUnit::NONE); m_xBitmapHeight->set_digits( 0 ); - m_xBitmapHeight->set_unit(FUNIT_PERCENT); - m_xBitmapHeight->set_value(100, FUNIT_NONE); - m_xBitmapHeight->set_range(0, 100, FUNIT_NONE); + m_xBitmapHeight->set_unit(FieldUnit::PERCENT); + m_xBitmapHeight->set_value(100, FieldUnit::NONE); + m_xBitmapHeight->set_range(0, 100, FieldUnit::NONE); } else { m_xBitmapWidth->set_digits( 2 ); m_xBitmapWidth->set_unit(meFieldUnit); - m_xBitmapWidth->set_value(100, FUNIT_NONE); - m_xBitmapWidth->set_range(0, 999900, FUNIT_NONE); + m_xBitmapWidth->set_value(100, FieldUnit::NONE); + m_xBitmapWidth->set_range(0, 999900, FieldUnit::NONE); m_xBitmapHeight->set_digits( 2 ); m_xBitmapHeight->set_unit(meFieldUnit); - m_xBitmapHeight->set_value(100, FUNIT_NONE); - m_xBitmapHeight->set_range(0, 999900, FUNIT_NONE); + m_xBitmapHeight->set_value(100, FieldUnit::NONE); + m_xBitmapHeight->set_range(0, 999900, FieldUnit::NONE); } ModifyBitmapStyleHdl( *m_xBitmapStyleLB ); @@ -651,8 +651,8 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapStyleHdl, weld::ComboBox&, void ) { if (m_xTsbScale->get_sensitive() && m_xTsbScale->get_state() == TRISTATE_TRUE) { - aSetBitmapSize.setWidth(-m_xBitmapWidth->get_value(FUNIT_NONE)); - aSetBitmapSize.setHeight(-m_xBitmapWidth->get_value(FUNIT_NONE)); + aSetBitmapSize.setWidth(-m_xBitmapWidth->get_value(FieldUnit::NONE)); + aSetBitmapSize.setHeight(-m_xBitmapWidth->get_value(FieldUnit::NONE)); } else { @@ -685,10 +685,10 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapPositionHdl, weld::ComboBox&, void IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyPositionOffsetHdl, weld::MetricSpinButton&, void) { if (m_xPositionOffX->get_sensitive()) - m_rXFSet.Put( XFillBmpPosOffsetXItem( m_xPositionOffX->get_value(FUNIT_PERCENT) ) ); + m_rXFSet.Put( XFillBmpPosOffsetXItem( m_xPositionOffX->get_value(FieldUnit::PERCENT) ) ); if (m_xPositionOffY->get_sensitive()) - m_rXFSet.Put( XFillBmpPosOffsetYItem( m_xPositionOffY->get_value(FUNIT_PERCENT) ) ); + m_rXFSet.Put( XFillBmpPosOffsetYItem( m_xPositionOffY->get_value(FieldUnit::PERCENT) ) ); m_aCtlBitmapPreview.SetAttributes( m_aXFillAttr.GetItemSet() ); m_aCtlBitmapPreview.Invalidate(); @@ -700,10 +700,10 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, weld::MetricSpinButton&, sal_uInt16 nTileYOff = 0; if(m_xTileOffLB->get_active() == static_cast<sal_Int32>(ROW)) - nTileXOff = m_xTileOffset->get_value(FUNIT_PERCENT); + nTileXOff = m_xTileOffset->get_value(FieldUnit::PERCENT); if(m_xTileOffLB->get_active() == static_cast<sal_Int32>(COLUMN)) - nTileYOff = m_xTileOffset->get_value(FUNIT_PERCENT); + nTileYOff = m_xTileOffset->get_value(FieldUnit::PERCENT); m_rXFSet.Put( XFillBmpTileOffsetXItem(nTileXOff) ); m_rXFSet.Put( XFillBmpTileOffsetYItem(nTileYOff) ); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 9a902fc7270b..c7b79ed69bc2 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -85,10 +85,10 @@ SvxColorTabPage::SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAtt , m_xYpreset(m_xBuilder->weld_entry("Y_preset")) , m_xMpreset(m_xBuilder->weld_entry("M_preset")) , m_xKpreset(m_xBuilder->weld_entry("K_preset")) - , m_xCcustom(m_xBuilder->weld_metric_spin_button("C_custom", FUNIT_PERCENT)) - , m_xYcustom(m_xBuilder->weld_metric_spin_button("Y_custom", FUNIT_PERCENT)) - , m_xMcustom(m_xBuilder->weld_metric_spin_button("M_custom", FUNIT_PERCENT)) - , m_xKcustom(m_xBuilder->weld_metric_spin_button("K_custom", FUNIT_PERCENT)) + , m_xCcustom(m_xBuilder->weld_metric_spin_button("C_custom", FieldUnit::PERCENT)) + , m_xYcustom(m_xBuilder->weld_metric_spin_button("Y_custom", FieldUnit::PERCENT)) + , m_xMcustom(m_xBuilder->weld_metric_spin_button("M_custom", FieldUnit::PERCENT)) + , m_xKcustom(m_xBuilder->weld_metric_spin_button("K_custom", FieldUnit::PERCENT)) , m_xBtnAdd(m_xBuilder->weld_button("add")) , m_xBtnDelete(m_xBuilder->weld_button("delete")) , m_xBtnWorkOn(m_xBuilder->weld_button("edit")) @@ -302,10 +302,10 @@ IMPL_LINK_NOARG(SvxColorTabPage, SpinValueHdl_Impl, weld::SpinButton&, void) IMPL_LINK_NOARG(SvxColorTabPage, MetricSpinValueHdl_Impl, weld::MetricSpinButton&, void) { // read current MtrFields, if cmyk, then k-value as transparency - aCurrentColor = Color(static_cast<sal_uInt8>(PercentToColor_Impl(m_xKcustom->get_value(FUNIT_NONE))), - static_cast<sal_uInt8>(PercentToColor_Impl(m_xCcustom->get_value(FUNIT_NONE))), - static_cast<sal_uInt8>(PercentToColor_Impl(m_xYcustom->get_value(FUNIT_NONE))), - static_cast<sal_uInt8>(PercentToColor_Impl(m_xMcustom->get_value(FUNIT_NONE)))); + aCurrentColor = Color(static_cast<sal_uInt8>(PercentToColor_Impl(m_xKcustom->get_value(FieldUnit::NONE))), + static_cast<sal_uInt8>(PercentToColor_Impl(m_xCcustom->get_value(FieldUnit::NONE))), + static_cast<sal_uInt8>(PercentToColor_Impl(m_xYcustom->get_value(FieldUnit::NONE))), + static_cast<sal_uInt8>(PercentToColor_Impl(m_xMcustom->get_value(FieldUnit::NONE)))); ConvertColorValues (aCurrentColor, ColorModel::RGB); rXFSet.Put( XFillColorItem( OUString(), aCurrentColor ) ); @@ -584,10 +584,10 @@ void SvxColorTabPage::UpdateColorValues( bool bUpdatePreset ) ConvertColorValues (aPreviousColor, eCM ); ConvertColorValues (aCurrentColor, eCM); - m_xCcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetRed() ), FUNIT_PERCENT ); - m_xMcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetBlue() ), FUNIT_PERCENT ); - m_xYcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetGreen() ), FUNIT_PERCENT ); - m_xKcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetTransparency() ), FUNIT_PERCENT ); + m_xCcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetRed() ), FieldUnit::PERCENT ); + m_xMcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetBlue() ), FieldUnit::PERCENT ); + m_xYcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetGreen() ), FieldUnit::PERCENT ); + m_xKcustom->set_value( ColorToPercent_Impl( aCurrentColor.GetTransparency() ), FieldUnit::PERCENT ); if( bUpdatePreset ) { diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 6227cfd4e086..5d6cacbea86f 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -58,16 +58,16 @@ SvxGradientTabPage::SvxGradientTabPage(TabPageParent pParent, const SfxItemSet& , m_rXFSet(m_aXFillAttr.GetItemSet()) , m_xLbGradientType(m_xBuilder->weld_combo_box("gradienttypelb")) , m_xFtCenter(m_xBuilder->weld_label("centerft")) - , m_xMtrCenterX(m_xBuilder->weld_metric_spin_button("centerxmtr", FUNIT_PERCENT)) - , m_xMtrCenterY(m_xBuilder->weld_metric_spin_button("centerymtr", FUNIT_PERCENT)) + , m_xMtrCenterX(m_xBuilder->weld_metric_spin_button("centerxmtr", FieldUnit::PERCENT)) + , m_xMtrCenterY(m_xBuilder->weld_metric_spin_button("centerymtr", FieldUnit::PERCENT)) , m_xFtAngle(m_xBuilder->weld_label("angleft")) - , m_xMtrAngle(m_xBuilder->weld_metric_spin_button("anglemtr", FUNIT_DEGREE)) - , m_xMtrBorder(m_xBuilder->weld_metric_spin_button("bordermtr", FUNIT_PERCENT)) + , m_xMtrAngle(m_xBuilder->weld_metric_spin_button("anglemtr", FieldUnit::DEGREE)) + , m_xMtrBorder(m_xBuilder->weld_metric_spin_button("bordermtr", FieldUnit::PERCENT)) , m_xSliderBorder(m_xBuilder->weld_scale("borderslider")) , m_xLbColorFrom(new ColorListBox(m_xBuilder->weld_menu_button("colorfromlb"), pParent.GetFrameWeld())) - , m_xMtrColorFrom(m_xBuilder->weld_metric_spin_button("colorfrommtr", FUNIT_PERCENT)) + , m_xMtrColorFrom(m_xBuilder->weld_metric_spin_button("colorfrommtr", FieldUnit::PERCENT)) , m_xLbColorTo(new ColorListBox(m_xBuilder->weld_menu_button("colortolb"), pParent.GetFrameWeld())) - , m_xMtrColorTo(m_xBuilder->weld_metric_spin_button("colortomtr", FUNIT_PERCENT)) + , m_xMtrColorTo(m_xBuilder->weld_metric_spin_button("colortomtr", FieldUnit::PERCENT)) , m_xGradientLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("gradientpresetlistwin"))) , m_xMtrIncrement(m_xBuilder->weld_spin_button("incrementmtr")) , m_xCbIncrement(m_xBuilder->weld_check_button("autoincrement")) @@ -85,8 +85,8 @@ SvxGradientTabPage::SvxGradientTabPage(TabPageParent pParent, const SfxItemSet& // as long as NOT supported by the item - m_xMtrColorTo->set_value(100, FUNIT_PERCENT); - m_xMtrColorFrom->set_value(100, FUNIT_PERCENT); + m_xMtrColorTo->set_value(100, FieldUnit::PERCENT); + m_xMtrColorFrom->set_value(100, FieldUnit::PERCENT); // setting the output device m_rXFSet.Put( XFillStyleItem(drawing::FillStyle_GRADIENT) ); @@ -210,12 +210,12 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet ) pXGradient.reset(new XGradient( m_xLbColorFrom->GetSelectEntryColor(), m_xLbColorTo->GetSelectEntryColor(), static_cast<css::awt::GradientStyle>(m_xLbGradientType->get_active()), - static_cast<long>(m_xMtrAngle->get_value(FUNIT_NONE) * 10), // should be changed in resource - static_cast<sal_uInt16>(m_xMtrCenterX->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrCenterY->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrBorder->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrColorFrom->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FUNIT_NONE)), + static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10), // should be changed in resource + static_cast<sal_uInt16>(m_xMtrCenterX->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrCenterY->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrBorder->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrColorFrom->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FieldUnit::NONE)), static_cast<sal_uInt16>(m_xMtrIncrement->get_value()) )); } @@ -298,9 +298,9 @@ IMPL_LINK_NOARG( SvxGradientTabPage, ChangeAutoStepHdl_Impl, weld::ToggleButton& void SvxGradientTabPage::ModifiedHdl_Impl( void const * pControl ) { if (pControl == m_xMtrBorder.get()) - m_xSliderBorder->set_value(m_xMtrBorder->get_value(FUNIT_NONE)); + m_xSliderBorder->set_value(m_xMtrBorder->get_value(FieldUnit::NONE)); if (pControl == m_xSliderBorder.get()) - m_xMtrBorder->set_value(m_xSliderBorder->get_value(), FUNIT_NONE); + m_xMtrBorder->set_value(m_xSliderBorder->get_value(), FieldUnit::NONE); if (pControl == m_xMtrIncrement.get()) m_xSliderIncrement->set_value(m_xMtrIncrement->get_value()); if (pControl == m_xSliderIncrement.get()) @@ -311,12 +311,12 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void const * pControl ) XGradient aXGradient( m_xLbColorFrom->GetSelectEntryColor(), m_xLbColorTo->GetSelectEntryColor(), eXGS, - static_cast<long>(m_xMtrAngle->get_value(FUNIT_NONE) * 10), // should be changed in resource - static_cast<sal_uInt16>(m_xMtrCenterX->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrCenterY->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrBorder->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrColorFrom->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FUNIT_NONE)), + static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10), // should be changed in resource + static_cast<sal_uInt16>(m_xMtrCenterX->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrCenterY->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrBorder->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrColorFrom->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FieldUnit::NONE)), static_cast<sal_uInt16>(m_xMtrIncrement->get_value()) ); // enable/disable controls @@ -378,12 +378,12 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, weld::Button&, void) XGradient aXGradient( m_xLbColorFrom->GetSelectEntryColor(), m_xLbColorTo->GetSelectEntryColor(), static_cast<css::awt::GradientStyle>(m_xLbGradientType->get_active()), - static_cast<long>(m_xMtrAngle->get_value(FUNIT_NONE) * 10), // should be changed in resource - static_cast<sal_uInt16>(m_xMtrCenterX->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrCenterY->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrBorder->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrColorFrom->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FUNIT_NONE)), + static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10), // should be changed in resource + static_cast<sal_uInt16>(m_xMtrCenterX->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrCenterY->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrBorder->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrColorFrom->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FieldUnit::NONE)), static_cast<sal_uInt16>(m_xMtrIncrement->get_value()) ); m_pGradientList->Insert(o3tl::make_unique<XGradientEntry>(aXGradient, aName), nCount); @@ -417,12 +417,12 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, weld::Button&, void) XGradient aXGradient( m_xLbColorFrom->GetSelectEntryColor(), m_xLbColorTo->GetSelectEntryColor(), static_cast<css::awt::GradientStyle>(m_xLbGradientType->get_active()), - static_cast<long>(m_xMtrAngle->get_value(FUNIT_NONE) * 10), // should be changed in resource - static_cast<sal_uInt16>(m_xMtrCenterX->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrCenterY->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrBorder->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrColorFrom->get_value(FUNIT_NONE)), - static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FUNIT_NONE)), + static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10), // should be changed in resource + static_cast<sal_uInt16>(m_xMtrCenterX->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrCenterY->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrBorder->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrColorFrom->get_value(FieldUnit::NONE)), + static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FieldUnit::NONE)), static_cast<sal_uInt16>(m_xMtrIncrement->get_value()) ); m_pGradientList->Replace(o3tl::make_unique<XGradientEntry>(aXGradient, aName), nPos); @@ -565,13 +565,13 @@ void SvxGradientTabPage::ChangeGradientHdl_Impl() m_xLbColorTo->SetNoSelection(); m_xLbColorTo->SelectEntry( pGradient->GetEndColor() ); - m_xMtrAngle->set_value(pGradient->GetAngle() / 10, FUNIT_NONE); // should be changed in resource - m_xMtrBorder->set_value(pGradient->GetBorder(), FUNIT_NONE); + m_xMtrAngle->set_value(pGradient->GetAngle() / 10, FieldUnit::NONE); // should be changed in resource + m_xMtrBorder->set_value(pGradient->GetBorder(), FieldUnit::NONE); m_xSliderBorder->set_value(pGradient->GetBorder()); - m_xMtrCenterX->set_value(pGradient->GetXOffset(), FUNIT_NONE); - m_xMtrCenterY->set_value(pGradient->GetYOffset(), FUNIT_NONE); - m_xMtrColorFrom->set_value(pGradient->GetStartIntens(), FUNIT_NONE); - m_xMtrColorTo->set_value(pGradient->GetEndIntens(), FUNIT_NONE); + m_xMtrCenterX->set_value(pGradient->GetXOffset(), FieldUnit::NONE); + m_xMtrCenterY->set_value(pGradient->GetYOffset(), FieldUnit::NONE); + m_xMtrColorFrom->set_value(pGradient->GetStartIntens(), FieldUnit::NONE); + m_xMtrColorTo->set_value(pGradient->GetEndIntens(), FieldUnit::NONE); // disable/enable controls SetControlState_Impl( eXGS ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index bf89f766ed51..74c25cbefa3a 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -56,8 +56,8 @@ SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAtt , m_pnColorListState(nullptr) , m_aXFillAttr(rInAttrs.GetPool()) , m_rXFSet(m_aXFillAttr.GetItemSet()) - , m_xMtrDistance(m_xBuilder->weld_metric_spin_button("distancemtr", FUNIT_MM)) - , m_xMtrAngle(m_xBuilder->weld_metric_spin_button("anglemtr", FUNIT_DEGREE)) + , m_xMtrDistance(m_xBuilder->weld_metric_spin_button("distancemtr", FieldUnit::MM)) + , m_xMtrAngle(m_xBuilder->weld_metric_spin_button("anglemtr", FieldUnit::DEGREE)) , m_xSliderAngle(m_xBuilder->weld_scale("angleslider")) , m_xLbLineType(m_xBuilder->weld_combo_box("linetypelb")) , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pParent.GetFrameWeld())) @@ -81,9 +81,9 @@ SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAtt switch ( eFUnit ) { - case FUNIT_M: - case FUNIT_KM: - eFUnit = FUNIT_MM; + case FieldUnit::M: + case FieldUnit::KM: + eFUnit = FieldUnit::MM; break; default: ;//prevent warning } @@ -245,7 +245,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) pXHatch.reset(new XHatch( m_xLbLineColor->GetSelectEntryColor(), static_cast<css::drawing::HatchStyle>(m_xLbLineType->get_active()), GetCoreValue( *m_xMtrDistance, m_ePoolUnit ), - static_cast<long>(m_xMtrAngle->get_value(FUNIT_NONE) * 10) )); + static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10) )); } assert( pXHatch && "XHatch couldn't be created" ); rSet->Put( XFillStyleItem( drawing::FillStyle_HATCH ) ); @@ -337,15 +337,15 @@ IMPL_LINK( SvxHatchTabPage, ModifiedSliderHdl_Impl, weld::Scale&, rSlider, void void SvxHatchTabPage::ModifiedHdl_Impl( void const * p ) { if (p == m_xMtrAngle.get()) - m_xSliderAngle->set_value(m_xMtrAngle->get_value(FUNIT_NONE)); + m_xSliderAngle->set_value(m_xMtrAngle->get_value(FieldUnit::NONE)); if (p == m_xSliderAngle.get()) - m_xMtrAngle->set_value(m_xSliderAngle->get_value(), FUNIT_NONE); + m_xMtrAngle->set_value(m_xSliderAngle->get_value(), FieldUnit::NONE); XHatch aXHatch( m_xLbLineColor->GetSelectEntryColor(), static_cast<css::drawing::HatchStyle>(m_xLbLineType->get_active()), GetCoreValue( *m_xMtrDistance, m_ePoolUnit ), - static_cast<long>(m_xMtrAngle->get_value(FUNIT_NONE) * 10) ); + static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10) ); m_rXFSet.Put( XFillHatchItem( OUString(), aXHatch ) ); @@ -392,7 +392,7 @@ void SvxHatchTabPage::ChangeHatchHdl_Impl() m_xLbLineColor->SelectEntry( pHatch->GetColor() ); SetMetricValue( *m_xMtrDistance, pHatch->GetDistance(), m_ePoolUnit ); long mHatchAngle = pHatch->GetAngle() / 10; - m_xMtrAngle->set_value(mHatchAngle, FUNIT_NONE); + m_xMtrAngle->set_value(mHatchAngle, FieldUnit::NONE); m_xSliderAngle->set_value(mHatchAngle); // fill ItemSet and pass it on to m_aCtlPreview @@ -452,7 +452,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, weld::Button&, void) XHatch aXHatch( m_xLbLineColor->GetSelectEntryColor(), static_cast<css::drawing::HatchStyle>(m_xLbLineType->get_active()), GetCoreValue( *m_xMtrDistance, m_ePoolUnit ), - static_cast<long>(m_xMtrAngle->get_value(FUNIT_NONE) * 10) ); + static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10) ); m_pHatchingList->Insert(o3tl::make_unique<XHatchEntry>(aXHatch, aName), nCount); @@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, weld::Button&, void) XHatch aXHatch( m_xLbLineColor->GetSelectEntryColor(), static_cast<css::drawing::HatchStyle>(m_xLbLineType->get_active()), GetCoreValue( *m_xMtrDistance, m_ePoolUnit ), - static_cast<long>(m_xMtrAngle->get_value(FUNIT_NONE) * 10) ); + static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10) ); m_pHatchingList->Replace(o3tl::make_unique<XHatchEntry>(aXHatch, aName), nPos); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index fa45d9916897..dad85068f793 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -94,18 +94,18 @@ SvxLineTabPage::SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs , m_xLbLineStyle(new SvxLineLB(m_xBuilder->weld_combo_box("LB_LINE_STYLE"))) , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_COLOR"), pParent.GetFrameWeld())) , m_xBoxWidth(m_xBuilder->weld_widget("boxWIDTH")) - , m_xMtrLineWidth(m_xBuilder->weld_metric_spin_button("MTR_FLD_LINE_WIDTH", FUNIT_CM)) + , m_xMtrLineWidth(m_xBuilder->weld_metric_spin_button("MTR_FLD_LINE_WIDTH", FieldUnit::CM)) , m_xBoxTransparency(m_xBuilder->weld_widget("boxTRANSPARENCY")) - , m_xMtrTransparent(m_xBuilder->weld_metric_spin_button("MTR_LINE_TRANSPARENT", FUNIT_PERCENT)) + , m_xMtrTransparent(m_xBuilder->weld_metric_spin_button("MTR_LINE_TRANSPARENT", FieldUnit::PERCENT)) , m_xFlLineEnds(m_xBuilder->weld_widget("FL_LINE_ENDS")) , m_xBoxArrowStyles(m_xBuilder->weld_widget("boxARROW_STYLES")) , m_xLbStartStyle(new SvxLineEndLB(m_xBuilder->weld_combo_box("LB_START_STYLE"))) , m_xBoxStart(m_xBuilder->weld_widget("boxSTART")) - , m_xMtrStartWidth(m_xBuilder->weld_metric_spin_button("MTR_FLD_START_WIDTH", FUNIT_CM)) + , m_xMtrStartWidth(m_xBuilder->weld_metric_spin_button("MTR_FLD_START_WIDTH", FieldUnit::CM)) , m_xTsbCenterStart(m_xBuilder->weld_check_button("TSB_CENTER_START")) , m_xBoxEnd(m_xBuilder->weld_widget("boxEND")) , m_xLbEndStyle(new SvxLineEndLB(m_xBuilder->weld_combo_box("LB_END_STYLE"))) - , m_xMtrEndWidth(m_xBuilder->weld_metric_spin_button("MTR_FLD_END_WIDTH", FUNIT_CM)) + , m_xMtrEndWidth(m_xBuilder->weld_metric_spin_button("MTR_FLD_END_WIDTH", FieldUnit::CM)) , m_xTsbCenterEnd(m_xBuilder->weld_check_button("TSB_CENTER_END")) , m_xCbxSynchronize(m_xBuilder->weld_check_button("CBX_SYNCHRONIZE")) , m_xMenu(m_xBuilder->weld_menu("menuSELECT")) @@ -117,8 +117,8 @@ SvxLineTabPage::SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs , m_xFlSymbol(m_xBuilder->weld_widget("FL_SYMBOL_FORMAT")) //#58425# Symbols on a line (e.g. StarChart) , m_xGridIconSize(m_xBuilder->weld_widget("gridICON_SIZE")) , m_xSymbolMB(m_xBuilder->weld_menu_button("MB_SYMBOL_BITMAP")) - , m_xSymbolWidthMF(m_xBuilder->weld_metric_spin_button("MF_SYMBOL_WIDTH", FUNIT_CM)) - , m_xSymbolHeightMF(m_xBuilder->weld_metric_spin_button("MF_SYMBOL_HEIGHT", FUNIT_CM)) + , m_xSymbolWidthMF(m_xBuilder->weld_metric_spin_button("MF_SYMBOL_WIDTH", FieldUnit::CM)) + , m_xSymbolHeightMF(m_xBuilder->weld_metric_spin_button("MF_SYMBOL_HEIGHT", FieldUnit::CM)) , m_xSymbolRatioCB(m_xBuilder->weld_check_button("CB_SYMBOL_RATIO")) { // This Page requires ExchangeSupport @@ -129,20 +129,20 @@ SvxLineTabPage::SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs switch ( eFUnit ) { - case FUNIT_M: - case FUNIT_KM: - eFUnit = FUNIT_MM; + case FieldUnit::M: + case FieldUnit::KM: + eFUnit = FieldUnit::MM; SAL_FALLTHROUGH; // we now have mm - case FUNIT_MM: - m_xMtrLineWidth->set_increments(50, 500, FUNIT_NONE); - m_xMtrStartWidth->set_increments(50, 500, FUNIT_NONE); - m_xMtrEndWidth->set_increments(50, 500, FUNIT_NONE); + case FieldUnit::MM: + m_xMtrLineWidth->set_increments(50, 500, FieldUnit::NONE); + m_xMtrStartWidth->set_increments(50, 500, FieldUnit::NONE); + m_xMtrEndWidth->set_increments(50, 500, FieldUnit::NONE); break; - case FUNIT_INCH: - m_xMtrLineWidth->set_increments(2, 20, FUNIT_NONE); - m_xMtrStartWidth->set_increments(2, 20, FUNIT_NONE); - m_xMtrEndWidth->set_increments(2, 20, FUNIT_NONE); + case FieldUnit::INCH: + m_xMtrLineWidth->set_increments(2, 20, FieldUnit::NONE); + m_xMtrStartWidth->set_increments(2, 20, FieldUnit::NONE); + m_xMtrEndWidth->set_increments(2, 20, FieldUnit::NONE); break; default: ;// prevent warning } @@ -529,7 +529,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) } // Transparency - sal_uInt16 nVal = m_xMtrTransparent->get_value(FUNIT_PERCENT); + sal_uInt16 nVal = m_xMtrTransparent->get_value(FieldUnit::PERCENT); if( m_xMtrTransparent->get_value_changed_from_saved() ) { XLineTransparenceItem aItem( nVal ); @@ -774,7 +774,7 @@ void SvxLineTabPage::FillXLSet_Impl() m_rXLSet.Put( XLineEndCenterItem( false ) ); // Transparency - sal_uInt16 nVal = m_xMtrTransparent->get_value(FUNIT_PERCENT); + sal_uInt16 nVal = m_xMtrTransparent->get_value(FieldUnit::PERCENT); m_rXLSet.Put( XLineTransparenceItem( nVal ) ); m_aCtlPreview.SetLineAttributes(m_aXLineAttr.GetItemSet()); @@ -1088,7 +1088,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) if( rAttrs->GetItemState( XATTR_LINETRANSPARENCE ) != SfxItemState::DONTCARE ) { sal_uInt16 nTransp = rAttrs->Get( XATTR_LINETRANSPARENCE ).GetValue(); - m_xMtrTransparent->set_value(nTransp, FUNIT_PERCENT); + m_xMtrTransparent->set_value(nTransp, FieldUnit::PERCENT); ChangeTransparentHdl_Impl(*m_xMtrTransparent); } else @@ -1270,7 +1270,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeStartListBoxHdl_Impl, weld::ComboBox&, voi IMPL_LINK_NOARG(SvxLineTabPage, ChangeStartModifyHdl_Impl, weld::MetricSpinButton&, void) { if (m_xCbxSynchronize->get_active()) - m_xMtrEndWidth->set_value(m_xMtrStartWidth->get_value(FUNIT_NONE), FUNIT_NONE); + m_xMtrEndWidth->set_value(m_xMtrStartWidth->get_value(FieldUnit::NONE), FieldUnit::NONE); ChangePreviewHdl_Impl(nullptr); } @@ -1340,14 +1340,14 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeEndListBoxHdl_Impl, weld::ComboBox&, void) IMPL_LINK_NOARG(SvxLineTabPage, ChangeEndModifyHdl_Impl, weld::MetricSpinButton&, void) { if (m_xCbxSynchronize->get_active()) - m_xMtrStartWidth->set_value(m_xMtrEndWidth->get_value(FUNIT_NONE), FUNIT_NONE); + m_xMtrStartWidth->set_value(m_xMtrEndWidth->get_value(FieldUnit::NONE), FieldUnit::NONE); ChangePreviewHdl_Impl(nullptr); } IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl, weld::MetricSpinButton&, void) { - sal_uInt16 nVal = m_xMtrTransparent->get_value(FUNIT_PERCENT); + sal_uInt16 nVal = m_xMtrTransparent->get_value(FieldUnit::PERCENT); m_rXLSet.Put(XLineTransparenceItem(nVal)); @@ -1599,8 +1599,8 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, weld::MetricSpinButton&, rField, void) bool bWidth = &rField == m_xSymbolWidthMF.get(); m_bLastWidthModified = bWidth; bool bRatio = m_xSymbolRatioCB->get_active(); - long nWidthVal = static_cast<long>(m_xSymbolWidthMF->denormalize(m_xSymbolWidthMF->get_value(FUNIT_100TH_MM))); - long nHeightVal= static_cast<long>(m_xSymbolHeightMF->denormalize(m_xSymbolHeightMF->get_value(FUNIT_100TH_MM))); + long nWidthVal = static_cast<long>(m_xSymbolWidthMF->denormalize(m_xSymbolWidthMF->get_value(FieldUnit::MM_100TH))); + long nHeightVal= static_cast<long>(m_xSymbolHeightMF->denormalize(m_xSymbolHeightMF->get_value(FieldUnit::MM_100TH))); nWidthVal = OutputDevice::LogicToLogic(nWidthVal,MapUnit::Map100thMM, m_ePoolUnit ); nHeightVal = OutputDevice::LogicToLogic(nHeightVal,MapUnit::Map100thMM, m_ePoolUnit); m_aSymbolSize = Size(nWidthVal,nHeightVal); @@ -1620,8 +1620,8 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, weld::MetricSpinButton&, rField, void) { m_aSymbolSize.setHeight( m_aSymbolLastSize.Height() + static_cast<long>(static_cast<double>(nDelta) / fSizeRatio) ); m_aSymbolSize.setHeight( OutputDevice::LogicToLogic( m_aSymbolSize.Height(), m_ePoolUnit, MapUnit::Map100thMM ) ); -//TODO m_xSymbolHeightMF->SetUserValue(m_xSymbolHeightMF->normalize(m_aSymbolSize.Height()), FUNIT_100TH_MM); - m_xSymbolHeightMF->set_value(m_xSymbolHeightMF->normalize(m_aSymbolSize.Height()), FUNIT_100TH_MM); +//TODO m_xSymbolHeightMF->SetUserValue(m_xSymbolHeightMF->normalize(m_aSymbolSize.Height()), FieldUnit::MM_100TH); + m_xSymbolHeightMF->set_value(m_xSymbolHeightMF->normalize(m_aSymbolSize.Height()), FieldUnit::MM_100TH); } } else @@ -1632,8 +1632,8 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, weld::MetricSpinButton&, rField, void) { m_aSymbolSize.setWidth( m_aSymbolLastSize.Width() + static_cast<long>(static_cast<double>(nDelta) * fSizeRatio) ); m_aSymbolSize.setWidth( OutputDevice::LogicToLogic( m_aSymbolSize.Width(), m_ePoolUnit, MapUnit::Map100thMM ) ); -//TODO m_xSymbolWidthMF->SetUserValue(m_xSymbolWidthMF->normalize(m_aSymbolSize.Width()), FUNIT_100TH_MM); - m_xSymbolWidthMF->set_value(m_xSymbolWidthMF->normalize(m_aSymbolSize.Width()), FUNIT_100TH_MM); +//TODO m_xSymbolWidthMF->SetUserValue(m_xSymbolWidthMF->normalize(m_aSymbolSize.Width()), FieldUnit::MM_100TH); + m_xSymbolWidthMF->set_value(m_xSymbolWidthMF->normalize(m_aSymbolSize.Width()), FieldUnit::MM_100TH); } } m_aCtlPreview.ResizeSymbol(m_aSymbolSize); diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 7a3063896738..5d822005f8ba 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -64,9 +64,9 @@ SvxLineDefTabPage::SvxLineDefTabPage(TabPageParent pParent, const SfxItemSet& rI , m_xLbType2(m_xBuilder->weld_combo_box("LB_TYPE_2")) , m_xNumFldNumber1(m_xBuilder->weld_spin_button("NUM_FLD_1")) , m_xNumFldNumber2(m_xBuilder->weld_spin_button("NUM_FLD_2")) - , m_xMtrLength1(m_xBuilder->weld_metric_spin_button("MTR_FLD_LENGTH_1", FUNIT_CM)) - , m_xMtrLength2(m_xBuilder->weld_metric_spin_button("MTR_FLD_LENGTH_2", FUNIT_CM)) - , m_xMtrDistance(m_xBuilder->weld_metric_spin_button("MTR_FLD_DISTANCE", FUNIT_CM)) + , m_xMtrLength1(m_xBuilder->weld_metric_spin_button("MTR_FLD_LENGTH_1", FieldUnit::CM)) + , m_xMtrLength2(m_xBuilder->weld_metric_spin_button("MTR_FLD_LENGTH_2", FieldUnit::CM)) + , m_xMtrDistance(m_xBuilder->weld_metric_spin_button("MTR_FLD_DISTANCE", FieldUnit::CM)) , m_xCbxSynchronize(m_xBuilder->weld_check_button("CBX_SYNCHRONIZE")) , m_xBtnAdd(m_xBuilder->weld_button("BTN_ADD")) , m_xBtnModify(m_xBuilder->weld_button("BTN_MODIFY")) @@ -83,9 +83,9 @@ SvxLineDefTabPage::SvxLineDefTabPage(TabPageParent pParent, const SfxItemSet& rI switch ( eFUnit ) { - case FUNIT_M: - case FUNIT_KM: - eFUnit = FUNIT_MM; + case FieldUnit::M: + case FieldUnit::KM: + eFUnit = FieldUnit::MM; break; default: ; //prevent warning } @@ -412,7 +412,7 @@ void SvxLineDefTabPage::ChangeMetricHdl_Impl(weld::ToggleButton* p) SetMetricValue( *m_xMtrLength2, nTmp2, ePoolUnit ); SetMetricValue( *m_xMtrDistance, nTmp3, ePoolUnit ); } - else if( m_xCbxSynchronize->get_active() && m_xMtrLength1->get_unit() != FUNIT_PERCENT ) + else if( m_xCbxSynchronize->get_active() && m_xMtrLength1->get_unit() != FieldUnit::PERCENT ) { long nTmp1, nTmp2, nTmp3; @@ -434,9 +434,9 @@ void SvxLineDefTabPage::ChangeMetricHdl_Impl(weld::ToggleButton* p) m_xMtrLength2->set_digits(0); m_xMtrDistance->set_digits(0); - m_xMtrLength1->set_unit(FUNIT_PERCENT); - m_xMtrLength2->set_unit(FUNIT_PERCENT); - m_xMtrDistance->set_unit(FUNIT_PERCENT); + m_xMtrLength1->set_unit(FieldUnit::PERCENT); + m_xMtrLength2->set_unit(FieldUnit::PERCENT); + m_xMtrDistance->set_unit(FieldUnit::PERCENT); SetMetricValue( *m_xMtrLength1, nTmp1, ePoolUnit ); SetMetricValue( *m_xMtrLength2, nTmp2, ePoolUnit ); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 7535392dc327..4b5d57c0e668 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -56,9 +56,9 @@ SvxShadowTabPage::SvxShadowTabPage(TabPageParent pParent, const SfxItemSet& rInA , m_aCtlPosition(this) , m_xTsbShowShadow(m_xBuilder->weld_check_button("TSB_SHOW_SHADOW")) , m_xGridShadow(m_xBuilder->weld_widget("gridSHADOW")) - , m_xMtrDistance(m_xBuilder->weld_metric_spin_button("MTR_FLD_DISTANCE", FUNIT_CM)) + , m_xMtrDistance(m_xBuilder->weld_metric_spin_button("MTR_FLD_DISTANCE", FieldUnit::CM)) , m_xLbShadowColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_SHADOW_COLOR"), pParent.GetFrameWeld())) - , m_xMtrTransparent(m_xBuilder->weld_metric_spin_button("MTR_SHADOW_TRANSPARENT", FUNIT_PERCENT)) + , m_xMtrTransparent(m_xBuilder->weld_metric_spin_button("MTR_SHADOW_TRANSPARENT", FieldUnit::PERCENT)) , m_xCtlPosition(new weld::CustomWeld(*m_xBuilder, "CTL_POSITION", m_aCtlPosition)) , m_xCtlXRectPreview(new weld::CustomWeld(*m_xBuilder, "CTL_COLOR_PREVIEW", m_aCtlXRectPreview)) { @@ -70,9 +70,9 @@ SvxShadowTabPage::SvxShadowTabPage(TabPageParent pParent, const SfxItemSet& rInA switch ( eFUnit ) { - case FUNIT_M: - case FUNIT_KM: - eFUnit = FUNIT_MM; + case FieldUnit::M: + case FieldUnit::KM: + eFUnit = FieldUnit::MM; break; default: ;//prevent warning } @@ -302,7 +302,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) } // transparency - sal_uInt16 nVal = static_cast<sal_uInt16>(m_xMtrTransparent->get_value(FUNIT_PERCENT)); + sal_uInt16 nVal = static_cast<sal_uInt16>(m_xMtrTransparent->get_value(FieldUnit::PERCENT)); if (m_xMtrTransparent->get_value_changed_from_saved()) { SdrPercentItem aItem( makeSdrShadowTransparenceItem(nVal) ); @@ -397,7 +397,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) if( rAttrs->GetItemState( SDRATTR_SHADOWTRANSPARENCE ) != SfxItemState::DONTCARE ) { sal_uInt16 nTransp = rAttrs->Get( SDRATTR_SHADOWTRANSPARENCE ).GetValue(); - m_xMtrTransparent->set_value(nTransp, FUNIT_PERCENT); + m_xMtrTransparent->set_value(nTransp, FieldUnit::PERCENT); } else m_xMtrTransparent->set_text(""); @@ -451,7 +451,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl, weld::MetricSpinButton&, m_rXFSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) ); m_rXFSet.Put( XFillColorItem( OUString(), m_xLbShadowColor->GetSelectEntryColor() ) ); - sal_uInt16 nVal = static_cast<sal_uInt16>(m_xMtrTransparent->get_value(FUNIT_PERCENT)); + sal_uInt16 nVal = static_cast<sal_uInt16>(m_xMtrTransparent->get_value(FieldUnit::PERCENT)); m_rXFSet.Put( XFillTransparenceItem( nVal ) ); // shadow removal diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index b75bf87daa37..7c3240da457d 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -107,7 +107,7 @@ void SvxTransparenceTabPage::ActivateLinear(bool bActivate) IMPL_LINK_NOARG(SvxTransparenceTabPage, ModifyTransparentHdl_Impl, weld::MetricSpinButton&, void) { - sal_uInt16 nPos = m_xMtrTransparent->get_value(FUNIT_PERCENT); + sal_uInt16 nPos = m_xMtrTransparent->get_value(FieldUnit::PERCENT); rXFSet.Put(XFillTransparenceItem(nPos)); // preview @@ -133,16 +133,16 @@ void SvxTransparenceTabPage::ModifiedTrgrHdl_Impl(const weld::ComboBox* pControl } // preview - sal_uInt8 nStartCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(m_xMtrTrgrStartValue->get_value(FUNIT_PERCENT)) * 255) / 100); - sal_uInt8 nEndCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(m_xMtrTrgrEndValue->get_value(FUNIT_PERCENT)) * 255) / 100); + sal_uInt8 nStartCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(m_xMtrTrgrStartValue->get_value(FieldUnit::PERCENT)) * 255) / 100); + sal_uInt8 nEndCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(m_xMtrTrgrEndValue->get_value(FieldUnit::PERCENT)) * 255) / 100); XGradient aTmpGradient( Color(nStartCol, nStartCol, nStartCol), Color(nEndCol, nEndCol, nEndCol), static_cast<css::awt::GradientStyle>(m_xLbTrgrGradientType->get_active()), - static_cast<sal_uInt16>(m_xMtrTrgrAngle->get_value(FUNIT_DEGREE)) * 10, - static_cast<sal_uInt16>(m_xMtrTrgrCenterX->get_value(FUNIT_PERCENT)), - static_cast<sal_uInt16>(m_xMtrTrgrCenterY->get_value(FUNIT_PERCENT)), - static_cast<sal_uInt16>(m_xMtrTrgrBorder->get_value(FUNIT_PERCENT)), + static_cast<sal_uInt16>(m_xMtrTrgrAngle->get_value(FieldUnit::DEGREE)) * 10, + static_cast<sal_uInt16>(m_xMtrTrgrCenterX->get_value(FieldUnit::PERCENT)), + static_cast<sal_uInt16>(m_xMtrTrgrCenterY->get_value(FieldUnit::PERCENT)), + static_cast<sal_uInt16>(m_xMtrTrgrBorder->get_value(FieldUnit::PERCENT)), 100, 100); XFillFloatTransparenceItem aItem( aTmpGradient); @@ -211,18 +211,18 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(TabPageParent pParent, const SfxI , m_xRbtTransOff(m_xBuilder->weld_radio_button("RBT_TRANS_OFF")) , m_xRbtTransLinear(m_xBuilder->weld_radio_button("RBT_TRANS_LINEAR")) , m_xRbtTransGradient(m_xBuilder->weld_radio_button("RBT_TRANS_GRADIENT")) - , m_xMtrTransparent(m_xBuilder->weld_metric_spin_button("MTR_TRANSPARENT", FUNIT_PERCENT)) + , m_xMtrTransparent(m_xBuilder->weld_metric_spin_button("MTR_TRANSPARENT", FieldUnit::PERCENT)) , m_xGridGradient(m_xBuilder->weld_widget("gridGradient")) , m_xLbTrgrGradientType(m_xBuilder->weld_combo_box("LB_TRGR_GRADIENT_TYPES")) , m_xFtTrgrCenterX(m_xBuilder->weld_label("FT_TRGR_CENTER_X")) - , m_xMtrTrgrCenterX(m_xBuilder->weld_metric_spin_button("MTR_TRGR_CENTER_X", FUNIT_PERCENT)) + , m_xMtrTrgrCenterX(m_xBuilder->weld_metric_spin_button("MTR_TRGR_CENTER_X", FieldUnit::PERCENT)) , m_xFtTrgrCenterY(m_xBuilder->weld_label("FT_TRGR_CENTER_Y")) - , m_xMtrTrgrCenterY(m_xBuilder->weld_metric_spin_button("MTR_TRGR_CENTER_Y", FUNIT_PERCENT)) + , m_xMtrTrgrCenterY(m_xBuilder->weld_metric_spin_button("MTR_TRGR_CENTER_Y", FieldUnit::PERCENT)) , m_xFtTrgrAngle(m_xBuilder->weld_label("FT_TRGR_ANGLE")) - , m_xMtrTrgrAngle(m_xBuilder->weld_metric_spin_button("MTR_TRGR_ANGLE", FUNIT_DEGREE)) - , m_xMtrTrgrBorder(m_xBuilder->weld_metric_spin_button("MTR_TRGR_BORDER", FUNIT_PERCENT)) - , m_xMtrTrgrStartValue(m_xBuilder->weld_metric_spin_button("MTR_TRGR_START_VALUE", FUNIT_PERCENT)) - , m_xMtrTrgrEndValue(m_xBuilder->weld_metric_spin_button("MTR_TRGR_END_VALUE", FUNIT_PERCENT)) + , m_xMtrTrgrAngle(m_xBuilder->weld_metric_spin_button("MTR_TRGR_ANGLE", FieldUnit::DEGREE)) + , m_xMtrTrgrBorder(m_xBuilder->weld_metric_spin_button("MTR_TRGR_BORDER", FieldUnit::PERCENT)) + , m_xMtrTrgrStartValue(m_xBuilder->weld_metric_spin_button("MTR_TRGR_START_VALUE", FieldUnit::PERCENT)) + , m_xMtrTrgrEndValue(m_xBuilder->weld_metric_spin_button("MTR_TRGR_END_VALUE", FieldUnit::PERCENT)) , m_xCtlBitmapBorder(m_xBuilder->weld_widget("bitmap_border")) , m_xCtlXRectBorder(m_xBuilder->weld_widget("trans_border")) , m_xCtlBitmapPreview(new weld::CustomWeld(*m_xBuilder, "CTL_BITMAP_PREVIEW", m_aCtlBitmapPreview)) @@ -234,12 +234,12 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(TabPageParent pParent, const SfxI m_xRbtTransGradient->connect_toggled(LINK(this, SvxTransparenceTabPage, ClickTransGradientHdl_Impl)); // linear transparency - m_xMtrTransparent->set_value(50, FUNIT_PERCENT); + m_xMtrTransparent->set_value(50, FieldUnit::PERCENT); m_xMtrTransparent->connect_value_changed(LINK(this, SvxTransparenceTabPage, ModifyTransparentHdl_Impl)); // gradient transparency - m_xMtrTrgrEndValue->set_value(100, FUNIT_PERCENT); - m_xMtrTrgrStartValue->set_value(0, FUNIT_PERCENT); + m_xMtrTrgrEndValue->set_value(100, FieldUnit::PERCENT); + m_xMtrTrgrStartValue->set_value(0, FieldUnit::PERCENT); Link<weld::MetricSpinButton&,void> aLink = LINK( this, SvxTransparenceTabPage, ModifiedTrgrEditHdl_Impl); m_xLbTrgrGradientType->connect_changed(LINK(this, SvxTransparenceTabPage, ModifiedTrgrListBoxHdl_Impl)); m_xMtrTrgrCenterX->connect_value_changed( aLink ); @@ -277,7 +277,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) if (m_xMtrTransparent->get_sensitive()) { // linear transparence - sal_uInt16 nPos = m_xMtrTransparent->get_value(FUNIT_PERCENT); + sal_uInt16 nPos = m_xMtrTransparent->get_value(FieldUnit::PERCENT); if (m_xMtrTransparent->get_value_changed_from_saved() || !bLinearActive) { XFillTransparenceItem aItem(nPos); @@ -304,16 +304,16 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) || m_xMtrTrgrStartValue->get_value_changed_from_saved() || m_xMtrTrgrEndValue->get_value_changed_from_saved()) { - sal_uInt8 nStartCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(m_xMtrTrgrStartValue->get_value(FUNIT_PERCENT)) * 255) / 100); - sal_uInt8 nEndCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(m_xMtrTrgrEndValue->get_value(FUNIT_PERCENT)) * 255) / 100); + sal_uInt8 nStartCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(m_xMtrTrgrStartValue->get_value(FieldUnit::PERCENT)) * 255) / 100); + sal_uInt8 nEndCol = static_cast<sal_uInt8>((static_cast<sal_uInt16>(m_xMtrTrgrEndValue->get_value(FieldUnit::PERCENT)) * 255) / 100); XGradient aTmpGradient( Color(nStartCol, nStartCol, nStartCol), Color(nEndCol, nEndCol, nEndCol), static_cast<css::awt::GradientStyle>(m_xLbTrgrGradientType->get_active()), - static_cast<sal_uInt16>(m_xMtrTrgrAngle->get_value(FUNIT_DEGREE)) * 10, - static_cast<sal_uInt16>(m_xMtrTrgrCenterX->get_value(FUNIT_PERCENT)), - static_cast<sal_uInt16>(m_xMtrTrgrCenterY->get_value(FUNIT_PERCENT)), - static_cast<sal_uInt16>(m_xMtrTrgrBorder->get_value(FUNIT_PERCENT)), + static_cast<sal_uInt16>(m_xMtrTrgrAngle->get_value(FieldUnit::DEGREE)) * 10, + static_cast<sal_uInt16>(m_xMtrTrgrCenterX->get_value(FieldUnit::PERCENT)), + static_cast<sal_uInt16>(m_xMtrTrgrCenterY->get_value(FieldUnit::PERCENT)), + static_cast<sal_uInt16>(m_xMtrTrgrBorder->get_value(FieldUnit::PERCENT)), 100, 100); XFillFloatTransparenceItem aItem(aTmpGradient); @@ -377,16 +377,16 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet* rAttrs) const XGradient& rGradient = static_cast<const XFillFloatTransparenceItem*>(pGradientItem)->GetGradientValue(); css::awt::GradientStyle eXGS(rGradient.GetGradientStyle()); m_xLbTrgrGradientType->set_active(sal::static_int_cast< sal_Int32 >(eXGS)); - m_xMtrTrgrAngle->set_value(rGradient.GetAngle() / 10, FUNIT_DEGREE); - m_xMtrTrgrBorder->set_value(rGradient.GetBorder(), FUNIT_PERCENT); - m_xMtrTrgrCenterX->set_value(rGradient.GetXOffset(), FUNIT_PERCENT); - m_xMtrTrgrCenterY->set_value(rGradient.GetYOffset(), FUNIT_PERCENT); - m_xMtrTrgrStartValue->set_value(static_cast<sal_uInt16>(((static_cast<sal_uInt16>(rGradient.GetStartColor().GetRed()) + 1) * 100) / 255), FUNIT_PERCENT); - m_xMtrTrgrEndValue->set_value(static_cast<sal_uInt16>(((static_cast<sal_uInt16>(rGradient.GetEndColor().GetRed()) + 1) * 100) / 255), FUNIT_PERCENT); + m_xMtrTrgrAngle->set_value(rGradient.GetAngle() / 10, FieldUnit::DEGREE); + m_xMtrTrgrBorder->set_value(rGradient.GetBorder(), FieldUnit::PERCENT); + m_xMtrTrgrCenterX->set_value(rGradient.GetXOffset(), FieldUnit::PERCENT); + m_xMtrTrgrCenterY->set_value(rGradient.GetYOffset(), FieldUnit::PERCENT); + m_xMtrTrgrStartValue->set_value(static_cast<sal_uInt16>(((static_cast<sal_uInt16>(rGradient.GetStartColor().GetRed()) + 1) * 100) / 255), FieldUnit::PERCENT); + m_xMtrTrgrEndValue->set_value(static_cast<sal_uInt16>(((static_cast<sal_uInt16>(rGradient.GetEndColor().GetRed()) + 1) * 100) / 255), FieldUnit::PERCENT); // linear transparence sal_uInt16 nTransp = static_cast<const XFillTransparenceItem*>(pLinearItem)->GetValue(); - m_xMtrTransparent->set_value(bLinearActive ? nTransp : 50, FUNIT_PERCENT); + m_xMtrTransparent->set_value(bLinearActive ? nTransp : 50, FieldUnit::PERCENT); ModifyTransparentHdl_Impl(*m_xMtrTransparent); // select the correct radio button diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index eac242eda649..3da5625fb774 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -172,11 +172,11 @@ SvxAngleTabPage::SvxAngleTabPage(TabPageParent pParent, const SfxItemSet& rInAtt : SvxTabPage(pParent, "cui/ui/rotationtabpage.ui", "Rotation", rInAttrs) , rOutAttrs(rInAttrs) , pView(nullptr) - , eDlgUnit(FUNIT_NONE) + , eDlgUnit(FieldUnit::NONE) , m_aCtlRect(this) , m_xFlPosition(m_xBuilder->weld_widget("FL_POSITION")) - , m_xMtrPosX(m_xBuilder->weld_metric_spin_button("MTR_FLD_POS_X", FUNIT_CM)) - , m_xMtrPosY(m_xBuilder->weld_metric_spin_button("MTR_FLD_POS_Y", FUNIT_CM)) + , m_xMtrPosX(m_xBuilder->weld_metric_spin_button("MTR_FLD_POS_X", FieldUnit::CM)) + , m_xMtrPosY(m_xBuilder->weld_metric_spin_button("MTR_FLD_POS_Y", FieldUnit::CM)) , m_xCtlRect(new weld::CustomWeld(*m_xBuilder, "CTL_RECT", m_aCtlRect)) , m_xFlAngle(m_xBuilder->weld_widget("FL_ANGLE")) , m_xNfAngle(m_xBuilder->weld_spin_button("NF_ANGLE")) @@ -201,7 +201,7 @@ void SvxAngleTabPage::Construct() SetFieldUnit(*m_xMtrPosX, eDlgUnit, true); SetFieldUnit(*m_xMtrPosY, eDlgUnit, true); - if (FUNIT_MILE == eDlgUnit || FUNIT_KM == eDlgUnit) + if (FieldUnit::MILE == eDlgUnit || FieldUnit::KM == eDlgUnit) { m_xMtrPosX->set_digits(3); m_xMtrPosY->set_digits(3); @@ -336,56 +336,56 @@ void SvxAngleTabPage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint eR { case RectPoint::LT: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE ); break; } case RectPoint::MT: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE ); break; } case RectPoint::RT: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE ); break; } case RectPoint::LM: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE ); break; } case RectPoint::MM: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE ); break; } case RectPoint::RM: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE ); break; } case RectPoint::LB: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE ); break; } case RectPoint::MB: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE ); break; } case RectPoint::RB: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE ); break; } } @@ -401,19 +401,19 @@ SvxSlantTabPage::SvxSlantTabPage(TabPageParent pParent, const SfxItemSet& rInAtt : SfxTabPage(pParent, "cui/ui/slantcornertabpage.ui", "SlantAndCornerRadius", &rInAttrs) , rOutAttrs(rInAttrs) , pView(nullptr) - , eDlgUnit(FUNIT_NONE) + , eDlgUnit(FieldUnit::NONE) , m_xFlRadius(m_xBuilder->weld_widget("FL_RADIUS")) - , m_xMtrRadius(m_xBuilder->weld_metric_spin_button("MTR_FLD_RADIUS", FUNIT_CM)) + , m_xMtrRadius(m_xBuilder->weld_metric_spin_button("MTR_FLD_RADIUS", FieldUnit::CM)) , m_xFlAngle(m_xBuilder->weld_widget("FL_SLANT")) - , m_xMtrAngle(m_xBuilder->weld_metric_spin_button("MTR_FLD_ANGLE", FUNIT_DEGREE)) + , m_xMtrAngle(m_xBuilder->weld_metric_spin_button("MTR_FLD_ANGLE", FieldUnit::DEGREE)) { for (int i = 0; i < 2; ++i) { m_aControlGroups[i] = m_xBuilder->weld_widget("controlgroups" + OString::number(i+1)); m_aControlGroupX[i] = m_xBuilder->weld_widget("controlgroupx" + OString::number(i+1)); - m_aControlX[i] = m_xBuilder->weld_metric_spin_button("controlx" + OString::number(i+1), FUNIT_CM); + m_aControlX[i] = m_xBuilder->weld_metric_spin_button("controlx" + OString::number(i+1), FieldUnit::CM); m_aControlGroupY[i] = m_xBuilder->weld_widget("controlgroupy" + OString::number(i+1)); - m_aControlY[i] = m_xBuilder->weld_metric_spin_button("controly" + OString::number(i+1), FUNIT_CM); + m_aControlY[i] = m_xBuilder->weld_metric_spin_button("controly" + OString::number(i+1), FieldUnit::CM); } // this page needs ExchangeSupport @@ -463,7 +463,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs) if (m_xMtrAngle->get_value_changed_from_saved()) { - sal_Int32 nValue = static_cast<sal_Int32>(m_xMtrAngle->get_value(FUNIT_NONE)); + sal_Int32 nValue = static_cast<sal_Int32>(m_xMtrAngle->get_value(FieldUnit::NONE)); rAttrs->Put( SfxInt32Item( SID_ATTR_TRANSFORM_SHEAR, nValue ) ); bModified = true; } @@ -609,7 +609,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) if( pItem ) { - m_xMtrAngle->set_value(static_cast<const SfxInt32Item*>(pItem)->GetValue(), FUNIT_NONE); + m_xMtrAngle->set_value(static_cast<const SfxInt32Item*>(pItem)->GetValue(), FieldUnit::NONE); } else { @@ -685,11 +685,11 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) if (aMaxPosition.X() == aMinPosition.X()) m_aControlGroupX[i]->set_sensitive(false); else - m_aControlX[i]->set_range(aMinPosition.X(), aMaxPosition.X(), FUNIT_MM); + m_aControlX[i]->set_range(aMinPosition.X(), aMaxPosition.X(), FieldUnit::MM); if (aMaxPosition.Y() == aMinPosition.Y()) m_aControlGroupY[i]->set_sensitive(false); else - m_aControlY[i]->set_range(aMinPosition.Y(), aMaxPosition.Y(), FUNIT_MM); + m_aControlY[i]->set_range(aMinPosition.Y(), aMaxPosition.Y(), FieldUnit::MM); } //restore geometry @@ -751,7 +751,7 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage(TabPageParent pParent, const SfxI : SvxTabPage(pParent, "cui/ui/possizetabpage.ui", "PositionAndSize", rInAttrs) , mrOutAttrs(rInAttrs) , mpView(nullptr) - , meDlgUnit(FUNIT_NONE) + , meDlgUnit(FieldUnit::NONE) , mnProtectSizeState(TRISTATE_FALSE) , mbPageDisabled(false) , mbProtectDisabled(false) @@ -764,14 +764,14 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage(TabPageParent pParent, const SfxI , m_aCtlPos(this) , m_aCtlSize(this) , m_xFlPosition(m_xBuilder->weld_widget("FL_POSITION")) - , m_xMtrPosX(m_xBuilder->weld_metric_spin_button("MTR_FLD_POS_X", FUNIT_CM)) - , m_xMtrPosY(m_xBuilder->weld_metric_spin_button("MTR_FLD_POS_Y", FUNIT_CM)) + , m_xMtrPosX(m_xBuilder->weld_metric_spin_button("MTR_FLD_POS_X", FieldUnit::CM)) + , m_xMtrPosY(m_xBuilder->weld_metric_spin_button("MTR_FLD_POS_Y", FieldUnit::CM)) , m_xCtlPos(new weld::CustomWeld(*m_xBuilder, "CTL_POSRECT", m_aCtlPos)) , m_xFlSize(m_xBuilder->weld_widget("FL_SIZE")) , m_xFtWidth(m_xBuilder->weld_label("FT_WIDTH")) - , m_xMtrWidth(m_xBuilder->weld_metric_spin_button("MTR_FLD_WIDTH", FUNIT_CM)) + , m_xMtrWidth(m_xBuilder->weld_metric_spin_button("MTR_FLD_WIDTH", FieldUnit::CM)) , m_xFtHeight(m_xBuilder->weld_label("FT_HEIGHT")) - , m_xMtrHeight(m_xBuilder->weld_metric_spin_button("MTR_FLD_HEIGHT", FUNIT_CM)) + , m_xMtrHeight(m_xBuilder->weld_metric_spin_button("MTR_FLD_HEIGHT", FieldUnit::CM)) , m_xCbxScale(m_xBuilder->weld_check_button("CBX_SCALE")) , m_xCtlSize(new weld::CustomWeld(*m_xBuilder, "CTL_SIZERECT", m_aCtlSize)) , m_xFlProtect(m_xBuilder->weld_widget("FL_PROTECT")) @@ -820,7 +820,7 @@ void SvxPositionSizeTabPage::Construct() SetFieldUnit( *m_xMtrWidth, meDlgUnit, true ); SetFieldUnit( *m_xMtrHeight, meDlgUnit, true ); - if(FUNIT_MILE == meDlgUnit || FUNIT_KM == meDlgUnit) + if(FieldUnit::MILE == meDlgUnit || FieldUnit::KM == meDlgUnit) { m_xMtrPosX->set_digits( 3 ); m_xMtrPosY->set_digits( 3 ); @@ -966,13 +966,13 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) Fraction aUIScale = mpView->GetModel()->GetUIScale(); // get Width - double nWidth = static_cast<double>(m_xMtrWidth->get_value(FUNIT_100TH_MM)); + double nWidth = static_cast<double>(m_xMtrWidth->get_value(FieldUnit::MM_100TH)); long lWidth = long(nWidth * static_cast<double>(aUIScale)); lWidth = OutputDevice::LogicToLogic( lWidth, MapUnit::Map100thMM, mePoolUnit ); lWidth = static_cast<long>(m_xMtrWidth->denormalize( lWidth )); // get Height - double nHeight = static_cast<double>(m_xMtrHeight->get_value(FUNIT_100TH_MM)); + double nHeight = static_cast<double>(m_xMtrHeight->get_value(FieldUnit::MM_100TH)); long lHeight = long(nHeight * static_cast<double>(aUIScale)); lHeight = OutputDevice::LogicToLogic( lHeight, MapUnit::Map100thMM, mePoolUnit ); lHeight = static_cast<long>(m_xMtrHeight->denormalize( lHeight )); @@ -1075,7 +1075,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) double fTmpWidth((OutputDevice::LogicToLogic(static_cast<sal_Int32>(mfOldWidth), mePoolUnit, MapUnit::Map100thMM)) / fUIScale); if (m_xMtrWidth->get_digits()) fTmpWidth *= pow(10.0, m_xMtrWidth->get_digits()); - m_xMtrWidth->set_value(static_cast<int>(fTmpWidth), FUNIT_100TH_MM); + m_xMtrWidth->set_value(static_cast<int>(fTmpWidth), FieldUnit::MM_100TH); } { // #i75273# set height @@ -1084,7 +1084,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) double fTmpHeight((OutputDevice::LogicToLogic(static_cast<sal_Int32>(mfOldHeight), mePoolUnit, MapUnit::Map100thMM)) / fUIScale); if (m_xMtrHeight->get_digits()) fTmpHeight *= pow(10.0, m_xMtrHeight->get_digits()); - m_xMtrHeight->set_value(static_cast<int>(fTmpHeight), FUNIT_100TH_MM); + m_xMtrHeight->set_value(static_cast<int>(fTmpHeight), FieldUnit::MM_100TH); } pItem = GetItem( mrOutAttrs, SID_ATTR_TRANSFORM_PROTECT_SIZE ); @@ -1149,8 +1149,8 @@ DeactivateRC SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) { - double fX(static_cast<double>(m_xMtrPosX->get_value(FUNIT_NONE))); - double fY(static_cast<double>(m_xMtrPosY->get_value(FUNIT_NONE))); + double fX(static_cast<double>(m_xMtrPosX->get_value(FieldUnit::NONE))); + double fY(static_cast<double>(m_xMtrPosY->get_value(FieldUnit::NONE))); GetTopLeftPosition(fX, fY, maRange); const ::tools::Rectangle aOutRectangle( @@ -1304,8 +1304,8 @@ void SvxPositionSizeTabPage::SetMinMaxPosition() fBottom = o3tl::clamp(fBottom, -fMaxLong, fMaxLong); // #i75273# normalizing when setting the min/max values was wrong, removed - m_xMtrPosX->set_range(basegfx::fround64(fLeft), basegfx::fround64(fRight), FUNIT_NONE); - m_xMtrPosY->set_range(basegfx::fround64(fTop), basegfx::fround64(fBottom), FUNIT_NONE); + m_xMtrPosX->set_range(basegfx::fround64(fLeft), basegfx::fround64(fRight), FieldUnit::NONE); + m_xMtrPosY->set_range(basegfx::fround64(fTop), basegfx::fround64(fBottom), FieldUnit::NONE); // size fLeft = maWorkRange.getMinX(); @@ -1382,8 +1382,8 @@ void SvxPositionSizeTabPage::SetMinMaxPosition() } // #i75273# normalizing when setting the min/max values was wrong, removed - m_xMtrWidth->set_max(basegfx::fround64(fNewX), FUNIT_NONE); - m_xMtrHeight->set_max(basegfx::fround64(fNewY), FUNIT_NONE); + m_xMtrWidth->set_max(basegfx::fround64(fNewX), FieldUnit::NONE); + m_xMtrHeight->set_max(basegfx::fround64(fNewY), FieldUnit::NONE); } void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange) @@ -1450,56 +1450,56 @@ void SvxPositionSizeTabPage::PointChanged(weld::DrawingArea* pDrawingArea, RectP { case RectPoint::LT: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE ); break; } case RectPoint::MT: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE ); break; } case RectPoint::RT: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE ); break; } case RectPoint::LM: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE ); break; } case RectPoint::MM: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE ); break; } case RectPoint::RM: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE ); break; } case RectPoint::LB: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE ); break; } case RectPoint::MB: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE ); break; } case RectPoint::RB: { - m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE ); - m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE ); + m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE ); + m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE ); break; } } @@ -1527,21 +1527,21 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl, weld::MetricSpinButton&, { if( m_xCbxScale->get_active() && m_xCbxScale->get_sensitive() ) { - sal_Int64 nHeight(basegfx::fround64((mfOldHeight * static_cast<double>(m_xMtrWidth->get_value(FUNIT_NONE))) / mfOldWidth)); + sal_Int64 nHeight(basegfx::fround64((mfOldHeight * static_cast<double>(m_xMtrWidth->get_value(FieldUnit::NONE))) / mfOldWidth)); int nMin, nMax; - m_xMtrHeight->get_range(nMin, nMax, FUNIT_NONE); + m_xMtrHeight->get_range(nMin, nMax, FieldUnit::NONE); if (nHeight <= nMax) { - m_xMtrHeight->set_value(nHeight, FUNIT_NONE); + m_xMtrHeight->set_value(nHeight, FieldUnit::NONE); } else { nHeight = nMax; - m_xMtrHeight->set_value(nHeight, FUNIT_NONE); + m_xMtrHeight->set_value(nHeight, FieldUnit::NONE); const sal_Int64 nWidth(basegfx::fround64((mfOldWidth * static_cast<double>(nHeight)) / mfOldHeight)); - m_xMtrWidth->set_value(nWidth, FUNIT_NONE); + m_xMtrWidth->set_value(nWidth, FieldUnit::NONE); } } } @@ -1550,21 +1550,21 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl, weld::MetricSpinButton& { if( m_xCbxScale->get_active() && m_xCbxScale->get_sensitive() ) { - sal_Int64 nWidth(basegfx::fround64((mfOldWidth * static_cast<double>(m_xMtrHeight->get_value(FUNIT_NONE))) / mfOldHeight)); + sal_Int64 nWidth(basegfx::fround64((mfOldWidth * static_cast<double>(m_xMtrHeight->get_value(FieldUnit::NONE))) / mfOldHeight)); int nMin, nMax; - m_xMtrWidth->get_range(nMin, nMax, FUNIT_NONE); + m_xMtrWidth->get_range(nMin, nMax, FieldUnit::NONE); if (nWidth <= nMax) { - m_xMtrWidth->set_value(nWidth, FUNIT_NONE); + m_xMtrWidth->set_value(nWidth, FieldUnit::NONE); } else { nWidth = nMax; - m_xMtrWidth->set_value(nWidth, FUNIT_NONE); + m_xMtrWidth->set_value(nWidth, FieldUnit::NONE); const sal_Int64 nHeight(basegfx::fround64((mfOldHeight * static_cast<double>(nWidth)) / mfOldWidth)); - m_xMtrHeight->set_value(nHeight, FUNIT_NONE); + m_xMtrHeight->set_value(nHeight, FieldUnit::NONE); } } } diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index e5d95c4b5624..9ed623fc8003 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -31,7 +31,7 @@ DlgSize::DlgSize(weld::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nA bRow ? OString("RowHeightDialog") : OString("ColWidthDialog")) , m_nPrevValue(nVal) , m_nStandard(bRow ? DEF_ROW_HEIGHT : DEF_COL_WIDTH) - , m_xMF_VALUE(m_xBuilder->weld_metric_spin_button("value", FUNIT_CM)) + , m_xMF_VALUE(m_xBuilder->weld_metric_spin_button("value", FieldUnit::CM)) , m_xCB_STANDARD(m_xBuilder->weld_check_button("automatic")) { if ( _nAlternativeStandard > 0 ) @@ -54,14 +54,14 @@ DlgSize::~DlgSize() void DlgSize::SetValue( sal_Int32 nVal ) { - m_xMF_VALUE->set_value(nVal, FUNIT_CM ); + m_xMF_VALUE->set_value(nVal, FieldUnit::CM ); } sal_Int32 DlgSize::GetValue() { if (m_xCB_STANDARD->get_active()) return -1; - return static_cast<sal_Int32>(m_xMF_VALUE->get_value( FUNIT_CM )); + return static_cast<sal_Int32>(m_xMF_VALUE->get_value( FieldUnit::CM )); } IMPL_LINK_NOARG(DlgSize, CbClickHdl, weld::ToggleButton&, void) @@ -70,7 +70,7 @@ IMPL_LINK_NOARG(DlgSize, CbClickHdl, weld::ToggleButton&, void) if (!m_xCB_STANDARD->get_active()) { // don't use getValue as this will use m_xCB_STANDARD->to determine if we're standard - m_nPrevValue = static_cast<sal_Int32>(m_xMF_VALUE->get_value(FUNIT_CM)); + m_nPrevValue = static_cast<sal_Int32>(m_xMF_VALUE->get_value(FieldUnit::CM)); m_xMF_VALUE->set_text(""); } else diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 9c397090454a..15c7f39a7bbb 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -1043,7 +1043,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewP if( MapUnit::MapRelative != eUnit ) nHeight = nNewHeight + ::ItemToControl( short(nNewProp), eUnit, - FUNIT_TWIP ); + FieldUnit::TWIP ); else if( 100 != nNewProp ) nHeight = sal_uInt32(( nNewHeight * nNewProp ) / 100 ); else @@ -1061,7 +1061,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp, if( MapUnit::MapRelative != eMetric ) nHeight = nNewHeight + ::ControlToItem( ::ItemToControl(static_cast<short>(nNewProp), eMetric, - FUNIT_TWIP ), FUNIT_TWIP, + FieldUnit::TWIP ), FieldUnit::TWIP, eCoreMetric ); else if( 100 != nNewProp ) nHeight = sal_uInt32(( nNewHeight * nNewProp ) / 100 ); diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 986781e0773d..b7de6f7b9c16 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -272,7 +272,7 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( const ESelection& rSel, const OUString& rFileName, const css::uno::Reference< css::xml::sax::XDocumentHandler > & xHandler) -: SvXMLExport( xContext, "", rFileName, xHandler, static_cast<frame::XModel*>(new SvxSimpleUnoModel()), FUNIT_CM, +: SvXMLExport( xContext, "", rFileName, xHandler, static_cast<frame::XModel*>(new SvxSimpleUnoModel()), FieldUnit::CM, SvXMLExportFlags::OASIS | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT ) { SvxEditEngineSource aEditSource( pEditEngine ); diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 6ea9864adcdd..d261ae48ecbe 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -350,7 +350,7 @@ namespace pcr sal_Int16 PropertyHandler::impl_getDocumentMeasurementUnit_throw() const { - FieldUnit eUnit = FUNIT_NONE; + FieldUnit eUnit = FieldUnit::NONE; Reference< XServiceInfo > xDocumentSI( impl_getContextDocument_nothrow(), UNO_QUERY ); OSL_ENSURE( xDocumentSI.is(), "PropertyHandlerHelper::impl_getDocumentMeasurementUnit_throw: No context document - where do I live?" ); @@ -390,19 +390,19 @@ namespace pcr { ::utl::OConfigurationTreeRoot aConfigTree( ::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, sConfigurationLocation, -1, ::utl::OConfigurationTreeRoot::CM_READONLY ) ); - sal_Int32 nUnitAsInt = sal_Int32(FUNIT_NONE); + sal_Int32 nUnitAsInt = sal_Int32(FieldUnit::NONE); aConfigTree.getNodeValue( sConfigurationProperty ) >>= nUnitAsInt; // if this denotes a valid (and accepted) unit, then use it - if ( ( nUnitAsInt > FUNIT_NONE ) && ( nUnitAsInt <= FUNIT_100TH_MM ) ) + if ( ( nUnitAsInt > sal_Int32(FieldUnit::NONE) ) && ( nUnitAsInt <= sal_Int32(FieldUnit::MM_100TH) ) ) eUnit = static_cast< FieldUnit >( nUnitAsInt ); } } - if ( FUNIT_NONE == eUnit ) + if ( FieldUnit::NONE == eUnit ) { MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); - eUnit = MeasurementSystem::Metric == eSystem ? FUNIT_CM : FUNIT_INCH; + eUnit = MeasurementSystem::Metric == eSystem ? FieldUnit::CM : FieldUnit::INCH; } return VCLUnoHelper::ConvertToMeasurementUnit( eUnit, 1 ); diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 40e283108339..9f88def3cbf6 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -477,10 +477,10 @@ namespace pcr ONumericControl::ONumericControl( vcl::Window* _pParent, WinBits _nWinStyle ) :ONumericControl_Base( PropertyControlType::NumericField, _pParent, _nWinStyle ) - ,m_eValueUnit( FUNIT_NONE ) + ,m_eValueUnit( FieldUnit::NONE ) ,m_nFieldToUNOValueFactor( 1 ) { - MetricField::SetDefaultUnit( FUNIT_NONE ); + MetricField::SetDefaultUnit( FieldUnit::NONE ); getTypedControlWindow()->EnableEmptyFieldValue( true ); getTypedControlWindow()->SetStrictFormat( true ); diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index a74726df964b..9163d21f141e 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -290,7 +290,7 @@ namespace pcr OTimeDurationControl::OTimeDurationControl( vcl::Window* pParent ) :ONumericControl( pParent, WB_BORDER | WB_TABSTOP ) { - getTypedControlWindow()->SetUnit( FUNIT_CUSTOM ); + getTypedControlWindow()->SetUnit( FieldUnit::CUSTOM ); getTypedControlWindow()->SetCustomUnitText(" ms"); getTypedControlWindow()->SetCustomConvertHdl( LINK( this, OTimeDurationControl, OnCustomConvert ) ); } diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index d23384b868a3..1a88a2ee5194 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -469,12 +469,12 @@ void SaneDlg::InitFields() { if( mrSane.GetOptionUnit( nOption ) == SANE_UNIT_MM ) { - pField->SetUnit( FUNIT_MM ); - pField->SetValue( static_cast<int>(fValue), FUNIT_MM ); + pField->SetUnit( FieldUnit::MM ); + pField->SetValue( static_cast<int>(fValue), FieldUnit::MM ); } else // SANE_UNIT_PIXEL { - pField->SetValue( static_cast<int>(fValue), FUNIT_CUSTOM ); + pField->SetValue( static_cast<int>(fValue), FieldUnit::CUSTOM ); pField->SetCustomUnitText("Pixel"); } switch( i ) { diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index e92668c62cf1..8b372cf752cf 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -458,7 +458,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(TabPageParent pParent, const SfxItemS , mxRbLosslessCompression(m_xBuilder->weld_radio_button("losslesscompress")) , mxRbJPEGCompression(m_xBuilder->weld_radio_button("jpegcompress")) , mxQualityFrame(m_xBuilder->weld_widget("qualityframe")) - , mxNfQuality(m_xBuilder->weld_metric_spin_button("quality", FUNIT_PERCENT)) + , mxNfQuality(m_xBuilder->weld_metric_spin_button("quality", FieldUnit::PERCENT)) , mxCbReduceImageResolution(m_xBuilder->weld_check_button("reduceresolution")) , mxCoReduceImageResolution(m_xBuilder->weld_combo_box("resolution")) , mxCbPDFA1b(m_xBuilder->weld_check_button("pdfa")) @@ -517,7 +517,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent) else mxRbJPEGCompression->set_active(true); - mxNfQuality->set_value( pParent->mnQuality, FUNIT_PERCENT ); + mxNfQuality->set_value( pParent->mnQuality, FieldUnit::PERCENT ); mxQualityFrame->set_sensitive(!bUseLosslessCompression); mxCbReduceImageResolution->connect_toggled(LINK(this, ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl)); @@ -611,7 +611,7 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* pParent ) { // updating the FilterData sequence and storing FilterData to configuration pParent->mbUseLosslessCompression = mxRbLosslessCompression->get_active(); - pParent->mnQuality = static_cast<sal_Int32>(mxNfQuality->get_value(FUNIT_PERCENT)); + pParent->mnQuality = static_cast<sal_Int32>(mxNfQuality->get_value(FieldUnit::PERCENT)); pParent->mbReduceImageResolution = mxCbReduceImageResolution->get_active(); pParent->mnMaxImageResolution = mxCoReduceImageResolution->get_active_text().toInt32(); pParent->mbExportNotes = mxCbExportNotes->get_active(); diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 1eb9ef1f414f..842cab05e4e8 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -92,7 +92,7 @@ public: Effectively, this method looks up the SfxViewFrame belonging to the given XFrame, then the SfxModule belonging to the document in this frame, then this module's field unit. - Failures in any of those steps are reported as assertion in non-product builds, and then FUNIT_100TH_MM is returned. + Failures in any of those steps are reported as assertion in non-product builds, and then FieldUnit::MM_100TH is returned. */ static FieldUnit GetModuleFieldUnit( css::uno::Reference< css::frame::XFrame > const & i_frame ); FieldUnit GetFieldUnit() const; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 7849cdfad9ac..d6e8f8f8ae63 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -54,7 +54,7 @@ All scalar numbers in 1/100 of the corresponding unit. Line1 is the outer, Line2 the inner line, Distance is the distance between these two lines. If Line2 == 0, only Line1 will be shown. Defaults for -source and target unit are FUNIT_POINT. +source and target unit are FieldUnit::POINT. SetColor() sets the line color. diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 8429ea1c74e6..e4baeb882500 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -111,15 +111,15 @@ The values are computed as described below: SetUnit() and SetZoom() configure which unit is used to display the values on the ruler. The following units are accepted: - FUNIT_MM - FUNIT_CM (Default) - FUNIT_M - FUNIT_KM - FUNIT_INCH - FUNIT_FOOT - FUNIT_MILE - FUNIT_POINT - FUNIT_PICA + FieldUnit::MM + FieldUnit::CM (Default) + FieldUnit::M + FieldUnit::KM + FieldUnit::INCH + FieldUnit::FOOT + FieldUnit::MILE + FieldUnit::POINT + FieldUnit::PICA -------------------------------------------------------------------------- diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 644843347a32..a27515e86327 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -265,12 +265,14 @@ inline bool IsInch(MapUnit eU) { } inline bool IsMetric(FieldUnit eU) { - return (eU==FUNIT_MM || eU==FUNIT_CM || eU==FUNIT_M || eU==FUNIT_KM || eU==FUNIT_100TH_MM); + return (eU == FieldUnit::MM || eU == FieldUnit::CM || eU == FieldUnit::M + || eU == FieldUnit::KM || eU == FieldUnit::MM_100TH); } inline bool IsInch(FieldUnit eU) { - return (eU==FUNIT_TWIP || eU==FUNIT_POINT || eU==FUNIT_PICA || - eU==FUNIT_INCH || eU==FUNIT_FOOT || eU==FUNIT_MILE); + return (eU == FieldUnit::TWIP || eU == FieldUnit::POINT + || eU == FieldUnit::PICA || eU == FieldUnit::INCH + || eU == FieldUnit::FOOT || eU == FieldUnit::MILE); } class SVX_DLLPUBLIC SdrFormatter { diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 996b195f5b07..3d62f15320b5 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -28,7 +28,7 @@ // (based on the facts of the MapUnit of the model). This unity is displayed if necessary. class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem<FieldUnit> { public: - SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {} + SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE): SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 14; } diff --git a/include/tools/fldunit.hxx b/include/tools/fldunit.hxx index 65beb743a07a..c300ef2ef31f 100644 --- a/include/tools/fldunit.hxx +++ b/include/tools/fldunit.hxx @@ -19,10 +19,32 @@ #ifndef INCLUDED_TOOLS_FLDUNIT_HXX #define INCLUDED_TOOLS_FLDUNIT_HXX -enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM, - FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA, - FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM, - FUNIT_PERCENT, FUNIT_100TH_MM, FUNIT_PIXEL, FUNIT_DEGREE, FUNIT_SECOND, FUNIT_MILLISECOND }; +#include <sal/types.h> + +// Corresponds to offapi/com/sun/star/awt/FieldUnit.idl +enum class FieldUnit : sal_uInt16 +{ + NONE, + MM, + CM, + M, + KM, + TWIP, + POINT, + PICA, + INCH, + FOOT, + MILE, + CHAR, + LINE, + CUSTOM, + PERCENT, + MM_100TH, + PIXEL, + DEGREE, + SECOND, + MILLISECOND, +}; #endif diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 33c7ecf4e000..0c0abcd9df55 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -222,7 +222,7 @@ public: void SetMin( sal_Int64 nNewMin, FieldUnit eInUnit ); using NumericFormatter::GetMin; sal_Int64 GetMin( FieldUnit eOutUnit ) const; - void SetBaseValue( sal_Int64 nNewBase, FieldUnit eInUnit = FUNIT_NONE ); + void SetBaseValue( sal_Int64 nNewBase, FieldUnit eInUnit = FieldUnit::NONE ); sal_Int64 GetBaseValue() const; virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); @@ -486,10 +486,10 @@ public: virtual void SetUnit( FieldUnit meUnit ) override; void SetFirst( sal_Int64 nNewFirst, FieldUnit eInUnit ); - void SetFirst(sal_Int64 first) { SetFirst(first, FUNIT_NONE); } + void SetFirst(sal_Int64 first) { SetFirst(first, FieldUnit::NONE); } sal_Int64 GetFirst( FieldUnit eOutUnit ) const; void SetLast( sal_Int64 nNewLast, FieldUnit eInUnit ); - void SetLast(sal_Int64 last) { SetLast(last, FUNIT_NONE); } + void SetLast(sal_Int64 last) { SetLast(last, FieldUnit::NONE); } sal_Int64 GetLast( FieldUnit eOutUnit ) const; static void SetDefaultUnit( FieldUnit eDefaultUnit ); @@ -660,7 +660,7 @@ public: virtual void CustomConvert() override; virtual void ReformatAll() override; - void InsertValue( sal_Int64 nValue, FieldUnit eInUnit = FUNIT_NONE, + void InsertValue( sal_Int64 nValue, FieldUnit eInUnit = FieldUnit::NONE, sal_Int32 nPos = COMBOBOX_APPEND ); // Needed, because GetValue() with nPos hide these functions diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index 39d298612882..078fd777bff4 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -142,7 +142,7 @@ void TextParagraph::insertAt( if( !aioBulletList.hasProperty( PROP_GraphicSize ) && !maRuns.empty() && aParaProp.getBulletList().maGraphic.hasValue()) { - long nFirstCharHeightMm = TransformMetric(nCharHeightFirst > 0 ? nCharHeightFirst : 1200, FUNIT_POINT, FUNIT_MM); + long nFirstCharHeightMm = TransformMetric(nCharHeightFirst > 0 ? nCharHeightFirst : 1200, FieldUnit::POINT, FieldUnit::MM); float fBulletSizeRel = 1.f; if( aParaProp.getBulletList().mnSize.hasValue() ) fBulletSizeRel = aParaProp.getBulletList().mnSize.get<sal_Int16>() / 100.f; diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index ba60093fa121..9b74d50737be 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2095,7 +2095,7 @@ void DrawingML::WriteParagraphNumbering(const Reference< XPropertySet >& rXPropS Graphic aGraphic(xGraphic); if (xGraphic.is() && aGraphic.GetType() != GraphicType::NONE) { - long nFirstCharHeightMm = TransformMetric(fFirstCharHeight * 100.f, FUNIT_POINT, FUNIT_MM); + long nFirstCharHeightMm = TransformMetric(fFirstCharHeight * 100.f, FieldUnit::POINT, FieldUnit::MM); float fBulletSizeRel = aGraphicSize.Height / static_cast<float>(nFirstCharHeightMm) / OOX_BULLET_LIST_SCALE_FACTOR; OUString sRelationId; diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 33d9b3bbfb57..90a6ec84213a 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -856,7 +856,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const ) { const MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); - const sal_Int16 nDisplayUnit = VCLUnoHelper::ConvertToMeasurementUnit( MeasurementSystem::Metric == eSystem ? FUNIT_CM : FUNIT_INCH, 1 ); + const sal_Int16 nDisplayUnit = VCLUnoHelper::ConvertToMeasurementUnit( MeasurementSystem::Metric == eSystem ? FieldUnit::CM : FieldUnit::INCH, 1 ); uno::Reference< inspection::XNumericControl > xNumericControl(aOut.Control,uno::UNO_QUERY); xNumericControl->setDecimalDigits( 2 ); xNumericControl->setValueUnit( util::MeasureUnit::MM_100TH ); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index c47521e6d318..9e3ced29fdc2 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2339,7 +2339,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ }; MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); - FieldUnit eUserMetric = MeasurementSystem::Metric == eSystem ? FUNIT_CM : FUNIT_INCH; + FieldUnit eUserMetric = MeasurementSystem::Metric == eSystem ? FieldUnit::CM : FieldUnit::INCH; static const sal_uInt16 pRanges[] = { RPTUI_ID_LRSPACE, XATTR_FILL_LAST, diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index afda8e28079d..b51e5164054f 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -74,7 +74,7 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) m_aHRuler->SetMargin1(); m_aHRuler->SetMargin2(); const MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); - m_aHRuler->SetUnit(MeasurementSystem::Metric == eSystem ? FUNIT_CM : FUNIT_INCH); + m_aHRuler->SetUnit(MeasurementSystem::Metric == eSystem ? FieldUnit::CM : FieldUnit::INCH); ImplInitSettings(); m_pReportListener = addStyleListener(_pView->getController().getReportDefinition(),this); diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index bbef83148b4a..0b2b8b843f04 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -67,7 +67,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry m_aVRuler->SetMargin1(); m_aVRuler->SetMargin2(); const MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); - m_aVRuler->SetUnit(MeasurementSystem::Metric == eSystem ? FUNIT_CM : FUNIT_INCH); + m_aVRuler->SetUnit(MeasurementSystem::Metric == eSystem ? FieldUnit::CM : FieldUnit::INCH); EnableChildTransparentMode(); SetParentClipMode( ParentClipMode::NoClip ); SetPaintTransparent( true ); diff --git a/sc/inc/units.hrc b/sc/inc/units.hrc index acec84dc7865..db6417ac7f40 100644 --- a/sc/inc/units.hrc +++ b/sc/inc/units.hrc @@ -24,15 +24,15 @@ const std::pair<const char*, FieldUnit> SCSTR_UNIT[] = { - { NC_("SCSTR_UNIT", "Millimeter") , FUNIT_MM }, - { NC_("SCSTR_UNIT", "Centimeter") , FUNIT_CM }, - { NC_("SCSTR_UNIT", "Meter") , FUNIT_M }, - { NC_("SCSTR_UNIT", "Kilometer") , FUNIT_KM }, - { NC_("SCSTR_UNIT", "Inch") , FUNIT_INCH }, - { NC_("SCSTR_UNIT", "Foot") , FUNIT_FOOT }, - { NC_("SCSTR_UNIT", "Miles") , FUNIT_MILE }, - { NC_("SCSTR_UNIT", "Pica") , FUNIT_PICA }, - { NC_("SCSTR_UNIT", "Point") , FUNIT_POINT } + { NC_("SCSTR_UNIT", "Millimeter") , FieldUnit::MM }, + { NC_("SCSTR_UNIT", "Centimeter") , FieldUnit::CM }, + { NC_("SCSTR_UNIT", "Meter") , FieldUnit::M }, + { NC_("SCSTR_UNIT", "Kilometer") , FieldUnit::KM }, + { NC_("SCSTR_UNIT", "Inch") , FieldUnit::INCH }, + { NC_("SCSTR_UNIT", "Foot") , FieldUnit::FOOT }, + { NC_("SCSTR_UNIT", "Miles") , FieldUnit::MILE }, + { NC_("SCSTR_UNIT", "Pica") , FieldUnit::PICA }, + { NC_("SCSTR_UNIT", "Point") , FieldUnit::POINT } }; #endif diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index ecc766a11de8..dc24b9e0d410 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -199,13 +199,13 @@ ScTabSizeChangedHint::~ScTabSizeChangedHint() static long TwipsToHmm (long nVal) { return static_cast< long >( MetricField::ConvertDoubleValue (static_cast<sal_Int64>(nVal), 0, 0, - FUNIT_TWIP, FUNIT_100TH_MM) ); + FieldUnit::TWIP, FieldUnit::MM_100TH) ); } static long HmmToTwips (long nVal) { return static_cast< long > ( MetricField::ConvertDoubleValue (static_cast<sal_Int64>(nVal), 0, 0, - FUNIT_100TH_MM, FUNIT_TWIP) ); + FieldUnit::MM_100TH, FieldUnit::TWIP) ); } static void lcl_ReverseTwipsToMM( tools::Rectangle& rRect ) diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index 93624110eb0e..d87076541f73 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -53,9 +53,9 @@ ScAppOptions::~ScAppOptions() void ScAppOptions::SetDefaults() { if ( ScOptionsUtil::IsMetricSystem() ) - eMetric = FUNIT_CM; // default for countries with metric system + eMetric = FieldUnit::CM; // default for countries with metric system else - eMetric = FUNIT_INCH; // default for others + eMetric = FieldUnit::INCH; // default for others nZoom = 100; eZoomType = SvxZoomType::PERCENT; diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index b064c73ead2c..6b4df19ea669 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -393,11 +393,11 @@ void ScModule::Execute( SfxRequest& rReq ) FieldUnit eUnit = static_cast<FieldUnit>(static_cast<const SfxUInt16Item*>(pItem)->GetValue()); switch( eUnit ) { - case FUNIT_MM: // Just the units that are also in the dialog - case FUNIT_CM: - case FUNIT_INCH: - case FUNIT_PICA: - case FUNIT_POINT: + case FieldUnit::MM: // Just the units that are also in the dialog + case FieldUnit::CM: + case FieldUnit::INCH: + case FieldUnit::PICA: + case FieldUnit::POINT: { PutItem( *pItem ); ScAppOptions aNewOpts( GetAppOptions() ); diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 773e9346fc80..3e6aa2d92fec 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -32,7 +32,7 @@ ScMetricInputDlg::ScMetricInputDlg( weld::Window* pParent, : GenericDialogController(pParent, OStringToOUString("modules/scalc/ui/" + sDialogName.toAsciiLowerCase() + ".ui", RTL_TEXTENCODING_UTF8), sDialogName) - , m_xEdValue(m_xBuilder->weld_metric_spin_button("value", FUNIT_CM)) + , m_xEdValue(m_xBuilder->weld_metric_spin_button("value", FieldUnit::CM)) , m_xBtnDefVal(m_xBuilder->weld_check_button("default")) { m_xBtnDefVal->connect_clicked(LINK(this, ScMetricInputDlg, SetDefValHdl)); @@ -41,17 +41,17 @@ ScMetricInputDlg::ScMetricInputDlg( weld::Window* pParent, m_xEdValue->set_unit(eFUnit); m_xEdValue->set_digits(nDecimals); m_xEdValue->set_range(m_xEdValue->normalize(nMinimum), - m_xEdValue->normalize(nMaximum), FUNIT_TWIP); + m_xEdValue->normalize(nMaximum), FieldUnit::TWIP); int nMin(0), nMax(0); - m_xEdValue->get_range(nMin, nMax, FUNIT_TWIP); + m_xEdValue->get_range(nMin, nMax, FieldUnit::TWIP); auto nIncrement = m_xEdValue->normalize(1); - m_xEdValue->set_increments(nIncrement / 10, nIncrement, FUNIT_NONE); - m_xEdValue->set_value(m_xEdValue->normalize(nDefault), FUNIT_TWIP); - nDefaultValue = m_xEdValue->get_value(FUNIT_NONE); - m_xEdValue->set_value(m_xEdValue->normalize(nCurrent), FUNIT_TWIP); - nCurrentValue = m_xEdValue->get_value(FUNIT_NONE); + m_xEdValue->set_increments(nIncrement / 10, nIncrement, FieldUnit::NONE); + m_xEdValue->set_value(m_xEdValue->normalize(nDefault), FieldUnit::TWIP); + nDefaultValue = m_xEdValue->get_value(FieldUnit::NONE); + m_xEdValue->set_value(m_xEdValue->normalize(nCurrent), FieldUnit::TWIP); + nCurrentValue = m_xEdValue->get_value(FieldUnit::NONE); m_xBtnDefVal->set_active(nCurrentValue == nDefaultValue); } @@ -80,7 +80,7 @@ int ScMetricInputDlg::GetInputValue() const */ // first cut off the decimal digits - not that great... - return m_xEdValue->denormalize(m_xEdValue->get_value(FUNIT_TWIP)); + return m_xEdValue->denormalize(m_xEdValue->get_value(FieldUnit::TWIP)); } // Handler: @@ -89,16 +89,16 @@ IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl, weld::Button&, void) { if (m_xBtnDefVal->get_active()) { - nCurrentValue = m_xEdValue->get_value(FUNIT_NONE); - m_xEdValue->set_value(nDefaultValue, FUNIT_NONE); + nCurrentValue = m_xEdValue->get_value(FieldUnit::NONE); + m_xEdValue->set_value(nDefaultValue, FieldUnit::NONE); } else - m_xEdValue->set_value(nCurrentValue, FUNIT_NONE); + m_xEdValue->set_value(nCurrentValue, FieldUnit::NONE); } IMPL_LINK_NOARG(ScMetricInputDlg, ModifyHdl, weld::MetricSpinButton&, void) { - m_xBtnDefVal->set_active(nDefaultValue == m_xEdValue->get_value(FUNIT_NONE)); + m_xBtnDefVal->set_active(nDefaultValue == m_xEdValue->get_value(FieldUnit::NONE)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 0fca706f38e2..77e89cda1c72 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -370,11 +370,11 @@ ScTpLayoutOptions::ScTpLayoutOptions( vcl::Window* pParent, 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: { // only use these metrics sal_Int32 nPos = m_pUnitLB->InsertEntry( sMetric ); @@ -440,7 +440,7 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet ) if(m_pTabMF->IsValueChangedFromSaved()) { rCoreSet->Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, - sal::static_int_cast<sal_uInt16>( m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP)) ))); + sal::static_int_cast<sal_uInt16>( m_pTabMF->Denormalize(m_pTabMF->GetValue(FieldUnit::TWIP)) ))); bRet = true; } @@ -550,7 +550,7 @@ void ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet ) const SfxPoolItem* pItem; if(SfxItemState::SET == rCoreSet->GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem)) - m_pTabMF->SetValue(m_pTabMF->Normalize(static_cast<const SfxUInt16Item*>(pItem)->GetValue()), FUNIT_TWIP); + m_pTabMF->SetValue(m_pTabMF->Normalize(static_cast<const SfxUInt16Item*>(pItem)->GetValue()), FieldUnit::TWIP); m_pTabMF->SaveValue(); m_pUnitLB ->SaveValue(); @@ -647,9 +647,9 @@ IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl, ListBox&, void) { FieldUnit eFieldUnit = static_cast<FieldUnit>(reinterpret_cast<sal_IntPtr>(m_pUnitLB->GetEntryData( nMPos ))); sal_Int64 nVal = - m_pTabMF->Denormalize( m_pTabMF->GetValue( FUNIT_TWIP ) ); + m_pTabMF->Denormalize( m_pTabMF->GetValue( FieldUnit::TWIP ) ); ::SetFieldUnit( *m_pTabMF, eFieldUnit ); - m_pTabMF->SetValue( m_pTabMF->Normalize( nVal ), FUNIT_TWIP ); + m_pTabMF->SetValue( m_pTabMF->Normalize( nVal ), FieldUnit::TWIP ); } } diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 7f655c628187..8b45a529acb0 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -112,7 +112,7 @@ ScTablePage::ScTablePage(TabPageParent pParent, const SfxItemSet& rCoreAttrs) , m_xBtnNullVals(m_xBuilder->weld_check_button("checkBTN_NULLVALS")) , m_xLbScaleMode(m_xBuilder->weld_combo_box("comboLB_SCALEMODE")) , m_xBxScaleAll(m_xBuilder->weld_widget("boxSCALEALL")) - , m_xEdScaleAll(m_xBuilder->weld_metric_spin_button("spinED_SCALEALL", FUNIT_PERCENT)) + , m_xEdScaleAll(m_xBuilder->weld_metric_spin_button("spinED_SCALEALL", FieldUnit::PERCENT)) , m_xGrHeightWidth(m_xBuilder->weld_widget("gridWH")) , m_xEdScalePageWidth(m_xBuilder->weld_spin_button("spinED_SCALEPAGEWIDTH")) , m_xCbScalePageWidth(m_xBuilder->weld_check_button("labelWP")) @@ -179,7 +179,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet ) sal_uInt16 nScale = static_cast<const SfxUInt16Item&>(rCoreSet->Get(nWhich)).GetValue(); if( nScale > 0 ) m_xLbScaleMode->set_active(SC_TPTABLE_SCALE_PERCENT); - m_xEdScaleAll->set_value((nScale > 0) ? nScale : 100, FUNIT_PERCENT); + m_xEdScaleAll->set_value((nScale > 0) ? nScale : 100, FieldUnit::PERCENT); } nWhich = GetWhich(SID_SCATTR_PAGE_SCALETO); @@ -227,7 +227,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet ) // fall back to 100% OSL_FAIL( "ScTablePage::Reset - missing scaling item" ); m_xLbScaleMode->set_active(SC_TPTABLE_SCALE_PERCENT); - m_xEdScaleAll->set_value(100, FUNIT_PERCENT); + m_xEdScaleAll->set_value(100, FieldUnit::PERCENT); } PageDirHdl(*m_xBtnTopDown); @@ -324,13 +324,13 @@ bool ScTablePage::FillItemSet( SfxItemSet* rCoreSet ) if( !m_xEdScalePageWidth->get_sensitive() && !m_xEdScalePageHeight->get_sensitive() ) { m_xLbScaleMode->set_active(SC_TPTABLE_SCALE_PERCENT); - m_xEdScaleAll->set_value(100, FUNIT_PERCENT); + m_xEdScaleAll->set_value(100, FieldUnit::PERCENT); } bDataChanged |= lcl_PutScaleItem( GetWhich(SID_SCATTR_PAGE_SCALE), *rCoreSet, rOldSet, *m_xLbScaleMode, SC_TPTABLE_SCALE_PERCENT, - *m_xEdScaleAll, static_cast<sal_uInt16>(m_xEdScaleAll->get_value(FUNIT_PERCENT)) ); + *m_xEdScaleAll, static_cast<sal_uInt16>(m_xEdScaleAll->get_value(FieldUnit::PERCENT)) ); bDataChanged |= lcl_PutScaleItem2( GetWhich(SID_SCATTR_PAGE_SCALETO), *rCoreSet, rOldSet, diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index b006e89dd4ba..6955fa47d2b5 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -122,14 +122,14 @@ void AlignmentPropertyPanel::Initialize() mpRefEdgeTop->SetClickHdl(aLink2); mpRefEdgeStd->SetClickHdl(aLink2); - mpMtrAngle->InsertValue(0, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(45, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(90, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(135, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(180, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(225, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(270, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(315, FUNIT_CUSTOM); + mpMtrAngle->InsertValue(0, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(45, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(90, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(135, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(180, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(225, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(270, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(315, FieldUnit::CUSTOM); mpMtrAngle->SetDropDownLineCount(mpMtrAngle->GetEntryCount()); } diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index f12fe630afb2..61581d513e7a 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -39,7 +39,7 @@ static OUString lcl_MetricString( long nTwips, const OUString& rText ) { FieldUnit eUserMet = SC_MOD()->GetAppOptions().GetAppMetric(); - sal_Int64 nUserVal = MetricField::ConvertValue( nTwips*100, 1, 2, FUNIT_TWIP, eUserMet ); + sal_Int64 nUserVal = MetricField::ConvertValue( nTwips*100, 1, 2, FieldUnit::TWIP, eUserMet ); OUString aStr = rText + " " + ScGlobal::pLocaleData->getNum( nUserVal, 2 ) diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 86fca90c822d..d8b2baa6e533 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -639,7 +639,7 @@ CharHeightPropertyBox::CharHeightPropertyBox(sal_Int32 nControlType, vcl::Window , maModifyHdl(rModifyHdl) { mpMetric.set( VclPtr<MetricField>::Create( pParent, WB_TABSTOP|WB_IGNORETAB| WB_NOBORDER) ); - mpMetric->SetUnit( FUNIT_PERCENT ); + mpMetric->SetUnit( FieldUnit::PERCENT ); mpMetric->SetMin( 0 ); mpMetric->SetMax( 1000 ); @@ -711,7 +711,7 @@ private: SdCharHeightPropertyBox::SdCharHeightPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl) : SdPropertySubControl(pParent) , maModifyHdl(rModifyHdl) - , mxMetric(mxBuilder->weld_metric_spin_button("fontsize", FUNIT_PERCENT)) + , mxMetric(mxBuilder->weld_metric_spin_button("fontsize", FieldUnit::PERCENT)) , mxControl(mxBuilder->weld_menu_button("fontsizemenu")) { mxMetric->connect_value_changed(LINK(this, SdCharHeightPropertyBox, EditModifyHdl)); @@ -734,7 +734,7 @@ IMPL_LINK_NOARG(SdCharHeightPropertyBox, EditModifyHdl, weld::MetricSpinButton&, IMPL_LINK(SdCharHeightPropertyBox, implMenuSelectHdl, const OString&, rIdent, void) { sal_Int32 nValue = rIdent.toInt32(); - mxMetric->set_value(nValue, FUNIT_PERCENT); + mxMetric->set_value(nValue, FieldUnit::PERCENT); EditModifyHdl(*mxMetric); } @@ -744,13 +744,13 @@ void SdCharHeightPropertyBox::setValue( const Any& rValue, const OUString& ) { double fValue = 0.0; rValue >>= fValue; - mxMetric->set_value(static_cast<long>(fValue * 100.0), FUNIT_PERCENT); + mxMetric->set_value(static_cast<long>(fValue * 100.0), FieldUnit::PERCENT); } } Any SdCharHeightPropertyBox::getValue() { - return makeAny(static_cast<double>(mxMetric->get_value(FUNIT_PERCENT)) / 100.0); + return makeAny(static_cast<double>(mxMetric->get_value(FieldUnit::PERCENT)) / 100.0); } class TransparencyPropertyBox : public PropertySubControl @@ -781,7 +781,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::W , maModifyHdl( rModifyHdl ) { mpMetric.set( VclPtr<MetricField>::Create( pParent ,WB_TABSTOP|WB_IGNORETAB| WB_NOBORDER) ); - mpMetric->SetUnit( FUNIT_PERCENT ); + mpMetric->SetUnit( FieldUnit::PERCENT ); mpMetric->SetMin( 0 ); mpMetric->SetMax( 100 ); @@ -875,7 +875,7 @@ private: SdTransparencyPropertyBox::SdTransparencyPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl) : SdPropertySubControl(pParent) , maModifyHdl(rModifyHdl) - , mxMetric(mxBuilder->weld_metric_spin_button("transparent", FUNIT_PERCENT)) + , mxMetric(mxBuilder->weld_metric_spin_button("transparent", FieldUnit::PERCENT)) , mxControl(mxBuilder->weld_menu_button("transparentmenu")) { for (sal_Int32 i = 25; i < 101; i += 25) @@ -899,7 +899,7 @@ SdTransparencyPropertyBox::SdTransparencyPropertyBox(weld::Label* pLabel, weld:: void SdTransparencyPropertyBox::updateMenu() { - sal_Int64 nValue = mxMetric->get_value(FUNIT_PERCENT); + sal_Int64 nValue = mxMetric->get_value(FieldUnit::PERCENT); for (sal_uInt16 i = 25; i < 101; i += 25) mxControl->set_item_active(OString::number(i), nValue == i); } @@ -913,9 +913,9 @@ IMPL_LINK_NOARG(SdTransparencyPropertyBox, implModifyHdl, weld::MetricSpinButton IMPL_LINK(SdTransparencyPropertyBox, implMenuSelectHdl, const OString&, rIdent, void) { auto nValue = rIdent.toInt32(); - if (nValue != mxMetric->get_value(FUNIT_PERCENT)) + if (nValue != mxMetric->get_value(FieldUnit::PERCENT)) { - mxMetric->set_value(nValue, FUNIT_PERCENT); + mxMetric->set_value(nValue, FieldUnit::PERCENT); implModifyHdl(*mxMetric); } } @@ -927,14 +927,14 @@ void SdTransparencyPropertyBox::setValue(const Any& rValue, const OUString&) double fValue = 0.0; rValue >>= fValue; long nValue = static_cast<long>(fValue * 100); - mxMetric->set_value(nValue, FUNIT_PERCENT); + mxMetric->set_value(nValue, FieldUnit::PERCENT); updateMenu(); } } Any SdTransparencyPropertyBox::getValue() { - return makeAny(static_cast<double>(mxMetric->get_value(FUNIT_PERCENT)) / 100.0); + return makeAny(static_cast<double>(mxMetric->get_value(FieldUnit::PERCENT)) / 100.0); } class RotationPropertyBox : public PropertySubControl @@ -967,7 +967,7 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* p , maModifyHdl(rModifyHdl) { mpMetric.set( VclPtr<MetricField>::Create( pParent ,WB_TABSTOP|WB_IGNORETAB| WB_NOBORDER) ); - mpMetric->SetUnit( FUNIT_CUSTOM ); + mpMetric->SetUnit( FieldUnit::CUSTOM ); mpMetric->SetCustomUnitText( OUString( u'\x00b0') ); // degree sign mpMetric->SetMin( -10000 ); mpMetric->SetMax( 10000 ); @@ -1079,7 +1079,7 @@ private: SdRotationPropertyBox::SdRotationPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl) : SdPropertySubControl(pParent) , maModifyHdl(rModifyHdl) - , mxMetric(mxBuilder->weld_metric_spin_button("rotate", FUNIT_DEGREE)) + , mxMetric(mxBuilder->weld_metric_spin_button("rotate", FieldUnit::DEGREE)) , mxControl(mxBuilder->weld_menu_button("rotatemenu")) { mxMetric->connect_value_changed(LINK( this, SdRotationPropertyBox, implModifyHdl)); @@ -1096,7 +1096,7 @@ SdRotationPropertyBox::SdRotationPropertyBox(weld::Label* pLabel, weld::Containe void SdRotationPropertyBox::updateMenu() { - sal_Int64 nValue = mxMetric->get_value(FUNIT_DEGREE); + sal_Int64 nValue = mxMetric->get_value(FieldUnit::DEGREE); bool bDirection = nValue >= 0; nValue = (nValue < 0 ? -nValue : nValue); @@ -1117,7 +1117,7 @@ IMPL_LINK_NOARG(SdRotationPropertyBox, implModifyHdl, weld::MetricSpinButton&, v IMPL_LINK(SdRotationPropertyBox, implMenuSelectHdl, const OString&, rIdent, void) { - auto nValue = mxMetric->get_value(FUNIT_DEGREE); + auto nValue = mxMetric->get_value(FieldUnit::DEGREE); bool bDirection = nValue >= 0; nValue = (nValue < 0 ? -nValue : nValue); @@ -1131,9 +1131,9 @@ IMPL_LINK(SdRotationPropertyBox, implMenuSelectHdl, const OString&, rIdent, void if( !bDirection ) nValue = -nValue; - if (nValue != mxMetric->get_value(FUNIT_DEGREE)) + if (nValue != mxMetric->get_value(FieldUnit::DEGREE)) { - mxMetric->set_value(nValue, FUNIT_DEGREE); + mxMetric->set_value(nValue, FieldUnit::DEGREE); implModifyHdl(*mxMetric); } } @@ -1145,14 +1145,14 @@ void SdRotationPropertyBox::setValue( const Any& rValue, const OUString& ) double fValue = 0.0; rValue >>= fValue; long nValue = static_cast<long>(fValue); - mxMetric->set_value(nValue, FUNIT_DEGREE); + mxMetric->set_value(nValue, FieldUnit::DEGREE); updateMenu(); } } Any SdRotationPropertyBox::getValue() { - return makeAny(static_cast<double>(mxMetric->get_value(FUNIT_DEGREE))); + return makeAny(static_cast<double>(mxMetric->get_value(FieldUnit::DEGREE))); } class ScalePropertyBox : public PropertySubControl @@ -1186,7 +1186,7 @@ ScalePropertyBox::ScalePropertyBox(sal_Int32 nControlType, vcl::Window* pParent, , maModifyHdl( rModifyHdl ) { mpMetric.set( VclPtr<MetricField>::Create( pParent ,WB_TABSTOP|WB_IGNORETAB| WB_NOBORDER) ); - mpMetric->SetUnit( FUNIT_PERCENT ); + mpMetric->SetUnit( FieldUnit::PERCENT ); mpMetric->SetMin( 0 ); mpMetric->SetMax( 10000 ); @@ -1357,7 +1357,7 @@ private: SdScalePropertyBox::SdScalePropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl) : SdPropertySubControl(pParent) , maModifyHdl( rModifyHdl ) - , mxMetric(mxBuilder->weld_metric_spin_button("scale", FUNIT_PERCENT)) + , mxMetric(mxBuilder->weld_metric_spin_button("scale", FieldUnit::PERCENT)) , mxControl(mxBuilder->weld_menu_button("scalemenu")) { mxControl->connect_selected(LINK(this, SdScalePropertyBox, implMenuSelectHdl)); @@ -1374,7 +1374,7 @@ SdScalePropertyBox::SdScalePropertyBox(weld::Label* pLabel, weld::Container* pPa void SdScalePropertyBox::updateMenu() { - auto nValue = mxMetric->get_value(FUNIT_PERCENT); + auto nValue = mxMetric->get_value(FieldUnit::PERCENT); mxControl->set_item_active("25scale", nValue == 25); mxControl->set_item_active("50scale", nValue == 50); @@ -1394,7 +1394,7 @@ IMPL_LINK_NOARG(SdScalePropertyBox, implModifyHdl, weld::MetricSpinButton&, void IMPL_LINK(SdScalePropertyBox, implMenuSelectHdl, const OString&, rIdent, void) { - auto nValue = mxMetric->get_value(FUNIT_PERCENT); + auto nValue = mxMetric->get_value(FieldUnit::PERCENT); int nDirection = mnDirection; @@ -1415,9 +1415,9 @@ IMPL_LINK(SdScalePropertyBox, implMenuSelectHdl, const OString&, rIdent, void) bModified = true; } - if (nValue != mxMetric->get_value(FUNIT_PERCENT)) + if (nValue != mxMetric->get_value(FieldUnit::PERCENT)) { - mxMetric->set_value(nValue, FUNIT_PERCENT); + mxMetric->set_value(nValue, FieldUnit::PERCENT); bModified = true; } @@ -1462,14 +1462,14 @@ void SdScalePropertyBox::setValue(const Any& rValue, const OUString&) nValue = static_cast<long>(fValue1 * 100.0); else nValue = static_cast<long>(fValue2 * 100.0); - mxMetric->set_value(nValue, FUNIT_PERCENT); + mxMetric->set_value(nValue, FieldUnit::PERCENT); updateMenu(); } } Any SdScalePropertyBox::getValue() { - double fValue1 = static_cast<double>(mxMetric->get_value(FUNIT_PERCENT)) / 100.0; + double fValue1 = static_cast<double>(mxMetric->get_value(FieldUnit::PERCENT)) / 100.0; // Shrink animation is represented by value < 1 (< 100%) // Shrink factor is calculated as (1 + $fValue) @@ -1783,7 +1783,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage(weld::Container* pPar , mxCLBDimColor(new ColorListBox(mxBuilder->weld_menu_button("dim_color_list"), pDialog)) , mxFTTextAnim(mxBuilder->weld_label("text_animation_label")) , mxLBTextAnim(mxBuilder->weld_combo_box("text_animation_list")) - , mxMFTextDelay(mxBuilder->weld_metric_spin_button("text_delay", FUNIT_PERCENT)) + , mxMFTextDelay(mxBuilder->weld_metric_spin_button("text_delay", FieldUnit::PERCENT)) , mxFTTextDelay(mxBuilder->weld_label("text_delay_label")) { mxCLBDimColor->SelectEntry(COL_BLACK); @@ -1908,7 +1908,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage(weld::Container* pPar { double fIterateInterval = 0.0; pSet->getPropertyValue( nHandleIterateInterval ) >>= fIterateInterval; - mxMFTextDelay->set_value(static_cast<long>(fIterateInterval*10), FUNIT_NONE); + mxMFTextDelay->set_value(static_cast<long>(fIterateInterval*10), FieldUnit::NONE); } } else @@ -1997,8 +1997,8 @@ void CustomAnimationEffectTabPage::implHdl(const weld::Widget* pControl) { if (pControl == mxLBTextAnim.get()) { - if (mxMFTextDelay->get_value(FUNIT_NONE) == 0) - mxMFTextDelay->set_value(100, FUNIT_NONE); + if (mxMFTextDelay->get_value(FieldUnit::NONE) == 0) + mxMFTextDelay->set_value(100, FieldUnit::NONE); } else if (pControl == mxLBSound.get()) { @@ -2115,7 +2115,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) } { - double fIterateInterval = static_cast<double>(mxMFTextDelay->get_value(FUNIT_NONE)) / 10; + double fIterateInterval = static_cast<double>(mxMFTextDelay->get_value(FieldUnit::NONE)) / 10; double fOldIterateInterval = -1.0; if( mpSet->getPropertyState( nHandleIterateInterval ) != STLPropertyState::Ambiguous ) @@ -2295,9 +2295,9 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(weld::Container* , mxFTStart(mxBuilder->weld_label("start_label")) , mxLBStart(mxBuilder->weld_combo_box("start_list")) , mxFTStartDelay(mxBuilder->weld_label("delay_label")) - , mxMFStartDelay(mxBuilder->weld_metric_spin_button("delay_value", FUNIT_SECOND)) + , mxMFStartDelay(mxBuilder->weld_metric_spin_button("delay_value", FieldUnit::SECOND)) , mxFTDuration(mxBuilder->weld_label("duration_label")) - , mxCBXDuration(mxBuilder->weld_metric_spin_button("anim_duration", FUNIT_SECOND)) + , mxCBXDuration(mxBuilder->weld_metric_spin_button("anim_duration", FieldUnit::SECOND)) , mxFTRepeat(mxBuilder->weld_label("repeat_label")) , mxCBRepeat(mxBuilder->weld_combo_box("repeat_list")) , mxCBXRewind(mxBuilder->weld_check_button("rewind")) @@ -2330,7 +2330,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(weld::Container* { double fBegin = 0.0; pSet->getPropertyValue( nHandleBegin ) >>= fBegin; - mxMFStartDelay->set_value(static_cast<long>(fBegin*10), FUNIT_NONE); + mxMFStartDelay->set_value(static_cast<long>(fBegin*10), FieldUnit::NONE); } if( pSet->getPropertyState( nHandleDuration ) != STLPropertyState::Ambiguous ) @@ -2348,7 +2348,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(weld::Container* } else { - mxCBXDuration->set_value(fDuration * 100.0, FUNIT_NONE); + mxCBXDuration->set_value(fDuration * 100.0, FieldUnit::NONE); } } @@ -2460,11 +2460,11 @@ IMPL_LINK_NOARG(CustomAnimationDurationTabPage, DurationModifiedHdl, weld::Metri { if (!mxCBXDuration->get_text().isEmpty()) { - double duration_value = static_cast<double>(mxCBXDuration->get_value(FUNIT_NONE)); + double duration_value = static_cast<double>(mxCBXDuration->get_value(FieldUnit::NONE)); if(duration_value <= 0.0) - mxCBXDuration->set_value(1, FUNIT_NONE); + mxCBXDuration->set_value(1, FieldUnit::NONE); else - mxCBXDuration->set_value(duration_value, FUNIT_NONE); + mxCBXDuration->set_value(duration_value, FieldUnit::NONE); } } @@ -2501,7 +2501,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) } { - double fBegin = static_cast<double>(mxMFStartDelay->get_value(FUNIT_NONE)) / 10.0; + double fBegin = static_cast<double>(mxMFStartDelay->get_value(FieldUnit::NONE)) / 10.0; double fOldBegin = -1.0; if( mpSet->getPropertyState( nHandleBegin ) != STLPropertyState::Ambiguous ) @@ -2560,7 +2560,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) if (!mxCBXDuration->get_text().isEmpty()) { - double duration_value = static_cast<double>(mxCBXDuration->get_value(FUNIT_NONE)); + double duration_value = static_cast<double>(mxCBXDuration->get_value(FieldUnit::NONE)); if(duration_value > 0) fDuration = duration_value/100.0; @@ -2656,7 +2656,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(weld::Container* , mxFTGroupText(mxBuilder->weld_label("group_text_label")) , mxLBGroupText(mxBuilder->weld_combo_box("group_text_list")) , mxCBXGroupAuto(mxBuilder->weld_check_button("auto_after")) - , mxMFGroupAuto(mxBuilder->weld_metric_spin_button("auto_after_value",FUNIT_SECOND)) + , mxMFGroupAuto(mxBuilder->weld_metric_spin_button("auto_after_value",FieldUnit::SECOND)) , mxCBXAnimateForm(mxBuilder->weld_check_button("animate_shape")) , mxCBXReverse(mxBuilder->weld_check_button("reverse_order")) { @@ -2679,7 +2679,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(weld::Container* { mxCBXGroupAuto->set_active(fTextGroupingAuto >= 0.0); if( fTextGroupingAuto >= 0.0 ) - mxMFGroupAuto->set_value(static_cast<long>(fTextGroupingAuto*10), FUNIT_NONE); + mxMFGroupAuto->set_value(static_cast<long>(fTextGroupingAuto*10), FieldUnit::NONE); } } else @@ -2756,7 +2756,7 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet ) if( nPos > 1 ) { - double fTextGroupingAuto = mxCBXGroupAuto->get_active() ? mxMFGroupAuto->get_value(FUNIT_NONE) / 10.0 : -1.0; + double fTextGroupingAuto = mxCBXGroupAuto->get_active() ? mxMFGroupAuto->get_value(FieldUnit::NONE) / 10.0 : -1.0; double fOldTextGroupingAuto = -2.0; if(mpSet->getPropertyState( nHandleTextGroupingAuto ) != STLPropertyState::Ambiguous) diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 0047558b2dfc..1e04f66d8b6a 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -197,11 +197,11 @@ void CustomAnimationPane::initialize() maStrProperty = mpFTProperty->GetText(); //fillDurationMetricComboBox - mpCBXDuration->InsertValue(50, FUNIT_CUSTOM); - mpCBXDuration->InsertValue(100, FUNIT_CUSTOM); - mpCBXDuration->InsertValue(200, FUNIT_CUSTOM); - mpCBXDuration->InsertValue(300, FUNIT_CUSTOM); - mpCBXDuration->InsertValue(500, FUNIT_CUSTOM); + mpCBXDuration->InsertValue(50, FieldUnit::CUSTOM); + mpCBXDuration->InsertValue(100, FieldUnit::CUSTOM); + mpCBXDuration->InsertValue(200, FieldUnit::CUSTOM); + mpCBXDuration->InsertValue(300, FieldUnit::CUSTOM); + mpCBXDuration->InsertValue(500, FieldUnit::CUSTOM); mpCBXDuration->AdaptDropDownLineCountToMaximum(); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 58e6781dd5b1..b7025bacfb30 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -477,9 +477,9 @@ void SlideTransitionPane::Initialize(SdDrawDocument* pDoc) VALUESET_APPEND, /* show legend */ true ); mpVS_TRANSITION_ICONS->RecalculateItemSizes(); - mpCBX_duration->InsertValue(100, FUNIT_CUSTOM); - mpCBX_duration->InsertValue(200, FUNIT_CUSTOM); - mpCBX_duration->InsertValue(300, FUNIT_CUSTOM); + mpCBX_duration->InsertValue(100, FieldUnit::CUSTOM); + mpCBX_duration->InsertValue(200, FieldUnit::CUSTOM); + mpCBX_duration->InsertValue(300, FieldUnit::CUSTOM); mpCBX_duration->AdaptDropDownLineCountToMaximum(); // set defaults diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 1bded3fdac06..a087ae3a8975 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -192,7 +192,7 @@ SdOptionsLayout::SdOptionsLayout(bool bImpress, bool bUseConfig) : bDragStripes( false ), bHandlesBezier( false ), bHelplines( true ), - nMetric(static_cast<sal_uInt16>(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)), + nMetric(static_cast<sal_uInt16>(isMetricSystem() ? FieldUnit::CM : FieldUnit::INCH)), nDefTab( 1250 ) { EnableModify( true ); diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 923926e4d320..8782722e52f8 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -128,11 +128,11 @@ void SdModule::Execute(SfxRequest& rReq) FieldUnit eUnit = static_cast<FieldUnit>(static_cast<const SfxUInt16Item*>(pItem)->GetValue()); switch( eUnit ) { - case FUNIT_MM: // only the units which are also in the dialog - case FUNIT_CM: - case FUNIT_INCH: - case FUNIT_PICA: - case FUNIT_POINT: + case FieldUnit::MM: // only the units which are also in the dialog + case FieldUnit::CM: + case FieldUnit::INCH: + case FieldUnit::PICA: + case FieldUnit::POINT: { ::sd::DrawDocShell* pDocSh = dynamic_cast< ::sd::DrawDocShell *>( SfxObjectShell::Current() ); if(pDocSh) diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index d4bad13ad7e1..afaf7d89c873 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -47,11 +47,11 @@ CopyDlg::CopyDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* , mpView(pInView) , m_xNumFldCopies(m_xBuilder->weld_spin_button("copies")) , m_xBtnSetViewData(m_xBuilder->weld_button("viewdata")) - , m_xMtrFldMoveX(m_xBuilder->weld_metric_spin_button("x", FUNIT_CM)) - , m_xMtrFldMoveY(m_xBuilder->weld_metric_spin_button("y", FUNIT_CM)) - , m_xMtrFldAngle(m_xBuilder->weld_metric_spin_button("angle", FUNIT_DEGREE)) - , m_xMtrFldWidth(m_xBuilder->weld_metric_spin_button("width", FUNIT_CM)) - , m_xMtrFldHeight(m_xBuilder->weld_metric_spin_button("height", FUNIT_CM)) + , m_xMtrFldMoveX(m_xBuilder->weld_metric_spin_button("x", FieldUnit::CM)) + , m_xMtrFldMoveY(m_xBuilder->weld_metric_spin_button("y", FieldUnit::CM)) + , m_xMtrFldAngle(m_xBuilder->weld_metric_spin_button("angle", FieldUnit::DEGREE)) + , m_xMtrFldWidth(m_xBuilder->weld_metric_spin_button("width", FieldUnit::CM)) + , m_xMtrFldHeight(m_xBuilder->weld_metric_spin_button("height", FieldUnit::CM)) , m_xFtEndColor(m_xBuilder->weld_label("endlabel")) , m_xBtnSetDefault(m_xBuilder->weld_button("default")) , m_xLbStartColor(new ColorListBox(m_xBuilder->weld_menu_button("start"), pWindow)) @@ -76,11 +76,11 @@ CopyDlg::~CopyDlg() SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); OUString sStr = OUString::number(m_xNumFldCopies->get_value()) + OUString(TOKEN) + - OUString::number(m_xMtrFldMoveX->get_value(FUNIT_NONE)) + OUString(TOKEN) + - OUString::number(m_xMtrFldMoveY->get_value(FUNIT_NONE)) + OUString(TOKEN) + - OUString::number(m_xMtrFldAngle->get_value(FUNIT_NONE)) + OUString(TOKEN) + - OUString::number(m_xMtrFldWidth->get_value(FUNIT_NONE)) + OUString(TOKEN) + - OUString::number(m_xMtrFldHeight->get_value(FUNIT_NONE)) + OUString(TOKEN) + + OUString::number(m_xMtrFldMoveX->get_value(FieldUnit::NONE)) + OUString(TOKEN) + + OUString::number(m_xMtrFldMoveY->get_value(FieldUnit::NONE)) + OUString(TOKEN) + + OUString::number(m_xMtrFldAngle->get_value(FieldUnit::NONE)) + OUString(TOKEN) + + OUString::number(m_xMtrFldWidth->get_value(FieldUnit::NONE)) + OUString(TOKEN) + + OUString::number(m_xMtrFldHeight->get_value(FieldUnit::NONE)) + OUString(TOKEN) + OUString::number(static_cast<sal_uInt32>(m_xLbStartColor->GetSelectEntryColor())) + OUString(TOKEN) + OUString::number(static_cast<sal_uInt32>(m_xLbEndColor->GetSelectEntryColor())); aDlgOpt.SetUserItem("UserItem", css::uno::makeAny(sStr)); @@ -95,16 +95,16 @@ void CopyDlg::Reset() ::tools::Rectangle aRect = mpView->GetAllMarkedRect(); Size aPageSize = mpView->GetSdrPageView()->GetPage()->GetSize(); SetMetricValue( *m_xMtrFldMoveX, long(1000000 / maUIScale), MapUnit::Map100thMM); - double fScaleFactor = m_xMtrFldMoveX->get_value(FUNIT_NONE)/1000000.0; + double fScaleFactor = m_xMtrFldMoveX->get_value(FieldUnit::NONE)/1000000.0; long nPageWidth = aPageSize.Width() * fScaleFactor; long nPageHeight = aPageSize.Height() * fScaleFactor; long nRectWidth = aRect.GetWidth() * fScaleFactor; long nRectHeight = aRect.GetHeight() * fScaleFactor; - m_xMtrFldMoveX->set_range(-nPageWidth, nPageWidth, FUNIT_NONE); - m_xMtrFldMoveY->set_range(-nPageHeight, nPageHeight, FUNIT_NONE); - m_xMtrFldWidth->set_range(-nRectWidth, nPageWidth, FUNIT_NONE); - m_xMtrFldHeight->set_range(-nRectHeight, nPageHeight, FUNIT_NONE); + m_xMtrFldMoveX->set_range(-nPageWidth, nPageWidth, FieldUnit::NONE); + m_xMtrFldMoveY->set_range(-nPageHeight, nPageHeight, FieldUnit::NONE); + m_xMtrFldWidth->set_range(-nRectWidth, nPageWidth, FieldUnit::NONE); + m_xMtrFldHeight->set_range(-nRectHeight, nPageHeight, FieldUnit::NONE); const SfxPoolItem* pPoolItem = nullptr; OUString aStr; @@ -133,9 +133,9 @@ void CopyDlg::Reset() SetMetricValue( *m_xMtrFldMoveY, long(nMoveY / maUIScale), MapUnit::Map100thMM); if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, true, &pPoolItem ) ) - m_xMtrFldAngle->set_value(static_cast<const SfxInt32Item*>( pPoolItem )->GetValue(), FUNIT_NONE); + m_xMtrFldAngle->set_value(static_cast<const SfxInt32Item*>( pPoolItem )->GetValue(), FieldUnit::NONE); else - m_xMtrFldAngle->set_value(0, FUNIT_NONE); + m_xMtrFldAngle->set_value(0, FieldUnit::NONE); long nWidth = 0; if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, true, &pPoolItem ) ) @@ -165,11 +165,11 @@ void CopyDlg::Reset() { sal_Int32 nIdx {0}; m_xNumFldCopies->set_value(aStr.getToken(0, TOKEN, nIdx).toInt64()); - m_xMtrFldMoveX->set_value(aStr.getToken(0, TOKEN, nIdx).toInt64(), FUNIT_NONE); - m_xMtrFldMoveY->set_value(aStr.getToken(0, TOKEN, nIdx).toInt64(), FUNIT_NONE); - m_xMtrFldAngle->set_value(aStr.getToken(0, TOKEN, nIdx).toInt64(), FUNIT_NONE); - m_xMtrFldWidth->set_value(aStr.getToken(0, TOKEN, nIdx).toInt64(), FUNIT_NONE); - m_xMtrFldHeight->set_value(aStr.getToken(0, TOKEN, nIdx).toInt64(), FUNIT_NONE); + m_xMtrFldMoveX->set_value(aStr.getToken(0, TOKEN, nIdx).toInt64(), FieldUnit::NONE); + m_xMtrFldMoveY->set_value(aStr.getToken(0, TOKEN, nIdx).toInt64(), FieldUnit::NONE); + m_xMtrFldAngle->set_value(aStr.getToken(0, TOKEN, nIdx).toInt64(), FieldUnit::NONE); + m_xMtrFldWidth->set_value(aStr.getToken(0, TOKEN, nIdx).toInt64(), FieldUnit::NONE); + m_xMtrFldHeight->set_value(aStr.getToken(0, TOKEN, nIdx).toInt64(), FieldUnit::NONE); m_xLbStartColor->SelectEntry( Color( aStr.getToken(0, TOKEN, nIdx).toUInt32() ) ); m_xLbEndColor->SelectEntry( Color( aStr.getToken(0, TOKEN, nIdx).toUInt32() ) ); } @@ -189,7 +189,7 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs ) rOutAttrs.Put( SfxUInt16Item( ATTR_COPY_NUMBER, static_cast<sal_uInt16>(m_xNumFldCopies->get_value()) ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_X, nMoveX ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_Y, nMoveY ) ); - rOutAttrs.Put( SfxInt32Item( ATTR_COPY_ANGLE, static_cast<sal_Int32>(m_xMtrFldAngle->get_value(FUNIT_DEGREE)) ) ); + rOutAttrs.Put( SfxInt32Item( ATTR_COPY_ANGLE, static_cast<sal_Int32>(m_xMtrFldAngle->get_value(FieldUnit::DEGREE)) ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_WIDTH, nWidth ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_HEIGHT, nHeight ) ); @@ -247,7 +247,7 @@ IMPL_LINK_NOARG(CopyDlg, SetDefault, weld::Button&, void) SetMetricValue( *m_xMtrFldMoveY, long(nValue / maUIScale), MapUnit::Map100thMM); nValue = 0; - m_xMtrFldAngle->set_value(nValue, FUNIT_DEGREE); + m_xMtrFldAngle->set_value(nValue, FieldUnit::DEGREE); SetMetricValue( *m_xMtrFldWidth, long(nValue / maUIScale), MapUnit::Map100thMM); SetMetricValue( *m_xMtrFldHeight, long(nValue / maUIScale), MapUnit::Map100thMM); diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 1958b6271433..1c8e5f9902c7 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -52,7 +52,7 @@ SdPagesField::SdPagesField( vcl::Window* pParent, SetSizePixel( aSize ); // set parameter of MetricFields - SetUnit( FUNIT_CUSTOM ); + SetUnit( FieldUnit::CUSTOM ); SetMin( 1 ); SetFirst( 1 ); SetMax( 15 ); diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 61bae299892d..0401ed7a8596 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -35,9 +35,9 @@ SdSnapLineDlg::SdSnapLineDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, : GenericDialogController(pWindow, "modules/sdraw/ui/dlgsnap.ui", "SnapObjectDialog") , aUIScale(pView->GetDoc().GetUIScale()) , m_xFtX(m_xBuilder->weld_label("xlabel")) - , m_xMtrFldX(m_xBuilder->weld_metric_spin_button("x", FUNIT_CM)) + , m_xMtrFldX(m_xBuilder->weld_metric_spin_button("x", FieldUnit::CM)) , m_xFtY(m_xBuilder->weld_label("ylabel")) - , m_xMtrFldY(m_xBuilder->weld_metric_spin_button("y", FUNIT_CM)) + , m_xMtrFldY(m_xBuilder->weld_metric_spin_button("y", FieldUnit::CM)) , m_xRadioGroup(m_xBuilder->weld_widget("radiogroup")) , m_xRbPoint(m_xBuilder->weld_radio_button("point")) , m_xRbVert(m_xBuilder->weld_radio_button("vert")) @@ -73,24 +73,24 @@ SdSnapLineDlg::SdSnapLineDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, // WorkArea, PoolUnit and FieldUnit: SetMetricValue(*m_xMtrFldX, aLeftTop.X(), ePoolUnit ); - int nValue = m_xMtrFldX->get_value(FUNIT_NONE); + int nValue = m_xMtrFldX->get_value(FieldUnit::NONE); nValue = sal_Int32(nValue / aUIScale); - m_xMtrFldX->set_min(nValue, FUNIT_NONE); + m_xMtrFldX->set_min(nValue, FieldUnit::NONE); SetMetricValue(*m_xMtrFldX, aRightBottom.X(), ePoolUnit); - nValue = m_xMtrFldX->get_value(FUNIT_NONE); + nValue = m_xMtrFldX->get_value(FieldUnit::NONE); nValue = sal_Int32(nValue / aUIScale); - m_xMtrFldX->set_max(nValue, FUNIT_NONE); + m_xMtrFldX->set_max(nValue, FieldUnit::NONE); SetMetricValue(*m_xMtrFldY, aLeftTop.Y(), ePoolUnit); - nValue = m_xMtrFldY->get_value(FUNIT_NONE); + nValue = m_xMtrFldY->get_value(FieldUnit::NONE); nValue = sal_Int32(nValue / aUIScale); - m_xMtrFldY->set_min(nValue, FUNIT_NONE); + m_xMtrFldY->set_min(nValue, FieldUnit::NONE); SetMetricValue(*m_xMtrFldY, aRightBottom.Y(), ePoolUnit); - nValue = m_xMtrFldY->get_value(FUNIT_NONE); + nValue = m_xMtrFldY->get_value(FieldUnit::NONE); nValue = sal_Int32(nValue / aUIScale); - m_xMtrFldY->set_max(nValue, FUNIT_NONE); + m_xMtrFldY->set_max(nValue, FieldUnit::NONE); // set values nXValue = static_cast<const SfxInt32Item&>( rInAttrs.Get(ATTR_SNAPLINE_X)).GetValue(); @@ -150,13 +150,13 @@ void SdSnapLineDlg::SetInputFields(bool bEnableX, bool bEnableY) if ( bEnableX ) { if (!m_xMtrFldX->get_sensitive()) - m_xMtrFldX->set_value(nXValue, FUNIT_NONE); + m_xMtrFldX->set_value(nXValue, FieldUnit::NONE); m_xMtrFldX->set_sensitive(true); m_xFtX->set_sensitive(true); } else if (m_xMtrFldX->get_sensitive()) { - nXValue = m_xMtrFldX->get_value(FUNIT_NONE); + nXValue = m_xMtrFldX->get_value(FieldUnit::NONE); m_xMtrFldX->set_text(OUString()); m_xMtrFldX->set_sensitive(false); m_xFtX->set_sensitive(false); @@ -164,13 +164,13 @@ void SdSnapLineDlg::SetInputFields(bool bEnableX, bool bEnableY) if ( bEnableY ) { if (!m_xMtrFldY->get_sensitive()) - m_xMtrFldY->set_value(nYValue, FUNIT_NONE); + m_xMtrFldY->set_value(nYValue, FieldUnit::NONE); m_xMtrFldY->set_sensitive(true); m_xFtY->set_sensitive(true); } else if (m_xMtrFldY->get_sensitive()) { - nYValue = m_xMtrFldY->get_value(FUNIT_NONE); + nYValue = m_xMtrFldY->get_value(FieldUnit::NONE); m_xMtrFldY->set_text(OUString()); m_xMtrFldY->set_sensitive(false); m_xFtY->set_sensitive(false); diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index b08feff7bdbb..86215b9c9758 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -68,9 +68,9 @@ bool SdTpOptionsSnap::FillItemSet( SfxItemSet* rAttrs ) aOptsItem.GetOptionsSnap().SetOrtho( m_xCbxOrtho->get_active() ); aOptsItem.GetOptionsSnap().SetBigOrtho( m_xCbxBigOrtho->get_active() ); aOptsItem.GetOptionsSnap().SetRotate( m_xCbxRotate->get_active() ); - aOptsItem.GetOptionsSnap().SetSnapArea(static_cast<sal_Int16>(m_xMtrFldSnapArea->get_value(FUNIT_PIXEL))); - aOptsItem.GetOptionsSnap().SetAngle(static_cast<sal_Int16>(m_xMtrFldAngle->get_value(FUNIT_DEGREE))); - aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle(static_cast<sal_Int16>(m_xMtrFldBezAngle->get_value(FUNIT_DEGREE))); + aOptsItem.GetOptionsSnap().SetSnapArea(static_cast<sal_Int16>(m_xMtrFldSnapArea->get_value(FieldUnit::PIXEL))); + aOptsItem.GetOptionsSnap().SetAngle(static_cast<sal_Int16>(m_xMtrFldAngle->get_value(FieldUnit::DEGREE))); + aOptsItem.GetOptionsSnap().SetEliminatePolyPointLimitAngle(static_cast<sal_Int16>(m_xMtrFldBezAngle->get_value(FieldUnit::DEGREE))); rAttrs->Put( aOptsItem ); @@ -93,9 +93,9 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs ) m_xCbxOrtho->set_active( aOptsItem.GetOptionsSnap().IsOrtho() ); m_xCbxBigOrtho->set_active( aOptsItem.GetOptionsSnap().IsBigOrtho() ); m_xCbxRotate->set_active( aOptsItem.GetOptionsSnap().IsRotate() ); - m_xMtrFldSnapArea->set_value(aOptsItem.GetOptionsSnap().GetSnapArea(), FUNIT_PIXEL); - m_xMtrFldAngle->set_value(aOptsItem.GetOptionsSnap().GetAngle(), FUNIT_DEGREE); - m_xMtrFldBezAngle->set_value(aOptsItem.GetOptionsSnap().GetEliminatePolyPointLimitAngle(), FUNIT_DEGREE); + m_xMtrFldSnapArea->set_value(aOptsItem.GetOptionsSnap().GetSnapArea(), FieldUnit::PIXEL); + m_xMtrFldAngle->set_value(aOptsItem.GetOptionsSnap().GetAngle(), FieldUnit::DEGREE); + m_xMtrFldBezAngle->set_value(aOptsItem.GetOptionsSnap().GetEliminatePolyPointLimitAngle(), FieldUnit::DEGREE); ClickRotateHdl_Impl(*m_xCbxRotate); } @@ -243,7 +243,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(vcl::Window* pParent, const SfxItemSet& rInAttr for (sal_uInt32 i = 0; i < SvxFieldUnitTable::Count(); ++i) { OUString sMetric = SvxFieldUnitTable::GetString(i); - sal_IntPtr nFieldUnit = SvxFieldUnitTable::GetValue(i); + sal_IntPtr nFieldUnit = sal_uInt16(SvxFieldUnitTable::GetValue(i)); sal_Int32 nPos = m_pLbMetric->InsertEntry( sMetric ); m_pLbMetric->SetEntryData( nPos, reinterpret_cast<void*>(nFieldUnit) ); } @@ -333,13 +333,13 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet ) if( eFUnit != m_pMtrFldOriginalWidth->GetUnit() ) { // set metrics - sal_Int64 nVal = m_pMtrFldOriginalWidth->Denormalize( m_pMtrFldOriginalWidth->GetValue( FUNIT_TWIP ) ); + sal_Int64 nVal = m_pMtrFldOriginalWidth->Denormalize( m_pMtrFldOriginalWidth->GetValue( FieldUnit::TWIP ) ); SetFieldUnit( *m_pMtrFldOriginalWidth, eFUnit, true ); - m_pMtrFldOriginalWidth->SetValue( m_pMtrFldOriginalWidth->Normalize( nVal ), FUNIT_TWIP ); + m_pMtrFldOriginalWidth->SetValue( m_pMtrFldOriginalWidth->Normalize( nVal ), FieldUnit::TWIP ); - nVal = m_pMtrFldOriginalHeight->Denormalize( m_pMtrFldOriginalHeight->GetValue( FUNIT_TWIP ) ); + nVal = m_pMtrFldOriginalHeight->Denormalize( m_pMtrFldOriginalHeight->GetValue( FieldUnit::TWIP ) ); SetFieldUnit( *m_pMtrFldOriginalHeight, eFUnit, true ); - m_pMtrFldOriginalHeight->SetValue( m_pMtrFldOriginalHeight->Normalize( nVal ), FUNIT_TWIP ); + m_pMtrFldOriginalHeight->SetValue( m_pMtrFldOriginalHeight->Normalize( nVal ), FieldUnit::TWIP ); if( nWidth != 0 && nHeight != 0 ) { @@ -540,9 +540,9 @@ IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox&, void) { FieldUnit eUnit = static_cast<FieldUnit>(reinterpret_cast<sal_IntPtr>(m_pLbMetric->GetEntryData( nPos ))); sal_Int64 nVal = - m_pMtrFldTabstop->Denormalize( m_pMtrFldTabstop->GetValue( FUNIT_TWIP ) ); + m_pMtrFldTabstop->Denormalize( m_pMtrFldTabstop->GetValue( FieldUnit::TWIP ) ); SetFieldUnit( *m_pMtrFldTabstop, eUnit ); - m_pMtrFldTabstop->SetValue( m_pMtrFldTabstop->Normalize( nVal ), FUNIT_TWIP ); + m_pMtrFldTabstop->SetValue( m_pMtrFldTabstop->Normalize( nVal ), FieldUnit::TWIP ); } } diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 2bbc2810b203..27fd59ef2ebd 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -35,9 +35,9 @@ SdVectorizeDlg::SdVectorizeDlg(weld::Window* pParent, const Bitmap& rBmp, ::sd:: , m_pDocSh(pDocShell) , aBmp(rBmp) , m_xNmLayers(m_xBuilder->weld_spin_button("colors")) - , m_xMtReduce(m_xBuilder->weld_metric_spin_button("points", FUNIT_PIXEL)) + , m_xMtReduce(m_xBuilder->weld_metric_spin_button("points", FieldUnit::PIXEL)) , m_xFtFillHoles(m_xBuilder->weld_label("tilesft")) - , m_xMtFillHoles(m_xBuilder->weld_metric_spin_button("tiles", FUNIT_PIXEL)) + , m_xMtFillHoles(m_xBuilder->weld_metric_spin_button("tiles", FieldUnit::PIXEL)) , m_xCbFillHoles(m_xBuilder->weld_check_button("fillholes")) , m_xBmpWin(new weld::CustomWeld(*m_xBuilder, "source", m_aBmpWin)) , m_xMtfWin(new weld::CustomWeld(*m_xBuilder, "vectorized", m_aMtfWin)) @@ -136,7 +136,7 @@ void SdVectorizeDlg::Calculate( Bitmap const & rBmp, GDIMetaFile& rMtf ) if( !!aTmp ) { const Link<long,void> aPrgsHdl( LINK( this, SdVectorizeDlg, ProgressHdl ) ); - aTmp.Vectorize( rMtf, static_cast<sal_uInt8>(m_xMtReduce->get_value(FUNIT_NONE)), &aPrgsHdl ); + aTmp.Vectorize( rMtf, static_cast<sal_uInt8>(m_xMtReduce->get_value(FieldUnit::NONE)), &aPrgsHdl ); if (m_xCbFillHoles->get_active()) { @@ -147,8 +147,8 @@ void SdVectorizeDlg::Calculate( Bitmap const & rBmp, GDIMetaFile& rMtf ) { const long nWidth = pRAcc->Width(); const long nHeight = pRAcc->Height(); - const long nTileX = m_xMtFillHoles->get_value(FUNIT_NONE); - const long nTileY = m_xMtFillHoles->get_value(FUNIT_NONE); + const long nTileX = m_xMtFillHoles->get_value(FieldUnit::NONE); + const long nTileY = m_xMtFillHoles->get_value(FieldUnit::NONE); assert(nTileX && "div-by-zero"); const long nCountX = nWidth / nTileX; assert(nTileY && "div-by-zero"); @@ -310,8 +310,8 @@ void SdVectorizeDlg::LoadSettings() } m_xNmLayers->set_value(nLayers); - m_xMtReduce->set_value(nReduce, FUNIT_NONE); - m_xMtFillHoles->set_value(nFillHoles, FUNIT_NONE); + m_xMtReduce->set_value(nReduce, FieldUnit::NONE); + m_xMtFillHoles->set_value(nFillHoles, FieldUnit::NONE); m_xCbFillHoles->set_active(bFillHoles); ToggleHdl(*m_xCbFillHoles); @@ -326,8 +326,8 @@ void SdVectorizeDlg::SaveSettings() const if( xOStm.is() ) { SdIOCompat aCompat( *xOStm, StreamMode::WRITE, 1 ); - xOStm->WriteUInt16( m_xNmLayers->get_value() ).WriteUInt16(m_xMtReduce->get_value(FUNIT_NONE)); - xOStm->WriteUInt16( m_xMtFillHoles->get_value(FUNIT_NONE) ).WriteBool(m_xCbFillHoles->get_active()); + xOStm->WriteUInt16( m_xNmLayers->get_value() ).WriteUInt16(m_xMtReduce->get_value(FieldUnit::NONE)); + xOStm->WriteUInt16( m_xMtFillHoles->get_value(FieldUnit::NONE) ).WriteBool(m_xCbFillHoles->get_active()); } } diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 2a0aef44d6c8..9624a991a9a3 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -211,7 +211,7 @@ SfxModule* SfxModule::GetActiveModule( SfxViewFrame* pFrame ) FieldUnit SfxModule::GetModuleFieldUnit( css::uno::Reference< css::frame::XFrame > const & i_frame ) { - ENSURE_OR_RETURN( i_frame.is(), "SfxModule::GetModuleFieldUnit: invalid frame!", FUNIT_100TH_MM ); + ENSURE_OR_RETURN( i_frame.is(), "SfxModule::GetModuleFieldUnit: invalid frame!", FieldUnit::MM_100TH ); // find SfxViewFrame for the given XFrame SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst(); @@ -221,17 +221,22 @@ FieldUnit SfxModule::GetModuleFieldUnit( css::uno::Reference< css::frame::XFrame break; pViewFrame = SfxViewFrame::GetNext( *pViewFrame ); } - ENSURE_OR_RETURN( pViewFrame != nullptr, "SfxModule::GetModuleFieldUnit: unable to find an SfxViewFrame for the given XFrame", FUNIT_100TH_MM ); + ENSURE_OR_RETURN( + pViewFrame != nullptr, + "SfxModule::GetModuleFieldUnit: unable to find an SfxViewFrame for the given XFrame", + FieldUnit::MM_100TH); // find the module SfxModule const * pModule = GetActiveModule( pViewFrame ); - ENSURE_OR_RETURN( pModule != nullptr, "SfxModule::GetModuleFieldUnit: no SfxModule for the given frame!", FUNIT_100TH_MM ); + ENSURE_OR_RETURN(pModule != nullptr, + "SfxModule::GetModuleFieldUnit: no SfxModule for the given frame!", + FieldUnit::MM_100TH); return pModule->GetFieldUnit(); } FieldUnit SfxModule::GetCurrentFieldUnit() { - FieldUnit eUnit = FUNIT_INCH; + FieldUnit eUnit = FieldUnit::INCH; SfxModule* pModule = GetActiveModule(); if ( pModule ) { @@ -246,7 +251,7 @@ FieldUnit SfxModule::GetCurrentFieldUnit() FieldUnit SfxModule::GetFieldUnit() const { - FieldUnit eUnit = FUNIT_INCH; + FieldUnit eUnit = FieldUnit::INCH; const SfxPoolItem* pItem = GetItem( SID_ATTR_METRIC ); if ( pItem ) eUnit = static_cast<FieldUnit>(static_cast<const SfxUInt16Item*>(pItem)->GetValue()); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index ebebe1c78bd5..f04feef9dd86 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -295,7 +295,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() { MapUnit eUnit = MapUnit::MapCM; - FieldUnit eFieldUnit( FUNIT_CM ); + FieldUnit eFieldUnit( FieldUnit::CM ); SfxModule* pModule = SfxModule::GetActiveModule(); if ( pModule ) { @@ -306,15 +306,15 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() switch ( eFieldUnit ) { - case FUNIT_MM: eUnit = MapUnit::MapMM; break; - case FUNIT_CM: - case FUNIT_M: - case FUNIT_KM: eUnit = MapUnit::MapCM; break; - case FUNIT_POINT: - case FUNIT_PICA: eUnit = MapUnit::MapPoint; break; - case FUNIT_INCH: - case FUNIT_FOOT: - case FUNIT_MILE: eUnit = MapUnit::MapInch; break; + case FieldUnit::MM: eUnit = MapUnit::MapMM; break; + case FieldUnit::CM: + case FieldUnit::M: + case FieldUnit::KM: eUnit = MapUnit::MapCM; break; + case FieldUnit::POINT: + case FieldUnit::PICA: eUnit = MapUnit::MapPoint; break; + case FieldUnit::INCH: + case FieldUnit::FOOT: + case FieldUnit::MILE: eUnit = MapUnit::MapInch; break; default: OSL_FAIL( "non supported field unit" ); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 82bc4c911217..5519ef39b1ac 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -163,7 +163,7 @@ SmPrintOptionsTabPage::SmPrintOptionsTabPage(TabPageParent pPage, const SfxItemS , m_xSizeNormal(m_xBuilder->weld_radio_button("sizenormal")) , m_xSizeScaled(m_xBuilder->weld_radio_button("sizescaled")) , m_xSizeZoomed(m_xBuilder->weld_radio_button("sizezoomed")) - , m_xZoom(m_xBuilder->weld_metric_spin_button("zoom", FUNIT_PERCENT)) + , m_xZoom(m_xBuilder->weld_metric_spin_button("zoom", FieldUnit::PERCENT)) , m_xNoRightSpaces(m_xBuilder->weld_check_button("norightspaces")) , m_xSaveOnlyUsedSymbols(m_xBuilder->weld_check_button("saveonlyusedsymbols")) , m_xAutoCloseBrackets(m_xBuilder->weld_check_button("autoclosebrackets")) @@ -190,7 +190,7 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet) nPrintSize = PRINT_SIZE_ZOOMED; rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), nPrintSize)); - rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), sal::static_int_cast<sal_uInt16>(m_xZoom->get_value(FUNIT_PERCENT)))); + rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), sal::static_int_cast<sal_uInt16>(m_xZoom->get_value(FieldUnit::PERCENT)))); rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), m_xTitle->get_active())); rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), m_xText->get_active())); rSet->Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), m_xFrame->get_active())); @@ -211,7 +211,7 @@ void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet) m_xZoom->set_sensitive(m_xSizeZoomed->get_active()); - m_xZoom->set_value(static_cast<const SfxUInt16Item &>(rSet->Get(GetWhich(SID_PRINTZOOM))).GetValue(), FUNIT_PERCENT); + m_xZoom->set_value(static_cast<const SfxUInt16Item &>(rSet->Get(GetWhich(SID_PRINTZOOM))).GetValue(), FieldUnit::PERCENT); m_xTitle->set_active(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_PRINTTITLE))).GetValue()); m_xNoRightSpaces->set_active(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_NO_RIGHT_SPACES))).GetValue()); @@ -360,12 +360,12 @@ IMPL_LINK_NOARG( SmFontSizeDialog, DefaultButtonClickHdl, weld::Button&, void ) SmFontSizeDialog::SmFontSizeDialog(weld::Window* pParent) : GenericDialogController(pParent, "modules/smath/ui/fontsizedialog.ui", "FontSizeDialog") - , m_xBaseSize(m_xBuilder->weld_metric_spin_button("spinB_baseSize", FUNIT_POINT)) - , m_xTextSize(m_xBuilder->weld_metric_spin_button("spinB_text", FUNIT_PERCENT)) - , m_xIndexSize(m_xBuilder->weld_metric_spin_button("spinB_index", FUNIT_PERCENT)) - , m_xFunctionSize(m_xBuilder->weld_metric_spin_button("spinB_function", FUNIT_PERCENT)) - , m_xOperatorSize(m_xBuilder->weld_metric_spin_button("spinB_operator", FUNIT_PERCENT)) - , m_xBorderSize(m_xBuilder->weld_metric_spin_button("spinB_limit", FUNIT_PERCENT)) + , m_xBaseSize(m_xBuilder->weld_metric_spin_button("spinB_baseSize", FieldUnit::POINT)) + , m_xTextSize(m_xBuilder->weld_metric_spin_button("spinB_text", FieldUnit::PERCENT)) + , m_xIndexSize(m_xBuilder->weld_metric_spin_button("spinB_index", FieldUnit::PERCENT)) + , m_xFunctionSize(m_xBuilder->weld_metric_spin_button("spinB_function", FieldUnit::PERCENT)) + , m_xOperatorSize(m_xBuilder->weld_metric_spin_button("spinB_operator", FieldUnit::PERCENT)) + , m_xBorderSize(m_xBuilder->weld_metric_spin_button("spinB_limit", FieldUnit::PERCENT)) , m_xDefaultButton(m_xBuilder->weld_button("default")) { m_xDefaultButton->connect_clicked(LINK(this, SmFontSizeDialog, DefaultButtonClickHdl)); @@ -379,24 +379,24 @@ void SmFontSizeDialog::ReadFrom(const SmFormat &rFormat) { //! watch out: round properly! m_xBaseSize->set_value( SmRoundFraction( - Sm100th_mmToPts( rFormat.GetBaseSize().Height() ) ), FUNIT_NONE ); + Sm100th_mmToPts( rFormat.GetBaseSize().Height() ) ), FieldUnit::NONE ); - m_xTextSize->set_value( rFormat.GetRelSize(SIZ_TEXT), FUNIT_NONE ); - m_xIndexSize->set_value( rFormat.GetRelSize(SIZ_INDEX), FUNIT_NONE ); - m_xFunctionSize->set_value( rFormat.GetRelSize(SIZ_FUNCTION), FUNIT_NONE ); - m_xOperatorSize->set_value( rFormat.GetRelSize(SIZ_OPERATOR), FUNIT_NONE ); - m_xBorderSize->set_value( rFormat.GetRelSize(SIZ_LIMITS), FUNIT_NONE ); + m_xTextSize->set_value( rFormat.GetRelSize(SIZ_TEXT), FieldUnit::NONE ); + m_xIndexSize->set_value( rFormat.GetRelSize(SIZ_INDEX), FieldUnit::NONE ); + m_xFunctionSize->set_value( rFormat.GetRelSize(SIZ_FUNCTION), FieldUnit::NONE ); + m_xOperatorSize->set_value( rFormat.GetRelSize(SIZ_OPERATOR), FieldUnit::NONE ); + m_xBorderSize->set_value( rFormat.GetRelSize(SIZ_LIMITS), FieldUnit::NONE ); } void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const { - rFormat.SetBaseSize( Size(0, SmPtsTo100th_mm( static_cast< long >(m_xBaseSize->get_value(FUNIT_NONE)))) ); + rFormat.SetBaseSize( Size(0, SmPtsTo100th_mm( static_cast< long >(m_xBaseSize->get_value(FieldUnit::NONE)))) ); - rFormat.SetRelSize(SIZ_TEXT, sal::static_int_cast<sal_uInt16>(m_xTextSize->get_value(FUNIT_NONE))); - rFormat.SetRelSize(SIZ_INDEX, sal::static_int_cast<sal_uInt16>(m_xIndexSize->get_value(FUNIT_NONE))); - rFormat.SetRelSize(SIZ_FUNCTION, sal::static_int_cast<sal_uInt16>(m_xFunctionSize->get_value(FUNIT_NONE))); - rFormat.SetRelSize(SIZ_OPERATOR, sal::static_int_cast<sal_uInt16>(m_xOperatorSize->get_value(FUNIT_NONE))); - rFormat.SetRelSize(SIZ_LIMITS, sal::static_int_cast<sal_uInt16>(m_xBorderSize->get_value(FUNIT_NONE))); + rFormat.SetRelSize(SIZ_TEXT, sal::static_int_cast<sal_uInt16>(m_xTextSize->get_value(FieldUnit::NONE))); + rFormat.SetRelSize(SIZ_INDEX, sal::static_int_cast<sal_uInt16>(m_xIndexSize->get_value(FieldUnit::NONE))); + rFormat.SetRelSize(SIZ_FUNCTION, sal::static_int_cast<sal_uInt16>(m_xFunctionSize->get_value(FieldUnit::NONE))); + rFormat.SetRelSize(SIZ_OPERATOR, sal::static_int_cast<sal_uInt16>(m_xOperatorSize->get_value(FieldUnit::NONE))); + rFormat.SetRelSize(SIZ_LIMITS, sal::static_int_cast<sal_uInt16>(m_xBorderSize->get_value(FieldUnit::NONE))); const Size aTmp (rFormat.GetBaseSize()); for (sal_uInt16 i = FNT_BEGIN; i <= FNT_END; i++) @@ -680,10 +680,10 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) if (nActiveCategory != CATEGORY_NONE) { pCat = Categories[nActiveCategory]; - pCat->SetValue(0, sal::static_int_cast<sal_uInt16>(m_xMetricField1->get_value(FUNIT_NONE))); - pCat->SetValue(1, sal::static_int_cast<sal_uInt16>(m_xMetricField2->get_value(FUNIT_NONE))); - pCat->SetValue(2, sal::static_int_cast<sal_uInt16>(m_xMetricField3->get_value(FUNIT_NONE))); - pCat->SetValue(3, sal::static_int_cast<sal_uInt16>(m_xMetricField4->get_value(FUNIT_NONE))); + pCat->SetValue(0, sal::static_int_cast<sal_uInt16>(m_xMetricField1->get_value(FieldUnit::NONE))); + pCat->SetValue(1, sal::static_int_cast<sal_uInt16>(m_xMetricField2->get_value(FieldUnit::NONE))); + pCat->SetValue(2, sal::static_int_cast<sal_uInt16>(m_xMetricField3->get_value(FieldUnit::NONE))); + pCat->SetValue(3, sal::static_int_cast<sal_uInt16>(m_xMetricField4->get_value(FieldUnit::NONE))); if (nActiveCategory == 5) bScaleAllBrackets = m_xCheckBox1->get_active(); @@ -712,12 +712,12 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) sal_uInt16 nDigits; if (nCategory < 9) { - eUnit = FUNIT_PERCENT; + eUnit = FieldUnit::PERCENT; nDigits = 0; } else { - eUnit = FUNIT_100TH_MM; + eUnit = FieldUnit::MM_100TH; nDigits = 2; } pMF->set_unit(eUnit); // changes the value @@ -728,8 +728,8 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) pCat = Categories[nCategory]; pFT->set_label(pCat->GetString(i)); - pMF->set_range(pCat->GetMinimum(i), pCat->GetMaximum(i), FUNIT_NONE); - pMF->set_value(pCat->GetValue(i), FUNIT_NONE); + pMF->set_range(pCat->GetMinimum(i), pCat->GetMaximum(i), FieldUnit::NONE); + pMF->set_value(pCat->GetValue(i), FieldUnit::NONE); pMF->set_help_id(aCatMf2Hid[nCategory][i]); } @@ -759,14 +759,14 @@ SmDistanceDialog::SmDistanceDialog(weld::Window *pParent) : GenericDialogController(pParent, "modules/smath/ui/spacingdialog.ui", "SpacingDialog") , m_xFrame(m_xBuilder->weld_frame("template")) , m_xFixedText1(m_xBuilder->weld_label("label1")) - , m_xMetricField1(m_xBuilder->weld_metric_spin_button("spinbutton1", FUNIT_CM)) + , m_xMetricField1(m_xBuilder->weld_metric_spin_button("spinbutton1", FieldUnit::CM)) , m_xFixedText2(m_xBuilder->weld_label("label2")) - , m_xMetricField2(m_xBuilder->weld_metric_spin_button("spinbutton2", FUNIT_CM)) + , m_xMetricField2(m_xBuilder->weld_metric_spin_button("spinbutton2", FieldUnit::CM)) , m_xFixedText3(m_xBuilder->weld_label("label3")) - , m_xMetricField3(m_xBuilder->weld_metric_spin_button("spinbutton3", FUNIT_CM)) + , m_xMetricField3(m_xBuilder->weld_metric_spin_button("spinbutton3", FieldUnit::CM)) , m_xCheckBox1(m_xBuilder->weld_check_button("checkbutton")) , m_xFixedText4(m_xBuilder->weld_label("label4")) - , m_xMetricField4(m_xBuilder->weld_metric_spin_button("spinbutton4", FUNIT_CM)) + , m_xMetricField4(m_xBuilder->weld_metric_spin_button("spinbutton4", FieldUnit::CM)) , m_xMenuButton(m_xBuilder->weld_menu_button("category")) , m_xDefaultButton(m_xBuilder->weld_button("default")) , m_xBitmap(m_xBuilder->weld_widget("image")) diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index ca805b44cab5..8061558284a5 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -426,7 +426,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance, aSize.setHeight( aTxtSize.Height() ); // SourceUnit to Twips - if ( eSourceUnit == FUNIT_POINT ) + if ( eSourceUnit == FieldUnit::POINT ) { nLine1 /= 5; nLine2 /= 5; @@ -485,7 +485,7 @@ LineListBox::LineListBox( vcl::Window* pParent, WinBits nWinStyle ) : { aTxtSize.setWidth( GetTextWidth( " " ) ); aTxtSize.setHeight( GetTextHeight() ); - eSourceUnit = FUNIT_POINT; + eSourceUnit = FieldUnit::POINT; aVirDev->SetLineColor(); aVirDev->SetMapMode( MapMode( MapUnit::MapTwip ) ); @@ -1352,7 +1352,7 @@ void FontSizeBox::Fill( const FontMetric* pFontMetric, const FontList* pList ) pTempAry = pAry; while ( *pTempAry ) { - InsertValue( *pTempAry, FUNIT_NONE, nPos ); + InsertValue( *pTempAry, FieldUnit::NONE, nPos ); ComboBox::SetEntryData( nPos, reinterpret_cast<void*>(*pTempAry) ); nPos++; pTempAry++; @@ -1383,7 +1383,7 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ) void FontSizeBox::SetValue( sal_Int64 nNewValue ) { - SetValue( nNewValue, FUNIT_NONE ); + SetValue( nNewValue, FieldUnit::NONE ); } sal_Int64 FontSizeBox::GetValueFromStringUnit(const OUString& rStr, FieldUnit eOutUnit) const @@ -1399,7 +1399,7 @@ sal_Int64 FontSizeBox::GetValueFromStringUnit(const OUString& rStr, FieldUnit eO SvtFontSizeBox::SvtFontSizeBox(std::unique_ptr<weld::ComboBox> p) : pFontList(nullptr) , nSavedValue(0) - , eUnit(FUNIT_POINT) + , eUnit(FieldUnit::POINT) , nDecimalDigits(1) , nRelMin(0) , nRelMax(0) @@ -1577,7 +1577,7 @@ void SvtFontSizeBox::EnableRelativeMode( sal_uInt16 nNewMin, sal_uInt16 nNewMax, nRelMin = nNewMin; nRelMax = nNewMax; nRelStep = nStep; - SetUnit(FUNIT_POINT); + SetUnit(FieldUnit::POINT); } void SvtFontSizeBox::EnablePtRelativeMode( short nNewMin, short nNewMax, short nStep ) @@ -1586,7 +1586,7 @@ void SvtFontSizeBox::EnablePtRelativeMode( short nNewMin, short nNewMax, short n nPtRelMin = nNewMin; nPtRelMax = nNewMax; nPtRelStep = nStep; - SetUnit(FUNIT_POINT); + SetUnit(FieldUnit::POINT); } void SvtFontSizeBox::InsertValue(int i) @@ -1614,7 +1614,7 @@ void SvtFontSizeBox::SetRelative( bool bNewRelative ) if (bPtRelative) { SetDecimalDigits( 1 ); - SetUnit(FUNIT_POINT); + SetUnit(FieldUnit::POINT); short i = nPtRelMin, n = 0; // JP 30.06.98: more than 100 values are not useful @@ -1627,7 +1627,7 @@ void SvtFontSizeBox::SetRelative( bool bNewRelative ) else { SetDecimalDigits(0); - SetUnit(FUNIT_PERCENT); + SetUnit(FieldUnit::PERCENT); sal_uInt16 i = nRelMin; while ( i <= nRelMax ) @@ -1643,7 +1643,7 @@ void SvtFontSizeBox::SetRelative( bool bNewRelative ) m_xComboBox->clear(); bRelative = bPtRelative = false; SetDecimalDigits(1); - SetUnit(FUNIT_POINT); + SetUnit(FieldUnit::POINT); if ( pFontList) Fill( &aFontMetric, pFontList ); } @@ -1657,7 +1657,7 @@ OUString SvtFontSizeBox::format_number(int nValue) const OUString sRet; //pawn percent off to icu to decide whether percent is separated from its number for this locale - if (eUnit == FUNIT_PERCENT) + if (eUnit == FieldUnit::PERCENT) { double fValue = nValue; fValue /= weld::SpinButton::Power10(nDecimalDigits); @@ -1668,9 +1668,9 @@ OUString SvtFontSizeBox::format_number(int nValue) const const SvtSysLocale aSysLocale; const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData(); sRet = rLocaleData.getNum(nValue, nDecimalDigits, true, false); - if (eUnit != FUNIT_NONE && eUnit != FUNIT_DEGREE) + if (eUnit != FieldUnit::NONE && eUnit != FieldUnit::DEGREE) sRet += " "; - assert(eUnit != FUNIT_PERCENT); + assert(eUnit != FieldUnit::PERCENT); sRet += weld::MetricSpinButton::MetricToString(eUnit); } @@ -1749,7 +1749,7 @@ void SvtLineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance, Size aSize(getPreviewSize(*m_xControl)); // SourceUnit to Twips - if ( eSourceUnit == FUNIT_POINT ) + if ( eSourceUnit == FieldUnit::POINT ) { nLine1 /= 5; nLine2 /= 5; @@ -1848,7 +1848,7 @@ SvtLineListBox::SvtLineListBox(std::unique_ptr<weld::MenuButton> pControl) m_xControl->set_size_request(std::max(aNonePrefSize.Width(), aSolidPrefSize.Width()), std::max(aNonePrefSize.Height(), aSolidPrefSize.Height())); - eSourceUnit = FUNIT_POINT; + eSourceUnit = FieldUnit::POINT; aVirDev->SetLineColor(); aVirDev->SetMapMode(MapMode(MapUnit::MapTwip)); diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index a27fb608d7b2..20a53e9e4126 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -219,7 +219,7 @@ void Ruler::ImplInit( WinBits nWinBits ) // Initialize Units mnUnitIndex = RULER_UNIT_CM; - meUnit = FUNIT_CM; + meUnit = FieldUnit::CM; maZoom = Fraction( 1, 1 ); // Recalculate border widths @@ -2387,37 +2387,37 @@ void Ruler::SetUnit( FieldUnit eNewUnit ) meUnit = eNewUnit; switch ( meUnit ) { - case FUNIT_MM: + case FieldUnit::MM: mnUnitIndex = RULER_UNIT_MM; break; - case FUNIT_CM: + case FieldUnit::CM: mnUnitIndex = RULER_UNIT_CM; break; - case FUNIT_M: + case FieldUnit::M: mnUnitIndex = RULER_UNIT_M; break; - case FUNIT_KM: + case FieldUnit::KM: mnUnitIndex = RULER_UNIT_KM; break; - case FUNIT_INCH: + case FieldUnit::INCH: mnUnitIndex = RULER_UNIT_INCH; break; - case FUNIT_FOOT: + case FieldUnit::FOOT: mnUnitIndex = RULER_UNIT_FOOT; break; - case FUNIT_MILE: + case FieldUnit::MILE: mnUnitIndex = RULER_UNIT_MILE; break; - case FUNIT_POINT: + case FieldUnit::POINT: mnUnitIndex = RULER_UNIT_POINT; break; - case FUNIT_PICA: + case FieldUnit::PICA: mnUnitIndex = RULER_UNIT_PICA; break; - case FUNIT_CHAR: + case FieldUnit::CHAR: mnUnitIndex = RULER_UNIT_CHAR; break; - case FUNIT_LINE: + case FieldUnit::LINE: mnUnitIndex = RULER_UNIT_LINE; break; default: diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index d4ca22c4d2e7..4efde710a714 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -106,7 +106,7 @@ public: SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< uno::XComponentContext >& rxContext ) : mxContext ( rxContext ), - meFieldUnit ( FUNIT_CM ), + meFieldUnit ( FieldUnit::CM ), mbExportSelection ( false ), mbGraphicsSource ( true ) { @@ -286,7 +286,8 @@ void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComp aPropertyName = "Metric"; else aPropertyName = "NonMetric"; - meFieldUnit = static_cast<FieldUnit>(aConfigItem.ReadInt32( aPropertyName, FUNIT_CM )); + meFieldUnit = static_cast<FieldUnit>( + aConfigItem.ReadInt32(aPropertyName, sal_Int32(FieldUnit::CM))); } } diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index b9267a6ddaba..99c2ad2b1cd6 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -106,24 +106,24 @@ sal_Int32 ExportDialog::GetDefaultUnit() sal_Int32 nDefaultUnit = UNIT_CM; switch( mrFltCallPara.eFieldUnit ) { -// case FUNIT_NONE : -// case FUNIT_PERCENT : -// case FUNIT_CUSTOM : +// case FieldUnit::NONE : +// case FieldUnit::PERCENT : +// case FieldUnit::CUSTOM : default: nDefaultUnit = UNIT_CM; break; - case FUNIT_MILE : // PASSTHROUGH INTENDED - case FUNIT_FOOT : - case FUNIT_TWIP : - case FUNIT_PICA : nDefaultUnit = UNIT_INCH; break; + case FieldUnit::MILE : // PASSTHROUGH INTENDED + case FieldUnit::FOOT : + case FieldUnit::TWIP : + case FieldUnit::PICA : nDefaultUnit = UNIT_INCH; break; - case FUNIT_KM : // PASSTHROUGH INTENDED - case FUNIT_M : - case FUNIT_100TH_MM : nDefaultUnit = UNIT_CM; break; + case FieldUnit::KM : // PASSTHROUGH INTENDED + case FieldUnit::M : + case FieldUnit::MM_100TH : nDefaultUnit = UNIT_CM; break; - case FUNIT_INCH : nDefaultUnit = UNIT_INCH; break; - case FUNIT_CM : nDefaultUnit = UNIT_CM; break; - case FUNIT_MM : nDefaultUnit = UNIT_MM; break; - case FUNIT_POINT : nDefaultUnit = UNIT_POINT; break; + case FieldUnit::INCH : nDefaultUnit = UNIT_INCH; break; + case FieldUnit::CM : nDefaultUnit = UNIT_CM; break; + case FieldUnit::MM : nDefaultUnit = UNIT_MM; break; + case FieldUnit::POINT : nDefaultUnit = UNIT_POINT; break; } return nDefaultUnit; } diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index d08820e041d6..1d3e40cdcebc 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.cxx @@ -22,7 +22,7 @@ void SetFieldUnit(weld::MetricSpinButton& rField, FieldUnit eUnit, bool bAll) { int nMin, nMax; - rField.get_range(nMin, nMax, FUNIT_TWIP); + rField.get_range(nMin, nMax, FieldUnit::TWIP); nMin = rField.denormalize(nMin); nMax = rField.denormalize(nMax); @@ -30,13 +30,13 @@ void SetFieldUnit(weld::MetricSpinButton& rField, FieldUnit eUnit, bool bAll) { switch (eUnit) { - case FUNIT_M: - case FUNIT_KM: - eUnit = FUNIT_CM; + case FieldUnit::M: + case FieldUnit::KM: + eUnit = FieldUnit::CM; break; - case FUNIT_FOOT: - case FUNIT_MILE: - eUnit = FUNIT_INCH; + case FieldUnit::FOOT: + case FieldUnit::MILE: + eUnit = FieldUnit::INCH; break; default: //prevent warning break; @@ -45,20 +45,20 @@ void SetFieldUnit(weld::MetricSpinButton& rField, FieldUnit eUnit, bool bAll) rField.set_unit(eUnit); - if (FUNIT_POINT == eUnit && rField.get_digits() > 1) + if (FieldUnit::POINT == eUnit && rField.get_digits() > 1) rField.set_digits(1); else rField.set_digits(2); switch (eUnit) { - // _CHAR and _LINE sets the step of "char" and "line" unit, they are same as FUNIT_MM - case FUNIT_CHAR: - case FUNIT_LINE: - case FUNIT_MM: + // _CHAR and _LINE sets the step of "char" and "line" unit, they are same as FieldUnit::MM + case FieldUnit::CHAR: + case FieldUnit::LINE: + case FieldUnit::MM: rField.set_increments(50, 500, eUnit); break; - case FUNIT_INCH: + case FieldUnit::INCH: rField.set_increments(2, 20, eUnit); break; default: @@ -70,29 +70,29 @@ void SetFieldUnit(weld::MetricSpinButton& rField, FieldUnit eUnit, bool bAll) { nMin = rField.normalize(nMin); nMax = rField.normalize(nMax); - rField.set_range(nMin, nMax, FUNIT_TWIP); + rField.set_range(nMin, nMax, FieldUnit::TWIP); } } void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll ) { - sal_Int64 nFirst = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ); - sal_Int64 nLast = rField.Denormalize( rField.GetLast( FUNIT_TWIP ) ); - sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) ); - sal_Int64 nMax = rField.Denormalize( rField.GetMax( FUNIT_TWIP ) ); + sal_Int64 nFirst = rField.Denormalize( rField.GetFirst( FieldUnit::TWIP ) ); + sal_Int64 nLast = rField.Denormalize( rField.GetLast( FieldUnit::TWIP ) ); + sal_Int64 nMin = rField.Denormalize( rField.GetMin( FieldUnit::TWIP ) ); + sal_Int64 nMax = rField.Denormalize( rField.GetMax( FieldUnit::TWIP ) ); if ( !bAll ) { switch ( eUnit ) { - case FUNIT_M: - case FUNIT_KM: - eUnit = FUNIT_CM; + case FieldUnit::M: + case FieldUnit::KM: + eUnit = FieldUnit::CM; break; - case FUNIT_FOOT: - case FUNIT_MILE: - eUnit = FUNIT_INCH; + case FieldUnit::FOOT: + case FieldUnit::MILE: + eUnit = FieldUnit::INCH; break; default: ;//prevent warning } @@ -100,14 +100,14 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll ) rField.SetUnit( eUnit ); switch( eUnit ) { - // _CHAR and _LINE sets the step of "char" and "line" unit, they are same as FUNIT_MM - case FUNIT_CHAR: - case FUNIT_LINE: - case FUNIT_MM: + // _CHAR and _LINE sets the step of "char" and "line" unit, they are same as FieldUnit::MM + case FieldUnit::CHAR: + case FieldUnit::LINE: + case FieldUnit::MM: rField.SetSpinSize( 50 ); break; - case FUNIT_INCH: + case FieldUnit::INCH: rField.SetSpinSize( 2 ); break; @@ -115,7 +115,7 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll ) rField.SetSpinSize( 10 ); } - if ( FUNIT_POINT == eUnit ) + if ( FieldUnit::POINT == eUnit ) { if( rField.GetDecimalDigits() > 1 ) rField.SetDecimalDigits( 1 ); @@ -125,10 +125,10 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll ) if ( !bAll ) { - rField.SetFirst( rField.Normalize( nFirst ), FUNIT_TWIP ); - rField.SetLast( rField.Normalize( nLast ), FUNIT_TWIP ); - rField.SetMin( rField.Normalize( nMin ), FUNIT_TWIP ); - rField.SetMax( rField.Normalize( nMax ), FUNIT_TWIP ); + rField.SetFirst( rField.Normalize( nFirst ), FieldUnit::TWIP ); + rField.SetLast( rField.Normalize( nLast ), FieldUnit::TWIP ); + rField.SetMin( rField.Normalize( nMin ), FieldUnit::TWIP ); + rField.SetMax( rField.Normalize( nMax ), FieldUnit::TWIP ); } } @@ -136,20 +136,20 @@ void SetMetricValue(weld::MetricSpinButton& rField, int nCoreValue, MapUnit eUni { auto nVal = OutputDevice::LogicToLogic(nCoreValue, eUnit, MapUnit::Map100thMM); nVal = rField.normalize(nVal); - rField.set_value(nVal, FUNIT_100TH_MM); + rField.set_value(nVal, FieldUnit::MM_100TH); } void SetMetricValue( MetricField& rField, long nCoreValue, MapUnit eUnit ) { sal_Int64 nVal = OutputDevice::LogicToLogic( nCoreValue, eUnit, MapUnit::Map100thMM ); nVal = rField.Normalize( nVal ); - rField.SetValue( nVal, FUNIT_100TH_MM ); + rField.SetValue(nVal, FieldUnit::MM_100TH); } int GetCoreValue(const weld::MetricSpinButton& rField, MapUnit eUnit) { - int nVal = rField.get_value(FUNIT_100TH_MM); + int nVal = rField.get_value(FieldUnit::MM_100TH); // avoid rounding issues const int nSizeMask = 0xff000000; bool bRoundBefore = true; @@ -173,7 +173,7 @@ int GetCoreValue(const weld::MetricSpinButton& rField, MapUnit eUnit) long GetCoreValue( const MetricField& rField, MapUnit eUnit ) { - sal_Int64 nVal = rField.GetValue( FUNIT_100TH_MM ); + sal_Int64 nVal = rField.GetValue(FieldUnit::MM_100TH); // avoid rounding issues const sal_Int64 nSizeMask = 0xffffffffff000000LL; bool bRoundBefore = true; @@ -240,13 +240,13 @@ long ItemToControl( long nIn, MapUnit eItem, FieldUnit eCtrl ) nIn /= 10; else if ( eItem == MapUnit::Map100thMM ) nIn /= 100; - nOut = TransformMetric( nIn, FUNIT_MM, eCtrl ); + nOut = TransformMetric( nIn, FieldUnit::MM, eCtrl ); } break; case MapUnit::MapCM: { - nOut = TransformMetric( nIn, FUNIT_CM, eCtrl ); + nOut = TransformMetric( nIn, FieldUnit::CM, eCtrl ); } break; @@ -261,19 +261,19 @@ long ItemToControl( long nIn, MapUnit eItem, FieldUnit eCtrl ) nIn /= 100; else if ( eItem == MapUnit::Map1000thInch ) nIn /= 1000; - nOut = TransformMetric( nIn, FUNIT_INCH, eCtrl ); + nOut = TransformMetric( nIn, FieldUnit::INCH, eCtrl ); } break; case MapUnit::MapPoint: { - nOut = TransformMetric( nIn, FUNIT_POINT, eCtrl ); + nOut = TransformMetric( nIn, FieldUnit::POINT, eCtrl ); } break; case MapUnit::MapTwip: { - nOut = TransformMetric( nIn, FUNIT_TWIP, eCtrl ); + nOut = TransformMetric( nIn, FieldUnit::TWIP, eCtrl ); } break; default: ;//prevent warning @@ -295,25 +295,25 @@ FieldUnit MapToFieldUnit( const MapUnit eUnit ) case MapUnit::Map100thMM: case MapUnit::Map10thMM: case MapUnit::MapMM: - return FUNIT_MM; + return FieldUnit::MM; case MapUnit::MapCM: - return FUNIT_CM; + return FieldUnit::CM; case MapUnit::Map1000thInch: case MapUnit::Map100thInch: case MapUnit::Map10thInch: case MapUnit::MapInch: - return FUNIT_INCH; + return FieldUnit::INCH; case MapUnit::MapPoint: - return FUNIT_POINT; + return FieldUnit::POINT; case MapUnit::MapTwip: - return FUNIT_TWIP; + return FieldUnit::TWIP; default: ;//prevent warning } - return FUNIT_NONE; + return FieldUnit::NONE; } @@ -650,8 +650,8 @@ FUNC_CONVERT const ConvertTable[6][6] = long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew ) { - if ( aOld == FUNIT_NONE || aNew == FUNIT_NONE || - aOld == FUNIT_CUSTOM || aNew == FUNIT_CUSTOM ) + if ( aOld == FieldUnit::NONE || aNew == FieldUnit::NONE || + aOld == FieldUnit::CUSTOM || aNew == FieldUnit::CUSTOM ) { return nVal; } @@ -661,34 +661,34 @@ long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew ) switch ( aOld ) { - case FUNIT_CM: + case FieldUnit::CM: nOld = 0; break; - case FUNIT_MM: + case FieldUnit::MM: nOld = 1; break; - case FUNIT_INCH: + case FieldUnit::INCH: nOld = 2; break; - case FUNIT_POINT: + case FieldUnit::POINT: nOld = 3; break; - case FUNIT_PICA: + case FieldUnit::PICA: nOld = 4; break; - case FUNIT_TWIP: + case FieldUnit::TWIP: nOld = 5; break; default: ;//prevent warning } switch ( aNew ) { - case FUNIT_CM: + case FieldUnit::CM: nNew = 0; break; - case FUNIT_MM: + case FieldUnit::MM: nNew = 1; break; - case FUNIT_INCH: + case FieldUnit::INCH: nNew = 2; break; - case FUNIT_POINT: + case FieldUnit::POINT: nNew = 3; break; - case FUNIT_PICA: + case FieldUnit::PICA: nNew = 4; break; - case FUNIT_TWIP: + case FieldUnit::TWIP: nNew = 5; break; default: ;//prevent warning } diff --git a/svx/inc/fieldunit.hrc b/svx/inc/fieldunit.hrc index 829d14750f3b..b4c4a97e4c31 100644 --- a/svx/inc/fieldunit.hrc +++ b/svx/inc/fieldunit.hrc @@ -27,17 +27,17 @@ const std::pair<const char*, FieldUnit> RID_SVXSTR_FIELDUNIT_TABLE[] = { - { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Millimeter") , FUNIT_MM }, - { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Centimeter") , FUNIT_CM }, - { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Meter") , FUNIT_M }, - { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Kilometer") , FUNIT_KM }, - { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Inch") , FUNIT_INCH }, - { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Foot") , FUNIT_FOOT }, - { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Miles") , FUNIT_MILE }, - { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Pica") , FUNIT_PICA }, - { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Point") , FUNIT_POINT }, - { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Char") , FUNIT_CHAR }, - { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Line") , FUNIT_LINE }, + { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Millimeter") , FieldUnit::MM }, + { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Centimeter") , FieldUnit::CM }, + { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Meter") , FieldUnit::M }, + { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Kilometer") , FieldUnit::KM }, + { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Inch") , FieldUnit::INCH }, + { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Foot") , FieldUnit::FOOT }, + { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Miles") , FieldUnit::MILE }, + { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Pica") , FieldUnit::PICA }, + { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Point") , FieldUnit::POINT }, + { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Char") , FieldUnit::CHAR }, + { NC_("RID_SVXSTR_FIELDUNIT_TABLE", "Line") , FieldUnit::LINE }, }; #endif diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 8a39d7cf5635..1797a6f3f7d4 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -219,12 +219,12 @@ void CompressGraphicsDialog::UpdateResolutionLB() double CompressGraphicsDialog::GetViewWidthInch() { - return static_cast<double>(MetricField::ConvertValue(m_aViewSize100mm.Width(), 2, MapUnit::Map100thMM, FUNIT_INCH)) / 100.0; + return static_cast<double>(MetricField::ConvertValue(m_aViewSize100mm.Width(), 2, MapUnit::Map100thMM, FieldUnit::INCH)) / 100.0; } double CompressGraphicsDialog::GetViewHeightInch() { - return static_cast<double>(MetricField::ConvertValue(m_aViewSize100mm.Height(), 2, MapUnit::Map100thMM, FUNIT_INCH)) / 100.0; + return static_cast<double>(MetricField::ConvertValue(m_aViewSize100mm.Height(), 2, MapUnit::Map100thMM, FieldUnit::INCH)) / 100.0; } BmpScaleFlag CompressGraphicsDialog::GetSelectedInterpolationType() diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 09649e10ab60..9ed2e2bdb9f4 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -30,7 +30,7 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) { - FieldUnit eUnit = FUNIT_INCH; + FieldUnit eUnit = FieldUnit::INCH; const SfxPoolItem* pItem = nullptr; if ( SfxItemState::SET == rSet.GetItemState( SID_ATTR_METRIC, false, &pItem ) ) eUnit = static_cast<FieldUnit>(static_cast<const SfxUInt16Item*>(pItem)->GetValue()); diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index d5cf5ad3d56c..197a0180d388 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -253,7 +253,7 @@ SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings *pBindinx, SetFieldUnit(*m_pMtrFldTextStart, eDlgUnit, true); SetFieldUnit(*m_pMtrFldShadowX, eDlgUnit, true); SetFieldUnit(*m_pMtrFldShadowY, eDlgUnit, true); - if( eDlgUnit == FUNIT_MM ) + if( eDlgUnit == FieldUnit::MM ) { m_pMtrFldDistance->SetSpinSize( 50 ); m_pMtrFldTextStart->SetSpinSize( 50 ); @@ -496,7 +496,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, m_pMtrFldShadowX->SetDecimalDigits(2); m_pMtrFldShadowX->SetMin(LONG_MIN); m_pMtrFldShadowX->SetMax(LONG_MAX); - if( eDlgUnit == FUNIT_MM ) + if( eDlgUnit == FieldUnit::MM ) m_pMtrFldShadowX->SetSpinSize( 50 ); else m_pMtrFldShadowX->SetSpinSize( 10 ); @@ -505,7 +505,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, m_pMtrFldShadowY->SetDecimalDigits(2); m_pMtrFldShadowY->SetMin(LONG_MIN); m_pMtrFldShadowY->SetMax(LONG_MAX); - if( eDlgUnit == FUNIT_MM ) + if( eDlgUnit == FieldUnit::MM ) m_pMtrFldShadowY->SetSpinSize( 50 ); else m_pMtrFldShadowY->SetSpinSize( 10 ); @@ -527,13 +527,13 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, { nId = nShadowSlantId; - m_pMtrFldShadowX->SetUnit(FUNIT_DEGREE); + m_pMtrFldShadowX->SetUnit(FieldUnit::DEGREE); m_pMtrFldShadowX->SetDecimalDigits(1); m_pMtrFldShadowX->SetMin(-1800); m_pMtrFldShadowX->SetMax( 1800); m_pMtrFldShadowX->SetSpinSize(10); - m_pMtrFldShadowY->SetUnit(FUNIT_PERCENT); + m_pMtrFldShadowY->SetUnit(FieldUnit::PERCENT); m_pMtrFldShadowY->SetDecimalDigits(0); m_pMtrFldShadowY->SetMin(-999); m_pMtrFldShadowY->SetMax( 999); @@ -746,16 +746,16 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl, Timer *, void) { SetFieldUnit(*m_pMtrFldDistance, eDlgUnit, true); SetFieldUnit(*m_pMtrFldTextStart, eDlgUnit, true); - m_pMtrFldDistance->SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); - m_pMtrFldTextStart->SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); + m_pMtrFldDistance->SetSpinSize( eDlgUnit == FieldUnit::MM ? 50 : 10 ); + m_pMtrFldTextStart->SetSpinSize( eDlgUnit == FieldUnit::MM ? 50 : 10 ); } if( eDlgUnit != m_pMtrFldShadowX->GetUnit() && m_pTbxShadow->IsItemChecked(nShadowNormalId) ) { SetFieldUnit(*m_pMtrFldShadowX, eDlgUnit, true); SetFieldUnit(*m_pMtrFldShadowY, eDlgUnit, true); - m_pMtrFldShadowX->SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); - m_pMtrFldShadowY->SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); + m_pMtrFldShadowX->SetSpinSize( eDlgUnit == FieldUnit::MM ? 50 : 10 ); + m_pMtrFldShadowY->SetSpinSize( eDlgUnit == FieldUnit::MM ? 50 : 10 ); } long nValue = GetCoreValue(*m_pMtrFldDistance, MapUnit::Map100thMM); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 557cb182f6d3..20c1bcdbd7a4 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -134,14 +134,14 @@ SvxHFPage::SvxHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 n , m_xCntSharedBox(m_xBuilder->weld_check_button("checkSameLR")) , m_xCntSharedFirstBox(m_xBuilder->weld_check_button("checkSameFP")) , m_xLMLbl(m_xBuilder->weld_label("labelLeftMarg")) - , m_xLMEdit(m_xBuilder->weld_metric_spin_button("spinMargLeft", FUNIT_CM)) + , m_xLMEdit(m_xBuilder->weld_metric_spin_button("spinMargLeft", FieldUnit::CM)) , m_xRMLbl(m_xBuilder->weld_label("labelRightMarg")) - , m_xRMEdit(m_xBuilder->weld_metric_spin_button("spinMargRight", FUNIT_CM)) + , m_xRMEdit(m_xBuilder->weld_metric_spin_button("spinMargRight", FieldUnit::CM)) , m_xDistFT(m_xBuilder->weld_label("labelSpacing")) - , m_xDistEdit(m_xBuilder->weld_metric_spin_button("spinSpacing", FUNIT_CM)) + , m_xDistEdit(m_xBuilder->weld_metric_spin_button("spinSpacing", FieldUnit::CM)) , m_xDynSpacingCB(m_xBuilder->weld_check_button("checkDynSpacing")) , m_xHeightFT(m_xBuilder->weld_label("labelHeight")) - , m_xHeightEdit(m_xBuilder->weld_metric_spin_button("spinHeight", FUNIT_CM)) + , m_xHeightEdit(m_xBuilder->weld_metric_spin_button("spinHeight", FieldUnit::CM)) , m_xHeightDynBtn(m_xBuilder->weld_check_button("checkAutofit")) , m_xBackgroundBtn(m_xBuilder->weld_button("buttonMore")) , m_xBspWin(new weld::CustomWeld(*m_xBuilder, "drawingareaPageHF", m_aBspWin)) @@ -979,9 +979,9 @@ void SvxHFPage::RangeHdl() long nFDist = m_aBspWin.GetFtDist(); long nHeight = std::max(long(MINBODY), - static_cast<long>(m_xHeightEdit->denormalize(m_xHeightEdit->get_value(FUNIT_TWIP)))); + static_cast<long>(m_xHeightEdit->denormalize(m_xHeightEdit->get_value(FieldUnit::TWIP)))); long nDist = m_xTurnOnBox->get_active() ? - static_cast<long>(m_xDistEdit->denormalize(m_xDistEdit->get_value(FUNIT_TWIP))) : 0; + static_cast<long>(m_xDistEdit->denormalize(m_xDistEdit->get_value(FieldUnit::TWIP))) : 0; long nMin; long nMax; @@ -1013,11 +1013,11 @@ void SvxHFPage::RangeHdl() nMin = ( nH - nBB - nBT ) / 5; // 20% nMax = std::max( nH - nMin - nHDist - nFDist - nFHeight - nBB - nBT, nMin ); - m_xHeightEdit->set_max(m_xHeightEdit->normalize(nMax), FUNIT_TWIP); + m_xHeightEdit->set_max(m_xHeightEdit->normalize(nMax), FieldUnit::TWIP); nMin = ( nH - nBB - nBT ) / 5; // 20% nDist = std::max( nH - nMin - nHHeight - nFDist - nFHeight - nBB - nBT, long(0) ); - m_xDistEdit->set_max(m_xDistEdit->normalize(nDist), FUNIT_TWIP); + m_xDistEdit->set_max(m_xDistEdit->normalize(nDist), FieldUnit::TWIP); } else { @@ -1025,21 +1025,21 @@ void SvxHFPage::RangeHdl() nMin = ( nH - nBT - nBB ) / 5; // 20% nMax = std::max( nH - nMin - nFDist - nHDist - nHHeight - nBT - nBB, nMin ); - m_xHeightEdit->set_max(m_xHeightEdit->normalize(nMax), FUNIT_TWIP); + m_xHeightEdit->set_max(m_xHeightEdit->normalize(nMax), FieldUnit::TWIP); nMin = ( nH - nBT - nBB ) / 5; // 20% nDist = std::max( nH - nMin - nFHeight - nHDist - nHHeight - nBT - nBB, long(0) ); - m_xDistEdit->set_max(m_xDistEdit->normalize(nDist), FUNIT_TWIP); + m_xDistEdit->set_max(m_xDistEdit->normalize(nDist), FieldUnit::TWIP); } // Limit Indentation nMax = nW - nBL - nBR - - static_cast<long>(m_xRMEdit->denormalize(m_xRMEdit->get_value(FUNIT_TWIP))) - MINBODY; - m_xLMEdit->set_max(m_xLMEdit->normalize(nMax), FUNIT_TWIP); + static_cast<long>(m_xRMEdit->denormalize(m_xRMEdit->get_value(FieldUnit::TWIP))) - MINBODY; + m_xLMEdit->set_max(m_xLMEdit->normalize(nMax), FieldUnit::TWIP); nMax = nW - nBL - nBR - - static_cast<long>(m_xLMEdit->denormalize(m_xLMEdit->get_value(FUNIT_TWIP))) - MINBODY; - m_xRMEdit->set_max(m_xLMEdit->normalize(nMax), FUNIT_TWIP); + static_cast<long>(m_xLMEdit->denormalize(m_xLMEdit->get_value(FieldUnit::TWIP))) - MINBODY; + m_xRMEdit->set_max(m_xLMEdit->normalize(nMax), FieldUnit::TWIP); } void SvxHFPage::EnableDynamicSpacing() diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index cfa82be0fe83..aa774b1dc777 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -28,14 +28,14 @@ // local functions static void lcl_GetMinMax(weld::MetricSpinButton const& rField, int& nMin, int& nMax) { - rField.get_range(nMin, nMax, FUNIT_TWIP); + rField.get_range(nMin, nMax, FieldUnit::TWIP); nMin = rField.denormalize(nMin); nMax = rField.denormalize(nMax); } static void lcl_SetMinMax(weld::MetricSpinButton& rField, int nMin, int nMax) { - rField.set_range(rField.normalize(nMin), rField.normalize(nMax), FUNIT_TWIP); + rField.set_range(rField.normalize(nMin), rField.normalize(nMax), FieldUnit::TWIP); } SvxOptionsGrid::SvxOptionsGrid() : @@ -93,8 +93,8 @@ SvxGridTabPage::SvxGridTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet , bAttrModified(false) , m_xCbxUseGridsnap(m_xBuilder->weld_check_button("usegridsnap")) , m_xCbxGridVisible(m_xBuilder->weld_check_button("gridvisible")) - , m_xMtrFldDrawX(m_xBuilder->weld_metric_spin_button("mtrflddrawx", FUNIT_CM)) - , m_xMtrFldDrawY(m_xBuilder->weld_metric_spin_button("mtrflddrawy", FUNIT_CM)) + , m_xMtrFldDrawX(m_xBuilder->weld_metric_spin_button("mtrflddrawx", FieldUnit::CM)) + , m_xMtrFldDrawY(m_xBuilder->weld_metric_spin_button("mtrflddrawy", FieldUnit::CM)) , m_xNumFldDivisionX(m_xBuilder->weld_spin_button("numflddivisionx")) , m_xNumFldDivisionY(m_xBuilder->weld_spin_button("numflddivisiony")) , m_xCbxSynchronize(m_xBuilder->weld_check_button("synchronize")) @@ -103,12 +103,12 @@ SvxGridTabPage::SvxGridTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet , m_xCbxSnapBorder(m_xBuilder->weld_check_button("snapborder")) , m_xCbxSnapFrame(m_xBuilder->weld_check_button("snapframe")) , m_xCbxSnapPoints(m_xBuilder->weld_check_button("snappoints")) - , m_xMtrFldSnapArea(m_xBuilder->weld_metric_spin_button("mtrfldsnaparea", FUNIT_PIXEL)) + , m_xMtrFldSnapArea(m_xBuilder->weld_metric_spin_button("mtrfldsnaparea", FieldUnit::PIXEL)) , m_xCbxOrtho(m_xBuilder->weld_check_button("ortho")) , m_xCbxBigOrtho(m_xBuilder->weld_check_button("bigortho")) , m_xCbxRotate(m_xBuilder->weld_check_button("rotate")) - , m_xMtrFldAngle(m_xBuilder->weld_metric_spin_button("mtrfldangle", FUNIT_DEGREE)) - , m_xMtrFldBezAngle(m_xBuilder->weld_metric_spin_button("mtrfldbezangle", FUNIT_DEGREE)) + , m_xMtrFldAngle(m_xBuilder->weld_metric_spin_button("mtrfldangle", FieldUnit::DEGREE)) + , m_xMtrFldBezAngle(m_xBuilder->weld_metric_spin_button("mtrfldbezangle", FieldUnit::DEGREE)) { // This page requires exchange Support SetExchangeSupport(); @@ -226,19 +226,19 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) { // Set Metrics int nMin, nMax; - int nVal = m_xMtrFldDrawX->denormalize(m_xMtrFldDrawX->get_value(FUNIT_TWIP)); + int nVal = m_xMtrFldDrawX->denormalize(m_xMtrFldDrawX->get_value(FieldUnit::TWIP)); lcl_GetMinMax(*m_xMtrFldDrawX, nMin, nMax); SetFieldUnit(*m_xMtrFldDrawX, eFUnit, true); lcl_SetMinMax(*m_xMtrFldDrawX, nMin, nMax); - m_xMtrFldDrawX->set_value(m_xMtrFldDrawX->normalize(nVal), FUNIT_TWIP); + m_xMtrFldDrawX->set_value(m_xMtrFldDrawX->normalize(nVal), FieldUnit::TWIP); - nVal = m_xMtrFldDrawY->denormalize(m_xMtrFldDrawY->get_value(FUNIT_TWIP)); + nVal = m_xMtrFldDrawY->denormalize(m_xMtrFldDrawY->get_value(FieldUnit::TWIP)); lcl_GetMinMax(*m_xMtrFldDrawY, nMin, nMax); SetFieldUnit(*m_xMtrFldDrawY, eFUnit, true); lcl_SetMinMax(*m_xMtrFldDrawY, nMin, nMax); - m_xMtrFldDrawY->set_value(m_xMtrFldDrawY->normalize(nVal), FUNIT_TWIP); + m_xMtrFldDrawY->set_value(m_xMtrFldDrawY->normalize(nVal), FieldUnit::TWIP); } } @@ -257,9 +257,9 @@ IMPL_LINK(SvxGridTabPage, ChangeDrawHdl_Impl, weld::MetricSpinButton&, rField, v if (m_xCbxSynchronize->get_active()) { if (&rField == m_xMtrFldDrawX.get()) - m_xMtrFldDrawY->set_value(m_xMtrFldDrawX->get_value(FUNIT_NONE), FUNIT_NONE); + m_xMtrFldDrawY->set_value(m_xMtrFldDrawX->get_value(FieldUnit::NONE), FieldUnit::NONE); else - m_xMtrFldDrawX->set_value(m_xMtrFldDrawY->get_value(FUNIT_NONE), FUNIT_NONE); + m_xMtrFldDrawX->set_value(m_xMtrFldDrawY->get_value(FieldUnit::NONE), FieldUnit::NONE); } } diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 53648d712ae3..9f1afca1da66 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -91,7 +91,7 @@ void RelativeField::EnableRelativeMode(sal_uInt16 nMin, sal_uInt16 nMax) bRelativeMode = true; nRelMin = nMin; nRelMax = nMax; - m_xSpinButton->set_unit(FUNIT_CM); + m_xSpinButton->set_unit(FieldUnit::CM); } void RelativeField::SetRelative( bool bNewRelative ) @@ -106,15 +106,15 @@ void RelativeField::SetRelative( bool bNewRelative ) { bRelative = true; m_xSpinButton->set_digits(0); - m_xSpinButton->set_range(nRelMin, nRelMax, FUNIT_NONE); - m_xSpinButton->set_unit(FUNIT_PERCENT); + m_xSpinButton->set_range(nRelMin, nRelMax, FieldUnit::NONE); + m_xSpinButton->set_unit(FieldUnit::PERCENT); } else { bRelative = false; m_xSpinButton->set_digits(2); - m_xSpinButton->set_range(bNegativeEnabled ? -9999 : 0, 9999, FUNIT_NONE); - m_xSpinButton->set_unit(FUNIT_CM); + m_xSpinButton->set_range(bNegativeEnabled ? -9999 : 0, 9999, FieldUnit::NONE); + m_xSpinButton->set_unit(FieldUnit::CM); } rSpinButton.set_text(aStr); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 83c7aad998a9..20cd94e06252 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2179,17 +2179,17 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, FieldUnit eFieldUnit = pSh->GetModule()->GetFieldUnit(); switch ( eFieldUnit ) { - case FUNIT_MM: eMapUnit = MapUnit::MapMM; break; - case FUNIT_CM: - case FUNIT_M: - case FUNIT_KM: eMapUnit = MapUnit::MapCM; break; - case FUNIT_TWIP: eMapUnit = MapUnit::MapTwip; break; - case FUNIT_POINT: - case FUNIT_PICA: eMapUnit = MapUnit::MapPoint; break; - case FUNIT_INCH: - case FUNIT_FOOT: - case FUNIT_MILE: eMapUnit = MapUnit::MapInch; break; - case FUNIT_100TH_MM: eMapUnit = MapUnit::Map100thMM; break; + case FieldUnit::MM: eMapUnit = MapUnit::MapMM; break; + case FieldUnit::CM: + case FieldUnit::M: + case FieldUnit::KM: eMapUnit = MapUnit::MapCM; break; + case FieldUnit::TWIP: eMapUnit = MapUnit::MapTwip; break; + case FieldUnit::POINT: + case FieldUnit::PICA: eMapUnit = MapUnit::MapPoint; break; + case FieldUnit::INCH: + case FieldUnit::FOOT: + case FieldUnit::MILE: eMapUnit = MapUnit::MapInch; break; + case FieldUnit::MM_100TH: eMapUnit = MapUnit::Map100thMM; break; default: ;//prevent warning } diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx index 7239f4993431..e4e46975f394 100644 --- a/svx/source/dialog/strarray.cxx +++ b/svx/source/dialog/strarray.cxx @@ -41,7 +41,7 @@ FieldUnit SvxFieldUnitTable::GetValue(sal_uInt32 nPos) { if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count()) return RID_SVXSTR_FIELDUNIT_TABLE[nPos].second; - return FUNIT_NONE; + return FieldUnit::NONE; } OUString SvxAttrNameTable::GetString(sal_uInt32 nPos) diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 1fa955469697..6af32ecfcdae 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -3405,18 +3405,18 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent ) aMenu->CheckItem(nId, eMenuUnit == eUnit); if( bReduceMetric ) { - if (eMenuUnit == FUNIT_M || - eMenuUnit == FUNIT_KM || - eMenuUnit == FUNIT_FOOT || - eMenuUnit == FUNIT_MILE) + if (eMenuUnit == FieldUnit::M || + eMenuUnit == FieldUnit::KM || + eMenuUnit == FieldUnit::FOOT || + eMenuUnit == FieldUnit::MILE) { aMenu->RemoveItem(i - 1); } - else if (( eMenuUnit == FUNIT_CHAR ) && !bHorz ) + else if (( eMenuUnit == FieldUnit::CHAR ) && !bHorz ) { aMenu->RemoveItem(i - 1); } - else if (( eMenuUnit == FUNIT_LINE ) && bHorz ) + else if (( eMenuUnit == FieldUnit::LINE ) && bHorz ) { aMenu->RemoveItem(i - 1); } diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 0c1bd9f14448..97841ad1edb4 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -198,7 +198,7 @@ void LineWidthPopup::SetWidthSelect(long lValue, bool bValuable, MapUnit eMapUni { sal_Int64 nVal = OutputDevice::LogicToLogic(lValue, eMapUnit, MapUnit::Map100thMM ); nVal = m_xMFWidth->Normalize(nVal); - m_xMFWidth->SetValue( nVal, FUNIT_100TH_MM ); + m_xMFWidth->SetValue( nVal, FieldUnit::MM_100TH ); } else { diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 183c9405631d..d77b26962dc0 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -78,7 +78,7 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId, vcl::Window* pPar mpLineDistAtPercentBox->SetModifyHdl( aLink2 ); mpLineDistAtMetricBox->SetModifyHdl( aLink2 ); - FieldUnit eUnit = FUNIT_INCH; + FieldUnit eUnit = FieldUnit::INCH; const SfxPoolItem* pItem = nullptr; if (SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_METRIC, pItem) >= SfxItemState::DEFAULT) eUnit = static_cast<FieldUnit>(static_cast<const SfxUInt16Item*>(pItem)->GetValue()); @@ -281,7 +281,7 @@ void ParaLineSpacingControl::UpdateMetricFields() mpLineDistAtMetricBox->SetMin(0); if (mpLineDistAtMetricBox->GetText().isEmpty()) - mpLineDistAtMetricBox->SetValue(mpLineDistAtMetricBox->Normalize(0), FUNIT_TWIP); + mpLineDistAtMetricBox->SetValue(mpLineDistAtMetricBox->Normalize(0), FieldUnit::TWIP); mpLineDistLabel->Enable(); mpActLineDistFld->Show(); @@ -294,7 +294,7 @@ void ParaLineSpacingControl::UpdateMetricFields() mpActLineDistFld = mpLineDistAtPercentBox.get(); if (mpLineDistAtPercentBox->GetText().isEmpty()) - mpLineDistAtPercentBox->SetValue(mpLineDistAtPercentBox->Normalize(100), FUNIT_TWIP); + mpLineDistAtPercentBox->SetValue(mpLineDistAtPercentBox->Normalize(100), FieldUnit::TWIP); mpLineDistLabel->Enable(); mpActLineDistFld->Show(); @@ -306,7 +306,7 @@ void ParaLineSpacingControl::UpdateMetricFields() mpActLineDistFld = mpLineDistAtMetricBox.get(); sal_Int64 nTemp = mpLineDistAtMetricBox->GetValue(); - mpLineDistAtMetricBox->SetMin(mpLineDistAtMetricBox->Normalize(MIN_FIXED_DISTANCE), FUNIT_TWIP); + mpLineDistAtMetricBox->SetMin(mpLineDistAtMetricBox->Normalize(MIN_FIXED_DISTANCE), FieldUnit::TWIP); if (mpLineDistAtMetricBox->GetValue() != nTemp) SetMetricValue(*mpLineDistAtMetricBox, FIX_DIST_DEF, MapUnit::MapTwip); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index b750a25663d9..a6db28c0d02c 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -245,9 +245,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( SfxItemState eState, const SfxPo case CombinedEnumContext(Application::WriterVariants, Context::Text): case CombinedEnumContext(Application::WriterVariants, Context::Table): { - mpLeftIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM ); - mpRightIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM ); - mpFLineIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM ); + mpLeftIndent->SetMin( NEGA_MAXVALUE, FieldUnit::MM_100TH ); + mpRightIndent->SetMin( NEGA_MAXVALUE, FieldUnit::MM_100TH ); + mpFLineIndent->SetMin( NEGA_MAXVALUE, FieldUnit::MM_100TH ); } break; } @@ -274,7 +274,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( SfxItemState eState, const SfxPo && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Default) && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Table)) { - mpFLineIndent->SetMin( nVal*-1, FUNIT_100TH_MM ); + mpFLineIndent->SetMin( nVal*-1, FieldUnit::MM_100TH ); } long nrVal = OutputDevice::LogicToLogic( aTxtRight, MapUnit::MapTwip, MapUnit::Map100thMM ); @@ -288,9 +288,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( SfxItemState eState, const SfxPo case CombinedEnumContext(Application::WriterVariants, Context::Table): case CombinedEnumContext(Application::WriterVariants, Context::Annotation): { - mpLeftIndent->SetMax( MAX_SW - nrVal, FUNIT_100TH_MM ); - mpRightIndent->SetMax( MAX_SW - nVal, FUNIT_100TH_MM ); - mpFLineIndent->SetMax( MAX_SW - nVal - nrVal, FUNIT_100TH_MM ); + mpLeftIndent->SetMax( MAX_SW - nrVal, FieldUnit::MM_100TH ); + mpRightIndent->SetMax( MAX_SW - nVal, FieldUnit::MM_100TH ); + mpFLineIndent->SetMax( MAX_SW - nVal - nrVal, FieldUnit::MM_100TH ); } break; case CombinedEnumContext(Application::DrawImpress, Context::DrawText): @@ -299,18 +299,18 @@ void ParaPropertyPanel::StateChangedIndentImpl( SfxItemState eState, const SfxPo case CombinedEnumContext(Application::DrawImpress, Context::TextObject): case CombinedEnumContext(Application::DrawImpress, Context::Graphic): { - mpLeftIndent->SetMax( MAX_SC_SD - nrVal, FUNIT_100TH_MM ); - mpRightIndent->SetMax( MAX_SC_SD - nVal, FUNIT_100TH_MM ); - mpFLineIndent->SetMax( MAX_SC_SD - nVal - nrVal, FUNIT_100TH_MM ); + mpLeftIndent->SetMax( MAX_SC_SD - nrVal, FieldUnit::MM_100TH ); + mpRightIndent->SetMax( MAX_SC_SD - nVal, FieldUnit::MM_100TH ); + mpFLineIndent->SetMax( MAX_SC_SD - nVal - nrVal, FieldUnit::MM_100TH ); } } - mpLeftIndent->SetValue( nVal, FUNIT_100TH_MM ); - mpRightIndent->SetValue( nrVal, FUNIT_100TH_MM ); + mpLeftIndent->SetValue( nVal, FieldUnit::MM_100TH ); + mpRightIndent->SetValue( nrVal, FieldUnit::MM_100TH ); long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MapUnit::MapTwip, MapUnit::Map100thMM ); nfVal = static_cast<long>(mpFLineIndent->Normalize( nfVal )); - mpFLineIndent->SetValue( nfVal, FUNIT_100TH_MM ); + mpFLineIndent->SetValue( nfVal, FieldUnit::MM_100TH ); } else if( eState == SfxItemState::DISABLED ) { @@ -345,11 +345,11 @@ void ParaPropertyPanel::StateChangedULImpl( SfxItemState eState, const SfxPoolIt sal_Int64 nVal = OutputDevice::LogicToLogic( maUpper, MapUnit::MapTwip, MapUnit::Map100thMM ); nVal = mpTopDist->Normalize( nVal ); - mpTopDist->SetValue( nVal, FUNIT_100TH_MM ); + mpTopDist->SetValue( nVal, FieldUnit::MM_100TH ); nVal = OutputDevice::LogicToLogic( maLower, MapUnit::MapTwip, MapUnit::Map100thMM ); nVal = mpBottomDist->Normalize( nVal ); - mpBottomDist->SetValue( nVal, FUNIT_100TH_MM ); + mpBottomDist->SetValue( nVal, FieldUnit::MM_100TH ); } else if(eState == SfxItemState::DISABLED ) { @@ -365,7 +365,7 @@ void ParaPropertyPanel::StateChangedULImpl( SfxItemState eState, const SfxPoolIt FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ) { - FieldUnit eUnit = FUNIT_NONE; + FieldUnit eUnit = FieldUnit::NONE; if ( pState && eState >= SfxItemState::DEFAULT ) eUnit = static_cast<FieldUnit>(static_cast<const SfxUInt16Item*>(pState)->GetValue()); @@ -403,8 +403,8 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, maTxtLeft (0), maUpper (0), maLower (0), - m_eMetricUnit(FUNIT_NONE), - m_last_eMetricUnit(FUNIT_NONE), + m_eMetricUnit(FieldUnit::NONE), + m_last_eMetricUnit(FieldUnit::NONE), m_eLRSpaceUnit(), m_eULSpaceUnit(), maLRSpaceControl (SID_ATTR_PARA_LRSPACE,*pBindings,*this), diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx index 90153f18d8a2..8b67b8919907 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx @@ -86,11 +86,11 @@ void ParaULSpacingWindow::SetValue(const SvxULSpaceItem* pItem) { sal_Int64 nVal = pItem->GetUpper(); nVal = m_pAboveSpacing->Normalize(nVal); - m_pAboveSpacing->SetValue(nVal, FUNIT_100TH_MM); + m_pAboveSpacing->SetValue(nVal, FieldUnit::MM_100TH); nVal = pItem->GetLower(); nVal = m_pBelowSpacing->Normalize(nVal); - m_pBelowSpacing->SetValue(nVal, FUNIT_100TH_MM); + m_pBelowSpacing->SetValue(nVal, FieldUnit::MM_100TH); } IMPL_LINK_NOARG(ParaULSpacingWindow, ModifySpacingHdl, Edit&, void) @@ -193,9 +193,9 @@ void ParaLRSpacingWindow::SetValue(SfxItemState eState, const SfxPoolItem* pStat case CombinedEnumContext(Application::WriterVariants, Context::Text): case CombinedEnumContext(Application::WriterVariants, Context::Table): { - m_pBeforeSpacing->SetMin(NEGA_MAXVALUE, FUNIT_100TH_MM); - m_pAfterSpacing->SetMin(NEGA_MAXVALUE, FUNIT_100TH_MM); - m_pFLSpacing->SetMin(NEGA_MAXVALUE, FUNIT_100TH_MM); + m_pBeforeSpacing->SetMin(NEGA_MAXVALUE, FieldUnit::MM_100TH); + m_pAfterSpacing->SetMin(NEGA_MAXVALUE, FieldUnit::MM_100TH); + m_pFLSpacing->SetMin(NEGA_MAXVALUE, FieldUnit::MM_100TH); } break; } @@ -217,7 +217,7 @@ void ParaLRSpacingWindow::SetValue(SfxItemState eState, const SfxPoolItem* pStat && m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Default) && m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Table)) { - m_pFLSpacing->SetMin(aTxtLeft*-1, FUNIT_100TH_MM); + m_pFLSpacing->SetMin(aTxtLeft*-1, FieldUnit::MM_100TH); } aTxtRight = static_cast<long>(m_pAfterSpacing->Normalize(aTxtRight)); @@ -230,9 +230,9 @@ void ParaLRSpacingWindow::SetValue(SfxItemState eState, const SfxPoolItem* pStat case CombinedEnumContext(Application::WriterVariants, Context::Table): case CombinedEnumContext(Application::WriterVariants, Context::Annotation): { - m_pBeforeSpacing->SetMax(MAX_SW - aTxtRight, FUNIT_100TH_MM); - m_pAfterSpacing->SetMax(MAX_SW - aTxtLeft, FUNIT_100TH_MM); - m_pFLSpacing->SetMax(MAX_SW - aTxtLeft - aTxtRight, FUNIT_100TH_MM); + m_pBeforeSpacing->SetMax(MAX_SW - aTxtRight, FieldUnit::MM_100TH); + m_pAfterSpacing->SetMax(MAX_SW - aTxtLeft, FieldUnit::MM_100TH); + m_pFLSpacing->SetMax(MAX_SW - aTxtLeft - aTxtRight, FieldUnit::MM_100TH); } break; case CombinedEnumContext(Application::DrawImpress, Context::DrawText): @@ -241,17 +241,17 @@ void ParaLRSpacingWindow::SetValue(SfxItemState eState, const SfxPoolItem* pStat case CombinedEnumContext(Application::DrawImpress, Context::TextObject): case CombinedEnumContext(Application::DrawImpress, Context::Graphic): { - m_pBeforeSpacing->SetMax(MAX_SC_SD - aTxtRight, FUNIT_100TH_MM); - m_pAfterSpacing->SetMax(MAX_SC_SD - aTxtLeft, FUNIT_100TH_MM); - m_pFLSpacing->SetMax(MAX_SC_SD - aTxtLeft - aTxtRight, FUNIT_100TH_MM); + m_pBeforeSpacing->SetMax(MAX_SC_SD - aTxtRight, FieldUnit::MM_100TH); + m_pAfterSpacing->SetMax(MAX_SC_SD - aTxtLeft, FieldUnit::MM_100TH); + m_pFLSpacing->SetMax(MAX_SC_SD - aTxtLeft - aTxtRight, FieldUnit::MM_100TH); } } - m_pBeforeSpacing->SetValue(aTxtLeft, FUNIT_100TH_MM); - m_pAfterSpacing->SetValue(aTxtRight, FUNIT_100TH_MM); + m_pBeforeSpacing->SetValue(aTxtLeft, FieldUnit::MM_100TH); + m_pAfterSpacing->SetValue(aTxtRight, FieldUnit::MM_100TH); aTxtFirstLineOfst = static_cast<long>(m_pFLSpacing->Normalize(aTxtFirstLineOfst)); - m_pFLSpacing->SetValue(aTxtFirstLineOfst, FUNIT_100TH_MM); + m_pFLSpacing->SetValue(aTxtFirstLineOfst, FieldUnit::MM_100TH); } else if(eState == SfxItemState::DISABLED) { diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 084fb7d1c718..1afdf1e725b9 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -62,7 +62,7 @@ PosSizePropertyPanel::PosSizePropertyPanel( mlRotY(0), maUIScale(), mePoolUnit(), - meDlgUnit(FUNIT_INCH), // #i124409# init with fallback default + meDlgUnit(FieldUnit::INCH), // #i124409# init with fallback default maTransfPosXControl(SID_ATTR_TRANSFORM_POS_X, *pBindings, *this), maTransfPosYControl(SID_ATTR_TRANSFORM_POS_Y, *pBindings, *this), maTransfWidthControl(SID_ATTR_TRANSFORM_WIDTH, *pBindings, *this), @@ -196,14 +196,14 @@ void PosSizePropertyPanel::Initialize() //flip: mpFlipTbx->SetSelectHdl( LINK( this, PosSizePropertyPanel, FlipHdl) ); - mpMtrAngle->InsertValue(0, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(4500, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(9000, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(13500, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(18000, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(22500, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(27000, FUNIT_CUSTOM); - mpMtrAngle->InsertValue(31500, FUNIT_CUSTOM); + mpMtrAngle->InsertValue(0, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(4500, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(9000, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(13500, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(18000, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(22500, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(27000, FieldUnit::CUSTOM); + mpMtrAngle->InsertValue(31500, FieldUnit::CUSTOM); mpMtrAngle->AdaptDropDownLineCountToMaximum(); SfxViewShell* pCurSh = SfxViewShell::Current(); @@ -326,16 +326,16 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ChangeWidthHdl, Edit&, void ) mpCbxScale->IsEnabled() ) { long nHeight = static_cast<long>( (static_cast<double>(mlOldHeight) * static_cast<double>(mpMtrWidth->GetValue())) / static_cast<double>(mlOldWidth) ); - if( nHeight <= mpMtrHeight->GetMax( FUNIT_NONE ) ) + if( nHeight <= mpMtrHeight->GetMax( FieldUnit::NONE ) ) { - mpMtrHeight->SetUserValue( nHeight, FUNIT_NONE ); + mpMtrHeight->SetUserValue( nHeight, FieldUnit::NONE ); } else { - nHeight = static_cast<long>(mpMtrHeight->GetMax( FUNIT_NONE )); + nHeight = static_cast<long>(mpMtrHeight->GetMax( FieldUnit::NONE )); mpMtrHeight->SetUserValue( nHeight ); const long nWidth = static_cast<long>( (static_cast<double>(mlOldWidth) * static_cast<double>(nHeight)) / static_cast<double>(mlOldHeight) ); - mpMtrWidth->SetUserValue( nWidth, FUNIT_NONE ); + mpMtrWidth->SetUserValue( nWidth, FieldUnit::NONE ); } } executeSize(); @@ -348,16 +348,16 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void ) mpCbxScale->IsEnabled() ) { long nWidth = static_cast<long>( (static_cast<double>(mlOldWidth) * static_cast<double>(mpMtrHeight->GetValue())) / static_cast<double>(mlOldHeight) ); - if( nWidth <= mpMtrWidth->GetMax( FUNIT_NONE ) ) + if( nWidth <= mpMtrWidth->GetMax( FieldUnit::NONE ) ) { - mpMtrWidth->SetUserValue( nWidth, FUNIT_NONE ); + mpMtrWidth->SetUserValue( nWidth, FieldUnit::NONE ); } else { - nWidth = static_cast<long>(mpMtrWidth->GetMax( FUNIT_NONE )); + nWidth = static_cast<long>(mpMtrWidth->GetMax( FieldUnit::NONE )); mpMtrWidth->SetUserValue( nWidth ); const long nHeight = static_cast<long>( (static_cast<double>(mlOldHeight) * static_cast<double>(nWidth)) / static_cast<double>(mlOldWidth) ); - mpMtrHeight->SetUserValue( nHeight, FUNIT_NONE ); + mpMtrHeight->SetUserValue( nHeight, FieldUnit::NONE ); } } executeSize(); @@ -819,14 +819,14 @@ void PosSizePropertyPanel::executeSize() // get Width double nWidth = static_cast<double>(mpMtrWidth->GetValue( meDlgUnit )); - nWidth = MetricField::ConvertDoubleValue( nWidth, mpMtrWidth->GetBaseValue(), mpMtrWidth->GetDecimalDigits(), meDlgUnit, FUNIT_100TH_MM ); + nWidth = MetricField::ConvertDoubleValue( nWidth, mpMtrWidth->GetBaseValue(), mpMtrWidth->GetDecimalDigits(), meDlgUnit, FieldUnit::MM_100TH ); long lWidth = static_cast<long>(nWidth * static_cast<double>(aUIScale)); lWidth = OutputDevice::LogicToLogic( lWidth, MapUnit::Map100thMM, mePoolUnit ); lWidth = static_cast<long>(mpMtrWidth->Denormalize( lWidth )); // get Height double nHeight = static_cast<double>(mpMtrHeight->GetValue( meDlgUnit )); - nHeight = MetricField::ConvertDoubleValue( nHeight, mpMtrHeight->GetBaseValue(), mpMtrHeight->GetDecimalDigits(), meDlgUnit, FUNIT_100TH_MM ); + nHeight = MetricField::ConvertDoubleValue( nHeight, mpMtrHeight->GetBaseValue(), mpMtrHeight->GetDecimalDigits(), meDlgUnit, FieldUnit::MM_100TH ); long lHeight = static_cast<long>(nHeight * static_cast<double>(aUIScale)); lHeight = OutputDevice::LogicToLogic( lHeight, MapUnit::Map100thMM, mePoolUnit ); lHeight = static_cast<long>(mpMtrWidth->Denormalize( lHeight )); @@ -899,7 +899,7 @@ void PosSizePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* FieldUnit PosSizePropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ) { - FieldUnit eUnit = FUNIT_NONE; + FieldUnit eUnit = FieldUnit::NONE; if ( pState && eState >= SfxItemState::DEFAULT ) { diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index d83095da35a1..a3c40a649db2 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -130,7 +130,7 @@ void ShadowPropertyPanel::Initialize() mpShadowTransSlider->SetUpdateMode(true); mpShadowTransSlider->SetSlideHdl( LINK(this, ShadowPropertyPanel, ModifyShadowTransSliderHdl) ); for(sal_uInt16 i = 0; i <= 20 ; i++) - mpShadowDistance->InsertValue(i*2,FUNIT_POINT); + mpShadowDistance->InsertValue(i*2,FieldUnit::POINT); InsertAngleValues(); } @@ -178,7 +178,7 @@ IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowTransSliderHdl, Slider*, void) IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowDistanceHdl, Edit&, void) { OUString sAngle = mpShadowAngle->GetText(); - nXY = mpShadowDistance->GetValue(FUNIT_100TH_MM); + nXY = mpShadowDistance->GetValue(FieldUnit::MM_100TH); switch(ParseText(sAngle)) { case 0: nX = nXY; nY = 0; break; @@ -235,7 +235,7 @@ void ShadowPropertyPanel::UpdateControls() else if( nX == 0 && nY > 0 ) { mpShadowAngle->SelectEntryPos(6); nXY = nY; } else if( nX > 0 && nY > 0 ) { mpShadowAngle->SelectEntryPos(7); nXY = nX; } else { nXY = 0; } - mpShadowDistance->SetValue(nXY, FUNIT_100TH_MM); + mpShadowDistance->SetValue(nXY, FieldUnit::MM_100TH); } void ShadowPropertyPanel::SetTransparencyValue(long nVal) @@ -250,14 +250,14 @@ void ShadowPropertyPanel::DataChanged(const DataChangedEvent& /*rEvent*/) void ShadowPropertyPanel::InsertAngleValues() { - mpShadowAngle->InsertValue(0, FUNIT_CUSTOM); - mpShadowAngle->InsertValue(45, FUNIT_CUSTOM); - mpShadowAngle->InsertValue(90, FUNIT_CUSTOM); - mpShadowAngle->InsertValue(135, FUNIT_CUSTOM); - mpShadowAngle->InsertValue(180, FUNIT_CUSTOM); - mpShadowAngle->InsertValue(225,FUNIT_CUSTOM); - mpShadowAngle->InsertValue(270, FUNIT_CUSTOM); - mpShadowAngle->InsertValue(315,FUNIT_CUSTOM); + mpShadowAngle->InsertValue(0, FieldUnit::CUSTOM); + mpShadowAngle->InsertValue(45, FieldUnit::CUSTOM); + mpShadowAngle->InsertValue(90, FieldUnit::CUSTOM); + mpShadowAngle->InsertValue(135, FieldUnit::CUSTOM); + mpShadowAngle->InsertValue(180, FieldUnit::CUSTOM); + mpShadowAngle->InsertValue(225,FieldUnit::CUSTOM); + mpShadowAngle->InsertValue(270, FieldUnit::CUSTOM); + mpShadowAngle->InsertValue(315,FieldUnit::CUSTOM); } void ShadowPropertyPanel::NotifyItemUpdate( diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 98fce9a6bdba..143cae23d057 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -65,13 +65,13 @@ OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) OUString sMetric; const sal_Unicode cSep = Application::GetSettings().GetLocaleDataWrapper().getNumDecimalSep()[0]; - sal_Int64 nConvVal = MetricField::ConvertValue( nVal * 100, 0L, 0, FUNIT_100TH_MM, eOutUnit ); + sal_Int64 nConvVal = MetricField::ConvertValue( nVal * 100, 0L, 0, FieldUnit::MM_100TH, eOutUnit ); if ( nConvVal < 0 && ( nConvVal / 100 == 0 ) ) sMetric += "-"; sMetric += OUString::number(nConvVal / 100); - if( FUNIT_NONE != eOutUnit ) + if( FieldUnit::NONE != eOutUnit ) { sMetric += OUStringLiteral1(cSep); sal_Int64 nFract = nConvVal % 100; diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 43bc7c26301f..b62dda4b7a05 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -1689,7 +1689,7 @@ OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const { OUString aRetval; - if(static_cast<FieldUnit>(nPos) == FUNIT_NONE) + if(static_cast<FieldUnit>(nPos) == FieldUnit::NONE) aRetval = "default"; else SdrFormatter::TakeUnitStr(static_cast<FieldUnit>(nPos), aRetval); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 22b28c956173..95167af2005e 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -111,7 +111,7 @@ void SdrModel::ImpCtor( mbInDestruction = false; aObjUnit=SdrEngineDefaults::GetMapFraction(); eObjUnit=SdrEngineDefaults::GetMapUnit(); - eUIUnit=FUNIT_MM; + eUIUnit=FieldUnit::MM; aUIScale=Fraction(1,1); nUIUnitDecimalMark=0; pLayerAdmin=nullptr; @@ -914,30 +914,30 @@ void SdrModel::ImpSetUIUnit() // 1 ft = 12 " = 1" = 304,8mm switch (eUIUnit) { - case FUNIT_NONE : break; + case FieldUnit::NONE : break; // metric - case FUNIT_100TH_MM: nUIUnitDecimalMark-=5; break; - case FUNIT_MM : nUIUnitDecimalMark-=3; break; - case FUNIT_CM : nUIUnitDecimalMark-=2; break; - case FUNIT_M : nUIUnitDecimalMark+=0; break; - case FUNIT_KM : nUIUnitDecimalMark+=3; break; + case FieldUnit::MM_100TH: nUIUnitDecimalMark-=5; break; + case FieldUnit::MM : nUIUnitDecimalMark-=3; break; + case FieldUnit::CM : nUIUnitDecimalMark-=2; break; + case FieldUnit::M : nUIUnitDecimalMark+=0; break; + case FieldUnit::KM : nUIUnitDecimalMark+=3; break; // Inch - case FUNIT_TWIP : nMul=144; nUIUnitDecimalMark--; break; // 1Twip = 1/1440" - case FUNIT_POINT : nMul=72; break; // 1Pt = 1/72" - case FUNIT_PICA : nMul=6; break; // 1Pica = 1/6" - case FUNIT_INCH : break; // 1" = 1" - case FUNIT_FOOT : nDiv*=12; break; // 1Ft = 12" - case FUNIT_MILE : nDiv*=6336; nUIUnitDecimalMark++; break; // 1mile = 63360" + case FieldUnit::TWIP : nMul=144; nUIUnitDecimalMark--; break; // 1Twip = 1/1440" + case FieldUnit::POINT : nMul=72; break; // 1Pt = 1/72" + case FieldUnit::PICA : nMul=6; break; // 1Pica = 1/6" + case FieldUnit::INCH : break; // 1" = 1" + case FieldUnit::FOOT : nDiv*=12; break; // 1Ft = 12" + case FieldUnit::MILE : nDiv*=6336; nUIUnitDecimalMark++; break; // 1mile = 63360" // other - case FUNIT_CUSTOM : break; - case FUNIT_PERCENT: nUIUnitDecimalMark+=2; break; + case FieldUnit::CUSTOM : break; + case FieldUnit::PERCENT: nUIUnitDecimalMark+=2; break; // TODO: Add code to handle the following if needed (added to remove warning) - case FUNIT_CHAR : break; - case FUNIT_LINE : break; - case FUNIT_PIXEL : break; - case FUNIT_DEGREE : break; - case FUNIT_SECOND : break; - case FUNIT_MILLISECOND : break; + case FieldUnit::CHAR : break; + case FieldUnit::LINE : break; + case FieldUnit::PIXEL : break; + case FieldUnit::DEGREE : break; + case FieldUnit::SECOND : break; + case FieldUnit::MILLISECOND : break; } // switch // check if mapping is from metric to inch and adapt @@ -1065,32 +1065,32 @@ OUString SdrModel::GetUnitString(FieldUnit eUnit) switch(eUnit) { default: - case FUNIT_NONE : - case FUNIT_CUSTOM : + case FieldUnit::NONE : + case FieldUnit::CUSTOM : return OUString(); - case FUNIT_100TH_MM: + case FieldUnit::MM_100TH: return OUString{"/100mm"}; - case FUNIT_MM : + case FieldUnit::MM : return OUString{"mm"}; - case FUNIT_CM : + case FieldUnit::CM : return OUString{"cm"}; - case FUNIT_M : + case FieldUnit::M : return OUString{"m"}; - case FUNIT_KM : + case FieldUnit::KM : return OUString{"km"}; - case FUNIT_TWIP : + case FieldUnit::TWIP : return OUString{"twip"}; - case FUNIT_POINT : + case FieldUnit::POINT : return OUString{"pt"}; - case FUNIT_PICA : + case FieldUnit::PICA : return OUString{"pica"}; - case FUNIT_INCH : + case FieldUnit::INCH : return OUString{"\""}; - case FUNIT_FOOT : + case FieldUnit::FOOT : return OUString{"ft"}; - case FUNIT_MILE : + case FieldUnit::MILE : return OUString{"mile(s)"}; - case FUNIT_PERCENT: + case FieldUnit::PERCENT: return OUString{"%"}; } } diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index bf65e6f37585..cc44db30d0bd 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -81,8 +81,8 @@ OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind Fraction aMeasureScale(1, 1); bool bTextRota90(false); bool bShowUnit(false); - FieldUnit eMeasureUnit(FUNIT_NONE); - FieldUnit eModUIUnit(FUNIT_NONE); + FieldUnit eMeasureUnit(FieldUnit::NONE); + FieldUnit eModUIUnit(FieldUnit::NONE); const SfxItemSet& rSet = GetMergedItemSet(); bTextRota90 = rSet.Get(SDRATTR_MEASURETEXTROTA90).GetValue(); @@ -97,7 +97,7 @@ OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind { eModUIUnit = getSdrModelFromSdrObject().GetUIUnit(); - if(eMeasureUnit == FUNIT_NONE) + if(eMeasureUnit == FieldUnit::NONE) eMeasureUnit = eModUIUnit; sal_Int32 nLen(GetLen(aPt2 - aPt1)); @@ -162,7 +162,7 @@ OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind { eModUIUnit = getSdrModelFromSdrObject().GetUIUnit(); - if(eMeasureUnit == FUNIT_NONE) + if(eMeasureUnit == FieldUnit::NONE) eMeasureUnit = eModUIUnit; aStr = SdrModel::GetUnitString(eMeasureUnit); diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index f0dafbba943b..940da6b700c5 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -608,17 +608,17 @@ static FrPair GetInchOrMM(MapUnit eU) static FrPair GetInchOrMM(FieldUnit eU) { switch (eU) { - case FUNIT_INCH : return FrPair( 1,1); - case FUNIT_POINT : return FrPair( 72,1); - case FUNIT_TWIP : return FrPair(1440,1); - case FUNIT_100TH_MM : return FrPair( 100,1); - case FUNIT_MM : return FrPair( 1,1); - case FUNIT_CM : return FrPair( 1,10); - case FUNIT_M : return FrPair( 1,1000); - case FUNIT_KM : return FrPair( 1,1000000); - case FUNIT_PICA : return FrPair( 6,1); - case FUNIT_FOOT : return FrPair( 1,12); - case FUNIT_MILE : return FrPair( 1,63360); + case FieldUnit::INCH : return FrPair( 1,1); + case FieldUnit::POINT : return FrPair( 72,1); + case FieldUnit::TWIP : return FrPair(1440,1); + case FieldUnit::MM_100TH : return FrPair( 100,1); + case FieldUnit::MM : return FrPair( 1,1); + case FieldUnit::CM : return FrPair( 1,10); + case FieldUnit::M : return FrPair( 1,1000); + case FieldUnit::KM : return FrPair( 1,1000000); + case FieldUnit::PICA : return FrPair( 6,1); + case FieldUnit::FOOT : return FrPair( 1,12); + case FieldUnit::MILE : return FrPair( 1,63360); default: break; } return Fraction(1,1); @@ -925,74 +925,74 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, OUString& rStr) switch(eUnit) { default : - case FUNIT_NONE : - case FUNIT_CUSTOM : + case FieldUnit::NONE : + case FieldUnit::CUSTOM : { rStr.clear(); break; } // metrically - case FUNIT_100TH_MM: + case FieldUnit::MM_100TH: { rStr = "/100mm"; break; } - case FUNIT_MM : + case FieldUnit::MM : { rStr = "mm"; break; } - case FUNIT_CM : + case FieldUnit::CM : { rStr = "cm"; break; } - case FUNIT_M : + case FieldUnit::M : { rStr = "m"; break; } - case FUNIT_KM : + case FieldUnit::KM : { rStr = "km"; break; } // Inch - case FUNIT_TWIP : + case FieldUnit::TWIP : { rStr = "twip"; break; } - case FUNIT_POINT : + case FieldUnit::POINT : { rStr = "pt"; break; } - case FUNIT_PICA : + case FieldUnit::PICA : { rStr = "pica"; break; } - case FUNIT_INCH : + case FieldUnit::INCH : { rStr = "\""; break; } - case FUNIT_FOOT : + case FieldUnit::FOOT : { rStr = "ft"; break; } - case FUNIT_MILE : + case FieldUnit::MILE : { rStr = "mile(s)"; break; } // others - case FUNIT_PERCENT: + case FieldUnit::PERCENT: { rStr = "%"; break; diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 70b170010478..8ee22d3bec00 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -345,7 +345,7 @@ ExtrusionDepthDialog::ExtrusionDepthDialog(weld::Window* pParent, double fDepth, : GenericDialogController(pParent, "svx/ui/extrustiondepthdialog.ui", "ExtrustionDepthDialog") , m_xMtrDepth(m_xBuilder->weld_metric_spin_button("depth", eDefaultUnit)) { - m_xMtrDepth->set_value(static_cast<int>(fDepth) * 100, FUNIT_100TH_MM); + m_xMtrDepth->set_value(static_cast<int>(fDepth) * 100, FieldUnit::MM_100TH); } ExtrusionDepthDialog::~ExtrusionDepthDialog() @@ -354,7 +354,7 @@ ExtrusionDepthDialog::~ExtrusionDepthDialog() double ExtrusionDepthDialog::getDepth() const { - return static_cast<double>(m_xMtrDepth->get_value(FUNIT_100TH_MM)) / 100.0; + return static_cast<double>(m_xMtrDepth->get_value(FieldUnit::MM_100TH)) / 100.0; } double const aDepthListInch[] = { 0, 1270,2540,5080,10160 }; @@ -368,7 +368,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( vcl::Window* pParentWindow ) : ToolbarMenu( rController.getFrameInterface(), pParentWindow, WB_STDPOPUP ) , mrController( rController ) - , meUnit(FUNIT_NONE) + , meUnit(FieldUnit::NONE) , mfDepth( -1.0 ) { SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 700a0c852bc8..9a910fa3d875 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -626,9 +626,9 @@ com_sun_star_comp_svx_FontworkCharacterSpacingControl_get_implementation( FontworkCharacterSpacingDialog::FontworkCharacterSpacingDialog(weld::Window* pParent, sal_Int32 nScale) : GenericDialogController(pParent, "svx/ui/fontworkspacingdialog.ui", "FontworkSpacingDialog") - , m_xMtrScale(m_xBuilder->weld_metric_spin_button("entry", FUNIT_PERCENT)) + , m_xMtrScale(m_xBuilder->weld_metric_spin_button("entry", FieldUnit::PERCENT)) { - m_xMtrScale->set_value(nScale, FUNIT_PERCENT); + m_xMtrScale->set_value(nScale, FieldUnit::PERCENT); } FontworkCharacterSpacingDialog::~FontworkCharacterSpacingDialog() @@ -637,7 +637,7 @@ FontworkCharacterSpacingDialog::~FontworkCharacterSpacingDialog() sal_Int32 FontworkCharacterSpacingDialog::getScale() const { - return static_cast<sal_Int32>(m_xMtrScale->get_value(FUNIT_PERCENT)); + return static_cast<sal_Int32>(m_xMtrScale->get_value(FieldUnit::PERCENT)); } } diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index f30f4a06c9c2..36ac6e4c0e5c 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -108,7 +108,7 @@ ImplGrafMetricField::ImplGrafMetricField( vcl::Window* pParent, const OUString& { const long nMinVal = maCommand == ".uno:GrafTransparence" ? 0 : -100; - SetUnit(FUNIT_PERCENT); + SetUnit(FieldUnit::PERCENT); SetDecimalDigits( 0 ); SetMin( nMinVal ); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index ab8a58380753..c41ba2a86dc1 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -248,7 +248,7 @@ SvxMetricField::SvxMetricField( Size aSize( CalcMinimumSize() ); SetSizePixel( aSize ); aLogicalSize = PixelToLogic(aSize, MapMode(MapUnit::MapAppFont)); - SetUnit( FUNIT_MM ); + SetUnit( FieldUnit::MM ); SetDecimalDigits( 2 ); SetMax( 5000 ); SetMin( 0 ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 8188a5832332..e450806ab628 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2363,7 +2363,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( svt::ToolboxController& rController, vcl m_aLineStyleLb->setPosSizePixel( 2, 2, 110, 140 ); SetOutputSizePixel( Size( 114, 144 ) ); - m_aLineStyleLb->SetSourceUnit( FUNIT_TWIP ); + m_aLineStyleLb->SetSourceUnit( FieldUnit::TWIP ); m_aLineStyleLb->SetNone( SvxResId(RID_SVXSTR_NONE) ); m_aLineStyleLb->InsertEntry( SvxBorderLine::getWidthImpl( SvxBorderLineStyle::SOLID ), SvxBorderLineStyle::SOLID ); diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 73e24198df1b..64e2649d7d7c 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -960,18 +960,18 @@ bool SvxMeasureUnitToFieldUnit( const short eApi, FieldUnit& eVcl ) throw() { switch( eApi ) { - case util::MeasureUnit::MM: eVcl = FUNIT_MM; break; - case util::MeasureUnit::CM: eVcl = FUNIT_CM; break; - case util::MeasureUnit::M: eVcl = FUNIT_M; break; - case util::MeasureUnit::KM: eVcl = FUNIT_KM; break; - case util::MeasureUnit::TWIP: eVcl = FUNIT_TWIP; break; - case util::MeasureUnit::POINT: eVcl = FUNIT_POINT; break; - case util::MeasureUnit::PICA: eVcl = FUNIT_PICA; break; - case util::MeasureUnit::INCH: eVcl = FUNIT_INCH; break; - case util::MeasureUnit::FOOT: eVcl = FUNIT_FOOT; break; - case util::MeasureUnit::MILE: eVcl = FUNIT_MILE; break; - case util::MeasureUnit::PERCENT: eVcl = FUNIT_PERCENT; break; - case util::MeasureUnit::MM_100TH: eVcl = FUNIT_100TH_MM; break; + case util::MeasureUnit::MM: eVcl = FieldUnit::MM; break; + case util::MeasureUnit::CM: eVcl = FieldUnit::CM; break; + case util::MeasureUnit::M: eVcl = FieldUnit::M; break; + case util::MeasureUnit::KM: eVcl = FieldUnit::KM; break; + case util::MeasureUnit::TWIP: eVcl = FieldUnit::TWIP; break; + case util::MeasureUnit::POINT: eVcl = FieldUnit::POINT; break; + case util::MeasureUnit::PICA: eVcl = FieldUnit::PICA; break; + case util::MeasureUnit::INCH: eVcl = FieldUnit::INCH; break; + case util::MeasureUnit::FOOT: eVcl = FieldUnit::FOOT; break; + case util::MeasureUnit::MILE: eVcl = FieldUnit::MILE; break; + case util::MeasureUnit::PERCENT: eVcl = FieldUnit::PERCENT; break; + case util::MeasureUnit::MM_100TH: eVcl = FieldUnit::MM_100TH; break; default: return false; } @@ -986,18 +986,18 @@ bool SvxFieldUnitToMeasureUnit( const FieldUnit eVcl, short& eApi ) throw() { switch( eVcl ) { - case FUNIT_MM: eApi = util::MeasureUnit::MM; break; - case FUNIT_CM: eApi = util::MeasureUnit::CM; break; - case FUNIT_M: eApi = util::MeasureUnit::M; break; - case FUNIT_KM: eApi = util::MeasureUnit::KM; break; - case FUNIT_TWIP: eApi = util::MeasureUnit::TWIP; break; - case FUNIT_POINT: eApi = util::MeasureUnit::POINT; break; - case FUNIT_PICA: eApi = util::MeasureUnit::PICA; break; - case FUNIT_INCH: eApi = util::MeasureUnit::INCH; break; - case FUNIT_FOOT: eApi = util::MeasureUnit::FOOT; break; - case FUNIT_MILE: eApi = util::MeasureUnit::MILE; break; - case FUNIT_PERCENT: eApi = util::MeasureUnit::PERCENT; break; - case FUNIT_100TH_MM: eApi = util::MeasureUnit::MM_100TH; break; + case FieldUnit::MM: eApi = util::MeasureUnit::MM; break; + case FieldUnit::CM: eApi = util::MeasureUnit::CM; break; + case FieldUnit::M: eApi = util::MeasureUnit::M; break; + case FieldUnit::KM: eApi = util::MeasureUnit::KM; break; + case FieldUnit::TWIP: eApi = util::MeasureUnit::TWIP; break; + case FieldUnit::POINT: eApi = util::MeasureUnit::POINT; break; + case FieldUnit::PICA: eApi = util::MeasureUnit::PICA; break; + case FieldUnit::INCH: eApi = util::MeasureUnit::INCH; break; + case FieldUnit::FOOT: eApi = util::MeasureUnit::FOOT; break; + case FieldUnit::MILE: eApi = util::MeasureUnit::MILE; break; + case FieldUnit::PERCENT: eApi = util::MeasureUnit::PERCENT; break; + case FieldUnit::MM_100TH: eApi = util::MeasureUnit::MM_100TH; break; default: return false; } diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 16598f7c37c7..3491b03044f4 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -140,7 +140,7 @@ SvxXMLXTableExportComponent::SvxXMLXTableExportComponent( const uno::Reference<xml::sax::XDocumentHandler> & rHandler, const uno::Reference<container::XNameContainer >& xTable, uno::Reference<document::XGraphicStorageHandler> const & xGraphicStorageHandler) -: SvXMLExport(rContext, "", rFileName, rHandler, nullptr, FUNIT_100TH_MM, SvXMLExportFlags::NONE), +: SvXMLExport(rContext, "", rFileName, rHandler, nullptr, FieldUnit::MM_100TH, SvXMLExportFlags::NONE), mxTable( xTable ) { diff --git a/sw/inc/optload.hrc b/sw/inc/optload.hrc index a3415c8e7c64..24463db8929b 100644 --- a/sw/inc/optload.hrc +++ b/sw/inc/optload.hrc @@ -24,17 +24,17 @@ const std::pair<const char*, FieldUnit> STR_ARR_METRIC[] = { - { NC_("STR_ARR_METRIC", "Millimeter") , FUNIT_MM }, - { NC_("STR_ARR_METRIC", "Centimeter") , FUNIT_CM }, - { NC_("STR_ARR_METRIC", "Meter") , FUNIT_M }, - { NC_("STR_ARR_METRIC", "Kilometer") , FUNIT_KM }, - { NC_("STR_ARR_METRIC", "Inch") , FUNIT_INCH }, - { NC_("STR_ARR_METRIC", "Foot") , FUNIT_FOOT }, - { NC_("STR_ARR_METRIC", "Miles") , FUNIT_MILE }, - { NC_("STR_ARR_METRIC", "Pica") , FUNIT_PICA }, - { NC_("STR_ARR_METRIC", "Point") , FUNIT_POINT }, - { NC_("STR_ARR_METRIC", "Char") , FUNIT_CHAR }, - { NC_("STR_ARR_METRIC", "Line") , FUNIT_LINE } + { NC_("STR_ARR_METRIC", "Millimeter") , FieldUnit::MM }, + { NC_("STR_ARR_METRIC", "Centimeter") , FieldUnit::CM }, + { NC_("STR_ARR_METRIC", "Meter") , FieldUnit::M }, + { NC_("STR_ARR_METRIC", "Kilometer") , FieldUnit::KM }, + { NC_("STR_ARR_METRIC", "Inch") , FieldUnit::INCH }, + { NC_("STR_ARR_METRIC", "Foot") , FieldUnit::FOOT }, + { NC_("STR_ARR_METRIC", "Miles") , FieldUnit::MILE }, + { NC_("STR_ARR_METRIC", "Pica") , FieldUnit::PICA }, + { NC_("STR_ARR_METRIC", "Point") , FieldUnit::POINT }, + { NC_("STR_ARR_METRIC", "Char") , FieldUnit::CHAR }, + { NC_("STR_ARR_METRIC", "Line") , FieldUnit::LINE } }; #endif diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 1c5effbac61b..d1db894519b0 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -32,7 +32,7 @@ private: public: HtmlExportTest() : SwModelTestBase("/sw/qa/extras/htmlexport/data/", "HTML (StarWriter)"), - m_eUnit(FUNIT_NONE) + m_eUnit(FieldUnit::NONE) {} /** @@ -93,7 +93,7 @@ private: })); SwMasterUsrPref* pPref = const_cast<SwMasterUsrPref*>(SW_MOD()->GetUsrPref(false)); m_eUnit = pPref->GetMetric(); - pPref->SetMetric(FUNIT_CM); + pPref->SetMetric(FieldUnit::CM); return pResetter; } return nullptr; diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 17f62b2a9718..630f3d611221 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -370,10 +370,10 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, const sal_Char *pUnit; switch( eUnit ) { - case FUNIT_100TH_MM: - OSL_ENSURE( FUNIT_MM == eUnit, "Measuring unit not supported" ); + case FieldUnit::MM_100TH: + OSL_ENSURE( FieldUnit::MM == eUnit, "Measuring unit not supported" ); SAL_FALLTHROUGH; - case FUNIT_MM: + case FieldUnit::MM: // 0.01mm = 0.57twip nMul = 25400; // 25.4 * 1000 nDiv = 1440; // 72 * 20; @@ -381,11 +381,11 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, pUnit = sCSS1_UNIT_mm; break; - case FUNIT_M: - case FUNIT_KM: - OSL_ENSURE( FUNIT_CM == eUnit, "Measuring unit not supported" ); + case FieldUnit::M: + case FieldUnit::KM: + OSL_ENSURE( FieldUnit::CM == eUnit, "Measuring unit not supported" ); SAL_FALLTHROUGH; - case FUNIT_CM: + case FieldUnit::CM: // 0.01cm = 5.7twip (not exact, but the UI is also not exact) nMul = 2540; // 2.54 * 1000 nDiv = 1440; // 72 * 20; @@ -393,10 +393,10 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, pUnit = sCSS1_UNIT_cm; break; - case FUNIT_TWIP: - OSL_ENSURE( FUNIT_POINT == eUnit, "Measuring unit not supported" ); + case FieldUnit::TWIP: + OSL_ENSURE( FieldUnit::POINT == eUnit, "Measuring unit not supported" ); SAL_FALLTHROUGH; - case FUNIT_POINT: + case FieldUnit::POINT: // 0.1pt = 2.0twip (not exact, but the UI is also not exact) nMul = 100; nDiv = 20; @@ -404,7 +404,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, pUnit = sCSS1_UNIT_pt; break; - case FUNIT_PICA: + case FieldUnit::PICA: // 0.01pc = 2.40twip (not exact, but the UI is also not exact) nMul = 1000; nDiv = 240; // 12 * 20; @@ -412,14 +412,14 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, pUnit = sCSS1_UNIT_pc; break; - case FUNIT_NONE: - case FUNIT_FOOT: - case FUNIT_MILE: - case FUNIT_CUSTOM: - case FUNIT_PERCENT: - case FUNIT_INCH: + case FieldUnit::NONE: + case FieldUnit::FOOT: + case FieldUnit::MILE: + case FieldUnit::CUSTOM: + case FieldUnit::PERCENT: + case FieldUnit::INCH: default: - OSL_ENSURE( FUNIT_INCH == eUnit, "Measuring unit not supported" ); + OSL_ENSURE( FieldUnit::INCH == eUnit, "Measuring unit not supported" ); // 0.01in = 14.4twip (not exact, but the UI is also not exact) nMul = 1000; nDiv = 1440; // 72 * 20; diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 531e14b07852..90afecad0879 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -92,7 +92,7 @@ static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL ) : m_pNumRuleInfo(new SwHTMLNumRuleInfo) , m_nHTMLMode(0) - , m_eCSS1Unit(FUNIT_NONE) + , m_eCSS1Unit(FieldUnit::NONE) , mxFormComps() , m_pStartNdIdx(nullptr) , m_pCurrPageDesc(nullptr) diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 55395917d739..e8ac4018c3a9 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -653,8 +653,8 @@ sal_Int32 RtfSdrExport::StartShape() rItemSet.GetItem(SID_ATTR_CHAR_FONTHEIGHT)); if (pFontHeight) { - long nFontHeight - = TransformMetric(pFontHeight->GetHeight(), FUNIT_TWIP, FUNIT_POINT); + long nFontHeight = TransformMetric(pFontHeight->GetHeight(), FieldUnit::TWIP, + FieldUnit::POINT); lcl_AppendSP( m_rAttrOutput.RunText(), "gtextSize", msfilter::rtfutil::OutString(OUString::number(nFontHeight * RTF_MULTIPLIER), diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 94143c79e721..d60a0c23e913 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -469,7 +469,7 @@ SwDropCapsPage::SwDropCapsPage(TabPageParent pParent, const SfxItemSet &rSet) , m_xLinesText(m_xBuilder->weld_label("labelTXT_LINES")) , m_xLinesField(m_xBuilder->weld_spin_button("spinFLD_LINES")) , m_xDistanceText(m_xBuilder->weld_label("labelTXT_DISTANCE")) - , m_xDistanceField(m_xBuilder->weld_metric_spin_button("spinFLD_DISTANCE", FUNIT_CM)) + , m_xDistanceField(m_xBuilder->weld_metric_spin_button("spinFLD_DISTANCE", FieldUnit::CM)) , m_xTextText(m_xBuilder->weld_label("labelTXT_TEXT")) , m_xTextEdit(m_xBuilder->weld_entry("entryEDT_TEXT")) , m_xTemplateText(m_xBuilder->weld_label("labelTXT_TEMPLATE")) @@ -535,14 +535,14 @@ void SwDropCapsPage::Reset(const SfxItemSet *rSet) { m_xDropCapsField->set_value(aFormatDrop.GetChars()); m_xLinesField->set_value(aFormatDrop.GetLines()); - m_xDistanceField->set_value(m_xDistanceField->normalize(aFormatDrop.GetDistance()), FUNIT_TWIP); + m_xDistanceField->set_value(m_xDistanceField->normalize(aFormatDrop.GetDistance()), FieldUnit::TWIP); m_xWholeWordCB->set_active(aFormatDrop.GetWholeWord()); } else { m_xDropCapsField->set_value(1); m_xLinesField->set_value(3); - m_xDistanceField->set_value(0, FUNIT_TWIP); + m_xDistanceField->set_value(0, FieldUnit::TWIP); } ::FillCharStyleListBox(*m_xTemplateBox, rSh.GetView().GetDocShell(), true); @@ -569,7 +569,7 @@ void SwDropCapsPage::Reset(const SfxItemSet *rSet) // Preview m_aPict.SetValues(m_xTextEdit->get_text(), sal_uInt8(m_xLinesField->get_value()), - sal_uInt16(m_xDistanceField->denormalize(m_xDistanceField->get_value(FUNIT_TWIP)))); + sal_uInt16(m_xDistanceField->denormalize(m_xDistanceField->get_value(FieldUnit::TWIP)))); ClickHdl(*m_xDropCapsBox); bModified = false; @@ -657,7 +657,7 @@ void SwDropCapsPage::ModifyEntry(weld::Entry& rEdit) else if (&rEdit == m_xLinesField.get()) m_aPict.SetLines(static_cast<sal_uInt8>(m_xLinesField->get_value())); else - m_aPict.SetDistance(static_cast<sal_uInt16>(m_xDistanceField->denormalize(m_xDistanceField->get_value(FUNIT_TWIP)))); + m_aPict.SetDistance(static_cast<sal_uInt16>(m_xDistanceField->denormalize(m_xDistanceField->get_value(FieldUnit::TWIP)))); bModified = true; } @@ -695,7 +695,7 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet ) // quantity, lines, gap aFormat.GetChars() = static_cast<sal_uInt8>(m_xDropCapsField->get_value()); aFormat.GetLines() = static_cast<sal_uInt8>(m_xLinesField->get_value()); - aFormat.GetDistance() = static_cast<sal_uInt16>(m_xDistanceField->denormalize(m_xDistanceField->get_value(FUNIT_TWIP))); + aFormat.GetDistance() = static_cast<sal_uInt16>(m_xDistanceField->denormalize(m_xDistanceField->get_value(FieldUnit::TWIP))); aFormat.GetWholeWord() = m_xWholeWordCB->get_active(); // template 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(); } 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()) { diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index ecb0150f25a4..dc7dcc2755df 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -127,8 +127,8 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : m_pExampleContainerWIN->Show(false); - m_pLeftMF->SetValue(m_pLeftMF->Normalize(DEFAULT_LEFT_DISTANCE), FUNIT_TWIP); - m_pTopMF->SetValue(m_pTopMF->Normalize(DEFAULT_TOP_DISTANCE), FUNIT_TWIP); + m_pLeftMF->SetValue(m_pLeftMF->Normalize(DEFAULT_LEFT_DISTANCE), FieldUnit::TWIP); + m_pTopMF->SetValue(m_pTopMF->Normalize(DEFAULT_TOP_DISTANCE), FieldUnit::TWIP); const LanguageTag& rLang = Application::GetSettings().GetUILanguageTag(); m_pZoomLB->InsertEntry(unicode::formatPercent(50, rLang), 1); @@ -221,8 +221,8 @@ void SwMailMergeLayoutPage::ActivatePage() } else { - long nLeft = static_cast< long >(m_pLeftMF->Denormalize(m_pLeftMF->GetValue(FUNIT_TWIP))); - long nTop = static_cast< long >(m_pTopMF->Denormalize(m_pTopMF->GetValue(FUNIT_TWIP))); + long nLeft = static_cast< long >(m_pLeftMF->Denormalize(m_pLeftMF->GetValue(FieldUnit::TWIP))); + long nTop = static_cast< long >(m_pTopMF->Denormalize(m_pTopMF->GetValue(FieldUnit::TWIP))); m_pAddressBlockFormat = InsertAddressFrame( *m_pExampleWrtShell, m_pWizard->GetConfigItem(), Point(nLeft, nTop), @@ -239,8 +239,8 @@ bool SwMailMergeLayoutPage::commitPage(::svt::WizardTypes::CommitPageReason eRea SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); if (eReason == ::svt::WizardTypes::eTravelForward || eReason == ::svt::WizardTypes::eFinish) { - long nLeft = static_cast< long >(m_pLeftMF->Denormalize(m_pLeftMF->GetValue(FUNIT_TWIP))); - long nTop = static_cast< long >(m_pTopMF->Denormalize(m_pTopMF->GetValue(FUNIT_TWIP))); + long nLeft = static_cast< long >(m_pLeftMF->Denormalize(m_pLeftMF->GetValue(FieldUnit::TWIP))); + long nTop = static_cast< long >(m_pTopMF->Denormalize(m_pTopMF->GetValue(FieldUnit::TWIP))); InsertAddressAndGreeting( m_pWizard->GetSwView(), rConfigItem, @@ -692,8 +692,8 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, SpinField&, void) { if(m_pExampleWrtShell && m_pAddressBlockFormat) { - long nLeft = static_cast< long >(m_pLeftMF->Denormalize(m_pLeftMF->GetValue(FUNIT_TWIP))); - long nTop = static_cast< long >(m_pTopMF->Denormalize(m_pTopMF->GetValue(FUNIT_TWIP))); + long nLeft = static_cast< long >(m_pLeftMF->Denormalize(m_pLeftMF->GetValue(FieldUnit::TWIP))); + long nTop = static_cast< long >(m_pTopMF->Denormalize(m_pTopMF->GetValue(FieldUnit::TWIP))); SfxItemSet aSet( m_pExampleWrtShell->GetAttrPool(), diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 87f0be102844..fdd0f4f6a733 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -2100,8 +2100,8 @@ void SwSectionPropertyTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage SwSectionIndentTabPage::SwSectionIndentTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet) : SfxTabPage(pParent, "modules/swriter/ui/indentpage.ui", "IndentPage", &rAttrSet) - , m_xBeforeMF(m_xBuilder->weld_metric_spin_button("before", FUNIT_CM)) - , m_xAfterMF(m_xBuilder->weld_metric_spin_button("after", FUNIT_CM)) + , m_xBeforeMF(m_xBuilder->weld_metric_spin_button("before", FieldUnit::CM)) + , m_xAfterMF(m_xBuilder->weld_metric_spin_button("after", FieldUnit::CM)) , m_xPreviewWin(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin)) { Link<weld::MetricSpinButton&,void> aLk = LINK(this, SwSectionIndentTabPage, IndentModifyHdl); @@ -2118,8 +2118,8 @@ bool SwSectionIndentTabPage::FillItemSet(SfxItemSet* rSet) if (m_xBeforeMF->get_value_changed_from_saved() || m_xAfterMF->get_value_changed_from_saved()) { SvxLRSpaceItem aLRSpace( - m_xBeforeMF->denormalize(m_xBeforeMF->get_value(FUNIT_TWIP)) , - m_xAfterMF->denormalize(m_xAfterMF->get_value(FUNIT_TWIP)), 0, 0, RES_LR_SPACE); + m_xBeforeMF->denormalize(m_xBeforeMF->get_value(FieldUnit::TWIP)) , + m_xAfterMF->denormalize(m_xAfterMF->get_value(FieldUnit::TWIP)), 0, 0, RES_LR_SPACE); rSet->Put(aLRSpace); } return true; @@ -2138,8 +2138,8 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet) const SvxLRSpaceItem& rSpace = rSet->Get( RES_LR_SPACE ); - m_xBeforeMF->set_value(m_xBeforeMF->normalize(rSpace.GetLeft()), FUNIT_TWIP); - m_xAfterMF->set_value(m_xAfterMF->normalize(rSpace.GetRight()), FUNIT_TWIP); + m_xBeforeMF->set_value(m_xBeforeMF->normalize(rSpace.GetLeft()), FieldUnit::TWIP); + m_xAfterMF->set_value(m_xAfterMF->normalize(rSpace.GetRight()), FieldUnit::TWIP); } else { @@ -2168,8 +2168,8 @@ void SwSectionIndentTabPage::SetWrtShell(SwWrtShell const & rSh) IMPL_LINK_NOARG(SwSectionIndentTabPage, IndentModifyHdl, weld::MetricSpinButton&, void) { - m_aPreviewWin.SetLeftMargin(m_xBeforeMF->denormalize(m_xBeforeMF->get_value(FUNIT_TWIP))); - m_aPreviewWin.SetRightMargin(m_xAfterMF->denormalize(m_xAfterMF->get_value(FUNIT_TWIP))); + m_aPreviewWin.SetLeftMargin(m_xBeforeMF->denormalize(m_xBeforeMF->get_value(FieldUnit::TWIP))); + m_aPreviewWin.SetRightMargin(m_xAfterMF->denormalize(m_xAfterMF->get_value(FieldUnit::TWIP))); m_aPreviewWin.Invalidate(); } diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 82c177e0cd42..7c2ca553fc69 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -117,15 +117,15 @@ static long lUserH = 5669; // 10 cm SwEnvFormatPage::SwEnvFormatPage(TabPageParent pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "modules/swriter/ui/envformatpage.ui", "EnvFormatPage", &rSet) , m_pDialog(nullptr) - , m_xAddrLeftField(m_xBuilder->weld_metric_spin_button("leftaddr", FUNIT_CM)) - , m_xAddrTopField(m_xBuilder->weld_metric_spin_button("topaddr", FUNIT_CM)) + , m_xAddrLeftField(m_xBuilder->weld_metric_spin_button("leftaddr", FieldUnit::CM)) + , m_xAddrTopField(m_xBuilder->weld_metric_spin_button("topaddr", FieldUnit::CM)) , m_xAddrEditButton(m_xBuilder->weld_menu_button("addredit")) - , m_xSendLeftField(m_xBuilder->weld_metric_spin_button("leftsender", FUNIT_CM)) - , m_xSendTopField(m_xBuilder->weld_metric_spin_button("topsender", FUNIT_CM)) + , m_xSendLeftField(m_xBuilder->weld_metric_spin_button("leftsender", FieldUnit::CM)) + , m_xSendTopField(m_xBuilder->weld_metric_spin_button("topsender", FieldUnit::CM)) , m_xSendEditButton(m_xBuilder->weld_menu_button("senderedit")) , m_xSizeFormatBox(m_xBuilder->weld_combo_box("format")) - , m_xSizeWidthField(m_xBuilder->weld_metric_spin_button("width", FUNIT_CM)) - , m_xSizeHeightField(m_xBuilder->weld_metric_spin_button("height", FUNIT_CM)) + , m_xSizeWidthField(m_xBuilder->weld_metric_spin_button("width", FieldUnit::CM)) + , m_xSizeHeightField(m_xBuilder->weld_metric_spin_button("height", FieldUnit::CM)) , m_xPreview(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreview)) { SetExchangeSupport(); @@ -403,13 +403,13 @@ void SwEnvFormatPage::SetMinMax() // Min and Max m_xAddrLeftField->set_range(100 * (getfieldval(*m_xSendLeftField) + 566), - 100 * (lWidth - 2 * 566), FUNIT_TWIP); + 100 * (lWidth - 2 * 566), FieldUnit::TWIP); m_xAddrTopField->set_range(100 * (getfieldval(*m_xSendTopField ) + 2 * 566), - 100 * (lHeight - 2 * 566), FUNIT_TWIP); + 100 * (lHeight - 2 * 566), FieldUnit::TWIP); m_xSendLeftField->set_range(100 * 566, - 100 * (getfieldval(*m_xAddrLeftField) - 566), FUNIT_TWIP); + 100 * (getfieldval(*m_xAddrLeftField) - 566), FieldUnit::TWIP); m_xSendTopField->set_range(100 * 566, - 100 * (getfieldval(*m_xAddrTopField ) - 2 * 566), FUNIT_TWIP); + 100 * (getfieldval(*m_xAddrTopField ) - 2 * 566), FieldUnit::TWIP); } VclPtr<SfxTabPage> SwEnvFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet) diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index f046a910d69d..2041e2838f19 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -35,8 +35,8 @@ SwEnvPrtPage::SwEnvPrtPage(TabPageParent pParent, const SfxItemSet& rSet) , m_xLower(m_xBuilder->weld_widget("lower")) , m_xTopButton(m_xBuilder->weld_radio_button("top")) , m_xBottomButton(m_xBuilder->weld_radio_button("bottom")) - , m_xRightField(m_xBuilder->weld_metric_spin_button("right", FUNIT_CM)) - , m_xDownField(m_xBuilder->weld_metric_spin_button("down", FUNIT_CM)) + , m_xRightField(m_xBuilder->weld_metric_spin_button("right", FieldUnit::CM)) + , m_xDownField(m_xBuilder->weld_metric_spin_button("down", FieldUnit::CM)) , m_xPrinterInfo(m_xBuilder->weld_label("printername")) , m_xPrtSetup(m_xBuilder->weld_button("setup")) , m_aIdsL { m_xBuilder->weld_radio_button("horileftl"), diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index f0bb88c3746d..98d96581d2ea 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -292,16 +292,16 @@ SwLabFormatPage::SwLabFormatPage(TabPageParent pParent, const SfxItemSet& rSet) , m_xMakeFI(m_xBuilder->weld_label("make")) , m_xTypeFI(m_xBuilder->weld_label("type")) , m_xPreview(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreview)) - , m_xHDistField(m_xBuilder->weld_metric_spin_button("hori", FUNIT_CM)) - , m_xVDistField(m_xBuilder->weld_metric_spin_button("vert", FUNIT_CM)) - , m_xWidthField(m_xBuilder->weld_metric_spin_button("width", FUNIT_CM)) - , m_xHeightField(m_xBuilder->weld_metric_spin_button("height", FUNIT_CM)) - , m_xLeftField(m_xBuilder->weld_metric_spin_button("left", FUNIT_CM)) - , m_xUpperField(m_xBuilder->weld_metric_spin_button("top", FUNIT_CM)) + , m_xHDistField(m_xBuilder->weld_metric_spin_button("hori", FieldUnit::CM)) + , m_xVDistField(m_xBuilder->weld_metric_spin_button("vert", FieldUnit::CM)) + , m_xWidthField(m_xBuilder->weld_metric_spin_button("width", FieldUnit::CM)) + , m_xHeightField(m_xBuilder->weld_metric_spin_button("height", FieldUnit::CM)) + , m_xLeftField(m_xBuilder->weld_metric_spin_button("left", FieldUnit::CM)) + , m_xUpperField(m_xBuilder->weld_metric_spin_button("top", FieldUnit::CM)) , m_xColsField(m_xBuilder->weld_spin_button("cols")) , m_xRowsField(m_xBuilder->weld_spin_button("rows")) - , m_xPWidthField(m_xBuilder->weld_metric_spin_button("pagewidth", FUNIT_CM)) - , m_xPHeightField(m_xBuilder->weld_metric_spin_button("pageheight", FUNIT_CM)) + , m_xPWidthField(m_xBuilder->weld_metric_spin_button("pagewidth", FieldUnit::CM)) + , m_xPHeightField(m_xBuilder->weld_metric_spin_button("pageheight", FieldUnit::CM)) , m_xSavePB(m_xBuilder->weld_button("save")) { SetExchangeSupport(); @@ -381,26 +381,26 @@ void SwLabFormatPage::ChangeMinMax() lMinPWidth = lLeft + (nCols - 1) * lHDist + lWidth, lMinPHeight = lUpper + (nRows - 1) * lVDist + lHeight; - m_xHDistField->set_min(nMinSize, FUNIT_CM); - m_xVDistField->set_min(nMinSize, FUNIT_CM); + m_xHDistField->set_min(nMinSize, FieldUnit::CM); + m_xVDistField->set_min(nMinSize, FieldUnit::CM); - m_xHDistField->set_max(long(100) * ((lMax - lLeft ) / std::max(1L, static_cast<long>(nCols))), FUNIT_TWIP); - m_xVDistField->set_max(long(100) * ((lMax - lUpper) / std::max(1L, static_cast<long>(nRows))), FUNIT_TWIP); + m_xHDistField->set_max(long(100) * ((lMax - lLeft ) / std::max(1L, static_cast<long>(nCols))), FieldUnit::TWIP); + m_xVDistField->set_max(long(100) * ((lMax - lUpper) / std::max(1L, static_cast<long>(nRows))), FieldUnit::TWIP); - m_xWidthField->set_min(nMinSize, FUNIT_CM); - m_xHeightField->set_min(nMinSize, FUNIT_CM); + m_xWidthField->set_min(nMinSize, FieldUnit::CM); + m_xHeightField->set_min(nMinSize, FieldUnit::CM); - m_xWidthField->set_max(long(100) * lHDist, FUNIT_TWIP); - m_xHeightField->set_max(long(100) * lVDist, FUNIT_TWIP); + m_xWidthField->set_max(long(100) * lHDist, FieldUnit::TWIP); + m_xHeightField->set_max(long(100) * lVDist, FieldUnit::TWIP); - m_xLeftField->set_max(long(100) * (lMax - nCols * lHDist), FUNIT_TWIP); - m_xUpperField->set_max(long(100) * (lMax - nRows * lVDist), FUNIT_TWIP); + m_xLeftField->set_max(long(100) * (lMax - nCols * lHDist), FieldUnit::TWIP); + m_xUpperField->set_max(long(100) * (lMax - nRows * lVDist), FieldUnit::TWIP); m_xColsField->set_range(1, (lMax - lLeft ) / std::max(1L, lHDist)); m_xRowsField->set_range(1, (lMax - lUpper) / std::max(1L, lVDist)); - m_xPWidthField->set_range(long(100) * lMinPWidth, long(100) * lMax, FUNIT_TWIP); - m_xPHeightField->set_range(long(100) * lMinPHeight, long(100) * lMax, FUNIT_TWIP); + m_xPWidthField->set_range(long(100) * lMinPWidth, long(100) * lMax, FieldUnit::TWIP); + m_xPHeightField->set_range(long(100) * lMinPHeight, long(100) * lMax, FieldUnit::TWIP); } VclPtr<SfxTabPage> SwLabFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet) @@ -456,14 +456,14 @@ void SwLabFormatPage::Reset(const SfxItemSet* ) // Initialise fields GetParentSwLabDlg()->GetLabItem(aItem); - m_xHDistField->set_max(100 * aItem.m_lHDist , FUNIT_TWIP); - m_xVDistField->set_max(100 * aItem.m_lVDist , FUNIT_TWIP); - m_xWidthField->set_max(100 * aItem.m_lWidth , FUNIT_TWIP); - m_xHeightField->set_max(100 * aItem.m_lHeight, FUNIT_TWIP); - m_xLeftField->set_max(100 * aItem.m_lLeft , FUNIT_TWIP); - m_xUpperField->set_max(100 * aItem.m_lUpper , FUNIT_TWIP); - m_xPWidthField->set_max(100 * aItem.m_lPWidth , FUNIT_TWIP); - m_xPHeightField->set_max(100 * aItem.m_lPHeight, FUNIT_TWIP); + m_xHDistField->set_max(100 * aItem.m_lHDist , FieldUnit::TWIP); + m_xVDistField->set_max(100 * aItem.m_lVDist , FieldUnit::TWIP); + m_xWidthField->set_max(100 * aItem.m_lWidth , FieldUnit::TWIP); + m_xHeightField->set_max(100 * aItem.m_lHeight, FieldUnit::TWIP); + m_xLeftField->set_max(100 * aItem.m_lLeft , FieldUnit::TWIP); + m_xUpperField->set_max(100 * aItem.m_lUpper , FieldUnit::TWIP); + m_xPWidthField->set_max(100 * aItem.m_lPWidth , FieldUnit::TWIP); + m_xPHeightField->set_max(100 * aItem.m_lPHeight, FieldUnit::TWIP); setfldval(*m_xHDistField, aItem.m_lHDist ); setfldval(*m_xVDistField , aItem.m_lVDist ); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 44891cf372b1..8afb3632617f 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -395,21 +395,21 @@ SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet) , m_xAutoWidthBox(m_xBuilder->weld_check_button("autowidth")) , m_xLineTypeLbl(m_xBuilder->weld_label("linestyleft")) , m_xLineWidthLbl(m_xBuilder->weld_label("linewidthft")) - , m_xLineWidthEdit(m_xBuilder->weld_metric_spin_button("linewidthmf", FUNIT_POINT)) + , m_xLineWidthEdit(m_xBuilder->weld_metric_spin_button("linewidthmf", FieldUnit::POINT)) , m_xLineColorLbl(m_xBuilder->weld_label("linecolorft")) , m_xLineHeightLbl(m_xBuilder->weld_label("lineheightft")) - , m_xLineHeightEdit(m_xBuilder->weld_metric_spin_button("lineheightmf", FUNIT_PERCENT)) + , m_xLineHeightEdit(m_xBuilder->weld_metric_spin_button("lineheightmf", FieldUnit::PERCENT)) , m_xLinePosLbl(m_xBuilder->weld_label("lineposft")) , m_xLinePosDLB(m_xBuilder->weld_combo_box("lineposlb")) , m_xTextDirectionFT(m_xBuilder->weld_label("textdirectionft")) , m_xTextDirectionLB(new svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("textdirectionlb"))) , m_xLineColorDLB(new ColorListBox(m_xBuilder->weld_menu_button("colorlb"), pParent.GetFrameWeld())) , m_xLineTypeDLB(new SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb"))) - , m_xEd1(new SwPercentField(m_xBuilder->weld_metric_spin_button("width1mf", FUNIT_CM))) - , m_xEd2(new SwPercentField(m_xBuilder->weld_metric_spin_button("width2mf", FUNIT_CM))) - , m_xEd3(new SwPercentField(m_xBuilder->weld_metric_spin_button("width3mf", FUNIT_CM))) - , m_xDistEd1(new SwPercentField(m_xBuilder->weld_metric_spin_button("spacing1mf", FUNIT_CM))) - , m_xDistEd2(new SwPercentField(m_xBuilder->weld_metric_spin_button("spacing2mf", FUNIT_CM))) + , m_xEd1(new SwPercentField(m_xBuilder->weld_metric_spin_button("width1mf", FieldUnit::CM))) + , m_xEd2(new SwPercentField(m_xBuilder->weld_metric_spin_button("width2mf", FieldUnit::CM))) + , m_xEd3(new SwPercentField(m_xBuilder->weld_metric_spin_button("width3mf", FieldUnit::CM))) + , m_xDistEd1(new SwPercentField(m_xBuilder->weld_metric_spin_button("spacing1mf", FieldUnit::CM))) + , m_xDistEd2(new SwPercentField(m_xBuilder->weld_metric_spin_button("spacing2mf", FieldUnit::CM))) , m_xDefaultVS(new weld::CustomWeld(*m_xBuilder, "valueset", m_aDefaultVS)) , m_xPgeExampleWN(new weld::CustomWeld(*m_xBuilder, "pageexample", m_aPgeExampleWN)) , m_xFrameExampleWN(new weld::CustomWeld(*m_xBuilder, "frameexample", m_aFrameExampleWN)) @@ -481,7 +481,7 @@ SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet) m_xLinePosDLB->connect_changed(LINK(this, SwColumnPage, UpdateColMgrListBox)); // Separator line - m_xLineTypeDLB->SetSourceUnit( FUNIT_TWIP ); + m_xLineTypeDLB->SetSourceUnit( FieldUnit::TWIP ); // Fill the line styles listbox m_xLineTypeDLB->InsertEntry( @@ -494,11 +494,11 @@ SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet) ::editeng::SvxBorderLine::getWidthImpl(SvxBorderLineStyle::DASHED), SvxBorderLineStyle::DASHED ); - sal_Int64 nLineWidth = m_xLineWidthEdit->get_value(FUNIT_POINT); + sal_Int64 nLineWidth = m_xLineWidthEdit->get_value(FieldUnit::POINT); nLineWidth = static_cast<long>(MetricField::ConvertDoubleValue( nLineWidth, m_xLineWidthEdit->get_digits(), - FUNIT_POINT, MapUnit::MapTwip )); + FieldUnit::POINT, MapUnit::MapTwip )); m_xLineTypeDLB->SetWidth(nLineWidth); m_xLineColorDLB->SelectEntry(COL_BLACK); } @@ -528,11 +528,11 @@ void SwColumnPage::SetPageWidth(long nPageWidth) { long nNewMaxWidth = static_cast< long >(m_xEd1->NormalizePercent(nPageWidth)); - m_xDistEd1->set_max(nNewMaxWidth, FUNIT_TWIP); - m_xDistEd2->set_max(nNewMaxWidth, FUNIT_TWIP); - m_xEd1->set_max(nNewMaxWidth, FUNIT_TWIP); - m_xEd2->set_max(nNewMaxWidth, FUNIT_TWIP); - m_xEd3->set_max(nNewMaxWidth, FUNIT_TWIP); + m_xDistEd1->set_max(nNewMaxWidth, FieldUnit::TWIP); + m_xDistEd2->set_max(nNewMaxWidth, FieldUnit::TWIP); + m_xEd1->set_max(nNewMaxWidth, FieldUnit::TWIP); + m_xEd2->set_max(nNewMaxWidth, FieldUnit::TWIP); + m_xEd3->set_max(nNewMaxWidth, FieldUnit::TWIP); } void SwColumnPage::connectPercentField(SwPercentField &rWrap) @@ -558,8 +558,8 @@ void SwColumnPage::Reset(const SfxItemSet *rSet) m_xDistEd1->SetMetric(aMetric); m_xDistEd2->SetMetric(aMetric); //default spacing between cols = 0.5cm - m_xDistEd1->SetPrcntValue(50, FUNIT_CM); - m_xDistEd2->SetPrcntValue(50, FUNIT_CM); + m_xDistEd1->SetPrcntValue(50, FieldUnit::CM); + m_xDistEd2->SetPrcntValue(50, FieldUnit::CM); m_xColMgr.reset(new SwColMgr(*rSet)); m_nCols = m_xColMgr->GetCount() ; @@ -697,7 +697,7 @@ IMPL_LINK_NOARG( SwColumnPage, UpdateColMgr, weld::MetricSpinButton&, void ) m_xLineColorDLB->set_sensitive(bEnable); m_xLineColorLbl->set_sensitive(bEnable); - sal_Int64 nLineWidth = m_xLineWidthEdit->get_value(FUNIT_PERCENT); + sal_Int64 nLineWidth = m_xLineWidthEdit->get_value(FieldUnit::PERCENT); nLineWidth = static_cast<long>(MetricField::ConvertDoubleValue( nLineWidth, m_xLineWidthEdit->get_digits(), @@ -711,7 +711,7 @@ IMPL_LINK_NOARG( SwColumnPage, UpdateColMgr, weld::MetricSpinButton&, void ) nLineWidth, m_xLineColorDLB->GetSelectEntryColor() ); m_xColMgr->SetAdjust(SwColLineAdj(m_xLinePosDLB->get_active() + 1)); - m_xColMgr->SetLineHeightPercent(static_cast<short>(m_xLineHeightEdit->get_value(FUNIT_PERCENT))); + m_xColMgr->SetLineHeightPercent(static_cast<short>(m_xLineHeightEdit->get_value(FieldUnit::PERCENT))); bEnable = m_xColMgr->GetLineHeightPercent() != 100; } m_xLinePosLbl->set_sensitive(bEnable); @@ -780,16 +780,16 @@ void SwColumnPage::Init() eAdj = COLADJ_TOP; //without Adjust no line type m_xLineTypeDLB->SelectEntry(SvxBorderLineStyle::NONE); - m_xLineHeightEdit->set_value(100, FUNIT_PERCENT); + m_xLineHeightEdit->set_value(100, FieldUnit::PERCENT); } else { // Need to multiply by 100 because of the 2 decimals - m_xLineWidthEdit->set_value( m_xColMgr->GetLineWidth() * 100, FUNIT_TWIP); + m_xLineWidthEdit->set_value( m_xColMgr->GetLineWidth() * 100, FieldUnit::TWIP); m_xLineColorDLB->SelectEntry( m_xColMgr->GetLineColor() ); m_xLineTypeDLB->SelectEntry( m_xColMgr->GetLineStyle() ); m_xLineTypeDLB->SetWidth( m_xColMgr->GetLineWidth( ) ); - m_xLineHeightEdit->set_value(m_xColMgr->GetLineHeightPercent(), FUNIT_PERCENT); + m_xLineHeightEdit->set_value(m_xColMgr->GetLineHeightPercent(), FieldUnit::PERCENT); } m_xLinePosDLB->set_active( static_cast< sal_Int32 >(eAdj - 1) ); @@ -798,7 +798,7 @@ void SwColumnPage::Init() { m_xLinePosDLB->set_active(0); m_xLineTypeDLB->SelectEntry(SvxBorderLineStyle::NONE); - m_xLineHeightEdit->set_value(100, FUNIT_PERCENT); + m_xLineHeightEdit->set_value(100, FieldUnit::PERCENT); } UpdateCols(); @@ -931,7 +931,7 @@ void SwColumnPage::ColModify(const weld::SpinButton* pNF) { if (pNF) m_aDefaultVS.SetNoSelection(); - long nDist = static_cast< long >(m_xDistEd1->DenormalizePercent(m_xDistEd1->get_value(FUNIT_TWIP))); + long nDist = static_cast< long >(m_xDistEd1->DenormalizePercent(m_xDistEd1->get_value(FieldUnit::TWIP))); m_xColMgr->SetCount(m_nCols, static_cast<sal_uInt16>(nDist)); for(sal_uInt16 i = 0; i < m_nCols; i++) m_nColDist[i] = nDist; @@ -955,7 +955,7 @@ IMPL_LINK(SwColumnPage, GapModify, weld::MetricSpinButton&, rMetricField, void) return; SwPercentField *pField = m_aPercentFieldsMap[&rMetricField]; assert(pField); - long nActValue = static_cast< long >(pField->DenormalizePercent(pField->get_value(FUNIT_TWIP))); + long nActValue = static_cast< long >(pField->DenormalizePercent(pField->get_value(FieldUnit::TWIP))); if (m_xAutoWidthBox->get_active()) { const long nMaxGap = static_cast< long > @@ -963,7 +963,7 @@ IMPL_LINK(SwColumnPage, GapModify, weld::MetricSpinButton&, rMetricField, void) if(nActValue > nMaxGap) { nActValue = nMaxGap; - m_xDistEd1->SetPrcntValue(m_xDistEd1->NormalizePercent(nMaxGap), FUNIT_TWIP); + m_xDistEd1->SetPrcntValue(m_xDistEd1->NormalizePercent(nMaxGap), FieldUnit::TWIP); } m_xColMgr->SetGutterWidth(static_cast<sal_uInt16>(nActValue)); for(sal_uInt16 i = 0; i < m_nCols; i++) @@ -1027,7 +1027,7 @@ IMPL_LINK(SwColumnPage, EdModify, weld::MetricSpinButton&, rEdit, void) // no explicit values for the column width can be entered. IMPL_LINK(SwColumnPage, AutoWidthHdl, weld::ToggleButton&, rBox, void) { - long nDist = static_cast< long >(m_xDistEd1->DenormalizePercent(m_xDistEd1->get_value(FUNIT_TWIP))); + long nDist = static_cast< long >(m_xDistEd1->DenormalizePercent(m_xDistEd1->get_value(FieldUnit::TWIP))); m_xColMgr->SetCount(m_nCols, static_cast<sal_uInt16>(nDist)); for(sal_uInt16 i = 0; i < m_nCols; i++) m_nColDist[i] = nDist; @@ -1078,7 +1078,7 @@ void SwColumnPage::Timeout() nChanged += 2; long nNewWidth = static_cast< long > - (m_pModifiedField->DenormalizePercent(m_pModifiedField->get_value(FUNIT_TWIP))); + (m_pModifiedField->DenormalizePercent(m_pModifiedField->get_value(FieldUnit::TWIP))); long nDiff = nNewWidth - m_nColWidth[nChanged]; // when it's the last column @@ -1116,35 +1116,35 @@ void SwColumnPage::Update(const weld::MetricSpinButton* pInteractiveField) { sal_Int64 nCurrentValue, nNewValue; - nCurrentValue = m_xEd1->NormalizePercent(m_xEd1->DenormalizePercent(m_xEd1->get_value(FUNIT_TWIP))); + nCurrentValue = m_xEd1->NormalizePercent(m_xEd1->DenormalizePercent(m_xEd1->get_value(FieldUnit::TWIP))); nNewValue = m_xEd1->NormalizePercent(m_nColWidth[m_nFirstVis]); //fdo#87612 if we're interacting with this widget and the value will be the same //then leave it alone (i.e. don't change equivalent values of e.g. .8 -> 0.8) if (nNewValue != nCurrentValue || pInteractiveField != m_xEd1->get()) - m_xEd1->SetPrcntValue(nNewValue, FUNIT_TWIP); + m_xEd1->SetPrcntValue(nNewValue, FieldUnit::TWIP); - nCurrentValue = m_xDistEd1->NormalizePercent(m_xDistEd1->DenormalizePercent(m_xDistEd1->get_value(FUNIT_TWIP))); + nCurrentValue = m_xDistEd1->NormalizePercent(m_xDistEd1->DenormalizePercent(m_xDistEd1->get_value(FieldUnit::TWIP))); nNewValue = m_xDistEd1->NormalizePercent(m_nColDist[m_nFirstVis]); if (nNewValue != nCurrentValue || pInteractiveField != m_xDistEd1->get()) - m_xDistEd1->SetPrcntValue(nNewValue, FUNIT_TWIP); + m_xDistEd1->SetPrcntValue(nNewValue, FieldUnit::TWIP); - nCurrentValue = m_xEd2->NormalizePercent(m_xEd2->DenormalizePercent(m_xEd2->get_value(FUNIT_TWIP))); + nCurrentValue = m_xEd2->NormalizePercent(m_xEd2->DenormalizePercent(m_xEd2->get_value(FieldUnit::TWIP))); nNewValue = m_xEd2->NormalizePercent(m_nColWidth[m_nFirstVis+1]); if (nNewValue != nCurrentValue || pInteractiveField != m_xEd2->get()) - m_xEd2->SetPrcntValue(nNewValue, FUNIT_TWIP); + m_xEd2->SetPrcntValue(nNewValue, FieldUnit::TWIP); if(m_nCols >= 3) { - nCurrentValue = m_xDistEd2->NormalizePercent(m_xDistEd2->DenormalizePercent(m_xDistEd2->get_value(FUNIT_TWIP))); + nCurrentValue = m_xDistEd2->NormalizePercent(m_xDistEd2->DenormalizePercent(m_xDistEd2->get_value(FieldUnit::TWIP))); nNewValue = m_xDistEd2->NormalizePercent(m_nColDist[m_nFirstVis+1]); if (nNewValue != nCurrentValue || pInteractiveField != m_xDistEd2->get()) - m_xDistEd2->SetPrcntValue(nNewValue, FUNIT_TWIP); + m_xDistEd2->SetPrcntValue(nNewValue, FieldUnit::TWIP); - nCurrentValue = m_xEd3->NormalizePercent(m_xEd3->DenormalizePercent(m_xEd3->get_value(FUNIT_TWIP))); + nCurrentValue = m_xEd3->NormalizePercent(m_xEd3->DenormalizePercent(m_xEd3->get_value(FieldUnit::TWIP))); nNewValue = m_xEd3->NormalizePercent(m_nColWidth[m_nFirstVis+2]); if (nNewValue != nCurrentValue || pInteractiveField != m_xEd3->get()) - m_xEd3->SetPrcntValue(nNewValue, FUNIT_TWIP); + m_xEd3->SetPrcntValue(nNewValue, FieldUnit::TWIP); } else { @@ -1280,7 +1280,7 @@ IMPL_LINK(SwColumnPage, SetDefaultsHdl, SvtValueSet *, pVS, void) { m_xCLNrEdt->set_value(nItem); m_xAutoWidthBox->set_active(true); - m_xDistEd1->SetPrcntValue(50, FUNIT_CM); + m_xDistEd1->SetPrcntValue(50, FieldUnit::CM); ColModify(nullptr); } else @@ -1288,18 +1288,18 @@ IMPL_LINK(SwColumnPage, SetDefaultsHdl, SvtValueSet *, pVS, void) m_bLockUpdate = true; m_xCLNrEdt->set_value(2); m_xAutoWidthBox->set_active(false); - m_xDistEd1->SetPrcntValue(50, FUNIT_CM); + m_xDistEd1->SetPrcntValue(50, FieldUnit::CM); ColModify(nullptr); // now set the width ratio to 2 : 1 or 1 : 2 respectively const long nSmall = static_cast< long >(m_xColMgr->GetActualSize() / 3); if(nItem == 4) { - m_xEd2->SetPrcntValue(m_xEd2->NormalizePercent(nSmall), FUNIT_TWIP); + m_xEd2->SetPrcntValue(m_xEd2->NormalizePercent(nSmall), FieldUnit::TWIP); m_pModifiedField = m_xEd2.get(); } else { - m_xEd1->SetPrcntValue(m_xEd1->NormalizePercent(nSmall), FUNIT_TWIP); + m_xEd1->SetPrcntValue(m_xEd1->NormalizePercent(nSmall), FieldUnit::TWIP); m_pModifiedField = m_xEd1.get(); } m_bLockUpdate = false; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 4a88c34dea9e..edee604b9759 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -965,8 +965,8 @@ void SwFramePage::Reset( const SfxItemSet *rSet ) } // entering procent value made possible - m_aWidthED.SetBaseValue( m_aWidthED.Normalize(m_aGrfSize.Width()), FUNIT_TWIP ); - m_aHeightED.SetBaseValue( m_aHeightED.Normalize(m_aGrfSize.Height()), FUNIT_TWIP ); + m_aWidthED.SetBaseValue( m_aWidthED.Normalize(m_aGrfSize.Width()), FieldUnit::TWIP ); + m_aHeightED.SetBaseValue( m_aHeightED.Normalize(m_aGrfSize.Height()), FieldUnit::TWIP ); //the available space is not yet known so the RefValue has to be calculated from size and relative size values //this is needed only if relative values are already set @@ -1059,8 +1059,8 @@ void SwFramePage::Reset( const SfxItemSet *rSet ) m_pAutoHeightCB->SaveValue(); m_pAutoWidthCB->SaveValue(); - SwTwips nWidth = static_cast< SwTwips >(m_aWidthED.DenormalizePercent(m_aWidthED.GetValue(FUNIT_TWIP))); - SwTwips nHeight = static_cast< SwTwips >(m_aHeightED.DenormalizePercent(m_aHeightED.GetValue(FUNIT_TWIP))); + SwTwips nWidth = static_cast< SwTwips >(m_aWidthED.DenormalizePercent(m_aWidthED.GetValue(FieldUnit::TWIP))); + SwTwips nHeight = static_cast< SwTwips >(m_aHeightED.DenormalizePercent(m_aHeightED.GetValue(FieldUnit::TWIP))); m_fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0; } @@ -1104,7 +1104,7 @@ bool SwFramePage::FillItemSet(SfxItemSet *rSet) if ( eHOri == text::HoriOrientation::NONE && (m_bNew || (m_bAtHorzPosModified || bMod) || m_nOldH != eHOri ) ) { - SwTwips nX = static_cast< SwTwips >(m_pAtHorzPosED->Denormalize(m_pAtHorzPosED->GetValue(FUNIT_TWIP))); + SwTwips nX = static_cast< SwTwips >(m_pAtHorzPosED->Denormalize(m_pAtHorzPosED->GetValue(FieldUnit::TWIP))); aHoriOrient.SetPos( nX ); } @@ -1139,7 +1139,7 @@ bool SwFramePage::FillItemSet(SfxItemSet *rSet) { // vertical position // recalculate offset for character bound frames - SwTwips nY = static_cast< SwTwips >(m_pAtVertPosED->Denormalize(m_pAtVertPosED->GetValue(FUNIT_TWIP))); + SwTwips nY = static_cast< SwTwips >(m_pAtVertPosED->Denormalize(m_pAtVertPosED->GetValue(FieldUnit::TWIP))); if (eAnchorId == RndStdIds::FLY_AS_CHAR) { nY *= -1; @@ -1197,19 +1197,19 @@ bool SwFramePage::FillItemSet(SfxItemSet *rSet) if ((m_bNew && !m_bFormat) || ((bValueModified || bCheckChanged) && bLegalValue)) { - sal_Int64 nNewWidth = m_aWidthED.DenormalizePercent(m_aWidthED.GetRealValue(FUNIT_TWIP)); - sal_Int64 nNewHeight = m_aHeightED.DenormalizePercent(m_aHeightED.GetRealValue(FUNIT_TWIP)); + sal_Int64 nNewWidth = m_aWidthED.DenormalizePercent(m_aWidthED.GetRealValue(FieldUnit::TWIP)); + sal_Int64 nNewHeight = m_aHeightED.DenormalizePercent(m_aHeightED.GetRealValue(FieldUnit::TWIP)); aSz.SetWidth (static_cast< SwTwips >(nNewWidth)); aSz.SetHeight(static_cast< SwTwips >(nNewHeight)); if (m_pRelWidthCB->IsChecked()) { - aSz.SetWidthPercent(static_cast<sal_uInt8>(std::min( static_cast< sal_Int64 >(MAX_PERCENT_WIDTH), m_aWidthED.Convert(m_aWidthED.NormalizePercent(nNewWidth), FUNIT_TWIP, FUNIT_CUSTOM)))); + aSz.SetWidthPercent(static_cast<sal_uInt8>(std::min( static_cast< sal_Int64 >(MAX_PERCENT_WIDTH), m_aWidthED.Convert(m_aWidthED.NormalizePercent(nNewWidth), FieldUnit::TWIP, FieldUnit::CUSTOM)))); } else aSz.SetWidthPercent(0); if (m_pRelHeightCB->IsChecked()) - aSz.SetHeightPercent(static_cast<sal_uInt8>(std::min(static_cast< sal_Int64 >(MAX_PERCENT_HEIGHT), m_aHeightED.Convert(m_aHeightED.NormalizePercent(nNewHeight), FUNIT_TWIP, FUNIT_CUSTOM)))); + aSz.SetHeightPercent(static_cast<sal_uInt8>(std::min(static_cast< sal_Int64 >(MAX_PERCENT_HEIGHT), m_aHeightED.Convert(m_aHeightED.NormalizePercent(nNewHeight), FieldUnit::TWIP, FieldUnit::CUSTOM)))); else aSz.SetHeightPercent(0); @@ -1357,14 +1357,14 @@ void SwFramePage::InitPos(RndStdIds eId, bEnable = nH == text::HoriOrientation::NONE && eId != RndStdIds::FLY_AS_CHAR; if (!bEnable) { - m_pAtHorzPosED->SetValue( 0, FUNIT_TWIP ); + m_pAtHorzPosED->SetValue( 0, FieldUnit::TWIP ); if (nX != LONG_MAX && m_bHtmlMode) m_pAtHorzPosED->SetModifyFlag(); } else { if (nX != LONG_MAX) - m_pAtHorzPosED->SetValue( m_pAtHorzPosED->Normalize(nX), FUNIT_TWIP ); + m_pAtHorzPosED->SetValue( m_pAtHorzPosED->Normalize(nX), FieldUnit::TWIP ); } m_pAtHorzPosFT->Enable( bEnable ); m_pAtHorzPosED->Enable( bEnable ); @@ -1372,7 +1372,7 @@ void SwFramePage::InitPos(RndStdIds eId, bEnable = nV == text::VertOrientation::NONE; if ( !bEnable ) { - m_pAtVertPosED->SetValue( 0, FUNIT_TWIP ); + m_pAtVertPosED->SetValue( 0, FieldUnit::TWIP ); if(nY != LONG_MAX && m_bHtmlMode) m_pAtVertPosED->SetModifyFlag(); } @@ -1386,7 +1386,7 @@ void SwFramePage::InitPos(RndStdIds eId, nY *= -1; } if ( nY != LONG_MAX ) - m_pAtVertPosED->SetValue( m_pAtVertPosED->Normalize(nY), FUNIT_TWIP ); + m_pAtVertPosED->SetValue( m_pAtVertPosED->Normalize(nY), FieldUnit::TWIP ); } m_pAtVertPosFT->Enable( bEnable && m_bAllowVertPositioning ); m_pAtVertPosED->Enable( bEnable && m_bAllowVertPositioning ); @@ -1838,9 +1838,9 @@ void SwFramePage::RangeModifyHdl() aVal.nVertOrient = text::VertOrientation::NONE; const long nAtHorzPosVal = static_cast< long >( - m_pAtHorzPosED->Denormalize(m_pAtHorzPosED->GetValue(FUNIT_TWIP)) ); + m_pAtHorzPosED->Denormalize(m_pAtHorzPosED->GetValue(FieldUnit::TWIP)) ); const long nAtVertPosVal = static_cast< long >( - m_pAtVertPosED->Denormalize(m_pAtVertPosED->GetValue(FUNIT_TWIP)) ); + m_pAtVertPosED->Denormalize(m_pAtVertPosED->GetValue(FieldUnit::TWIP)) ); aVal.nHPos = nAtHorzPosVal; aVal.nVPos = nAtVertPosVal; @@ -1852,8 +1852,8 @@ void SwFramePage::RangeModifyHdl() m_aHeightED.SetRefValue(aVal.aPercentSize.Height()); // ... and correctly convert width and height with it - SwTwips nWidth = static_cast< SwTwips >(m_aWidthED. DenormalizePercent(m_aWidthED.GetValue(FUNIT_TWIP))); - SwTwips nHeight = static_cast< SwTwips >(m_aHeightED.DenormalizePercent(m_aHeightED.GetValue(FUNIT_TWIP))); + SwTwips nWidth = static_cast< SwTwips >(m_aWidthED. DenormalizePercent(m_aWidthED.GetValue(FieldUnit::TWIP))); + SwTwips nHeight = static_cast< SwTwips >(m_aHeightED.DenormalizePercent(m_aHeightED.GetValue(FieldUnit::TWIP))); aVal.nWidth = nWidth; aVal.nHeight = nHeight; @@ -1880,8 +1880,8 @@ void SwFramePage::RangeModifyHdl() nHeight = aVal.nHeight; // minimum range also for template - m_aHeightED.SetMin(m_aHeightED.NormalizePercent(aVal.nMinHeight), FUNIT_TWIP); - m_aWidthED. SetMin(m_aWidthED.NormalizePercent(aVal.nMinWidth), FUNIT_TWIP); + m_aHeightED.SetMin(m_aHeightED.NormalizePercent(aVal.nMinHeight), FieldUnit::TWIP); + m_aWidthED. SetMin(m_aWidthED.NormalizePercent(aVal.nMinWidth), FieldUnit::TWIP); SwTwips nMaxWidth(aVal.nMaxWidth); SwTwips nMaxHeight(aVal.nMaxHeight); @@ -1889,34 +1889,34 @@ void SwFramePage::RangeModifyHdl() if (aVal.bAutoHeight && (m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog")) { SwTwips nTmp = std::min(nWidth * nMaxHeight / std::max(nHeight, 1L), nMaxHeight); - m_aWidthED.SetMax(m_aWidthED.NormalizePercent(nTmp), FUNIT_TWIP); + m_aWidthED.SetMax(m_aWidthED.NormalizePercent(nTmp), FieldUnit::TWIP); nTmp = std::min(nHeight * nMaxWidth / std::max(nWidth, 1L), nMaxWidth); - m_aHeightED.SetMax(m_aWidthED.NormalizePercent(nTmp), FUNIT_TWIP); + m_aHeightED.SetMax(m_aWidthED.NormalizePercent(nTmp), FieldUnit::TWIP); } else { SwTwips nTmp = static_cast< SwTwips >(m_aHeightED.NormalizePercent(nMaxHeight)); - m_aHeightED.SetMax(nTmp, FUNIT_TWIP); + m_aHeightED.SetMax(nTmp, FieldUnit::TWIP); nTmp = static_cast< SwTwips >(m_aWidthED.NormalizePercent(nMaxWidth)); - m_aWidthED.SetMax(nTmp, FUNIT_TWIP); + m_aWidthED.SetMax(nTmp, FieldUnit::TWIP); } - m_pAtHorzPosED->SetMin(m_pAtHorzPosED->Normalize(aVal.nMinHPos), FUNIT_TWIP); - m_pAtHorzPosED->SetMax(m_pAtHorzPosED->Normalize(aVal.nMaxHPos), FUNIT_TWIP); + m_pAtHorzPosED->SetMin(m_pAtHorzPosED->Normalize(aVal.nMinHPos), FieldUnit::TWIP); + m_pAtHorzPosED->SetMax(m_pAtHorzPosED->Normalize(aVal.nMaxHPos), FieldUnit::TWIP); if ( aVal.nHPos != nAtHorzPosVal ) - m_pAtHorzPosED->SetValue(m_pAtHorzPosED->Normalize(aVal.nHPos), FUNIT_TWIP); + m_pAtHorzPosED->SetValue(m_pAtHorzPosED->Normalize(aVal.nHPos), FieldUnit::TWIP); const SwTwips nUpperOffset = (aVal.nAnchorType == RndStdIds::FLY_AS_CHAR) ? m_nUpperBorder : 0; const SwTwips nLowerOffset = (aVal.nAnchorType == RndStdIds::FLY_AS_CHAR) ? m_nLowerBorder : 0; - m_pAtVertPosED->SetMin(m_pAtVertPosED->Normalize(aVal.nMinVPos + nLowerOffset + nUpperOffset), FUNIT_TWIP); - m_pAtVertPosED->SetMax(m_pAtVertPosED->Normalize(aVal.nMaxVPos), FUNIT_TWIP); + m_pAtVertPosED->SetMin(m_pAtVertPosED->Normalize(aVal.nMinVPos + nLowerOffset + nUpperOffset), FieldUnit::TWIP); + m_pAtVertPosED->SetMax(m_pAtVertPosED->Normalize(aVal.nMaxVPos), FieldUnit::TWIP); if ( aVal.nVPos != nAtVertPosVal ) - m_pAtVertPosED->SetValue(m_pAtVertPosED->Normalize(aVal.nVPos), FUNIT_TWIP); + m_pAtVertPosED->SetValue(m_pAtVertPosED->Normalize(aVal.nVPos), FieldUnit::TWIP); } IMPL_LINK_NOARG(SwFramePage, AnchorTypeHdl, Button*, void) @@ -2079,8 +2079,8 @@ IMPL_LINK( SwFramePage, RelHdl, ListBox&, rLB, void ) IMPL_LINK_NOARG(SwFramePage, RealSizeHdl, Button*, void) { - m_aWidthED.SetUserValue( m_aWidthED. NormalizePercent(m_aGrfSize.Width() ), FUNIT_TWIP); - m_aHeightED.SetUserValue(m_aHeightED.NormalizePercent(m_aGrfSize.Height()), FUNIT_TWIP); + m_aWidthED.SetUserValue( m_aWidthED. NormalizePercent(m_aGrfSize.Width() ), FieldUnit::TWIP); + m_aHeightED.SetUserValue(m_aHeightED.NormalizePercent(m_aGrfSize.Height()), FieldUnit::TWIP); m_fWidthHeightRatio = m_aGrfSize.Height() ? double(m_aGrfSize.Width()) / double(m_aGrfSize.Height()) : 1.0; UpdateExample(); } @@ -2099,19 +2099,19 @@ IMPL_LINK_NOARG(SwFramePage, AutoHeightClickHdl, Button*, void) IMPL_LINK( SwFramePage, ModifyHdl, Edit&, rEdit, void ) { - SwTwips nWidth = static_cast< SwTwips >(m_aWidthED.DenormalizePercent(m_aWidthED.GetValue(FUNIT_TWIP))); - SwTwips nHeight = static_cast< SwTwips >(m_aHeightED.DenormalizePercent(m_aHeightED.GetValue(FUNIT_TWIP))); + SwTwips nWidth = static_cast< SwTwips >(m_aWidthED.DenormalizePercent(m_aWidthED.GetValue(FieldUnit::TWIP))); + SwTwips nHeight = static_cast< SwTwips >(m_aHeightED.DenormalizePercent(m_aHeightED.GetValue(FieldUnit::TWIP))); if ( m_pFixedRatioCB->IsChecked() ) { if (&rEdit == m_aWidthED.get()) { nHeight = SwTwips(static_cast<double>(nWidth) / m_fWidthHeightRatio); - m_aHeightED.SetPrcntValue(m_aHeightED.NormalizePercent(nHeight), FUNIT_TWIP); + m_aHeightED.SetPrcntValue(m_aHeightED.NormalizePercent(nHeight), FieldUnit::TWIP); } else if (&rEdit == m_aHeightED.get()) { nWidth = SwTwips(static_cast<double>(nHeight) * m_fWidthHeightRatio); - m_aWidthED.SetPrcntValue(m_aWidthED.NormalizePercent(nWidth), FUNIT_TWIP); + m_aWidthED.SetPrcntValue(m_aWidthED.NormalizePercent(nWidth), FieldUnit::TWIP); } } m_fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0; @@ -2137,8 +2137,8 @@ void SwFramePage::UpdateExample() } // size - long nXPos = static_cast< long >(m_pAtHorzPosED->Denormalize(m_pAtHorzPosED->GetValue(FUNIT_TWIP))); - long nYPos = static_cast< long >(m_pAtVertPosED->Denormalize(m_pAtVertPosED->GetValue(FUNIT_TWIP))); + long nXPos = static_cast< long >(m_pAtHorzPosED->Denormalize(m_pAtHorzPosED->GetValue(FieldUnit::TWIP))); + long nYPos = static_cast< long >(m_pAtVertPosED->Denormalize(m_pAtVertPosED->GetValue(FieldUnit::TWIP))); m_pExampleWN->SetRelPos(Point(nXPos, nYPos)); m_pExampleWN->SetAnchor(GetAnchor()); @@ -2200,28 +2200,28 @@ void SwFramePage::Init(const SfxItemSet& rSet, bool bReset) sal_Int64 nWidth = m_aWidthED.NormalizePercent(rSize.GetWidth()); sal_Int64 nHeight = m_aHeightED.NormalizePercent(rSize.GetHeight()); - if (nWidth != m_aWidthED.GetValue(FUNIT_TWIP)) + if (nWidth != m_aWidthED.GetValue(FieldUnit::TWIP)) { if(!bReset) { // value was changed by circulation-Tabpage and // has to be set with Modify-Flag - m_aWidthED.SetUserValue(nWidth, FUNIT_TWIP); + m_aWidthED.SetUserValue(nWidth, FieldUnit::TWIP); } else - m_aWidthED.SetPrcntValue(nWidth, FUNIT_TWIP); + m_aWidthED.SetPrcntValue(nWidth, FieldUnit::TWIP); } - if (nHeight != m_aHeightED.GetValue(FUNIT_TWIP)) + if (nHeight != m_aHeightED.GetValue(FieldUnit::TWIP)) { if (!bReset) { // values was changed by circulation-Tabpage and // has to be set with Modify-Flag - m_aHeightED.SetUserValue(nHeight, FUNIT_TWIP); + m_aHeightED.SetUserValue(nHeight, FieldUnit::TWIP); } else - m_aHeightED.SetPrcntValue(nHeight, FUNIT_TWIP); + m_aHeightED.SetPrcntValue(nHeight, FieldUnit::TWIP); } if (!IsInGraficMode()) @@ -2324,14 +2324,14 @@ void SwFramePage::Init(const SfxItemSet& rSet, bool bReset) { m_pRelWidthCB->Check(); RelSizeClickHdl(m_pRelWidthCB); - m_aWidthED.SetPrcntValue(rSize.GetWidthPercent(), FUNIT_CUSTOM); + m_aWidthED.SetPrcntValue(rSize.GetWidthPercent(), FieldUnit::CUSTOM); } if (rSize.GetHeightPercent() && rSize.GetHeightPercent() != SwFormatFrameSize::SYNCED && !m_pRelHeightCB->IsChecked()) { m_pRelHeightCB->Check(); RelSizeClickHdl(m_pRelHeightCB); - m_aHeightED.SetPrcntValue(rSize.GetHeightPercent(), FUNIT_CUSTOM); + m_aHeightED.SetPrcntValue(rSize.GetHeightPercent(), FieldUnit::CUSTOM); } m_pRelWidthCB->SaveValue(); m_pRelHeightCB->SaveValue(); diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 2df017529f32..41eade66087f 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -79,10 +79,10 @@ SwWrapTabPage::SwWrapTabPage(TabPageParent pParent, const SfxItemSet &rSet) , m_xWrapParallelRB(m_xBuilder->weld_radio_button("parallel")) , m_xWrapThroughRB(m_xBuilder->weld_radio_button("through")) , m_xIdealWrapRB(m_xBuilder->weld_radio_button("optimal")) - , m_xLeftMarginED(m_xBuilder->weld_metric_spin_button("left", FUNIT_CM)) - , m_xRightMarginED(m_xBuilder->weld_metric_spin_button("right", FUNIT_CM)) - , m_xTopMarginED(m_xBuilder->weld_metric_spin_button("top", FUNIT_CM)) - , m_xBottomMarginED(m_xBuilder->weld_metric_spin_button("bottom", FUNIT_CM)) + , m_xLeftMarginED(m_xBuilder->weld_metric_spin_button("left", FieldUnit::CM)) + , m_xRightMarginED(m_xBuilder->weld_metric_spin_button("right", FieldUnit::CM)) + , m_xTopMarginED(m_xBuilder->weld_metric_spin_button("top", FieldUnit::CM)) + , m_xBottomMarginED(m_xBuilder->weld_metric_spin_button("bottom", FieldUnit::CM)) , m_xWrapAnchorOnlyCB(m_xBuilder->weld_check_button("anchoronly")) , m_xWrapTransparentCB(m_xBuilder->weld_check_button("transparent")) , m_xWrapOutlineCB(m_xBuilder->weld_check_button("outline")) @@ -236,10 +236,10 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet) const SvxLRSpaceItem& rLR = rSet->Get(RES_LR_SPACE); // gap to text - m_xLeftMarginED->set_value(m_xLeftMarginED->normalize(rLR.GetLeft()), FUNIT_TWIP); - m_xRightMarginED->set_value(m_xRightMarginED->normalize(rLR.GetRight()), FUNIT_TWIP); - m_xTopMarginED->set_value(m_xTopMarginED->normalize(rUL.GetUpper()), FUNIT_TWIP); - m_xBottomMarginED->set_value(m_xBottomMarginED->normalize(rUL.GetLower()), FUNIT_TWIP); + m_xLeftMarginED->set_value(m_xLeftMarginED->normalize(rLR.GetLeft()), FieldUnit::TWIP); + m_xRightMarginED->set_value(m_xRightMarginED->normalize(rLR.GetRight()), FieldUnit::TWIP); + m_xTopMarginED->set_value(m_xTopMarginED->normalize(rUL.GetUpper()), FieldUnit::TWIP); + m_xBottomMarginED->set_value(m_xBottomMarginED->normalize(rUL.GetLower()), FieldUnit::TWIP); m_xLeftMarginED->save_value(); m_xRightMarginED->save_value(); @@ -312,8 +312,8 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) bool bBottomMod = m_xBottomMarginED->get_value_changed_from_saved(); SvxULSpaceItem aUL( RES_UL_SPACE ); - aUL.SetUpper(static_cast<sal_uInt16>(m_xTopMarginED->denormalize(m_xTopMarginED->get_value(FUNIT_TWIP)))); - aUL.SetLower(static_cast<sal_uInt16>(m_xBottomMarginED->denormalize(m_xBottomMarginED->get_value(FUNIT_TWIP)))); + aUL.SetUpper(static_cast<sal_uInt16>(m_xTopMarginED->denormalize(m_xTopMarginED->get_value(FieldUnit::TWIP)))); + aUL.SetLower(static_cast<sal_uInt16>(m_xBottomMarginED->denormalize(m_xBottomMarginED->get_value(FieldUnit::TWIP)))); if ( bTopMod || bBottomMod ) { @@ -329,8 +329,8 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) bool bRightMod = m_xRightMarginED->get_value_changed_from_saved(); SvxLRSpaceItem aLR( RES_LR_SPACE ); - aLR.SetLeft(static_cast<sal_uInt16>(m_xLeftMarginED->denormalize(m_xLeftMarginED->get_value(FUNIT_TWIP)))); - aLR.SetRight(static_cast<sal_uInt16>(m_xRightMarginED->denormalize(m_xRightMarginED->get_value(FUNIT_TWIP)))); + aLR.SetLeft(static_cast<sal_uInt16>(m_xLeftMarginED->denormalize(m_xLeftMarginED->get_value(FieldUnit::TWIP)))); + aLR.SetRight(static_cast<sal_uInt16>(m_xRightMarginED->denormalize(m_xRightMarginED->get_value(FieldUnit::TWIP)))); if ( bLeftMod || bRightMod ) { @@ -435,11 +435,11 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) nRight = nLeft; } - m_xLeftMarginED->set_max(m_xLeftMarginED->normalize(nLeft), FUNIT_TWIP); - m_xRightMarginED->set_max(m_xRightMarginED->normalize(nRight), FUNIT_TWIP); + m_xLeftMarginED->set_max(m_xLeftMarginED->normalize(nLeft), FieldUnit::TWIP); + m_xRightMarginED->set_max(m_xRightMarginED->normalize(nRight), FieldUnit::TWIP); - m_xTopMarginED->set_max(m_xTopMarginED->normalize(nTop), FUNIT_TWIP); - m_xBottomMarginED->set_max(m_xBottomMarginED->normalize(nBottom), FUNIT_TWIP); + m_xTopMarginED->set_max(m_xTopMarginED->normalize(nTop), FieldUnit::TWIP); + m_xBottomMarginED->set_max(m_xBottomMarginED->normalize(nBottom), FieldUnit::TWIP); RangeModifyHdl(*m_xLeftMarginED); RangeModifyHdl(*m_xTopMarginED); @@ -538,7 +538,7 @@ DeactivateRC SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) IMPL_LINK(SwWrapTabPage, RangeModifyHdl, weld::MetricSpinButton&, rEdit, void) { - auto nValue = rEdit.get_value(FUNIT_NONE); + auto nValue = rEdit.get_value(FieldUnit::NONE); weld::MetricSpinButton* pOpposite = nullptr; if (&rEdit == m_xLeftMarginED.get()) pOpposite = m_xRightMarginED.get(); @@ -553,10 +553,10 @@ IMPL_LINK(SwWrapTabPage, RangeModifyHdl, weld::MetricSpinButton&, rEdit, void) if (pOpposite) { - auto nOpposite = pOpposite->get_value(FUNIT_NONE); + auto nOpposite = pOpposite->get_value(FieldUnit::NONE); - if (nValue + nOpposite > std::max(rEdit.get_max(FUNIT_NONE), pOpposite->get_max(FUNIT_NONE))) - pOpposite->set_value(pOpposite->get_max(FUNIT_NONE) - nValue, FUNIT_NONE); + if (nValue + nOpposite > std::max(rEdit.get_max(FieldUnit::NONE), pOpposite->get_max(FieldUnit::NONE))) + pOpposite->set_value(pOpposite->get_max(FieldUnit::NONE) - nValue, FieldUnit::NONE); } } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index fc12daa00696..94aaf4930544 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2481,7 +2481,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) m_pAutoRightCB->Enable(bTabStop); if(bTabStop) { - m_pTabPosMF->SetValue(m_pTabPosMF->Normalize(rToken.nTabStopPosition), FUNIT_TWIP); + m_pTabPosMF->SetValue(m_pTabPosMF->Normalize(rToken.nTabStopPosition), FieldUnit::TWIP); m_pAutoRightCB->Check(SvxTabAdjust::End == rToken.eTabAlign); m_pFillCharCB->SetText(OUString(rToken.cTabFillChar)); m_pTabPosFT->Enable(!m_pAutoRightCB->IsChecked()); @@ -2616,7 +2616,7 @@ IMPL_LINK(SwTOXEntryTabPage, TabPosHdl, Edit&, rEdit, void) if( pCtrl && WindowType::EDIT != pCtrl->GetType() ) { static_cast<SwTOXButton*>(pCtrl)->SetTabPosition( static_cast< SwTwips >( - pField->Denormalize( pField->GetValue( FUNIT_TWIP )))); + pField->Denormalize( pField->GetValue( FieldUnit::TWIP )))); } ModifyHdl(nullptr); } diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 0c46aa3f4463..8ee82b88cfe1 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -75,7 +75,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(const SwView& rVw) , m_xCharStyleLB(m_xBuilder->weld_combo_box("styledropdown")) , m_xFormatLB(new SwNumberingTypeListBox(m_xBuilder->weld_combo_box("formatdropdown"))) , m_xPosLB(m_xBuilder->weld_combo_box("positiondropdown")) - , m_xOffsetMF(m_xBuilder->weld_metric_spin_button("spacingspin", FUNIT_CM)) + , m_xOffsetMF(m_xBuilder->weld_metric_spin_button("spacingspin", FieldUnit::CM)) , m_xDivisorED(m_xBuilder->weld_entry("textentry")) , m_xCountEmptyLinesCB(m_xBuilder->weld_check_button("blanklines")) , m_xCountFrameLinesCB(m_xBuilder->weld_check_button("linesintextframes")) @@ -136,7 +136,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(const SwView& rVw) FieldUnit eFieldUnit = SW_MOD()->GetUsrPref(dynamic_cast< const SwWebDocShell*>( rVw.GetDocShell()) != nullptr)->GetMetric(); ::SetFieldUnit(*m_xOffsetMF, eFieldUnit); - m_xOffsetMF->set_value(m_xOffsetMF->normalize(nOffset), FUNIT_TWIP); + m_xOffsetMF->set_value(m_xOffsetMF->normalize(nOffset), FieldUnit::TWIP); // numbering offset m_xNumIntervalNF->set_value(rInf.GetCountBy()); @@ -209,7 +209,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl, weld::Button&, void) aInf.SetPos(static_cast<LineNumberPosition>(m_xPosLB->get_active())); // offset - aInf.SetPosFromLeft(static_cast<sal_uInt16>(m_xOffsetMF->denormalize(m_xOffsetMF->get_value(FUNIT_TWIP)))); + aInf.SetPosFromLeft(static_cast<sal_uInt16>(m_xOffsetMF->denormalize(m_xOffsetMF->get_value(FieldUnit::TWIP)))); // numbering offset aInf.SetCountBy(static_cast<sal_uInt16>(m_xNumIntervalNF->get_value())); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 764eec430efa..1ba855ed1239 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -67,24 +67,24 @@ SwNumPositionTabPage::SwNumPositionTabPage(TabPageParent pParent, const SfxItemS , m_xLevelLB(m_xBuilder->weld_tree_view("levellb")) , m_xPositionFrame(m_xBuilder->weld_widget("numberingframe")) , m_xDistBorderFT(m_xBuilder->weld_label("indent")) - , m_xDistBorderMF(m_xBuilder->weld_metric_spin_button("indentmf", FUNIT_CM)) + , m_xDistBorderMF(m_xBuilder->weld_metric_spin_button("indentmf", FieldUnit::CM)) , m_xRelativeCB(m_xBuilder->weld_check_button("relative")) , m_xIndentFT(m_xBuilder->weld_label("numberingwidth")) - , m_xIndentMF(m_xBuilder->weld_metric_spin_button("numberingwidthmf", FUNIT_CM)) + , m_xIndentMF(m_xBuilder->weld_metric_spin_button("numberingwidthmf", FieldUnit::CM)) , m_xDistNumFT(m_xBuilder->weld_label("numdist")) - , m_xDistNumMF(m_xBuilder->weld_metric_spin_button("numdistmf", FUNIT_CM)) + , m_xDistNumMF(m_xBuilder->weld_metric_spin_button("numdistmf", FieldUnit::CM)) , m_xAlignFT(m_xBuilder->weld_label("numalign")) , m_xAlignLB(m_xBuilder->weld_combo_box("numalignlb")) , m_xLabelFollowedByFT(m_xBuilder->weld_label("numfollowedby")) , m_xLabelFollowedByLB(m_xBuilder->weld_combo_box("numfollowedbylb")) , m_xListtabFT(m_xBuilder->weld_label("at")) - , m_xListtabMF(m_xBuilder->weld_metric_spin_button("atmf", FUNIT_CM)) + , m_xListtabMF(m_xBuilder->weld_metric_spin_button("atmf", FieldUnit::CM)) , m_xAlign2FT(m_xBuilder->weld_label("num2align")) , m_xAlign2LB(m_xBuilder->weld_combo_box("num2alignlb")) , m_xAlignedAtFT(m_xBuilder->weld_label("alignedat")) - , m_xAlignedAtMF(m_xBuilder->weld_metric_spin_button("alignedatmf", FUNIT_CM)) + , m_xAlignedAtMF(m_xBuilder->weld_metric_spin_button("alignedatmf", FieldUnit::CM)) , m_xIndentAtFT(m_xBuilder->weld_label("indentat")) - , m_xIndentAtMF(m_xBuilder->weld_metric_spin_button("indentatmf", FUNIT_CM)) + , m_xIndentAtMF(m_xBuilder->weld_metric_spin_button("indentatmf", FieldUnit::CM)) , m_xStandardPB(m_xBuilder->weld_button("standard")) , m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWIN)) { @@ -243,17 +243,17 @@ void SwNumPositionTabPage::InitControls() { nDistBorderNum = static_cast<long>(aNumFormatArr[nLvl]->GetAbsLSpace())+ aNumFormatArr[nLvl]->GetFirstLineOffset(); } - m_xDistBorderMF->set_value(m_xDistBorderMF->normalize(nDistBorderNum),FUNIT_TWIP); + m_xDistBorderMF->set_value(m_xDistBorderMF->normalize(nDistBorderNum),FieldUnit::TWIP); } else bSetDistEmpty = true; if(bSameDist) - m_xDistNumMF->set_value(m_xDistNumMF->normalize(aNumFormatArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP); + m_xDistNumMF->set_value(m_xDistNumMF->normalize(aNumFormatArr[nLvl]->GetCharTextDistance()), FieldUnit::TWIP); else m_xDistNumMF->set_text(aEmptyOUStr); if(bSameIndent) - m_xIndentMF->set_value(m_xIndentMF->normalize(-aNumFormatArr[nLvl]->GetFirstLineOffset()), FUNIT_TWIP); + m_xIndentMF->set_value(m_xIndentMF->normalize(-aNumFormatArr[nLvl]->GetFirstLineOffset()), FieldUnit::TWIP); else m_xIndentMF->set_text(aEmptyOUStr); @@ -301,7 +301,7 @@ void SwNumPositionTabPage::InitControls() m_xListtabMF->set_sensitive(true); if ( bSameListtab ) { - m_xListtabMF->set_value(m_xListtabMF->normalize(aNumFormatArr[nLvl]->GetListtabPos()),FUNIT_TWIP); + m_xListtabMF->set_value(m_xListtabMF->normalize(aNumFormatArr[nLvl]->GetListtabPos()),FieldUnit::TWIP); } else { @@ -320,7 +320,7 @@ void SwNumPositionTabPage::InitControls() m_xAlignedAtMF->set_value( m_xAlignedAtMF->normalize( aNumFormatArr[nLvl]->GetIndentAt() + aNumFormatArr[nLvl]->GetFirstLineIndent()), - FUNIT_TWIP ); + FieldUnit::TWIP ); } else { @@ -330,7 +330,7 @@ void SwNumPositionTabPage::InitControls() if ( bSameIndentAt ) { m_xIndentAtMF->set_value( - m_xIndentAtMF->normalize( aNumFormatArr[nLvl]->GetIndentAt()), FUNIT_TWIP ); + m_xIndentAtMF->normalize( aNumFormatArr[nLvl]->GetIndentAt()), FieldUnit::TWIP ); } else { @@ -508,17 +508,17 @@ void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) const SwTwips nWidth = pWrtSh->GetAnyCurRect(CurRectType::Frame).Width(); - m_xDistBorderMF->set_max(m_xDistBorderMF->normalize( nWidth ), FUNIT_TWIP ); - m_xDistNumMF->set_max(m_xDistNumMF->normalize( nWidth ), FUNIT_TWIP); - m_xIndentMF->set_max(m_xIndentMF->normalize( nWidth ), FUNIT_TWIP ); - m_xListtabMF->set_max(m_xListtabMF->normalize( nWidth ), FUNIT_TWIP ); - m_xAlignedAtMF->set_max(m_xAlignedAtMF->normalize( nWidth ), FUNIT_TWIP ); - m_xIndentAtMF->set_max(m_xIndentAtMF->normalize( nWidth ), FUNIT_TWIP ); + m_xDistBorderMF->set_max(m_xDistBorderMF->normalize( nWidth ), FieldUnit::TWIP ); + m_xDistNumMF->set_max(m_xDistNumMF->normalize( nWidth ), FieldUnit::TWIP); + m_xIndentMF->set_max(m_xIndentMF->normalize( nWidth ), FieldUnit::TWIP ); + m_xListtabMF->set_max(m_xListtabMF->normalize( nWidth ), FieldUnit::TWIP ); + m_xAlignedAtMF->set_max(m_xAlignedAtMF->normalize( nWidth ), FieldUnit::TWIP ); + m_xIndentAtMF->set_max(m_xIndentAtMF->normalize( nWidth ), FieldUnit::TWIP ); const SwRect& rPrtRect = pWrtSh->GetAnyCurRect(CurRectType::Page); m_aPreviewWIN.SetPageWidth(rPrtRect.Width()); FieldUnit eMetric = ::GetDfltMetric( dynamic_cast<SwWebView*>( &pWrtSh->GetView()) != nullptr ); - if(eMetric == FUNIT_MM) + if(eMetric == FieldUnit::MM) { m_xDistBorderMF->set_digits(1); m_xDistNumMF->set_digits(1); @@ -608,7 +608,7 @@ IMPL_LINK(SwNumPositionTabPage, DistanceHdl, weld::MetricSpinButton&, rField, vo { if(bInInintControl) return; - long nValue = static_cast< long >(rField.denormalize(rField.get_value(FUNIT_TWIP))); + long nValue = static_cast< long >(rField.denormalize(rField.get_value(FieldUnit::TWIP))); sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) { @@ -693,7 +693,7 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, weld::ToggleButton&, rBox, void ) } if(bSetValue) - m_xDistBorderMF->set_value(m_xDistBorderMF->normalize(nValue), FUNIT_TWIP); + m_xDistBorderMF->set_value(m_xDistBorderMF->normalize(nValue), FieldUnit::TWIP); else m_xDistBorderMF->set_text(aEmptyOUStr); m_xDistBorderMF->set_sensitive(bOn || bSingleSelection || pOutlineDlg); @@ -753,7 +753,7 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl, weld::ComboBox&, { m_xListtabMF->set_value( m_xListtabMF->normalize( pActNum->Get( nFirstLvl ).GetListtabPos() ), - FUNIT_TWIP ); + FieldUnit::TWIP ); } else { @@ -766,7 +766,7 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl, weld::ComboBox&, IMPL_LINK( SwNumPositionTabPage, ListtabPosHdl_Impl, weld::MetricSpinButton&, rField, void ) { // determine value to be set at the chosen list levels - const long nValue = static_cast< long >(rField.denormalize(rField.get_value(FUNIT_TWIP))); + const long nValue = static_cast< long >(rField.denormalize(rField.get_value(FieldUnit::TWIP))); // set value at the chosen list levels sal_uInt16 nMask = 1; @@ -787,7 +787,7 @@ IMPL_LINK( SwNumPositionTabPage, ListtabPosHdl_Impl, weld::MetricSpinButton&, rF IMPL_LINK( SwNumPositionTabPage, AlignAtHdl_Impl, weld::MetricSpinButton&, rField, void ) { // determine value to be set at the chosen list levels - const long nValue = static_cast< long >(rField.denormalize(rField.get_value(FUNIT_TWIP))); + const long nValue = static_cast< long >(rField.denormalize(rField.get_value(FieldUnit::TWIP))); // set value at the chosen list levels sal_uInt16 nMask = 1; @@ -809,7 +809,7 @@ IMPL_LINK( SwNumPositionTabPage, AlignAtHdl_Impl, weld::MetricSpinButton&, rFiel IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, weld::MetricSpinButton&, rField, void ) { // determine value to be set at the chosen list levels - const long nValue = static_cast< long >(rField.denormalize(rField.get_value(FUNIT_TWIP))); + const long nValue = static_cast< long >(rField.denormalize(rField.get_value(FieldUnit::TWIP))); // set value at the chosen list levels sal_uInt16 nMask = 1; diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 0868a4cb38fb..f4cdf538c717 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -72,26 +72,26 @@ IMPL_LINK_NOARG(SwFootNotePage, HeightMetric, weld::ToggleButton&, void) IMPL_LINK_NOARG(SwFootNotePage, HeightModify, weld::MetricSpinButton&, void) { m_xMaxHeightEdit->set_max(m_xMaxHeightEdit->normalize(lMaxHeight - - (m_xDistEdit->denormalize(m_xDistEdit->get_value(FUNIT_TWIP)) + - m_xLineDistEdit->denormalize(m_xLineDistEdit->get_value(FUNIT_TWIP)))), - FUNIT_TWIP); - if (m_xMaxHeightEdit->get_value(FUNIT_NONE) < 0) - m_xMaxHeightEdit->set_value(0, FUNIT_NONE); + (m_xDistEdit->denormalize(m_xDistEdit->get_value(FieldUnit::TWIP)) + + m_xLineDistEdit->denormalize(m_xLineDistEdit->get_value(FieldUnit::TWIP)))), + FieldUnit::TWIP); + if (m_xMaxHeightEdit->get_value(FieldUnit::NONE) < 0) + m_xMaxHeightEdit->set_value(0, FieldUnit::NONE); m_xDistEdit->set_max(m_xDistEdit->normalize(lMaxHeight - - (m_xMaxHeightEdit->denormalize(m_xMaxHeightEdit->get_value(FUNIT_TWIP)) + - m_xLineDistEdit->denormalize(m_xLineDistEdit->get_value(FUNIT_TWIP)))), - FUNIT_TWIP); - if (m_xDistEdit->get_value(FUNIT_NONE) < 0) - m_xDistEdit->set_value(0, FUNIT_NONE); + (m_xMaxHeightEdit->denormalize(m_xMaxHeightEdit->get_value(FieldUnit::TWIP)) + + m_xLineDistEdit->denormalize(m_xLineDistEdit->get_value(FieldUnit::TWIP)))), + FieldUnit::TWIP); + if (m_xDistEdit->get_value(FieldUnit::NONE) < 0) + m_xDistEdit->set_value(0, FieldUnit::NONE); m_xLineDistEdit->set_max(m_xLineDistEdit->normalize(lMaxHeight - - (m_xMaxHeightEdit->denormalize(m_xMaxHeightEdit->get_value(FUNIT_TWIP)) + - m_xDistEdit->denormalize(m_xDistEdit->get_value(FUNIT_TWIP)))), - FUNIT_TWIP); + (m_xMaxHeightEdit->denormalize(m_xMaxHeightEdit->get_value(FieldUnit::TWIP)) + + m_xDistEdit->denormalize(m_xDistEdit->get_value(FieldUnit::TWIP)))), + FieldUnit::TWIP); } IMPL_LINK_NOARG(SwFootNotePage, LineWidthChanged_Impl, weld::MetricSpinButton&, void) { - sal_Int64 nVal = m_xLineWidthEdit->get_value(FUNIT_NONE); + sal_Int64 nVal = m_xLineWidthEdit->get_value(FieldUnit::NONE); nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( nVal, m_xLineWidthEdit->get_digits(), @@ -109,14 +109,14 @@ SwFootNotePage::SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet) , lMaxHeight(0) , m_xMaxHeightPageBtn(m_xBuilder->weld_radio_button("maxheightpage")) , m_xMaxHeightBtn(m_xBuilder->weld_radio_button("maxheight")) - , m_xMaxHeightEdit(m_xBuilder->weld_metric_spin_button("maxheightsb", FUNIT_CM)) - , m_xDistEdit(m_xBuilder->weld_metric_spin_button("spacetotext", FUNIT_CM)) + , m_xMaxHeightEdit(m_xBuilder->weld_metric_spin_button("maxheightsb", FieldUnit::CM)) + , m_xDistEdit(m_xBuilder->weld_metric_spin_button("spacetotext", FieldUnit::CM)) , m_xLinePosBox(m_xBuilder->weld_combo_box("position")) , m_xLineTypeBox(new SvtLineListBox(m_xBuilder->weld_menu_button("style"))) - , m_xLineWidthEdit(m_xBuilder->weld_metric_spin_button("thickness", FUNIT_POINT)) + , m_xLineWidthEdit(m_xBuilder->weld_metric_spin_button("thickness", FieldUnit::POINT)) , m_xLineColorBox(new ColorListBox(m_xBuilder->weld_menu_button("color"), pParent.GetFrameWeld())) - , m_xLineLengthEdit(m_xBuilder->weld_metric_spin_button("length", FUNIT_PERCENT)) - , m_xLineDistEdit(m_xBuilder->weld_metric_spin_button("spacingtocontents", FUNIT_CM)) + , m_xLineLengthEdit(m_xBuilder->weld_metric_spin_button("length", FieldUnit::PERCENT)) + , m_xLineDistEdit(m_xBuilder->weld_metric_spin_button("spacingtocontents", FieldUnit::CM)) { SetExchangeSupport(); FieldUnit aMetric = ::GetDfltMetric(false); @@ -125,7 +125,7 @@ SwFootNotePage::SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet) ::SetFieldUnit(*m_xLineDistEdit, aMetric); MeasurementSystem eSys = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); long nHeightValue = MeasurementSystem::Metric != eSys ? 1440 : 1134; - m_xMaxHeightEdit->set_value(m_xMaxHeightEdit->normalize(nHeightValue),FUNIT_TWIP); + m_xMaxHeightEdit->set_value(m_xMaxHeightEdit->normalize(nHeightValue),FieldUnit::TWIP); } SwFootNotePage::~SwFootNotePage() @@ -166,7 +166,7 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet) SwTwips lHeight = pFootnoteInfo->GetHeight(); if(lHeight) { - m_xMaxHeightEdit->set_value(m_xMaxHeightEdit->normalize(lHeight),FUNIT_TWIP); + m_xMaxHeightEdit->set_value(m_xMaxHeightEdit->normalize(lHeight),FieldUnit::TWIP); m_xMaxHeightBtn->set_active(true); } else @@ -187,10 +187,10 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet) sal_Int64 nWidthPt = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( sal_Int64( pFootnoteInfo->GetLineWidth() ), m_xLineWidthEdit->get_digits(), MapUnit::MapTwip, m_xLineWidthEdit->get_unit( ) )); - m_xLineWidthEdit->set_value(nWidthPt, FUNIT_NONE); + m_xLineWidthEdit->set_value(nWidthPt, FieldUnit::NONE); // Separator style - m_xLineTypeBox->SetSourceUnit( FUNIT_TWIP ); + m_xLineTypeBox->SetSourceUnit( FieldUnit::TWIP ); m_xLineTypeBox->InsertEntry( ::editeng::SvxBorderLine::getWidthImpl(SvxBorderLineStyle::SOLID), @@ -215,12 +215,12 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet) // width Fraction aTmp( 100, 1 ); aTmp *= pFootnoteInfo->GetWidth(); - m_xLineLengthEdit->set_value(static_cast<long>(aTmp), FUNIT_PERCENT); + m_xLineLengthEdit->set_value(static_cast<long>(aTmp), FieldUnit::PERCENT); // gap footnote area - m_xDistEdit->set_value(m_xDistEdit->normalize(pFootnoteInfo->GetTopDist()), FUNIT_TWIP); + m_xDistEdit->set_value(m_xDistEdit->normalize(pFootnoteInfo->GetTopDist()), FieldUnit::TWIP); m_xLineDistEdit->set_value( - m_xLineDistEdit->normalize(pFootnoteInfo->GetBottomDist()), FUNIT_TWIP); + m_xLineDistEdit->normalize(pFootnoteInfo->GetBottomDist()), FieldUnit::TWIP); ActivatePage( *rSet ); } @@ -235,21 +235,21 @@ bool SwFootNotePage::FillItemSet(SfxItemSet *rSet) // footnote area's height if (m_xMaxHeightBtn->get_active()) rFootnoteInfo.SetHeight( static_cast< SwTwips >( - m_xMaxHeightEdit->denormalize(m_xMaxHeightEdit->get_value(FUNIT_TWIP)))); + m_xMaxHeightEdit->denormalize(m_xMaxHeightEdit->get_value(FieldUnit::TWIP)))); else rFootnoteInfo.SetHeight(0); // gap footnote area rFootnoteInfo.SetTopDist( static_cast< SwTwips >( - m_xDistEdit->denormalize(m_xDistEdit->get_value(FUNIT_TWIP)))); + m_xDistEdit->denormalize(m_xDistEdit->get_value(FieldUnit::TWIP)))); rFootnoteInfo.SetBottomDist( static_cast< SwTwips >( - m_xLineDistEdit->denormalize(m_xLineDistEdit->get_value(FUNIT_TWIP)))); + m_xLineDistEdit->denormalize(m_xLineDistEdit->get_value(FieldUnit::TWIP)))); // Separator style rFootnoteInfo.SetLineStyle(m_xLineTypeBox->GetSelectEntryStyle()); // Separator width - sal_Int64 nWidth = m_xLineWidthEdit->get_value(FUNIT_NONE); + sal_Int64 nWidth = m_xLineWidthEdit->get_value(FieldUnit::NONE); nWidth = static_cast<long>(MetricField::ConvertDoubleValue( nWidth, m_xLineWidthEdit->get_digits(), @@ -263,7 +263,7 @@ bool SwFootNotePage::FillItemSet(SfxItemSet *rSet) rFootnoteInfo.SetAdj(static_cast<css::text::HorizontalAdjust>(m_xLinePosBox->get_active())); // Width - rFootnoteInfo.SetWidth(Fraction(m_xLineLengthEdit->get_value(FUNIT_PERCENT), 100)); + rFootnoteInfo.SetWidth(Fraction(m_xLineLengthEdit->get_value(FieldUnit::PERCENT), 100)); const SfxPoolItem* pOldItem; if(nullptr == (pOldItem = GetOldItem( *rSet, FN_PARAM_FTN_INFO )) || diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index a89076bf32f9..85686aace8bc 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -58,14 +58,14 @@ SwTextGridPage::SwTextGridPage(TabPageParent pParent, const SfxItemSet &rSet) , m_xLayoutFL(m_xBuilder->weld_widget("frameFL_LAYOUT")) , m_xLinesPerPageNF(m_xBuilder->weld_spin_button("spinNF_LINESPERPAGE")) , m_xLinesRangeFT(m_xBuilder->weld_label("labelFT_LINERANGE")) - , m_xTextSizeMF(m_xBuilder->weld_metric_spin_button("spinMF_TEXTSIZE", FUNIT_POINT)) + , m_xTextSizeMF(m_xBuilder->weld_metric_spin_button("spinMF_TEXTSIZE", FieldUnit::POINT)) , m_xCharsPerLineFT(m_xBuilder->weld_label("labelFT_CHARSPERLINE")) , m_xCharsPerLineNF(m_xBuilder->weld_spin_button("spinNF_CHARSPERLINE")) , m_xCharsRangeFT(m_xBuilder->weld_label("labelFT_CHARRANGE")) , m_xCharWidthFT(m_xBuilder->weld_label("labelFT_CHARWIDTH")) - , m_xCharWidthMF(m_xBuilder->weld_metric_spin_button("spinMF_CHARWIDTH", FUNIT_POINT)) + , m_xCharWidthMF(m_xBuilder->weld_metric_spin_button("spinMF_CHARWIDTH", FieldUnit::POINT)) , m_xRubySizeFT(m_xBuilder->weld_label("labelFT_RUBYSIZE")) - , m_xRubySizeMF(m_xBuilder->weld_metric_spin_button("spinMF_RUBYSIZE", FUNIT_POINT)) + , m_xRubySizeMF(m_xBuilder->weld_metric_spin_button("spinMF_RUBYSIZE", FieldUnit::POINT)) , m_xRubyBelowCB(m_xBuilder->weld_check_button("checkCB_RUBYBELOW")) , m_xDisplayFL(m_xBuilder->weld_widget("frameFL_DISPLAY")) , m_xDisplayCB(m_xBuilder->weld_check_button("checkCB_DISPLAY")) @@ -188,9 +188,9 @@ void SwTextGridPage::Reset(const SfxItemSet *rSet) SetLinesOrCharsRanges(*m_xLinesRangeFT , m_xLinesPerPageNF->get_max()); m_nRubyUserValue = rGridItem.GetBaseHeight(); m_bRubyUserValue = true; - m_xTextSizeMF->set_value(m_xTextSizeMF->normalize(m_nRubyUserValue), FUNIT_TWIP); - m_xRubySizeMF->set_value(m_xRubySizeMF->normalize(rGridItem.GetRubyHeight()), FUNIT_TWIP); - m_xCharWidthMF->set_value(m_xCharWidthMF->normalize(rGridItem.GetBaseWidth()), FUNIT_TWIP); + m_xTextSizeMF->set_value(m_xTextSizeMF->normalize(m_nRubyUserValue), FieldUnit::TWIP); + m_xRubySizeMF->set_value(m_xRubySizeMF->normalize(rGridItem.GetRubyHeight()), FieldUnit::TWIP); + m_xCharWidthMF->set_value(m_xCharWidthMF->normalize(rGridItem.GetBaseWidth()), FieldUnit::TWIP); m_xRubyBelowCB->set_active(rGridItem.IsRubyTextBelow()); m_xPrintCB->set_active(rGridItem.IsPrintGrid()); m_xColorLB->SelectEntry(rGridItem.GetColor()); @@ -234,9 +234,9 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet) aGridItem.SetLines( static_cast< sal_uInt16 >(m_xLinesPerPageNF->get_value()) ); aGridItem.SetBaseHeight( static_cast< sal_uInt16 >( m_bRubyUserValue ? m_nRubyUserValue : - m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FUNIT_TWIP))) ); - aGridItem.SetRubyHeight( static_cast< sal_uInt16 >(m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FUNIT_TWIP))) ); - aGridItem.SetBaseWidth( static_cast< sal_uInt16 >(m_xCharWidthMF->denormalize(m_xCharWidthMF->get_value(FUNIT_TWIP))) ); + m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FieldUnit::TWIP))) ); + aGridItem.SetRubyHeight( static_cast< sal_uInt16 >(m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FieldUnit::TWIP))) ); + aGridItem.SetBaseWidth( static_cast< sal_uInt16 >(m_xCharWidthMF->denormalize(m_xCharWidthMF->get_value(FieldUnit::TWIP))) ); aGridItem.SetRubyTextBelow(m_xRubyBelowCB->get_active()); aGridItem.SetSquaredMode(m_bSquaredMode); aGridItem.SetDisplayGrid(m_xDisplayCB->get_active()); @@ -252,8 +252,8 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet) m_bHRulerChanged = true; } m_bVRulerChanged = true; - pView->GetHRuler().SetCharWidth(static_cast<long>(m_xCharWidthMF->get_value(FUNIT_TWIP)/56.7)); - pView->GetVRuler().SetLineHeight(static_cast<long>(m_xTextSizeMF->get_value(FUNIT_TWIP)/56.7)); + pView->GetHRuler().SetCharWidth(static_cast<long>(m_xCharWidthMF->get_value(FieldUnit::TWIP)/56.7)); + pView->GetVRuler().SetLineHeight(static_cast<long>(m_xTextSizeMF->get_value(FieldUnit::TWIP)/56.7)); } } @@ -296,21 +296,21 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet) sal_Int32 nTextSize = static_cast< sal_Int32 >(m_bRubyUserValue ? m_nRubyUserValue : - m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FUNIT_TWIP))); + m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FieldUnit::TWIP))); if ( m_bSquaredMode ) { m_xCharsPerLineNF->set_value(m_aPageSize.Width() / nTextSize); m_xCharsPerLineNF->set_max(m_xCharsPerLineNF->get_value()); m_xLinesPerPageNF->set_max(m_aPageSize.Height() / - ( m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FUNIT_TWIP)) + - m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FUNIT_TWIP)))); + ( m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FieldUnit::TWIP)) + + m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FieldUnit::TWIP)))); SetLinesOrCharsRanges( *m_xCharsRangeFT , m_xCharsPerLineNF->get_max() ); SetLinesOrCharsRanges( *m_xLinesRangeFT , m_xLinesPerPageNF->get_max() ); } else { - sal_Int32 nTextWidth = static_cast< sal_Int32 >(m_xCharWidthMF->denormalize(m_xCharWidthMF->get_value(FUNIT_TWIP))); + sal_Int32 nTextWidth = static_cast< sal_Int32 >(m_xCharWidthMF->denormalize(m_xCharWidthMF->get_value(FieldUnit::TWIP))); m_xLinesPerPageNF->set_value(m_aPageSize.Height() / nTextSize); if (nTextWidth) m_xCharsPerLineNF->set_value(m_aPageSize.Width() / nTextWidth); @@ -347,7 +347,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, weld::SpinButton&, rField, void) auto nValue = m_xCharsPerLineNF->get_value(); assert(nValue && "div-by-zero"); auto nWidth = m_aPageSize.Width() / nValue; - m_xTextSizeMF->set_value(m_xTextSizeMF->normalize(nWidth), FUNIT_TWIP); + m_xTextSizeMF->set_value(m_xTextSizeMF->normalize(nWidth), FieldUnit::TWIP); //prevent rounding errors in the MetricField by saving the used value m_nRubyUserValue = nWidth; m_bRubyUserValue = true; @@ -356,8 +356,8 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, weld::SpinButton&, rField, void) //set maximum line per page { sal_Int32 nMaxLines = static_cast< sal_Int32 >(m_aPageSize.Height() / - ( m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FUNIT_TWIP)) + - m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FUNIT_TWIP)))); + ( m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FieldUnit::TWIP)) + + m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FieldUnit::TWIP)))); m_xLinesPerPageNF->set_max(nMaxLines); } SetLinesOrCharsRanges( *m_xLinesRangeFT , m_xLinesPerPageNF->get_max() ); @@ -370,8 +370,8 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, weld::SpinButton&, rField, void) auto nValue = m_xLinesPerPageNF->get_value(); assert(nValue && "div-by-zero"); auto nHeight = m_aPageSize.Height() / nValue; - m_xTextSizeMF->set_value(m_xTextSizeMF->normalize(nHeight), FUNIT_TWIP); - m_xRubySizeMF->set_value(0, FUNIT_TWIP); + m_xTextSizeMF->set_value(m_xTextSizeMF->normalize(nHeight), FieldUnit::TWIP); + m_xRubySizeMF->set_value(0, FieldUnit::TWIP); SetLinesOrCharsRanges( *m_xLinesRangeFT , m_xLinesPerPageNF->get_max() ); m_nRubyUserValue = nHeight; @@ -382,7 +382,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, weld::SpinButton&, rField, void) auto nValue = m_xCharsPerLineNF->get_value(); assert(nValue && "div-by-zero"); auto nWidth = m_aPageSize.Width() / nValue; - m_xCharWidthMF->set_value(m_xCharWidthMF->normalize(nWidth), FUNIT_TWIP); + m_xCharWidthMF->set_value(m_xCharWidthMF->normalize(nWidth), FieldUnit::TWIP); SetLinesOrCharsRanges( *m_xCharsRangeFT , m_xCharsPerLineNF->get_max() ); } } @@ -399,7 +399,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, weld::MetricSpinButton&, rField, v m_bRubyUserValue = false; // fdo#50941: set maximum characters per line - sal_Int32 nTextSize = static_cast< sal_Int32 >(m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FUNIT_TWIP))); + sal_Int32 nTextSize = static_cast< sal_Int32 >(m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FieldUnit::TWIP))); if (nTextSize > 0) { sal_Int32 nMaxChars = m_aPageSize.Width() / nTextSize; @@ -411,8 +411,8 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, weld::MetricSpinButton&, rField, v //set maximum line per page { sal_Int32 nMaxLines = static_cast< sal_Int32 >(m_aPageSize.Height() / - ( m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FUNIT_TWIP)) + - m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FUNIT_TWIP)))); + ( m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FieldUnit::TWIP)) + + m_xRubySizeMF->denormalize(m_xRubySizeMF->get_value(FieldUnit::TWIP)))); m_xLinesPerPageNF->set_max(nMaxLines); SetLinesOrCharsRanges( *m_xLinesRangeFT , m_xLinesPerPageNF->get_max() ); } @@ -421,14 +421,14 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, weld::MetricSpinButton&, rField, v { if (m_xTextSizeMF.get() == &rField) { - sal_Int32 nTextSize = static_cast< sal_Int32 >(m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FUNIT_TWIP))); + sal_Int32 nTextSize = static_cast< sal_Int32 >(m_xTextSizeMF->denormalize(m_xTextSizeMF->get_value(FieldUnit::TWIP))); m_xLinesPerPageNF->set_value(m_aPageSize.Height() / nTextSize); m_bRubyUserValue = false; SetLinesOrCharsRanges( *m_xLinesRangeFT , m_xLinesPerPageNF->get_max() ); } else if (m_xCharWidthMF.get() == &rField) { - sal_Int32 nTextWidth = static_cast< sal_Int32 >(m_xCharWidthMF->denormalize(m_xCharWidthMF->get_value(FUNIT_TWIP))); + sal_Int32 nTextWidth = static_cast< sal_Int32 >(m_xCharWidthMF->denormalize(m_xCharWidthMF->get_value(FieldUnit::TWIP))); sal_Int32 nMaxChar = 45 ; if (nTextWidth) nMaxChar = m_aPageSize.Width() / nTextWidth; diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index a6b0f349bb35..35dd9f225b0d 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -34,15 +34,15 @@ IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl, weld::SpinButton&, void) { sal_uInt16 nId = static_cast<sal_uInt16>(m_xColNF->get_value()) - 1; const SwTwips lWidth = m_rFnc.GetColWidth(nId); - m_xWidthMF->set_max(m_xWidthMF->normalize(m_rFnc.GetMaxColWidth(nId)), FUNIT_TWIP); - m_xWidthMF->set_value(m_xWidthMF->normalize(lWidth), FUNIT_TWIP); + m_xWidthMF->set_max(m_xWidthMF->normalize(m_rFnc.GetMaxColWidth(nId)), FieldUnit::TWIP); + m_xWidthMF->set_value(m_xWidthMF->normalize(lWidth), FieldUnit::TWIP); } SwTableWidthDlg::SwTableWidthDlg(weld::Window *pParent, SwTableFUNC &rTableFnc) : GenericDialogController(pParent, "modules/swriter/ui/columnwidth.ui", "ColumnWidthDialog") , m_rFnc(rTableFnc) , m_xColNF(m_xBuilder->weld_spin_button("column")) - , m_xWidthMF(m_xBuilder->weld_metric_spin_button("width", FUNIT_CM)) + , m_xWidthMF(m_xBuilder->weld_metric_spin_button("width", FieldUnit::CM)) { bool bIsWeb = rTableFnc.GetShell() && (dynamic_cast< const SwWebDocShell* >( @@ -54,9 +54,9 @@ SwTableWidthDlg::SwTableWidthDlg(weld::Window *pParent, SwTableFUNC &rTableFnc) m_xColNF->set_value(m_rFnc.GetCurColNum() + 1); if (m_rFnc.GetColCount() == 0) - m_xWidthMF->set_min(m_xWidthMF->normalize(m_rFnc.GetColWidth(0)), FUNIT_TWIP); + m_xWidthMF->set_min(m_xWidthMF->normalize(m_rFnc.GetColWidth(0)), FieldUnit::TWIP); else - m_xWidthMF->set_min(m_xWidthMF->normalize(MINLAY), FUNIT_TWIP); + m_xWidthMF->set_min(m_xWidthMF->normalize(MINLAY), FieldUnit::TWIP); m_xColNF->connect_value_changed(LINK(this, SwTableWidthDlg, LoseFocusHdl)); LoseFocusHdl(*m_xColNF); } @@ -65,7 +65,7 @@ void SwTableWidthDlg::Apply() { m_rFnc.InitTabCols(); m_rFnc.SetColWidth(static_cast<sal_uInt16>(m_xColNF->get_value() - 1), - static_cast<sal_uInt16>(m_xWidthMF->denormalize(m_xWidthMF->get_value(FUNIT_TWIP)))); + static_cast<sal_uInt16>(m_xWidthMF->denormalize(m_xWidthMF->get_value(FieldUnit::TWIP)))); } short SwTableWidthDlg::run() diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 53c35373cc8f..2a46f3e36629 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -36,7 +36,7 @@ void SwTableHeightDlg::Apply() { - SwTwips nHeight = static_cast< SwTwips >(m_xHeightEdit->denormalize(m_xHeightEdit->get_value(FUNIT_TWIP))); + SwTwips nHeight = static_cast< SwTwips >(m_xHeightEdit->denormalize(m_xHeightEdit->get_value(FieldUnit::TWIP))); SwFormatFrameSize aSz(ATT_FIX_SIZE, 0, nHeight); SwFrameSize eFrameSize = m_xAutoHeightCB->get_active() ? ATT_MIN_SIZE : ATT_FIX_SIZE; @@ -50,21 +50,21 @@ void SwTableHeightDlg::Apply() SwTableHeightDlg::SwTableHeightDlg(weld::Window *pParent, SwWrtShell &rS) : GenericDialogController(pParent, "modules/swriter/ui/rowheight.ui", "RowHeightDialog") , m_rSh(rS) - , m_xHeightEdit(m_xBuilder->weld_metric_spin_button("heightmf", FUNIT_CM)) + , m_xHeightEdit(m_xBuilder->weld_metric_spin_button("heightmf", FieldUnit::CM)) , m_xAutoHeightCB(m_xBuilder->weld_check_button("fit")) { FieldUnit eFieldUnit = SW_MOD()->GetUsrPref( dynamic_cast< const SwWebDocShell*>( m_rSh.GetView().GetDocShell() ) != nullptr )->GetMetric(); ::SetFieldUnit(*m_xHeightEdit, eFieldUnit); - m_xHeightEdit->set_min(MINLAY, FUNIT_TWIP); + m_xHeightEdit->set_min(MINLAY, FieldUnit::TWIP); SwFormatFrameSize *pSz; m_rSh.GetRowHeight(pSz); if (pSz) { auto nHeight = pSz->GetHeight(); m_xAutoHeightCB->set_active(pSz->GetHeightSizeType() != ATT_FIX_SIZE); - m_xHeightEdit->set_value(m_xHeightEdit->normalize(nHeight), FUNIT_TWIP); + m_xHeightEdit->set_value(m_xHeightEdit->normalize(nHeight), FieldUnit::TWIP); delete pSz; } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index a2943bdfef65..d4a4bf68b9a2 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -72,7 +72,7 @@ SwFormatTablePage::SwFormatTablePage(TabPageParent pParent, const SfxItemSet& rS , bHtmlMode(false) , m_xNameED(m_xBuilder->weld_entry("name")) , m_xWidthFT(m_xBuilder->weld_label("widthft")) - , m_xWidthMF(new SwPercentField(m_xBuilder->weld_metric_spin_button("widthmf", FUNIT_CM))) + , m_xWidthMF(new SwPercentField(m_xBuilder->weld_metric_spin_button("widthmf", FieldUnit::CM))) , m_xRelWidthCB(m_xBuilder->weld_check_button("relwidth")) , m_xFullBtn(m_xBuilder->weld_radio_button("full")) , m_xLeftBtn(m_xBuilder->weld_radio_button("left")) @@ -81,13 +81,13 @@ SwFormatTablePage::SwFormatTablePage(TabPageParent pParent, const SfxItemSet& rS , m_xCenterBtn(m_xBuilder->weld_radio_button("center")) , m_xFreeBtn(m_xBuilder->weld_radio_button("free")) , m_xLeftFT(m_xBuilder->weld_label("leftft")) - , m_xLeftMF(new SwPercentField(m_xBuilder->weld_metric_spin_button("leftmf", FUNIT_CM))) + , m_xLeftMF(new SwPercentField(m_xBuilder->weld_metric_spin_button("leftmf", FieldUnit::CM))) , m_xRightFT(m_xBuilder->weld_label("rightft")) - , m_xRightMF(new SwPercentField(m_xBuilder->weld_metric_spin_button("rightmf", FUNIT_CM))) + , m_xRightMF(new SwPercentField(m_xBuilder->weld_metric_spin_button("rightmf", FieldUnit::CM))) , m_xTopFT(m_xBuilder->weld_label("aboveft")) - , m_xTopMF(m_xBuilder->weld_metric_spin_button("abovemf", FUNIT_CM)) + , m_xTopMF(m_xBuilder->weld_metric_spin_button("abovemf", FieldUnit::CM)) , m_xBottomFT(m_xBuilder->weld_label("belowft")) - , m_xBottomMF(m_xBuilder->weld_metric_spin_button("belowmf", FUNIT_CM)) + , m_xBottomMF(m_xBuilder->weld_metric_spin_button("belowmf", FieldUnit::CM)) , m_xTextDirectionLB(new svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("textdirection"))) , m_xProperties(m_xBuilder->weld_widget("properties")) { @@ -145,8 +145,8 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, weld::ToggleButton&, rBtn, void { OSL_ENSURE(pTableData, "table data not available?"); bool bIsChecked = rBtn.get_active(); - sal_Int64 nLeft = m_xLeftMF->DenormalizePercent(m_xLeftMF->get_value(FUNIT_TWIP)); - sal_Int64 nRight = m_xRightMF->DenormalizePercent(m_xRightMF->get_value(FUNIT_TWIP)); + sal_Int64 nLeft = m_xLeftMF->DenormalizePercent(m_xLeftMF->get_value(FieldUnit::TWIP)); + sal_Int64 nRight = m_xRightMF->DenormalizePercent(m_xRightMF->get_value(FieldUnit::TWIP)); m_xWidthMF->ShowPercent(bIsChecked); m_xLeftMF->ShowPercent(bIsChecked); m_xRightMF->ShowPercent(bIsChecked); @@ -160,8 +160,8 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, weld::ToggleButton&, rBtn, void m_xRightMF->SetMetricFieldMin(0); //dito m_xLeftMF->SetMetricFieldMax(99); m_xRightMF->SetMetricFieldMax(99); - m_xLeftMF->SetPrcntValue(m_xLeftMF->NormalizePercent(nLeft ), FUNIT_TWIP ); - m_xRightMF->SetPrcntValue(m_xRightMF->NormalizePercent(nRight ), FUNIT_TWIP ); + m_xLeftMF->SetPrcntValue(m_xLeftMF->NormalizePercent(nLeft ), FieldUnit::TWIP ); + m_xRightMF->SetPrcntValue(m_xRightMF->NormalizePercent(nRight ), FieldUnit::TWIP ); } else ModifyHdl(*m_xLeftMF->get()); //correct values again @@ -186,8 +186,8 @@ IMPL_LINK_NOARG(SwFormatTablePage, AutoClickHdl, weld::ToggleButton&, void) { m_xLeftMF->SetPrcntValue(0); m_xRightMF->SetPrcntValue(0); - nSaveWidth = static_cast<SwTwips>(m_xWidthMF->DenormalizePercent(m_xWidthMF->get_value(FUNIT_TWIP))); - m_xWidthMF->SetPrcntValue(m_xWidthMF->NormalizePercent(pTableData->GetSpace()), FUNIT_TWIP); + nSaveWidth = static_cast<SwTwips>(m_xWidthMF->DenormalizePercent(m_xWidthMF->get_value(FieldUnit::TWIP))); + m_xWidthMF->SetPrcntValue(m_xWidthMF->NormalizePercent(pTableData->GetSpace()), FieldUnit::TWIP); bFull = true; bRestore = false; } @@ -233,7 +233,7 @@ IMPL_LINK_NOARG(SwFormatTablePage, AutoClickHdl, weld::ToggleButton&, void) //After being switched on automatic, the width was pinned //in order to restore the width while switching back to. bFull = false; - m_xWidthMF->SetPrcntValue(m_xWidthMF->NormalizePercent(nSaveWidth ), FUNIT_TWIP ); + m_xWidthMF->SetPrcntValue(m_xWidthMF->NormalizePercent(nSaveWidth ), FieldUnit::TWIP ); } ModifyHdl(*m_xWidthMF->get()); bModified = true; @@ -265,10 +265,10 @@ IMPL_LINK( SwFormatTablePage, ValueChangedHdl, weld::MetricSpinButton&, rEdit, v void SwFormatTablePage::ModifyHdl(const weld::MetricSpinButton& rEdit) { - SwTwips nCurWidth = static_cast< SwTwips >(m_xWidthMF->DenormalizePercent(m_xWidthMF->get_value(FUNIT_TWIP))); + SwTwips nCurWidth = static_cast< SwTwips >(m_xWidthMF->DenormalizePercent(m_xWidthMF->get_value(FieldUnit::TWIP))); SwTwips nPrevWidth = nCurWidth; - SwTwips nRight = static_cast< SwTwips >(m_xRightMF->DenormalizePercent(m_xRightMF->get_value(FUNIT_TWIP))); - SwTwips nLeft = static_cast< SwTwips >(m_xLeftMF->DenormalizePercent(m_xLeftMF->get_value(FUNIT_TWIP))); + SwTwips nRight = static_cast< SwTwips >(m_xRightMF->DenormalizePercent(m_xRightMF->get_value(FieldUnit::TWIP))); + SwTwips nLeft = static_cast< SwTwips >(m_xLeftMF->DenormalizePercent(m_xLeftMF->get_value(FieldUnit::TWIP))); SwTwips nDiff; if (&rEdit == m_xWidthMF->get()) @@ -358,9 +358,9 @@ void SwFormatTablePage::ModifyHdl(const weld::MetricSpinButton& rEdit) } } if (nCurWidth != nPrevWidth ) - m_xWidthMF->SetPrcntValue( m_xWidthMF->NormalizePercent( nCurWidth ), FUNIT_TWIP ); - m_xRightMF->SetPrcntValue( m_xRightMF->NormalizePercent( nRight ), FUNIT_TWIP ); - m_xLeftMF->SetPrcntValue( m_xLeftMF->NormalizePercent( nLeft ), FUNIT_TWIP ); + m_xWidthMF->SetPrcntValue( m_xWidthMF->NormalizePercent( nCurWidth ), FieldUnit::TWIP ); + m_xRightMF->SetPrcntValue( m_xRightMF->NormalizePercent( nRight ), FieldUnit::TWIP ); + m_xLeftMF->SetPrcntValue( m_xLeftMF->NormalizePercent( nLeft ), FieldUnit::TWIP ); bModified = true; } @@ -389,8 +389,8 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet ) m_xTopMF->get_value_changed_from_saved() ) { SvxULSpaceItem aULSpace(RES_UL_SPACE); - aULSpace.SetUpper(m_xTopMF->denormalize(m_xTopMF->get_value(FUNIT_TWIP))); - aULSpace.SetLower(m_xBottomMF->denormalize(m_xBottomMF->get_value(FUNIT_TWIP))); + aULSpace.SetUpper(m_xTopMF->denormalize(m_xTopMF->get_value(FieldUnit::TWIP))); + aULSpace.SetLower(m_xBottomMF->denormalize(m_xBottomMF->get_value(FieldUnit::TWIP))); rCoreSet->Put(aULSpace); } @@ -451,15 +451,15 @@ void SwFormatTablePage::Reset( const SfxItemSet* ) { m_xRelWidthCB->set_active(true); RelWidthClickHdl(*m_xRelWidthCB); - m_xWidthMF->SetPrcntValue(pTableData->GetWidthPercent(), FUNIT_PERCENT); + m_xWidthMF->SetPrcntValue(pTableData->GetWidthPercent(), FieldUnit::PERCENT); m_xWidthMF->save_value(); - nSaveWidth = static_cast< SwTwips >(m_xWidthMF->get_value(FUNIT_PERCENT)); + nSaveWidth = static_cast< SwTwips >(m_xWidthMF->get_value(FieldUnit::PERCENT)); } else { m_xWidthMF->SetPrcntValue(m_xWidthMF->NormalizePercent( - pTableData->GetWidth()), FUNIT_TWIP); + pTableData->GetWidth()), FieldUnit::TWIP); m_xWidthMF->save_value(); nSaveWidth = pTableData->GetWidth(); nMinTableWidth = std::min( nSaveWidth, nMinTableWidth ); @@ -468,9 +468,9 @@ void SwFormatTablePage::Reset( const SfxItemSet* ) m_xWidthMF->SetRefValue(pTableData->GetSpace()); m_xLeftMF->SetPrcntValue(m_xLeftMF->NormalizePercent( - pTableData->GetLeftSpace()), FUNIT_TWIP); + pTableData->GetLeftSpace()), FieldUnit::TWIP); m_xRightMF->SetPrcntValue(m_xRightMF->NormalizePercent( - pTableData->GetRightSpace()), FUNIT_TWIP); + pTableData->GetRightSpace()), FieldUnit::TWIP); m_xLeftMF->save_value(); m_xRightMF->save_value(); @@ -533,9 +533,9 @@ void SwFormatTablePage::Reset( const SfxItemSet* ) if(SfxItemState::SET == rSet.GetItemState( RES_UL_SPACE, false,&pItem )) { m_xTopMF->set_value(m_xTopMF->normalize( - static_cast<const SvxULSpaceItem*>(pItem)->GetUpper()), FUNIT_TWIP); + static_cast<const SvxULSpaceItem*>(pItem)->GetUpper()), FieldUnit::TWIP); m_xBottomMF->set_value(m_xBottomMF->normalize( - static_cast<const SvxULSpaceItem*>(pItem)->GetLower()), FUNIT_TWIP); + static_cast<const SvxULSpaceItem*>(pItem)->GetLower()), FieldUnit::TWIP); m_xTopMF->save_value(); m_xBottomMF->save_value(); } @@ -548,10 +548,10 @@ void SwFormatTablePage::Reset( const SfxItemSet* ) m_xTextDirectionLB->save_value(); } - m_xWidthMF->set_max( 2*m_xWidthMF->NormalizePercent( pTableData->GetSpace() ), FUNIT_TWIP ); - m_xRightMF->set_max( m_xRightMF->NormalizePercent( pTableData->GetSpace() ), FUNIT_TWIP ); - m_xLeftMF->set_max( m_xLeftMF->NormalizePercent( pTableData->GetSpace() ), FUNIT_TWIP ); - m_xWidthMF->set_min( m_xWidthMF->NormalizePercent( nMinTableWidth ), FUNIT_TWIP ); + m_xWidthMF->set_max( 2*m_xWidthMF->NormalizePercent( pTableData->GetSpace() ), FieldUnit::TWIP ); + m_xRightMF->set_max( m_xRightMF->NormalizePercent( pTableData->GetSpace() ), FieldUnit::TWIP ); + m_xLeftMF->set_max( m_xLeftMF->NormalizePercent( pTableData->GetSpace() ), FieldUnit::TWIP ); + m_xWidthMF->set_min( m_xWidthMF->NormalizePercent( nMinTableWidth ), FieldUnit::TWIP ); } void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet ) @@ -563,17 +563,17 @@ void SwFormatTablePage::ActivatePage( const SfxItemSet& rSet ) pTableData->GetWidth() : pTableData->GetSpace(); if(pTableData->GetWidthPercent() == 0 && - nCurWidth != m_xWidthMF->DenormalizePercent(m_xWidthMF->get_value(FUNIT_TWIP))) + nCurWidth != m_xWidthMF->DenormalizePercent(m_xWidthMF->get_value(FieldUnit::TWIP))) { m_xWidthMF->SetPrcntValue(m_xWidthMF->NormalizePercent( - nCurWidth), FUNIT_TWIP); + nCurWidth), FieldUnit::TWIP); m_xWidthMF->save_value(); nSaveWidth = nCurWidth; m_xLeftMF->SetPrcntValue(m_xLeftMF->NormalizePercent( - pTableData->GetLeftSpace()), FUNIT_TWIP); + pTableData->GetLeftSpace()), FieldUnit::TWIP); m_xLeftMF->save_value(); m_xRightMF->SetPrcntValue(m_xRightMF->NormalizePercent( - pTableData->GetRightSpace()), FUNIT_TWIP); + pTableData->GetRightSpace()), FieldUnit::TWIP); m_xRightMF->save_value(); } } @@ -600,8 +600,8 @@ DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) FillItemSet(_pSet); if(bModified) { - SwTwips lLeft = static_cast< SwTwips >(m_xLeftMF->DenormalizePercent(m_xLeftMF->get_value(FUNIT_TWIP))); - SwTwips lRight = static_cast< SwTwips >(m_xRightMF->DenormalizePercent(m_xRightMF->get_value(FUNIT_TWIP))); + SwTwips lLeft = static_cast< SwTwips >(m_xLeftMF->DenormalizePercent(m_xLeftMF->get_value(FieldUnit::TWIP))); + SwTwips lRight = static_cast< SwTwips >(m_xRightMF->DenormalizePercent(m_xRightMF->get_value(FieldUnit::TWIP))); if( m_xLeftMF->get_value_changed_from_saved() || m_xRightMF->get_value_changed_from_saved() ) @@ -615,7 +615,7 @@ DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) if (m_xRelWidthCB->get_active() && m_xRelWidthCB->get_sensitive()) { lWidth = pTableData->GetSpace() - lRight - lLeft; - const sal_uInt16 nPercentWidth = m_xWidthMF->get_value(FUNIT_PERCENT); + const sal_uInt16 nPercentWidth = m_xWidthMF->get_value(FieldUnit::PERCENT); if(pTableData->GetWidthPercent() != nPercentWidth) { pTableData->SetWidthPercent(nPercentWidth); @@ -625,7 +625,7 @@ DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) else { pTableData->SetWidthPercent(0); - lWidth = static_cast<SwTwips>(m_xWidthMF->DenormalizePercent(m_xWidthMF->get_value(FUNIT_TWIP))); + lWidth = static_cast<SwTwips>(m_xWidthMF->DenormalizePercent(m_xWidthMF->get_value(FieldUnit::TWIP))); } pTableData->SetWidth(lWidth); @@ -708,12 +708,12 @@ SwTableColumnPage::SwTableColumnPage(TabPageParent pParent, const SfxItemSet& rS , bModified(false) , bModifyTable(false) , bPercentMode(false) - , m_aFieldArr { m_xBuilder->weld_metric_spin_button("width1", FUNIT_CM), - m_xBuilder->weld_metric_spin_button("width2", FUNIT_CM), - m_xBuilder->weld_metric_spin_button("width3", FUNIT_CM), - m_xBuilder->weld_metric_spin_button("width4", FUNIT_CM), - m_xBuilder->weld_metric_spin_button("width5", FUNIT_CM), - m_xBuilder->weld_metric_spin_button("width6", FUNIT_CM) } + , m_aFieldArr { m_xBuilder->weld_metric_spin_button("width1", FieldUnit::CM), + m_xBuilder->weld_metric_spin_button("width2", FieldUnit::CM), + m_xBuilder->weld_metric_spin_button("width3", FieldUnit::CM), + m_xBuilder->weld_metric_spin_button("width4", FieldUnit::CM), + m_xBuilder->weld_metric_spin_button("width5", FieldUnit::CM), + m_xBuilder->weld_metric_spin_button("width6", FieldUnit::CM) } , m_aTextArr { m_xBuilder->weld_label("1"), m_xBuilder->weld_label("2"), m_xBuilder->weld_label("3"), @@ -723,7 +723,7 @@ SwTableColumnPage::SwTableColumnPage(TabPageParent pParent, const SfxItemSet& rS , m_xModifyTableCB(m_xBuilder->weld_check_button("adaptwidth")) , m_xProportionalCB(m_xBuilder->weld_check_button("adaptcolumns")) , m_xSpaceFT(m_xBuilder->weld_label("spaceft")) - , m_xSpaceED(m_xBuilder->weld_metric_spin_button("space", FUNIT_CM)) + , m_xSpaceED(m_xBuilder->weld_metric_spin_button("space", FieldUnit::CM)) , m_xUpBtn(m_xBuilder->weld_button("next")) , m_xDownBtn(m_xBuilder->weld_button("back")) { @@ -785,9 +785,9 @@ void SwTableColumnPage::Reset( const SfxItemSet* ) for( sal_uInt16 i = 0; (i < nMetFields) && (i < nNoOfVisibleCols); i++ ) { m_aFieldArr[i].SetPrcntValue( m_aFieldArr[i].NormalizePercent( - GetVisibleWidth(i) ), FUNIT_TWIP ); - m_aFieldArr[i].set_min(nMinTwips, FUNIT_TWIP); - m_aFieldArr[i].set_max(nMaxTwips, FUNIT_TWIP); + GetVisibleWidth(i) ), FieldUnit::TWIP ); + m_aFieldArr[i].set_min(nMinTwips, FieldUnit::TWIP); + m_aFieldArr[i].set_max(nMaxTwips, FieldUnit::TWIP); m_aFieldArr[i].set_sensitive(true); m_aTextArr[i]->set_sensitive(true); } @@ -915,7 +915,7 @@ void SwTableColumnPage::ModifyHdl(const weld::MetricSpinButton* pField) return; } - SetVisibleWidth(aValueTable[i], pEdit->DenormalizePercent(pEdit->get_value(FUNIT_TWIP))); + SetVisibleWidth(aValueTable[i], pEdit->DenormalizePercent(pEdit->get_value(FieldUnit::TWIP))); UpdateCols( aValueTable[i] ); } @@ -1023,12 +1023,12 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nCurrentPos ) } if(!bPercentMode) - m_xSpaceED->set_value(m_xSpaceED->normalize(pTableData->GetSpace() - nTableWidth), FUNIT_TWIP); + m_xSpaceED->set_value(m_xSpaceED->normalize(pTableData->GetSpace() - nTableWidth), FieldUnit::TWIP); for( sal_uInt16 i = 0; ( i < nNoOfVisibleCols ) && ( i < nMetFields ); i++) { m_aFieldArr[i].SetPrcntValue(m_aFieldArr[i].NormalizePercent( - GetVisibleWidth(aValueTable[i]) ), FUNIT_TWIP); + GetVisibleWidth(aValueTable[i]) ), FieldUnit::TWIP); } } @@ -1071,7 +1071,7 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& ) m_xProportionalCB->set_sensitive(!bPercentMode && bModifyTable ); m_xSpaceED->set_value(m_xSpaceED->normalize( - pTableData->GetSpace() - nTableWidth), FUNIT_TWIP); + pTableData->GetSpace() - nTableWidth), FieldUnit::TWIP); } diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 2b8520dc8a70..46b350c02c59 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -659,11 +659,11 @@ void SwModule::ExecOther(SfxRequest& rReq) FieldUnit eUnit = static_cast<FieldUnit>(static_cast<const SfxUInt16Item*>(pItem)->GetValue()); switch( eUnit ) { - case FUNIT_MM: - case FUNIT_CM: - case FUNIT_INCH: - case FUNIT_PICA: - case FUNIT_POINT: + case FieldUnit::MM: + case FieldUnit::CM: + case FieldUnit::INCH: + case FieldUnit::PICA: + case FieldUnit::POINT: { SwView* pActView = ::GetActiveView(); bool bWebView = dynamic_cast<SwWebView*>( pActView ) != nullptr; diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index d366ba6d0066..eaddc4c7d9ae 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -309,20 +309,20 @@ void SwModule::ApplyUserCharUnit(bool bApplyChar, bool bWeb) FieldUnit eVScrollMetric = pPref->IsVScrollMetric() ? pPref->GetVScrollMetric() : pPref->GetMetric(); if(bApplyChar) { - eHScrollMetric = FUNIT_CHAR; - eVScrollMetric = FUNIT_LINE; + eHScrollMetric = FieldUnit::CHAR; + eVScrollMetric = FieldUnit::LINE; } else { SvtCJKOptions aCJKOptions; - if ( !aCJKOptions.IsAsianTypographyEnabled() && ( eHScrollMetric == FUNIT_CHAR )) - eHScrollMetric = FUNIT_INCH; - else if ( eHScrollMetric == FUNIT_CHAR ) - eHScrollMetric = FUNIT_CM; - if ( !aCJKOptions.IsAsianTypographyEnabled() && ( eVScrollMetric == FUNIT_LINE )) - eVScrollMetric = FUNIT_INCH; - else if ( eVScrollMetric == FUNIT_LINE ) - eVScrollMetric = FUNIT_CM; + if ( !aCJKOptions.IsAsianTypographyEnabled() && ( eHScrollMetric == FieldUnit::CHAR )) + eHScrollMetric = FieldUnit::INCH; + else if ( eHScrollMetric == FieldUnit::CHAR ) + eHScrollMetric = FieldUnit::CM; + if ( !aCJKOptions.IsAsianTypographyEnabled() && ( eVScrollMetric == FieldUnit::LINE )) + eVScrollMetric = FieldUnit::INCH; + else if ( eVScrollMetric == FieldUnit::LINE ) + eVScrollMetric = FieldUnit::CM; } SwView* pTmpView = SwModule::GetFirstView(); // switch rulers for all MDI-Windows diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index f8a08ef6c83b..4b0f4be31c97 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -62,11 +62,11 @@ SwMasterUsrPref::SwMasterUsrPref(bool bWeb) : { if (utl::ConfigManager::IsFuzzing()) { - m_eHScrollMetric = m_eVScrollMetric = m_eUserMetric = FUNIT_CM; + m_eHScrollMetric = m_eVScrollMetric = m_eUserMetric = FieldUnit::CM; return; } MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); - m_eUserMetric = MeasurementSystem::Metric == eSystem ? FUNIT_CM : FUNIT_INCH; + m_eUserMetric = MeasurementSystem::Metric == eSystem ? FieldUnit::CM : FieldUnit::INCH; m_eHScrollMetric = m_eVScrollMetric = m_eUserMetric; m_aContentConfig.Load(); diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx index e40227abe962..378f20e2b9cb 100644 --- a/sw/source/uibase/dialog/watermarkdialog.cxx +++ b/sw/source/uibase/dialog/watermarkdialog.cxx @@ -25,8 +25,8 @@ SwWatermarkDialog::SwWatermarkDialog(weld::Window* pParent, SfxBindings& rBindin , m_xTextInput(m_xBuilder->weld_entry("TextInput")) , m_xOKButton(m_xBuilder->weld_button("ok")) , m_xFont(m_xBuilder->weld_combo_box("FontBox")) - , m_xAngle(m_xBuilder->weld_metric_spin_button("Angle", FUNIT_DEGREE)) - , m_xTransparency(m_xBuilder->weld_metric_spin_button("Transparency", FUNIT_PERCENT)) + , m_xAngle(m_xBuilder->weld_metric_spin_button("Angle", FieldUnit::DEGREE)) + , m_xTransparency(m_xBuilder->weld_metric_spin_button("Transparency", FieldUnit::PERCENT)) , m_xColor(new ColorListBox(m_xBuilder->weld_menu_button("Color"), m_xDialog.get())) { InitFields(); @@ -72,9 +72,9 @@ void SwWatermarkDialog::InitFields() const OUString& sText = pWatermark->GetText(); m_xTextInput->set_text(sText); m_xFont->set_entry_text(pWatermark->GetFont()); - m_xAngle->set_value(pWatermark->GetAngle(), FUNIT_DEGREE); + m_xAngle->set_value(pWatermark->GetAngle(), FieldUnit::DEGREE); m_xColor->SelectEntry( pWatermark->GetColor() ); - m_xTransparency->set_value(pWatermark->GetTransparency(), FUNIT_PERCENT); + m_xTransparency->set_value(pWatermark->GetTransparency(), FieldUnit::PERCENT); } } @@ -86,8 +86,8 @@ IMPL_LINK_NOARG(SwWatermarkDialog, OKButtonHdl, weld::Button&, void) { { "Text", css::uno::makeAny( sText ) }, { "Font", css::uno::makeAny( m_xFont->get_active_text() ) }, - { "Angle", css::uno::makeAny( static_cast<sal_Int16>( m_xAngle->get_value(FUNIT_DEGREE) ) ) }, - { "Transparency", css::uno::makeAny( static_cast<sal_Int16>( m_xTransparency->get_value(FUNIT_PERCENT) ) ) }, + { "Angle", css::uno::makeAny( static_cast<sal_Int16>( m_xAngle->get_value(FieldUnit::DEGREE) ) ) }, + { "Transparency", css::uno::makeAny( static_cast<sal_Int16>( m_xTransparency->get_value(FieldUnit::PERCENT) ) ) }, { "Color", css::uno::makeAny( static_cast<sal_uInt32>( m_xColor->GetSelectEntryColor().GetRGBColor() ) ) } } ) ); comphelper::dispatchCommand( ".uno:Watermark", aPropertyValues ); diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 0e68dec3dc13..6cae867948ca 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -31,17 +31,17 @@ #include "envimg.hxx" -#define GetFieldVal(rField) (rField).Denormalize((rField).GetValue(FUNIT_TWIP)) -#define SetFieldVal(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP) +#define GetFieldVal(rField) (rField).Denormalize((rField).GetValue(FieldUnit::TWIP)) +#define SetFieldVal(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FieldUnit::TWIP) inline int getfieldval(weld::MetricSpinButton& rField) { - return rField.denormalize(rField.get_value(FUNIT_TWIP)); + return rField.denormalize(rField.get_value(FieldUnit::TWIP)); } inline void setfieldval(weld::MetricSpinButton& rField, int lValue) { - rField.set_value(rField.normalize(lValue), FUNIT_TWIP); + rField.set_value(rField.normalize(lValue), FieldUnit::TWIP); } class SwEnvDlg; diff --git a/sw/source/uibase/inc/labimp.hxx b/sw/source/uibase/inc/labimp.hxx index e6d4fe147f19..dcda10e01f22 100644 --- a/sw/source/uibase/inc/labimp.hxx +++ b/sw/source/uibase/inc/labimp.hxx @@ -28,17 +28,17 @@ #include "label.hxx" #include "labimg.hxx" -#define GETFLDVAL(rField) (rField).Denormalize((rField).GetValue(FUNIT_TWIP)) -#define SETFLDVAL(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP) +#define GETFLDVAL(rField) (rField).Denormalize((rField).GetValue(FieldUnit::TWIP)) +#define SETFLDVAL(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FieldUnit::TWIP) inline int getfldval(weld::MetricSpinButton& rField) { - return rField.denormalize(rField.get_value(FUNIT_TWIP)); + return rField.denormalize(rField.get_value(FieldUnit::TWIP)); } inline void setfldval(weld::MetricSpinButton& rField, int lValue) { - rField.set_value(rField.normalize(lValue), FUNIT_TWIP); + rField.set_value(rField.normalize(lValue), FieldUnit::TWIP); } #endif // INCLUDED_SW_SOURCE_UIBASE_INC_LABIMP_HXX diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx index 6b831a259b13..f03b55f37f44 100644 --- a/sw/source/uibase/inc/prcntfld.hxx +++ b/sw/source/uibase/inc/prcntfld.hxx @@ -55,15 +55,15 @@ public: void Enable(bool bEnable = true) { m_pField->Enable(bEnable); } void Disable() { m_pField->Disable(); } - void SetValue(sal_Int64 nNewValue) { m_pField->SetValue(nNewValue, FUNIT_NONE); } + void SetValue(sal_Int64 nNewValue) { m_pField->SetValue(nNewValue, FieldUnit::NONE); } - void SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE); + void SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit = FieldUnit::NONE); void SetUserValue(sal_Int64 nNewValue, FieldUnit eInUnit); void SetBaseValue(sal_Int64 nNewValue, FieldUnit eInUnit); - sal_Int64 GetValue(FieldUnit eOutUnit = FUNIT_NONE); + sal_Int64 GetValue(FieldUnit eOutUnit = FieldUnit::NONE); bool IsValueModified(); @@ -118,12 +118,12 @@ public: bool get_value_changed_from_saved() const { return m_pField->get_value_changed_from_saved(); } void set_text(const OUString& rStr) { m_pField->set_text(rStr); } void set_accessible_name(const OUString& rStr) { m_pField->set_accessible_name(rStr); } - void SetMetricFieldMin(int nNewMin) { m_pField->set_min(nNewMin, FUNIT_NONE); } - void SetMetricFieldMax(int nNewMax) { m_pField->set_max(nNewMax, FUNIT_NONE); } + void SetMetricFieldMin(int nNewMin) { m_pField->set_min(nNewMin, FieldUnit::NONE); } + void SetMetricFieldMax(int nNewMax) { m_pField->set_max(nNewMax, FieldUnit::NONE); } - void SetPrcntValue(int nNewValue, FieldUnit eInUnit = FUNIT_NONE); + void SetPrcntValue(int nNewValue, FieldUnit eInUnit = FieldUnit::NONE); - int get_value(FieldUnit eOutUnit = FUNIT_NONE); + int get_value(FieldUnit eOutUnit = FieldUnit::NONE); void set_min(int nNewMin, FieldUnit eInUnit); void set_max(int nNewMax, FieldUnit eInUnit); diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx index a256e0be0e1d..b8b81c56d48a 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.cxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx @@ -129,10 +129,10 @@ void PageFormatPanel::Initialize() aCustomEntry = mpCustomEntry->GetText(); const SvtOptionsDrawinglayer aDrawinglayerOpt; - mpPaperWidth->SetMax(mpPaperWidth->Normalize(aDrawinglayerOpt.GetMaximumPaperWidth()), FUNIT_CM); - mpPaperWidth->SetLast(mpPaperWidth->Normalize(aDrawinglayerOpt.GetMaximumPaperWidth()), FUNIT_CM); - mpPaperHeight->SetMax(mpPaperHeight->Normalize(aDrawinglayerOpt.GetMaximumPaperHeight()), FUNIT_CM); - mpPaperHeight->SetLast(mpPaperHeight->Normalize(aDrawinglayerOpt.GetMaximumPaperHeight()), FUNIT_CM); + mpPaperWidth->SetMax(mpPaperWidth->Normalize(aDrawinglayerOpt.GetMaximumPaperWidth()), FieldUnit::CM); + mpPaperWidth->SetLast(mpPaperWidth->Normalize(aDrawinglayerOpt.GetMaximumPaperWidth()), FieldUnit::CM); + mpPaperHeight->SetMax(mpPaperHeight->Normalize(aDrawinglayerOpt.GetMaximumPaperHeight()), FieldUnit::CM); + mpPaperHeight->SetLast(mpPaperHeight->Normalize(aDrawinglayerOpt.GetMaximumPaperHeight()), FieldUnit::CM); mpPaperSizeBox->SetSelectHdl( LINK(this, PageFormatPanel, PaperFormatModifyHdl )); mpPaperOrientation->SetSelectHdl( LINK(this, PageFormatPanel, PaperFormatModifyHdl )); @@ -166,8 +166,8 @@ void PageFormatPanel::NotifyItemUpdate( { Size aPaperSize = pSizeItem->GetSize(); - mpPaperWidth->SetValue( mpPaperWidth->Normalize( aPaperSize.Width() ), FUNIT_TWIP ); - mpPaperHeight->SetValue( mpPaperHeight->Normalize( aPaperSize.Height() ), FUNIT_TWIP ); + mpPaperWidth->SetValue( mpPaperWidth->Normalize( aPaperSize.Width() ), FieldUnit::TWIP ); + mpPaperHeight->SetValue( mpPaperHeight->Normalize( aPaperSize.Height() ), FieldUnit::TWIP ); if(mpPaperOrientation->GetSelectedEntryPos() == 1) Swap(aPaperSize); @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(PageFormatPanel, PaperModifyMarginHdl, ListBox&, void) FieldUnit PageFormatPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ) { - FieldUnit eUnit = FUNIT_NONE; + FieldUnit eUnit = FieldUnit::NONE; if ( pState && eState >= SfxItemState::DEFAULT ) eUnit = static_cast<FieldUnit>(static_cast<const SfxUInt16Item*>(pState)->GetValue()); diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index ad6d3c5860e7..984c7d8cde2b 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -49,7 +49,7 @@ namespace { FieldUnit lcl_GetFieldUnit() { - FieldUnit eUnit = FUNIT_INCH; + FieldUnit eUnit = FieldUnit::INCH; const SfxPoolItem* pItem = nullptr; SfxItemState eState = SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState( SID_ATTR_METRIC, pItem ); if ( pItem && eState >= SfxItemState::DEFAULT ) @@ -169,7 +169,7 @@ PageMarginControl::PageMarginControl( sal_uInt16 nId, vcl::Window* pParent ) get( m_pContainer, "container" ); m_pWidthHeightField = VclPtr<MetricField>::Create( m_pContainer.get(), WinBits(0) ); m_pWidthHeightField->Hide(); - m_pWidthHeightField->SetUnit( FUNIT_CM ); + m_pWidthHeightField->SetUnit( FieldUnit::CM ); m_pWidthHeightField->SetMax( 9999 ); m_pWidthHeightField->SetDecimalDigits( 2 ); m_pWidthHeightField->SetSpinSize( 10 ); @@ -254,29 +254,29 @@ void PageMarginControl::dispose() void PageMarginControl::SetMetricFieldMaxValues( const Size& rPageSize ) { - const long nML = m_pLeftMarginEdit->Denormalize( m_pLeftMarginEdit->GetValue( FUNIT_TWIP ) ); - const long nMR = m_pRightMarginEdit->Denormalize( m_pRightMarginEdit->GetValue( FUNIT_TWIP ) ); - const long nMT = m_pTopMarginEdit->Denormalize( m_pTopMarginEdit->GetValue( FUNIT_TWIP ) ); - const long nMB = m_pBottomMarginEdit->Denormalize( m_pBottomMarginEdit->GetValue( FUNIT_TWIP ) ); + const long nML = m_pLeftMarginEdit->Denormalize( m_pLeftMarginEdit->GetValue( FieldUnit::TWIP ) ); + const long nMR = m_pRightMarginEdit->Denormalize( m_pRightMarginEdit->GetValue( FieldUnit::TWIP ) ); + const long nMT = m_pTopMarginEdit->Denormalize( m_pTopMarginEdit->GetValue( FieldUnit::TWIP ) ); + const long nMB = m_pBottomMarginEdit->Denormalize( m_pBottomMarginEdit->GetValue( FieldUnit::TWIP ) ); const long nPH = LogicToLogic( rPageSize.Height(), m_eUnit, MapUnit::MapTwip ); const long nPW = LogicToLogic( rPageSize.Width(), m_eUnit, MapUnit::MapTwip ); // Left long nMax = nPW - nMR - MINBODY; - m_pLeftMarginEdit->SetMax( m_pLeftMarginEdit->Normalize( nMax ), FUNIT_TWIP ); + m_pLeftMarginEdit->SetMax( m_pLeftMarginEdit->Normalize( nMax ), FieldUnit::TWIP ); // Right nMax = nPW - nML - MINBODY; - m_pRightMarginEdit->SetMax( m_pRightMarginEdit->Normalize( nMax ), FUNIT_TWIP ); + m_pRightMarginEdit->SetMax( m_pRightMarginEdit->Normalize( nMax ), FieldUnit::TWIP ); //Top nMax = nPH - nMB - MINBODY; - m_pTopMarginEdit->SetMax( m_pTopMarginEdit->Normalize( nMax ), FUNIT_TWIP ); + m_pTopMarginEdit->SetMax( m_pTopMarginEdit->Normalize( nMax ), FieldUnit::TWIP ); //Bottom nMax = nPH - nMT - MINBODY; - m_pBottomMarginEdit->SetMax( m_pTopMarginEdit->Normalize( nMax ), FUNIT_TWIP ); + m_pBottomMarginEdit->SetMax( m_pTopMarginEdit->Normalize( nMax ), FieldUnit::TWIP ); } void PageMarginControl::FillHelpText( const bool bUserCustomValuesAvailable ) diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index eb189fa7935a..f95dd0769462 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -40,7 +40,7 @@ namespace { FieldUnit lcl_GetFieldUnit() { - FieldUnit eUnit = FUNIT_INCH; + FieldUnit eUnit = FieldUnit::INCH; const SfxPoolItem* pItem = nullptr; SfxItemState eState = SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState( SID_ATTR_METRIC, pItem ); if ( pItem && eState >= SfxItemState::DEFAULT ) @@ -74,7 +74,7 @@ PageSizeControl::PageSizeControl( sal_uInt16 nId, vcl::Window* pParent ) mpSizeValueSet = VclPtr<svx::sidebar::ValueSetWithTextControl>::Create( maContainer.get(), WB_BORDER ); maWidthHeightField = VclPtr<MetricField>::Create( maContainer.get(), 0 ); maWidthHeightField->Hide(); - maWidthHeightField->SetUnit(FUNIT_CM); + maWidthHeightField->SetUnit(FieldUnit::CM); maWidthHeightField->SetMax(9999); maWidthHeightField->SetDecimalDigits(2); maWidthHeightField->SetSpinSize(10); @@ -140,14 +140,14 @@ PageSizeControl::PageSizeControl( sal_uInt16 nId, vcl::Window* pParent ) Swap( aPaperSize ); } - maWidthHeightField->SetValue( maWidthHeightField->Normalize( aPaperSize.Width() ), FUNIT_TWIP ); + maWidthHeightField->SetValue( maWidthHeightField->Normalize( aPaperSize.Width() ), FieldUnit::TWIP ); aWidthStr = localeDataWrapper.getNum( maWidthHeightField->GetValue(), maWidthHeightField->GetDecimalDigits(), maWidthHeightField->IsUseThousandSep(), maWidthHeightField->IsShowTrailingZeros() ); - maWidthHeightField->SetValue( maWidthHeightField->Normalize( aPaperSize.Height() ), FUNIT_TWIP); + maWidthHeightField->SetValue( maWidthHeightField->Normalize( aPaperSize.Height() ), FieldUnit::TWIP); aHeightStr = localeDataWrapper.getNum( maWidthHeightField->GetValue(), maWidthHeightField->GetDecimalDigits(), diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index 00399ac9ca45..a7a60ad2faec 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -524,9 +524,9 @@ SwXViewSettings::SwXViewSettings(SwView* pVw) , mpConstViewOption(nullptr) , bObjectValid(true) , mbApplyZoom(false) - , eHRulerUnit(FUNIT_CM) + , eHRulerUnit(FieldUnit::CM) , mbApplyHRulerMetric(false) - , eVRulerUnit(FUNIT_CM) + , eVRulerUnit(FieldUnit::CM) , mbApplyVRulerMetric(false) { // This property only exists if we have a view (ie, not at the module ) @@ -732,13 +732,13 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c { sal_uInt16 nUnit; if( rValue >>= nUnit ) - switch( nUnit ) + switch (static_cast<FieldUnit>(nUnit)) { - 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: if( rInfo.mnHandle == HANDLE_VIEWSET_HORI_RULER_METRIC ) { eHRulerUnit = static_cast<FieldUnit>(nUnit); diff --git a/sw/source/uibase/utlui/prcntfld.cxx b/sw/source/uibase/utlui/prcntfld.cxx index 2375d60c4d16..3616fb3f84fa 100644 --- a/sw/source/uibase/utlui/prcntfld.cxx +++ b/sw/source/uibase/utlui/prcntfld.cxx @@ -29,7 +29,7 @@ PercentField::PercentField() , nLastPercent(-1) , nLastValue(-1) , nOldDigits(0) - , eOldUnit(FUNIT_NONE) + , eOldUnit(FieldUnit::NONE) , bLockAutoCalculation(false) { } @@ -38,7 +38,7 @@ void PercentField::set(MetricField *pField) { m_pField = pField; nOldSpinSize = m_pField->GetSpinSize(); - nRefValue = DenormalizePercent(m_pField->GetMax(FUNIT_TWIP)); + nRefValue = DenormalizePercent(m_pField->GetMax(FieldUnit::TWIP)); nOldDigits = m_pField->GetDecimalDigits(); m_pField->SetCustomUnitText(OUString('%')); } @@ -49,14 +49,14 @@ void PercentField::SetRefValue(sal_Int64 nValue) nRefValue = nValue; - if (!bLockAutoCalculation && (m_pField->GetUnit() == FUNIT_CUSTOM)) + if (!bLockAutoCalculation && (m_pField->GetUnit() == FieldUnit::CUSTOM)) SetPrcntValue(nRealValue, eOldUnit); } void PercentField::ShowPercent(bool bPercent) { - if ((bPercent && m_pField->GetUnit() == FUNIT_CUSTOM) || - (!bPercent && m_pField->GetUnit() != FUNIT_CUSTOM)) + if ((bPercent && m_pField->GetUnit() == FieldUnit::CUSTOM) || + (!bPercent && m_pField->GetUnit() != FieldUnit::CUSTOM)) return; sal_Int64 nOldValue; @@ -73,10 +73,10 @@ void PercentField::ShowPercent(bool bPercent) nOldMax = m_pField->GetMax(); nOldSpinSize = m_pField->GetSpinSize(); nOldBaseValue = m_pField->GetBaseValue(); - m_pField->SetUnit(FUNIT_CUSTOM); + m_pField->SetUnit(FieldUnit::CUSTOM); m_pField->SetDecimalDigits( 0 ); - nCurrentWidth = MetricField::ConvertValue(nOldMin, 0, nOldDigits, eOldUnit, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nOldMin, 0, nOldDigits, eOldUnit, FieldUnit::TWIP); // round to 0.5 percent nPercent = ((nCurrentWidth * 10) / nRefValue + 5) / 10; @@ -86,7 +86,7 @@ void PercentField::ShowPercent(bool bPercent) m_pField->SetBaseValue(0); if (nOldValue != nLastValue) { - nCurrentWidth = MetricField::ConvertValue(nOldValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nOldValue, 0, nOldDigits, eOldUnit, FieldUnit::TWIP); nPercent = ((nCurrentWidth * 10) / nRefValue + 5) / 10; m_pField->SetValue(nPercent); nLastPercent = nPercent; @@ -97,7 +97,7 @@ void PercentField::ShowPercent(bool bPercent) } else { - sal_Int64 nOldPercent = GetValue(FUNIT_CUSTOM); + sal_Int64 nOldPercent = GetValue(FieldUnit::CUSTOM); nOldValue = Convert(GetValue(), m_pField->GetUnit(), eOldUnit); @@ -121,20 +121,20 @@ void PercentField::ShowPercent(bool bPercent) void PercentField::SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit) { - if (m_pField->GetUnit() != FUNIT_CUSTOM || eInUnit == FUNIT_CUSTOM) + if (m_pField->GetUnit() != FieldUnit::CUSTOM || eInUnit == FieldUnit::CUSTOM) m_pField->SetValue(Convert(nNewValue, eInUnit, m_pField->GetUnit())); else { // Overwrite output value, do not restore later sal_Int64 nPercent, nCurrentWidth; - if(eInUnit == FUNIT_TWIP) + if(eInUnit == FieldUnit::TWIP) { - nCurrentWidth = MetricField::ConvertValue(nNewValue, 0, nOldDigits, FUNIT_TWIP, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nNewValue, 0, nOldDigits, FieldUnit::TWIP, FieldUnit::TWIP); } else { sal_Int64 nValue = Convert(nNewValue, eInUnit, eOldUnit); - nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eOldUnit, FieldUnit::TWIP); } nPercent = ((nCurrentWidth * 10) / nRefValue + 5) / 10; m_pField->SetValue(nPercent); @@ -143,7 +143,7 @@ void PercentField::SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit) void PercentField::SetBaseValue(sal_Int64 nNewValue, FieldUnit eInUnit) { - if (m_pField->GetUnit() == FUNIT_CUSTOM) + if (m_pField->GetUnit() == FieldUnit::CUSTOM) nOldBaseValue = MetricField::ConvertValue(nNewValue, 0, nOldDigits, eInUnit, eOldUnit); else m_pField->SetBaseValue(nNewValue, eInUnit); @@ -156,28 +156,28 @@ sal_Int64 PercentField::GetValue(FieldUnit eOutUnit) void PercentField::SetMin(sal_Int64 nNewMin, FieldUnit eInUnit) { - if (m_pField->GetUnit() != FUNIT_CUSTOM) + if (m_pField->GetUnit() != FieldUnit::CUSTOM) m_pField->SetMin(nNewMin, eInUnit); else { - if (eInUnit == FUNIT_NONE) + if (eInUnit == FieldUnit::NONE) eInUnit = eOldUnit; nOldMin = Convert(nNewMin, eInUnit, eOldUnit); - sal_Int64 nPercent = Convert(nNewMin, eInUnit, FUNIT_CUSTOM); + sal_Int64 nPercent = Convert(nNewMin, eInUnit, FieldUnit::CUSTOM); m_pField->SetMin(std::max( static_cast< sal_Int64 >(1), nPercent)); } } void PercentField::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit) { - if (m_pField->GetUnit() != FUNIT_CUSTOM) + if (m_pField->GetUnit() != FieldUnit::CUSTOM) m_pField->SetMax(nNewMax, eInUnit); } sal_Int64 PercentField::NormalizePercent(sal_Int64 nValue) { - if (m_pField->GetUnit() != FUNIT_CUSTOM) + if (m_pField->GetUnit() != FieldUnit::CUSTOM) nValue = m_pField->Normalize(nValue); else nValue = nValue * ImpPower10(nOldDigits); @@ -186,7 +186,7 @@ sal_Int64 PercentField::NormalizePercent(sal_Int64 nValue) sal_Int64 PercentField::DenormalizePercent(sal_Int64 nValue) { - if (m_pField->GetUnit() != FUNIT_CUSTOM) + if (m_pField->GetUnit() != FieldUnit::CUSTOM) nValue = m_pField->Denormalize(nValue); else { @@ -198,7 +198,7 @@ sal_Int64 PercentField::DenormalizePercent(sal_Int64 nValue) bool PercentField::IsValueModified() { - if (m_pField->GetUnit() == FUNIT_CUSTOM) + if (m_pField->GetUnit() == FieldUnit::CUSTOM) return true; else return m_pField->IsValueModified(); @@ -206,23 +206,23 @@ bool PercentField::IsValueModified() void PercentField::SetUserValue(sal_Int64 nNewValue, FieldUnit eInUnit) { - if (m_pField->GetUnit() != FUNIT_CUSTOM || eInUnit == FUNIT_CUSTOM) - m_pField->SetUserValue(Convert(nNewValue, eInUnit, m_pField->GetUnit()),FUNIT_NONE); + if (m_pField->GetUnit() != FieldUnit::CUSTOM || eInUnit == FieldUnit::CUSTOM) + m_pField->SetUserValue(Convert(nNewValue, eInUnit, m_pField->GetUnit()),FieldUnit::NONE); else { // Overwrite output value, do not restore later sal_Int64 nPercent, nCurrentWidth; - if (eInUnit == FUNIT_TWIP) + if (eInUnit == FieldUnit::TWIP) { - nCurrentWidth = MetricField::ConvertValue(nNewValue, 0, nOldDigits, FUNIT_TWIP, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nNewValue, 0, nOldDigits, FieldUnit::TWIP, FieldUnit::TWIP); } else { sal_Int64 nValue = Convert(nNewValue, eInUnit, eOldUnit); - nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eOldUnit, FieldUnit::TWIP); } nPercent = ((nCurrentWidth * 10) / nRefValue + 5) / 10; - m_pField->SetUserValue(nPercent,FUNIT_NONE); + m_pField->SetUserValue(nPercent,FieldUnit::NONE); } } @@ -238,7 +238,7 @@ sal_Int64 PercentField::ImpPower10(sal_uInt16 n) sal_Int64 PercentField::GetRealValue(FieldUnit eOutUnit) { - if (m_pField->GetUnit() != FUNIT_CUSTOM) + if (m_pField->GetUnit() != FieldUnit::CUSTOM) return GetValue(eOutUnit); else return Convert(GetValue(), m_pField->GetUnit(), eOutUnit); @@ -247,31 +247,31 @@ sal_Int64 PercentField::GetRealValue(FieldUnit eOutUnit) sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit eOutUnit) { if (eInUnit == eOutUnit || - (eInUnit == FUNIT_NONE && eOutUnit == m_pField->GetUnit()) || - (eOutUnit == FUNIT_NONE && eInUnit == m_pField->GetUnit())) + (eInUnit == FieldUnit::NONE && eOutUnit == m_pField->GetUnit()) || + (eOutUnit == FieldUnit::NONE && eInUnit == m_pField->GetUnit())) return nValue; - if (eInUnit == FUNIT_CUSTOM) + if (eInUnit == FieldUnit::CUSTOM) { // Convert to metric sal_Int64 nTwipValue = (nRefValue * nValue + 50) / 100; - if (eOutUnit == FUNIT_TWIP) // Only convert if necessary + if (eOutUnit == FieldUnit::TWIP) // Only convert if necessary return NormalizePercent(nTwipValue); else - return MetricField::ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FUNIT_TWIP, eOutUnit); + return MetricField::ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FieldUnit::TWIP, eOutUnit); } - if (eOutUnit == FUNIT_CUSTOM) + if (eOutUnit == FieldUnit::CUSTOM) { // Convert to percent sal_Int64 nCurrentWidth; nValue = DenormalizePercent(nValue); - if (eInUnit == FUNIT_TWIP) // Only convert if necessary + if (eInUnit == FieldUnit::TWIP) // Only convert if necessary nCurrentWidth = nValue; else - nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eInUnit, FieldUnit::TWIP); // Round to 0.5 percent return ((nCurrentWidth * 1000) / nRefValue + 5) / 10; } @@ -286,12 +286,12 @@ SwPercentField::SwPercentField(std::unique_ptr<weld::MetricSpinButton> pControl) , nLastPercent(-1) , nLastValue(-1) , nOldDigits(m_pField->get_digits()) - , eOldUnit(FUNIT_NONE) + , eOldUnit(FieldUnit::NONE) { int nMin, nMax; - m_pField->get_range(nMin, nMax, FUNIT_TWIP); + m_pField->get_range(nMin, nMax, FieldUnit::TWIP); nRefValue = DenormalizePercent(nMax); - m_pField->get_increments(nOldSpinSize, nOldPageSize, FUNIT_NONE); + m_pField->get_increments(nOldSpinSize, nOldPageSize, FieldUnit::NONE); } void SwPercentField::SetRefValue(int nValue) @@ -300,14 +300,14 @@ void SwPercentField::SetRefValue(int nValue) nRefValue = nValue; - if (m_pField->get_unit() == FUNIT_PERCENT) + if (m_pField->get_unit() == FieldUnit::PERCENT) SetPrcntValue(nRealValue, eOldUnit); } void SwPercentField::ShowPercent(bool bPercent) { - if ((bPercent && m_pField->get_unit() == FUNIT_PERCENT) || - (!bPercent && m_pField->get_unit() != FUNIT_PERCENT)) + if ((bPercent && m_pField->get_unit() == FieldUnit::PERCENT) || + (!bPercent && m_pField->get_unit() != FieldUnit::PERCENT)) return; int nOldValue; @@ -320,38 +320,38 @@ void SwPercentField::ShowPercent(bool bPercent) eOldUnit = m_pField->get_unit(); nOldDigits = m_pField->get_digits(); - m_pField->get_range(nOldMin, nOldMax, FUNIT_NONE); - m_pField->get_increments(nOldSpinSize, nOldPageSize, FUNIT_NONE); - m_pField->set_unit(FUNIT_PERCENT); + m_pField->get_range(nOldMin, nOldMax, FieldUnit::NONE); + m_pField->get_increments(nOldSpinSize, nOldPageSize, FieldUnit::NONE); + m_pField->set_unit(FieldUnit::PERCENT); m_pField->set_digits(0); - nCurrentWidth = MetricField::ConvertValue(nOldMin, 0, nOldDigits, eOldUnit, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nOldMin, 0, nOldDigits, eOldUnit, FieldUnit::TWIP); // round to 0.5 percent nPercent = ((nCurrentWidth * 10) / nRefValue + 5) / 10; - m_pField->set_range(std::max(1, nPercent), 100, FUNIT_NONE); - m_pField->set_increments(5, 10, FUNIT_NONE); + m_pField->set_range(std::max(1, nPercent), 100, FieldUnit::NONE); + m_pField->set_increments(5, 10, FieldUnit::NONE); if (nOldValue != nLastValue) { - nCurrentWidth = MetricField::ConvertValue(nOldValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nOldValue, 0, nOldDigits, eOldUnit, FieldUnit::TWIP); nPercent = ((nCurrentWidth * 10) / nRefValue + 5) / 10; - m_pField->set_value(nPercent, FUNIT_NONE); + m_pField->set_value(nPercent, FieldUnit::NONE); nLastPercent = nPercent; nLastValue = nOldValue; } else - m_pField->set_value(nLastPercent, FUNIT_NONE); + m_pField->set_value(nLastPercent, FieldUnit::NONE); } else { - int nOldPercent = get_value(FUNIT_PERCENT); + int nOldPercent = get_value(FieldUnit::PERCENT); nOldValue = Convert(get_value(), m_pField->get_unit(), eOldUnit); m_pField->set_unit(eOldUnit); m_pField->set_digits(nOldDigits); - m_pField->set_range(nOldMin, nOldMax, FUNIT_NONE); - m_pField->set_increments(nOldSpinSize, nOldPageSize, FUNIT_NONE); + m_pField->set_range(nOldMin, nOldMax, FieldUnit::NONE); + m_pField->set_increments(nOldSpinSize, nOldPageSize, FieldUnit::NONE); if (nOldPercent != nLastPercent) { @@ -366,55 +366,55 @@ void SwPercentField::ShowPercent(bool bPercent) void SwPercentField::SetPrcntValue(int nNewValue, FieldUnit eInUnit) { - if (m_pField->get_unit() != FUNIT_PERCENT || eInUnit == FUNIT_PERCENT) - m_pField->set_value(Convert(nNewValue, eInUnit, m_pField->get_unit()), FUNIT_NONE); + if (m_pField->get_unit() != FieldUnit::PERCENT || eInUnit == FieldUnit::PERCENT) + m_pField->set_value(Convert(nNewValue, eInUnit, m_pField->get_unit()), FieldUnit::NONE); else { // Overwrite output value, do not restore later int nPercent, nCurrentWidth; - if(eInUnit == FUNIT_TWIP) + if(eInUnit == FieldUnit::TWIP) { - nCurrentWidth = MetricField::ConvertValue(nNewValue, 0, nOldDigits, FUNIT_TWIP, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nNewValue, 0, nOldDigits, FieldUnit::TWIP, FieldUnit::TWIP); } else { int nValue = Convert(nNewValue, eInUnit, eOldUnit); - nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eOldUnit, FieldUnit::TWIP); } nPercent = ((nCurrentWidth * 10) / nRefValue + 5) / 10; - m_pField->set_value(nPercent, FUNIT_NONE); + m_pField->set_value(nPercent, FieldUnit::NONE); } } int SwPercentField::get_value(FieldUnit eOutUnit) { - return Convert(m_pField->get_value(FUNIT_NONE), m_pField->get_unit(), eOutUnit); + return Convert(m_pField->get_value(FieldUnit::NONE), m_pField->get_unit(), eOutUnit); } void SwPercentField::set_min(int nNewMin, FieldUnit eInUnit) { - if (m_pField->get_unit() != FUNIT_PERCENT) + if (m_pField->get_unit() != FieldUnit::PERCENT) m_pField->set_min(nNewMin, eInUnit); else { - if (eInUnit == FUNIT_NONE) + if (eInUnit == FieldUnit::NONE) eInUnit = eOldUnit; nOldMin = Convert(nNewMin, eInUnit, eOldUnit); - int nPercent = Convert(nNewMin, eInUnit, FUNIT_PERCENT); - m_pField->set_min(std::max(1, nPercent), FUNIT_NONE); + int nPercent = Convert(nNewMin, eInUnit, FieldUnit::PERCENT); + m_pField->set_min(std::max(1, nPercent), FieldUnit::NONE); } } void SwPercentField::set_max(int nNewMax, FieldUnit eInUnit) { - if (m_pField->get_unit() != FUNIT_PERCENT) + if (m_pField->get_unit() != FieldUnit::PERCENT) m_pField->set_max(nNewMax, eInUnit); } int SwPercentField::NormalizePercent(int nValue) { - if (m_pField->get_unit() != FUNIT_PERCENT) + if (m_pField->get_unit() != FieldUnit::PERCENT) nValue = m_pField->normalize(nValue); else nValue = nValue * ImpPower10(nOldDigits); @@ -423,7 +423,7 @@ int SwPercentField::NormalizePercent(int nValue) int SwPercentField::DenormalizePercent(int nValue) { - if (m_pField->get_unit() != FUNIT_PERCENT) + if (m_pField->get_unit() != FieldUnit::PERCENT) nValue = m_pField->denormalize(nValue); else { @@ -445,7 +445,7 @@ int SwPercentField::ImpPower10(sal_uInt16 n) int SwPercentField::GetRealValue(FieldUnit eOutUnit) { - if (m_pField->get_unit() != FUNIT_PERCENT) + if (m_pField->get_unit() != FieldUnit::PERCENT) return get_value(eOutUnit); else return Convert(get_value(), m_pField->get_unit(), eOutUnit); @@ -454,31 +454,31 @@ int SwPercentField::GetRealValue(FieldUnit eOutUnit) int SwPercentField::Convert(int nValue, FieldUnit eInUnit, FieldUnit eOutUnit) { if (eInUnit == eOutUnit || - (eInUnit == FUNIT_NONE && eOutUnit == m_pField->get_unit()) || - (eOutUnit == FUNIT_NONE && eInUnit == m_pField->get_unit())) + (eInUnit == FieldUnit::NONE && eOutUnit == m_pField->get_unit()) || + (eOutUnit == FieldUnit::NONE && eInUnit == m_pField->get_unit())) return nValue; - if (eInUnit == FUNIT_PERCENT) + if (eInUnit == FieldUnit::PERCENT) { // Convert to metric int nTwipValue = (nRefValue * nValue + 50) / 100; - if (eOutUnit == FUNIT_TWIP) // Only convert if necessary + if (eOutUnit == FieldUnit::TWIP) // Only convert if necessary return NormalizePercent(nTwipValue); else - return MetricField::ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FUNIT_TWIP, eOutUnit); + return MetricField::ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FieldUnit::TWIP, eOutUnit); } - if (eOutUnit == FUNIT_PERCENT) + if (eOutUnit == FieldUnit::PERCENT) { // Convert to percent int nCurrentWidth; nValue = DenormalizePercent(nValue); - if (eInUnit == FUNIT_TWIP) // Only convert if necessary + if (eInUnit == FieldUnit::TWIP) // Only convert if necessary nCurrentWidth = nValue; else - nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP); + nCurrentWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eInUnit, FieldUnit::TWIP); // Round to 0.5 percent return ((nCurrentWidth * 1000) / nRefValue + 5) / 10; } diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index 79036c5ebdf8..154d9d7f9553 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -87,13 +87,13 @@ using namespace ::com::sun::star; void SetMetric(MetricFormatter& rCtrl, FieldUnit eUnit) { - SwTwips nMin = static_cast< SwTwips >(rCtrl.GetMin(FUNIT_TWIP)); - SwTwips nMax = static_cast< SwTwips >(rCtrl.GetMax(FUNIT_TWIP)); + SwTwips nMin = static_cast< SwTwips >(rCtrl.GetMin(FieldUnit::TWIP)); + SwTwips nMax = static_cast< SwTwips >(rCtrl.GetMax(FieldUnit::TWIP)); rCtrl.SetUnit(eUnit); - rCtrl.SetMin(nMin, FUNIT_TWIP); - rCtrl.SetMax(nMax, FUNIT_TWIP); + rCtrl.SetMin(nMin, FieldUnit::TWIP); + rCtrl.SetMax(nMax, FieldUnit::TWIP); } // Set boxinfo attribute diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 6e466468e2f1..4308a255afc8 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -364,22 +364,22 @@ namespace sal_Int16 nMeasurementUnit; sal_Int16 nFieldToMeasureFactor; } const aUnits[] = { - { FUNIT_NONE, -1 , -1}, - { FUNIT_MM, MeasureUnit::MM, 1 }, // must precede MM_10TH - { FUNIT_MM, MeasureUnit::MM_10TH, 10 }, - { FUNIT_100TH_MM, MeasureUnit::MM_100TH, 1 }, - { FUNIT_CM, MeasureUnit::CM, 1 }, - { FUNIT_M, MeasureUnit::M, 1 }, - { FUNIT_KM, MeasureUnit::KM, 1 }, - { FUNIT_TWIP, MeasureUnit::TWIP, 1 }, - { FUNIT_POINT, MeasureUnit::POINT, 1 }, - { FUNIT_PICA, MeasureUnit::PICA, 1 }, - { FUNIT_INCH, MeasureUnit::INCH, 1 }, // must precede INCH_*TH - { FUNIT_INCH, MeasureUnit::INCH_10TH, 10 }, - { FUNIT_INCH, MeasureUnit::INCH_100TH, 100 }, - { FUNIT_INCH, MeasureUnit::INCH_1000TH, 1000 }, - { FUNIT_FOOT, MeasureUnit::FOOT, 1 }, - { FUNIT_MILE, MeasureUnit::MILE, 1 }, + { FieldUnit::NONE, -1 , -1}, + { FieldUnit::MM, MeasureUnit::MM, 1 }, // must precede MM_10TH + { FieldUnit::MM, MeasureUnit::MM_10TH, 10 }, + { FieldUnit::MM_100TH, MeasureUnit::MM_100TH, 1 }, + { FieldUnit::CM, MeasureUnit::CM, 1 }, + { FieldUnit::M, MeasureUnit::M, 1 }, + { FieldUnit::KM, MeasureUnit::KM, 1 }, + { FieldUnit::TWIP, MeasureUnit::TWIP, 1 }, + { FieldUnit::POINT, MeasureUnit::POINT, 1 }, + { FieldUnit::PICA, MeasureUnit::PICA, 1 }, + { FieldUnit::INCH, MeasureUnit::INCH, 1 }, // must precede INCH_*TH + { FieldUnit::INCH, MeasureUnit::INCH_10TH, 10 }, + { FieldUnit::INCH, MeasureUnit::INCH_100TH, 100 }, + { FieldUnit::INCH, MeasureUnit::INCH_1000TH, 1000 }, + { FieldUnit::FOOT, MeasureUnit::FOOT, 1 }, + { FieldUnit::MILE, MeasureUnit::MILE, 1 }, }; for (auto & aUnit : aUnits) { @@ -401,7 +401,7 @@ namespace return -1; _rFieldToUNOValueFactor = 1; - return sal_Int16(FUNIT_NONE); + return sal_Int16(FieldUnit::NONE); } } diff --git a/vcl/inc/units.hrc b/vcl/inc/units.hrc index 3fc58eca0270..031ffab67ec3 100644 --- a/vcl/inc/units.hrc +++ b/vcl/inc/units.hrc @@ -25,32 +25,32 @@ std::pair<const char*, FieldUnit> SV_FUNIT_STRINGS[] = { // To translators: This is the first entry of a sequence of measurement unit names - { NC_("SV_FUNIT_STRINGS", "mm"), FUNIT_MM }, - { NC_("SV_FUNIT_STRINGS", "cm"), FUNIT_CM }, - { NC_("SV_FUNIT_STRINGS", "m"), FUNIT_M }, - { NC_("SV_FUNIT_STRINGS", "km"), FUNIT_KM }, - { NC_("SV_FUNIT_STRINGS", "twips"), FUNIT_TWIP }, - { NC_("SV_FUNIT_STRINGS", "twip"), FUNIT_TWIP }, - { NC_("SV_FUNIT_STRINGS", "pt"), FUNIT_POINT }, - { NC_("SV_FUNIT_STRINGS", "pc"), FUNIT_PICA }, - { NC_("SV_FUNIT_STRINGS", "\""), FUNIT_INCH }, - { NC_("SV_FUNIT_STRINGS", "in"), FUNIT_INCH }, - { NC_("SV_FUNIT_STRINGS", "inch"), FUNIT_INCH }, - { NC_("SV_FUNIT_STRINGS", "'"), FUNIT_FOOT }, - { NC_("SV_FUNIT_STRINGS", "ft"), FUNIT_FOOT }, - { NC_("SV_FUNIT_STRINGS", "foot"), FUNIT_FOOT }, - { NC_("SV_FUNIT_STRINGS", "feet"), FUNIT_FOOT }, - { NC_("SV_FUNIT_STRINGS", "miles"), FUNIT_MILE }, - { NC_("SV_FUNIT_STRINGS", "mile"), FUNIT_MILE }, - { NC_("SV_FUNIT_STRINGS", "ch"), FUNIT_CHAR }, - { NC_("SV_FUNIT_STRINGS", "line"), FUNIT_LINE }, - { NC_("SV_FUNIT_STRINGS", "pixels"), FUNIT_PIXEL }, - { NC_("SV_FUNIT_STRINGS", "pixel"), FUNIT_PIXEL }, + { NC_("SV_FUNIT_STRINGS", "mm"), FieldUnit::MM }, + { NC_("SV_FUNIT_STRINGS", "cm"), FieldUnit::CM }, + { NC_("SV_FUNIT_STRINGS", "m"), FieldUnit::M }, + { NC_("SV_FUNIT_STRINGS", "km"), FieldUnit::KM }, + { NC_("SV_FUNIT_STRINGS", "twips"), FieldUnit::TWIP }, + { NC_("SV_FUNIT_STRINGS", "twip"), FieldUnit::TWIP }, + { NC_("SV_FUNIT_STRINGS", "pt"), FieldUnit::POINT }, + { NC_("SV_FUNIT_STRINGS", "pc"), FieldUnit::PICA }, + { NC_("SV_FUNIT_STRINGS", "\""), FieldUnit::INCH }, + { NC_("SV_FUNIT_STRINGS", "in"), FieldUnit::INCH }, + { NC_("SV_FUNIT_STRINGS", "inch"), FieldUnit::INCH }, + { NC_("SV_FUNIT_STRINGS", "'"), FieldUnit::FOOT }, + { NC_("SV_FUNIT_STRINGS", "ft"), FieldUnit::FOOT }, + { NC_("SV_FUNIT_STRINGS", "foot"), FieldUnit::FOOT }, + { NC_("SV_FUNIT_STRINGS", "feet"), FieldUnit::FOOT }, + { NC_("SV_FUNIT_STRINGS", "miles"), FieldUnit::MILE }, + { NC_("SV_FUNIT_STRINGS", "mile"), FieldUnit::MILE }, + { NC_("SV_FUNIT_STRINGS", "ch"), FieldUnit::CHAR }, + { NC_("SV_FUNIT_STRINGS", "line"), FieldUnit::LINE }, + { NC_("SV_FUNIT_STRINGS", "pixels"), FieldUnit::PIXEL }, + { NC_("SV_FUNIT_STRINGS", "pixel"), FieldUnit::PIXEL }, /* To translators: degree */ - { NC_("SV_FUNIT_STRINGS", "°"), FUNIT_DEGREE }, - { NC_("SV_FUNIT_STRINGS", "sec"), FUNIT_SECOND }, + { NC_("SV_FUNIT_STRINGS", "°"), FieldUnit::DEGREE }, + { NC_("SV_FUNIT_STRINGS", "sec"), FieldUnit::SECOND }, // To translators: This is the last entry of the sequence of measurement unit names - { NC_("SV_FUNIT_STRINGS", "ms"), FUNIT_MILLISECOND } + { NC_("SV_FUNIT_STRINGS", "ms"), FieldUnit::MILLISECOND } }; #endif // INCLUDED_VCL_INC_UNITS_HRC diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 777a2f07d535..23c6905548b6 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1027,7 +1027,7 @@ FieldUnit MetricFormatter::StringToMetric(const OUString &rMetricString) } } - return FUNIT_NONE; + return FieldUnit::NONE; } static FieldUnit ImplMetricGetUnit(const OUString& rStr) @@ -1043,7 +1043,8 @@ static FieldUnit ImplMetricGetUnit(const OUString& rStr) // twip in km = 254 / 14 400 000 000 // expressions too big for default size 32 bit need LL to avoid overflow -static const sal_Int64 aImplFactor[FUNIT_LINE+1][FUNIT_LINE+1] = +static const sal_Int64 aImplFactor[sal_uInt16(FieldUnit::LINE) + 1] + [sal_uInt16(FieldUnit::LINE) + 1] = { /* mm/100 mm cm m km twip point pica inch foot mile char line */ { 1, 100, 1 K, 100 K, 100 M, 2540, 2540, 2540, 2540,2540*12,2540*12 X , 53340, 396240}, @@ -1064,7 +1065,7 @@ mm/100 mm cm m km twip point pica inch foot mile #undef M #undef K -static FieldUnit eDefaultUnit = FUNIT_NONE; +static FieldUnit eDefaultUnit = FieldUnit::NONE; FieldUnit MetricField::GetDefaultUnit() { return eDefaultUnit; } void MetricField::SetDefaultUnit( FieldUnit meUnit ) { eDefaultUnit = meUnit; } @@ -1075,34 +1076,34 @@ static FieldUnit ImplMap2FieldUnit( MapUnit meUnit, long& nDecDigits ) { case MapUnit::Map100thMM : nDecDigits -= 2; - return FUNIT_MM; + return FieldUnit::MM; case MapUnit::Map10thMM : nDecDigits -= 1; - return FUNIT_MM; + return FieldUnit::MM; case MapUnit::MapMM : - return FUNIT_MM; + return FieldUnit::MM; case MapUnit::MapCM : - return FUNIT_CM; + return FieldUnit::CM; case MapUnit::Map1000thInch : nDecDigits -= 3; - return FUNIT_INCH; + return FieldUnit::INCH; case MapUnit::Map100thInch : nDecDigits -= 2; - return FUNIT_INCH; + return FieldUnit::INCH; case MapUnit::Map10thInch : nDecDigits -= 1; - return FUNIT_INCH; + return FieldUnit::INCH; case MapUnit::MapInch : - return FUNIT_INCH; + return FieldUnit::INCH; case MapUnit::MapPoint : - return FUNIT_POINT; + return FieldUnit::POINT; case MapUnit::MapTwip : - return FUNIT_TWIP; + return FieldUnit::TWIP; default: OSL_FAIL( "default eInUnit" ); break; } - return FUNIT_NONE; + return FieldUnit::NONE; } static double nonValueDoubleToValueDouble( double nValue ) @@ -1143,7 +1144,7 @@ double MetricField::ConvertDoubleValue( double nValue, sal_Int64 mnBaseValue, sa { sal_Int64 nMult = 1, nDiv = 1; - if ( eInUnit == FUNIT_PERCENT ) + if (eInUnit == FieldUnit::PERCENT) { if ( (mnBaseValue <= 0) || (nValue <= 0) ) return nValue; @@ -1151,28 +1152,28 @@ double MetricField::ConvertDoubleValue( double nValue, sal_Int64 mnBaseValue, sa nMult = mnBaseValue; } - else if ( eOutUnit == FUNIT_PERCENT || - eOutUnit == FUNIT_CUSTOM || - eOutUnit == FUNIT_NONE || - eOutUnit == FUNIT_DEGREE || - eOutUnit == FUNIT_SECOND || - eOutUnit == FUNIT_MILLISECOND || - eOutUnit == FUNIT_PIXEL || - eInUnit == FUNIT_CUSTOM || - eInUnit == FUNIT_NONE || - eInUnit == FUNIT_DEGREE || - eInUnit == FUNIT_MILLISECOND || - eInUnit == FUNIT_PIXEL ) + else if ( eOutUnit == FieldUnit::PERCENT || + eOutUnit == FieldUnit::CUSTOM || + eOutUnit == FieldUnit::NONE || + eOutUnit == FieldUnit::DEGREE || + eOutUnit == FieldUnit::SECOND || + eOutUnit == FieldUnit::MILLISECOND || + eOutUnit == FieldUnit::PIXEL || + eInUnit == FieldUnit::CUSTOM || + eInUnit == FieldUnit::NONE || + eInUnit == FieldUnit::DEGREE || + eInUnit == FieldUnit::MILLISECOND || + eInUnit == FieldUnit::PIXEL ) return nValue; else { - if ( eOutUnit == FUNIT_100TH_MM ) - eOutUnit = FUNIT_NONE; - if ( eInUnit == FUNIT_100TH_MM ) - eInUnit = FUNIT_NONE; + if (eOutUnit == FieldUnit::MM_100TH) + eOutUnit = FieldUnit::NONE; + if (eInUnit == FieldUnit::MM_100TH) + eInUnit = FieldUnit::NONE; - nDiv = aImplFactor[eInUnit][eOutUnit]; - nMult = aImplFactor[eOutUnit][eInUnit]; + nDiv = aImplFactor[sal_uInt16(eInUnit)][sal_uInt16(eOutUnit)]; + nMult = aImplFactor[sal_uInt16(eOutUnit)][sal_uInt16(eInUnit)]; SAL_WARN_IF( nMult <= 0, "vcl", "illegal *" ); SAL_WARN_IF( nDiv <= 0, "vcl", "illegal /" ); @@ -1193,9 +1194,9 @@ double MetricField::ConvertDoubleValue( double nValue, sal_Int64 mnBaseValue, sa double MetricField::ConvertDoubleValue( double nValue, sal_uInt16 nDigits, MapUnit eInUnit, FieldUnit eOutUnit ) { - if ( eOutUnit == FUNIT_PERCENT || - eOutUnit == FUNIT_CUSTOM || - eOutUnit == FUNIT_NONE || + if ( eOutUnit == FieldUnit::PERCENT || + eOutUnit == FieldUnit::CUSTOM || + eOutUnit == FieldUnit::NONE || eInUnit == MapUnit::MapPixel || eInUnit == MapUnit::MapSysFont || eInUnit == MapUnit::MapAppFont || @@ -1224,8 +1225,8 @@ double MetricField::ConvertDoubleValue( double nValue, sal_uInt16 nDigits, if ( eFieldUnit != eOutUnit ) { - sal_Int64 nDiv = aImplFactor[eFieldUnit][eOutUnit]; - sal_Int64 nMult = aImplFactor[eOutUnit][eFieldUnit]; + sal_Int64 nDiv = aImplFactor[sal_uInt16(eFieldUnit)][sal_uInt16(eOutUnit)]; + sal_Int64 nMult = aImplFactor[sal_uInt16(eOutUnit)][sal_uInt16(eFieldUnit)]; SAL_WARN_IF( nMult <= 0, "vcl", "illegal *" ); SAL_WARN_IF( nDiv <= 0, "vcl", "illegal /" ); @@ -1244,13 +1245,13 @@ double MetricField::ConvertDoubleValue( double nValue, sal_uInt16 nDigits, double MetricField::ConvertDoubleValue( double nValue, sal_uInt16 nDigits, FieldUnit eInUnit, MapUnit eOutUnit ) { - if ( eInUnit == FUNIT_PERCENT || - eInUnit == FUNIT_CUSTOM || - eInUnit == FUNIT_NONE || - eInUnit == FUNIT_DEGREE || - eInUnit == FUNIT_SECOND || - eInUnit == FUNIT_MILLISECOND || - eInUnit == FUNIT_PIXEL || + if ( eInUnit == FieldUnit::PERCENT || + eInUnit == FieldUnit::CUSTOM || + eInUnit == FieldUnit::NONE || + eInUnit == FieldUnit::DEGREE || + eInUnit == FieldUnit::SECOND || + eInUnit == FieldUnit::MILLISECOND || + eInUnit == FieldUnit::PIXEL || eOutUnit == MapUnit::MapPixel || eOutUnit == MapUnit::MapSysFont || eOutUnit == MapUnit::MapAppFont || @@ -1274,8 +1275,8 @@ double MetricField::ConvertDoubleValue( double nValue, sal_uInt16 nDigits, if ( eFieldUnit != eInUnit ) { - sal_Int64 nDiv = aImplFactor[eInUnit][eFieldUnit]; - sal_Int64 nMult = aImplFactor[eFieldUnit][eInUnit]; + sal_Int64 nDiv = aImplFactor[sal_uInt16(eInUnit)][sal_uInt16(eFieldUnit)]; + sal_Int64 nMult = aImplFactor[sal_uInt16(eFieldUnit)][sal_uInt16(eInUnit)]; SAL_WARN_IF( nMult <= 0, "vcl", "illegal *" ); SAL_WARN_IF( nDiv <= 0, "vcl", "illegal /" ); @@ -1341,10 +1342,10 @@ MetricFormatter::~MetricFormatter() void MetricFormatter::SetUnit( FieldUnit eNewUnit ) { - if ( eNewUnit == FUNIT_100TH_MM ) + if (eNewUnit == FieldUnit::MM_100TH) { SetDecimalDigits( GetDecimalDigits() + 2 ); - meUnit = FUNIT_MM; + meUnit = FieldUnit::MM; } else meUnit = eNewUnit; @@ -1367,7 +1368,7 @@ OUString MetricFormatter::CreateFieldText( sal_Int64 nValue ) const { //whether percent is separated from its number is locale //specific, pawn it off to icu to decide - if (meUnit == FUNIT_PERCENT) + if (meUnit == FieldUnit::PERCENT) { double dValue = nValue; dValue /= ImplPower10(GetDecimalDigits()); @@ -1376,13 +1377,13 @@ OUString MetricFormatter::CreateFieldText( sal_Int64 nValue ) const OUString aStr = NumericFormatter::CreateFieldText( nValue ); - if( meUnit == FUNIT_CUSTOM ) + if( meUnit == FieldUnit::CUSTOM ) aStr += maCustomUnitText; else { - if (meUnit != FUNIT_NONE && meUnit != FUNIT_DEGREE) + if (meUnit != FieldUnit::NONE && meUnit != FieldUnit::DEGREE) aStr += " "; - assert(meUnit != FUNIT_PERCENT); + assert(meUnit != FieldUnit::PERCENT); aStr += ImplMetricToString( meUnit ); } return aStr; @@ -1414,7 +1415,7 @@ sal_Int64 MetricFormatter::GetValueFromStringUnit(const OUString& rStr, FieldUni sal_Int64 MetricFormatter::GetValueFromString(const OUString& rStr) const { - return GetValueFromStringUnit(rStr, FUNIT_NONE); + return GetValueFromStringUnit(rStr, FieldUnit::NONE); } sal_Int64 MetricFormatter::GetValue( FieldUnit eOutUnit ) const @@ -1425,7 +1426,7 @@ sal_Int64 MetricFormatter::GetValue( FieldUnit eOutUnit ) const void MetricFormatter::SetValue( sal_Int64 nValue ) { // Implementation not inline, because it is a virtual Function - SetValue( nValue, FUNIT_NONE ); + SetValue( nValue, FieldUnit::NONE ); } void MetricFormatter::SetMin( sal_Int64 nNewMin, FieldUnit eInUnit ) @@ -1466,7 +1467,7 @@ sal_Int64 MetricFormatter::GetBaseValue() const { // convert to requested units return MetricField::ConvertValue( mnBaseValue, mnBaseValue, GetDecimalDigits(), - meUnit, FUNIT_NONE ); + meUnit, FieldUnit::NONE ); } void MetricFormatter::Reformat() @@ -1475,7 +1476,7 @@ void MetricFormatter::Reformat() return; OUString aText = GetField()->GetText(); - if ( meUnit == FUNIT_CUSTOM ) + if ( meUnit == FieldUnit::CUSTOM ) maCurUnitText = ImplMetricGetUnitText( aText ); OUString aStr; @@ -1487,7 +1488,7 @@ void MetricFormatter::Reformat() if ( !aStr.isEmpty() ) { ImplSetText( aStr ); - if ( meUnit == FUNIT_CUSTOM ) + if ( meUnit == FieldUnit::CUSTOM ) CustomConvert(); } else diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index ece1380052f5..71bfae795c0f 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -226,7 +226,7 @@ namespace weld unsigned int nDecimalDigits = m_xSpinButton->get_digits(); //pawn percent off to icu to decide whether percent is separated from its number for this locale - if (m_eSrcUnit == FUNIT_PERCENT) + if (m_eSrcUnit == FieldUnit::PERCENT) { double fValue = nValue; fValue /= SpinButton::Power10(nDecimalDigits); @@ -235,9 +235,9 @@ namespace weld else { aStr = rLocaleData.getNum(nValue, nDecimalDigits, true, true); - if (m_eSrcUnit != FUNIT_NONE && m_eSrcUnit != FUNIT_DEGREE) + if (m_eSrcUnit != FieldUnit::NONE && m_eSrcUnit != FieldUnit::DEGREE) aStr += " "; - assert(m_eSrcUnit != FUNIT_PERCENT); + assert(m_eSrcUnit != FieldUnit::PERCENT); aStr += MetricToString(m_eSrcUnit); } @@ -1202,44 +1202,44 @@ namespace FieldUnit detectMetricUnit(const OUString& sUnit) { - FieldUnit eUnit = FUNIT_NONE; + FieldUnit eUnit = FieldUnit::NONE; if (sUnit == "mm") - eUnit = FUNIT_MM; + eUnit = FieldUnit::MM; else if (sUnit == "cm") - eUnit = FUNIT_CM; + eUnit = FieldUnit::CM; else if (sUnit == "m") - eUnit = FUNIT_M; + eUnit = FieldUnit::M; else if (sUnit == "km") - eUnit = FUNIT_KM; + eUnit = FieldUnit::KM; else if ((sUnit == "twips") || (sUnit == "twip")) - eUnit = FUNIT_TWIP; + eUnit = FieldUnit::TWIP; else if (sUnit == "pt") - eUnit = FUNIT_POINT; + eUnit = FieldUnit::POINT; else if (sUnit == "pc") - eUnit = FUNIT_PICA; + eUnit = FieldUnit::PICA; else if (sUnit == "\"" || (sUnit == "in") || (sUnit == "inch")) - eUnit = FUNIT_INCH; + eUnit = FieldUnit::INCH; else if ((sUnit == "'") || (sUnit == "ft") || (sUnit == "foot") || (sUnit == "feet")) - eUnit = FUNIT_FOOT; + eUnit = FieldUnit::FOOT; else if (sUnit == "mile" || (sUnit == "miles")) - eUnit = FUNIT_MILE; + eUnit = FieldUnit::MILE; else if (sUnit == "ch") - eUnit = FUNIT_CHAR; + eUnit = FieldUnit::CHAR; else if (sUnit == "line") - eUnit = FUNIT_LINE; + eUnit = FieldUnit::LINE; else if (sUnit == "%") - eUnit = FUNIT_PERCENT; + eUnit = FieldUnit::PERCENT; else if ((sUnit == "pixels") || (sUnit == "pixel") || (sUnit == "px")) - eUnit = FUNIT_PIXEL; + eUnit = FieldUnit::PIXEL; else if ((sUnit == "degrees") || (sUnit == "degree")) - eUnit = FUNIT_DEGREE; + eUnit = FieldUnit::DEGREE; else if ((sUnit == "sec") || (sUnit == "seconds") || (sUnit == "second")) - eUnit = FUNIT_SECOND; + eUnit = FieldUnit::SECOND; else if ((sUnit == "ms") || (sUnit == "milliseconds") || (sUnit == "millisecond")) - eUnit = FUNIT_MILLISECOND; + eUnit = FieldUnit::MILLISECOND; else if (sUnit != "0") - eUnit = FUNIT_CUSTOM; + eUnit = FieldUnit::CUSTOM; return eUnit; } @@ -1723,7 +1723,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & SAL_INFO("vcl.layout", "making metric field for " << name << " " << sUnit); VclPtrInstance<MetricField> xField(pParent, nBits); xField->SetUnit(eUnit); - if (eUnit == FUNIT_CUSTOM) + if (eUnit == FieldUnit::CUSTOM) xField->SetCustomUnitText(sUnit); xWindow = xField; } @@ -1757,7 +1757,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & xBox->EnableAutoSize(true); xBox->SetUnit(eUnit); xBox->SetDecimalDigits(extractDecimalDigits(sPattern)); - if (eUnit == FUNIT_CUSTOM) + if (eUnit == FieldUnit::CUSTOM) xBox->SetCustomUnitText(sUnit); xWindow = xBox; } @@ -1797,7 +1797,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & xBox->EnableAutoSize(true); xBox->SetUnit(eUnit); xBox->SetDecimalDigits(extractDecimalDigits(sPattern)); - if (eUnit == FUNIT_CUSTOM) + if (eUnit == FieldUnit::CUSTOM) xBox->SetCustomUnitText(sUnit); xWindow = xBox; } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index e184fbcdf3a2..d3140e084a55 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -523,11 +523,11 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll // setup field units for metric fields const LocaleDataWrapper& rLocWrap( mpPageMarginEdt->GetLocaleDataWrapper() ); - FieldUnit eUnit = FUNIT_MM; + FieldUnit eUnit = FieldUnit::MM; sal_uInt16 nDigits = 0; if( rLocWrap.getMeasurementSystemEnum() == MeasurementSystem::US ) { - eUnit = FUNIT_INCH; + eUnit = FieldUnit::INCH; nDigits = 2; } // set units @@ -538,8 +538,10 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll mpPageMarginEdt->SetDecimalDigits( nDigits ); mpSheetMarginEdt->SetDecimalDigits( nDigits ); - mpSheetMarginEdt->SetValue( mpSheetMarginEdt->Normalize( i_rMPS.nLeftMargin ), FUNIT_100TH_MM ); - mpPageMarginEdt->SetValue( mpPageMarginEdt->Normalize( i_rMPS.nHorizontalSpacing ), FUNIT_100TH_MM ); + mpSheetMarginEdt->SetValue(mpSheetMarginEdt->Normalize(i_rMPS.nLeftMargin), + FieldUnit::MM_100TH); + mpPageMarginEdt->SetValue(mpPageMarginEdt->Normalize(i_rMPS.nHorizontalSpacing), + FieldUnit::MM_100TH); mpBorderCB->Check( i_rMPS.bDrawBorder ); mpNupRowsEdt->SetValue( i_rMPS.nRows ); mpNupColEdt->SetValue( i_rMPS.nColumns ); @@ -1431,8 +1433,10 @@ void PrintDialog::updateNupFromPages() sal_IntPtr nPages = sal_IntPtr(maNUpPage.mpNupPagesBox->GetSelectedEntryData()); int nRows = int(maNUpPage.mpNupRowsEdt->GetValue()); int nCols = int(maNUpPage.mpNupColEdt->GetValue()); - long nPageMargin = maNUpPage.mpPageMarginEdt->Denormalize(maNUpPage.mpPageMarginEdt->GetValue( FUNIT_100TH_MM )); - long nSheetMargin = maNUpPage.mpSheetMarginEdt->Denormalize(maNUpPage.mpSheetMarginEdt->GetValue( FUNIT_100TH_MM )); + long nPageMargin = maNUpPage.mpPageMarginEdt->Denormalize( + maNUpPage.mpPageMarginEdt->GetValue(FieldUnit::MM_100TH)); + long nSheetMargin = maNUpPage.mpSheetMarginEdt->Denormalize( + maNUpPage.mpSheetMarginEdt->GetValue(FieldUnit::MM_100TH)); bool bCustom = false; if( nPages == 1 ) @@ -1497,8 +1501,8 @@ void PrintDialog::updateNupFromPages() nSheetMargin = nVertMax; maNUpPage.mpSheetMarginEdt->SetMax( - maNUpPage.mpSheetMarginEdt->Normalize( - std::min(nHorzMax, nVertMax) ), FUNIT_100TH_MM ); + maNUpPage.mpSheetMarginEdt->Normalize(std::min(nHorzMax, nVertMax)), + FieldUnit::MM_100TH); // maximum page distance nHorzMax = (aSize.Width() - 2*nSheetMargin); @@ -1514,14 +1518,16 @@ void PrintDialog::updateNupFromPages() nPageMargin = nVertMax; maNUpPage.mpPageMarginEdt->SetMax( - maNUpPage.mpSheetMarginEdt->Normalize( - std::min(nHorzMax, nVertMax ) ), FUNIT_100TH_MM ); + maNUpPage.mpSheetMarginEdt->Normalize(std::min(nHorzMax, nVertMax)), + FieldUnit::MM_100TH); } maNUpPage.mpNupRowsEdt->SetValue( nRows ); maNUpPage.mpNupColEdt->SetValue( nCols ); - maNUpPage.mpPageMarginEdt->SetValue( maNUpPage.mpPageMarginEdt->Normalize( nPageMargin ), FUNIT_100TH_MM ); - maNUpPage.mpSheetMarginEdt->SetValue( maNUpPage.mpSheetMarginEdt->Normalize( nSheetMargin ), FUNIT_100TH_MM ); + maNUpPage.mpPageMarginEdt->SetValue(maNUpPage.mpPageMarginEdt->Normalize(nPageMargin), + FieldUnit::MM_100TH); + maNUpPage.mpSheetMarginEdt->SetValue(maNUpPage.mpSheetMarginEdt->Normalize(nSheetMargin), + FieldUnit::MM_100TH); maNUpPage.showAdvancedControls( bCustom ); @@ -1535,8 +1541,10 @@ void PrintDialog::updateNup() { int nRows = int(maNUpPage.mpNupRowsEdt->GetValue()); int nCols = int(maNUpPage.mpNupColEdt->GetValue()); - long nPageMargin = maNUpPage.mpPageMarginEdt->Denormalize(maNUpPage.mpPageMarginEdt->GetValue( FUNIT_100TH_MM )); - long nSheetMargin = maNUpPage.mpSheetMarginEdt->Denormalize(maNUpPage.mpSheetMarginEdt->GetValue( FUNIT_100TH_MM )); + long nPageMargin = maNUpPage.mpPageMarginEdt->Denormalize( + maNUpPage.mpPageMarginEdt->GetValue(FieldUnit::MM_100TH)); + long nSheetMargin = maNUpPage.mpSheetMarginEdt->Denormalize( + maNUpPage.mpSheetMarginEdt->GetValue(FieldUnit::MM_100TH)); PrinterController::MultiPageSetup aMPS; aMPS.nRows = nRows; diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 237c041e92cc..804265efb022 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -134,25 +134,25 @@ sal_Int16 SvXMLUnitConverter::GetMeasureUnit(FieldUnit const nFieldUnit) sal_Int16 eUnit = util::MeasureUnit::INCH; switch( nFieldUnit ) { - case FUNIT_MM: + case FieldUnit::MM: eUnit = util::MeasureUnit::MM; break; - case FUNIT_CM: - case FUNIT_M: - case FUNIT_KM: + case FieldUnit::CM: + case FieldUnit::M: + case FieldUnit::KM: eUnit = util::MeasureUnit::CM; break; - case FUNIT_TWIP: + case FieldUnit::TWIP: eUnit = util::MeasureUnit::TWIP; break; - case FUNIT_POINT: - case FUNIT_PICA: + case FieldUnit::POINT: + case FieldUnit::PICA: eUnit = util::MeasureUnit::POINT; break; - case FUNIT_100TH_MM: + case FieldUnit::MM_100TH: eUnit = util::MeasureUnit::MM_100TH; break; - case FUNIT_INCH: + case FieldUnit::INCH: eUnit = util::MeasureUnit::INCH; break; default: |