[Okular-devel] Review Request 110391: Fix for bug 319442

[Commit Hook]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/110391/
-----------------------------------------------------------

(Updated May 14, 2013, 7:46 a.m.)


Status
------

This change has been marked as submitted.


Review request for Okular.


Description
-------

Fixed bug 319442 by removing the annotation's inplaceText and window text attributes and replacing them both with the unified usage of the contents attribute.  See discussion with Fabio in bug report and https://git.reviewboard.kde.org/r/107442/.  The inplaceText and window text properties will still be read from saved XML files for backwards compatibility, however they are now used to set the annotation's contents property.


This addresses bug 319442.
    http://bugs.kde.org/show_bug.cgi?id=319442


Diffs
-----

  core/annotations.h 4e9082e 
  core/annotations.cpp 72ca8b5 
  core/document.cpp 2732441 
  generators/djvu/generator_djvu.cpp bc83ed7 
  generators/poppler/annots.cpp b7fb9f7 
  ui/pagepainter.cpp 950be03 
  ui/pageviewannotator.cpp 4615d1c 

Diff: http://git.reviewboard.kde.org/r/110391/diff/


Testing
-------

Tested creating inline note annotations and the bug no longer occurs.


Thanks,

Jon Mease

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/okular-devel/attachments/20130514/3ab4bf82/attachment.html>