[Phpgroupware-cvs] manual/inc class.odt2xhtml.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    manual
Changes by:     Sigurd Nes <sigurdne>   07/03/29 13:11:17

Modified files:
        inc            : class.odt2xhtml.inc.php 

Log message:
        alternative stylesheet

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/manual/inc/class.odt2xhtml.inc.php?cvsroot=phpgroupware&r1=1.1&r2=1.2

Patches:
Index: class.odt2xhtml.inc.php
===================================================================
RCS file: /sources/phpgroupware/manual/inc/class.odt2xhtml.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- class.odt2xhtml.inc.php     6 Mar 2007 13:38:47 -0000       1.1
+++ class.odt2xhtml.inc.php     29 Mar 2007 13:11:17 -0000      1.2
@@ -9,7 +9,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package manual
        * @subpackage odt2xhtml
-       * @version $Id: class.odt2xhtml.inc.php,v 1.1 2007/03/06 13:38:47 
sigurdne Exp $
+       * @version $Id: class.odt2xhtml.inc.php,v 1.2 2007/03/29 13:11:17 
sigurdne Exp $
        */
 
        /**
@@ -68,6 +68,7 @@
                {
                        $xls = new DOMDocument;
                        $xls->load(PHPGW_SERVER_ROOT . SEP . 'manual' . SEP . 
'templates' . SEP . 'base' . SEP . 'odt2html.xsl');
+               //      $xls->load(PHPGW_SERVER_ROOT . SEP . 'manual' . SEP . 
'templates' . SEP . 'base' . SEP . 'odt2xhtml.xsl');
                //      $xls->load('xslt/export/xhtml/ooo2xhtml.xsl');
                //      $xls->load('template.xsl');
                        $xslt = new XSLTProcessor;
@@ -77,7 +78,7 @@
                
                        $xml = new DOMDocument;
                        $xml->loadXML($x);
-                       return html_entity_decode($xslt->transformToXML($xml));
+                       return 
html_entity_decode(utf8_decode($xslt->transformToXML($xml)),ENT_COMPAT,'utf-8');
                }
 
                public function makeImage($img)