after
    commit cee2602d
    "remove unused RulerBorderStyle enum value"
introduced a broken if-chain

and
    commit 55605810
    -Werror=duplicated-cond
fixed the chain but did not quite re-introduce the original logic.

Change-Id: I868d8cfe6628192a19a923ebe86c2596fb347d86