cui/source/options/optgdlg.cxx | 10 +++++-----
include/svtools/apearcfg.hxx | 16 ++++++++--------
svtools/source/config/apearcfg.cxx | 24 +++++++++++++++---------
3 files changed, 28 insertions(+), 22 deletions(-)
New commits:
commit 9ff8c95e54bed9ffd6ae4636c9e8385ad3160643
Author: Noel Grandin <n...@peralex.com>
Date: Mon May 23 10:07:21 2016 +0200
Convert SnapType to scoped enum
Change-Id: I3980c2999bab191bb9357c883868db17db79e81f
Reviewed-on: https://gerrit.libreoffice.org/25353
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 396d1ee..b05ca35 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -788,10 +788,10 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
}
// Mouse Snap Mode
- short eOldSnap = pAppearanceCfg->GetSnapMode();
- short eNewSnap = m_pMousePosLB->GetSelectEntryPos();
- if(eNewSnap > 2)
- eNewSnap = 2;
+ SnapType eOldSnap = pAppearanceCfg->GetSnapMode();
+ SnapType eNewSnap = (SnapType)m_pMousePosLB->GetSelectEntryPos();
+ if(eNewSnap > SnapType::NONE)
+ eNewSnap = SnapType::NONE;
if ( eNewSnap != eOldSnap )
{
@@ -921,7 +921,7 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
// Screen Scaling
m_pWindowSizeMF->SetValue ( pAppearanceCfg->GetScaleFactor() );
// Mouse Snap
- m_pMousePosLB->SelectEntryPos(pAppearanceCfg->GetSnapMode());
+ m_pMousePosLB->SelectEntryPos((sal_Int32)pAppearanceCfg->GetSnapMode());
m_pMousePosLB->SaveValue();
// Mouse Snap
diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx
index 7b431c26..2dd1788 100644
--- a/include/svtools/apearcfg.hxx
+++ b/include/svtools/apearcfg.hxx
@@ -25,11 +25,11 @@
class Application;
enum class MouseMiddleButtonAction;
-typedef enum {
- SnapToButton = 0,
- SnapToMiddle,
- NoSnap
-} SnapType;
+enum class SnapType {
+ ToButton = 0,
+ ToMiddle,
+ NONE
+};
enum class DragMode {
FullWindow,
@@ -42,7 +42,7 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public
utl::ConfigItem
{
DragMode nDragMode ;
short nScaleFactor ;
- short nSnapMode ;
+ SnapType nSnapMode ;
MouseMiddleButtonAction nMiddleMouse;
#if defined( UNX )
short nAAMinPixelHeight ;
@@ -69,8 +69,8 @@ public:
sal_uInt16 GetScaleFactor () const { return nScaleFactor; }
void SetScaleFactor ( sal_uInt16 nSet );
- sal_uInt16 GetSnapMode () const { return nSnapMode; }
- void SetSnapMode ( sal_uInt16 nSet );
+ SnapType GetSnapMode () const { return nSnapMode; }
+ void SetSnapMode ( SnapType nSet );
MouseMiddleButtonAction GetMiddleMouseButton () const { return
nMiddleMouse; }
void SetMiddleMouseButton ( MouseMiddleButtonAction nSet );
diff --git a/svtools/source/config/apearcfg.cxx
b/svtools/source/config/apearcfg.cxx
index dffd584..19f16b4 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -26,7 +26,7 @@
#include <sal/macros.h>
#define DEFAULT_DRAGMODE DragMode::SystemDep
-#define DEFAULT_SNAPMODE 0
+#define DEFAULT_SNAPMODE SnapType::ToButton
#define DEFAULT_SCALEFACTOR 100
#if defined UNX
#define DEFAULT_AAMINHEIGHT 8
@@ -72,7 +72,13 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
break;
}
case 2: bMenuMouseFollow = *static_cast<sal_Bool const
*>(pValues->getValue()); break; //"Menu/FollowMouse",
- case 3: *pValues >>= nSnapMode; break;
//"Dialog/MousePositioning",
+ case 3:
+ {
+ short nTmp;
+ if (*pValues >>= nTmp)
+ nSnapMode = (SnapType)nTmp;
//"Dialog/MousePositioning",
+ break;
+ }
case 4: { short nTmp = 0; *pValues >>= nTmp; nMiddleMouse
= static_cast<MouseMiddleButtonAction>(nTmp); break; }
//"Dialog/MiddleMouseButton",
#if defined( UNX )
case 5: bFontAntialiasing = *static_cast<sal_Bool const
*>(pValues->getValue()); break; // "FontAntialising/Enabled",
@@ -127,9 +133,9 @@ void SvtTabAppearanceCfg::ImplCommit()
switch(nProp)
{
case 0: pValues[nProp] <<= nScaleFactor; break; //
"FontScaling",
- case 1: pValues[nProp] <<= (short)nDragMode; break;
//"Window/Drag",
- case 2: pValues[nProp] <<= bMenuMouseFollow; break;
//"Menu/FollowMouse",
- case 3: pValues[nProp] <<= nSnapMode; break;
//"Dialog/MousePositioning",
+ case 1: pValues[nProp] <<= (short)nDragMode; break;
//"Window/Drag",
+ case 2: pValues[nProp] <<= bMenuMouseFollow; break;
//"Menu/FollowMouse",
+ case 3: pValues[nProp] <<= (short)nSnapMode; break;
//"Dialog/MousePositioning",
case 4: pValues[nProp] <<= static_cast<short>(nMiddleMouse);
break; //"Dialog/MiddleMouseButton",
#if defined( UNX )
case 5: pValues[nProp] <<= bFontAntialiasing; break; //
"FontAntialising/Enabled",
@@ -150,7 +156,7 @@ void SvtTabAppearanceCfg::SetScaleFactor ( sal_uInt16 nSet )
SetModified();
}
-void SvtTabAppearanceCfg::SetSnapMode ( sal_uInt16 nSet )
+void SvtTabAppearanceCfg::SetSnapMode ( SnapType nSet )
{
nSnapMode = nSet;
SetModified();
@@ -196,13 +202,13 @@ void SvtTabAppearanceCfg::SetApplicationDefaults (
Application* pApp )
switch ( nSnapMode )
{
- case SnapToButton:
+ case SnapType::ToButton:
nMouseOptions |= MouseSettingsOptions::AutoDefBtnPos;
break;
- case SnapToMiddle:
+ case SnapType::ToMiddle:
nMouseOptions |= MouseSettingsOptions::AutoCenterPos;
break;
- case NoSnap:
+ case SnapType::NONE:
default:
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
