* In the process of fixing the math background color bug, this commit transfer backgr...

[lyx.git] / src / insets / insetgraphics.h

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 71930d1363b304152460699be432e6fe9d02d193..49811a2da629ff4b140694031144e0261246d209 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -35,7 +35,7 @@ public:
        ///
        ~InsetGraphics();
        ///
-       void metrics(MetricsInfo &, Dimension &) const;
+       bool metrics(MetricsInfo &, Dimension &) const;
        ///
        EDITABLE editable() const;
        ///
@@ -48,13 +48,13 @@ public:
         fragile commands by adding a #\protect# before.
         */
        int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                 OutputParams const &) const;
        ///
        int plaintext(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                     OutputParams const &) const;
        ///
        int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+                   OutputParams const &) const;
 
        /** Tell LyX what the latex features you need i.e. what latex packages
            you need to be included.
@@ -96,9 +96,9 @@ private:
        /// Create the options for the latex command.
        std::string const createLatexOptions() const;
        /// Create length values for docbook export.
-       std::string const toDocbookLength(LyXLength const & len) const;
+       docstring const toDocbookLength(LyXLength const & len) const;
        /// Create the atributes for docbook export.
-       std::string const createDocBookAttributes() const;
+       docstring const createDocBookAttributes() const;
        /// Convert the file if needed, and return the location of the file.
        std::string const prepareFile(Buffer const & buf, OutputParams const &) const;
 
@@ -106,7 +106,7 @@ private:
        InsetGraphicsParams params_;
 
        /// holds the entity name that defines the graphics location (SGML).
-       std::string const graphic_label;
+       docstring const graphic_label;
 
        /// The thing that actually draws the image on LyX's screen.
        boost::scoped_ptr<RenderGraphic> const graphic_;