[Libreoffice-commits] core.git: compilerplugins/clang i18nutil/source

[Noel Grandin]

 compilerplugins/clang/unusedfields.py |    9 ++++++++-
 i18nutil/source/utility/unicode.cxx   |    7 -------
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 8411f48bfb71d5713b185b41d6519b0beb4c1e83
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Apr 20 09:13:34 2017 +0200

    loplugin:unusedfields
    
    Change-Id: I0026e0a1890b984675e82ab7be5cdbc56e142a87
    Reviewed-on: https://gerrit.libreoffice.org/36722
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedfields.py b/compilerplugins/clang/unusedfields.py
index 77e6446e18e3..3effaff38828 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -97,7 +97,9 @@ for d in definitionSet:
     if srcLoc.startswith("cppu/source/uno/check.cxx"):
         continue
     fieldType = definitionToTypeMap[d]
-    if fieldType in set([ "class rptui::OModuleClient" ]):
+    if "ModuleClient" in fieldType:
+        continue
+    if "::sfx2::sidebar::ControllerItem" in fieldType:
         continue
     untouchedSet.add((d[0] + " " + d[1] + " " + fieldType, srcLoc))
 
@@ -118,6 +120,11 @@ for d in definitionSet:
         or srcLoc.startswith("lotuswordpro/source/filter/lwpsdwdrawheader.hxx")
         or srcLoc.startswith("svtools/source/dialogs/insdlg.cxx")):
         continue
+    fieldType = definitionToTypeMap[d]
+    if "ModuleClient" in fieldType:
+        continue
+    if "::sfx2::sidebar::ControllerItem" in fieldType:
+        continue
 
     writeonlySet.add((clazz + " " + definitionToTypeMap[d], srcLoc))
 
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 496c5cb589ac..94abe5220f84 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -36,13 +36,6 @@
 
 using namespace ::com::sun::star::i18n;
 
-struct DefaultScriptTypeList {
-    com::sun::star::i18n::UnicodeScript from;
-    com::sun::star::i18n::UnicodeScript to;
-    com::sun::star::i18n::UnicodeScript value;
-};
-
-
 template<class L, typename T>
 T getScriptType( const sal_Unicode ch, const L* typeList, T unknownType ) {