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

[Stephan Bergmann]

 sw/source/filter/ww8/wrtww8.cxx |    2 +-
 sw/source/ui/shells/tabsh.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d019d725338827edc3946d49b8c9ad3a17c9a8e2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 15 18:44:34 2014 +0100

    String::Len was used in a non-bool context here
    
    ...and apparently erroneously got rewritten as a call to OUString::isEmpty
    instead of OUString::getLength in the conflict resolution of
    7ec7a9a68b4a9c5600840a34434fc800cda3d815 "Fix #120224# Mapping the text rotation
    in Writer table cell with MSO."
    
    Change-Id: If02687437848917f64b8f92f323979ccb51aaad2
    (cherry picked from commit 60af010a98540b4785353b27ccbb545ef72e7791)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 08bf24b..639b25c 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2002,7 +2002,7 @@ static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, sal_Int32 nR
             if( pCNd && pCNd->IsTxtNode())
             {
                 SfxItemSet aCoreSet(rDoc.GetAttrPool(), RES_CHRATR_ROTATE, RES_CHRATR_ROTATE);
-                ((SwTxtNode*)pCNd)->GetAttr( aCoreSet, 0, !((SwTxtNode*)pCNd)->GetTxt().isEmpty());
+                ((SwTxtNode*)pCNd)->GetAttr( aCoreSet, 0, ((SwTxtNode*)pCNd)->GetTxt().getLength());
                 const SvxCharRotateItem * pRotate = NULL;
                 const SfxPoolItem * pRotItem;
                 if ( SFX_ITEM_SET == aCoreSet.GetItemState(RES_CHRATR_ROTATE, sal_True, &pRotItem))
commit 1b4ed6073163f03468a0581588515128b8c25682
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)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index b5d24e8..4d13e4e 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -1241,7 +1241,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));