diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-03-25 11:17:09 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-03-25 14:32:17 +0100 |
| commit | 208bb103d3ad93c2356c60174a49204a3e919f74 (patch) | |
| tree | 3cb7391d9af385079cae8e96a8e17650f31e3079 /svtools | |
| parent | cf05c579411a92e44d4559de2dc3a6de29412ad4 (diff) | |
no reason for the FontAntiAliasing setting being UNX-only (tdf#107744)
This dates back to the ancient times where no revision control history
dares, so no idea why this was so, but it doesn't make sense, as
at least Windows can disable AA for fonts too. And if some platform
really wants to hide the setting, it should be enough just to hide
the UI element, no reason for '#if defined( UNX )' all over the place.
Change-Id: I76fc9ad157358321904573079ace5a3fe556f86a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91041
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/config/apearcfg.cxx | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index b3d534009f5f..681b9282e695 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -29,9 +29,7 @@ #define DEFAULT_DRAGMODE DragMode::SystemDep #define DEFAULT_SNAPMODE SnapType::ToButton -#if defined UNX #define DEFAULT_AAMINHEIGHT 8 -#endif using namespace ::com::sun::star::uno; @@ -42,13 +40,9 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg() ,nDragMode ( DEFAULT_DRAGMODE ) ,nSnapMode ( DEFAULT_SNAPMODE ) ,nMiddleMouse ( MouseMiddleButtonAction::AutoScroll ) -#if defined( UNX ) ,nAAMinPixelHeight ( DEFAULT_AAMINHEIGHT ) -#endif - ,bMenuMouseFollow ( false ) -#if defined( UNX ) ,bFontAntialiasing ( true ) -#endif + ,bMenuMouseFollow ( false ) { const Sequence<OUString>& rNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(rNames); @@ -80,10 +74,8 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg() break; } case 3: { short nTmp = 0; *pValues >>= nTmp; nMiddleMouse = static_cast<MouseMiddleButtonAction>(nTmp); break; } //"Dialog/MiddleMouseButton", -#if defined( UNX ) case 4: bFontAntialiasing = *o3tl::doAccess<bool>(*pValues); break; // "FontAntialising/Enabled", case 5: *pValues >>= nAAMinPixelHeight; break; // "FontAntialising/MinPixelHeight", -#endif } } } @@ -101,10 +93,8 @@ const Sequence<OUString>& SvtTabAppearanceCfg::GetPropertyNames() ,"Menu/FollowMouse" // 1 ,"Dialog/MousePositioning" // 2 ,"Dialog/MiddleMouseButton" // 3 -#if defined( UNX ) ,"FontAntiAliasing/Enabled" // 4 ,"FontAntiAliasing/MinPixelHeight" // 5 -#endif }; return aNames; } @@ -123,10 +113,8 @@ void SvtTabAppearanceCfg::ImplCommit() case 1: pValues[nProp] <<= bMenuMouseFollow; break; // "Menu/FollowMouse", case 2: pValues[nProp] <<= static_cast<short>(nSnapMode); break; // "Dialog/MousePositioning", case 3: pValues[nProp] <<= static_cast<short>(nMiddleMouse); break; // "Dialog/MiddleMouseButton", -#if defined( UNX ) case 4: pValues[nProp] <<= bFontAntialiasing; break; // "FontAntialising/Enabled", case 5: pValues[nProp] <<= nAAMinPixelHeight; break; // "FontAntialising/MinPixelHeight", -#endif } } PutProperties(rNames, aValues); @@ -162,11 +150,9 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp ) // and set it here hAppStyle.SetUseSystemUIFonts( bUseSystemUIFonts ); -#if defined( UNX ) // font anti aliasing hAppStyle.SetAntialiasingMinPixelHeight( nAAMinPixelHeight ); hAppStyle.SetDisplayOptions( bFontAntialiasing ? DisplayOptions::NONE : DisplayOptions::AADisable ); -#endif // Mouse Snap |