Skip to content

Commit b4e8fdd

Browse files
committed
Update the dependence PhpOffice\Common to 0.2.*
1 parent 5cfa50f commit b4e8fdd

File tree

8 files changed

+55
-53
lines changed

8 files changed

+55
-53
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ vendor
2525
/samples/#*
2626
/samples/Github_*.*
2727
/samples/results
28+
/composer.lock

CHANGELOG.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55

66
### Bugfix
77

8-
### Miscellaneous
9-
- PhpOffice\PhpPowerpoint\Style\Font::setStriketrough has been removed : Use setStrikethrough
10-
- PhpOffice\PhpPowerpoint\AbstractShape::getSlide has been removed
11-
- PhpOffice\PhpPowerpoint\AbstractShape::setSlide has been removed
12-
- PhpOffice\PhpPowerpoint\DocumentLayout::getLayoutXmilli has been removed : getCX(DocumentLayout::UNIT_MILLIMETER)
13-
- PhpOffice\PhpPowerpoint\DocumentLayout::getLayoutYmilli has been removed : getCY(DocumentLayout::UNIT_MILLIMETER)
14-
- PhpOffice\PhpPowerpoint\DocumentLayout::setLayoutXmilli has been removed : setCX(DocumentLayout::UNIT_MILLIMETER)
15-
- PhpOffice\PhpPowerpoint\DocumentLayout::setLayoutYmilli has been removed : setCY(DocumentLayout::UNIT_MILLIMETER)
8+
### Changes
9+
- PhpOffice\PhpPowerpoint\Style\Font::setStriketrough has been removed : Use setStrikethrough - @Progi1984
10+
- PhpOffice\PhpPowerpoint\AbstractShape::getSlide has been removed - @Progi1984
11+
- PhpOffice\PhpPowerpoint\AbstractShape::setSlide has been removed - @Progi1984
12+
- PhpOffice\PhpPowerpoint\DocumentLayout::getLayoutXmilli has been removed : getCX(DocumentLayout::UNIT_MILLIMETER) - @Progi1984
13+
- PhpOffice\PhpPowerpoint\DocumentLayout::getLayoutYmilli has been removed : getCY(DocumentLayout::UNIT_MILLIMETER) - @Progi1984
14+
- PhpOffice\PhpPowerpoint\DocumentLayout::setLayoutXmilli has been removed : setCX(DocumentLayout::UNIT_MILLIMETER) - @Progi1984
15+
- PhpOffice\PhpPowerpoint\DocumentLayout::setLayoutYmilli has been removed : setCY(DocumentLayout::UNIT_MILLIMETER) - @Progi1984
16+
- Update the dependence PhpOffice\Common to 0.2.* - @Progi1984
1617

1718
## 0.4.0 - 2015-07-07
1819

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"php": ">=5.3.0",
2323
"ext-xml": "*",
2424
"ext-zip": "*",
25-
"phpoffice/common": "0.1.*"
25+
"phpoffice/common": "0.2.*"
2626
},
2727
"require-dev": {
2828
"phpunit/phpunit": "3.7.*",

src/PhpPowerpoint/Reader/PowerPoint97.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
use PhpOffice\PhpPowerpoint\Style\Bullet;
2929
use PhpOffice\PhpPowerpoint\Shape\Hyperlink;
3030
use PhpOffice\PhpPowerpoint\Shape\Line;
31-
use PhpOffice\Common\String;
31+
use PhpOffice\Common\Text;
3232
use PhpOffice\PhpPowerPoint\Shape\Group;
3333
use PhpOffice\PhpPowerpoint\Shape\PhpOffice\PhpPowerpoint\Shape;
3434

@@ -1256,7 +1256,7 @@ private function readRecordOfficeArtClientTextbox($stream, $pos)
12561256
if ($char == 0x0B) {
12571257
$char = 0x20;
12581258
}
1259-
$arrayReturn['text'] .= String::chr($char);
1259+
$arrayReturn['text'] .= Text::chr($char);
12601260
$arrayReturn['length'] += 1;
12611261
}
12621262
break;
@@ -1269,7 +1269,7 @@ private function readRecordOfficeArtClientTextbox($stream, $pos)
12691269
if ($char == 0x0B) {
12701270
$char = 0x20;
12711271
}
1272-
$arrayReturn['text'] .= String::chr($char);
1272+
$arrayReturn['text'] .= Text::chr($char);
12731273
$arrayReturn['length'] += 2;
12741274
}
12751275
break;
@@ -2623,7 +2623,7 @@ private function readRecordSlideNameAtom($stream, $pos)
26232623
for ($inc = 0; $inc < $strLen; $inc++) {
26242624
$char = self::getInt2d($stream, $pos + $arrayReturn['length']);
26252625
$arrayReturn['length'] += 2;
2626-
$arrayReturn['slideName'] .= String::chr($char);
2626+
$arrayReturn['slideName'] .= Text::chr($char);
26272627
}
26282628
}
26292629

src/PhpPowerpoint/Writer/ODPresentation/Content.php

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
namespace PhpOffice\PhpPowerpoint\Writer\ODPresentation;
1919

