[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 69725] kword printing to pdf crashes if filename contains a
From:       Michael Goffioul <goffioul () imec ! be>
Date:       2004-02-24 15:42:03
Message-ID: 20040224154203.12588.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
      
http://bugs.kde.org/show_bug.cgi?id=69725      
goffioul imec be changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From goffioul imec be  2004-02-24 16:41 -------
CVS commit by goffioul: 

Fix encoding error when updating output filename
CCMAIL: 69725-done bugs kde org


  M +9 -8      kprintdialog.cpp   1.77


--- kdelibs/kdeprint/kprintdialog.cpp  #1.76:1.77
 @ -569,7 +569,7  @ void KPrintDialog::initialize(KPrinter *
         // Initialize output filename
         if (!d->m_printer->outputFileName().isEmpty())
-                d->m_file->lineEdit()->setText(d->m_printer->outputFileName());
+                d->m_file->setURL( d->m_printer->outputFileName() );
         else if (!d->m_printer->docFileName().isEmpty())
-                d->m_file->lineEdit()->setText(d->m_printer->docDirectory()+"/"+d->m_printer->docFileName()+".ps");
 +                d->m_file->setURL( \
d->m_printer->docDirectory()+"/"+d->m_printer->docFileName()+".ps" );  
         if ( d->m_printers->count() > 0 )
 @ -661,5 +661,6  @ void KPrintDialog::done(int result)
                         if (!checkOutputFile()) return;
                         d->m_printer->setOutputToFile(true);
-                        \
d->m_printer->setOutputFileName(d->m_file->lineEdit()->text()); +                     \
/* be sure to decode the output filename */ +                        \
d->m_printer->setOutputFileName( KURL::decode_string( d->m_file->url() ) );  }
                 else
 @ -692,5 +693,5  @ bool KPrintDialog::checkOutputFile()
 {
         bool    value(false);
-        if (d->m_file->lineEdit()->text().isEmpty())
+        if (d->m_file->url().isEmpty())
                 KMessageBox::error(this,i18n("The output filename is empty."));
         else
 @ -711,5 +712,5  @ bool KPrintDialog::checkOutputFile()
                                 //value = (KMessageBox::warningYesNo(this,i18n("File \
                \"%1\" already exists. Overwrite?").arg(f.absFilePath())) == \
                KMessageBox::Yes);
                                 time_t mtimeDest = f.lastModified().toTime_t();
-                                KIO::RenameDlg dlg( this, i18n( "Print" ), \
QString::null, d->m_file->lineEdit()->text(), +                                \
                KIO::RenameDlg dlg( this, i18n( "Print" ), QString::null, \
                d->m_file->url(),
                                                 KIO::M_OVERWRITE, ( time_t ) -1, \
f.size(), ( time_t ) -1, f.created().toTime_t() , mtimeDest+1, mtimeDest, true );  \
int result = dlg.exec();  @ -725,5 +726,5  @ bool KPrintDialog::checkOutputFile()
                                         case KIO::R_RENAME:
                                                 url = dlg.newDestURL();
-                                                d->m_file->lineEdit()->setText( \
url.path() ); +                                                d->m_file->setURL( \
url.path() );  value = true;
                                                 anotherCheck = true;
 @ -786,5 +787,5  @ void KPrintDialog::setOutputFileExtensio
                 {
                         url.setFileName( f.left( p ) + "." + ext );
-                        d->m_file->setURL( url.url() );
+                        d->m_file->setURL( KURL::decode_string( url.url() ) );
                 }
         }
 @ -892,5 +893,5  @ void KPrintDialog::slotHelp()
 void KPrintDialog::slotOutputFileSelected(const QString& txt)
 {
-        d->m_file->lineEdit()->setText(txt);
+        d->m_file->setURL( txt );
 }


[prev in list] [next in list] [prev in thread] [next in thread]