Attachment #2896 for bug #2957

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2957
Collapse All | Expand All

Lines 1-6 Link Here

(-)a/config.h.cmake (+1 lines)
1	#cmakedefine VERSION "@VERSION@"	1	#cmakedefine VERSION "@VERSION@"
2		2
3	// poppler-tqt	3	// poppler-tqt
		4	#cmakedefine HAVE_POPPLER_064
4	#cmakedefine HAVE_POPPLER_060	5	#cmakedefine HAVE_POPPLER_060
5	#cmakedefine HAVE_POPPLER_030	6	#cmakedefine HAVE_POPPLER_030
6	#cmakedefine HAVE_POPPLER_020	7	#cmakedefine HAVE_POPPLER_020




    message( STATUS "Performing Test HAVE_POPPLER_060 - Failed" )
  endif( )
endif( )

if( NOT DEFINED HAVE_POPPLER_064 )
  message( STATUS "Performing Test HAVE_POPPLER_064" )
  if( NOT POPPLER_VERSION VERSION_LESS "0.64" )
    set( HAVE_POPPLER_064 1 CACHE INTERNAL "" FORCE )
    message( STATUS "Performing Test HAVE_POPPLER_064 - Success" )
  else( )
    set( HAVE_POPPLER_064 "" CACHE INTERNAL "" FORCE )
    message( STATUS "Performing Test HAVE_POPPLER_064 - Failed" )
  endif( )
endif( )

Lines 163-169 TQString Document::getInfo( const TQString & type ) const Link Here

(-)a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc (-2 / +2 lines)
163		163
164	TQString result;	164	TQString result;
165	Object obj;	165	Object obj;
166	GooString *s1;	166	CONST_064 GooString *s1;
167	GBool isUnicode;	167	GBool isUnicode;
168	Unicode u;	168	Unicode u;
169	int i;	169	int i;
Lines 320-326 TQDomDocument *Document::toc() const Link Here
320	if ( !outline )	320	if ( !outline )
321	return NULL;	321	return NULL;
322		322
323	GooList * items = outline->getItems();	323	CONST_064 GooList * items = outline->getItems();
324	if ( !items \|\| items->getLength() < 1 )	324	if ( !items \|\| items->getLength() < 1 )
325	return NULL;	325	return NULL;
326		326

