summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/options/optgdlg.cxx18
-rw-r--r--cui/source/options/optgdlg.hxx2
-rw-r--r--include/svtools/apearcfg.hxx8
-rw-r--r--svtools/source/config/apearcfg.cxx16
4 files changed, 2 insertions, 42 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index d99f3530e161..50fdda97d17b 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -802,15 +802,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, weld::DialogController* p
m_xMenuIconBox->hide();
}
-#if defined( UNX )
m_xFontAntiAliasing->connect_toggled( LINK( this, OfaViewTabPage, OnAntialiasingToggled ) );
-#else
- // on this platform, we do not have the anti aliasing options
- m_xFontAntiAliasing->hide();
- m_xAAPointLimitLabel->hide();
- m_xAAPointLimit->hide();
-
-#endif
m_xForceOpenGL->connect_toggled(LINK(this, OfaViewTabPage, OnForceOpenGLToggled));
m_xForceSkia->connect_toggled(LINK(this, OfaViewTabPage, OnForceSkiaToggled));
@@ -860,7 +852,6 @@ OfaViewTabPage::~OfaViewTabPage()
{
}
-#if defined( UNX )
IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, weld::ToggleButton&, void )
{
bool bAAEnabled = m_xFontAntiAliasing->get_active();
@@ -868,7 +859,6 @@ IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, weld::ToggleButton&, voi
m_xAAPointLimitLabel->set_sensitive(bAAEnabled);
m_xAAPointLimit->set_sensitive(bAAEnabled);
}
-#endif
IMPL_LINK_NOARG(OfaViewTabPage, OnForceOpenGLToggled, weld::ToggleButton&, void)
{
@@ -994,7 +984,6 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
bAppearanceChanged = true;
}
-#if defined( UNX )
if (m_xFontAntiAliasing->get_state_changed_from_saved())
{
pAppearanceCfg->SetFontAntiAliasing(m_xFontAntiAliasing->get_active());
@@ -1006,7 +995,6 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
pAppearanceCfg->SetFontAntialiasingMinPixelHeight(m_xAAPointLimit->get_value(FieldUnit::PIXEL));
bAppearanceChanged = true;
}
-#endif
if (m_xFontShowCB->get_state_changed_from_saved())
{
@@ -1180,10 +1168,8 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
m_xMouseMiddleLB->set_active(static_cast<short>(pAppearanceCfg->GetMiddleMouseButton()));
m_xMouseMiddleLB->save_value();
-#if defined( UNX )
m_xFontAntiAliasing->set_active( pAppearanceCfg->IsFontAntiAliasing() );
m_xAAPointLimit->set_value(pAppearanceCfg->GetFontAntialiasingMinPixelHeight(), FieldUnit::PIXEL);
-#endif
// WorkingSet
SvtFontOptions aFontOpt;
@@ -1231,10 +1217,8 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
m_xForceSkia->set_active(mpSkiaConfig->forceSkia());
m_xForceSkiaRaster->set_active(mpSkiaConfig->forceSkiaRaster());
-#if defined( UNX )
m_xFontAntiAliasing->save_state();
m_xAAPointLimit->save_value();
-#endif
m_xFontShowCB->save_state();
m_xUseOpenGL->save_state();
@@ -1243,9 +1227,7 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
m_xForceSkia->save_state();
m_xForceSkiaRaster->save_state();
-#if defined( UNX )
OnAntialiasingToggled(*m_xFontAntiAliasing);
-#endif
}
void OfaViewTabPage::UpdateOGLStatus()
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 04988f8e57a4..08eb2eab73b1 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -127,9 +127,7 @@ private:
std::unique_ptr<weld::ComboBox> m_xMousePosLB;
std::unique_ptr<weld::ComboBox> m_xMouseMiddleLB;
-#if defined( UNX )
DECL_LINK(OnAntialiasingToggled, weld::ToggleButton&, void);
-#endif
DECL_LINK(OnForceOpenGLToggled, weld::ToggleButton&, void);
DECL_LINK(OnForceSkiaToggled, weld::ToggleButton&, void);
DECL_LINK(OnForceSkiaRasterToggled, weld::ToggleButton&, void);
diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx
index 81a9ef8f931f..119d012ed555 100644
--- a/include/svtools/apearcfg.hxx
+++ b/include/svtools/apearcfg.hxx
@@ -43,14 +43,10 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg final : public utl::ConfigItem
DragMode nDragMode ;
SnapType nSnapMode ;
MouseMiddleButtonAction nMiddleMouse;
-#if defined( UNX )
short nAAMinPixelHeight ;
-#endif
+ bool bFontAntialiasing ;
bool bMenuMouseFollow ;
-#if defined( UNX )
- bool bFontAntialiasing ;
-#endif
static bool bInitialized ;
@@ -75,13 +71,11 @@ public:
bool IsMenuMouseFollow() const{return bMenuMouseFollow;}
-#if defined( UNX )
void SetFontAntiAliasing( bool bSet ) { bFontAntialiasing = bSet; SetModified(); }
bool IsFontAntiAliasing() const { return bFontAntialiasing; }
sal_uInt16 GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; }
void SetFontAntialiasingMinPixelHeight( sal_uInt16 _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); }
-#endif
static bool IsInitialized() { return bInitialized; }
static void SetInitialized() { bInitialized = true; }
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
generated by cgit (git 2.34.1) at 2025-03-12 08:12:58 +0000