[Libreoffice-commits] core.git: sw/source

Noel Grandin noel.grandin at collabora.co.uk
Thu Sep 8 09:41:50 UTC 2016


 sw/source/core/doc/docredln.cxx |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit ac1c3f2ab68a17b6508901bf9b5abdad618158a6
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Sep 8 11:41:22 2016 +0200

    more workaround lack of constexpr
    
    Change-Id: I1be117f9845d502d4b8dfa238dc13198f8b76dd6

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 5f258a4..2173fc8 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -994,19 +994,13 @@ bool SwRangeRedline::HasValidRange() const
 
 void SwRangeRedline::CallDisplayFunc(size_t nMyPos)
 {
-    switch( RedlineFlags::ShowMask & GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags() )
-    {
-    case RedlineFlags::ShowInsert | RedlineFlags::ShowDelete:
+    RedlineFlags eShow = RedlineFlags::ShowMask & GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags();
+    if (eShow == (RedlineFlags::ShowInsert | RedlineFlags::ShowDelete))
         Show(0, nMyPos);
-        break;
-    case RedlineFlags::ShowInsert:
+    else if (eShow == RedlineFlags::ShowInsert)
         Hide(0, nMyPos);
-        break;
-    case RedlineFlags::ShowDelete:
+    else if (eShow == RedlineFlags::ShowDelete)
         ShowOriginal(0, nMyPos);
-        break;
-    default: break;
-    }
 }
 
 void SwRangeRedline::Show(sal_uInt16 nLoop, size_t nMyPos)


More information about the Libreoffice-commits mailing list