LOK: kill saveAsWithOptions.

The saveAsWithOptions/saveAs split existed for reasons of historical
API compatibility. Since we're breaking the API currently we can
now get a clean start, and get rid of the redundant saveAs, and
make saveAsWithOptions the standard saveAs function.

Change-Id: Ia3e2294a8604cab08e95b07544c9d10d42dd1152
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>

2 files changed, 4 insertions, 13 deletions

diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h
index 63c2c22cd471..33b5872c76e2 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -58,11 +58,8 @@ struct _LibreOfficeKitDocumentClass
   void (*destroy)   (LibreOfficeKitDocument* pThis);
   int (*saveAs)     (LibreOfficeKitDocument* pThis,
                      const char *pUrl,
-                     const char *pFormat);
-  int (*saveAsWithOptions) (LibreOfficeKitDocument* pThis,
-                            const char *pUrl,
-                            const char *pFormat,
-                            const char *pFilterOptions);
+                     const char *pFormat,
+                     const char *pFilterOptions);
 };
 
 LibreOfficeKit* lok_init (const char* pInstallPath);
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index f1db388655f0..51a8578f15d0 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -36,15 +36,9 @@ public:
         mpDoc->pClass->destroy(mpDoc);
     }
 
-    // Save as the given format, if format is NULL sniff from ext'n
-    inline bool saveAs(const char* pUrl, const char* pFormat = NULL)
+    inline bool saveAs(const char* pUrl, const char* pFormat = NULL, const char* pFilterOptions = NULL)
     {
-        return mpDoc->pClass->saveAs(mpDoc, pUrl, pFormat);
-    }
-
-    inline bool saveAsWithOptions(const char* pUrl, const char* pFormat = NULL, const char* pFilterOptions = NULL)
-    {
-        return mpDoc->pClass->saveAsWithOptions(mpDoc, pUrl, pFormat, pFilterOptions);
+        return mpDoc->pClass->saveAs(mpDoc, pUrl, pFormat, pFilterOptions);
     }
     inline LibreOfficeKitDocument *get() { return mpDoc; }
 };