Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop

Author: Progi1984

Classes/PHPWord.php

@@ -39,8 +39,23 @@
 class PHPWord
 {
 
+    /**
+     * Default font name (Arial)
+     */
     const DEFAULT_FONT_NAME = 'Arial';
-    const DEFAULT_FONT_SIZE = 20;
+
+    /**
+     * Default font size in points (10pt)
+     *
+     * OOXML defined font size values in halfpoints, i.e. twice of what PHPWord
+     * use, and the conversion will be conducted during XML writing.
+     */
+    const DEFAULT_FONT_SIZE = 10;
+
+    /**
+     * Default font color (black)
+     */
+    const DEFAULT_FONT_COLOR = '000000';
 
     /**
      * Document properties

Classes/PHPWord/Shared/Drawing.php

@@ -128,7 +128,7 @@ public static function pixelsToCentimeters($pValue = 0)
     public static function centimetersToPixels($pValue = 0)
     {
         if ($pValue != 0) {
-            return $pValue * 0.028;
+            return $pValue / 0.028;
         } else {
             return 0;
         }

Classes/PHPWord/Style/Cell.php

@@ -198,11 +198,6 @@ public function setBgColor($pValue = null)
         $this->_bgColor = $pValue;
     }
 
-    public function setHeight($pValue = null)
-    {
-        $this->_height = $pValue;
-    }
-
     public function setBorderSize($pValue = null)
     {
         $this->_borderTopSize = $pValue;