[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - sw/source

[Stephan Bergmann]

 sw/source/ui/shells/tabsh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03d5ffdca7261af6af9124a75e1a079337609d06
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 15 17:43:21 2014 +0100

    Fix brace position
    
    Presumably a typo during conflict resolution for
    d02f75a8c36705924ddd6a5921fe3012fafce812 "Resolves: #i121420# merge sidebar
    feature."
    
    Change-Id: Id328c2d2dd0e1a3bb60b7ffd34842fd789da332a
    (cherry picked from commit f86084ea6cc72ac282e3d262ec230d49807cd70f)
    Reviewed-on: https://gerrit.libreoffice.org/7447
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 17d7a31..44ddfca 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -1243,7 +1243,7 @@ void SwTableShell::GetState(SfxItemSet &rSet)
             case SID_TABLE_VERT_BOTTOM:
             {
                 sal_uInt16 nAlign = rSh.GetBoxAlign();
-                sal_Bool bSet = nSlot == (SID_TABLE_VERT_NONE && nAlign == text::VertOrientation::NONE) ||
+                sal_Bool bSet = (nSlot == SID_TABLE_VERT_NONE && nAlign == text::VertOrientation::NONE) ||
                             (nSlot == SID_TABLE_VERT_CENTER && nAlign == text::VertOrientation::CENTER) ||
                             (nSlot == SID_TABLE_VERT_BOTTOM && nAlign == text::VertOrientation::BOTTOM);
                 rSet.Put(SfxBoolItem(nSlot, bSet));