From 0a4e710ad76d06a061e5f595e9c064f3f4f7c50d Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 6 Apr 2015 12:01:08 -0300
Subject: [PATCH] Add filename arg to fop_to_save_document()

---
 src/app/commands/cmd_save_file.cpp |  4 ++--
 src/app/file/file.cpp              | 14 ++++++++------
 src/app/file/file.h                |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/app/commands/cmd_save_file.cpp b/src/app/commands/cmd_save_file.cpp
index 3397deb40..a9be27b88 100644
--- a/src/app/commands/cmd_save_file.cpp
+++ b/src/app/commands/cmd_save_file.cpp
@@ -73,8 +73,8 @@ private:
 static void save_document_in_background(Context* context, Document* document,
   bool mark_as_saved, const std::string& fn_format)
 {
-  base::UniquePtr<FileOp> fop(fop_to_save_document(context, document,
-      fn_format.c_str()));
+  base::UniquePtr<FileOp> fop(fop_to_save_document(context,
+      document, document->filename().c_str(), fn_format.c_str()));
   if (!fop)
     return;
 
diff --git a/src/app/file/file.cpp b/src/app/file/file.cpp
index 2a0006bae..e5e3f010a 100644
--- a/src/app/file/file.cpp
+++ b/src/app/file/file.cpp
@@ -108,7 +108,8 @@ int save_document(Context* context, doc::Document* document)
 
   int ret;
   FileOp* fop = fop_to_save_document(context,
-    static_cast<app::Document*>(document), "");
+    static_cast<app::Document*>(document),
+    document->filename().c_str(), "");
   if (!fop)
     return -1;
 
@@ -223,7 +224,8 @@ done:;
   return fop;
 }
 
-FileOp* fop_to_save_document(Context* context, Document* document, const char* fn_format_arg)
+FileOp* fop_to_save_document(Context* context, Document* document,
+  const char* filename, const char* fn_format_arg)
 {
   FileOp *fop;
   bool fatal;
@@ -236,9 +238,9 @@ FileOp* fop_to_save_document(Context* context, Document* document, const char* f
   fop->document = document;
 
   // Get the extension of the filename (in lower case)
-  std::string extension = base::string_to_lower(base::get_file_extension(fop->document->filename()));
+  std::string extension = base::string_to_lower(base::get_file_extension(filename));
 
-  PRINTF("Saving document \"%s\" (%s)\n", fop->document->filename().c_str(), extension.c_str());
+  PRINTF("Saving document \"%s\" (%s)\n", filename, extension.c_str());
 
   // Get the format through the extension of the filename
   fop->format = FileFormatsManager::instance()
@@ -363,7 +365,7 @@ FileOp* fop_to_save_document(Context* context, Document* document, const char* f
   if (fop->format->support(FILE_SUPPORT_SEQUENCES)) {
     fop_prepare_for_sequence(fop);
 
-    std::string fn = fop->document->filename();
+    std::string fn = filename;
     std::string fn_format = fn_format_arg;
     bool default_format = false;
 
@@ -415,7 +417,7 @@ FileOp* fop_to_save_document(Context* context, Document* document, const char* f
     }
   }
   else
-    fop->filename = fop->document->filename();
+    fop->filename = filename;
 
   // Configure output format?
   if (fop->format->support(FILE_SUPPORT_GET_FORMAT_OPTIONS)) {
diff --git a/src/app/file/file.h b/src/app/file/file.h
index 77a1ba101..0cf928a16 100644
--- a/src/app/file/file.h
+++ b/src/app/file/file.h
@@ -123,7 +123,7 @@ namespace app {
   // Low-level routines to load/save documents.
 
   FileOp* fop_to_load_document(Context* context, const char* filename, int flags);
-  FileOp* fop_to_save_document(Context* context, Document* document, const char* fn_format);
+  FileOp* fop_to_save_document(Context* context, Document* document, const char* filename, const char* fn_format);
   void fop_operate(FileOp* fop, IFileOpProgress* progress);
   void fop_done(FileOp* fop);
   void fop_stop(FileOp* fop);