diff options
author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-06-10 11:31:51 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2014-06-11 21:36:46 +0100 |
commit | f646e8c8e275dd984ad8aa8592228a89998abf79 (patch) | |
tree | 882100249e96c8cb92f7057a85cd0605546feb41 /desktop | |
parent | 7d210d6b32dc28bb2725983ffb66d8f153299c01 (diff) |
Rename C api of LibreOfficeKit.
However for the sake of ABI compatibility we can't change
liblibreoffice_hook.
Change-Id: I0e921efeeab40ef1b53a67c0e7a89d4c75ced831
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/lib/init.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index bbcac7fef613..512cfb3654c2 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -144,18 +144,18 @@ static OUString getAbsoluteURL(const char* pURL) extern "C" { -static void doc_destroy(LibreOfficeDocument* pThis); -static int doc_saveAs(LibreOfficeDocument* pThis, const char* pUrl, const char* pFormat); -static int doc_saveAsWithOptions(LibreOfficeDocument* pThis, const char* pUrl, const char* pFormat, const char* pFilterOptions); +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); -struct LibLODocument_Impl : public _LibreOfficeDocument +struct LibLODocument_Impl : public _LibreOfficeKitDocument { uno::Reference<css::lang::XComponent> mxComponent; LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent) : mxComponent( xComponent ) { - nSize = sizeof(LibreOffice); + nSize = sizeof(LibreOfficeKit); destroy = doc_destroy; saveAs = doc_saveAs; @@ -168,24 +168,24 @@ struct LibLODocument_Impl : public _LibreOfficeDocument } }; -static void doc_destroy(LibreOfficeDocument *pThis) +static void doc_destroy(LibreOfficeKitDocument *pThis) { LibLODocument_Impl *pDocument = static_cast<LibLODocument_Impl*>(pThis); delete pDocument; } -static void lo_destroy (LibreOffice* pThis); -static int lo_initialize (LibreOffice* pThis, const char* pInstallPath); -static LibreOfficeDocument* lo_documentLoad (LibreOffice* pThis, const char* pURL); -static char * lo_getError (LibreOffice* pThis); +static void lo_destroy (LibreOfficeKit* pThis); +static int lo_initialize (LibreOfficeKit* pThis, const char* pInstallPath); +static LibreOfficeKitDocument* lo_documentLoad (LibreOfficeKit* pThis, const char* pURL); +static char * lo_getError (LibreOfficeKit* pThis); -struct LibLibreOffice_Impl : public _LibreOffice +struct LibLibreOffice_Impl : public _LibreOfficeKit { OUString maLastExceptionMsg; LibLibreOffice_Impl() { - nSize = sizeof(LibreOfficeDocument); + nSize = sizeof(LibreOfficeKitDocument); destroy = lo_destroy; initialize = lo_initialize; @@ -199,7 +199,7 @@ static uno::Reference<css::uno::XComponentContext> xContext; static uno::Reference<css::lang::XMultiServiceFactory> xSFactory; static uno::Reference<css::lang::XMultiComponentFactory> xFactory; -static LibreOfficeDocument* lo_documentLoad(LibreOffice* pThis, const char* pURL) +static LibreOfficeKitDocument* lo_documentLoad(LibreOfficeKit* pThis, const char* pURL) { LibLibreOffice_Impl* pLib = static_cast<LibLibreOffice_Impl*>(pThis); @@ -230,12 +230,12 @@ static LibreOfficeDocument* lo_documentLoad(LibreOffice* pThis, const char* pURL return NULL; } -static int doc_saveAs(LibreOfficeDocument* pThis, const char* sUrl, const char* pFormat) +static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const char* pFormat) { return doc_saveAsWithOptions(pThis, sUrl, pFormat, NULL); } -static int doc_saveAsWithOptions(LibreOfficeDocument* pThis, const char* sUrl, const char* pFormat, const char* pFilterOptions) +static int doc_saveAsWithOptions(LibreOfficeKitDocument* pThis, const char* sUrl, const char* pFormat, const char* pFilterOptions) { LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis); @@ -321,7 +321,7 @@ static int doc_saveAsWithOptions(LibreOfficeDocument* pThis, const char* sUrl, c return false; } -static char* lo_getError (LibreOffice *pThis) +static char* lo_getError (LibreOfficeKit *pThis) { LibLibreOffice_Impl* pLib = static_cast<LibLibreOffice_Impl*>(pThis); OString aString = OUStringToOString(pLib->maLastExceptionMsg, RTL_TEXTENCODING_UTF8); @@ -376,7 +376,7 @@ static void initialize_uno(const OUString &aAppURL) // configmgr setup ? } -static int lo_initialize(LibreOffice* pThis, const char* pAppPath) +static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath) { (void) pThis; @@ -416,17 +416,17 @@ static int lo_initialize(LibreOffice* pThis, const char* pAppPath) return bInitialized; } -SAL_DLLPUBLIC_EXPORT LibreOffice *liblibreoffice_hook(void) +SAL_DLLPUBLIC_EXPORT LibreOfficeKit *liblibreoffice_hook(void) { if (!gImpl) { fprintf(stderr, "create libreoffice object\n"); gImpl = new LibLibreOffice_Impl(); } - return static_cast<LibreOffice*>(gImpl); + return static_cast<LibreOfficeKit*>(gImpl); } -static void lo_destroy(LibreOffice *pThis) +static void lo_destroy(LibreOfficeKit *pThis) { LibLibreOffice_Impl* pLib = static_cast<LibLibreOffice_Impl*>(pThis); delete pLib; |