[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1529
Date       : Tue Jul 25 15:42:44 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/bmapprev.cpp
   M /Trunk/XaraLX/Kernel/bmpexprw.cpp

Remove [Resource string not found] from export dialog


Diff:
Index: Trunk/XaraLX/Kernel/bmapprev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1528)
+++ Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1529)
@@ -737,7 +737,10 @@
 		// Set up the title of the dialog box according to the passed in string which
 		// is the name of the filter plus export bitmap options.
 		String_256 Temp = ""; //*(m_pExportOptions->GetFilterName());
-		Temp.Load(m_pExportOptions->GetFilterNameStrID()); // which is safer than the ptr into whatever
+		if( m_pBmpFilter->GetFilterType() != IMAGEMAGICK )
+			Temp.Load(m_pExportOptions->GetFilterNameStrID()); // which is safer than the ptr into whatever
+		else
+			Temp.Load( _R(IDS_IMAGEMAGICK_FILTERNAME) ); 
 		Temp += String_256(_R(IDN_EXPORTBMPOPTS));
 
 		DialogManager::SetTitlebarName(WindowID, &Temp); // set the title bar for the window
Index: Trunk/XaraLX/Kernel/bmpexprw.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmpexprw.cpp	(revision 1528)
+++ Trunk/XaraLX/Kernel/bmpexprw.cpp	(revision 1529)
@@ -2691,7 +2691,8 @@
 	// create a temp file 
 	PathName TempPath = FileUtil::GetTemporaryPathName();
 
-	if( m_pBmpFilter->IS_KIND_OF( ImageMagickFilter ) )
+	// If we want any change of re-importing IM based filters, they need an extension
+	if( m_pBmpFilter->GetFilterType() == IMAGEMAGICK )
 		TempPath.SetType( ((ImageMagickFilter*)m_pBmpFilter)->GetExtension() );
 
 // Set flag telling exporter that we are NOT exporting a temporary file!


Xara