summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-05-18 23:44:00 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2016-05-18 23:46:33 +0300
commit77eaa0e4f3727a06a03a0c92b83e9fe2f6a2efb1 (patch)
tree206a5be61eb947e6cde4ccba5435dd75fdbad0b8
parented4410850af1e62a27db10d5f15ad98c50dedce5 (diff)
tdf#99935 Fix rulers visible state
regression of 5e54d9e9bc856520808a446f20575e29a50d017b Change-Id: I7dd032a7bf29ce8387d880c103852846e743b2e7
-rw-r--r--sw/inc/viewopt.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 808f2e3dceb7..ae6e43145d5d 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -528,7 +528,7 @@ public:
#if HAVE_FEATURE_DESKTOP
return bDirect
? bool(m_nUIOptions & ViewOptFlags2::HRuler)
- : !m_bReadonly && (m_nUIOptions & (ViewOptFlags2::AnyRuler|ViewOptFlags2::HRuler));
+ : !m_bReadonly && (m_nUIOptions & (ViewOptFlags2::AnyRuler|ViewOptFlags2::HRuler)) == (ViewOptFlags2::AnyRuler|ViewOptFlags2::HRuler);
#else
(void) bDirect;
return false;
@@ -542,7 +542,7 @@ public:
#if HAVE_FEATURE_DESKTOP
return bDirect
? bool(m_nUIOptions & ViewOptFlags2::VRuler)
- : !m_bReadonly && (m_nUIOptions & (ViewOptFlags2::AnyRuler|ViewOptFlags2::VRuler));
+ : !m_bReadonly && (m_nUIOptions & (ViewOptFlags2::AnyRuler|ViewOptFlags2::VRuler)) == (ViewOptFlags2::AnyRuler|ViewOptFlags2::VRuler);
#else
(void) bDirect;
return false;