X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphicsParams.h;h=315f4c70827bd34b0890d4473122aeaff84ecf1f;hb=e5c79a43ee78192f45a9ab34873f8bb426b5f37e;hp=4e40dd703f9aae374562b411e9f5607c340c003f;hpb=0cbcc8a166d0fd798478bddf8c078819f1193bc9;p=lyx.git diff --git a/src/insets/InsetGraphicsParams.h b/src/insets/InsetGraphicsParams.h index 4e40dd703f..315f4c7082 100644 --- a/src/insets/InsetGraphicsParams.h +++ b/src/insets/InsetGraphicsParams.h @@ -14,7 +14,7 @@ #define INSETGRAPHICSPARAMS_H -#include "Length.h" +#include "graphics/GraphicsParams.h" #include "support/FileName.h" @@ -51,8 +51,8 @@ public: /// scale image before rotating bool scaleBeforeRotation; - /// The bounding box with "xLB yLB yRT yRT ", divided by a space! - std::string bb; + /// The bounding box + graphics::BoundingBox bbox; /// clip image bool clip; @@ -68,12 +68,13 @@ public: /// InsetGraphicsParams(InsetGraphicsParams const &); /// - void operator=(InsetGraphicsParams const &); + InsetGraphicsParams & operator=(InsetGraphicsParams const &); /// Save the parameters in the LyX format stream. /// Buffer is needed to figure out if a figure is embedded. void Write(std::ostream & os, Buffer const & buf) const; /// If the token belongs to our parameters, read it. - bool Read(Lexer & lex, std::string const & token, std::string const & bufpath); + bool Read(Lexer & lex, std::string const & token, Buffer const & buf, + bool allowOrigin); /// convert // Only a subset of InsetGraphicsParams is needed for display purposes. // This function also interrogates lyxrc to ascertain whether