diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2016-11-18 22:41:13 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-11-21 15:29:24 +0000 |
| commit | efbf399e773c6fc04496331b6ff1efde54bd4f9e (patch) | |
| tree | 7c21538c696b3b331ba85b0d395f287097f02eb9 /sw/inc | |
| parent | 6f8f053a22a9010b50e6142443909bd31d5501df (diff) | |
related: tdf#90362: remove option from Formatting Aids
The option to ignore protection breaks expected functionality
(protection, including sections protected with password), and may
cause problems mentioned in original bug. This only should be used
in specific recovery situations.
Moving it from user-visible page to Expert Configuration.
(Previously, changing it in Expert Configuration hadn't effect.)
Change-Id: Ice2f20200584acd6b476e002eb783820fa823611
Reviewed-on: https://gerrit.libreoffice.org/30968
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/cmdid.h | 1 | ||||
| -rw-r--r-- | sw/inc/viewopt.hxx | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index b3451c9d4168..cf15543a13c2 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -786,7 +786,6 @@ #define FN_SHAPE_ENDPOSITION_IN_HORI_L2R (FN_PARAM2+26) #define FN_PARAM_PAM (FN_PARAM2+27) /* Point and Mark */ #define FN_TEXT_BOX (FN_PARAM2+28) /* TextBox Property*/ -#define FN_PARAM_IGNORE_PROTECTED (FN_PARAM2+29) /* Ignore protected areas */ // Status: not more than 19! #define FN_STAT_PAGE (FN_STAT + 1) diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 63ba55c5fdee..39e30fdb0cb8 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -74,7 +74,6 @@ enum class ViewOptCoreFlags2 { CursorInProt = 0x0008, PdfExport = 0x0010, Printing = 0x0020, - IgnoreProt = 0x0040 }; namespace o3tl { template<> struct typed_flags<ViewOptCoreFlags2> : is_typed_flags<ViewOptCoreFlags2, 0x007f> {}; @@ -358,15 +357,7 @@ public: inline void SetCursorInProtectedArea(bool b) { b ? (m_nCore2Options |= ViewOptCoreFlags2::CursorInProt) : (m_nCore2Options &= ~ViewOptCoreFlags2::CursorInProt);} - bool IsIgnoreProtectedArea() const - { - return bool(m_nCore2Options & ViewOptCoreFlags2::IgnoreProt); - } - - void SetIgnoreProtectedArea(bool bSet) - { - bSet ? (m_nCore2Options |= ViewOptCoreFlags2::IgnoreProt) : (m_nCore2Options &= ~ViewOptCoreFlags2::IgnoreProt); - } + static bool IsIgnoreProtectedArea(); inline bool IsPDFExport() const {return bool(m_nCore2Options & ViewOptCoreFlags2::PdfExport); } |