summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-15 18:44:34 +0100
committerMichael Stahl <mstahl@redhat.com>2014-01-15 21:00:28 +0000
commit370204f97ff950b6bae9c9d9a91da5ef1baeff10 (patch)
treeb3a24c105deb4e8a774387cdbd094cd462f6e83d
parent97531f23406c810ca9486b6609a394da96d27566 (diff)
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/7450 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index e6f7ea197c4f..2716a79b3431 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))