class ResizeData {
public:
- ResizeData() : scale(0), keepAspectRatio(false) {}
+ ResizeData() : scale(), keepAspectRatio(false) {}
bool no_resize() const;
bool usingScale() const;
- float scale;
+ std::string scale;
LyXLength width;
LyXLength height;
bool keepAspectRatio;
BASELINERIGHT
};
- RotationData() : angle_(0), origin_(DEFAULT) {}
+ RotationData() : angle("0"), origin_(DEFAULT) {}
bool no_rotation() const;
- void angle(double a);
- double angle() const { return angle_; }
+ std::string const adjAngle() const;
+ std::string angle;
void origin(OriginType o) { origin_ = o; }
OriginType origin() const { return origin_; }
std::string const originString() const;
private:
- double angle_;
OriginType origin_;
};
};
-typedef boost::function1<TransformOption::ptr_type, ClipData>
+typedef boost::function<TransformOption::ptr_type(ClipData)>
ClipOptionFactory;
-typedef boost::function1<TransformOption::ptr_type, std::string>
+typedef boost::function<TransformOption::ptr_type(std::string)>
ExtraOptionFactory;
-typedef boost::function1<TransformOption::ptr_type, ResizeData>
+typedef boost::function<TransformOption::ptr_type(ResizeData)>
ResizeOptionFactory;
-typedef boost::function1<TransformOption::ptr_type, RotationData>
+typedef boost::function<TransformOption::ptr_type(RotationData)>
RotationOptionFactory;
-typedef boost::function1<TransformCommand::ptr_type, ResizeData>
+typedef boost::function<TransformCommand::ptr_type(ResizeData)>
ResizeCommandFactory;
-typedef boost::function1<TransformCommand::ptr_type, RotationData>
+typedef boost::function<TransformCommand::ptr_type(RotationData)>
RotationCommandFactory;
-struct TransformStore
+class TransformStore
{
+public:
TransformStore() {}
/** Stores \c factory and a reminder of what \c data this \c factory