2020
use PhpOffice\Common\Drawing as CommonDrawing;
21-
use PhpOffice\Common\String;
21+
use PhpOffice\Common\Text;
2222
use PhpOffice\Common\XMLWriter;
2323
use PhpOffice\PhpPowerpoint\Slide;
2424
use PhpOffice\PhpPowerpoint\PhpPowerpoint;
@@ -318,10 +318,10 @@ public function writeShapePic(XMLWriter $objWriter, AbstractDrawing $shape)
318318
// draw:frame
319319
$objWriter->startElement('draw:frame');
320320
$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');
325325
$objWriter->writeAttribute('draw:style-name', 'gr' . $this->shapeId);
326326
// draw:image
327327
$objWriter->startElement('draw:image');
@@ -367,10 +367,10 @@ public function writeShapeTxt(XMLWriter $objWriter, RichText $shape)
367367
// draw:frame
368368
$objWriter->startElement('draw:frame');
369369
$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');
374374
// draw:text-box
375375
$objWriter->startElement('draw:text-box');
376376

@@ -527,10 +527,10 @@ public function writeShapeLine(XMLWriter $objWriter, Line $shape)
527527
// draw:line
528528
$objWriter->startElement('draw:line');
529529
$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');
534534

535535
// text:p
536536
$objWriter->writeElement('text:p');
@@ -547,10 +547,10 @@ public function writeShapeTable(XMLWriter $objWriter, Table $shape)
547547
{
548548
// draw:frame
549549
$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');
554554

555555
// table:table
556556
$objWriter->startElement('table:table');
@@ -641,10 +641,10 @@ public function writeShapeChart(XMLWriter $objWriter, Chart $shape)
641641
// draw:frame
642642
$objWriter->startElement('draw:frame');
643643
$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');
648648

649649
// draw:object
650650
$objWriter->startElement('draw:object');
@@ -888,7 +888,7 @@ public function writeLineStyle(XMLWriter $objWriter, Line $shape)
888888
break;
889889
}
890890
$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');
892892
$objWriter->endElement();
893893

894894
$objWriter->endElement();
@@ -910,7 +910,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
910910

911911
// style:table-row-properties
912912
$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');
914914
$objWriter->endElement();
915915

