include ERP5.Document.Image API when getting image width and height

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13764 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5OOo/OOoTemplate.py

@@ -339,10 +339,13 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0">
 
       w, h, maxwidth, maxheight = getLengthInfos( options_dict, ('width','height','maxwidth','maxheight') )
 
-      try:
+      try: # try image properties
         aspect_ratio = float(picture.width) / float(picture.height)
       except (TypeError, ZeroDivisionError):
-        aspect_ratio = float(picture.width()) / float(picture.height())
+        try: # try ERP5.Document.Image API
+          aspect_ratio = float(picture.getWidth()) / float(picture.getHeight())
+        except AttributeError: # fallback to Photo API
+          aspect_ratio = float(picture.width()) / float(picture.height())
       # fix a default value and correct the aspect
       if h is None:
         if w is None: