mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 10:18:50 +00:00
Remove last traces of the ShareContainer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13604 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
8c93f63b48
commit
3e19d07e7c
@ -98,24 +98,15 @@ public:
|
|||||||
///
|
///
|
||||||
FontTable(lyx::pos_type p, LyXFont const & f)
|
FontTable(lyx::pos_type p, LyXFont const & f)
|
||||||
: pos_(p), font_(f)
|
: pos_(p), font_(f)
|
||||||
{
|
{}
|
||||||
#if 0
|
|
||||||
font_ = container.get(f);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
///
|
///
|
||||||
lyx::pos_type pos() const { return pos_; }
|
lyx::pos_type pos() const { return pos_; }
|
||||||
///
|
///
|
||||||
void pos(lyx::pos_type p) { pos_ = p; }
|
void pos(lyx::pos_type p) { pos_ = p; }
|
||||||
///
|
///
|
||||||
LyXFont const & font() const { return font_; }
|
LyXFont const & font() const { return font_; }
|
||||||
#if 0
|
|
||||||
///
|
|
||||||
void font(LyXFont const & f) { font_ = container.get(f);}
|
|
||||||
#else
|
|
||||||
///
|
///
|
||||||
void font(LyXFont const & f) { font_ = f;}
|
void font(LyXFont const & f) { font_ = f;}
|
||||||
#endif
|
|
||||||
private:
|
private:
|
||||||
/// End position of paragraph this font attribute covers
|
/// End position of paragraph this font attribute covers
|
||||||
lyx::pos_type pos_;
|
lyx::pos_type pos_;
|
||||||
@ -128,13 +119,7 @@ public:
|
|||||||
The values LyXFont::IGNORE_* and LyXFont::TOGGLE are NOT
|
The values LyXFont::IGNORE_* and LyXFont::TOGGLE are NOT
|
||||||
allowed in these font tables.
|
allowed in these font tables.
|
||||||
*/
|
*/
|
||||||
#if 0
|
|
||||||
boost::shared_ptr<LyXFont> font_;
|
|
||||||
///
|
|
||||||
static ShareContainer<LyXFont> container;
|
|
||||||
#else
|
|
||||||
LyXFont font_;
|
LyXFont font_;
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
///
|
///
|
||||||
friend class matchFT;
|
friend class matchFT;
|
||||||
|
Loading…
Reference in New Issue
Block a user