cui/source/tabpages/chardlg.cxx | 8 ++++----
cui/source/tabpages/tabstpge.cxx | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit a8c80f20752e3436a0f50484753700d01a23a44e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Sep 24 10:05:37 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Sep 24 13:00:56 2019 +0200
LogicToLogic is a static member
Change-Id: If87f2c6d89c14a92f7222ed040696186583c73e2
Reviewed-on: https://gerrit.libreoffice.org/79443
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 8d1abb55a0ac..152117aaceb5 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -2623,7 +2623,7 @@ IMPL_LINK_NOARG(SvxCharPositionPage, FitToLineHdl_Impl,
weld::ToggleButton&, voi
IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl,
weld::MetricSpinButton&, void)
{
long nVal = static_cast<long>(m_xKerningMF->get_value(FieldUnit::POINT));
- nVal = LogicToLogic( nVal, MapUnit::MapPoint, MapUnit::MapTwip );
+ nVal = OutputDevice::LogicToLogic( nVal, MapUnit::MapPoint,
MapUnit::MapTwip );
long nKern = static_cast<short>(m_xKerningMF->denormalize(nVal));
SvxFont& rFont = GetPreviewFont();
@@ -2802,10 +2802,10 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet
)
const SvxKerningItem& rItem = static_cast<const
SvxKerningItem&>(rSet->Get( nWhich ));
MapUnit eUnit = rSet->GetPool()->GetMetric( nWhich );
long nBig = static_cast<long>(m_xKerningMF->normalize(
static_cast<long>(rItem.GetValue()) ));
- long nKerning = LogicToLogic( nBig, eUnit, MapUnit::MapPoint );
+ long nKerning = OutputDevice::LogicToLogic(nBig, eUnit,
MapUnit::MapPoint);
// set Kerning at the Font, convert into Twips before
- long nKern = LogicToLogic( rItem.GetValue(), eUnit, MapUnit::MapTwip );
+ long nKern = OutputDevice::LogicToLogic(rItem.GetValue(), eUnit,
MapUnit::MapTwip);
rFont.SetFixKerning( static_cast<short>(nKern) );
rCJKFont.SetFixKerning( static_cast<short>(nKern) );
rCTLFont.SetFixKerning( static_cast<short>(nKern) );
@@ -2970,7 +2970,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet )
MapUnit eUnit = rSet->GetPool()->GetMetric( nWhich );
long nTmp = static_cast<long>(m_xKerningMF->get_value(FieldUnit::POINT));
- long nVal = LogicToLogic( nTmp, MapUnit::MapPoint, eUnit );
+ long nVal = OutputDevice::LogicToLogic(nTmp, MapUnit::MapPoint, eUnit);
nKerning = static_cast<short>(m_xKerningMF->denormalize( nVal ));
SfxItemState eOldKernState = rOldSet.GetItemState( nWhich, false );
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 8ecb2478a0d1..8d448306887f 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -195,7 +195,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
for (sal_uInt16 i = 0; i < aNewTabs->Count(); ++i)
{
SvxTabStop aTmpStop = (*aNewTabs)[i];
- aTmpStop.GetTabPos() = LogicToLogic(aTmpStop.GetTabPos(),
MapUnit::Map100thMM, eUnit);
+ aTmpStop.GetTabPos() =
OutputDevice::LogicToLogic(aTmpStop.GetTabPos(), MapUnit::Map100thMM, eUnit);
aTmp->Insert(aTmpStop);
}
@@ -237,7 +237,7 @@ void SvxTabulatorTabPage::Reset(const SfxItemSet* rSet)
for (sal_uInt16 i = 0; i < aTmp->Count(); ++i)
{
SvxTabStop aTmpStop = (*aTmp)[i];
- aTmpStop.GetTabPos() = LogicToLogic(aTmpStop.GetTabPos(),
eUnit, MapUnit::Map100thMM);
+ aTmpStop.GetTabPos() =
OutputDevice::LogicToLogic(aTmpStop.GetTabPos(), eUnit, MapUnit::Map100thMM);
aNewTabs->Insert(aTmpStop);
}
}
@@ -256,7 +256,7 @@ void SvxTabulatorTabPage::Reset(const SfxItemSet* rSet)
pItem = GetItem(*rSet, SID_ATTR_TABSTOP_DEFAULTS);
if (pItem)
- nDefDist = LogicToLogic(long(static_cast<const
SfxUInt16Item*>(pItem)->GetValue()), eUnit, MapUnit::Map100thMM);
+ nDefDist = OutputDevice::LogicToLogic(long(static_cast<const
SfxUInt16Item*>(pItem)->GetValue()), eUnit, MapUnit::Map100thMM);
// Tab pos currently selected
sal_uInt16 nTabPos = 0;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
