fix checkstyle issues
This commit is contained in:
parent
524c08bafb
commit
7fd0489567
@ -748,8 +748,7 @@ class TemplateProcessor
|
|||||||
|
|
||||||
// If tmpXmlRow doesn't contain continue, this row is no longer part of the spanned row.
|
// If tmpXmlRow doesn't contain continue, this row is no longer part of the spanned row.
|
||||||
$tmpXmlRow = $this->getSlice($extraRowStart, $extraRowEnd);
|
$tmpXmlRow = $this->getSlice($extraRowStart, $extraRowEnd);
|
||||||
if (
|
if (!preg_match('#<w:vMerge/>#', $tmpXmlRow) &&
|
||||||
!preg_match('#<w:vMerge/>#', $tmpXmlRow) &&
|
|
||||||
!preg_match('#<w:vMerge w:val="continue"\s*/>#', $tmpXmlRow)
|
!preg_match('#<w:vMerge w:val="continue"\s*/>#', $tmpXmlRow)
|
||||||
) {
|
) {
|
||||||
break;
|
break;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user