sw/source/filter/ww8/wrtww8.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 60af010a98540b4785353b27ccbb545ef72e7791
Author: Stephan Bergmann <sberg...@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
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 1c95748..0280445 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2010,7 +2010,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))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
