From 4dcde8c0a9283a4b4d94adf6eeafd937b187e65c Mon Sep 17 00:00:00 2001 From: Ivan Lanin Date: Sun, 9 Mar 2014 16:06:35 +0700 Subject: [PATCH] PHPWord_Shared_Drawing::centimetersToPixels() conversion --- Classes/PHPWord/Shared/Drawing.php | 2 +- changelog.txt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Classes/PHPWord/Shared/Drawing.php b/Classes/PHPWord/Shared/Drawing.php index dba204e3..064e6fcc 100755 --- a/Classes/PHPWord/Shared/Drawing.php +++ b/Classes/PHPWord/Shared/Drawing.php @@ -128,7 +128,7 @@ class PHPWord_Shared_Drawing public static function centimetersToPixels($pValue = 0) { if ($pValue != 0) { - return $pValue * 0.028; + return $pValue / 0.028; } else { return 0; } diff --git a/changelog.txt b/changelog.txt index 4ad31be9..09ffc81f 100755 --- a/changelog.txt +++ b/changelog.txt @@ -44,7 +44,10 @@ Changes in branch for release 0.7.1 : - Feature: (ivanlanin) GH-87 - Paragraph: Ability to define parent style (basedOn) and style for following paragraph (next) - Feature: (jeroenmoors) GH-44 GH-88 - Clone table rows on the fly when using a template document - Feature: (deds) GH-16 - Initial addition of basic footnote support -- Feature: (ivanlanin) GH-91 - Paragraph: Ability to define paragraph pagination: widow control, keep next, keep lines, and page break before +- Feature: (ivanlanin) GH-92 - Paragraph: Ability to define paragraph pagination: widow control, keep next, keep lines, and page break before +- General: (ivanlanin) GH-93 - General: PHPWord_Style_Font refactoring +- General: (ivanlanin) GH-93 - Font: Use points instead of halfpoints internally. Conversion to halfpoints done during XML Writing. +- Bugfix: (ivanlanin) GH-94 - General: PHPWord_Shared_Drawing::centimetersToPixels() conversion - QA: (Progi1984) - UnitTests Changes in branch for release 0.7.0 :