diff options
Diffstat (limited to 'vcl/unx/source/app/i18n_wrp.cxx')
| -rw-r--r-- | vcl/unx/source/app/i18n_wrp.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/vcl/unx/source/app/i18n_wrp.cxx b/vcl/unx/source/app/i18n_wrp.cxx index baf7e175eac5..df64a69b8a36 100644 --- a/vcl/unx/source/app/i18n_wrp.cxx +++ b/vcl/unx/source/app/i18n_wrp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -struct XIMArg +struct XIMArg { char *name; char *value; @@ -48,7 +48,7 @@ struct XIMArg #include <X11/Xlibint.h> #include "XIM.h" -#define XIIIMP_LIB "xiiimp.so.2" +#define XIIIMP_LIB "xiiimp.so.2" #ifdef SOLARIS #define XIIIMP_PATH "/usr/openwin/lib/locale/common/" XIIIMP_LIB @@ -169,8 +169,8 @@ XvaGetArgs( va_list pInArgs, XIMArg *pOutArgs ) #ifdef __cplusplus extern "C" #endif -XIM -XvaOpenIM(Display *display, XrmDatabase rdb, +XIM +XvaOpenIM(Display *display, XrmDatabase rdb, char *res_name, char *res_class, ...) { XIM xim = (XIM)0; @@ -180,7 +180,7 @@ XvaOpenIM(Display *display, XrmDatabase rdb, /* * so count the stuff dangling here */ - + #if defined(SOLARIS) && !defined(__GNUC__) va_start(variable); #else @@ -189,8 +189,8 @@ XvaOpenIM(Display *display, XrmDatabase rdb, total_count = XvaCountArgs(variable); va_end(variable); - if (total_count > 0) - { + if (total_count > 0) + { /* call a new open IM method */ XIMArg* args = (XIMArg*)alloca( (total_count + 1) * sizeof(XIMArg) ); @@ -206,23 +206,23 @@ XvaOpenIM(Display *display, XrmDatabase rdb, XvaGetArgs( variable, args ); va_end(variable); - if (!g_dlmodule) + if (!g_dlmodule) { g_dlmodule = dlopen(XIIIMP_LIB, RTLD_LAZY); if(!g_dlmodule) { g_dlmodule = dlopen(XIIIMP_PATH, RTLD_LAZY); - if (!g_dlmodule) + if (!g_dlmodule) goto legacy_XIM; } g_open_im = (OpenFunction)(long)dlsym(g_dlmodule, "__XOpenIM"); - if (!g_open_im) + if (!g_open_im) goto legacy_XIM; xim = (*g_open_im)(display, (XrmDatabase)rdb, (char*)res_name, (char *)res_class, (XIMArg*)args); - } - else + } + else { goto legacy_XIM; } @@ -230,10 +230,10 @@ XvaOpenIM(Display *display, XrmDatabase rdb, // in #if to prevent warning "warning: label 'legacy_XIM' defined but not used" legacy_XIM: - + if (!xim) xim = XOpenIM(display, rdb, res_name, res_class); - + return xim; } @@ -245,8 +245,8 @@ Status XvaCloseIM(XIM) { Status s = False; - if (!g_dlmodule) - { + if (!g_dlmodule) + { /* assuming one XvaOpenIM call */ dlclose(g_dlmodule); g_dlmodule = (void*)0; |