prevent crash when inserting minipage in table cell,

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

diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h
index b33629b328ea2d1d5a7d7b673a76e48f99b33b90..8b626a64ec7d9ffdf946db607a771edb7475adf6 100644 (file)
--- a/src/insets/insetgraphicsParams.h
+++ b/src/insets/insetgraphicsParams.h
@@ -17,8 +17,7 @@
 #include "graphics/GraphicsTypes.h"
 #include "LString.h"
 #include "lyxlength.h"
-
-namespace grfx = lyx::graphics;
+#include "support/filename.h"
 
 class LyXLex;
 
@@ -33,11 +32,11 @@ namespace graphics {
 struct InsetGraphicsParams
 {
        /// Image filename.
-       string filename;
+       lyx::support::FileName filename;
        /// Scaling the Screen inside Lyx
        unsigned int lyxscale;
        /// How to display the image inside LyX
-       grfx::DisplayType display;
+       lyx::graphics::DisplayType display;
        /// Scaling for output (LaTeX)
        float scale;
        /// sizes for output (LaTeX)
@@ -81,7 +80,7 @@ struct InsetGraphicsParams
   // Only a subset of InsetGraphicsParams is needed for display purposes.
   // This function also interrogates lyxrc to ascertain whether
   // to display or not.
-       grfx::Params as_grfxParams() const;
+       lyx::graphics::Params as_grfxParams() const;
 
 private:
        /// Initialize the object to a default status.