Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Noah Brackenbury
erp5
Commits
875473d3
Commit
875473d3
authored
Jun 29, 2011
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent passing frame parameter twice.
parent
ab5d4dd9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
product/ERP5OOo/Document/OOoDocument.py
product/ERP5OOo/Document/OOoDocument.py
+2
-2
No files found.
product/ERP5OOo/Document/OOoDocument.py
View file @
875473d3
...
@@ -278,7 +278,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
...
@@ -278,7 +278,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
return response_dict['
mime
'], Pdata(dec(response_dict['
data
']))
return response_dict['
mime
'], Pdata(dec(response_dict['
data
']))
# Conversion API
# Conversion API
def _convert(self, format, display=None, quality=_MARKER, **kw):
def _convert(self, format, display=None, quality=_MARKER,
frame=0,
**kw):
"""Convert the document to the given format.
"""Convert the document to the given format.
If a conversion is already stored for this format, it is returned
If a conversion is already stored for this format, it is returned
...
@@ -388,7 +388,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
...
@@ -388,7 +388,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
temp_object
=
1
)
temp_object
=
1
)
temp_image
.
_setData
(
data
)
temp_image
.
_setData
(
data
)
# we care for first page only but as well for image quality
# we care for first page only but as well for image quality
mime
,
data
=
temp_image
.
convert
(
original_format
,
display
=
display
,
frame
=
0
,
quality
=
quality
,
**
kw
)
mime
,
data
=
temp_image
.
convert
(
original_format
,
display
=
display
,
frame
=
frame
,
quality
=
quality
,
**
kw
)
# store conversion
# store conversion
if
display
is
None
:
if
display
is
None
:
self
.
setConversion
(
data
,
mime
,
format
=
original_format
)
self
.
setConversion
(
data
,
mime
,
format
=
original_format
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment