Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #578 from ComputerTinker/develop

Browse Source 
#574 Incorrect Constant Names in \Style\Font.php
This commit is contained in:
troosan 2017-11-08 00:31:45 +01:00 committed by GitHub
commit 64a6505f70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PhpWord/Reader/MsDoc.php
View File

@ -1698,7 +1698,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
$oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASH; $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASH;
break; break;
case 0x09: case 0x09:
$oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTHASH; $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDASH;
break; break;
case 0x0A: case 0x0A:
$oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDOTDASH; $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDOTDASH;
@ -1713,7 +1713,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
$oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASHHEAVY; $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASHHEAVY;
break; break;
case 0x19: case 0x19:
$oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTHASHHEAVY; $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDASHHEAVY;
break; break;
case 0x1A: case 0x1A:
$oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDOTDASHHEAVY; $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDOTDASHHEAVY;

6
src/PhpWord/Style/Font.php
View File

@ -33,8 +33,10 @@ class Font extends AbstractStyle
const UNDERLINE_DASHLONG = 'dashLong'; const UNDERLINE_DASHLONG = 'dashLong';
const UNDERLINE_DASHLONGHEAVY = 'dashLongHeavy'; const UNDERLINE_DASHLONGHEAVY = 'dashLongHeavy';
const UNDERLINE_DOUBLE = 'dbl'; const UNDERLINE_DOUBLE = 'dbl';
const UNDERLINE_DOTHASH = 'dotDash'; const UNDERLINE_DOTHASH = 'dotDash'; // Incorrect spelling, for backwards compatibility
const UNDERLINE_DOTHASHHEAVY = 'dotDashHeavy'; const UNDERLINE_DOTHASHHEAVY = 'dotDashHeavy'; // Incorrect spelling, for backwards compatibility
const UNDERLINE_DOTDASH = 'dotDash'; // Correct spelling
const UNDERLINE_DOTDASHHEAVY = 'dotDashHeavy'; // Correct spelling
const UNDERLINE_DOTDOTDASH = 'dotDotDash'; const UNDERLINE_DOTDOTDASH = 'dotDotDash';
const UNDERLINE_DOTDOTDASHHEAVY = 'dotDotDashHeavy'; const UNDERLINE_DOTDOTDASHHEAVY = 'dotDotDashHeavy';
const UNDERLINE_DOTTED = 'dotted'; const UNDERLINE_DOTTED = 'dotted';