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/18.12'

Browse source
This commit is contained in:
Albert Astals Cid 2018-11-28 23:11:47 +01:00
parent 442cbfcfee b04a2daa6b
commit c4cf125e85
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
generators/djvu/generator_djvu.cpp
View file

@ -292,7 +292,6 @@ void DjVuGenerator::loadPages( QVector<Okular::Page*> & pagesVector, int rotatio
Okular::ObjectRect* DjVuGenerator::convertKDjVuLink( int page, KDjVu::Link * link ) const
{
int newpage = -1;
Okular::Action *newlink = nullptr;
Okular::ObjectRect *newrect = nullptr;
switch ( link->type() )
@ -309,10 +308,7 @@ Okular::ObjectRect* DjVuGenerator::convertKDjVuLink( int page, KDjVu::Link * lin
{
Okular::DocumentViewport vp;
if ( !target.isEmpty() )
{
vp.pageNumber = ( target.at(0) == QLatin1Char( '+' ) || target.at(0) == QLatin1Char( '-' ) ) ? page + tmppage : tmppage - 1;
newpage = vp.pageNumber;
}
newlink = new Okular::GotoAction( QString(), vp );
}
break;
@ -327,9 +323,7 @@ Okular::ObjectRect* DjVuGenerator::convertKDjVuLink( int page, KDjVu::Link * lin
}
if ( newlink )
{
const KDjVu::Page* p = m_djvu->pages().value( newpage == -1 ? page : newpage );
if ( !p )
p = m_djvu->pages().at( page );
const KDjVu::Page* p = m_djvu->pages().at( page );
int width = p->width();
int height = p->height();
bool scape_orientation = false; // hack by tokoe, should always create default page