Fixed issue 'Function getODTProperties() does not convert pixel to points for 'border-left' etc... #50'.

Author: lpaulsen93

helper/cssimport.php

@@ -825,6 +825,10 @@ public function adjustLengthValues ($callback) {
             break;
 
             case 'border':
+            case 'border-left':
+            case 'border-right':
+            case 'border-top':
+            case 'border-bottom':
                 $this->adjustLengthValuesBorder ($callback);
             break;
 
@@ -838,11 +842,17 @@ public function adjustLengthValues ($callback) {
      * @param $callback
      */
     protected function adjustLengthValuesBorder ($callback) {
-        if ( $this->property == 'border' ) {
-            $values = preg_split ('/\s+/', $this->value);
-            $width =
-                call_user_func($callback, $this->property, $values [0], CSSValueType::StrokeOrBorderWidth);
-            $this->value = $width . ' ' . $values [1] . ' ' . $values [2];
+        switch ($this->property) {
+            case 'border':
+            case 'border-left':
+            case 'border-right':
+            case 'border-top':
+            case 'border-bottom':
+                $values = preg_split ('/\s+/', $this->value);
+                $width =
+                    call_user_func($callback, $this->property, $values [0], CSSValueType::StrokeOrBorderWidth);
+                $this->value = $width . ' ' . $values [1] . ' ' . $values [2];
+            break;
         }
     }
 }

renderer/page.php

@@ -3375,11 +3375,19 @@ public function adjustLengthCallback ($property, $value, $type) {
                 break;
 
                 case CSSValueType::StrokeOrBorderWidth:
-                    if ( $property != 'border' ) {
-                        $adjusted = $value;
-                    } else {
-                        // border in ODT spans does not support 'px' units, so we convert it.
-                        $adjusted = $this->pixelToPointsY($number).'pt';
+                    switch ($property) {
+                        case 'border':
+                        case 'border-left':
+                        case 'border-right':
+                        case 'border-top':
+                        case 'border-bottom':
+                            // border in ODT spans does not support 'px' units, so we convert it.
+                            $adjusted = $this->pixelToPointsY($number).'pt';
+                        break;
+
+                        default:
+                            $adjusted = $value;
+                        break;
                     }
                 break;