Skip to content

Commit

Permalink
Reimplemented #498.
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman Syroeshko committed Apr 14, 2015
1 parent a5c3645 commit b7387be
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ This is the changelog between releases of PHPWord. Releases are listed in revers
Place announcement text here.

### Changes
- Changed visibility of all private properties and methods of ``TemplateProcessor`` to ``protected``. - RomanSyroeshko #498
- Improved performance of ``TemplateProcessor::setValue()``. - @RomanSyroeshko #513
- Renamed ``align`` option of ``Paragraph`` style into ``alignment``. Note: accessor and mutator methods are renamed too. - @RomanSyroeshko

Expand Down
20 changes: 10 additions & 10 deletions src/PhpWord/TemplateProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,33 +30,33 @@ class TemplateProcessor
*
* @var mixed
*/
private $zipClass;
protected $zipClass;

/**
* @var string Temporary document filename (with path).
*/
private $temporaryDocumentFilename;
protected $temporaryDocumentFilename;

/**
* Content of main document part (in XML format) of the temporary document.
*
* @var string
*/
private $temporaryDocumentMainPart;
protected $temporaryDocumentMainPart;

/**
* Content of headers (in XML format) of the temporary document.
*
* @var string[]
*/
private $temporaryDocumentHeaders = array();
protected $temporaryDocumentHeaders = array();

/**
* Content of footers (in XML format) of the temporary document.
*
* @var string[]
*/
private $temporaryDocumentFooters = array();
protected $temporaryDocumentFooters = array();

/**
* @since 0.12.0 Throws CreateTemporaryFileException and CopyFileException instead of Exception.
Expand Down Expand Up @@ -410,7 +410,7 @@ protected function getVariablesForPart($documentPartXML)
* @param integer $index
* @return string
*/
private function getFooterName($index)
protected function getFooterName($index)
{
return sprintf('word/footer%d.xml', $index);
}
Expand All @@ -421,7 +421,7 @@ private function getFooterName($index)
* @param integer $index
* @return string
*/
private function getHeaderName($index)
protected function getHeaderName($index)
{
return sprintf('word/header%d.xml', $index);
}
Expand All @@ -433,7 +433,7 @@ private function getHeaderName($index)
* @return integer
* @throws \PhpOffice\PhpWord\Exception\Exception
*/
private function findRowStart($offset)
protected function findRowStart($offset)
{
$rowStart = strrpos($this->temporaryDocumentMainPart, '<w:tr ', ((strlen($this->temporaryDocumentMainPart) - $offset) * -1));

Expand All @@ -453,7 +453,7 @@ private function findRowStart($offset)
* @param integer $offset
* @return integer
*/
private function findRowEnd($offset)
protected function findRowEnd($offset)
{
return strpos($this->temporaryDocumentMainPart, '</w:tr>', $offset) + 7;
}
Expand All @@ -465,7 +465,7 @@ private function findRowEnd($offset)
* @param integer $endPosition
* @return string
*/
private function getSlice($startPosition, $endPosition = 0)
protected function getSlice($startPosition, $endPosition = 0)
{
if (!$endPosition) {
$endPosition = strlen($this->temporaryDocumentMainPart);
Expand Down

0 comments on commit b7387be

Please sign in to comment.