From 47483ca5d84774a4d0efb80ca5bb72ab746e0407 Mon Sep 17 00:00:00 2001 From: "Zane U. Ji" Date: Sun, 27 Apr 2014 20:58:41 +0800 Subject: [PATCH] Don't escape file names partially --- src/associatedialog.cpp | 2 -- src/xmlassociatexsd.cpp | 1 - src/xmlcopyeditor.cpp | 4 ---- 3 files changed, 7 deletions(-) diff --git a/src/associatedialog.cpp b/src/associatedialog.cpp index 0183137..18ba6a4 100644 --- a/src/associatedialog.cpp +++ b/src/associatedialog.cpp @@ -182,8 +182,6 @@ void AssociateDialog::OnBrowse ( wxCommandEvent& e ) if ( fd->ShowModal() == wxID_OK ) { wxString newValue = fd->GetPath(); - newValue.Replace ( _T ( "\\" ), _T ( "/" ), true ); - newValue.Replace ( _T ( " " ), _T ( "%20" ), true ); urlCtrl->SetValue ( newValue ); if ( mLastDir ) diff --git a/src/xmlassociatexsd.cpp b/src/xmlassociatexsd.cpp index a3ad4a5..a5eb045 100644 --- a/src/xmlassociatexsd.cpp +++ b/src/xmlassociatexsd.cpp @@ -44,7 +44,6 @@ XmlAssociateXsd::XmlAssociateXsd ( std::auto_ptr parser ( new XmlParseSchemaNs() ); std::string normalisedPath, buffer; normalisedPath = path.mb_str ( wxConvLocal ); - Replace::run ( normalisedPath, "%20", " ", true ); if ( !ReadFile::run ( normalisedPath, buffer ) ) return; parser->parse ( buffer ); diff --git a/src/xmlcopyeditor.cpp b/src/xmlcopyeditor.cpp index c0a76af..0e23581 100644 --- a/src/xmlcopyeditor.cpp +++ b/src/xmlcopyeditor.cpp @@ -711,9 +711,6 @@ MyFrame::MyFrame ( lastRelaxNGSchema = config->Read ( _T ( "lastRelaxNGSchema" ), wxEmptyString ); - lastXslStylesheet.Replace ( _T ( " " ), _T ( "%20" ), true ); - lastRelaxNGSchema.Replace ( _T ( " " ), _T ( "%20" ), true ); - exportQuiet = config->Read ( _T ( "exportQuiet" ), (long)true ); exportMp3Album = @@ -4091,7 +4088,6 @@ void MyFrame::OnXslt ( wxCommandEvent& event ) std::string location = xl.getXslLocation(); path = wxString ( location.c_str(), wxConvUTF8, location.size() ); - path.Replace ( _T ( "%20" ), _T ( " " ), true ); path = PathResolver::run ( path, doc->getFullFileName() );