projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added SetFontSize method for better compatibility with pdf version.
[fa-stable.git]
/
reporting
/
includes
/
excel_report.inc
diff --git
a/reporting/includes/excel_report.inc
b/reporting/includes/excel_report.inc
index 7356da84c3188944cd321901d7a9f496ca59512c..996d290c42338960b9c7794f0ac69009f06401bc 100644
(file)
--- a/
reporting/includes/excel_report.inc
+++ b/
reporting/includes/excel_report.inc
@@
-29,6
+29,8
@@
class FrontReport extends Spreadsheet_Excel_Writer_Workbook
var $bottomMargin = 0;
var $lineHeight;
var $leftMargin = 0;
var $bottomMargin = 0;
var $lineHeight;
var $leftMargin = 0;
+ var $pageWidth; // dummy
+ var $rightMargin; // dummy
var $cols;
var $params;
var $cols;
var $params;
@@
-70,7
+72,7
@@
class FrontReport extends Spreadsheet_Excel_Writer_Workbook
$this->title = $title;
$this->lineHeight = 12;
$this->endLine = 760;
$this->title = $title;
$this->lineHeight = 12;
$this->endLine = 760;
- $this->
fontSize = $fontsize
;
+ $this->
SetFontSize($fontsize)
;
$this->oldFontSize = 0;
$this->y = 0;
$this->currency = '';
$this->oldFontSize = 0;
$this->y = 0;
$this->currency = '';
@@
-214,6
+216,11
@@
class FrontReport extends Spreadsheet_Excel_Writer_Workbook
function Font($fontname = '', $style = 'normal')
{
}
function Font($fontname = '', $style = 'normal')
{
}
+
+ function SetFontSize($size)
+ {
+ $this->fontSize = $size;
+ }
function Info($params, $cols, $headers, $aligns,
$cols2 = null, $headers2 = null, $aligns2 = null)
function Info($params, $cols, $headers, $aligns,
$cols2 = null, $headers2 = null, $aligns2 = null)
@@
-558,7
+565,7
@@
class FrontReport extends Spreadsheet_Excel_Writer_Workbook
{
if (!$conv)
$txt = date2sql($txt);
{
if (!$conv)
$txt = date2sql($txt);
- list($year, $mo, $day) = explode("-", $txt);
+ list($year, $mo, $day) = explode("-", $txt);
$date = $this->ymd2date((int)$year, (int)$mo, (int)$day);
$this->sheet->writeNumber($this->y, $c, $date, $this->formatDate);
}
$date = $this->ymd2date((int)$year, (int)$mo, (int)$day);
$this->sheet->writeNumber($this->y, $c, $date, $this->formatDate);
}