Cosmetics.

[lyx.git] / src / insets / InsetGraphicsParams.cpp

diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index 78aa53a333eb16737220165d4850c3ff24d7f1f1..16130e7c6a1c73977a98945479d4337c58380558 100644 (file)
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -13,7 +13,6 @@
 
 #include "InsetGraphicsParams.h"
 
-#include "support/debug.h"
 #include "LyX.h" // for use_gui
 #include "Lexer.h"
 #include "LyXRC.h"
@@ -23,6 +22,7 @@
 #include "graphics/GraphicsTypes.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
@@ -78,8 +78,6 @@ void InsetGraphicsParams::init()
 
        rotateAngle = "0";              // angle of rotation in degrees
        rotateOrigin.erase();           // Origin of rotation
-       subcaption = false;             // subfigure
-       subcaptionText.erase();         // subfigure caption
        special.erase();                // additional userdefined stuff
 }
 
@@ -102,8 +100,6 @@ void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
 
        rotateAngle = igp.rotateAngle;
        rotateOrigin = igp.rotateOrigin;
-       subcaption = igp.subcaption;
-       subcaptionText = igp.subcaptionText;
        special = igp.special;
 }
 
@@ -127,8 +123,6 @@ bool operator==(InsetGraphicsParams const & left,
 
            left.rotateAngle == right.rotateAngle &&
            left.rotateOrigin == right.rotateOrigin &&
-           left.subcaption == right.subcaption &&
-           left.subcaptionText == right.subcaptionText &&
            left.special == right.special;
 }
 
@@ -180,10 +174,6 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const
                os << "\trotateAngle " << rotateAngle << '\n';
        if (!rotateOrigin.empty())
                os << "\trotateOrigin " << rotateOrigin << '\n';
-       if (subcaption)
-               os << "\tsubcaption\n";
-       if (!subcaptionText.empty())
-               os << "\tsubcaptionText \"" << subcaptionText << '\"' << '\n';
        if (!special.empty())
                os << "\tspecial " << special << '\n';
 }
@@ -194,11 +184,6 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const &
        if (token == "filename") {
                lex.eatLine();
                filename.set(lex.getString(), bufpath);
-       } else if (token == "inzipName") {
-               // this option is currently ignored because only files in
-               // or under current document path is embeddable, and their
-               // inzipName is automatically determined.
-               lex.eatLine();
        } else if (token == "embed") {
                lex.next();
                string const name = lex.getString();
@@ -246,13 +231,6 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const &
        } else if (token == "rotateOrigin") {
                lex.next();
                rotateOrigin=lex.getString();
-       } else if (token == "subcaption") {
-               subcaption = true;
-       } else if (token == "subcaptionText") {
-               lex.eatLine();
-               string sub = lex.getString();
-               // strip surrounding " "
-               subcaptionText = sub.substr(1, sub.length() - 2);
        } else if (token == "special") {
                lex.eatLine();
                special = lex.getString();