916916
$objWriter->endElement();
@@ -940,7 +940,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
940940
&& $shapeCell->getBorders()->getBottom()->getHashCode() == $shapeCell->getBorders()->getLeft()->getHashCode()
941941
&& $shapeCell->getBorders()->getBottom()->getHashCode() == $shapeCell->getBorders()->getRight()->getHashCode()) {
942942
$lineStyle = 'none';
943-
$lineWidth = String::numberFormat($shapeCell->getBorders()->getBottom()->getLineWidth() / 1.75, 2);
943+
$lineWidth = Text::numberFormat($shapeCell->getBorders()->getBottom()->getLineWidth() / 1.75, 2);
944944
$lineColor = $shapeCell->getBorders()->getBottom()->getColor()->getRGB();
945945
switch ($shapeCell->getBorders()->getBottom()->getLineStyle()) {
946946
case Border::LINE_SINGLE:
@@ -949,7 +949,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
949949
$objWriter->writeAttribute('fo:border', $lineWidth.'pt '.$lineStyle.' #'.$lineColor);
950950
} else {
951951
$lineStyle = 'none';
952-
$lineWidth = String::numberFormat($shapeCell->getBorders()->getBottom()->getLineWidth() / 1.75, 2);
952+
$lineWidth = Text::numberFormat($shapeCell->getBorders()->getBottom()->getLineWidth() / 1.75, 2);
953953
$lineColor = $shapeCell->getBorders()->getBottom()->getColor()->getRGB();
954954
switch ($shapeCell->getBorders()->getBottom()->getLineStyle()) {
955955
case Border::LINE_SINGLE:
@@ -958,7 +958,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
958958
$objWriter->writeAttribute('fo:border-bottom', $lineWidth.'pt '.$lineStyle.' #'.$lineColor);
959959
// TOP
960960
$lineStyle = 'none';
961-
$lineWidth = String::numberFormat($shapeCell->getBorders()->getTop()->getLineWidth() / 1.75, 2);
961+
$lineWidth = Text::numberFormat($shapeCell->getBorders()->getTop()->getLineWidth() / 1.75, 2);
962962
$lineColor = $shapeCell->getBorders()->getTop()->getColor()->getRGB();
963963
switch ($shapeCell->getBorders()->getTop()->getLineStyle()) {
964964
case Border::LINE_SINGLE:
@@ -967,7 +967,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
967967
$objWriter->writeAttribute('fo:border-top', $lineWidth.'pt '.$lineStyle.' #'.$lineColor);
968968
// RIGHT
969969
$lineStyle = 'none';
970-
$lineWidth = String::numberFormat($shapeCell->getBorders()->getRight()->getLineWidth() / 1.75, 2);
970+
$lineWidth = Text::numberFormat($shapeCell->getBorders()->getRight()->getLineWidth() / 1.75, 2);
971971
$lineColor = $shapeCell->getBorders()->getRight()->getColor()->getRGB();
972972
switch ($shapeCell->getBorders()->getRight()->getLineStyle()) {
973973
case Border::LINE_SINGLE:
@@ -976,7 +976,7 @@ public function writeTableStyle(XMLWriter $objWriter, Table $shape)
976976
$objWriter->writeAttribute('fo:border-right', $lineWidth.'pt '.$lineStyle.' #'.$lineColor);
977977
// LEFT
978978
$lineStyle = 'none';
979-
$lineWidth = String::numberFormat($shapeCell->getBorders()->getLeft()->getLineWidth() / 1.75, 2);
979+
$lineWidth = Text::numberFormat($shapeCell->getBorders()->getLeft()->getLineWidth() / 1.75, 2);
980980
$lineColor = $shapeCell->getBorders()->getLeft()->getColor()->getRGB();
981981
switch ($shapeCell->getBorders()->getLeft()->getLineStyle()) {
982982
case Border::LINE_SINGLE:

src/PhpPowerpoint/Writer/ODPresentation/ObjectsChart.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
namespace PhpOffice\PhpPowerpoint\Writer\ODPresentation;
1919

2020
use PhpOffice\Common\Drawing as CommonDrawing;
21-
use PhpOffice\Common\String;
21+
use PhpOffice\Common\Text;
2222
use PhpOffice\Common\XMLWriter;
2323
use PhpOffice\PhpPowerpoint\PhpPowerpoint;
2424
use PhpOffice\PhpPowerpoint\Shape\Chart;
@@ -199,8 +199,8 @@ private function writeContentPart(Chart $chart)
199199
$this->xmlContent->startElement('office:chart');
200200
// office:chart
201201
$this->xmlContent->startElement('chart:chart');
202-
$this->xmlContent->writeAttribute('svg:width', String::numberFormat(CommonDrawing::pixelsToCentimeters($chart->getWidth()), 3) . 'cm');
203-
$this->xmlContent->writeAttribute('svg:height', String::numberFormat(CommonDrawing::pixelsToCentimeters($chart->getHeight()), 3) . 'cm');
202+
$this->xmlContent->writeAttribute('svg:width', Text::numberFormat(CommonDrawing::pixelsToCentimeters($chart->getWidth()), 3) . 'cm');
203+
$this->xmlContent->writeAttribute('svg:height', Text::numberFormat(CommonDrawing::pixelsToCentimeters($chart->getHeight()), 3) . 'cm');
204204
$this->xmlContent->writeAttribute('xlink:href', '.');
205205
$this->xmlContent->writeAttribute('xlink:type', 'simple');
206206
$this->xmlContent->writeAttribute('chart:style-name', 'styleChart');
@@ -387,8 +387,8 @@ private function writeLegend(Chart $chart)
387387
// chart:legend
388388
$this->xmlContent->startElement('chart:legend');
389389
$this->xmlContent->writeAttribute('chart:legend-position', 'end');
390-
$this->xmlContent->writeAttribute('svg:x', String::numberFormat(CommonDrawing::pixelsToCentimeters($chart->getLegend()->getOffsetX()), 3) . 'cm');
391-
$this->xmlContent->writeAttribute('svg:y', String::numberFormat(CommonDrawing::pixelsToCentimeters($chart->getLegend()->getOffsetY()), 3) . 'cm');
390+
$this->xmlContent->writeAttribute('svg:x', Text::numberFormat(CommonDrawing::pixelsToCentimeters($chart->getLegend()->getOffsetX()), 3) . 'cm');
391+
$this->xmlContent->writeAttribute('svg:y', Text::numberFormat(CommonDrawing::pixelsToCentimeters($chart->getLegend()->getOffsetY()), 3) . 'cm');
392392
$this->xmlContent->writeAttribute('style:legend-expansion', 'high');
393393
$this->xmlContent->writeAttribute('chart:style-name', 'styleLegend');
394394
// > chart:legend
@@ -764,8 +764,8 @@ private function writeTitle(Title $oTitle)
764764
if ($oTitle->isVisible()) {
765765
// chart:title
766766
$this->xmlContent->startElement('chart:title');
767-
$this->xmlContent->writeAttribute('svg:x', String::numberFormat(CommonDrawing::pixelsToCentimeters($oTitle->getOffsetX()), 3) . 'cm');
768-
$this->xmlContent->writeAttribute('svg:y', String::numberFormat(CommonDrawing::pixelsToCentimeters($oTitle->getOffsetY()), 3) . 'cm');
767+
$this->xmlContent->writeAttribute('svg:x', Text::numberFormat(CommonDrawing::pixelsToCentimeters($oTitle->getOffsetX()), 3) . 'cm');
768+
$this->xmlContent->writeAttribute('svg:y', Text::numberFormat(CommonDrawing::pixelsToCentimeters($oTitle->getOffsetY()), 3) . 'cm');
769769
$this->xmlContent->writeAttribute('chart:style-name', 'styleTitle');
770770
// > text:p
771771
$this->xmlContent->startElement('text:p');

0 commit comments

Comments
 (0)