diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-15 13:04:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-15 13:05:31 +0200 |
| commit | ea2604180089ec749086f868a17ffef7cbcbbc47 (patch) | |
| tree | f1067b61361e2871cce004f956523aad79c9061f /sw/inc | |
| parent | 9e87c064408aa9549336d4ce463e2c2315d30001 (diff) | |
convert SvxCompareMode to scoped enum
and move it to SW since it is only used there
Change-Id: I9cc7869564e24a8ce733f30ef453751a854cf7e0
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/modcfg.hxx | 13 | ||||
| -rw-r--r-- | sw/inc/swmodule.hxx | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 543e6afb95b6..8cec996dab2c 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -88,11 +88,18 @@ public: void SetModified(){ConfigItem::SetModified();} }; +enum class SwCompareMode +{ + Auto = 0, + ByWord, + ByChar +}; + class SwCompareConfig : public utl::ConfigItem { friend class SwModuleOptions; - sal_uInt16 eCmpMode; //Compare/CompareDocuments; + SwCompareMode eCmpMode; //Compare/CompareDocuments; bool bUseRsid; //Compare/Settings/Use RSID /// Compare/Settings/Store RSID bool m_bStoreRsid; @@ -349,8 +356,8 @@ public: bool IsHideFieldTips() const {return bHideFieldTips;} void SetHideFieldTips(bool bSet) {bHideFieldTips = bSet;} - SvxCompareMode GetCompareMode() const { return (SvxCompareMode)aCompareConfig.eCmpMode; } - void SetCompareMode( SvxCompareMode eMode ) { aCompareConfig.eCmpMode = eMode; + SwCompareMode GetCompareMode() const { return aCompareConfig.eCmpMode; } + void SetCompareMode( SwCompareMode eMode ) { aCompareConfig.eCmpMode = eMode; aCompareConfig.SetModified(); } bool IsUseRsid() const { return aCompareConfig.bUseRsid; } diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index c749f9e3d9cc..8ecbc4676f43 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -18,6 +18,7 @@ */ #ifndef INCLUDED_SW_INC_SWMODULE_HXX #define INCLUDED_SW_INC_SWMODULE_HXX + #include <tools/fldunit.hxx> #include <svl/lstner.hxx> #include <unotools/options.hxx> @@ -28,7 +29,6 @@ #include <fldupde.hxx> #include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp> #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> -#include <editeng/svxenum.hxx> class Color; class SfxItemSet; @@ -51,7 +51,7 @@ namespace svtools{ class ColorConfig;} class SvtAccessibilityOptions; class SvtCTLOptions; class SvtUserOptions; - +enum class SwCompareMode; struct SwDBData; enum class SvViewOpt { @@ -199,7 +199,7 @@ public: sal_uInt16 GetRedlineMarkPos(); const Color& GetRedlineMarkColor(); - SvxCompareMode GetCompareMode() const; + SwCompareMode GetCompareMode() const; bool IsUseRsid() const; bool IsIgnorePieces() const; sal_uInt16 GetPieceLen() const; |