diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-06 14:37:23 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-08 12:15:51 +0100 |
| commit | 9e0770ea7e0cf094add54ad64bc9ff825d24bbe1 (patch) | |
| tree | e897291e44ecb11ca44ba5e5ebefe03ac536862f /sw/source | |
| parent | 841ee6fb052fb35467d74b70f575a86c8c0fe3b7 (diff) | |
Convert FieldUnit to scoped enum
Change-Id: Id2df31daa596a18c79af5fc6ea162deb6e24d5af
Reviewed-on: https://gerrit.libreoffice.org/62958
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source')
35 files changed, 520 insertions, 520 deletions
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 |