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

[Stephan Bergmann]

 sw/source/filter/ww8/wrtww8.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea9db4c43a6bcbe1ce3a5fcda352ac5366b989d4
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)
    Reviewed-on: https://gerrit.libreoffice.org/7451
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index e6f7ea1..2716a79 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1993,7 +1993,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))