diff options
author | obo <obo@openoffice.org> | 2010-07-29 08:11:42 +0200 |
---|---|---|
committer | obo <obo@openoffice.org> | 2010-07-29 08:11:42 +0200 |
commit | d8f24a19a22b5b6ba62eea7b508a308d1b41282e (patch) | |
tree | 941bde1a27c61aa95bc73fc57e9bea0914597764 /reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java | |
parent | 31bfaf0d23521af88c5110ebdb974c0963b67f03 (diff) | |
parent | 58f7363e0857802c43e0ed2a81adead1b2e4ddce (diff) |
Integrate OOO330_m2 into DEV300 (merge)
Notes
split repo tag: extensions_ooo/DEV300_m86
Diffstat (limited to 'reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java')
-rw-r--r-- | reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java index 7a0a496ffb26..5a6b8f948372 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java @@ -136,9 +136,20 @@ public class FormattedTextLayoutController else { final DataFlags df = FormatValueUtility.computeDataFlag(element, getFlowController()); - if (df != null && df.getValue() instanceof String ) + if (df != null) { - target.processContent(df); + if (df.getValue() instanceof String) + { + target.processContent(df); + } + else //@see http://qa.openoffice.org/issues/show_bug.cgi?id=108954 + { + Element cell = getParentTableCell(); + if (cell != null && "string".equals(cell.getAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE))) + { + target.processContent(df); + } + } } } |