10689: Incorrect save filename when filename contains multiple points

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17721 11d20701-8431-0410-a711-e3c959e3b870

1 files changed, 7 insertions, 2 deletions

diff --git a/scribus/pdfopts.cpp b/scribus/pdfopts.cpp
index 71cee56..5cfe6e6 100644
--- a/scribus/pdfopts.cpp
+++ b/scribus/pdfopts.cpp
@@ -75,9 +75,14 @@ PDFExportDialog::PDFExportDialog( QWidget* parent, const QString & docFileName,
 	else
 	{
 		QFileInfo fi(docFileName);
+		QString completeBaseName = fi.completeBaseName();
+		if (completeBaseName.endsWith(".sla", Qt::CaseInsensitive))
+			if (completeBaseName.length() > 4) completeBaseName.chop(4);
+		if (completeBaseName.endsWith(".gz", Qt::CaseInsensitive))
+			if (completeBaseName.length() > 3) completeBaseName.chop(3);
 		if (fi.exists())
 		{
-			QString fileName(fi.path()+"/"+fi.baseName()+".pdf");
+			QString fileName(fi.path() + "/" + completeBaseName + ".pdf");
 			fileNameLineEdit->setText( QDir::toNativeSeparators(fileName) );
 		}
 		else
@@ -86,7 +91,7 @@ PDFExportDialog::PDFExportDialog( QWidget* parent, const QString & docFileName,
 			QString pdfdir = dirs->get("pdf", fi.path());
 			if (pdfdir.right(1) != "/")
 				pdfdir += "/";
-			QString fileName(pdfdir+fi.baseName()+".pdf");
+			QString fileName(pdfdir + completeBaseName + ".pdf");
 			fileNameLineEdit->setText( QDir::toNativeSeparators(fileName) );
 		}
 	}