Small fix

[lyx.git] / lib / lyx2lyx / lyxconvert_220.py

diff --git a/lib/lyx2lyx/lyxconvert_220.py b/lib/lyx2lyx/lyxconvert_220.py
index fbb6b3f515d0823ba56ff38be5cee4f012ba3c50..b0976b026ec2edec6a75670a05bff52c24fc69c3 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_220.py
+++ b/lib/lyx2lyx/lyxconvert_220.py
@@ -44,32 +44,34 @@ def change_insetgraphics(lines):
        k = find_token2(lines, "size_type", i, j)
        if k == -1:
            k = find_token2(lines, "size_kind", i, j)
-       size_type = string.split(lines[k])[1]
-       del lines[k]
-       j = j-1
-       if size_type in ["0", "original"]:
-           j = del_token(lines, "width", i, j)
-           j = del_token(lines, "height", i, j)
-           j = del_token(lines, "scale", i, j)
-       elif size_type in ["2", "scale"]:
-           j = del_token(lines, "width", i, j)
-           j = del_token(lines, "height", i, j)
-           if get_value(lines, "scale", i, j) == "100":
+       if k != -1:
+           size_type = string.split(lines[k])[1]
+           del lines[k]
+           j = j-1
+           if size_type in ["0", "original"]:
+               j = del_token(lines, "width", i, j)
+               j = del_token(lines, "height", i, j)
+               j = del_token(lines, "scale", i, j)
+           elif size_type in ["2", "scale"]:
+               j = del_token(lines, "width", i, j)
+               j = del_token(lines, "height", i, j)
+               if get_value(lines, "scale", i, j) == "100":
+                   j = del_token(lines, "scale", i, j)
+           else:
                j = del_token(lines, "scale", i, j)
-       else:
-           j = del_token(lines, "scale", i, j)
 
        k = find_token2(lines, "lyxsize_type", i, j)
        if k == -1:
            k = find_token2(lines, "lyxsize_kind", i, j)
-       lyxsize_type = string.split(lines[k])[1]
-       del lines[k]
-       j = j-1
-       j = del_token(lines, "lyxwidth", i, j)
-       j = del_token(lines, "lyxheight", i, j)
-       if lyxsize_type not in ["2", "scale"] or \
-          get_value(lines, "lyxscale", i, j) == "100":
-           j = del_token(lines, "lyxscale", i, j)
+       if k != -1:
+           lyxsize_type = string.split(lines[k])[1]
+           del lines[k]
+           j = j-1
+           j = del_token(lines, "lyxwidth", i, j)
+           j = del_token(lines, "lyxheight", i, j)
+           if lyxsize_type not in ["2", "scale"] or \
+              get_value(lines, "lyxscale", i, j) == "100":
+               j = del_token(lines, "lyxscale", i, j)
        
        i = i+1