From a8987d0697fbf0ff4b992d5ff4d694fd9018fd5d Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 4 Nov 2002 14:53:03 +0000 Subject: [PATCH] Use getBBUnits in both frontends. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5580 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/controllers/ChangeLog | 5 ++++ src/frontends/controllers/ControlGraphics.C | 31 ++++++--------------- src/frontends/controllers/ControlGraphics.h | 5 ++-- src/frontends/qt2/ChangeLog | 5 ++++ src/frontends/qt2/QGraphics.C | 2 +- src/frontends/xforms/ChangeLog | 4 +++ src/frontends/xforms/FormGraphics.C | 2 +- 7 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 193a1067bc..36307f1049 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ +2002-11-04 Angus Leeming + + * ControlGraphics.[Ch] (getUnits): moved out of class and into + frnt::getBBUnits(). Code cleaned also. + 2002-11-04 Lars Gullik Bjønnes * biblio.C (regexSearch): STRCONV diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C index e0f278259f..38e0f14ae2 100644 --- a/src/frontends/controllers/ControlGraphics.C +++ b/src/frontends/controllers/ControlGraphics.C @@ -133,32 +133,13 @@ bool ControlGraphics::isFilenameValid(string const & fname) const } -namespace { - -static char const * bb_units[] = { "bp", "cm", "mm", "in"}; -size_t const bb_size = sizeof(bb_units) / sizeof(char *); - -} - - -vector const ControlGraphics::getUnits() -{ - static vector data; - if (!data.empty()) - return data; - - data.resize(bb_size); - for (lyx::size_type i = 0; i < bb_size; ++i) { - data[i] = bb_units[i]; - } - return data; -} - - namespace frnt { namespace { +char const * const bb_units[] = { "bp", "cm", "mm", "in" }; +size_t const bb_size = sizeof(bb_units) / sizeof(char *); + // These are the strings that are stored in the LyX file and which // correspond to the LaTeX identifiers shown in the comments at the // end of each line. @@ -180,6 +161,12 @@ size_t const rorigin_size = sizeof(rorigin_lyx_strs) / sizeof(char *); } // namespace anon +vector const getBBUnits() +{ + return vector (bb_units, bb_units + bb_size); +} + + vector getRotationOriginData() { static vector data; diff --git a/src/frontends/controllers/ControlGraphics.h b/src/frontends/controllers/ControlGraphics.h index 770864b2c1..244533bf7d 100644 --- a/src/frontends/controllers/ControlGraphics.h +++ b/src/frontends/controllers/ControlGraphics.h @@ -47,8 +47,6 @@ public: bool bbChanged; /// test if file exist bool isFilenameValid(string const & fname) const; - /// get the units for the bb - std::vector const getUnits(); private: /// Dispatch the changed parameters to the kernel. @@ -63,6 +61,9 @@ private: namespace frnt { +/// get the units for the bounding box +std::vector const getBBUnits(); + /// The (tranlated) GUI string and it's LaTeX equivalent. typedef std::pair RotationOriginPair; /// diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index dbb55883d6..60ee7f6681 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2002-11-04 Angus Leeming + + * QGraphics.C (update_contents): controller.getUnits() -> + frnt::getBBUnits(). + 2002-11-04 Lars Gullik Bjønnes * QAbout.C (build_dialog): do not use str().c_str() when not needed. diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index 036f2b215b..0aa6feed65 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -114,7 +114,7 @@ int getItemNo(vector v, string const & s) { void QGraphics::update_contents() { // clear and fill in the comboboxes - vector const bb_units = controller().getUnits(); + vector const bb_units = frnt::getBBUnits(); dialog_->lbXunit->clear(); dialog_->lbYunit->clear(); dialog_->rtXunit->clear(); diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 15caaf19c5..37bf47a5ed 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2002-11-04 Angus Leeming + + * FormGraphics.C (build): Use frnt::getBBUnits(). + 2002-11-04 Rob Lahaye * FormSpellchecker.C (input): fix label of spellchecker progress bar. diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C index a87b169a32..6e4c2ea402 100644 --- a/src/frontends/xforms/FormGraphics.C +++ b/src/frontends/xforms/FormGraphics.C @@ -183,7 +183,7 @@ void FormGraphics::build() fl_set_input_filter(bbox_->input_bb_y0, fl_unsigned_float_filter); fl_set_input_filter(bbox_->input_bb_y1, fl_unsigned_float_filter); - string const bb_units = "bp|cm|mm|in"; + string const bb_units = getStringFromVector(frnt::getBBUnits(), "|"); fl_addto_choice(bbox_->choice_bb_units, bb_units.c_str()); // set up the tooltips for the bounding-box-section -- 2.39.5