[Libreoffice-commits] core.git: include/LibreOfficeKit

Tor Lillqvist tml at collabora.com
Mon Mar 23 13:25:55 PDT 2015


 include/LibreOfficeKit/LibreOfficeKitInit.h |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 9bb8ba4e0640521253e2f5a4d476cad7777da079
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Mar 23 19:38:58 2015 +0200

    Typo: s/SEPERATOR/SEPARATOR
    
    Thanks to Jürgen Funk for noticing, on
    https://gerrit.libreoffice.org/#/c/13017/ .
    
    Change-Id: Iff6225d658a9f5c7d3cd95b1f5b0b17606897d15

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 6f56c72..fe10cd9 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -35,7 +35,7 @@ extern "C"
         #define TARGET_LIB        "lib" "sofficeapp" ".so"
         #define TARGET_MERGED_LIB "lib" "mergedlo" ".so"
     #endif
-    #define SEPERATOR         '/'
+    #define SEPARATOR         '/'
 
     void *_dlopen(const char *pFN)
     {
@@ -69,7 +69,7 @@ extern "C"
     #include <windows.h>
     #define TARGET_LIB        "sofficeapp" ".dll"
     #define TARGET_MERGED_LIB "mergedlo" ".dll"
-    #define SEPERATOR         '\\'
+    #define SEPARATOR         '\\'
     #define UNOPATH           "\\..\\URE\\bin"
 
     void *_dlopen(const char *pFN)
@@ -151,7 +151,7 @@ static LibreOfficeKit *lok_init( const char *install_path )
 
     extendUnoPath(install_path);
 
-    imp_lib[partial_length++] = SEPERATOR;
+    imp_lib[partial_length++] = SEPARATOR;
     strcpy(imp_lib + partial_length, TARGET_LIB);
 
     dlhandle = _dlopen(imp_lib);
@@ -186,6 +186,8 @@ static LibreOfficeKit *lok_init( const char *install_path )
     return pSym( install_path );
 }
 
+#undef SEPARATOR // It is used at least in enum class MenuItemType
+
 #endif // defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) || defined(_WIN32) || defined(__APPLE__)
 
 #ifdef __cplusplus


More information about the Libreoffice-commits mailing list