mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-25 02:45:38 +00:00
Merge remote-tracking branch 'origin/Applications/15.08'
This commit is contained in:
commit
6195d6b7f5
|
@ -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;
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue