sw/inc/viewopt.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 77eaa0e4f3727a06a03a0c92b83e9fe2f6a2efb1
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Wed May 18 23:44:00 2016 +0300
tdf#99935 Fix rulers visible state
regression of 5e54d9e9bc856520808a446f20575e29a50d017b
Change-Id: I7dd032a7bf29ce8387d880c103852846e743b2e7
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 808f2e3..ae6e431 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
