diff options
author | Andras Timar <andras.timar@collabora.com> | 2015-11-15 21:12:45 +0300 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-11-15 21:12:45 +0300 |
commit | 8010839279610c598f33b17e3b299acb15809b05 (patch) | |
tree | f6702980163c9d9f97407e4f9882b2467ab03663 | |
parent | d31731597ab8a816771de582783e771bc4b42854 (diff) |
bccu#1335 don't try to handle pdf, internal pdf.js does a better job
-rw-r--r-- | appinfo/app.php | 17 | ||||
-rw-r--r-- | js/viewer/viewer.js | 1 | ||||
-rw-r--r-- | lib/storage.php | 1 |
3 files changed, 0 insertions, 19 deletions
diff --git a/appinfo/app.php b/appinfo/app.php index c01f9a83..86bd14f0 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -139,23 +139,6 @@ if ($c->query('AppConfig')->isConverterEnabled()){ ] ); - $odgFilter = new Office( - [ - 'read' => - [ - 'target' => 'application/pdf', - 'format' => 'pdf', - 'extension' => 'pdf' - ], - 'write' => - [ - 'target' => 'application/pdf', - 'format' => 'pdf', - 'extension' => 'pdf' - ] - ] - ); - $docFilter = new Office( [ 'read' => diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js index aca60c89..9f88dcbb 100644 --- a/js/viewer/viewer.js +++ b/js/viewer/viewer.js @@ -11,7 +11,6 @@ var odfViewer = { 'application/vnd.oasis.opendocument.presentation', 'application/vnd.lotus-wordpro', 'image/svg+xml', - 'application/pdf', 'application/vnd.visio', 'application/vnd.wordperfect', 'application/msonenote', diff --git a/lib/storage.php b/lib/storage.php index 5d756091..31e28e5f 100644 --- a/lib/storage.php +++ b/lib/storage.php @@ -32,7 +32,6 @@ class Storage { 'application/vnd.oasis.opendocument.graphics', 'application/vnd.lotus-wordpro', 'image/svg+xml', - 'application/pdf', 'application/vnd.visio', 'application/vnd.wordperfect', 'application/msonenote', |