diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-15 18:44:34 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-01-15 23:36:04 +0100 |
| commit | d019d725338827edc3946d49b8c9ad3a17c9a8e2 (patch) | |
| tree | d93746f25bd78bc7ee65bf0e5894160fcddb00e5 /sw/source/filter | |
| parent | 1b4ed6073163f03468a0581588515128b8c25682 (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)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 08bf24b11944..639b25cd4c18 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)) |