← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/inkscape/oneiric-updates

« back to all changes in this revision

Viewing changes to src/live_effects/lpeobject.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/live_effects/lpeobject.cpp
245
245
/**
246
246
 * If this has other users, create a new private duplicate and return it
247
247
 * returns 'this' when no forking was necessary (and therefore no duplicate was made)
 
248
 * Check out sp_lpe_item_fork_path_effects_if_necessary !
248
249
 */
249
250
LivePathEffectObject *
250
251
LivePathEffectObject::fork_private_if_necessary(unsigned int nr_of_allowed_users)
252
253
    if (SP_OBJECT_HREFCOUNT(this) > nr_of_allowed_users) {
253
254
        SPDocument *doc = SP_OBJECT_DOCUMENT(this);
254
255
        Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
255
 
 
256
 
        Inkscape::XML::Node *repr = SP_OBJECT_REPR (this)->duplicate(xml_doc);
257
 
        SP_OBJECT_REPR (SP_DOCUMENT_DEFS (doc))->addChild(repr, NULL);
258
 
        LivePathEffectObject *lpeobj_new = (LivePathEffectObject *) doc->getObjectByRepr(repr);
259
 
        Inkscape::GC::release(repr);
 
256
        Inkscape::XML::Node *dup_repr = SP_OBJECT_REPR (this)->duplicate(xml_doc);
 
257
 
 
258
        SP_OBJECT_REPR (SP_DOCUMENT_DEFS (doc))->addChild(dup_repr, NULL);
 
259
        LivePathEffectObject *lpeobj_new = LIVEPATHEFFECT( doc->getObjectByRepr(dup_repr) );
 
260
 
 
261
        Inkscape::GC::release(dup_repr);
260
262
        return lpeobj_new;
261
263
    }
262
264
    return this;