Complete LibreOfficeKit C++ renaming.

Change-Id: Ice611cf5913051346a3a0c0b00ed35a35a0dfe3c

include/LibreOfficeKit/LibreOfficeKit.hxx

@@ -87,9 +87,7 @@ public:
     }
 };
 
-}
-
-inline ::lok::Office* lo_cpp_init(const char* pInstallPath)
+inline Office* lok_cpp_init(const char* pInstallPath)
 {
     LibreOfficeKit* pThis = lok_init(pInstallPath);
     if (pThis == NULL || pThis->nSize == 0)
@@ -97,5 +95,6 @@ inline ::lok::Office* lo_cpp_init(const char* pInstallPath)
     return new ::lok::Office(pThis);
 }
 
+}
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

smoketest/libtest.cxx

@@ -46,7 +46,7 @@ int main (int argc, char **argv)
         return 1;
     }
 
-    Office *pOffice = lo_cpp_init( argv[1] );
+    Office *pOffice = lok_cpp_init( argv[1] );
     if( !pOffice )
     {
         fprintf( stderr, "Failed to initialize\n" );