svx: use o3tl::convert instead of 847 (mm100) when we want 24pt
Change-Id: I1d1c4a0e12c0443e7021c8aedcd386814a1647be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166823 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
committed by
Tomaž Vajngerl
parent
f4ef5435df
commit
e82c9633e4
@@ -27,6 +27,7 @@
|
|||||||
#include <svl/whichranges.hxx>
|
#include <svl/whichranges.hxx>
|
||||||
#include <unotools/syslocale.hxx>
|
#include <unotools/syslocale.hxx>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <o3tl/unit_conversion.hxx>
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -67,11 +68,8 @@ namespace SdrEngineDefaults
|
|||||||
// Default FontColor is COL_AUTO
|
// Default FontColor is COL_AUTO
|
||||||
inline Color GetFontColor() { return COL_AUTO; }
|
inline Color GetFontColor() { return COL_AUTO; }
|
||||||
|
|
||||||
// Default FontHeight is 847. The font height uses logical units (MapUnit/MapFraction
|
// Default font height
|
||||||
// see below for further details). The default setting 847/100mm corresponds to about
|
inline size_t GetFontHeight() { return o3tl::convert(24, o3tl::Length::pt, o3tl::Length::mm100); }
|
||||||
// 24 Point. If e.g. one would use Twips (SetMapUnit(MapUnit::MapTwip)) (20 Twip = 1 Point)
|
|
||||||
// instead, one would need to set the font height to 480, in order to get a 24 Point height.
|
|
||||||
inline size_t GetFontHeight() { return 847; }
|
|
||||||
|
|
||||||
// The MapMode is needed for the global Outliner.
|
// The MapMode is needed for the global Outliner.
|
||||||
// Incidentally, every newly instantiated SdrModel is assigned this MapMode by default.
|
// Incidentally, every newly instantiated SdrModel is assigned this MapMode by default.
|
||||||
|
Reference in New Issue
Block a user