]>
Commit | Line | Data |
---|---|---|
53f2cc1f | 1 | =================================================================== |
2 | RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qdnd_x11.cpp,v | |
3 | retrieving revision 1.56 | |
4 | retrieving revision 1.57 | |
5 | diff -u -p -r1.56 -r1.57 | |
6 | --- qt-copy/src/kernel/qdnd_x11.cpp 2003/05/16 13:02:39 1.56 | |
7 | +++ qt-copy/src/kernel/qdnd_x11.cpp 2003/09/23 16:01:19 1.57 | |
53f2cc1f | 8 | @@ -1437,7 +1437,7 @@ static QByteArray qt_xdnd_obtain_data( c |
9 | return result; // should never happen? | |
10 | ||
11 | QWidget* tw = qt_xdnd_current_widget; | |
12 | - if ( qt_xdnd_current_widget->isDesktop() ) { | |
13 | + if ( qt_xdnd_current_widget && qt_xdnd_current_widget->isDesktop() ) { | |
14 | tw = new QWidget; | |
15 | } | |
16 | XConvertSelection( QPaintDevice::x11AppDisplay(), | |
17 | @@ -1475,7 +1475,7 @@ static QByteArray qt_xdnd_obtain_data( c | |
18 | #endif | |
19 | } | |
20 | } | |
21 | - if ( qt_xdnd_current_widget->isDesktop() ) { | |
22 | + if ( qt_xdnd_current_widget && qt_xdnd_current_widget->isDesktop() ) { | |
23 | delete tw; | |
24 | } | |
25 | } | |
26 | =================================================================== | |
27 | RCS file: /home2/webcvs/mirror/qt-copy/src/kernel/qpsprinter.cpp,v | |
28 | retrieving revision 1.73 | |
29 | retrieving revision 1.74 | |
30 | diff -u -p -r1.73 -r1.74 | |
31 | --- qt-copy/src/kernel/qpsprinter.cpp 2003/08/27 14:31:46 1.73 | |
32 | +++ qt-copy/src/kernel/qpsprinter.cpp 2003/09/09 09:54:18 1.74 | |
33 | @@ -2376,7 +2376,7 @@ QPSPrinterFontTTF::QPSPrinterFontTTF(con | |
34 | Trademark.setLatin1(strings+offset,length); | |
35 | ||
36 | } | |
37 | - | |
38 | + psname = psname.replace(' ','-'); | |
39 | //read_cmap(font); | |
40 | ||
41 | /* We need to have the PostScript table around. */ |