Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Feb 2016 17:45:36 +0000 (18:45 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Feb 2016 17:45:36 +0000 (18:45 +0100)
Conflicts:
tests/tine20/Addressbook/Export/DocTest.php
tine20/Tinebase/Export/Richtext/Doc.php

Change-Id: I4b2c05e5735b3b4876ca56d0f2eeb31a2078fa31

1  2 
tests/tine20/Addressbook/Export/DocTest.php

@@@ -39,21 -34,5 +39,19 @@@ class Addressbook_Export_DocTest extend
          $doc->save($tempfile);
  
          $this->assertGreaterThan(0, filesize($tempfile));
- //        `open $tempfile`;
      }
 -}
 +
 +    // read and write sucks
 +    public function _testReadWriteCycleSucks()
 +    {
 +        PhpWord\Settings::setTempDir(Tinebase_Core::getTempDir());
 +
 +        $source = str_replace('tests/tine20', 'tine20', __DIR__) . '/templates/addressbook_contact_letter.docx';
 +        $phpWord = PhpWord\IOFactory::load($source);
 +
 +        $tempfile = tempnam(Tinebase_Core::getTempDir(), __METHOD__ . '_') . '.docx';
 +        $writer = $phpWord->save($tempfile);
 +
 +        `open $tempfile`;
 +    }
- }
++}