Lines 30-37 namespace Poppler { Link Here

(-)a/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc (-2 / +2 lines)
30	LinkDestination::LinkDestination(const LinkDestinationData &data)	30	LinkDestination::LinkDestination(const LinkDestinationData &data)
31	{	31	{
32	bool deleteDest = false;	32	bool deleteDest = false;
33	LinkDest *ld = data.ld;	33	CONST_064 LinkDest *ld = data.ld;
34		34
35	if ( data.namedDest && !ld )	35	if ( data.namedDest && !ld )
36	{	36	{
37	deleteDest = true;	37	deleteDest = true;




namespace Poppler {

/* borrowed from kpdf */
TQString unicodeToTQString(CONST_064 Unicode* u, int len)
{
    TQString ret;
    ret.setLength(len);

    return ret;
}

TQString UnicodeParsedString(CONST_064 GooString *s1)
{
    GBool isUnicode;
    int i;

}


void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, CONST_064 GooList * items )
{
    int numItems = items->getLength();
    for ( int i = 0; i < numItems; ++i )


        // 1. create element using outlineItem's title as tagName
        TQString name;
        CONST_064 Unicode * uniChar = outlineItem->getTitle();
        int titleLength = outlineItem->getTitleLength();
        name = unicodeToTQString(uniChar, titleLength);
        if ( name.isEmpty() )

        parent->appendChild( item );

        // 2. find the page the link refers to
        CONST_064 ::LinkAction * a = outlineItem->getAction();
        if ( a && ( a->getKind() == actionGoTo || a->getKind() == actionGoToR ) )
        {
            // page number is contained/referenced in a LinkGoTo
            CONST_064 LinkGoTo * g = static_cast< CONST_064 LinkGoTo * >( a );
            CONST_064 LinkDest * destination = g->getDest();
            if ( !destination && g->getNamedDest() )
            {
                // no 'destination' but an internal 'named reference'. we could
                // get the destination for the page now, but it's VERY time consuming,
                // so better storing the reference and provide the viewport on demand
                CONST_064 GooString *s = g->getNamedDest();
                TQChar *charArray = new TQChar[s->getLength()];
                for (int i = 0; i < s->getLength(); ++i) charArray[i] = TQChar(s->getCString()[i]);
                    TQString aux(charArray, s->getLength());

                }
                if ( a->getKind() == actionGoToR )
                {
                    CONST_064 LinkGoToR * g2 = static_cast< CONST_064 LinkGoToR * >( a );
                    item.setAttribute( "ExternalFileName", g2->getFileName()->getCString() );
                }
            }

        // 3. recursively descend over children
        outlineItem->open();
        CONST_064 GooList * children = outlineItem->getKids();
        if ( children )
            addTocChildren( docSyn, &item, children );
    }




#else
class SplashOutputDev;
#endif
#if defined(HAVE_POPPLER_064)
#define CONST_064 const
#else
#define CONST_064
#endif

namespace Poppler {
    
class DocumentData;

TQString unicodeToTQString(CONST_064 Unicode* u, int len);

TQString UnicodeParsedString(CONST_064 GooString *s1);

GooString *TQStringToGooString(const TQString &s);

class LinkDestinationData {
  public:
     LinkDestinationData( CONST_064 LinkDest *l, GooString *nd, Poppler::DocumentData *pdfdoc ) : ld(l), namedDest(nd), doc(pdfdoc)
     {
     }

     CONST_064 LinkDest *ld;
     GooString *namedDest;
     Poppler::DocumentData *doc;
};

        return m_outputDev;
    }

    void addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, CONST_064 GooList * items );

  class PDFDoc doc;
  bool locked;

Return to bug 2957

Lines 31-37 Link Here

(-)a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cc (-10 / +10 lines)
31	namespace Poppler {	31	namespace Poppler {
32		32
33	/* borrowed from kpdf */	33	/* borrowed from kpdf */
34	TQString unicodeToTQString(Unicode* u, int len)	34	TQString unicodeToTQString(CONST_064 Unicode* u, int len)
35	{	35	{
36	TQString ret;	36	TQString ret;
37	ret.setLength(len);	37	ret.setLength(len);
Lines 41-47 TQString unicodeToTQString(Unicode* u, int len) Link Here
41	return ret;	41	return ret;
42	}	42	}
43		43
44	TQString UnicodeParsedString(GooString *s1)	44	TQString UnicodeParsedString(CONST_064 GooString *s1)
45	{	45	{
46	GBool isUnicode;	46	GBool isUnicode;
47	int i;	47	int i;
Lines 86-92 GooString *TQStringToGooString(const TQString &s) Link Here
86	}	86	}
87		87
88		88
89	void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, GooList * items )	89	void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, CONST_064 GooList * items )
90	{	90	{
91	int numItems = items->getLength();	91	int numItems = items->getLength();
92	for ( int i = 0; i < numItems; ++i )	92	for ( int i = 0; i < numItems; ++i )
Lines 96-102 void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G Link Here
96		96
97	// 1. create element using outlineItem's title as tagName	97	// 1. create element using outlineItem's title as tagName
98	TQString name;	98	TQString name;
99	Unicode * uniChar = outlineItem->getTitle();	99	CONST_064 Unicode * uniChar = outlineItem->getTitle();
100	int titleLength = outlineItem->getTitleLength();	100	int titleLength = outlineItem->getTitleLength();
101	name = unicodeToTQString(uniChar, titleLength);	101	name = unicodeToTQString(uniChar, titleLength);
102	if ( name.isEmpty() )	102	if ( name.isEmpty() )
Lines 106-123 void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G Link Here
106	parent->appendChild( item );	106	parent->appendChild( item );
107		107
108	// 2. find the page the link refers to	108	// 2. find the page the link refers to
109	::LinkAction * a = outlineItem->getAction();	109	CONST_064 ::LinkAction * a = outlineItem->getAction();
110	if ( a && ( a->getKind() == actionGoTo \|\| a->getKind() == actionGoToR ) )	110	if ( a && ( a->getKind() == actionGoTo \|\| a->getKind() == actionGoToR ) )
111	{	111	{
112	// page number is contained/referenced in a LinkGoTo	112	// page number is contained/referenced in a LinkGoTo
113	LinkGoTo * g = static_cast< LinkGoTo * >( a );	113	CONST_064 LinkGoTo * g = static_cast< CONST_064 LinkGoTo * >( a );
114	LinkDest * destination = g->getDest();	114	CONST_064 LinkDest * destination = g->getDest();
115	if ( !destination && g->getNamedDest() )	115	if ( !destination && g->getNamedDest() )
116	{	116	{
117	// no 'destination' but an internal 'named reference'. we could	117	// no 'destination' but an internal 'named reference'. we could
118	// get the destination for the page now, but it's VERY time consuming,	118	// get the destination for the page now, but it's VERY time consuming,
119	// so better storing the reference and provide the viewport on demand	119	// so better storing the reference and provide the viewport on demand
120	GooString *s = g->getNamedDest();	120	CONST_064 GooString *s = g->getNamedDest();
121	TQChar *charArray = new TQChar[s->getLength()];	121	TQChar *charArray = new TQChar[s->getLength()];
122	for (int i = 0; i < s->getLength(); ++i) charArray[i] = TQChar(s->getCString()[i]);	122	for (int i = 0; i < s->getLength(); ++i) charArray[i] = TQChar(s->getCString()[i]);
123	TQString aux(charArray, s->getLength());	123	TQString aux(charArray, s->getLength());
Lines 131-144 void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G Link Here
131	}	131	}
132	if ( a->getKind() == actionGoToR )	132	if ( a->getKind() == actionGoToR )
133	{	133	{
134	LinkGoToR * g2 = static_cast< LinkGoToR * >( a );	134	CONST_064 LinkGoToR * g2 = static_cast< CONST_064 LinkGoToR * >( a );
135	item.setAttribute( "ExternalFileName", g2->getFileName()->getCString() );	135	item.setAttribute( "ExternalFileName", g2->getFileName()->getCString() );
136	}	136	}
137	}	137	}
138		138
139	// 3. recursively descend over children	139	// 3. recursively descend over children
140	outlineItem->open();	140	outlineItem->open();
141	GooList * children = outlineItem->getKids();	141	CONST_064 GooList * children = outlineItem->getKids();
142	if ( children )	142	if ( children )
143	addTocChildren( docSyn, &item, children );	143	addTocChildren( docSyn, &item, children );
144	}	144	}

Lines 34-57 Link Here

(-)a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h (-6 / +11 lines)
34	#else	34	#else
35	class SplashOutputDev;	35	class SplashOutputDev;
36	#endif	36	#endif
		37	#if defined(HAVE_POPPLER_064)
		38	#define CONST_064 const
		39	#else
		40	#define CONST_064
		41	#endif
37		42
38	namespace Poppler {	43	namespace Poppler {
39		44
40	class DocumentData;	45	class DocumentData;
41		46
42	TQString unicodeToTQString(Unicode* u, int len);	47	TQString unicodeToTQString(CONST_064 Unicode* u, int len);
43		48
44	TQString UnicodeParsedString(GooString *s1);	49	TQString UnicodeParsedString(CONST_064 GooString *s1);
45		50
46	GooString *TQStringToGooString(const TQString &s);	51	GooString *TQStringToGooString(const TQString &s);
47		52
48	class LinkDestinationData {	53	class LinkDestinationData {
49	public:	54	public:
50	LinkDestinationData( LinkDest l, GooString nd, Poppler::DocumentData *pdfdoc ) : ld(l), namedDest(nd), doc(pdfdoc)	55	LinkDestinationData( CONST_064 LinkDest l, GooString nd, Poppler::DocumentData *pdfdoc ) : ld(l), namedDest(nd), doc(pdfdoc)
51	{	56	{
52	}	57	}
53		58
54	LinkDest *ld;	59	CONST_064 LinkDest *ld;
55	GooString *namedDest;	60	GooString *namedDest;
56	Poppler::DocumentData *doc;	61	Poppler::DocumentData *doc;
57	};	62	};
Lines 84-90 class DocumentData { Link Here
84	return m_outputDev;	89	return m_outputDev;
85	}	90	}
86		91
87	void addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, GooList * items );	92	void addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, CONST_064 GooList * items );
88		93
89	class PDFDoc doc;	94	class PDFDoc doc;
90	bool locked;	95	bool locked;

Lines 34-36 if( NOT DEFINED HAVE_POPPLER_060 ) Link Here

(-)a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake (+11 lines)
34	message( STATUS "Performing Test HAVE_POPPLER_060 - Failed" )	34	message( STATUS "Performing Test HAVE_POPPLER_060 - Failed" )
35	endif( )	35	endif( )
36	endif( )	36	endif( )
		37
		38	if( NOT DEFINED HAVE_POPPLER_064 )
		39	message( STATUS "Performing Test HAVE_POPPLER_064" )
		40	if( NOT POPPLER_VERSION VERSION_LESS "0.64" )
		41	set( HAVE_POPPLER_064 1 CACHE INTERNAL "" FORCE )
		42	message( STATUS "Performing Test HAVE_POPPLER_064 - Success" )
		43	else( )
		44	set( HAVE_POPPLER_064 "" CACHE INTERNAL "" FORCE )
		45	message( STATUS "Performing Test HAVE_POPPLER_064 - Failed" )
		46	endif( )
		47	endif( )