← Back to branch summary

~ubuntu-branches/ubuntu/utopic/inkscape/utopic-proposed

« back to all changes in this revision

Viewing changes to src/extension/param/parameter.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/extension/param/parameter.cpp
204
204
    return param->get(doc, node);
205
205
}
206
206
 
 
207
/** \brief  Wrapper to cast to the object and use it's function.  */
 
208
gchar const *Parameter::get_optiongroup(SPDocument const * doc, Inkscape::XML::Node const * node)
 
209
{
 
210
    ParamRadioButton * param = dynamic_cast<ParamRadioButton *>(this);
 
211
    if (!param) {
 
212
        throw Extension::param_not_optiongroup_param();
 
213
    }
 
214
    return param->get(doc, node);
 
215
}
 
216
 
207
217
guint32
208
218
Parameter::get_color(const SPDocument* doc, const Inkscape::XML::Node* node)
209
219
{
253
263
        throw Extension::param_not_string_param();
254
264
    return stringpntr->set(in, doc, node);
255
265
}
 
266
 
 
267
gchar const * Parameter::set_optiongroup( gchar const * in, SPDocument * doc, Inkscape::XML::Node * node )
 
268
{
 
269
    ParamRadioButton *param = dynamic_cast<ParamRadioButton *>(this);
 
270
    if (!param) {
 
271
        throw Extension::param_not_optiongroup_param();
 
272
    }
 
273
    return param->set(in, doc, node);
 
274
}
 
275
 
 
276
 
256
277
/** \brief  Wrapper to cast to the object and use it's function.  */
257
278
guint32
258
279
Parameter::set_color (guint32 in, SPDocument * doc, Inkscape::XML::Node * node)