compilerplugins/clang/unusedenumconstants.py | 1
compilerplugins/clang/unusedfields.py | 4
solenv/clang-format/excludelist | 1
vcl/inc/unx/XIM.h | 111 ---------------------------
4 files changed, 117 deletions(-)
New commits:
commit 4557f04ee9aadc0b399a3bd2e08133d4929221b9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 24 16:07:27 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 24 18:16:52 2020 +0200
remove unused XIM.h
Change-Id: Icf15604a2d449159fceb212717264952e8cacb33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101282
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/compilerplugins/clang/unusedenumconstants.py
b/compilerplugins/clang/unusedenumconstants.py
index 34a459bd0b54..aff9efd12ef4 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -183,7 +183,6 @@ def is_ignore(srcLoc):
# represents constants from an external API
"opencl/inc/opencl_device_selection.h",
"vcl/inc/sft.hxx",
- "vcl/inc/unx/XIM.h",
"vcl/unx/gtk/xid_fullscreen_on_all_monitors.c",
"vcl/unx/gtk/salnativewidgets-gtk.cxx",
"sc/inc/callform.hxx", # ParamType
diff --git a/compilerplugins/clang/unusedfields.py
b/compilerplugins/clang/unusedfields.py
index f98f2777ced1..6dcf3a85b7bc 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -70,7 +70,6 @@ for d in definitionSet:
or srcLoc.startswith("sw/source/filter/ww8/")
or srcLoc.startswith("vcl/source/filter/sgvmain.hxx")
or srcLoc.startswith("vcl/source/filter/sgfbram.hxx")
- or srcLoc.startswith("vcl/inc/unx/XIM.h")
or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h")
or srcLoc.startswith("include/svl/svdde.hxx")
or srcLoc.startswith("lotuswordpro/source/filter/lwpsdwdrawheader.hxx")
@@ -108,7 +107,6 @@ for d in definitionSet:
or srcLoc.startswith("sw/source/filter/ww8/")
or srcLoc.startswith("vcl/source/filter/sgvmain.hxx")
or srcLoc.startswith("vcl/source/filter/sgfbram.hxx")
- or srcLoc.startswith("vcl/inc/unx/XIM.h")
or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h")
or srcLoc.startswith("include/svl/svdde.hxx")
or srcLoc.startswith("lotuswordpro/source/filter/lwpsdwdrawheader.hxx")
@@ -146,7 +144,6 @@ for d in definitionSet:
or srcLoc.startswith("sw/source/filter/ww8/")
or srcLoc.startswith("vcl/source/filter/sgvmain.hxx")
or srcLoc.startswith("vcl/source/filter/sgfbram.hxx")
- or srcLoc.startswith("vcl/inc/unx/XIM.h")
or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h")
or srcLoc.startswith("include/svl/svdde.hxx")
or srcLoc.startswith("lotuswordpro/source/filter/lwpsdwdrawheader.hxx")
@@ -200,7 +197,6 @@ for d in definitionSet:
or srcLoc.startswith("sw/source/filter/ww8/")
or srcLoc.startswith("vcl/source/filter/sgvmain.hxx")
or srcLoc.startswith("vcl/source/filter/sgfbram.hxx")
- or srcLoc.startswith("vcl/inc/unx/XIM.h")
or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h")
or srcLoc.startswith("include/svl/svdde.hxx")):
continue
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index f080951b0d8c..e30a82513bfa 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -16654,7 +16654,6 @@ vcl/inc/textlayout.hxx
vcl/inc/textlineinfo.hxx
vcl/inc/textrender.hxx
vcl/inc/toolbox.h
-vcl/inc/unx/XIM.h
vcl/inc/unx/cairotextrender.hxx
vcl/inc/unx/cpdmgr.hxx
vcl/inc/unx/cupsmgr.hxx
diff --git a/vcl/inc/unx/XIM.h b/vcl/inc/unx/XIM.h
deleted file mode 100644
index 97379ed03c0b..000000000000
--- a/vcl/inc/unx/XIM.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_VCL_INC_UNX_XIM_H
-#define INCLUDED_VCL_INC_UNX_XIM_H
-
-#include <X11/Xlib.h>
-
-#ifndef XIMCallback1
-typedef int (*XIMProc1)(XIC, XPointer, XPointer);
-typedef struct {
- XPointer client_data;
- XIMProc1 callback;
-} XIMCallback1;
-#endif
-
-typedef struct {
- int start_position;
- int end_position;
- XPointer data;
-} XIMAnnotation;
-
-/*
- XIMUText: XIMText extension for UTF16
- */
-typedef struct {
- unsigned short length;
- XIMFeedback *feedback;
- Bool encoding_is_wchar;
- union {
- char *multi_byte;
- wchar_t *wide_char;
- unsigned short *utf16_char;
- } string;
- unsigned int count_annotations;
- XIMAnnotation *annotations;
-} XIMUnicodeText;
-
-/* lookup choice */
-typedef enum {
- XIMDrawUpHorizontally = 0 ,
- XIMDrawUpVertically = 1
-} XIMDrawUpDirection ;
-
-typedef struct {
- int choice_per_window; /* Number of choices can be display
- * in the region
- */
- int nrows;
- int ncolumns;
- XIMDrawUpDirection draw_up_direction;
-} XIMLookupStartCallbackStruct;
-
-typedef struct {
- XIMUnicodeText *label;
- XIMUnicodeText *value;
-} XIMUnicodeChoiceObject;
-
-typedef struct {
- XIMUnicodeChoiceObject *choices; /* the lookup choices */
- int n_choices; /* Total number of lookup choices */
- int first_index;
- int last_index;
- int current_index;
- XIMUnicodeText *title;
-} XIMLookupDrawCallbackStruct;
-
-/* Unicode Subset */
-typedef enum {
- XIMKatakana, XIMHanzi
-} XIMUnicodeCharacterSubsetID;
-
-typedef struct {
- XIMUnicodeCharacterSubsetID index;
- XIMUnicodeCharacterSubsetID subset_id;
- char *name;
- Bool is_active;
-} XIMUnicodeCharacterSubset;
-
-typedef struct {
- unsigned short count_subsets;
- XIMUnicodeCharacterSubset *supported_subsets;
-} XIMUnicodeCharacterSubsets;
-
-typedef struct {
- XIMUnicodeCharacterSubset *from;
- XIMUnicodeCharacterSubset *to;
-} XIMSwitchIMNotifyCallbackStruct;
-
-/* XIC attributes for multilingual IM extension */
-
-#define XNUnicodeCharacterSubset "UnicodeCharacterSubset"
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
