Strict Standards Notices entfernt; Sonderzeichen in PDFs konvertiert

This commit is contained in:
Andreas Österreicher
2014-07-07 08:28:56 +00:00
parent f182dfff8f
commit 72117c4cae
8 changed files with 42 additions and 22 deletions
+2 -2
View File
@@ -320,7 +320,7 @@ class OLE extends PEAR
* @param integer $date A timestamp
* @return string The string for the OLE container
*/
function LocalDate2OLE($date = null)
static function LocalDate2OLE($date = null)
{
if (!isset($date)) {
return "\x00\x00\x00\x00\x00\x00\x00\x00";
@@ -367,7 +367,7 @@ class OLE extends PEAR
* @param integer $string A binary string with the encoded date
* @return string The timestamp corresponding to the string
*/
function OLE2LocalDate($string)
static function OLE2LocalDate($string)
{
if (strlen($string) != 8) {
return new PEAR_Error("Expecting 8 byte string");
+2 -1
View File
@@ -45,10 +45,11 @@ class OLE_PPS_Root extends OLE_PPS
*/
function OLE_PPS_Root($time_1st, $time_2nd, $raChild)
{
$ole_obj = new OLE();
$this->_tmp_dir = '';
$this->OLE_PPS(
null,
OLE::Asc2Ucs('Root Entry'),
$ole_obj->Asc2Ucs('Root Entry'),
OLE_PPS_TYPE_ROOT,
null,
null,
+2 -1
View File
@@ -577,7 +577,8 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
*/
function _storeOLEFile()
{
$OLE = new OLE_PPS_File(OLE::Asc2Ucs('Book'));
$ole_obj = new OLE();
$OLE = new OLE_PPS_File($ole_obj->Asc2Ucs('Book'));
if ($this->_tmp_dir != '') {
$OLE->setTempDir($this->_tmp_dir);
}