18
18
namespace PhpOffice \PhpPowerpoint \Writer \ODPresentation ;
19
19
20
20
use PhpOffice \Common \Drawing as CommonDrawing ;
21
- use PhpOffice \Common \String ;
21
+ use PhpOffice \Common \Text ;
22
22
use PhpOffice \Common \XMLWriter ;
23
23
use PhpOffice \PhpPowerpoint \Slide ;
24
24
use PhpOffice \PhpPowerpoint \PhpPowerpoint ;
@@ -318,10 +318,10 @@ public function writeShapePic(XMLWriter $objWriter, AbstractDrawing $shape)
318
318
// draw:frame
319
319
$ objWriter ->startElement ('draw:frame ' );
320
320
$ objWriter ->writeAttribute ('draw:name ' , $ shape ->getName ());
321
- $ objWriter ->writeAttribute ('svg:width ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getWidth ()), 3 ) . 'cm ' );
322
- $ objWriter ->writeAttribute ('svg:height ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getHeight ()), 3 ) . 'cm ' );
323
- $ objWriter ->writeAttribute ('svg:x ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()), 3 ) . 'cm ' );
324
- $ objWriter ->writeAttribute ('svg:y ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()), 3 ) . 'cm ' );
321
+ $ objWriter ->writeAttribute ('svg:width ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getWidth ()), 3 ) . 'cm ' );
322
+ $ objWriter ->writeAttribute ('svg:height ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getHeight ()), 3 ) . 'cm ' );
323
+ $ objWriter ->writeAttribute ('svg:x ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()), 3 ) . 'cm ' );
324
+ $ objWriter ->writeAttribute ('svg:y ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()), 3 ) . 'cm ' );
325
325
$ objWriter ->writeAttribute ('draw:style-name ' , 'gr ' . $ this ->shapeId );
326
326
// draw:image
327
327
$ objWriter ->startElement ('draw:image ' );
@@ -367,10 +367,10 @@ public function writeShapeTxt(XMLWriter $objWriter, RichText $shape)
367
367
// draw:frame
368
368
$ objWriter ->startElement ('draw:frame ' );
369
369
$ objWriter ->writeAttribute ('draw:style-name ' , 'gr ' . $ this ->shapeId );
370
- $ objWriter ->writeAttribute ('svg:width ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getWidth ()), 3 ) . 'cm ' );
371
- $ objWriter ->writeAttribute ('svg:height ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getHeight ()), 3 ) . 'cm ' );
372
- $ objWriter ->writeAttribute ('svg:x ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()), 3 ) . 'cm ' );
373
- $ objWriter ->writeAttribute ('svg:y ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()), 3 ) . 'cm ' );
370
+ $ objWriter ->writeAttribute ('svg:width ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getWidth ()), 3 ) . 'cm ' );
371
+ $ objWriter ->writeAttribute ('svg:height ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getHeight ()), 3 ) . 'cm ' );
372
+ $ objWriter ->writeAttribute ('svg:x ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()), 3 ) . 'cm ' );
373
+ $ objWriter ->writeAttribute ('svg:y ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()), 3 ) . 'cm ' );
374
374
// draw:text-box
375
375
$ objWriter ->startElement ('draw:text-box ' );
376
376
@@ -527,10 +527,10 @@ public function writeShapeLine(XMLWriter $objWriter, Line $shape)
527
527
// draw:line
528
528
$ objWriter ->startElement ('draw:line ' );
529
529
$ objWriter ->writeAttribute ('draw:style-name ' , 'gr ' . $ this ->shapeId );
530
- $ objWriter ->writeAttribute ('svg:x1 ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()), 3 ) . 'cm ' );
531
- $ objWriter ->writeAttribute ('svg:y1 ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()), 3 ) . 'cm ' );
532
- $ objWriter ->writeAttribute ('svg:x2 ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()+$ shape ->getWidth ()), 3 ) . 'cm ' );
533
- $ objWriter ->writeAttribute ('svg:y2 ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()+$ shape ->getHeight ()), 3 ) . 'cm ' );
530
+ $ objWriter ->writeAttribute ('svg:x1 ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()), 3 ) . 'cm ' );
531
+ $ objWriter ->writeAttribute ('svg:y1 ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()), 3 ) . 'cm ' );
532
+ $ objWriter ->writeAttribute ('svg:x2 ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()+$ shape ->getWidth ()), 3 ) . 'cm ' );
533
+ $ objWriter ->writeAttribute ('svg:y2 ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()+$ shape ->getHeight ()), 3 ) . 'cm ' );
534
534
535
535
// text:p
536
536
$ objWriter ->writeElement ('text:p ' );
@@ -547,10 +547,10 @@ public function writeShapeTable(XMLWriter $objWriter, Table $shape)
547
547
{
548
548
// draw:frame
549
549
$ objWriter ->startElement ('draw:frame ' );
550
- $ objWriter ->writeAttribute ('svg:x ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()), 3 ) . 'cm ' );
551
- $ objWriter ->writeAttribute ('svg:y ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()), 3 ) . 'cm ' );
552
- $ objWriter ->writeAttribute ('svg:height ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getHeight ()), 3 ) . 'cm ' );
553
- $ objWriter ->writeAttribute ('svg:width ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getWidth ()), 3 ) . 'cm ' );
550
+ $ objWriter ->writeAttribute ('svg:x ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()), 3 ) . 'cm ' );
551
+ $ objWriter ->writeAttribute ('svg:y ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()), 3 ) . 'cm ' );
552
+ $ objWriter ->writeAttribute ('svg:height ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getHeight ()), 3 ) . 'cm ' );
553
+ $ objWriter ->writeAttribute ('svg:width ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getWidth ()), 3 ) . 'cm ' );
554
554
555
555
// table:table
556
556
$ objWriter ->startElement ('table:table ' );
@@ -641,10 +641,10 @@ public function writeShapeChart(XMLWriter $objWriter, Chart $shape)
641
641
// draw:frame
642
642
$ objWriter ->startElement ('draw:frame ' );
643
643
$ objWriter ->writeAttribute ('draw:name ' , $ shape ->getTitle ()->getText ());
644
- $ objWriter ->writeAttribute ('svg:x ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()), 3 ) . 'cm ' );
645
- $ objWriter ->writeAttribute ('svg:y ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()), 3 ) . 'cm ' );
646
- $ objWriter ->writeAttribute ('svg:height ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getHeight ()), 3 ) . 'cm ' );
647
- $ objWriter ->writeAttribute ('svg:width ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getWidth ()), 3 ) . 'cm ' );
644
+ $ objWriter ->writeAttribute ('svg:x ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetX ()), 3 ) . 'cm ' );
645
+ $ objWriter ->writeAttribute ('svg:y ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getOffsetY ()), 3 ) . 'cm ' );
646
+ $ objWriter ->writeAttribute ('svg:height ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getHeight ()), 3 ) . 'cm ' );
647
+ $ objWriter ->writeAttribute ('svg:width ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ($ shape ->getWidth ()), 3 ) . 'cm ' );
648
648
649
649
// draw:object
650
650
$ objWriter ->startElement ('draw:object ' );
@@ -888,7 +888,7 @@ public function writeLineStyle(XMLWriter $objWriter, Line $shape)
888
888
break ;
889
889
}
890
890
$ objWriter ->writeAttribute ('svg:stroke-color ' , '# ' .$ shape ->getBorder ()->getColor ()->getRGB ());
891
- $ objWriter ->writeAttribute ('svg:stroke-width ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters ((CommonDrawing::pointsToPixels ($ shape ->getBorder ()->getLineWidth ()))), 3 ).'cm ' );
891
+ $ objWriter ->writeAttribute ('svg:stroke-width ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters ((CommonDrawing::pointsToPixels ($ shape ->getBorder ()->getLineWidth ()))), 3 ).'cm ' );
892
892
$ objWriter ->endElement ();
893
893
894
894
$ objWriter ->endElement ();
@@ -910,7 +910,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
910
910
911
911
// style:table-row-properties
912
912
$ objWriter ->startElement ('style:table-row-properties ' );
913
- $ objWriter ->writeAttribute ('style:row-height ' , String ::numberFormat (CommonDrawing::pixelsToCentimeters (CommonDrawing::pointsToPixels ($ shapeRow ->getHeight ())), 3 ).'cm ' );
913
+ $ objWriter ->writeAttribute ('style:row-height ' , Text ::numberFormat (CommonDrawing::pixelsToCentimeters (CommonDrawing::pointsToPixels ($ shapeRow ->getHeight ())), 3 ).'cm ' );
914
914
$ objWriter ->endElement ();
915
915
916
916
$ objWriter ->endElement ();
@@ -940,7 +940,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
940
940
&& $ shapeCell ->getBorders ()->getBottom ()->getHashCode () == $ shapeCell ->getBorders ()->getLeft ()->getHashCode ()
941
941
&& $ shapeCell ->getBorders ()->getBottom ()->getHashCode () == $ shapeCell ->getBorders ()->getRight ()->getHashCode ()) {
942
942
$ lineStyle = 'none ' ;
943
- $ lineWidth = String ::numberFormat ($ shapeCell ->getBorders ()->getBottom ()->getLineWidth () / 1.75 , 2 );
943
+ $ lineWidth = Text ::numberFormat ($ shapeCell ->getBorders ()->getBottom ()->getLineWidth () / 1.75 , 2 );
944
944
$ lineColor = $ shapeCell ->getBorders ()->getBottom ()->getColor ()->getRGB ();
945
945
switch ($ shapeCell ->getBorders ()->getBottom ()->getLineStyle ()) {
946
946
case Border::LINE_SINGLE :
@@ -949,7 +949,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
949
949
$ objWriter ->writeAttribute ('fo:border ' , $ lineWidth .'pt ' .$ lineStyle .' # ' .$ lineColor );
950
950
} else {
951
951
$ lineStyle = 'none ' ;
952
- $ lineWidth = String ::numberFormat ($ shapeCell ->getBorders ()->getBottom ()->getLineWidth () / 1.75 , 2 );
952
+ $ lineWidth = Text ::numberFormat ($ shapeCell ->getBorders ()->getBottom ()->getLineWidth () / 1.75 , 2 );
953
953
$ lineColor = $ shapeCell ->getBorders ()->getBottom ()->getColor ()->getRGB ();
954
954
switch ($ shapeCell ->getBorders ()->getBottom ()->getLineStyle ()) {
955
955
case Border::LINE_SINGLE :
@@ -958,7 +958,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
958
958
$ objWriter ->writeAttribute ('fo:border-bottom ' , $ lineWidth .'pt ' .$ lineStyle .' # ' .$ lineColor );
959
959
// TOP
960
960
$ lineStyle = 'none ' ;
961
- $ lineWidth = String ::numberFormat ($ shapeCell ->getBorders ()->getTop ()->getLineWidth () / 1.75 , 2 );
961
+ $ lineWidth = Text ::numberFormat ($ shapeCell ->getBorders ()->getTop ()->getLineWidth () / 1.75 , 2 );
962
962
$ lineColor = $ shapeCell ->getBorders ()->getTop ()->getColor ()->getRGB ();
963
963
switch ($ shapeCell ->getBorders ()->getTop ()->getLineStyle ()) {
964
964
case Border::LINE_SINGLE :
@@ -967,7 +967,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
967
967
$ objWriter ->writeAttribute ('fo:border-top ' , $ lineWidth .'pt ' .$ lineStyle .' # ' .$ lineColor );
968
968
// RIGHT
969
969
$ lineStyle = 'none ' ;
970
- $ lineWidth = String ::numberFormat ($ shapeCell ->getBorders ()->getRight ()->getLineWidth () / 1.75 , 2 );
970
+ $ lineWidth = Text ::numberFormat ($ shapeCell ->getBorders ()->getRight ()->getLineWidth () / 1.75 , 2 );
971
971
$ lineColor = $ shapeCell ->getBorders ()->getRight ()->getColor ()->getRGB ();
972
972
switch ($ shapeCell ->getBorders ()->getRight ()->getLineStyle ()) {
973
973
case Border::LINE_SINGLE :
@@ -976,7 +976,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
976
976
$ objWriter ->writeAttribute ('fo:border-right ' , $ lineWidth .'pt ' .$ lineStyle .' # ' .$ lineColor );
977
977
// LEFT
978
978
$ lineStyle = 'none ' ;
979
- $ lineWidth = String ::numberFormat ($ shapeCell ->getBorders ()->getLeft ()->getLineWidth () / 1.75 , 2 );
979
+ $ lineWidth = Text ::numberFormat ($ shapeCell ->getBorders ()->getLeft ()->getLineWidth () / 1.75 , 2 );
980
980
$ lineColor = $ shapeCell ->getBorders ()->getLeft ()->getColor ()->getRGB ();
981
981
switch ($ shapeCell ->getBorders ()->getLeft ()->getLineStyle ()) {
982
982
case Border::LINE_SINGLE :
0 commit comments