office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-25 02:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Applications/15.08'

Browse source
This commit is contained in:
Albert Astals Cid 2015-07-30 10:50:40 +02:00
parent 8eb8cfcf1a 1da3c424d1
commit 6195d6b7f5
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/document.cpp
View file

@ -3293,6 +3293,7 @@ bool Document::canRemovePageAnnotation( const Annotation * annotation ) const
case Annotation::AHighlight:
case Annotation::AStamp:
case Annotation::AInk:
case Annotation::ACaret:
return true;
default:
return false;

1
generators/poppler/annots.cpp
View file

@ -341,6 +341,7 @@ Okular::Annotation* createAnnotationFromPopplerAnnotation( Poppler::Annotation *
case Poppler::Annotation::AGeom:
case Poppler::Annotation::AHighlight:
case Poppler::Annotation::AInk:
case Poppler::Annotation::ACaret:
{
externallyDrawn = true;
/* fallback */