changeset 85:c018570c1a2d 1.2

Ignore existing Bookmarks when merging documemts
author Frank Koormann <frank.koormann@intevation.de>
date Thu, 02 Apr 2015 15:45:55 +0200
parents 3492c79d83c8
children 6466501a963b
files odfcast/convert.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/odfcast/convert.py	Thu Apr 02 15:45:01 2015 +0200
+++ b/odfcast/convert.py	Thu Apr 02 15:45:55 2015 +0200
@@ -214,7 +214,7 @@
 
         for ffile in ffiles:
             try:
-                merger.append(ffile)
+                merger.append(ffile, import_bookmarks=False)
             except Exception, e:
                 log.exception("Error merging file %s" % ffile)
                 if self.is_ignore_file_errors():
@@ -257,7 +257,7 @@
                 html_error_code=400)
 
         try:
-            merger.append(ffile)
+            merger.append(ffile, import_bookmarks=False)
         except Exception, e:
             log.exception("Error merging file %s" % ffile)
             return MergeErrorResponse(details=str(e))
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)