Document/Word/Writer/Writer/Word2007/Base.php
authoredward <edward@roojs.com>
Thu, 28 Apr 2016 05:52:19 +0000 (13:52 +0800)
committeredward <edward@roojs.com>
Thu, 28 Apr 2016 05:52:19 +0000 (13:52 +0800)
Document/Word/Writer/Writer/Word2007/Base.php

index e313e61..7dea2fd 100644 (file)
@@ -144,49 +144,53 @@ class Document_Word_Writer_Writer_Word2007_Base extends Document_Word_Writer_Wri
        \r
        protected function _writeParagraphStyle(Document_Word_Writer_Shared_XMLWriter $objWriter = null, Document_Word_Writer_Style_Paragraph $style, $withoutPPR = false) \r
         {\r
-            $align = $style->getAlign();\r
-            // microsoft office default line spacing is 10pt, we need to set it to 0 if we have not set the spacing..\r
-            $spaceBefore = is_null($style->getSpaceBefore()) ? 0 : $style->getSpaceBefore();\r
-            $spaceAfter = is_null($style->getSpaceAfter()) ? 0 : $style->getSpaceAfter();\r
-            $spacing = is_nan($style->getSpacing()) ? 0 : $style->getSpacing();\r
-            $isList = is_null($style->getListStyle()) ? '' : $style->getListStyle();\r
-\r
-            if(!is_null($align) || !is_null($spacing) || !is_null($spaceBefore) || !is_null($spaceAfter) || !empty($isList)) {\r
-\r
-                if(!$withoutPPR) {\r
-                    $objWriter->startElement('w:pPr');\r
-                }\r
-                \r
-                if(!is_null($align)) {\r
-                        $objWriter->startElement('w:jc');\r
-                                $objWriter->writeAttribute('w:val', $align);\r
-                        $objWriter->endElement();\r
-                }\r
-                \r
-                \r
-\r
-                if(!is_null($spaceBefore) || !is_null($spaceAfter) || !is_null($spacing)) {\r
-\r
-                        $objWriter->startElement('w:spacing');\r
-\r
-                                if(!is_null($spaceBefore)) {\r
-                                        $objWriter->writeAttribute('w:before', $spaceBefore);\r
-                                }\r
-                                if(!is_null($spaceAfter)) {\r
-                                        $objWriter->writeAttribute('w:after', $spaceAfter);\r
-                                }\r
-                                if(!is_null($spacing)) {\r
-                                        $objWriter->writeAttribute('w:line', $spacing);\r
-                                        $objWriter->writeAttribute('w:lineRule', 'auto');\r
-                                }\r
-\r
-                        $objWriter->endElement();\r
-                }\r
+               $align = $style->getAlign();\r
+                // microsoft office default line spacing is 10pt, we need to set it to 0 if we have not set the spacing..\r
+               $spaceBefore = is_null($style->getSpaceBefore()) ? 0 : $style->getSpaceBefore();\r
+               $spaceAfter = is_null($style->getSpaceAfter()) ? 0 : $style->getSpaceAfter();\r
+               $spacing = is_nan($style->getSpacing()) ? 0 : $style->getSpacing();\r
+               $isList = is_null($style->getListStyle()) ? '' : $style->getListStyle();\r
+        \r
+               if(!is_null($align) || !is_null($spacing) || !is_null($spaceBefore) || !is_null($spaceAfter) || !empty($isList)) {\r
+                       \r
+            if(!$withoutPPR) {\r
+                $objWriter->startElement('w:pPr');\r
+            }\r
+                       \r
+                       if(!empty($isList)) {\r
+                               $objWriter->startElement('w:jc');\r
+                                       $objWriter->writeAttribute('w:val', $align);\r
+                               $objWriter->endElement();\r
+                       }\r
+                        \r
+                        if(!is_null($align)) {\r
+                               $objWriter->startElement('w:jc');\r
+                                       $objWriter->writeAttribute('w:val', $align);\r
+                               $objWriter->endElement();\r
+                       }\r
+                       \r
+                       if(!is_null($spaceBefore) || !is_null($spaceAfter) || !is_null($spacing)) {\r
+                               \r
+                               $objWriter->startElement('w:spacing');\r
+                               \r
+                                       if(!is_null($spaceBefore)) {\r
+                                               $objWriter->writeAttribute('w:before', $spaceBefore);\r
+                                       }\r
+                                       if(!is_null($spaceAfter)) {\r
+                                               $objWriter->writeAttribute('w:after', $spaceAfter);\r
+                                       }\r
+                                       if(!is_null($spacing)) {\r
+                                               $objWriter->writeAttribute('w:line', $spacing);\r
+                                               $objWriter->writeAttribute('w:lineRule', 'auto');\r
+                                       }\r
 \r
-                if(!$withoutPPR) {\r
-                                $objWriter->endElement(); // w:pPr\r
-                }\r
+                               $objWriter->endElement();\r
+                       }\r
+                       \r
+            if(!$withoutPPR) {\r
+                           $objWriter->endElement(); // w:pPr\r
             }\r
+               }\r
        }\r
        \r
        protected function _writeLink(Document_Word_Writer_Shared_XMLWriter $objWriter = null, Document_Word_Writer_Section_Link $link, $withoutP = false) \r