diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-05-10 08:39:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-05-10 11:48:27 +0200 |
| commit | ce6b49c8a6c014f286deb98c353058483ae4bd95 (patch) | |
| tree | 3fb66c3cdd3317bc924211abd9bcd527eb5b251c | |
| parent | 4c602fd2554952fa3d2d2144fed3a19bdbfe4481 (diff) | |
cid#1597274 Identical code for different branches
Change-Id: I9672db1e788265c806336f0bf077d0bb8144dc9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167433
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
| -rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 9cec489e0338..c33ea3c3f5a8 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -484,9 +484,9 @@ std::optional<SfxItemSet> SdModule::CreateItemSet( sal_uInt16 nSlot ) nMetric = static_cast<FieldUnit>(officecfg::Office::Impress::Layout::Other::MeasureUnit::NonMetric::get()); else if (aSysLocale.GetLocaleData().getMeasurementSystemEnum() == MeasurementSystem::Metric) - nMetric = static_cast<FieldUnit>(officecfg::Office::Impress::Layout::Other::MeasureUnit::Metric::get()); + nMetric = static_cast<FieldUnit>(officecfg::Office::Draw::Layout::Other::MeasureUnit::Metric::get()); else - nMetric = static_cast<FieldUnit>(officecfg::Office::Impress::Layout::Other::MeasureUnit::NonMetric::get()); + nMetric = static_cast<FieldUnit>(officecfg::Office::Draw::Layout::Other::MeasureUnit::NonMetric::get()); if( nMetric == FieldUnit(0xffff) ) nMetric = GetFieldUnit(); @@ -739,9 +739,9 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) eUIUnit = static_cast<FieldUnit>(officecfg::Office::Impress::Layout::Other::MeasureUnit::NonMetric::get()); else if (aSysLocale.GetLocaleData().getMeasurementSystemEnum() == MeasurementSystem::Metric) - eUIUnit = static_cast<FieldUnit>(officecfg::Office::Impress::Layout::Other::MeasureUnit::Metric::get()); + eUIUnit = static_cast<FieldUnit>(officecfg::Office::Draw::Layout::Other::MeasureUnit::Metric::get()); else - eUIUnit = static_cast<FieldUnit>(officecfg::Office::Impress::Layout::Other::MeasureUnit::NonMetric::get()); + eUIUnit = static_cast<FieldUnit>(officecfg::Office::Draw::Layout::Other::MeasureUnit::NonMetric::get()); pDoc->SetUIUnit(eUIUnit); |