diff options
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-06-17 19:33:34 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-06-23 12:27:08 +0100 |
| commit | 204bcc4d891ce1882ed1847decd9cc36c8c5f164 (patch) | |
| tree | 892214d23d1de48dfb7d7ead159f4c1355004bdc /desktop | |
| parent | bc7943390e0d629d5f7e319cc8044d191fcd4331 (diff) | |
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>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index eed7831eaf54..710b4741bca6 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -153,8 +153,7 @@ extern "C" { static void doc_destroy(LibreOfficeKitDocument* pThis); -static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* pUrl, const char* pFormat); -static int doc_saveAsWithOptions(LibreOfficeKitDocument* pThis, const char* pUrl, const char* pFormat, const char* pFilterOptions); +static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* pUrl, const char* pFormat, const char* pFilterOptions); struct LibLODocument_Impl : public _LibreOfficeKitDocument { @@ -172,7 +171,6 @@ struct LibLODocument_Impl : public _LibreOfficeKitDocument m_pDocumentClass->destroy = doc_destroy; m_pDocumentClass->saveAs = doc_saveAs; - m_pDocumentClass->saveAsWithOptions = doc_saveAsWithOptions; gDocumentClass = m_pDocumentClass; } @@ -254,12 +252,7 @@ static LibreOfficeKitDocument* lo_documentLoad(LibreOfficeKit* pThis, const char return NULL; } -static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const char* pFormat) -{ - return doc_saveAsWithOptions(pThis, sUrl, pFormat, NULL); -} - -static int doc_saveAsWithOptions(LibreOfficeKitDocument* pThis, const char* sUrl, const char* pFormat, const char* pFilterOptions) +static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const char* pFormat, const char* pFilterOptions) { LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis); |